mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-25 07:52:40 +01:00
4569339a4b
* Refactor Logger Refactor Logger to make a logger interface and make it possible to wrap loggers for specific purposes. * Refactor Doctor Move the gitea doctor functions into its own module. Use a logger for its messages instead of returning a results string[] Signed-off-by: Andrew Thornton <art27@cantab.net> * Update modules/doctor/misc.go Co-authored-by: 6543 <6543@obermui.de> * Update modules/doctor/misc.go Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
110 lines
3.6 KiB
Go
110 lines
3.6 KiB
Go
// Copyright 2020 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 doctor
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/models"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"xorm.io/builder"
|
|
)
|
|
|
|
func iteratePRs(repo *models.Repository, each func(*models.Repository, *models.PullRequest) error) error {
|
|
return models.Iterate(
|
|
models.DefaultDBContext(),
|
|
new(models.PullRequest),
|
|
builder.Eq{"base_repo_id": repo.ID},
|
|
func(idx int, bean interface{}) error {
|
|
return each(repo, bean.(*models.PullRequest))
|
|
},
|
|
)
|
|
}
|
|
|
|
func checkPRMergeBase(logger log.Logger, autofix bool) error {
|
|
numRepos := 0
|
|
numPRs := 0
|
|
numPRsUpdated := 0
|
|
err := iterateRepositories(func(repo *models.Repository) error {
|
|
numRepos++
|
|
return iteratePRs(repo, func(repo *models.Repository, pr *models.PullRequest) error {
|
|
numPRs++
|
|
pr.BaseRepo = repo
|
|
repoPath := repo.RepoPath()
|
|
|
|
oldMergeBase := pr.MergeBase
|
|
|
|
if !pr.HasMerged {
|
|
var err error
|
|
pr.MergeBase, err = git.NewCommand("merge-base", "--", pr.BaseBranch, pr.GetGitRefName()).RunInDir(repoPath)
|
|
if err != nil {
|
|
var err2 error
|
|
pr.MergeBase, err2 = git.NewCommand("rev-parse", git.BranchPrefix+pr.BaseBranch).RunInDir(repoPath)
|
|
if err2 != nil {
|
|
logger.Warn("Unable to get merge base for PR ID %d, #%d onto %s in %s/%s. Error: %v & %v", pr.ID, pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, err, err2)
|
|
return nil
|
|
}
|
|
}
|
|
} else {
|
|
parentsString, err := git.NewCommand("rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
|
|
if err != nil {
|
|
logger.Warn("Unable to get parents for merged PR ID %d, #%d onto %s in %s/%s. Error: %v", pr.ID, pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, err)
|
|
return nil
|
|
}
|
|
parents := strings.Split(strings.TrimSpace(parentsString), " ")
|
|
if len(parents) < 2 {
|
|
return nil
|
|
}
|
|
|
|
args := append([]string{"merge-base", "--"}, parents[1:]...)
|
|
args = append(args, pr.GetGitRefName())
|
|
|
|
pr.MergeBase, err = git.NewCommand(args...).RunInDir(repoPath)
|
|
if err != nil {
|
|
logger.Warn("Unable to get merge base for merged PR ID %d, #%d onto %s in %s/%s. Error: %v", pr.ID, pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, err)
|
|
return nil
|
|
}
|
|
}
|
|
pr.MergeBase = strings.TrimSpace(pr.MergeBase)
|
|
if pr.MergeBase != oldMergeBase {
|
|
if autofix {
|
|
if err := pr.UpdateCols("merge_base"); err != nil {
|
|
logger.Critical("Failed to update merge_base. ERROR: %v", err)
|
|
return fmt.Errorf("Failed to update merge_base. ERROR: %v", err)
|
|
}
|
|
} else {
|
|
logger.Info("#%d onto %s in %s/%s: MergeBase should be %s but is %s", pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, oldMergeBase, pr.MergeBase)
|
|
}
|
|
numPRsUpdated++
|
|
}
|
|
return nil
|
|
})
|
|
})
|
|
|
|
if autofix {
|
|
logger.Info("%d PR mergebases updated of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)
|
|
} else {
|
|
if numPRsUpdated > 0 && err == nil {
|
|
logger.Critical("%d PRs with incorrect mergebases of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)
|
|
return fmt.Errorf("%d PRs with incorrect mergebases of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)
|
|
}
|
|
|
|
logger.Warn("%d PRs with incorrect mergebases of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func init() {
|
|
Register(&Check{
|
|
Title: "Recalculate merge bases",
|
|
Name: "recalculate-merge-bases",
|
|
IsDefault: false,
|
|
Run: checkPRMergeBase,
|
|
Priority: 7,
|
|
})
|
|
}
|