Mercurial > public > mercurial-scm > hg

diff mercurial/store.py @ 41093:6498f0e03526

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/store.py	Wed Dec 26 13:44:37 2018 +0100
+++ b/mercurial/store.py	Wed Jan 02 10:29:12 2019 +0100
@@ -523,7 +523,7 @@
             self._load()
         return iter(self.entries | self.addls)
 
-class _fncachevfs(vfsmod.abstractvfs, vfsmod.proxyvfs):
+class _fncachevfs(vfsmod.proxyvfs):
     def __init__(self, vfs, fnc, encode):
         vfsmod.proxyvfs.__init__(self, vfs)
         self.fncache = fnc