diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-12-07 10:44:10 +0800 |
---|---|---|
committer | techknowlogick <techknowlogick@gitea.io> | 2019-12-06 21:44:10 -0500 |
commit | 82e0383d2104f454af5b3e0e768f0497113f3b13 (patch) | |
tree | 0bb945b408668867e24db2429cc7099d57eaa6f6 /services/pull | |
parent | 1583c48e3a89fcb9aeb81a57295982ee64d5859f (diff) | |
download | gitea-82e0383d2104f454af5b3e0e768f0497113f3b13.tar.gz gitea-82e0383d2104f454af5b3e0e768f0497113f3b13.zip |
Move some pull request functions from models to services (#9266)
* Move some pull request functions from models to services
* Fix test
Diffstat (limited to 'services/pull')
-rw-r--r-- | services/pull/check.go | 209 | ||||
-rw-r--r-- | services/pull/check_test.go | 34 | ||||
-rw-r--r-- | services/pull/main_test.go | 17 | ||||
-rw-r--r-- | services/pull/pull.go | 4 |
4 files changed, 262 insertions, 2 deletions
diff --git a/services/pull/check.go b/services/pull/check.go new file mode 100644 index 0000000000..0fd3e2a76f --- /dev/null +++ b/services/pull/check.go @@ -0,0 +1,209 @@ +// Copyright 2019 The Gitea 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 pull + +import ( + "fmt" + "io/ioutil" + "os" + "path/filepath" + "strconv" + "strings" + "time" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/sync" + "code.gitea.io/gitea/modules/timeutil" + + "github.com/unknwon/com" +) + +// pullRequestQueue represents a queue to handle update pull request tests +var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength) + +// AddToTaskQueue adds itself to pull request test task queue. +func AddToTaskQueue(pr *models.PullRequest) { + go pullRequestQueue.AddFunc(pr.ID, func() { + pr.Status = models.PullRequestStatusChecking + if err := pr.UpdateCols("status"); err != nil { + log.Error("AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err) + } + }) +} + +// checkAndUpdateStatus checks if pull request is possible to leaving checking status, +// and set to be either conflict or mergeable. +func checkAndUpdateStatus(pr *models.PullRequest) { + // Status is not changed to conflict means mergeable. + if pr.Status == models.PullRequestStatusChecking { + pr.Status = models.PullRequestStatusMergeable + } + + // Make sure there is no waiting test to process before leaving the checking status. + if !pullRequestQueue.Exist(pr.ID) { + if err := pr.UpdateCols("status, conflicted_files"); err != nil { + log.Error("Update[%d]: %v", pr.ID, err) + } + } +} + +// getMergeCommit checks if a pull request got merged +// Returns the git.Commit of the pull request if merged +func getMergeCommit(pr *models.PullRequest) (*git.Commit, error) { + if pr.BaseRepo == nil { + var err error + pr.BaseRepo, err = models.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) + + headFile := pr.GetGitRefName() + + // Check if a pull request is merged into BaseBranch + _, err := git.NewCommand("merge-base", "--is-ancestor", headFile, pr.BaseBranch).RunInDirWithEnv(pr.BaseRepo.RepoPath(), []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()}) + if err != nil { + // Errors are signaled by a non-zero status that is not 1 + if strings.Contains(err.Error(), "exit status 1") { + return nil, nil + } + return nil, fmt.Errorf("git merge-base --is-ancestor: %v", err) + } + + 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 + + // Get the commit from BaseBranch where the pull request got merged + mergeCommit, err := git.NewCommand("rev-list", "--ancestry-path", "--merges", "--reverse", cmd).RunInDirWithEnv("", []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()}) + if err != nil { + return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v", err) + } else if len(mergeCommit) < 40 { + // PR was fast-forwarded, so just use last commit of PR + mergeCommit = commitID[:40] + } + + gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath()) + if err != nil { + return nil, fmt.Errorf("OpenRepository: %v", err) + } + defer gitRepo.Close() + + commit, err := gitRepo.GetCommit(mergeCommit[:40]) + if err != nil { + return nil, fmt.Errorf("GetCommit: %v", err) + } + + return commit, nil +} + +// manuallyMerged checks if a pull request got manually merged +// When a pull request got manually merged mark the pull request as merged +func manuallyMerged(pr *models.PullRequest) bool { + commit, err := getMergeCommit(pr) + if err != nil { + log.Error("PullRequest[%d].getMergeCommit: %v", pr.ID, err) + return false + } + if commit != nil { + pr.MergedCommitID = commit.ID.String() + pr.MergedUnix = timeutil.TimeStamp(commit.Author.When.Unix()) + pr.Status = models.PullRequestStatusManuallyMerged + merger, _ := models.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(); err != nil { + log.Error("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("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 +} + +// TestPullRequests checks and tests untested patches of pull requests. +// TODO: test more pull requests at same time. +func TestPullRequests() { + prs, err := models.GetPullRequestsByCheckStatus(models.PullRequestStatusChecking) + if err != nil { + log.Error("Find Checking PRs: %v", err) + return + } + + var checkedPRs = make(map[int64]struct{}) + + // Update pull request status. + for _, pr := range prs { + checkedPRs[pr.ID] = struct{}{} + if err := pr.GetBaseRepo(); err != nil { + log.Error("GetBaseRepo: %v", err) + continue + } + if manuallyMerged(pr) { + continue + } + if err := pr.TestPatch(); err != nil { + log.Error("testPatch: %v", err) + continue + } + + checkAndUpdateStatus(pr) + } + + // Start listening on new test requests. + for prID := range pullRequestQueue.Queue() { + log.Trace("TestPullRequests[%v]: processing test task", prID) + pullRequestQueue.Remove(prID) + + id := com.StrTo(prID).MustInt64() + if _, ok := checkedPRs[id]; ok { + continue + } + + pr, err := models.GetPullRequestByID(id) + if err != nil { + log.Error("GetPullRequestByID[%s]: %v", prID, err) + continue + } else if manuallyMerged(pr) { + continue + } else if err = pr.TestPatch(); err != nil { + log.Error("testPatch[%d]: %v", pr.ID, err) + continue + } + + checkAndUpdateStatus(pr) + } +} + +// Init runs the task queue to test all the checking status pull requests +func Init() { + go TestPullRequests() +} diff --git a/services/pull/check_test.go b/services/pull/check_test.go new file mode 100644 index 0000000000..48a7774a61 --- /dev/null +++ b/services/pull/check_test.go @@ -0,0 +1,34 @@ +// Copyright 2019 The Gitea 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 pull + +import ( + "strconv" + "testing" + "time" + + "code.gitea.io/gitea/models" + + "github.com/stretchr/testify/assert" +) + +func TestPullRequest_AddToTaskQueue(t *testing.T) { + assert.NoError(t, models.PrepareTestDatabase()) + + pr := models.AssertExistsAndLoadBean(t, &models.PullRequest{ID: 1}).(*models.PullRequest) + AddToTaskQueue(pr) + + select { + case id := <-pullRequestQueue.Queue(): + assert.EqualValues(t, strconv.FormatInt(pr.ID, 10), id) + case <-time.After(time.Second): + assert.Fail(t, "Timeout: nothing was added to pullRequestQueue") + } + + assert.True(t, pullRequestQueue.Exist(pr.ID)) + pr = models.AssertExistsAndLoadBean(t, &models.PullRequest{ID: 1}).(*models.PullRequest) + assert.Equal(t, models.PullRequestStatusChecking, pr.Status) +} diff --git a/services/pull/main_test.go b/services/pull/main_test.go new file mode 100644 index 0000000000..6c49e8fbf2 --- /dev/null +++ b/services/pull/main_test.go @@ -0,0 +1,17 @@ +// Copyright 2019 The Gitea 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 pull + +import ( + "path/filepath" + "testing" + + "code.gitea.io/gitea/models" +) + +func TestMain(m *testing.M) { + models.MainTest(m, filepath.Join("..", "..")) +} diff --git a/services/pull/pull.go b/services/pull/pull.go index 7a9c2ef9ad..2650dacc11 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -64,7 +64,7 @@ func addHeadRepoTasks(prs []*models.PullRequest) { continue } - pr.AddToTaskQueue() + AddToTaskQueue(pr) } } @@ -103,6 +103,6 @@ func AddTestPullRequestTask(doer *models.User, repoID int64, branch string, isSy return } for _, pr := range prs { - pr.AddToTaskQueue() + AddToTaskQueue(pr) } } |