This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7287

simplemerge: disable a pytype error where it's just confused
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG3b581ad59459: simplemerge: disable a pytype error where it's just confused

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:58 PM
indygreg accepted this revision.Nov 7 2019, 3:21 AM
This revision is now accepted and ready to land.Nov 7 2019, 3:21 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (14 lines)

Diff 17701

mercurial/simplemerge.py

Lines where both A and B have made the same changes at the beginning Lines where both A and B have made the same changes at the beginning
or the end of each merge region are eliminated from the conflict or the end of each merge region are eliminated from the conflict
region and are instead considered the same. region and are instead considered the same.
""" """
for region in merge_regions: for region in merge_regions:
if region[0] != b"conflict": if region[0] != b"conflict":
yield region yield region
continue continue
issue, z1, z2, a1, a2, b1, b2 = region # pytype thinks this tuple contains only 3 things, but
# that's clearly not true because this code successfully
# executes. It might be wise to rework merge_regions to be
# some kind of attrs type.
(
issue,
z1,
z2,
a1,
a2,
b1,
b2,
) = region # pytype: disable=bad-unpacking
alen = a2 - a1 alen = a2 - a1
blen = b2 - b1 blen = b2 - b1
# find matches at the front # find matches at the front
ii = 0 ii = 0
while ( while (
ii < alen and ii < blen and self.a[a1 + ii] == self.b[b1 + ii] ii < alen and ii < blen and self.a[a1 + ii] == self.b[b1 + ii]
): ):