mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 13:01:15 +00:00
3ba127c618
Fix #29997 --- Conflict resolution: - Use Forgejo's user blocking feature (services/issue/issue.go) - Trivial (tests/integration/pull_review_test.go) Ref: https://codeberg.org/forgejo/forgejo/pulls/2872 (cherry picked from commit 475b6e839caa88994318f905f0965c3b418f876a)
148 lines
3.9 KiB
Go
148 lines
3.9 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package issue
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
org_model "code.gitea.io/gitea/models/organization"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
)
|
|
|
|
func getMergeBase(repo *git.Repository, pr *issues_model.PullRequest, baseBranch, headBranch string) (string, error) {
|
|
// Add a temporary remote
|
|
tmpRemote := fmt.Sprintf("mergebase-%d-%d", pr.ID, time.Now().UnixNano())
|
|
if err := repo.AddRemote(tmpRemote, repo.Path, false); err != nil {
|
|
return "", fmt.Errorf("AddRemote: %w", err)
|
|
}
|
|
defer func() {
|
|
if err := repo.RemoveRemote(tmpRemote); err != nil {
|
|
log.Error("getMergeBase: RemoveRemote: %v", err)
|
|
}
|
|
}()
|
|
|
|
mergeBase, _, err := repo.GetMergeBase(tmpRemote, baseBranch, headBranch)
|
|
return mergeBase, err
|
|
}
|
|
|
|
type ReviewRequestNotifier struct {
|
|
Comment *issues_model.Comment
|
|
IsAdd bool
|
|
Reviwer *user_model.User
|
|
ReviewTeam *org_model.Team
|
|
}
|
|
|
|
func PullRequestCodeOwnersReview(ctx context.Context, issue *issues_model.Issue, pr *issues_model.PullRequest) ([]*ReviewRequestNotifier, error) {
|
|
files := []string{"CODEOWNERS", "docs/CODEOWNERS", ".gitea/CODEOWNERS"}
|
|
|
|
if pr.IsWorkInProgress(ctx) {
|
|
return nil, nil
|
|
}
|
|
|
|
if err := pr.LoadHeadRepo(ctx); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if pr.HeadRepo.IsFork {
|
|
return nil, nil
|
|
}
|
|
|
|
if err := pr.LoadBaseRepo(ctx); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
repo, err := gitrepo.OpenRepository(ctx, pr.BaseRepo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer repo.Close()
|
|
|
|
commit, err := repo.GetBranchCommit(pr.BaseRepo.DefaultBranch)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var data string
|
|
for _, file := range files {
|
|
if blob, err := commit.GetBlobByPath(file); err == nil {
|
|
data, err = blob.GetBlobContent(setting.UI.MaxDisplayFileSize)
|
|
if err == nil {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
rules, _ := issues_model.GetCodeOwnersFromContent(ctx, data)
|
|
|
|
// get the mergebase
|
|
mergeBase, err := getMergeBase(repo, pr, git.BranchPrefix+pr.BaseBranch, pr.GetGitRefName())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// https://github.com/go-gitea/gitea/issues/29763, we need to get the files changed
|
|
// between the merge base and the head commit but not the base branch and the head commit
|
|
changedFiles, err := repo.GetFilesChangedBetween(mergeBase, pr.GetGitRefName())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
uniqUsers := make(map[int64]*user_model.User)
|
|
uniqTeams := make(map[string]*org_model.Team)
|
|
for _, rule := range rules {
|
|
for _, f := range changedFiles {
|
|
if (rule.Rule.MatchString(f) && !rule.Negative) || (!rule.Rule.MatchString(f) && rule.Negative) {
|
|
for _, u := range rule.Users {
|
|
uniqUsers[u.ID] = u
|
|
}
|
|
for _, t := range rule.Teams {
|
|
uniqTeams[fmt.Sprintf("%d/%d", t.OrgID, t.ID)] = t
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
notifiers := make([]*ReviewRequestNotifier, 0, len(uniqUsers)+len(uniqTeams))
|
|
|
|
if err := issue.LoadPoster(ctx); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
for _, u := range uniqUsers {
|
|
if u.ID != issue.Poster.ID {
|
|
comment, err := issues_model.AddReviewRequest(ctx, issue, u, issue.Poster)
|
|
if err != nil {
|
|
log.Warn("Failed add assignee user: %s to PR review: %s#%d, error: %s", u.Name, pr.BaseRepo.Name, pr.ID, err)
|
|
return nil, err
|
|
}
|
|
notifiers = append(notifiers, &ReviewRequestNotifier{
|
|
Comment: comment,
|
|
IsAdd: true,
|
|
Reviwer: u,
|
|
})
|
|
}
|
|
}
|
|
for _, t := range uniqTeams {
|
|
comment, err := issues_model.AddTeamReviewRequest(ctx, issue, t, issue.Poster)
|
|
if err != nil {
|
|
log.Warn("Failed add assignee team: %s to PR review: %s#%d, error: %s", t.Name, pr.BaseRepo.Name, pr.ID, err)
|
|
return nil, err
|
|
}
|
|
notifiers = append(notifiers, &ReviewRequestNotifier{
|
|
Comment: comment,
|
|
IsAdd: true,
|
|
ReviewTeam: t,
|
|
})
|
|
}
|
|
|
|
return notifiers, nil
|
|
}
|