( )⚙ D10782 revlog: use `self.sidedata` directly in `revlog.clone`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10782

revlog: use `self.sidedata` directly in `revlog.clone`
ClosedPublic

Authored by marmoute on May 28 2021, 6:56 PM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHGfec306b05328: revlog: use `self.sidedata` directly in `revlog.clone`
Summary

We want to change revlog._revisiondata signature, so we need to migrate users
away.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.May 28 2021, 6:56 PM
Alphare accepted this revision as: Alphare.May 31 2021, 6:14 AM
baymax updated this revision to Diff 28295.May 31 2021, 6:37 AM

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

baymax updated this revision to Diff 28392.Jun 1 2021, 11:10 PM

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

baymax updated this revision to Diff 28441.Jun 4 2021, 9:54 AM

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

marmoute added a commit: rHGfec306b05328: revlog: use `self.sidedata` directly in `revlog.clone`.Jun 7 2021, 5:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGfec306b05328: revlog: use `self.sidedata` directly in `revlog.clone` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (6 lines)

Diff 28295

mercurial/revlog.py

p2 = index[entry[6]][7] p2 = index[entry[6]][7]
node = entry[7] node = entry[7]
# (Possibly) reuse the delta from the revlog if allowed and # (Possibly) reuse the delta from the revlog if allowed and
# the revlog chunk is a delta. # the revlog chunk is a delta.
cachedelta = None cachedelta = None
rawtext = None rawtext = None
if deltareuse == self.DELTAREUSEFULLADD: if deltareuse == self.DELTAREUSEFULLADD:
text, sidedata = self._revisiondata(rev) text = self._revisiondata(rev)[0]
sidedata = self.sidedata(rev)
if sidedata_helpers is not None: if sidedata_helpers is not None:
(sidedata, new_flags) = sidedatautil.run_sidedata_helpers( (sidedata, new_flags) = sidedatautil.run_sidedata_helpers(
self, sidedata_helpers, sidedata, rev self, sidedata_helpers, sidedata, rev
) )
flags = flags | new_flags[0] & ~new_flags[1] flags = flags | new_flags[0] & ~new_flags[1]
destrevlog.addrevision( destrevlog.addrevision(
else: else:
if destrevlog._lazydelta: if destrevlog._lazydelta:
dp = self.deltaparent(rev) dp = self.deltaparent(rev)
if dp != nullrev: if dp != nullrev:
cachedelta = (dp, bytes(self._chunk(rev))) cachedelta = (dp, bytes(self._chunk(rev)))
sidedata = None sidedata = None
if not cachedelta: if not cachedelta:
rawtext, sidedata = self._revisiondata(rev) rawtext = self._revisiondata(rev)[0]
sidedata = self.sidedata(rev)
if sidedata is None: if sidedata is None:
sidedata = self.sidedata(rev) sidedata = self.sidedata(rev)
if sidedata_helpers is not None: if sidedata_helpers is not None:
(sidedata, new_flags) = sidedatautil.run_sidedata_helpers( (sidedata, new_flags) = sidedatautil.run_sidedata_helpers(
self, sidedata_helpers, sidedata, rev self, sidedata_helpers, sidedata, rev
) )
flags = flags | new_flags[0] & ~new_flags[1] flags = flags | new_flags[0] & ~new_flags[1]