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.

pull.go 13KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449
  1. // Copyright 2019 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. "bufio"
  7. "bytes"
  8. "context"
  9. "fmt"
  10. "os"
  11. "path"
  12. "strings"
  13. "time"
  14. "code.gitea.io/gitea/models"
  15. "code.gitea.io/gitea/modules/git"
  16. "code.gitea.io/gitea/modules/graceful"
  17. "code.gitea.io/gitea/modules/log"
  18. "code.gitea.io/gitea/modules/notification"
  19. issue_service "code.gitea.io/gitea/services/issue"
  20. "github.com/unknwon/com"
  21. )
  22. // NewPullRequest creates new pull request with labels for repository.
  23. func NewPullRequest(repo *models.Repository, pull *models.Issue, labelIDs []int64, uuids []string, pr *models.PullRequest, assigneeIDs []int64) error {
  24. if err := TestPatch(pr); err != nil {
  25. return err
  26. }
  27. if err := models.NewPullRequest(repo, pull, labelIDs, uuids, pr); err != nil {
  28. return err
  29. }
  30. for _, assigneeID := range assigneeIDs {
  31. if err := issue_service.AddAssigneeIfNotAssigned(pull, pull.Poster, assigneeID); err != nil {
  32. return err
  33. }
  34. }
  35. pr.Issue = pull
  36. pull.PullRequest = pr
  37. if err := PushToBaseRepo(pr); err != nil {
  38. return err
  39. }
  40. notification.NotifyNewPullRequest(pr)
  41. return nil
  42. }
  43. // ChangeTargetBranch changes the target branch of this pull request, as the given user.
  44. func ChangeTargetBranch(pr *models.PullRequest, doer *models.User, targetBranch string) (err error) {
  45. // Current target branch is already the same
  46. if pr.BaseBranch == targetBranch {
  47. return nil
  48. }
  49. if pr.Issue.IsClosed {
  50. return models.ErrIssueIsClosed{
  51. ID: pr.Issue.ID,
  52. RepoID: pr.Issue.RepoID,
  53. Index: pr.Issue.Index,
  54. }
  55. }
  56. if pr.HasMerged {
  57. return models.ErrPullRequestHasMerged{
  58. ID: pr.ID,
  59. IssueID: pr.Index,
  60. HeadRepoID: pr.HeadRepoID,
  61. BaseRepoID: pr.BaseRepoID,
  62. HeadBranch: pr.HeadBranch,
  63. BaseBranch: pr.BaseBranch,
  64. }
  65. }
  66. // Check if branches are equal
  67. branchesEqual, err := pr.IsHeadEqualWithBranch(targetBranch)
  68. if err != nil {
  69. return err
  70. }
  71. if branchesEqual {
  72. return models.ErrBranchesEqual{
  73. HeadBranchName: pr.HeadBranch,
  74. BaseBranchName: targetBranch,
  75. }
  76. }
  77. // Check if pull request for the new target branch already exists
  78. existingPr, err := models.GetUnmergedPullRequest(pr.HeadRepoID, pr.BaseRepoID, pr.HeadBranch, targetBranch)
  79. if existingPr != nil {
  80. return models.ErrPullRequestAlreadyExists{
  81. ID: existingPr.ID,
  82. IssueID: existingPr.Index,
  83. HeadRepoID: existingPr.HeadRepoID,
  84. BaseRepoID: existingPr.BaseRepoID,
  85. HeadBranch: existingPr.HeadBranch,
  86. BaseBranch: existingPr.BaseBranch,
  87. }
  88. }
  89. if err != nil && !models.IsErrPullRequestNotExist(err) {
  90. return err
  91. }
  92. // Set new target branch
  93. oldBranch := pr.BaseBranch
  94. pr.BaseBranch = targetBranch
  95. // Refresh patch
  96. if err := TestPatch(pr); err != nil {
  97. return err
  98. }
  99. // Update target branch, PR diff and status
  100. // This is the same as checkAndUpdateStatus in check service, but also updates base_branch
  101. if pr.Status == models.PullRequestStatusChecking {
  102. pr.Status = models.PullRequestStatusMergeable
  103. }
  104. if err := pr.UpdateCols("status, conflicted_files, base_branch"); err != nil {
  105. return err
  106. }
  107. // Create comment
  108. options := &models.CreateCommentOptions{
  109. Type: models.CommentTypeChangeTargetBranch,
  110. Doer: doer,
  111. Repo: pr.Issue.Repo,
  112. Issue: pr.Issue,
  113. OldRef: oldBranch,
  114. NewRef: targetBranch,
  115. }
  116. if _, err = models.CreateComment(options); err != nil {
  117. return fmt.Errorf("CreateChangeTargetBranchComment: %v", err)
  118. }
  119. return nil
  120. }
  121. func checkForInvalidation(requests models.PullRequestList, repoID int64, doer *models.User, branch string) error {
  122. repo, err := models.GetRepositoryByID(repoID)
  123. if err != nil {
  124. return fmt.Errorf("GetRepositoryByID: %v", err)
  125. }
  126. gitRepo, err := git.OpenRepository(repo.RepoPath())
  127. if err != nil {
  128. return fmt.Errorf("git.OpenRepository: %v", err)
  129. }
  130. go func() {
  131. // FIXME: graceful: We need to tell the manager we're doing something...
  132. err := requests.InvalidateCodeComments(doer, gitRepo, branch)
  133. if err != nil {
  134. log.Error("PullRequestList.InvalidateCodeComments: %v", err)
  135. }
  136. gitRepo.Close()
  137. }()
  138. return nil
  139. }
  140. func addHeadRepoTasks(prs []*models.PullRequest) {
  141. for _, pr := range prs {
  142. log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
  143. if err := PushToBaseRepo(pr); err != nil {
  144. log.Error("PushToBaseRepo: %v", err)
  145. continue
  146. }
  147. AddToTaskQueue(pr)
  148. }
  149. }
  150. // AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch,
  151. // and generate new patch for testing as needed.
  152. func AddTestPullRequestTask(doer *models.User, repoID int64, branch string, isSync bool, oldCommitID, newCommitID string) {
  153. log.Trace("AddTestPullRequestTask [head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
  154. graceful.GetManager().RunWithShutdownContext(func(ctx context.Context) {
  155. // There is no sensible way to shut this down ":-("
  156. // If you don't let it run all the way then you will lose data
  157. // FIXME: graceful: AddTestPullRequestTask needs to become a queue!
  158. prs, err := models.GetUnmergedPullRequestsByHeadInfo(repoID, branch)
  159. if err != nil {
  160. log.Error("Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
  161. return
  162. }
  163. if isSync {
  164. requests := models.PullRequestList(prs)
  165. if err = requests.LoadAttributes(); err != nil {
  166. log.Error("PullRequestList.LoadAttributes: %v", err)
  167. }
  168. if invalidationErr := checkForInvalidation(requests, repoID, doer, branch); invalidationErr != nil {
  169. log.Error("checkForInvalidation: %v", invalidationErr)
  170. }
  171. if err == nil {
  172. for _, pr := range prs {
  173. if newCommitID != "" && newCommitID != git.EmptySHA {
  174. changed, err := checkIfPRContentChanged(pr, oldCommitID, newCommitID)
  175. if err != nil {
  176. log.Error("checkIfPRContentChanged: %v", err)
  177. }
  178. if changed {
  179. // Mark old reviews as stale if diff to mergebase has changed
  180. if err := models.MarkReviewsAsStale(pr.IssueID); err != nil {
  181. log.Error("MarkReviewsAsStale: %v", err)
  182. }
  183. }
  184. if err := models.MarkReviewsAsNotStale(pr.IssueID, newCommitID); err != nil {
  185. log.Error("MarkReviewsAsNotStale: %v", err)
  186. }
  187. }
  188. pr.Issue.PullRequest = pr
  189. notification.NotifyPullRequestSynchronized(doer, pr)
  190. }
  191. }
  192. }
  193. addHeadRepoTasks(prs)
  194. log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
  195. prs, err = models.GetUnmergedPullRequestsByBaseInfo(repoID, branch)
  196. if err != nil {
  197. log.Error("Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
  198. return
  199. }
  200. for _, pr := range prs {
  201. AddToTaskQueue(pr)
  202. }
  203. })
  204. }
  205. // checkIfPRContentChanged checks if diff to target branch has changed by push
  206. // A commit can be considered to leave the PR untouched if the patch/diff with its merge base is unchanged
  207. func checkIfPRContentChanged(pr *models.PullRequest, oldCommitID, newCommitID string) (hasChanged bool, err error) {
  208. if err = pr.GetHeadRepo(); err != nil {
  209. return false, fmt.Errorf("GetHeadRepo: %v", err)
  210. } else if pr.HeadRepo == nil {
  211. // corrupt data assumed changed
  212. return true, nil
  213. }
  214. if err = pr.GetBaseRepo(); err != nil {
  215. return false, fmt.Errorf("GetBaseRepo: %v", err)
  216. }
  217. headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
  218. if err != nil {
  219. return false, fmt.Errorf("OpenRepository: %v", err)
  220. }
  221. defer headGitRepo.Close()
  222. // Add a temporary remote.
  223. tmpRemote := "checkIfPRContentChanged-" + com.ToStr(time.Now().UnixNano())
  224. if err = headGitRepo.AddRemote(tmpRemote, pr.BaseRepo.RepoPath(), true); err != nil {
  225. return false, fmt.Errorf("AddRemote: %s/%s-%s: %v", pr.HeadRepo.OwnerName, pr.HeadRepo.Name, tmpRemote, err)
  226. }
  227. defer func() {
  228. if err := headGitRepo.RemoveRemote(tmpRemote); err != nil {
  229. log.Error("checkIfPRContentChanged: RemoveRemote: %s/%s-%s: %v", pr.HeadRepo.OwnerName, pr.HeadRepo.Name, tmpRemote, err)
  230. }
  231. }()
  232. // To synchronize repo and get a base ref
  233. _, base, err := headGitRepo.GetMergeBase(tmpRemote, pr.BaseBranch, pr.HeadBranch)
  234. if err != nil {
  235. return false, fmt.Errorf("GetMergeBase: %v", err)
  236. }
  237. diffBefore := &bytes.Buffer{}
  238. diffAfter := &bytes.Buffer{}
  239. if err := headGitRepo.GetDiffFromMergeBase(base, oldCommitID, diffBefore); err != nil {
  240. // If old commit not found, assume changed.
  241. log.Debug("GetDiffFromMergeBase: %v", err)
  242. return true, nil
  243. }
  244. if err := headGitRepo.GetDiffFromMergeBase(base, newCommitID, diffAfter); err != nil {
  245. // New commit should be found
  246. return false, fmt.Errorf("GetDiffFromMergeBase: %v", err)
  247. }
  248. diffBeforeLines := bufio.NewScanner(diffBefore)
  249. diffAfterLines := bufio.NewScanner(diffAfter)
  250. for diffBeforeLines.Scan() && diffAfterLines.Scan() {
  251. if strings.HasPrefix(diffBeforeLines.Text(), "index") && strings.HasPrefix(diffAfterLines.Text(), "index") {
  252. // file hashes can change without the diff changing
  253. continue
  254. } else if strings.HasPrefix(diffBeforeLines.Text(), "@@") && strings.HasPrefix(diffAfterLines.Text(), "@@") {
  255. // the location of the difference may change
  256. continue
  257. } else if !bytes.Equal(diffBeforeLines.Bytes(), diffAfterLines.Bytes()) {
  258. return true, nil
  259. }
  260. }
  261. if diffBeforeLines.Scan() || diffAfterLines.Scan() {
  262. // Diffs not of equal length
  263. return true, nil
  264. }
  265. return false, nil
  266. }
  267. // PushToBaseRepo pushes commits from branches of head repository to
  268. // corresponding branches of base repository.
  269. // FIXME: Only push branches that are actually updates?
  270. func PushToBaseRepo(pr *models.PullRequest) (err error) {
  271. log.Trace("PushToBaseRepo[%d]: pushing commits to base repo '%s'", pr.BaseRepoID, pr.GetGitRefName())
  272. // Clone base repo.
  273. tmpBasePath, err := models.CreateTemporaryPath("pull")
  274. if err != nil {
  275. log.Error("CreateTemporaryPath: %v", err)
  276. return err
  277. }
  278. defer func() {
  279. err := models.RemoveTemporaryPath(tmpBasePath)
  280. if err != nil {
  281. log.Error("Error whilst removing temporary path: %s Error: %v", tmpBasePath, err)
  282. }
  283. }()
  284. headRepoPath := pr.HeadRepo.RepoPath()
  285. if err := git.Clone(headRepoPath, tmpBasePath, git.CloneRepoOptions{
  286. Bare: true,
  287. Shared: true,
  288. Branch: pr.HeadBranch,
  289. Quiet: true,
  290. }); err != nil {
  291. log.Error("git clone tmpBasePath: %v", err)
  292. return err
  293. }
  294. gitRepo, err := git.OpenRepository(tmpBasePath)
  295. if err != nil {
  296. return fmt.Errorf("OpenRepository: %v", err)
  297. }
  298. if err := gitRepo.AddRemote("base", pr.BaseRepo.RepoPath(), false); err != nil {
  299. return fmt.Errorf("tmpGitRepo.AddRemote: %v", err)
  300. }
  301. defer gitRepo.Close()
  302. headFile := pr.GetGitRefName()
  303. // Remove head in case there is a conflict.
  304. file := path.Join(pr.BaseRepo.RepoPath(), headFile)
  305. _ = os.Remove(file)
  306. if err = pr.LoadIssue(); err != nil {
  307. return fmt.Errorf("unable to load issue %d for pr %d: %v", pr.IssueID, pr.ID, err)
  308. }
  309. if err = pr.Issue.LoadPoster(); err != nil {
  310. return fmt.Errorf("unable to load poster %d for pr %d: %v", pr.Issue.PosterID, pr.ID, err)
  311. }
  312. if err = git.Push(tmpBasePath, git.PushOptions{
  313. Remote: "base",
  314. Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile),
  315. Force: true,
  316. // Use InternalPushingEnvironment here because we know that pre-receive and post-receive do not run on a refs/pulls/...
  317. Env: models.InternalPushingEnvironment(pr.Issue.Poster, pr.BaseRepo),
  318. }); err != nil {
  319. return fmt.Errorf("Push: %s:%s %s:%s %v", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), headFile, err)
  320. }
  321. return nil
  322. }
  323. type errlist []error
  324. func (errs errlist) Error() string {
  325. if len(errs) > 0 {
  326. var buf strings.Builder
  327. for i, err := range errs {
  328. if i > 0 {
  329. buf.WriteString(", ")
  330. }
  331. buf.WriteString(err.Error())
  332. }
  333. return buf.String()
  334. }
  335. return ""
  336. }
  337. // CloseBranchPulls close all the pull requests who's head branch is the branch
  338. func CloseBranchPulls(doer *models.User, repoID int64, branch string) error {
  339. prs, err := models.GetUnmergedPullRequestsByHeadInfo(repoID, branch)
  340. if err != nil {
  341. return err
  342. }
  343. prs2, err := models.GetUnmergedPullRequestsByBaseInfo(repoID, branch)
  344. if err != nil {
  345. return err
  346. }
  347. prs = append(prs, prs2...)
  348. if err := models.PullRequestList(prs).LoadAttributes(); err != nil {
  349. return err
  350. }
  351. var errs errlist
  352. for _, pr := range prs {
  353. if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrIssueWasClosed(err) {
  354. errs = append(errs, err)
  355. }
  356. }
  357. if len(errs) > 0 {
  358. return errs
  359. }
  360. return nil
  361. }
  362. // CloseRepoBranchesPulls close all pull requests which head branches are in the given repository
  363. func CloseRepoBranchesPulls(doer *models.User, repo *models.Repository) error {
  364. branches, err := git.GetBranchesByPath(repo.RepoPath())
  365. if err != nil {
  366. return err
  367. }
  368. var errs errlist
  369. for _, branch := range branches {
  370. prs, err := models.GetUnmergedPullRequestsByHeadInfo(repo.ID, branch.Name)
  371. if err != nil {
  372. return err
  373. }
  374. if err = models.PullRequestList(prs).LoadAttributes(); err != nil {
  375. return err
  376. }
  377. for _, pr := range prs {
  378. if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrIssueWasClosed(err) {
  379. errs = append(errs, err)
  380. }
  381. }
  382. }
  383. if len(errs) > 0 {
  384. return errs
  385. }
  386. return nil
  387. }