martinvonz updated this revision to Diff 13109. martinvonz retitled this revision from "perfrevlogwrite: use progress helper" to "perfrevlogwrite: use progress helper on modern hg".
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5372?vs=12711&id=13109 REVISION DETAIL https://phab.mercurial-scm.org/D5372 AFFECTED FILES contrib/perf.py CHANGE DETAILS diff --git a/contrib/perf.py b/contrib/perf.py --- a/contrib/perf.py +++ b/contrib/perf.py @@ -1838,17 +1838,30 @@ topic = 'adding' if runidx is not None: topic += ' (run #%d)' % runidx + # Support both old and new progress API + if util.safehasattr(ui, 'makeprogress'): + progress = ui.makeprogress(topic, unit='revs', total=total) + def updateprogress(pos): + progress.update(pos) + def completeprogress(): + progress.complete() + else: + def updateprogress(pos): + ui.progress(topic, pos, unit='revs', total=total) + def completeprogress(): + ui.progress(topic, None, unit='revs', total=total) + for idx, rev in enumerate(revs): - ui.progress(topic, idx, unit='revs', total=total) + updateprogress(idx) addargs, addkwargs = _getrevisionseed(orig, rev, tr, source) if clearcaches: dest.index.clearcaches() dest.clearcaches() with timeone() as r: dest.addrawrevision(*addargs, **addkwargs) timings.append((rev, r[0])) - ui.progress(topic, total, unit='revs', total=total) - ui.progress(topic, None, unit='revs', total=total) + updateprogress(total) + completeprogress() return timings def _getrevisionseed(orig, rev, tr, source): To: martinvonz, #hg-reviewers, durin42 Cc: durin42, yuja, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel