undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-bzr: delay peer branch usage

Browse Source 
So it doesn't time out.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-04-30 20:10:09 -05:00 committed by Junio C Hamano
parent 38cecbdf52
commit 747c9a377f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/remote-helpers/git-remote-bzr
View File

@ -687,7 +687,7 @@ def do_export(parser):
branch.generate_revision_history(revid, marks.get_tip(name))
if name in peers:
peer = peers[name]
peer = bzrlib.branch.Branch.open(peers[name])
try:
peer.bzrdir.push_branch(branch, revision_id=revid)
except bzrlib.errors.DivergedBranches:
@ -825,7 +825,7 @@ def get_repo(url, alias):
branch = origin.open_branch()
if not is_local:
peers[name] = branch
peers[name] = branch.base
branches[name] = get_remote_branch(origin, branch, name)
else:
branches[name] = branch
@ -841,7 +841,7 @@ def get_repo(url, alias):
for name, branch in find_branches(repo, wanted):
if not is_local:
peers[name] = branch
peers[name] = branch.base
branches[name] = get_remote_branch(origin, branch, name)
else:
branches[name] = branch