comparison mercurial/streamclone.py @ 38360:c1fca51c26f3

streamclone: update progress later to avoid passing None to util.bytecount Differential Revision: https://phab.mercurial-scm.org/D3773
author Augie Fackler <raf@durin42.com>
date Sun, 17 Jun 2018 23:03:23 -0400
parents e59eaf51cc0d
children ef692614e601
comparison
equal deleted inserted replaced
38359:876352ea831e 38360:c1fca51c26f3
619 repo.invalidate(clearfilecache=True) 619 repo.invalidate(clearfilecache=True)
620 620
621 elapsed = util.timer() - start 621 elapsed = util.timer() - start
622 if elapsed <= 0: 622 if elapsed <= 0:
623 elapsed = 0.001 623 elapsed = 0.001
624 progress.update(None)
625 repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % 624 repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') %
626 (util.bytecount(progress.pos), elapsed, 625 (util.bytecount(progress.pos), elapsed,
627 util.bytecount(progress.pos / elapsed))) 626 util.bytecount(progress.pos / elapsed)))
627 progress.update(None)
628 628
629 def applybundlev2(repo, fp, filecount, filesize, requirements): 629 def applybundlev2(repo, fp, filecount, filesize, requirements):
630 missingreqs = [r for r in requirements if r not in repo.supported] 630 missingreqs = [r for r in requirements if r not in repo.supported]
631 if missingreqs: 631 if missingreqs:
632 raise error.Abort(_('unable to apply stream clone: ' 632 raise error.Abort(_('unable to apply stream clone: '