Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phases: emit phases to pushkey protocol in deterministic order
authorGregory Szorc <gregory.szorc@gmail.com>
Thu, 13 Apr 2017 22:12:04 -0700
changeset 32000 511a62669f1b
parent 31999 aa836f56c3cc
child 32001 c85f19c66e8d
phases: emit phases to pushkey protocol in deterministic order An upcoming test will report exact bytes sent over the wire protocol. Without this change, the ordering of phases listkey data is non-deterministic.
mercurial/phases.py file | annotate | diff | comparison | revisions 
--- a/mercurial/phases.py	Thu Apr 13 18:04:38 2017 -0700
+++ b/mercurial/phases.py	Thu Apr 13 22:12:04 2017 -0700
@@ -116,6 +116,7 @@
     error,
     smartset,
     txnutil,
+    util,
 )
 
 allphases = public, draft, secret = range(3)
@@ -386,7 +387,8 @@
 
 def listphases(repo):
     """List phases root for serialization over pushkey"""
-    keys = {}
+    # Use ordered dictionary so behavior is deterministic.
+    keys = util.sortdict()
     value = '%i' % draft
     for root in repo._phasecache.phaseroots[draft]:
         keys[hex(root)] = value
mercurial