[PATCH 3 of 3 V2] changegroup: clear progress callback after changelog processing

Martin von Zweigbergk martinvonz at google.com
Mon Feb 29 12:31:59 EST 2016


# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1456766803 28800
#      Mon Feb 29 09:26:43 2016 -0800
# Node ID e33fc0e477247014378c475af764446d9c7c140b
# Parent  59b9ced20093cd7d0999111dda9910636d366cb0
changegroup: clear progress callback after changelog processing

The progress callback is replaced by one for manifests after changelog
processing is done, but let's not depend on manifests replacing the
value and instead explicitly clear it.

diff -r 59b9ced20093 -r e33fc0e47724 mercurial/changegroup.py
--- a/mercurial/changegroup.py	Sun Feb 28 22:51:07 2016 -0800
+++ b/mercurial/changegroup.py	Mon Feb 29 09:26:43 2016 -0800
@@ -360,8 +360,8 @@
                         repo.ui.progress(self._step, self._count,
                                          unit=_('chunks'), total=self._total)
                         self._count += 1
+
                 self.callback = prog(_('changesets'), expectedtotal)
-
                 efiles = set()
                 def onchangelog(cl, node):
                     efiles.update(cl.readfiles(node))
@@ -376,6 +376,7 @@
                 clend = len(cl)
                 changesets = clend - clstart
                 repo.ui.progress(_('changesets'), None)
+                self.callback = None
 
                 # pull off the manifest group
                 repo.ui.status(_("adding manifests\n"))


More information about the Mercurial-devel mailing list