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

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Nov 6 12:07:01 CST 2015


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at 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.

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:


More information about the Mercurial-devel mailing list