restore pr create with new context/client

nate smith · nate smith · commit 5087ec5c15a5 · 2019-10-30T12:00:16.000-05:00
diff --git a/api/queries.go b/api/queries.go
@@ -22,6 +22,34 @@ type Repo interface {
 	RepoOwner() string
 }
 
+func GitHubRepoId(client *Client, ghRepo Repo) (string, error) {
+	owner := ghRepo.RepoOwner()
+	repo := ghRepo.RepoName()
+
+	query := `
+		query FindRepoID($owner:String!, $name:String!) {
+			repository(owner:$owner, name:$name) {
+				id
+			}
+	}`
+	variables := map[string]interface{}{
+		"owner": owner,
+		"name":  repo,
+	}
+
+	result := struct {
+		Repository struct {
+			Id string
+		}
+	}{}
+	err := client.GraphQL(query, variables, &result)
+	if err != nil {
+		return "", fmt.Errorf("failed to determine GH repo ID: %s", err)
+	}
+
+	return result.Repository.Id, nil
+}
+
 func PullRequests(client *Client, ghRepo Repo, currentBranch, currentUsername string) (*PullRequestsPayload, error) {
 	type edges struct {
 		Edges []struct {
@@ -171,3 +199,46 @@ func PullRequestsForBranch(client *Client, ghRepo Repo, branch string) ([]PullRe
 
 	return prs, nil
 }
+
+func CreatePullRequest(client *Client, ghRepo Repo, title string, body string, draft bool, base string, head string) (string, error) {
+	repoId, err := GitHubRepoId(client, ghRepo)
+	if err != nil {
+		return "", err
+	}
+	if repoId == "" {
+		return "", fmt.Errorf("could not determine GH repo ID")
+	}
+
+	query := `
+		mutation CreatePullRequest($input: CreatePullRequestInput!) {
+			createPullRequest(input: $input) {
+				pullRequest {
+					url
+				}
+			}
+	}`
+
+	variables := map[string]interface{}{
+		"input": map[string]interface{}{
+			"repositoryId": repoId,
+			"baseRefName":  base,
+			"headRefName":  head,
+			"title":        title,
+			"body":         body,
+			"draft":        draft,
+		},
+	}
+
+	result := struct {
+		CreatePullRequest struct {
+			PullRequest PullRequest
+		}
+	}{}
+
+	err = client.GraphQL(query, variables, &result)
+	if err != nil {
+		return "", err
+	}
+
+	return result.CreatePullRequest.PullRequest.URL, nil
+}
diff --git a/command/pr.go b/command/pr.go
@@ -22,6 +22,7 @@ func init() {
 			Short: "Open a pull request in the browser",
 			RunE:  prView,
 		},
+		prCreateCmd,
 	)
 }
 
diff --git a/command/root.go b/command/root.go
@@ -58,6 +58,7 @@ var apiClientForContext = func(ctx context.Context) (*api.Client, error) {
 	opts := []api.ClientOption{
 		api.AddHeader("Authorization", fmt.Sprintf("token %s", token)),
 		api.AddHeader("User-Agent", fmt.Sprintf("GitHub CLI %s", version.Version)),
+		api.AddHeader("Accept", "application/vnd.github.shadow-cat-preview+json"),
 	}
 	if verbose := os.Getenv("DEBUG"); verbose != "" {
 		opts = append(opts, api.VerboseLog(os.Stderr))
diff --git a/git/git.go b/git/git.go
@@ -216,6 +216,29 @@ func LocalBranches() ([]string, error) {
 	return branches, nil
 }
 
+func UncommittedChangeCount() (int, error) {
+	statusCmd := exec.Command("git", "status", "--porcelain")
+	output, err := statusCmd.Output()
+	if err != nil {
+		return 0, fmt.Errorf("failed to run git status: %s", err)
+	}
+	lines := strings.Split(string(output), "\n")
+
+	count := 0
+
+	for _, l := range lines {
+		if l != "" {
+			count++
+		}
+	}
+
+	return count, nil
+}
+
+var Push = func(remote string, ref string) error {
+	return Run("push", "--set-upstream", remote, ref)
+}
+
 func outputLines(output []byte) []string {
 	lines := strings.TrimSuffix(string(output), "\n")
 	if lines == "" {

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ func init() {`
`22`	`22`	`Short: "Open a pull request in the browser",`
`23`	`23`	`RunE: prView,`
`24`	`24`	`},`
	`25`	`+ prCreateCmd,`
`25`	`26`	`)`
`26`	`27`	`}`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ var apiClientForContext = func(ctx context.Context) (*api.Client, error) {`
`58`	`58`	`opts := []api.ClientOption{`
`59`	`59`	`api.AddHeader("Authorization", fmt.Sprintf("token %s", token)),`
`60`	`60`	`api.AddHeader("User-Agent", fmt.Sprintf("GitHub CLI %s", version.Version)),`
	`61`	`+ api.AddHeader("Accept", "application/vnd.github.shadow-cat-preview+json"),`
`61`	`62`	`}`
`62`	`63`	`if verbose := os.Getenv("DEBUG"); verbose != "" {`
`63`	`64`	`opts = append(opts, api.VerboseLog(os.Stderr))`