Du kannst nicht mehr als 25 Themen auswählen Themen müssen mit entweder einem Buchstaben oder einer Ziffer beginnen. Sie können Bindestriche („-“) enthalten und bis zu 35 Zeichen lang sein.

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529
  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("data/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. }
  181. // testPatch checks if patch can be merged to base repository without conflit.
  182. func (pr *PullRequest) testPatch() (err error) {
  183. if pr.BaseRepo == nil {
  184. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  185. if err != nil {
  186. return fmt.Errorf("GetRepositoryByID: %v", err)
  187. }
  188. }
  189. patchPath, err := pr.BaseRepo.PatchPath(pr.Index)
  190. if err != nil {
  191. return fmt.Errorf("BaseRepo.PatchPath: %v", err)
  192. }
  193. // Fast fail if patch does not exist, this assumes data is cruppted.
  194. if !com.IsFile(patchPath) {
  195. log.Trace("PullRequest[%d].testPatch: ignored cruppted data", pr.ID)
  196. return nil
  197. }
  198. log.Trace("PullRequest[%d].testPatch(patchPath): %s", pr.ID, patchPath)
  199. if err := pr.BaseRepo.UpdateLocalCopy(); err != nil {
  200. return fmt.Errorf("UpdateLocalCopy: %v", err)
  201. }
  202. pr.Status = PULL_REQUEST_STATUS_CHECKING
  203. _, stderr, err := process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(),
  204. fmt.Sprintf("testPatch(git apply --check): %d", pr.BaseRepo.ID),
  205. "git", "apply", "--check", patchPath)
  206. if err != nil {
  207. for i := range patchConflicts {
  208. if strings.Contains(stderr, patchConflicts[i]) {
  209. log.Trace("PullRequest[%d].testPatch(apply): has conflit", pr.ID)
  210. pr.Status = PULL_REQUEST_STATUS_CONFLICT
  211. return nil
  212. }
  213. }
  214. return fmt.Errorf("git apply --check: %v - %s", err, stderr)
  215. }
  216. return nil
  217. }
  218. // NewPullRequest creates new pull request with labels for repository.
  219. func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte) (err error) {
  220. sess := x.NewSession()
  221. defer sessionRelease(sess)
  222. if err = sess.Begin(); err != nil {
  223. return err
  224. }
  225. if err = newIssue(sess, repo, pull, labelIDs, uuids, true); err != nil {
  226. return fmt.Errorf("newIssue: %v", err)
  227. }
  228. // Notify watchers.
  229. act := &Action{
  230. ActUserID: pull.Poster.Id,
  231. ActUserName: pull.Poster.Name,
  232. ActEmail: pull.Poster.Email,
  233. OpType: CREATE_PULL_REQUEST,
  234. Content: fmt.Sprintf("%d|%s", pull.Index, pull.Name),
  235. RepoID: repo.ID,
  236. RepoUserName: repo.Owner.Name,
  237. RepoName: repo.Name,
  238. IsPrivate: repo.IsPrivate,
  239. }
  240. if err = notifyWatchers(sess, act); err != nil {
  241. return err
  242. }
  243. pr.Index = pull.Index
  244. if err = repo.SavePatch(pr.Index, patch); err != nil {
  245. return fmt.Errorf("SavePatch: %v", err)
  246. }
  247. pr.BaseRepo = repo
  248. if err = pr.testPatch(); err != nil {
  249. return fmt.Errorf("testPatch: %v", err)
  250. }
  251. if pr.Status == PULL_REQUEST_STATUS_CHECKING {
  252. pr.Status = PULL_REQUEST_STATUS_MERGEABLE
  253. }
  254. pr.IssueID = pull.ID
  255. if _, err = sess.Insert(pr); err != nil {
  256. return fmt.Errorf("insert pull repo: %v", err)
  257. }
  258. return sess.Commit()
  259. }
  260. // GetUnmergedPullRequest returnss a pull request that is open and has not been merged
  261. // by given head/base and repo/branch.
  262. func GetUnmergedPullRequest(headRepoID, baseRepoID int64, headBranch, baseBranch string) (*PullRequest, error) {
  263. pr := new(PullRequest)
  264. has, err := x.Where("head_repo_id=? AND head_branch=? AND base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  265. headRepoID, headBranch, baseRepoID, baseBranch, false, false).
  266. Join("INNER", "issue", "issue.id=pull_request.issue_id").Get(pr)
  267. if err != nil {
  268. return nil, err
  269. } else if !has {
  270. return nil, ErrPullRequestNotExist{0, 0, headRepoID, baseRepoID, headBranch, baseBranch}
  271. }
  272. return pr, nil
  273. }
  274. // GetUnmergedPullRequestsByHeadInfo returnss all pull requests that are open and has not been merged
  275. // by given head information (repo and branch).
  276. func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) {
  277. prs := make([]*PullRequest, 0, 2)
  278. return prs, x.Where("head_repo_id=? AND head_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. // GetUnmergedPullRequestsByBaseInfo returnss all pull requests that are open and has not been merged
  283. // by given base information (repo and branch).
  284. func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequest, error) {
  285. prs := make([]*PullRequest, 0, 2)
  286. return prs, x.Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  287. repoID, branch, false, false).
  288. Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
  289. }
  290. // GetPullRequestByID returns a pull request by given ID.
  291. func GetPullRequestByID(id int64) (*PullRequest, error) {
  292. pr := new(PullRequest)
  293. has, err := x.Id(id).Get(pr)
  294. if err != nil {
  295. return nil, err
  296. } else if !has {
  297. return nil, ErrPullRequestNotExist{id, 0, 0, 0, "", ""}
  298. }
  299. return pr, nil
  300. }
  301. // GetPullRequestByIssueID returns pull request by given issue ID.
  302. func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
  303. pr := &PullRequest{
  304. IssueID: issueID,
  305. }
  306. has, err := x.Get(pr)
  307. if err != nil {
  308. return nil, err
  309. } else if !has {
  310. return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""}
  311. }
  312. return pr, nil
  313. }
  314. // Update updates all fields of pull request.
  315. func (pr *PullRequest) Update() error {
  316. _, err := x.Id(pr.ID).AllCols().Update(pr)
  317. return err
  318. }
  319. // Update updates specific fields of pull request.
  320. func (pr *PullRequest) UpdateCols(cols ...string) error {
  321. _, err := x.Id(pr.ID).Cols(cols...).Update(pr)
  322. return err
  323. }
  324. var PullRequestQueue = NewUniqueQueue(setting.Repository.PullRequestQueueLength)
  325. // UpdatePatch generates and saves a new patch.
  326. func (pr *PullRequest) UpdatePatch() error {
  327. if err := pr.GetHeadRepo(); err != nil {
  328. return fmt.Errorf("GetHeadRepo: %v", err)
  329. } else if pr.HeadRepo == nil {
  330. log.Trace("PullRequest[%d].UpdatePatch: ignored cruppted data", pr.ID)
  331. return nil
  332. }
  333. if err := pr.GetBaseRepo(); err != nil {
  334. return fmt.Errorf("GetBaseRepo: %v", err)
  335. }
  336. headRepoPath, err := pr.HeadRepo.RepoPath()
  337. if err != nil {
  338. return fmt.Errorf("HeadRepo.RepoPath: %v", err)
  339. }
  340. headGitRepo, err := git.OpenRepository(headRepoPath)
  341. if err != nil {
  342. return fmt.Errorf("OpenRepository: %v", err)
  343. }
  344. patch, err := headGitRepo.GetPatch(pr.MergeBase, pr.HeadBranch)
  345. if err != nil {
  346. return fmt.Errorf("GetPatch: %v", err)
  347. }
  348. if err = pr.BaseRepo.SavePatch(pr.Index, patch); err != nil {
  349. return fmt.Errorf("BaseRepo.SavePatch: %v", err)
  350. }
  351. return nil
  352. }
  353. // AddToTaskQueue adds itself to pull request test task queue.
  354. func (pr *PullRequest) AddToTaskQueue() {
  355. go PullRequestQueue.AddFunc(pr.ID, func() {
  356. pr.Status = PULL_REQUEST_STATUS_CHECKING
  357. if err := pr.UpdateCols("status"); err != nil {
  358. log.Error(5, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
  359. }
  360. })
  361. }
  362. func addHeadRepoTasks(prs []*PullRequest) {
  363. for _, pr := range prs {
  364. log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
  365. if err := pr.UpdatePatch(); err != nil {
  366. log.Error(4, "UpdatePatch: %v", err)
  367. continue
  368. }
  369. pr.AddToTaskQueue()
  370. }
  371. }
  372. // AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch,
  373. // and generate new patch for testing as needed.
  374. func AddTestPullRequestTask(repoID int64, branch string) {
  375. log.Trace("AddTestPullRequestTask[head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
  376. prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
  377. if err != nil {
  378. log.Error(4, "Find pull requests[head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
  379. return
  380. }
  381. addHeadRepoTasks(prs)
  382. log.Trace("AddTestPullRequestTask[base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
  383. prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
  384. if err != nil {
  385. log.Error(4, "Find pull requests[base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
  386. return
  387. }
  388. for _, pr := range prs {
  389. pr.AddToTaskQueue()
  390. }
  391. }
  392. // checkAndUpdateStatus checks if pull request is possible to levaing checking status,
  393. // and set to be either conflict or mergeable.
  394. func (pr *PullRequest) checkAndUpdateStatus() {
  395. // Status is not changed to conflict means mergeable.
  396. if pr.Status == PULL_REQUEST_STATUS_CHECKING {
  397. pr.Status = PULL_REQUEST_STATUS_MERGEABLE
  398. }
  399. // Make sure there is no waiting test to process before levaing the checking status.
  400. if !PullRequestQueue.Exist(pr.ID) {
  401. if err := pr.UpdateCols("status"); err != nil {
  402. log.Error(4, "Update[%d]: %v", pr.ID, err)
  403. }
  404. }
  405. }
  406. // TestPullRequests checks and tests untested patches of pull requests.
  407. // TODO: test more pull requests at same time.
  408. func TestPullRequests() {
  409. prs := make([]*PullRequest, 0, 10)
  410. x.Iterate(PullRequest{
  411. Status: PULL_REQUEST_STATUS_CHECKING,
  412. },
  413. func(idx int, bean interface{}) error {
  414. pr := bean.(*PullRequest)
  415. if err := pr.GetBaseRepo(); err != nil {
  416. log.Error(3, "GetBaseRepo: %v", err)
  417. return nil
  418. }
  419. if err := pr.testPatch(); err != nil {
  420. log.Error(3, "testPatch: %v", err)
  421. return nil
  422. }
  423. prs = append(prs, pr)
  424. return nil
  425. })
  426. // Update pull request status.
  427. for _, pr := range prs {
  428. pr.checkAndUpdateStatus()
  429. }
  430. // Start listening on new test requests.
  431. for prID := range PullRequestQueue.Queue() {
  432. log.Trace("TestPullRequests[%v]: processing test task", prID)
  433. PullRequestQueue.Remove(prID)
  434. pr, err := GetPullRequestByID(com.StrTo(prID).MustInt64())
  435. if err != nil {
  436. log.Error(4, "GetPullRequestByID[%d]: %v", prID, err)
  437. continue
  438. } else if err = pr.testPatch(); err != nil {
  439. log.Error(4, "testPatch[%d]: %v", pr.ID, err)
  440. continue
  441. }
  442. pr.checkAndUpdateStatus()
  443. }
  444. }
  445. func InitTestPullRequests() {
  446. go TestPullRequests()
  447. }