This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7271

linelog: be more careful about types before looking for _target attribute
ClosedPublic

Authored by durin42 on Nov 6 2019, 5:57 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG14e374d4c9ee: linelog: be more careful about types before looking for _target attribute
Summary

Without this, pytype (correctly) complains that fakejge might not have
a _cmprev attribute. We're operating on some constraints not
expressible in the type system, so we detect the invalid case and
raise a nicer exception now.

Sadly, we also need an assert to give PyType a clue that we know
what we're doing, but I can absolutely live with that.

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

durin42 created this revision.Nov 6 2019, 5:57 PM
indygreg accepted this revision.Nov 7 2019, 3:09 AM
indygreg added a subscriber: indygreg.

I can live with assertions to appease our static analysis bot overlords as well, too.

This revision is now accepted and ready to land.Nov 7 2019, 3:09 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/linelog.py (8 lines)

Diff 17688

mercurial/linelog.py

raise LineLogError( raise LineLogError(
b"invalid linelog buffer size %d (must be a multiple of %d)" b"invalid linelog buffer size %d (must be a multiple of %d)"
% (len(buf), _llentry.size) % (len(buf), _llentry.size)
) )
expected = len(buf) / _llentry.size expected = len(buf) / _llentry.size
fakejge = _decodeone(buf, 0) fakejge = _decodeone(buf, 0)
if isinstance(fakejge, _jump): if isinstance(fakejge, _jump):
maxrev = 0 maxrev = 0
else: elif isinstance(fakejge, (_jge, _jl)):
maxrev = fakejge._cmprev maxrev = fakejge._cmprev
else:
raise LineLogError(
'Expected one of _jump, _jge, or _jl. Got %s.'
% type(fakejge).__name__
)
assert isinstance(fakejge, (_jump, _jge, _jl)) # help pytype
numentries = fakejge._target numentries = fakejge._target
if expected != numentries: if expected != numentries:
raise LineLogError( raise LineLogError(
b"corrupt linelog data: claimed" b"corrupt linelog data: claimed"
b" %d entries but given data for %d entries" b" %d entries but given data for %d entries"
% (expected, numentries) % (expected, numentries)
) )
instructions = [_eof(0, 0)] instructions = [_eof(0, 0)]