Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
discovery: process heads in sorted order
authorMads Kiilerich <mads@kiilerich.com>
Tue, 15 Jan 2013 02:59:12 +0100
changeset 18361 06f075836010
parent 18360 760c0d67ce5e
child 18362 5a4f220fbfca
discovery: process heads in sorted order
mercurial/discovery.py file | annotate | diff | comparison | revisions
tests/test-push-warn.t file | annotate | diff | comparison | revisions 
--- a/mercurial/discovery.py	Tue Jan 15 02:59:12 2013 +0100
+++ b/mercurial/discovery.py	Tue Jan 15 02:59:12 2013 +0100
@@ -268,7 +268,7 @@
     allmissing = set(outgoing.missing)
     allfuturecommon = set(c.node() for c in repo.set('%ld', outgoing.common))
     allfuturecommon.update(allmissing)
-    for branch, heads in headssum.iteritems():
+    for branch, heads in sorted(headssum.iteritems()):
         if heads[0] is None:
             # Maybe we should abort if we push more that one head
             # for new branches ?
@@ -312,7 +312,7 @@
             unsynced = True
         if len(newhs) > len(oldhs):
             # strip updates to existing remote heads from the new heads list
-            dhs = list(newhs - bookmarkedheads - oldhs)
+            dhs = sorted(newhs - bookmarkedheads - oldhs)
         if dhs:
             if error is None:
                 if branch not in ('default', None):
--- a/tests/test-push-warn.t	Tue Jan 15 02:59:12 2013 +0100
+++ b/tests/test-push-warn.t	Tue Jan 15 02:59:12 2013 +0100
@@ -457,7 +457,7 @@
   $ hg push ../l -b b
   pushing to ../l
   searching for changes
-  abort: push creates new remote head e7e31d71180f on branch 'a'!
+  abort: push creates new remote head 451211cc22b0 on branch 'a'!
   (did you forget to merge? use push -f to force)
   [255]
Mercurial