remote-bzr: delay peer branch usage

So it doesn't time out.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index 66e3861c21cf8922b83d2f444684d6a0fb30d28a..b2d67f7f37a464aa152c6923a89ffdd943f455c8 100755 (executable)
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -687,7 +687,7 @@ def do_export(parser):
         branch.generate_revision_history(revid, marks.get_tip(name))
 
         if name in peers:
         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:
             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:
         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
             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:
         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
                 branches[name] = get_remote_branch(origin, branch, name)
             else:
                 branches[name] = branch