gitea/tea
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 16 Wiki Activity

Update branch filtering

Browse Source
This commit is contained in:
harryzcy 2023-01-10 23:54:03 -05:00
parent 5a0ac6e1e8
commit 783d167f37
No known key found for this signature in database
GPG Key ID: E3C2287691E40E35
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/pulls/merge.go
View File

@ -96,22 +96,21 @@ func getPullIndex(ctx *context.TeaContext, branch string) (int64, error) {
return 0, fmt.Errorf("No open PRs found") return 0, fmt.Errorf("No open PRs found")
} }
prOptions := make([]string, len(prs)) prOptions := make([]string, 0)
// get the PR index for the current branch first // get the PR indexes where head branch is the current branch
for _, pr := range prs { for _, pr := range prs {
if pr.Head.Ref == branch { if pr.Head.Ref == branch {
prOptions[0] = fmt.Sprintf("#%d: %s", pr.Index, pr.Title) prOptions = append(prOptions, fmt.Sprintf("#%d: %s", pr.Index, pr.Title))
} }
} }
// then get the rest of the PRs // then get the PR indexes where base branch is the current branch
i := 1
for _, pr := range prs { for _, pr := range prs {
if pr.Head.Ref != branch { // don't add the same PR twice, so `pr.Head.Ref != branch`
prOptions[i] = fmt.Sprintf("#%d: %s", pr.Index, pr.Title) if pr.Base.Ref == branch && pr.Head.Ref != branch {
prOptions = append(prOptions, fmt.Sprintf("#%d: %s", pr.Index, pr.Title))
} }
i++
} }
selected := "" selected := ""