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

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Sat Aug 11 07:14:46 CDT 2012


# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1344687075 -32400
# Node ID 2819a8dd4a06f6213b6bba9a535fff523c347151
# Parent  a471147e47cf6477af91cad0f93d27340997c914
store: initialize "vfs" fields by "vfs" constructors

This patch also leaves "opener" fields as aliases of "vfs" ones.

diff -r a471147e47cf -r 2819a8dd4a06 mercurial/store.py
--- a/mercurial/store.py	Sat Aug 11 21:11:15 2012 +0900
+++ b/mercurial/store.py	Sat Aug 11 21:11:15 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):
@@ -389,7 +391,8 @@
         vfs.createmode = self.createmode
         fnc = fncache(vfs)
         self.fncache = fnc
-        self.opener = _fncacheopener(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