2018-01-05 19:56:52 +09:00
|
|
|
// Copyright 2018 The Gitea Authors.
|
|
|
|
// Copyright 2014 The Gogs Authors.
|
|
|
|
// All rights reserved.
|
2014-03-24 19:25:15 +09:00
|
|
|
// Use of this source code is governed by a MIT-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
package repo
|
|
|
|
|
|
|
|
import (
|
2015-09-02 22:26:56 +09:00
|
|
|
"container/list"
|
2019-07-07 02:03:13 +09:00
|
|
|
"crypto/subtle"
|
2016-10-12 22:28:51 +09:00
|
|
|
"fmt"
|
2018-01-07 22:10:20 +09:00
|
|
|
"io"
|
2015-09-02 08:07:02 +09:00
|
|
|
"path"
|
2015-08-08 23:43:14 +09:00
|
|
|
"strings"
|
|
|
|
|
2016-11-11 01:24:48 +09:00
|
|
|
"code.gitea.io/gitea/models"
|
|
|
|
"code.gitea.io/gitea/modules/auth"
|
|
|
|
"code.gitea.io/gitea/modules/base"
|
|
|
|
"code.gitea.io/gitea/modules/context"
|
2019-03-27 18:33:00 +09:00
|
|
|
"code.gitea.io/gitea/modules/git"
|
2016-11-11 01:24:48 +09:00
|
|
|
"code.gitea.io/gitea/modules/log"
|
2017-01-29 00:59:58 +09:00
|
|
|
"code.gitea.io/gitea/modules/notification"
|
2016-11-11 01:24:48 +09:00
|
|
|
"code.gitea.io/gitea/modules/setting"
|
2019-01-21 20:45:32 +09:00
|
|
|
"code.gitea.io/gitea/modules/util"
|
2019-09-06 11:20:09 +09:00
|
|
|
"code.gitea.io/gitea/services/gitdiff"
|
2019-10-25 23:46:37 +09:00
|
|
|
issue_service "code.gitea.io/gitea/services/issue"
|
2019-09-27 09:22:36 +09:00
|
|
|
pull_service "code.gitea.io/gitea/services/pull"
|
2017-01-29 00:59:58 +09:00
|
|
|
|
2019-08-24 01:40:30 +09:00
|
|
|
"github.com/unknwon/com"
|
2014-03-24 19:25:15 +09:00
|
|
|
)
|
|
|
|
|
2014-06-23 12:11:12 +09:00
|
|
|
const (
|
2016-11-24 16:04:31 +09:00
|
|
|
tplFork base.TplName = "repo/pulls/fork"
|
2019-06-08 05:29:29 +09:00
|
|
|
tplCompareDiff base.TplName = "repo/diff/compare"
|
2016-11-24 16:04:31 +09:00
|
|
|
tplPullCommits base.TplName = "repo/pulls/commits"
|
|
|
|
tplPullFiles base.TplName = "repo/pulls/files"
|
2016-02-18 07:21:31 +09:00
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
pullRequestTemplateKey = "PullRequestTemplate"
|
2016-02-18 07:21:31 +09:00
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
2016-11-24 16:04:31 +09:00
|
|
|
pullRequestTemplateCandidates = []string{
|
2017-01-05 09:48:23 +09:00
|
|
|
"PULL_REQUEST_TEMPLATE.md",
|
|
|
|
"pull_request_template.md",
|
|
|
|
".gitea/PULL_REQUEST_TEMPLATE.md",
|
|
|
|
".gitea/pull_request_template.md",
|
|
|
|
".github/PULL_REQUEST_TEMPLATE.md",
|
|
|
|
".github/pull_request_template.md",
|
2016-02-18 07:21:31 +09:00
|
|
|
}
|
2014-06-23 12:11:12 +09:00
|
|
|
)
|
|
|
|
|
2016-03-12 01:56:52 +09:00
|
|
|
func getForkRepository(ctx *context.Context) *models.Repository {
|
2015-08-08 23:43:14 +09:00
|
|
|
forkRepo, err := models.GetRepositoryByID(ctx.ParamsInt64(":repoid"))
|
2015-08-08 18:10:34 +09:00
|
|
|
if err != nil {
|
|
|
|
if models.IsErrRepoNotExist(err) {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("GetRepositoryByID", nil)
|
2015-08-08 18:10:34 +09:00
|
|
|
} else {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetRepositoryByID", err)
|
2015-08-08 18:10:34 +09:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
2015-09-02 00:57:02 +09:00
|
|
|
|
2018-11-28 20:26:14 +09:00
|
|
|
perm, err := models.GetUserRepoPermission(forkRepo, ctx.User)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetUserRepoPermission", err)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-01-18 09:01:04 +09:00
|
|
|
if forkRepo.IsEmpty || !perm.CanRead(models.UnitTypeCode) {
|
2019-04-23 05:40:51 +09:00
|
|
|
if log.IsTrace() {
|
|
|
|
if forkRepo.IsEmpty {
|
|
|
|
log.Trace("Empty fork repository %-v", forkRepo)
|
|
|
|
} else {
|
|
|
|
log.Trace("Permission Denied: User %-v cannot read %-v of forkRepo %-v\n"+
|
|
|
|
"User in forkRepo has Permissions: %-+v",
|
|
|
|
ctx.User,
|
|
|
|
models.UnitTypeCode,
|
|
|
|
ctx.Repo,
|
|
|
|
perm)
|
|
|
|
}
|
|
|
|
}
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("getForkRepository", nil)
|
2015-09-02 00:57:02 +09:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-08-08 18:10:34 +09:00
|
|
|
ctx.Data["repo_name"] = forkRepo.Name
|
2015-11-19 05:11:37 +09:00
|
|
|
ctx.Data["description"] = forkRepo.Description
|
2015-08-08 18:10:34 +09:00
|
|
|
ctx.Data["IsPrivate"] = forkRepo.IsPrivate
|
2017-10-16 00:06:07 +09:00
|
|
|
canForkToUser := forkRepo.OwnerID != ctx.User.ID && !ctx.User.HasForkedRepo(forkRepo.ID)
|
2015-08-08 18:10:34 +09:00
|
|
|
|
|
|
|
if err = forkRepo.GetOwner(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetOwner", err)
|
2015-08-08 18:10:34 +09:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
ctx.Data["ForkFrom"] = forkRepo.Owner.Name + "/" + forkRepo.Name
|
2016-12-01 19:51:50 +09:00
|
|
|
ctx.Data["ForkFromOwnerID"] = forkRepo.Owner.ID
|
2015-08-08 18:10:34 +09:00
|
|
|
|
2017-10-16 00:06:07 +09:00
|
|
|
if err := ctx.User.GetOwnedOrganizations(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetOwnedOrganizations", err)
|
2015-08-08 18:10:34 +09:00
|
|
|
return nil
|
|
|
|
}
|
2017-10-16 00:06:07 +09:00
|
|
|
var orgs []*models.User
|
|
|
|
for _, org := range ctx.User.OwnedOrgs {
|
|
|
|
if forkRepo.OwnerID != org.ID && !org.HasForkedRepo(forkRepo.ID) {
|
|
|
|
orgs = append(orgs, org)
|
|
|
|
}
|
|
|
|
}
|
2017-11-06 13:12:55 +09:00
|
|
|
|
|
|
|
var traverseParentRepo = forkRepo
|
|
|
|
for {
|
|
|
|
if ctx.User.ID == traverseParentRepo.OwnerID {
|
|
|
|
canForkToUser = false
|
|
|
|
} else {
|
|
|
|
for i, org := range orgs {
|
|
|
|
if org.ID == traverseParentRepo.OwnerID {
|
|
|
|
orgs = append(orgs[:i], orgs[i+1:]...)
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !traverseParentRepo.IsFork {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
traverseParentRepo, err = models.GetRepositoryByID(traverseParentRepo.ForkID)
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetRepositoryByID", err)
|
2017-11-06 13:12:55 +09:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx.Data["CanForkToUser"] = canForkToUser
|
2017-10-16 00:06:07 +09:00
|
|
|
ctx.Data["Orgs"] = orgs
|
|
|
|
|
|
|
|
if canForkToUser {
|
|
|
|
ctx.Data["ContextUser"] = ctx.User
|
|
|
|
} else if len(orgs) > 0 {
|
|
|
|
ctx.Data["ContextUser"] = orgs[0]
|
|
|
|
}
|
2015-08-08 18:10:34 +09:00
|
|
|
|
|
|
|
return forkRepo
|
|
|
|
}
|
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
// Fork render repository fork page
|
2016-03-12 01:56:52 +09:00
|
|
|
func Fork(ctx *context.Context) {
|
2015-08-08 18:10:34 +09:00
|
|
|
ctx.Data["Title"] = ctx.Tr("new_fork")
|
|
|
|
|
|
|
|
getForkRepository(ctx)
|
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
ctx.HTML(200, tplFork)
|
2015-08-08 18:10:34 +09:00
|
|
|
}
|
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
// ForkPost response for forking a repository
|
2016-03-12 01:56:52 +09:00
|
|
|
func ForkPost(ctx *context.Context, form auth.CreateRepoForm) {
|
2015-08-08 18:10:34 +09:00
|
|
|
ctx.Data["Title"] = ctx.Tr("new_fork")
|
|
|
|
|
2017-10-16 00:06:07 +09:00
|
|
|
ctxUser := checkContextUser(ctx, form.UID)
|
2015-08-08 18:10:34 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2017-10-16 00:06:07 +09:00
|
|
|
forkRepo := getForkRepository(ctx)
|
2015-08-08 18:10:34 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
2017-10-16 00:06:07 +09:00
|
|
|
|
2015-08-08 18:10:34 +09:00
|
|
|
ctx.Data["ContextUser"] = ctxUser
|
|
|
|
|
|
|
|
if ctx.HasError() {
|
2016-11-24 16:04:31 +09:00
|
|
|
ctx.HTML(200, tplFork)
|
2015-08-08 18:10:34 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2017-11-06 13:12:55 +09:00
|
|
|
var err error
|
|
|
|
var traverseParentRepo = forkRepo
|
|
|
|
for {
|
|
|
|
if ctxUser.ID == traverseParentRepo.OwnerID {
|
|
|
|
ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), tplFork, &form)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
repo, has := models.HasForkedRepo(ctxUser.ID, traverseParentRepo.ID)
|
|
|
|
if has {
|
|
|
|
ctx.Redirect(setting.AppSubURL + "/" + ctxUser.Name + "/" + repo.Name)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !traverseParentRepo.IsFork {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
traverseParentRepo, err = models.GetRepositoryByID(traverseParentRepo.ForkID)
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetRepositoryByID", err)
|
2017-11-06 13:12:55 +09:00
|
|
|
return
|
|
|
|
}
|
2017-07-26 16:17:38 +09:00
|
|
|
}
|
|
|
|
|
2015-08-08 18:10:34 +09:00
|
|
|
// Check ownership of organization.
|
|
|
|
if ctxUser.IsOrganization() {
|
2017-12-21 16:43:26 +09:00
|
|
|
isOwner, err := ctxUser.IsOwnedBy(ctx.User.ID)
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("IsOwnedBy", err)
|
2017-12-21 16:43:26 +09:00
|
|
|
return
|
|
|
|
} else if !isOwner {
|
2015-08-08 18:10:34 +09:00
|
|
|
ctx.Error(403)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-03 17:20:24 +09:00
|
|
|
repo, err := models.ForkRepository(ctx.User, ctxUser, forkRepo, form.RepoName, form.Description)
|
2015-08-08 18:10:34 +09:00
|
|
|
if err != nil {
|
2015-08-31 16:24:28 +09:00
|
|
|
ctx.Data["Err_RepoName"] = true
|
2015-08-08 18:10:34 +09:00
|
|
|
switch {
|
|
|
|
case models.IsErrRepoAlreadyExist(err):
|
2016-11-24 16:04:31 +09:00
|
|
|
ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), tplFork, &form)
|
2015-08-08 18:10:34 +09:00
|
|
|
case models.IsErrNameReserved(err):
|
2016-11-24 16:04:31 +09:00
|
|
|
ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), tplFork, &form)
|
2015-08-08 18:10:34 +09:00
|
|
|
case models.IsErrNamePatternNotAllowed(err):
|
2016-11-24 16:04:31 +09:00
|
|
|
ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), tplFork, &form)
|
2015-08-08 18:10:34 +09:00
|
|
|
default:
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("ForkPost", err)
|
2015-08-08 18:10:34 +09:00
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2015-08-08 23:43:14 +09:00
|
|
|
log.Trace("Repository forked[%d]: %s/%s", forkRepo.ID, ctxUser.Name, repo.Name)
|
2016-11-27 19:14:25 +09:00
|
|
|
ctx.Redirect(setting.AppSubURL + "/" + ctxUser.Name + "/" + repo.Name)
|
2015-08-08 18:10:34 +09:00
|
|
|
}
|
|
|
|
|
2016-03-12 01:56:52 +09:00
|
|
|
func checkPullInfo(ctx *context.Context) *models.Issue {
|
2015-10-19 08:30:39 +09:00
|
|
|
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
|
2015-09-02 17:08:05 +09:00
|
|
|
if err != nil {
|
|
|
|
if models.IsErrIssueNotExist(err) {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("GetIssueByIndex", err)
|
2015-09-02 17:08:05 +09:00
|
|
|
} else {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetIssueByIndex", err)
|
2015-09-02 17:08:05 +09:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
2018-12-14 00:55:43 +09:00
|
|
|
if err = issue.LoadPoster(); err != nil {
|
|
|
|
ctx.ServerError("LoadPoster", err)
|
|
|
|
return nil
|
|
|
|
}
|
2019-10-24 02:54:13 +09:00
|
|
|
if err := issue.LoadRepo(); err != nil {
|
|
|
|
ctx.ServerError("LoadRepo", err)
|
|
|
|
return nil
|
|
|
|
}
|
2016-10-12 22:28:51 +09:00
|
|
|
ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, issue.Title)
|
2015-10-19 08:30:39 +09:00
|
|
|
ctx.Data["Issue"] = issue
|
2015-09-02 17:08:05 +09:00
|
|
|
|
2015-10-19 08:30:39 +09:00
|
|
|
if !issue.IsPull {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("ViewPullCommits", nil)
|
2015-09-02 17:08:05 +09:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2018-12-14 00:55:43 +09:00
|
|
|
if err = issue.LoadPullRequest(); err != nil {
|
|
|
|
ctx.ServerError("LoadPullRequest", err)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-08-17 02:19:09 +09:00
|
|
|
if err = issue.PullRequest.GetHeadRepo(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetHeadRepo", err)
|
2015-10-24 16:36:47 +09:00
|
|
|
return nil
|
2015-09-02 17:08:05 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
if ctx.IsSigned {
|
|
|
|
// Update issue-user.
|
2016-07-24 02:08:22 +09:00
|
|
|
if err = issue.ReadBy(ctx.User.ID); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("ReadBy", err)
|
2015-09-02 17:08:05 +09:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-19 08:30:39 +09:00
|
|
|
return issue
|
2015-09-02 17:08:05 +09:00
|
|
|
}
|
|
|
|
|
2017-10-05 02:35:01 +09:00
|
|
|
func setMergeTarget(ctx *context.Context, pull *models.PullRequest) {
|
2019-10-18 20:13:31 +09:00
|
|
|
if ctx.Repo.Owner.Name == pull.MustHeadUserName() {
|
2017-10-05 02:35:01 +09:00
|
|
|
ctx.Data["HeadTarget"] = pull.HeadBranch
|
|
|
|
} else if pull.HeadRepo == nil {
|
2019-10-18 20:13:31 +09:00
|
|
|
ctx.Data["HeadTarget"] = pull.MustHeadUserName() + ":" + pull.HeadBranch
|
2017-10-05 02:35:01 +09:00
|
|
|
} else {
|
2019-10-18 20:13:31 +09:00
|
|
|
ctx.Data["HeadTarget"] = pull.MustHeadUserName() + "/" + pull.HeadRepo.Name + ":" + pull.HeadBranch
|
2017-10-05 02:35:01 +09:00
|
|
|
}
|
|
|
|
ctx.Data["BaseTarget"] = pull.BaseBranch
|
|
|
|
}
|
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
// PrepareMergedViewPullInfo show meta information for a merged pull request view page
|
2019-06-08 05:29:29 +09:00
|
|
|
func PrepareMergedViewPullInfo(ctx *context.Context, issue *models.Issue) *git.CompareInfo {
|
2016-08-17 02:19:09 +09:00
|
|
|
pull := issue.PullRequest
|
2015-09-02 22:26:56 +09:00
|
|
|
|
2017-10-05 02:35:01 +09:00
|
|
|
setMergeTarget(ctx, pull)
|
|
|
|
ctx.Data["HasMerged"] = true
|
|
|
|
|
2019-06-12 08:32:08 +09:00
|
|
|
compareInfo, err := ctx.Repo.GitRepo.GetCompareInfo(ctx.Repo.Repository.RepoPath(),
|
2018-01-19 15:18:51 +09:00
|
|
|
pull.MergeBase, pull.GetGitRefName())
|
2017-11-25 22:47:19 +09:00
|
|
|
|
2015-09-02 22:26:56 +09:00
|
|
|
if err != nil {
|
2018-01-19 15:18:51 +09:00
|
|
|
if strings.Contains(err.Error(), "fatal: Not a valid object name") {
|
2018-08-01 12:00:35 +09:00
|
|
|
ctx.Data["IsPullRequestBroken"] = true
|
2018-01-19 15:18:51 +09:00
|
|
|
ctx.Data["BaseTarget"] = "deleted"
|
|
|
|
ctx.Data["NumCommits"] = 0
|
|
|
|
ctx.Data["NumFiles"] = 0
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-06-08 05:29:29 +09:00
|
|
|
ctx.ServerError("GetCompareInfo", err)
|
2018-01-19 15:18:51 +09:00
|
|
|
return nil
|
2015-09-02 22:26:56 +09:00
|
|
|
}
|
2019-06-12 08:32:08 +09:00
|
|
|
ctx.Data["NumCommits"] = compareInfo.Commits.Len()
|
|
|
|
ctx.Data["NumFiles"] = compareInfo.NumFiles
|
|
|
|
return compareInfo
|
2015-09-02 22:26:56 +09:00
|
|
|
}
|
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
// PrepareViewPullInfo show meta information for a pull request preview page
|
2019-06-08 05:29:29 +09:00
|
|
|
func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.CompareInfo {
|
2015-09-02 17:08:05 +09:00
|
|
|
repo := ctx.Repo.Repository
|
2016-08-17 02:19:09 +09:00
|
|
|
pull := issue.PullRequest
|
2015-09-02 17:08:05 +09:00
|
|
|
|
2017-10-05 02:35:01 +09:00
|
|
|
var err error
|
2015-10-24 16:36:47 +09:00
|
|
|
if err = pull.GetHeadRepo(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetHeadRepo", err)
|
2015-10-24 16:36:47 +09:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-10-05 02:35:01 +09:00
|
|
|
setMergeTarget(ctx, pull)
|
|
|
|
|
2019-09-18 14:39:45 +09:00
|
|
|
if err = pull.LoadProtectedBranch(); err != nil {
|
|
|
|
ctx.ServerError("GetLatestCommitStatus", err)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
ctx.Data["EnableStatusCheck"] = pull.ProtectedBranch != nil && pull.ProtectedBranch.EnableStatusCheck
|
|
|
|
|
2017-10-05 02:35:01 +09:00
|
|
|
var headGitRepo *git.Repository
|
2019-06-30 16:57:59 +09:00
|
|
|
var headBranchExist bool
|
|
|
|
// HeadRepo may be missing
|
2015-10-05 09:54:06 +09:00
|
|
|
if pull.HeadRepo != nil {
|
2015-11-27 07:33:45 +09:00
|
|
|
headGitRepo, err = git.OpenRepository(pull.HeadRepo.RepoPath())
|
2015-10-05 09:54:06 +09:00
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("OpenRepository", err)
|
2015-10-05 09:54:06 +09:00
|
|
|
return nil
|
|
|
|
}
|
2019-06-30 16:57:59 +09:00
|
|
|
|
|
|
|
headBranchExist = headGitRepo.IsBranchExist(pull.HeadBranch)
|
|
|
|
|
|
|
|
if headBranchExist {
|
|
|
|
sha, err := headGitRepo.GetBranchCommitID(pull.HeadBranch)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetBranchCommitID", err)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
commitStatuses, err := models.GetLatestCommitStatus(repo, sha, 0)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetLatestCommitStatus", err)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if len(commitStatuses) > 0 {
|
|
|
|
ctx.Data["LatestCommitStatuses"] = commitStatuses
|
|
|
|
ctx.Data["LatestCommitStatus"] = models.CalcCommitStatus(commitStatuses)
|
|
|
|
}
|
2019-09-18 14:39:45 +09:00
|
|
|
|
|
|
|
if pull.ProtectedBranch != nil && pull.ProtectedBranch.EnableStatusCheck {
|
|
|
|
ctx.Data["is_context_required"] = func(context string) bool {
|
|
|
|
for _, c := range pull.ProtectedBranch.StatusCheckContexts {
|
|
|
|
if c == context {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
ctx.Data["IsRequiredStatusCheckSuccess"] = pull_service.IsCommitStatusContextSuccess(commitStatuses, pull.ProtectedBranch.StatusCheckContexts)
|
|
|
|
}
|
2019-06-30 16:57:59 +09:00
|
|
|
}
|
2015-09-02 17:08:05 +09:00
|
|
|
}
|
|
|
|
|
2019-06-30 16:57:59 +09:00
|
|
|
if pull.HeadRepo == nil || !headBranchExist {
|
2018-08-01 12:00:35 +09:00
|
|
|
ctx.Data["IsPullRequestBroken"] = true
|
2015-09-02 22:26:56 +09:00
|
|
|
ctx.Data["HeadTarget"] = "deleted"
|
|
|
|
ctx.Data["NumCommits"] = 0
|
|
|
|
ctx.Data["NumFiles"] = 0
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-06-12 08:32:08 +09:00
|
|
|
compareInfo, err := headGitRepo.GetCompareInfo(models.RepoPath(repo.Owner.Name, repo.Name),
|
2015-10-19 08:30:39 +09:00
|
|
|
pull.BaseBranch, pull.HeadBranch)
|
2015-09-02 17:08:05 +09:00
|
|
|
if err != nil {
|
2016-07-23 19:35:16 +09:00
|
|
|
if strings.Contains(err.Error(), "fatal: Not a valid object name") {
|
2018-08-01 12:00:35 +09:00
|
|
|
ctx.Data["IsPullRequestBroken"] = true
|
2016-07-23 19:35:16 +09:00
|
|
|
ctx.Data["BaseTarget"] = "deleted"
|
|
|
|
ctx.Data["NumCommits"] = 0
|
|
|
|
ctx.Data["NumFiles"] = 0
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-06-08 05:29:29 +09:00
|
|
|
ctx.ServerError("GetCompareInfo", err)
|
2015-09-02 17:08:05 +09:00
|
|
|
return nil
|
|
|
|
}
|
2018-08-14 04:04:39 +09:00
|
|
|
|
|
|
|
if pull.IsWorkInProgress() {
|
|
|
|
ctx.Data["IsPullWorkInProgress"] = true
|
|
|
|
ctx.Data["WorkInProgressPrefix"] = pull.GetWorkInProgressPrefix()
|
|
|
|
}
|
|
|
|
|
2019-02-05 20:54:49 +09:00
|
|
|
if pull.IsFilesConflicted() {
|
|
|
|
ctx.Data["IsPullFilesConflicted"] = true
|
|
|
|
ctx.Data["ConflictedFiles"] = pull.ConflictedFiles
|
|
|
|
}
|
|
|
|
|
2019-06-12 08:32:08 +09:00
|
|
|
ctx.Data["NumCommits"] = compareInfo.Commits.Len()
|
|
|
|
ctx.Data["NumFiles"] = compareInfo.NumFiles
|
|
|
|
return compareInfo
|
2015-09-02 17:08:05 +09:00
|
|
|
}
|
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
// ViewPullCommits show commits for a pull request
|
2016-03-12 01:56:52 +09:00
|
|
|
func ViewPullCommits(ctx *context.Context) {
|
2016-08-14 19:32:24 +09:00
|
|
|
ctx.Data["PageIsPullList"] = true
|
2015-09-02 17:08:05 +09:00
|
|
|
ctx.Data["PageIsPullCommits"] = true
|
|
|
|
|
2016-08-17 02:19:09 +09:00
|
|
|
issue := checkPullInfo(ctx)
|
2015-09-02 17:08:05 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
2016-08-17 02:19:09 +09:00
|
|
|
pull := issue.PullRequest
|
2015-09-02 17:08:05 +09:00
|
|
|
|
2015-09-02 22:26:56 +09:00
|
|
|
var commits *list.List
|
|
|
|
if pull.HasMerged {
|
2018-01-19 15:18:51 +09:00
|
|
|
prInfo := PrepareMergedViewPullInfo(ctx, issue)
|
2015-09-02 22:26:56 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
2018-01-19 15:18:51 +09:00
|
|
|
} else if prInfo == nil {
|
|
|
|
ctx.NotFound("ViewPullCommits", nil)
|
|
|
|
return
|
2015-09-02 22:26:56 +09:00
|
|
|
}
|
2017-06-21 07:25:38 +09:00
|
|
|
ctx.Data["Username"] = ctx.Repo.Owner.Name
|
|
|
|
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
|
2018-01-19 15:18:51 +09:00
|
|
|
commits = prInfo.Commits
|
2015-09-02 22:26:56 +09:00
|
|
|
} else {
|
2016-08-17 02:19:09 +09:00
|
|
|
prInfo := PrepareViewPullInfo(ctx, issue)
|
2015-09-02 22:26:56 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
} else if prInfo == nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("ViewPullCommits", nil)
|
2015-09-02 22:26:56 +09:00
|
|
|
return
|
|
|
|
}
|
2019-10-18 20:13:31 +09:00
|
|
|
ctx.Data["Username"] = pull.MustHeadUserName()
|
2017-06-21 07:25:38 +09:00
|
|
|
ctx.Data["Reponame"] = pull.HeadRepo.Name
|
2015-09-02 22:26:56 +09:00
|
|
|
commits = prInfo.Commits
|
2015-09-02 17:08:05 +09:00
|
|
|
}
|
|
|
|
|
2015-09-02 22:26:56 +09:00
|
|
|
commits = models.ValidateCommitsWithEmails(commits)
|
2017-05-07 23:40:31 +09:00
|
|
|
commits = models.ParseCommitsWithSignature(commits)
|
|
|
|
commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
|
2015-09-02 22:26:56 +09:00
|
|
|
ctx.Data["Commits"] = commits
|
|
|
|
ctx.Data["CommitCount"] = commits.Len()
|
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
ctx.HTML(200, tplPullCommits)
|
2015-09-02 17:08:05 +09:00
|
|
|
}
|
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
// ViewPullFiles render pull request changed files list page
|
2016-03-12 01:56:52 +09:00
|
|
|
func ViewPullFiles(ctx *context.Context) {
|
2016-08-14 19:32:24 +09:00
|
|
|
ctx.Data["PageIsPullList"] = true
|
2015-09-02 17:08:05 +09:00
|
|
|
ctx.Data["PageIsPullFiles"] = true
|
|
|
|
|
2016-08-17 02:19:09 +09:00
|
|
|
issue := checkPullInfo(ctx)
|
2015-09-02 17:08:05 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
2016-08-17 02:19:09 +09:00
|
|
|
pull := issue.PullRequest
|
2015-09-02 17:08:05 +09:00
|
|
|
|
2018-08-15 02:49:33 +09:00
|
|
|
whitespaceFlags := map[string]string{
|
|
|
|
"ignore-all": "-w",
|
|
|
|
"ignore-change": "-b",
|
|
|
|
"ignore-eol": "--ignore-space-at-eol",
|
|
|
|
"": ""}
|
|
|
|
|
2015-09-02 22:26:56 +09:00
|
|
|
var (
|
|
|
|
diffRepoPath string
|
|
|
|
startCommitID string
|
|
|
|
endCommitID string
|
|
|
|
gitRepo *git.Repository
|
|
|
|
)
|
|
|
|
|
2017-06-21 07:25:38 +09:00
|
|
|
var headTarget string
|
2015-09-02 22:26:56 +09:00
|
|
|
if pull.HasMerged {
|
2018-01-19 15:18:51 +09:00
|
|
|
prInfo := PrepareMergedViewPullInfo(ctx, issue)
|
2015-09-02 22:26:56 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
2018-01-19 15:18:51 +09:00
|
|
|
} else if prInfo == nil {
|
|
|
|
ctx.NotFound("ViewPullFiles", nil)
|
|
|
|
return
|
2015-09-02 22:26:56 +09:00
|
|
|
}
|
2015-09-02 17:08:05 +09:00
|
|
|
|
2015-09-02 22:26:56 +09:00
|
|
|
diffRepoPath = ctx.Repo.GitRepo.Path
|
2018-01-19 15:18:51 +09:00
|
|
|
gitRepo = ctx.Repo.GitRepo
|
|
|
|
|
|
|
|
headCommitID, err := gitRepo.GetRefCommitID(pull.GetGitRefName())
|
2017-11-25 22:47:19 +09:00
|
|
|
if err != nil {
|
2018-01-19 15:18:51 +09:00
|
|
|
ctx.ServerError("GetRefCommitID", err)
|
2017-11-25 22:47:19 +09:00
|
|
|
return
|
|
|
|
}
|
2018-01-19 15:18:51 +09:00
|
|
|
|
|
|
|
startCommitID = prInfo.MergeBase
|
|
|
|
endCommitID = headCommitID
|
2017-06-21 07:25:38 +09:00
|
|
|
|
|
|
|
headTarget = path.Join(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
|
|
|
|
ctx.Data["Username"] = ctx.Repo.Owner.Name
|
|
|
|
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
|
2015-09-02 22:26:56 +09:00
|
|
|
} else {
|
2016-08-17 02:19:09 +09:00
|
|
|
prInfo := PrepareViewPullInfo(ctx, issue)
|
2015-09-02 22:26:56 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
} else if prInfo == nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("ViewPullFiles", nil)
|
2015-09-02 22:26:56 +09:00
|
|
|
return
|
|
|
|
}
|
2015-09-02 17:08:05 +09:00
|
|
|
|
2019-10-18 20:13:31 +09:00
|
|
|
headRepoPath := pull.HeadRepo.RepoPath()
|
2015-09-02 17:08:05 +09:00
|
|
|
|
2015-09-02 22:26:56 +09:00
|
|
|
headGitRepo, err := git.OpenRepository(headRepoPath)
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("OpenRepository", err)
|
2015-09-02 22:26:56 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2015-12-10 10:46:05 +09:00
|
|
|
headCommitID, err := headGitRepo.GetBranchCommitID(pull.HeadBranch)
|
2015-09-02 22:26:56 +09:00
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetBranchCommitID", err)
|
2015-09-02 22:26:56 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
diffRepoPath = headRepoPath
|
|
|
|
startCommitID = prInfo.MergeBase
|
|
|
|
endCommitID = headCommitID
|
|
|
|
gitRepo = headGitRepo
|
2017-06-21 07:25:38 +09:00
|
|
|
|
2019-10-18 20:13:31 +09:00
|
|
|
headTarget = path.Join(pull.MustHeadUserName(), pull.HeadRepo.Name)
|
|
|
|
ctx.Data["Username"] = pull.MustHeadUserName()
|
2017-06-21 07:25:38 +09:00
|
|
|
ctx.Data["Reponame"] = pull.HeadRepo.Name
|
2015-09-02 17:08:05 +09:00
|
|
|
}
|
|
|
|
|
2019-09-06 11:20:09 +09:00
|
|
|
diff, err := gitdiff.GetDiffRangeWithWhitespaceBehavior(diffRepoPath,
|
2016-06-30 00:11:00 +09:00
|
|
|
startCommitID, endCommitID, setting.Git.MaxGitDiffLines,
|
2018-08-15 02:49:33 +09:00
|
|
|
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles,
|
|
|
|
whitespaceFlags[ctx.Data["WhitespaceBehavior"].(string)])
|
2015-09-02 17:08:05 +09:00
|
|
|
if err != nil {
|
2018-08-15 02:49:33 +09:00
|
|
|
ctx.ServerError("GetDiffRangeWithWhitespaceBehavior", err)
|
2015-09-02 17:08:05 +09:00
|
|
|
return
|
|
|
|
}
|
2018-08-06 13:43:22 +09:00
|
|
|
|
|
|
|
if err = diff.LoadComments(issue, ctx.User); err != nil {
|
|
|
|
ctx.ServerError("LoadComments", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2015-09-02 17:08:05 +09:00
|
|
|
ctx.Data["Diff"] = diff
|
|
|
|
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
|
|
|
|
|
2019-09-16 18:03:22 +09:00
|
|
|
baseCommit, err := ctx.Repo.GitRepo.GetCommit(startCommitID)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetCommit", err)
|
|
|
|
return
|
|
|
|
}
|
2015-09-02 22:26:56 +09:00
|
|
|
commit, err := gitRepo.GetCommit(endCommitID)
|
2015-09-02 17:08:05 +09:00
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetCommit", err)
|
2015-09-02 17:08:05 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-10-05 04:58:54 +09:00
|
|
|
setImageCompareContext(ctx, baseCommit, commit)
|
|
|
|
setPathsCompareContext(ctx, baseCommit, commit, headTarget)
|
2019-09-16 18:03:22 +09:00
|
|
|
|
2016-02-01 01:19:02 +09:00
|
|
|
ctx.Data["RequireHighlightJS"] = true
|
2018-08-06 13:43:22 +09:00
|
|
|
ctx.Data["RequireTribute"] = true
|
|
|
|
if ctx.Data["Assignees"], err = ctx.Repo.Repository.GetAssignees(); err != nil {
|
|
|
|
ctx.ServerError("GetAssignees", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
ctx.Data["CurrentReview"], err = models.GetCurrentReview(ctx.User, issue)
|
|
|
|
if err != nil && !models.IsErrReviewNotExist(err) {
|
|
|
|
ctx.ServerError("GetCurrentReview", err)
|
|
|
|
return
|
|
|
|
}
|
2016-11-24 16:04:31 +09:00
|
|
|
ctx.HTML(200, tplPullFiles)
|
2015-09-02 17:08:05 +09:00
|
|
|
}
|
2015-08-31 16:24:28 +09:00
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
// MergePullRequest response for merging pull request
|
2018-01-06 03:56:50 +09:00
|
|
|
func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
|
2015-10-19 08:30:39 +09:00
|
|
|
issue := checkPullInfo(ctx)
|
2015-09-02 22:26:56 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
2015-10-19 08:30:39 +09:00
|
|
|
if issue.IsClosed {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("MergePullRequest", nil)
|
2015-09-02 22:26:56 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-12-14 00:55:43 +09:00
|
|
|
pr := issue.PullRequest
|
2015-09-02 22:26:56 +09:00
|
|
|
|
2015-10-19 06:18:45 +09:00
|
|
|
if !pr.CanAutoMerge() || pr.HasMerged {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("MergePullRequest", nil)
|
2015-09-02 22:26:56 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-08-14 04:04:39 +09:00
|
|
|
if pr.IsWorkInProgress() {
|
|
|
|
ctx.Flash.Error(ctx.Tr("repo.pulls.no_merge_wip"))
|
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-09-18 14:39:45 +09:00
|
|
|
isPass, err := pull_service.IsPullCommitStatusPass(pr)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("IsPullCommitStatusPass", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !isPass && !ctx.IsUserRepoAdmin() {
|
|
|
|
ctx.Flash.Error(ctx.Tr("repo.pulls.no_merge_status_check"))
|
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-01-06 03:56:50 +09:00
|
|
|
if ctx.HasError() {
|
|
|
|
ctx.Flash.Error(ctx.Data["ErrorMsg"].(string))
|
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
message := strings.TrimSpace(form.MergeTitleField)
|
|
|
|
if len(message) == 0 {
|
|
|
|
if models.MergeStyle(form.Do) == models.MergeStyleMerge {
|
|
|
|
message = pr.GetDefaultMergeMessage()
|
|
|
|
}
|
2018-12-27 19:27:08 +09:00
|
|
|
if models.MergeStyle(form.Do) == models.MergeStyleRebaseMerge {
|
|
|
|
message = pr.GetDefaultMergeMessage()
|
|
|
|
}
|
2018-01-06 03:56:50 +09:00
|
|
|
if models.MergeStyle(form.Do) == models.MergeStyleSquash {
|
|
|
|
message = pr.GetDefaultSquashMessage()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
form.MergeMessageField = strings.TrimSpace(form.MergeMessageField)
|
|
|
|
if len(form.MergeMessageField) > 0 {
|
|
|
|
message += "\n\n" + form.MergeMessageField
|
|
|
|
}
|
|
|
|
|
2015-10-19 08:30:39 +09:00
|
|
|
pr.Issue = issue
|
|
|
|
pr.Issue.Repo = ctx.Repo.Repository
|
2018-07-18 06:23:58 +09:00
|
|
|
|
|
|
|
noDeps, err := models.IssueNoDependenciesLeft(issue)
|
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if !noDeps {
|
|
|
|
ctx.Flash.Error(ctx.Tr("repo.issues.dependency.pr_close_blocked"))
|
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-09-27 09:22:36 +09:00
|
|
|
if err = pull_service.Merge(pr, ctx.User, ctx.Repo.GitRepo, models.MergeStyle(form.Do), message); err != nil {
|
2018-01-06 03:56:50 +09:00
|
|
|
if models.IsErrInvalidMergeStyle(err) {
|
|
|
|
ctx.Flash.Error(ctx.Tr("repo.pulls.invalid_merge_option"))
|
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
|
|
|
|
return
|
|
|
|
}
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("Merge", err)
|
2015-09-02 22:26:56 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-02-05 20:38:11 +09:00
|
|
|
if err := stopTimerIfAvailable(ctx.User, issue); err != nil {
|
|
|
|
ctx.ServerError("CreateOrStopIssueStopwatch", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-10-18 20:23:05 +09:00
|
|
|
notification.NotifyMergePullRequest(pr, ctx.User, ctx.Repo.GitRepo)
|
2017-01-29 00:59:58 +09:00
|
|
|
|
2015-09-02 22:26:56 +09:00
|
|
|
log.Trace("Pull request merged: %d", pr.ID)
|
2015-10-19 08:30:39 +09:00
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
|
2015-09-02 22:26:56 +09:00
|
|
|
}
|
|
|
|
|
2019-02-05 20:38:11 +09:00
|
|
|
func stopTimerIfAvailable(user *models.User, issue *models.Issue) error {
|
|
|
|
|
|
|
|
if models.StopwatchExists(user.ID, issue.ID) {
|
|
|
|
if err := models.CreateOrStopIssueStopwatch(user, issue); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
// CompareAndPullRequestPost response for creating pull request
|
2016-03-12 01:56:52 +09:00
|
|
|
func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) {
|
2015-09-02 08:07:02 +09:00
|
|
|
ctx.Data["Title"] = ctx.Tr("repo.pulls.compare_changes")
|
|
|
|
ctx.Data["PageIsComparePull"] = true
|
|
|
|
ctx.Data["IsDiffCompare"] = true
|
2016-08-16 06:04:44 +09:00
|
|
|
ctx.Data["RequireHighlightJS"] = true
|
2018-08-14 04:04:39 +09:00
|
|
|
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
|
2015-09-02 08:07:02 +09:00
|
|
|
renderAttachmentSettings(ctx)
|
|
|
|
|
|
|
|
var (
|
|
|
|
repo = ctx.Repo.Repository
|
|
|
|
attachments []string
|
|
|
|
)
|
|
|
|
|
2015-09-02 08:26:39 +09:00
|
|
|
headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch := ParseCompareInfo(ctx)
|
2015-09-02 08:07:02 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-11-28 20:26:14 +09:00
|
|
|
labelIDs, assigneeIDs, milestoneID := ValidateRepoMetas(ctx, form, true)
|
2015-09-02 08:07:02 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if setting.AttachmentEnabled {
|
2016-08-11 21:48:08 +09:00
|
|
|
attachments = form.Files
|
2015-09-02 08:07:02 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
if ctx.HasError() {
|
2016-08-16 06:04:44 +09:00
|
|
|
auth.AssignForm(form, ctx.Data)
|
|
|
|
|
|
|
|
// This stage is already stop creating new pull request, so it does not matter if it has
|
|
|
|
// something to compare or not.
|
|
|
|
PrepareCompareDiff(ctx, headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch)
|
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-06-08 05:29:29 +09:00
|
|
|
ctx.HTML(200, tplCompareDiff)
|
2015-09-02 08:07:02 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-01-21 20:45:32 +09:00
|
|
|
if util.IsEmptyString(form.Title) {
|
|
|
|
PrepareCompareDiff(ctx, headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch)
|
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-06-08 05:29:29 +09:00
|
|
|
ctx.RenderWithErr(ctx.Tr("repo.issues.new.title_empty"), tplCompareDiff, form)
|
2019-01-21 20:45:32 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-08-16 06:04:44 +09:00
|
|
|
patch, err := headGitRepo.GetPatch(prInfo.MergeBase, headBranch)
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetPatch", err)
|
2016-08-16 06:04:44 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-02-24 21:56:54 +09:00
|
|
|
pullIssue := &models.Issue{
|
2015-09-02 08:07:02 +09:00
|
|
|
RepoID: repo.ID,
|
2016-08-14 19:32:24 +09:00
|
|
|
Title: form.Title,
|
2016-07-24 02:08:22 +09:00
|
|
|
PosterID: ctx.User.ID,
|
2015-09-02 08:07:02 +09:00
|
|
|
Poster: ctx.User,
|
|
|
|
MilestoneID: milestoneID,
|
|
|
|
IsPull: true,
|
|
|
|
Content: form.Content,
|
|
|
|
}
|
2016-02-24 21:56:54 +09:00
|
|
|
pullRequest := &models.PullRequest{
|
2019-10-18 20:13:31 +09:00
|
|
|
HeadRepoID: headRepo.ID,
|
|
|
|
BaseRepoID: repo.ID,
|
|
|
|
HeadBranch: headBranch,
|
|
|
|
BaseBranch: baseBranch,
|
|
|
|
HeadRepo: headRepo,
|
|
|
|
BaseRepo: repo,
|
|
|
|
MergeBase: prInfo.MergeBase,
|
|
|
|
Type: models.PullRequestGitea,
|
2016-02-24 21:56:54 +09:00
|
|
|
}
|
2016-08-16 06:04:44 +09:00
|
|
|
// FIXME: check error in the case two people send pull request at almost same time, give nice error prompt
|
|
|
|
// instead of 500.
|
2018-05-10 01:29:04 +09:00
|
|
|
|
2019-10-25 23:46:37 +09:00
|
|
|
if err := pull_service.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch); err != nil {
|
2018-05-10 01:29:04 +09:00
|
|
|
if models.IsErrUserDoesNotHaveAccessToRepo(err) {
|
|
|
|
ctx.Error(400, "UserDoesNotHaveAccessToRepo", err.Error())
|
|
|
|
return
|
|
|
|
}
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("NewPullRequest", err)
|
2015-09-02 08:07:02 +09:00
|
|
|
return
|
2016-03-05 05:43:01 +09:00
|
|
|
} else if err := pullRequest.PushToBaseRepo(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("PushToBaseRepo", err)
|
2016-02-24 21:56:54 +09:00
|
|
|
return
|
2015-12-11 01:18:56 +09:00
|
|
|
}
|
|
|
|
|
2019-10-25 23:46:37 +09:00
|
|
|
if err := issue_service.AddAssignees(pullIssue, ctx.User, assigneeIDs); err != nil {
|
|
|
|
log.Error("AddAssignees: %v", err)
|
|
|
|
ctx.Flash.Error(ctx.Tr("issues.assignee.error"))
|
|
|
|
}
|
|
|
|
|
2018-10-18 20:23:05 +09:00
|
|
|
notification.NotifyNewPullRequest(pullRequest)
|
2017-01-29 00:59:58 +09:00
|
|
|
|
2016-02-24 21:56:54 +09:00
|
|
|
log.Trace("Pull request created: %d/%d", repo.ID, pullIssue.ID)
|
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pullIssue.Index))
|
2014-03-24 19:25:15 +09:00
|
|
|
}
|
2015-10-24 16:36:47 +09:00
|
|
|
|
2016-11-24 16:04:31 +09:00
|
|
|
// TriggerTask response for a trigger task request
|
2016-03-12 01:56:52 +09:00
|
|
|
func TriggerTask(ctx *context.Context) {
|
2016-08-14 19:32:24 +09:00
|
|
|
pusherID := ctx.QueryInt64("pusher")
|
2015-12-15 07:06:54 +09:00
|
|
|
branch := ctx.Query("branch")
|
|
|
|
secret := ctx.Query("secret")
|
2016-08-14 19:32:24 +09:00
|
|
|
if len(branch) == 0 || len(secret) == 0 || pusherID <= 0 {
|
2015-12-15 07:06:54 +09:00
|
|
|
ctx.Error(404)
|
2016-08-14 19:32:24 +09:00
|
|
|
log.Trace("TriggerTask: branch or secret is empty, or pusher ID is not valid")
|
2015-12-15 07:06:54 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
owner, repo := parseOwnerAndRepo(ctx)
|
2015-10-24 16:36:47 +09:00
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
2019-07-07 02:03:13 +09:00
|
|
|
got := []byte(base.EncodeMD5(owner.Salt))
|
|
|
|
want := []byte(secret)
|
|
|
|
if subtle.ConstantTimeCompare(got, want) != 1 {
|
2015-12-15 07:06:54 +09:00
|
|
|
ctx.Error(404)
|
|
|
|
log.Trace("TriggerTask [%s/%s]: invalid secret", owner.Name, repo.Name)
|
2015-10-24 16:36:47 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-08-14 19:32:24 +09:00
|
|
|
pusher, err := models.GetUserByID(pusherID)
|
|
|
|
if err != nil {
|
|
|
|
if models.IsErrUserNotExist(err) {
|
|
|
|
ctx.Error(404)
|
|
|
|
} else {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetUserByID", err)
|
2016-08-14 19:32:24 +09:00
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
log.Trace("TriggerTask '%s/%s' by %s", repo.Name, branch, pusher.Name)
|
2015-10-24 16:36:47 +09:00
|
|
|
|
|
|
|
go models.HookQueue.Add(repo.ID)
|
2019-10-15 12:28:40 +09:00
|
|
|
go pull_service.AddTestPullRequestTask(pusher, repo.ID, branch, true)
|
2015-10-24 16:36:47 +09:00
|
|
|
ctx.Status(202)
|
|
|
|
}
|
2017-06-21 10:00:03 +09:00
|
|
|
|
|
|
|
// CleanUpPullRequest responses for delete merged branch when PR has been merged
|
|
|
|
func CleanUpPullRequest(ctx *context.Context) {
|
|
|
|
issue := checkPullInfo(ctx)
|
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-12-14 00:55:43 +09:00
|
|
|
pr := issue.PullRequest
|
2017-06-21 10:00:03 +09:00
|
|
|
|
2019-04-21 05:50:34 +09:00
|
|
|
// Don't cleanup unmerged and unclosed PRs
|
|
|
|
if !pr.HasMerged && !issue.IsClosed {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("CleanUpPullRequest", nil)
|
2017-06-21 10:00:03 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-12-14 00:55:43 +09:00
|
|
|
if err := pr.GetHeadRepo(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetHeadRepo", err)
|
2017-06-21 10:00:03 +09:00
|
|
|
return
|
|
|
|
} else if pr.HeadRepo == nil {
|
|
|
|
// Forked repository has already been deleted
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("CleanUpPullRequest", nil)
|
2017-06-21 10:00:03 +09:00
|
|
|
return
|
2019-06-13 04:41:28 +09:00
|
|
|
} else if err = pr.GetBaseRepo(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetBaseRepo", err)
|
2017-06-21 10:00:03 +09:00
|
|
|
return
|
2019-06-13 04:41:28 +09:00
|
|
|
} else if err = pr.HeadRepo.GetOwner(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("HeadRepo.GetOwner", err)
|
2017-06-21 10:00:03 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-11-28 20:26:14 +09:00
|
|
|
perm, err := models.GetUserRepoPermission(pr.HeadRepo, ctx.User)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetUserRepoPermission", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !perm.CanWrite(models.UnitTypeCode) {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("CleanUpPullRequest", nil)
|
2017-06-21 10:00:03 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
fullBranchName := pr.HeadRepo.Owner.Name + "/" + pr.HeadBranch
|
|
|
|
|
|
|
|
gitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.HeadRepo.RepoPath()), err)
|
2017-06-21 10:00:03 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
gitBaseRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.BaseRepo.RepoPath()), err)
|
2017-06-21 10:00:03 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
defer func() {
|
|
|
|
ctx.JSON(200, map[string]interface{}{
|
|
|
|
"redirect": pr.BaseRepo.Link() + "/pulls/" + com.ToStr(issue.Index),
|
|
|
|
})
|
|
|
|
}()
|
|
|
|
|
|
|
|
if pr.HeadBranch == pr.HeadRepo.DefaultBranch || !gitRepo.IsBranchExist(pr.HeadBranch) {
|
|
|
|
ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if branch is not protected
|
2017-09-14 17:16:22 +09:00
|
|
|
if protected, err := pr.HeadRepo.IsProtectedBranch(pr.HeadBranch, ctx.User); err != nil || protected {
|
2017-06-21 10:00:03 +09:00
|
|
|
if err != nil {
|
2019-04-02 16:48:31 +09:00
|
|
|
log.Error("HeadRepo.IsProtectedBranch: %v", err)
|
2017-06-21 10:00:03 +09:00
|
|
|
}
|
|
|
|
ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if branch has no new commits
|
2018-01-30 21:29:39 +09:00
|
|
|
headCommitID, err := gitBaseRepo.GetRefCommitID(pr.GetGitRefName())
|
|
|
|
if err != nil {
|
2019-04-02 16:48:31 +09:00
|
|
|
log.Error("GetRefCommitID: %v", err)
|
2018-01-30 21:29:39 +09:00
|
|
|
ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
branchCommitID, err := gitRepo.GetBranchCommitID(pr.HeadBranch)
|
|
|
|
if err != nil {
|
2019-04-02 16:48:31 +09:00
|
|
|
log.Error("GetBranchCommitID: %v", err)
|
2018-01-30 21:29:39 +09:00
|
|
|
ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if headCommitID != branchCommitID {
|
|
|
|
ctx.Flash.Error(ctx.Tr("repo.branch.delete_branch_has_new_commits", fullBranchName))
|
|
|
|
return
|
2017-06-21 10:00:03 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
if err := gitRepo.DeleteBranch(pr.HeadBranch, git.DeleteBranchOptions{
|
|
|
|
Force: true,
|
|
|
|
}); err != nil {
|
2019-04-02 16:48:31 +09:00
|
|
|
log.Error("DeleteBranch: %v", err)
|
2017-06-21 10:00:03 +09:00
|
|
|
ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := models.AddDeletePRBranchComment(ctx.User, pr.BaseRepo, issue.ID, pr.HeadBranch); err != nil {
|
|
|
|
// Do not fail here as branch has already been deleted
|
2019-04-02 16:48:31 +09:00
|
|
|
log.Error("DeleteBranch: %v", err)
|
2017-06-21 10:00:03 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", fullBranchName))
|
|
|
|
}
|
2018-01-05 19:56:52 +09:00
|
|
|
|
|
|
|
// 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) {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("GetIssueByIndex", err)
|
2018-01-05 19:56:52 +09:00
|
|
|
} else {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetIssueByIndex", err)
|
2018-01-05 19:56:52 +09:00
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-01-07 22:10:20 +09:00
|
|
|
// Return not found if it's not a pull request
|
2018-01-05 19:56:52 +09:00
|
|
|
if !issue.IsPull {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("DownloadPullDiff",
|
2018-01-05 19:56:52 +09:00
|
|
|
fmt.Errorf("Issue is not a pull request"))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-12-14 00:55:43 +09:00
|
|
|
if err = issue.LoadPullRequest(); err != nil {
|
|
|
|
ctx.ServerError("LoadPullRequest", err)
|
|
|
|
return
|
|
|
|
}
|
2018-01-05 19:56:52 +09:00
|
|
|
|
2018-12-14 00:55:43 +09:00
|
|
|
pr := issue.PullRequest
|
2018-01-05 19:56:52 +09:00
|
|
|
if err = pr.GetBaseRepo(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetBaseRepo", err)
|
2018-01-05 19:56:52 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
patch, err := pr.BaseRepo.PatchPath(pr.Index)
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("PatchPath", err)
|
2018-01-05 19:56:52 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx.ServeFileContent(patch)
|
|
|
|
}
|
2018-01-07 22:10:20 +09:00
|
|
|
|
|
|
|
// 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) {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("GetIssueByIndex", err)
|
2018-01-07 22:10:20 +09:00
|
|
|
} else {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetIssueByIndex", err)
|
2018-01-07 22:10:20 +09:00
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return not found if it's not a pull request
|
|
|
|
if !issue.IsPull {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.NotFound("DownloadPullDiff",
|
2018-01-07 22:10:20 +09:00
|
|
|
fmt.Errorf("Issue is not a pull request"))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-12-14 00:55:43 +09:00
|
|
|
if err = issue.LoadPullRequest(); err != nil {
|
|
|
|
ctx.ServerError("LoadPullRequest", err)
|
|
|
|
return
|
|
|
|
}
|
2018-01-07 22:10:20 +09:00
|
|
|
|
2018-12-14 00:55:43 +09:00
|
|
|
pr := issue.PullRequest
|
2018-01-07 22:10:20 +09:00
|
|
|
if err = pr.GetHeadRepo(); err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetHeadRepo", err)
|
2018-01-07 22:10:20 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("OpenRepository", err)
|
2018-01-07 22:10:20 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
patch, err := headGitRepo.GetFormatPatch(pr.MergeBase, pr.HeadBranch)
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("GetFormatPatch", err)
|
2018-01-07 22:10:20 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err = io.Copy(ctx, patch)
|
|
|
|
if err != nil {
|
2018-01-11 06:34:17 +09:00
|
|
|
ctx.ServerError("io.Copy", err)
|
2018-01-07 22:10:20 +09:00
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|