# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1602823443 25200
# Node ID 693da1b928af67d54df704effede9698bc416370
# Parent  5df1655edf420d3b8e3991361a52b2859f27b0d1
backout: leverage cmdutil.check_incompatible_arguments()

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

diff -r 5df1655edf42 -r 693da1b928af mercurial/commands.py
--- a/mercurial/commands.py	Mon Oct 12 12:52:45 2020 -0700
+++ b/mercurial/commands.py	Thu Oct 15 21:44:03 2020 -0700
@@ -769,11 +769,8 @@
 
 
 def _dobackout(ui, repo, node=None, rev=None, **opts):
+    cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
     opts = pycompat.byteskwargs(opts)
-    if opts.get(b'commit') and opts.get(b'no_commit'):
-        raise error.Abort(_(b"cannot use --commit with --no-commit"))
-    if opts.get(b'merge') and opts.get(b'no_commit'):
-        raise error.Abort(_(b"cannot use --merge with --no-commit"))
 
     if rev and node:
         raise error.Abort(_(b"please specify just one revision"))
diff -r 5df1655edf42 -r 693da1b928af tests/test-backout.t
--- a/tests/test-backout.t	Mon Oct 12 12:52:45 2020 -0700
+++ b/tests/test-backout.t	Thu Oct 15 21:44:03 2020 -0700
@@ -804,5 +804,5 @@
 --no-commit can't be used with --merge
 
   $ hg backout --merge --no-commit 2
-  abort: cannot use --merge with --no-commit
+  abort: cannot specify both --no-commit and --merge
   [255]