D7663: transplant: use check_incompatible_arguments()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Dec 13 23:01:06 UTC 2019
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/D7663
AFFECTED FILES
hgext/transplant.py
tests/test-transplant.t
CHANGE DETAILS
diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -18,10 +18,10 @@
abort: no source URL, branch revision, or revision list provided
[255]
$ hg transplant --continue --all
- abort: --continue is incompatible with --branch, --all and --merge
+ abort: cannot specify both --continue and --all
[255]
$ hg transplant --stop --all
- abort: --stop is incompatible with --branch, --all and --merge
+ abort: cannot specify both --stop and --all
[255]
$ hg transplant --all tip
abort: --all requires a branch revision
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -760,22 +760,14 @@
def checkopts(opts, revs):
if opts.get(b'continue'):
- if opts.get(b'branch') or opts.get(b'all') or opts.get(b'merge'):
- raise error.Abort(
- _(
- b'--continue is incompatible with '
- b'--branch, --all and --merge'
- )
- )
+ cmdutil.check_incompatible_arguments(
+ opts, b'continue', b'branch', b'all', b'merge'
+ )
return
if opts.get(b'stop'):
- if opts.get(b'branch') or opts.get(b'all') or opts.get(b'merge'):
- raise error.Abort(
- _(
- b'--stop is incompatible with '
- b'--branch, --all and --merge'
- )
- )
+ cmdutil.check_incompatible_arguments(
+ opts, b'stop', b'branch', b'all', b'merge'
+ )
return
if not (
opts.get(b'source')
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list