2015-10-19 02:30:39 +03: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"
"os"
"path"
"strings"
"time"
2016-11-11 15:11:45 +03:00
"code.gitea.io/git"
2016-11-10 19:24:48 +03: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"
2016-11-11 12:39:44 +03:00
api "code.gitea.io/sdk/gitea"
2016-11-11 15:11:45 +03:00
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
2015-10-19 02:30:39 +03:00
)
2016-11-28 18:31:06 +03:00
var pullRequestQueue = sync . NewUniqueQueue ( setting . Repository . PullRequestQueueLength )
2016-08-31 01:50:30 +03:00
2016-11-28 18:31:06 +03:00
// PullRequestType defines pull request type
2015-10-19 02:30:39 +03:00
type PullRequestType int
2016-11-28 18:31:06 +03:00
// Enumerate all the pull request types
2015-10-19 02:30:39 +03:00
const (
2016-11-07 18:37:32 +03:00
PullRequestGitea PullRequestType = iota
PullRequestGit
2015-10-19 02:30:39 +03:00
)
2016-11-28 18:31:06 +03:00
// PullRequestStatus defines pull request status
2015-10-19 02:30:39 +03:00
type PullRequestStatus int
2016-11-28 18:31:06 +03:00
// Enumerate all the pull request status
2015-10-19 02:30:39 +03:00
const (
2016-11-07 18:37:32 +03:00
PullRequestStatusConflict PullRequestStatus = iota
PullRequestStatusChecking
PullRequestStatusMergeable
2015-10-19 02:30:39 +03: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
2015-10-24 10:36:47 +03:00
HeadRepoID int64
HeadRepo * Repository ` xorm:"-" `
BaseRepoID int64
BaseRepo * Repository ` xorm:"-" `
HeadUserName string
HeadBranch string
BaseBranch string
MergeBase string ` xorm:"VARCHAR(40)" `
2015-10-19 02:30:39 +03:00
2015-10-24 10:36:47 +03:00
HasMerged bool
MergedCommitID string ` xorm:"VARCHAR(40)" `
MergerID int64
2016-03-10 03:53:30 +03:00
Merger * User ` xorm:"-" `
Merged time . Time ` xorm:"-" `
MergedUnix int64
}
2016-11-28 18:31:06 +03:00
// BeforeUpdate is invoked from XORM before updating an object of this type.
2016-03-10 03:53:30 +03:00
func ( pr * PullRequest ) BeforeUpdate ( ) {
2016-07-23 15:24:44 +03:00
pr . MergedUnix = pr . Merged . Unix ( )
2015-10-19 02:30:39 +03:00
}
2016-11-28 18:31:06 +03:00
// AfterSet is invoked from XORM after setting the value of a field of this object.
2016-08-14 13:32:24 +03:00
// Note: don't try to get Issue because will end up recursive querying.
2015-10-19 02:30:39 +03:00
func ( pr * PullRequest ) AfterSet ( colName string , _ xorm . Cell ) {
switch colName {
2016-03-10 03:53:30 +03:00
case "merged_unix" :
2015-10-19 02:30:39 +03:00
if ! pr . HasMerged {
return
}
2016-03-10 03:53:30 +03:00
pr . Merged = time . Unix ( pr . MergedUnix , 0 ) . Local ( )
2015-10-19 02:30:39 +03:00
}
}
2016-08-14 13:32:24 +03: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 18:31:06 +03:00
// LoadAttributes loads pull request attributes from database
2016-08-14 13:32:24 +03:00
func ( pr * PullRequest ) LoadAttributes ( ) error {
return pr . loadAttributes ( x )
}
2016-11-28 18:31:06 +03:00
// LoadIssue loads issue information from database
2016-08-14 13:32:24 +03:00
func ( pr * PullRequest ) LoadIssue ( ) ( err error ) {
2016-08-16 20:19:09 +03:00
if pr . Issue != nil {
return nil
}
2016-08-14 13:32:24 +03:00
pr . Issue , err = GetIssueByID ( pr . IssueID )
return err
}
2016-11-28 18:31:06 +03:00
// APIFormat assumes following fields have been assigned with valid values:
2016-08-14 13:32:24 +03:00
// Required - Issue
// Optional - Merger
func ( pr * PullRequest ) APIFormat ( ) * api . PullRequest {
2016-12-05 14:17:39 +03:00
var (
baseBranch * Branch
headBranch * Branch
baseCommit * git . Commit
headCommit * git . Commit
err error
)
2016-08-14 13:32:24 +03:00
apiIssue := pr . Issue . APIFormat ( )
2016-12-05 14:17:39 +03: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 14:10:39 +03:00
apiBaseBranchInfo := & api . PRBranchInfo {
Name : pr . BaseBranch ,
Ref : pr . BaseBranch ,
Sha : baseCommit . ID . String ( ) ,
RepoID : pr . BaseRepoID ,
2016-12-06 02:48:51 +03:00
Repository : pr . BaseRepo . APIFormat ( AccessModeNone ) ,
2016-12-02 14:10:39 +03:00
}
apiHeadBranchInfo := & api . PRBranchInfo {
Name : pr . HeadBranch ,
Ref : pr . HeadBranch ,
Sha : headCommit . ID . String ( ) ,
RepoID : pr . HeadRepoID ,
2016-12-06 02:48:51 +03:00
Repository : pr . HeadRepo . APIFormat ( AccessModeNone ) ,
2016-12-02 14:10:39 +03:00
}
2016-08-14 13:32:24 +03:00
apiPullRequest := & api . PullRequest {
ID : pr . ID ,
Index : pr . Index ,
2016-08-16 20:19:09 +03:00
Poster : apiIssue . Poster ,
2016-08-14 13:32:24 +03:00
Title : apiIssue . Title ,
Body : apiIssue . Body ,
Labels : apiIssue . Labels ,
Milestone : apiIssue . Milestone ,
Assignee : apiIssue . Assignee ,
2016-08-16 20:19:09 +03:00
State : apiIssue . State ,
2016-08-14 13:32:24 +03:00
Comments : apiIssue . Comments ,
2016-08-16 20:19:09 +03:00
HTMLURL : pr . Issue . HTMLURL ( ) ,
2016-12-02 14:10:39 +03:00
DiffURL : pr . Issue . DiffURL ( ) ,
PatchURL : pr . Issue . PatchURL ( ) ,
2016-08-14 13:32:24 +03:00
HasMerged : pr . HasMerged ,
2016-12-02 14:10:39 +03:00
Base : apiBaseBranchInfo ,
Head : apiHeadBranchInfo ,
MergeBase : pr . MergeBase ,
2016-08-14 13:32:24 +03:00
}
2016-11-07 18:37:32 +03:00
if pr . Status != PullRequestStatusChecking {
mergeable := pr . Status != PullRequestStatusConflict
2016-11-29 11:25:47 +03:00
apiPullRequest . Mergeable = mergeable
2016-08-14 13:32:24 +03:00
}
if pr . HasMerged {
apiPullRequest . Merged = & pr . Merged
apiPullRequest . MergedCommitID = & pr . MergedCommitID
apiPullRequest . MergedBy = pr . Merger . APIFormat ( )
}
return apiPullRequest
}
2015-10-26 01:35:27 +03:00
func ( pr * PullRequest ) getHeadRepo ( e Engine ) ( err error ) {
pr . HeadRepo , err = getRepositoryByID ( e , pr . HeadRepoID )
2015-10-24 10:36:47 +03:00
if err != nil && ! IsErrRepoNotExist ( err ) {
2015-10-26 16:16:24 +03:00
return fmt . Errorf ( "getRepositoryByID(head): %v" , err )
2015-10-24 10:36:47 +03:00
}
return nil
}
2016-11-28 18:31:06 +03:00
// GetHeadRepo loads the head repository
2016-08-14 13:32:24 +03:00
func ( pr * PullRequest ) GetHeadRepo ( ) error {
2015-10-26 01:35:27 +03:00
return pr . getHeadRepo ( x )
}
2016-11-28 18:31:06 +03:00
// GetBaseRepo loads the target repository
2015-10-24 10:36:47 +03: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 16:16:24 +03:00
return fmt . Errorf ( "GetRepositoryByID(base): %v" , err )
2015-10-24 10:36:47 +03:00
}
return nil
}
// IsChecking returns true if this pull request is still checking conflict.
func ( pr * PullRequest ) IsChecking ( ) bool {
2016-11-07 18:37:32 +03:00
return pr . Status == PullRequestStatusChecking
2015-10-24 10:36:47 +03:00
}
2015-10-19 02:30:39 +03:00
// CanAutoMerge returns true if this pull request can be merged automatically.
func ( pr * PullRequest ) CanAutoMerge ( ) bool {
2016-11-07 18:37:32 +03:00
return pr . Status == PullRequestStatusMergeable
2015-10-19 02:30:39 +03:00
}
// Merge merges pull request to base repository.
2016-08-14 13:32:24 +03:00
// FIXME: add repoWorkingPull make sure two merges does not happen at same time.
2015-10-19 02:30:39 +03:00
func ( pr * PullRequest ) Merge ( doer * User , baseGitRepo * git . Repository ) ( err error ) {
2015-12-10 04:46:05 +03: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 )
}
2016-08-14 13:32:24 +03:00
defer func ( ) {
go HookQueue . Add ( pr . BaseRepo . ID )
go AddTestPullRequestTask ( doer , pr . BaseRepo . ID , pr . BaseBranch , false )
} ( )
2015-10-19 02:30:39 +03:00
sess := x . NewSession ( )
defer sessionRelease ( sess )
if err = sess . Begin ( ) ; err != nil {
return err
}
2016-02-25 22:17:55 +03:00
if err = pr . Issue . changeStatus ( sess , doer , pr . Issue . Repo , true ) ; err != nil {
2015-10-24 10:36:47 +03:00
return fmt . Errorf ( "Issue.changeStatus: %v" , err )
}
2015-10-19 02:30:39 +03:00
headRepoPath := RepoPath ( pr . HeadUserName , pr . HeadRepo . Name )
headGitRepo , err := git . OpenRepository ( headRepoPath )
if err != nil {
return fmt . Errorf ( "OpenRepository: %v" , err )
}
// Clone base repo.
2015-10-30 03:40:57 +03:00
tmpBasePath := path . Join ( setting . AppDataPath , "tmp/repos" , com . ToStr ( time . Now ( ) . Nanosecond ( ) ) + ".git" )
2016-12-01 02:56:15 +03:00
if err := os . MkdirAll ( path . Dir ( tmpBasePath ) , os . ModePerm ) ; err != nil {
return fmt . Errorf ( "Fail to create dir %s: %v" , tmpBasePath , err )
}
2015-10-19 02:30:39 +03:00
defer os . RemoveAll ( path . Dir ( tmpBasePath ) )
var stderr string
if _ , stderr , err = process . ExecTimeout ( 5 * time . Minute ,
2015-11-20 10:53:54 +03:00
fmt . Sprintf ( "PullRequest.Merge (git clone): %s" , tmpBasePath ) ,
2015-10-19 02:30:39 +03:00
"git" , "clone" , baseGitRepo . Path , tmpBasePath ) ; err != nil {
return fmt . Errorf ( "git clone: %s" , stderr )
}
// Check out base branch.
if _ , stderr , err = process . ExecDir ( - 1 , tmpBasePath ,
2015-11-20 10:53:54 +03:00
fmt . Sprintf ( "PullRequest.Merge (git checkout): %s" , tmpBasePath ) ,
2015-10-19 02:30:39 +03:00
"git" , "checkout" , pr . BaseBranch ) ; err != nil {
return fmt . Errorf ( "git checkout: %s" , stderr )
}
2015-10-24 10:36:47 +03:00
// Add head repo remote.
if _ , stderr , err = process . ExecDir ( - 1 , tmpBasePath ,
2015-11-20 10:53:54 +03:00
fmt . Sprintf ( "PullRequest.Merge (git remote add): %s" , tmpBasePath ) ,
2015-10-24 10:36:47 +03:00
"git" , "remote" , "add" , "head_repo" , headRepoPath ) ; err != nil {
2015-11-20 10:53:54 +03:00
return fmt . Errorf ( "git remote add [%s -> %s]: %s" , headRepoPath , tmpBasePath , stderr )
2015-10-24 10:36:47 +03:00
}
// Merge commits.
2015-10-19 02:30:39 +03:00
if _ , stderr , err = process . ExecDir ( - 1 , tmpBasePath ,
2015-11-20 10:53:54 +03:00
fmt . Sprintf ( "PullRequest.Merge (git fetch): %s" , tmpBasePath ) ,
2015-10-24 10:36:47 +03:00
"git" , "fetch" , "head_repo" ) ; err != nil {
2015-11-20 10:53:54 +03:00
return fmt . Errorf ( "git fetch [%s -> %s]: %s" , headRepoPath , tmpBasePath , stderr )
2015-10-24 10:36:47 +03:00
}
if _ , stderr , err = process . ExecDir ( - 1 , tmpBasePath ,
2015-11-20 19:37:17 +03:00
fmt . Sprintf ( "PullRequest.Merge (git merge --no-ff --no-commit): %s" , tmpBasePath ) ,
2015-11-20 12:08:08 +03:00
"git" , "merge" , "--no-ff" , "--no-commit" , "head_repo/" + pr . HeadBranch ) ; err != nil {
2015-11-20 16:43:15 +03:00
return fmt . Errorf ( "git merge --no-ff --no-commit [%s]: %v - %s" , tmpBasePath , err , stderr )
2015-11-20 10:53:54 +03:00
}
sig := doer . NewGitSig ( )
if _ , stderr , err = process . ExecDir ( - 1 , tmpBasePath ,
fmt . Sprintf ( "PullRequest.Merge (git merge): %s" , tmpBasePath ) ,
"git" , "commit" , fmt . Sprintf ( "--author='%s <%s>'" , sig . Name , sig . Email ) ,
"-m" , fmt . Sprintf ( "Merge branch '%s' of %s/%s into %s" , pr . HeadBranch , pr . HeadUserName , pr . HeadRepo . Name , pr . BaseBranch ) ) ; err != nil {
2015-11-20 12:08:08 +03:00
return fmt . Errorf ( "git commit [%s]: %v - %s" , tmpBasePath , err , stderr )
2015-10-19 02:30:39 +03:00
}
// Push back to upstream.
if _ , stderr , err = process . ExecDir ( - 1 , tmpBasePath ,
2015-11-20 10:53:54 +03:00
fmt . Sprintf ( "PullRequest.Merge (git push): %s" , tmpBasePath ) ,
2015-10-19 02:30:39 +03:00
"git" , "push" , baseGitRepo . Path , pr . BaseBranch ) ; err != nil {
return fmt . Errorf ( "git push: %s" , stderr )
}
2016-08-14 13:32:24 +03:00
pr . MergedCommitID , err = headGitRepo . GetBranchCommitID ( pr . HeadBranch )
if err != nil {
return fmt . Errorf ( "GetBranchCommit: %v" , err )
}
pr . HasMerged = true
pr . Merged = time . Now ( )
pr . MergerID = doer . ID
if _ , err = sess . Id ( pr . ID ) . AllCols ( ) . Update ( pr ) ; err != nil {
return fmt . Errorf ( "update pull request: %v" , err )
}
2015-12-10 04:46:05 +03:00
if err = sess . Commit ( ) ; err != nil {
return fmt . Errorf ( "Commit: %v" , err )
}
2016-08-14 13:32:24 +03:00
if err = MergePullRequestAction ( doer , pr . Issue . Repo , pr . Issue ) ; err != nil {
log . Error ( 4 , "MergePullRequestAction [%d]: %v" , pr . ID , err )
}
// Reload pull request information.
if err = pr . LoadAttributes ( ) ; err != nil {
log . Error ( 4 , "LoadAttributes: %v" , err )
return nil
}
2016-11-07 18:37:32 +03:00
if err = PrepareWebhooks ( pr . Issue . Repo , HookEventPullRequest , & api . PullRequestPayload {
Action : api . HookIssueClosed ,
2016-08-14 13:32:24 +03:00
Index : pr . Index ,
PullRequest : pr . APIFormat ( ) ,
2016-12-06 02:48:51 +03:00
Repository : pr . Issue . Repo . APIFormat ( AccessModeNone ) ,
2016-08-14 13:32:24 +03:00
Sender : doer . APIFormat ( ) ,
} ) ; err != nil {
log . Error ( 4 , "PrepareWebhooks: %v" , err )
return nil
}
2015-12-10 04:46:05 +03:00
l , err := headGitRepo . CommitsBetweenIDs ( pr . MergedCommitID , pr . MergeBase )
if err != nil {
2016-08-14 13:32:24 +03:00
log . Error ( 4 , "CommitsBetweenIDs: %v" , err )
return nil
}
// TODO: when squash commits, no need to append merge commit.
// It is possible that head branch is not fully sync with base branch for merge commits,
// so we need to get latest head commit and append merge commit manully
// 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 04:46:05 +03:00
}
2016-08-14 13:32:24 +03:00
l . PushFront ( mergeCommit )
2015-12-10 04:46:05 +03:00
p := & api . PushPayload {
2016-12-22 12:30:52 +03:00
Ref : git . BranchPrefix + pr . BaseBranch ,
2015-12-10 04:46:05 +03:00
Before : pr . MergeBase ,
After : pr . MergedCommitID ,
2016-11-27 13:14:25 +03:00
CompareURL : setting . AppURL + pr . BaseRepo . ComposeCompareURL ( pr . MergeBase , pr . MergedCommitID ) ,
2016-11-22 13:43:30 +03:00
Commits : ListToPushCommits ( l ) . ToAPIPayloadCommits ( pr . BaseRepo . HTMLURL ( ) ) ,
2016-12-06 02:48:51 +03:00
Repo : pr . BaseRepo . APIFormat ( AccessModeNone ) ,
2016-08-14 14:17:26 +03:00
Pusher : pr . HeadRepo . MustOwner ( ) . APIFormat ( ) ,
Sender : doer . APIFormat ( ) ,
2015-12-10 04:46:05 +03:00
}
2016-11-07 18:37:32 +03:00
if err = PrepareWebhooks ( pr . BaseRepo , HookEventPush , p ) ; err != nil {
2015-12-10 04:46:05 +03:00
return fmt . Errorf ( "PrepareWebhooks: %v" , err )
}
return nil
2015-10-19 02:30:39 +03:00
}
2016-12-01 04:05:32 +03:00
// patchConflicts is a list of conflict description from Git.
2015-10-24 21:48:11 +03:00
var patchConflicts = [ ] string {
"patch does not apply" ,
"already exists in working directory" ,
2015-10-30 03:40:57 +03:00
"unrecognized input" ,
2016-02-03 20:28:03 +03:00
"error:" ,
2015-10-24 21:48:11 +03:00
}
2016-12-01 04:05:32 +03:00
// testPatch checks if patch can be merged to base repository without conflict.
2015-10-24 10:36:47 +03: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 )
}
2015-10-25 10:10:22 +03:00
// Fast fail if patch does not exist, this assumes data is cruppted.
if ! com . IsFile ( patchPath ) {
log . Trace ( "PullRequest[%d].testPatch: ignored cruppted data" , pr . ID )
return nil
}
2016-08-30 15:07:50 +03:00
repoWorkingPool . CheckIn ( com . ToStr ( pr . BaseRepoID ) )
defer repoWorkingPool . CheckOut ( com . ToStr ( pr . BaseRepoID ) )
2016-02-03 20:28:03 +03:00
log . Trace ( "PullRequest[%d].testPatch (patchPath): %s" , pr . ID , patchPath )
2015-10-24 10:36:47 +03:00
2016-12-09 01:08:28 +03:00
// Delete old temp local copy before we create a new temp local copy
RemoveAllWithNotice ( "Deleting old local copy" , pr . BaseRepo . LocalCopyPath ( ) )
2016-08-15 09:02:14 +03:00
if err := pr . BaseRepo . UpdateLocalCopyBranch ( pr . BaseBranch ) ; err != nil {
2015-10-24 10:36:47 +03:00
return fmt . Errorf ( "UpdateLocalCopy: %v" , err )
}
2016-11-07 18:37:32 +03:00
pr . Status = PullRequestStatusChecking
2016-08-15 09:02:14 +03:00
_ , stderr , err := process . ExecDir ( - 1 , pr . BaseRepo . LocalCopyPath ( ) ,
2016-02-03 20:28:03 +03:00
fmt . Sprintf ( "testPatch (git apply --check): %d" , pr . BaseRepo . ID ) ,
2015-10-24 10:36:47 +03:00
"git" , "apply" , "--check" , patchPath )
if err != nil {
2015-10-24 21:48:11 +03:00
for i := range patchConflicts {
if strings . Contains ( stderr , patchConflicts [ i ] ) {
2016-12-01 04:05:32 +03:00
log . Trace ( "PullRequest[%d].testPatch (apply): has conflict" , pr . ID )
2015-11-17 05:18:04 +03:00
fmt . Println ( stderr )
2016-11-07 18:37:32 +03:00
pr . Status = PullRequestStatusConflict
2015-10-24 21:48:11 +03:00
return nil
}
2015-10-24 10:36:47 +03:00
}
2015-10-24 21:48:11 +03:00
return fmt . Errorf ( "git apply --check: %v - %s" , err , stderr )
2015-10-24 10:36:47 +03:00
}
return nil
}
2015-10-19 02:30:39 +03:00
// NewPullRequest creates new pull request with labels for repository.
func NewPullRequest ( repo * Repository , pull * Issue , labelIDs [ ] int64 , uuids [ ] string , pr * PullRequest , patch [ ] byte ) ( err error ) {
sess := x . NewSession ( )
defer sessionRelease ( sess )
if err = sess . Begin ( ) ; err != nil {
return err
}
2016-08-16 08:20:55 +03:00
if err = newIssue ( sess , NewIssueOptions {
2016-08-16 04:40:32 +03:00
Repo : repo ,
Issue : pull ,
LableIDs : labelIDs ,
Attachments : uuids ,
IsPull : true ,
} ) ; err != nil {
2015-10-19 02:30:39 +03:00
return fmt . Errorf ( "newIssue: %v" , err )
}
2015-10-24 21:48:11 +03:00
pr . Index = pull . Index
2015-10-24 10:36:47 +03:00
if err = repo . SavePatch ( pr . Index , patch ) ; err != nil {
return fmt . Errorf ( "SavePatch: %v" , err )
2015-10-19 02:30:39 +03:00
}
2015-10-24 10:36:47 +03:00
pr . BaseRepo = repo
if err = pr . testPatch ( ) ; err != nil {
return fmt . Errorf ( "testPatch: %v" , err )
2015-10-19 02:30:39 +03:00
}
2016-08-14 13:32:24 +03:00
// No conflict appears after test means mergeable.
2016-11-07 18:37:32 +03:00
if pr . Status == PullRequestStatusChecking {
pr . Status = PullRequestStatusMergeable
2015-10-19 02:30:39 +03:00
}
pr . IssueID = pull . ID
if _ , err = sess . Insert ( pr ) ; err != nil {
return fmt . Errorf ( "insert pull repo: %v" , err )
}
2016-07-15 19:36:39 +03:00
if err = sess . Commit ( ) ; err != nil {
return fmt . Errorf ( "Commit: %v" , err )
}
2016-08-14 13:32:24 +03:00
if err = NotifyWatchers ( & Action {
ActUserID : pull . Poster . ID ,
ActUserName : pull . Poster . Name ,
2016-11-07 18:37:32 +03:00
OpType : ActionCreatePullRequest ,
2016-08-14 13:32:24 +03:00
Content : fmt . Sprintf ( "%d|%s" , pull . Index , pull . Title ) ,
RepoID : repo . ID ,
RepoUserName : repo . Owner . Name ,
RepoName : repo . Name ,
IsPrivate : repo . IsPrivate ,
} ) ; err != nil {
2016-07-15 19:36:39 +03:00
log . Error ( 4 , "NotifyWatchers: %v" , err )
} else if err = pull . MailParticipants ( ) ; err != nil {
log . Error ( 4 , "MailParticipants: %v" , err )
}
2016-08-14 13:32:24 +03:00
pr . Issue = pull
pull . PullRequest = pr
2016-11-07 18:37:32 +03:00
if err = PrepareWebhooks ( repo , HookEventPullRequest , & api . PullRequestPayload {
Action : api . HookIssueOpened ,
2016-08-14 13:32:24 +03:00
Index : pull . Index ,
PullRequest : pr . APIFormat ( ) ,
2016-12-06 02:48:51 +03:00
Repository : repo . APIFormat ( AccessModeNone ) ,
2016-08-14 13:32:24 +03:00
Sender : pull . Poster . APIFormat ( ) ,
} ) ; err != nil {
log . Error ( 4 , "PrepareWebhooks: %v" , err )
}
go HookQueue . Add ( repo . ID )
2016-07-15 19:36:39 +03:00
return nil
2015-10-19 02:30:39 +03:00
}
2016-12-02 14:10:39 +03:00
// PullRequestsOptions holds the options for PRs
type PullRequestsOptions struct {
Page int
State string
SortType string
Labels [ ] string
MilestoneID int64
}
func listPullRequestStatement ( baseRepoID int64 , opts * PullRequestsOptions ) * xorm . Session {
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" )
}
return sess
}
// 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
}
countSession := listPullRequestStatement ( baseRepoID , opts )
maxResults , err := countSession . Count ( new ( PullRequest ) )
if err != nil {
log . Error ( 4 , "Count PRs" , err )
return nil , maxResults , err
}
prs := make ( [ ] * PullRequest , 0 , ItemsPerPage )
findSession := listPullRequestStatement ( baseRepoID , opts )
findSession . Limit ( ItemsPerPage , ( opts . Page - 1 ) * ItemsPerPage )
return prs , maxResults , findSession . Find ( & prs )
}
2015-10-19 02:30:39 +03:00
// GetUnmergedPullRequest returnss a pull request that is open and has not been merged
// by given head/base and repo/branch.
func GetUnmergedPullRequest ( headRepoID , baseRepoID int64 , headBranch , baseBranch string ) ( * PullRequest , error ) {
pr := new ( PullRequest )
2016-11-10 18:16:32 +03: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 02:30:39 +03:00
if err != nil {
return nil , err
} else if ! has {
return nil , ErrPullRequestNotExist { 0 , 0 , headRepoID , baseRepoID , headBranch , baseBranch }
}
return pr , nil
}
2015-10-24 10:36:47 +03:00
// GetUnmergedPullRequestsByHeadInfo returnss all pull requests that are open and has not been merged
// by given head information (repo and branch).
2015-10-24 21:48:11 +03:00
func GetUnmergedPullRequestsByHeadInfo ( repoID int64 , branch string ) ( [ ] * PullRequest , error ) {
2015-10-24 10:36:47 +03:00
prs := make ( [ ] * PullRequest , 0 , 2 )
2016-11-10 18:16:32 +03: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 21:48:11 +03:00
}
// GetUnmergedPullRequestsByBaseInfo returnss all pull requests that are open and has not been merged
// by given base information (repo and branch).
func GetUnmergedPullRequestsByBaseInfo ( repoID int64 , branch string ) ( [ ] * PullRequest , error ) {
prs := make ( [ ] * PullRequest , 0 , 2 )
2016-11-10 18:16:32 +03: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 10:36:47 +03:00
}
2016-12-02 14:10:39 +03: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 {
return nil , ErrPullRequestNotExist { 0 , repoID , index , 0 , "" , "" }
}
2016-12-05 14:17:39 +03:00
if err = pr . LoadAttributes ( ) ; err != nil {
return nil , err
}
if err = pr . LoadIssue ( ) ; err != nil {
return nil , err
}
2016-12-02 14:10:39 +03:00
return pr , nil
}
2016-08-14 13:32:24 +03:00
func getPullRequestByID ( e Engine , id int64 ) ( * PullRequest , error ) {
2015-10-24 10:36:47 +03:00
pr := new ( PullRequest )
2016-08-14 13:32:24 +03:00
has , err := e . Id ( id ) . Get ( pr )
2015-10-24 10:36:47 +03:00
if err != nil {
return nil , err
} else if ! has {
return nil , ErrPullRequestNotExist { id , 0 , 0 , 0 , "" , "" }
}
2016-08-14 13:32:24 +03:00
return pr , pr . loadAttributes ( e )
2015-10-24 10:36:47 +03:00
}
2016-08-14 13:32:24 +03: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 21:47:24 +03:00
pr := & PullRequest {
IssueID : issueID ,
}
2016-08-14 13:32:24 +03:00
has , err := e . Get ( pr )
2015-10-19 02:30:39 +03:00
if err != nil {
return nil , err
} else if ! has {
2015-10-22 21:47:24 +03:00
return nil , ErrPullRequestNotExist { 0 , issueID , 0 , 0 , "" , "" }
2015-10-19 02:30:39 +03:00
}
2016-08-14 13:32:24 +03: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 02:30:39 +03:00
}
2015-10-24 10:36:47 +03:00
// Update updates all fields of pull request.
func ( pr * PullRequest ) Update ( ) error {
_ , err := x . Id ( pr . ID ) . AllCols ( ) . Update ( pr )
return err
}
2016-11-28 18:31:06 +03:00
// UpdateCols updates specific fields of pull request.
2015-10-24 10:36:47 +03:00
func ( pr * PullRequest ) UpdateCols ( cols ... string ) error {
_ , err := x . Id ( pr . ID ) . Cols ( cols ... ) . Update ( pr )
return err
}
2015-10-25 10:10:22 +03:00
// UpdatePatch generates and saves a new patch.
2015-11-04 01:25:39 +03:00
func ( pr * PullRequest ) UpdatePatch ( ) ( err error ) {
if err = pr . GetHeadRepo ( ) ; err != nil {
2015-10-25 10:10:22 +03: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 10:36:47 +03:00
}
2015-11-04 01:25:39 +03:00
if err = pr . GetBaseRepo ( ) ; err != nil {
2015-10-25 10:10:22 +03:00
return fmt . Errorf ( "GetBaseRepo: %v" , err )
2015-10-24 10:36:47 +03:00
}
2015-10-25 10:10:22 +03:00
2015-11-27 01:33:45 +03:00
headGitRepo , err := git . OpenRepository ( pr . HeadRepo . RepoPath ( ) )
2015-10-25 10:10:22 +03:00
if err != nil {
return fmt . Errorf ( "OpenRepository: %v" , err )
}
2015-11-04 01:25:39 +03:00
// Add a temporary remote.
tmpRemote := com . ToStr ( time . Now ( ) . UnixNano ( ) )
2015-12-10 04:46:05 +03:00
if err = headGitRepo . AddRemote ( tmpRemote , RepoPath ( pr . BaseRepo . MustOwner ( ) . Name , pr . BaseRepo . Name ) , true ) ; err != nil {
2015-11-04 01:25:39 +03: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 10:10:22 +03: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 10:36:47 +03:00
}
2016-02-20 06:16:26 +03: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 21:00:42 +03:00
func ( pr * PullRequest ) PushToBaseRepo ( ) ( err error ) {
2016-03-04 23:43:01 +03:00
log . Trace ( "PushToBaseRepo[%d]: pushing commits to base repo 'refs/pull/%d/head'" , pr . BaseRepoID , pr . Index )
2016-02-04 21:00:42 +03:00
2016-02-20 06:16:26 +03:00
headRepoPath := pr . HeadRepo . RepoPath ( )
headGitRepo , err := git . OpenRepository ( headRepoPath )
2016-02-04 21:00:42 +03:00
if err != nil {
2016-02-20 06:16:26 +03:00
return fmt . Errorf ( "OpenRepository: %v" , err )
2016-02-04 21:00:42 +03:00
}
2016-02-20 06:16:26 +03: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 21:00:42 +03:00
}
// Make sure to remove the remote even if the push fails
2016-02-20 06:16:26 +03:00
defer headGitRepo . RemoveRemote ( tmpRemoteName )
2016-02-04 21:00:42 +03:00
2016-03-05 00:53:03 +03:00
headFile := fmt . Sprintf ( "refs/pull/%d/head" , pr . Index )
// Remove head in case there is a conflict.
2016-12-01 02:56:15 +03:00
file := path . Join ( pr . BaseRepo . RepoPath ( ) , headFile )
2016-03-05 00:53:03 +03:00
2016-12-04 00:31:54 +03:00
_ = os . Remove ( file )
2016-03-05 00:53:03 +03:00
if err = git . Push ( headRepoPath , tmpRemoteName , fmt . Sprintf ( "%s:%s" , pr . HeadBranch , headFile ) ) ; err != nil {
2016-02-20 06:16:26 +03:00
return fmt . Errorf ( "Push: %v" , err )
2016-02-04 21:00:42 +03:00
}
return nil
}
2015-10-25 10:10:22 +03:00
// AddToTaskQueue adds itself to pull request test task queue.
func ( pr * PullRequest ) AddToTaskQueue ( ) {
2016-11-28 18:31:06 +03:00
go pullRequestQueue . AddFunc ( pr . ID , func ( ) {
2016-11-07 18:37:32 +03:00
pr . Status = PullRequestStatusChecking
2015-10-24 21:48:11 +03:00
if err := pr . UpdateCols ( "status" ) ; err != nil {
2015-10-25 10:10:22 +03:00
log . Error ( 5 , "AddToTaskQueue.UpdateCols[%d].(add to queue): %v" , pr . ID , err )
2015-10-24 21:48:11 +03:00
}
} )
}
2015-10-24 10:36:47 +03:00
2016-11-28 18:31:06 +03:00
// PullRequestList defines a list of pull requests
2016-08-14 13:32:24 +03:00
type PullRequestList [ ] * PullRequest
func ( prs PullRequestList ) loadAttributes ( e Engine ) error {
if len ( prs ) == 0 {
return nil
}
// Load issues.
issueIDs := make ( [ ] int64 , 0 , len ( prs ) )
for i := range prs {
issueIDs = append ( issueIDs , prs [ i ] . IssueID )
}
issues := make ( [ ] * Issue , 0 , len ( issueIDs ) )
2016-11-10 18:16:32 +03:00
if err := e .
Where ( "id > 0" ) .
In ( "id" , issueIDs ) .
Find ( & issues ) ; err != nil {
2016-08-14 13:32:24 +03: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
}
2016-11-28 18:31:06 +03:00
// LoadAttributes load all the prs attributes
2016-08-14 13:32:24 +03:00
func ( prs PullRequestList ) LoadAttributes ( ) error {
return prs . loadAttributes ( x )
}
2015-10-24 21:48:11 +03:00
func addHeadRepoTasks ( prs [ ] * PullRequest ) {
2015-10-24 10:36:47 +03:00
for _ , pr := range prs {
2015-10-24 21:48:11 +03:00
log . Trace ( "addHeadRepoTasks[%d]: composing new test task" , pr . ID )
2015-10-25 10:10:22 +03:00
if err := pr . UpdatePatch ( ) ; err != nil {
log . Error ( 4 , "UpdatePatch: %v" , err )
2015-10-24 10:36:47 +03:00
continue
2016-02-04 21:00:42 +03:00
} else if err := pr . PushToBaseRepo ( ) ; err != nil {
log . Error ( 4 , "PushToBaseRepo: %v" , err )
continue
2015-10-24 10:36:47 +03:00
}
2015-10-25 10:10:22 +03:00
pr . AddToTaskQueue ( )
2015-10-24 21:48:11 +03: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 13:32:24 +03: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 21:48:11 +03:00
prs , err := GetUnmergedPullRequestsByHeadInfo ( repoID , branch )
if err != nil {
2016-08-14 13:32:24 +03:00
log . Error ( 4 , "Find pull requests [head_repo_id: %d, head_branch: %s]: %v" , repoID , branch , err )
2015-10-24 21:48:11 +03:00
return
}
2016-08-14 13:32:24 +03:00
if isSync {
if err = PullRequestList ( prs ) . LoadAttributes ( ) ; err != nil {
log . Error ( 4 , "PullRequestList.LoadAttributes: %v" , err )
}
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 18:37:32 +03:00
if err = PrepareWebhooks ( pr . Issue . Repo , HookEventPullRequest , & api . PullRequestPayload {
Action : api . HookIssueSynchronized ,
2016-08-14 13:32:24 +03:00
Index : pr . Issue . Index ,
PullRequest : pr . Issue . PullRequest . APIFormat ( ) ,
2016-12-06 02:48:51 +03:00
Repository : pr . Issue . Repo . APIFormat ( AccessModeNone ) ,
2016-08-14 13:32:24 +03: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 )
}
}
}
2015-10-24 21:48:11 +03:00
addHeadRepoTasks ( prs )
2016-08-14 13:32:24 +03:00
log . Trace ( "AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests" , repoID , branch )
2015-10-24 21:48:11 +03:00
prs , err = GetUnmergedPullRequestsByBaseInfo ( repoID , branch )
if err != nil {
2016-08-14 13:32:24 +03:00
log . Error ( 4 , "Find pull requests [base_repo_id: %d, base_branch: %s]: %v" , repoID , branch , err )
2015-10-24 21:48:11 +03:00
return
}
for _ , pr := range prs {
2015-10-25 10:10:22 +03:00
pr . AddToTaskQueue ( )
}
}
2016-11-28 18:31:06 +03:00
// ChangeUsernameInPullRequests changes the name of head_user_name
2016-01-28 14:07:16 +03:00
func ChangeUsernameInPullRequests ( oldUserName , newUserName string ) error {
2016-01-28 00:45:03 +03:00
pr := PullRequest {
2016-01-28 14:07:16 +03:00
HeadUserName : strings . ToLower ( newUserName ) ,
2016-01-28 00:45:03 +03:00
}
2016-11-10 18:16:32 +03:00
_ , err := x .
Cols ( "head_user_name" ) .
Where ( "head_user_name = ?" , strings . ToLower ( oldUserName ) ) .
Update ( pr )
2016-01-28 00:45:03 +03:00
return err
}
2015-10-25 10:10:22 +03:00
// checkAndUpdateStatus checks if pull request is possible to levaing checking status,
// and set to be either conflict or mergeable.
func ( pr * PullRequest ) checkAndUpdateStatus ( ) {
// Status is not changed to conflict means mergeable.
2016-11-07 18:37:32 +03:00
if pr . Status == PullRequestStatusChecking {
pr . Status = PullRequestStatusMergeable
2015-10-25 10:10:22 +03:00
}
// Make sure there is no waiting test to process before levaing the checking status.
2016-11-28 18:31:06 +03:00
if ! pullRequestQueue . Exist ( pr . ID ) {
2015-10-25 10:10:22 +03:00
if err := pr . UpdateCols ( "status" ) ; err != nil {
log . Error ( 4 , "Update[%d]: %v" , pr . ID , err )
}
2015-10-24 10:36:47 +03: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 )
x . Iterate ( PullRequest {
2016-11-07 18:37:32 +03:00
Status : PullRequestStatusChecking ,
2015-10-24 10:36:47 +03:00
} ,
func ( idx int , bean interface { } ) error {
pr := bean . ( * PullRequest )
if err := pr . GetBaseRepo ( ) ; err != nil {
log . Error ( 3 , "GetBaseRepo: %v" , err )
return nil
}
if err := pr . testPatch ( ) ; err != nil {
log . Error ( 3 , "testPatch: %v" , err )
return nil
}
prs = append ( prs , pr )
return nil
} )
// Update pull request status.
for _ , pr := range prs {
pr . checkAndUpdateStatus ( )
}
// Start listening on new test requests.
2016-11-28 18:31:06 +03:00
for prID := range pullRequestQueue . Queue ( ) {
2015-10-24 10:36:47 +03:00
log . Trace ( "TestPullRequests[%v]: processing test task" , prID )
2016-11-28 18:31:06 +03:00
pullRequestQueue . Remove ( prID )
2015-10-24 10:36:47 +03:00
pr , err := GetPullRequestByID ( com . StrTo ( prID ) . MustInt64 ( ) )
if err != nil {
2016-12-21 10:09:43 +03:00
log . Error ( 4 , "GetPullRequestByID[%s]: %v" , prID , err )
2015-10-24 10:36:47 +03:00
continue
} else if err = pr . testPatch ( ) ; err != nil {
log . Error ( 4 , "testPatch[%d]: %v" , pr . ID , err )
continue
}
pr . checkAndUpdateStatus ( )
}
}
2016-11-28 18:31:06 +03:00
// InitTestPullRequests runs the task to test all the checking status pull requests
2015-10-24 10:36:47 +03:00
func InitTestPullRequests ( ) {
go TestPullRequests ( )
}