2015-10-19 07:30:39 +08: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"
|
|
|
|
|
|
|
|
"github.com/Unknwon/com"
|
|
|
|
"github.com/go-xorm/xorm"
|
|
|
|
|
2015-12-16 06:25:45 +08:00
|
|
|
"github.com/gogits/git-module"
|
2015-12-10 09:46:05 +08:00
|
|
|
api "github.com/gogits/go-gogs-client"
|
|
|
|
|
2015-10-19 07:30:39 +08:00
|
|
|
"github.com/gogits/gogs/modules/log"
|
|
|
|
"github.com/gogits/gogs/modules/process"
|
2015-10-24 15:36:47 +08:00
|
|
|
"github.com/gogits/gogs/modules/setting"
|
2015-10-19 07:30:39 +08:00
|
|
|
)
|
|
|
|
|
|
|
|
type PullRequestType int
|
|
|
|
|
|
|
|
const (
|
|
|
|
PULL_REQUEST_GOGS PullRequestType = iota
|
|
|
|
PLLL_ERQUEST_GIT
|
|
|
|
)
|
|
|
|
|
|
|
|
type PullRequestStatus int
|
|
|
|
|
|
|
|
const (
|
|
|
|
PULL_REQUEST_STATUS_CONFLICT PullRequestStatus = iota
|
|
|
|
PULL_REQUEST_STATUS_CHECKING
|
|
|
|
PULL_REQUEST_STATUS_MERGEABLE
|
|
|
|
)
|
|
|
|
|
|
|
|
// 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 15:36:47 +08: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 07:30:39 +08:00
|
|
|
|
2015-10-24 15:36:47 +08:00
|
|
|
HasMerged bool
|
|
|
|
MergedCommitID string `xorm:"VARCHAR(40)"`
|
|
|
|
MergerID int64
|
2016-03-10 08:53:30 +08:00
|
|
|
Merger *User `xorm:"-"`
|
|
|
|
Merged time.Time `xorm:"-"`
|
|
|
|
MergedUnix int64
|
|
|
|
}
|
|
|
|
|
|
|
|
func (pr *PullRequest) BeforeUpdate() {
|
2016-07-23 20:24:44 +08:00
|
|
|
pr.MergedUnix = pr.Merged.Unix()
|
2015-10-19 07:30:39 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Note: don't try to get Pull because will end up recursive querying.
|
|
|
|
func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
|
|
|
|
switch colName {
|
2016-03-10 08:53:30 +08:00
|
|
|
case "merged_unix":
|
2015-10-19 07:30:39 +08:00
|
|
|
if !pr.HasMerged {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-03-10 08:53:30 +08:00
|
|
|
pr.Merged = time.Unix(pr.MergedUnix, 0).Local()
|
2015-10-19 07:30:39 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-26 06:35:27 +08:00
|
|
|
func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
|
|
|
|
pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
|
2015-10-24 15:36:47 +08:00
|
|
|
if err != nil && !IsErrRepoNotExist(err) {
|
2015-10-26 21:16:24 +08:00
|
|
|
return fmt.Errorf("getRepositoryByID(head): %v", err)
|
2015-10-24 15:36:47 +08:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-10-26 06:35:27 +08:00
|
|
|
func (pr *PullRequest) GetHeadRepo() (err error) {
|
|
|
|
return pr.getHeadRepo(x)
|
|
|
|
}
|
|
|
|
|
2015-10-24 15:36:47 +08: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 21:16:24 +08:00
|
|
|
return fmt.Errorf("GetRepositoryByID(base): %v", err)
|
2015-10-24 15:36:47 +08:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (pr *PullRequest) GetMerger() (err error) {
|
|
|
|
if !pr.HasMerged || pr.Merger != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
pr.Merger, err = GetUserByID(pr.MergerID)
|
|
|
|
if IsErrUserNotExist(err) {
|
|
|
|
pr.MergerID = -1
|
|
|
|
pr.Merger = NewFakeUser()
|
|
|
|
} else if err != nil {
|
|
|
|
return fmt.Errorf("GetUserByID: %v", err)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// IsChecking returns true if this pull request is still checking conflict.
|
|
|
|
func (pr *PullRequest) IsChecking() bool {
|
|
|
|
return pr.Status == PULL_REQUEST_STATUS_CHECKING
|
|
|
|
}
|
|
|
|
|
2015-10-19 07:30:39 +08:00
|
|
|
// CanAutoMerge returns true if this pull request can be merged automatically.
|
|
|
|
func (pr *PullRequest) CanAutoMerge() bool {
|
|
|
|
return pr.Status == PULL_REQUEST_STATUS_MERGEABLE
|
|
|
|
}
|
|
|
|
|
|
|
|
// Merge merges pull request to base repository.
|
|
|
|
func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error) {
|
2015-12-10 09:46:05 +08: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)
|
|
|
|
}
|
|
|
|
|
2015-10-19 07:30:39 +08:00
|
|
|
sess := x.NewSession()
|
|
|
|
defer sessionRelease(sess)
|
|
|
|
if err = sess.Begin(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2016-02-26 03:17:55 +08:00
|
|
|
if err = pr.Issue.changeStatus(sess, doer, pr.Issue.Repo, true); err != nil {
|
2015-10-24 15:36:47 +08:00
|
|
|
return fmt.Errorf("Issue.changeStatus: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-10-19 07:30:39 +08:00
|
|
|
headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
|
|
|
|
headGitRepo, err := git.OpenRepository(headRepoPath)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("OpenRepository: %v", err)
|
|
|
|
}
|
2015-12-10 09:46:05 +08:00
|
|
|
pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.HeadBranch)
|
2015-10-19 07:30:39 +08:00
|
|
|
if err != nil {
|
2015-12-10 09:46:05 +08:00
|
|
|
return fmt.Errorf("GetBranchCommitID: %v", err)
|
2015-10-19 07:30:39 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if err = mergePullRequestAction(sess, doer, pr.Issue.Repo, pr.Issue); err != nil {
|
|
|
|
return fmt.Errorf("mergePullRequestAction: %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)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Clone base repo.
|
2015-10-30 08:40:57 +08:00
|
|
|
tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git")
|
2015-10-19 07:30:39 +08:00
|
|
|
os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm)
|
|
|
|
defer os.RemoveAll(path.Dir(tmpBasePath))
|
|
|
|
|
|
|
|
var stderr string
|
|
|
|
if _, stderr, err = process.ExecTimeout(5*time.Minute,
|
2015-11-20 15:53:54 +08:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git clone): %s", tmpBasePath),
|
2015-10-19 07:30:39 +08: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 15:53:54 +08:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
|
2015-10-19 07:30:39 +08:00
|
|
|
"git", "checkout", pr.BaseBranch); err != nil {
|
|
|
|
return fmt.Errorf("git checkout: %s", stderr)
|
|
|
|
}
|
|
|
|
|
2015-10-24 15:36:47 +08:00
|
|
|
// Add head repo remote.
|
|
|
|
if _, stderr, err = process.ExecDir(-1, tmpBasePath,
|
2015-11-20 15:53:54 +08:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git remote add): %s", tmpBasePath),
|
2015-10-24 15:36:47 +08:00
|
|
|
"git", "remote", "add", "head_repo", headRepoPath); err != nil {
|
2015-11-20 15:53:54 +08:00
|
|
|
return fmt.Errorf("git remote add [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
|
2015-10-24 15:36:47 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Merge commits.
|
2015-10-19 07:30:39 +08:00
|
|
|
if _, stderr, err = process.ExecDir(-1, tmpBasePath,
|
2015-11-20 15:53:54 +08:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git fetch): %s", tmpBasePath),
|
2015-10-24 15:36:47 +08:00
|
|
|
"git", "fetch", "head_repo"); err != nil {
|
2015-11-20 15:53:54 +08:00
|
|
|
return fmt.Errorf("git fetch [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
|
2015-10-24 15:36:47 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if _, stderr, err = process.ExecDir(-1, tmpBasePath,
|
2015-11-21 00:37:17 +08:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git merge --no-ff --no-commit): %s", tmpBasePath),
|
2015-11-20 17:08:08 +08:00
|
|
|
"git", "merge", "--no-ff", "--no-commit", "head_repo/"+pr.HeadBranch); err != nil {
|
2015-11-20 21:43:15 +08:00
|
|
|
return fmt.Errorf("git merge --no-ff --no-commit [%s]: %v - %s", tmpBasePath, err, stderr)
|
2015-11-20 15:53:54 +08: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 17:08:08 +08:00
|
|
|
return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr)
|
2015-10-19 07:30:39 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Push back to upstream.
|
|
|
|
if _, stderr, err = process.ExecDir(-1, tmpBasePath,
|
2015-11-20 15:53:54 +08:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git push): %s", tmpBasePath),
|
2015-10-19 07:30:39 +08:00
|
|
|
"git", "push", baseGitRepo.Path, pr.BaseBranch); err != nil {
|
|
|
|
return fmt.Errorf("git push: %s", stderr)
|
|
|
|
}
|
|
|
|
|
2015-12-10 09:46:05 +08:00
|
|
|
if err = sess.Commit(); err != nil {
|
|
|
|
return fmt.Errorf("Commit: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Compose commit repository action
|
|
|
|
l, err := headGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("CommitsBetween: %v", err)
|
|
|
|
}
|
|
|
|
p := &api.PushPayload{
|
|
|
|
Ref: "refs/heads/" + pr.BaseBranch,
|
|
|
|
Before: pr.MergeBase,
|
|
|
|
After: pr.MergedCommitID,
|
|
|
|
CompareUrl: setting.AppUrl + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
|
2016-07-15 21:53:43 +08:00
|
|
|
Commits: ListToPushCommits(l).ToApiPayloadCommits(pr.BaseRepo.FullLink()),
|
2015-12-10 09:46:05 +08:00
|
|
|
Repo: pr.BaseRepo.ComposePayload(),
|
|
|
|
Pusher: &api.PayloadAuthor{
|
|
|
|
Name: pr.HeadRepo.MustOwner().DisplayName(),
|
|
|
|
Email: pr.HeadRepo.MustOwner().Email,
|
|
|
|
UserName: pr.HeadRepo.MustOwner().Name,
|
|
|
|
},
|
|
|
|
Sender: &api.PayloadUser{
|
|
|
|
UserName: doer.Name,
|
|
|
|
ID: doer.Id,
|
|
|
|
AvatarUrl: setting.AppUrl + doer.RelAvatarLink(),
|
|
|
|
},
|
|
|
|
}
|
|
|
|
if err = PrepareWebhooks(pr.BaseRepo, HOOK_EVENT_PUSH, p); err != nil {
|
|
|
|
return fmt.Errorf("PrepareWebhooks: %v", err)
|
|
|
|
}
|
|
|
|
go HookQueue.Add(pr.BaseRepo.ID)
|
|
|
|
return nil
|
2015-10-19 07:30:39 +08:00
|
|
|
}
|
|
|
|
|
2015-10-25 02:48:11 +08:00
|
|
|
// patchConflicts is a list of conflit description from Git.
|
|
|
|
var patchConflicts = []string{
|
|
|
|
"patch does not apply",
|
|
|
|
"already exists in working directory",
|
2015-10-30 08:40:57 +08:00
|
|
|
"unrecognized input",
|
2016-02-04 01:28:03 +08:00
|
|
|
"error:",
|
2015-10-25 02:48:11 +08:00
|
|
|
}
|
|
|
|
|
2015-10-24 15:36:47 +08:00
|
|
|
// testPatch checks if patch can be merged to base repository without conflit.
|
2015-11-16 03:41:36 +08:00
|
|
|
// FIXME: make a mechanism to clean up stable local copies.
|
2015-10-24 15:36:47 +08: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 15:10:22 +08: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-02-04 01:28:03 +08:00
|
|
|
log.Trace("PullRequest[%d].testPatch (patchPath): %s", pr.ID, patchPath)
|
2015-10-24 15:36:47 +08:00
|
|
|
|
|
|
|
if err := pr.BaseRepo.UpdateLocalCopy(); err != nil {
|
|
|
|
return fmt.Errorf("UpdateLocalCopy: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-11-16 03:41:36 +08:00
|
|
|
// Checkout base branch.
|
2015-10-24 15:36:47 +08:00
|
|
|
_, stderr, err := process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(),
|
2016-02-04 01:28:03 +08:00
|
|
|
fmt.Sprintf("PullRequest.Merge (git checkout): %v", pr.BaseRepo.ID),
|
2015-11-16 03:41:36 +08:00
|
|
|
"git", "checkout", pr.BaseBranch)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("git checkout: %s", stderr)
|
|
|
|
}
|
|
|
|
|
|
|
|
pr.Status = PULL_REQUEST_STATUS_CHECKING
|
|
|
|
_, stderr, err = process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(),
|
2016-02-04 01:28:03 +08:00
|
|
|
fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID),
|
2015-10-24 15:36:47 +08:00
|
|
|
"git", "apply", "--check", patchPath)
|
|
|
|
if err != nil {
|
2015-10-25 02:48:11 +08:00
|
|
|
for i := range patchConflicts {
|
|
|
|
if strings.Contains(stderr, patchConflicts[i]) {
|
2016-02-04 01:28:03 +08:00
|
|
|
log.Trace("PullRequest[%d].testPatch (apply): has conflit", pr.ID)
|
2015-11-17 10:18:04 +08:00
|
|
|
fmt.Println(stderr)
|
2015-10-25 02:48:11 +08:00
|
|
|
pr.Status = PULL_REQUEST_STATUS_CONFLICT
|
|
|
|
return nil
|
|
|
|
}
|
2015-10-24 15:36:47 +08:00
|
|
|
}
|
2015-10-25 02:48:11 +08:00
|
|
|
|
|
|
|
return fmt.Errorf("git apply --check: %v - %s", err, stderr)
|
2015-10-24 15:36:47 +08:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-10-19 07:30:39 +08: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
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = newIssue(sess, repo, pull, labelIDs, uuids, true); err != nil {
|
|
|
|
return fmt.Errorf("newIssue: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Notify watchers.
|
|
|
|
act := &Action{
|
|
|
|
ActUserID: pull.Poster.Id,
|
|
|
|
ActUserName: pull.Poster.Name,
|
|
|
|
ActEmail: pull.Poster.Email,
|
2016-02-23 01:40:00 +08:00
|
|
|
OpType: ACTION_CREATE_PULL_REQUEST,
|
2015-10-19 07:30:39 +08:00
|
|
|
Content: fmt.Sprintf("%d|%s", pull.Index, pull.Name),
|
|
|
|
RepoID: repo.ID,
|
|
|
|
RepoUserName: repo.Owner.Name,
|
|
|
|
RepoName: repo.Name,
|
|
|
|
IsPrivate: repo.IsPrivate,
|
|
|
|
}
|
|
|
|
|
2015-10-25 02:48:11 +08:00
|
|
|
pr.Index = pull.Index
|
2015-10-24 15:36:47 +08:00
|
|
|
if err = repo.SavePatch(pr.Index, patch); err != nil {
|
|
|
|
return fmt.Errorf("SavePatch: %v", err)
|
2015-10-19 07:30:39 +08:00
|
|
|
}
|
|
|
|
|
2015-10-24 15:36:47 +08:00
|
|
|
pr.BaseRepo = repo
|
|
|
|
if err = pr.testPatch(); err != nil {
|
|
|
|
return fmt.Errorf("testPatch: %v", err)
|
2015-10-19 07:30:39 +08:00
|
|
|
}
|
2015-10-24 15:36:47 +08:00
|
|
|
if pr.Status == PULL_REQUEST_STATUS_CHECKING {
|
|
|
|
pr.Status = PULL_REQUEST_STATUS_MERGEABLE
|
2015-10-19 07:30:39 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
pr.IssueID = pull.ID
|
|
|
|
if _, err = sess.Insert(pr); err != nil {
|
|
|
|
return fmt.Errorf("insert pull repo: %v", err)
|
|
|
|
}
|
|
|
|
|
2016-07-16 00:36:39 +08:00
|
|
|
if err = sess.Commit(); err != nil {
|
|
|
|
return fmt.Errorf("Commit: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = NotifyWatchers(act); err != nil {
|
|
|
|
log.Error(4, "NotifyWatchers: %v", err)
|
|
|
|
} else if err = pull.MailParticipants(); err != nil {
|
|
|
|
log.Error(4, "MailParticipants: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
2015-10-19 07:30:39 +08: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)
|
|
|
|
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)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if !has {
|
|
|
|
return nil, ErrPullRequestNotExist{0, 0, headRepoID, baseRepoID, headBranch, baseBranch}
|
|
|
|
}
|
|
|
|
|
|
|
|
return pr, nil
|
|
|
|
}
|
|
|
|
|
2015-10-24 15:36:47 +08:00
|
|
|
// GetUnmergedPullRequestsByHeadInfo returnss all pull requests that are open and has not been merged
|
|
|
|
// by given head information (repo and branch).
|
2015-10-25 02:48:11 +08:00
|
|
|
func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) {
|
2015-10-24 15:36:47 +08:00
|
|
|
prs := make([]*PullRequest, 0, 2)
|
|
|
|
return prs, x.Where("head_repo_id=? AND head_branch=? AND has_merged=? AND issue.is_closed=?",
|
2015-10-25 02:48:11 +08:00
|
|
|
repoID, branch, false, false).
|
|
|
|
Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
|
|
|
|
}
|
|
|
|
|
|
|
|
// 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)
|
|
|
|
return prs, x.Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
|
|
|
|
repoID, branch, false, false).
|
2015-10-24 15:36:47 +08:00
|
|
|
Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetPullRequestByID returns a pull request by given ID.
|
|
|
|
func GetPullRequestByID(id int64) (*PullRequest, error) {
|
|
|
|
pr := new(PullRequest)
|
|
|
|
has, err := x.Id(id).Get(pr)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if !has {
|
|
|
|
return nil, ErrPullRequestNotExist{id, 0, 0, 0, "", ""}
|
|
|
|
}
|
|
|
|
return pr, nil
|
|
|
|
}
|
|
|
|
|
2015-10-19 07:30:39 +08:00
|
|
|
// GetPullRequestByIssueID returns pull request by given issue ID.
|
2015-10-23 02:47:24 +08:00
|
|
|
func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
|
|
|
|
pr := &PullRequest{
|
|
|
|
IssueID: issueID,
|
|
|
|
}
|
|
|
|
has, err := x.Get(pr)
|
2015-10-19 07:30:39 +08:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if !has {
|
2015-10-23 02:47:24 +08:00
|
|
|
return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""}
|
2015-10-19 07:30:39 +08:00
|
|
|
}
|
|
|
|
return pr, nil
|
|
|
|
}
|
2015-10-24 15:36:47 +08:00
|
|
|
|
|
|
|
// Update updates all fields of pull request.
|
|
|
|
func (pr *PullRequest) Update() error {
|
|
|
|
_, err := x.Id(pr.ID).AllCols().Update(pr)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update updates specific fields of pull request.
|
|
|
|
func (pr *PullRequest) UpdateCols(cols ...string) error {
|
|
|
|
_, err := x.Id(pr.ID).Cols(cols...).Update(pr)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
var PullRequestQueue = NewUniqueQueue(setting.Repository.PullRequestQueueLength)
|
|
|
|
|
2015-10-25 15:10:22 +08:00
|
|
|
// UpdatePatch generates and saves a new patch.
|
2015-11-04 06:25:39 +08:00
|
|
|
func (pr *PullRequest) UpdatePatch() (err error) {
|
|
|
|
if err = pr.GetHeadRepo(); err != nil {
|
2015-10-25 15:10:22 +08: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 15:36:47 +08:00
|
|
|
}
|
|
|
|
|
2015-11-04 06:25:39 +08:00
|
|
|
if err = pr.GetBaseRepo(); err != nil {
|
2015-10-25 15:10:22 +08:00
|
|
|
return fmt.Errorf("GetBaseRepo: %v", err)
|
2015-10-24 15:36:47 +08:00
|
|
|
}
|
2015-10-25 15:10:22 +08:00
|
|
|
|
2015-11-27 06:33:45 +08:00
|
|
|
headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
|
2015-10-25 15:10:22 +08:00
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("OpenRepository: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-11-04 06:25:39 +08:00
|
|
|
// Add a temporary remote.
|
|
|
|
tmpRemote := com.ToStr(time.Now().UnixNano())
|
2015-12-10 09:46:05 +08:00
|
|
|
if err = headGitRepo.AddRemote(tmpRemote, RepoPath(pr.BaseRepo.MustOwner().Name, pr.BaseRepo.Name), true); err != nil {
|
2015-11-04 06:25:39 +08: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 15:10:22 +08: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 15:36:47 +08:00
|
|
|
}
|
|
|
|
|
2016-02-20 11:16:26 +08: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-05 02:00:42 +08:00
|
|
|
func (pr *PullRequest) PushToBaseRepo() (err error) {
|
2016-03-05 04:43:01 +08:00
|
|
|
log.Trace("PushToBaseRepo[%d]: pushing commits to base repo 'refs/pull/%d/head'", pr.BaseRepoID, pr.Index)
|
2016-02-05 02:00:42 +08:00
|
|
|
|
2016-02-20 11:16:26 +08:00
|
|
|
headRepoPath := pr.HeadRepo.RepoPath()
|
|
|
|
headGitRepo, err := git.OpenRepository(headRepoPath)
|
2016-02-05 02:00:42 +08:00
|
|
|
if err != nil {
|
2016-02-20 11:16:26 +08:00
|
|
|
return fmt.Errorf("OpenRepository: %v", err)
|
2016-02-05 02:00:42 +08:00
|
|
|
}
|
|
|
|
|
2016-02-20 11:16:26 +08: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-05 02:00:42 +08:00
|
|
|
}
|
|
|
|
// Make sure to remove the remote even if the push fails
|
2016-02-20 11:16:26 +08:00
|
|
|
defer headGitRepo.RemoveRemote(tmpRemoteName)
|
2016-02-05 02:00:42 +08:00
|
|
|
|
2016-03-05 05:53:03 +08:00
|
|
|
headFile := fmt.Sprintf("refs/pull/%d/head", pr.Index)
|
|
|
|
|
|
|
|
// Remove head in case there is a conflict.
|
|
|
|
os.Remove(path.Join(pr.BaseRepo.RepoPath(), headFile))
|
|
|
|
|
|
|
|
if err = git.Push(headRepoPath, tmpRemoteName, fmt.Sprintf("%s:%s", pr.HeadBranch, headFile)); err != nil {
|
2016-02-20 11:16:26 +08:00
|
|
|
return fmt.Errorf("Push: %v", err)
|
2016-02-05 02:00:42 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-10-25 15:10:22 +08:00
|
|
|
// AddToTaskQueue adds itself to pull request test task queue.
|
|
|
|
func (pr *PullRequest) AddToTaskQueue() {
|
2015-10-25 02:48:11 +08:00
|
|
|
go PullRequestQueue.AddFunc(pr.ID, func() {
|
|
|
|
pr.Status = PULL_REQUEST_STATUS_CHECKING
|
|
|
|
if err := pr.UpdateCols("status"); err != nil {
|
2015-10-25 15:10:22 +08:00
|
|
|
log.Error(5, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
|
2015-10-25 02:48:11 +08:00
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
2015-10-24 15:36:47 +08:00
|
|
|
|
2015-10-25 02:48:11 +08:00
|
|
|
func addHeadRepoTasks(prs []*PullRequest) {
|
2015-10-24 15:36:47 +08:00
|
|
|
for _, pr := range prs {
|
2015-10-25 02:48:11 +08:00
|
|
|
log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
|
2015-10-25 15:10:22 +08:00
|
|
|
if err := pr.UpdatePatch(); err != nil {
|
|
|
|
log.Error(4, "UpdatePatch: %v", err)
|
2015-10-24 15:36:47 +08:00
|
|
|
continue
|
2016-02-05 02:00:42 +08:00
|
|
|
} else if err := pr.PushToBaseRepo(); err != nil {
|
|
|
|
log.Error(4, "PushToBaseRepo: %v", err)
|
|
|
|
continue
|
2015-10-24 15:36:47 +08:00
|
|
|
}
|
|
|
|
|
2015-10-25 15:10:22 +08:00
|
|
|
pr.AddToTaskQueue()
|
2015-10-25 02:48:11 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch,
|
|
|
|
// and generate new patch for testing as needed.
|
|
|
|
func AddTestPullRequestTask(repoID int64, branch string) {
|
|
|
|
log.Trace("AddTestPullRequestTask[head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
|
|
|
|
prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "Find pull requests[head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
addHeadRepoTasks(prs)
|
|
|
|
|
|
|
|
log.Trace("AddTestPullRequestTask[base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
|
|
|
|
prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "Find pull requests[base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
for _, pr := range prs {
|
2015-10-25 15:10:22 +08:00
|
|
|
pr.AddToTaskQueue()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-28 19:07:16 +08:00
|
|
|
func ChangeUsernameInPullRequests(oldUserName, newUserName string) error {
|
2016-01-28 05:45:03 +08:00
|
|
|
pr := PullRequest{
|
2016-01-28 19:07:16 +08:00
|
|
|
HeadUserName: strings.ToLower(newUserName),
|
2016-01-28 05:45:03 +08:00
|
|
|
}
|
2016-01-28 19:07:16 +08:00
|
|
|
_, err := x.Cols("head_user_name").Where("head_user_name = ?", strings.ToLower(oldUserName)).Update(pr)
|
2016-01-28 05:45:03 +08:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-10-25 15:10:22 +08: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.
|
|
|
|
if pr.Status == PULL_REQUEST_STATUS_CHECKING {
|
|
|
|
pr.Status = PULL_REQUEST_STATUS_MERGEABLE
|
|
|
|
}
|
|
|
|
|
|
|
|
// Make sure there is no waiting test to process before levaing the checking status.
|
|
|
|
if !PullRequestQueue.Exist(pr.ID) {
|
|
|
|
if err := pr.UpdateCols("status"); err != nil {
|
|
|
|
log.Error(4, "Update[%d]: %v", pr.ID, err)
|
|
|
|
}
|
2015-10-24 15:36:47 +08: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{
|
|
|
|
Status: PULL_REQUEST_STATUS_CHECKING,
|
|
|
|
},
|
|
|
|
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.
|
|
|
|
for prID := range PullRequestQueue.Queue() {
|
|
|
|
log.Trace("TestPullRequests[%v]: processing test task", prID)
|
|
|
|
PullRequestQueue.Remove(prID)
|
|
|
|
|
|
|
|
pr, err := GetPullRequestByID(com.StrTo(prID).MustInt64())
|
|
|
|
if err != nil {
|
|
|
|
log.Error(4, "GetPullRequestByID[%d]: %v", prID, err)
|
|
|
|
continue
|
|
|
|
} else if err = pr.testPatch(); err != nil {
|
|
|
|
log.Error(4, "testPatch[%d]: %v", pr.ID, err)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
pr.checkAndUpdateStatus()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func InitTestPullRequests() {
|
|
|
|
go TestPullRequests()
|
|
|
|
}
|