diff --git a/integrations/pull_create_test.go b/integrations/pull_create_test.go index 00a23a29e..89abccf88 100644 --- a/integrations/pull_create_test.go +++ b/integrations/pull_create_test.go @@ -56,7 +56,15 @@ func TestPullCreate(t *testing.T) { // check .diff can be accessed and matches performed change req := NewRequest(t, "GET", url+".diff") resp = session.MakeRequest(t, req, http.StatusOK) - assert.Regexp(t, "\\+Hello, World \\(Edited\\)", resp.Body) + assert.Regexp(t, `\+Hello, World \(Edited\)`, resp.Body) assert.Regexp(t, "^diff", resp.Body) assert.NotRegexp(t, "diff.*diff", resp.Body) // not two diffs, just one + + // check .patch can be accessed and matches performed change + req = NewRequest(t, "GET", url+".patch") + resp = session.MakeRequest(t, req, http.StatusOK) + assert.Regexp(t, `\+Hello, World \(Edited\)`, resp.Body) + assert.Regexp(t, "diff", resp.Body) + assert.Regexp(t, `Subject: \[PATCH\] Update 'README.md'`, resp.Body) + assert.NotRegexp(t, "diff.*diff", resp.Body) // not two diffs, just one } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 9de826895..515b6a91f 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -9,6 +9,7 @@ package repo import ( "container/list" "fmt" + "io" "path" "strings" @@ -1033,7 +1034,7 @@ func DownloadPullDiff(ctx *context.Context) { return } - // Redirect elsewhere if it's not a pull request + // Return not found if it's not a pull request if !issue.IsPull { ctx.Handle(404, "DownloadPullDiff", fmt.Errorf("Issue is not a pull request")) @@ -1054,3 +1055,48 @@ func DownloadPullDiff(ctx *context.Context) { ctx.ServeFileContent(patch) } + +// DownloadPullPatch render a pull's raw patch +func DownloadPullPatch(ctx *context.Context) { + issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + if err != nil { + if models.IsErrIssueNotExist(err) { + ctx.Handle(404, "GetIssueByIndex", err) + } else { + ctx.Handle(500, "GetIssueByIndex", err) + } + return + } + + // Return not found if it's not a pull request + if !issue.IsPull { + ctx.Handle(404, "DownloadPullDiff", + fmt.Errorf("Issue is not a pull request")) + return + } + + pr := issue.PullRequest + + if err = pr.GetHeadRepo(); err != nil { + ctx.Handle(500, "GetHeadRepo", err) + return + } + + headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath()) + if err != nil { + ctx.Handle(500, "OpenRepository", err) + return + } + + patch, err := headGitRepo.GetFormatPatch(pr.MergeBase, pr.HeadBranch) + if err != nil { + ctx.Handle(500, "GetFormatPatch", err) + return + } + + _, err = io.Copy(ctx, patch) + if err != nil { + ctx.Handle(500, "io.Copy", err) + return + } +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 3e00f55eb..fc7401fc9 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -625,6 +625,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/pulls/:index", func() { m.Get(".diff", repo.DownloadPullDiff) + m.Get(".patch", repo.DownloadPullPatch) m.Get("/commits", context.RepoRef(), repo.ViewPullCommits) m.Get("/files", context.RepoRef(), repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.ViewPullFiles) m.Post("/merge", reqRepoWriter, bindIgnErr(auth.MergePullRequestForm{}), repo.MergePullRequest) diff --git a/vendor/code.gitea.io/git/MAINTAINERS b/vendor/code.gitea.io/git/MAINTAINERS index 2ad3f01f5..4f3aab318 100644 --- a/vendor/code.gitea.io/git/MAINTAINERS +++ b/vendor/code.gitea.io/git/MAINTAINERS @@ -7,6 +7,7 @@ Kim Carlbäcker (@bkcsoft) LefsFlare (@LefsFlarey) Lunny Xiao (@lunny) Matthias Loibl (@metalmatze) +Morgan Bazalgette (@thehowl) Rachid Zarouali (@xinity) Rémy Boulanouar (@DblK) Sandro Santilli (@strk) diff --git a/vendor/code.gitea.io/git/command.go b/vendor/code.gitea.io/git/command.go index 06722c213..8ca99fd6d 100644 --- a/vendor/code.gitea.io/git/command.go +++ b/vendor/code.gitea.io/git/command.go @@ -17,6 +17,9 @@ import ( var ( // GlobalCommandArgs global command args for external package setting GlobalCommandArgs []string + + // DefaultCommandExecutionTimeout default command execution timeout duration + DefaultCommandExecutionTimeout = 60 * time.Second ) // Command represents a command with its subcommands or arguments. @@ -50,7 +53,7 @@ func (c *Command) AddArguments(args ...string) *Command { // it pipes stdout and stderr to given io.Writer. func (c *Command) RunInDirTimeoutPipeline(timeout time.Duration, dir string, stdout, stderr io.Writer) error { if timeout == -1 { - timeout = 60 * time.Second + timeout = DefaultCommandExecutionTimeout } if len(dir) == 0 { diff --git a/vendor/code.gitea.io/git/repo_pull.go b/vendor/code.gitea.io/git/repo_pull.go index 1c45a4e02..c6d97a6fd 100644 --- a/vendor/code.gitea.io/git/repo_pull.go +++ b/vendor/code.gitea.io/git/repo_pull.go @@ -5,8 +5,10 @@ package git import ( + "bytes" "container/list" "fmt" + "io" "strconv" "strings" "time" @@ -73,3 +75,15 @@ func (repo *Repository) GetPullRequestInfo(basePath, baseBranch, headBranch stri func (repo *Repository) GetPatch(base, head string) ([]byte, error) { return NewCommand("diff", "-p", "--binary", base, head).RunInDirBytes(repo.Path) } + +// GetFormatPatch generates and returns format-patch data between given revisions. +func (repo *Repository) GetFormatPatch(base, head string) (io.Reader, error) { + stdout := new(bytes.Buffer) + stderr := new(bytes.Buffer) + + if err := NewCommand("format-patch", "--binary", "--stdout", base+"..."+head). + RunInDirPipeline(repo.Path, stdout, stderr); err != nil { + return nil, concatenateError(err, stderr.String()) + } + return stdout, nil +} diff --git a/vendor/vendor.json b/vendor/vendor.json index 828bdd4e4..51f758fd2 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,10 +3,10 @@ "ignore": "test appengine", "package": [ { - "checksumSHA1": "Em29XiKkOh5rFFXdkCjqqsQ7fe4=", + "checksumSHA1": "1WHdGmDRsFRTD5N69l+MEbZr+nM=", "path": "code.gitea.io/git", - "revision": "4ec3654064ef7eef4f05f891073a38039ad8d0f7", - "revisionTime": "2017-12-22T02:43:26Z" + "revision": "f4a91053671bee69f1995e456c1541668717c19d", + "revisionTime": "2018-01-07T06:11:05Z" }, { "checksumSHA1": "Qtq0kW+BnpYMOriaoCjMa86WGG8=",