( )⚙ D10799 revlog: add a ways to blacklist some revision when searching for a delta

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10799

revlog: add a ways to blacklist some revision when searching for a delta
ClosedPublic

Authored by marmoute on May 30 2021, 1:30 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1efe3cdef53a: revlog: add a ways to blacklist some revision when searching for a delta
Summary

This will be useful to recompute appropriate deltas one the fly during
censor/strip operation with revlog-v2.

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

marmoute created this revision.May 30 2021, 1:30 PM
baymax updated this revision to Diff 28312.May 31 2021, 6:51 AM

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

Alphare requested changes to this revision.May 31 2021, 10:50 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/revlogutils/deltas.py
1053

Should be excluded_bases, since it's a set. Could you add its purpose to the docstring?

This revision now requires changes to proceed.May 31 2021, 10:50 AM
baymax updated this revision to Diff 28327.May 31 2021, 4:21 PM

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

baymax updated this revision to Diff 28409.Jun 1 2021, 11:17 PM

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

Alphare accepted this revision as: Alphare.Jun 2 2021, 4:22 AM
baymax updated this revision to Diff 28424.Jun 2 2021, 7:43 AM

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

baymax updated this revision to Diff 28458.Jun 4 2021, 11:05 AM

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

baymax updated this revision to Diff 28480.Jun 7 2021, 5:17 AM

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

marmoute added a commit: rHG1efe3cdef53a: revlog: add a ways to blacklist some revision when searching for a delta.Jun 7 2021, 5:26 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1efe3cdef53a: revlog: add a ways to blacklist some revision when searching for a delta (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/deltas.py (11 lines)

Diff 28502

mercurial/revlogutils/deltas.py

data, data,
deltabase, deltabase,
chainbase, chainbase,
chainlen, chainlen,
compresseddeltalen, compresseddeltalen,
snapshotdepth, snapshotdepth,
) )
def finddeltainfo(self, revinfo, fh): def finddeltainfo(self, revinfo, fh, excluded_bases=None):
AlphareUnsubmitted
Not Done

Should be excluded_bases, since it's a set. Could you add its purpose to the docstring?

Alphare: Should be `excluded_bases`, since it's a set. Could you add its purpose to the docstring?
"""Find an acceptable delta against a candidate revision """Find an acceptable delta against a candidate revision
revinfo: information about the revision (instance of _revisioninfo) revinfo: information about the revision (instance of _revisioninfo)
fh: file handle to either the .i or the .d revlog file, fh: file handle to either the .i or the .d revlog file,
depending on whether it is inlined or not depending on whether it is inlined or not
Returns the first acceptable candidate revision, as ordered by Returns the first acceptable candidate revision, as ordered by
_candidategroups _candidategroups
If no suitable deltabase is found, we return delta info for a full If no suitable deltabase is found, we return delta info for a full
snapshot. snapshot.
`excluded_bases` is an optional set of revision that cannot be used as
a delta base. Use this to recompute delta suitable in censor or strip
context.
""" """
if not revinfo.textlen: if not revinfo.textlen:
return self._fullsnapshotinfo(fh, revinfo) return self._fullsnapshotinfo(fh, revinfo)
if excluded_bases is None:
excluded_bases = set()
# no delta for flag processor revision (see "candelta" for why) # no delta for flag processor revision (see "candelta" for why)
# not calling candelta since only one revision needs test, also to # not calling candelta since only one revision needs test, also to
# avoid overhead fetching flags again. # avoid overhead fetching flags again.
if revinfo.flags & REVIDX_RAWTEXT_CHANGING_FLAGS: if revinfo.flags & REVIDX_RAWTEXT_CHANGING_FLAGS:
return self._fullsnapshotinfo(fh, revinfo) return self._fullsnapshotinfo(fh, revinfo)
cachedelta = revinfo.cachedelta cachedelta = revinfo.cachedelta
p1 = revinfo.p1 p1 = revinfo.p1
p2 = revinfo.p2 p2 = revinfo.p2
revlog = self.revlog revlog = self.revlog
deltainfo = None deltainfo = None
p1r, p2r = revlog.rev(p1), revlog.rev(p2) p1r, p2r = revlog.rev(p1), revlog.rev(p2)
groups = _candidategroups( groups = _candidategroups(
self.revlog, revinfo.textlen, p1r, p2r, cachedelta self.revlog, revinfo.textlen, p1r, p2r, cachedelta
) )
candidaterevs = next(groups) candidaterevs = next(groups)
while candidaterevs is not None: while candidaterevs is not None:
nominateddeltas = [] nominateddeltas = []
if deltainfo is not None: if deltainfo is not None:
# if we already found a good delta, # if we already found a good delta,
# challenge it against refined candidates # challenge it against refined candidates
nominateddeltas.append(deltainfo) nominateddeltas.append(deltainfo)
for candidaterev in candidaterevs: for candidaterev in candidaterevs:
if candidaterev in excluded_bases:
continue
candidatedelta = self._builddeltainfo(revinfo, candidaterev, fh) candidatedelta = self._builddeltainfo(revinfo, candidaterev, fh)
if candidatedelta is not None: if candidatedelta is not None:
if isgooddeltainfo(self.revlog, candidatedelta, revinfo): if isgooddeltainfo(self.revlog, candidatedelta, revinfo):
nominateddeltas.append(candidatedelta) nominateddeltas.append(candidatedelta)
if nominateddeltas: if nominateddeltas:
deltainfo = min(nominateddeltas, key=lambda x: x.deltalen) deltainfo = min(nominateddeltas, key=lambda x: x.deltalen)
if deltainfo is not None: if deltainfo is not None:
candidaterevs = groups.send(deltainfo.base) candidaterevs = groups.send(deltainfo.base)
else: else:
candidaterevs = next(groups) candidaterevs = next(groups)
if deltainfo is None: if deltainfo is None:
deltainfo = self._fullsnapshotinfo(fh, revinfo) deltainfo = self._fullsnapshotinfo(fh, revinfo)
return deltainfo return deltainfo