From 0e1bae7be04339f41b20a77f718e9a4323478cd7 Mon Sep 17 00:00:00 2001
From: Chris Westra <bestra@github.com>
Date: Tue, 6 Sep 2022 17:04:37 -0400
Subject: [PATCH] WIP

---
 api/queries_branch_issue_reference.go | 25 ++++++++++++++++++-------
 pkg/cmd/issue/develop/develop.go      | 20 ++++++++++++--------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/api/queries_branch_issue_reference.go b/api/queries_branch_issue_reference.go
index bb168bb74..c14f4c800 100644
--- a/api/queries_branch_issue_reference.go
+++ b/api/queries_branch_issue_reference.go
@@ -58,10 +58,15 @@ func CreateBranchIssueReference(client *Client, repo *Repository, params map[str
 
 }
 
-func FindBaseOid(client *Client, repo *Repository, ref string) (string, error) {
+func FindBaseOid(client *Client, repo *Repository, ref string) (string, string, error) {
 	query := `
-	query BranchIssueReferenceFindBaseOid($repositoryId: ID!, $ref: String!) {
-		repository(id: $repositoryId) {
+	query BranchIssueReferenceFindBaseOid($repositoryName: String!, $repositoryOwner: String!, $ref: String!) {
+		repository(name: $repositoryName, owner: $repositoryOwner) {
+			defaultBranchRef {
+				target {
+					oid
+				}
+			}
 			ref(qualifiedName: $ref) {
 				target {
 					oid
@@ -71,12 +76,18 @@ func FindBaseOid(client *Client, repo *Repository, ref string) (string, error) {
 	}`
 
 	variables := map[string]interface{}{
-		"repositoryId": repo.ID,
-		"ref":          ref,
+		"repositoryName":  repo.Name,
+		"repositoryOwner": repo.RepoOwner(),
+		"ref":             ref,
 	}
 
 	result := struct {
 		Repository struct {
+			DefaultBranchRef struct {
+				Target struct {
+					Oid string
+				}
+			}
 			Ref struct {
 				Target struct {
 					Oid string
@@ -87,7 +98,7 @@ func FindBaseOid(client *Client, repo *Repository, ref string) (string, error) {
 
 	err := client.GraphQL(repo.RepoHost(), query, variables, &result)
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
-	return result.Repository.Ref.Target.Oid, nil
+	return result.Repository.Ref.Target.Oid, result.Repository.DefaultBranchRef.Target.Oid, nil
 }
diff --git a/pkg/cmd/issue/develop/develop.go b/pkg/cmd/issue/develop/develop.go
index 96fdb4a0c..95be27218 100644
--- a/pkg/cmd/issue/develop/develop.go
+++ b/pkg/cmd/issue/develop/develop.go
@@ -22,11 +22,11 @@ type DevelopOptions struct {
 	BaseRepo   func() (ghrepo.Interface, error)
 	Browser    browser.Browser
 
-	IssueRepo   string
-	IssueNumber string
-	Name        string
-	BaseBranch  string
-	Checkout    bool
+	IssueRepo     string
+	IssueSelector string
+	Name          string
+	BaseBranch    string
+	Checkout      bool
 }
 
 func NewCmdDevelop(f *cmdutil.Factory, runF func(*DevelopOptions) error) *cobra.Command {
@@ -46,11 +46,12 @@ func NewCmdDevelop(f *cmdutil.Factory, runF func(*DevelopOptions) error) *cobra.
 			$ gh issue develop --issue-repo "github/cli" 123 list branches for issue 123 in repo "github/cli"
 			$ gh issue develop 123 --name "my-branch" --head main
 			`),
-		Args: cmdutil.NoArgsQuoteReminder,
+		Args: cmdutil.ExactArgs(1, "issue number is required"),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if runF != nil {
 				return runF(opts)
 			}
+			opts.IssueSelector = args[0]
 			return developRun(opts)
 		},
 	}
@@ -62,15 +63,18 @@ func NewCmdDevelop(f *cmdutil.Factory, runF func(*DevelopOptions) error) *cobra.
 }
 
 func developRun(opts *DevelopOptions) (err error) {
+	fmt.Printf("starting\n")
 	httpClient, err := opts.HttpClient()
 	if err != nil {
 		return err
 	}
+	fmt.Fprintf(opts.IO.ErrOut, "got the http client\n")
 	apiClient := api.NewClientFromHTTP(httpClient)
 	baseRepo, err := opts.BaseRepo()
 	if err != nil {
 		return err
 	}
+	fmt.Fprintf(opts.IO.ErrOut, "got the baseRepo")
 	opts.IO.StartProgressIndicator()
 	fmt.Fprintf(opts.IO.ErrOut, "running")
 	repo, err := api.GitHubRepo(apiClient, baseRepo)
@@ -79,12 +83,12 @@ func developRun(opts *DevelopOptions) (err error) {
 		return err
 	}
 
-	oid, err := api.FindBaseOid(apiClient, repo, opts.BaseBranch)
+	oid, default_branch_oid, err := api.FindBaseOid(apiClient, repo, opts.BaseBranch)
 	if err != nil {
 		return err
 	}
 
-	fmt.Fprintf(opts.IO.ErrOut, "found oid for %s", oid)
+	fmt.Fprintf(opts.IO.ErrOut, "found %s for ref %s, and found default branch oid %s\n", oid, opts.BaseBranch, default_branch_oid)
 	// get the id of the issue repo
 	issue, _, err := shared.IssueFromArgWithFields(httpClient, opts.BaseRepo, opts.IssueNumber, []string{"id", "number", "title", "state"})
 	if err != nil {