pull.go 15 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516
  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. "os"
  8. "path"
  9. "strings"
  10. "time"
  11. "github.com/Unknwon/com"
  12. "github.com/go-xorm/xorm"
  13. "github.com/gogits/gogs/modules/git"
  14. "github.com/gogits/gogs/modules/log"
  15. "github.com/gogits/gogs/modules/process"
  16. "github.com/gogits/gogs/modules/setting"
  17. )
  18. type PullRequestType int
  19. const (
  20. PULL_REQUEST_GOGS PullRequestType = iota
  21. PLLL_ERQUEST_GIT
  22. )
  23. type PullRequestStatus int
  24. const (
  25. PULL_REQUEST_STATUS_CONFLICT PullRequestStatus = iota
  26. PULL_REQUEST_STATUS_CHECKING
  27. PULL_REQUEST_STATUS_MERGEABLE
  28. )
  29. // PullRequest represents relation between pull request and repositories.
  30. type PullRequest struct {
  31. ID int64 `xorm:"pk autoincr"`
  32. Type PullRequestType
  33. Status PullRequestStatus
  34. IssueID int64 `xorm:"INDEX"`
  35. Issue *Issue `xorm:"-"`
  36. Index int64
  37. HeadRepoID int64
  38. HeadRepo *Repository `xorm:"-"`
  39. BaseRepoID int64
  40. BaseRepo *Repository `xorm:"-"`
  41. HeadUserName string
  42. HeadBranch string
  43. BaseBranch string
  44. MergeBase string `xorm:"VARCHAR(40)"`
  45. HasMerged bool
  46. MergedCommitID string `xorm:"VARCHAR(40)"`
  47. Merged time.Time
  48. MergerID int64
  49. Merger *User `xorm:"-"`
  50. }
  51. // Note: don't try to get Pull because will end up recursive querying.
  52. func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
  53. switch colName {
  54. case "merged":
  55. if !pr.HasMerged {
  56. return
  57. }
  58. pr.Merged = regulateTimeZone(pr.Merged)
  59. }
  60. }
  61. func (pr *PullRequest) GetHeadRepo() (err error) {
  62. pr.HeadRepo, err = GetRepositoryByID(pr.HeadRepoID)
  63. if err != nil && !IsErrRepoNotExist(err) {
  64. return fmt.Errorf("GetRepositoryByID (head): %v", err)
  65. }
  66. return nil
  67. }
  68. func (pr *PullRequest) GetBaseRepo() (err error) {
  69. if pr.BaseRepo != nil {
  70. return nil
  71. }
  72. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  73. if err != nil {
  74. return fmt.Errorf("GetRepositoryByID (base): %v", err)
  75. }
  76. return nil
  77. }
  78. func (pr *PullRequest) GetMerger() (err error) {
  79. if !pr.HasMerged || pr.Merger != nil {
  80. return nil
  81. }
  82. pr.Merger, err = GetUserByID(pr.MergerID)
  83. if IsErrUserNotExist(err) {
  84. pr.MergerID = -1
  85. pr.Merger = NewFakeUser()
  86. } else if err != nil {
  87. return fmt.Errorf("GetUserByID: %v", err)
  88. }
  89. return nil
  90. }
  91. // IsChecking returns true if this pull request is still checking conflict.
  92. func (pr *PullRequest) IsChecking() bool {
  93. return pr.Status == PULL_REQUEST_STATUS_CHECKING
  94. }
  95. // CanAutoMerge returns true if this pull request can be merged automatically.
  96. func (pr *PullRequest) CanAutoMerge() bool {
  97. return pr.Status == PULL_REQUEST_STATUS_MERGEABLE
  98. }
  99. // Merge merges pull request to base repository.
  100. func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error) {
  101. sess := x.NewSession()
  102. defer sessionRelease(sess)
  103. if err = sess.Begin(); err != nil {
  104. return err
  105. }
  106. if err = pr.Issue.changeStatus(sess, doer, true); err != nil {
  107. return fmt.Errorf("Issue.changeStatus: %v", err)
  108. }
  109. if err = pr.GetHeadRepo(); err != nil {
  110. return fmt.Errorf("GetHeadRepo: %v", err)
  111. }
  112. headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
  113. headGitRepo, err := git.OpenRepository(headRepoPath)
  114. if err != nil {
  115. return fmt.Errorf("OpenRepository: %v", err)
  116. }
  117. pr.MergedCommitID, err = headGitRepo.GetCommitIdOfBranch(pr.HeadBranch)
  118. if err != nil {
  119. return fmt.Errorf("GetCommitIdOfBranch: %v", err)
  120. }
  121. if err = mergePullRequestAction(sess, doer, pr.Issue.Repo, pr.Issue); err != nil {
  122. return fmt.Errorf("mergePullRequestAction: %v", err)
  123. }
  124. pr.HasMerged = true
  125. pr.Merged = time.Now()
  126. pr.MergerID = doer.Id
  127. if _, err = sess.Id(pr.ID).AllCols().Update(pr); err != nil {
  128. return fmt.Errorf("update pull request: %v", err)
  129. }
  130. // Clone base repo.
  131. tmpBasePath := path.Join("data/tmp/repos", com.ToStr(time.Now().Nanosecond())+".git")
  132. os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm)
  133. defer os.RemoveAll(path.Dir(tmpBasePath))
  134. var stderr string
  135. if _, stderr, err = process.ExecTimeout(5*time.Minute,
  136. fmt.Sprintf("PullRequest.Merge(git clone): %s", tmpBasePath),
  137. "git", "clone", baseGitRepo.Path, tmpBasePath); err != nil {
  138. return fmt.Errorf("git clone: %s", stderr)
  139. }
  140. // Check out base branch.
  141. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  142. fmt.Sprintf("PullRequest.Merge(git checkout): %s", tmpBasePath),
  143. "git", "checkout", pr.BaseBranch); err != nil {
  144. return fmt.Errorf("git checkout: %s", stderr)
  145. }
  146. // Add head repo remote.
  147. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  148. fmt.Sprintf("PullRequest.Merge(git remote add): %s", tmpBasePath),
  149. "git", "remote", "add", "head_repo", headRepoPath); err != nil {
  150. return fmt.Errorf("git remote add[%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  151. }
  152. // Merge commits.
  153. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  154. fmt.Sprintf("PullRequest.Merge(git fetch): %s", tmpBasePath),
  155. "git", "fetch", "head_repo"); err != nil {
  156. return fmt.Errorf("git fetch[%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  157. }
  158. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  159. fmt.Sprintf("PullRequest.Merge(git merge): %s", tmpBasePath),
  160. "git", "merge", "--no-ff", "-m",
  161. fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch),
  162. "head_repo/"+pr.HeadBranch); err != nil {
  163. return fmt.Errorf("git merge[%s]: %s", tmpBasePath, stderr)
  164. }
  165. // Push back to upstream.
  166. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  167. fmt.Sprintf("PullRequest.Merge(git push): %s", tmpBasePath),
  168. "git", "push", baseGitRepo.Path, pr.BaseBranch); err != nil {
  169. return fmt.Errorf("git push: %s", stderr)
  170. }
  171. return sess.Commit()
  172. }
  173. // patchConflicts is a list of conflit description from Git.
  174. var patchConflicts = []string{
  175. "patch does not apply",
  176. "already exists in working directory",
  177. }
  178. // testPatch checks if patch can be merged to base repository without conflit.
  179. func (pr *PullRequest) testPatch() (err error) {
  180. if pr.BaseRepo == nil {
  181. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  182. if err != nil {
  183. return fmt.Errorf("GetRepositoryByID: %v", err)
  184. }
  185. }
  186. patchPath, err := pr.BaseRepo.PatchPath(pr.Index)
  187. if err != nil {
  188. return fmt.Errorf("BaseRepo.PatchPath: %v", err)
  189. }
  190. log.Trace("PullRequest[%d].testPatch(patchPath): %s", pr.ID, patchPath)
  191. if err := pr.BaseRepo.UpdateLocalCopy(); err != nil {
  192. return fmt.Errorf("UpdateLocalCopy: %v", err)
  193. }
  194. pr.Status = PULL_REQUEST_STATUS_CHECKING
  195. _, stderr, err := process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(),
  196. fmt.Sprintf("testPatch(git apply --check): %d", pr.BaseRepo.ID),
  197. "git", "apply", "--check", patchPath)
  198. if err != nil {
  199. for i := range patchConflicts {
  200. if strings.Contains(stderr, patchConflicts[i]) {
  201. log.Trace("PullRequest[%d].testPatch(apply): has conflit", pr.ID)
  202. pr.Status = PULL_REQUEST_STATUS_CONFLICT
  203. return nil
  204. }
  205. }
  206. return fmt.Errorf("git apply --check: %v - %s", err, stderr)
  207. }
  208. return nil
  209. }
  210. // NewPullRequest creates new pull request with labels for repository.
  211. func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte) (err error) {
  212. sess := x.NewSession()
  213. defer sessionRelease(sess)
  214. if err = sess.Begin(); err != nil {
  215. return err
  216. }
  217. if err = newIssue(sess, repo, pull, labelIDs, uuids, true); err != nil {
  218. return fmt.Errorf("newIssue: %v", err)
  219. }
  220. // Notify watchers.
  221. act := &Action{
  222. ActUserID: pull.Poster.Id,
  223. ActUserName: pull.Poster.Name,
  224. ActEmail: pull.Poster.Email,
  225. OpType: CREATE_PULL_REQUEST,
  226. Content: fmt.Sprintf("%d|%s", pull.Index, pull.Name),
  227. RepoID: repo.ID,
  228. RepoUserName: repo.Owner.Name,
  229. RepoName: repo.Name,
  230. IsPrivate: repo.IsPrivate,
  231. }
  232. if err = notifyWatchers(sess, act); err != nil {
  233. return err
  234. }
  235. pr.Index = pull.Index
  236. if err = repo.SavePatch(pr.Index, patch); err != nil {
  237. return fmt.Errorf("SavePatch: %v", err)
  238. }
  239. pr.BaseRepo = repo
  240. if err = pr.testPatch(); err != nil {
  241. return fmt.Errorf("testPatch: %v", err)
  242. }
  243. if pr.Status == PULL_REQUEST_STATUS_CHECKING {
  244. pr.Status = PULL_REQUEST_STATUS_MERGEABLE
  245. }
  246. pr.IssueID = pull.ID
  247. if _, err = sess.Insert(pr); err != nil {
  248. return fmt.Errorf("insert pull repo: %v", err)
  249. }
  250. return sess.Commit()
  251. }
  252. // GetUnmergedPullRequest returnss a pull request that is open and has not been merged
  253. // by given head/base and repo/branch.
  254. func GetUnmergedPullRequest(headRepoID, baseRepoID int64, headBranch, baseBranch string) (*PullRequest, error) {
  255. pr := new(PullRequest)
  256. has, err := x.Where("head_repo_id=? AND head_branch=? AND base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  257. headRepoID, headBranch, baseRepoID, baseBranch, false, false).
  258. Join("INNER", "issue", "issue.id=pull_request.issue_id").Get(pr)
  259. if err != nil {
  260. return nil, err
  261. } else if !has {
  262. return nil, ErrPullRequestNotExist{0, 0, headRepoID, baseRepoID, headBranch, baseBranch}
  263. }
  264. return pr, nil
  265. }
  266. // GetUnmergedPullRequestsByHeadInfo returnss all pull requests that are open and has not been merged
  267. // by given head information (repo and branch).
  268. func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) {
  269. prs := make([]*PullRequest, 0, 2)
  270. return prs, x.Where("head_repo_id=? AND head_branch=? AND has_merged=? AND issue.is_closed=?",
  271. repoID, branch, false, false).
  272. Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
  273. }
  274. // GetUnmergedPullRequestsByBaseInfo returnss all pull requests that are open and has not been merged
  275. // by given base information (repo and branch).
  276. func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequest, error) {
  277. prs := make([]*PullRequest, 0, 2)
  278. return prs, x.Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  279. repoID, branch, false, false).
  280. Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
  281. }
  282. // GetPullRequestByID returns a pull request by given ID.
  283. func GetPullRequestByID(id int64) (*PullRequest, error) {
  284. pr := new(PullRequest)
  285. has, err := x.Id(id).Get(pr)
  286. if err != nil {
  287. return nil, err
  288. } else if !has {
  289. return nil, ErrPullRequestNotExist{id, 0, 0, 0, "", ""}
  290. }
  291. return pr, nil
  292. }
  293. // GetPullRequestByIssueID returns pull request by given issue ID.
  294. func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
  295. pr := &PullRequest{
  296. IssueID: issueID,
  297. }
  298. has, err := x.Get(pr)
  299. if err != nil {
  300. return nil, err
  301. } else if !has {
  302. return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""}
  303. }
  304. return pr, nil
  305. }
  306. // Update updates all fields of pull request.
  307. func (pr *PullRequest) Update() error {
  308. _, err := x.Id(pr.ID).AllCols().Update(pr)
  309. return err
  310. }
  311. // Update updates specific fields of pull request.
  312. func (pr *PullRequest) UpdateCols(cols ...string) error {
  313. _, err := x.Id(pr.ID).Cols(cols...).Update(pr)
  314. return err
  315. }
  316. var PullRequestQueue = NewUniqueQueue(setting.Repository.PullRequestQueueLength)
  317. // checkAndUpdateStatus checks if pull request is possible to levaing checking status,
  318. // and set to be either conflict or mergeable.
  319. func (pr *PullRequest) checkAndUpdateStatus() {
  320. // Status is not changed to conflict means mergeable.
  321. if pr.Status == PULL_REQUEST_STATUS_CHECKING {
  322. pr.Status = PULL_REQUEST_STATUS_MERGEABLE
  323. }
  324. // Make sure there is no waiting test to process before levaing the checking status.
  325. if !PullRequestQueue.Exist(pr.ID) {
  326. if err := pr.UpdateCols("status"); err != nil {
  327. log.Error(4, "Update[%d]: %v", pr.ID, err)
  328. }
  329. }
  330. }
  331. // addToTaskQueue adds itself to pull request test task queue.
  332. func (pr *PullRequest) addToTaskQueue() {
  333. go PullRequestQueue.AddFunc(pr.ID, func() {
  334. pr.Status = PULL_REQUEST_STATUS_CHECKING
  335. if err := pr.UpdateCols("status"); err != nil {
  336. log.Error(5, "addToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
  337. }
  338. })
  339. }
  340. func addHeadRepoTasks(prs []*PullRequest) {
  341. for _, pr := range prs {
  342. log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
  343. if err := pr.GetHeadRepo(); err != nil {
  344. log.Error(4, "GetHeadRepo[%d]: %v", pr.ID, err)
  345. continue
  346. } else if pr.HeadRepo == nil {
  347. log.Trace("addHeadRepoTasks[%d]: ignored cruppted data", pr.ID)
  348. continue
  349. }
  350. if err := pr.GetBaseRepo(); err != nil {
  351. log.Error(4, "GetBaseRepo[%d]: %v", pr.ID, err)
  352. continue
  353. }
  354. headRepoPath, err := pr.HeadRepo.RepoPath()
  355. if err != nil {
  356. log.Error(4, "HeadRepo.RepoPath[%d]: %v", pr.ID, err)
  357. continue
  358. }
  359. headGitRepo, err := git.OpenRepository(headRepoPath)
  360. if err != nil {
  361. log.Error(4, "OpenRepository[%d]: %v", pr.ID, err)
  362. continue
  363. }
  364. // Generate patch.
  365. patch, err := headGitRepo.GetPatch(pr.MergeBase, pr.HeadBranch)
  366. if err != nil {
  367. log.Error(4, "GetPatch[%d]: %v", pr.ID, err)
  368. continue
  369. }
  370. if err = pr.BaseRepo.SavePatch(pr.Index, patch); err != nil {
  371. log.Error(4, "BaseRepo.SavePatch[%d]: %v", pr.ID, err)
  372. continue
  373. }
  374. pr.addToTaskQueue()
  375. }
  376. }
  377. // AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch,
  378. // and generate new patch for testing as needed.
  379. func AddTestPullRequestTask(repoID int64, branch string) {
  380. log.Trace("AddTestPullRequestTask[head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
  381. prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
  382. if err != nil {
  383. log.Error(4, "Find pull requests[head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
  384. return
  385. }
  386. addHeadRepoTasks(prs)
  387. log.Trace("AddTestPullRequestTask[base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
  388. prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
  389. if err != nil {
  390. log.Error(4, "Find pull requests[base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
  391. return
  392. }
  393. for _, pr := range prs {
  394. pr.addToTaskQueue()
  395. }
  396. }
  397. // TestPullRequests checks and tests untested patches of pull requests.
  398. // TODO: test more pull requests at same time.
  399. func TestPullRequests() {
  400. prs := make([]*PullRequest, 0, 10)
  401. x.Iterate(PullRequest{
  402. Status: PULL_REQUEST_STATUS_CHECKING,
  403. },
  404. func(idx int, bean interface{}) error {
  405. pr := bean.(*PullRequest)
  406. if err := pr.GetBaseRepo(); err != nil {
  407. log.Error(3, "GetBaseRepo: %v", err)
  408. return nil
  409. }
  410. if err := pr.testPatch(); err != nil {
  411. log.Error(3, "testPatch: %v", err)
  412. return nil
  413. }
  414. prs = append(prs, pr)
  415. return nil
  416. })
  417. // Update pull request status.
  418. for _, pr := range prs {
  419. pr.checkAndUpdateStatus()
  420. }
  421. // Start listening on new test requests.
  422. for prID := range PullRequestQueue.Queue() {
  423. log.Trace("TestPullRequests[%v]: processing test task", prID)
  424. PullRequestQueue.Remove(prID)
  425. pr, err := GetPullRequestByID(com.StrTo(prID).MustInt64())
  426. if err != nil {
  427. log.Error(4, "GetPullRequestByID[%d]: %v", prID, err)
  428. continue
  429. } else if err = pr.testPatch(); err != nil {
  430. log.Error(4, "testPatch[%d]: %v", pr.ID, err)
  431. continue
  432. }
  433. pr.checkAndUpdateStatus()
  434. }
  435. }
  436. func InitTestPullRequests() {
  437. go TestPullRequests()
  438. }