mirror of
https://gitea.com/gitea/tea.git
synced 2026-09-10 07:26:33 -04:00
913c22263a
Add --confirm/-y flag to tea pulls merge and close commands to skip interactive confirmation prompts. This enables safe use in CI/CD pipelines and scripts where interactive prompts would hang. When --confirm is not set, the user is prompted with a y/N confirmation before the operation proceeds. With --confirm, the operation executes immediately without prompting.
89 lines
2.1 KiB
Go
89 lines
2.1 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package pulls
|
|
|
|
import (
|
|
stdctx "context"
|
|
"fmt"
|
|
|
|
gitea "gitea.dev/sdk"
|
|
"github.com/urfave/cli/v3"
|
|
|
|
"gitea.dev/tea/cmd/flags"
|
|
"gitea.dev/tea/modules/context"
|
|
"gitea.dev/tea/modules/interact"
|
|
"gitea.dev/tea/modules/task"
|
|
"gitea.dev/tea/modules/utils"
|
|
)
|
|
|
|
// CmdPullsMerge merges a PR
|
|
var CmdPullsMerge = cli.Command{
|
|
Name: "merge",
|
|
Aliases: []string{"m"},
|
|
Usage: "Merge a pull request",
|
|
Description: "Merge a pull request",
|
|
ArgsUsage: "<pull index>",
|
|
Flags: append([]cli.Flag{
|
|
&cli.BoolFlag{
|
|
Name: "confirm",
|
|
Aliases: []string{"y"},
|
|
Usage: "confirm merge without prompting",
|
|
},
|
|
&cli.StringFlag{
|
|
Name: "style",
|
|
Aliases: []string{"s"},
|
|
Usage: "Kind of merge to perform: merge, rebase, squash, rebase-merge",
|
|
Value: "merge",
|
|
},
|
|
&cli.StringFlag{
|
|
Name: "title",
|
|
Aliases: []string{"t"},
|
|
Usage: "Merge commit title",
|
|
},
|
|
&cli.StringFlag{
|
|
Name: "message",
|
|
Aliases: []string{"m"},
|
|
Usage: "Merge commit message",
|
|
},
|
|
}, flags.AllDefaultFlags...),
|
|
Action: func(requestCtx stdctx.Context, cmd *cli.Command) error {
|
|
ctx, err := context.InitCommand(cmd)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := ctx.Ensure(context.CtxRequirement{RemoteRepo: true}); err != nil {
|
|
return err
|
|
}
|
|
|
|
if ctx.Args().Len() != 1 {
|
|
// If no PR index is provided, try interactive mode
|
|
if err := interact.MergePull(requestCtx, ctx); err != nil && !interact.IsQuitting(err) {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
idx, err := utils.ArgToIndex(ctx.Args().First())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if !ctx.Bool("confirm") {
|
|
fmt.Printf("Are you sure you want to merge PR #%d? [y/N] ", idx)
|
|
var response string
|
|
fmt.Scanln(&response)
|
|
if response != "y" && response != "Y" && response != "yes" {
|
|
fmt.Println("Merge canceled.")
|
|
return nil
|
|
}
|
|
}
|
|
|
|
return task.PullMerge(requestCtx, ctx.Login, ctx.Owner, ctx.Repo, idx, gitea.MergePullRequestOption{
|
|
Style: gitea.MergeStyle(ctx.String("style")),
|
|
Title: ctx.String("title"),
|
|
Message: ctx.String("message"),
|
|
})
|
|
},
|
|
}
|