Mercurial > hg
changeset 29916:8a658b8b795a
manifest: backed out changeset bb3281b3fcaa
There is some suspicious failure in evolution tests. This changeset was supposed
to be dropped until we investigate.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Sat, 10 Sep 2016 01:42:05 +0200 |
| parents | 548fa75cdb07 |
| children | f32f8bf5dc4c |
| files | mercurial/bundlerepo.py mercurial/manifest.py |
| diffstat | 2 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundlerepo.py Sat Sep 10 01:41:38 2016 +0200 +++ b/mercurial/bundlerepo.py Sat Sep 10 01:42:05 2016 +0200 @@ -204,8 +204,8 @@ 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
--- a/mercurial/manifest.py Sat Sep 10 01:41:38 2016 +0200 +++ b/mercurial/manifest.py Sat Sep 10 01:42:05 2016 +0200 @@ -1130,11 +1130,7 @@ 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)