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

remote-bzr: improve progress reporting

Browse Source 
No need to manually count the revisions, and also, this would help to
iterate more properly.

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-04-30 20:10:07 -05:00 committed by Junio C Hamano
parent 248663c4ff
commit a397699950
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,13 +282,16 @@ def export_branch(repo, name):
branch.lock_read() branch.lock_read()
revs = branch.iter_merge_sorted_revisions(None, tip, 'exclude', 'forward') revs = branch.iter_merge_sorted_revisions(None, tip, 'exclude', 'forward')
count = 0 tip_revno = branch.revision_id_to_revno(tip)
last_revno, _ = branch.last_revision_info()
total = last_revno - tip_revno
revs = [revid for revid, _, _, _ in revs if not marks.is_marked(revid)] revs = [revid, seq for revid, _, seq, _ in revs if not marks.is_marked(revid)]
for revid in revs: for revid, seq in revs:
rev = repo.get_revision(revid) rev = repo.get_revision(revid)
revno = seq[0]
parents = rev.parent_ids parents = rev.parent_ids
time = rev.timestamp time = rev.timestamp
@ -343,10 +346,13 @@ def export_branch(repo, name):
print "M %s :%u %s" % f print "M %s :%u %s" % f
print print
count += 1 if len(seq) > 1:
if (count % 100 == 0): # let's skip branch revisions from the progress report
print "progress revision %s '%s' (%d/%d)" % (revid, name, count, len(revs)) continue
print "#############################################################"
progress = (revno - tip_revno)
if (progress % 100 == 0):
print "progress revision %d '%s' (%d/%d)" % (revno, name, progress, total)
branch.unlock() branch.unlock()