* Serve pull request .diff files Closes #3259 * Add test for pull request redirection and .diff access * Typo * There's no need to test for pr.BaseRepo being nil after calling GetBaseRepotags/v1.4.0-rc1
}) | }) | ||||
resp = session.MakeRequest(t, req, http.StatusFound) | resp = session.MakeRequest(t, req, http.StatusFound) | ||||
//TODO check the redirected URL | |||||
return resp | return resp | ||||
} | } | ||||
session := loginUser(t, "user1") | session := loginUser(t, "user1") | ||||
testRepoFork(t, session, "user2", "repo1", "user1", "repo1") | testRepoFork(t, session, "user2", "repo1", "user1", "repo1") | ||||
testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n") | testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n") | ||||
testPullCreate(t, session, "user1", "repo1", "master") | |||||
resp := testPullCreate(t, session, "user1", "repo1", "master") | |||||
// check the redirected URL | |||||
url := resp.HeaderMap.Get("Location") | |||||
assert.Regexp(t, "^/user2/repo1/pulls/[0-9]*$", url) | |||||
// 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, "^diff", resp.Body) | |||||
assert.NotRegexp(t, "diff.*diff", resp.Body) // not two diffs, just one | |||||
} | } |
return err | return err | ||||
} | } | ||||
// GetBaseRepo returns the base repository | |||||
// GetBaseRepo populates repo.BaseRepo for a fork repository and | |||||
// returns an error on failure (NOTE: no error is returned for | |||||
// non-fork repositories, and BaseRepo will be left untouched) | |||||
func (repo *Repository) GetBaseRepo() (err error) { | func (repo *Repository) GetBaseRepo() (err error) { | ||||
if !repo.IsFork { | if !repo.IsFork { | ||||
return nil | return nil |
// Copyright 2014 The Gogs Authors. All rights reserved. | |||||
// Copyright 2018 The Gitea Authors. | |||||
// Copyright 2014 The Gogs Authors. | |||||
// All rights reserved. | |||||
// Use of this source code is governed by a MIT-style | // Use of this source code is governed by a MIT-style | ||||
// license that can be found in the LICENSE file. | // license that can be found in the LICENSE file. | ||||
ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", fullBranchName)) | ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", fullBranchName)) | ||||
} | } | ||||
// DownloadPullDiff render a pull's raw diff | |||||
func DownloadPullDiff(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 | |||||
} | |||||
// Redirect elsewhere 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.GetBaseRepo(); err != nil { | |||||
ctx.Handle(500, "GetBaseRepo", err) | |||||
return | |||||
} | |||||
patch, err := pr.BaseRepo.PatchPath(pr.Index) | |||||
if err != nil { | |||||
ctx.Handle(500, "PatchPath", err) | |||||
return | |||||
} | |||||
ctx.ServeFileContent(patch) | |||||
} |
}, repo.MustBeNotBare, context.RepoRef(), context.CheckUnit(models.UnitTypeCode)) | }, repo.MustBeNotBare, context.RepoRef(), context.CheckUnit(models.UnitTypeCode)) | ||||
m.Group("/pulls/:index", func() { | m.Group("/pulls/:index", func() { | ||||
m.Get(".diff", repo.DownloadPullDiff) | |||||
m.Get("/commits", context.RepoRef(), repo.ViewPullCommits) | m.Get("/commits", context.RepoRef(), repo.ViewPullCommits) | ||||
m.Get("/files", context.RepoRef(), repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.ViewPullFiles) | m.Get("/files", context.RepoRef(), repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.ViewPullFiles) | ||||
m.Post("/merge", reqRepoWriter, repo.MergePullRequest) | m.Post("/merge", reqRepoWriter, repo.MergePullRequest) |