##// END OF EJS Templates
peer: subrepo isolation, pass repo instead of repo.ui to hg.peer...
Simon Heimberg -
r17874:2ba70eec stable
parent child Browse files
Show More
@@ -605,7 +605,7 b' def transplant(ui, repo, *revs, **opts):'
605
605
606 sourcerepo = opts.get('source')
606 sourcerepo = opts.get('source')
607 if sourcerepo:
607 if sourcerepo:
608 peer = hg.peer(ui, opts, ui.expandpath(sourcerepo))
608 peer = hg.peer(repo, opts, ui.expandpath(sourcerepo))
609 branches = map(peer.lookup, opts.get('branch', ()))
609 branches = map(peer.lookup, opts.get('branch', ()))
610 source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer,
610 source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer,
611 onlyheads=branches, force=True)
611 onlyheads=branches, force=True)
@@ -348,7 +348,7 b' def clone(ui, peeropts, source, dest=Non'
348
348
349 # we need to re-init the repo after manually copying the data
349 # we need to re-init the repo after manually copying the data
350 # into it
350 # into it
351 destpeer = peer(ui, peeropts, dest)
351 destpeer = peer(srcrepo, peeropts, dest)
352 srcrepo.hook('outgoing', source='clone',
352 srcrepo.hook('outgoing', source='clone',
353 node=node.hex(node.nullid))
353 node=node.hex(node.nullid))
354 else:
354 else:
@@ -501,7 +501,7 b' class hgsubrepo(abstractsubrepo):'
501 if revision not in self._repo:
501 if revision not in self._repo:
502 self._repo._subsource = source
502 self._repo._subsource = source
503 srcurl = _abssource(self._repo)
503 srcurl = _abssource(self._repo)
504 other = hg.peer(self._repo.ui, {}, srcurl)
504 other = hg.peer(self._repo, {}, srcurl)
505 if len(self._repo) == 0:
505 if len(self._repo) == 0:
506 self._repo.ui.status(_('cloning subrepo %s from %s\n')
506 self._repo.ui.status(_('cloning subrepo %s from %s\n')
507 % (subrelpath(self), srcurl))
507 % (subrelpath(self), srcurl))
@@ -566,7 +566,7 b' class hgsubrepo(abstractsubrepo):'
566 dsturl = _abssource(self._repo, True)
566 dsturl = _abssource(self._repo, True)
567 self._repo.ui.status(_('pushing subrepo %s to %s\n') %
567 self._repo.ui.status(_('pushing subrepo %s to %s\n') %
568 (subrelpath(self), dsturl))
568 (subrelpath(self), dsturl))
569 other = hg.peer(self._repo.ui, {'ssh': ssh}, dsturl)
569 other = hg.peer(self._repo, {'ssh': ssh}, dsturl)
570 return self._repo.push(other, force, newbranch=newbranch)
570 return self._repo.push(other, force, newbranch=newbranch)
571
571
572 def outgoing(self, ui, dest, opts):
572 def outgoing(self, ui, dest, opts):
General Comments 0
You need to be logged in to leave comments. Login now