This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10341

sidedata: gate sidedata functionality to revlogv2 in more places
ClosedPublic

Authored by Alphare on Apr 9 2021, 4:49 AM.

Details

Reviewers
indygreg
marmoute
Group Reviewers
hg-reviewers
Commits
rHG5554aacd783f: sidedata: gate sidedata functionality to revlogv2 in more places
Summary

Since revlogv1 is not capable of storing sidedata, we prevent sidedata
mechanisms around the revlog layer from doing anything. We however keep the
ones that allow a revlogv1 repo to generate sidedata on-the-fly on a push, the
pull case simply does not add the sidedata to the revlog.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Apr 9 2021, 4:49 AM
marmoute requested changes to this revision.Apr 9 2021, 6:00 AM
marmoute added a subscriber: marmoute.

why ?

This revision now requires changes to proceed.Apr 9 2021, 6:00 AM
Alphare edited the summary of this revision. (Show Details)Apr 10 2021, 3:14 PM
marmoute accepted this revision.Apr 16 2021, 7:38 AM
This revision now requires review to proceed.Apr 16 2021, 7:38 AM
Alphare updated this revision to Diff 27030.Apr 19 2021, 6:09 AM
Alphare updated this revision to Diff 27097.Apr 20 2021, 9:38 AM
marmoute accepted this revision.Apr 22 2021, 1:38 PM
baymax updated this revision to Diff 27298.May 3 2021, 6:06 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27448.May 3 2021, 9:01 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare added a commit: rHG5554aacd783f: sidedata: gate sidedata functionality to revlogv2 in more places.May 5 2021, 6:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5554aacd783f: sidedata: gate sidedata functionality to revlogv2 in more places (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (7 lines)
Mmercurial/localrepo.py (3 lines)
Mmercurial/revlog.py (2 lines)

Diff 27601

mercurial/changegroup.py

`sidedata_categories` is an optional set of the remote's sidedata wanted `sidedata_categories` is an optional set of the remote's sidedata wanted
categories. categories.
""" """
repo = repo.unfiltered() repo = repo.unfiltered()
# Only useful if we're adding sidedata categories. If both peers have # Only useful if we're adding sidedata categories. If both peers have
# the same categories, then we simply don't do anything. # the same categories, then we simply don't do anything.
if self.version == b'04' and srctype == b'pull': adding_sidedata = (
requirements.REVLOGV2_REQUIREMENT in repo.requirements
and self.version == b'04'
and srctype == b'pull'
)
if adding_sidedata:
sidedata_helpers = get_sidedata_helpers( sidedata_helpers = get_sidedata_helpers(
repo, repo,
sidedata_categories or set(), sidedata_categories or set(),
pull=True, pull=True,
) )
else: else:
sidedata_helpers = None sidedata_helpers = None

mercurial/localrepo.py

fp = self.vfs(b'last-message.txt', b'wb') fp = self.vfs(b'last-message.txt', b'wb')
try: try:
fp.write(text) fp.write(text)
finally: finally:
fp.close() fp.close()
return self.pathto(fp.name[len(self.root) + 1 :]) return self.pathto(fp.name[len(self.root) + 1 :])
def register_wanted_sidedata(self, category): def register_wanted_sidedata(self, category):
if requirementsmod.REVLOGV2_REQUIREMENT not in self.requirements:
# Only revlogv2 repos can want sidedata.
return
self._wanted_sidedata.add(pycompat.bytestr(category)) self._wanted_sidedata.add(pycompat.bytestr(category))
def register_sidedata_computer(self, kind, category, keys, computer): def register_sidedata_computer(self, kind, category, keys, computer):
if kind not in revlogconst.ALL_KINDS: if kind not in revlogconst.ALL_KINDS:
msg = _(b"unexpected revlog kind %r.") msg = _(b"unexpected revlog kind %r.")
raise error.ProgrammingError(msg % kind) raise error.ProgrammingError(msg % kind)
category = pycompat.bytestr(category) category = pycompat.bytestr(category)
if category in self._sidedata_computers.get(kind, []): if category in self._sidedata_computers.get(kind, []):

mercurial/revlog.py

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: if sidedata and self.version & 0xFFFF == REVLOGV2:
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