# HG changeset patch # User Martin von Zweigbergk # Date 1529241809 25200 # Node ID 9e70690a21ac6c62eb337bc7edc8dad151344abd # Parent e59eaf51cc0dba6ad40e8c561879485fa94be0c2 setdiscovery: use progress helper Differential Revision: https://phab.mercurial-scm.org/D3770 diff -r e59eaf51cc0d -r 9e70690a21ac mercurial/setdiscovery.py --- a/mercurial/setdiscovery.py Sat Jun 16 00:37:44 2018 -0700 +++ b/mercurial/setdiscovery.py Sun Jun 17 06:23:29 2018 -0700 @@ -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.update(roundtrips) 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')