This repository has been archived on 2024-01-04. You can view files and clone it, but cannot push or open issues or pull requests.
forgejo/routers/repo/pull.go

720 lines
18 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"
2015-09-01 23:07:02 +00:00
"path"
2015-08-08 14:43:14 +00:00
"strings"
2015-09-01 23:07:02 +00:00
"github.com/Unknwon/com"
2015-12-15 22:25:45 +00:00
"github.com/gogits/git-module"
2015-08-08 09:10:34 +00:00
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
2014-06-23 03:11:12 +00:00
"github.com/gogits/gogs/modules/base"
2015-08-08 09:10:34 +00:00
"github.com/gogits/gogs/modules/log"
2014-03-24 10:25:15 +00:00
"github.com/gogits/gogs/modules/middleware"
2015-08-08 09:10:34 +00:00
"github.com/gogits/gogs/modules/setting"
2014-03-24 10:25:15 +00:00
)
2014-06-23 03:11:12 +00:00
const (
2015-08-08 14:43:14 +00:00
FORK base.TplName = "repo/pulls/fork"
COMPARE_PULL base.TplName = "repo/pulls/compare"
2015-09-02 08:08:05 +00:00
PULL_COMMITS base.TplName = "repo/pulls/commits"
PULL_FILES base.TplName = "repo/pulls/files"
PULL_REQUEST_TEMPLATE_KEY = "PullRequestTemplate"
)
var (
PullRequestTemplateCandidates = []string{
"PULL_REQUEST.md",
".gogs/PULL_REQUEST.md",
".github/PULL_REQUEST.md",
}
2014-06-23 03:11:12 +00:00
)
2015-08-08 09:10:34 +00:00
func getForkRepository(ctx *middleware.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
if !forkRepo.CanBeForked() {
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
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
}
func Fork(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("new_fork")
getForkRepository(ctx)
if ctx.Written() {
return
}
ctx.Data["ContextUser"] = ctx.User
ctx.HTML(200, FORK)
}
func ForkPost(ctx *middleware.Context, form auth.CreateRepoForm) {
ctx.Data["Title"] = ctx.Tr("new_fork")
forkRepo := getForkRepository(ctx)
if ctx.Written() {
return
}
ctxUser := checkContextUser(ctx, form.Uid)
if ctx.Written() {
return
}
ctx.Data["ContextUser"] = ctxUser
if ctx.HasError() {
ctx.HTML(200, FORK)
return
}
2015-08-08 14:43:14 +00:00
repo, has := models.HasForkedRepo(ctxUser.Id, forkRepo.ID)
2015-08-08 09:24:10 +00:00
if has {
ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + repo.Name)
return
}
2015-08-08 09:10:34 +00:00
// Check ownership of organization.
if ctxUser.IsOrganization() {
if !ctxUser.IsOwnedBy(ctx.User.Id) {
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):
ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), FORK, &form)
case models.IsErrNameReserved(err):
ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), FORK, &form)
case models.IsErrNamePatternNotAllowed(err):
ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), FORK, &form)
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)
2015-08-08 09:10:34 +00:00
ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + repo.Name)
}
2015-09-02 08:08:05 +00:00
func checkPullInfo(ctx *middleware.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
}
ctx.Data["Title"] = issue.Name
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.GetPoster(); err != nil {
2015-09-02 08:08:05 +00:00
ctx.Handle(500, "GetPoster", err)
return nil
2015-10-25 07:10:22 +00:00
} else if err = issue.GetPullRequest(); err != nil {
ctx.Handle(500, "GetPullRequest", err)
return nil
} else if err = issue.GetHeadRepo(); err != nil {
ctx.Handle(500, "GetHeadRepo", err)
return nil
2015-09-02 08:08:05 +00:00
}
if ctx.IsSigned {
// Update issue-user.
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
}
2015-09-02 13:26:56 +00:00
func PrepareMergedViewPullInfo(ctx *middleware.Context, pull *models.Issue) {
ctx.Data["HasMerged"] = true
var err error
if err = pull.GetMerger(); err != nil {
ctx.Handle(500, "GetMerger", err)
return
}
ctx.Data["HeadTarget"] = pull.HeadUserName + "/" + pull.HeadBranch
2015-09-02 13:26:56 +00:00
ctx.Data["BaseTarget"] = ctx.Repo.Owner.Name + "/" + pull.BaseBranch
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
}
}
2015-09-02 08:08:05 +00:00
func PrepareViewPullInfo(ctx *middleware.Context, pull *models.Issue) *git.PullRequestInfo {
repo := ctx.Repo.Repository
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 {
ctx.Handle(500, "GetPullRequestInfo", err)
return nil
}
ctx.Data["NumCommits"] = prInfo.Commits.Len()
ctx.Data["NumFiles"] = prInfo.NumFiles
return prInfo
}
func ViewPullCommits(ctx *middleware.Context) {
ctx.Data["PageIsPullCommits"] = true
pull := checkPullInfo(ctx)
if ctx.Written() {
return
}
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, pull)
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, pull)
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()
2015-09-02 08:08:05 +00:00
ctx.HTML(200, PULL_COMMITS)
}
func ViewPullFiles(ctx *middleware.Context) {
ctx.Data["PageIsPullFiles"] = true
pull := checkPullInfo(ctx)
if ctx.Written() {
return
}
2015-09-02 13:26:56 +00:00
var (
diffRepoPath string
startCommitID string
endCommitID string
gitRepo *git.Repository
)
if pull.HasMerged {
PrepareMergedViewPullInfo(ctx, pull)
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, pull)
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)
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
ctx.HTML(200, PULL_FILES)
}
2015-08-31 07:24:28 +00:00
2015-09-02 13:26:56 +00:00
func MergePullRequest(ctx *middleware.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
}
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
}
2015-09-01 23:07:02 +00:00
func ParseCompareInfo(ctx *middleware.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.
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
}
func PrepareCompareDiff(
ctx *middleware.Context,
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.
2015-11-26 22:33:45 +00:00
ctx.Data["CommitRepoLink"] = headRepo.RepoLink()
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)
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
}
func CompareAndPullRequest(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("repo.pulls.compare_changes")
ctx.Data["PageIsComparePull"] = true
ctx.Data["IsDiffCompare"] = true
ctx.Data["RequireHighlightJS"] = true
setTemplateIfExists(ctx, PULL_REQUEST_TEMPLATE_KEY, 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
ctx.HTML(200, COMPARE_PULL)
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
}
}
2015-08-08 14:43:14 +00:00
ctx.HTML(200, COMPARE_PULL)
}
2015-09-01 23:07:02 +00:00
func CompareAndPullRequestPost(ctx *middleware.Context, form auth.CreateIssueForm) {
ctx.Data["Title"] = ctx.Tr("repo.pulls.compare_changes")
ctx.Data["PageIsComparePull"] = true
ctx.Data["IsDiffCompare"] = true
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
}
patch, err := headGitRepo.GetPatch(prInfo.MergeBase, headBranch)
2015-09-01 23:07:02 +00:00
if err != nil {
ctx.Handle(500, "GetPatch", err)
return
}
labelIDs, milestoneID, assigneeID := ValidateRepoMetas(ctx, form)
if ctx.Written() {
return
}
if setting.AttachmentEnabled {
attachments = form.Attachments
}
if ctx.HasError() {
ctx.HTML(200, COMPARE_PULL)
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(),
2015-09-01 23:07:02 +00:00
Name: form.Title,
PosterID: ctx.User.Id,
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.PULL_REQUEST_GOGS,
}
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
}
2015-09-01 23:07:02 +00:00
notifyWatchersAndMentions(ctx, pullIssue)
if ctx.Written() {
return
}
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
}
func TriggerTask(ctx *middleware.Context) {
2015-12-14 22:06:54 +00:00
branch := ctx.Query("branch")
secret := ctx.Query("secret")
if len(branch) == 0 || len(secret) == 0 {
ctx.Error(404)
log.Trace("TriggerTask: branch or secret is empty")
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
}
2015-12-14 22:06:54 +00:00
log.Trace("TriggerTask [%d].(new request): %s", repo.ID, branch)
go models.HookQueue.Add(repo.ID)
go models.AddTestPullRequestTask(repo.ID, branch)
ctx.Status(202)
}