Skip to content

Commit 68e2330

Browse files
committed
Pass changelog unmodified, let LogAgent swap the JIRA references
1 parent 448dc38 commit 68e2330

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

ymir/agents/backport_agent.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,9 @@ async def extract_source_changelog(
781781
"""Extract changelog messages from source dist-git commits.
782782
783783
Iterates all upstream patch URLs, extracts the newest changelog entry
784-
from each commit's spec file, strips Resolves/Related lines, and
785-
combines the descriptive lines (deduplicating across commits).
784+
from each commit's spec file, and combines the lines (deduplicating
785+
across commits). The content is passed through as-is; the LogAgent
786+
handles replacing Jira references.
786787
"""
787788
upstream_clone = Path(f"{local_clone}-upstream")
788789
if not upstream_clone.exists():
@@ -815,8 +816,6 @@ async def extract_source_changelog(
815816
continue
816817

817818
for line in entry.content:
818-
if re.match(r"^\s*[-\*]?\s*(resolves|related):", line, re.IGNORECASE):
819-
continue
820819
if line not in seen:
821820
seen.add(line)
822821
collected_lines.append(line)

ymir/agents/log_agent.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ def get_instructions() -> str:
4343
4444
If a source changelog message is provided in the prompt, use those lines as the
4545
exact changelog message content. Keep the descriptive lines exactly as-is — do not
46-
rephrase, summarize, or add to them. Add the Resolves/Related line
47-
for <JIRA_ISSUES>, matching the style of existing changelog entries.
46+
rephrase, summarize, or add to them. Only replace the Jira issue references
47+
in any Resolves/Related lines with <JIRA_ISSUES>. The Resolves/Related lines must
48+
only reference <JIRA_ISSUES>, all original Jira issue references must be removed.
4849
4950
If no source changelog message is provided, write a new entry. In general,
5051
the entry should contain a short summary of the changes, ideally fitting on a single line,

0 commit comments

Comments
 (0)