From patchwork Sat Jan 25 00:17:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D7993: merge: use check_incompatible_arguments() for --abort From: phabricator X-Patchwork-Id: 44642 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Sat, 25 Jan 2020 00:17:55 +0000 martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D7993 AFFECTED FILES mercurial/commands.py tests/test-commit-unresolved.t CHANGE DETAILS To: martinvonz, #hg-reviewers Cc: mercurial-devel 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: