allow aborting merge

Author: Stephan Dilly

Diff for: asyncgit/src/sync/branch/merge_commit.rs

@@ -8,37 +8,6 @@ use crate::{
 use git2::MergeOptions;
 use scopetime::scope_time;
 
-///
-pub fn merge_branch(repo_path: &str, branch: &str) -> Result<()> {
-    scope_time!("merge_branch");
-
-    let repo = utils::repo(repo_path)?;
-
-    let branch = repo.find_branch(branch, BranchType::Local)?;
-
-    let id = branch.into_reference().peel_to_commit()?;
-
-    let annotated = repo.find_annotated_commit(id.id())?;
-
-    let (analysis, _) = repo.merge_analysis(&[&annotated])?;
-
-    //TODO: support merge on unborn
-    if analysis.is_unborn() {
-        return Err(Error::Generic("head is unborn".into()));
-    }
-
-    let mut opt = MergeOptions::default();
-    // opt.fail_on_conflict(true);
-
-    repo.merge(&[&annotated], Some(&mut opt), None)?;
-
-    // if repo.index()?.has_conflicts() {
-    //     return Err(Error::Generic("creates conflicts".into()));
-    // }
-
-    Ok(())
-}
-
 /// merge upstream using a merge commit without conflicts. fails if not possible without conflicts
 pub fn merge_upstream_commit(
     repo_path: &str,

Diff for: asyncgit/src/sync/merge.rs

@@ -0,0 +1,43 @@
+use crate::{
+    error::{Error, Result},
+    sync::utils,
+};
+use git2::{BranchType, MergeOptions};
+use scopetime::scope_time;
+
+///
+pub fn abort_merge(repo_path: &str) -> Result<()> {
+    scope_time!("cleanup_state");
+
+    let repo = utils::repo(repo_path)?;
+
+    repo.cleanup_state()?;
+
+    Ok(())
+}
+
+///
+pub fn merge_branch(repo_path: &str, branch: &str) -> Result<()> {
+    scope_time!("merge_branch");
+
+    let repo = utils::repo(repo_path)?;
+
+    let branch = repo.find_branch(branch, BranchType::Local)?;
+
+    let id = branch.into_reference().peel_to_commit()?;
+
+    let annotated = repo.find_annotated_commit(id.id())?;
+
+    let (analysis, _) = repo.merge_analysis(&[&annotated])?;
+
+    //TODO: support merge on unborn
+    if analysis.is_unborn() {
+        return Err(Error::Generic("head is unborn".into()));
+    }
+
+    let mut opt = MergeOptions::default();
+
+    repo.merge(&[&annotated], Some(&mut opt), None)?;
+
+    Ok(())
+}

Diff for: asyncgit/src/sync/mod.rs

@@ -15,6 +15,7 @@ mod hooks;
 mod hunks;
 mod ignore;
 mod logwalker;
+mod merge;
 mod patches;
 pub mod remotes;
 mod reset;
@@ -29,8 +30,7 @@ pub use blame::{blame_file, BlameHunk, FileBlame};
 pub use branch::{
     branch_compare_upstream, checkout_branch, config_is_pull_rebase,
     create_branch, delete_branch, get_branch_remote,
-    get_branches_info, merge_commit::merge_branch,
-    merge_commit::merge_upstream_commit,
+    get_branches_info, merge_commit::merge_upstream_commit,
     merge_ff::branch_merge_upstream_fastforward,
     merge_rebase::merge_upstream_rebase, rename::rename_branch,
     BranchCompare, BranchInfo,
@@ -50,6 +50,7 @@ pub use hooks::{
 pub use hunks::{reset_hunk, stage_hunk, unstage_hunk};
 pub use ignore::add_to_ignore;
 pub use logwalker::LogWalker;
+pub use merge::{abort_merge, merge_branch};
 pub use remotes::{
     get_default_remote, get_remotes, push::AsyncProgress,
     tags::PushTagsProgress,

Diff for: src/keys.rs

@@ -72,6 +72,7 @@ pub struct KeyConfig {
     pub push: KeyEvent,
     pub force_push: KeyEvent,
     pub pull: KeyEvent,
+    pub abort_merge: KeyEvent,
 }
 
 #[rustfmt::skip]
@@ -122,14 +123,15 @@ impl Default for KeyConfig {
 			log_tag_commit: KeyEvent { code: KeyCode::Char('t'), modifiers: KeyModifiers::empty()},
 			commit_amend: KeyEvent { code: KeyCode::Char('a'), modifiers: KeyModifiers::CONTROL},
             copy: KeyEvent { code: KeyCode::Char('y'), modifiers: KeyModifiers::empty()},
-            create_branch: KeyEvent { code: KeyCode::Char('c'), modifiers: KeyModifiers::NONE},
-            rename_branch: KeyEvent { code: KeyCode::Char('r'), modifiers: KeyModifiers::NONE},
-            select_branch: KeyEvent { code: KeyCode::Char('b'), modifiers: KeyModifiers::NONE},
+            create_branch: KeyEvent { code: KeyCode::Char('c'), modifiers: KeyModifiers::empty()},
+            rename_branch: KeyEvent { code: KeyCode::Char('r'), modifiers: KeyModifiers::empty()},
+            select_branch: KeyEvent { code: KeyCode::Char('b'), modifiers: KeyModifiers::empty()},
             delete_branch: KeyEvent{code: KeyCode::Char('D'), modifiers: KeyModifiers::SHIFT},
-            merge_branch: KeyEvent{code: KeyCode::Char('m'), modifiers: KeyModifiers::NONE},
+            merge_branch: KeyEvent{code: KeyCode::Char('m'), modifiers: KeyModifiers::empty()},
             push: KeyEvent { code: KeyCode::Char('p'), modifiers: KeyModifiers::empty()},
             force_push: KeyEvent { code: KeyCode::Char('P'), modifiers: KeyModifiers::SHIFT},
             pull: KeyEvent { code: KeyCode::Char('f'), modifiers: KeyModifiers::empty()},
+            abort_merge: KeyEvent { code: KeyCode::Char('M'), modifiers: KeyModifiers::SHIFT},
         }
     }
 }

Diff for: src/strings.rs

@@ -520,6 +520,16 @@ pub mod commands {
             CMD_GROUP_GENERAL,
         )
     }
+    pub fn abort_merge(key_config: &SharedKeyConfig) -> CommandText {
+        CommandText::new(
+            format!(
+                "Abort merge [{}]",
+                key_config.get_hint(key_config.abort_merge),
+            ),
+            "abort ongoing merge",
+            CMD_GROUP_GENERAL,
+        )
+    }
     pub fn select_staging(
         key_config: &SharedKeyConfig,
     ) -> CommandText {

Diff for: src/tabs/status.rs

@@ -8,7 +8,7 @@ use crate::{
     },
     keys::SharedKeyConfig,
     queue::{Action, InternalEvent, Queue, ResetItem},
-    strings,
+    strings, try_or_popup,
     ui::style::SharedTheme,
 };
 use anyhow::Result;
@@ -465,6 +465,16 @@ impl Status {
             .as_ref()
             .map_or(true, |state| state.ahead > 0)
     }
+
+    fn can_abort_merge() -> bool {
+        sync::repo_state(CWD).unwrap_or(RepoState::Clean)
+            == RepoState::Merge
+    }
+
+    fn abort_merge(&self) -> Result<()> {
+        sync::abort_merge(CWD)?;
+        Ok(())
+    }
 }
 
 impl Component for Status {
@@ -507,6 +517,12 @@ impl Component for Status {
                 true,
                 !focus_on_diff,
             ));
+
+            out.push(CommandInfo::new(
+                strings::commands::abort_merge(&self.key_config),
+                true,
+                Self::can_abort_merge() || force_all,
+            ));
         }
 
         {
@@ -653,6 +669,16 @@ impl Component for Status {
                     && !self.is_focus_on_diff()
                 {
                     self.pull();
+                    Ok(EventState::Consumed)
+                } else if k == self.key_config.abort_merge
+                    && Self::can_abort_merge()
+                {
+                    try_or_popup!(
+                        self,
+                        "abort merge error:",
+                        self.abort_merge()
+                    );
+
                     Ok(EventState::Consumed)
                 } else {
                     Ok(EventState::NotConsumed)