mirror of
https://github.com/go-gitea/gitea.git
synced 2026-11-19 15:14:40 +09:00
fix(automerge): recheck scheduled auto merge when an official review request is cleared (#40420)
With `block_on_official_review_requests` enabled, a scheduled auto merge stayed stuck after the last official review request was cleared, because nothing rechecked the PR. A request can be cleared by removing a user's request, by removing a team's request, or when the requested reviewer submits any review, including a plain comment. All three cases now trigger an auto merge recheck. Previously only approvals and dismissals did. Every recheck now skips pull requests without a scheduled auto merge before opening the git repository. Fixes: https://github.com/go-gitea/gitea/issues/40415 Assisted-by: Claude Code:claude-opus-5-5 --------- Co-authored-by: bircni <bircni@icloud.com> Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
5 files changed
+88
-13
No files matched your search
@@ -29,10 +29,7 @@ func NewNotifier() notify_service.Notifier {
|
||||
}
|
||||
|
||||
func (n *automergeNotifier) PullRequestReview(ctx context.Context, pr *issues_model.PullRequest, review *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) {
|
||||
// as a missing / blocking reviews could have blocked a pending automerge let's recheck
|
||||
if review.Type == issues_model.ReviewTypeApprove {
|
||||
automergequeue.StartAutoMergeCheckByPullHead(ctx, pr)
|
||||
}
|
||||
automergequeue.StartAutoMergeCheckByPullHead(ctx, pr) // not only approvals, every review clears the reviewer's review request
|
||||
}
|
||||
|
||||
func (n *automergeNotifier) PullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
|
||||
@@ -48,6 +45,17 @@ func (n *automergeNotifier) PullReviewDismiss(ctx context.Context, doer *user_mo
|
||||
automergequeue.StartAutoMergeCheckByPullHead(ctx, review.Issue.PullRequest)
|
||||
}
|
||||
|
||||
func (n *automergeNotifier) PullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
|
||||
if isRequest {
|
||||
return
|
||||
}
|
||||
if err := issue.LoadPullRequest(ctx); err != nil {
|
||||
log.Error("LoadPullRequest: %v", err)
|
||||
return
|
||||
}
|
||||
automergequeue.StartAutoMergeCheckByPullHead(ctx, issue.PullRequest)
|
||||
}
|
||||
|
||||
func (n *automergeNotifier) CreateCommitStatus(ctx context.Context, repo *repo_model.Repository, commit *repository.PushCommit, sender *user_model.User, status *git_model.CommitStatus) {
|
||||
if !status.State.IsSuccess() {
|
||||
return
|
||||
|
||||
@@ -8,10 +8,14 @@ import (
|
||||
"errors"
|
||||
"strconv"
|
||||
|
||||
"gitea.dev/models/db"
|
||||
issues_model "gitea.dev/models/issues"
|
||||
pull_model "gitea.dev/models/pull"
|
||||
"gitea.dev/modules/git"
|
||||
"gitea.dev/modules/log"
|
||||
"gitea.dev/modules/queue"
|
||||
|
||||
"xorm.io/builder"
|
||||
)
|
||||
|
||||
// AutoMergeItem is for the unique queue, so the item type can't be JSON which doesn't have deterministic key order.
|
||||
@@ -31,6 +35,13 @@ func StartAutoMergeCheckByPullCommit(pullID int64, commitID string) {
|
||||
}
|
||||
|
||||
func StartAutoMergeCheckByPullHead(ctx context.Context, pull *issues_model.PullRequest) {
|
||||
if scheduled, err := db.Exist[pull_model.AutoMerge](ctx, builder.Eq{"pull_id": pull.ID}); !scheduled {
|
||||
if err != nil {
|
||||
log.Error("Exist AutoMerge: %v", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if err := pull.LoadBaseRepo(ctx); err != nil {
|
||||
log.Error("LoadBaseRepo: %v", err)
|
||||
return
|
||||
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
"gitea.dev/models/unit"
|
||||
user_model "gitea.dev/models/user"
|
||||
"gitea.dev/modules/log"
|
||||
"gitea.dev/services/automergequeue"
|
||||
notify_service "gitea.dev/services/notify"
|
||||
)
|
||||
|
||||
@@ -192,6 +193,12 @@ func TeamReviewRequest(ctx context.Context, issue *issues_model.Issue, doer *use
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if comment != nil && !isAdd {
|
||||
if err := issue.LoadPullRequest(ctx); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
automergequeue.StartAutoMergeCheckByPullHead(ctx, issue.PullRequest) // team removals don't reach the notifier
|
||||
}
|
||||
if comment == nil || !isAdd {
|
||||
return nil, nil //nolint:nilnil // return nil because no comment was created or it is a removal
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ import (
|
||||
git_model "gitea.dev/models/git"
|
||||
issues_model "gitea.dev/models/issues"
|
||||
access_model "gitea.dev/models/perm/access"
|
||||
"gitea.dev/models/pull"
|
||||
repo_model "gitea.dev/models/repo"
|
||||
"gitea.dev/models/unit"
|
||||
user_model "gitea.dev/models/user"
|
||||
@@ -290,14 +289,7 @@ func markPullRequestAsMergeable(ctx context.Context, pr *issues_model.PullReques
|
||||
return err
|
||||
}
|
||||
|
||||
// if there is a scheduled merge for this pull request, start the auto merge check (again)
|
||||
hasScheduledMerge, _, err := pull.GetScheduledMergeByPullID(ctx, pr.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if hasScheduledMerge {
|
||||
automergequeue.StartAutoMergeCheckByPullHead(ctx, pr)
|
||||
}
|
||||
automergequeue.StartAutoMergeCheckByPullHead(ctx, pr)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ import (
|
||||
"gitea.dev/models/db"
|
||||
git_model "gitea.dev/models/git"
|
||||
issues_model "gitea.dev/models/issues"
|
||||
"gitea.dev/models/organization"
|
||||
"gitea.dev/models/perm"
|
||||
pull_model "gitea.dev/models/pull"
|
||||
repo_model "gitea.dev/models/repo"
|
||||
@@ -42,6 +43,7 @@ import (
|
||||
"gitea.dev/services/automerge"
|
||||
"gitea.dev/services/automergequeue"
|
||||
"gitea.dev/services/forms"
|
||||
issue_service "gitea.dev/services/issue"
|
||||
pull_service "gitea.dev/services/pull"
|
||||
repo_service "gitea.dev/services/repository"
|
||||
commitstatus_service "gitea.dev/services/repository/commitstatus"
|
||||
@@ -961,6 +963,61 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApproval(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
func TestPullAutoMergeAfterReviewRequestRemoved(t *testing.T) {
|
||||
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
|
||||
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
|
||||
ownersTeam := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 1})
|
||||
session := loginUser(t, "user2")
|
||||
session.MakeRequest(t, NewRequestWithValues(t, "POST", "/org3/repo3/settings/branches/edit", map[string]string{
|
||||
"rule_name": "master",
|
||||
"enable_push": "true",
|
||||
"block_on_official_review_requests": "true",
|
||||
}), http.StatusOK)
|
||||
|
||||
requestUser4 := func(isAdd bool) func(pr *issues_model.PullRequest) {
|
||||
return func(pr *issues_model.PullRequest) {
|
||||
_, err := issue_service.ReviewRequest(t.Context(), pr.Issue, user2, nil, user4, isAdd)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
}
|
||||
requestTeam := func(isAdd bool) func(pr *issues_model.PullRequest) {
|
||||
return func(pr *issues_model.PullRequest) {
|
||||
_, err := issue_service.TeamReviewRequest(t.Context(), pr.Issue, user2, ownersTeam, isAdd)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
}
|
||||
commentAsUser4 := func(pr *issues_model.PullRequest) {
|
||||
testSubmitReview(t, loginUser(t, "user4"), "org3", "repo3", strconv.FormatInt(pr.Index, 10), "", "comment", http.StatusOK)
|
||||
}
|
||||
|
||||
for _, tc := range []struct {
|
||||
branch string
|
||||
block, unblock func(pr *issues_model.PullRequest)
|
||||
}{
|
||||
{"remove-user-request", requestUser4(true), requestUser4(false)},
|
||||
{"comment-review", requestUser4(true), commentAsUser4},
|
||||
{"remove-team-request", requestTeam(true), requestTeam(false)},
|
||||
} {
|
||||
testCreateFile(t, session, "org3", "repo3", "master", tc.branch, tc.branch+".txt", tc.branch)
|
||||
testPullCreateDirectly(t, session, createPullRequestOptions{BaseRepoOwner: "org3", BaseRepoName: "repo3", BaseBranch: "master", HeadBranch: tc.branch, Title: tc.branch})
|
||||
pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: 3, HeadBranch: tc.branch})
|
||||
require.NoError(t, pr.LoadIssue(t.Context()))
|
||||
require.NoError(t, pr.Issue.LoadRepo(t.Context()))
|
||||
|
||||
tc.block(pr)
|
||||
_, err := automerge.ScheduleAutoMerge(t.Context(), user2, pr, repo_model.MergeStyleMerge, "auto merge test", false)
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, automergequeue.AutoMergeQueue.FlushWithContext(t.Context(), 5*time.Second))
|
||||
assert.False(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}).HasMerged, tc.branch)
|
||||
|
||||
tc.unblock(pr)
|
||||
require.NoError(t, automergequeue.AutoMergeQueue.FlushWithContext(t.Context(), 5*time.Second))
|
||||
assert.True(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}).HasMerged, tc.branch)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.T) {
|
||||
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||
// create a pull request
|
||||
|
||||
Reference in new issue
Block a user