Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
incoming: leverage cmdutil.check_incompatible_arguments()
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 15 Oct 2020 22:23:45 -0700
changeset 45742 b5e0746e272b
parent 45741 4f7309fdfb60
child 45743 3b23cec4953f
incoming: leverage cmdutil.check_incompatible_arguments() Differential Revision: https://phab.mercurial-scm.org/D9220
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-subrepo-recursion.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu Oct 15 22:23:35 2020 -0700
+++ b/mercurial/commands.py	Thu Oct 15 22:23:45 2020 -0700
@@ -4227,8 +4227,7 @@
         hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
         return 0
 
-    if opts.get(b'bundle') and opts.get(b'subrepos'):
-        raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
+    cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
 
     if opts.get(b'bookmarks'):
         source, branches = hg.parseurl(
--- a/tests/test-subrepo-recursion.t	Thu Oct 15 22:23:35 2020 -0700
+++ b/tests/test-subrepo-recursion.t	Thu Oct 15 22:23:45 2020 -0700
@@ -681,7 +681,7 @@
   no changes found
 
   $ hg incoming -S --bundle incoming.hg
-  abort: cannot combine --bundle and --subrepos
+  abort: cannot specify both --subrepos and --bundle
   [255]
 
 Test missing subrepo:
mercurial