Make it work without a PR number

probablycorey · probablycorey · commit 8c85e14bac8f · 2020-05-06T11:19:00.000-07:00
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -446,6 +446,7 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea
 	type response struct {
 		Repository struct {
 			PullRequests struct {
+				ID    githubv4.ID
 				Nodes []PullRequest
 			}
 		}
@@ -456,6 +457,7 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea
 		repository(owner: $owner, name: $repo) {
 			pullRequests(headRefName: $headRefName, states: OPEN, first: 30) {
 				nodes {
+					id
 					number
 					title
 					state
diff --git a/command/pr.go b/command/pr.go
@@ -85,9 +85,9 @@ var prReopenCmd = &cobra.Command{
 }
 
 var prMergeCmd = &cobra.Command{
-	Use:   "merge <number | url> [--rebase | --merge | --squash]",
+	Use:   "merge [number | url] [--rebase | --merge | --squash]",
 	Short: "Merge a pull request",
-	Args:  cobra.ExactArgs(1),
+	Args:  cobra.MaximumNArgs(1),
 	RunE:  prMerge,
 }
 
@@ -110,6 +110,7 @@ func prStatus(cmd *cobra.Command, args []string) error {
 
 	repoOverride, _ := cmd.Flags().GetString("repo")
 	currentPRNumber, currentPRHeadRef, err := prSelectorForCurrentBranch(ctx, baseRepo)
+
 	if err != nil && repoOverride == "" && err.Error() != "git: not on any branch" {
 		return fmt.Errorf("could not query for pull request for current branch: %w", err)
 	}
@@ -443,9 +444,23 @@ func prMerge(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	pr, err := prFromArg(apiClient, baseRepo, args[0])
-	if err != nil {
-		return err
+	var pr *api.PullRequest
+	if len(args) > 0 {
+		pr, err = prFromArg(apiClient, baseRepo, args[0])
+		if err != nil {
+			return err
+		}
+	} else {
+		_, branchWithOwner, err := prSelectorForCurrentBranch(ctx, baseRepo)
+		if err != nil {
+			return err
+		}
+
+		pr, err = api.PullRequestForBranch(apiClient, baseRepo, "", branchWithOwner)
+		fmt.Printf("🌭 %+v\n", pr)
+		if err != nil {
+			return err
+		}
 	}
 
 	if pr.State == "MERGED" {
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -976,6 +976,26 @@ func TestPrMerge(t *testing.T) {
 	}
 }
 
+func TestPrMerge_noPrNumberGiven(t *testing.T) {
+	initWithStubs(
+		stubResponse{200, bytes.NewBufferString(`{ "data": { "repository": {
+			"pullRequest": { "number": 100, "closed": false, "state": "OPEN"}
+		} } }`)},
+		stubResponse{200, bytes.NewBufferString(`{"id": "THE-ID"}`)},
+	)
+
+	output, err := RunCommand("pr merge")
+	if err != nil {
+		t.Fatalf("error running command `pr merge`: %v", err)
+	}
+
+	r := regexp.MustCompile(`Merged pull request #100`)
+
+	if !r.MatchString(output.Stderr()) {
+		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": {
