mercurial-scm/hg: comparison mercurial/revlog.py

equal deleted inserted replaced

-:e72e669dd51f
+:6446e9b37c8b
 file handle to be used for reading. If the file handle is read, its
 seek position will not be preserved.
 Requests for data may be satisfied by a cache.
-Returns a str or a buffer instance of raw byte data. Callers will
+Returns a 2-tuple of (offset, data) for the requested range of
-need to call ``self.start(rev)`` and ``self.length()`` to determine
+revisions. Offset is the integer offset from the beginning of the
-where each revision's data begins and ends.
+revlog and data is a str or buffer of the raw byte data.
+Callers will need to call ``self.start(rev)`` and ``self.length(rev)``
+to determine where each revision's data begins and ends.
 """
 start = self.start(startrev)
 end = self.end(endrev)
 if self._inline:
 start += (startrev + 1) * self._io.size
 end += (endrev + 1) * self._io.size
 length = end - start
-return self._getchunk(start, length, df=df)
+return start, self._getchunk(start, length, df=df)
 def _chunk(self, rev, df=None):
 """Obtain a single decompressed chunk for a revision.
 Accepts an integer revision and an optional already-open file handle
 to be used for reading. If used, the seek position of the file will not
 be preserved.
 Returns a str holding uncompressed data for the requested revision.
 """
-return decompress(self._chunkraw(rev, rev, df=df))
+return decompress(self._chunkraw(rev, rev, df=df)[1])
 def _chunks(self, revs, df=None):
 """Obtain decompressed chunks for the specified revisions.
 Accepts an iterable of numeric revisions that are assumed to be in
 # preload the cache
 try:
 while True:
 # ensure that the cache doesn't change out from under us
 _cache = self._chunkcache
-self._chunkraw(revs[0], revs[-1], df=df)
+self._chunkraw(revs[0], revs[-1], df=df)[1]
 if _cache == self._chunkcache:
 break
 offset, data = _cache
 except OverflowError:
 # issue4215 - we can't cache a run of chunks greater than
 fp.close()
 df = self.opener(self.datafile, 'w')
 try:
 for r in self:
-df.write(self._chunkraw(r, r))
+df.write(self._chunkraw(r, r)[1])
 finally:
 df.close()
 fp = self.opener(self.indexfile, 'w', atomictemp=True)
 self.version &= ~(REVLOGNGINLINEDATA)

changeset 27649	6446e9b37c8b
parent 27637	b502138f5faa
child 27650	e7222d326ea2