This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5372

perfrevlogwrite: use progress helper on modern hg
ClosedPublic

Authored by martinvonz on Dec 5 2018, 12:39 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGf36fd52dae8f: perfrevlogwrite: use progress helper on modern hg

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 5 2018, 12:39 PM
yuja added a subscriber: yuja.Dec 6 2018, 6:38 AM

Queued the patches but for this, thanks. perf.py has to support old Mercurial
versions.

durin42 requested changes to this revision.Jan 9 2019, 3:04 PM
durin42 added a subscriber: durin42.

per yuya, this has to support old hgs

This revision now requires changes to proceed.Jan 9 2019, 3:04 PM
martinvonz retitled this revision from perfrevlogwrite: use progress helper to perfrevlogwrite: use progress helper on modern hg.Jan 9 2019, 3:12 PM
martinvonz updated this revision to Diff 13109.
martinvonz added a comment.Jan 9 2019, 3:12 PM
In D5372#81858, @durin42 wrote:

per yuya, this has to support old hgs

Thanks for the reminder. I was thinking of just leaving this on the old API, but now that I'm deprecating ui.progress(), this needs to be migrated. Done.

Closed by commit rHGf36fd52dae8f: perfrevlogwrite: use progress helper on modern hg (authored by martinvonz). · Explain WhyJan 9 2019, 3:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/perf.py (19 lines)

Diff 13111

contrib/perf.py

tr = _faketr() tr = _faketr()
with _temprevlog(ui, orig, startrev) as dest: with _temprevlog(ui, orig, startrev) as dest:
dest._lazydeltabase = lazydeltabase dest._lazydeltabase = lazydeltabase
revs = list(orig.revs(startrev, stoprev)) revs = list(orig.revs(startrev, stoprev))
total = len(revs) total = len(revs)
topic = 'adding' topic = 'adding'
if runidx is not None: if runidx is not None:
topic += ' (run #%d)' % runidx 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): for idx, rev in enumerate(revs):
ui.progress(topic, idx, unit='revs', total=total) updateprogress(idx)
addargs, addkwargs = _getrevisionseed(orig, rev, tr, source) addargs, addkwargs = _getrevisionseed(orig, rev, tr, source)
if clearcaches: if clearcaches:
dest.index.clearcaches() dest.index.clearcaches()
dest.clearcaches() dest.clearcaches()
with timeone() as r: with timeone() as r:
dest.addrawrevision(*addargs, **addkwargs) dest.addrawrevision(*addargs, **addkwargs)
timings.append((rev, r[0])) timings.append((rev, r[0]))
ui.progress(topic, total, unit='revs', total=total) updateprogress(total)
ui.progress(topic, None, unit='revs', total=total) completeprogress()
return timings return timings
def _getrevisionseed(orig, rev, tr, source): def _getrevisionseed(orig, rev, tr, source):
from mercurial.node import nullid from mercurial.node import nullid
linkrev = orig.linkrev(rev) linkrev = orig.linkrev(rev)
node = orig.node(rev) node = orig.node(rev)
p1, p2 = orig.parents(node) p1, p2 = orig.parents(node)