Merge remote-tracking branch 'origin/master' into check-if-pr-exists

command/pr_create.go

@@ -15,6 +15,39 @@ import (
 	"github.com/spf13/cobra"
 )
 
+type defaults struct {
+	Title string
+	Body  string
+}
+
+func computeDefaults(baseRef, headRef string) (defaults, error) {
+	commits, err := git.Commits(baseRef, headRef)
+	if err != nil {
+		return defaults{}, err
+	}
+
+	out := defaults{}
+
+	if len(commits) == 1 {
+		out.Title = commits[0].Title
+		body, err := git.CommitBody(commits[0].Sha)
+		if err != nil {
+			return defaults{}, err
+		}
+		out.Body = body
+	} else {
+		out.Title = utils.Humanize(headRef)
+
+		body := ""
+		for _, c := range commits {
+			body += fmt.Sprintf("- %s\n", c.Title)
+		}
+		out.Body = body
+	}
+
+	return out, nil
+}
+
 func prCreate(cmd *cobra.Command, _ []string) error {
 	ctx := contextForCommand(cmd)
 	remotes, err := ctx.Remotes()
@@ -73,30 +106,50 @@ func prCreate(cmd *cobra.Command, _ []string) error {
 		return fmt.Errorf("could not parse body: %w", err)
 	}
 
+	defs, defaultsErr := computeDefaults(baseBranch, headBranch)
+
 	isWeb, err := cmd.Flags().GetBool("web")
 	if err != nil {
 		return fmt.Errorf("could not parse web: %q", err)
 	}
 
+	autofill, err := cmd.Flags().GetBool("fill")
+	if err != nil {
+		return fmt.Errorf("could not parse fill: %q", err)
+	}
+
 	action := SubmitAction
 	if isWeb {
 		action = PreviewAction
+		if (title == "" || body == "") && defaultsErr != nil {
+			return fmt.Errorf("could not compute title or body defaults: %w", defaultsErr)
+		}
+	} else if autofill {
+		if defaultsErr != nil {
+			return fmt.Errorf("could not compute title or body defaults: %w", defaultsErr)
+		}
+		action = SubmitAction
+		title = defs.Title
+		body = defs.Body
 	} else {
 		fmt.Fprintf(colorableErr(cmd), "\nCreating pull request for %s into %s in %s\n\n",
 			utils.Cyan(headBranch),
 			utils.Cyan(baseBranch),
 			ghrepo.FullName(baseRepo))
+		if (title == "" || body == "") && defaultsErr != nil {
+			fmt.Fprintf(colorableErr(cmd), "%s warning: could not compute title or body defaults: %s\n", utils.Yellow("!"), defaultsErr)
+		}
 	}
 
 	// TODO: only drop into interactive mode if stdin & stdout are a tty
-	if !isWeb && (title == "" || body == "") {
+	if !isWeb && !autofill && (title == "" || body == "") {
 		var templateFiles []string
 		if rootDir, err := git.ToplevelDir(); err == nil {
 			// TODO: figure out how to stub this in tests
 			templateFiles = githubtemplate.Find(rootDir, "PULL_REQUEST_TEMPLATE")
 		}
 
-		tb, err := titleBodySurvey(cmd, title, body, templateFiles)
+		tb, err := titleBodySurvey(cmd, title, body, defs, templateFiles)
 		if err != nil {
 			return fmt.Errorf("could not collect title and/or body: %w", err)
 		}
@@ -243,4 +296,5 @@ func init() {
 	prCreateCmd.Flags().StringP("base", "B", "",
 		"The branch into which you want your code merged")
 	prCreateCmd.Flags().BoolP("web", "w", false, "Open the web browser to create a pull request")
+	prCreateCmd.Flags().BoolP("fill", "f", false, "Do not prompt for title/body and just use commit info")
 }