Fix repo resolution for PR helper commands (#34)

* fix(pr): honor repo override for review helpers

* fix(pr): ignore base repo error for full refs

Author: Casey Quinn

README.md

@@ -16,17 +16,17 @@ Use `gh pr` subcommands to script review workflows without hand-writing REST or
 
 ```sh
 # list comments from the latest submitted review by the current user
-gh pr see-comments --org octo --repo demo --pr 42 --latest
+gh pr see-comments 42 --latest -R octo/demo
 
 # reply to a specific review comment and auto-submit any pending review
-gh pr reply-comment --org octo --repo demo --pr 42 \
-  --comment-id 123456789 --body "Thanks for catching that!" --auto-submit-pending
+gh pr reply-comment 42 --comment-id 123456789 \
+  --body "Thanks for catching that!" --auto-submit-pending -R octo/demo
 
 # GraphQL pending review flow (open → add inline thread → submit)
-gh pr review pending open   --org octo --repo demo --pr 42
-gh pr review pending add    --org octo --repo demo --pr 42 --review-id REVIEW_ID \
-  --path src/main.go --line 87 --side RIGHT --body "nit: rename for clarity"
-gh pr review pending submit --org octo --repo demo --pr 42 --review-id REVIEW_ID --event COMMENT
+gh pr review pending open   42 -R octo/demo
+gh pr review pending add    42 --review-id REVIEW_ID \
+  --path src/main.go --line 87 --side RIGHT --body "nit: rename for clarity" -R octo/demo
+gh pr review pending submit 42 --review-id REVIEW_ID --event COMMENT -R octo/demo
 
 ```
 

pkg/cmd/pr/reply-comment/reply_comment.go

@@ -10,7 +10,9 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/cli/cli/v2/api"
 	"github.com/cli/cli/v2/internal/gh"
+	"github.com/cli/cli/v2/internal/ghrepo"
 	"github.com/cli/cli/v2/pkg/cmd/pr/reviewapi"
+	"github.com/cli/cli/v2/pkg/cmd/pr/shared"
 	"github.com/cli/cli/v2/pkg/cmdutil"
 	"github.com/cli/cli/v2/pkg/iostreams"
 	"github.com/spf13/cobra"
@@ -23,8 +25,10 @@ type ReplyCommentOptions struct {
 	HttpClient func() (*http.Client, error)
 	Config     func() (gh.Config, error)
 
-	Org               string
-	Repo              string
+	BaseRepo func() (ghrepo.Interface, error)
+
+	Repo              ghrepo.Interface
+	Selector          string
 	Pull              int
 	CommentID         int64
 	Body              string
@@ -37,17 +41,26 @@ func NewCmdReplyComment(f *cmdutil.Factory) *cobra.Command {
 		IO:         f.IOStreams,
 		HttpClient: f.HttpClient,
 		Config:     f.Config,
+		BaseRepo: func() (ghrepo.Interface, error) {
+			return f.BaseRepo()
+		},
 	}
 
 	cmd := &cobra.Command{
-		Use:   "reply-comment",
+		Use:   "reply-comment [<number> | <url> | <owner>/<repo>#<number>]",
 		Short: "Reply to a pull request review comment",
 		Long: heredoc.Doc(`
             Reply to an existing pull request review comment by comment identifier.
         `),
+		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) > 0 {
+				opts.Selector = args[0]
+			}
 			if opts.Pull <= 0 {
-				return cmdutil.FlagErrorf("invalid value for --pr: %d", opts.Pull)
+				if opts.Selector == "" {
+					return cmdutil.FlagErrorf("must specify a pull request via --pr or as an argument")
+				}
 			}
 			if opts.CommentID <= 0 {
 				return cmdutil.FlagErrorf("invalid value for --comment-id: %d", opts.CommentID)
@@ -60,30 +73,34 @@ func NewCmdReplyComment(f *cmdutil.Factory) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVar(&opts.Org, "org", "", "Organization that owns the repository")
-	cmd.Flags().StringVar(&opts.Repo, "repo", "", "Repository name")
 	cmd.Flags().IntVar(&opts.Pull, "pr", 0, "Pull request number")
 	cmd.Flags().Int64Var(&opts.CommentID, "comment-id", 0, "Review comment identifier to reply to")
 	cmd.Flags().StringVar(&opts.Body, "body", "", "Reply text")
 	cmd.Flags().BoolVar(&opts.AutoSubmitPending, "auto-submit-pending", false, "Submit pending reviews before replying")
 	cmd.Flags().StringVar(&opts.Hostname, "hostname", "", "GitHub hostname (default to authenticated host)")
-
-	_ = cmd.MarkFlagRequired("org")
-	_ = cmd.MarkFlagRequired("repo")
-	_ = cmd.MarkFlagRequired("pr")
 	_ = cmd.MarkFlagRequired("comment-id")
 	_ = cmd.MarkFlagRequired("body")
 
 	return cmd
 }
 
 func runReplyComment(ctx context.Context, opts *ReplyCommentOptions) error {
+	repo, number, err := shared.ResolvePullRequest(opts.BaseRepo, opts.Selector, opts.Pull)
+	if err != nil {
+		return err
+	}
+	opts.Repo = repo
+	opts.Pull = number
+
 	cfg, err := opts.Config()
 	if err != nil {
 		return err
 	}
 
-	host, _ := cfg.Authentication().DefaultHost()
+	host := repo.RepoHost()
+	if host == "" {
+		host, _ = cfg.Authentication().DefaultHost()
+	}
 	if opts.Hostname != "" {
 		host = opts.Hostname
 	}
@@ -94,34 +111,36 @@ func runReplyComment(ctx context.Context, opts *ReplyCommentOptions) error {
 	}
 
 	service := reviewapi.NewService(httpClient, host)
+	owner := repo.RepoOwner()
+	name := repo.RepoName()
 
-	reply, err := service.ReplyToComment(ctx, opts.Org, opts.Repo, opts.Pull, opts.CommentID, opts.Body)
+	reply, err := service.ReplyToComment(ctx, owner, name, opts.Pull, opts.CommentID, opts.Body)
 	if err != nil {
 		var pendingErr *reviewapi.PendingReviewError
 		if errors.As(err, &pendingErr) {
 			if !opts.AutoSubmitPending {
-				return fmt.Errorf("pending review detected for %s/%s#%d. Submit the review or re-run with --auto-submit-pending, or use the GraphQL review thread mutation.", opts.Org, opts.Repo, opts.Pull)
+				return fmt.Errorf("pending review detected for %s/%s#%d. Submit the review or re-run with --auto-submit-pending, or use the GraphQL review thread mutation.", owner, name, opts.Pull)
 			}
 
 			reviewer, loginErr := service.CurrentLogin(ctx)
 			if loginErr != nil {
-				return formatReplyError(loginErr, opts, "failed to resolve authenticated user")
+				return formatReplyError(loginErr, "failed to resolve authenticated user")
 			}
 
-			submitted, submitErr := service.SubmitPendingReviews(ctx, opts.Org, opts.Repo, opts.Pull, reviewer, autoSubmitSummary)
+			submitted, submitErr := service.SubmitPendingReviews(ctx, owner, name, opts.Pull, reviewer, autoSubmitSummary)
 			if submitErr != nil {
-				return formatReplyError(submitErr, opts, "failed to submit pending review")
+				return formatReplyError(submitErr, "failed to submit pending review")
 			}
 			if submitted == 0 {
 				return fmt.Errorf("no pending reviews owned by %s found on pull request #%d", reviewer, opts.Pull)
 			}
 
-			reply, err = service.ReplyToComment(ctx, opts.Org, opts.Repo, opts.Pull, opts.CommentID, opts.Body)
+			reply, err = service.ReplyToComment(ctx, owner, name, opts.Pull, opts.CommentID, opts.Body)
 			if err != nil {
-				return formatReplyError(err, opts, "failed to post reply after submitting pending review")
+				return formatReplyError(err, "failed to post reply after submitting pending review")
 			}
 		} else {
-			return formatReplyError(err, opts, "failed to post reply")
+			return formatReplyError(err, "failed to post reply")
 		}
 	}
 
@@ -134,7 +153,7 @@ func runReplyComment(ctx context.Context, opts *ReplyCommentOptions) error {
 	return nil
 }
 
-func formatReplyError(err error, opts *ReplyCommentOptions, prefix string) error {
+func formatReplyError(err error, prefix string) error {
 	switch e := err.(type) {
 	case *reviewapi.PullRequestNotFoundError:
 		return fmt.Errorf("%s: %w", prefix, e)

pkg/cmd/pr/reply-comment/reply_comment_test.go

@@ -3,6 +3,7 @@ package reply_comment
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"io"
 	"net/http"
 	"net/url"
@@ -11,6 +12,7 @@ import (
 
 	"github.com/cli/cli/v2/internal/config"
 	"github.com/cli/cli/v2/internal/gh"
+	"github.com/cli/cli/v2/internal/ghrepo"
 	"github.com/cli/cli/v2/pkg/cmdutil"
 	"github.com/cli/cli/v2/pkg/httpmock"
 	"github.com/cli/cli/v2/pkg/iostreams"
@@ -19,7 +21,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func newTestFactory(t *testing.T, rt http.RoundTripper) (*cmdutil.Factory, *bytes.Buffer, *bytes.Buffer) {
+func newTestFactory(t *testing.T, rt http.RoundTripper, repo ghrepo.Interface, repoErr error) (*cmdutil.Factory, *bytes.Buffer, *bytes.Buffer) {
 	t.Helper()
 	ios, _, stdout, stderr := iostreams.Test()
 	ios.SetStdoutTTY(false)
@@ -29,15 +31,27 @@ func newTestFactory(t *testing.T, rt http.RoundTripper) (*cmdutil.Factory, *byte
 	cfg := config.NewBlankConfig()
 	cfg.Authentication().SetDefaultHost("github.com", "default")
 
-	return &cmdutil.Factory{
+	factory := &cmdutil.Factory{
 		IOStreams: ios,
 		HttpClient: func() (*http.Client, error) {
 			return &http.Client{Transport: rt}, nil
 		},
 		Config: func() (gh.Config, error) {
 			return cfg, nil
 		},
-	}, stdout, stderr
+	}
+
+	factory.BaseRepo = func() (ghrepo.Interface, error) {
+		if repoErr != nil {
+			return nil, repoErr
+		}
+		if repo != nil {
+			return repo, nil
+		}
+		return ghrepo.FromFullName("ORG/REPO")
+	}
+
+	return factory, stdout, stderr
 }
 
 func TestReplyComment_AutoSubmitPending(t *testing.T) {
@@ -98,11 +112,13 @@ func TestReplyComment_AutoSubmitPending(t *testing.T) {
 		httpmock.JSONResponse(reply),
 	)
 
-	f, stdout, stderr := newTestFactory(t, reg)
+	repo, err := ghrepo.FromFullName("ORG/REPO")
+	require.NoError(t, err)
+	f, stdout, stderr := newTestFactory(t, reg, repo, nil)
 	cmd := NewCmdReplyComment(f)
-	cmd.SetArgs([]string{"--org", "ORG", "--repo", "REPO", "--pr", "123", "--comment-id", "456", "--body", "Thanks!", "--auto-submit-pending"})
+	cmd.SetArgs([]string{"123", "--comment-id", "456", "--body", "Thanks!", "--auto-submit-pending"})
 
-	_, err := cmd.ExecuteC()
+	_, err = cmd.ExecuteC()
 	require.NoError(t, err)
 	assert.Equal(t, "", stderr.String())
 	assert.JSONEq(t, `{"id":333,"in_reply_to_id":456,"body":"Thanks!","user":{"login":"octocat"},"created_at":"2024-05-06T07:08:09Z"}`, stdout.String())
@@ -115,3 +131,52 @@ func TestReplyComment_AutoSubmitPending(t *testing.T) {
 	}
 	assert.Equal(t, 2, reqCount, "expected two requests to reply endpoint")
 }
+
+func TestReplyComment_RepoOverrideWithoutGit(t *testing.T) {
+	reg := &httpmock.Registry{}
+	defer reg.Verify(t)
+
+	reg.Register(
+		httpmock.WithHost(httpmock.REST("POST", "repos/octo/demo/pulls/10/comments/50/replies"), "api.github.com"),
+		httpmock.JSONResponse(map[string]interface{}{"id": 99}),
+	)
+
+	noRepoErr := errors.New("no repository")
+	f, stdout, stderr := newTestFactory(t, reg, nil, noRepoErr)
+	f.BaseRepo = cmdutil.OverrideBaseRepoFunc(f, "octo/demo")
+
+	cmd := NewCmdReplyComment(f)
+	cmd.SetArgs([]string{"10", "--comment-id", "50", "--body", "Thanks"})
+
+	_, err := cmd.ExecuteC()
+	require.NoError(t, err)
+	assert.Equal(t, "", stderr.String())
+
+	var payload map[string]interface{}
+	require.NoError(t, json.Unmarshal(stdout.Bytes(), &payload))
+	assert.Equal(t, float64(99), payload["id"])
+}
+
+func TestReplyComment_FullReferenceWithoutGit(t *testing.T) {
+	reg := &httpmock.Registry{}
+	defer reg.Verify(t)
+
+	reg.Register(
+		httpmock.WithHost(httpmock.REST("POST", "repos/octo/demo/pulls/10/comments/50/replies"), "api.github.com"),
+		httpmock.JSONResponse(map[string]interface{}{"id": 101}),
+	)
+
+	noRepoErr := errors.New("no repository")
+	f, stdout, stderr := newTestFactory(t, reg, nil, noRepoErr)
+
+	cmd := NewCmdReplyComment(f)
+	cmd.SetArgs([]string{"octo/demo#10", "--comment-id", "50", "--body", "ack"})
+
+	_, err := cmd.ExecuteC()
+	require.NoError(t, err)
+	assert.Equal(t, "", stderr.String())
+
+	var payload map[string]interface{}
+	require.NoError(t, json.Unmarshal(stdout.Bytes(), &payload))
+	assert.Equal(t, float64(101), payload["id"])
+}