Mercurial > hg
comparison mercurial/upgrade.py @ 38398:f273b768b60f
upgrade: close progress after each revlog
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.
Differential Revision: https://phab.mercurial-scm.org/D3799
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 17 Jun 2018 23:49:27 -0700 |
parents | 2ce60954b1b7 |
children | 185588cb0c4b |
comparison
equal
deleted
inserted
replaced
38397:1249475f0bd6 | 38398:f273b768b60f |
---|---|
532 ui.write(_('migrating %d manifests containing %d revisions ' | 532 ui.write(_('migrating %d manifests containing %d revisions ' |
533 '(%s in store; %s tracked data)\n') % | 533 '(%s in store; %s tracked data)\n') % |
534 (mcount, mrevcount, util.bytecount(msrcsize), | 534 (mcount, mrevcount, util.bytecount(msrcsize), |
535 util.bytecount(mrawsize))) | 535 util.bytecount(mrawsize))) |
536 seen.add('m') | 536 seen.add('m') |
537 if progress: | |
538 ui.progress(progress[0], None) | |
537 progress[:] = [_('manifest revisions'), 0, mrevcount] | 539 progress[:] = [_('manifest revisions'), 0, mrevcount] |
538 elif 'f' not in seen: | 540 elif 'f' not in seen: |
539 ui.write(_('migrating %d filelogs containing %d revisions ' | 541 ui.write(_('migrating %d filelogs containing %d revisions ' |
540 '(%s in store; %s tracked data)\n') % | 542 '(%s in store; %s tracked data)\n') % |
541 (fcount, frevcount, util.bytecount(fsrcsize), | 543 (fcount, frevcount, util.bytecount(fsrcsize), |
542 util.bytecount(frawsize))) | 544 util.bytecount(frawsize))) |
543 seen.add('f') | 545 seen.add('f') |
546 if progress: | |
547 ui.progress(progress[0], None) | |
544 progress[:] = [_('file revisions'), 0, frevcount] | 548 progress[:] = [_('file revisions'), 0, frevcount] |
545 | 549 |
546 ui.progress(progress[0], progress[1], total=progress[2]) | 550 ui.progress(progress[0], progress[1], total=progress[2]) |
547 | 551 |
548 ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded)) | 552 ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded)) |