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

Make squash and rebase work

Browse source
This commit is contained in:
Corey Johnson 2020-05-05 15:09:02 -07:00
parent c0831d4c4f
commit 8681e7a7b6
3 changed files with 80 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
api/queries_pr.go
View file

@ -800,6 +800,18 @@ func PullRequestReopen(client *Client, repo ghrepo.Interface, pr *PullRequest) e
}
func PullRequestMerge(client *Client, repo ghrepo.Interface, pr *PullRequest) error {
return merge(client, repo, pr, githubv4.PullRequestMergeMethodMerge)
}
func PullRequestRebase(client *Client, repo ghrepo.Interface, pr *PullRequest) error {
return merge(client, repo, pr, githubv4.PullRequestMergeMethodRebase)
}
func PullRequestSquash(client *Client, repo ghrepo.Interface, pr *PullRequest) error {
return merge(client, repo, pr, githubv4.PullRequestMergeMethodSquash)
}
func merge(client *Client, repo ghrepo.Interface, pr *PullRequest, mergeMethod githubv4.PullRequestMergeMethod) error {
var mutation struct {
ReopenPullRequest struct {
PullRequest struct {
@ -810,6 +822,7 @@ func PullRequestMerge(client *Client, repo ghrepo.Interface, pr *PullRequest) er
input := githubv4.MergePullRequestInput{
PullRequestID: pr.ID,
MergeMethod: &mergeMethod,
}
v4 := githubv4.NewClient(client.http)

31
command/pr.go
View file

@ -25,6 +25,9 @@ func init() {
prCmd.AddCommand(prCloseCmd)
prCmd.AddCommand(prReopenCmd)
prCmd.AddCommand(prMergeCmd)
prMergeCmd.Flags().BoolP("merge", "m", true, "merge the commits with the base branch")
prMergeCmd.Flags().BoolP("rebase", "r", false, "Rebase the commits onto the base branch")
prMergeCmd.Flags().BoolP("squash", "s", false, "Squash the commits into one commit and merge it into the base branch")
prCmd.AddCommand(prListCmd)
prListCmd.Flags().IntP("limit", "L", 30, "Maximum number of items to fetch")
@ -58,7 +61,7 @@ var prStatusCmd = &cobra.Command{
RunE: prStatus,
}
var prViewCmd = &cobra.Command{
Use: "view [{<number> | <url> | <branch>}]",
Use: "view <{<number> | <url> | <branch>}>",
Short: "View a pull request",
Long: `Display the title, body, and other information about a pull request.
@ -82,7 +85,7 @@ var prReopenCmd = &cobra.Command{
}
var prMergeCmd = &cobra.Command{
Use: "merge <number | url>",
Use: "merge <number | url> [--rebase | --merge | --squash]",
Short: "Merge a pull request",
Args: cobra.ExactArgs(1),
RunE: prMerge,
@ -450,12 +453,32 @@ func prMerge(cmd *cobra.Command, args []string) error {
return err
}
err = api.PullRequestMerge(apiClient, baseRepo, pr)
rebase, err := cmd.Flags().GetBool("rebase")
if err != nil {
return err
}
squash, err := cmd.Flags().GetBool("squash")
if err != nil {
return err
}
var output string
if rebase {
output = fmt.Sprintf("%s Rebased pull request #%d\n", utils.Green("✔"), pr.Number)
err = api.PullRequestRebase(apiClient, baseRepo, pr)
} else if squash {
output = fmt.Sprintf("%s Squashed and merged pull request #%d\n", utils.Green("✔"), pr.Number)
err = api.PullRequestSquash(apiClient, baseRepo, pr)
} else {
output = fmt.Sprintf("%s Merged pull request #%d\n", utils.Green("✔"), pr.Number)
err = api.PullRequestMerge(apiClient, baseRepo, pr)
}
if err != nil {
return fmt.Errorf("API call failed: %w", err)
}
fmt.Fprintf(colorableErr(cmd), "%s Merged pull request #%d\n", utils.Green("✔"), pr.Number)
fmt.Fprintf(colorableErr(cmd), output)
return nil
}

40
command/pr_test.go
View file

@ -975,3 +975,43 @@ func TestPrMerge(t *testing.T) {
t.Fatalf("output did not match regexp /%s/\n> output\n%q\n", r, output.Stderr())
}
}
func TestPrMerge_rebase(t *testing.T) {
initWithStubs(
stubResponse{200, bytes.NewBufferString(`{ "data": { "repository": {
"pullRequest": { "number": 2, "closed": false, "state": "OPEN"}
} } }`)},
stubResponse{200, bytes.NewBufferString(`{"id": "THE-ID"}`)},
)
output, err := RunCommand("pr merge 2 --rebase")
if err != nil {
t.Fatalf("error running command `pr merge`: %v", err)
}
r := regexp.MustCompile(`Rebased pull request #2`)
if !r.MatchString(output.Stderr()) {
t.Fatalf("output did not match regexp /%s/\n> output\n%q\n", r, output.Stderr())
}
}
func TestPrMerge_squash(t *testing.T) {
initWithStubs(
stubResponse{200, bytes.NewBufferString(`{ "data": { "repository": {
"pullRequest": { "number": 3, "closed": false, "state": "OPEN"}
} } }`)},
stubResponse{200, bytes.NewBufferString(`{"id": "THE-ID"}`)},
)
output, err := RunCommand("pr merge 3 --squash")
if err != nil {
t.Fatalf("error running command `pr merge`: %v", err)
}
r := regexp.MustCompile(`Squashed and merged pull request #3`)
if !r.MatchString(output.Stderr()) {
t.Fatalf("output did not match regexp /%s/\n> output\n%q\n", r, output.Stderr())
}
}