[PATCH 5 of 6 V3] store: initialize "vfs" fields by "vfs" constructors

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Thu Aug 30 18:14:21 UTC 2012


# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1346346389 -32400
# Node ID 02423f91d676cf1bed2955bd71b72512ea9e3fc7
# Parent  327244ba038fb0d0ae309ce0f51d1366701c0a2f
store: initialize "vfs" fields by "vfs" constructors

For backwards compatibility, "opener" fields are still left as aliases
for "vfs" ones.

diff -r 327244ba038f -r 02423f91d676 mercurial/store.py
--- a/mercurial/store.py	Fri Aug 31 02:06:29 2012 +0900
+++ b/mercurial/store.py	Fri Aug 31 02:06:29 2012 +0900
@@ -242,7 +242,8 @@
         self.createmode = _calcmode(path)
         vfs = vfstype(self.path)
         vfs.createmode = self.createmode
-        self.opener = scmutil.filteropener(vfs, encodedir)
+        self.vfs = scmutil.filtervfs(vfs, encodedir)
+        self.opener = self.vfs
 
     def join(self, f):
         return self.path + '/' + encodedir(f)
@@ -292,7 +293,8 @@
         self.createmode = _calcmode(self.path)
         vfs = vfstype(self.path)
         vfs.createmode = self.createmode
-        self.opener = scmutil.filteropener(vfs, encodefilename)
+        self.vfs = scmutil.filtervfs(vfs, encodefilename)
+        self.opener = self.vfs
 
     def datafiles(self):
         for a, b, size in self._walk('data', True):
@@ -387,7 +389,8 @@
         vfs.createmode = self.createmode
         fnc = fncache(vfs)
         self.fncache = fnc
-        self.opener = _fncachevfs(vfs, fnc, encode)
+        self.vfs = _fncachevfs(vfs, fnc, encode)
+        self.opener = self.vfs
 
     def join(self, f):
         return self.path + '/' + self.encode(f)



More information about the Mercurial-devel mailing list