Mercurial > public > mercurial-scm > hg-stable
diff mercurial/store.py @ 31244:9b7a2ef4f27c
vfs: use 'vfs' module directly in 'mercurial.store'
Now that the 'vfs' classes moved in their own module, lets use the new module
directly. We update code iteratively to help with possible bisect needs in the
future.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Thu, 02 Mar 2017 13:30:10 +0100 |
| parents | f8e06821c118 |
| children | 64596338ba10 |
line wrap: on
line diff
--- a/mercurial/store.py Thu Mar 02 13:29:59 2017 +0100 +++ b/mercurial/store.py Thu Mar 02 13:30:10 2017 +0100 @@ -17,8 +17,8 @@ error, parsers, pycompat, - scmutil, util, + vfs as vfsmod, ) # This avoids a collision between a file named foo and a dir named @@ -325,7 +325,7 @@ self.createmode = _calcmode(vfs) vfs.createmode = self.createmode self.rawvfs = vfs - self.vfs = scmutil.filtervfs(vfs, encodedir) + self.vfs = vfsmod.filtervfs(vfs, encodedir) self.opener = self.vfs def join(self, f): @@ -398,7 +398,7 @@ self.createmode = _calcmode(vfs) vfs.createmode = self.createmode self.rawvfs = vfs - self.vfs = scmutil.filtervfs(vfs, encodefilename) + self.vfs = vfsmod.filtervfs(vfs, encodefilename) self.opener = self.vfs def datafiles(self): @@ -477,9 +477,9 @@ self._load() return iter(self.entries) -class _fncachevfs(scmutil.abstractvfs, scmutil.auditvfs): +class _fncachevfs(vfsmod.abstractvfs, vfsmod.auditvfs): def __init__(self, vfs, fnc, encode): - scmutil.auditvfs.__init__(self, vfs) + vfsmod.auditvfs.__init__(self, vfs) self.fncache = fnc self.encode = encode