Commit 862dd6e8 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

incoming: leverage cmdutil.check_incompatible_arguments()

Differential Revision:
parent 4f7309fdfb60
......@@ -4227,8 +4227,7 @@ def incoming(ui, repo, source=b"default", **opts):
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(
......@@ -681,7 +681,7 @@ Test incoming:
no changes found
$ hg incoming -S --bundle incoming.hg
abort: cannot combine --bundle and --subrepos
abort: cannot specify both --subrepos and --bundle
Test missing subrepo:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment