Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes tag annotation being broken in 0.25 #2139

Merged
merged 3 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/components/textinput.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ impl TextInputComponent {
self
}

///
pub fn set_input_type(&mut self, input_type: InputType) {
self.clear();
self.input_type = input_type;
}

/// Clear the `msg`.
pub fn clear(&mut self) {
self.msg.take();
Expand Down
56 changes: 36 additions & 20 deletions src/popups/tag_commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,13 @@ impl Component for TagCommitPopup {
if self.is_visible() || force_all {
self.input.commands(out, force_all);

let is_annotation_mode =
matches!(self.mode, Mode::Annotation { .. });

out.push(CommandInfo::new(
strings::commands::tag_commit_confirm_msg(
&self.key_config,
is_annotation_mode,
),
self.is_valid_tag(),
true,
Expand All @@ -66,37 +70,34 @@ impl Component for TagCommitPopup {

fn event(&mut self, ev: &Event) -> Result<EventState> {
if self.is_visible() {
if self.input.event(ev)?.is_consumed() {
return Ok(EventState::Consumed);
}

if let Event::Key(e) = ev {
if key_match(e, self.key_config.keys.enter)
let is_annotation_mode =
matches!(self.mode, Mode::Annotation { .. });

if !is_annotation_mode
&& key_match(e, self.key_config.keys.enter)
&& self.is_valid_tag()
{
try_or_popup!(self, "tag error:", self.tag());
return Ok(EventState::Consumed);
}
if is_annotation_mode
&& key_match(e, self.key_config.keys.commit)
{
try_or_popup!(self, "tag error:", self.tag());
return Ok(EventState::Consumed);
} else if key_match(
e,
self.key_config.keys.tag_annotate,
) && self.is_valid_tag()
{
let tag_name: String =
self.input.get_text().into();

self.input.clear();
self.input.set_title(
strings::tag_popup_annotation_title(
&tag_name,
),
);
self.input.set_default_msg(
strings::tag_popup_annotation_msg(),
);
self.mode = Mode::Annotation { tag_name };
self.start_annotate_mode();
return Ok(EventState::Consumed);
}

return Ok(EventState::Consumed);
}

self.input.event(ev)?;
return Ok(EventState::Consumed);
}
Ok(EventState::NotConsumed)
}
Expand All @@ -111,6 +112,7 @@ impl Component for TagCommitPopup {

fn show(&mut self) -> Result<()> {
self.mode = Mode::Name;
self.input.set_input_type(InputType::Singleline);
self.input.set_title(strings::tag_popup_name_title());
self.input.set_default_msg(strings::tag_popup_name_msg());
self.input.show()?;
Expand Down Expand Up @@ -166,6 +168,7 @@ impl TagCommitPopup {
.flatten()
.and_then(|val| val.parse::<bool>().ok())
.unwrap_or_default();

anyhow::ensure!(!gpgsign, "config tag.gpgsign=true detected.\ngpg signing not supported.\ndeactivate in your repo/gitconfig to be able to tag without signing.");

let (tag_name, tag_annotation) = self.tag_info();
Expand Down Expand Up @@ -201,4 +204,17 @@ impl TagCommitPopup {

Ok(())
}

fn start_annotate_mode(&mut self) {
let tag_name: String = self.input.get_text().into();

self.input.clear();
self.input.set_input_type(InputType::Multiline);
self.input.set_title(strings::tag_popup_annotation_title(
&tag_name,
));
self.input
.set_default_msg(strings::tag_popup_annotation_msg());
self.mode = Mode::Annotation { tag_name };
}
}
7 changes: 6 additions & 1 deletion src/strings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1423,11 +1423,16 @@ pub mod commands {
}
pub fn tag_commit_confirm_msg(
key_config: &SharedKeyConfig,
is_annotation_mode: bool,
) -> CommandText {
CommandText::new(
format!(
"Tag [{}]",
key_config.get_hint(key_config.keys.enter),
key_config.get_hint(if is_annotation_mode {
key_config.keys.commit
} else {
key_config.keys.enter
}),
),
"tag commit",
CMD_GROUP_LOG,
Expand Down