remote-bzr: fixes for older versions of bzr

Down to v2.0, by using older but still valid interfaces.

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 8ecee6721d8dd8a13887c92d77f42a31910b4f80..10300c63d1a71aecd0f8d2273d276f36773e6b1e 100755 (executable)
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -31,6 +31,7 @@ import bzrlib.transport
 import bzrlib.errors
 import bzrlib.ui
 import bzrlib.urlutils
 import bzrlib.errors
 import bzrlib.ui
 import bzrlib.urlutils

+import bzrlib.branch

 
 import sys
 import os
 
 import sys
 import os


@@ -788,7 +789,7 @@ def get_remote_branch(origin, remote_branch, name):
     return branch
 
 def find_branches(repo, wanted):
     return branch
 
 def find_branches(repo, wanted):

-    transport = repo.user_transport
+    transport = repo.bzrdir.root_transport

 
     for fn in transport.iter_files_recursive():
         if not fn.endswith('.bzr/branch-format'):
 
     for fn in transport.iter_files_recursive():
         if not fn.endswith('.bzr/branch-format'):


@@ -924,7 +925,8 @@ def main(args):
     if not os.path.exists(dirname):
         os.makedirs(dirname)
 
     if not os.path.exists(dirname):
         os.makedirs(dirname)
 

-    bzrlib.ui.ui_factory.be_quiet(True)
+    if hasattr(bzrlib.ui.ui_factory, 'be_quiet'):
+        bzrlib.ui.ui_factory.be_quiet(True)

 
     repo = get_repo(url, alias)
 
 
     repo = get_repo(url, alias)