mirror of
https://gitea.com/gitea/tea.git
synced 2026-04-25 17:07:49 +02:00
f538c05282
## Summary - Extract duplicate \`getReleaseByTag\` into shared \`cmd/releases/utils.go\` - Replace \`log.Fatal\` calls with proper error returns in config and login commands; \`GetLoginByToken\`/\`GetLoginsByHost\`/\`GetLoginByHost\` now return errors - Remove dead \`portChan\` channel in \`modules/auth/oauth.go\` - Fix YAML integer detection to use \`strconv.ParseInt\` (correctly handles negatives and large ints) - Fix \`path.go\` error handling to use \`errors.As\` + \`syscall.ENOTDIR\` instead of string comparison - Extract repeated credential helper key into local variable in \`SetupHelper\` - Use existing \`isRemoteDeleted()\` in \`pull_clean.go\` instead of duplicating the logic - Fix ~30 error message casing violations to follow Go conventions - Use \`fmt.Errorf\` consistently instead of string concatenation in \`generic.go\` Reviewed-on: https://gitea.com/gitea/tea/pulls/947 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Reviewed-by: Bo-Yi Wu (吳柏毅) <appleboy.tw@gmail.com> Co-authored-by: Nicolas <bircni@icloud.com> Co-committed-by: Nicolas <bircni@icloud.com>
106 lines
2.5 KiB
Go
106 lines
2.5 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package interact
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"code.gitea.io/sdk/gitea"
|
|
"code.gitea.io/tea/cmd/flags"
|
|
"code.gitea.io/tea/modules/context"
|
|
"code.gitea.io/tea/modules/task"
|
|
"code.gitea.io/tea/modules/utils"
|
|
|
|
"charm.land/huh/v2"
|
|
)
|
|
|
|
// MergePull interactively creates a PR
|
|
func MergePull(ctx *context.TeaContext) error {
|
|
if ctx.LocalRepo == nil {
|
|
return fmt.Errorf("pull request index is required")
|
|
}
|
|
|
|
branch, _, err := ctx.LocalRepo.TeaGetCurrentBranchNameAndSHA()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
idx, err := getPullIndex(ctx, branch)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return task.PullMerge(ctx.Login, ctx.Owner, ctx.Repo, idx, gitea.MergePullRequestOption{
|
|
Style: gitea.MergeStyle(ctx.String("style")),
|
|
Title: ctx.String("title"),
|
|
Message: ctx.String("message"),
|
|
})
|
|
}
|
|
|
|
// getPullIndex interactively determines the PR index
|
|
func getPullIndex(ctx *context.TeaContext, branch string) (int64, error) {
|
|
c := ctx.Login.Client()
|
|
opts := gitea.ListPullRequestsOptions{
|
|
State: gitea.StateOpen,
|
|
ListOptions: flags.GetListOptions(ctx.Command),
|
|
}
|
|
selected := ""
|
|
loadMoreOption := "PR not found? Load more PRs..."
|
|
|
|
// paginated fetch
|
|
var prs []*gitea.PullRequest
|
|
for {
|
|
var err error
|
|
prs, _, err = c.ListRepoPullRequests(ctx.Owner, ctx.Repo, opts)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
if len(prs) == 0 {
|
|
return 0, fmt.Errorf("no open PRs found")
|
|
}
|
|
opts.ListOptions.Page++
|
|
prOptions := make([]string, 0)
|
|
|
|
// get the PR indexes where head branch is the current branch
|
|
for _, pr := range prs {
|
|
if pr.Head.Ref == branch {
|
|
prOptions = append(prOptions, fmt.Sprintf("#%d: %s", pr.Index, pr.Title))
|
|
}
|
|
}
|
|
|
|
// then get the PR indexes where base branch is the current branch
|
|
for _, pr := range prs {
|
|
// don't add the same PR twice, so `pr.Head.Ref != branch`
|
|
if pr.Base.Ref == branch && pr.Head.Ref != branch {
|
|
prOptions = append(prOptions, fmt.Sprintf("#%d: %s", pr.Index, pr.Title))
|
|
}
|
|
}
|
|
|
|
prOptions = append(prOptions, loadMoreOption)
|
|
|
|
if err := huh.NewSelect[string]().
|
|
Title("Select a PR to merge:").
|
|
Options(huh.NewOptions(prOptions...)...).
|
|
Value(&selected).
|
|
Filtering(true).
|
|
Run(); err != nil {
|
|
return 0, err
|
|
}
|
|
|
|
if selected != loadMoreOption {
|
|
break
|
|
}
|
|
}
|
|
|
|
// get the index from the selected option
|
|
before, _, _ := strings.Cut(selected, ":")
|
|
before = strings.TrimPrefix(before, "#")
|
|
idx, err := utils.ArgToIndex(before)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
|
|
return idx, nil
|
|
}
|