2015-10-19 01:30:39 +02:00
|
|
|
// Copyright 2015 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 models
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
2017-02-05 14:07:44 +01:00
|
|
|
"io/ioutil"
|
2015-10-19 01:30:39 +02:00
|
|
|
"os"
|
|
|
|
"path"
|
2016-12-29 15:59:52 +01:00
|
|
|
"path/filepath"
|
|
|
|
"strconv"
|
2015-10-19 01:30:39 +02:00
|
|
|
"strings"
|
|
|
|
"time"
|
|
|
|
|
2016-11-11 13:11:45 +01:00
|
|
|
"code.gitea.io/git"
|
2017-01-28 23:14:56 +01:00
|
|
|
"code.gitea.io/gitea/modules/base"
|
2018-01-05 19:56:50 +01:00
|
|
|
"code.gitea.io/gitea/modules/cache"
|
2016-11-10 17:24:48 +01:00
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
|
|
"code.gitea.io/gitea/modules/process"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
"code.gitea.io/gitea/modules/sync"
|
2017-12-11 05:37:04 +01:00
|
|
|
"code.gitea.io/gitea/modules/util"
|
2016-11-11 10:39:44 +01:00
|
|
|
api "code.gitea.io/sdk/gitea"
|
2017-02-05 14:07:44 +01:00
|
|
|
|
2016-11-11 13:11:45 +01:00
|
|
|
"github.com/Unknwon/com"
|
|
|
|
"github.com/go-xorm/xorm"
|
2015-10-19 01:30:39 +02:00
|
|
|
)
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
|
2016-08-31 00:50:30 +02:00
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// PullRequestType defines pull request type
|
2015-10-19 01:30:39 +02:00
|
|
|
type PullRequestType int
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// Enumerate all the pull request types
|
2015-10-19 01:30:39 +02:00
|
|
|
const (
|
2016-11-07 16:37:32 +01:00
|
|
|
PullRequestGitea PullRequestType = iota
|
|
|
|
PullRequestGit
|
2015-10-19 01:30:39 +02:00
|
|
|
)
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// PullRequestStatus defines pull request status
|
2015-10-19 01:30:39 +02:00
|
|
|
type PullRequestStatus int
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// Enumerate all the pull request status
|
2015-10-19 01:30:39 +02:00
|
|
|
const (
|
2016-11-07 16:37:32 +01:00
|
|
|
PullRequestStatusConflict PullRequestStatus = iota
|
|
|
|
PullRequestStatusChecking
|
|
|
|
PullRequestStatusMergeable
|
2017-02-05 14:07:44 +01:00
|
|
|
PullRequestStatusManuallyMerged
|
2015-10-19 01:30:39 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
// PullRequest represents relation between pull request and repositories.
|
|
|
|
type PullRequest struct {
|
|
|
|
ID int64 `xorm:"pk autoincr"`
|
|
|
|
Type PullRequestType
|
|
|
|
Status PullRequestStatus
|
|
|
|
|
|
|
|
IssueID int64 `xorm:"INDEX"`
|
|
|
|
Issue *Issue `xorm:"-"`
|
|
|
|
Index int64
|
|
|
|
|
2017-01-06 16:14:33 +01:00
|
|
|
HeadRepoID int64 `xorm:"INDEX"`
|
2015-10-24 09:36:47 +02:00
|
|
|
HeadRepo *Repository `xorm:"-"`
|
2017-01-06 16:14:33 +01:00
|
|
|
BaseRepoID int64 `xorm:"INDEX"`
|
2015-10-24 09:36:47 +02:00
|
|
|
BaseRepo *Repository `xorm:"-"`
|
|
|
|
HeadUserName string
|
|
|
|
HeadBranch string
|
|
|
|
BaseBranch string
|
|
|
|
MergeBase string `xorm:"VARCHAR(40)"`
|
2015-10-19 01:30:39 +02:00
|
|
|
|
2017-12-11 05:37:04 +01:00
|
|
|
HasMerged bool `xorm:"INDEX"`
|
|
|
|
MergedCommitID string `xorm:"VARCHAR(40)"`
|
|
|
|
MergerID int64 `xorm:"INDEX"`
|
|
|
|
Merger *User `xorm:"-"`
|
|
|
|
MergedUnix util.TimeStamp `xorm:"updated INDEX"`
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
// Note: don't try to get Issue because will end up recursive querying.
|
|
|
|
func (pr *PullRequest) loadAttributes(e Engine) (err error) {
|
|
|
|
if pr.HasMerged && pr.Merger == nil {
|
|
|
|
pr.Merger, err = getUserByID(e, pr.MergerID)
|
|
|
|
if IsErrUserNotExist(err) {
|
|
|
|
pr.MergerID = -1
|
|
|
|
pr.Merger = NewGhostUser()
|
|
|
|
} else if err != nil {
|
|
|
|
return fmt.Errorf("getUserByID [%d]: %v", pr.MergerID, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// LoadAttributes loads pull request attributes from database
|
2016-08-14 12:32:24 +02:00
|
|
|
func (pr *PullRequest) LoadAttributes() error {
|
|
|
|
return pr.loadAttributes(x)
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// LoadIssue loads issue information from database
|
2016-08-14 12:32:24 +02:00
|
|
|
func (pr *PullRequest) LoadIssue() (err error) {
|
2017-02-27 01:42:55 +01:00
|
|
|
return pr.loadIssue(x)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (pr *PullRequest) loadIssue(e Engine) (err error) {
|
2016-08-16 19:19:09 +02:00
|
|
|
if pr.Issue != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-02-27 01:42:55 +01:00
|
|
|
pr.Issue, err = getIssueByID(e, pr.IssueID)
|
2016-08-14 12:32:24 +02:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2018-01-05 19:56:50 +01:00
|
|
|
// GetDefaultMergeMessage returns default message used when merging pull request
|
|
|
|
func (pr *PullRequest) GetDefaultMergeMessage() string {
|
|
|
|
if pr.HeadRepo == nil {
|
|
|
|
var err error
|
|
|
|
pr.HeadRepo, err = GetRepositoryByID(pr.HeadRepoID)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "GetRepositoryById[%d]: %v", pr.HeadRepoID, err)
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetDefaultSquashMessage returns default message used when squash and merging pull request
|
|
|
|
func (pr *PullRequest) GetDefaultSquashMessage() string {
|
|
|
|
if err := pr.LoadIssue(); err != nil {
|
|
|
|
log.Error(4, "LoadIssue: %v", err)
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return fmt.Sprintf("%s (#%d)", pr.Issue.Title, pr.Issue.Index)
|
|
|
|
}
|
|
|
|
|
2018-01-19 07:18:51 +01:00
|
|
|
// GetGitRefName returns git ref for hidden pull request branch
|
|
|
|
func (pr *PullRequest) GetGitRefName() string {
|
|
|
|
return fmt.Sprintf("refs/pull/%d/head", pr.Index)
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// APIFormat assumes following fields have been assigned with valid values:
|
2016-08-14 12:32:24 +02:00
|
|
|
// Required - Issue
|
|
|
|
// Optional - Merger
|
|
|
|
func (pr *PullRequest) APIFormat() *api.PullRequest {
|
2016-12-05 12:17:39 +01:00
|
|
|
var (
|
|
|
|
baseBranch *Branch
|
|
|
|
headBranch *Branch
|
|
|
|
baseCommit *git.Commit
|
|
|
|
headCommit *git.Commit
|
|
|
|
err error
|
|
|
|
)
|
2016-08-14 12:32:24 +02:00
|
|
|
apiIssue := pr.Issue.APIFormat()
|
2016-12-05 12:17:39 +01:00
|
|
|
if pr.BaseRepo == nil {
|
|
|
|
pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(log.ERROR, "GetRepositoryById[%d]: %v", pr.ID, err)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if pr.HeadRepo == nil {
|
|
|
|
pr.HeadRepo, err = GetRepositoryByID(pr.HeadRepoID)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(log.ERROR, "GetRepositoryById[%d]: %v", pr.ID, err)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if baseBranch, err = pr.BaseRepo.GetBranch(pr.BaseBranch); err != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if baseCommit, err = baseBranch.GetCommit(); err != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if headBranch, err = pr.HeadRepo.GetBranch(pr.HeadBranch); err != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if headCommit, err = headBranch.GetCommit(); err != nil {
|
|
|
|
return nil
|
|
|
|
}
|
2016-12-02 12:10:39 +01:00
|
|
|
apiBaseBranchInfo := &api.PRBranchInfo{
|
|
|
|
Name: pr.BaseBranch,
|
|
|
|
Ref: pr.BaseBranch,
|
|
|
|
Sha: baseCommit.ID.String(),
|
|
|
|
RepoID: pr.BaseRepoID,
|
2016-12-06 00:48:51 +01:00
|
|
|
Repository: pr.BaseRepo.APIFormat(AccessModeNone),
|
2016-12-02 12:10:39 +01:00
|
|
|
}
|
|
|
|
apiHeadBranchInfo := &api.PRBranchInfo{
|
|
|
|
Name: pr.HeadBranch,
|
|
|
|
Ref: pr.HeadBranch,
|
|
|
|
Sha: headCommit.ID.String(),
|
|
|
|
RepoID: pr.HeadRepoID,
|
2016-12-06 00:48:51 +01:00
|
|
|
Repository: pr.HeadRepo.APIFormat(AccessModeNone),
|
2016-12-02 12:10:39 +01:00
|
|
|
}
|
2016-08-14 12:32:24 +02:00
|
|
|
apiPullRequest := &api.PullRequest{
|
|
|
|
ID: pr.ID,
|
|
|
|
Index: pr.Index,
|
2016-08-16 19:19:09 +02:00
|
|
|
Poster: apiIssue.Poster,
|
2016-08-14 12:32:24 +02:00
|
|
|
Title: apiIssue.Title,
|
|
|
|
Body: apiIssue.Body,
|
|
|
|
Labels: apiIssue.Labels,
|
|
|
|
Milestone: apiIssue.Milestone,
|
|
|
|
Assignee: apiIssue.Assignee,
|
2018-05-09 18:29:04 +02:00
|
|
|
Assignees: apiIssue.Assignees,
|
2016-08-16 19:19:09 +02:00
|
|
|
State: apiIssue.State,
|
2016-08-14 12:32:24 +02:00
|
|
|
Comments: apiIssue.Comments,
|
2016-08-16 19:19:09 +02:00
|
|
|
HTMLURL: pr.Issue.HTMLURL(),
|
2016-12-02 12:10:39 +01:00
|
|
|
DiffURL: pr.Issue.DiffURL(),
|
|
|
|
PatchURL: pr.Issue.PatchURL(),
|
2016-08-14 12:32:24 +02:00
|
|
|
HasMerged: pr.HasMerged,
|
2016-12-02 12:10:39 +01:00
|
|
|
Base: apiBaseBranchInfo,
|
|
|
|
Head: apiHeadBranchInfo,
|
|
|
|
MergeBase: pr.MergeBase,
|
2018-05-01 21:05:28 +02:00
|
|
|
Deadline: apiIssue.Deadline,
|
2017-12-11 05:37:04 +01:00
|
|
|
Created: pr.Issue.CreatedUnix.AsTimePtr(),
|
|
|
|
Updated: pr.Issue.UpdatedUnix.AsTimePtr(),
|
2016-08-14 12:32:24 +02:00
|
|
|
}
|
|
|
|
|
2016-11-07 16:37:32 +01:00
|
|
|
if pr.Status != PullRequestStatusChecking {
|
2018-08-13 21:04:39 +02:00
|
|
|
mergeable := pr.Status != PullRequestStatusConflict && !pr.IsWorkInProgress()
|
2016-11-29 09:25:47 +01:00
|
|
|
apiPullRequest.Mergeable = mergeable
|
2016-08-14 12:32:24 +02:00
|
|
|
}
|
|
|
|
if pr.HasMerged {
|
2017-12-11 05:37:04 +01:00
|
|
|
apiPullRequest.Merged = pr.MergedUnix.AsTimePtr()
|
2016-08-14 12:32:24 +02:00
|
|
|
apiPullRequest.MergedCommitID = &pr.MergedCommitID
|
|
|
|
apiPullRequest.MergedBy = pr.Merger.APIFormat()
|
|
|
|
}
|
|
|
|
|
|
|
|
return apiPullRequest
|
|
|
|
}
|
|
|
|
|
2015-10-25 23:35:27 +01:00
|
|
|
func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
|
|
|
|
pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
|
2015-10-24 09:36:47 +02:00
|
|
|
if err != nil && !IsErrRepoNotExist(err) {
|
2015-10-26 14:16:24 +01:00
|
|
|
return fmt.Errorf("getRepositoryByID(head): %v", err)
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// GetHeadRepo loads the head repository
|
2016-08-14 12:32:24 +02:00
|
|
|
func (pr *PullRequest) GetHeadRepo() error {
|
2015-10-25 23:35:27 +01:00
|
|
|
return pr.getHeadRepo(x)
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// GetBaseRepo loads the target repository
|
2015-10-24 09:36:47 +02:00
|
|
|
func (pr *PullRequest) GetBaseRepo() (err error) {
|
|
|
|
if pr.BaseRepo != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
|
|
|
|
if err != nil {
|
2015-10-26 14:16:24 +01:00
|
|
|
return fmt.Errorf("GetRepositoryByID(base): %v", err)
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// IsChecking returns true if this pull request is still checking conflict.
|
|
|
|
func (pr *PullRequest) IsChecking() bool {
|
2016-11-07 16:37:32 +01:00
|
|
|
return pr.Status == PullRequestStatusChecking
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
|
2015-10-19 01:30:39 +02:00
|
|
|
// CanAutoMerge returns true if this pull request can be merged automatically.
|
|
|
|
func (pr *PullRequest) CanAutoMerge() bool {
|
2016-11-07 16:37:32 +01:00
|
|
|
return pr.Status == PullRequestStatusMergeable
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
|
|
|
|
2018-01-05 19:56:50 +01:00
|
|
|
// MergeStyle represents the approach to merge commits into base branch.
|
|
|
|
type MergeStyle string
|
|
|
|
|
|
|
|
const (
|
|
|
|
// MergeStyleMerge create merge commit
|
|
|
|
MergeStyleMerge MergeStyle = "merge"
|
|
|
|
// MergeStyleRebase rebase before merging
|
|
|
|
MergeStyleRebase MergeStyle = "rebase"
|
|
|
|
// MergeStyleSquash squash commits into single commit before merging
|
|
|
|
MergeStyleSquash MergeStyle = "squash"
|
|
|
|
)
|
|
|
|
|
2018-03-13 04:46:14 +01:00
|
|
|
// CheckUserAllowedToMerge checks whether the user is allowed to merge
|
|
|
|
func (pr *PullRequest) CheckUserAllowedToMerge(doer *User) (err error) {
|
|
|
|
if doer == nil {
|
|
|
|
return ErrNotAllowedToMerge{
|
|
|
|
"Not signed in",
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if pr.BaseRepo == nil {
|
|
|
|
if err = pr.GetBaseRepo(); err != nil {
|
|
|
|
return fmt.Errorf("GetBaseRepo: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-25 12:01:32 +02:00
|
|
|
if protected, err := pr.BaseRepo.IsProtectedBranchForMerging(pr.BaseBranch, doer); err != nil {
|
2018-03-13 04:46:14 +01:00
|
|
|
return fmt.Errorf("IsProtectedBranch: %v", err)
|
|
|
|
} else if protected {
|
|
|
|
return ErrNotAllowedToMerge{
|
|
|
|
"The branch is protected",
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-10-19 01:30:39 +02:00
|
|
|
// Merge merges pull request to base repository.
|
2016-08-14 12:32:24 +02:00
|
|
|
// FIXME: add repoWorkingPull make sure two merges does not happen at same time.
|
2018-01-05 19:56:50 +01:00
|
|
|
func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle MergeStyle, message string) (err error) {
|
2015-12-10 02:46:05 +01:00
|
|
|
if err = pr.GetHeadRepo(); err != nil {
|
|
|
|
return fmt.Errorf("GetHeadRepo: %v", err)
|
|
|
|
} else if err = pr.GetBaseRepo(); err != nil {
|
|
|
|
return fmt.Errorf("GetBaseRepo: %v", err)
|
|
|
|
}
|
|
|
|
|
2018-01-05 19:56:50 +01:00
|
|
|
prUnit, err := pr.BaseRepo.GetUnit(UnitTypePullRequests)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
prConfig := prUnit.PullRequestsConfig()
|
|
|
|
|
2018-03-13 04:46:14 +01:00
|
|
|
if err := pr.CheckUserAllowedToMerge(doer); err != nil {
|
|
|
|
return fmt.Errorf("CheckUserAllowedToMerge: %v", err)
|
|
|
|
}
|
|
|
|
|
2018-01-05 19:56:50 +01:00
|
|
|
// Check if merge style is correct and allowed
|
|
|
|
if !prConfig.IsMergeStyleAllowed(mergeStyle) {
|
|
|
|
return ErrInvalidMergeStyle{pr.BaseRepo.ID, mergeStyle}
|
|
|
|
}
|
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
defer func() {
|
|
|
|
go HookQueue.Add(pr.BaseRepo.ID)
|
|
|
|
go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false)
|
|
|
|
}()
|
|
|
|
|
2015-10-19 01:30:39 +02:00
|
|
|
headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
|
|
|
|
|
|
|
|
// Clone base repo.
|
2018-01-11 00:46:59 +01:00
|
|
|
tmpBasePath := path.Join(LocalCopyPath(), "merge-"+com.ToStr(time.Now().Nanosecond())+".git")
|
2016-12-01 00:56:15 +01:00
|
|
|
|
|
|
|
if err := os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm); err != nil {
|
2017-01-29 21:13:57 +01:00
|
|
|
return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err)
|
2016-12-01 00:56:15 +01:00
|
|
|
}
|
|
|
|
|
2015-10-19 01:30:39 +02:00
|
|
|
defer os.RemoveAll(path.Dir(tmpBasePath))
|
|
|
|
|
|
|
|
var stderr string
|
2017-01-17 06:58:58 +01:00
|
|
|
if _, stderr, err = process.GetManager().ExecTimeout(5*time.Minute,
|
2015-11-20 08:53:54 +01:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git clone): %s", tmpBasePath),
|
2015-10-19 01:30:39 +02:00
|
|
|
"git", "clone", baseGitRepo.Path, tmpBasePath); err != nil {
|
|
|
|
return fmt.Errorf("git clone: %s", stderr)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check out base branch.
|
2017-01-17 06:58:58 +01:00
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
2015-11-20 08:53:54 +01:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
|
2015-10-19 01:30:39 +02:00
|
|
|
"git", "checkout", pr.BaseBranch); err != nil {
|
|
|
|
return fmt.Errorf("git checkout: %s", stderr)
|
|
|
|
}
|
|
|
|
|
2015-10-24 09:36:47 +02:00
|
|
|
// Add head repo remote.
|
2017-01-17 06:58:58 +01:00
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
2015-11-20 08:53:54 +01:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git remote add): %s", tmpBasePath),
|
2015-10-24 09:36:47 +02:00
|
|
|
"git", "remote", "add", "head_repo", headRepoPath); err != nil {
|
2015-11-20 08:53:54 +01:00
|
|
|
return fmt.Errorf("git remote add [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Merge commits.
|
2017-01-17 06:58:58 +01:00
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
2015-11-20 08:53:54 +01:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git fetch): %s", tmpBasePath),
|
2015-10-24 09:36:47 +02:00
|
|
|
"git", "fetch", "head_repo"); err != nil {
|
2015-11-20 08:53:54 +01:00
|
|
|
return fmt.Errorf("git fetch [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
|
2018-01-05 19:56:50 +01:00
|
|
|
switch mergeStyle {
|
|
|
|
case MergeStyleMerge:
|
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
|
|
|
fmt.Sprintf("PullRequest.Merge (git merge --no-ff --no-commit): %s", tmpBasePath),
|
|
|
|
"git", "merge", "--no-ff", "--no-commit", "head_repo/"+pr.HeadBranch); err != nil {
|
|
|
|
return fmt.Errorf("git merge --no-ff --no-commit [%s]: %v - %s", tmpBasePath, err, stderr)
|
|
|
|
}
|
2015-11-20 08:53:54 +01:00
|
|
|
|
2018-01-05 19:56:50 +01:00
|
|
|
sig := doer.NewGitSig()
|
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
|
|
|
fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath),
|
|
|
|
"git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
|
|
|
|
"-m", message); err != nil {
|
|
|
|
return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr)
|
|
|
|
}
|
|
|
|
case MergeStyleRebase:
|
|
|
|
// Checkout head branch
|
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
|
|
|
fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
|
|
|
|
"git", "checkout", "-b", "head_repo_"+pr.HeadBranch, "head_repo/"+pr.HeadBranch); err != nil {
|
|
|
|
return fmt.Errorf("git checkout: %s", stderr)
|
|
|
|
}
|
|
|
|
// Rebase before merging
|
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
|
|
|
fmt.Sprintf("PullRequest.Merge (git rebase): %s", tmpBasePath),
|
|
|
|
"git", "rebase", "-q", pr.BaseBranch); err != nil {
|
|
|
|
return fmt.Errorf("git rebase [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
|
|
|
|
}
|
|
|
|
// Checkout base branch again
|
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
|
|
|
fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
|
|
|
|
"git", "checkout", pr.BaseBranch); err != nil {
|
|
|
|
return fmt.Errorf("git checkout: %s", stderr)
|
|
|
|
}
|
|
|
|
// Merge fast forward
|
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
|
|
|
fmt.Sprintf("PullRequest.Merge (git rebase): %s", tmpBasePath),
|
|
|
|
"git", "merge", "--ff-only", "-q", "head_repo_"+pr.HeadBranch); err != nil {
|
|
|
|
return fmt.Errorf("git merge --ff-only [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
|
|
|
|
}
|
|
|
|
case MergeStyleSquash:
|
|
|
|
// Merge with squash
|
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
|
|
|
fmt.Sprintf("PullRequest.Merge (git squash): %s", tmpBasePath),
|
|
|
|
"git", "merge", "-q", "--squash", "head_repo/"+pr.HeadBranch); err != nil {
|
|
|
|
return fmt.Errorf("git merge --squash [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
|
|
|
|
}
|
|
|
|
sig := pr.Issue.Poster.NewGitSig()
|
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
|
|
|
fmt.Sprintf("PullRequest.Merge (git squash): %s", tmpBasePath),
|
|
|
|
"git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
|
|
|
|
"-m", message); err != nil {
|
|
|
|
return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr)
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
return ErrInvalidMergeStyle{pr.BaseRepo.ID, mergeStyle}
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Push back to upstream.
|
2017-01-17 06:58:58 +01:00
|
|
|
if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
|
2015-11-20 08:53:54 +01:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git push): %s", tmpBasePath),
|
2015-10-19 01:30:39 +02:00
|
|
|
"git", "push", baseGitRepo.Path, pr.BaseBranch); err != nil {
|
|
|
|
return fmt.Errorf("git push: %s", stderr)
|
|
|
|
}
|
|
|
|
|
2017-06-19 11:37:11 +02:00
|
|
|
pr.MergedCommitID, err = baseGitRepo.GetBranchCommitID(pr.BaseBranch)
|
2016-08-14 12:32:24 +02:00
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("GetBranchCommit: %v", err)
|
|
|
|
}
|
|
|
|
|
2017-12-11 05:37:04 +01:00
|
|
|
pr.MergedUnix = util.TimeStampNow()
|
2017-02-05 14:07:44 +01:00
|
|
|
pr.Merger = doer
|
2016-08-14 12:32:24 +02:00
|
|
|
pr.MergerID = doer.ID
|
|
|
|
|
2017-02-05 14:07:44 +01:00
|
|
|
if err = pr.setMerged(); err != nil {
|
|
|
|
log.Error(4, "setMerged [%d]: %v", pr.ID, err)
|
2015-12-10 02:46:05 +01:00
|
|
|
}
|
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
if err = MergePullRequestAction(doer, pr.Issue.Repo, pr.Issue); err != nil {
|
|
|
|
log.Error(4, "MergePullRequestAction [%d]: %v", pr.ID, err)
|
|
|
|
}
|
|
|
|
|
2018-01-05 19:56:50 +01:00
|
|
|
// Reset cached commit count
|
|
|
|
cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true))
|
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
// Reload pull request information.
|
|
|
|
if err = pr.LoadAttributes(); err != nil {
|
|
|
|
log.Error(4, "LoadAttributes: %v", err)
|
|
|
|
return nil
|
|
|
|
}
|
2018-05-21 04:28:29 +02:00
|
|
|
|
|
|
|
mode, _ := AccessLevel(doer.ID, pr.Issue.Repo)
|
2016-11-07 16:37:32 +01:00
|
|
|
if err = PrepareWebhooks(pr.Issue.Repo, HookEventPullRequest, &api.PullRequestPayload{
|
|
|
|
Action: api.HookIssueClosed,
|
2016-08-14 12:32:24 +02:00
|
|
|
Index: pr.Index,
|
|
|
|
PullRequest: pr.APIFormat(),
|
2018-05-21 04:28:29 +02:00
|
|
|
Repository: pr.Issue.Repo.APIFormat(mode),
|
2016-08-14 12:32:24 +02:00
|
|
|
Sender: doer.APIFormat(),
|
|
|
|
}); err != nil {
|
|
|
|
log.Error(4, "PrepareWebhooks: %v", err)
|
2018-05-21 04:28:29 +02:00
|
|
|
} else {
|
|
|
|
go HookQueue.Add(pr.Issue.Repo.ID)
|
2016-08-14 12:32:24 +02:00
|
|
|
}
|
|
|
|
|
2018-01-29 11:18:20 +01:00
|
|
|
l, err := baseGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
|
2015-12-10 02:46:05 +01:00
|
|
|
if err != nil {
|
2016-08-14 12:32:24 +02:00
|
|
|
log.Error(4, "CommitsBetweenIDs: %v", err)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// It is possible that head branch is not fully sync with base branch for merge commits,
|
2017-01-05 01:50:34 +01:00
|
|
|
// so we need to get latest head commit and append merge commit manually
|
2016-08-14 12:32:24 +02:00
|
|
|
// to avoid strange diff commits produced.
|
|
|
|
mergeCommit, err := baseGitRepo.GetBranchCommit(pr.BaseBranch)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "GetBranchCommit: %v", err)
|
|
|
|
return nil
|
2015-12-10 02:46:05 +01:00
|
|
|
}
|
2018-01-05 19:56:50 +01:00
|
|
|
if mergeStyle == MergeStyleMerge {
|
|
|
|
l.PushFront(mergeCommit)
|
|
|
|
}
|
2016-08-14 12:32:24 +02:00
|
|
|
|
2015-12-10 02:46:05 +01:00
|
|
|
p := &api.PushPayload{
|
2016-12-22 10:30:52 +01:00
|
|
|
Ref: git.BranchPrefix + pr.BaseBranch,
|
2015-12-10 02:46:05 +01:00
|
|
|
Before: pr.MergeBase,
|
2018-01-05 19:56:50 +01:00
|
|
|
After: mergeCommit.ID.String(),
|
2016-11-27 11:14:25 +01:00
|
|
|
CompareURL: setting.AppURL + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
|
2016-11-22 11:43:30 +01:00
|
|
|
Commits: ListToPushCommits(l).ToAPIPayloadCommits(pr.BaseRepo.HTMLURL()),
|
2018-05-21 04:28:29 +02:00
|
|
|
Repo: pr.BaseRepo.APIFormat(mode),
|
2016-08-14 13:17:26 +02:00
|
|
|
Pusher: pr.HeadRepo.MustOwner().APIFormat(),
|
|
|
|
Sender: doer.APIFormat(),
|
2015-12-10 02:46:05 +01:00
|
|
|
}
|
2016-11-07 16:37:32 +01:00
|
|
|
if err = PrepareWebhooks(pr.BaseRepo, HookEventPush, p); err != nil {
|
2018-05-21 04:28:29 +02:00
|
|
|
log.Error(4, "PrepareWebhooks: %v", err)
|
|
|
|
} else {
|
|
|
|
go HookQueue.Add(pr.BaseRepo.ID)
|
2015-12-10 02:46:05 +01:00
|
|
|
}
|
|
|
|
return nil
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
|
|
|
|
2017-02-05 14:07:44 +01:00
|
|
|
// setMerged sets a pull request to merged and closes the corresponding issue
|
|
|
|
func (pr *PullRequest) setMerged() (err error) {
|
|
|
|
if pr.HasMerged {
|
|
|
|
return fmt.Errorf("PullRequest[%d] already merged", pr.Index)
|
|
|
|
}
|
2017-12-11 05:37:04 +01:00
|
|
|
if pr.MergedCommitID == "" || pr.MergedUnix == 0 || pr.Merger == nil {
|
2017-02-05 14:07:44 +01:00
|
|
|
return fmt.Errorf("Unable to merge PullRequest[%d], some required fields are empty", pr.Index)
|
|
|
|
}
|
|
|
|
|
|
|
|
pr.HasMerged = true
|
|
|
|
|
|
|
|
sess := x.NewSession()
|
2017-06-21 02:57:05 +02:00
|
|
|
defer sess.Close()
|
2017-02-05 14:07:44 +01:00
|
|
|
if err = sess.Begin(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2017-02-27 01:42:55 +01:00
|
|
|
if err = pr.loadIssue(sess); err != nil {
|
2017-02-05 14:07:44 +01:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2017-02-27 01:42:55 +01:00
|
|
|
if err = pr.Issue.loadRepo(sess); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if err = pr.Issue.Repo.getOwner(sess); err != nil {
|
|
|
|
return err
|
2017-02-05 14:07:44 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if err = pr.Issue.changeStatus(sess, pr.Merger, pr.Issue.Repo, true); err != nil {
|
|
|
|
return fmt.Errorf("Issue.changeStatus: %v", err)
|
|
|
|
}
|
2017-10-05 23:25:40 +02:00
|
|
|
if _, err = sess.ID(pr.ID).Cols("has_merged, status, merged_commit_id, merger_id, merged_unix").Update(pr); err != nil {
|
2017-02-05 14:07:44 +01:00
|
|
|
return fmt.Errorf("update pull request: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = sess.Commit(); err != nil {
|
|
|
|
return fmt.Errorf("Commit: %v", err)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// manuallyMerged checks if a pull request got manually merged
|
|
|
|
// When a pull request got manually merged mark the pull request as merged
|
|
|
|
func (pr *PullRequest) manuallyMerged() bool {
|
|
|
|
commit, err := pr.getMergeCommit()
|
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "PullRequest[%d].getMergeCommit: %v", pr.ID, err)
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
if commit != nil {
|
|
|
|
pr.MergedCommitID = commit.ID.String()
|
2017-12-11 05:37:04 +01:00
|
|
|
pr.MergedUnix = util.TimeStamp(commit.Author.When.Unix())
|
2017-02-05 14:07:44 +01:00
|
|
|
pr.Status = PullRequestStatusManuallyMerged
|
|
|
|
merger, _ := GetUserByEmail(commit.Author.Email)
|
|
|
|
|
|
|
|
// When the commit author is unknown set the BaseRepo owner as merger
|
|
|
|
if merger == nil {
|
|
|
|
if pr.BaseRepo.Owner == nil {
|
|
|
|
if err = pr.BaseRepo.getOwner(x); err != nil {
|
|
|
|
log.Error(4, "BaseRepo.getOwner[%d]: %v", pr.ID, err)
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
merger = pr.BaseRepo.Owner
|
|
|
|
}
|
|
|
|
pr.Merger = merger
|
|
|
|
pr.MergerID = merger.ID
|
|
|
|
|
|
|
|
if err = pr.setMerged(); err != nil {
|
|
|
|
log.Error(4, "PullRequest[%d].setMerged : %v", pr.ID, err)
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
log.Info("manuallyMerged[%d]: Marked as manually merged into %s/%s by commit id: %s", pr.ID, pr.BaseRepo.Name, pr.BaseBranch, commit.ID.String())
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
// getMergeCommit checks if a pull request got merged
|
|
|
|
// Returns the git.Commit of the pull request if merged
|
|
|
|
func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
|
|
|
|
if pr.BaseRepo == nil {
|
|
|
|
var err error
|
|
|
|
pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("GetRepositoryByID: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
|
|
|
|
defer os.Remove(indexTmpPath)
|
|
|
|
|
2018-01-19 07:18:51 +01:00
|
|
|
headFile := pr.GetGitRefName()
|
2017-02-05 14:07:44 +01:00
|
|
|
|
|
|
|
// Check if a pull request is merged into BaseBranch
|
|
|
|
_, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git merge-base --is-ancestor): %d", pr.BaseRepo.ID),
|
|
|
|
[]string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
|
|
|
|
"git", "merge-base", "--is-ancestor", headFile, pr.BaseBranch)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
// Errors are signaled by a non-zero status that is not 1
|
2017-06-30 12:29:58 +02:00
|
|
|
if strings.Contains(err.Error(), "exit status 1") {
|
2017-02-05 14:07:44 +01:00
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err)
|
|
|
|
}
|
|
|
|
|
2017-06-01 02:51:24 +02:00
|
|
|
commitIDBytes, err := ioutil.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("ReadFile(%s): %v", headFile, err)
|
|
|
|
}
|
|
|
|
commitID := string(commitIDBytes)
|
|
|
|
if len(commitID) < 40 {
|
|
|
|
return nil, fmt.Errorf(`ReadFile(%s): invalid commit-ID "%s"`, headFile, commitID)
|
|
|
|
}
|
|
|
|
cmd := commitID[:40] + ".." + pr.BaseBranch
|
2017-02-05 14:07:44 +01:00
|
|
|
|
|
|
|
// Get the commit from BaseBranch where the pull request got merged
|
|
|
|
mergeCommit, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git rev-list --ancestry-path --merges --reverse): %d", pr.BaseRepo.ID),
|
|
|
|
[]string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
|
|
|
|
"git", "rev-list", "--ancestry-path", "--merges", "--reverse", cmd)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v %v", stderr, err)
|
2017-06-22 03:06:57 +02:00
|
|
|
} else if len(mergeCommit) < 40 {
|
|
|
|
// PR was fast-forwarded, so just use last commit of PR
|
|
|
|
mergeCommit = commitID[:40]
|
2017-02-05 14:07:44 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("OpenRepository: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
commit, err := gitRepo.GetCommit(mergeCommit[:40])
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("GetCommit: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return commit, nil
|
|
|
|
}
|
|
|
|
|
2016-12-01 02:05:32 +01:00
|
|
|
// patchConflicts is a list of conflict description from Git.
|
2015-10-24 20:48:11 +02:00
|
|
|
var patchConflicts = []string{
|
|
|
|
"patch does not apply",
|
|
|
|
"already exists in working directory",
|
2015-10-30 01:40:57 +01:00
|
|
|
"unrecognized input",
|
2016-02-03 18:28:03 +01:00
|
|
|
"error:",
|
2015-10-24 20:48:11 +02:00
|
|
|
}
|
|
|
|
|
2016-12-01 02:05:32 +01:00
|
|
|
// testPatch checks if patch can be merged to base repository without conflict.
|
2015-10-24 09:36:47 +02:00
|
|
|
func (pr *PullRequest) testPatch() (err error) {
|
|
|
|
if pr.BaseRepo == nil {
|
|
|
|
pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("GetRepositoryByID: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
patchPath, err := pr.BaseRepo.PatchPath(pr.Index)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("BaseRepo.PatchPath: %v", err)
|
|
|
|
}
|
|
|
|
|
2017-01-05 01:50:34 +01:00
|
|
|
// Fast fail if patch does not exist, this assumes data is corrupted.
|
2015-10-25 08:10:22 +01:00
|
|
|
if !com.IsFile(patchPath) {
|
2017-01-05 01:50:34 +01:00
|
|
|
log.Trace("PullRequest[%d].testPatch: ignored corrupted data", pr.ID)
|
2015-10-25 08:10:22 +01:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-08-30 14:07:50 +02:00
|
|
|
repoWorkingPool.CheckIn(com.ToStr(pr.BaseRepoID))
|
|
|
|
defer repoWorkingPool.CheckOut(com.ToStr(pr.BaseRepoID))
|
|
|
|
|
2016-02-03 18:28:03 +01:00
|
|
|
log.Trace("PullRequest[%d].testPatch (patchPath): %s", pr.ID, patchPath)
|
2015-10-24 09:36:47 +02:00
|
|
|
|
2016-12-29 15:59:52 +01:00
|
|
|
pr.Status = PullRequestStatusChecking
|
|
|
|
|
|
|
|
indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
|
|
|
|
defer os.Remove(indexTmpPath)
|
2016-12-08 23:08:28 +01:00
|
|
|
|
2016-12-29 15:59:52 +01:00
|
|
|
var stderr string
|
2017-01-17 06:58:58 +01:00
|
|
|
_, stderr, err = process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("testPatch (git read-tree): %d", pr.BaseRepo.ID),
|
2016-12-29 15:59:52 +01:00
|
|
|
[]string{"GIT_DIR=" + pr.BaseRepo.RepoPath(), "GIT_INDEX_FILE=" + indexTmpPath},
|
|
|
|
"git", "read-tree", pr.BaseBranch)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("git read-tree --index-output=%s %s: %v - %s", indexTmpPath, pr.BaseBranch, err, stderr)
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
|
2018-01-05 19:56:50 +01:00
|
|
|
prUnit, err := pr.BaseRepo.GetUnit(UnitTypePullRequests)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
prConfig := prUnit.PullRequestsConfig()
|
|
|
|
|
|
|
|
args := []string{"apply", "--check", "--cached"}
|
|
|
|
if prConfig.IgnoreWhitespaceConflicts {
|
|
|
|
args = append(args, "--ignore-whitespace")
|
|
|
|
}
|
|
|
|
args = append(args, patchPath)
|
|
|
|
|
2017-01-17 06:58:58 +01:00
|
|
|
_, stderr, err = process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID),
|
2016-12-29 15:59:52 +01:00
|
|
|
[]string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
|
2018-01-05 19:56:50 +01:00
|
|
|
"git", args...)
|
2015-10-24 09:36:47 +02:00
|
|
|
if err != nil {
|
2015-10-24 20:48:11 +02:00
|
|
|
for i := range patchConflicts {
|
|
|
|
if strings.Contains(stderr, patchConflicts[i]) {
|
2016-12-01 02:05:32 +01:00
|
|
|
log.Trace("PullRequest[%d].testPatch (apply): has conflict", pr.ID)
|
2015-11-17 03:18:04 +01:00
|
|
|
fmt.Println(stderr)
|
2016-11-07 16:37:32 +01:00
|
|
|
pr.Status = PullRequestStatusConflict
|
2015-10-24 20:48:11 +02:00
|
|
|
return nil
|
|
|
|
}
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
2015-10-24 20:48:11 +02:00
|
|
|
|
|
|
|
return fmt.Errorf("git apply --check: %v - %s", err, stderr)
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-10-19 01:30:39 +02:00
|
|
|
// NewPullRequest creates new pull request with labels for repository.
|
2018-05-09 18:29:04 +02:00
|
|
|
func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte, assigneeIDs []int64) (err error) {
|
2015-10-19 01:30:39 +02:00
|
|
|
sess := x.NewSession()
|
2017-06-21 02:57:05 +02:00
|
|
|
defer sess.Close()
|
2015-10-19 01:30:39 +02:00
|
|
|
if err = sess.Begin(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2017-02-01 03:36:08 +01:00
|
|
|
if err = newIssue(sess, pull.Poster, NewIssueOptions{
|
2016-08-16 03:40:32 +02:00
|
|
|
Repo: repo,
|
|
|
|
Issue: pull,
|
2017-03-01 02:08:45 +01:00
|
|
|
LabelIDs: labelIDs,
|
2016-08-16 03:40:32 +02:00
|
|
|
Attachments: uuids,
|
|
|
|
IsPull: true,
|
2018-05-09 18:29:04 +02:00
|
|
|
AssigneeIDs: assigneeIDs,
|
2016-08-16 03:40:32 +02:00
|
|
|
}); err != nil {
|
2018-05-09 18:29:04 +02:00
|
|
|
if IsErrUserDoesNotHaveAccessToRepo(err) {
|
|
|
|
return err
|
|
|
|
}
|
2015-10-19 01:30:39 +02:00
|
|
|
return fmt.Errorf("newIssue: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-10-24 20:48:11 +02:00
|
|
|
pr.Index = pull.Index
|
2015-10-24 09:36:47 +02:00
|
|
|
if err = repo.SavePatch(pr.Index, patch); err != nil {
|
|
|
|
return fmt.Errorf("SavePatch: %v", err)
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
|
|
|
|
2015-10-24 09:36:47 +02:00
|
|
|
pr.BaseRepo = repo
|
|
|
|
if err = pr.testPatch(); err != nil {
|
|
|
|
return fmt.Errorf("testPatch: %v", err)
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
2016-08-14 12:32:24 +02:00
|
|
|
// No conflict appears after test means mergeable.
|
2016-11-07 16:37:32 +01:00
|
|
|
if pr.Status == PullRequestStatusChecking {
|
|
|
|
pr.Status = PullRequestStatusMergeable
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
pr.IssueID = pull.ID
|
|
|
|
if _, err = sess.Insert(pr); err != nil {
|
|
|
|
return fmt.Errorf("insert pull repo: %v", err)
|
|
|
|
}
|
|
|
|
|
2016-07-15 18:36:39 +02:00
|
|
|
if err = sess.Commit(); err != nil {
|
|
|
|
return fmt.Errorf("Commit: %v", err)
|
|
|
|
}
|
|
|
|
|
2017-09-16 22:16:21 +02:00
|
|
|
UpdateIssueIndexer(pull.ID)
|
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
if err = NotifyWatchers(&Action{
|
2017-05-26 03:38:18 +02:00
|
|
|
ActUserID: pull.Poster.ID,
|
|
|
|
ActUser: pull.Poster,
|
|
|
|
OpType: ActionCreatePullRequest,
|
|
|
|
Content: fmt.Sprintf("%d|%s", pull.Index, pull.Title),
|
|
|
|
RepoID: repo.ID,
|
|
|
|
Repo: repo,
|
|
|
|
IsPrivate: repo.IsPrivate,
|
2016-08-14 12:32:24 +02:00
|
|
|
}); err != nil {
|
2016-07-15 18:36:39 +02:00
|
|
|
log.Error(4, "NotifyWatchers: %v", err)
|
|
|
|
} else if err = pull.MailParticipants(); err != nil {
|
|
|
|
log.Error(4, "MailParticipants: %v", err)
|
|
|
|
}
|
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
pr.Issue = pull
|
|
|
|
pull.PullRequest = pr
|
2018-05-21 04:28:29 +02:00
|
|
|
mode, _ := AccessLevel(pull.Poster.ID, repo)
|
2016-11-07 16:37:32 +01:00
|
|
|
if err = PrepareWebhooks(repo, HookEventPullRequest, &api.PullRequestPayload{
|
|
|
|
Action: api.HookIssueOpened,
|
2016-08-14 12:32:24 +02:00
|
|
|
Index: pull.Index,
|
|
|
|
PullRequest: pr.APIFormat(),
|
2018-05-21 04:28:29 +02:00
|
|
|
Repository: repo.APIFormat(mode),
|
2016-08-14 12:32:24 +02:00
|
|
|
Sender: pull.Poster.APIFormat(),
|
|
|
|
}); err != nil {
|
|
|
|
log.Error(4, "PrepareWebhooks: %v", err)
|
2018-05-21 04:28:29 +02:00
|
|
|
} else {
|
|
|
|
go HookQueue.Add(repo.ID)
|
2016-08-14 12:32:24 +02:00
|
|
|
}
|
|
|
|
|
2016-07-15 18:36:39 +02:00
|
|
|
return nil
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
|
|
|
|
2016-12-02 12:10:39 +01:00
|
|
|
// PullRequestsOptions holds the options for PRs
|
|
|
|
type PullRequestsOptions struct {
|
|
|
|
Page int
|
|
|
|
State string
|
|
|
|
SortType string
|
|
|
|
Labels []string
|
|
|
|
MilestoneID int64
|
|
|
|
}
|
|
|
|
|
2017-01-01 19:15:09 +01:00
|
|
|
func listPullRequestStatement(baseRepoID int64, opts *PullRequestsOptions) (*xorm.Session, error) {
|
2016-12-02 12:10:39 +01:00
|
|
|
sess := x.Where("pull_request.base_repo_id=?", baseRepoID)
|
|
|
|
|
|
|
|
sess.Join("INNER", "issue", "pull_request.issue_id = issue.id")
|
|
|
|
switch opts.State {
|
|
|
|
case "closed", "open":
|
|
|
|
sess.And("issue.is_closed=?", opts.State == "closed")
|
|
|
|
}
|
|
|
|
|
2017-01-01 19:15:09 +01:00
|
|
|
if labelIDs, err := base.StringsToInt64s(opts.Labels); err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if len(labelIDs) > 0 {
|
|
|
|
sess.Join("INNER", "issue_label", "issue.id = issue_label.issue_id").
|
|
|
|
In("issue_label.label_id", labelIDs)
|
|
|
|
}
|
|
|
|
|
|
|
|
if opts.MilestoneID > 0 {
|
|
|
|
sess.And("issue.milestone_id=?", opts.MilestoneID)
|
|
|
|
}
|
|
|
|
|
|
|
|
return sess, nil
|
2016-12-02 12:10:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// PullRequests returns all pull requests for a base Repo by the given conditions
|
|
|
|
func PullRequests(baseRepoID int64, opts *PullRequestsOptions) ([]*PullRequest, int64, error) {
|
|
|
|
if opts.Page <= 0 {
|
|
|
|
opts.Page = 1
|
|
|
|
}
|
|
|
|
|
2017-01-01 19:15:09 +01:00
|
|
|
countSession, err := listPullRequestStatement(baseRepoID, opts)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "listPullRequestStatement", err)
|
|
|
|
return nil, 0, err
|
|
|
|
}
|
2016-12-02 12:10:39 +01:00
|
|
|
maxResults, err := countSession.Count(new(PullRequest))
|
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "Count PRs", err)
|
|
|
|
return nil, maxResults, err
|
|
|
|
}
|
|
|
|
|
|
|
|
prs := make([]*PullRequest, 0, ItemsPerPage)
|
2017-01-01 19:15:09 +01:00
|
|
|
findSession, err := listPullRequestStatement(baseRepoID, opts)
|
2017-06-30 18:50:57 +02:00
|
|
|
sortIssuesSession(findSession, opts.SortType)
|
2017-01-01 19:15:09 +01:00
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "listPullRequestStatement", err)
|
|
|
|
return nil, maxResults, err
|
|
|
|
}
|
2016-12-02 12:10:39 +01:00
|
|
|
findSession.Limit(ItemsPerPage, (opts.Page-1)*ItemsPerPage)
|
|
|
|
return prs, maxResults, findSession.Find(&prs)
|
|
|
|
}
|
|
|
|
|
2017-01-05 01:50:34 +01:00
|
|
|
// GetUnmergedPullRequest returns a pull request that is open and has not been merged
|
2015-10-19 01:30:39 +02:00
|
|
|
// by given head/base and repo/branch.
|
|
|
|
func GetUnmergedPullRequest(headRepoID, baseRepoID int64, headBranch, baseBranch string) (*PullRequest, error) {
|
|
|
|
pr := new(PullRequest)
|
2016-11-10 16:16:32 +01:00
|
|
|
has, err := x.
|
|
|
|
Where("head_repo_id=? AND head_branch=? AND base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
|
|
|
|
headRepoID, headBranch, baseRepoID, baseBranch, false, false).
|
|
|
|
Join("INNER", "issue", "issue.id=pull_request.issue_id").
|
|
|
|
Get(pr)
|
2015-10-19 01:30:39 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if !has {
|
|
|
|
return nil, ErrPullRequestNotExist{0, 0, headRepoID, baseRepoID, headBranch, baseBranch}
|
|
|
|
}
|
|
|
|
|
|
|
|
return pr, nil
|
|
|
|
}
|
|
|
|
|
2017-01-05 01:50:34 +01:00
|
|
|
// GetUnmergedPullRequestsByHeadInfo returns all pull requests that are open and has not been merged
|
2015-10-24 09:36:47 +02:00
|
|
|
// by given head information (repo and branch).
|
2015-10-24 20:48:11 +02:00
|
|
|
func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) {
|
2015-10-24 09:36:47 +02:00
|
|
|
prs := make([]*PullRequest, 0, 2)
|
2016-11-10 16:16:32 +01:00
|
|
|
return prs, x.
|
|
|
|
Where("head_repo_id = ? AND head_branch = ? AND has_merged = ? AND issue.is_closed = ?",
|
|
|
|
repoID, branch, false, false).
|
|
|
|
Join("INNER", "issue", "issue.id = pull_request.issue_id").
|
|
|
|
Find(&prs)
|
2015-10-24 20:48:11 +02:00
|
|
|
}
|
|
|
|
|
2017-01-05 01:50:34 +01:00
|
|
|
// GetUnmergedPullRequestsByBaseInfo returns all pull requests that are open and has not been merged
|
2015-10-24 20:48:11 +02:00
|
|
|
// by given base information (repo and branch).
|
|
|
|
func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequest, error) {
|
|
|
|
prs := make([]*PullRequest, 0, 2)
|
2016-11-10 16:16:32 +01:00
|
|
|
return prs, x.
|
|
|
|
Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
|
|
|
|
repoID, branch, false, false).
|
|
|
|
Join("INNER", "issue", "issue.id=pull_request.issue_id").
|
|
|
|
Find(&prs)
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
|
2016-12-02 12:10:39 +01:00
|
|
|
// GetPullRequestByIndex returns a pull request by the given index
|
|
|
|
func GetPullRequestByIndex(repoID int64, index int64) (*PullRequest, error) {
|
|
|
|
pr := &PullRequest{
|
|
|
|
BaseRepoID: repoID,
|
|
|
|
Index: index,
|
|
|
|
}
|
|
|
|
|
|
|
|
has, err := x.Get(pr)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if !has {
|
2017-01-01 19:15:09 +01:00
|
|
|
return nil, ErrPullRequestNotExist{0, 0, 0, repoID, "", ""}
|
2016-12-02 12:10:39 +01:00
|
|
|
}
|
|
|
|
|
2016-12-05 12:17:39 +01:00
|
|
|
if err = pr.LoadAttributes(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if err = pr.LoadIssue(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2016-12-02 12:10:39 +01:00
|
|
|
|
|
|
|
return pr, nil
|
|
|
|
}
|
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
func getPullRequestByID(e Engine, id int64) (*PullRequest, error) {
|
2015-10-24 09:36:47 +02:00
|
|
|
pr := new(PullRequest)
|
2017-10-05 06:43:04 +02:00
|
|
|
has, err := e.ID(id).Get(pr)
|
2015-10-24 09:36:47 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if !has {
|
|
|
|
return nil, ErrPullRequestNotExist{id, 0, 0, 0, "", ""}
|
|
|
|
}
|
2016-08-14 12:32:24 +02:00
|
|
|
return pr, pr.loadAttributes(e)
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
// GetPullRequestByID returns a pull request by given ID.
|
|
|
|
func GetPullRequestByID(id int64) (*PullRequest, error) {
|
|
|
|
return getPullRequestByID(x, id)
|
|
|
|
}
|
|
|
|
|
|
|
|
func getPullRequestByIssueID(e Engine, issueID int64) (*PullRequest, error) {
|
2015-10-22 20:47:24 +02:00
|
|
|
pr := &PullRequest{
|
|
|
|
IssueID: issueID,
|
|
|
|
}
|
2016-08-14 12:32:24 +02:00
|
|
|
has, err := e.Get(pr)
|
2015-10-19 01:30:39 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if !has {
|
2015-10-22 20:47:24 +02:00
|
|
|
return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""}
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
2016-08-14 12:32:24 +02:00
|
|
|
return pr, pr.loadAttributes(e)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetPullRequestByIssueID returns pull request by given issue ID.
|
|
|
|
func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
|
|
|
|
return getPullRequestByIssueID(x, issueID)
|
2015-10-19 01:30:39 +02:00
|
|
|
}
|
2015-10-24 09:36:47 +02:00
|
|
|
|
|
|
|
// Update updates all fields of pull request.
|
|
|
|
func (pr *PullRequest) Update() error {
|
2017-10-05 06:43:04 +02:00
|
|
|
_, err := x.ID(pr.ID).AllCols().Update(pr)
|
2015-10-24 09:36:47 +02:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// UpdateCols updates specific fields of pull request.
|
2015-10-24 09:36:47 +02:00
|
|
|
func (pr *PullRequest) UpdateCols(cols ...string) error {
|
2017-10-05 06:43:04 +02:00
|
|
|
_, err := x.ID(pr.ID).Cols(cols...).Update(pr)
|
2015-10-24 09:36:47 +02:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-10-25 08:10:22 +01:00
|
|
|
// UpdatePatch generates and saves a new patch.
|
2015-11-03 23:25:39 +01:00
|
|
|
func (pr *PullRequest) UpdatePatch() (err error) {
|
|
|
|
if err = pr.GetHeadRepo(); err != nil {
|
2015-10-25 08:10:22 +01:00
|
|
|
return fmt.Errorf("GetHeadRepo: %v", err)
|
|
|
|
} else if pr.HeadRepo == nil {
|
|
|
|
log.Trace("PullRequest[%d].UpdatePatch: ignored cruppted data", pr.ID)
|
|
|
|
return nil
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
|
2015-11-03 23:25:39 +01:00
|
|
|
if err = pr.GetBaseRepo(); err != nil {
|
2015-10-25 08:10:22 +01:00
|
|
|
return fmt.Errorf("GetBaseRepo: %v", err)
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
2015-10-25 08:10:22 +01:00
|
|
|
|
2015-11-26 23:33:45 +01:00
|
|
|
headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
|
2015-10-25 08:10:22 +01:00
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("OpenRepository: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-11-03 23:25:39 +01:00
|
|
|
// Add a temporary remote.
|
|
|
|
tmpRemote := com.ToStr(time.Now().UnixNano())
|
2015-12-10 02:46:05 +01:00
|
|
|
if err = headGitRepo.AddRemote(tmpRemote, RepoPath(pr.BaseRepo.MustOwner().Name, pr.BaseRepo.Name), true); err != nil {
|
2015-11-03 23:25:39 +01:00
|
|
|
return fmt.Errorf("AddRemote: %v", err)
|
|
|
|
}
|
|
|
|
defer func() {
|
|
|
|
headGitRepo.RemoveRemote(tmpRemote)
|
|
|
|
}()
|
|
|
|
remoteBranch := "remotes/" + tmpRemote + "/" + pr.BaseBranch
|
|
|
|
pr.MergeBase, err = headGitRepo.GetMergeBase(remoteBranch, pr.HeadBranch)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("GetMergeBase: %v", err)
|
|
|
|
} else if err = pr.Update(); err != nil {
|
|
|
|
return fmt.Errorf("Update: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-10-25 08:10:22 +01:00
|
|
|
patch, err := headGitRepo.GetPatch(pr.MergeBase, pr.HeadBranch)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("GetPatch: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = pr.BaseRepo.SavePatch(pr.Index, patch); err != nil {
|
|
|
|
return fmt.Errorf("BaseRepo.SavePatch: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
|
2016-02-20 04:16:26 +01:00
|
|
|
// PushToBaseRepo pushes commits from branches of head repository to
|
|
|
|
// corresponding branches of base repository.
|
|
|
|
// FIXME: Only push branches that are actually updates?
|
2016-02-04 19:00:42 +01:00
|
|
|
func (pr *PullRequest) PushToBaseRepo() (err error) {
|
2018-01-19 07:18:51 +01:00
|
|
|
log.Trace("PushToBaseRepo[%d]: pushing commits to base repo '%s'", pr.BaseRepoID, pr.GetGitRefName())
|
2016-02-04 19:00:42 +01:00
|
|
|
|
2016-02-20 04:16:26 +01:00
|
|
|
headRepoPath := pr.HeadRepo.RepoPath()
|
|
|
|
headGitRepo, err := git.OpenRepository(headRepoPath)
|
2016-02-04 19:00:42 +01:00
|
|
|
if err != nil {
|
2016-02-20 04:16:26 +01:00
|
|
|
return fmt.Errorf("OpenRepository: %v", err)
|
2016-02-04 19:00:42 +01:00
|
|
|
}
|
|
|
|
|
2016-02-20 04:16:26 +01:00
|
|
|
tmpRemoteName := fmt.Sprintf("tmp-pull-%d", pr.ID)
|
|
|
|
if err = headGitRepo.AddRemote(tmpRemoteName, pr.BaseRepo.RepoPath(), false); err != nil {
|
|
|
|
return fmt.Errorf("headGitRepo.AddRemote: %v", err)
|
2016-02-04 19:00:42 +01:00
|
|
|
}
|
|
|
|
// Make sure to remove the remote even if the push fails
|
2016-02-20 04:16:26 +01:00
|
|
|
defer headGitRepo.RemoveRemote(tmpRemoteName)
|
2016-02-04 19:00:42 +01:00
|
|
|
|
2018-01-19 07:18:51 +01:00
|
|
|
headFile := pr.GetGitRefName()
|
2016-03-04 22:53:03 +01:00
|
|
|
|
|
|
|
// Remove head in case there is a conflict.
|
2016-12-01 00:56:15 +01:00
|
|
|
file := path.Join(pr.BaseRepo.RepoPath(), headFile)
|
2016-03-04 22:53:03 +01:00
|
|
|
|
2016-12-03 22:31:54 +01:00
|
|
|
_ = os.Remove(file)
|
|
|
|
|
2017-05-30 11:32:01 +02:00
|
|
|
if err = git.Push(headRepoPath, git.PushOptions{
|
|
|
|
Remote: tmpRemoteName,
|
|
|
|
Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile),
|
2018-01-19 07:53:45 +01:00
|
|
|
Force: true,
|
2017-05-30 11:32:01 +02:00
|
|
|
}); err != nil {
|
2016-02-20 04:16:26 +01:00
|
|
|
return fmt.Errorf("Push: %v", err)
|
2016-02-04 19:00:42 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-10-25 08:10:22 +01:00
|
|
|
// AddToTaskQueue adds itself to pull request test task queue.
|
|
|
|
func (pr *PullRequest) AddToTaskQueue() {
|
2016-11-28 16:31:06 +01:00
|
|
|
go pullRequestQueue.AddFunc(pr.ID, func() {
|
2016-11-07 16:37:32 +01:00
|
|
|
pr.Status = PullRequestStatusChecking
|
2015-10-24 20:48:11 +02:00
|
|
|
if err := pr.UpdateCols("status"); err != nil {
|
2015-10-25 08:10:22 +01:00
|
|
|
log.Error(5, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
|
2015-10-24 20:48:11 +02:00
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
2015-10-24 09:36:47 +02:00
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// PullRequestList defines a list of pull requests
|
2016-08-14 12:32:24 +02:00
|
|
|
type PullRequestList []*PullRequest
|
|
|
|
|
|
|
|
func (prs PullRequestList) loadAttributes(e Engine) error {
|
|
|
|
if len(prs) == 0 {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Load issues.
|
2018-08-06 06:43:22 +02:00
|
|
|
issueIDs := prs.getIssueIDs()
|
2016-08-14 12:32:24 +02:00
|
|
|
issues := make([]*Issue, 0, len(issueIDs))
|
2016-11-10 16:16:32 +01:00
|
|
|
if err := e.
|
|
|
|
Where("id > 0").
|
|
|
|
In("id", issueIDs).
|
|
|
|
Find(&issues); err != nil {
|
2016-08-14 12:32:24 +02:00
|
|
|
return fmt.Errorf("find issues: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
set := make(map[int64]*Issue)
|
|
|
|
for i := range issues {
|
|
|
|
set[issues[i].ID] = issues[i]
|
|
|
|
}
|
|
|
|
for i := range prs {
|
|
|
|
prs[i].Issue = set[prs[i].IssueID]
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2018-08-06 06:43:22 +02:00
|
|
|
func (prs PullRequestList) getIssueIDs() []int64 {
|
|
|
|
issueIDs := make([]int64, 0, len(prs))
|
|
|
|
for i := range prs {
|
|
|
|
issueIDs = append(issueIDs, prs[i].IssueID)
|
|
|
|
}
|
|
|
|
return issueIDs
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// LoadAttributes load all the prs attributes
|
2016-08-14 12:32:24 +02:00
|
|
|
func (prs PullRequestList) LoadAttributes() error {
|
|
|
|
return prs.loadAttributes(x)
|
|
|
|
}
|
|
|
|
|
2018-08-06 06:43:22 +02:00
|
|
|
func (prs PullRequestList) invalidateCodeComments(e Engine, doer *User, repo *git.Repository, branch string) error {
|
|
|
|
if len(prs) == 0 {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
issueIDs := prs.getIssueIDs()
|
|
|
|
var codeComments []*Comment
|
|
|
|
if err := e.
|
|
|
|
Where("type = ? and invalidated = ?", CommentTypeCode, false).
|
|
|
|
In("issue_id", issueIDs).
|
|
|
|
Find(&codeComments); err != nil {
|
|
|
|
return fmt.Errorf("find code comments: %v", err)
|
|
|
|
}
|
|
|
|
for _, comment := range codeComments {
|
|
|
|
if err := comment.CheckInvalidation(repo, doer, branch); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// InvalidateCodeComments will lookup the prs for code comments which got invalidated by change
|
|
|
|
func (prs PullRequestList) InvalidateCodeComments(doer *User, repo *git.Repository, branch string) error {
|
|
|
|
return prs.invalidateCodeComments(x, doer, repo, branch)
|
|
|
|
}
|
|
|
|
|
2015-10-24 20:48:11 +02:00
|
|
|
func addHeadRepoTasks(prs []*PullRequest) {
|
2015-10-24 09:36:47 +02:00
|
|
|
for _, pr := range prs {
|
2015-10-24 20:48:11 +02:00
|
|
|
log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
|
2015-10-25 08:10:22 +01:00
|
|
|
if err := pr.UpdatePatch(); err != nil {
|
|
|
|
log.Error(4, "UpdatePatch: %v", err)
|
2015-10-24 09:36:47 +02:00
|
|
|
continue
|
2016-02-04 19:00:42 +01:00
|
|
|
} else if err := pr.PushToBaseRepo(); err != nil {
|
|
|
|
log.Error(4, "PushToBaseRepo: %v", err)
|
|
|
|
continue
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
|
2015-10-25 08:10:22 +01:00
|
|
|
pr.AddToTaskQueue()
|
2015-10-24 20:48:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch,
|
|
|
|
// and generate new patch for testing as needed.
|
2016-08-14 12:32:24 +02:00
|
|
|
func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool) {
|
|
|
|
log.Trace("AddTestPullRequestTask [head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
|
2015-10-24 20:48:11 +02:00
|
|
|
prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
|
|
|
|
if err != nil {
|
2016-08-14 12:32:24 +02:00
|
|
|
log.Error(4, "Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
|
2015-10-24 20:48:11 +02:00
|
|
|
return
|
|
|
|
}
|
2016-08-14 12:32:24 +02:00
|
|
|
|
|
|
|
if isSync {
|
2018-08-06 06:43:22 +02:00
|
|
|
requests := PullRequestList(prs)
|
|
|
|
if err = requests.LoadAttributes(); err != nil {
|
2016-08-14 12:32:24 +02:00
|
|
|
log.Error(4, "PullRequestList.LoadAttributes: %v", err)
|
|
|
|
}
|
2018-08-06 06:43:22 +02:00
|
|
|
if invalidationErr := checkForInvalidation(requests, repoID, doer, branch); invalidationErr != nil {
|
|
|
|
log.Error(4, "checkForInvalidation: %v", invalidationErr)
|
|
|
|
}
|
2016-08-14 12:32:24 +02:00
|
|
|
if err == nil {
|
|
|
|
for _, pr := range prs {
|
|
|
|
pr.Issue.PullRequest = pr
|
|
|
|
if err = pr.Issue.LoadAttributes(); err != nil {
|
|
|
|
log.Error(4, "LoadAttributes: %v", err)
|
|
|
|
continue
|
|
|
|
}
|
2016-11-07 16:37:32 +01:00
|
|
|
if err = PrepareWebhooks(pr.Issue.Repo, HookEventPullRequest, &api.PullRequestPayload{
|
|
|
|
Action: api.HookIssueSynchronized,
|
2016-08-14 12:32:24 +02:00
|
|
|
Index: pr.Issue.Index,
|
|
|
|
PullRequest: pr.Issue.PullRequest.APIFormat(),
|
2016-12-06 00:48:51 +01:00
|
|
|
Repository: pr.Issue.Repo.APIFormat(AccessModeNone),
|
2016-08-14 12:32:24 +02:00
|
|
|
Sender: doer.APIFormat(),
|
|
|
|
}); err != nil {
|
|
|
|
log.Error(4, "PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
go HookQueue.Add(pr.Issue.Repo.ID)
|
|
|
|
}
|
|
|
|
}
|
2018-08-06 06:43:22 +02:00
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
}
|
|
|
|
|
2015-10-24 20:48:11 +02:00
|
|
|
addHeadRepoTasks(prs)
|
|
|
|
|
2016-08-14 12:32:24 +02:00
|
|
|
log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
|
2015-10-24 20:48:11 +02:00
|
|
|
prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
|
|
|
|
if err != nil {
|
2016-08-14 12:32:24 +02:00
|
|
|
log.Error(4, "Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
|
2015-10-24 20:48:11 +02:00
|
|
|
return
|
|
|
|
}
|
|
|
|
for _, pr := range prs {
|
2015-10-25 08:10:22 +01:00
|
|
|
pr.AddToTaskQueue()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-06 06:43:22 +02:00
|
|
|
func checkForInvalidation(requests PullRequestList, repoID int64, doer *User, branch string) error {
|
|
|
|
repo, err := GetRepositoryByID(repoID)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("GetRepositoryByID: %v", err)
|
|
|
|
}
|
|
|
|
gitRepo, err := git.OpenRepository(repo.RepoPath())
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("git.OpenRepository: %v", err)
|
|
|
|
}
|
|
|
|
go func() {
|
|
|
|
err := requests.InvalidateCodeComments(doer, gitRepo, branch)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "PullRequestList.InvalidateCodeComments: %v", err)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// ChangeUsernameInPullRequests changes the name of head_user_name
|
2016-01-28 12:07:16 +01:00
|
|
|
func ChangeUsernameInPullRequests(oldUserName, newUserName string) error {
|
2016-01-27 22:45:03 +01:00
|
|
|
pr := PullRequest{
|
2016-01-28 12:07:16 +01:00
|
|
|
HeadUserName: strings.ToLower(newUserName),
|
2016-01-27 22:45:03 +01:00
|
|
|
}
|
2016-11-10 16:16:32 +01:00
|
|
|
_, err := x.
|
|
|
|
Cols("head_user_name").
|
|
|
|
Where("head_user_name = ?", strings.ToLower(oldUserName)).
|
|
|
|
Update(pr)
|
2016-01-27 22:45:03 +01:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2017-01-05 01:50:34 +01:00
|
|
|
// checkAndUpdateStatus checks if pull request is possible to leaving checking status,
|
2015-10-25 08:10:22 +01:00
|
|
|
// and set to be either conflict or mergeable.
|
|
|
|
func (pr *PullRequest) checkAndUpdateStatus() {
|
|
|
|
// Status is not changed to conflict means mergeable.
|
2016-11-07 16:37:32 +01:00
|
|
|
if pr.Status == PullRequestStatusChecking {
|
|
|
|
pr.Status = PullRequestStatusMergeable
|
2015-10-25 08:10:22 +01:00
|
|
|
}
|
|
|
|
|
2017-01-05 01:50:34 +01:00
|
|
|
// Make sure there is no waiting test to process before leaving the checking status.
|
2016-11-28 16:31:06 +01:00
|
|
|
if !pullRequestQueue.Exist(pr.ID) {
|
2015-10-25 08:10:22 +01:00
|
|
|
if err := pr.UpdateCols("status"); err != nil {
|
|
|
|
log.Error(4, "Update[%d]: %v", pr.ID, err)
|
|
|
|
}
|
2015-10-24 09:36:47 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-13 21:04:39 +02:00
|
|
|
// IsWorkInProgress determine if the Pull Request is a Work In Progress by its title
|
|
|
|
func (pr *PullRequest) IsWorkInProgress() bool {
|
|
|
|
if err := pr.LoadIssue(); err != nil {
|
|
|
|
log.Error(4, "LoadIssue: %v", err)
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
|
|
|
|
if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetWorkInProgressPrefix returns the prefix used to mark the pull request as a work in progress.
|
|
|
|
// It returns an empty string when none were found
|
|
|
|
func (pr *PullRequest) GetWorkInProgressPrefix() string {
|
|
|
|
if err := pr.LoadIssue(); err != nil {
|
|
|
|
log.Error(4, "LoadIssue: %v", err)
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
|
|
|
|
if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
|
|
|
|
return pr.Issue.Title[0:len(prefix)]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
2015-10-24 09:36:47 +02:00
|
|
|
// TestPullRequests checks and tests untested patches of pull requests.
|
|
|
|
// TODO: test more pull requests at same time.
|
|
|
|
func TestPullRequests() {
|
|
|
|
prs := make([]*PullRequest, 0, 10)
|
2017-05-05 02:47:03 +02:00
|
|
|
|
|
|
|
err := x.Where("status = ?", PullRequestStatusChecking).Find(&prs)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(3, "Find Checking PRs", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
var checkedPRs = make(map[int64]struct{})
|
2015-10-24 09:36:47 +02:00
|
|
|
|
|
|
|
// Update pull request status.
|
|
|
|
for _, pr := range prs {
|
2017-05-05 02:47:03 +02:00
|
|
|
checkedPRs[pr.ID] = struct{}{}
|
|
|
|
if err := pr.GetBaseRepo(); err != nil {
|
|
|
|
log.Error(3, "GetBaseRepo: %v", err)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if pr.manuallyMerged() {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if err := pr.testPatch(); err != nil {
|
|
|
|
log.Error(3, "testPatch: %v", err)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2015-10-24 09:36:47 +02:00
|
|
|
pr.checkAndUpdateStatus()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Start listening on new test requests.
|
2016-11-28 16:31:06 +01:00
|
|
|
for prID := range pullRequestQueue.Queue() {
|
2015-10-24 09:36:47 +02:00
|
|
|
log.Trace("TestPullRequests[%v]: processing test task", prID)
|
2016-11-28 16:31:06 +01:00
|
|
|
pullRequestQueue.Remove(prID)
|
2015-10-24 09:36:47 +02:00
|
|
|
|
2017-05-05 02:47:03 +02:00
|
|
|
id := com.StrTo(prID).MustInt64()
|
|
|
|
if _, ok := checkedPRs[id]; ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
pr, err := GetPullRequestByID(id)
|
2015-10-24 09:36:47 +02:00
|
|
|
if err != nil {
|
2016-12-21 08:09:43 +01:00
|
|
|
log.Error(4, "GetPullRequestByID[%s]: %v", prID, err)
|
2015-10-24 09:36:47 +02:00
|
|
|
continue
|
2017-02-05 14:07:44 +01:00
|
|
|
} else if pr.manuallyMerged() {
|
|
|
|
continue
|
2015-10-24 09:36:47 +02:00
|
|
|
} else if err = pr.testPatch(); err != nil {
|
|
|
|
log.Error(4, "testPatch[%d]: %v", pr.ID, err)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
pr.checkAndUpdateStatus()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:31:06 +01:00
|
|
|
// InitTestPullRequests runs the task to test all the checking status pull requests
|
2015-10-24 09:36:47 +02:00
|
|
|
func InitTestPullRequests() {
|
|
|
|
go TestPullRequests()
|
|
|
|
}
|