Patchwork D7995: merge: call hg.abortmerge() directly and return early

login
register
mail settings
Submitter phabricator
Date Jan. 26, 2020, 12:26 a.m.
Message ID <01342d5c03c08b824b2fc734b01df37a@localhost.localdomain>
Download mbox | patch
Permalink /patch/44667/
State Not Applicable
Headers show

Comments

phabricator - Jan. 26, 2020, 12:26 a.m.
Closed by commit rHG6744859ff3ee: merge: call hg.abortmerge() directly and return early (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7995?vs=19586&id=19614

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7995/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7995

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4857,6 +4857,8 @@ 
             )
         if node:
             raise error.Abort(_(b"cannot specify a node with --abort"))
+        return hg.abortmerge(repo.ui, repo)
+
     if opts.get(b'rev') and node:
         raise error.Abort(_(b"please specify just one revision"))
     if not node:
@@ -4865,7 +4867,7 @@ 
     if node:
         node = scmutil.revsingle(repo, node).node()
 
-    if not node and not abort:
+    if not node:
         if ui.configbool(b'commands', b'merge.require-rev'):
             raise error.Abort(
                 _(
@@ -4898,7 +4900,6 @@ 
             force=force,
             mergeforce=force,
             labels=labels,
-            abort=abort,
         )