undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-bzr: delay cloning/pulling

Browse Source 
Until the branch is actually going to be used.

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:22 -05:00 committed by Junio C Hamano
parent 1bf09d4fbf
commit 2ae078e847
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/remote-helpers/git-remote-bzr
View File

@ -278,7 +278,7 @@ def export_branch(repo, name):
ref = '%s/heads/%s' % (prefix, name) ref = '%s/heads/%s' % (prefix, name)
tip = marks.get_tip(name) tip = marks.get_tip(name)
branch = bzrlib.branch.Branch.open(branches[name]) branch = get_remote_branch(name)
repo = branch.repository repo = branch.repository
branch.lock_read() branch.lock_read()
@ -590,7 +590,7 @@ def parse_commit(parser):
if ref.startswith('refs/heads/'): if ref.startswith('refs/heads/'):
name = ref[len('refs/heads/'):] name = ref[len('refs/heads/'):]
branch = bzrlib.branch.Branch.open(branches[name]) branch = get_remote_branch(name)
else: else:
die('unknown ref') die('unknown ref')
@ -692,7 +692,7 @@ def do_export(parser):
for ref, revid in parsed_refs.iteritems(): for ref, revid in parsed_refs.iteritems():
if ref.startswith('refs/heads/'): if ref.startswith('refs/heads/'):
name = ref[len('refs/heads/'):] name = ref[len('refs/heads/'):]
branch = bzrlib.branch.Branch.open(branches[name]) branch = get_remote_branch(name)
branch.generate_revision_history(revid, marks.get_tip(name)) branch.generate_revision_history(revid, marks.get_tip(name))
if name in peers: if name in peers:
@ -749,7 +749,7 @@ def do_list(parser):
master_branch = name master_branch = name
print "? refs/heads/%s" % name print "? refs/heads/%s" % name
branch = bzrlib.branch.Branch.open(branches[master_branch]) branch = get_remote_branch(master_branch)
branch.lock_read() branch.lock_read()
for tag, revid in branch.tags.get_tag_dict().items(): for tag, revid in branch.tags.get_tag_dict().items():
try: try:
@ -771,8 +771,12 @@ def clone(path, remote_branch):
repo.fetch(remote_branch.repository) repo.fetch(remote_branch.repository)
return remote_branch.sprout(bdir, repository=repo) return remote_branch.sprout(bdir, repository=repo)
def get_remote_branch(remote_branch, name): def get_remote_branch(name):
global dirname, peers global dirname, branches
remote_branch = bzrlib.branch.Branch.open(branches[name])
if isinstance(remote_branch.user_transport, bzrlib.transport.local.LocalTransport):
return remote_branch
branch_path = os.path.join(dirname, 'clone', name) branch_path = os.path.join(dirname, 'clone', name)
@ -857,13 +861,10 @@ def get_repo(url, alias):
if not is_local: if not is_local:
peers[name] = remote_branch.base peers[name] = remote_branch.base
branch = get_remote_branch(remote_branch, name)
else:
branch = remote_branch
branches[name] = branch.base branches[name] = remote_branch.base
return branch.repository return remote_branch.repository
else: else:
# repository # repository
@ -875,11 +876,8 @@ def get_repo(url, alias):
if not is_local: if not is_local:
peers[name] = remote_branch.base peers[name] = remote_branch.base
branch = get_remote_branch(remote_branch, name)
else:
branch = remote_branch
branches[name] = branch.base branches[name] = remote_branch.base
return repo return repo