This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3799

upgrade: close progress after each revlog
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf273b768b60f: upgrade: close progress after each revlog
Summary

IIUC, one is supposed to close each progress topic before strarting a
new one. Otherwise the topics are considered nested, which we don't
want here.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jun 18 2018, 1:15 PM
pulkit accepted this revision.Jun 18 2018, 4:04 PM
Closed by commit rHGf273b768b60f: upgrade: close progress after each revlog (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 (4 lines)

Diff 9193

mercurial/upgrade.py

'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:
ui.progress(progress[0], None)
progress[:] = [_('manifest revisions'), 0, mrevcount] progress[:] = [_('manifest revisions'), 0, 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:
ui.progress(progress[0], None)
progress[:] = [_('file revisions'), 0, frevcount] progress[:] = [_('file revisions'), 0, frevcount]
ui.progress(progress[0], progress[1], total=progress[2]) 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)