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

Fix merge

Browse source
This commit is contained in:
Sam Coe 2021-01-21 12:53:04 -08:00
parent a9123966e3
commit 71a66cc8d6
No known key found for this signature in database
GPG key ID: 8E322C20F811D086
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
pkg/cmd/pr/merge/merge.go
View file

@ -130,11 +130,21 @@ func mergeRun(opts *MergeOptions) error {
deleteBranch := opts.DeleteBranch
crossRepoPR := pr.HeadRepositoryOwner.Login != baseRepo.RepoOwner()
isTerminal := opts.IO.IsStdoutTTY()
if opts.InteractiveMode {
mergeMethod, deleteBranch, err = prInteractiveMerge(opts.DeleteLocalBranch, crossRepoPR, baseRepo, apiClient)
if err != nil {
return nil
isPRAlreadyMerged := pr.State == "MERGED"
if !isPRAlreadyMerged {
mergeMethod := opts.MergeMethod
if opts.InteractiveMode {
mergeMethod, deleteBranch, err = prInteractiveMerge(opts, crossRepoPR, baseRepo, apiClient)
if err != nil {
if errors.Is(err, cancelError) {
fmt.Fprintln(opts.IO.ErrOut, "Cancelled.")
return cmdutil.SilentError
}
return err
}
}
err = api.PullRequestMerge(apiClient, baseRepo, pr, mergeMethod)
@ -219,7 +229,9 @@ func mergeRun(opts *MergeOptions) error {
return nil
}
func prInteractiveMerge(deleteLocalBranch bool, crossRepoPR bool, repo ghrepo.Interface, apiClient *api.Client) (api.PullRequestMergeMethod, bool, error) {
var cancelError = errors.New("cancelError")
func prInteractiveMerge(opts *MergeOptions, crossRepoPR bool, repo ghrepo.Interface, apiClient *api.Client) (api.PullRequestMergeMethod, bool, error) {
var baseRepo *api.Repository
if r, ok := repo.(*api.Repository); ok {
@ -232,21 +244,21 @@ func prInteractiveMerge(deleteLocalBranch bool, crossRepoPR bool, repo ghrepo.In
}
}
var opts []string
var mergeOpts []string
if baseRepo.MergeCommitAllowed {
opts = append(opts, "Create a merge commit")
mergeOpts = append(mergeOpts, "Create a merge commit")
}
if baseRepo.RebaseMergeAllowed {
opts = append(opts, "Rebase and merge")
mergeOpts = append(mergeOpts, "Rebase and merge")
}
if baseRepo.SquashMergeAllowed {
opts = append(opts, "Squash and merge")
mergeOpts = append(mergeOpts, "Squash and merge")
}
if len(opts) == 0 {
if len(mergeOpts) == 0 {
return 0, false, fmt.Errorf("no merge options enabled, please enable at least one for your repo")
}
@ -254,7 +266,7 @@ func prInteractiveMerge(deleteLocalBranch bool, crossRepoPR bool, repo ghrepo.In
Name: "mergeMethod",
Prompt: &survey.Select{
Message: "What merge method would you like to use?",
Options: opts,
Options: mergeOpts,
Default: "Create a merge commit",
},
}