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

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