Patchwork D3799: upgrade: close progress after each revlog

login
register
mail settings
Submitter phabricator
Date June 18, 2018, 5:15 p.m.
Message ID <differential-rev-PHID-DREV-i2vyofq7lfktbslhfx7x-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/32297/
State Superseded
Headers show

Comments

phabricator - June 18, 2018, 5:15 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3799

AFFECTED FILES
  mercurial/upgrade.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py
--- a/mercurial/upgrade.py
+++ b/mercurial/upgrade.py
@@ -534,13 +534,17 @@ 
                      (mcount, mrevcount, util.bytecount(msrcsize),
                       util.bytecount(mrawsize)))
             seen.add('m')
+            if progress:
+                ui.progress(progress[0], None)
             progress[:] = [_('manifest revisions'), 0, mrevcount]
         elif 'f' not in seen:
             ui.write(_('migrating %d filelogs containing %d revisions '
                        '(%s in store; %s tracked data)\n') %
                      (fcount, frevcount, util.bytecount(fsrcsize),
                       util.bytecount(frawsize)))
             seen.add('f')
+            if progress:
+                ui.progress(progress[0], None)
             progress[:] = [_('file revisions'), 0, frevcount]
 
         ui.progress(progress[0], progress[1], total=progress[2])