mercurial: comparison mercurial/revlog.py

equal deleted inserted replaced

-:e340b556a13e
+:b876f0bf7366
 from .i18n import _
 from .pycompat import getattr
 from .revlogutils.constants import (
 ALL_KINDS,
 COMP_MODE_INLINE,
+COMP_MODE_PLAIN,
 FEATURES_BY_VERSION,
 FLAG_GENERALDELTA,
 FLAG_INLINE_DATA,
 INDEX_HEADER,
 REVLOGV0,
 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 self.decompress(self._getsegmentforrevs(rev, rev, df=df)[1])
+compression_mode = self.index[rev][10]
+data = self._getsegmentforrevs(rev, rev, df=df)[1]
+if compression_mode == COMP_MODE_PLAIN:
+return data
+elif compression_mode == COMP_MODE_INLINE:
+return self.decompress(data)
+else:
+msg = 'unknown compression mode %d'
+msg %= compression_mode
+raise error.RevlogError(msg)
 def _chunks(self, revs, df=None, targetsize=None):
 """Obtain decompressed chunks for the specified revisions.
 Accepts an iterable of numeric revisions that are assumed to be in
 for rev in revschunk:
 chunkstart = start(rev)
 if inline:
 chunkstart += (rev + 1) * iosize
 chunklength = length(rev)
+comp_mode = self.index[rev][10]
 c = buffer(data, chunkstart - offset, chunklength)
-ladd(decomp(c))
+if comp_mode == COMP_MODE_PLAIN:
+ladd(c)
+elif comp_mode == COMP_MODE_INLINE:
+ladd(decomp(c))
+else:
+msg = 'unknown compression mode %d'
+msg %= comp_mode
+raise error.RevlogError(msg)
 return l
 def _chunkclear(self):
 """Clear the raw chunk cache."""
 revinfo = _revisioninfo(node, p1, p2, btext, textlen, cachedelta, flags)
 deltainfo = deltacomputer.finddeltainfo(revinfo, fh)
+compression_mode = COMP_MODE_INLINE
+if self._docket is not None:
+h, d = deltainfo.data
+if not h and not d:
+# not data to store at all... declare them uncompressed
+compression_mode = COMP_MODE_PLAIN
+elif not h and d[0:1] == b'\0':
+compression_mode = COMP_MODE_PLAIN
+elif h == b'u':
+# we have a more efficient way to declare uncompressed
+h = b''
+compression_mode = COMP_MODE_PLAIN
+deltainfo = deltautil.drop_u_compression(deltainfo)
 if sidedata and self.hassidedata:
 serialized_sidedata = sidedatautil.serialize_sidedata(sidedata)
 sidedata_offset = offset + deltainfo.deltalen
 else:
 serialized_sidedata = b""
 p1r,
 p2r,
 node,
 sidedata_offset,
 len(serialized_sidedata),
-COMP_MODE_INLINE,
+compression_mode,
 )
 self.index.append(e)
 entry = self.index.entry_binary(curr)
 if curr == 0 and self._docket is None:

changeset 47253	b876f0bf7366
parent 47252	e340b556a13e
child 47254	eac3591abbf4