# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1576276311 28800
# Node ID e623ad1b4800e7c10e3fc3541a816c5a6b410691
# Parent  5cde16489b429c4c6e6a07e41e2f93050e227e07
bookmarks: use check_incompatible_arguments() for inactive+action

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

diff -r 5cde16489b42 -r e623ad1b4800 mercurial/commands.py
--- a/mercurial/commands.py	Thu Dec 12 23:32:47 2019 -0800
+++ b/mercurial/commands.py	Fri Dec 13 14:31:51 2019 -0800
@@ -1236,8 +1236,7 @@
     else:
         action = b'list'
 
-    if inactive and action in {b'delete', b'list'}:
-        raise error.Abort(_(b"--inactive is incompatible with --%s") % action)
+    cmdutil.check_incompatible_arguments(opts, b'inactive', b'delete', b'list')
     if not names and action in {b'add', b'delete'}:
         raise error.Abort(_(b"bookmark name required"))
 
diff -r 5cde16489b42 -r e623ad1b4800 tests/test-bookmarks.t
--- a/tests/test-bookmarks.t	Thu Dec 12 23:32:47 2019 -0800
+++ b/tests/test-bookmarks.t	Fri Dec 13 14:31:51 2019 -0800
@@ -84,7 +84,7 @@
   abort: cannot specify both --list and --rev
   [255]
   $ hg bookmarks -l --inactive
-  abort: --inactive is incompatible with --list
+  abort: cannot specify both --inactive and --list
   [255]
 
   $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
@@ -347,7 +347,7 @@
 delete with --inactive
 
   $ hg bookmark -d --inactive Y
-  abort: --inactive is incompatible with --delete
+  abort: cannot specify both --inactive and --delete
   [255]
 
 bookmark name with spaces should be stripped