# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2018-06-18 06:49:27
# Node ID f273b768b60f9e43f0f847e0c38c312c1db7e04d
# Parent  1249475f0bd6385b1c63577f057702ed4d3c0500

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

diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py
--- a/mercurial/upgrade.py
+++ b/mercurial/upgrade.py
@@ -534,6 +534,8 @@ def _copyrevlogs(ui, srcrepo, dstrepo, t
                      (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 '
@@ -541,6 +543,8 @@ def _copyrevlogs(ui, srcrepo, dstrepo, t
                      (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])