Merge #13

13: fix: Duplicate pull request numbers r=AaronFriel a=AaronFriel



Co-authored-by: Aaron Friel <[email protected]>

Author: bors[bot]

changelog/pending/20220916--issue-1.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: fix
+  description: Fixes rendering the same pull request number multiple times.
+  prs: [13, 13, 13, 13]

cmd/render.go

@@ -145,6 +145,9 @@ func extractChangelog(config *changelog.Config, dir string, filterSinceCommit st
 			if filterSinceCommit != "" && (len(output) == 0 || len(revlist) == 0) {
 				return nil
 			}
+
+			pullRequests := map[int]struct{}{}
+
 			for _, v := range revlist {
 				prs, _, err := client.PullRequests.ListPullRequestsWithCommit(context.TODO(), owner, repo, v, &github.PullRequestListOptions{})
 				if err != nil {
@@ -155,10 +158,24 @@ func extractChangelog(config *changelog.Config, dir string, filterSinceCommit st
 					if filterOpenPrNumber != 0 && pr.GetState() == "open" && pr.GetNumber() != filterOpenPrNumber {
 						continue
 					}
-					for _, c := range entry.Entries {
-						c.GitHubMeta.PullRequestNumbers = append(c.GitHubMeta.PullRequestNumbers, pr.GetNumber())
+					pullRequests[pr.GetNumber()] = struct{}{}
+				}
+			}
+
+			for _, c := range entry.Entries {
+				var prs []int
+				for _, num := range c.GitHubMeta.PullRequestNumbers {
+					if _, has := pullRequests[num]; has {
+						// skip, the shared map has this entry already
+					} else {
+						prs = append(prs, num)
 					}
 				}
+
+				for num := range pullRequests {
+					prs = append(prs, num)
+				}
+				c.GitHubMeta.PullRequestNumbers = prs
 			}
 
 			fullChangelog = fullChangelog.Merge(entry)