bookmarks: use cmdutil.check_at_most_one_arg() for action
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 12 Dec 2019 23:31:17 -0800
changeset 43900 3b50de911200
parent 43899 fff21278554b
child 43901 5cde16489b42
bookmarks: use cmdutil.check_at_most_one_arg() for action Differential Revision: https://phab.mercurial-scm.org/D7647
mercurial/commands.py
tests/test-bookmarks.t
--- a/mercurial/commands.py	Thu Dec 12 15:55:33 2019 -0800
+++ b/mercurial/commands.py	Thu Dec 12 23:31:17 2019 -0800
@@ -1226,13 +1226,9 @@
     rev = opts.get(b'rev')
     inactive = opts.get(b'inactive')  # meaning add/rename to inactive bookmark
 
-    selactions = [k for k in [b'delete', b'rename', b'list'] if opts.get(k)]
-    if len(selactions) > 1:
-        raise error.Abort(
-            _(b'--%s and --%s are incompatible') % tuple(selactions[:2])
-        )
-    if selactions:
-        action = selactions[0]
+    action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
+    if action:
+        pass
     elif names or rev:
         action = b'add'
     elif inactive:
--- a/tests/test-bookmarks.t	Thu Dec 12 15:55:33 2019 -0800
+++ b/tests/test-bookmarks.t	Thu Dec 12 23:31:17 2019 -0800
@@ -475,7 +475,7 @@
   $ cd repo
 
   $ hg bookmark -m Y -d Z
-  abort: --delete and --rename are incompatible
+  abort: cannot specify both --delete and --rename
   [255]
 
   $ hg bookmark -r 1 -d Z