Платформа ЦРНП "Мирокод" для разработки проектов
https://git.mirocod.ru
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
457 lines
13 KiB
457 lines
13 KiB
// 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 ( |
|
"bufio" |
|
"bytes" |
|
"context" |
|
"fmt" |
|
"os" |
|
"path" |
|
"strings" |
|
"time" |
|
|
|
"code.gitea.io/gitea/models" |
|
"code.gitea.io/gitea/modules/git" |
|
"code.gitea.io/gitea/modules/graceful" |
|
"code.gitea.io/gitea/modules/log" |
|
"code.gitea.io/gitea/modules/notification" |
|
issue_service "code.gitea.io/gitea/services/issue" |
|
|
|
"github.com/unknwon/com" |
|
) |
|
|
|
// NewPullRequest creates new pull request with labels for repository. |
|
func NewPullRequest(repo *models.Repository, pull *models.Issue, labelIDs []int64, uuids []string, pr *models.PullRequest, assigneeIDs []int64) error { |
|
if err := TestPatch(pr); err != nil { |
|
return err |
|
} |
|
|
|
if err := models.NewPullRequest(repo, pull, labelIDs, uuids, pr); err != nil { |
|
return err |
|
} |
|
|
|
for _, assigneeID := range assigneeIDs { |
|
if err := issue_service.AddAssigneeIfNotAssigned(pull, pull.Poster, assigneeID); err != nil { |
|
return err |
|
} |
|
} |
|
|
|
pr.Issue = pull |
|
pull.PullRequest = pr |
|
|
|
if err := PushToBaseRepo(pr); err != nil { |
|
return err |
|
} |
|
|
|
notification.NotifyNewPullRequest(pr) |
|
|
|
return nil |
|
} |
|
|
|
// ChangeTargetBranch changes the target branch of this pull request, as the given user. |
|
func ChangeTargetBranch(pr *models.PullRequest, doer *models.User, targetBranch string) (err error) { |
|
// Current target branch is already the same |
|
if pr.BaseBranch == targetBranch { |
|
return nil |
|
} |
|
|
|
if pr.Issue.IsClosed { |
|
return models.ErrIssueIsClosed{ |
|
ID: pr.Issue.ID, |
|
RepoID: pr.Issue.RepoID, |
|
Index: pr.Issue.Index, |
|
} |
|
} |
|
|
|
if pr.HasMerged { |
|
return models.ErrPullRequestHasMerged{ |
|
ID: pr.ID, |
|
IssueID: pr.Index, |
|
HeadRepoID: pr.HeadRepoID, |
|
BaseRepoID: pr.BaseRepoID, |
|
HeadBranch: pr.HeadBranch, |
|
BaseBranch: pr.BaseBranch, |
|
} |
|
} |
|
|
|
// Check if branches are equal |
|
branchesEqual, err := pr.IsHeadEqualWithBranch(targetBranch) |
|
if err != nil { |
|
return err |
|
} |
|
if branchesEqual { |
|
return models.ErrBranchesEqual{ |
|
HeadBranchName: pr.HeadBranch, |
|
BaseBranchName: targetBranch, |
|
} |
|
} |
|
|
|
// Check if pull request for the new target branch already exists |
|
existingPr, err := models.GetUnmergedPullRequest(pr.HeadRepoID, pr.BaseRepoID, pr.HeadBranch, targetBranch) |
|
if existingPr != nil { |
|
return models.ErrPullRequestAlreadyExists{ |
|
ID: existingPr.ID, |
|
IssueID: existingPr.Index, |
|
HeadRepoID: existingPr.HeadRepoID, |
|
BaseRepoID: existingPr.BaseRepoID, |
|
HeadBranch: existingPr.HeadBranch, |
|
BaseBranch: existingPr.BaseBranch, |
|
} |
|
} |
|
if err != nil && !models.IsErrPullRequestNotExist(err) { |
|
return err |
|
} |
|
|
|
// Set new target branch |
|
oldBranch := pr.BaseBranch |
|
pr.BaseBranch = targetBranch |
|
|
|
// Refresh patch |
|
if err := TestPatch(pr); err != nil { |
|
return err |
|
} |
|
|
|
// Update target branch, PR diff and status |
|
// This is the same as checkAndUpdateStatus in check service, but also updates base_branch |
|
if pr.Status == models.PullRequestStatusChecking { |
|
pr.Status = models.PullRequestStatusMergeable |
|
} |
|
if err := pr.UpdateCols("status, conflicted_files, base_branch"); err != nil { |
|
return err |
|
} |
|
|
|
// Create comment |
|
options := &models.CreateCommentOptions{ |
|
Type: models.CommentTypeChangeTargetBranch, |
|
Doer: doer, |
|
Repo: pr.Issue.Repo, |
|
Issue: pr.Issue, |
|
OldRef: oldBranch, |
|
NewRef: targetBranch, |
|
} |
|
if _, err = models.CreateComment(options); err != nil { |
|
return fmt.Errorf("CreateChangeTargetBranchComment: %v", err) |
|
} |
|
|
|
return nil |
|
} |
|
|
|
func checkForInvalidation(requests models.PullRequestList, repoID int64, doer *models.User, branch string) error { |
|
repo, err := models.GetRepositoryByID(repoID) |
|
if err != nil { |
|
return fmt.Errorf("GetRepositoryByID: %v", err) |
|
} |
|
gitRepo, err := git.OpenRepository(repo.RepoPath()) |
|
if err != nil { |
|
return fmt.Errorf("git.OpenRepository: %v", err) |
|
} |
|
go func() { |
|
// FIXME: graceful: We need to tell the manager we're doing something... |
|
err := requests.InvalidateCodeComments(doer, gitRepo, branch) |
|
if err != nil { |
|
log.Error("PullRequestList.InvalidateCodeComments: %v", err) |
|
} |
|
gitRepo.Close() |
|
}() |
|
return nil |
|
} |
|
|
|
func addHeadRepoTasks(prs []*models.PullRequest) { |
|
for _, pr := range prs { |
|
log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID) |
|
if err := PushToBaseRepo(pr); err != nil { |
|
log.Error("PushToBaseRepo: %v", err) |
|
continue |
|
} |
|
|
|
AddToTaskQueue(pr) |
|
} |
|
} |
|
|
|
// AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch, |
|
// and generate new patch for testing as needed. |
|
func AddTestPullRequestTask(doer *models.User, repoID int64, branch string, isSync bool, oldCommitID, newCommitID string) { |
|
log.Trace("AddTestPullRequestTask [head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch) |
|
graceful.GetManager().RunWithShutdownContext(func(ctx context.Context) { |
|
// There is no sensible way to shut this down ":-(" |
|
// If you don't let it run all the way then you will lose data |
|
// FIXME: graceful: AddTestPullRequestTask needs to become a queue! |
|
|
|
prs, err := models.GetUnmergedPullRequestsByHeadInfo(repoID, branch) |
|
if err != nil { |
|
log.Error("Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err) |
|
return |
|
} |
|
|
|
if isSync { |
|
requests := models.PullRequestList(prs) |
|
if err = requests.LoadAttributes(); err != nil { |
|
log.Error("PullRequestList.LoadAttributes: %v", err) |
|
} |
|
if invalidationErr := checkForInvalidation(requests, repoID, doer, branch); invalidationErr != nil { |
|
log.Error("checkForInvalidation: %v", invalidationErr) |
|
} |
|
if err == nil { |
|
for _, pr := range prs { |
|
if newCommitID != "" && newCommitID != git.EmptySHA { |
|
changed, err := checkIfPRContentChanged(pr, oldCommitID, newCommitID) |
|
if err != nil { |
|
log.Error("checkIfPRContentChanged: %v", err) |
|
} |
|
if changed { |
|
// Mark old reviews as stale if diff to mergebase has changed |
|
if err := models.MarkReviewsAsStale(pr.IssueID); err != nil { |
|
log.Error("MarkReviewsAsStale: %v", err) |
|
} |
|
} |
|
if err := models.MarkReviewsAsNotStale(pr.IssueID, newCommitID); err != nil { |
|
log.Error("MarkReviewsAsNotStale: %v", err) |
|
} |
|
} |
|
|
|
pr.Issue.PullRequest = pr |
|
notification.NotifyPullRequestSynchronized(doer, pr) |
|
} |
|
} |
|
} |
|
|
|
addHeadRepoTasks(prs) |
|
|
|
log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch) |
|
prs, err = models.GetUnmergedPullRequestsByBaseInfo(repoID, branch) |
|
if err != nil { |
|
log.Error("Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err) |
|
return |
|
} |
|
for _, pr := range prs { |
|
AddToTaskQueue(pr) |
|
} |
|
}) |
|
} |
|
|
|
// checkIfPRContentChanged checks if diff to target branch has changed by push |
|
// A commit can be considered to leave the PR untouched if the patch/diff with its merge base is unchanged |
|
func checkIfPRContentChanged(pr *models.PullRequest, oldCommitID, newCommitID string) (hasChanged bool, err error) { |
|
|
|
if err = pr.GetHeadRepo(); err != nil { |
|
return false, fmt.Errorf("GetHeadRepo: %v", err) |
|
} else if pr.HeadRepo == nil { |
|
// corrupt data assumed changed |
|
return true, nil |
|
} |
|
|
|
if err = pr.GetBaseRepo(); err != nil { |
|
return false, fmt.Errorf("GetBaseRepo: %v", err) |
|
} |
|
|
|
headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath()) |
|
if err != nil { |
|
return false, fmt.Errorf("OpenRepository: %v", err) |
|
} |
|
defer headGitRepo.Close() |
|
|
|
// Add a temporary remote. |
|
tmpRemote := "checkIfPRContentChanged-" + com.ToStr(time.Now().UnixNano()) |
|
if err = headGitRepo.AddRemote(tmpRemote, pr.BaseRepo.RepoPath(), true); err != nil { |
|
return false, fmt.Errorf("AddRemote: %s/%s-%s: %v", pr.HeadRepo.OwnerName, pr.HeadRepo.Name, tmpRemote, err) |
|
} |
|
defer func() { |
|
if err := headGitRepo.RemoveRemote(tmpRemote); err != nil { |
|
log.Error("checkIfPRContentChanged: RemoveRemote: %s/%s-%s: %v", pr.HeadRepo.OwnerName, pr.HeadRepo.Name, tmpRemote, err) |
|
} |
|
}() |
|
// To synchronize repo and get a base ref |
|
_, base, err := headGitRepo.GetMergeBase(tmpRemote, pr.BaseBranch, pr.HeadBranch) |
|
if err != nil { |
|
return false, fmt.Errorf("GetMergeBase: %v", err) |
|
} |
|
|
|
diffBefore := &bytes.Buffer{} |
|
diffAfter := &bytes.Buffer{} |
|
if err := headGitRepo.GetDiffFromMergeBase(base, oldCommitID, diffBefore); err != nil { |
|
// If old commit not found, assume changed. |
|
log.Debug("GetDiffFromMergeBase: %v", err) |
|
return true, nil |
|
} |
|
if err := headGitRepo.GetDiffFromMergeBase(base, newCommitID, diffAfter); err != nil { |
|
// New commit should be found |
|
return false, fmt.Errorf("GetDiffFromMergeBase: %v", err) |
|
} |
|
|
|
diffBeforeLines := bufio.NewScanner(diffBefore) |
|
diffAfterLines := bufio.NewScanner(diffAfter) |
|
|
|
for diffBeforeLines.Scan() && diffAfterLines.Scan() { |
|
if strings.HasPrefix(diffBeforeLines.Text(), "index") && strings.HasPrefix(diffAfterLines.Text(), "index") { |
|
// file hashes can change without the diff changing |
|
continue |
|
} else if strings.HasPrefix(diffBeforeLines.Text(), "@@") && strings.HasPrefix(diffAfterLines.Text(), "@@") { |
|
// the location of the difference may change |
|
continue |
|
} else if !bytes.Equal(diffBeforeLines.Bytes(), diffAfterLines.Bytes()) { |
|
return true, nil |
|
} |
|
} |
|
|
|
if diffBeforeLines.Scan() || diffAfterLines.Scan() { |
|
// Diffs not of equal length |
|
return true, nil |
|
} |
|
|
|
return false, nil |
|
} |
|
|
|
// PushToBaseRepo pushes commits from branches of head repository to |
|
// corresponding branches of base repository. |
|
// FIXME: Only push branches that are actually updates? |
|
func PushToBaseRepo(pr *models.PullRequest) (err error) { |
|
log.Trace("PushToBaseRepo[%d]: pushing commits to base repo '%s'", pr.BaseRepoID, pr.GetGitRefName()) |
|
|
|
// Clone base repo. |
|
tmpBasePath, err := models.CreateTemporaryPath("pull") |
|
if err != nil { |
|
log.Error("CreateTemporaryPath: %v", err) |
|
return err |
|
} |
|
defer func() { |
|
err := models.RemoveTemporaryPath(tmpBasePath) |
|
if err != nil { |
|
log.Error("Error whilst removing temporary path: %s Error: %v", tmpBasePath, err) |
|
} |
|
}() |
|
|
|
if err := pr.LoadHeadRepo(); err != nil { |
|
log.Error("Unable to load head repository for PR[%d] Error: %v", pr.ID, err) |
|
return err |
|
} |
|
headRepoPath := pr.HeadRepo.RepoPath() |
|
|
|
if err := git.Clone(headRepoPath, tmpBasePath, git.CloneRepoOptions{ |
|
Bare: true, |
|
Shared: true, |
|
Branch: pr.HeadBranch, |
|
Quiet: true, |
|
}); err != nil { |
|
log.Error("git clone tmpBasePath: %v", err) |
|
return err |
|
} |
|
gitRepo, err := git.OpenRepository(tmpBasePath) |
|
if err != nil { |
|
return fmt.Errorf("OpenRepository: %v", err) |
|
} |
|
|
|
if err := pr.LoadBaseRepo(); err != nil { |
|
log.Error("Unable to load base repository for PR[%d] Error: %v", pr.ID, err) |
|
return err |
|
} |
|
if err := gitRepo.AddRemote("base", pr.BaseRepo.RepoPath(), false); err != nil { |
|
return fmt.Errorf("tmpGitRepo.AddRemote: %v", err) |
|
} |
|
defer gitRepo.Close() |
|
|
|
headFile := pr.GetGitRefName() |
|
|
|
// Remove head in case there is a conflict. |
|
file := path.Join(pr.BaseRepo.RepoPath(), headFile) |
|
|
|
_ = os.Remove(file) |
|
|
|
if err = pr.LoadIssue(); err != nil { |
|
return fmt.Errorf("unable to load issue %d for pr %d: %v", pr.IssueID, pr.ID, err) |
|
} |
|
if err = pr.Issue.LoadPoster(); err != nil { |
|
return fmt.Errorf("unable to load poster %d for pr %d: %v", pr.Issue.PosterID, pr.ID, err) |
|
} |
|
|
|
if err = git.Push(tmpBasePath, git.PushOptions{ |
|
Remote: "base", |
|
Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile), |
|
Force: true, |
|
// Use InternalPushingEnvironment here because we know that pre-receive and post-receive do not run on a refs/pulls/... |
|
Env: models.InternalPushingEnvironment(pr.Issue.Poster, pr.BaseRepo), |
|
}); err != nil { |
|
return fmt.Errorf("Push: %s:%s %s:%s %v", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), headFile, err) |
|
} |
|
|
|
return nil |
|
} |
|
|
|
type errlist []error |
|
|
|
func (errs errlist) Error() string { |
|
if len(errs) > 0 { |
|
var buf strings.Builder |
|
for i, err := range errs { |
|
if i > 0 { |
|
buf.WriteString(", ") |
|
} |
|
buf.WriteString(err.Error()) |
|
} |
|
return buf.String() |
|
} |
|
return "" |
|
} |
|
|
|
// CloseBranchPulls close all the pull requests who's head branch is the branch |
|
func CloseBranchPulls(doer *models.User, repoID int64, branch string) error { |
|
prs, err := models.GetUnmergedPullRequestsByHeadInfo(repoID, branch) |
|
if err != nil { |
|
return err |
|
} |
|
|
|
prs2, err := models.GetUnmergedPullRequestsByBaseInfo(repoID, branch) |
|
if err != nil { |
|
return err |
|
} |
|
|
|
prs = append(prs, prs2...) |
|
if err := models.PullRequestList(prs).LoadAttributes(); err != nil { |
|
return err |
|
} |
|
|
|
var errs errlist |
|
for _, pr := range prs { |
|
if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrPullWasClosed(err) { |
|
errs = append(errs, err) |
|
} |
|
} |
|
if len(errs) > 0 { |
|
return errs |
|
} |
|
return nil |
|
} |
|
|
|
// CloseRepoBranchesPulls close all pull requests which head branches are in the given repository |
|
func CloseRepoBranchesPulls(doer *models.User, repo *models.Repository) error { |
|
branches, err := git.GetBranchesByPath(repo.RepoPath()) |
|
if err != nil { |
|
return err |
|
} |
|
|
|
var errs errlist |
|
for _, branch := range branches { |
|
prs, err := models.GetUnmergedPullRequestsByHeadInfo(repo.ID, branch.Name) |
|
if err != nil { |
|
return err |
|
} |
|
|
|
if err = models.PullRequestList(prs).LoadAttributes(); err != nil { |
|
return err |
|
} |
|
|
|
for _, pr := range prs { |
|
if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrPullWasClosed(err) { |
|
errs = append(errs, err) |
|
} |
|
} |
|
} |
|
|
|
if len(errs) > 0 { |
|
return errs |
|
} |
|
return nil |
|
}
|
|
|