Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 45742:b5e0746e272b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
incoming: leverage cmdutil.check_incompatible_arguments() Differential Revision: https://phab.mercurial-scm.org/D9220
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 15 Oct 2020 22:23:45 -0700
parents 4f7309fdfb60
children 3b23cec4953f
comparison
equal deleted inserted replaced
45741:4f7309fdfb60 45742:b5e0746e272b
4225 ) 4225 )
4226 4226
4227 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) 4227 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4228 return 0 4228 return 0
4229 4229
4230 if opts.get(b'bundle') and opts.get(b'subrepos'): 4230 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4231 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4232 4231
4233 if opts.get(b'bookmarks'): 4232 if opts.get(b'bookmarks'):
4234 source, branches = hg.parseurl( 4233 source, branches = hg.parseurl(
4235 ui.expandpath(source), opts.get(b'branch') 4234 ui.expandpath(source), opts.get(b'branch')
4236 ) 4235 )