You can not select more than 25 topics Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.

pull.go 20 kB

Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
Issue due date (#3794) * Started adding deadline to ui * Implemented basic issue due date managing * Improved UI for due date managing * Added at least write access to the repo in order to modify issue due dates * Ui improvements * Added issue comments creation when adding/modifying/removing a due date * Show due date in issue list * Added api support for issue due dates * Fixed lint suggestions * Added deadline to sdk * Updated css * Added support for adding/modifiying deadlines for pull requests via api * Fixed comments not created when updating or removing a deadline * update sdk (will do properly once go-gitea/go-sdk#103 is merged) * enhanced updateIssueDeadline * Removed unnessecary Issue.DeadlineString * UI improvements * Small improvments to comment creation + ui & validation improvements * Check if an issue is overdue is now a seperate function * Updated go-sdk with govendor as it was merged * Simplified isOverdue method * removed unessecary deadline to 0 set * Update swagger definitions * Added missing return * Added an explanary comment * Improved updateIssueDeadline method so it'll only update `deadline_unix` * Small changes and improvements * no need to explicitly load the issue when updating a deadline, just use whats already there * small optimisations * Added check if a deadline was modified before updating it * Moved comment creating logic into its own function * Code cleanup for creating deadline comment * locale improvement * When modifying a deadline, the old deadline is saved with the comment * small improvments to xorm session handling when updating an issue deadline + style nitpicks * style nitpicks * Moved checking for if the user has write acces to middleware
7 years ago
Issue due date (#3794) * Started adding deadline to ui * Implemented basic issue due date managing * Improved UI for due date managing * Added at least write access to the repo in order to modify issue due dates * Ui improvements * Added issue comments creation when adding/modifying/removing a due date * Show due date in issue list * Added api support for issue due dates * Fixed lint suggestions * Added deadline to sdk * Updated css * Added support for adding/modifiying deadlines for pull requests via api * Fixed comments not created when updating or removing a deadline * update sdk (will do properly once go-gitea/go-sdk#103 is merged) * enhanced updateIssueDeadline * Removed unnessecary Issue.DeadlineString * UI improvements * Small improvments to comment creation + ui & validation improvements * Check if an issue is overdue is now a seperate function * Updated go-sdk with govendor as it was merged * Simplified isOverdue method * removed unessecary deadline to 0 set * Update swagger definitions * Added missing return * Added an explanary comment * Improved updateIssueDeadline method so it'll only update `deadline_unix` * Small changes and improvements * no need to explicitly load the issue when updating a deadline, just use whats already there * small optimisations * Added check if a deadline was modified before updating it * Moved comment creating logic into its own function * Code cleanup for creating deadline comment * locale improvement * When modifying a deadline, the old deadline is saved with the comment * small improvments to xorm session handling when updating an issue deadline + style nitpicks * style nitpicks * Moved checking for if the user has write acces to middleware
7 years ago
Issue due date (#3794) * Started adding deadline to ui * Implemented basic issue due date managing * Improved UI for due date managing * Added at least write access to the repo in order to modify issue due dates * Ui improvements * Added issue comments creation when adding/modifying/removing a due date * Show due date in issue list * Added api support for issue due dates * Fixed lint suggestions * Added deadline to sdk * Updated css * Added support for adding/modifiying deadlines for pull requests via api * Fixed comments not created when updating or removing a deadline * update sdk (will do properly once go-gitea/go-sdk#103 is merged) * enhanced updateIssueDeadline * Removed unnessecary Issue.DeadlineString * UI improvements * Small improvments to comment creation + ui & validation improvements * Check if an issue is overdue is now a seperate function * Updated go-sdk with govendor as it was merged * Simplified isOverdue method * removed unessecary deadline to 0 set * Update swagger definitions * Added missing return * Added an explanary comment * Improved updateIssueDeadline method so it'll only update `deadline_unix` * Small changes and improvements * no need to explicitly load the issue when updating a deadline, just use whats already there * small optimisations * Added check if a deadline was modified before updating it * Moved comment creating logic into its own function * Code cleanup for creating deadline comment * locale improvement * When modifying a deadline, the old deadline is saved with the comment * small improvments to xorm session handling when updating an issue deadline + style nitpicks * style nitpicks * Moved checking for if the user has write acces to middleware
7 years ago
Issue due date (#3794) * Started adding deadline to ui * Implemented basic issue due date managing * Improved UI for due date managing * Added at least write access to the repo in order to modify issue due dates * Ui improvements * Added issue comments creation when adding/modifying/removing a due date * Show due date in issue list * Added api support for issue due dates * Fixed lint suggestions * Added deadline to sdk * Updated css * Added support for adding/modifiying deadlines for pull requests via api * Fixed comments not created when updating or removing a deadline * update sdk (will do properly once go-gitea/go-sdk#103 is merged) * enhanced updateIssueDeadline * Removed unnessecary Issue.DeadlineString * UI improvements * Small improvments to comment creation + ui & validation improvements * Check if an issue is overdue is now a seperate function * Updated go-sdk with govendor as it was merged * Simplified isOverdue method * removed unessecary deadline to 0 set * Update swagger definitions * Added missing return * Added an explanary comment * Improved updateIssueDeadline method so it'll only update `deadline_unix` * Small changes and improvements * no need to explicitly load the issue when updating a deadline, just use whats already there * small optimisations * Added check if a deadline was modified before updating it * Moved comment creating logic into its own function * Code cleanup for creating deadline comment * locale improvement * When modifying a deadline, the old deadline is saved with the comment * small improvments to xorm session handling when updating an issue deadline + style nitpicks * style nitpicks * Moved checking for if the user has write acces to middleware
7 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756
  1. // Copyright 2016 The Gitea 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 repo
  5. import (
  6. "fmt"
  7. "net/http"
  8. "strings"
  9. "code.gitea.io/gitea/models"
  10. "code.gitea.io/gitea/modules/auth"
  11. "code.gitea.io/gitea/modules/context"
  12. "code.gitea.io/gitea/modules/git"
  13. "code.gitea.io/gitea/modules/log"
  14. "code.gitea.io/gitea/modules/notification"
  15. api "code.gitea.io/gitea/modules/structs"
  16. "code.gitea.io/gitea/modules/timeutil"
  17. issue_service "code.gitea.io/gitea/services/issue"
  18. milestone_service "code.gitea.io/gitea/services/milestone"
  19. pull_service "code.gitea.io/gitea/services/pull"
  20. )
  21. // ListPullRequests returns a list of all PRs
  22. func ListPullRequests(ctx *context.APIContext, form api.ListPullRequestsOptions) {
  23. // swagger:operation GET /repos/{owner}/{repo}/pulls repository repoListPullRequests
  24. // ---
  25. // summary: List a repo's pull requests
  26. // produces:
  27. // - application/json
  28. // parameters:
  29. // - name: owner
  30. // in: path
  31. // description: owner of the repo
  32. // type: string
  33. // required: true
  34. // - name: repo
  35. // in: path
  36. // description: name of the repo
  37. // type: string
  38. // required: true
  39. // - name: page
  40. // in: query
  41. // description: Page number
  42. // type: integer
  43. // - name: state
  44. // in: query
  45. // description: "State of pull request: open or closed (optional)"
  46. // type: string
  47. // enum: [closed, open, all]
  48. // - name: sort
  49. // in: query
  50. // description: "Type of sort"
  51. // type: string
  52. // enum: [oldest, recentupdate, leastupdate, mostcomment, leastcomment, priority]
  53. // - name: milestone
  54. // in: query
  55. // description: "ID of the milestone"
  56. // type: integer
  57. // format: int64
  58. // - name: labels
  59. // in: query
  60. // description: "Label IDs"
  61. // type: array
  62. // collectionFormat: multi
  63. // items:
  64. // type: integer
  65. // format: int64
  66. // responses:
  67. // "200":
  68. // "$ref": "#/responses/PullRequestList"
  69. prs, maxResults, err := models.PullRequests(ctx.Repo.Repository.ID, &models.PullRequestsOptions{
  70. Page: ctx.QueryInt("page"),
  71. State: ctx.QueryTrim("state"),
  72. SortType: ctx.QueryTrim("sort"),
  73. Labels: ctx.QueryStrings("labels"),
  74. MilestoneID: ctx.QueryInt64("milestone"),
  75. })
  76. if err != nil {
  77. ctx.Error(500, "PullRequests", err)
  78. return
  79. }
  80. apiPrs := make([]*api.PullRequest, len(prs))
  81. for i := range prs {
  82. if err = prs[i].LoadIssue(); err != nil {
  83. ctx.Error(500, "LoadIssue", err)
  84. return
  85. }
  86. if err = prs[i].LoadAttributes(); err != nil {
  87. ctx.Error(500, "LoadAttributes", err)
  88. return
  89. }
  90. if err = prs[i].GetBaseRepo(); err != nil {
  91. ctx.Error(500, "GetBaseRepo", err)
  92. return
  93. }
  94. if err = prs[i].GetHeadRepo(); err != nil {
  95. ctx.Error(500, "GetHeadRepo", err)
  96. return
  97. }
  98. apiPrs[i] = prs[i].APIFormat()
  99. }
  100. ctx.SetLinkHeader(int(maxResults), models.ItemsPerPage)
  101. ctx.JSON(200, &apiPrs)
  102. }
  103. // GetPullRequest returns a single PR based on index
  104. func GetPullRequest(ctx *context.APIContext) {
  105. // swagger:operation GET /repos/{owner}/{repo}/pulls/{index} repository repoGetPullRequest
  106. // ---
  107. // summary: Get a pull request
  108. // produces:
  109. // - application/json
  110. // parameters:
  111. // - name: owner
  112. // in: path
  113. // description: owner of the repo
  114. // type: string
  115. // required: true
  116. // - name: repo
  117. // in: path
  118. // description: name of the repo
  119. // type: string
  120. // required: true
  121. // - name: index
  122. // in: path
  123. // description: index of the pull request to get
  124. // type: integer
  125. // format: int64
  126. // required: true
  127. // responses:
  128. // "200":
  129. // "$ref": "#/responses/PullRequest"
  130. pr, err := models.GetPullRequestByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  131. if err != nil {
  132. if models.IsErrPullRequestNotExist(err) {
  133. ctx.NotFound()
  134. } else {
  135. ctx.Error(500, "GetPullRequestByIndex", err)
  136. }
  137. return
  138. }
  139. if err = pr.GetBaseRepo(); err != nil {
  140. ctx.Error(500, "GetBaseRepo", err)
  141. return
  142. }
  143. if err = pr.GetHeadRepo(); err != nil {
  144. ctx.Error(500, "GetHeadRepo", err)
  145. return
  146. }
  147. ctx.JSON(200, pr.APIFormat())
  148. }
  149. // CreatePullRequest does what it says
  150. func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption) {
  151. // swagger:operation POST /repos/{owner}/{repo}/pulls repository repoCreatePullRequest
  152. // ---
  153. // summary: Create a pull request
  154. // consumes:
  155. // - application/json
  156. // produces:
  157. // - application/json
  158. // parameters:
  159. // - name: owner
  160. // in: path
  161. // description: owner of the repo
  162. // type: string
  163. // required: true
  164. // - name: repo
  165. // in: path
  166. // description: name of the repo
  167. // type: string
  168. // required: true
  169. // - name: body
  170. // in: body
  171. // schema:
  172. // "$ref": "#/definitions/CreatePullRequestOption"
  173. // responses:
  174. // "201":
  175. // "$ref": "#/responses/PullRequest"
  176. var (
  177. repo = ctx.Repo.Repository
  178. labelIDs []int64
  179. assigneeID int64
  180. milestoneID int64
  181. )
  182. // Get repo/branch information
  183. _, headRepo, headGitRepo, compareInfo, baseBranch, headBranch := parseCompareInfo(ctx, form)
  184. if ctx.Written() {
  185. return
  186. }
  187. // Check if another PR exists with the same targets
  188. existingPr, err := models.GetUnmergedPullRequest(headRepo.ID, ctx.Repo.Repository.ID, headBranch, baseBranch)
  189. if err != nil {
  190. if !models.IsErrPullRequestNotExist(err) {
  191. ctx.Error(500, "GetUnmergedPullRequest", err)
  192. return
  193. }
  194. } else {
  195. err = models.ErrPullRequestAlreadyExists{
  196. ID: existingPr.ID,
  197. IssueID: existingPr.Index,
  198. HeadRepoID: existingPr.HeadRepoID,
  199. BaseRepoID: existingPr.BaseRepoID,
  200. HeadBranch: existingPr.HeadBranch,
  201. BaseBranch: existingPr.BaseBranch,
  202. }
  203. ctx.Error(409, "GetUnmergedPullRequest", err)
  204. return
  205. }
  206. if len(form.Labels) > 0 {
  207. labels, err := models.GetLabelsInRepoByIDs(ctx.Repo.Repository.ID, form.Labels)
  208. if err != nil {
  209. ctx.Error(500, "GetLabelsInRepoByIDs", err)
  210. return
  211. }
  212. labelIDs = make([]int64, len(labels))
  213. for i := range labels {
  214. labelIDs[i] = labels[i].ID
  215. }
  216. }
  217. if form.Milestone > 0 {
  218. milestone, err := models.GetMilestoneByRepoID(ctx.Repo.Repository.ID, milestoneID)
  219. if err != nil {
  220. if models.IsErrMilestoneNotExist(err) {
  221. ctx.NotFound()
  222. } else {
  223. ctx.Error(500, "GetMilestoneByRepoID", err)
  224. }
  225. return
  226. }
  227. milestoneID = milestone.ID
  228. }
  229. patch, err := headGitRepo.GetPatch(compareInfo.MergeBase, headBranch)
  230. if err != nil {
  231. ctx.Error(500, "GetPatch", err)
  232. return
  233. }
  234. var deadlineUnix timeutil.TimeStamp
  235. if form.Deadline != nil {
  236. deadlineUnix = timeutil.TimeStamp(form.Deadline.Unix())
  237. }
  238. prIssue := &models.Issue{
  239. RepoID: repo.ID,
  240. Title: form.Title,
  241. PosterID: ctx.User.ID,
  242. Poster: ctx.User,
  243. MilestoneID: milestoneID,
  244. AssigneeID: assigneeID,
  245. IsPull: true,
  246. Content: form.Body,
  247. DeadlineUnix: deadlineUnix,
  248. }
  249. pr := &models.PullRequest{
  250. HeadRepoID: headRepo.ID,
  251. BaseRepoID: repo.ID,
  252. HeadBranch: headBranch,
  253. BaseBranch: baseBranch,
  254. HeadRepo: headRepo,
  255. BaseRepo: repo,
  256. MergeBase: compareInfo.MergeBase,
  257. Type: models.PullRequestGitea,
  258. }
  259. // Get all assignee IDs
  260. assigneeIDs, err := models.MakeIDsFromAPIAssigneesToAdd(form.Assignee, form.Assignees)
  261. if err != nil {
  262. if models.IsErrUserNotExist(err) {
  263. ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", err))
  264. } else {
  265. ctx.Error(500, "AddAssigneeByName", err)
  266. }
  267. return
  268. }
  269. // Check if the passed assignees is assignable
  270. for _, aID := range assigneeIDs {
  271. assignee, err := models.GetUserByID(aID)
  272. if err != nil {
  273. ctx.Error(500, "GetUserByID", err)
  274. return
  275. }
  276. valid, err := models.CanBeAssigned(assignee, repo, true)
  277. if err != nil {
  278. ctx.Error(500, "canBeAssigned", err)
  279. return
  280. }
  281. if !valid {
  282. ctx.Error(422, "canBeAssigned", models.ErrUserDoesNotHaveAccessToRepo{UserID: aID, RepoName: repo.Name})
  283. return
  284. }
  285. }
  286. if err := pull_service.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, patch); err != nil {
  287. if models.IsErrUserDoesNotHaveAccessToRepo(err) {
  288. ctx.Error(400, "UserDoesNotHaveAccessToRepo", err)
  289. return
  290. }
  291. ctx.Error(500, "NewPullRequest", err)
  292. return
  293. } else if err := pr.PushToBaseRepo(); err != nil {
  294. ctx.Error(500, "PushToBaseRepo", err)
  295. return
  296. }
  297. if err := issue_service.AddAssignees(prIssue, ctx.User, assigneeIDs); err != nil {
  298. ctx.ServerError("AddAssignees", err)
  299. return
  300. }
  301. notification.NotifyNewPullRequest(pr)
  302. log.Trace("Pull request created: %d/%d", repo.ID, prIssue.ID)
  303. ctx.JSON(201, pr.APIFormat())
  304. }
  305. // EditPullRequest does what it says
  306. func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
  307. // swagger:operation PATCH /repos/{owner}/{repo}/pulls/{index} repository repoEditPullRequest
  308. // ---
  309. // summary: Update a pull request
  310. // consumes:
  311. // - application/json
  312. // produces:
  313. // - application/json
  314. // parameters:
  315. // - name: owner
  316. // in: path
  317. // description: owner of the repo
  318. // type: string
  319. // required: true
  320. // - name: repo
  321. // in: path
  322. // description: name of the repo
  323. // type: string
  324. // required: true
  325. // - name: index
  326. // in: path
  327. // description: index of the pull request to edit
  328. // type: integer
  329. // format: int64
  330. // required: true
  331. // - name: body
  332. // in: body
  333. // schema:
  334. // "$ref": "#/definitions/EditPullRequestOption"
  335. // responses:
  336. // "201":
  337. // "$ref": "#/responses/PullRequest"
  338. pr, err := models.GetPullRequestByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  339. if err != nil {
  340. if models.IsErrPullRequestNotExist(err) {
  341. ctx.NotFound()
  342. } else {
  343. ctx.Error(500, "GetPullRequestByIndex", err)
  344. }
  345. return
  346. }
  347. err = pr.LoadIssue()
  348. if err != nil {
  349. ctx.Error(http.StatusInternalServerError, "LoadIssue", err)
  350. return
  351. }
  352. issue := pr.Issue
  353. issue.Repo = ctx.Repo.Repository
  354. if !issue.IsPoster(ctx.User.ID) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) {
  355. ctx.Status(403)
  356. return
  357. }
  358. if len(form.Title) > 0 {
  359. issue.Title = form.Title
  360. }
  361. if len(form.Body) > 0 {
  362. issue.Content = form.Body
  363. }
  364. // Update Deadline
  365. if form.Deadline != nil {
  366. deadlineUnix := timeutil.TimeStamp(form.Deadline.Unix())
  367. if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
  368. ctx.Error(500, "UpdateIssueDeadline", err)
  369. return
  370. }
  371. issue.DeadlineUnix = deadlineUnix
  372. }
  373. // Add/delete assignees
  374. // Deleting is done the GitHub way (quote from their api documentation):
  375. // https://developer.github.com/v3/issues/#edit-an-issue
  376. // "assignees" (array): Logins for Users to assign to this issue.
  377. // Pass one or more user logins to replace the set of assignees on this Issue.
  378. // Send an empty array ([]) to clear all assignees from the Issue.
  379. if ctx.Repo.CanWrite(models.UnitTypePullRequests) && (form.Assignees != nil || len(form.Assignee) > 0) {
  380. err = issue_service.UpdateAssignees(issue, form.Assignee, form.Assignees, ctx.User)
  381. if err != nil {
  382. if models.IsErrUserNotExist(err) {
  383. ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", err))
  384. } else {
  385. ctx.Error(500, "UpdateAssignees", err)
  386. }
  387. return
  388. }
  389. }
  390. if ctx.Repo.CanWrite(models.UnitTypePullRequests) && form.Milestone != 0 &&
  391. issue.MilestoneID != form.Milestone {
  392. oldMilestoneID := issue.MilestoneID
  393. issue.MilestoneID = form.Milestone
  394. if err = milestone_service.ChangeMilestoneAssign(issue, ctx.User, oldMilestoneID); err != nil {
  395. ctx.Error(500, "ChangeMilestoneAssign", err)
  396. return
  397. }
  398. }
  399. if ctx.Repo.CanWrite(models.UnitTypePullRequests) && form.Labels != nil {
  400. labels, err := models.GetLabelsInRepoByIDs(ctx.Repo.Repository.ID, form.Labels)
  401. if err != nil {
  402. ctx.Error(500, "GetLabelsInRepoByIDsError", err)
  403. return
  404. }
  405. if err = issue.ReplaceLabels(labels, ctx.User); err != nil {
  406. ctx.Error(500, "ReplaceLabelsError", err)
  407. return
  408. }
  409. }
  410. if err = models.UpdateIssue(issue); err != nil {
  411. ctx.Error(500, "UpdateIssue", err)
  412. return
  413. }
  414. if form.State != nil {
  415. if err = issue_service.ChangeStatus(issue, ctx.User, api.StateClosed == api.StateType(*form.State)); err != nil {
  416. if models.IsErrDependenciesLeft(err) {
  417. ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this pull request because it still has open dependencies")
  418. return
  419. }
  420. ctx.Error(500, "ChangeStatus", err)
  421. return
  422. }
  423. }
  424. // Refetch from database
  425. pr, err = models.GetPullRequestByIndex(ctx.Repo.Repository.ID, pr.Index)
  426. if err != nil {
  427. if models.IsErrPullRequestNotExist(err) {
  428. ctx.NotFound()
  429. } else {
  430. ctx.Error(500, "GetPullRequestByIndex", err)
  431. }
  432. return
  433. }
  434. // TODO this should be 200, not 201
  435. ctx.JSON(201, pr.APIFormat())
  436. }
  437. // IsPullRequestMerged checks if a PR exists given an index
  438. func IsPullRequestMerged(ctx *context.APIContext) {
  439. // swagger:operation GET /repos/{owner}/{repo}/pulls/{index}/merge repository repoPullRequestIsMerged
  440. // ---
  441. // summary: Check if a pull request has been merged
  442. // produces:
  443. // - application/json
  444. // parameters:
  445. // - name: owner
  446. // in: path
  447. // description: owner of the repo
  448. // type: string
  449. // required: true
  450. // - name: repo
  451. // in: path
  452. // description: name of the repo
  453. // type: string
  454. // required: true
  455. // - name: index
  456. // in: path
  457. // description: index of the pull request
  458. // type: integer
  459. // format: int64
  460. // required: true
  461. // responses:
  462. // "204":
  463. // description: pull request has been merged
  464. // "404":
  465. // description: pull request has not been merged
  466. pr, err := models.GetPullRequestByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  467. if err != nil {
  468. if models.IsErrPullRequestNotExist(err) {
  469. ctx.NotFound()
  470. } else {
  471. ctx.Error(500, "GetPullRequestByIndex", err)
  472. }
  473. return
  474. }
  475. if pr.HasMerged {
  476. ctx.Status(204)
  477. }
  478. ctx.NotFound()
  479. }
  480. // MergePullRequest merges a PR given an index
  481. func MergePullRequest(ctx *context.APIContext, form auth.MergePullRequestForm) {
  482. // swagger:operation POST /repos/{owner}/{repo}/pulls/{index}/merge repository repoMergePullRequest
  483. // ---
  484. // summary: Merge a pull request
  485. // produces:
  486. // - application/json
  487. // parameters:
  488. // - name: owner
  489. // in: path
  490. // description: owner of the repo
  491. // type: string
  492. // required: true
  493. // - name: repo
  494. // in: path
  495. // description: name of the repo
  496. // type: string
  497. // required: true
  498. // - name: index
  499. // in: path
  500. // description: index of the pull request to merge
  501. // type: integer
  502. // format: int64
  503. // required: true
  504. // - name: body
  505. // in: body
  506. // schema:
  507. // $ref: "#/definitions/MergePullRequestOption"
  508. // responses:
  509. // "200":
  510. // "$ref": "#/responses/empty"
  511. // "405":
  512. // "$ref": "#/responses/empty"
  513. pr, err := models.GetPullRequestByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  514. if err != nil {
  515. if models.IsErrPullRequestNotExist(err) {
  516. ctx.NotFound("GetPullRequestByIndex", err)
  517. } else {
  518. ctx.Error(500, "GetPullRequestByIndex", err)
  519. }
  520. return
  521. }
  522. if err = pr.GetHeadRepo(); err != nil {
  523. ctx.ServerError("GetHeadRepo", err)
  524. return
  525. }
  526. err = pr.LoadIssue()
  527. if err != nil {
  528. ctx.Error(http.StatusInternalServerError, "LoadIssue", err)
  529. return
  530. }
  531. pr.Issue.Repo = ctx.Repo.Repository
  532. if ctx.IsSigned {
  533. // Update issue-user.
  534. if err = pr.Issue.ReadBy(ctx.User.ID); err != nil {
  535. ctx.Error(500, "ReadBy", err)
  536. return
  537. }
  538. }
  539. if pr.Issue.IsClosed {
  540. ctx.NotFound()
  541. return
  542. }
  543. if !pr.CanAutoMerge() || pr.HasMerged || pr.IsWorkInProgress() {
  544. ctx.Status(405)
  545. return
  546. }
  547. isPass, err := pull_service.IsPullCommitStatusPass(pr)
  548. if err != nil {
  549. ctx.Error(500, "IsPullCommitStatusPass", err)
  550. return
  551. }
  552. if !isPass && !ctx.IsUserRepoAdmin() {
  553. ctx.Status(405)
  554. return
  555. }
  556. if len(form.Do) == 0 {
  557. form.Do = string(models.MergeStyleMerge)
  558. }
  559. message := strings.TrimSpace(form.MergeTitleField)
  560. if len(message) == 0 {
  561. if models.MergeStyle(form.Do) == models.MergeStyleMerge {
  562. message = pr.GetDefaultMergeMessage()
  563. }
  564. if models.MergeStyle(form.Do) == models.MergeStyleSquash {
  565. message = pr.GetDefaultSquashMessage()
  566. }
  567. }
  568. form.MergeMessageField = strings.TrimSpace(form.MergeMessageField)
  569. if len(form.MergeMessageField) > 0 {
  570. message += "\n\n" + form.MergeMessageField
  571. }
  572. if err := pull_service.Merge(pr, ctx.User, ctx.Repo.GitRepo, models.MergeStyle(form.Do), message); err != nil {
  573. if models.IsErrInvalidMergeStyle(err) {
  574. ctx.Status(405)
  575. return
  576. }
  577. ctx.Error(500, "Merge", err)
  578. return
  579. }
  580. log.Trace("Pull request merged: %d", pr.ID)
  581. ctx.Status(200)
  582. }
  583. func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption) (*models.User, *models.Repository, *git.Repository, *git.CompareInfo, string, string) {
  584. baseRepo := ctx.Repo.Repository
  585. // Get compared branches information
  586. // format: <base branch>...[<head repo>:]<head branch>
  587. // base<-head: master...head:feature
  588. // same repo: master...feature
  589. // TODO: Validate form first?
  590. baseBranch := form.Base
  591. var (
  592. headUser *models.User
  593. headBranch string
  594. isSameRepo bool
  595. err error
  596. )
  597. // If there is no head repository, it means pull request between same repository.
  598. headInfos := strings.Split(form.Head, ":")
  599. if len(headInfos) == 1 {
  600. isSameRepo = true
  601. headUser = ctx.Repo.Owner
  602. headBranch = headInfos[0]
  603. } else if len(headInfos) == 2 {
  604. headUser, err = models.GetUserByName(headInfos[0])
  605. if err != nil {
  606. if models.IsErrUserNotExist(err) {
  607. ctx.NotFound("GetUserByName")
  608. } else {
  609. ctx.ServerError("GetUserByName", err)
  610. }
  611. return nil, nil, nil, nil, "", ""
  612. }
  613. headBranch = headInfos[1]
  614. } else {
  615. ctx.NotFound()
  616. return nil, nil, nil, nil, "", ""
  617. }
  618. ctx.Repo.PullRequest.SameRepo = isSameRepo
  619. log.Info("Base branch: %s", baseBranch)
  620. log.Info("Repo path: %s", ctx.Repo.GitRepo.Path)
  621. // Check if base branch is valid.
  622. if !ctx.Repo.GitRepo.IsBranchExist(baseBranch) {
  623. ctx.NotFound("IsBranchExist")
  624. return nil, nil, nil, nil, "", ""
  625. }
  626. // Check if current user has fork of repository or in the same repository.
  627. headRepo, has := models.HasForkedRepo(headUser.ID, baseRepo.ID)
  628. if !has && !isSameRepo {
  629. log.Trace("parseCompareInfo[%d]: does not have fork or in same repository", baseRepo.ID)
  630. ctx.NotFound("HasForkedRepo")
  631. return nil, nil, nil, nil, "", ""
  632. }
  633. var headGitRepo *git.Repository
  634. if isSameRepo {
  635. headRepo = ctx.Repo.Repository
  636. headGitRepo = ctx.Repo.GitRepo
  637. } else {
  638. headGitRepo, err = git.OpenRepository(models.RepoPath(headUser.Name, headRepo.Name))
  639. if err != nil {
  640. ctx.Error(500, "OpenRepository", err)
  641. return nil, nil, nil, nil, "", ""
  642. }
  643. }
  644. // user should have permission to read baseRepo's codes and pulls, NOT headRepo's
  645. permBase, err := models.GetUserRepoPermission(baseRepo, ctx.User)
  646. if err != nil {
  647. ctx.ServerError("GetUserRepoPermission", err)
  648. return nil, nil, nil, nil, "", ""
  649. }
  650. if !permBase.CanReadIssuesOrPulls(true) || !permBase.CanRead(models.UnitTypeCode) {
  651. if log.IsTrace() {
  652. log.Trace("Permission Denied: User %-v cannot create/read pull requests or cannot read code in Repo %-v\nUser in baseRepo has Permissions: %-+v",
  653. ctx.User,
  654. baseRepo,
  655. permBase)
  656. }
  657. ctx.NotFound("Can't read pulls or can't read UnitTypeCode")
  658. return nil, nil, nil, nil, "", ""
  659. }
  660. // user should have permission to read headrepo's codes
  661. permHead, err := models.GetUserRepoPermission(headRepo, ctx.User)
  662. if err != nil {
  663. ctx.ServerError("GetUserRepoPermission", err)
  664. return nil, nil, nil, nil, "", ""
  665. }
  666. if !permHead.CanRead(models.UnitTypeCode) {
  667. if log.IsTrace() {
  668. log.Trace("Permission Denied: User: %-v cannot read code in Repo: %-v\nUser in headRepo has Permissions: %-+v",
  669. ctx.User,
  670. headRepo,
  671. permHead)
  672. }
  673. ctx.NotFound("Can't read headRepo UnitTypeCode")
  674. return nil, nil, nil, nil, "", ""
  675. }
  676. // Check if head branch is valid.
  677. if !headGitRepo.IsBranchExist(headBranch) {
  678. ctx.NotFound()
  679. return nil, nil, nil, nil, "", ""
  680. }
  681. compareInfo, err := headGitRepo.GetCompareInfo(models.RepoPath(baseRepo.Owner.Name, baseRepo.Name), baseBranch, headBranch)
  682. if err != nil {
  683. ctx.Error(500, "GetCompareInfo", err)
  684. return nil, nil, nil, nil, "", ""
  685. }
  686. return headUser, headRepo, headGitRepo, compareInfo, baseBranch, headBranch
  687. }