diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -278,10 +278,8 @@ 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_unique_argument(opts, b'date', b'currentdate') + check_unique_argument(opts, b'user', b'currentuser') datemaydiffer = False # date-only change should be ignored? diff --git a/tests/test-amend.t b/tests/test-amend.t --- a/tests/test-amend.t +++ b/tests/test-amend.t @@ -447,7 +447,7 @@ 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 diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -127,10 +127,10 @@ $ 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: diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t --- a/tests/test-uncommit.t +++ b/tests/test-uncommit.t @@ -554,10 +554,10 @@ $ 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