[PATCH 2 of 3] largefiles: make prompt order deterministic

Mads Kiilerich mads at kiilerich.com
Sun Jan 17 12:32:02 CST 2016


# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1453055367 -3600
#      Sun Jan 17 19:29:27 2016 +0100
# Node ID 635b2393cf30b5843ba9d3441fdaf57c6e2b8f4d
# Parent  92c424a25cce00c7af68b3d0c489d648a967815a
largefiles: make prompt order deterministic

42ae1b1f048f introduced iteration of a set. Make it stable.

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -476,7 +476,7 @@ def overridecalculateupdates(origfn, rep
         elif lfutil.standin(f) in p1:
             lfiles.add(f)
 
-    for lfile in lfiles:
+    for lfile in sorted(lfiles):
         standin = lfutil.standin(lfile)
         (lm, largs, lmsg) = actions.get(lfile, (None, None, None))
         (sm, sargs, smsg) = actions.get(standin, (None, None, None))


More information about the Mercurial-devel mailing list