mirror of
https://github.com/go-gitea/gitea.git
synced 2026-09-27 05:25:14 +00:00
wxiaoguang
ea91028028
* Revert the behavior introduced by #30805 * Now the PR status is still managed in Gitea's code where the operation is triggerred but not in post-receive hook * Fix #39254 and many more related bugs. * Fix #39124 ``` // MarkAsMerged sets a pull request to merged and closes the corresponding issue // To make sure the pull request is marked as merged correctly, the caller uses multiple-stage operations: // 1. Create a temp repo from base, merge the head into the temp repo, and get the merged commit ID and timestamp, // 2. The merged commit ID and related information are stored into pull request // 3. Push the merged commit to the base repo // 4. Call MarkAsMerged to mark the pull request as merged and do post-processing (notification, close issues, etc) // // If failure occurs in step 1/2/3: the pull request is still open, the base repo is not changed, the doer can start a new merge. // If failure occurs in step 4: the pull request can be marked as merged by the merged commit ID stored in it later. ```
93 lines
3.2 KiB
Go
93 lines
3.2 KiB
Go
// Copyright 2022 Gitea. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package pull
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"gitea.dev/models/db"
|
|
repo_model "gitea.dev/models/repo"
|
|
user_model "gitea.dev/models/user"
|
|
"gitea.dev/modules/timeutil"
|
|
)
|
|
|
|
// AutoMerge represents a pull request scheduled for merging when checks succeed
|
|
type AutoMerge struct {
|
|
ID int64 `xorm:"pk autoincr"`
|
|
PullID int64 `xorm:"UNIQUE"`
|
|
DoerID int64 `xorm:"INDEX NOT NULL"`
|
|
Doer *user_model.User `xorm:"-"`
|
|
MergeStyle repo_model.MergeStyle `xorm:"varchar(30)"`
|
|
Message string `xorm:"LONGTEXT"`
|
|
DeleteBranchAfterMerge bool
|
|
CreatedUnix timeutil.TimeStamp `xorm:"created"`
|
|
MergedCommitID string `xorm:"VARCHAR(64)"`
|
|
}
|
|
|
|
// TableName return database table name for xorm
|
|
func (AutoMerge) TableName() string {
|
|
return "pull_auto_merge"
|
|
}
|
|
|
|
func init() {
|
|
db.RegisterModel(new(AutoMerge))
|
|
}
|
|
|
|
// ErrAlreadyScheduledToAutoMerge represents a "PullRequestHasMerged"-error
|
|
type ErrAlreadyScheduledToAutoMerge struct {
|
|
PullID int64
|
|
}
|
|
|
|
func (err ErrAlreadyScheduledToAutoMerge) Error() string {
|
|
return fmt.Sprintf("pull request is already scheduled to auto merge when checks succeed [pull_id: %d]", err.PullID)
|
|
}
|
|
|
|
// IsErrAlreadyScheduledToAutoMerge checks if an error is a ErrAlreadyScheduledToAutoMerge.
|
|
func IsErrAlreadyScheduledToAutoMerge(err error) bool {
|
|
_, ok := err.(ErrAlreadyScheduledToAutoMerge)
|
|
return ok
|
|
}
|
|
|
|
// ScheduleAutoMerge schedules a pull request to be merged when all checks succeed
|
|
func ScheduleAutoMerge(ctx context.Context, doer *user_model.User, pullID int64, style repo_model.MergeStyle, message string, deleteBranchAfterMerge bool) error {
|
|
// Check if we already have a merge scheduled for that pull request
|
|
if exists, _, err := GetScheduledMergeByPullID(ctx, pullID); err != nil {
|
|
return err
|
|
} else if exists {
|
|
return ErrAlreadyScheduledToAutoMerge{PullID: pullID}
|
|
}
|
|
|
|
_, err := db.GetEngine(ctx).Insert(&AutoMerge{
|
|
DoerID: doer.ID,
|
|
PullID: pullID,
|
|
MergeStyle: style,
|
|
Message: message,
|
|
DeleteBranchAfterMerge: deleteBranchAfterMerge,
|
|
})
|
|
return err
|
|
}
|
|
|
|
// GetScheduledMergeByPullID gets a scheduled pull request merge by pull request id
|
|
func GetScheduledMergeByPullID(ctx context.Context, pullID int64) (bool, *AutoMerge, error) {
|
|
scheduledPRM := &AutoMerge{}
|
|
exists, err := db.GetEngine(ctx).Where("pull_id = ?", pullID).Get(scheduledPRM)
|
|
if err != nil || !exists {
|
|
return false, nil, err
|
|
}
|
|
|
|
scheduledPRM.DoerID, scheduledPRM.Doer, err = user_model.GetPossibleUserByID(ctx, scheduledPRM.DoerID)
|
|
return true, scheduledPRM, err
|
|
}
|
|
|
|
func GetScheduledMergePullIDsSince(ctx context.Context, since timeutil.TimeStamp) ([]int64, error) {
|
|
var pullIDs []int64
|
|
err := db.GetEngine(ctx).Table(&AutoMerge{}).Where("created_unix >= ?", since).Cols("pull_id").Find(&pullIDs)
|
|
return pullIDs, err
|
|
}
|
|
|
|
func DeleteScheduledAutoMerge(ctx context.Context, pullID int64) (int64, error) {
|
|
return db.GetEngine(ctx).Where("pull_id = ?", pullID).Delete(&AutoMerge{})
|
|
}
|