remote-bzr: trivial cleanups
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 24, 2013 at 21:24 UTC
a8ffc3ade273c5d6b2383450f1b4970c2da89d7d
1 file changed
+7
-7
contrib/remote-helpers/git-remote-bzr
+7
-7
@@ -815,7 +815,7 @@ def find_branches(repo, wanted):
815
except bzrlib.errors.NotBranchError:
816
continue
817
else:
818
- yield name, branch
818
+ yield name, branch.base
819
820
def get_repo(url, alias):
821
global dirname, peer, branches
@@ -857,12 +857,12 @@ def get_repo(url, alias):
857
# branch
858
859
name = 'master'
860
- remote_branch = origin.open_branch()
860
+ branch = origin.open_branch().base
861
862
if not is_local:
863
- peers[name] = remote_branch.base
863
+ peers[name] = branch
864
865
- branches[name] = remote_branch.base
865
+ branches[name] = branch
866
867
return origin
868
else:
@@ -872,12 +872,12 @@ def get_repo(url, alias):
872
# stupid python
873
wanted = [e for e in wanted if e]
874
875
- for name, remote_branch in find_branches(repo, wanted):
875
+ for name, branch in find_branches(repo, wanted):
876
877
if not is_local:
878
- peers[name] = remote_branch.base
878
+ peers[name] = branch
879
880
- branches[name] = remote_branch.base
880
+ branches[name] = branch
881
882
return origin
883