This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	28540		Jun 10 2021, 7:21 PM	★	★
Diff 2	28602		Jun 18 2021, 5:53 PM	★	★
Diff 3	28633	rHG5c49e0aa7fadf68aebeb29fac73b26642029ed7f	Jun 10 2021, 5:36 PM	★	★

Commit	Parents	Author	Summary	Date
328f649857ec	9ec8c8961e84	Martin von Zweigbergk		Jun 10 2021, 5:36 PM

Status	Author	Revision
Closed	martinvonz	D10886 narrowbundle: use new context manager for silencing the ui
Closed	martinvonz	D10885 debugbackupbundle: use new context manager for silencing the ui
Closed	martinvonz	D10884 ui: add a context manager for silencing the ui (pushbuffer+popbuffer)
Closed	martinvonz	D10883 shelve: don't swallow errors that happen when reverting the working copy
Closed	martinvonz	D10882 histedit: don't swallow errors that happen when updating the working copy
Closed	martinvonz	D10881 histedit: don't record labels for output that we will discard
Closed	martinvonz	D10864 dog-raft: work with str-keyed opts throughout
Closed	martinvonz	D10863 cmdutil: make resolvecommitoptions() work on str-keyed opts
Closed	martinvonz	D10862 cmdutil: make amend() take str-keyed opts
Closed	martinvonz	D10861 commit: keep opts dict str-keyed a bit longer
Closed	martinvonz	D10860 dog-raft: keep opts dict str-keyed a bit longer
Closed	martinvonz	D10859 cmdutil: make checknotesize() work on str-keyed opts
Closed	martinvonz	D10880 amend: work mostly with str-type **opts for simplicity

Diff 28540


	Returns 0 on successful completion, 1 if there are unresolved files.			Returns 0 on successful completion, 1 if there are unresolved files.
	"""			"""
	with repo.wlock():			with repo.wlock():
	return _dograft(ui, repo, revs, *opts)			return _dograft(ui, repo, revs, *opts)


	def _dograft(ui, repo, revs, *opts):			def _dograft(ui, repo, revs, *opts):
	opts = pycompat.byteskwargs(opts)			if revs and opts.get('rev'):
	if revs and opts.get(b'rev'):
	ui.warn(			ui.warn(
	_(			_(
	b'warning: inconsistent use of --rev might give unexpected '			b'warning: inconsistent use of --rev might give unexpected '
	b'revision ordering!\n'			b'revision ordering!\n'
	)			)
	)			)

	revs = list(revs)			revs = list(revs)
	revs.extend(opts.get(b'rev'))			revs.extend(opts.get('rev'))
	# a dict of data to be stored in state file			# a dict of data to be stored in state file
	statedata = {}			statedata = {}
	# list of new nodes created by ongoing graft			# list of new nodes created by ongoing graft
	statedata[b'newnodes'] = []			statedata[b'newnodes'] = []

				opts = pycompat.byteskwargs(opts)
	cmdutil.resolvecommitoptions(ui, opts)			cmdutil.resolvecommitoptions(ui, opts)

	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')