[devscripts] make_changelog: Parse full commit message for fixes (#11366)

Authored by: Grub4K, bashonly

Co-authored-by: Simon Sawicki <contact@grub4k.xyz>

devscripts/changelog_override.json

@@ -216,5 +216,23 @@
         "action": "add",
         "when": "d784464399b600ba9516bbcec6286f11d68974dd",
         "short": "[priority] **The minimum *required* Python version has been raised to 3.9**\nPython 3.8 reached its end-of-life on 2024.10.07, and yt-dlp has now removed support for it. As an unfortunate side effect, the official `yt-dlp.exe` and `yt-dlp_x86.exe` binaries are no longer supported on Windows 7. [Read more](https://github.com/yt-dlp/yt-dlp/issues/10086)"
+    },
+    {
+        "action": "change",
+        "when": "914af9a0cf51c9a3f74aa88d952bee8334c67511",
+        "short": "Expand paths in `--plugin-dirs` (#11334)",
+        "authors": ["bashonly"]
+    },
+    {
+        "action": "change",
+        "when": "c29f5a7fae93a08f3cfbb6127b2faa75145b06a0",
+        "short": "[ie/generic] Do not impersonate by default (#11336)",
+        "authors": ["bashonly"]
+    },
+    {
+        "action": "change",
+        "when": "57212a5f97ce367590aaa5c3e9a135eead8f81f7",
+        "short": "[ie/vimeo] Fix API retries (#11351)",
+        "authors": ["bashonly"]
     }
 ]

devscripts/make_changelog.py

@@ -71,14 +71,13 @@ class CommitGroup(enum.Enum):
     def get(cls, value: str) -> tuple[CommitGroup | None, str | None]:
         group, _, subgroup = (group.strip().lower() for group in value.partition('/'))
 
-        result = cls.group_lookup().get(group)
+        if result := cls.group_lookup().get(group):
-        if not result:
+            return result, subgroup or None
+
         if subgroup:
             return None, value
-            subgroup = group
-            result = cls.subgroup_lookup().get(subgroup)
 
-        return result, subgroup or None
+        return cls.subgroup_lookup().get(group), group or None
 
 
 @dataclass
@@ -136,8 +135,7 @@ class Changelog:
                 first = False
                 yield '\n<details><summary><h3>Changelog</h3></summary>\n'
 
-            group = groups[item]
+            if group := groups[item]:
-            if group:
                 yield self.format_module(item.value, group)
 
         if self._collapsible:
@@ -253,7 +251,7 @@ class CommitRange:
         ''', re.VERBOSE | re.DOTALL)
     EXTRACTOR_INDICATOR_RE = re.compile(r'(?:Fix|Add)\s+Extractors?', re.IGNORECASE)
     REVERT_RE = re.compile(r'(?:\[[^\]]+\]\s+)?(?i:Revert)\s+([\da-f]{40})')
-    FIXES_RE = re.compile(r'(?i:Fix(?:es)?(?:\s+bugs?)?(?:\s+in|\s+for)?|Revert|Improve)\s+([\da-f]{40})')
+    FIXES_RE = re.compile(r'(?i:(?:bug\s*)?fix(?:es)?(?:\s+bugs?)?(?:\s+in|\s+for)?|Improve)\s+([\da-f]{40})')
     UPSTREAM_MERGE_RE = re.compile(r'Update to ytdl-commit-([\da-f]+)')
 
     def __init__(self, start, end, default_author=None):
@@ -287,11 +285,16 @@ class CommitRange:
             short = next(lines)
             skip = short.startswith('Release ') or short == '[version] update'
 
+            fix_commitish = None
+            if match := self.FIXES_RE.search(short):
+                fix_commitish = match.group(1)
+
             authors = [default_author] if default_author else []
             for line in iter(lambda: next(lines), self.COMMIT_SEPARATOR):
-                match = self.AUTHOR_INDICATOR_RE.match(line)
+                if match := self.AUTHOR_INDICATOR_RE.match(line):
-                if match:
                     authors = sorted(map(str.strip, line[match.end():].split(',')), key=str.casefold)
+                if not fix_commitish and (match := self.FIXES_RE.fullmatch(line)):
+                    fix_commitish = match.group(1)
 
             commit = Commit(commit_hash, short, authors)
             if skip and (self._start or not i):
@@ -301,21 +304,17 @@ class CommitRange:
                 logger.debug(f'Reached Release commit, breaking: {commit}')
                 break
 
-            revert_match = self.REVERT_RE.fullmatch(commit.short)
+            if match := self.REVERT_RE.fullmatch(commit.short):
-            if revert_match:
+                reverts[match.group(1)] = commit
-                reverts[revert_match.group(1)] = commit
                 continue
 
-            fix_match = self.FIXES_RE.search(commit.short)
+            if fix_commitish:
-            if fix_match:
+                fixes[fix_commitish].append(commit)
-                commitish = fix_match.group(1)
-                fixes[commitish].append(commit)
 
             commits[commit.hash] = commit
 
         for commitish, revert_commit in reverts.items():
-            reverted = commits.pop(commitish, None)
+            if reverted := commits.pop(commitish, None):
-            if reverted:
                 logger.debug(f'{commitish} fully reverted {reverted}')
             else:
                 commits[revert_commit.hash] = revert_commit
@@ -461,8 +460,7 @@ def create_changelog(args):
 
     logger.info(f'Loaded {len(commits)} commits')
 
-    new_contributors = get_new_contributors(args.contributors_path, commits)
+    if new_contributors := get_new_contributors(args.contributors_path, commits):
-    if new_contributors:
         if args.contributors:
             write_file(args.contributors_path, '\n'.join(new_contributors) + '\n', mode='a')
         logger.info(f'New contributors: {", ".join(new_contributors)}')