##// END OF EJS Templates
revlog: rename internal functions containing "chunk" to use "segment"...
Gregory Szorc -
r32222:1395f843 default
parent child Browse files
Show More
@@ -1075,7 +1075,7 b' class revlog(object):'
1075 p1, p2 = self.parents(node)
1075 p1, p2 = self.parents(node)
1076 return hash(text, p1, p2) != node
1076 return hash(text, p1, p2) != node
1077
1077
1078 def _addchunk(self, offset, data):
1078 def _cachesegment(self, offset, data):
1079 """Add a segment to the revlog cache.
1079 """Add a segment to the revlog cache.
1080
1080
1081 Accepts an absolute offset and the data that is at that location.
1081 Accepts an absolute offset and the data that is at that location.
@@ -1087,7 +1087,7 b' class revlog(object):'
1087 else:
1087 else:
1088 self._chunkcache = offset, data
1088 self._chunkcache = offset, data
1089
1089
1090 def _loadchunk(self, offset, length, df=None):
1090 def _readsegment(self, offset, length, df=None):
1091 """Load a segment of raw data from the revlog.
1091 """Load a segment of raw data from the revlog.
1092
1092
1093 Accepts an absolute offset, length to read, and an optional existing
1093 Accepts an absolute offset, length to read, and an optional existing
@@ -1118,12 +1118,12 b' class revlog(object):'
1118 d = df.read(reallength)
1118 d = df.read(reallength)
1119 if closehandle:
1119 if closehandle:
1120 df.close()
1120 df.close()
1121 self._addchunk(realoffset, d)
1121 self._cachesegment(realoffset, d)
1122 if offset != realoffset or reallength != length:
1122 if offset != realoffset or reallength != length:
1123 return util.buffer(d, offset - realoffset, length)
1123 return util.buffer(d, offset - realoffset, length)
1124 return d
1124 return d
1125
1125
1126 def _getchunk(self, offset, length, df=None):
1126 def _getsegment(self, offset, length, df=None):
1127 """Obtain a segment of raw data from the revlog.
1127 """Obtain a segment of raw data from the revlog.
1128
1128
1129 Accepts an absolute offset, length of bytes to obtain, and an
1129 Accepts an absolute offset, length of bytes to obtain, and an
@@ -1145,7 +1145,7 b' class revlog(object):'
1145 return d # avoid a copy
1145 return d # avoid a copy
1146 return util.buffer(d, cachestart, cacheend - cachestart)
1146 return util.buffer(d, cachestart, cacheend - cachestart)
1147
1147
1148 return self._loadchunk(offset, length, df=df)
1148 return self._readsegment(offset, length, df=df)
1149
1149
1150 def _chunkraw(self, startrev, endrev, df=None):
1150 def _chunkraw(self, startrev, endrev, df=None):
1151 """Obtain a segment of raw data corresponding to a range of revisions.
1151 """Obtain a segment of raw data corresponding to a range of revisions.
@@ -1179,7 +1179,7 b' class revlog(object):'
1179 end += (endrev + 1) * self._io.size
1179 end += (endrev + 1) * self._io.size
1180 length = end - start
1180 length = end - start
1181
1181
1182 return start, self._getchunk(start, length, df=df)
1182 return start, self._getsegment(start, length, df=df)
1183
1183
1184 def _chunk(self, rev, df=None):
1184 def _chunk(self, rev, df=None):
1185 """Obtain a single decompressed chunk for a revision.
1185 """Obtain a single decompressed chunk for a revision.
General Comments 0
You need to be logged in to leave comments. Login now