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

login
register
mail settings
Submitter phabricator
Date Nov. 6, 2019, 10:59 p.m.
Message ID <differential-rev-PHID-DREV-gxwkpviauxl4zrxb27ra-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/42837/
State Superseded
Headers show

Comments

phabricator - Nov. 6, 2019, 10:59 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7287

AFFECTED FILES
  mercurial/simplemerge.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -291,7 +291,19 @@ 
             if region[0] != b"conflict":
                 yield region
                 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
             blen = b2 - b1