From cd6997844e444050255519ac0c3f66bfd21c01b5 Mon Sep 17 00:00:00 2001 From: Augie Fackler Date: Sun, 14 Feb 2010 14:19:57 -0600 Subject: [PATCH] pull: report progress to ui.progress so progress bars can appear --- hgsubversion/wrappers.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py index d9ed87ecae..44d16b8430 100644 --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -256,6 +256,11 @@ def pull(repo, source, heads=[], force=False): 'remains unimplemented.') oldrevisions = len(meta.revmap) + cnt = 0 + if stopat_rev: + total = stopat_rev - start + else: + total = svn.HEAD - start try: try: # start converting revisions @@ -277,6 +282,8 @@ def pull(repo, source, heads=[], force=False): msg = [s.strip() for s in msg.splitlines() if s][0] w = hgutil.termwidth() bits = (r.revnum, r.author, msg) + cnt += 1 + ui.progress('pull', cnt, total=total) ui.status(('[r%d] %s: %s\n' % bits)[:w]) meta.save_tbdelta(tbdelta) @@ -305,6 +312,7 @@ def pull(repo, source, heads=[], force=False): except KeyboardInterrupt: pass finally: + ui.progress('pull', None, total=total) util.swap_out_encoding(old_encoding) revisions = len(meta.revmap) - oldrevisions