manifest: make one use of _mancache avoid manifestctxs
authorDurham Goode <durham@fb.com>
Mon, 12 Sep 2016 14:29:09 -0700
changeset 29925 1619efcde9a4
parent 29924 45bf56a89197
child 29926 be16091ac14d
manifest: make one use of _mancache avoid manifestctxs In a future patch we will change manifestctx and treemanifestctx to no longer derive from manifestdict and treemanifest, respectively. This means that consumers of the _mancache will now need to be aware of the different between the two, until we get rid of the manifest entirely and the _mancache becomes only filled with ctxs. This fixes one case of it that can be fixed by using the other cache. Future patches will address the others uses using the upcoming manifestctx.read() function.
mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py	Sun Aug 21 13:16:21 2016 +0900
+++ b/mercurial/bundlerepo.py	Mon Sep 12 14:29:09 2016 -0700
@@ -204,8 +204,8 @@
         if isinstance(node, int):
             node = self.node(node)
 
-        if node in self._mancache:
-            result = self._mancache[node].text()
+        if node in self.fulltextcache:
+            result = self.fulltextcache[node].tostring()
         else:
             result = manifest.manifest.revision(self, nodeorrev)
         return result