Mercurial > hg
comparison hgext/convert/hg.py @ 18373:687ed69f6fdf
convert: process missing branches in sorted order
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 15 Jan 2013 02:59:14 +0100 |
parents | 7f5dab94e48c |
children | 05acdf8e1f23 |
comparison
equal
deleted
inserted
replaced
18372:5965997b7023 | 18373:687ed69f6fdf |
---|---|
108 except Exception: | 108 except Exception: |
109 missings.setdefault(b[1], []).append(b[0]) | 109 missings.setdefault(b[1], []).append(b[0]) |
110 | 110 |
111 if missings: | 111 if missings: |
112 self.after() | 112 self.after() |
113 for pbranch, heads in missings.iteritems(): | 113 for pbranch, heads in sorted(missings.iteritems()): |
114 pbranchpath = os.path.join(self.path, pbranch) | 114 pbranchpath = os.path.join(self.path, pbranch) |
115 prepo = hg.peer(self.ui, {}, pbranchpath) | 115 prepo = hg.peer(self.ui, {}, pbranchpath) |
116 self.ui.note(_('pulling from %s into %s\n') % (pbranch, branch)) | 116 self.ui.note(_('pulling from %s into %s\n') % (pbranch, branch)) |
117 self.repo.pull(prepo, [prepo.lookup(h) for h in heads]) | 117 self.repo.pull(prepo, [prepo.lookup(h) for h in heads]) |
118 self.before() | 118 self.before() |