Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: use cmdutil.check_incompatible_arguments() for action+rev
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 12 Dec 2019 23:32:47 -0800
changeset 43901 5cde16489b42
parent 43900 3b50de911200
child 43902 e623ad1b4800
bookmarks: use cmdutil.check_incompatible_arguments() for action+rev Differential Revision: https://phab.mercurial-scm.org/D7648
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-bookmarks.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu Dec 12 23:31:17 2019 -0800
+++ b/mercurial/commands.py	Thu Dec 12 23:32:47 2019 -0800
@@ -1228,7 +1228,7 @@
 
     action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
     if action:
-        pass
+        cmdutil.check_incompatible_arguments(opts, action, b'rev')
     elif names or rev:
         action = b'add'
     elif inactive:
@@ -1236,8 +1236,6 @@
     else:
         action = b'list'
 
-    if rev and action in {b'delete', b'rename', b'list'}:
-        raise error.Abort(_(b"--rev is incompatible with --%s") % action)
     if inactive and action in {b'delete', b'list'}:
         raise error.Abort(_(b"--inactive is incompatible with --%s") % action)
     if not names and action in {b'add', b'delete'}:
--- a/tests/test-bookmarks.t	Thu Dec 12 23:31:17 2019 -0800
+++ b/tests/test-bookmarks.t	Thu Dec 12 23:32:47 2019 -0800
@@ -81,7 +81,7 @@
   abort: bookmark 'A' does not exist
   [255]
   $ hg bookmarks -l -r0
-  abort: --rev is incompatible with --list
+  abort: cannot specify both --list and --rev
   [255]
   $ hg bookmarks -l --inactive
   abort: --inactive is incompatible with --list
@@ -479,11 +479,11 @@
   [255]
 
   $ hg bookmark -r 1 -d Z
-  abort: --rev is incompatible with --delete
+  abort: cannot specify both --delete and --rev
   [255]
 
   $ hg bookmark -r 1 -m Z Y
-  abort: --rev is incompatible with --rename
+  abort: cannot specify both --rename and --rev
   [255]
 
 force bookmark with existing name
Mercurial