facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

revlog: mark cache private

Browse Source
This commit is contained in:
Matt Mackall 2007-07-23 20:44:08 -05:00
parent 9a71ba31c4
commit f3686b0a39
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mercurial/bundlerepo.py
View File

@ -104,8 +104,8 @@ class bundlerevlog(revlog.revlog):
rev = self.rev(iter_node)
# reconstruct the revision if it is from a changegroup
while self.bundle(rev):
if self.cache and self.cache[0] == iter_node:
text = self.cache[2]
if self._cache and self._cache[0] == iter_node:
text = self._cache[2]
break
chain.append(rev)
iter_node = self.bundlebase(rev)
@ -122,7 +122,7 @@ class bundlerevlog(revlog.revlog):
raise revlog.RevlogError(_("integrity check failed on %s:%d")
% (self.datafile, self.rev(node)))
self.cache = (node, self.rev(node), text)
self._cache = (node, self.rev(node), text)
return text
def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):

19
mercurial/revlog.py
View File

@ -409,9 +409,8 @@ class revlog(object):
self.indexfile = indexfile
self.datafile = indexfile[:-2] + ".d"
self.opener = opener
self.indexstat = None
self.cache = None
self._cache = None
self._chunkcache = None
self.defversion = REVLOG_DEFAULT_VERSION
if hasattr(opener, "defversion"):
@ -891,8 +890,8 @@ class revlog(object):
"""return an uncompressed revision of a given"""
if node == nullid:
return ""
if self.cache and self.cache[0] == node:
return self.cache[2]
if self._cache and self._cache[0] == node:
return self._cache[2]
# look up what we need to read
text = None
@ -906,9 +905,9 @@ class revlog(object):
df = self.opener(self.datafile)
# do we have useful data cached?
if self.cache and self.cache[1] >= base and self.cache[1] < rev:
base = self.cache[1]
text = self.cache[2]
if self._cache and self._cache[1] >= base and self._cache[1] < rev:
base = self._cache[1]
text = self._cache[2]
self._loadindex(base, rev + 1)
else:
self._loadindex(base, rev + 1)
@ -925,7 +924,7 @@ class revlog(object):
raise RevlogError(_("integrity check failed on %s:%d")
% (self.datafile, rev))
self.cache = (node, rev, text)
self._cache = (node, rev, text)
return text
def checkinlinesize(self, tr, fp=None):
@ -1047,7 +1046,7 @@ class revlog(object):
ifh.write(data[1])
self.checkinlinesize(transaction, ifh)
self.cache = (node, curr, text)
self._cache = (node, curr, text)
return node
def ancestor(self, a, b):
@ -1233,7 +1232,7 @@ class revlog(object):
indexf.truncate(end)
# then reset internal state in memory to forget those revisions
self.cache = None
self._cache = None
self._chunkcache = None
for x in xrange(rev, self.count()):
del self.nodemap[self.node(x)]