STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow PullRequestForBranch to search in closed pull requests

Browse source
This commit is contained in:
Ian Billett 2020-10-23 19:10:21 +01:00 • committed by Mislav Marohnić
parent c77e6afb03
commit 0f61272333
4 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
api/queries_pr.go
View file

@ -6,6 +6,7 @@ import (
"fmt"
"io"
"net/http"
"sort"
"strings"
"time"
@ -621,7 +622,7 @@ func PullRequestByNumber(client *Client, repo ghrepo.Interface, number int) (*Pu
return &resp.Repository.PullRequest, nil
}
func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, headBranch string) (*PullRequest, error) {
func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, headBranch string, stateFilters []string) (*PullRequest, error) {
type response struct {
Repository struct {
PullRequests struct {
@ -637,9 +638,9 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea
}
query := `
query PullRequestForBranch($owner: String!, $repo: String!, $headRefName: String!) {
query PullRequestForBranch($owner: String!, $repo: String!, $headRefName: String!, $states: [PullRequestState!]) {
repository(owner: $owner, name: $repo) {
pullRequests(headRefName: $headRefName, states: OPEN, first: 30) {
pullRequests(headRefName: $headRefName, states: $states, first: 30) {
nodes {
id
number
@ -726,6 +727,7 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea
"owner": repo.RepoOwner(),
"repo": repo.RepoName(),
"headRefName": branchWithoutOwner,
"states": stateFilters,
}
var resp response
@ -734,7 +736,8 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea
return nil, err
}
for _, pr := range resp.Repository.PullRequests.Nodes {
prs := sortPullRequestsByState(resp.Repository.PullRequests.Nodes)
for _, pr := range prs {
if pr.HeadLabel() == headBranch {
if baseBranch != "" {
if pr.BaseRefName != baseBranch {
@ -1149,6 +1152,14 @@ func BranchDeleteRemote(client *Client, repo ghrepo.Interface, branch string) er
return client.REST(repo.RepoHost(), "DELETE", path, nil, nil)
}
// sortPullRequestsByState ensures that OPEN PRs precede non-open states (MERGED, CLOSED)
func sortPullRequestsByState(prs []PullRequest) []PullRequest {
sort.SliceStable(prs, func(a, b int) bool {
return prs[a].State == "OPEN"
})
return prs
}
func min(a, b int) int {
if a < b {
return a

20
api/queries_pr_test.go
View file

@ -138,3 +138,23 @@ func Test_determinePullRequestFeatures(t *testing.T) {
})
}
}
func Test_sortPullRequestsByPrecedence(t *testing.T) {
prs := sortPullRequestsByState([]PullRequest{
{
BaseRefName: "test-PR",
State: "MERGED",
},
{
BaseRefName: "test-PR",
State: "CLOSED",
},
{
BaseRefName: "test-PR",
State: "OPEN",
},
})
if prs[0].State != "OPEN" {
t.Errorf("sortPullRequestsByPrecedence() = got %s, want \"OPEN\"", prs[0].State)
}
}

2
pkg/cmd/pr/create/create.go
View file

@ -303,7 +303,7 @@ func createRun(opts *CreateOptions) error {
}
if !opts.WebMode {
existingPR, err := api.PullRequestForBranch(client, baseRepo, baseBranch, headBranchLabel)
existingPR, err := api.PullRequestForBranch(client, baseRepo, baseBranch, headBranchLabel, []string{"OPEN"})
var notFound *api.NotFoundError
if err != nil && !errors.As(err, &notFound) {
return fmt.Errorf("error checking for existing pull request: %w", err)

4
pkg/cmd/pr/shared/lookup.go
View file

@ -43,7 +43,7 @@ func PRFromArgs(apiClient *api.Client, baseRepoFn func() (ghrepo.Interface, erro
}
// Last see if it is a branch name
pr, err = api.PullRequestForBranch(apiClient, repo, "", arg)
pr, err = api.PullRequestForBranch(apiClient, repo, "", arg, nil)
return pr, repo, err
}
}
@ -117,5 +117,5 @@ func prForCurrentBranch(apiClient *api.Client, repo ghrepo.Interface, branchFn f
}
}
return api.PullRequestForBranch(apiClient, repo, "", prHeadRef)
return api.PullRequestForBranch(apiClient, repo, "", prHeadRef, nil)
}