[PATCH in crew] clfilter: fix `nodemap` usage in `getbundle`

Kevin Bullock kbullock+mercurial at ringworld.org
Tue Dec 18 20:38:11 UTC 2012


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1355159561 -3600
# Node ID 739c88ff043c10edfaf741cbac64901f47c10e5d
# Parent  4c53f015564fea7dea633e52bee37af2ca05a391
clfilter: fix `nodemap` usage in `getbundle`

With the current implementation, `changelog.nodemap` is not filtered. So some
filtered changeset in common are not filtered by `n in nodemap`. This leads to
crash lower in the stack when the bundle generation try to access those node on
a filtered changelog.

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2107,8 +2107,8 @@ class localrepository(object):
         """
         cl = self.changelog
         if common:
-            nm = cl.nodemap
-            common = [n for n in common if n in nm]
+            hasnode = cl.hasnode
+            common = [n for n in common if hasnode(n)]
         else:
             common = [nullid]
         if not heads:



More information about the Mercurial-devel mailing list