Merge pull request #6 from craftamap/close-on-merge

added impl for close-on-merge

client/pr.go

@@ -309,6 +309,29 @@ func (c Client) PrMerge(repoOrga string, repoSlug string, id string) (*PullReque
 	return &pullRequest, nil
 }
 
+func (c Client) PrMergeWithCloseBranch(repoOrga string, repoSlug string, id string, closeBranch bool) (*PullRequest, error) {
+	client := bitbucket.NewBasicAuth(c.Username, c.Password)
+
+	opt := &bitbucket.PullRequestsOptions{
+		Owner:             repoOrga,
+		RepoSlug:          repoSlug,
+		ID:                id,
+		CloseSourceBranch: closeBranch,
+	}
+
+	response, err := client.Repositories.PullRequests.Merge(opt)
+	if err != nil {
+		return nil, err
+	}
+
+	var pullRequest PullRequest
+	err = mapstructure.Decode(response, &pullRequest)
+	if err != nil {
+		return nil, err
+	}
+	return &pullRequest, nil
+}
+
 func (c Client) PrComments(repoOrga string, repoSlug string, id string) (*Comments, error) {
 	client := bitbucket.NewBasicAuth(c.Username, c.Password)
 

cmd/commands/pr/create/create.go

@@ -2,10 +2,11 @@ package create
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/craftamap/bb/client"
 	"github.com/craftamap/bb/util/logging"
 	"github.com/ktrysmt/go-bitbucket"
-	"os"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/charmbracelet/glamour"

cmd/commands/pr/merge/merge.go

@@ -2,18 +2,25 @@ package merge
 
 import (
 	"fmt"
-	"github.com/craftamap/bb/util/logging"
 	"strconv"
 	"strings"
 
+	"github.com/craftamap/bb/client"
+	"github.com/craftamap/bb/util/logging"
+
 	"github.com/cli/cli/git"
 	"github.com/craftamap/bb/cmd/commands/pr/view"
 	"github.com/craftamap/bb/cmd/options"
 	"github.com/spf13/cobra"
 )
 
+var (
+	CloseBranch bool
+)
+
 func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
-	mergeCmd := &cobra.Command{
+	var mergeCmd *cobra.Command
+	mergeCmd = &cobra.Command{
 		Use:   "merge [<number of pr>]",
 		Long:  "Merge a pull request on Bitbucket.org",
 		Short: "Merge a pull request",
@@ -53,10 +60,22 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 
 				id = prs.Values[0].ID
 			}
-			pr, err := c.PrMerge(bbrepo.RepoOrga, bbrepo.RepoSlug, fmt.Sprintf("%d", id))
-			if err != nil {
-				logging.Error(err)
-				return
+
+			var pr *client.PullRequest
+
+			if mergeCmd.Flag("close-source-branch").Changed {
+				pr, err = c.PrMergeWithCloseBranch(bbrepo.RepoOrga, bbrepo.RepoSlug, fmt.Sprintf("%d", id), CloseBranch)
+				if err != nil {
+					logging.Error(err)
+					return
+				}
+
+			} else {
+				pr, err = c.PrMerge(bbrepo.RepoOrga, bbrepo.RepoSlug, fmt.Sprintf("%d", id))
+				if err != nil {
+					logging.Error(err)
+					return
+				}
 			}
 
 			commits, err := c.PrCommits(bbrepo.RepoOrga, bbrepo.RepoSlug, fmt.Sprintf("%d", id))
@@ -68,5 +87,7 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
 		},
 	}
 
+	mergeCmd.Flags().BoolVar(&CloseBranch, "close-source-branch", false, "close the source branch (pr setting if omited)")
+
 	prCmd.AddCommand(mergeCmd)
 }