This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D8669 graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop
Closed	martinvonz	D8668 graft: leverage cmdutil.check_incompatible_arguments() for --no-commit
Closed	martinvonz	D8667 graft: leverage cmdutil.check_at_most_one_arg() for --abort/--stop/--continue

Diff 21727

	editor = cmdutil.getcommiteditor(			editor = cmdutil.getcommiteditor(
	editform=b'graft', **pycompat.strkwargs(opts)			editform=b'graft', **pycompat.strkwargs(opts)
	)			)

	cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')			cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')

	cont = False			cont = False
	if opts.get(b'no_commit'):			if opts.get(b'no_commit'):
	if opts.get(b'edit'):			cmdutil.check_incompatible_arguments(
	raise error.Abort(			opts,
	_(b"cannot specify --no-commit and --edit together")			b'no_commit',
	)			[b'edit', b'currentuser', b'currentdate', b'log'],
	if opts.get(b'currentuser'):
	raise error.Abort(
	_(b"cannot specify --no-commit and --currentuser together")
	)
	if opts.get(b'currentdate'):
	raise error.Abort(
	_(b"cannot specify --no-commit and --currentdate together")
	)
	if opts.get(b'log'):
	raise error.Abort(
	_(b"cannot specify --no-commit and --log together")
	)			)

	graftstate = statemod.cmdstate(repo, b'graftstate')			graftstate = statemod.cmdstate(repo, b'graftstate')

	if opts.get(b'stop'):			if opts.get(b'stop'):
	if any(			if any(
	(			(
	opts.get(b'edit'),			opts.get(b'edit'),
	opts.get(b'log'),			opts.get(b'log'),

	\| o 1:d2ae7f538514 b			\| o 1:d2ae7f538514 b
	\|/			\|/
	o 0:cb9a9f314b8b a			o 0:cb9a9f314b8b a


	Check reporting when --no-commit used with non-applicable options:			Check reporting when --no-commit used with non-applicable options:

	$ hg graft 1 --no-commit -e			$ hg graft 1 --no-commit -e
	abort: cannot specify --no-commit and --edit together			abort: cannot specify both --no-commit and --edit
	[255]			[255]

	$ hg graft 1 --no-commit --log			$ hg graft 1 --no-commit --log
	abort: cannot specify --no-commit and --log together			abort: cannot specify both --no-commit and --log
	[255]			[255]

	$ hg graft 1 --no-commit -D			$ hg graft 1 --no-commit -D
	abort: cannot specify --no-commit and --currentdate together			abort: cannot specify both --no-commit and --currentdate
	[255]			[255]

	Test --no-commit is working:			Test --no-commit is working:
	$ hg graft 1 --no-commit			$ hg graft 1 --no-commit
	grafting 1:d2ae7f538514 "b"			grafting 1:d2ae7f538514 "b"

	$ hg log -GT "{rev}:{node\|short} {desc}\n"			$ hg log -GT "{rev}:{node\|short} {desc}\n"
	@ 2:d36c0562f908 c			@ 2:d36c0562f908 c