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.

update.go 4.5KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165
  1. // Copyright 2020 The Gitea Authors. All rights reserved.
  2. // Use of this source code is governed by a MIT-style
  3. // license that can be found in the LICENSE file.
  4. package pull
  5. import (
  6. "context"
  7. "fmt"
  8. "code.gitea.io/gitea/models"
  9. repo_model "code.gitea.io/gitea/models/repo"
  10. "code.gitea.io/gitea/models/unit"
  11. user_model "code.gitea.io/gitea/models/user"
  12. "code.gitea.io/gitea/modules/git"
  13. "code.gitea.io/gitea/modules/log"
  14. repo_module "code.gitea.io/gitea/modules/repository"
  15. )
  16. // Update updates pull request with base branch.
  17. func Update(ctx context.Context, pull *models.PullRequest, doer *user_model.User, message string, rebase bool) error {
  18. var (
  19. pr *models.PullRequest
  20. style repo_model.MergeStyle
  21. )
  22. pullWorkingPool.CheckIn(fmt.Sprint(pull.ID))
  23. defer pullWorkingPool.CheckOut(fmt.Sprint(pull.ID))
  24. if rebase {
  25. pr = pull
  26. style = repo_model.MergeStyleRebaseUpdate
  27. } else {
  28. // use merge functions but switch repo's and branch's
  29. pr = &models.PullRequest{
  30. HeadRepoID: pull.BaseRepoID,
  31. BaseRepoID: pull.HeadRepoID,
  32. HeadBranch: pull.BaseBranch,
  33. BaseBranch: pull.HeadBranch,
  34. }
  35. style = repo_model.MergeStyleMerge
  36. }
  37. if pull.Flow == models.PullRequestFlowAGit {
  38. // TODO: Not support update agit flow pull request's head branch
  39. return fmt.Errorf("Not support update agit flow pull request's head branch")
  40. }
  41. if err := pr.LoadHeadRepoCtx(ctx); err != nil {
  42. log.Error("LoadHeadRepo: %v", err)
  43. return fmt.Errorf("LoadHeadRepo: %v", err)
  44. } else if err = pr.LoadBaseRepoCtx(ctx); err != nil {
  45. log.Error("LoadBaseRepo: %v", err)
  46. return fmt.Errorf("LoadBaseRepo: %v", err)
  47. }
  48. diffCount, err := GetDiverging(ctx, pull)
  49. if err != nil {
  50. return err
  51. } else if diffCount.Behind == 0 {
  52. return fmt.Errorf("HeadBranch of PR %d is up to date", pull.Index)
  53. }
  54. _, err = rawMerge(ctx, pr, doer, style, "", message)
  55. defer func() {
  56. if rebase {
  57. go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "")
  58. return
  59. }
  60. go AddTestPullRequestTask(doer, pr.HeadRepo.ID, pr.HeadBranch, false, "", "")
  61. }()
  62. return err
  63. }
  64. // IsUserAllowedToUpdate check if user is allowed to update PR with given permissions and branch protections
  65. func IsUserAllowedToUpdate(ctx context.Context, pull *models.PullRequest, user *user_model.User) (mergeAllowed, rebaseAllowed bool, err error) {
  66. if pull.Flow == models.PullRequestFlowAGit {
  67. return false, false, nil
  68. }
  69. if user == nil {
  70. return false, false, nil
  71. }
  72. headRepoPerm, err := models.GetUserRepoPermission(ctx, pull.HeadRepo, user)
  73. if err != nil {
  74. return false, false, err
  75. }
  76. pr := &models.PullRequest{
  77. HeadRepoID: pull.BaseRepoID,
  78. BaseRepoID: pull.HeadRepoID,
  79. HeadBranch: pull.BaseBranch,
  80. BaseBranch: pull.HeadBranch,
  81. }
  82. err = pr.LoadProtectedBranch()
  83. if err != nil {
  84. return false, false, err
  85. }
  86. // can't do rebase on protected branch because need force push
  87. if pr.ProtectedBranch == nil {
  88. prUnit, err := pr.BaseRepo.GetUnit(unit.TypePullRequests)
  89. if err != nil {
  90. log.Error("pr.BaseRepo.GetUnit(unit.TypePullRequests): %v", err)
  91. return false, false, err
  92. }
  93. rebaseAllowed = prUnit.PullRequestsConfig().AllowRebaseUpdate
  94. }
  95. // Update function need push permission
  96. if pr.ProtectedBranch != nil && !pr.ProtectedBranch.CanUserPush(user.ID) {
  97. return false, false, nil
  98. }
  99. baseRepoPerm, err := models.GetUserRepoPermission(ctx, pull.BaseRepo, user)
  100. if err != nil {
  101. return false, false, err
  102. }
  103. mergeAllowed, err = IsUserAllowedToMerge(ctx, pr, headRepoPerm, user)
  104. if err != nil {
  105. return false, false, err
  106. }
  107. if pull.AllowMaintainerEdit {
  108. mergeAllowedMaintainer, err := IsUserAllowedToMerge(ctx, pr, baseRepoPerm, user)
  109. if err != nil {
  110. return false, false, err
  111. }
  112. mergeAllowed = mergeAllowed || mergeAllowedMaintainer
  113. }
  114. return mergeAllowed, rebaseAllowed, nil
  115. }
  116. // GetDiverging determines how many commits a PR is ahead or behind the PR base branch
  117. func GetDiverging(ctx context.Context, pr *models.PullRequest) (*git.DivergeObject, error) {
  118. log.Trace("GetDiverging[%d]: compare commits", pr.ID)
  119. if err := pr.LoadBaseRepoCtx(ctx); err != nil {
  120. return nil, err
  121. }
  122. if err := pr.LoadHeadRepoCtx(ctx); err != nil {
  123. return nil, err
  124. }
  125. tmpRepo, err := createTemporaryRepo(ctx, pr)
  126. if err != nil {
  127. if !models.IsErrBranchDoesNotExist(err) {
  128. log.Error("CreateTemporaryRepo: %v", err)
  129. }
  130. return nil, err
  131. }
  132. defer func() {
  133. if err := repo_module.RemoveTemporaryPath(tmpRepo); err != nil {
  134. log.Error("Merge: RemoveTemporaryPath: %s", err)
  135. }
  136. }()
  137. diff, err := git.GetDivergingCommits(ctx, tmpRepo, "base", "tracking")
  138. return &diff, err
  139. }