Mercurial > hg

diff hgext/transplant.py @ 44194:d4c1501225c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: change check_incompatible_arguments() *arg to single iterable This makes it clearer on the call-sites that the first argument is special. Thanks to Yuya for the suggestion. Differential Revision: https://phab.mercurial-scm.org/D8018
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 27 Jan 2020 09:14:19 -0800
parents d50b4ad1d4a5
children 9d2b2df2c2ba
line wrap: on
line diff
--- a/hgext/transplant.py	Mon Jan 27 12:38:59 2020 -0800
+++ b/hgext/transplant.py	Mon Jan 27 09:14:19 2020 -0800
@@ -761,12 +761,12 @@
     def checkopts(opts, revs):
         if opts.get(b'continue'):
             cmdutil.check_incompatible_arguments(
-                opts, b'continue', b'branch', b'all', b'merge'
+                opts, b'continue', [b'branch', b'all', b'merge']
             )
             return
         if opts.get(b'stop'):
             cmdutil.check_incompatible_arguments(
-                opts, b'stop', b'branch', b'all', b'merge'
+                opts, b'stop', [b'branch', b'all', b'merge']
             )
             return
         if not (