[PATCH 4 of 9] unionrepo: use a lower level overide in unionrepo too
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Sat Aug 31 09:41:44 UTC 2019
On 8/31/19 4:45 AM, Yuya Nishihara wrote:
> On Fri, 30 Aug 2019 18:39:33 +0200, Pierre-Yves David wrote:
>> # HG changeset patch
>> # User Pierre-Yves David <pierre-yves.david at octobus.net>
>> # Date 1567179938 -7200
>> # Fri Aug 30 17:45:38 2019 +0200
>> # Node ID b3b9c5961371426a896a47095a5ff8941174520a
>> # Parent 680d5166e27cd9029c7e1c6f983fb98e677ea10f
>> # EXP-Topic sidedata-prep
>> # Available At https://bitbucket.org/octobus/mercurial-devel/
>> # hg pull https://bitbucket.org/octobus/mercurial-devel/ -r b3b9c5961371
>> unionrepo: use a lower level overide in unionrepo too
>
>> @@ -105,16 +101,13 @@ class unionrevlog(revlog.revlog):
>> node = nodeorrev
>> rev = self.rev(node)
>>
>> - if node == nullid:
>> - return ""
>> -
>> if rev > self.repotiprev:
>> - text = self.revlog2.revision(node)
>> - self._revisioncache = (node, rev, text)
>> + # work around manifestrevlog NOT being a revlog
>> + revlog2 = getattr(self.revlog2, '_revlog', self.revlog2)
>> + func = revlog2._revisiondata
>
> So we no longer set self._revisioncache, which I think is correct, but just
> note that in case it wasn't.
We no longer need to because and higher level layer will take care of
that for us.
--
Pierre-Yves David
More information about the Mercurial-devel
mailing list