# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1602827850 25200
# Node ID 94f681b84c7016289763937cde633cb1d8c831b1
# Parent  4df5d3965a3ebe12f9cc6e49182cdaeb500241e5
tag: leverage cmdutil.check_incompatible_arguments()

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

diff -r 4df5d3965a3e -r 94f681b84c70 mercurial/commands.py
--- a/mercurial/commands.py	Thu Oct 15 22:36:17 2020 -0700
+++ b/mercurial/commands.py	Thu Oct 15 22:57:30 2020 -0700
@@ -7088,6 +7088,7 @@
 
     Returns 0 on success.
     """
+    cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
     opts = pycompat.byteskwargs(opts)
     with repo.wlock(), repo.lock():
         rev_ = b"."
@@ -7100,8 +7101,6 @@
                 raise error.Abort(
                     _(b'tag names cannot consist entirely of whitespace')
                 )
-        if opts.get(b'rev') and opts.get(b'remove'):
-            raise error.Abort(_(b"--rev and --remove are incompatible"))
         if opts.get(b'rev'):
             rev_ = opts[b'rev']
         message = opts.get(b'message')