Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 40101:57500950f40e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: sort unresolved paths 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. Differential Revision: https://phab.mercurial-scm.org/D4929
author Gregory Szorc <gregory.szorc@gmail.com>
date Tue, 09 Oct 2018 12:56:11 -0700
parents 1d09ba0d2ed3
children fa88170c10bb
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Tue Oct 09 07:46:01 2018 +0900
+++ b/mercurial/cmdutil.py	Tue Oct 09 12:56:11 2018 -0700
@@ -581,7 +581,7 @@
     if unresolvedlist:
         mergeliststr = '\n'.join(
             ['    %s' % util.pathto(repo.root, encoding.getcwd(), path)
-             for path in unresolvedlist])
+             for path in sorted(unresolvedlist)])
         msg = _('''Unresolved merge conflicts:
 
 %s