diff --git a/CHANGELOG.md b/CHANGELOG.md index 86dbdfe0ef..f70adb04ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added * `theme.ron` now supports customizing line break symbol ([#1894](https://github.com/extrawurst/gitui/issues/1894)) - +* add confirmation for dialog for undo commit ([#1912](https://github.com/extrawurst/gitui/issues/1912)) + ## [0.24.3] - 2023-09-09 ### Fixes diff --git a/src/app.rs b/src/app.rs index cbf69159ed..2bdb2754ef 100644 --- a/src/app.rs +++ b/src/app.rs @@ -26,12 +26,17 @@ use crate::{ setup_popups, strings::{self, ellipsis_trim_start, order}, tabs::{FilesTab, Revlog, StashList, Stashing, Status}, + try_or_popup, ui::style::{SharedTheme, Theme}, AsyncAppNotification, AsyncNotification, }; use anyhow::{bail, Result}; use asyncgit::{ - sync::{self, utils::repo_work_dir, RepoPath, RepoPathRef}, + sync::{ + self, + utils::{repo_work_dir, undo_last_commit}, + RepoPath, RepoPathRef, + }, AsyncGitNotification, PushType, }; use crossbeam_channel::Sender; @@ -1076,6 +1081,13 @@ impl App { Action::AbortRebase => { self.status_tab.abort_rebase(); } + Action::UndoCommit => { + try_or_popup!( + self, + "undo commit failed:", + undo_last_commit(&self.repo.borrow()) + ); + } }; flags.insert(NeedsUpdate::ALL); diff --git a/src/components/reset.rs b/src/components/reset.rs index 6130419f65..aa8cd1dd78 100644 --- a/src/components/reset.rs +++ b/src/components/reset.rs @@ -213,6 +213,10 @@ impl ConfirmComponent { strings::confirm_title_abortrevert(), strings::confirm_msg_revertchanges(), ), + Action::UndoCommit => ( + strings::confirm_title_undo_commit(), + strings::confirm_msg_undo_commit(), + ), }; } diff --git a/src/queue.rs b/src/queue.rs index 68531985e6..170bc68ca3 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -54,6 +54,7 @@ pub enum Action { AbortMerge, AbortRebase, AbortRevert, + UndoCommit, } #[derive(Debug)] diff --git a/src/strings.rs b/src/strings.rs index 8134b5b6f6..7a73b1f97a 100644 --- a/src/strings.rs +++ b/src/strings.rs @@ -145,6 +145,9 @@ pub fn stash_popup_msg(_key_config: &SharedKeyConfig) -> String { pub fn confirm_title_reset() -> String { "Reset".to_string() } +pub fn confirm_title_undo_commit() -> String { + "Undo commit".to_string() +} pub fn confirm_title_stashdrop( _key_config: &SharedKeyConfig, multiple: bool, @@ -203,6 +206,9 @@ pub fn confirm_msg_reset_lines(lines: usize) -> String { "are you sure you want to discard {lines} selected lines?" ) } +pub fn confirm_msg_undo_commit() -> String { + "confirm undo last commit?".to_string() +} pub fn confirm_msg_stashdrop( _key_config: &SharedKeyConfig, ids: &[CommitId], diff --git a/src/tabs/status.rs b/src/tabs/status.rs index 837b87b140..d7e323740f 100644 --- a/src/tabs/status.rs +++ b/src/tabs/status.rs @@ -610,11 +610,8 @@ impl Status { } fn undo_last_commit(&self) { - try_or_popup!( - self, - "undo commit failed:", - sync::utils::undo_last_commit(&self.repo.borrow()) - ); + self.queue + .push(InternalEvent::ConfirmAction(Action::UndoCommit)); } fn branch_compare(&mut self) {