hub/commands/pull_request.go

package commands

import (
	"fmt"
	"regexp"
	"strings"

	"github.com/github/hub/Godeps/_workspace/src/github.com/octokit/go-octokit/octokit"
	"github.com/github/hub/git"
	"github.com/github/hub/github"
	"github.com/github/hub/utils"
)

var cmdPullRequest = &Command{
	Run:   pullRequest,
	Usage: "pull-request [-f] [-m <MESSAGE>|-F <FILE>|-i <ISSUE>|<ISSUE-URL>] [-o] [-b <BASE>] [-h <HEAD>] [-a <USER>]",
	Short: "Open a pull request on GitHub",
	Long: `Opens a pull request on GitHub for the project that the "origin" remote
points to. The default head of the pull request is the current branch.
Both base and head of the pull request can be explicitly given in one of
the following formats: "branch", "owner:branch", "owner/repo:branch".
This command will abort operation if it detects that the current topic
branch has local commits that are not yet pushed to its upstream branch
on the remote. To skip this check, use "-f".

Without <MESSAGE> or <FILE>, a text editor will open in which title and body
of the pull request can be entered in the same manner as git commit message.
Pull request message can also be passed via stdin with "-F -".

If instead of normal <TITLE> an issue number is given with "-i", the pull
request will be attached to an existing GitHub issue. Alternatively, instead
of title you can paste a full URL to an issue on GitHub.

You can assign the new pull request to a user with "-a <USER>".
`,
}

var (
	flagPullRequestBase,
	flagPullRequestHead,
	flagPullRequestIssue,
	flagPullRequestMessage,
	flagPullRequestAssignee,
	flagPullRequestFile string
	flagPullRequestBrowse,
	flagPullRequestForce,
	flagPullRequestEdit bool
)

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(&flagPullRequestForce, "force", "f", false, "FORCE")
	cmdPullRequest.Flag.StringVarP(&flagPullRequestFile, "file", "F", "", "FILE")
	cmdPullRequest.Flag.StringVarP(&flagPullRequestAssignee, "assign", "a", "", "USER")
	cmdPullRequest.Flag.BoolVarP(&flagPullRequestEdit, "edit", "e", false, "EDIT")

	CmdRunner.Use(cmdPullRequest)
}

/*
  # while on a topic branch called "feature":
  $ gh pull-request
  [ opens text editor to edit title & body for the request ]
  [ opened pull request on GitHub for "YOUR_USER:feature" ]

  # explicit pull base & head:
  $ gh pull-request -b jingweno:master -h jingweno:feature

  $ gh pull-request -m "title\n\nbody"
  [ create pull request with title & body  ]

  $ gh pull-request -i 123
  [ attached pull request to issue #123 ]

  $ gh pull-request https://github.com/jingweno/gh/pull/123
  [ attached pull request to issue #123 ]

  $ gh pull-request -F FILE
  [ create pull request with title & body from FILE ]
*/
func pullRequest(cmd *Command, args *Args) {
	localRepo, err := github.LocalRepo()
	utils.Check(err)

	currentBranch, err := localRepo.CurrentBranch()
	utils.Check(err)

	baseProject, err := localRepo.MainProject()
	utils.Check(err)

	host, err := github.CurrentConfig().PromptForHost(baseProject.Host)
	if err != nil {
		utils.Check(github.FormatError("creating pull request", err))
	}

	trackedBranch, headProject, err := localRepo.RemoteBranchAndProject(host.User, false)
	utils.Check(err)

	var (
		base, head string
		force      bool
	)

	force = flagPullRequestForce

	if flagPullRequestBase != "" {
		baseProject, base = parsePullRequestProject(baseProject, flagPullRequestBase)
	}

	if flagPullRequestHead != "" {
		headProject, head = parsePullRequestProject(headProject, flagPullRequestHead)
	}

	if args.ParamsSize() == 1 {
		arg := args.RemoveParam(0)
		flagPullRequestIssue = parsePullRequestIssueNumber(arg)
	}

	if base == "" {
		masterBranch := localRepo.MasterBranch()
		base = masterBranch.ShortName()
	}

	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() {
				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)
			}
		}
	}

	if head == "" {
		if trackedBranch == nil {
			head = currentBranch.ShortName()
		} else {
			head = trackedBranch.ShortName()
		}
	}

	title, body, err := getTitleAndBodyFromFlags(flagPullRequestMessage, flagPullRequestFile)
	utils.Check(err)

	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)
		}
	}

	var editor *github.Editor
	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)
		}

		message, err := pullRequestChangesMessage(baseTracking, headTracking, fullBase, fullHead)
		utils.Check(err)

		editor, err = github.NewEditor("PULLREQ", "pull request", message)
		utils.Check(err)

		title, body, err = editor.EditTitleAndBody()
		utils.Check(err)
	}

	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)
	}

	if title == "" && flagPullRequestIssue == "" {
		utils.Check(fmt.Errorf("Aborting due to empty pull request title"))
	}

	var pullRequestURL string
	if args.Noop {
		args.Before(fmt.Sprintf("Would request a pull request to %s from %s", fullBase, fullHead), "")
		pullRequestURL = "PULL_REQUEST_URL"
	} else {
		var (
			pr  *octokit.PullRequest
			err error
		)

		client := github.NewClientWithHost(host)
		if title != "" {
			pr, err = client.CreatePullRequest(baseProject, base, fullHead, title, body)
		} else if flagPullRequestIssue != "" {
			pr, err = client.CreatePullRequestForIssue(baseProject, base, fullHead, flagPullRequestIssue)
		}

		if err == nil && editor != nil {
			defer editor.DeleteFile()
		}

		utils.Check(err)

		pullRequestURL = pr.HTMLURL

		if flagPullRequestAssignee != "" {
			err = client.UpdateIssueAssignee(baseProject, pr.Number, flagPullRequestAssignee)
			utils.Check(err)
		}
	}

	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.")
	}
}

func pullRequestChangesMessage(base, head, fullBase, fullHead string) (string, error) {
	var (
		defaultMsg string
		commitLogs string
		err        error
	)

	commits, _ := git.RefList(base, head)
	if len(commits) == 1 {
		defaultMsg, err = git.Show(commits[0])
		if err != nil {
			return "", err
		}
	} else if len(commits) > 1 {
		commitLogs, err = git.Log(base, head)
		if err != nil {
			return "", err
		}
	}

	cs := git.CommentChar()

	return renderPullRequestTpl(defaultMsg, cs, fullBase, fullHead, commitLogs)
}

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 ""
}
Move code to proper subpackages 2013-05-29 22:58:46 +04:00			`package commands`
Add pull_request stub 2013-04-11 19:33:43 +04:00
			`import (`
Add commit logs to PR message 2013-04-29 00:41:45 +04:00			`"fmt"`
Implement pull request message 2013-04-24 14:00:45 +04:00			`"regexp"`
Implement pull request edit message 2013-04-28 21:45:00 +04:00			`"strings"`
Format API response error 2014-02-24 01:34:10 +04:00
Allow assigning a new PR to a user, closes #371 2015-04-02 16:53:10 +03:00			`"github.com/github/hub/Godeps/_workspace/src/github.com/octokit/go-octokit/octokit"`
Format API response error 2014-02-24 01:34:10 +04:00			`"github.com/github/hub/git"`
			`"github.com/github/hub/github"`
			`"github.com/github/hub/utils"`
Add pull_request stub 2013-04-11 19:33:43 +04:00			`)`

Expand pull-request and ci-status to avoid alias collision 2013-06-30 00:54:40 +04:00			`var cmdPullRequest = &Command{`
			`Run: pullRequest,`
Allow assigning a new PR to a user, closes #371 2015-04-02 16:53:10 +03:00			`Usage: "pull-request [-f] [-m <MESSAGE>\|-F <FILE>\|-i <ISSUE>\|<ISSUE-URL>] [-o] [-b <BASE>] [-h <HEAD>] [-a <USER>]",`
Add pull_request stub 2013-04-11 19:33:43 +04:00			`Short: "Open a pull request on GitHub",`
			Long: `Opens a pull request on GitHub for the project that the "origin" remote
			`points to. The default head of the pull request is the current branch.`
			`Both base and head of the pull request can be explicitly given in one of`
			`the following formats: "branch", "owner:branch", "owner/repo:branch".`
			`This command will abort operation if it detects that the current topic`
			`branch has local commits that are not yet pushed to its upstream branch`
Update man page 2013-12-08 21:35:11 +04:00			`on the remote. To skip this check, use "-f".`
Add pull_request stub 2013-04-11 19:33:43 +04:00
Update man page 2013-12-08 21:35:11 +04:00			`Without <MESSAGE> or <FILE>, a text editor will open in which title and body`
			`of the pull request can be entered in the same manner as git commit message.`
			`Pull request message can also be passed via stdin with "-F -".`
Add pull_request stub 2013-04-11 19:33:43 +04:00
Update man page 2013-12-08 21:35:11 +04:00			`If instead of normal <TITLE> an issue number is given with "-i", the pull`
Add pull_request stub 2013-04-11 19:33:43 +04:00			`request will be attached to an existing GitHub issue. Alternatively, instead`
			`of title you can paste a full URL to an issue on GitHub.`
Allow assigning a new PR to a user, closes #371 2015-04-02 16:53:10 +03:00
Update man page for new `pull-request --assign` option 2015-04-07 13:29:15 +03:00			`You can assign the new pull request to a user with "-a <USER>".`
Add pull_request stub 2013-04-11 19:33:43 +04:00			`,
			`}`

Fix more cucumber failure due to `-f` 2013-12-07 19:43:55 +04:00			`var (`
			`flagPullRequestBase,`
			`flagPullRequestHead,`
			`flagPullRequestIssue,`
			`flagPullRequestMessage,`
Allow assigning a new PR to a user, closes #371 2015-04-02 16:53:10 +03:00			`flagPullRequestAssignee,`
Fix more cucumber failure due to `-f` 2013-12-07 19:43:55 +04:00			`flagPullRequestFile string`
Add support for `-o/--browse` option for pull-request 2014-04-11 08:16:50 +04:00			`flagPullRequestBrowse,`
Add -e option to pull request 2015-06-08 18:17:28 +03:00			`flagPullRequestForce,`
			`flagPullRequestEdit bool`
Fix more cucumber failure due to `-f` 2013-12-07 19:43:55 +04:00			`)`
Add pull_request stub 2013-04-11 19:33:43 +04:00
			`func init() {`
Use a POSIX compatible flag parser. So we can use flags before and after arguments, and we can group boolean flags, just like git does. 2013-12-30 03:07:58 +04:00			`cmdPullRequest.Flag.StringVarP(&flagPullRequestBase, "base", "b", "", "BASE")`
			`cmdPullRequest.Flag.StringVarP(&flagPullRequestHead, "head", "h", "", "HEAD")`
			`cmdPullRequest.Flag.StringVarP(&flagPullRequestIssue, "issue", "i", "", "ISSUE")`
Add support for `-o/--browse` option for pull-request 2014-04-11 08:16:50 +04:00			`cmdPullRequest.Flag.BoolVarP(&flagPullRequestBrowse, "browse", "o", false, "BROWSE")`
Use a POSIX compatible flag parser. So we can use flags before and after arguments, and we can group boolean flags, just like git does. 2013-12-30 03:07:58 +04:00			`cmdPullRequest.Flag.StringVarP(&flagPullRequestMessage, "message", "m", "", "MESSAGE")`
			`cmdPullRequest.Flag.BoolVarP(&flagPullRequestForce, "force", "f", false, "FORCE")`
			`cmdPullRequest.Flag.StringVarP(&flagPullRequestFile, "file", "F", "", "FILE")`
Allow assigning a new PR to a user, closes #371 2015-04-02 16:53:10 +03:00			`cmdPullRequest.Flag.StringVarP(&flagPullRequestAssignee, "assign", "a", "", "USER")`
Add -e option to pull request 2015-06-08 18:17:28 +03:00			`cmdPullRequest.Flag.BoolVarP(&flagPullRequestEdit, "edit", "e", false, "EDIT")`
Add global commands to the runner. - Use a hash to lookup for commands. - Add more tests for the command and runner execution. 2013-12-30 02:18:14 +04:00
			`CmdRunner.Use(cmdPullRequest)`
Add pull_request stub 2013-04-11 19:33:43 +04:00			`}`

Fix all comands to aware of noop 2013-07-06 00:45:22 +04:00			`/*`
			`# while on a topic branch called "feature":`
			`$ gh pull-request`
			`[ opens text editor to edit title & body for the request ]`
			`[ opened pull request on GitHub for "YOUR_USER:feature" ]`

			`# explicit pull base & head:`
			`$ gh pull-request -b jingweno:master -h jingweno:feature`

Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`$ gh pull-request -m "title\n\nbody"`
			`[ create pull request with title & body ]`

Fix all comands to aware of noop 2013-07-06 00:45:22 +04:00			`$ gh pull-request -i 123`
			`[ attached pull request to issue #123 ]`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00
			`$ gh pull-request https://github.com/jingweno/gh/pull/123`
			`[ attached pull request to issue #123 ]`
Update man page 2013-12-08 21:35:11 +04:00
			`$ gh pull-request -F FILE`
			`[ create pull request with title & body from FILE ]`
Fix all comands to aware of noop 2013-07-06 00:45:22 +04:00			`*/`
Expand pull-request and ci-status to avoid alias collision 2013-06-30 00:54:40 +04:00			`func pullRequest(cmd Command, args Args) {`
Validate git dir when getting local repo 2014-04-02 00:40:02 +04:00			`localRepo, err := github.LocalRepo()`
			`utils.Check(err)`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00
			`currentBranch, err := localRepo.CurrentBranch()`
Move error to LocalRepo 2013-12-06 22:54:11 +04:00			`utils.Check(err)`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00
			`baseProject, err := localRepo.MainProject()`
Move error to LocalRepo 2013-12-06 22:54:11 +04:00			`utils.Check(err)`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00
Refactor to `configService` to read & write `Config` `configService` can save and load `Config` using a strategy of `configEncoder` and `configDecoder`. This pave the path for swapping out `tomlConfigEncoder` and `tomlConfigDecoder` with `yamlConfigEncoder` and `yamlConfigDecoder`. `Configs` also has been renamed to `Config`. 2014-09-15 04:46:13 +04:00			`host, err := github.CurrentConfig().PromptForHost(baseProject.Host)`
Return error when prompting for host. This'll make sure we propagate error to the caller where we can reformat the error message within the context. This fixes `features/authentication.feature:85` 2014-03-28 03:42:14 +04:00			`if err != nil {`
			`utils.Check(github.FormatError("creating pull request", err))`
			`}`
Pull in cucumber tests from Hub Since https://github.com/github/hub/compare/31a85e519e0a080dd10ce21339f806a9a0877766...master Some tests are ignored either because they don't make sense or WIP 2013-12-28 13:14:07 +04:00
Introduce lookup order for origin names 2014-04-09 20:22:20 +04:00			`trackedBranch, headProject, err := localRepo.RemoteBranchAndProject(host.User, false)`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`utils.Check(err)`

Fix more cucumber test failure due to -F 2013-12-07 04:51:11 +04:00			`var (`
Pull in cucumber tests from Hub Since https://github.com/github/hub/compare/31a85e519e0a080dd10ce21339f806a9a0877766...master Some tests are ignored either because they don't make sense or WIP 2013-12-28 13:14:07 +04:00			`base, head string`
			`force bool`
Fix more cucumber test failure due to -F 2013-12-07 04:51:11 +04:00			`)`
Refactor 2013-12-08 12:33:48 +04:00
Fix more cucumber failure due to `-f` 2013-12-07 19:43:55 +04:00			`force = flagPullRequestForce`
Refactor 2013-12-08 12:33:48 +04:00
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`if flagPullRequestBase != "" {`
Refactor 2013-12-08 12:33:48 +04:00			`baseProject, base = parsePullRequestProject(baseProject, flagPullRequestBase)`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`}`
Fix more cucumber test failure due to -F 2013-12-07 04:51:11 +04:00
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`if flagPullRequestHead != "" {`
Refactor 2013-12-08 12:33:48 +04:00			`headProject, head = parsePullRequestProject(headProject, flagPullRequestHead)`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`}`
Fix more cucumber test failure due to -F 2013-12-07 04:51:11 +04:00
Rename to Args#Params 2013-07-02 22:56:45 +04:00			`if args.ParamsSize() == 1 {`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`arg := args.RemoveParam(0)`
Refactor 2013-12-08 12:33:48 +04:00			`flagPullRequestIssue = parsePullRequestIssueNumber(arg)`
Make sure pull-request look for title argument 2013-06-02 05:16:18 +04:00			`}`

Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`if base == "" {`
Pull in cucumber tests from Hub Since https://github.com/github/hub/compare/31a85e519e0a080dd10ce21339f806a9a0877766...master Some tests are ignored either because they don't make sense or WIP 2013-12-28 13:14:07 +04:00			`masterBranch := localRepo.MasterBranch()`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`base = masterBranch.ShortName()`
			`}`

Check null of trackedBranch 2014-03-05 20:37:17 +04:00			`if head == "" && trackedBranch != nil {`
Pull in cucumber tests from Hub Since https://github.com/github/hub/compare/31a85e519e0a080dd10ce21339f806a9a0877766...master Some tests are ignored either because they don't make sense or WIP 2013-12-28 13:14:07 +04:00			`if !trackedBranch.IsRemote() {`
			`// the current branch tracking another branch`
			`// pretend there's no upstream at all`
			`trackedBranch = nil`
			`} else {`
Use `project.SameAs(otherProject)` instead of reflect.DeepEqual This lets github.project implement its own comparison logic. For instance, two projects can be the same even though their `Protocol` values don't match. 2014-07-30 09:25:23 +04:00			`if baseProject.SameAs(headProject) && base == trackedBranch.ShortName() {`
Refactor 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)`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`}`
			`}`
Check null of trackedBranch 2014-03-05 20:37:17 +04:00			`}`

Only set head when it's empty 2014-03-05 20:39:23 +04:00			`if head == "" {`
			`if trackedBranch == nil {`
			`head = currentBranch.ShortName()`
			`} else {`
			`head = trackedBranch.ShortName()`
			`}`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`}`

Move GetTitleAndBodyFromFlags to commands/utils 2013-12-31 23:06:58 +04:00			`title, body, err := getTitleAndBodyFromFlags(flagPullRequestMessage, flagPullRequestFile)`
Extract editor logic from the pull request commands. 2013-12-20 04:54:14 +04:00			`utils.Check(err)`
Fix more cucumber test failure due to -F 2013-12-07 04:51:11 +04:00
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`fullBase := fmt.Sprintf("%s:%s", baseProject.Owner, base)`
			`fullHead := fmt.Sprintf("%s:%s", headProject.Owner, head)`

Fix bug that warning unpunished commits The problem was we need to look at the commits for tracked branch instead of local base and head 2013-12-19 22:19:38 +04:00			`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)`
			`}`
Fix more cucumber failure due to `-f` 2013-12-07 19:43:55 +04:00			`}`

Don't delete file after editing 2014-03-02 23:43:43 +04:00			`var editor *github.Editor`
Attach issue to pull-request 2013-06-02 06:09:17 +04:00			`if title == "" && flagPullRequestIssue == "" {`
Revert to @mislav's solution to get base branch for pull request As discussed https://github.com/github/hub/pull/646/files#r19065050, we'd need to defend against getting base branch and tracking branch when generating diff. 2014-10-20 04:49:05 +04:00			`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)`
			`}`

			`message, err := pullRequestChangesMessage(baseTracking, headTracking, fullBase, fullHead)`
Don't delete file after editing 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()`
Return octokit.PullRequest 2013-11-07 02:18:30 +04:00			`utils.Check(err)`
Enable noop 2013-07-05 22:10:24 +04:00			`}`
Implement pull request edit message 2013-04-28 21:45:00 +04:00
Add -e option to pull request 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)`
			`}`

Enable noop 2013-07-05 22:10:24 +04:00			`if title == "" && flagPullRequestIssue == "" {`
			`utils.Check(fmt.Errorf("Aborting due to empty pull request title"))`
			`}`
Expand git editor path 2013-05-28 21:13:55 +04:00
Fix all comands to aware of noop 2013-07-06 00:45:22 +04:00			`var pullRequestURL string`
Enable noop 2013-07-05 22:10:24 +04:00			`if args.Noop {`
Import cucumber tests from Hub and get the pull_request.feature going a bit 2013-12-06 22:50:19 +04:00			`args.Before(fmt.Sprintf("Would request a pull request to %s from %s", fullBase, fullHead), "")`
Fix all comands to aware of noop 2013-07-06 00:45:22 +04:00			`pullRequestURL = "PULL_REQUEST_URL"`
Enable noop 2013-07-05 22:10:24 +04:00			`} else {`
Warn existence of URL 2014-02-24 02:24:37 +04:00			`var (`
			`pr *octokit.PullRequest`
			`err error`
			`)`

Return error when prompting for host. This'll make sure we propagate error to the caller where we can reformat the error message within the context. This fixes `features/authentication.feature:85` 2014-03-28 03:42:14 +04:00			`client := github.NewClientWithHost(host)`
Enable noop 2013-07-05 22:10:24 +04:00			`if title != "" {`
Warn existence of URL 2014-02-24 02:24:37 +04:00			`pr, err = client.CreatePullRequest(baseProject, base, fullHead, title, body)`
			`} else if flagPullRequestIssue != "" {`
			`pr, err = client.CreatePullRequestForIssue(baseProject, base, fullHead, flagPullRequestIssue)`
Enable noop 2013-07-05 22:10:24 +04:00			`}`
Implement pull request edit message 2013-04-28 21:45:00 +04:00
Don't delete file after editing 2014-03-02 23:43:43 +04:00			`if err == nil && editor != nil {`
			`defer editor.DeleteFile()`
			`}`

Warn existence of URL 2014-02-24 02:24:37 +04:00			`utils.Check(err)`
Allow assigning a new PR to a user, closes #371 2015-04-02 16:53:10 +03:00
Warn existence of URL 2014-02-24 02:24:37 +04:00			`pullRequestURL = pr.HTMLURL`
Allow assigning a new PR to a user, closes #371 2015-04-02 16:53:10 +03:00
			`if flagPullRequestAssignee != "" {`
Address review comments: - Add test for `pull-request -a` - Narrow scope of `updateIssue` to `updateIssueAssignee` 2015-04-03 20:21:48 +03:00			`err = client.UpdateIssueAssignee(baseProject, pr.Number, flagPullRequestAssignee)`
Allow assigning a new PR to a user, closes #371 2015-04-02 16:53:10 +03:00			`utils.Check(err)`
			`}`
Enable noop 2013-07-05 22:10:24 +04:00			`}`
Fix all comands to aware of noop 2013-07-06 00:45:22 +04:00
Add support for `-o/--browse` option for pull-request 2014-04-11 08:16:50 +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)`
			`}`

Pull in cucumber tests from Hub Since https://github.com/github/hub/compare/31a85e519e0a080dd10ce21339f806a9a0877766...master Some tests are ignored either because they don't make sense or WIP 2013-12-28 13:14:07 +04:00			`if flagPullRequestIssue != "" {`
			`args.After("echo", "Warning: Issue to pull request conversion is deprecated and might not work in the future.")`
			`}`
Enable noop 2013-07-05 22:10:24 +04:00			`}`
Direct remove instead of defer 2013-06-30 20:11:25 +04:00
Add template for pull request 2014-07-16 23:24:07 +04:00			`func pullRequestChangesMessage(base, head, fullBase, fullHead string) (string, error) {`
			`var (`
			`defaultMsg string`
			`commitLogs string`
			`err error`
			`)`

			`commits, _ := git.RefList(base, head)`
Rewrite implementation of edit pull request message 2013-12-02 20:51:45 +04:00			`if len(commits) == 1 {`
Add template for pull request 2014-07-16 23:24:07 +04:00			`defaultMsg, err = git.Show(commits[0])`
Rewrite implementation of edit pull request message 2013-12-02 20:51:45 +04:00			`if err != nil {`
Simplify title and body hint message creation. 2013-12-27 08:57:08 +04:00			`return "", err`
Rewrite implementation of edit pull request message 2013-12-02 20:51:45 +04:00			`}`
			`} else if len(commits) > 1 {`
Add template for pull request 2014-07-16 23:24:07 +04:00			`commitLogs, err = git.Log(base, head)`
Rewrite implementation of edit pull request message 2013-12-02 20:51:45 +04:00			`if err != nil {`
Simplify title and body hint message creation. 2013-12-27 08:57:08 +04:00			`return "", err`
Rewrite implementation of edit pull request message 2013-12-02 20:51:45 +04:00			`}`
Remove unused scenarios 2014-07-16 02:44:48 +04:00			`}`

Add template for pull request 2014-07-16 23:24:07 +04:00			`cs := git.CommentChar()`
Remove unused scenarios 2014-07-16 02:44:48 +04:00
Add template for pull request 2014-07-16 23:24:07 +04:00			`return renderPullRequestTpl(defaultMsg, cs, fullBase, fullHead, commitLogs)`
Remove unused scenarios 2014-07-16 02:44:48 +04:00			`}`

Refactor 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 ""`
			`}`