Nelze vybrat více než 25 témat Téma musí začínat písmenem nebo číslem, může obsahovat pomlčky („-“) a může být dlouhé až 35 znaků.

pull.go 33KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124
  1. // Copyright 2015 The Gogs 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 models
  5. import (
  6. "fmt"
  7. "io/ioutil"
  8. "os"
  9. "path"
  10. "path/filepath"
  11. "strconv"
  12. "strings"
  13. "time"
  14. "code.gitea.io/git"
  15. "code.gitea.io/gitea/modules/base"
  16. "code.gitea.io/gitea/modules/log"
  17. "code.gitea.io/gitea/modules/process"
  18. "code.gitea.io/gitea/modules/setting"
  19. "code.gitea.io/gitea/modules/sync"
  20. api "code.gitea.io/sdk/gitea"
  21. "github.com/Unknwon/com"
  22. "github.com/go-xorm/xorm"
  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. IssueID int64 `xorm:"INDEX"`
  47. Issue *Issue `xorm:"-"`
  48. Index int64
  49. HeadRepoID int64 `xorm:"INDEX"`
  50. HeadRepo *Repository `xorm:"-"`
  51. BaseRepoID int64 `xorm:"INDEX"`
  52. BaseRepo *Repository `xorm:"-"`
  53. HeadUserName string
  54. HeadBranch string
  55. BaseBranch string
  56. MergeBase string `xorm:"VARCHAR(40)"`
  57. HasMerged bool `xorm:"INDEX"`
  58. MergedCommitID string `xorm:"VARCHAR(40)"`
  59. MergerID int64 `xorm:"INDEX"`
  60. Merger *User `xorm:"-"`
  61. Merged time.Time `xorm:"-"`
  62. MergedUnix int64 `xorm:"INDEX"`
  63. }
  64. // BeforeUpdate is invoked from XORM before updating an object of this type.
  65. func (pr *PullRequest) BeforeUpdate() {
  66. pr.MergedUnix = pr.Merged.Unix()
  67. }
  68. // AfterSet is invoked from XORM after setting the value of a field of this object.
  69. // Note: don't try to get Issue because will end up recursive querying.
  70. func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
  71. switch colName {
  72. case "merged_unix":
  73. if !pr.HasMerged {
  74. return
  75. }
  76. pr.Merged = time.Unix(pr.MergedUnix, 0).Local()
  77. }
  78. }
  79. // Note: don't try to get Issue because will end up recursive querying.
  80. func (pr *PullRequest) loadAttributes(e Engine) (err error) {
  81. if pr.HasMerged && pr.Merger == nil {
  82. pr.Merger, err = getUserByID(e, pr.MergerID)
  83. if IsErrUserNotExist(err) {
  84. pr.MergerID = -1
  85. pr.Merger = NewGhostUser()
  86. } else if err != nil {
  87. return fmt.Errorf("getUserByID [%d]: %v", pr.MergerID, err)
  88. }
  89. }
  90. return nil
  91. }
  92. // LoadAttributes loads pull request attributes from database
  93. func (pr *PullRequest) LoadAttributes() error {
  94. return pr.loadAttributes(x)
  95. }
  96. // LoadIssue loads issue information from database
  97. func (pr *PullRequest) LoadIssue() (err error) {
  98. return pr.loadIssue(x)
  99. }
  100. func (pr *PullRequest) loadIssue(e Engine) (err error) {
  101. if pr.Issue != nil {
  102. return nil
  103. }
  104. pr.Issue, err = getIssueByID(e, pr.IssueID)
  105. return err
  106. }
  107. // APIFormat assumes following fields have been assigned with valid values:
  108. // Required - Issue
  109. // Optional - Merger
  110. func (pr *PullRequest) APIFormat() *api.PullRequest {
  111. var (
  112. baseBranch *Branch
  113. headBranch *Branch
  114. baseCommit *git.Commit
  115. headCommit *git.Commit
  116. err error
  117. )
  118. apiIssue := pr.Issue.APIFormat()
  119. if pr.BaseRepo == nil {
  120. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  121. if err != nil {
  122. log.Error(log.ERROR, "GetRepositoryById[%d]: %v", pr.ID, err)
  123. return nil
  124. }
  125. }
  126. if pr.HeadRepo == nil {
  127. pr.HeadRepo, err = GetRepositoryByID(pr.HeadRepoID)
  128. if err != nil {
  129. log.Error(log.ERROR, "GetRepositoryById[%d]: %v", pr.ID, err)
  130. return nil
  131. }
  132. }
  133. if baseBranch, err = pr.BaseRepo.GetBranch(pr.BaseBranch); err != nil {
  134. return nil
  135. }
  136. if baseCommit, err = baseBranch.GetCommit(); err != nil {
  137. return nil
  138. }
  139. if headBranch, err = pr.HeadRepo.GetBranch(pr.HeadBranch); err != nil {
  140. return nil
  141. }
  142. if headCommit, err = headBranch.GetCommit(); err != nil {
  143. return nil
  144. }
  145. apiBaseBranchInfo := &api.PRBranchInfo{
  146. Name: pr.BaseBranch,
  147. Ref: pr.BaseBranch,
  148. Sha: baseCommit.ID.String(),
  149. RepoID: pr.BaseRepoID,
  150. Repository: pr.BaseRepo.APIFormat(AccessModeNone),
  151. }
  152. apiHeadBranchInfo := &api.PRBranchInfo{
  153. Name: pr.HeadBranch,
  154. Ref: pr.HeadBranch,
  155. Sha: headCommit.ID.String(),
  156. RepoID: pr.HeadRepoID,
  157. Repository: pr.HeadRepo.APIFormat(AccessModeNone),
  158. }
  159. apiPullRequest := &api.PullRequest{
  160. ID: pr.ID,
  161. Index: pr.Index,
  162. Poster: apiIssue.Poster,
  163. Title: apiIssue.Title,
  164. Body: apiIssue.Body,
  165. Labels: apiIssue.Labels,
  166. Milestone: apiIssue.Milestone,
  167. Assignee: apiIssue.Assignee,
  168. State: apiIssue.State,
  169. Comments: apiIssue.Comments,
  170. HTMLURL: pr.Issue.HTMLURL(),
  171. DiffURL: pr.Issue.DiffURL(),
  172. PatchURL: pr.Issue.PatchURL(),
  173. HasMerged: pr.HasMerged,
  174. Base: apiBaseBranchInfo,
  175. Head: apiHeadBranchInfo,
  176. MergeBase: pr.MergeBase,
  177. Created: &pr.Issue.Created,
  178. Updated: &pr.Issue.Updated,
  179. }
  180. if pr.Status != PullRequestStatusChecking {
  181. mergeable := pr.Status != PullRequestStatusConflict
  182. apiPullRequest.Mergeable = mergeable
  183. }
  184. if pr.HasMerged {
  185. apiPullRequest.Merged = &pr.Merged
  186. apiPullRequest.MergedCommitID = &pr.MergedCommitID
  187. apiPullRequest.MergedBy = pr.Merger.APIFormat()
  188. }
  189. return apiPullRequest
  190. }
  191. func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
  192. pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
  193. if err != nil && !IsErrRepoNotExist(err) {
  194. return fmt.Errorf("getRepositoryByID(head): %v", err)
  195. }
  196. return nil
  197. }
  198. // GetHeadRepo loads the head repository
  199. func (pr *PullRequest) GetHeadRepo() error {
  200. return pr.getHeadRepo(x)
  201. }
  202. // GetBaseRepo loads the target repository
  203. func (pr *PullRequest) GetBaseRepo() (err error) {
  204. if pr.BaseRepo != nil {
  205. return nil
  206. }
  207. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  208. if err != nil {
  209. return fmt.Errorf("GetRepositoryByID(base): %v", err)
  210. }
  211. return nil
  212. }
  213. // IsChecking returns true if this pull request is still checking conflict.
  214. func (pr *PullRequest) IsChecking() bool {
  215. return pr.Status == PullRequestStatusChecking
  216. }
  217. // CanAutoMerge returns true if this pull request can be merged automatically.
  218. func (pr *PullRequest) CanAutoMerge() bool {
  219. return pr.Status == PullRequestStatusMergeable
  220. }
  221. // Merge merges pull request to base repository.
  222. // FIXME: add repoWorkingPull make sure two merges does not happen at same time.
  223. func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error) {
  224. if err = pr.GetHeadRepo(); err != nil {
  225. return fmt.Errorf("GetHeadRepo: %v", err)
  226. } else if err = pr.GetBaseRepo(); err != nil {
  227. return fmt.Errorf("GetBaseRepo: %v", err)
  228. }
  229. defer func() {
  230. go HookQueue.Add(pr.BaseRepo.ID)
  231. go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false)
  232. }()
  233. headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
  234. headGitRepo, err := git.OpenRepository(headRepoPath)
  235. if err != nil {
  236. return fmt.Errorf("OpenRepository: %v", err)
  237. }
  238. // Clone base repo.
  239. tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git")
  240. if err := os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm); err != nil {
  241. return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err)
  242. }
  243. defer os.RemoveAll(path.Dir(tmpBasePath))
  244. var stderr string
  245. if _, stderr, err = process.GetManager().ExecTimeout(5*time.Minute,
  246. fmt.Sprintf("PullRequest.Merge (git clone): %s", tmpBasePath),
  247. "git", "clone", baseGitRepo.Path, tmpBasePath); err != nil {
  248. return fmt.Errorf("git clone: %s", stderr)
  249. }
  250. // Check out base branch.
  251. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  252. fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
  253. "git", "checkout", pr.BaseBranch); err != nil {
  254. return fmt.Errorf("git checkout: %s", stderr)
  255. }
  256. // Add head repo remote.
  257. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  258. fmt.Sprintf("PullRequest.Merge (git remote add): %s", tmpBasePath),
  259. "git", "remote", "add", "head_repo", headRepoPath); err != nil {
  260. return fmt.Errorf("git remote add [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  261. }
  262. // Merge commits.
  263. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  264. fmt.Sprintf("PullRequest.Merge (git fetch): %s", tmpBasePath),
  265. "git", "fetch", "head_repo"); err != nil {
  266. return fmt.Errorf("git fetch [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  267. }
  268. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  269. fmt.Sprintf("PullRequest.Merge (git merge --no-ff --no-commit): %s", tmpBasePath),
  270. "git", "merge", "--no-ff", "--no-commit", "head_repo/"+pr.HeadBranch); err != nil {
  271. return fmt.Errorf("git merge --no-ff --no-commit [%s]: %v - %s", tmpBasePath, err, stderr)
  272. }
  273. sig := doer.NewGitSig()
  274. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  275. fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath),
  276. "git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
  277. "-m", fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch)); err != nil {
  278. return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr)
  279. }
  280. // Push back to upstream.
  281. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  282. fmt.Sprintf("PullRequest.Merge (git push): %s", tmpBasePath),
  283. "git", "push", baseGitRepo.Path, pr.BaseBranch); err != nil {
  284. return fmt.Errorf("git push: %s", stderr)
  285. }
  286. pr.MergedCommitID, err = baseGitRepo.GetBranchCommitID(pr.BaseBranch)
  287. if err != nil {
  288. return fmt.Errorf("GetBranchCommit: %v", err)
  289. }
  290. pr.Merged = time.Now()
  291. pr.Merger = doer
  292. pr.MergerID = doer.ID
  293. if err = pr.setMerged(); err != nil {
  294. log.Error(4, "setMerged [%d]: %v", pr.ID, err)
  295. }
  296. if err = MergePullRequestAction(doer, pr.Issue.Repo, pr.Issue); err != nil {
  297. log.Error(4, "MergePullRequestAction [%d]: %v", pr.ID, err)
  298. }
  299. // Reload pull request information.
  300. if err = pr.LoadAttributes(); err != nil {
  301. log.Error(4, "LoadAttributes: %v", err)
  302. return nil
  303. }
  304. if err = PrepareWebhooks(pr.Issue.Repo, HookEventPullRequest, &api.PullRequestPayload{
  305. Action: api.HookIssueClosed,
  306. Index: pr.Index,
  307. PullRequest: pr.APIFormat(),
  308. Repository: pr.Issue.Repo.APIFormat(AccessModeNone),
  309. Sender: doer.APIFormat(),
  310. }); err != nil {
  311. log.Error(4, "PrepareWebhooks: %v", err)
  312. return nil
  313. }
  314. l, err := headGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
  315. if err != nil {
  316. log.Error(4, "CommitsBetweenIDs: %v", err)
  317. return nil
  318. }
  319. // TODO: when squash commits, no need to append merge commit.
  320. // It is possible that head branch is not fully sync with base branch for merge commits,
  321. // so we need to get latest head commit and append merge commit manually
  322. // to avoid strange diff commits produced.
  323. mergeCommit, err := baseGitRepo.GetBranchCommit(pr.BaseBranch)
  324. if err != nil {
  325. log.Error(4, "GetBranchCommit: %v", err)
  326. return nil
  327. }
  328. l.PushFront(mergeCommit)
  329. p := &api.PushPayload{
  330. Ref: git.BranchPrefix + pr.BaseBranch,
  331. Before: pr.MergeBase,
  332. After: pr.MergedCommitID,
  333. CompareURL: setting.AppURL + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
  334. Commits: ListToPushCommits(l).ToAPIPayloadCommits(pr.BaseRepo.HTMLURL()),
  335. Repo: pr.BaseRepo.APIFormat(AccessModeNone),
  336. Pusher: pr.HeadRepo.MustOwner().APIFormat(),
  337. Sender: doer.APIFormat(),
  338. }
  339. if err = PrepareWebhooks(pr.BaseRepo, HookEventPush, p); err != nil {
  340. return fmt.Errorf("PrepareWebhooks: %v", err)
  341. }
  342. return nil
  343. }
  344. // setMerged sets a pull request to merged and closes the corresponding issue
  345. func (pr *PullRequest) setMerged() (err error) {
  346. if pr.HasMerged {
  347. return fmt.Errorf("PullRequest[%d] already merged", pr.Index)
  348. }
  349. if pr.MergedCommitID == "" || pr.Merged.IsZero() || pr.Merger == nil {
  350. return fmt.Errorf("Unable to merge PullRequest[%d], some required fields are empty", pr.Index)
  351. }
  352. pr.HasMerged = true
  353. sess := x.NewSession()
  354. defer sess.Close()
  355. if err = sess.Begin(); err != nil {
  356. return err
  357. }
  358. if err = pr.loadIssue(sess); err != nil {
  359. return err
  360. }
  361. if err = pr.Issue.loadRepo(sess); err != nil {
  362. return err
  363. }
  364. if err = pr.Issue.Repo.getOwner(sess); err != nil {
  365. return err
  366. }
  367. if err = pr.Issue.changeStatus(sess, pr.Merger, pr.Issue.Repo, true); err != nil {
  368. return fmt.Errorf("Issue.changeStatus: %v", err)
  369. }
  370. if _, err = sess.Id(pr.ID).AllCols().Update(pr); err != nil {
  371. return fmt.Errorf("update pull request: %v", err)
  372. }
  373. if err = sess.Commit(); err != nil {
  374. return fmt.Errorf("Commit: %v", err)
  375. }
  376. return nil
  377. }
  378. // manuallyMerged checks if a pull request got manually merged
  379. // When a pull request got manually merged mark the pull request as merged
  380. func (pr *PullRequest) manuallyMerged() bool {
  381. commit, err := pr.getMergeCommit()
  382. if err != nil {
  383. log.Error(4, "PullRequest[%d].getMergeCommit: %v", pr.ID, err)
  384. return false
  385. }
  386. if commit != nil {
  387. pr.MergedCommitID = commit.ID.String()
  388. pr.Merged = commit.Author.When
  389. pr.Status = PullRequestStatusManuallyMerged
  390. merger, _ := GetUserByEmail(commit.Author.Email)
  391. // When the commit author is unknown set the BaseRepo owner as merger
  392. if merger == nil {
  393. if pr.BaseRepo.Owner == nil {
  394. if err = pr.BaseRepo.getOwner(x); err != nil {
  395. log.Error(4, "BaseRepo.getOwner[%d]: %v", pr.ID, err)
  396. return false
  397. }
  398. }
  399. merger = pr.BaseRepo.Owner
  400. }
  401. pr.Merger = merger
  402. pr.MergerID = merger.ID
  403. if err = pr.setMerged(); err != nil {
  404. log.Error(4, "PullRequest[%d].setMerged : %v", pr.ID, err)
  405. return false
  406. }
  407. 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())
  408. return true
  409. }
  410. return false
  411. }
  412. // getMergeCommit checks if a pull request got merged
  413. // Returns the git.Commit of the pull request if merged
  414. func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
  415. if pr.BaseRepo == nil {
  416. var err error
  417. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  418. if err != nil {
  419. return nil, fmt.Errorf("GetRepositoryByID: %v", err)
  420. }
  421. }
  422. indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
  423. defer os.Remove(indexTmpPath)
  424. headFile := fmt.Sprintf("refs/pull/%d/head", pr.Index)
  425. // Check if a pull request is merged into BaseBranch
  426. _, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git merge-base --is-ancestor): %d", pr.BaseRepo.ID),
  427. []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
  428. "git", "merge-base", "--is-ancestor", headFile, pr.BaseBranch)
  429. if err != nil {
  430. // Errors are signaled by a non-zero status that is not 1
  431. if err.Error() == "exit status 1" {
  432. return nil, nil
  433. }
  434. return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err)
  435. }
  436. commitIDBytes, err := ioutil.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile)
  437. if err != nil {
  438. return nil, fmt.Errorf("ReadFile(%s): %v", headFile, err)
  439. }
  440. commitID := string(commitIDBytes)
  441. if len(commitID) < 40 {
  442. return nil, fmt.Errorf(`ReadFile(%s): invalid commit-ID "%s"`, headFile, commitID)
  443. }
  444. cmd := commitID[:40] + ".." + pr.BaseBranch
  445. // Get the commit from BaseBranch where the pull request got merged
  446. mergeCommit, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git rev-list --ancestry-path --merges --reverse): %d", pr.BaseRepo.ID),
  447. []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
  448. "git", "rev-list", "--ancestry-path", "--merges", "--reverse", cmd)
  449. if err != nil {
  450. return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v %v", stderr, err)
  451. } else if len(mergeCommit) < 40 {
  452. // PR was fast-forwarded, so just use last commit of PR
  453. mergeCommit = commitID[:40]
  454. }
  455. gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
  456. if err != nil {
  457. return nil, fmt.Errorf("OpenRepository: %v", err)
  458. }
  459. commit, err := gitRepo.GetCommit(mergeCommit[:40])
  460. if err != nil {
  461. return nil, fmt.Errorf("GetCommit: %v", err)
  462. }
  463. return commit, nil
  464. }
  465. // patchConflicts is a list of conflict description from Git.
  466. var patchConflicts = []string{
  467. "patch does not apply",
  468. "already exists in working directory",
  469. "unrecognized input",
  470. "error:",
  471. }
  472. // testPatch checks if patch can be merged to base repository without conflict.
  473. func (pr *PullRequest) testPatch() (err error) {
  474. if pr.BaseRepo == nil {
  475. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  476. if err != nil {
  477. return fmt.Errorf("GetRepositoryByID: %v", err)
  478. }
  479. }
  480. patchPath, err := pr.BaseRepo.PatchPath(pr.Index)
  481. if err != nil {
  482. return fmt.Errorf("BaseRepo.PatchPath: %v", err)
  483. }
  484. // Fast fail if patch does not exist, this assumes data is corrupted.
  485. if !com.IsFile(patchPath) {
  486. log.Trace("PullRequest[%d].testPatch: ignored corrupted data", pr.ID)
  487. return nil
  488. }
  489. repoWorkingPool.CheckIn(com.ToStr(pr.BaseRepoID))
  490. defer repoWorkingPool.CheckOut(com.ToStr(pr.BaseRepoID))
  491. log.Trace("PullRequest[%d].testPatch (patchPath): %s", pr.ID, patchPath)
  492. pr.Status = PullRequestStatusChecking
  493. indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
  494. defer os.Remove(indexTmpPath)
  495. var stderr string
  496. _, stderr, err = process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("testPatch (git read-tree): %d", pr.BaseRepo.ID),
  497. []string{"GIT_DIR=" + pr.BaseRepo.RepoPath(), "GIT_INDEX_FILE=" + indexTmpPath},
  498. "git", "read-tree", pr.BaseBranch)
  499. if err != nil {
  500. return fmt.Errorf("git read-tree --index-output=%s %s: %v - %s", indexTmpPath, pr.BaseBranch, err, stderr)
  501. }
  502. _, stderr, err = process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID),
  503. []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
  504. "git", "apply", "--check", "--cached", patchPath)
  505. if err != nil {
  506. for i := range patchConflicts {
  507. if strings.Contains(stderr, patchConflicts[i]) {
  508. log.Trace("PullRequest[%d].testPatch (apply): has conflict", pr.ID)
  509. fmt.Println(stderr)
  510. pr.Status = PullRequestStatusConflict
  511. return nil
  512. }
  513. }
  514. return fmt.Errorf("git apply --check: %v - %s", err, stderr)
  515. }
  516. return nil
  517. }
  518. // NewPullRequest creates new pull request with labels for repository.
  519. func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte) (err error) {
  520. sess := x.NewSession()
  521. defer sess.Close()
  522. if err = sess.Begin(); err != nil {
  523. return err
  524. }
  525. if err = newIssue(sess, pull.Poster, NewIssueOptions{
  526. Repo: repo,
  527. Issue: pull,
  528. LabelIDs: labelIDs,
  529. Attachments: uuids,
  530. IsPull: true,
  531. }); err != nil {
  532. return fmt.Errorf("newIssue: %v", err)
  533. }
  534. pr.Index = pull.Index
  535. if err = repo.SavePatch(pr.Index, patch); err != nil {
  536. return fmt.Errorf("SavePatch: %v", err)
  537. }
  538. pr.BaseRepo = repo
  539. if err = pr.testPatch(); err != nil {
  540. return fmt.Errorf("testPatch: %v", err)
  541. }
  542. // No conflict appears after test means mergeable.
  543. if pr.Status == PullRequestStatusChecking {
  544. pr.Status = PullRequestStatusMergeable
  545. }
  546. pr.IssueID = pull.ID
  547. if _, err = sess.Insert(pr); err != nil {
  548. return fmt.Errorf("insert pull repo: %v", err)
  549. }
  550. if err = sess.Commit(); err != nil {
  551. return fmt.Errorf("Commit: %v", err)
  552. }
  553. if err = NotifyWatchers(&Action{
  554. ActUserID: pull.Poster.ID,
  555. ActUser: pull.Poster,
  556. OpType: ActionCreatePullRequest,
  557. Content: fmt.Sprintf("%d|%s", pull.Index, pull.Title),
  558. RepoID: repo.ID,
  559. Repo: repo,
  560. IsPrivate: repo.IsPrivate,
  561. }); err != nil {
  562. log.Error(4, "NotifyWatchers: %v", err)
  563. } else if err = pull.MailParticipants(); err != nil {
  564. log.Error(4, "MailParticipants: %v", err)
  565. }
  566. pr.Issue = pull
  567. pull.PullRequest = pr
  568. if err = PrepareWebhooks(repo, HookEventPullRequest, &api.PullRequestPayload{
  569. Action: api.HookIssueOpened,
  570. Index: pull.Index,
  571. PullRequest: pr.APIFormat(),
  572. Repository: repo.APIFormat(AccessModeNone),
  573. Sender: pull.Poster.APIFormat(),
  574. }); err != nil {
  575. log.Error(4, "PrepareWebhooks: %v", err)
  576. }
  577. go HookQueue.Add(repo.ID)
  578. return nil
  579. }
  580. // PullRequestsOptions holds the options for PRs
  581. type PullRequestsOptions struct {
  582. Page int
  583. State string
  584. SortType string
  585. Labels []string
  586. MilestoneID int64
  587. }
  588. func listPullRequestStatement(baseRepoID int64, opts *PullRequestsOptions) (*xorm.Session, error) {
  589. sess := x.Where("pull_request.base_repo_id=?", baseRepoID)
  590. sess.Join("INNER", "issue", "pull_request.issue_id = issue.id")
  591. switch opts.State {
  592. case "closed", "open":
  593. sess.And("issue.is_closed=?", opts.State == "closed")
  594. }
  595. sortIssuesSession(sess, opts.SortType)
  596. if labelIDs, err := base.StringsToInt64s(opts.Labels); err != nil {
  597. return nil, err
  598. } else if len(labelIDs) > 0 {
  599. sess.Join("INNER", "issue_label", "issue.id = issue_label.issue_id").
  600. In("issue_label.label_id", labelIDs)
  601. }
  602. if opts.MilestoneID > 0 {
  603. sess.And("issue.milestone_id=?", opts.MilestoneID)
  604. }
  605. return sess, nil
  606. }
  607. // PullRequests returns all pull requests for a base Repo by the given conditions
  608. func PullRequests(baseRepoID int64, opts *PullRequestsOptions) ([]*PullRequest, int64, error) {
  609. if opts.Page <= 0 {
  610. opts.Page = 1
  611. }
  612. countSession, err := listPullRequestStatement(baseRepoID, opts)
  613. if err != nil {
  614. log.Error(4, "listPullRequestStatement", err)
  615. return nil, 0, err
  616. }
  617. maxResults, err := countSession.Count(new(PullRequest))
  618. if err != nil {
  619. log.Error(4, "Count PRs", err)
  620. return nil, maxResults, err
  621. }
  622. prs := make([]*PullRequest, 0, ItemsPerPage)
  623. findSession, err := listPullRequestStatement(baseRepoID, opts)
  624. if err != nil {
  625. log.Error(4, "listPullRequestStatement", err)
  626. return nil, maxResults, err
  627. }
  628. findSession.Limit(ItemsPerPage, (opts.Page-1)*ItemsPerPage)
  629. return prs, maxResults, findSession.Find(&prs)
  630. }
  631. // GetUnmergedPullRequest returns a pull request that is open and has not been merged
  632. // by given head/base and repo/branch.
  633. func GetUnmergedPullRequest(headRepoID, baseRepoID int64, headBranch, baseBranch string) (*PullRequest, error) {
  634. pr := new(PullRequest)
  635. has, err := x.
  636. Where("head_repo_id=? AND head_branch=? AND base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  637. headRepoID, headBranch, baseRepoID, baseBranch, false, false).
  638. Join("INNER", "issue", "issue.id=pull_request.issue_id").
  639. Get(pr)
  640. if err != nil {
  641. return nil, err
  642. } else if !has {
  643. return nil, ErrPullRequestNotExist{0, 0, headRepoID, baseRepoID, headBranch, baseBranch}
  644. }
  645. return pr, nil
  646. }
  647. // GetUnmergedPullRequestsByHeadInfo returns all pull requests that are open and has not been merged
  648. // by given head information (repo and branch).
  649. func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) {
  650. prs := make([]*PullRequest, 0, 2)
  651. return prs, x.
  652. Where("head_repo_id = ? AND head_branch = ? AND has_merged = ? AND issue.is_closed = ?",
  653. repoID, branch, false, false).
  654. Join("INNER", "issue", "issue.id = pull_request.issue_id").
  655. Find(&prs)
  656. }
  657. // GetUnmergedPullRequestsByBaseInfo returns all pull requests that are open and has not been merged
  658. // by given base information (repo and branch).
  659. func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequest, error) {
  660. prs := make([]*PullRequest, 0, 2)
  661. return prs, x.
  662. Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  663. repoID, branch, false, false).
  664. Join("INNER", "issue", "issue.id=pull_request.issue_id").
  665. Find(&prs)
  666. }
  667. // GetPullRequestByIndex returns a pull request by the given index
  668. func GetPullRequestByIndex(repoID int64, index int64) (*PullRequest, error) {
  669. pr := &PullRequest{
  670. BaseRepoID: repoID,
  671. Index: index,
  672. }
  673. has, err := x.Get(pr)
  674. if err != nil {
  675. return nil, err
  676. } else if !has {
  677. return nil, ErrPullRequestNotExist{0, 0, 0, repoID, "", ""}
  678. }
  679. if err = pr.LoadAttributes(); err != nil {
  680. return nil, err
  681. }
  682. if err = pr.LoadIssue(); err != nil {
  683. return nil, err
  684. }
  685. return pr, nil
  686. }
  687. func getPullRequestByID(e Engine, id int64) (*PullRequest, error) {
  688. pr := new(PullRequest)
  689. has, err := e.Id(id).Get(pr)
  690. if err != nil {
  691. return nil, err
  692. } else if !has {
  693. return nil, ErrPullRequestNotExist{id, 0, 0, 0, "", ""}
  694. }
  695. return pr, pr.loadAttributes(e)
  696. }
  697. // GetPullRequestByID returns a pull request by given ID.
  698. func GetPullRequestByID(id int64) (*PullRequest, error) {
  699. return getPullRequestByID(x, id)
  700. }
  701. func getPullRequestByIssueID(e Engine, issueID int64) (*PullRequest, error) {
  702. pr := &PullRequest{
  703. IssueID: issueID,
  704. }
  705. has, err := e.Get(pr)
  706. if err != nil {
  707. return nil, err
  708. } else if !has {
  709. return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""}
  710. }
  711. return pr, pr.loadAttributes(e)
  712. }
  713. // GetPullRequestByIssueID returns pull request by given issue ID.
  714. func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
  715. return getPullRequestByIssueID(x, issueID)
  716. }
  717. // Update updates all fields of pull request.
  718. func (pr *PullRequest) Update() error {
  719. _, err := x.Id(pr.ID).AllCols().Update(pr)
  720. return err
  721. }
  722. // UpdateCols updates specific fields of pull request.
  723. func (pr *PullRequest) UpdateCols(cols ...string) error {
  724. _, err := x.Id(pr.ID).Cols(cols...).Update(pr)
  725. return err
  726. }
  727. // UpdatePatch generates and saves a new patch.
  728. func (pr *PullRequest) UpdatePatch() (err error) {
  729. if err = pr.GetHeadRepo(); err != nil {
  730. return fmt.Errorf("GetHeadRepo: %v", err)
  731. } else if pr.HeadRepo == nil {
  732. log.Trace("PullRequest[%d].UpdatePatch: ignored cruppted data", pr.ID)
  733. return nil
  734. }
  735. if err = pr.GetBaseRepo(); err != nil {
  736. return fmt.Errorf("GetBaseRepo: %v", err)
  737. }
  738. headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
  739. if err != nil {
  740. return fmt.Errorf("OpenRepository: %v", err)
  741. }
  742. // Add a temporary remote.
  743. tmpRemote := com.ToStr(time.Now().UnixNano())
  744. if err = headGitRepo.AddRemote(tmpRemote, RepoPath(pr.BaseRepo.MustOwner().Name, pr.BaseRepo.Name), true); err != nil {
  745. return fmt.Errorf("AddRemote: %v", err)
  746. }
  747. defer func() {
  748. headGitRepo.RemoveRemote(tmpRemote)
  749. }()
  750. remoteBranch := "remotes/" + tmpRemote + "/" + pr.BaseBranch
  751. pr.MergeBase, err = headGitRepo.GetMergeBase(remoteBranch, pr.HeadBranch)
  752. if err != nil {
  753. return fmt.Errorf("GetMergeBase: %v", err)
  754. } else if err = pr.Update(); err != nil {
  755. return fmt.Errorf("Update: %v", err)
  756. }
  757. patch, err := headGitRepo.GetPatch(pr.MergeBase, pr.HeadBranch)
  758. if err != nil {
  759. return fmt.Errorf("GetPatch: %v", err)
  760. }
  761. if err = pr.BaseRepo.SavePatch(pr.Index, patch); err != nil {
  762. return fmt.Errorf("BaseRepo.SavePatch: %v", err)
  763. }
  764. return nil
  765. }
  766. // PushToBaseRepo pushes commits from branches of head repository to
  767. // corresponding branches of base repository.
  768. // FIXME: Only push branches that are actually updates?
  769. func (pr *PullRequest) PushToBaseRepo() (err error) {
  770. log.Trace("PushToBaseRepo[%d]: pushing commits to base repo 'refs/pull/%d/head'", pr.BaseRepoID, pr.Index)
  771. headRepoPath := pr.HeadRepo.RepoPath()
  772. headGitRepo, err := git.OpenRepository(headRepoPath)
  773. if err != nil {
  774. return fmt.Errorf("OpenRepository: %v", err)
  775. }
  776. tmpRemoteName := fmt.Sprintf("tmp-pull-%d", pr.ID)
  777. if err = headGitRepo.AddRemote(tmpRemoteName, pr.BaseRepo.RepoPath(), false); err != nil {
  778. return fmt.Errorf("headGitRepo.AddRemote: %v", err)
  779. }
  780. // Make sure to remove the remote even if the push fails
  781. defer headGitRepo.RemoveRemote(tmpRemoteName)
  782. headFile := fmt.Sprintf("refs/pull/%d/head", pr.Index)
  783. // Remove head in case there is a conflict.
  784. file := path.Join(pr.BaseRepo.RepoPath(), headFile)
  785. _ = os.Remove(file)
  786. if err = git.Push(headRepoPath, git.PushOptions{
  787. Remote: tmpRemoteName,
  788. Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile),
  789. }); err != nil {
  790. return fmt.Errorf("Push: %v", err)
  791. }
  792. return nil
  793. }
  794. // AddToTaskQueue adds itself to pull request test task queue.
  795. func (pr *PullRequest) AddToTaskQueue() {
  796. go pullRequestQueue.AddFunc(pr.ID, func() {
  797. pr.Status = PullRequestStatusChecking
  798. if err := pr.UpdateCols("status"); err != nil {
  799. log.Error(5, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
  800. }
  801. })
  802. }
  803. // PullRequestList defines a list of pull requests
  804. type PullRequestList []*PullRequest
  805. func (prs PullRequestList) loadAttributes(e Engine) error {
  806. if len(prs) == 0 {
  807. return nil
  808. }
  809. // Load issues.
  810. issueIDs := make([]int64, 0, len(prs))
  811. for i := range prs {
  812. issueIDs = append(issueIDs, prs[i].IssueID)
  813. }
  814. issues := make([]*Issue, 0, len(issueIDs))
  815. if err := e.
  816. Where("id > 0").
  817. In("id", issueIDs).
  818. Find(&issues); err != nil {
  819. return fmt.Errorf("find issues: %v", err)
  820. }
  821. set := make(map[int64]*Issue)
  822. for i := range issues {
  823. set[issues[i].ID] = issues[i]
  824. }
  825. for i := range prs {
  826. prs[i].Issue = set[prs[i].IssueID]
  827. }
  828. return nil
  829. }
  830. // LoadAttributes load all the prs attributes
  831. func (prs PullRequestList) LoadAttributes() error {
  832. return prs.loadAttributes(x)
  833. }
  834. func addHeadRepoTasks(prs []*PullRequest) {
  835. for _, pr := range prs {
  836. log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
  837. if err := pr.UpdatePatch(); err != nil {
  838. log.Error(4, "UpdatePatch: %v", err)
  839. continue
  840. } else if err := pr.PushToBaseRepo(); err != nil {
  841. log.Error(4, "PushToBaseRepo: %v", err)
  842. continue
  843. }
  844. pr.AddToTaskQueue()
  845. }
  846. }
  847. // AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch,
  848. // and generate new patch for testing as needed.
  849. func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool) {
  850. log.Trace("AddTestPullRequestTask [head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
  851. prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
  852. if err != nil {
  853. log.Error(4, "Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
  854. return
  855. }
  856. if isSync {
  857. if err = PullRequestList(prs).LoadAttributes(); err != nil {
  858. log.Error(4, "PullRequestList.LoadAttributes: %v", err)
  859. }
  860. if err == nil {
  861. for _, pr := range prs {
  862. pr.Issue.PullRequest = pr
  863. if err = pr.Issue.LoadAttributes(); err != nil {
  864. log.Error(4, "LoadAttributes: %v", err)
  865. continue
  866. }
  867. if err = PrepareWebhooks(pr.Issue.Repo, HookEventPullRequest, &api.PullRequestPayload{
  868. Action: api.HookIssueSynchronized,
  869. Index: pr.Issue.Index,
  870. PullRequest: pr.Issue.PullRequest.APIFormat(),
  871. Repository: pr.Issue.Repo.APIFormat(AccessModeNone),
  872. Sender: doer.APIFormat(),
  873. }); err != nil {
  874. log.Error(4, "PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
  875. continue
  876. }
  877. go HookQueue.Add(pr.Issue.Repo.ID)
  878. }
  879. }
  880. }
  881. addHeadRepoTasks(prs)
  882. log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
  883. prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
  884. if err != nil {
  885. log.Error(4, "Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
  886. return
  887. }
  888. for _, pr := range prs {
  889. pr.AddToTaskQueue()
  890. }
  891. }
  892. // ChangeUsernameInPullRequests changes the name of head_user_name
  893. func ChangeUsernameInPullRequests(oldUserName, newUserName string) error {
  894. pr := PullRequest{
  895. HeadUserName: strings.ToLower(newUserName),
  896. }
  897. _, err := x.
  898. Cols("head_user_name").
  899. Where("head_user_name = ?", strings.ToLower(oldUserName)).
  900. Update(pr)
  901. return err
  902. }
  903. // checkAndUpdateStatus checks if pull request is possible to leaving checking status,
  904. // and set to be either conflict or mergeable.
  905. func (pr *PullRequest) checkAndUpdateStatus() {
  906. // Status is not changed to conflict means mergeable.
  907. if pr.Status == PullRequestStatusChecking {
  908. pr.Status = PullRequestStatusMergeable
  909. }
  910. // Make sure there is no waiting test to process before leaving the checking status.
  911. if !pullRequestQueue.Exist(pr.ID) {
  912. if err := pr.UpdateCols("status"); err != nil {
  913. log.Error(4, "Update[%d]: %v", pr.ID, err)
  914. }
  915. }
  916. }
  917. // TestPullRequests checks and tests untested patches of pull requests.
  918. // TODO: test more pull requests at same time.
  919. func TestPullRequests() {
  920. prs := make([]*PullRequest, 0, 10)
  921. err := x.Where("status = ?", PullRequestStatusChecking).Find(&prs)
  922. if err != nil {
  923. log.Error(3, "Find Checking PRs", err)
  924. return
  925. }
  926. var checkedPRs = make(map[int64]struct{})
  927. // Update pull request status.
  928. for _, pr := range prs {
  929. checkedPRs[pr.ID] = struct{}{}
  930. if err := pr.GetBaseRepo(); err != nil {
  931. log.Error(3, "GetBaseRepo: %v", err)
  932. continue
  933. }
  934. if pr.manuallyMerged() {
  935. continue
  936. }
  937. if err := pr.testPatch(); err != nil {
  938. log.Error(3, "testPatch: %v", err)
  939. continue
  940. }
  941. pr.checkAndUpdateStatus()
  942. }
  943. // Start listening on new test requests.
  944. for prID := range pullRequestQueue.Queue() {
  945. log.Trace("TestPullRequests[%v]: processing test task", prID)
  946. pullRequestQueue.Remove(prID)
  947. id := com.StrTo(prID).MustInt64()
  948. if _, ok := checkedPRs[id]; ok {
  949. continue
  950. }
  951. pr, err := GetPullRequestByID(id)
  952. if err != nil {
  953. log.Error(4, "GetPullRequestByID[%s]: %v", prID, err)
  954. continue
  955. } else if pr.manuallyMerged() {
  956. continue
  957. } else if err = pr.testPatch(); err != nil {
  958. log.Error(4, "testPatch[%d]: %v", pr.ID, err)
  959. continue
  960. }
  961. pr.checkAndUpdateStatus()
  962. }
  963. }
  964. // InitTestPullRequests runs the task to test all the checking status pull requests
  965. func InitTestPullRequests() {
  966. go TestPullRequests()
  967. }