Mercurial > hg-stable

changeset 32220:fb9b6bfb54b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifest: remove check for non-contexts in _dirmancache It looks like the _dirmancache has contained only manifest contexts since d79c141fdf41 (manifest: remove usages of manifest.read, 2016-11-10).
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 05 May 2017 14:10:58 -0700
parents b9d97bf96f61
children 448ed4d3ee90
files mercurial/manifest.py
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/manifest.py	Thu May 04 12:48:45 2017 +0200
+++ b/mercurial/manifest.py	Fri May 05 14:10:58 2017 -0700
@@ -1340,12 +1340,7 @@
                    the revlog
         """
         if node in self._dirmancache.get(dir, ()):
-            cachemf = self._dirmancache[dir][node]
-            # The old manifest may put non-ctx manifests in the cache, so
-            # skip those since they don't implement the full api.
-            if (isinstance(cachemf, manifestctx) or
-                isinstance(cachemf, treemanifestctx)):
-                return cachemf
+            return self._dirmancache[dir][node]
 
         if dir:
             if self._revlog._treeondisk: