Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 45010:c63a297fb964

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: leverage cmdutil.check_incompatible_arguments() for --no-commit Differential Revision: https://phab.mercurial-scm.org/D8668
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 25 Jun 2020 13:29:05 -0700
parents 7d494425167c
children 6118ad07b98d
comparison
equal deleted inserted replaced
45009:7d494425167c 45010:c63a297fb964
2984 2984
2985 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') 2985 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
2986 2986
2987 cont = False 2987 cont = False
2988 if opts.get(b'no_commit'): 2988 if opts.get(b'no_commit'):
2989 if opts.get(b'edit'): 2989 cmdutil.check_incompatible_arguments(
2990 raise error.Abort( 2990 opts,
2991 _(b"cannot specify --no-commit and --edit together") 2991 b'no_commit',
2992 ) 2992 [b'edit', b'currentuser', b'currentdate', b'log'],
2993 if opts.get(b'currentuser'): 2993 )
2994 raise error.Abort(
2995 _(b"cannot specify --no-commit and --currentuser together")
2996 )
2997 if opts.get(b'currentdate'):
2998 raise error.Abort(
2999 _(b"cannot specify --no-commit and --currentdate together")
3000 )
3001 if opts.get(b'log'):
3002 raise error.Abort(
3003 _(b"cannot specify --no-commit and --log together")
3004 )
3005 2994
3006 graftstate = statemod.cmdstate(repo, b'graftstate') 2995 graftstate = statemod.cmdstate(repo, b'graftstate')
3007 2996
3008 if opts.get(b'stop'): 2997 if opts.get(b'stop'):
3009 if any( 2998 if any(