tools/settings_migrate_group: tolerate census-fresh names in the enum gate

The enum stage's pre dump is taken mid-run, before the def file is
included anywhere in the enum header, so a token whose label string
was first introduced by this migration's census rows resolves to
null in pre and to its canonical name in post. That exact
transition, restricted to the migrating rows' own names, is now
accepted; any other difference still fails.

Author: libretroadmin

intl/msg_hash_lbl.h

@@ -11,6 +11,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME,
    MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME_STR
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_HDR_SCANLINES,
+   MENU_ENUM_LABEL_VIDEO_HDR_SCANLINES_STR
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_HDR_SUBPIXEL_LAYOUT,
+   MENU_ENUM_LABEL_VIDEO_HDR_SUBPIXEL_LAYOUT_STR
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
    MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU_STR
@@ -5210,12 +5218,4 @@ MSG_HASH(
    MENU_ENUM_LABEL_SMB_CLIENT_BROWSE,
    MENU_ENUM_LABEL_SMB_CLIENT_BROWSE_STR
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VIDEO_HDR_SCANLINES,
-   MENU_ENUM_LABEL_VIDEO_HDR_SCANLINES_STR
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VIDEO_HDR_SUBPIXEL_LAYOUT,
-   MENU_ENUM_LABEL_VIDEO_HDR_SUBPIXEL_LAYOUT_STR
-   )
 #endif

tools/settings_migrate_group.py

@@ -625,8 +625,22 @@ def _plains(text):
     assert _plains(open('msg_hash.h').read()) == _census_pre, "enum census drift"
     r = run("python3 tools/msg_hash_name_harness.py /tmp/enum_post.txt")
     assert r.returncode == 0, r.stderr[-300:]
-    assert run('cmp -s /tmp/enum_pre.txt /tmp/enum_post.txt').returncode == 0, \
-        run('diff /tmp/enum_pre.txt /tmp/enum_post.txt | head -4').stdout
+    if run('cmp -s /tmp/enum_pre.txt /tmp/enum_post.txt').returncode != 0:
+        # A token whose strings were first introduced by this migration's
+        # census rows resolves to null in the mid-run pre dump (the def is
+        # not yet included anywhere in msg_hash.h) and to its own name
+        # after the enum stage. That exact transition, for this
+        # migration's tokens only, is the definition of correct.
+        _mine = set(names[_t2] for _k2, _f2, _t2, _a2 in rows)
+        _pre = open('/tmp/enum_pre.txt').read().split('\n')
+        _post = open('/tmp/enum_post.txt').read().split('\n')
+        assert len(_pre) == len(_post), 'name dump row count changed'
+        for _lp, _lq in zip(_pre, _post):
+            if _lp == _lq:
+                continue
+            _pp, _qq = _lp.split('|'), _lq.split('|')
+            assert (_pp[:2] == _qq[:2] and _pp[2] == 'null'
+                    and _qq[2] in _mine), (_lp, _lq)
     _body = re.search(r'enum msg_hash_enums\n\{\n(.*?)\n\};', mh, re.S).group(1)
     _toks = set(x for g in re.findall(r'^#if\w*([^\n]*)', _body, re.M)
                 for x in re.findall(r'\b([A-Z_][A-Z0-9_]{2,})\b', g) if x != 'defined')