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

Augie Fackler raf at durin42.com
Tue Mar 1 14:23:54 EST 2016


On Mon, Feb 29, 2016 at 09:31:59AM -0800, Martin von Zweigbergk wrote:
> # 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

Queued these, thanks.


>
> 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"))
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list