Mercurial > hg
comparison mercurial/store.py @ 41093:6498f0e03526
vfs: fix proxyvfs inheritance
The proxyvfs class is designed to overwrite some of the vfs logic. Yet, it did
not use normal class inheritance. This is becoming an issue as `abstractvfs`
method could take precedence over their `proxyvfs` version.
We fix the inheritance chain to be as expected.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 02 Jan 2019 10:29:12 +0100 |
parents | df8ed31a8ad8 |
children | d7ef84e595f8 |
comparison
equal
deleted
inserted
replaced
41092:9e593db5f1a1 | 41093:6498f0e03526 |
---|---|
521 def __iter__(self): | 521 def __iter__(self): |
522 if self.entries is None: | 522 if self.entries is None: |
523 self._load() | 523 self._load() |
524 return iter(self.entries | self.addls) | 524 return iter(self.entries | self.addls) |
525 | 525 |
526 class _fncachevfs(vfsmod.abstractvfs, vfsmod.proxyvfs): | 526 class _fncachevfs(vfsmod.proxyvfs): |
527 def __init__(self, vfs, fnc, encode): | 527 def __init__(self, vfs, fnc, encode): |
528 vfsmod.proxyvfs.__init__(self, vfs) | 528 vfsmod.proxyvfs.__init__(self, vfs) |
529 self.fncache = fnc | 529 self.fncache = fnc |
530 self.encode = encode | 530 self.encode = encode |
531 | 531 |