This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9279

pure: guard against empty blocks
ClosedPublic

Authored by indygreg on Nov 7 2020, 8:22 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG68aedad4c11c: pure: guard against empty blocks
Summary

If blocks is empty, we append None to the returned list, which is
incorrect.

This subtle issue was caught by pytype, which correctly identified
the return value as List[Optional[Tuple]] because of this possibility.

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

indygreg created this revision.Nov 7 2020, 8:22 PM
Alphare accepted this revision.Nov 13 2020, 5:00 AM
indygreg added a commit: rHG68aedad4c11c: pure: guard against empty blocks.Nov 18 2020, 6:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG68aedad4c11c: pure: guard against empty blocks (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/bdiff.py (5 lines)

Diff 23547

mercurial/pure/bdiff.py

shift += 1 shift += 1
elif b1end == b2: elif b1end == b2:
while ( while (
b1end + shift < b2end and a[a1end + shift] == b[b1end + shift] b1end + shift < b2end and a[a1end + shift] == b[b1end + shift]
): ):
shift += 1 shift += 1
r.append((a1, b1, l1 + shift)) r.append((a1, b1, l1 + shift))
prev = a2 + shift, b2 + shift, l2 - shift prev = a2 + shift, b2 + shift, l2 - shift
if prev is not None:
r.append(prev) r.append(prev)
return r return r
def bdiff(a, b): def bdiff(a, b):
a = bytes(a).splitlines(True) a = bytes(a).splitlines(True)
b = bytes(b).splitlines(True) b = bytes(b).splitlines(True)
if not a: if not a: