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 28KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008
  1. // Copyright 2015 The Gogs Authors. All rights reserved.
  2. // Copyright 2019 The Gitea Authors. All rights reserved.
  3. // Use of this source code is governed by a MIT-style
  4. // license that can be found in the LICENSE file.
  5. package models
  6. import (
  7. "bufio"
  8. "fmt"
  9. "io/ioutil"
  10. "os"
  11. "path"
  12. "path/filepath"
  13. "strconv"
  14. "strings"
  15. "time"
  16. "code.gitea.io/gitea/modules/git"
  17. "code.gitea.io/gitea/modules/log"
  18. "code.gitea.io/gitea/modules/setting"
  19. api "code.gitea.io/gitea/modules/structs"
  20. "code.gitea.io/gitea/modules/sync"
  21. "code.gitea.io/gitea/modules/timeutil"
  22. "github.com/unknwon/com"
  23. )
  24. var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
  25. // PullRequestType defines pull request type
  26. type PullRequestType int
  27. // Enumerate all the pull request types
  28. const (
  29. PullRequestGitea PullRequestType = iota
  30. PullRequestGit
  31. )
  32. // PullRequestStatus defines pull request status
  33. type PullRequestStatus int
  34. // Enumerate all the pull request status
  35. const (
  36. PullRequestStatusConflict PullRequestStatus = iota
  37. PullRequestStatusChecking
  38. PullRequestStatusMergeable
  39. PullRequestStatusManuallyMerged
  40. )
  41. // PullRequest represents relation between pull request and repositories.
  42. type PullRequest struct {
  43. ID int64 `xorm:"pk autoincr"`
  44. Type PullRequestType
  45. Status PullRequestStatus
  46. ConflictedFiles []string `xorm:"TEXT JSON"`
  47. IssueID int64 `xorm:"INDEX"`
  48. Issue *Issue `xorm:"-"`
  49. Index int64
  50. HeadRepoID int64 `xorm:"INDEX"`
  51. HeadRepo *Repository `xorm:"-"`
  52. BaseRepoID int64 `xorm:"INDEX"`
  53. BaseRepo *Repository `xorm:"-"`
  54. HeadBranch string
  55. BaseBranch string
  56. ProtectedBranch *ProtectedBranch `xorm:"-"`
  57. MergeBase string `xorm:"VARCHAR(40)"`
  58. HasMerged bool `xorm:"INDEX"`
  59. MergedCommitID string `xorm:"VARCHAR(40)"`
  60. MergerID int64 `xorm:"INDEX"`
  61. Merger *User `xorm:"-"`
  62. MergedUnix timeutil.TimeStamp `xorm:"updated INDEX"`
  63. }
  64. // MustHeadUserName returns the HeadRepo's username if failed return blank
  65. func (pr *PullRequest) MustHeadUserName() string {
  66. if err := pr.LoadHeadRepo(); err != nil {
  67. log.Error("LoadHeadRepo: %v", err)
  68. return ""
  69. }
  70. return pr.HeadRepo.MustOwnerName()
  71. }
  72. // Note: don't try to get Issue because will end up recursive querying.
  73. func (pr *PullRequest) loadAttributes(e Engine) (err error) {
  74. if pr.HasMerged && pr.Merger == nil {
  75. pr.Merger, err = getUserByID(e, pr.MergerID)
  76. if IsErrUserNotExist(err) {
  77. pr.MergerID = -1
  78. pr.Merger = NewGhostUser()
  79. } else if err != nil {
  80. return fmt.Errorf("getUserByID [%d]: %v", pr.MergerID, err)
  81. }
  82. }
  83. return nil
  84. }
  85. // LoadAttributes loads pull request attributes from database
  86. func (pr *PullRequest) LoadAttributes() error {
  87. return pr.loadAttributes(x)
  88. }
  89. // LoadBaseRepo loads pull request base repository from database
  90. func (pr *PullRequest) LoadBaseRepo() error {
  91. if pr.BaseRepo == nil {
  92. if pr.HeadRepoID == pr.BaseRepoID && pr.HeadRepo != nil {
  93. pr.BaseRepo = pr.HeadRepo
  94. return nil
  95. }
  96. var repo Repository
  97. if has, err := x.ID(pr.BaseRepoID).Get(&repo); err != nil {
  98. return err
  99. } else if !has {
  100. return ErrRepoNotExist{ID: pr.BaseRepoID}
  101. }
  102. pr.BaseRepo = &repo
  103. }
  104. return nil
  105. }
  106. // LoadHeadRepo loads pull request head repository from database
  107. func (pr *PullRequest) LoadHeadRepo() error {
  108. if pr.HeadRepo == nil {
  109. if pr.HeadRepoID == pr.BaseRepoID && pr.BaseRepo != nil {
  110. pr.HeadRepo = pr.BaseRepo
  111. return nil
  112. }
  113. var repo Repository
  114. if has, err := x.ID(pr.HeadRepoID).Get(&repo); err != nil {
  115. return err
  116. } else if !has {
  117. return ErrRepoNotExist{ID: pr.BaseRepoID}
  118. }
  119. pr.HeadRepo = &repo
  120. }
  121. return nil
  122. }
  123. // LoadIssue loads issue information from database
  124. func (pr *PullRequest) LoadIssue() (err error) {
  125. return pr.loadIssue(x)
  126. }
  127. func (pr *PullRequest) loadIssue(e Engine) (err error) {
  128. if pr.Issue != nil {
  129. return nil
  130. }
  131. pr.Issue, err = getIssueByID(e, pr.IssueID)
  132. if err == nil {
  133. pr.Issue.PullRequest = pr
  134. }
  135. return err
  136. }
  137. // LoadProtectedBranch loads the protected branch of the base branch
  138. func (pr *PullRequest) LoadProtectedBranch() (err error) {
  139. if pr.BaseRepo == nil {
  140. if pr.BaseRepoID == 0 {
  141. return nil
  142. }
  143. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  144. if err != nil {
  145. return
  146. }
  147. }
  148. pr.ProtectedBranch, err = GetProtectedBranchBy(pr.BaseRepo.ID, pr.BaseBranch)
  149. return
  150. }
  151. // GetDefaultMergeMessage returns default message used when merging pull request
  152. func (pr *PullRequest) GetDefaultMergeMessage() string {
  153. if pr.HeadRepo == nil {
  154. var err error
  155. pr.HeadRepo, err = GetRepositoryByID(pr.HeadRepoID)
  156. if err != nil {
  157. log.Error("GetRepositoryById[%d]: %v", pr.HeadRepoID, err)
  158. return ""
  159. }
  160. }
  161. return fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.MustHeadUserName(), pr.HeadRepo.Name, pr.BaseBranch)
  162. }
  163. // GetDefaultSquashMessage returns default message used when squash and merging pull request
  164. func (pr *PullRequest) GetDefaultSquashMessage() string {
  165. if err := pr.LoadIssue(); err != nil {
  166. log.Error("LoadIssue: %v", err)
  167. return ""
  168. }
  169. return fmt.Sprintf("%s (#%d)", pr.Issue.Title, pr.Issue.Index)
  170. }
  171. // GetGitRefName returns git ref for hidden pull request branch
  172. func (pr *PullRequest) GetGitRefName() string {
  173. return fmt.Sprintf("refs/pull/%d/head", pr.Index)
  174. }
  175. // APIFormat assumes following fields have been assigned with valid values:
  176. // Required - Issue
  177. // Optional - Merger
  178. func (pr *PullRequest) APIFormat() *api.PullRequest {
  179. return pr.apiFormat(x)
  180. }
  181. func (pr *PullRequest) apiFormat(e Engine) *api.PullRequest {
  182. var (
  183. baseBranch *git.Branch
  184. headBranch *git.Branch
  185. baseCommit *git.Commit
  186. headCommit *git.Commit
  187. err error
  188. )
  189. if err = pr.Issue.loadRepo(e); err != nil {
  190. log.Error("loadRepo[%d]: %v", pr.ID, err)
  191. return nil
  192. }
  193. apiIssue := pr.Issue.apiFormat(e)
  194. if pr.BaseRepo == nil {
  195. pr.BaseRepo, err = getRepositoryByID(e, pr.BaseRepoID)
  196. if err != nil {
  197. log.Error("GetRepositoryById[%d]: %v", pr.ID, err)
  198. return nil
  199. }
  200. }
  201. if pr.HeadRepo == nil {
  202. pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
  203. if err != nil {
  204. log.Error("GetRepositoryById[%d]: %v", pr.ID, err)
  205. return nil
  206. }
  207. }
  208. if err = pr.Issue.loadRepo(e); err != nil {
  209. log.Error("pr.Issue.loadRepo[%d]: %v", pr.ID, err)
  210. return nil
  211. }
  212. apiPullRequest := &api.PullRequest{
  213. ID: pr.ID,
  214. URL: pr.Issue.HTMLURL(),
  215. Index: pr.Index,
  216. Poster: apiIssue.Poster,
  217. Title: apiIssue.Title,
  218. Body: apiIssue.Body,
  219. Labels: apiIssue.Labels,
  220. Milestone: apiIssue.Milestone,
  221. Assignee: apiIssue.Assignee,
  222. Assignees: apiIssue.Assignees,
  223. State: apiIssue.State,
  224. Comments: apiIssue.Comments,
  225. HTMLURL: pr.Issue.HTMLURL(),
  226. DiffURL: pr.Issue.DiffURL(),
  227. PatchURL: pr.Issue.PatchURL(),
  228. HasMerged: pr.HasMerged,
  229. MergeBase: pr.MergeBase,
  230. Deadline: apiIssue.Deadline,
  231. Created: pr.Issue.CreatedUnix.AsTimePtr(),
  232. Updated: pr.Issue.UpdatedUnix.AsTimePtr(),
  233. }
  234. baseBranch, err = pr.BaseRepo.GetBranch(pr.BaseBranch)
  235. if err != nil {
  236. if git.IsErrBranchNotExist(err) {
  237. apiPullRequest.Base = nil
  238. } else {
  239. log.Error("GetBranch[%s]: %v", pr.BaseBranch, err)
  240. return nil
  241. }
  242. } else {
  243. apiBaseBranchInfo := &api.PRBranchInfo{
  244. Name: pr.BaseBranch,
  245. Ref: pr.BaseBranch,
  246. RepoID: pr.BaseRepoID,
  247. Repository: pr.BaseRepo.innerAPIFormat(e, AccessModeNone, false),
  248. }
  249. baseCommit, err = baseBranch.GetCommit()
  250. if err != nil {
  251. if git.IsErrNotExist(err) {
  252. apiBaseBranchInfo.Sha = ""
  253. } else {
  254. log.Error("GetCommit[%s]: %v", baseBranch.Name, err)
  255. return nil
  256. }
  257. } else {
  258. apiBaseBranchInfo.Sha = baseCommit.ID.String()
  259. }
  260. apiPullRequest.Base = apiBaseBranchInfo
  261. }
  262. headBranch, err = pr.HeadRepo.GetBranch(pr.HeadBranch)
  263. if err != nil {
  264. if git.IsErrBranchNotExist(err) {
  265. apiPullRequest.Head = nil
  266. } else {
  267. log.Error("GetBranch[%s]: %v", pr.HeadBranch, err)
  268. return nil
  269. }
  270. } else {
  271. apiHeadBranchInfo := &api.PRBranchInfo{
  272. Name: pr.HeadBranch,
  273. Ref: pr.HeadBranch,
  274. RepoID: pr.HeadRepoID,
  275. Repository: pr.HeadRepo.innerAPIFormat(e, AccessModeNone, false),
  276. }
  277. headCommit, err = headBranch.GetCommit()
  278. if err != nil {
  279. if git.IsErrNotExist(err) {
  280. apiHeadBranchInfo.Sha = ""
  281. } else {
  282. log.Error("GetCommit[%s]: %v", headBranch.Name, err)
  283. return nil
  284. }
  285. } else {
  286. apiHeadBranchInfo.Sha = headCommit.ID.String()
  287. }
  288. apiPullRequest.Head = apiHeadBranchInfo
  289. }
  290. if pr.Status != PullRequestStatusChecking {
  291. mergeable := pr.Status != PullRequestStatusConflict && !pr.IsWorkInProgress()
  292. apiPullRequest.Mergeable = mergeable
  293. }
  294. if pr.HasMerged {
  295. apiPullRequest.Merged = pr.MergedUnix.AsTimePtr()
  296. apiPullRequest.MergedCommitID = &pr.MergedCommitID
  297. apiPullRequest.MergedBy = pr.Merger.APIFormat()
  298. }
  299. return apiPullRequest
  300. }
  301. func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
  302. pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
  303. if err != nil && !IsErrRepoNotExist(err) {
  304. return fmt.Errorf("getRepositoryByID(head): %v", err)
  305. }
  306. return nil
  307. }
  308. // GetHeadRepo loads the head repository
  309. func (pr *PullRequest) GetHeadRepo() error {
  310. return pr.getHeadRepo(x)
  311. }
  312. // GetBaseRepo loads the target repository
  313. func (pr *PullRequest) GetBaseRepo() (err error) {
  314. if pr.BaseRepo != nil {
  315. return nil
  316. }
  317. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  318. if err != nil {
  319. return fmt.Errorf("GetRepositoryByID(base): %v", err)
  320. }
  321. return nil
  322. }
  323. // IsChecking returns true if this pull request is still checking conflict.
  324. func (pr *PullRequest) IsChecking() bool {
  325. return pr.Status == PullRequestStatusChecking
  326. }
  327. // CanAutoMerge returns true if this pull request can be merged automatically.
  328. func (pr *PullRequest) CanAutoMerge() bool {
  329. return pr.Status == PullRequestStatusMergeable
  330. }
  331. // GetLastCommitStatus returns the last commit status for this pull request.
  332. func (pr *PullRequest) GetLastCommitStatus() (status *CommitStatus, err error) {
  333. if err = pr.GetHeadRepo(); err != nil {
  334. return nil, err
  335. }
  336. if pr.HeadRepo == nil {
  337. return nil, ErrPullRequestHeadRepoMissing{pr.ID, pr.HeadRepoID}
  338. }
  339. headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
  340. if err != nil {
  341. return nil, err
  342. }
  343. defer headGitRepo.Close()
  344. lastCommitID, err := headGitRepo.GetBranchCommitID(pr.HeadBranch)
  345. if err != nil {
  346. return nil, err
  347. }
  348. err = pr.LoadBaseRepo()
  349. if err != nil {
  350. return nil, err
  351. }
  352. statusList, err := GetLatestCommitStatus(pr.BaseRepo, lastCommitID, 0)
  353. if err != nil {
  354. return nil, err
  355. }
  356. return CalcCommitStatus(statusList), nil
  357. }
  358. // MergeStyle represents the approach to merge commits into base branch.
  359. type MergeStyle string
  360. const (
  361. // MergeStyleMerge create merge commit
  362. MergeStyleMerge MergeStyle = "merge"
  363. // MergeStyleRebase rebase before merging
  364. MergeStyleRebase MergeStyle = "rebase"
  365. // MergeStyleRebaseMerge rebase before merging with merge commit (--no-ff)
  366. MergeStyleRebaseMerge MergeStyle = "rebase-merge"
  367. // MergeStyleSquash squash commits into single commit before merging
  368. MergeStyleSquash MergeStyle = "squash"
  369. )
  370. // CheckUserAllowedToMerge checks whether the user is allowed to merge
  371. func (pr *PullRequest) CheckUserAllowedToMerge(doer *User) (err error) {
  372. if doer == nil {
  373. return ErrNotAllowedToMerge{
  374. "Not signed in",
  375. }
  376. }
  377. if pr.BaseRepo == nil {
  378. if err = pr.GetBaseRepo(); err != nil {
  379. return fmt.Errorf("GetBaseRepo: %v", err)
  380. }
  381. }
  382. if protected, err := pr.BaseRepo.IsProtectedBranchForMerging(pr, pr.BaseBranch, doer); err != nil {
  383. return fmt.Errorf("IsProtectedBranch: %v", err)
  384. } else if protected {
  385. return ErrNotAllowedToMerge{
  386. "The branch is protected",
  387. }
  388. }
  389. return nil
  390. }
  391. // SetMerged sets a pull request to merged and closes the corresponding issue
  392. func (pr *PullRequest) SetMerged() (err error) {
  393. if pr.HasMerged {
  394. return fmt.Errorf("PullRequest[%d] already merged", pr.Index)
  395. }
  396. if pr.MergedCommitID == "" || pr.MergedUnix == 0 || pr.Merger == nil {
  397. return fmt.Errorf("Unable to merge PullRequest[%d], some required fields are empty", pr.Index)
  398. }
  399. pr.HasMerged = true
  400. sess := x.NewSession()
  401. defer sess.Close()
  402. if err = sess.Begin(); err != nil {
  403. return err
  404. }
  405. if err = pr.loadIssue(sess); err != nil {
  406. return err
  407. }
  408. if err = pr.Issue.loadRepo(sess); err != nil {
  409. return err
  410. }
  411. if err = pr.Issue.Repo.getOwner(sess); err != nil {
  412. return err
  413. }
  414. if err = pr.Issue.changeStatus(sess, pr.Merger, true); err != nil {
  415. return fmt.Errorf("Issue.changeStatus: %v", err)
  416. }
  417. if _, err = sess.ID(pr.ID).Cols("has_merged, status, merged_commit_id, merger_id, merged_unix").Update(pr); err != nil {
  418. return fmt.Errorf("update pull request: %v", err)
  419. }
  420. if err = sess.Commit(); err != nil {
  421. return fmt.Errorf("Commit: %v", err)
  422. }
  423. return nil
  424. }
  425. // manuallyMerged checks if a pull request got manually merged
  426. // When a pull request got manually merged mark the pull request as merged
  427. func (pr *PullRequest) manuallyMerged() bool {
  428. commit, err := pr.getMergeCommit()
  429. if err != nil {
  430. log.Error("PullRequest[%d].getMergeCommit: %v", pr.ID, err)
  431. return false
  432. }
  433. if commit != nil {
  434. pr.MergedCommitID = commit.ID.String()
  435. pr.MergedUnix = timeutil.TimeStamp(commit.Author.When.Unix())
  436. pr.Status = PullRequestStatusManuallyMerged
  437. merger, _ := GetUserByEmail(commit.Author.Email)
  438. // When the commit author is unknown set the BaseRepo owner as merger
  439. if merger == nil {
  440. if pr.BaseRepo.Owner == nil {
  441. if err = pr.BaseRepo.getOwner(x); err != nil {
  442. log.Error("BaseRepo.getOwner[%d]: %v", pr.ID, err)
  443. return false
  444. }
  445. }
  446. merger = pr.BaseRepo.Owner
  447. }
  448. pr.Merger = merger
  449. pr.MergerID = merger.ID
  450. if err = pr.SetMerged(); err != nil {
  451. log.Error("PullRequest[%d].setMerged : %v", pr.ID, err)
  452. return false
  453. }
  454. log.Info("manuallyMerged[%d]: Marked as manually merged into %s/%s by commit id: %s", pr.ID, pr.BaseRepo.Name, pr.BaseBranch, commit.ID.String())
  455. return true
  456. }
  457. return false
  458. }
  459. // getMergeCommit checks if a pull request got merged
  460. // Returns the git.Commit of the pull request if merged
  461. func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
  462. if pr.BaseRepo == nil {
  463. var err error
  464. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  465. if err != nil {
  466. return nil, fmt.Errorf("GetRepositoryByID: %v", err)
  467. }
  468. }
  469. indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
  470. defer os.Remove(indexTmpPath)
  471. headFile := pr.GetGitRefName()
  472. // Check if a pull request is merged into BaseBranch
  473. _, err := git.NewCommand("merge-base", "--is-ancestor", headFile, pr.BaseBranch).RunInDirWithEnv(pr.BaseRepo.RepoPath(), []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()})
  474. if err != nil {
  475. // Errors are signaled by a non-zero status that is not 1
  476. if strings.Contains(err.Error(), "exit status 1") {
  477. return nil, nil
  478. }
  479. return nil, fmt.Errorf("git merge-base --is-ancestor: %v", err)
  480. }
  481. commitIDBytes, err := ioutil.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile)
  482. if err != nil {
  483. return nil, fmt.Errorf("ReadFile(%s): %v", headFile, err)
  484. }
  485. commitID := string(commitIDBytes)
  486. if len(commitID) < 40 {
  487. return nil, fmt.Errorf(`ReadFile(%s): invalid commit-ID "%s"`, headFile, commitID)
  488. }
  489. cmd := commitID[:40] + ".." + pr.BaseBranch
  490. // Get the commit from BaseBranch where the pull request got merged
  491. mergeCommit, err := git.NewCommand("rev-list", "--ancestry-path", "--merges", "--reverse", cmd).RunInDirWithEnv("", []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()})
  492. if err != nil {
  493. return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v", err)
  494. } else if len(mergeCommit) < 40 {
  495. // PR was fast-forwarded, so just use last commit of PR
  496. mergeCommit = commitID[:40]
  497. }
  498. gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
  499. if err != nil {
  500. return nil, fmt.Errorf("OpenRepository: %v", err)
  501. }
  502. defer gitRepo.Close()
  503. commit, err := gitRepo.GetCommit(mergeCommit[:40])
  504. if err != nil {
  505. return nil, fmt.Errorf("GetCommit: %v", err)
  506. }
  507. return commit, nil
  508. }
  509. // patchConflicts is a list of conflict description from Git.
  510. var patchConflicts = []string{
  511. "patch does not apply",
  512. "already exists in working directory",
  513. "unrecognized input",
  514. "error:",
  515. }
  516. // testPatch checks if patch can be merged to base repository without conflict.
  517. func (pr *PullRequest) testPatch(e Engine) (err error) {
  518. if pr.BaseRepo == nil {
  519. pr.BaseRepo, err = getRepositoryByID(e, pr.BaseRepoID)
  520. if err != nil {
  521. return fmt.Errorf("GetRepositoryByID: %v", err)
  522. }
  523. }
  524. patchPath, err := pr.BaseRepo.patchPath(e, pr.Index)
  525. if err != nil {
  526. return fmt.Errorf("BaseRepo.PatchPath: %v", err)
  527. }
  528. // Fast fail if patch does not exist, this assumes data is corrupted.
  529. if !com.IsFile(patchPath) {
  530. log.Trace("PullRequest[%d].testPatch: ignored corrupted data", pr.ID)
  531. return nil
  532. }
  533. repoWorkingPool.CheckIn(com.ToStr(pr.BaseRepoID))
  534. defer repoWorkingPool.CheckOut(com.ToStr(pr.BaseRepoID))
  535. log.Trace("PullRequest[%d].testPatch (patchPath): %s", pr.ID, patchPath)
  536. pr.Status = PullRequestStatusChecking
  537. indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
  538. defer os.Remove(indexTmpPath)
  539. _, err = git.NewCommand("read-tree", pr.BaseBranch).RunInDirWithEnv("", []string{"GIT_DIR=" + pr.BaseRepo.RepoPath(), "GIT_INDEX_FILE=" + indexTmpPath})
  540. if err != nil {
  541. return fmt.Errorf("git read-tree --index-output=%s %s: %v", indexTmpPath, pr.BaseBranch, err)
  542. }
  543. prUnit, err := pr.BaseRepo.getUnit(e, UnitTypePullRequests)
  544. if err != nil {
  545. return err
  546. }
  547. prConfig := prUnit.PullRequestsConfig()
  548. args := []string{"apply", "--check", "--cached"}
  549. if prConfig.IgnoreWhitespaceConflicts {
  550. args = append(args, "--ignore-whitespace")
  551. }
  552. args = append(args, patchPath)
  553. pr.ConflictedFiles = []string{}
  554. stderrBuilder := new(strings.Builder)
  555. err = git.NewCommand(args...).RunInDirTimeoutEnvPipeline(
  556. []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
  557. -1,
  558. "",
  559. nil,
  560. stderrBuilder)
  561. stderr := stderrBuilder.String()
  562. if err != nil {
  563. for i := range patchConflicts {
  564. if strings.Contains(stderr, patchConflicts[i]) {
  565. log.Trace("PullRequest[%d].testPatch (apply): has conflict: %s", pr.ID, stderr)
  566. const prefix = "error: patch failed:"
  567. pr.Status = PullRequestStatusConflict
  568. pr.ConflictedFiles = make([]string, 0, 5)
  569. scanner := bufio.NewScanner(strings.NewReader(stderr))
  570. for scanner.Scan() {
  571. line := scanner.Text()
  572. if strings.HasPrefix(line, prefix) {
  573. var found bool
  574. var filepath = strings.TrimSpace(strings.Split(line[len(prefix):], ":")[0])
  575. for _, f := range pr.ConflictedFiles {
  576. if f == filepath {
  577. found = true
  578. break
  579. }
  580. }
  581. if !found {
  582. pr.ConflictedFiles = append(pr.ConflictedFiles, filepath)
  583. }
  584. }
  585. // only list 10 conflicted files
  586. if len(pr.ConflictedFiles) >= 10 {
  587. break
  588. }
  589. }
  590. if len(pr.ConflictedFiles) > 0 {
  591. log.Trace("Found %d files conflicted: %v", len(pr.ConflictedFiles), pr.ConflictedFiles)
  592. }
  593. return nil
  594. }
  595. }
  596. return fmt.Errorf("git apply --check: %v - %s", err, stderr)
  597. }
  598. return nil
  599. }
  600. // NewPullRequest creates new pull request with labels for repository.
  601. func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte) (err error) {
  602. // Retry several times in case INSERT fails due to duplicate key for (repo_id, index); see #7887
  603. i := 0
  604. for {
  605. if err = newPullRequestAttempt(repo, pull, labelIDs, uuids, pr, patch); err == nil {
  606. return nil
  607. }
  608. if !IsErrNewIssueInsert(err) {
  609. return err
  610. }
  611. if i++; i == issueMaxDupIndexAttempts {
  612. break
  613. }
  614. log.Error("NewPullRequest: error attempting to insert the new issue; will retry. Original error: %v", err)
  615. }
  616. return fmt.Errorf("NewPullRequest: too many errors attempting to insert the new issue. Last error was: %v", err)
  617. }
  618. func newPullRequestAttempt(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte) (err error) {
  619. sess := x.NewSession()
  620. defer sess.Close()
  621. if err = sess.Begin(); err != nil {
  622. return err
  623. }
  624. if err = newIssue(sess, pull.Poster, NewIssueOptions{
  625. Repo: repo,
  626. Issue: pull,
  627. LabelIDs: labelIDs,
  628. Attachments: uuids,
  629. IsPull: true,
  630. }); err != nil {
  631. if IsErrUserDoesNotHaveAccessToRepo(err) || IsErrNewIssueInsert(err) {
  632. return err
  633. }
  634. return fmt.Errorf("newIssue: %v", err)
  635. }
  636. pr.Index = pull.Index
  637. pr.BaseRepo = repo
  638. pr.Status = PullRequestStatusChecking
  639. if len(patch) > 0 {
  640. if err = repo.savePatch(sess, pr.Index, patch); err != nil {
  641. return fmt.Errorf("SavePatch: %v", err)
  642. }
  643. if err = pr.testPatch(sess); err != nil {
  644. return fmt.Errorf("testPatch: %v", err)
  645. }
  646. }
  647. // No conflict appears after test means mergeable.
  648. if pr.Status == PullRequestStatusChecking {
  649. pr.Status = PullRequestStatusMergeable
  650. }
  651. pr.IssueID = pull.ID
  652. if _, err = sess.Insert(pr); err != nil {
  653. return fmt.Errorf("insert pull repo: %v", err)
  654. }
  655. if err = sess.Commit(); err != nil {
  656. return fmt.Errorf("Commit: %v", err)
  657. }
  658. return nil
  659. }
  660. // GetUnmergedPullRequest returns a pull request that is open and has not been merged
  661. // by given head/base and repo/branch.
  662. func GetUnmergedPullRequest(headRepoID, baseRepoID int64, headBranch, baseBranch string) (*PullRequest, error) {
  663. pr := new(PullRequest)
  664. has, err := x.
  665. Where("head_repo_id=? AND head_branch=? AND base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  666. headRepoID, headBranch, baseRepoID, baseBranch, false, false).
  667. Join("INNER", "issue", "issue.id=pull_request.issue_id").
  668. Get(pr)
  669. if err != nil {
  670. return nil, err
  671. } else if !has {
  672. return nil, ErrPullRequestNotExist{0, 0, headRepoID, baseRepoID, headBranch, baseBranch}
  673. }
  674. return pr, nil
  675. }
  676. // GetLatestPullRequestByHeadInfo returns the latest pull request (regardless of its status)
  677. // by given head information (repo and branch).
  678. func GetLatestPullRequestByHeadInfo(repoID int64, branch string) (*PullRequest, error) {
  679. pr := new(PullRequest)
  680. has, err := x.
  681. Where("head_repo_id = ? AND head_branch = ?", repoID, branch).
  682. OrderBy("id DESC").
  683. Get(pr)
  684. if !has {
  685. return nil, err
  686. }
  687. return pr, err
  688. }
  689. // GetPullRequestByIndex returns a pull request by the given index
  690. func GetPullRequestByIndex(repoID int64, index int64) (*PullRequest, error) {
  691. pr := &PullRequest{
  692. BaseRepoID: repoID,
  693. Index: index,
  694. }
  695. has, err := x.Get(pr)
  696. if err != nil {
  697. return nil, err
  698. } else if !has {
  699. return nil, ErrPullRequestNotExist{0, 0, 0, repoID, "", ""}
  700. }
  701. if err = pr.LoadAttributes(); err != nil {
  702. return nil, err
  703. }
  704. if err = pr.LoadIssue(); err != nil {
  705. return nil, err
  706. }
  707. return pr, nil
  708. }
  709. func getPullRequestByID(e Engine, id int64) (*PullRequest, error) {
  710. pr := new(PullRequest)
  711. has, err := e.ID(id).Get(pr)
  712. if err != nil {
  713. return nil, err
  714. } else if !has {
  715. return nil, ErrPullRequestNotExist{id, 0, 0, 0, "", ""}
  716. }
  717. return pr, pr.loadAttributes(e)
  718. }
  719. // GetPullRequestByID returns a pull request by given ID.
  720. func GetPullRequestByID(id int64) (*PullRequest, error) {
  721. return getPullRequestByID(x, id)
  722. }
  723. func getPullRequestByIssueID(e Engine, issueID int64) (*PullRequest, error) {
  724. pr := &PullRequest{
  725. IssueID: issueID,
  726. }
  727. has, err := e.Get(pr)
  728. if err != nil {
  729. return nil, err
  730. } else if !has {
  731. return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""}
  732. }
  733. return pr, pr.loadAttributes(e)
  734. }
  735. // GetPullRequestByIssueID returns pull request by given issue ID.
  736. func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
  737. return getPullRequestByIssueID(x, issueID)
  738. }
  739. // Update updates all fields of pull request.
  740. func (pr *PullRequest) Update() error {
  741. _, err := x.ID(pr.ID).AllCols().Update(pr)
  742. return err
  743. }
  744. // UpdateCols updates specific fields of pull request.
  745. func (pr *PullRequest) UpdateCols(cols ...string) error {
  746. _, err := x.ID(pr.ID).Cols(cols...).Update(pr)
  747. return err
  748. }
  749. // UpdatePatch generates and saves a new patch.
  750. func (pr *PullRequest) UpdatePatch() (err error) {
  751. if err = pr.GetHeadRepo(); err != nil {
  752. return fmt.Errorf("GetHeadRepo: %v", err)
  753. } else if pr.HeadRepo == nil {
  754. log.Trace("PullRequest[%d].UpdatePatch: ignored corrupted data", pr.ID)
  755. return nil
  756. }
  757. if err = pr.GetBaseRepo(); err != nil {
  758. return fmt.Errorf("GetBaseRepo: %v", err)
  759. }
  760. headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
  761. if err != nil {
  762. return fmt.Errorf("OpenRepository: %v", err)
  763. }
  764. defer headGitRepo.Close()
  765. // Add a temporary remote.
  766. tmpRemote := com.ToStr(time.Now().UnixNano())
  767. if err = headGitRepo.AddRemote(tmpRemote, RepoPath(pr.BaseRepo.MustOwner().Name, pr.BaseRepo.Name), true); err != nil {
  768. return fmt.Errorf("AddRemote: %v", err)
  769. }
  770. defer func() {
  771. if err := headGitRepo.RemoveRemote(tmpRemote); err != nil {
  772. log.Error("UpdatePatch: RemoveRemote: %s", err)
  773. }
  774. }()
  775. pr.MergeBase, _, err = headGitRepo.GetMergeBase(tmpRemote, pr.BaseBranch, pr.HeadBranch)
  776. if err != nil {
  777. return fmt.Errorf("GetMergeBase: %v", err)
  778. } else if err = pr.Update(); err != nil {
  779. return fmt.Errorf("Update: %v", err)
  780. }
  781. patch, err := headGitRepo.GetPatch(pr.MergeBase, pr.HeadBranch)
  782. if err != nil {
  783. return fmt.Errorf("GetPatch: %v", err)
  784. }
  785. if err = pr.BaseRepo.SavePatch(pr.Index, patch); err != nil {
  786. return fmt.Errorf("BaseRepo.SavePatch: %v", err)
  787. }
  788. return nil
  789. }
  790. // PushToBaseRepo pushes commits from branches of head repository to
  791. // corresponding branches of base repository.
  792. // FIXME: Only push branches that are actually updates?
  793. func (pr *PullRequest) PushToBaseRepo() (err error) {
  794. log.Trace("PushToBaseRepo[%d]: pushing commits to base repo '%s'", pr.BaseRepoID, pr.GetGitRefName())
  795. headRepoPath := pr.HeadRepo.RepoPath()
  796. headGitRepo, err := git.OpenRepository(headRepoPath)
  797. if err != nil {
  798. return fmt.Errorf("OpenRepository: %v", err)
  799. }
  800. defer headGitRepo.Close()
  801. tmpRemoteName := fmt.Sprintf("tmp-pull-%d", pr.ID)
  802. if err = headGitRepo.AddRemote(tmpRemoteName, pr.BaseRepo.RepoPath(), false); err != nil {
  803. return fmt.Errorf("headGitRepo.AddRemote: %v", err)
  804. }
  805. // Make sure to remove the remote even if the push fails
  806. defer func() {
  807. if err := headGitRepo.RemoveRemote(tmpRemoteName); err != nil {
  808. log.Error("PushToBaseRepo: RemoveRemote: %s", err)
  809. }
  810. }()
  811. headFile := pr.GetGitRefName()
  812. // Remove head in case there is a conflict.
  813. file := path.Join(pr.BaseRepo.RepoPath(), headFile)
  814. _ = os.Remove(file)
  815. if err = git.Push(headRepoPath, git.PushOptions{
  816. Remote: tmpRemoteName,
  817. Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile),
  818. Force: true,
  819. }); err != nil {
  820. return fmt.Errorf("Push: %v", err)
  821. }
  822. return nil
  823. }
  824. // AddToTaskQueue adds itself to pull request test task queue.
  825. func (pr *PullRequest) AddToTaskQueue() {
  826. go pullRequestQueue.AddFunc(pr.ID, func() {
  827. pr.Status = PullRequestStatusChecking
  828. if err := pr.UpdateCols("status"); err != nil {
  829. log.Error("AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
  830. }
  831. })
  832. }
  833. // checkAndUpdateStatus checks if pull request is possible to leaving checking status,
  834. // and set to be either conflict or mergeable.
  835. func (pr *PullRequest) checkAndUpdateStatus() {
  836. // Status is not changed to conflict means mergeable.
  837. if pr.Status == PullRequestStatusChecking {
  838. pr.Status = PullRequestStatusMergeable
  839. }
  840. // Make sure there is no waiting test to process before leaving the checking status.
  841. if !pullRequestQueue.Exist(pr.ID) {
  842. if err := pr.UpdateCols("status, conflicted_files"); err != nil {
  843. log.Error("Update[%d]: %v", pr.ID, err)
  844. }
  845. }
  846. }
  847. // IsWorkInProgress determine if the Pull Request is a Work In Progress by its title
  848. func (pr *PullRequest) IsWorkInProgress() bool {
  849. if err := pr.LoadIssue(); err != nil {
  850. log.Error("LoadIssue: %v", err)
  851. return false
  852. }
  853. for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
  854. if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
  855. return true
  856. }
  857. }
  858. return false
  859. }
  860. // IsFilesConflicted determines if the Pull Request has changes conflicting with the target branch.
  861. func (pr *PullRequest) IsFilesConflicted() bool {
  862. return len(pr.ConflictedFiles) > 0
  863. }
  864. // GetWorkInProgressPrefix returns the prefix used to mark the pull request as a work in progress.
  865. // It returns an empty string when none were found
  866. func (pr *PullRequest) GetWorkInProgressPrefix() string {
  867. if err := pr.LoadIssue(); err != nil {
  868. log.Error("LoadIssue: %v", err)
  869. return ""
  870. }
  871. for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
  872. if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
  873. return pr.Issue.Title[0:len(prefix)]
  874. }
  875. }
  876. return ""
  877. }