( )⚙ D11685 rewrite: fix issue6599

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11685

rewrite: fix issue6599
ClosedPublic

Authored by Alphare on Oct 18 2021, 11:12 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG531d26b1390a: rewrite: fix issue6599
rHG32b824459175: rewrite: fix issue6599
Summary

Explanation inside.

Diff Detail

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

Event Timeline

Alphare created this revision.Oct 18 2021, 11:12 AM
Alphare added a commit: rHG32b824459175: rewrite: fix issue6599.Oct 18 2021, 3:34 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG32b824459175: rewrite: fix issue6599 (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
Alphare added a subscriber: joerg.sonnenberger.Oct 19 2021, 7:44 AM

@joerg.sonnenberger mentioned that the length check isn't needed, so I'll amend my change to remove it.

Revision Contents
Changeset List

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

Diff 30878

mercurial/revlogutils/rewrite.py

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 = full_text() 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')
# raw text can be a `memoryview`, which doesn't implement `startswith`
has_meta = len(raw_text) >= 2 and bytes(raw_text[:2]) == 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) = parents_revs() (p1, p2) = parents_revs()
if p1 != nullrev and p2 == nullrev: if p1 != nullrev and p2 == nullrev:
return True return True
return False return False