diff options
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 558 |
1 files changed, 558 insertions, 0 deletions
diff --git a/models/pull.go b/models/pull.go new file mode 100644 index 00000000..5c7d4a3f --- /dev/null +++ b/models/pull.go @@ -0,0 +1,558 @@ +// 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" + + "github.com/gogits/gogs/modules/git" + "github.com/gogits/gogs/modules/log" + "github.com/gogits/gogs/modules/process" + "github.com/gogits/gogs/modules/setting" +) + +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 + + HeadRepoID int64 + HeadRepo *Repository `xorm:"-"` + BaseRepoID int64 + BaseRepo *Repository `xorm:"-"` + HeadUserName string + HeadBranch string + BaseBranch string + MergeBase string `xorm:"VARCHAR(40)"` + + HasMerged bool + MergedCommitID string `xorm:"VARCHAR(40)"` + Merged time.Time + MergerID int64 + Merger *User `xorm:"-"` +} + +// Note: don't try to get Pull because will end up recursive querying. +func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) { + switch colName { + case "merged": + if !pr.HasMerged { + return + } + + pr.Merged = regulateTimeZone(pr.Merged) + } +} + +func (pr *PullRequest) getHeadRepo(e Engine) (err error) { + pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID) + if err != nil && !IsErrRepoNotExist(err) { + return fmt.Errorf("getRepositoryByID(head): %v", err) + } + return nil +} + +func (pr *PullRequest) GetHeadRepo() (err error) { + return pr.getHeadRepo(x) +} + +func (pr *PullRequest) GetBaseRepo() (err error) { + if pr.BaseRepo != nil { + return nil + } + + pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID) + if err != nil { + return fmt.Errorf("GetRepositoryByID(base): %v", err) + } + 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 +} + +// 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) { + sess := x.NewSession() + defer sessionRelease(sess) + if err = sess.Begin(); err != nil { + return err + } + + if err = pr.Issue.changeStatus(sess, doer, true); err != nil { + return fmt.Errorf("Issue.changeStatus: %v", err) + } + + if err = pr.getHeadRepo(sess); err != nil { + return fmt.Errorf("getHeadRepo: %v", err) + } + + headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name) + headGitRepo, err := git.OpenRepository(headRepoPath) + if err != nil { + return fmt.Errorf("OpenRepository: %v", err) + } + pr.MergedCommitID, err = headGitRepo.GetCommitIdOfBranch(pr.HeadBranch) + if err != nil { + return fmt.Errorf("GetCommitIdOfBranch: %v", err) + } + + 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. + tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git") + os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm) + defer os.RemoveAll(path.Dir(tmpBasePath)) + + var stderr string + if _, stderr, err = process.ExecTimeout(5*time.Minute, + fmt.Sprintf("PullRequest.Merge(git clone): %s", tmpBasePath), + "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, + fmt.Sprintf("PullRequest.Merge(git checkout): %s", tmpBasePath), + "git", "checkout", pr.BaseBranch); err != nil { + return fmt.Errorf("git checkout: %s", stderr) + } + + // Add head repo remote. + if _, stderr, err = process.ExecDir(-1, tmpBasePath, + fmt.Sprintf("PullRequest.Merge(git remote add): %s", tmpBasePath), + "git", "remote", "add", "head_repo", headRepoPath); err != nil { + return fmt.Errorf("git remote add[%s -> %s]: %s", headRepoPath, tmpBasePath, stderr) + } + + // Merge commits. + if _, stderr, err = process.ExecDir(-1, tmpBasePath, + fmt.Sprintf("PullRequest.Merge(git fetch): %s", tmpBasePath), + "git", "fetch", "head_repo"); err != nil { + return fmt.Errorf("git fetch[%s -> %s]: %s", headRepoPath, tmpBasePath, stderr) + } + + if _, stderr, err = process.ExecDir(-1, tmpBasePath, + fmt.Sprintf("PullRequest.Merge(git merge): %s", tmpBasePath), + "git", "merge", "--no-ff", "-m", + fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch), + "head_repo/"+pr.HeadBranch); err != nil { + return fmt.Errorf("git merge[%s]: %s", tmpBasePath, stderr) + } + + // Push back to upstream. + if _, stderr, err = process.ExecDir(-1, tmpBasePath, + fmt.Sprintf("PullRequest.Merge(git push): %s", tmpBasePath), + "git", "push", baseGitRepo.Path, pr.BaseBranch); err != nil { + return fmt.Errorf("git push: %s", stderr) + } + + return sess.Commit() +} + +// patchConflicts is a list of conflit description from Git. +var patchConflicts = []string{ + "patch does not apply", + "already exists in working directory", + "unrecognized input", +} + +// testPatch checks if patch can be merged to base repository without conflit. +// FIXME: make a mechanism to clean up stable local copies. +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) + } + + // 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 + } + + log.Trace("PullRequest[%d].testPatch(patchPath): %s", pr.ID, patchPath) + + if err := pr.BaseRepo.UpdateLocalCopy(); err != nil { + return fmt.Errorf("UpdateLocalCopy: %v", err) + } + + // Checkout base branch. + _, stderr, err := process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(), + fmt.Sprintf("PullRequest.Merge(git checkout): %s", pr.BaseRepo.ID), + "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(), + fmt.Sprintf("testPatch(git apply --check): %d", pr.BaseRepo.ID), + "git", "apply", "--check", patchPath) + if err != nil { + for i := range patchConflicts { + if strings.Contains(stderr, patchConflicts[i]) { + log.Trace("PullRequest[%d].testPatch(apply): has conflit", pr.ID) + fmt.Println(stderr) + pr.Status = PULL_REQUEST_STATUS_CONFLICT + return nil + } + } + + return fmt.Errorf("git apply --check: %v - %s", err, stderr) + } + return nil +} + +// 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, + OpType: CREATE_PULL_REQUEST, + Content: fmt.Sprintf("%d|%s", pull.Index, pull.Name), + RepoID: repo.ID, + RepoUserName: repo.Owner.Name, + RepoName: repo.Name, + IsPrivate: repo.IsPrivate, + } + if err = notifyWatchers(sess, act); err != nil { + return err + } + + pr.Index = pull.Index + if err = repo.SavePatch(pr.Index, patch); err != nil { + return fmt.Errorf("SavePatch: %v", err) + } + + pr.BaseRepo = repo + if err = pr.testPatch(); err != nil { + return fmt.Errorf("testPatch: %v", err) + } + if pr.Status == PULL_REQUEST_STATUS_CHECKING { + pr.Status = PULL_REQUEST_STATUS_MERGEABLE + } + + pr.IssueID = pull.ID + if _, err = sess.Insert(pr); err != nil { + return fmt.Errorf("insert pull repo: %v", err) + } + + return sess.Commit() +} + +// 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 +} + +// GetUnmergedPullRequestsByHeadInfo returnss all pull requests that are open and has not been merged +// by given head information (repo and branch). +func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) { + prs := make([]*PullRequest, 0, 2) + 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) +} + +// 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). + 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 +} + +// GetPullRequestByIssueID returns pull request by given issue ID. +func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) { + pr := &PullRequest{ + IssueID: issueID, + } + has, err := x.Get(pr) + if err != nil { + return nil, err + } else if !has { + return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""} + } + return pr, nil +} + +// 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) + +// UpdatePatch generates and saves a new patch. +func (pr *PullRequest) UpdatePatch() (err error) { + if err = pr.GetHeadRepo(); err != nil { + return fmt.Errorf("GetHeadRepo: %v", err) + } else if pr.HeadRepo == nil { + log.Trace("PullRequest[%d].UpdatePatch: ignored cruppted data", pr.ID) + return nil + } + + if err = pr.GetBaseRepo(); err != nil { + return fmt.Errorf("GetBaseRepo: %v", err) + } else if err = pr.BaseRepo.GetOwner(); err != nil { + return fmt.Errorf("GetOwner: %v", err) + } + + headRepoPath, err := pr.HeadRepo.RepoPath() + if err != nil { + return fmt.Errorf("HeadRepo.RepoPath: %v", err) + } + + headGitRepo, err := git.OpenRepository(headRepoPath) + if err != nil { + return fmt.Errorf("OpenRepository: %v", err) + } + + // Add a temporary remote. + tmpRemote := com.ToStr(time.Now().UnixNano()) + if err = headGitRepo.AddRemote(tmpRemote, RepoPath(pr.BaseRepo.Owner.Name, pr.BaseRepo.Name)); err != nil { + 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) + } + + 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 +} + +// AddToTaskQueue adds itself to pull request test task queue. +func (pr *PullRequest) AddToTaskQueue() { + go PullRequestQueue.AddFunc(pr.ID, func() { + pr.Status = PULL_REQUEST_STATUS_CHECKING + if err := pr.UpdateCols("status"); err != nil { + log.Error(5, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err) + } + }) +} + +func addHeadRepoTasks(prs []*PullRequest) { + for _, pr := range prs { + log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID) + if err := pr.UpdatePatch(); err != nil { + log.Error(4, "UpdatePatch: %v", err) + continue + } + + pr.AddToTaskQueue() + } +} + +// 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 { + pr.AddToTaskQueue() + } +} + +// 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) + } + } +} + +// 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() +} |