remote-bzr: trivial cleanups

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-05-24 21:24:24 -05:00 committed by Junio C Hamano
parent 0454c399c9
commit a8ffc3ade2

View File

@ -815,7 +815,7 @@ def find_branches(repo, wanted):
except bzrlib.errors.NotBranchError: except bzrlib.errors.NotBranchError:
continue continue
else: else:
yield name, branch yield name, branch.base
def get_repo(url, alias): def get_repo(url, alias):
global dirname, peer, branches global dirname, peer, branches
@ -857,12 +857,12 @@ def get_repo(url, alias):
# branch # branch
name = 'master' name = 'master'
remote_branch = origin.open_branch() branch = origin.open_branch().base
if not is_local: if not is_local:
peers[name] = remote_branch.base peers[name] = branch
branches[name] = remote_branch.base branches[name] = branch
return origin return origin
else: else:
@ -872,12 +872,12 @@ def get_repo(url, alias):
# stupid python # stupid python
wanted = [e for e in wanted if e] wanted = [e for e in wanted if e]
for name, remote_branch in find_branches(repo, wanted): for name, branch in find_branches(repo, wanted):
if not is_local: if not is_local:
peers[name] = remote_branch.base peers[name] = branch
branches[name] = remote_branch.base branches[name] = branch
return origin return origin