pull.go 26 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850
  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. log "gopkg.in/clog.v1"
  14. "github.com/gogs/git-module"
  15. api "github.com/gogs/go-gogs-client"
  16. "github.com/gogs/gogs/models/errors"
  17. "github.com/gogs/gogs/pkg/process"
  18. "github.com/gogs/gogs/pkg/setting"
  19. "github.com/gogs/gogs/pkg/sync"
  20. )
  21. var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
  22. type PullRequestType int
  23. const (
  24. PULL_REQUEST_GOGS PullRequestType = iota
  25. PLLL_ERQUEST_GIT
  26. )
  27. type PullRequestStatus int
  28. const (
  29. PULL_REQUEST_STATUS_CONFLICT PullRequestStatus = iota
  30. PULL_REQUEST_STATUS_CHECKING
  31. PULL_REQUEST_STATUS_MERGEABLE
  32. )
  33. // PullRequest represents relation between pull request and repositories.
  34. type PullRequest struct {
  35. ID int64
  36. Type PullRequestType
  37. Status PullRequestStatus
  38. IssueID int64 `xorm:"INDEX"`
  39. Issue *Issue `xorm:"-"`
  40. Index int64
  41. HeadRepoID int64
  42. HeadRepo *Repository `xorm:"-"`
  43. BaseRepoID int64
  44. BaseRepo *Repository `xorm:"-"`
  45. HeadUserName string
  46. HeadBranch string
  47. BaseBranch string
  48. MergeBase string `xorm:"VARCHAR(40)"`
  49. HasMerged bool
  50. MergedCommitID string `xorm:"VARCHAR(40)"`
  51. MergerID int64
  52. Merger *User `xorm:"-"`
  53. Merged time.Time `xorm:"-"`
  54. MergedUnix int64
  55. }
  56. func (pr *PullRequest) BeforeUpdate() {
  57. pr.MergedUnix = pr.Merged.Unix()
  58. }
  59. // Note: don't try to get Issue because will end up recursive querying.
  60. func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
  61. switch colName {
  62. case "merged_unix":
  63. if !pr.HasMerged {
  64. return
  65. }
  66. pr.Merged = time.Unix(pr.MergedUnix, 0).Local()
  67. }
  68. }
  69. // Note: don't try to get Issue because will end up recursive querying.
  70. func (pr *PullRequest) loadAttributes(e Engine) (err error) {
  71. if pr.HeadRepo == nil {
  72. pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
  73. if err != nil && !errors.IsRepoNotExist(err) {
  74. return fmt.Errorf("getRepositoryByID.(HeadRepo) [%d]: %v", pr.HeadRepoID, err)
  75. }
  76. }
  77. if pr.BaseRepo == nil {
  78. pr.BaseRepo, err = getRepositoryByID(e, pr.BaseRepoID)
  79. if err != nil {
  80. return fmt.Errorf("getRepositoryByID.(BaseRepo) [%d]: %v", pr.BaseRepoID, err)
  81. }
  82. }
  83. if pr.HasMerged && pr.Merger == nil {
  84. pr.Merger, err = getUserByID(e, pr.MergerID)
  85. if errors.IsUserNotExist(err) {
  86. pr.MergerID = -1
  87. pr.Merger = NewGhostUser()
  88. } else if err != nil {
  89. return fmt.Errorf("getUserByID [%d]: %v", pr.MergerID, err)
  90. }
  91. }
  92. return nil
  93. }
  94. func (pr *PullRequest) LoadAttributes() error {
  95. return pr.loadAttributes(x)
  96. }
  97. func (pr *PullRequest) LoadIssue() (err error) {
  98. if pr.Issue != nil {
  99. return nil
  100. }
  101. pr.Issue, err = GetIssueByID(pr.IssueID)
  102. return err
  103. }
  104. // This method assumes following fields have been assigned with valid values:
  105. // Required - Issue, BaseRepo
  106. // Optional - HeadRepo, Merger
  107. func (pr *PullRequest) APIFormat() *api.PullRequest {
  108. // In case of head repo has been deleted.
  109. var apiHeadRepo *api.Repository
  110. if pr.HeadRepo == nil {
  111. apiHeadRepo = &api.Repository{
  112. Name: "deleted",
  113. }
  114. } else {
  115. apiHeadRepo = pr.HeadRepo.APIFormat(nil)
  116. }
  117. apiIssue := pr.Issue.APIFormat()
  118. apiPullRequest := &api.PullRequest{
  119. ID: pr.ID,
  120. Index: pr.Index,
  121. Poster: apiIssue.Poster,
  122. Title: apiIssue.Title,
  123. Body: apiIssue.Body,
  124. Labels: apiIssue.Labels,
  125. Milestone: apiIssue.Milestone,
  126. Assignee: apiIssue.Assignee,
  127. State: apiIssue.State,
  128. Comments: apiIssue.Comments,
  129. HeadBranch: pr.HeadBranch,
  130. HeadRepo: apiHeadRepo,
  131. BaseBranch: pr.BaseBranch,
  132. BaseRepo: pr.BaseRepo.APIFormat(nil),
  133. HTMLURL: pr.Issue.HTMLURL(),
  134. HasMerged: pr.HasMerged,
  135. }
  136. if pr.Status != PULL_REQUEST_STATUS_CHECKING {
  137. mergeable := pr.Status != PULL_REQUEST_STATUS_CONFLICT
  138. apiPullRequest.Mergeable = &mergeable
  139. }
  140. if pr.HasMerged {
  141. apiPullRequest.Merged = &pr.Merged
  142. apiPullRequest.MergedCommitID = &pr.MergedCommitID
  143. apiPullRequest.MergedBy = pr.Merger.APIFormat()
  144. }
  145. return apiPullRequest
  146. }
  147. // IsChecking returns true if this pull request is still checking conflict.
  148. func (pr *PullRequest) IsChecking() bool {
  149. return pr.Status == PULL_REQUEST_STATUS_CHECKING
  150. }
  151. // CanAutoMerge returns true if this pull request can be merged automatically.
  152. func (pr *PullRequest) CanAutoMerge() bool {
  153. return pr.Status == PULL_REQUEST_STATUS_MERGEABLE
  154. }
  155. // MergeStyle represents the approach to merge commits into base branch.
  156. type MergeStyle string
  157. const (
  158. MERGE_STYLE_REGULAR MergeStyle = "create_merge_commit"
  159. MERGE_STYLE_REBASE MergeStyle = "rebase_before_merging"
  160. )
  161. // Merge merges pull request to base repository.
  162. // FIXME: add repoWorkingPull make sure two merges does not happen at same time.
  163. func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle MergeStyle) (err error) {
  164. defer func() {
  165. go HookQueue.Add(pr.BaseRepo.ID)
  166. go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false)
  167. }()
  168. sess := x.NewSession()
  169. defer sess.Close()
  170. if err = sess.Begin(); err != nil {
  171. return err
  172. }
  173. if err = pr.Issue.changeStatus(sess, doer, pr.Issue.Repo, true); err != nil {
  174. return fmt.Errorf("Issue.changeStatus: %v", err)
  175. }
  176. headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
  177. headGitRepo, err := git.OpenRepository(headRepoPath)
  178. if err != nil {
  179. return fmt.Errorf("OpenRepository: %v", err)
  180. }
  181. // Create temporary directory to store temporary copy of the base repository,
  182. // and clean it up when operation finished regardless of succeed or not.
  183. tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git")
  184. os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm)
  185. defer os.RemoveAll(path.Dir(tmpBasePath))
  186. // Clone the base repository to the defined temporary directory,
  187. // and checks out to base branch directly.
  188. var stderr string
  189. if _, stderr, err = process.ExecTimeout(5*time.Minute,
  190. fmt.Sprintf("PullRequest.Merge (git clone): %s", tmpBasePath),
  191. "git", "clone", "-b", pr.BaseBranch, baseGitRepo.Path, tmpBasePath); err != nil {
  192. return fmt.Errorf("git clone: %s", stderr)
  193. }
  194. // Add remote which points to the head repository.
  195. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  196. fmt.Sprintf("PullRequest.Merge (git remote add): %s", tmpBasePath),
  197. "git", "remote", "add", "head_repo", headRepoPath); err != nil {
  198. return fmt.Errorf("git remote add [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  199. }
  200. // Fetch information from head repository to the temporary copy.
  201. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  202. fmt.Sprintf("PullRequest.Merge (git fetch): %s", tmpBasePath),
  203. "git", "fetch", "head_repo"); err != nil {
  204. return fmt.Errorf("git fetch [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  205. }
  206. remoteHeadBranch := "head_repo/" + pr.HeadBranch
  207. // Check if merge style is allowed, reset to default style if not
  208. if mergeStyle == MERGE_STYLE_REBASE && !pr.BaseRepo.PullsAllowRebase {
  209. mergeStyle = MERGE_STYLE_REGULAR
  210. }
  211. switch mergeStyle {
  212. case MERGE_STYLE_REGULAR: // Create merge commit
  213. // Merge changes from head branch.
  214. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  215. fmt.Sprintf("PullRequest.Merge (git merge --no-ff --no-commit): %s", tmpBasePath),
  216. "git", "merge", "--no-ff", "--no-commit", remoteHeadBranch); err != nil {
  217. return fmt.Errorf("git merge --no-ff --no-commit [%s]: %v - %s", tmpBasePath, err, stderr)
  218. }
  219. // Create a merge commit for the base branch.
  220. sig := doer.NewGitSig()
  221. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  222. fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath),
  223. "git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
  224. "-m", fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch)); err != nil {
  225. return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr)
  226. }
  227. case MERGE_STYLE_REBASE: // Rebase before merging
  228. // Rebase head branch based on base branch, this creates a non-branch commit state.
  229. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  230. fmt.Sprintf("PullRequest.Merge (git rebase): %s", tmpBasePath),
  231. "git", "rebase", "--quiet", pr.BaseBranch, remoteHeadBranch); err != nil {
  232. return fmt.Errorf("git rebase [%s on %s]: %s", remoteHeadBranch, pr.BaseBranch, stderr)
  233. }
  234. // Name non-branch commit state to a new temporary branch in order to save changes.
  235. tmpBranch := com.ToStr(time.Now().UnixNano(), 10)
  236. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  237. fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
  238. "git", "checkout", "-b", tmpBranch); err != nil {
  239. return fmt.Errorf("git checkout '%s': %s", tmpBranch, stderr)
  240. }
  241. // Check out the base branch to be operated on.
  242. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  243. fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
  244. "git", "checkout", pr.BaseBranch); err != nil {
  245. return fmt.Errorf("git checkout '%s': %s", pr.BaseBranch, stderr)
  246. }
  247. // Merge changes from temporary branch to the base branch.
  248. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  249. fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath),
  250. "git", "merge", tmpBranch); err != nil {
  251. return fmt.Errorf("git merge [%s]: %v - %s", tmpBasePath, err, stderr)
  252. }
  253. default:
  254. return fmt.Errorf("unknown merge style: %s", mergeStyle)
  255. }
  256. // Push changes on base branch to upstream.
  257. if _, stderr, err = process.ExecDir(-1, tmpBasePath,
  258. fmt.Sprintf("PullRequest.Merge (git push): %s", tmpBasePath),
  259. "git", "push", baseGitRepo.Path, pr.BaseBranch); err != nil {
  260. return fmt.Errorf("git push: %s", stderr)
  261. }
  262. pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.HeadBranch)
  263. if err != nil {
  264. return fmt.Errorf("GetBranchCommit: %v", err)
  265. }
  266. pr.HasMerged = true
  267. pr.Merged = time.Now()
  268. pr.MergerID = doer.ID
  269. if _, err = sess.Id(pr.ID).AllCols().Update(pr); err != nil {
  270. return fmt.Errorf("update pull request: %v", err)
  271. }
  272. if err = sess.Commit(); err != nil {
  273. return fmt.Errorf("Commit: %v", err)
  274. }
  275. if err = MergePullRequestAction(doer, pr.Issue.Repo, pr.Issue); err != nil {
  276. log.Error(2, "MergePullRequestAction [%d]: %v", pr.ID, err)
  277. }
  278. // Reload pull request information.
  279. if err = pr.LoadAttributes(); err != nil {
  280. log.Error(2, "LoadAttributes: %v", err)
  281. return nil
  282. }
  283. if err = PrepareWebhooks(pr.Issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
  284. Action: api.HOOK_ISSUE_CLOSED,
  285. Index: pr.Index,
  286. PullRequest: pr.APIFormat(),
  287. Repository: pr.Issue.Repo.APIFormat(nil),
  288. Sender: doer.APIFormat(),
  289. }); err != nil {
  290. log.Error(2, "PrepareWebhooks: %v", err)
  291. return nil
  292. }
  293. l, err := headGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
  294. if err != nil {
  295. log.Error(2, "CommitsBetweenIDs: %v", err)
  296. return nil
  297. }
  298. // It is possible that head branch is not fully sync with base branch for merge commits,
  299. // so we need to get latest head commit and append merge commit manully
  300. // to avoid strange diff commits produced.
  301. mergeCommit, err := baseGitRepo.GetBranchCommit(pr.BaseBranch)
  302. if err != nil {
  303. log.Error(2, "GetBranchCommit: %v", err)
  304. return nil
  305. }
  306. if mergeStyle == MERGE_STYLE_REGULAR {
  307. l.PushFront(mergeCommit)
  308. }
  309. commits, err := ListToPushCommits(l).ToApiPayloadCommits(pr.BaseRepo.RepoPath(), pr.BaseRepo.HTMLURL())
  310. if err != nil {
  311. log.Error(2, "ToApiPayloadCommits: %v", err)
  312. return nil
  313. }
  314. p := &api.PushPayload{
  315. Ref: git.BRANCH_PREFIX + pr.BaseBranch,
  316. Before: pr.MergeBase,
  317. After: mergeCommit.ID.String(),
  318. CompareURL: setting.AppURL + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
  319. Commits: commits,
  320. Repo: pr.BaseRepo.APIFormat(nil),
  321. Pusher: pr.HeadRepo.MustOwner().APIFormat(),
  322. Sender: doer.APIFormat(),
  323. }
  324. if err = PrepareWebhooks(pr.BaseRepo, HOOK_EVENT_PUSH, p); err != nil {
  325. log.Error(2, "PrepareWebhooks: %v", err)
  326. return nil
  327. }
  328. return nil
  329. }
  330. // testPatch checks if patch can be merged to base repository without conflit.
  331. // FIXME: make a mechanism to clean up stable local copies.
  332. func (pr *PullRequest) testPatch() (err error) {
  333. if pr.BaseRepo == nil {
  334. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  335. if err != nil {
  336. return fmt.Errorf("GetRepositoryByID: %v", err)
  337. }
  338. }
  339. patchPath, err := pr.BaseRepo.PatchPath(pr.Index)
  340. if err != nil {
  341. return fmt.Errorf("BaseRepo.PatchPath: %v", err)
  342. }
  343. // Fast fail if patch does not exist, this assumes data is cruppted.
  344. if !com.IsFile(patchPath) {
  345. log.Trace("PullRequest[%d].testPatch: ignored cruppted data", pr.ID)
  346. return nil
  347. }
  348. repoWorkingPool.CheckIn(com.ToStr(pr.BaseRepoID))
  349. defer repoWorkingPool.CheckOut(com.ToStr(pr.BaseRepoID))
  350. log.Trace("PullRequest[%d].testPatch (patchPath): %s", pr.ID, patchPath)
  351. if err := pr.BaseRepo.UpdateLocalCopyBranch(pr.BaseBranch); err != nil {
  352. return fmt.Errorf("UpdateLocalCopy [%d]: %v", pr.BaseRepoID, err)
  353. }
  354. args := []string{"apply", "--check"}
  355. if pr.BaseRepo.PullsIgnoreWhitespace {
  356. args = append(args, "--ignore-whitespace")
  357. }
  358. args = append(args, patchPath)
  359. pr.Status = PULL_REQUEST_STATUS_CHECKING
  360. _, stderr, err := process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(),
  361. fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID),
  362. "git", args...)
  363. if err != nil {
  364. log.Trace("PullRequest[%d].testPatch (apply): has conflit\n%s", pr.ID, stderr)
  365. pr.Status = PULL_REQUEST_STATUS_CONFLICT
  366. return nil
  367. }
  368. return nil
  369. }
  370. // NewPullRequest creates new pull request with labels for repository.
  371. func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte) (err error) {
  372. sess := x.NewSession()
  373. defer sess.Close()
  374. if err = sess.Begin(); err != nil {
  375. return err
  376. }
  377. if err = newIssue(sess, NewIssueOptions{
  378. Repo: repo,
  379. Issue: pull,
  380. LableIDs: labelIDs,
  381. Attachments: uuids,
  382. IsPull: true,
  383. }); err != nil {
  384. return fmt.Errorf("newIssue: %v", err)
  385. }
  386. pr.Index = pull.Index
  387. if err = repo.SavePatch(pr.Index, patch); err != nil {
  388. return fmt.Errorf("SavePatch: %v", err)
  389. }
  390. pr.BaseRepo = repo
  391. if err = pr.testPatch(); err != nil {
  392. return fmt.Errorf("testPatch: %v", err)
  393. }
  394. // No conflict appears after test means mergeable.
  395. if pr.Status == PULL_REQUEST_STATUS_CHECKING {
  396. pr.Status = PULL_REQUEST_STATUS_MERGEABLE
  397. }
  398. pr.IssueID = pull.ID
  399. if _, err = sess.Insert(pr); err != nil {
  400. return fmt.Errorf("insert pull repo: %v", err)
  401. }
  402. if err = sess.Commit(); err != nil {
  403. return fmt.Errorf("Commit: %v", err)
  404. }
  405. if err = NotifyWatchers(&Action{
  406. ActUserID: pull.Poster.ID,
  407. ActUserName: pull.Poster.Name,
  408. OpType: ACTION_CREATE_PULL_REQUEST,
  409. Content: fmt.Sprintf("%d|%s", pull.Index, pull.Title),
  410. RepoID: repo.ID,
  411. RepoUserName: repo.Owner.Name,
  412. RepoName: repo.Name,
  413. IsPrivate: repo.IsPrivate,
  414. }); err != nil {
  415. log.Error(2, "NotifyWatchers: %v", err)
  416. }
  417. if err = pull.MailParticipants(); err != nil {
  418. log.Error(2, "MailParticipants: %v", err)
  419. }
  420. pr.Issue = pull
  421. pull.PullRequest = pr
  422. if err = PrepareWebhooks(repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
  423. Action: api.HOOK_ISSUE_OPENED,
  424. Index: pull.Index,
  425. PullRequest: pr.APIFormat(),
  426. Repository: repo.APIFormat(nil),
  427. Sender: pull.Poster.APIFormat(),
  428. }); err != nil {
  429. log.Error(2, "PrepareWebhooks: %v", err)
  430. }
  431. return nil
  432. }
  433. // GetUnmergedPullRequest returnss a pull request that is open and has not been merged
  434. // by given head/base and repo/branch.
  435. func GetUnmergedPullRequest(headRepoID, baseRepoID int64, headBranch, baseBranch string) (*PullRequest, error) {
  436. pr := new(PullRequest)
  437. has, err := x.Where("head_repo_id=? AND head_branch=? AND base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  438. headRepoID, headBranch, baseRepoID, baseBranch, false, false).
  439. Join("INNER", "issue", "issue.id=pull_request.issue_id").Get(pr)
  440. if err != nil {
  441. return nil, err
  442. } else if !has {
  443. return nil, ErrPullRequestNotExist{0, 0, headRepoID, baseRepoID, headBranch, baseBranch}
  444. }
  445. return pr, nil
  446. }
  447. // GetUnmergedPullRequestsByHeadInfo returnss all pull requests that are open and has not been merged
  448. // by given head information (repo and branch).
  449. func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) {
  450. prs := make([]*PullRequest, 0, 2)
  451. return prs, x.Where("head_repo_id = ? AND head_branch = ? AND has_merged = ? AND issue.is_closed = ?",
  452. repoID, branch, false, false).
  453. Join("INNER", "issue", "issue.id = pull_request.issue_id").Find(&prs)
  454. }
  455. // GetUnmergedPullRequestsByBaseInfo returnss all pull requests that are open and has not been merged
  456. // by given base information (repo and branch).
  457. func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequest, error) {
  458. prs := make([]*PullRequest, 0, 2)
  459. return prs, x.Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  460. repoID, branch, false, false).
  461. Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
  462. }
  463. func getPullRequestByID(e Engine, id int64) (*PullRequest, error) {
  464. pr := new(PullRequest)
  465. has, err := e.Id(id).Get(pr)
  466. if err != nil {
  467. return nil, err
  468. } else if !has {
  469. return nil, ErrPullRequestNotExist{id, 0, 0, 0, "", ""}
  470. }
  471. return pr, pr.loadAttributes(e)
  472. }
  473. // GetPullRequestByID returns a pull request by given ID.
  474. func GetPullRequestByID(id int64) (*PullRequest, error) {
  475. return getPullRequestByID(x, id)
  476. }
  477. func getPullRequestByIssueID(e Engine, issueID int64) (*PullRequest, error) {
  478. pr := &PullRequest{
  479. IssueID: issueID,
  480. }
  481. has, err := e.Get(pr)
  482. if err != nil {
  483. return nil, err
  484. } else if !has {
  485. return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""}
  486. }
  487. return pr, pr.loadAttributes(e)
  488. }
  489. // GetPullRequestByIssueID returns pull request by given issue ID.
  490. func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
  491. return getPullRequestByIssueID(x, issueID)
  492. }
  493. // Update updates all fields of pull request.
  494. func (pr *PullRequest) Update() error {
  495. _, err := x.Id(pr.ID).AllCols().Update(pr)
  496. return err
  497. }
  498. // Update updates specific fields of pull request.
  499. func (pr *PullRequest) UpdateCols(cols ...string) error {
  500. _, err := x.Id(pr.ID).Cols(cols...).Update(pr)
  501. return err
  502. }
  503. // UpdatePatch generates and saves a new patch.
  504. func (pr *PullRequest) UpdatePatch() (err error) {
  505. if pr.HeadRepo == nil {
  506. log.Trace("PullRequest[%d].UpdatePatch: ignored cruppted data", pr.ID)
  507. return nil
  508. }
  509. headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
  510. if err != nil {
  511. return fmt.Errorf("OpenRepository: %v", err)
  512. }
  513. // Add a temporary remote.
  514. tmpRemote := com.ToStr(time.Now().UnixNano())
  515. if err = headGitRepo.AddRemote(tmpRemote, RepoPath(pr.BaseRepo.MustOwner().Name, pr.BaseRepo.Name), true); err != nil {
  516. return fmt.Errorf("AddRemote: %v", err)
  517. }
  518. defer func() {
  519. headGitRepo.RemoveRemote(tmpRemote)
  520. }()
  521. remoteBranch := "remotes/" + tmpRemote + "/" + pr.BaseBranch
  522. pr.MergeBase, err = headGitRepo.GetMergeBase(remoteBranch, pr.HeadBranch)
  523. if err != nil {
  524. return fmt.Errorf("GetMergeBase: %v", err)
  525. } else if err = pr.Update(); err != nil {
  526. return fmt.Errorf("Update: %v", err)
  527. }
  528. patch, err := headGitRepo.GetPatch(pr.MergeBase, pr.HeadBranch)
  529. if err != nil {
  530. return fmt.Errorf("GetPatch: %v", err)
  531. }
  532. if err = pr.BaseRepo.SavePatch(pr.Index, patch); err != nil {
  533. return fmt.Errorf("BaseRepo.SavePatch: %v", err)
  534. }
  535. return nil
  536. }
  537. // PushToBaseRepo pushes commits from branches of head repository to
  538. // corresponding branches of base repository.
  539. // FIXME: Only push branches that are actually updates?
  540. func (pr *PullRequest) PushToBaseRepo() (err error) {
  541. log.Trace("PushToBaseRepo[%d]: pushing commits to base repo 'refs/pull/%d/head'", pr.BaseRepoID, pr.Index)
  542. headRepoPath := pr.HeadRepo.RepoPath()
  543. headGitRepo, err := git.OpenRepository(headRepoPath)
  544. if err != nil {
  545. return fmt.Errorf("OpenRepository: %v", err)
  546. }
  547. tmpRemoteName := fmt.Sprintf("tmp-pull-%d", pr.ID)
  548. if err = headGitRepo.AddRemote(tmpRemoteName, pr.BaseRepo.RepoPath(), false); err != nil {
  549. return fmt.Errorf("headGitRepo.AddRemote: %v", err)
  550. }
  551. // Make sure to remove the remote even if the push fails
  552. defer headGitRepo.RemoveRemote(tmpRemoteName)
  553. headFile := fmt.Sprintf("refs/pull/%d/head", pr.Index)
  554. // Remove head in case there is a conflict.
  555. os.Remove(path.Join(pr.BaseRepo.RepoPath(), headFile))
  556. if err = git.Push(headRepoPath, tmpRemoteName, fmt.Sprintf("%s:%s", pr.HeadBranch, headFile)); err != nil {
  557. return fmt.Errorf("Push: %v", err)
  558. }
  559. return nil
  560. }
  561. // AddToTaskQueue adds itself to pull request test task queue.
  562. func (pr *PullRequest) AddToTaskQueue() {
  563. go PullRequestQueue.AddFunc(pr.ID, func() {
  564. pr.Status = PULL_REQUEST_STATUS_CHECKING
  565. if err := pr.UpdateCols("status"); err != nil {
  566. log.Error(3, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
  567. }
  568. })
  569. }
  570. type PullRequestList []*PullRequest
  571. func (prs PullRequestList) loadAttributes(e Engine) (err error) {
  572. if len(prs) == 0 {
  573. return nil
  574. }
  575. // Load issues
  576. set := make(map[int64]*Issue)
  577. for i := range prs {
  578. set[prs[i].IssueID] = nil
  579. }
  580. issueIDs := make([]int64, 0, len(prs))
  581. for issueID := range set {
  582. issueIDs = append(issueIDs, issueID)
  583. }
  584. issues := make([]*Issue, 0, len(issueIDs))
  585. if err = e.Where("id > 0").In("id", issueIDs).Find(&issues); err != nil {
  586. return fmt.Errorf("find issues: %v", err)
  587. }
  588. for i := range issues {
  589. set[issues[i].ID] = issues[i]
  590. }
  591. for i := range prs {
  592. prs[i].Issue = set[prs[i].IssueID]
  593. }
  594. // Load attributes
  595. for i := range prs {
  596. if err = prs[i].loadAttributes(e); err != nil {
  597. return fmt.Errorf("loadAttributes [%d]: %v", prs[i].ID, err)
  598. }
  599. }
  600. return nil
  601. }
  602. func (prs PullRequestList) LoadAttributes() error {
  603. return prs.loadAttributes(x)
  604. }
  605. func addHeadRepoTasks(prs []*PullRequest) {
  606. for _, pr := range prs {
  607. log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
  608. if err := pr.UpdatePatch(); err != nil {
  609. log.Error(4, "UpdatePatch: %v", err)
  610. continue
  611. } else if err := pr.PushToBaseRepo(); err != nil {
  612. log.Error(4, "PushToBaseRepo: %v", err)
  613. continue
  614. }
  615. pr.AddToTaskQueue()
  616. }
  617. }
  618. // AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch,
  619. // and generate new patch for testing as needed.
  620. func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool) {
  621. log.Trace("AddTestPullRequestTask [head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
  622. prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
  623. if err != nil {
  624. log.Error(2, "Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
  625. return
  626. }
  627. if isSync {
  628. if err = PullRequestList(prs).LoadAttributes(); err != nil {
  629. log.Error(2, "PullRequestList.LoadAttributes: %v", err)
  630. }
  631. if err == nil {
  632. for _, pr := range prs {
  633. pr.Issue.PullRequest = pr
  634. if err = pr.Issue.LoadAttributes(); err != nil {
  635. log.Error(2, "LoadAttributes: %v", err)
  636. continue
  637. }
  638. if err = PrepareWebhooks(pr.Issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
  639. Action: api.HOOK_ISSUE_SYNCHRONIZED,
  640. Index: pr.Issue.Index,
  641. PullRequest: pr.Issue.PullRequest.APIFormat(),
  642. Repository: pr.Issue.Repo.APIFormat(nil),
  643. Sender: doer.APIFormat(),
  644. }); err != nil {
  645. log.Error(2, "PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
  646. continue
  647. }
  648. }
  649. }
  650. }
  651. addHeadRepoTasks(prs)
  652. log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
  653. prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
  654. if err != nil {
  655. log.Error(2, "Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
  656. return
  657. }
  658. for _, pr := range prs {
  659. pr.AddToTaskQueue()
  660. }
  661. }
  662. func ChangeUsernameInPullRequests(oldUserName, newUserName string) error {
  663. pr := PullRequest{
  664. HeadUserName: strings.ToLower(newUserName),
  665. }
  666. _, err := x.Cols("head_user_name").Where("head_user_name = ?", strings.ToLower(oldUserName)).Update(pr)
  667. return err
  668. }
  669. // checkAndUpdateStatus checks if pull request is possible to levaing checking status,
  670. // and set to be either conflict or mergeable.
  671. func (pr *PullRequest) checkAndUpdateStatus() {
  672. // Status is not changed to conflict means mergeable.
  673. if pr.Status == PULL_REQUEST_STATUS_CHECKING {
  674. pr.Status = PULL_REQUEST_STATUS_MERGEABLE
  675. }
  676. // Make sure there is no waiting test to process before levaing the checking status.
  677. if !PullRequestQueue.Exist(pr.ID) {
  678. if err := pr.UpdateCols("status"); err != nil {
  679. log.Error(4, "Update[%d]: %v", pr.ID, err)
  680. }
  681. }
  682. }
  683. // TestPullRequests checks and tests untested patches of pull requests.
  684. // TODO: test more pull requests at same time.
  685. func TestPullRequests() {
  686. prs := make([]*PullRequest, 0, 10)
  687. x.Iterate(PullRequest{
  688. Status: PULL_REQUEST_STATUS_CHECKING,
  689. },
  690. func(idx int, bean interface{}) error {
  691. pr := bean.(*PullRequest)
  692. if err := pr.LoadAttributes(); err != nil {
  693. log.Error(3, "LoadAttributes: %v", err)
  694. return nil
  695. }
  696. if err := pr.testPatch(); err != nil {
  697. log.Error(3, "testPatch: %v", err)
  698. return nil
  699. }
  700. prs = append(prs, pr)
  701. return nil
  702. })
  703. // Update pull request status.
  704. for _, pr := range prs {
  705. pr.checkAndUpdateStatus()
  706. }
  707. // Start listening on new test requests.
  708. for prID := range PullRequestQueue.Queue() {
  709. log.Trace("TestPullRequests[%v]: processing test task", prID)
  710. PullRequestQueue.Remove(prID)
  711. pr, err := GetPullRequestByID(com.StrTo(prID).MustInt64())
  712. if err != nil {
  713. log.Error(4, "GetPullRequestByID[%s]: %v", prID, err)
  714. continue
  715. } else if err = pr.testPatch(); err != nil {
  716. log.Error(4, "testPatch[%d]: %v", pr.ID, err)
  717. continue
  718. }
  719. pr.checkAndUpdateStatus()
  720. }
  721. }
  722. func InitTestPullRequests() {
  723. go TestPullRequests()
  724. }