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.

mergebase.go 4.0KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114
  1. // Copyright 2020 The Gitea Authors. All rights reserved.
  2. // SPDX-License-Identifier: MIT
  3. package doctor
  4. import (
  5. "context"
  6. "fmt"
  7. "strings"
  8. "code.gitea.io/gitea/models/db"
  9. issues_model "code.gitea.io/gitea/models/issues"
  10. repo_model "code.gitea.io/gitea/models/repo"
  11. "code.gitea.io/gitea/modules/git"
  12. "code.gitea.io/gitea/modules/log"
  13. "xorm.io/builder"
  14. )
  15. func iteratePRs(ctx context.Context, repo *repo_model.Repository, each func(*repo_model.Repository, *issues_model.PullRequest) error) error {
  16. return db.Iterate(
  17. ctx,
  18. builder.Eq{"base_repo_id": repo.ID},
  19. func(ctx context.Context, bean *issues_model.PullRequest) error {
  20. return each(repo, bean)
  21. },
  22. )
  23. }
  24. func checkPRMergeBase(ctx context.Context, logger log.Logger, autofix bool) error {
  25. numRepos := 0
  26. numPRs := 0
  27. numPRsUpdated := 0
  28. err := iterateRepositories(ctx, func(repo *repo_model.Repository) error {
  29. numRepos++
  30. return iteratePRs(ctx, repo, func(repo *repo_model.Repository, pr *issues_model.PullRequest) error {
  31. numPRs++
  32. pr.BaseRepo = repo
  33. repoPath := repo.RepoPath()
  34. oldMergeBase := pr.MergeBase
  35. if !pr.HasMerged {
  36. var err error
  37. pr.MergeBase, _, err = git.NewCommand(ctx, "merge-base").AddDashesAndList(pr.BaseBranch, pr.GetGitRefName()).RunStdString(&git.RunOpts{Dir: repoPath})
  38. if err != nil {
  39. var err2 error
  40. pr.MergeBase, _, err2 = git.NewCommand(ctx, "rev-parse").AddDynamicArguments(git.BranchPrefix + pr.BaseBranch).RunStdString(&git.RunOpts{Dir: repoPath})
  41. if err2 != nil {
  42. 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)
  43. return nil
  44. }
  45. }
  46. } else {
  47. parentsString, _, err := git.NewCommand(ctx, "rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID).RunStdString(&git.RunOpts{Dir: repoPath})
  48. if err != nil {
  49. 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)
  50. return nil
  51. }
  52. parents := strings.Split(strings.TrimSpace(parentsString), " ")
  53. if len(parents) < 2 {
  54. return nil
  55. }
  56. refs := append([]string{}, parents[1:]...)
  57. refs = append(refs, pr.GetGitRefName())
  58. cmd := git.NewCommand(ctx, "merge-base").AddDashesAndList(refs...)
  59. pr.MergeBase, _, err = cmd.RunStdString(&git.RunOpts{Dir: repoPath})
  60. if err != nil {
  61. 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)
  62. return nil
  63. }
  64. }
  65. pr.MergeBase = strings.TrimSpace(pr.MergeBase)
  66. if pr.MergeBase != oldMergeBase {
  67. if autofix {
  68. if err := pr.UpdateCols(ctx, "merge_base"); err != nil {
  69. logger.Critical("Failed to update merge_base. ERROR: %v", err)
  70. return fmt.Errorf("Failed to update merge_base. ERROR: %w", err)
  71. }
  72. } else {
  73. 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)
  74. }
  75. numPRsUpdated++
  76. }
  77. return nil
  78. })
  79. })
  80. if autofix {
  81. logger.Info("%d PR mergebases updated of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)
  82. } else {
  83. if numPRsUpdated == 0 {
  84. logger.Info("All %d PRs in %d repos have a correct mergebase", numPRs, numRepos)
  85. } else if err == nil {
  86. logger.Critical("%d PRs with incorrect mergebases of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)
  87. return fmt.Errorf("%d PRs with incorrect mergebases of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)
  88. } else {
  89. logger.Warn("%d PRs with incorrect mergebases of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)
  90. }
  91. }
  92. return err
  93. }
  94. func init() {
  95. Register(&Check{
  96. Title: "Recalculate merge bases",
  97. Name: "recalculate-merge-bases",
  98. IsDefault: false,
  99. Run: checkPRMergeBase,
  100. Priority: 7,
  101. })
  102. }