@@ -125,8 +125,8 @@
import mercurial.manifest
timer, fm = gettimer(ui)
def t():
- repo.changelog = mercurial.changelog.changelog(repo.sopener)
- repo.manifest = mercurial.manifest.manifest(repo.sopener)
+ repo.changelog = mercurial.changelog.changelog(repo.svfs)
+ repo.manifest = mercurial.manifest.manifest(repo.svfs)
repo._tags = None
return len(repo.tags())
timer(t)
@@ -265,7 +265,7 @@
mercurial.revlog._prereadsize = 2**24 # disable lazy parser in old hg
n = repo["tip"].node()
def d():
- cl = mercurial.revlog.revlog(repo.sopener, "00changelog.i")
+ cl = mercurial.revlog.revlog(repo.svfs, "00changelog.i")
cl.rev(n)
timer(d)
fm.end()
@@ -308,7 +308,7 @@
import mercurial.revlog
mercurial.revlog._prereadsize = 2**24 # disable lazy parser in old hg
n = repo[rev].node()
- cl = mercurial.revlog.revlog(repo.sopener, "00changelog.i")
+ cl = mercurial.revlog.revlog(repo.svfs, "00changelog.i")
def d():
cl.rev(n)
clearcaches(cl)
@@ -533,5 +533,5 @@
Result is the number of markers in the repo."""
timer, fm = gettimer(ui)
- timer(lambda: len(obsolete.obsstore(repo.sopener)))
+ timer(lambda: len(obsolete.obsstore(repo.svfs)))
fm.end()
@@ -591,7 +591,7 @@
def file(self, f):
if f[0] == '/':
f = f[1:]
- return kwfilelog(self.sopener, kwt, f)
+ return kwfilelog(self.svfs, kwt, f)
def wread(self, filename):
data = super(kwrepo, self).wread(filename)
@@ -254,7 +254,7 @@
def changelog(self):
# consume the header if it exists
self.bundle.changelogheader()
- c = bundlechangelog(self.sopener, self.bundle)
+ c = bundlechangelog(self.svfs, self.bundle)
self.manstart = self.bundle.tell()
return c
@@ -263,7 +263,7 @@
self.bundle.seek(self.manstart)
# consume the header if it exists
self.bundle.manifestheader()
- m = bundlemanifest(self.sopener, self.bundle, self.changelog.rev)
+ m = bundlemanifest(self.svfs, self.bundle, self.changelog.rev)
self.filestart = self.bundle.tell()
return m
@@ -296,10 +296,10 @@
if f in self.bundlefilespos:
self.bundle.seek(self.bundlefilespos[f])
- return bundlefilelog(self.sopener, f, self.bundle,
+ return bundlefilelog(self.svfs, f, self.bundle,
self.changelog.rev, self)
else:
- return filelog.filelog(self.sopener, f)
+ return filelog.filelog(self.svfs, f)
def close(self):
"""Close assigned bundle file immediately."""
@@ -269,7 +269,6 @@
self.store = store.store(requirements, self.sharedpath, scmutil.vfs)
self.spath = self.store.path
self.svfs = self.store.vfs
- self.sopener = self.svfs
self.sjoin = self.store.join
self.vfs.createmode = self.store.createmode
self._applyrequirements(requirements)
@@ -133,7 +133,7 @@
if inst.errno != errno.ENOENT:
raise
if f is None:
- f = repo.sopener('phaseroots')
+ f = repo.svfs('phaseroots')
try:
for line in f:
phase, nh = line.split()
@@ -156,7 +156,7 @@
self.phaseroots, self.dirty = _readroots(repo, phasedefaults)
self._phaserevs = None
self.filterunknown(repo)
- self.opener = repo.sopener
+ self.opener = repo.svfs
def copy(self):
# Shallow copy meant to ensure isolation in
@@ -140,7 +140,7 @@
try:
for i in xrange(offset, len(tr.entries)):
file, troffset, ignore = tr.entries[i]
- repo.sopener(file, 'a').truncate(troffset)
+ repo.svfs(file, 'a').truncate(troffset)
if troffset == 0:
repo.store.markremoved(file)
tr.close()
@@ -129,14 +129,14 @@
# setup store
self.store = store.store(requirements, self.path, opener)
self.spath = self.store.path
- self.sopener = self.store.opener
- self.svfs = self.sopener
+ self.svfs = self.store.opener
+ self.svfs = self.svfs
self.sjoin = self.store.join
self._filecache = {}
self.requirements = requirements
- self.manifest = manifest.manifest(self.sopener)
- self.changelog = changelog.changelog(self.sopener)
+ self.manifest = manifest.manifest(self.svfs)
+ self.changelog = changelog.changelog(self.svfs)
self._tags = None
self.nodetagscache = None
self._branchcaches = {}
@@ -178,7 +178,7 @@
@localrepo.unfilteredpropertycache
def changelog(self):
- return unionchangelog(self.sopener, self.repo2.sopener)
+ return unionchangelog(self.svfs, self.repo2.svfs)
def _clrev(self, rev2):
"""map from repo2 changelog rev to temporary rev in self.changelog"""
@@ -187,14 +187,14 @@
@localrepo.unfilteredpropertycache
def manifest(self):
- return unionmanifest(self.sopener, self.repo2.sopener,
+ return unionmanifest(self.svfs, self.repo2.svfs,
self._clrev)
def url(self):
return self._url
def file(self, f):
- return unionfilelog(self.sopener, f, self.repo2.sopener,
+ return unionfilelog(self.svfs, f, self.repo2.svfs,
self._clrev, self)
def close(self):
@@ -778,7 +778,7 @@
(len(entries), total_bytes))
yield '%d %d\n' % (len(entries), total_bytes)
- sopener = repo.sopener
+ sopener = repo.svfs
oldaudit = sopener.mustaudit
debugflag = repo.ui.debugflag
sopener.mustaudit = False