D3770: setdiscovery: use progress helper
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sun Jun 17 16:42:51 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3770
AFFECTED FILES
mercurial/setdiscovery.py
CHANGE DETAILS
diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
--- a/mercurial/setdiscovery.py
+++ b/mercurial/setdiscovery.py
@@ -197,6 +197,7 @@
missing = set()
full = False
+ progress = ui.makeprogress(_('searching'), unit=_('queries'))
while undecided:
if sample:
@@ -226,7 +227,7 @@
sample = samplefunc(dag, undecided, targetsize)
roundtrips += 1
- ui.progress(_('searching'), roundtrips, unit=_('queries'))
+ progress.increment()
ui.debug("query %i; still undecided: %i, sample size is: %i\n"
% (roundtrips, len(undecided), len(sample)))
# indices between sample and externalized version must match
@@ -251,7 +252,7 @@
# return any heads in that case, so discard that
result.discard(nullrev)
elapsed = util.timer() - start
- ui.progress(_('searching'), None)
+ progress.update(None)
ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed))
msg = ('found %d common and %d unknown server heads,'
' %d roundtrips in %.4fs\n')
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list