fix conflict

Author: Stephan Dilly

asyncgit/src/sync/merge.rs

@@ -2,7 +2,9 @@ use crate::{
 	error::{Error, Result},
 	sync::{
 		branch::merge_commit::commit_merge_with_head,
-		rebase::{continue_rebase, get_rebase_progress},
+		rebase::{
+			abort_rebase, continue_rebase, get_rebase_progress,
+		},
 		reset_stage, reset_workdir, utils, CommitId,
 	},
 };
@@ -74,6 +76,15 @@ pub fn continue_pending_rebase(
 	continue_rebase(&repo)
 }
 
+///
+pub fn abort_pending_rebase(repo_path: &str) -> Result<()> {
+	scope_time!("abort_pending_rebase");
+
+	let repo = utils::repo(repo_path)?;
+
+	abort_rebase(&repo)
+}
+
 ///
 pub fn merge_branch_repo(
 	repo: &Repository,

asyncgit/src/sync/mod.rs

@@ -58,8 +58,9 @@ pub use hunks::{reset_hunk, stage_hunk, unstage_hunk};
 pub use ignore::add_to_ignore;
 pub use logwalker::{LogWalker, LogWalkerFilter};
 pub use merge::{
-	abort_merge, continue_pending_rebase, merge_branch, merge_commit,
-	merge_msg, mergehead_ids, rebase_progress,
+	abort_merge, abort_pending_rebase, continue_pending_rebase,
+	merge_branch, merge_commit, merge_msg, mergehead_ids,
+	rebase_progress,
 };
 pub use rebase::rebase_branch;
 pub use remotes::{

asyncgit/src/sync/rebase.rs

@@ -161,7 +161,6 @@ pub fn get_rebase_progress(
 }
 
 ///
-#[allow(dead_code)]
 pub fn abort_rebase(repo: &git2::Repository) -> Result<()> {
 	let mut rebase = repo.open_rebase(None)?;
 

src/app.rs

@@ -821,6 +821,10 @@ impl App {
 				self.status_tab.abort_merge();
 				flags.insert(NeedsUpdate::ALL);
 			}
+			Action::AbortRebase => {
+				self.status_tab.abort_rebase();
+				flags.insert(NeedsUpdate::ALL);
+			}
 		};
 
 		Ok(())

src/components/reset.rs

@@ -200,6 +200,10 @@ impl ConfirmComponent {
                 Action::AbortMerge => (
                     strings::confirm_title_abortmerge(),
                     strings::confirm_msg_abortmerge(),
+                ),
+				Action::AbortRebase => (
+                    strings::confirm_title_abortrebase(),
+                    strings::confirm_msg_abortrebase(),
                 ),
             };
 		}

src/keys.rs

@@ -158,7 +158,7 @@ impl Default for KeyConfig {
 			force_push: KeyEvent { code: KeyCode::Char('P'), modifiers: KeyModifiers::SHIFT},
 			undo_commit: KeyEvent { code: KeyCode::Char('U'), modifiers: KeyModifiers::SHIFT},
 			pull: KeyEvent { code: KeyCode::Char('f'), modifiers: KeyModifiers::empty()},
-			abort_merge: KeyEvent { code: KeyCode::Char('M'), modifiers: KeyModifiers::SHIFT},
+			abort_merge: KeyEvent { code: KeyCode::Char('A'), modifiers: KeyModifiers::SHIFT},
 			open_file_tree: KeyEvent { code: KeyCode::Char('F'), modifiers: KeyModifiers::SHIFT},
 			file_find: KeyEvent { code: KeyCode::Char('f'), modifiers: KeyModifiers::empty()},
 		}

src/queue.rs

@@ -41,6 +41,7 @@ pub enum Action {
 	ForcePush(String, bool),
 	PullMerge { incoming: usize, rebase: bool },
 	AbortMerge,
+	AbortRebase,
 }
 
 ///

src/strings.rs

@@ -153,6 +153,13 @@ pub fn confirm_msg_abortmerge() -> String {
 	"This will revert all uncommitted changes. Are you sure?"
 		.to_string()
 }
+pub fn confirm_title_abortrebase() -> String {
+	"Abort rebase?".to_string()
+}
+pub fn confirm_msg_abortrebase() -> String {
+	"This will revert all uncommitted changes. Are you sure?"
+		.to_string()
+}
 pub fn confirm_msg_reset() -> String {
 	"confirm file reset?".to_string()
 }
@@ -641,6 +648,18 @@ pub mod commands {
 			CMD_GROUP_GENERAL,
 		)
 	}
+
+	pub fn abort_rebase(key_config: &SharedKeyConfig) -> CommandText {
+		CommandText::new(
+			format!(
+				"Abort rebase [{}]",
+				key_config.get_hint(key_config.abort_merge),
+			),
+			"abort ongoing rebase",
+			CMD_GROUP_GENERAL,
+		)
+	}
+
 	pub fn select_staging(
 		key_config: &SharedKeyConfig,
 	) -> CommandText {

src/tabs/status.rs

@@ -550,6 +550,14 @@ impl Status {
 		try_or_popup!(self, "abort merge", sync::abort_merge(CWD));
 	}
 
+	pub fn abort_rebase(&self) {
+		try_or_popup!(
+			self,
+			"abort rebase",
+			sync::abort_pending_rebase(CWD)
+		);
+	}
+
 	fn continue_rebase(&self) {
 		try_or_popup!(
 			self,
@@ -655,11 +663,17 @@ impl Component for Status {
 				true,
 				Self::can_abort_merge() || force_all,
 			));
+
 			out.push(CommandInfo::new(
 				strings::commands::continue_rebase(&self.key_config),
 				true,
 				Self::pending_rebase() || force_all,
 			));
+			out.push(CommandInfo::new(
+				strings::commands::abort_rebase(&self.key_config),
+				true,
+				Self::pending_rebase() || force_all,
+			));
 		}
 
 		{
@@ -765,6 +779,14 @@ impl Component for Status {
 						Action::AbortMerge,
 					));
 
+					Ok(EventState::Consumed)
+				} else if k == self.key_config.abort_merge
+					&& Self::pending_rebase()
+				{
+					self.queue.push(InternalEvent::ConfirmAction(
+						Action::AbortRebase,
+					));
+
 					Ok(EventState::Consumed)
 				} else if k == self.key_config.rebase_branch
 					&& Self::pending_rebase()