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.

41092:9e593db5f1a1

    def __iter__(self):
        if self.entries is None:
            self._load()
        return iter(self.entries | self.addls)

class _fncachevfs(vfsmod.abstractvfs, vfsmod.proxyvfs):
    def __init__(self, vfs, fnc, encode):
        vfsmod.proxyvfs.__init__(self, vfs)
        self.fncache = fnc
        self.encode = encode

41093:6498f0e03526

    def __iter__(self):
        if self.entries is None:
            self._load()
        return iter(self.entries | self.addls)

class _fncachevfs(vfsmod.proxyvfs):
    def __init__(self, vfs, fnc, encode):
        vfsmod.proxyvfs.__init__(self, vfs)
        self.fncache = fnc
        self.encode = encode