Patchwork D7993: merge: use check_incompatible_arguments() for --abort

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

Comments

phabricator - Jan. 26, 2020, 12:26 a.m.
Closed by commit rHG75c2ca094d3a: merge: use check_incompatible_arguments() for --abort (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/D7993?vs=19584&id=19612

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

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

AFFECTED FILES
  mercurial/commands.py
  tests/test-commit-unresolved.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-commit-unresolved.t b/tests/test-commit-unresolved.t
--- a/tests/test-commit-unresolved.t
+++ b/tests/test-commit-unresolved.t
@@ -60,7 +60,7 @@ 
   abort: cannot specify a node with --abort
   [255]
   $ hg merge --abort --rev e4501
-  abort: cannot specify both --rev and --abort
+  abort: cannot specify both --abort and --rev
   [255]
 
 #if abortcommand
@@ -144,7 +144,7 @@ 
   (branch merge, don't forget to commit)
 
   $ hg merge --preview --abort
-  abort: cannot specify --preview with --abort
+  abort: cannot specify both --abort and --preview
   [255]
 
   $ hg abort
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4847,6 +4847,7 @@ 
     abort = opts.get(b'abort')
     if abort and repo.dirstate.p2() == nullid:
         cmdutil.wrongtooltocontinue(repo, _(b'merge'))
+    cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview')
     if abort:
         state = cmdutil.getunfinishedstate(repo)
         if state and state._opname != b'merge':
@@ -4856,10 +4857,6 @@ 
             )
         if node:
             raise error.Abort(_(b"cannot specify a node with --abort"))
-        if opts.get(b'rev'):
-            raise error.Abort(_(b"cannot specify both --rev and --abort"))
-        if opts.get(b'preview'):
-            raise error.Abort(_(b"cannot specify --preview with --abort"))
     if opts.get(b'rev') and node:
         raise error.Abort(_(b"please specify just one revision"))
     if not node: