[PATCH 1 of 6 V2] localrepo: add "vfs" fields to "localrepository" for migration from "opener"
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Fri Jul 6 04:45:37 CDT 2012
# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1341567926 -32400
# Node ID df1f9c100827e00c6fe1bbf309bf8dc704136d26
# Parent 2e13c1bd34dc6afda8fc7cfa22a8cd658276724f
localrepo: add "vfs" fields to "localrepository" for migration from "opener"
As a part of migration to vfs, this patch adds "vfs" fields to
"localrepository" class.
This allows new codes to access current "opener" objects related to
repositories via "vfs" fields, so patches referring to "vfs" will
replace referring to "opener" in time.
This patch also adds initializations for "vfs" fields to
"statichttprepository" class derived from it, because its constructor
doesn't invoke the constructor of "localrepository", so "vfs" fields
should be initialized explicitly as same as "opener" fields: it has no
working directory, so "wvfs" field is not added.
diff -r 2e13c1bd34dc -r df1f9c100827 mercurial/localrepo.py
--- a/mercurial/localrepo.py Wed Jul 04 17:29:49 2012 +0200
+++ b/mercurial/localrepo.py Fri Jul 06 18:45:26 2012 +0900
@@ -37,7 +37,9 @@
self.origroot = path
self.auditor = scmutil.pathauditor(self.root, self._checknested)
self.opener = scmutil.opener(self.path)
+ self.vfs = self.opener
self.wopener = scmutil.opener(self.root)
+ self.wvfs = self.wopener
self.baseui = baseui
self.ui = baseui.copy()
# A list of callback to shape the phase if no data were found.
@@ -99,6 +101,7 @@
self.store = store.store(requirements, self.sharedpath, scmutil.opener)
self.spath = self.store.path
self.sopener = self.store.opener
+ self.svfs = self.sopener
self.sjoin = self.store.join
self.opener.createmode = self.store.createmode
self._applyrequirements(requirements)
diff -r 2e13c1bd34dc -r df1f9c100827 mercurial/statichttprepo.py
--- a/mercurial/statichttprepo.py Wed Jul 04 17:29:49 2012 +0200
+++ b/mercurial/statichttprepo.py Fri Jul 06 18:45:26 2012 +0900
@@ -87,6 +87,7 @@
opener = build_opener(ui, authinfo)
self.opener = opener(self.path)
+ self.vfs = self.opener
self._phasedefaults = []
try:
@@ -112,6 +113,7 @@
self.store = store.store(requirements, self.path, opener)
self.spath = self.store.path
self.sopener = self.store.opener
+ self.svfs = self.sopener
self.sjoin = self.store.join
self._filecache = {}
More information about the Mercurial-devel
mailing list