[PATCH 2 of 3 V2] manifest: make uses of _mancache aware of contexts

[Pierre-Yves David]

On 09/03/2016 05:51 PM, Yuya Nishihara wrote:
> On Wed, 31 Aug 2016 13:30:20 -0700, Durham Goode wrote:
>> # HG changeset patch
>> # User Durham Goode <durham at fb.com>
>> # Date 1472518929 25200
>> #      Mon Aug 29 18:02:09 2016 -0700
>> # Node ID 59bc68e1d78538bb83f60c0d4f9342ec0a8893bf
>> # Parent  abce9af35512d8589683d94f34f6d8aa21163568
>> manifest: make uses of _mancache aware of contexts
>
>> --- a/mercurial/manifest.py
>> +++ b/mercurial/manifest.py
>> @@ -1128,7 +1128,11 @@ class manifest(manifestrevlog):
>>          if node == revlog.nullid:
>>              return self._newmanifest() # don't upset local cache
>>          if node in self._mancache:
>> -            return self._mancache[node]
>> +            cached = self._mancache[node]
>> +            if (isinstance(cached, manifestctx) or
>> +                isinstance(cached, treemanifestctx)):
>> +                cached = cached.read()
>
> manifestctx.read() is added by the next patch, so tests fail at this revision.
> But that wouldn't be a good reason enough to rework this series.

This changeset or the next also introduce a strange failure in evolve 
tests where a manifest hash changes (eg: test-evolve.t). please hold on 
during investigation.

-- 
Pierre-Yves David