Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/fixed-15606-latest-issue-closer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- When an issue has multiple merged same-repository pull request references, Hive now selects the most recently merged closer instead of depending on GitHub's node order ([#15606](https://github.com/hivecommons/hive/issues/15606)).
33 changes: 33 additions & 0 deletions src/pkg/github/pr_supersession_closer_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package github

import (
"context"
"fmt"
"log/slog"
"net/http"
"net/http/httptest"
"testing"
"time"
)

func TestClosedByPullRequestReferenceSelectsLatestMergedNode(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost || r.URL.Path != "/graphql" {
http.NotFound(w, r)
return
}
fmt.Fprint(w, `{"data":{"repository":{"issue":{"closedByPullRequestsReferences":{"nodes":[`+
`{"number":40,"url":"https://github.com/o/r/pull/40","merged":true,"mergedAt":"2026-10-10T11:40:00Z"},`+
`{"number":41,"url":"https://github.com/o/r/pull/41","merged":false,"mergedAt":null},`+
`{"number":42,"url":"https://github.com/other/repo/pull/42","merged":true,"mergedAt":"2026-10-12T11:40:00Z"},`+
`{"number":43,"url":"https://github.com/o/r/pull/43","merged":true,"mergedAt":"2026-10-12T11:40:00Z"}]}}}}}`)
}))
defer ts.Close()
c := NewClientForTest(ts.URL, "o", []string{"r"}, slog.Default())

got, ok := c.closedByPullRequestReference(context.Background(), "o", "r", 7, 41)
wantMergedAt := time.Date(2026, 10, 12, 11, 40, 0, 0, time.UTC)
if !ok || got.Repo != "o/r" || got.Number != 43 || got.URL != "https://github.com/o/r/pull/43" || !got.MergedAt.Equal(wantMergedAt) {
t.Fatalf("closer = %+v, %v; want latest same-repo merged PR #43", got, ok)
}
}
9 changes: 7 additions & 2 deletions src/pkg/github/pr_supersession_sweep.go
Original file line number Diff line number Diff line change
Expand Up @@ -468,16 +468,21 @@ func (c *Client) closedByPullRequestReference(ctx context.Context, owner, repo s
return supersessionCloser{}, false
}
displayRepo := owner + "/" + repo
var latest supersessionCloser
found := false
for _, node := range resp.Data.Repository.Issue.ClosedByPullRequestsReferences.Nodes {
if node.Number == currentPR || !node.Merged {
continue
}
if !sameRepoPullURL(node.URL, owner, repo, node.Number) {
continue
}
return supersessionCloser{Repo: displayRepo, Number: node.Number, URL: node.URL, MergedAt: node.MergedAt}, true
if !found || node.MergedAt.After(latest.MergedAt) {
latest = supersessionCloser{Repo: displayRepo, Number: node.Number, URL: node.URL, MergedAt: node.MergedAt}
found = true
}
}
return supersessionCloser{}, false
return latest, found
}

// sameRepoPullURL reports whether a PR URL from closedByPullRequestsReferences
Expand Down
Loading