D7636: export: use cmdutil.check_unique_argument()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Dec 13 07:56:22 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/D7636
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2610,8 +2610,7 @@
bookmark = opts.get(b'bookmark')
changesets += tuple(opts.get(b'rev', []))
- if bookmark and changesets:
- raise error.Abort(_(b"-r and -B are mutually exclusive"))
+ cmdutil.check_unique_argument(opts, b'rev', b'bookmark')
if bookmark:
if bookmark not in repo._bookmarks:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list