( )⚙ D3800 upgrade: use progress helper

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3800

upgrade: use progress helper
ClosedPublic

Authored by martinvonz on Jun 18 2018, 1:15 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG185588cb0c4b: upgrade: use progress helper
Summary

A minor side-effect is that we no longer print the progress at 0 (and
that we don't re-print it at its current value when starting the next
manifest/file).

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.Jun 18 2018, 1:15 PM
pulkit accepted this revision.Jun 18 2018, 4:05 PM
Closed by commit rHG185588cb0c4b: upgrade: use progress helper (authored by martinvonz). · Explain WhyJun 18 2018, 4:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (21 lines)

Diff 9201

mercurial/upgrade.py

ui.write(_('migrating %d total revisions (%d in filelogs, %d in manifests, ' ui.write(_('migrating %d total revisions (%d in filelogs, %d in manifests, '
'%d in changelog)\n') % '%d in changelog)\n') %
(revcount, frevcount, mrevcount, crevcount)) (revcount, frevcount, mrevcount, crevcount))
ui.write(_('migrating %s in store; %s tracked data\n') % ( ui.write(_('migrating %s in store; %s tracked data\n') % (
(util.bytecount(srcsize), util.bytecount(srcrawsize)))) (util.bytecount(srcsize), util.bytecount(srcrawsize))))
# Used to keep track of progress. # Used to keep track of progress.
progress = [] progress = None
def oncopiedrevision(rl, rev, node): def oncopiedrevision(rl, rev, node):
progress[1] += 1 progress.increment()
srcrepo.ui.progress(progress[0], progress[1], total=progress[2])
# Do the actual copying. # Do the actual copying.
# FUTURE this operation can be farmed off to worker processes. # FUTURE this operation can be farmed off to worker processes.
seen = set() seen = set()
for unencoded, encoded, size in srcrepo.store.walk(): for unencoded, encoded, size in srcrepo.store.walk():
if unencoded.endswith('.d'): if unencoded.endswith('.d'):
continue continue
oldrl = _revlogfrompath(srcrepo, unencoded) oldrl = _revlogfrompath(srcrepo, unencoded)
newrl = _revlogfrompath(dstrepo, unencoded) newrl = _revlogfrompath(dstrepo, unencoded)
if isinstance(oldrl, changelog.changelog) and 'c' not in seen: if isinstance(oldrl, changelog.changelog) and 'c' not in seen:
ui.write(_('finished migrating %d manifest revisions across %d ' ui.write(_('finished migrating %d manifest revisions across %d '
'manifests; change in size: %s\n') % 'manifests; change in size: %s\n') %
(mrevcount, mcount, util.bytecount(mdstsize - msrcsize))) (mrevcount, mcount, util.bytecount(mdstsize - msrcsize)))
ui.write(_('migrating changelog containing %d revisions ' ui.write(_('migrating changelog containing %d revisions '
'(%s in store; %s tracked data)\n') % '(%s in store; %s tracked data)\n') %
(crevcount, util.bytecount(csrcsize), (crevcount, util.bytecount(csrcsize),
util.bytecount(crawsize))) util.bytecount(crawsize)))
seen.add('c') seen.add('c')
progress[:] = [_('changelog revisions'), 0, crevcount] progress = srcrepo.ui.makeprogress(_('changelog revisions'),
total=crevcount)
elif isinstance(oldrl, manifest.manifestrevlog) and 'm' not in seen: elif isinstance(oldrl, manifest.manifestrevlog) and 'm' not in seen:
ui.write(_('finished migrating %d filelog revisions across %d ' ui.write(_('finished migrating %d filelog revisions across %d '
'filelogs; change in size: %s\n') % 'filelogs; change in size: %s\n') %
(frevcount, fcount, util.bytecount(fdstsize - fsrcsize))) (frevcount, fcount, util.bytecount(fdstsize - fsrcsize)))
ui.write(_('migrating %d manifests containing %d revisions ' ui.write(_('migrating %d manifests containing %d revisions '
'(%s in store; %s tracked data)\n') % '(%s in store; %s tracked data)\n') %
(mcount, mrevcount, util.bytecount(msrcsize), (mcount, mrevcount, util.bytecount(msrcsize),
util.bytecount(mrawsize))) util.bytecount(mrawsize)))
seen.add('m') seen.add('m')
if progress: if progress:
ui.progress(progress[0], None) progress.complete()
progress[:] = [_('manifest revisions'), 0, mrevcount] progress = srcrepo.ui.makeprogress(_('manifest revisions'),
total=mrevcount)
elif 'f' not in seen: elif 'f' not in seen:
ui.write(_('migrating %d filelogs containing %d revisions ' ui.write(_('migrating %d filelogs containing %d revisions '
'(%s in store; %s tracked data)\n') % '(%s in store; %s tracked data)\n') %
(fcount, frevcount, util.bytecount(fsrcsize), (fcount, frevcount, util.bytecount(fsrcsize),
util.bytecount(frawsize))) util.bytecount(frawsize)))
seen.add('f') seen.add('f')
if progress: if progress:
ui.progress(progress[0], None) progress.complete()
progress[:] = [_('file revisions'), 0, frevcount] progress = srcrepo.ui.makeprogress(_('file revisions'),
total=frevcount)
ui.progress(progress[0], progress[1], total=progress[2])
ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded)) ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded))
oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision, oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision,
deltareuse=deltareuse, deltareuse=deltareuse,
aggressivemergedeltas=aggressivemergedeltas) aggressivemergedeltas=aggressivemergedeltas)
datasize = 0 datasize = 0
idx = newrl.index idx = newrl.index
for rev in newrl: for rev in newrl:
datasize += idx[rev][1] datasize += idx[rev][1]
dstsize += datasize dstsize += datasize
if isinstance(newrl, changelog.changelog): if isinstance(newrl, changelog.changelog):
cdstsize += datasize cdstsize += datasize
elif isinstance(newrl, manifest.manifestrevlog): elif isinstance(newrl, manifest.manifestrevlog):
mdstsize += datasize mdstsize += datasize
else: else:
fdstsize += datasize fdstsize += datasize
ui.progress(progress[0], None) progress.complete()
ui.write(_('finished migrating %d changelog revisions; change in size: ' ui.write(_('finished migrating %d changelog revisions; change in size: '
'%s\n') % (crevcount, util.bytecount(cdstsize - csrcsize))) '%s\n') % (crevcount, util.bytecount(cdstsize - csrcsize)))
ui.write(_('finished migrating %d total revisions; total change in store ' ui.write(_('finished migrating %d total revisions; total change in store '
'size: %s\n') % (revcount, util.bytecount(dstsize - srcsize))) 'size: %s\n') % (revcount, util.bytecount(dstsize - srcsize)))
def _filterstorefile(srcrepo, dstrepo, requirements, path, mode, st): def _filterstorefile(srcrepo, dstrepo, requirements, path, mode, st):