# HG changeset patch # User Martin von Zweigbergk # Date 1543969979 28800 # Node ID b6a6dc1a14bd0b51e5015d12b426aaa96e2cdcba # Parent 4e08bbfc6d51bc51e1faa99f3675a42a4aeba501 remotefilelog: use progress helper in shallowrepo Differential Revision: https://phab.mercurial-scm.org/D5380 diff -r 4e08bbfc6d51 -r b6a6dc1a14bd hgext/remotefilelog/shallowrepo.py --- a/hgext/remotefilelog/shallowrepo.py Tue Dec 04 16:31:04 2018 -0800 +++ b/hgext/remotefilelog/shallowrepo.py Tue Dec 04 16:32:59 2018 -0800 @@ -40,8 +40,6 @@ from mercurial.utils import procutil _hgexecutable = procutil.hgexecutable -_prefetching = _('prefetching') - # These make*stores functions are global so that other extensions can replace # them. def makelocalstores(repo): @@ -233,9 +231,9 @@ serverfiles = skip.copy() visited = set() visited.add(nullrev) - revnum = 0 revcount = len(revs) - self.ui.progress(_prefetching, revnum, total=revcount) + progress = self.ui.makeprogress(_('prefetching'), total=revcount) + progress.update(0) for rev in sorted(revs): ctx = repo[rev] if pats: @@ -264,12 +262,11 @@ files.update(diff) visited.add(mfrev) - revnum += 1 - self.ui.progress(_prefetching, revnum, total=revcount) + progress.increment() files.difference_update(skip) serverfiles.difference_update(skip) - self.ui.progress(_prefetching, None) + progress.complete() # Fetch files known to be on the server if serverfiles: