# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 2016-09-09 23:42:05
# Node ID 8a658b8b795aaea5e9fe34ae26a49b4656c594cb
# Parent  548fa75cdb079e743b740889fb88b5a2c0ed4835

manifest: backed out changeset bb3281b3fcaa

There is some suspicious failure in evolution tests. This changeset was supposed
to be dropped until we investigate.

diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -204,8 +204,8 @@ class bundlemanifest(bundlerevlog, manif
         if isinstance(node, int):
             node = self.node(node)
 
-        if node in self.fulltextcache:
-            result = self.fulltextcache[node].tostring()
+        if node in self._mancache:
+            result = self._mancache[node].text()
         else:
             result = manifest.manifest.revision(self, nodeorrev)
         return result
diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -1130,11 +1130,7 @@ class manifest(manifestrevlog):
         if node == revlog.nullid:
             return self._newmanifest() # don't upset local cache
         if node in self._mancache:
-            cached = self._mancache[node]
-            if (isinstance(cached, manifestctx) or
-                isinstance(cached, treemanifestctx)):
-                cached = cached.read()
-            return cached
+            return self._mancache[node]
         if self._treeondisk:
             def gettext():
                 return self.revision(node)