0bf844018c
All checks were successful
continuous-integration/drone/push Build is passing
fixes #343 Co-authored-by: Norwin Roosen <git@nroo.de> Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: #348 Reviewed-by: 6543 <6543@obermui.de> Reviewed-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Norwin <noerw@noreply.gitea.io> Co-committed-by: Norwin <noerw@noreply.gitea.io>
71 lines
1.7 KiB
Go
71 lines
1.7 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package pulls
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"code.gitea.io/sdk/gitea"
|
|
"code.gitea.io/tea/cmd/flags"
|
|
"code.gitea.io/tea/modules/context"
|
|
"code.gitea.io/tea/modules/utils"
|
|
|
|
"github.com/urfave/cli/v2"
|
|
)
|
|
|
|
// 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.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(cmd *cli.Context) error {
|
|
ctx := context.InitCommand(cmd)
|
|
ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
|
|
|
|
if ctx.Args().Len() != 1 {
|
|
return fmt.Errorf("Must specify a PR index")
|
|
}
|
|
|
|
idx, err := utils.ArgToIndex(ctx.Args().First())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
success, _, err := ctx.Login.Client().MergePullRequest(ctx.Owner, ctx.Repo, idx, gitea.MergePullRequestOption{
|
|
Style: gitea.MergeStyle(ctx.String("style")),
|
|
Title: ctx.String("title"),
|
|
Message: ctx.String("message"),
|
|
})
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !success {
|
|
return fmt.Errorf("Failed to merge PR. Is it still open?")
|
|
}
|
|
return nil
|
|
},
|
|
}
|