--- a/hgext/transplant.py Fri Jul 06 14:12:42 2012 -0500
+++ b/hgext/transplant.py Fri Jul 13 21:46:53 2012 +0200
@@ -139,7 +139,7 @@
continue
if pulls:
if source != repo:
- repo.pull(source, heads=pulls)
+ repo.pull(source.peer(), heads=pulls)
merge.update(repo, pulls[-1], False, False, None)
p1, p2 = repo.dirstate.parents()
pulls = []
@@ -203,7 +203,7 @@
os.unlink(patchfile)
tr.close()
if pulls:
- repo.pull(source, heads=pulls)
+ repo.pull(source.peer(), heads=pulls)
merge.update(repo, pulls[-1], False, False, None)
finally:
self.saveseries(revmap, merges)
@@ -614,9 +614,9 @@
sourcerepo = opts.get('source')
if sourcerepo:
- source = hg.peer(ui, opts, ui.expandpath(sourcerepo))
- branches = map(source.lookup, opts.get('branch', ()))
- source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, source,
+ peer = hg.peer(ui, opts, ui.expandpath(sourcerepo))
+ branches = map(peer.lookup, opts.get('branch', ()))
+ source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer,
onlyheads=branches, force=True)
else:
source = repo