[PATCH 21 of 24] convert: process missing branches in sorted order
Mads Kiilerich
mads at kiilerich.com
Sun Dec 16 16:34:16 CST 2012
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1355687458 -3600
# Node ID 9620cbd6db4c07b26d6076cb6fee1aea80cf3cfc
# Parent d8ae1e3965a185b2dda639c59a34b31b3117e48d
convert: process missing branches in sorted order
diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -110,7 +110,7 @@
if missings:
self.after()
- for pbranch, heads in missings.iteritems():
+ for pbranch, heads in sorted(missings.iteritems()):
pbranchpath = os.path.join(self.path, pbranch)
prepo = hg.peer(self.ui, {}, pbranchpath)
self.ui.note(_('pulling from %s into %s\n') % (pbranch, branch))
diff --git a/tests/test-convert-clonebranches.t b/tests/test-convert-clonebranches.t
--- a/tests/test-convert-clonebranches.t
+++ b/tests/test-convert-clonebranches.t
@@ -82,7 +82,7 @@
pulling from branch0 into branch2
4 changesets found
0 c3
+ pulling from branch1 into branch3
+ 5 changesets found
pulling from branch2 into branch3
- 5 changesets found
- pulling from branch1 into branch3
1 changesets found
More information about the Mercurial-devel
mailing list