| indygreg | |
| Alphare |
| hg-reviewers |
This is more flexible and semantically more correct. The associated revlog's
attribute exist since 827cb4fe62a3, so well we start linking sidedata to
revlogv2.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revlog.py (8 lines) | |||
| M | tests/testlib/ext-sidedata.py (2 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| c709cc176787 | 7b6460ccbec5 | Pierre-Yves David | May 3 2021, 6:19 AM |
| def flags(self, rev): | def flags(self, rev): | ||||
| return self.index[rev][0] & 0xFFFF | return self.index[rev][0] & 0xFFFF | ||||
| def length(self, rev): | def length(self, rev): | ||||
| return self.index[rev][1] | return self.index[rev][1] | ||||
| def sidedata_length(self, rev): | def sidedata_length(self, rev): | ||||
| if self.version & 0xFFFF != REVLOGV2: | if not self.hassidedata: | ||||
| return 0 | return 0 | ||||
| return self.index[rev][9] | return self.index[rev][9] | ||||
| def rawsize(self, rev): | def rawsize(self, rev): | ||||
| """return the length of the uncompressed text for a given revision""" | """return the length of the uncompressed text for a given revision""" | ||||
| l = self.index[rev][2] | l = self.index[rev][2] | ||||
| if l >= 0: | if l >= 0: | ||||
| return l | return l | ||||
| # fast path the special `nullid` rev | # fast path the special `nullid` rev | ||||
| if node == self.nullid: | if node == self.nullid: | ||||
| return b"", {} | return b"", {} | ||||
| # ``rawtext`` is the text as stored inside the revlog. Might be the | # ``rawtext`` is the text as stored inside the revlog. Might be the | ||||
| # revision or might need to be processed to retrieve the revision. | # revision or might need to be processed to retrieve the revision. | ||||
| rev, rawtext, validated = self._rawtext(node, rev, _df=_df) | rev, rawtext, validated = self._rawtext(node, rev, _df=_df) | ||||
| if self.version & 0xFFFF == REVLOGV2: | if self.hassidedata: | ||||
| if rev is None: | if rev is None: | ||||
| rev = self.rev(node) | rev = self.rev(node) | ||||
| sidedata = self._sidedata(rev) | sidedata = self._sidedata(rev) | ||||
| else: | else: | ||||
| sidedata = {} | sidedata = {} | ||||
| if raw and validated: | if raw and validated: | ||||
| # if we don't want to process the raw text and that raw | # if we don't want to process the raw text and that raw | ||||
| if deltacomputer is None: | if deltacomputer is None: | ||||
| deltacomputer = deltautil.deltacomputer(self) | deltacomputer = deltautil.deltacomputer(self) | ||||
| revinfo = _revisioninfo(node, p1, p2, btext, textlen, cachedelta, flags) | revinfo = _revisioninfo(node, p1, p2, btext, textlen, cachedelta, flags) | ||||
| deltainfo = deltacomputer.finddeltainfo(revinfo, fh) | deltainfo = deltacomputer.finddeltainfo(revinfo, fh) | ||||
| if sidedata and self.version & 0xFFFF == REVLOGV2: | if sidedata and self.hassidedata: | ||||
| serialized_sidedata = sidedatautil.serialize_sidedata(sidedata) | serialized_sidedata = sidedatautil.serialize_sidedata(sidedata) | ||||
| sidedata_offset = offset + deltainfo.deltalen | sidedata_offset = offset + deltainfo.deltalen | ||||
| else: | else: | ||||
| serialized_sidedata = b"" | serialized_sidedata = b"" | ||||
| # Don't store the offset if the sidedata is empty, that way | # Don't store the offset if the sidedata is empty, that way | ||||
| # we can easily detect empty sidedata and they will be no different | # we can easily detect empty sidedata and they will be no different | ||||
| # than ones we manually add. | # than ones we manually add. | ||||
| sidedata_offset = 0 | sidedata_offset = 0 | ||||
| if storedsize: | if storedsize: | ||||
| d[b'storedsize'] = sum( | d[b'storedsize'] = sum( | ||||
| self.opener.stat(path).st_size for path in self.files() | self.opener.stat(path).st_size for path in self.files() | ||||
| ) | ) | ||||
| return d | return d | ||||
| def rewrite_sidedata(self, helpers, startrev, endrev): | def rewrite_sidedata(self, helpers, startrev, endrev): | ||||
| if self.version & 0xFFFF != REVLOGV2: | if not self.hassidedata: | ||||
| return | return | ||||
| # inline are not yet supported because they suffer from an issue when | # inline are not yet supported because they suffer from an issue when | ||||
| # rewriting them (since it's not an append-only operation). | # rewriting them (since it's not an append-only operation). | ||||
| # See issue6485. | # See issue6485. | ||||
| assert not self._inline | assert not self._inline | ||||
| if not helpers[1] and not helpers[2]: | if not helpers[1] and not helpers[2]: | ||||
| # Nothing to generate or remove | # Nothing to generate or remove | ||||
| return | return | ||||
| sd[sidedata.SD_TEST2] = struct.pack('>32s', sha256) | sd[sidedata.SD_TEST2] = struct.pack('>32s', sha256) | ||||
| return orig(self, text, transaction, link, p1, p2, *args, **kwargs) | return orig(self, text, transaction, link, p1, p2, *args, **kwargs) | ||||
| def wrap_revisiondata(orig, self, nodeorrev, *args, **kwargs): | def wrap_revisiondata(orig, self, nodeorrev, *args, **kwargs): | ||||
| text, sd = orig(self, nodeorrev, *args, **kwargs) | text, sd = orig(self, nodeorrev, *args, **kwargs) | ||||
| if getattr(self, 'sidedatanocheck', False): | if getattr(self, 'sidedatanocheck', False): | ||||
| return text, sd | return text, sd | ||||
| if self.version & 0xFFFF != 2: | if self.hassidedata: | ||||
| return text, sd | return text, sd | ||||
| if nodeorrev != nullrev and nodeorrev != self.nullid: | if nodeorrev != nullrev and nodeorrev != self.nullid: | ||||
| cat1 = sd.get(sidedata.SD_TEST1) | cat1 = sd.get(sidedata.SD_TEST1) | ||||
| if cat1 is not None and len(text) != struct.unpack('>I', cat1)[0]: | if cat1 is not None and len(text) != struct.unpack('>I', cat1)[0]: | ||||
| raise RuntimeError('text size mismatch') | raise RuntimeError('text size mismatch') | ||||
| expected = sd.get(sidedata.SD_TEST2) | expected = sd.get(sidedata.SD_TEST2) | ||||
| got = hashlib.sha256(text).digest() | got = hashlib.sha256(text).digest() | ||||
| if expected is not None and got != expected: | if expected is not None and got != expected: | ||||