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 21438

	exchange,			exchange,
	extensions,			extensions,
	httppeer,			httppeer,
	localrepo,			localrepo,
	lock,			lock,
	logcmdutil,			logcmdutil,
	logexchange,			logexchange,
	merge as mergemod,			merge as mergemod,
	mergestate as mergestatemod,
	narrowspec,			narrowspec,
	node,			node,
	phases,			phases,
	pycompat,			pycompat,
	scmutil,			scmutil,
	sshpeer,			sshpeer,
	statichttprepo,			statichttprepo,
	ui as uimod,			ui as uimod,
	)			)
	)			)
	elif remind:			elif remind:
	repo.ui.status(_(b"(branch merge, don't forget to commit)\n"))			repo.ui.status(_(b"(branch merge, don't forget to commit)\n"))
	return stats.unresolvedcount > 0			return stats.unresolvedcount > 0


	def abortmerge(ui, repo):			def abortmerge(ui, repo):
	ms = mergestatemod.mergestate.read(repo)			ms = repo[None].mergestate()
	if ms.active():			if ms.active():
	# there were conflicts			# there were conflicts
	node = ms.localctx.hex()			node = ms.localctx.hex()
	else:			else:
	# there were no conficts, mergestate was not stored			# there were no conficts, mergestate was not stored
	node = repo[b'.'].hex()			node = repo[b'.'].hex()

	repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])			repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])