gitea/routers/repo/pull.go

756 lines
20 KiB
Go
Raw Normal View History

2014-03-24 10:25:15 +00:00
// Copyright 2014 The Gogs Authors. All rights reserved.
// 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 13:26:56 +00:00
"container/list"
2016-10-12 13:28:51 +00:00
"fmt"
2015-09-01 23:07:02 +00:00
"path"
2015-08-08 14:43:14 +00:00
"strings"
2016-11-11 12:11:45 +00:00
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/setting"
2016-11-11 12:11:45 +00:00
"github.com/Unknwon/com"
2014-03-24 10:25:15 +00:00
)
2014-06-23 03:11:12 +00:00
const (
2016-11-24 07:04:31 +00:00
tplFork base.TplName = "repo/pulls/fork"
tplComparePull base.TplName = "repo/pulls/compare"
tplPullCommits base.TplName = "repo/pulls/commits"
tplPullFiles base.TplName = "repo/pulls/files"
2016-11-24 07:04:31 +00:00
pullRequestTemplateKey = "PullRequestTemplate"
)
var (
2016-11-24 07:04:31 +00:00
pullRequestTemplateCandidates = []string{
"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",
}
2014-06-23 03:11:12 +00:00
)
2016-03-11 16:56:52 +00:00
func getForkRepository(ctx *context.Context) *models.Repository {
2015-08-08 14:43:14 +00:00
forkRepo, err := models.GetRepositoryByID(ctx.ParamsInt64(":repoid"))
2015-08-08 09:10:34 +00:00
if err != nil {
if models.IsErrRepoNotExist(err) {
2015-08-08 14:43:14 +00:00
ctx.Handle(404, "GetRepositoryByID", nil)
2015-08-08 09:10:34 +00:00
} else {
2015-08-08 14:43:14 +00:00
ctx.Handle(500, "GetRepositoryByID", err)
2015-08-08 09:10:34 +00:00
}
return nil
}
2015-09-01 15:57:02 +00:00
2017-01-03 04:41:10 +00:00
if !forkRepo.CanBeForked() || !forkRepo.HasAccess(ctx.User) {
ctx.Handle(404, "getForkRepository", nil)
2015-09-01 15:57:02 +00:00
return nil
}
2015-08-08 09:10:34 +00:00
ctx.Data["repo_name"] = forkRepo.Name
2015-11-18 20:11:37 +00:00
ctx.Data["description"] = forkRepo.Description
2015-08-08 09:10:34 +00:00
ctx.Data["IsPrivate"] = forkRepo.IsPrivate
if err = forkRepo.GetOwner(); err != nil {
ctx.Handle(500, "GetOwner", err)
return nil
}
ctx.Data["ForkFrom"] = forkRepo.Owner.Name + "/" + forkRepo.Name
ctx.Data["ForkFromOwnerID"] = forkRepo.Owner.ID
2015-08-08 09:10:34 +00:00
2015-12-17 07:28:47 +00:00
if err := ctx.User.GetOrganizations(true); err != nil {
2015-08-08 09:10:34 +00:00
ctx.Handle(500, "GetOrganizations", err)
return nil
}
ctx.Data["Orgs"] = ctx.User.Orgs
return forkRepo
}
2016-11-24 07:04:31 +00:00
// Fork render repository fork page
2016-03-11 16:56:52 +00:00
func Fork(ctx *context.Context) {
2015-08-08 09:10:34 +00:00
ctx.Data["Title"] = ctx.Tr("new_fork")
getForkRepository(ctx)
if ctx.Written() {
return
}
ctx.Data["ContextUser"] = ctx.User
2016-11-24 07:04:31 +00:00
ctx.HTML(200, tplFork)
2015-08-08 09:10:34 +00:00
}
2016-11-24 07:04:31 +00:00
// ForkPost response for forking a repository
2016-03-11 16:56:52 +00:00
func ForkPost(ctx *context.Context, form auth.CreateRepoForm) {
2015-08-08 09:10:34 +00:00
ctx.Data["Title"] = ctx.Tr("new_fork")
forkRepo := getForkRepository(ctx)
if ctx.Written() {
return
}
2016-11-27 06:03:59 +00:00
ctxUser := checkContextUser(ctx, form.UID)
2015-08-08 09:10:34 +00:00
if ctx.Written() {
return
}
ctx.Data["ContextUser"] = ctxUser
if ctx.HasError() {
2016-11-24 07:04:31 +00:00
ctx.HTML(200, tplFork)
2015-08-08 09:10:34 +00:00
return
}
// Check ownership of organization.
if ctxUser.IsOrganization() {
2016-07-23 17:08:22 +00:00
if !ctxUser.IsOwnedBy(ctx.User.ID) {
2015-08-08 09:10:34 +00:00
ctx.Error(403)
return
}
}
repo, err := models.ForkRepository(ctxUser, forkRepo, form.RepoName, form.Description)
if err != nil {
2015-08-31 07:24:28 +00:00
ctx.Data["Err_RepoName"] = true
2015-08-08 09:10:34 +00:00
switch {
case models.IsErrRepoAlreadyExist(err):
2016-11-24 07:04:31 +00:00
ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), tplFork, &form)
2015-08-08 09:10:34 +00:00
case models.IsErrNameReserved(err):
2016-11-24 07:04:31 +00:00
ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), tplFork, &form)
2015-08-08 09:10:34 +00:00
case models.IsErrNamePatternNotAllowed(err):
2016-11-24 07:04:31 +00:00
ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), tplFork, &form)
2015-08-08 09:10:34 +00:00
default:
ctx.Handle(500, "ForkPost", err)
}
return
}
2015-08-08 14:43:14 +00:00
log.Trace("Repository forked[%d]: %s/%s", forkRepo.ID, ctxUser.Name, repo.Name)
ctx.Redirect(setting.AppSubURL + "/" + ctxUser.Name + "/" + repo.Name)
2015-08-08 09:10:34 +00:00
}
2016-03-11 16:56:52 +00:00
func checkPullInfo(ctx *context.Context) *models.Issue {
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
2015-09-02 08:08:05 +00:00
if err != nil {
if models.IsErrIssueNotExist(err) {
ctx.Handle(404, "GetIssueByIndex", err)
} else {
ctx.Handle(500, "GetIssueByIndex", err)
}
return nil
}
2016-10-12 13:28:51 +00:00
ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, issue.Title)
ctx.Data["Issue"] = issue
2015-09-02 08:08:05 +00:00
if !issue.IsPull {
2015-09-02 08:08:05 +00:00
ctx.Handle(404, "ViewPullCommits", nil)
return nil
}
if err = issue.PullRequest.GetHeadRepo(); err != nil {
ctx.Handle(500, "GetHeadRepo", err)
return nil
2015-09-02 08:08:05 +00:00
}
if ctx.IsSigned {
// Update issue-user.
2016-07-23 17:08:22 +00:00
if err = issue.ReadBy(ctx.User.ID); err != nil {
2015-09-02 08:08:05 +00:00
ctx.Handle(500, "ReadBy", err)
return nil
}
}
return issue
2015-09-02 08:08:05 +00:00
}
2016-11-24 07:04:31 +00:00
// PrepareMergedViewPullInfo show meta information for a merged pull request view page
func PrepareMergedViewPullInfo(ctx *context.Context, issue *models.Issue) {
pull := issue.PullRequest
2015-09-02 13:26:56 +00:00
ctx.Data["HasMerged"] = true
ctx.Data["HeadTarget"] = issue.PullRequest.HeadUserName + "/" + pull.HeadBranch
2015-09-02 13:26:56 +00:00
ctx.Data["BaseTarget"] = ctx.Repo.Owner.Name + "/" + pull.BaseBranch
var err error
2015-09-02 13:26:56 +00:00
ctx.Data["NumCommits"], err = ctx.Repo.GitRepo.CommitsCountBetween(pull.MergeBase, pull.MergedCommitID)
if err != nil {
ctx.Handle(500, "Repo.GitRepo.CommitsCountBetween", err)
return
}
ctx.Data["NumFiles"], err = ctx.Repo.GitRepo.FilesCountBetween(pull.MergeBase, pull.MergedCommitID)
if err != nil {
ctx.Handle(500, "Repo.GitRepo.FilesCountBetween", err)
return
}
}
2016-11-24 07:04:31 +00:00
// PrepareViewPullInfo show meta information for a pull request preview page
func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.PullRequestInfo {
2015-09-02 08:08:05 +00:00
repo := ctx.Repo.Repository
pull := issue.PullRequest
2015-09-02 08:08:05 +00:00
ctx.Data["HeadTarget"] = pull.HeadUserName + "/" + pull.HeadBranch
ctx.Data["BaseTarget"] = ctx.Repo.Owner.Name + "/" + pull.BaseBranch
2015-09-02 08:08:05 +00:00
var (
headGitRepo *git.Repository
err error
)
if err = pull.GetHeadRepo(); err != nil {
ctx.Handle(500, "GetHeadRepo", err)
return nil
}
if pull.HeadRepo != nil {
2015-11-26 22:33:45 +00:00
headGitRepo, err = git.OpenRepository(pull.HeadRepo.RepoPath())
if err != nil {
ctx.Handle(500, "OpenRepository", err)
return nil
}
2015-09-02 08:08:05 +00:00
}
if pull.HeadRepo == nil || !headGitRepo.IsBranchExist(pull.HeadBranch) {
2015-09-02 13:26:56 +00:00
ctx.Data["IsPullReuqestBroken"] = true
ctx.Data["HeadTarget"] = "deleted"
ctx.Data["NumCommits"] = 0
ctx.Data["NumFiles"] = 0
return nil
}
2015-09-02 08:08:05 +00:00
prInfo, err := headGitRepo.GetPullRequestInfo(models.RepoPath(repo.Owner.Name, repo.Name),
pull.BaseBranch, pull.HeadBranch)
2015-09-02 08:08:05 +00:00
if err != nil {
if strings.Contains(err.Error(), "fatal: Not a valid object name") {
ctx.Data["IsPullReuqestBroken"] = true
ctx.Data["BaseTarget"] = "deleted"
ctx.Data["NumCommits"] = 0
ctx.Data["NumFiles"] = 0
return nil
}
2015-09-02 08:08:05 +00:00
ctx.Handle(500, "GetPullRequestInfo", err)
return nil
}
ctx.Data["NumCommits"] = prInfo.Commits.Len()
ctx.Data["NumFiles"] = prInfo.NumFiles
return prInfo
}
2016-11-24 07:04:31 +00:00
// ViewPullCommits show commits for a pull request
2016-03-11 16:56:52 +00:00
func ViewPullCommits(ctx *context.Context) {
ctx.Data["PageIsPullList"] = true
2015-09-02 08:08:05 +00:00
ctx.Data["PageIsPullCommits"] = true
issue := checkPullInfo(ctx)
2015-09-02 08:08:05 +00:00
if ctx.Written() {
return
}
pull := issue.PullRequest
2015-09-02 13:26:56 +00:00
ctx.Data["Username"] = pull.HeadUserName
ctx.Data["Reponame"] = pull.HeadRepo.Name
2015-09-02 08:08:05 +00:00
2015-09-02 13:26:56 +00:00
var commits *list.List
if pull.HasMerged {
PrepareMergedViewPullInfo(ctx, issue)
2015-09-02 13:26:56 +00:00
if ctx.Written() {
return
}
startCommit, err := ctx.Repo.GitRepo.GetCommit(pull.MergeBase)
if err != nil {
ctx.Handle(500, "Repo.GitRepo.GetCommit", err)
return
}
endCommit, err := ctx.Repo.GitRepo.GetCommit(pull.MergedCommitID)
if err != nil {
ctx.Handle(500, "Repo.GitRepo.GetCommit", err)
return
}
commits, err = ctx.Repo.GitRepo.CommitsBetween(endCommit, startCommit)
if err != nil {
ctx.Handle(500, "Repo.GitRepo.CommitsBetween", err)
return
}
} else {
prInfo := PrepareViewPullInfo(ctx, issue)
2015-09-02 13:26:56 +00:00
if ctx.Written() {
return
} else if prInfo == nil {
ctx.Handle(404, "ViewPullCommits", nil)
return
}
commits = prInfo.Commits
2015-09-02 08:08:05 +00:00
}
2015-09-02 13:26:56 +00:00
commits = models.ValidateCommitsWithEmails(commits)
ctx.Data["Commits"] = commits
ctx.Data["CommitCount"] = commits.Len()
2016-11-24 07:04:31 +00:00
ctx.HTML(200, tplPullCommits)
2015-09-02 08:08:05 +00:00
}
2016-11-24 07:04:31 +00:00
// ViewPullFiles render pull request changed files list page
2016-03-11 16:56:52 +00:00
func ViewPullFiles(ctx *context.Context) {
ctx.Data["PageIsPullList"] = true
2015-09-02 08:08:05 +00:00
ctx.Data["PageIsPullFiles"] = true
issue := checkPullInfo(ctx)
2015-09-02 08:08:05 +00:00
if ctx.Written() {
return
}
pull := issue.PullRequest
2015-09-02 08:08:05 +00:00
2015-09-02 13:26:56 +00:00
var (
diffRepoPath string
startCommitID string
endCommitID string
gitRepo *git.Repository
)
if pull.HasMerged {
PrepareMergedViewPullInfo(ctx, issue)
2015-09-02 13:26:56 +00:00
if ctx.Written() {
return
}
2015-09-02 08:08:05 +00:00
2015-09-02 13:26:56 +00:00
diffRepoPath = ctx.Repo.GitRepo.Path
startCommitID = pull.MergeBase
endCommitID = pull.MergedCommitID
gitRepo = ctx.Repo.GitRepo
} else {
prInfo := PrepareViewPullInfo(ctx, issue)
2015-09-02 13:26:56 +00:00
if ctx.Written() {
return
} else if prInfo == nil {
ctx.Handle(404, "ViewPullFiles", nil)
return
}
2015-09-02 08:08:05 +00:00
2015-09-02 13:26:56 +00:00
headRepoPath := models.RepoPath(pull.HeadUserName, pull.HeadRepo.Name)
2015-09-02 08:08:05 +00:00
2015-09-02 13:26:56 +00:00
headGitRepo, err := git.OpenRepository(headRepoPath)
if err != nil {
ctx.Handle(500, "OpenRepository", err)
return
}
headCommitID, err := headGitRepo.GetBranchCommitID(pull.HeadBranch)
2015-09-02 13:26:56 +00:00
if err != nil {
ctx.Handle(500, "GetBranchCommitID", err)
2015-09-02 13:26:56 +00:00
return
}
diffRepoPath = headRepoPath
startCommitID = prInfo.MergeBase
endCommitID = headCommitID
gitRepo = headGitRepo
2015-09-02 08:08:05 +00:00
}
2015-09-02 13:26:56 +00:00
diff, err := models.GetDiffRange(diffRepoPath,
startCommitID, endCommitID, setting.Git.MaxGitDiffLines,
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles)
2015-09-02 08:08:05 +00:00
if err != nil {
ctx.Handle(500, "GetDiffRange", err)
return
}
ctx.Data["Diff"] = diff
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
2015-09-02 13:26:56 +00:00
commit, err := gitRepo.GetCommit(endCommitID)
2015-09-02 08:08:05 +00:00
if err != nil {
ctx.Handle(500, "GetCommit", err)
return
}
headTarget := path.Join(pull.HeadUserName, pull.HeadRepo.Name)
ctx.Data["Username"] = pull.HeadUserName
ctx.Data["Reponame"] = pull.HeadRepo.Name
2015-09-02 13:26:56 +00:00
ctx.Data["IsImageFile"] = commit.IsImageFile
ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", endCommitID)
ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", startCommitID)
ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", endCommitID)
ctx.Data["RequireHighlightJS"] = true
2015-09-02 08:08:05 +00:00
2016-11-24 07:04:31 +00:00
ctx.HTML(200, tplPullFiles)
2015-09-02 08:08:05 +00:00
}
2015-08-31 07:24:28 +00:00
2016-11-24 07:04:31 +00:00
// MergePullRequest response for merging pull request
2016-03-11 16:56:52 +00:00
func MergePullRequest(ctx *context.Context) {
issue := checkPullInfo(ctx)
2015-09-02 13:26:56 +00:00
if ctx.Written() {
return
}
if issue.IsClosed {
2015-09-02 13:26:56 +00:00
ctx.Handle(404, "MergePullRequest", nil)
return
}
pr, err := models.GetPullRequestByIssueID(issue.ID)
2015-09-02 13:26:56 +00:00
if err != nil {
if models.IsErrPullRequestNotExist(err) {
ctx.Handle(404, "GetPullRequestByIssueID", nil)
2015-09-02 13:26:56 +00:00
} else {
ctx.Handle(500, "GetPullRequestByIssueID", err)
2015-09-02 13:26:56 +00:00
}
return
}
2015-10-18 21:18:45 +00:00
if !pr.CanAutoMerge() || pr.HasMerged {
2015-09-02 13:26:56 +00:00
ctx.Handle(404, "MergePullRequest", nil)
return
}
pr.Issue = issue
pr.Issue.Repo = ctx.Repo.Repository
2015-09-02 15:13:37 +00:00
if err = pr.Merge(ctx.User, ctx.Repo.GitRepo); err != nil {
ctx.Handle(500, "Merge", err)
2015-09-02 13:26:56 +00:00
return
}
notification.Service.NotifyIssue(pr.Issue, ctx.User.ID)
2015-09-02 13:26:56 +00:00
log.Trace("Pull request merged: %d", pr.ID)
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
2015-09-02 13:26:56 +00:00
}
2016-11-24 07:04:31 +00:00
// ParseCompareInfo parse compare info between two commit for preparing pull request
2016-03-11 16:56:52 +00:00
func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, *git.Repository, *git.PullRequestInfo, string, string) {
baseRepo := ctx.Repo.Repository
// Get compared branches information
// format: <base branch>...[<head repo>:]<head branch>
// base<-head: master...head:feature
// same repo: master...feature
2015-08-08 14:43:14 +00:00
infos := strings.Split(ctx.Params("*"), "...")
if len(infos) != 2 {
log.Trace("ParseCompareInfo[%d]: not enough compared branches information %s", baseRepo.ID, infos)
2015-08-08 14:43:14 +00:00
ctx.Handle(404, "CompareAndPullRequest", nil)
2015-09-01 23:07:02 +00:00
return nil, nil, nil, nil, "", ""
2015-08-08 14:43:14 +00:00
}
baseBranch := infos[0]
ctx.Data["BaseBranch"] = baseBranch
var (
headUser *models.User
headBranch string
isSameRepo bool
err error
)
// If there is no head repository, it means pull request between same repository.
2015-08-08 14:43:14 +00:00
headInfos := strings.Split(infos[1], ":")
if len(headInfos) == 1 {
isSameRepo = true
headUser = ctx.Repo.Owner
headBranch = headInfos[0]
2015-08-08 14:43:14 +00:00
} else if len(headInfos) == 2 {
headUser, err = models.GetUserByName(headInfos[0])
if err != nil {
if models.IsErrUserNotExist(err) {
ctx.Handle(404, "GetUserByName", nil)
} else {
ctx.Handle(500, "GetUserByName", err)
}
return nil, nil, nil, nil, "", ""
2015-09-01 23:07:02 +00:00
}
headBranch = headInfos[1]
} else {
ctx.Handle(404, "CompareAndPullRequest", nil)
2015-09-01 23:07:02 +00:00
return nil, nil, nil, nil, "", ""
}
ctx.Data["HeadUser"] = headUser
ctx.Data["HeadBranch"] = headBranch
2016-03-07 04:57:46 +00:00
ctx.Repo.PullRequest.SameRepo = isSameRepo
2015-09-01 23:07:02 +00:00
// Check if base branch is valid.
if !ctx.Repo.GitRepo.IsBranchExist(baseBranch) {
ctx.Handle(404, "IsBranchExist", nil)
return nil, nil, nil, nil, "", ""
}
2015-08-08 14:43:14 +00:00
// Check if current user has fork of repository or in the same repository.
2016-07-23 17:08:22 +00:00
headRepo, has := models.HasForkedRepo(headUser.ID, baseRepo.ID)
if !has && !isSameRepo {
log.Trace("ParseCompareInfo[%d]: does not have fork or in same repository", baseRepo.ID)
ctx.Handle(404, "ParseCompareInfo", nil)
2015-09-01 23:07:02 +00:00
return nil, nil, nil, nil, "", ""
2015-08-08 14:43:14 +00:00
}
var headGitRepo *git.Repository
if isSameRepo {
headRepo = ctx.Repo.Repository
headGitRepo = ctx.Repo.GitRepo
} else {
headGitRepo, err = git.OpenRepository(models.RepoPath(headUser.Name, headRepo.Name))
if err != nil {
ctx.Handle(500, "OpenRepository", err)
return nil, nil, nil, nil, "", ""
}
2015-09-01 23:07:02 +00:00
}
if !ctx.User.IsWriterOfRepo(headRepo) && !ctx.User.IsAdmin {
log.Trace("ParseCompareInfo[%d]: does not have write access or site admin", baseRepo.ID)
ctx.Handle(404, "ParseCompareInfo", nil)
return nil, nil, nil, nil, "", ""
}
2015-09-01 23:07:02 +00:00
// Check if head branch is valid.
if !headGitRepo.IsBranchExist(headBranch) {
ctx.Handle(404, "IsBranchExist", nil)
return nil, nil, nil, nil, "", ""
2015-08-08 14:43:14 +00:00
}
2015-09-01 23:07:02 +00:00
2015-08-08 14:43:14 +00:00
headBranches, err := headGitRepo.GetBranches()
if err != nil {
ctx.Handle(500, "GetBranches", err)
2015-09-01 23:07:02 +00:00
return nil, nil, nil, nil, "", ""
2015-08-08 14:43:14 +00:00
}
ctx.Data["HeadBranches"] = headBranches
prInfo, err := headGitRepo.GetPullRequestInfo(models.RepoPath(baseRepo.Owner.Name, baseRepo.Name), baseBranch, headBranch)
2015-09-01 23:07:02 +00:00
if err != nil {
ctx.Handle(500, "GetPullRequestInfo", err)
return nil, nil, nil, nil, "", ""
}
ctx.Data["BeforeCommitID"] = prInfo.MergeBase
return headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch
}
2016-11-24 07:04:31 +00:00
// PrepareCompareDiff render pull request preview diff page
2015-09-01 23:07:02 +00:00
func PrepareCompareDiff(
2016-03-11 16:56:52 +00:00
ctx *context.Context,
2015-09-01 23:07:02 +00:00
headUser *models.User,
headRepo *models.Repository,
headGitRepo *git.Repository,
prInfo *git.PullRequestInfo,
baseBranch, headBranch string) bool {
2015-09-01 23:07:02 +00:00
var (
repo = ctx.Repo.Repository
err error
)
// Get diff information.
ctx.Data["CommitRepoLink"] = headRepo.Link()
2015-09-01 23:07:02 +00:00
headCommitID, err := headGitRepo.GetBranchCommitID(headBranch)
2015-09-01 23:07:02 +00:00
if err != nil {
ctx.Handle(500, "GetBranchCommitID", err)
return false
2015-09-01 23:07:02 +00:00
}
ctx.Data["AfterCommitID"] = headCommitID
if headCommitID == prInfo.MergeBase {
ctx.Data["IsNothingToCompare"] = true
return true
}
2015-09-01 23:07:02 +00:00
diff, err := models.GetDiffRange(models.RepoPath(headUser.Name, headRepo.Name),
prInfo.MergeBase, headCommitID, setting.Git.MaxGitDiffLines,
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles)
2015-09-01 23:07:02 +00:00
if err != nil {
ctx.Handle(500, "GetDiffRange", err)
return false
2015-09-01 23:07:02 +00:00
}
ctx.Data["Diff"] = diff
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
headCommit, err := headGitRepo.GetCommit(headCommitID)
if err != nil {
ctx.Handle(500, "GetCommit", err)
return false
2015-09-01 23:07:02 +00:00
}
prInfo.Commits = models.ValidateCommitsWithEmails(prInfo.Commits)
ctx.Data["Commits"] = prInfo.Commits
ctx.Data["CommitCount"] = prInfo.Commits.Len()
ctx.Data["Username"] = headUser.Name
ctx.Data["Reponame"] = headRepo.Name
2015-09-02 08:08:05 +00:00
ctx.Data["IsImageFile"] = headCommit.IsImageFile
headTarget := path.Join(headUser.Name, repo.Name)
ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", headCommitID)
ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", prInfo.MergeBase)
ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", headCommitID)
return false
2015-09-01 23:07:02 +00:00
}
2016-11-24 07:04:31 +00:00
// CompareAndPullRequest render pull request preview page
2016-03-11 16:56:52 +00:00
func CompareAndPullRequest(ctx *context.Context) {
2015-09-01 23:07:02 +00:00
ctx.Data["Title"] = ctx.Tr("repo.pulls.compare_changes")
ctx.Data["PageIsComparePull"] = true
ctx.Data["IsDiffCompare"] = true
ctx.Data["RequireHighlightJS"] = true
2016-11-24 07:04:31 +00:00
setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates)
2015-09-01 23:07:02 +00:00
renderAttachmentSettings(ctx)
headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch := ParseCompareInfo(ctx)
if ctx.Written() {
return
}
pr, err := models.GetUnmergedPullRequest(headRepo.ID, ctx.Repo.Repository.ID, headBranch, baseBranch)
if err != nil {
if !models.IsErrPullRequestNotExist(err) {
ctx.Handle(500, "GetUnmergedPullRequest", err)
return
}
} else {
ctx.Data["HasPullRequest"] = true
ctx.Data["PullRequest"] = pr
2016-11-24 07:04:31 +00:00
ctx.HTML(200, tplComparePull)
return
}
2015-09-01 23:07:02 +00:00
nothingToCompare := PrepareCompareDiff(ctx, headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch)
2015-08-31 07:24:28 +00:00
if ctx.Written() {
return
}
if !nothingToCompare {
// Setup information for new form.
RetrieveRepoMetas(ctx, ctx.Repo.Repository)
if ctx.Written() {
return
}
}
2016-11-24 07:04:31 +00:00
ctx.HTML(200, tplComparePull)
2015-08-08 14:43:14 +00:00
}
2016-11-24 07:04:31 +00:00
// CompareAndPullRequestPost response for creating pull request
2016-03-11 16:56:52 +00:00
func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) {
2015-09-01 23:07:02 +00:00
ctx.Data["Title"] = ctx.Tr("repo.pulls.compare_changes")
ctx.Data["PageIsComparePull"] = true
ctx.Data["IsDiffCompare"] = true
ctx.Data["RequireHighlightJS"] = true
2015-09-01 23:07:02 +00:00
renderAttachmentSettings(ctx)
var (
repo = ctx.Repo.Repository
attachments []string
)
2015-09-01 23:26:39 +00:00
headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch := ParseCompareInfo(ctx)
2015-09-01 23:07:02 +00:00
if ctx.Written() {
return
}
labelIDs, milestoneID, assigneeID := ValidateRepoMetas(ctx, form)
if ctx.Written() {
return
}
if setting.AttachmentEnabled {
Squashed commit of the following: commit 0afcb843d7ffd596991c4885cab768273a6eb42c Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 17:13:29 2016 -0600 Removed Upload stats as the upload table is just a temporary table commit 7ecd73ff5535612d79d471409173ee7f1fcfa157 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:42:41 2016 -0600 Fix for CodeMirror mode commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:03:33 2016 -0600 Made tabbing in editor use spaces commit 23af384c53206a8a40e11e45bf49d7a149c4adcd Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:56:46 2016 -0600 Fix for data-url commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9 Merge: 7fc8a89 991ce42 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:42:53 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit 7fc8a89cb495478225b02d613e647f99a1489634 Merge: fd3d86c c03d040 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:40:00 2016 -0600 Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:39:44 2016 -0600 Code cleanup commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 29 15:38:23 2016 -0600 Code cleanup commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:36:01 2016 -0600 Code cleanup and fixes commit c2895dc742f25f8412879c9fa15e18f27f42f194 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:24:04 2016 -0600 Fixes per Unknwon's requests commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef Merge: 889e9fa ad7ea88 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 17:13:43 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go modules/setting/setting.go commit 889e9faf1bd8559a4979c8f46005d488c1a234d4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:09:18 2016 -0600 Fix in gogs.js commit 47603edf223f147b114be65f3bd27bc1e88827a5 Merge: bb57912 cf85e9e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:07:36 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit bb5791255867a71c11a77b639db050ad09c597a4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:02:18 2016 -0600 Update for using CodeMirror mode addon commit d10d128c51039be19e2af9c66c63db66a9f2ec6d Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 16:12:57 2016 -0600 Update for Edit commit 34a34982025144e3225e389f7849eb6273c1d576 Merge: fa1b752 1c7dcdd Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 11:52:02 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go commit fa1b752be29cd455c5184ddac2ffe80b3489763e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 15 18:35:42 2016 -0600 Feature for editing, creating, uploading and deleting files
2016-08-11 12:48:08 +00:00
attachments = form.Files
2015-09-01 23:07:02 +00:00
}
if ctx.HasError() {
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
}
2016-11-24 07:04:31 +00:00
ctx.HTML(200, tplComparePull)
2015-09-01 23:07:02 +00:00
return
}
patch, err := headGitRepo.GetPatch(prInfo.MergeBase, headBranch)
if err != nil {
ctx.Handle(500, "GetPatch", err)
return
}
pullIssue := &models.Issue{
2015-09-01 23:07:02 +00:00
RepoID: repo.ID,
2015-09-03 07:49:50 +00:00
Index: repo.NextIssueIndex(),
Title: form.Title,
2016-07-23 17:08:22 +00:00
PosterID: ctx.User.ID,
2015-09-01 23:07:02 +00:00
Poster: ctx.User,
MilestoneID: milestoneID,
AssigneeID: assigneeID,
IsPull: true,
Content: form.Content,
}
pullRequest := &models.PullRequest{
2015-09-01 23:26:39 +00:00
HeadRepoID: headRepo.ID,
BaseRepoID: repo.ID,
HeadUserName: headUser.Name,
HeadBranch: headBranch,
2015-09-01 23:26:39 +00:00
BaseBranch: baseBranch,
HeadRepo: headRepo,
BaseRepo: repo,
2015-09-01 23:26:39 +00:00
MergeBase: prInfo.MergeBase,
Type: models.PullRequestGitea,
}
// FIXME: check error in the case two people send pull request at almost same time, give nice error prompt
// instead of 500.
if err := models.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch); err != nil {
2015-09-01 23:07:02 +00:00
ctx.Handle(500, "NewPullRequest", err)
return
} else if err := pullRequest.PushToBaseRepo(); err != nil {
ctx.Handle(500, "PushToBaseRepo", err)
return
}
notification.Service.NotifyIssue(pullIssue, ctx.User.ID)
log.Trace("Pull request created: %d/%d", repo.ID, pullIssue.ID)
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pullIssue.Index))
2014-03-24 10:25:15 +00:00
}
2016-11-24 07:04:31 +00:00
// TriggerTask response for a trigger task request
2016-03-11 16:56:52 +00:00
func TriggerTask(ctx *context.Context) {
pusherID := ctx.QueryInt64("pusher")
2015-12-14 22:06:54 +00:00
branch := ctx.Query("branch")
secret := ctx.Query("secret")
if len(branch) == 0 || len(secret) == 0 || pusherID <= 0 {
2015-12-14 22:06:54 +00:00
ctx.Error(404)
log.Trace("TriggerTask: branch or secret is empty, or pusher ID is not valid")
2015-12-14 22:06:54 +00:00
return
}
owner, repo := parseOwnerAndRepo(ctx)
if ctx.Written() {
return
}
2015-12-14 22:06:54 +00:00
if secret != base.EncodeMD5(owner.Salt) {
ctx.Error(404)
log.Trace("TriggerTask [%s/%s]: invalid secret", owner.Name, repo.Name)
return
}
pusher, err := models.GetUserByID(pusherID)
if err != nil {
if models.IsErrUserNotExist(err) {
ctx.Error(404)
} else {
ctx.Handle(500, "GetUserByID", err)
}
return
}
log.Trace("TriggerTask '%s/%s' by %s", repo.Name, branch, pusher.Name)
go models.HookQueue.Add(repo.ID)
go models.AddTestPullRequestTask(pusher, repo.ID, branch, true)
ctx.Status(202)
}