hub/commands/pull_request.go

347 строки
8.8 KiB
Go
Исходник Обычный вид История

2013-05-29 22:58:46 +04:00
package commands
2013-04-11 19:33:43 +04:00
import (
2013-04-29 00:41:45 +04:00
"fmt"
2013-04-24 14:00:45 +04:00
"regexp"
2016-08-08 01:43:48 +03:00
"strconv"
2013-04-28 21:45:00 +04:00
"strings"
2014-02-24 01:34:10 +04:00
"github.com/github/hub/git"
"github.com/github/hub/github"
"github.com/github/hub/utils"
2013-04-11 19:33:43 +04:00
)
var cmdPullRequest = &Command{
Run: pullRequest,
Usage: `
2016-08-10 12:44:38 +03:00
pull-request [-fo] [-b <BASE>] [-h <HEAD>] [-a <USERS>] [-M <MILESTONE>] [-l <LABELS>]
pull-request -m <MESSAGE>
pull-request -F <FILE>
pull-request -i <ISSUE>
`,
Long: `Create a GitHub pull request.
## Options:
-f, --force
Skip the check for unpushed commits.
-m, --message <MESSAGE>
Use the first line of <MESSAGE> as pull request title, and the rest as pull
request description.
-F, --file <FILE>
Read the pull request title and description from <FILE>.
-i, --issue <ISSUE>, <ISSUE-URL>
(Deprecated) Convert <ISSUE> to a pull request.
-o, --browse
Open the new pull request in a web browser.
-b, --base <BASE>
The base branch in "[OWNER:]BRANCH" format. Defaults to the default branch
(usually "master").
-h, --head <HEAD>
The head branch in "[OWNER:]BRANCH" format. Defaults to the current branch.
2016-08-10 12:44:38 +03:00
-a, --assign <USERS>
A comma-separated list of GitHub handles to assign to this pull request.
-M, --milestone <ID>
Add this pull request to a GitHub milestone with id <ID>.
-l, --labels <LABELS>
Add a comma-separated list of labels to this pull request.
2016-01-24 18:50:01 +03:00
## See also:
hub(1), hub-merge(1), hub-checkout(1)
2013-04-11 19:33:43 +04:00
`,
}
2013-12-07 19:43:55 +04:00
var (
flagPullRequestBase,
flagPullRequestHead,
flagPullRequestIssue,
flagPullRequestMessage,
flagPullRequestFile string
flagPullRequestBrowse,
flagPullRequestEdit,
2013-12-07 19:43:55 +04:00
flagPullRequestForce bool
flagPullRequestMilestone uint64
flagPullRequestAssignees,
flagPullRequestLabels listFlag
2013-12-07 19:43:55 +04:00
)
2013-04-11 19:33:43 +04:00
func init() {
cmdPullRequest.Flag.StringVarP(&flagPullRequestBase, "base", "b", "", "BASE")
cmdPullRequest.Flag.StringVarP(&flagPullRequestHead, "head", "h", "", "HEAD")
cmdPullRequest.Flag.StringVarP(&flagPullRequestIssue, "issue", "i", "", "ISSUE")
cmdPullRequest.Flag.BoolVarP(&flagPullRequestBrowse, "browse", "o", false, "BROWSE")
cmdPullRequest.Flag.StringVarP(&flagPullRequestMessage, "message", "m", "", "MESSAGE")
cmdPullRequest.Flag.BoolVarP(&flagPullRequestEdit, "edit", "e", false, "EDIT")
cmdPullRequest.Flag.BoolVarP(&flagPullRequestForce, "force", "f", false, "FORCE")
cmdPullRequest.Flag.StringVarP(&flagPullRequestFile, "file", "F", "", "FILE")
cmdPullRequest.Flag.VarP(&flagPullRequestAssignees, "assign", "a", "USERS")
cmdPullRequest.Flag.Uint64VarP(&flagPullRequestMilestone, "milestone", "M", 0, "MILESTONE")
cmdPullRequest.Flag.VarP(&flagPullRequestLabels, "labels", "l", "LABELS")
CmdRunner.Use(cmdPullRequest)
2013-04-11 19:33:43 +04:00
}
func pullRequest(cmd *Command, args *Args) {
localRepo, err := github.LocalRepo()
utils.Check(err)
currentBranch, err := localRepo.CurrentBranch()
2013-12-06 22:54:11 +04:00
utils.Check(err)
baseProject, err := localRepo.MainProject()
2013-12-06 22:54:11 +04:00
utils.Check(err)
host, err := github.CurrentConfig().PromptForHost(baseProject.Host)
if err != nil {
utils.Check(github.FormatError("creating pull request", err))
}
client := github.NewClientWithHost(host)
trackedBranch, headProject, err := localRepo.RemoteBranchAndProject(host.User, false)
utils.Check(err)
var (
base, head string
force bool
)
2013-12-08 12:33:48 +04:00
2013-12-07 19:43:55 +04:00
force = flagPullRequestForce
2013-12-08 12:33:48 +04:00
if flagPullRequestBase != "" {
2013-12-08 12:33:48 +04:00
baseProject, base = parsePullRequestProject(baseProject, flagPullRequestBase)
}
if flagPullRequestHead != "" {
2013-12-08 12:33:48 +04:00
headProject, head = parsePullRequestProject(headProject, flagPullRequestHead)
}
2013-07-02 22:56:45 +04:00
if args.ParamsSize() == 1 {
arg := args.RemoveParam(0)
2013-12-08 12:33:48 +04:00
flagPullRequestIssue = parsePullRequestIssueNumber(arg)
}
if base == "" {
masterBranch := localRepo.MasterBranch()
base = masterBranch.ShortName()
}
2014-03-05 20:37:17 +04:00
if head == "" && trackedBranch != nil {
if !trackedBranch.IsRemote() {
// the current branch tracking another branch
// pretend there's no upstream at all
trackedBranch = nil
} else {
if baseProject.SameAs(headProject) && base == trackedBranch.ShortName() {
2013-12-08 12:33:48 +04:00
e := fmt.Errorf(`Aborted: head branch is the same as base ("%s")`, base)
e = fmt.Errorf("%s\n(use `-h <branch>` to specify an explicit pull request head)", e)
utils.Check(e)
}
}
2014-03-05 20:37:17 +04:00
}
2014-03-05 20:39:23 +04:00
if head == "" {
if trackedBranch == nil {
head = currentBranch.ShortName()
} else {
head = trackedBranch.ShortName()
}
}
title, body, err := getTitleAndBodyFromFlags(flagPullRequestMessage, flagPullRequestFile)
utils.Check(err)
if headRepo, err := client.Repository(headProject); err == nil {
headProject.Owner = headRepo.Owner.Login
headProject.Name = headRepo.Name
}
fullBase := fmt.Sprintf("%s:%s", baseProject.Owner, base)
fullHead := fmt.Sprintf("%s:%s", headProject.Owner, head)
if !force && trackedBranch != nil {
remoteCommits, _ := git.RefList(trackedBranch.LongName(), "")
if len(remoteCommits) > 0 {
err = fmt.Errorf("Aborted: %d commits are not yet pushed to %s", len(remoteCommits), trackedBranch.LongName())
err = fmt.Errorf("%s\n(use `-f` to force submit a pull request anyway)", err)
utils.Check(err)
}
2013-12-07 19:43:55 +04:00
}
2014-03-02 23:43:43 +04:00
var editor *github.Editor
2013-06-02 06:09:17 +04:00
if title == "" && flagPullRequestIssue == "" {
baseTracking := base
headTracking := head
remote := gitRemoteForProject(baseProject)
if remote != nil {
baseTracking = fmt.Sprintf("%s/%s", remote.Name, base)
}
if remote == nil || !baseProject.SameAs(headProject) {
remote = gitRemoteForProject(headProject)
}
if remote != nil {
headTracking = fmt.Sprintf("%s/%s", remote.Name, head)
}
2016-03-14 14:31:50 +03:00
message, err := createPullRequestMessage(baseTracking, headTracking, fullBase, fullHead)
2014-03-02 23:43:43 +04:00
utils.Check(err)
editor, err = github.NewEditor("PULLREQ", "pull request", message)
utils.Check(err)
title, body, err = editor.EditTitleAndBody()
2013-11-07 02:18:30 +04:00
utils.Check(err)
2013-07-05 22:10:24 +04:00
}
2013-04-28 21:45:00 +04:00
2015-06-08 18:17:28 +03:00
if flagPullRequestFile != "" && flagPullRequestEdit {
editor, err = github.NewEditor("PULLREQ", "pull request", title + "\n\n" + body)
utils.Check(err)
title, body, err = editor.EditTitleAndBody()
utils.Check(err)
}
2013-07-05 22:10:24 +04:00
if title == "" && flagPullRequestIssue == "" {
utils.Check(fmt.Errorf("Aborting due to empty pull request title"))
}
2013-05-28 21:13:55 +04:00
2013-07-06 00:45:22 +04:00
var pullRequestURL string
2013-07-05 22:10:24 +04:00
if args.Noop {
args.Before(fmt.Sprintf("Would request a pull request to %s from %s", fullBase, fullHead), "")
2013-07-06 00:45:22 +04:00
pullRequestURL = "PULL_REQUEST_URL"
2013-07-05 22:10:24 +04:00
} else {
2016-08-08 01:43:48 +03:00
params := map[string]interface{}{
"base": base,
"head": fullHead,
}
2014-02-24 02:24:37 +04:00
2013-07-05 22:10:24 +04:00
if title != "" {
2016-08-08 01:43:48 +03:00
params["title"] = title
if body != "" {
params["body"] = body
}
} else {
issueNum, _ := strconv.Atoi(flagPullRequestIssue)
params["issue"] = issueNum
2013-07-05 22:10:24 +04:00
}
2016-08-08 01:43:48 +03:00
pr, err := client.CreatePullRequest(baseProject, params)
2013-04-28 21:45:00 +04:00
2014-03-02 23:43:43 +04:00
if err == nil && editor != nil {
defer editor.DeleteFile()
}
2014-02-24 02:24:37 +04:00
utils.Check(err)
pullRequestURL = pr.HtmlUrl
if len(flagPullRequestAssignees) > 0 || flagPullRequestMilestone > 0 ||
len(flagPullRequestLabels) > 0 {
params := map[string]interface{}{
"labels": flagPullRequestLabels,
"assignees": flagPullRequestAssignees,
}
if flagPullRequestMilestone > 0 {
params["milestone"] = flagPullRequestMilestone
}
err = client.UpdateIssue(baseProject, pr.Number, params)
utils.Check(err)
}
2013-07-05 22:10:24 +04:00
}
2013-07-06 00:45:22 +04:00
if flagPullRequestBrowse {
launcher, err := utils.BrowserLauncher()
utils.Check(err)
args.Replace(launcher[0], "", launcher[1:]...)
args.AppendParams(pullRequestURL)
} else {
args.Replace("echo", "", pullRequestURL)
}
if flagPullRequestIssue != "" {
args.After("echo", "Warning: Issue to pull request conversion is deprecated and might not work in the future.")
}
2013-07-05 22:10:24 +04:00
}
2013-06-30 20:11:25 +04:00
2016-03-14 14:31:50 +03:00
func createPullRequestMessage(base, head, fullBase, fullHead string) (string, error) {
2014-07-16 23:24:07 +04:00
var (
defaultMsg string
commitLogs string
err error
)
commits, _ := git.RefList(base, head)
if len(commits) == 1 {
2014-07-16 23:24:07 +04:00
defaultMsg, err = git.Show(commits[0])
if err != nil {
return "", err
}
} else if len(commits) > 1 {
2014-07-16 23:24:07 +04:00
commitLogs, err = git.Log(base, head)
if err != nil {
return "", err
}
2014-07-16 02:44:48 +04:00
}
2016-04-12 05:32:54 +03:00
if template := github.GetPullRequestTemplate(); template != "" {
if defaultMsg == "" {
defaultMsg = "\n\n" + template
} else {
parts := strings.SplitN(defaultMsg, "\n\n", 2)
defaultMsg = parts[0] + "\n\n" + template
if len(parts) > 1 && parts[1] != "" {
defaultMsg = defaultMsg + "\n\n" + parts[1]
}
}
2016-03-14 14:31:50 +03:00
}
2014-07-16 23:24:07 +04:00
cs := git.CommentChar()
2014-07-16 02:44:48 +04:00
2014-07-16 23:24:07 +04:00
return renderPullRequestTpl(defaultMsg, cs, fullBase, fullHead, commitLogs)
2014-07-16 02:44:48 +04:00
}
2013-12-08 12:33:48 +04:00
func parsePullRequestProject(context *github.Project, s string) (p *github.Project, ref string) {
p = context
ref = s
if strings.Contains(s, ":") {
split := strings.SplitN(s, ":", 2)
ref = split[1]
var name string
if !strings.Contains(split[0], "/") {
name = context.Name
}
p = github.NewProject(split[0], name, context.Host)
}
return
}
func parsePullRequestIssueNumber(url string) string {
u, e := github.ParseURL(url)
if e != nil {
return ""
}
r := regexp.MustCompile(`^issues\/(\d+)`)
p := u.ProjectPath()
if r.MatchString(p) {
return r.FindStringSubmatch(p)[1]
}
return ""
}