This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Abandoned	durin42	D8554 strip: get mergestate via context
Abandoned	durin42	D8565 mergestate: optimize unresolvedcount() a little bit
Abandoned	durin42	D8564 fakemergerecord: get mergestate via context
Abandoned	durin42	D8563 localrepo: get mergestate via context
Abandoned	durin42	D8626 memctx: add mergestate method
Abandoned	durin42	D8562 shelve: get mergestate via context
Abandoned	durin42	D8561 hg: get mergestate via context
Abandoned	durin42	D8560 templatekw: get mergestate via context
Abandoned	durin42	D8559 revset: get mergestate via context
Abandoned	durin42	D8558 fileset: get mergestate via context
Abandoned	durin42	D8557 debugcommands: get mergestate via context
Abandoned	durin42	D8556 commands: get mergestate via context
Abandoned	durin42	D8555 cmdutil: get mergestate via context
Abandoned	durin42	D8553 histedit: use context to load mergestate instead of loading it directly
Abandoned	durin42	D8552 fix: use context to fetch mergestate instead of loading it directly

Diff 23024

	cmdutil,			cmdutil,
	discovery,			discovery,
	error,			error,
	exchange,			exchange,
	hg,			hg,
	lock as lockmod,			lock as lockmod,
	mdiff,			mdiff,
	merge,			merge,
	mergestate as mergestatemod,
	node as nodemod,			node as nodemod,
	patch,			patch,
	phases,			phases,
	pycompat,			pycompat,
	repair,			repair,
	scmutil,			scmutil,
	templatefilters,			templatefilters,
	util,			util,
	def unshelvecontinue(ui, repo, state, opts):			def unshelvecontinue(ui, repo, state, opts):
	"""subcommand to continue an in-progress unshelve"""			"""subcommand to continue an in-progress unshelve"""
	# We're finishing off a merge. First parent is our original			# We're finishing off a merge. First parent is our original
	# parent, second is the temporary "fake" commit we're unshelving.			# parent, second is the temporary "fake" commit we're unshelving.
	interactive = state.interactive			interactive = state.interactive
	basename = state.name			basename = state.name
	with repo.lock():			with repo.lock():
	checkparents(repo, state)			checkparents(repo, state)
	ms = mergestatemod.mergestate.read(repo)			ms = repo[None].mergestate()
	if list(ms.unresolved()):			if list(ms.unresolved()):
	raise error.Abort(			raise error.Abort(
	_(b"unresolved conflicts, can't continue"),			_(b"unresolved conflicts, can't continue"),
	hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"),			hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"),
	)			)

	shelvectx = repo[state.parents[1]]			shelvectx = repo[state.parents[1]]
	pendingctx = state.pendingctx			pendingctx = state.pendingctx