This is an archive of the discontinued Mercurial Phabricator instance.

cmdutil: sort unresolved paths
ClosedPublic

Authored by indygreg on Oct 9 2018, 3:56 PM.

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG57500950f40e: cmdutil: sort unresolved paths

Summary

I noticed that hg status was printing unresolved paths in a
non-deterministic order. This patch fixes that.

I'm not sure if the sorting should be done in
merge.mergestate.unresolved() instead. Either way fixes the
presentation issue.

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			mercurial/cmdutil.py (2 lines)

	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.unresolved() if m(f)]			unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
	if unresolvedlist:			if unresolvedlist:
	mergeliststr = '\n'.join(			mergeliststr = '\n'.join(
	[' %s' % util.pathto(repo.root, encoding.getcwd(), path)			[' %s' % util.pathto(repo.root, encoding.getcwd(), path)
	for path in unresolvedlist])			for path in sorted(unresolvedlist)])
	msg = _('''Unresolved merge conflicts:			msg = _('''Unresolved merge conflicts:

	%s			%s

	To mark files as resolved: hg resolve --mark FILE''') % mergeliststr			To mark files as resolved: hg resolve --mark FILE''') % mergeliststr
	else:			else:
	msg = _('No unresolved merge conflicts.')			msg = _('No unresolved merge conflicts.')