Patchwork [3,of,3,STABLE] changegroup: back code change of e7c618cee8df out

login
register
mail settings
Submitter Pierre-Yves David
Date Nov. 6, 2015, 6:07 p.m.
Message ID <e3122e7beb6e5c5b21e0.1446833221@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/11307/
State Accepted
Headers show

Comments

Pierre-Yves David - Nov. 6, 2015, 6:07 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1446832875 18000
#      Fri Nov 06 13:01:15 2015 -0500
# Branch stable
# Node ID e3122e7beb6e5c5b21e0d6c60d2b85a42d3da7a7
# Parent  b720bb662a3e17cdfac3cc5c90fdd895673ec864
# Available At http://hg.netv6.net/marmoute-wip/mercurial/
#              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r e3122e7beb6e
changegroup: back code change of e7c618cee8df out

The previous changeset is a simpler way of fixing issue4934 without changing the
spirit of the code. We can remove the dual call to 'delayupdate' but we keep the
tests to show that the issue is still fixed.
Matt Mackall - Nov. 6, 2015, 8:52 p.m.
On Fri, 2015-11-06 at 13:07 -0500, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1446832875 18000
> #      Fri Nov 06 13:01:15 2015 -0500
> # Branch stable
> # Node ID e3122e7beb6e5c5b21e0d6c60d2b85a42d3da7a7
> # Parent  b720bb662a3e17cdfac3cc5c90fdd895673ec864
> # Available At http://hg.netv6.net/marmoute-wip/mercurial/
> #              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r
> e3122e7beb6e
> changegroup: back code change of e7c618cee8df out

These are queued for stable, thanks.

Patch

diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -404,14 +404,10 @@  class cg1unpacker(object):
             repo.ui.status(_("added %d changesets"
                              " with %d changes to %d files%s\n")
                              % (changesets, revisions, files, htext))
             repo.invalidatevolatilesets()
 
-            # Call delayupdate again to ensure the transaction writepending
-            # subscriptions are still in place.
-            cl.delayupdate(tr)
-
             if changesets > 0:
                 if 'node' not in tr.hookargs:
                     tr.hookargs['node'] = hex(cl.node(clstart))
                     hookargs = dict(tr.hookargs)
                 else: