Show More
@@ -21,7 +21,7 b'' | |||||
21 | import os, time, cStringIO |
|
21 | import os, time, cStringIO | |
22 | from mercurial.i18n import _ |
|
22 | from mercurial.i18n import _ | |
23 | from mercurial.node import bin, hex, nullid |
|
23 | from mercurial.node import bin, hex, nullid | |
24 | from mercurial import hg, util, context, bookmarks, error, scmutil |
|
24 | from mercurial import hg, util, context, bookmarks, error, scmutil, exchange | |
25 |
|
25 | |||
26 | from common import NoRepo, commit, converter_source, converter_sink |
|
26 | from common import NoRepo, commit, converter_source, converter_sink | |
27 |
|
27 | |||
@@ -113,7 +113,8 b' class mercurial_sink(converter_sink):' | |||||
113 | pbranchpath = os.path.join(self.path, pbranch) |
|
113 | pbranchpath = os.path.join(self.path, pbranch) | |
114 | prepo = hg.peer(self.ui, {}, pbranchpath) |
|
114 | prepo = hg.peer(self.ui, {}, pbranchpath) | |
115 | self.ui.note(_('pulling from %s into %s\n') % (pbranch, branch)) |
|
115 | self.ui.note(_('pulling from %s into %s\n') % (pbranch, branch)) | |
116 | self.repo.pull(prepo, [prepo.lookup(h) for h in heads]) |
|
116 | exchange.pull(self.repo, prepo, | |
|
117 | [prepo.lookup(h) for h in heads]) | |||
117 | self.before() |
|
118 | self.before() | |
118 |
|
119 | |||
119 | def _rewritetags(self, source, revmap, data): |
|
120 | def _rewritetags(self, source, revmap, data): |
General Comments 0
You need to be logged in to leave comments.
Login now