From 9d2c8e5b987614aecdeed719885d4de85bcd76a6 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan.c.baker@intel.com>
Date: Mon, 17 Nov 2025 09:10:19 -0800
Subject: [PATCH] bin/gen_release_notes: Remove duplicate bug entires

A multiple commits may reference the same bug (for example, a commit
is only a partial fix). We don't want that to show up in our fixed bug
log.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38492>
---
 bin/gen_release_notes.py      |  3 ++-
 bin/gen_release_notes_test.py | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/bin/gen_release_notes.py b/bin/gen_release_notes.py
index dbbe4ec5ccd..744470ef82a 100755
--- a/bin/gen_release_notes.py
+++ b/bin/gen_release_notes.py
@@ -226,7 +226,8 @@ async def gather_bugs(version: str) -> typing.List[str]:
     loop = asyncio.get_event_loop()
     async with aiohttp.ClientSession(loop=loop) as session:
         results = await asyncio.gather(*[get_bug(session, i) for i in issues])
-    bugs = list(results)
+    # Remove duplicates.
+    bugs = sorted(set(results))
     if not bugs:
         bugs = ['None']
     return bugs
diff --git a/bin/gen_release_notes_test.py b/bin/gen_release_notes_test.py
index 07e668f5d66..1ecc123d422 100644
--- a/bin/gen_release_notes_test.py
+++ b/bin/gen_release_notes_test.py
@@ -24,6 +24,9 @@ import typing
 
 import pytest
 
+if typing.TYPE_CHECKING:
+    import aiohttp
+
 # AsyncMock is new in 3.8, so if we're using an older version we need the
 # backported version of mock
 if sys.version_info >= (3, 8):
@@ -199,7 +202,25 @@ async def test_parse_issues(content: str, bugs: typing.List[str]) -> None:
         ids = await parse_issues('1234 not used')
         assert set(ids) == set(bugs)
 
+
 @pytest.mark.asyncio
 async def test_rst_escape():
     out = inliner.quoteInline('foo@bar')
     assert out == 'foo\@bar'
+
+
+@pytest.mark.asyncio
+async def test_gather_bugs_duplicates():
+    mock_gc = mock.AsyncMock(return_value='something')
+    mock_pi = mock.AsyncMock(return_value=['a', 'b', 'a', 'a', 'c', 'b'])
+
+    async def get_bug(session: 'aiohttp.ClientSession', bug_id: str) -> str:
+        return bug_id
+
+    with mock.patch('bin.gen_release_notes.gather_commits', mock_gc), \
+            mock.patch('bin.gen_release_notes.parse_issues', mock_pi), \
+            mock.patch('bin.gen_release_notes.get_bug', get_bug):
+        bugs = await gather_bugs('')
+
+    assert bugs == ['a', 'b', 'c']
+