Codebase intelligence for AI and humans: code health scores, auto-generated docs, git analytics, dead code detection, and architectural decisions via MCP.
Python aicode-complexitycode-healthcode-intelligencecode-qualitydead-codedeveloper-toolsdocumentationgit-analyticsmcpopen-sourcepythonrefactoringstatic-analysistechnical-debt
fix(changes): take an issue-keyed merge body line as the change title (#4469)
Raghav Chamadiya49783f63e593
diff --git a/packages/core/src/repowise/core/changes/reconstruct.py b/packages/core/src/repowise/core/changes/reconstruct.pyindex 5e39b7293..f8efe37ec 100644--- a/packages/core/src/repowise/core/changes/reconstruct.py+++ b/packages/core/src/repowise/core/changes/reconstruct.py@@ -53,7 +53,11 @@ _BOILERPLATE_MERGE = ("Merged in ",)_AZURE_MERGED = re.compile(r"^Merged PR \d+:\s*(.+)$")-_TRAILER_LINE = re.compile(r"^[A-Za-z][\w-]*:\s|^See merge request ")+#: A git trailer's key has no digits, so an issue key (``FINERACT-2455: …``)+#: never reads as one.+_TRAILER_KEY = re.compile(r"^([A-Za-z][A-Za-z-]*):\s")+_KNOWN_TRAILERS = frozenset({"change-id", "cc", "reviewed-on"})+_GITLAB_MERGE_REF = "See merge request "#: Shas per ``git log --no-walk`` call, well under Windows' command-line limit._SHA_BATCH = 200@@ -103,6 +107,27 @@ class _Commit:return len(self.parents) > 1+def _is_trailer(line: str, in_final_paragraph: bool) -> bool:+ if not (m := _TRAILER_KEY.match(line)):+ return False+ key = m.group(1).lower()+ return in_final_paragraph or key.endswith("-by") or key in _KNOWN_TRAILERS+++def _body_title(body: str) -> str | None:+ """A merge body's first line that is neither a trailer nor git's own text."""+ lines = [line.strip() for line in body.strip().splitlines()]+ # Git keeps trailers in the final paragraph; a body of one paragraph is+ # the title (``fix: x``), save a known trailer such as ``Signed-off-by``.+ final = next((i for i in range(len(lines) - 1, 0, -1) if not lines[i - 1] and lines[i]), 0)+ for i, line in enumerate(lines):+ if line in ("Conflicts:", "# Conflicts:"):+ return None # git's conflict list, kept when a merge commit is not edited+ if line and not line.startswith(_GITLAB_MERGE_REF) and not _is_trailer(line, 0 < final <= i):+ return line+ return None++def change_title(subject: str, body: str, is_merge: bool) -> str:"""The change's title: a merge's own boilerplate subject gives way to its body."""if not is_merge:@@ -110,12 +135,7 @@ def change_title(subject: str, body: str, is_merge: bool) -> str:if m := _AZURE_MERGED.match(subject):return m.group(1).strip()if subject.startswith(_BOILERPLATE_MERGE):- for line in body.splitlines():- line = line.strip()- if line in ("Conflicts:", "# Conflicts:"):- break # git's conflict list, kept when a merge commit is not edited- if line and not _TRAILER_LINE.match(line):- return line+ return _body_title(body) or subjectreturn subjectdiff --git a/tests/unit/core/test_changes.py b/tests/unit/core/test_changes.pyindex 6462b8e26..dea0391c6 100644--- a/tests/unit/core/test_changes.py+++ b/tests/unit/core/test_changes.py@@ -200,6 +200,23 @@ def test_title_skips_boilerplate_and_trailers():assert change_title(subject, "#123 Fix foo\n", True) == "#123 Fix foo"+def test_title_takes_an_issue_keyed_line_and_skips_real_trailers():+ subject = "Merge pull request #6480 from a/FINERACT-2455"+ jira = "FINERACT-2455: WC - Support discount fee by transaction external id"+ assert change_title(subject, jira, True) == jira+ assert change_title(subject, f"{jira}\n\nSigned-off-by: A <a@x>", True) == jira+ assert change_title(subject, "ABC-1: Fix it", True) == "ABC-1: Fix it"+ # A one-paragraph body is the PR title, even in ``type: subject`` form.+ assert change_title(subject, "fix: handle null", True) == "fix: handle null"+ assert change_title(subject, "\r\n\r\nfix: handle null\r\n", True) == "fix: handle null"+ assert change_title(subject, "Title\n\nSee merge request g/p!1", True) == "Title"+ # Real trailers are still skipped, in the final paragraph or by known key.+ body = "Signed-off-by: A <a@x>\nCo-authored-by: B <b@x>"+ assert change_title(subject, body, True) == subject+ assert change_title(subject, f"{body}\n\nReal title", True) == "Real title"+ assert change_title(subject, f"{body}\n\nTicket: y", True) == subject++def test_title_drops_only_its_own_ref_suffix():assert without_own_ref("feat(x): add y (#3792)", "3792") == "feat(x): add y"assert without_own_ref("Fix the parser (!41)", "41") == "Fix the parser"