This is an archive of the discontinued Mercurial Phabricator instance.

	def _conflictsmsg(repo):			def _conflictsmsg(repo):
	# avoid merge cycle			# avoid merge cycle
	from . import merge as mergemod			from . import merge as mergemod
	mergestate = mergemod.mergestate.read(repo)			mergestate = mergemod.mergestate.read(repo)
	if not mergestate.active():			if not mergestate.active():
	return			return

	m = scmutil.match(repo[None])			m = scmutil.match(repo[None])
	unresolvedlist = [f for f in mergestate if m(f) and mergestate[f] == 'u']			unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
	if unresolvedlist:			if unresolvedlist:
	mergeliststr = '\n'.join(			mergeliststr = '\n'.join(
	[' %s' % os.path.relpath(			[' %s' % os.path.relpath(
	os.path.join(repo.root, path),			os.path.join(repo.root, path),
	pycompat.getcwd()) for path in unresolvedlist])			pycompat.getcwd()) for path in unresolvedlist])
	msg = _('''Unresolved merge conflicts:			msg = _('''Unresolved merge conflicts:

	%s			%s

morestatus: simplify check for unresolved merge conflictsClosedPublic