Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 18364:6252b4f1c4b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepos: process subrepos in sorted order Add sorted() in places found by testing with PYTHONHASHSEED=random and code inspection. An alternative to sprinkling sorted() all over would be to change substate to a custom dict with sorted iterators...
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 12 Dec 2012 02:38:14 +0100
parents 752f77ef7202
children f3b21beb9802
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Jan 15 02:59:12 2013 +0100
+++ b/mercurial/localrepo.py	Wed Dec 12 02:38:14 2012 +0100
@@ -1500,7 +1500,7 @@
         if working: # we need to scan the working dir
             subrepos = []
             if '.hgsub' in self.dirstate:
-                subrepos = ctx2.substate.keys()
+                subrepos = sorted(ctx2.substate)
             s = self.dirstate.status(match, subrepos, listignored,
                                      listclean, listunknown)
             cmp, modified, added, removed, deleted, unknown, ignored, clean = s