commit: use cmdutil.check_at_most_one_arg()

Differential Revision: https://phab.mercurial-scm.org/D7634

mercurial/cmdutil.py

@@ -278,10 +278,8 b' def resolvecommitoptions(ui, opts):'
     The return value indicates that ``rewrite.update-timestamp`` is the reason
     the ``date`` option is set.
     """
-    if opts.get(b'date') and opts.get(b'currentdate'):
-        raise error.Abort(_(b'--date and --currentdate are mutually exclusive'))
-    if opts.get(b'user') and opts.get(b'currentuser'):
-        raise error.Abort(_(b'--user and --currentuser are mutually exclusive'))
+    check_at_most_one_arg(opts, b'date', b'currentdate')
+    check_at_most_one_arg(opts, b'user', b'currentuser')
 
     datemaydiffer = False  # date-only change should be ignored?
 

tests/test-amend.t

@@ -447,7 +447,7 b' rewrite.update-timestamp can be negated '
 Bad combination of date options:
 
   $ hg amend -D --date '0 0'
-  abort: --date and --currentdate are mutually exclusive
+  abort: cannot specify both --date and --currentdate
   [255]
 
 Close branch

tests/test-graft.t

@@ -127,10 +127,10 b' Conflicting date/user options:'
 
   $ hg up -q 0
   $ hg graft -U --user foo 2
-  abort: --user and --currentuser are mutually exclusive
+  abort: cannot specify both --user and --currentuser
   [255]
   $ hg graft -D --date '0 0' 2
-  abort: --date and --currentdate are mutually exclusive
+  abort: cannot specify both --date and --currentdate
   [255]
 
 Can't graft with dirty wd:

tests/test-uncommit.t

@@ -554,10 +554,10 b' Bad option combinations'
 
   $ hg rollback -q --config ui.rollback=True
   $ hg uncommit -U --user 'user'
-  abort: --user and --currentuser are mutually exclusive
+  abort: cannot specify both --user and --currentuser
   [255]
   $ hg uncommit -D --date today
-  abort: --date and --currentdate are mutually exclusive
+  abort: cannot specify both --date and --currentdate
   [255]
 
 `uncommit <dir>` and `cd <dir> && uncommit .` behave the same...