This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11267

issue6528: implement _is_revision_affected using callback
ClosedPublic

Authored by marmoute on Aug 7 2021, 10:07 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5b046c2e3000: issue6528: implement _is_revision_affected using callback
Summary

The delta comming from a bundle/stream does not exists in the revlog yet, so we
will need other way to retrieve the same information.

To prepare for this we split the function to use callbacks in the core logic.

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.Aug 7 2021, 10:07 AM
baymax updated this revision to Diff 29858.Aug 8 2021, 5:22 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

pulkit accepted this revision.Aug 10 2021, 8:18 AM
This revision is now accepted and ready to land.Aug 10 2021, 8:18 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/rewrite.py (17 lines)

Diff 29879

mercurial/revlogutils/rewrite.py

rl.opener.rename(new_file_path, index_file) rl.opener.rename(new_file_path, index_file)
rl.clearcaches() rl.clearcaches()
rl._loadindex() rl._loadindex()
finally: finally:
util.tryunlink(new_file_path) util.tryunlink(new_file_path)
def _is_revision_affected(fl, filerev, metadata_cache=None): def _is_revision_affected(fl, filerev, metadata_cache=None):
full_text = lambda: fl._revlog.rawdata(filerev)
parent_revs = lambda: fl._revlog.parentrevs(filerev)
return _is_revision_affected_inner(
full_text, parent_revs, filerev, metadata_cache
)
def _is_revision_affected_inner(
full_text,
parents_revs,
filerev,
metadata_cache=None,
):
"""Mercurial currently (5.9rc0) uses `p1 == nullrev and p2 != nullrev` as a """Mercurial currently (5.9rc0) uses `p1 == nullrev and p2 != nullrev` as a
special meaning compared to the reverse in the context of filelog-based special meaning compared to the reverse in the context of filelog-based
copytracing. issue6528 exists because new code assumed that parent ordering copytracing. issue6528 exists because new code assumed that parent ordering
didn't matter, so this detects if the revision contains metadata (since didn't matter, so this detects if the revision contains metadata (since
it's only used for filelog-based copytracing) and its parents are in the it's only used for filelog-based copytracing) and its parents are in the
"wrong" order.""" "wrong" order."""
try: try:
raw_text = fl.rawdata(filerev) raw_text = full_text()
except error.CensoredNodeError: except error.CensoredNodeError:
# We don't care about censored nodes as they never carry metadata # We don't care about censored nodes as they never carry metadata
return False return False
has_meta = raw_text.startswith(b'\x01\n') has_meta = raw_text.startswith(b'\x01\n')
if metadata_cache is not None: if metadata_cache is not None:
metadata_cache[filerev] = has_meta metadata_cache[filerev] = has_meta
if has_meta: if has_meta:
(p1, p2) = fl.parentrevs(filerev) (p1, p2) = parents_revs()
if p1 != nullrev and p2 == nullrev: if p1 != nullrev and p2 == nullrev:
return True return True
return False return False
def _is_revision_affected_fast(repo, fl, filerev, metadata_cache): def _is_revision_affected_fast(repo, fl, filerev, metadata_cache):
"""Optimization fast-path for `_is_revision_affected`. """Optimization fast-path for `_is_revision_affected`.