Skip to content

Commit

Permalink
remote-bzr: delay peer branch usage
Browse files Browse the repository at this point in the history
So it doesn't time out.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed May 1, 2013
1 parent 38cecbd commit 747c9a3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions contrib/remote-helpers/git-remote-bzr
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 747c9a3

Please sign in to comment.