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 22 kB

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
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785
  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. "time"
  10. "code.gitea.io/gitea/models"
  11. "code.gitea.io/gitea/modules/auth"
  12. "code.gitea.io/gitea/modules/context"
  13. "code.gitea.io/gitea/modules/git"
  14. "code.gitea.io/gitea/modules/log"
  15. "code.gitea.io/gitea/modules/notification"
  16. api "code.gitea.io/gitea/modules/structs"
  17. "code.gitea.io/gitea/modules/timeutil"
  18. issue_service "code.gitea.io/gitea/services/issue"
  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(http.StatusInternalServerError, "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(http.StatusInternalServerError, "LoadIssue", err)
  84. return
  85. }
  86. if err = prs[i].LoadAttributes(); err != nil {
  87. ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
  88. return
  89. }
  90. if err = prs[i].GetBaseRepo(); err != nil {
  91. ctx.Error(http.StatusInternalServerError, "GetBaseRepo", err)
  92. return
  93. }
  94. if err = prs[i].GetHeadRepo(); err != nil {
  95. ctx.Error(http.StatusInternalServerError, "GetHeadRepo", err)
  96. return
  97. }
  98. apiPrs[i] = prs[i].APIFormat()
  99. }
  100. ctx.SetLinkHeader(int(maxResults), models.ItemsPerPage)
  101. ctx.JSON(http.StatusOK, &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(http.StatusInternalServerError, "GetPullRequestByIndex", err)
  136. }
  137. return
  138. }
  139. if err = pr.GetBaseRepo(); err != nil {
  140. ctx.Error(http.StatusInternalServerError, "GetBaseRepo", err)
  141. return
  142. }
  143. if err = pr.GetHeadRepo(); err != nil {
  144. ctx.Error(http.StatusInternalServerError, "GetHeadRepo", err)
  145. return
  146. }
  147. ctx.JSON(http.StatusOK, 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. // "409":
  177. // "$ref": "#/responses/error"
  178. // "422":
  179. // "$ref": "#/responses/validationError"
  180. var (
  181. repo = ctx.Repo.Repository
  182. labelIDs []int64
  183. assigneeID int64
  184. milestoneID int64
  185. )
  186. // Get repo/branch information
  187. _, headRepo, headGitRepo, compareInfo, baseBranch, headBranch := parseCompareInfo(ctx, form)
  188. if ctx.Written() {
  189. return
  190. }
  191. defer headGitRepo.Close()
  192. // Check if another PR exists with the same targets
  193. existingPr, err := models.GetUnmergedPullRequest(headRepo.ID, ctx.Repo.Repository.ID, headBranch, baseBranch)
  194. if err != nil {
  195. if !models.IsErrPullRequestNotExist(err) {
  196. ctx.Error(http.StatusInternalServerError, "GetUnmergedPullRequest", err)
  197. return
  198. }
  199. } else {
  200. err = models.ErrPullRequestAlreadyExists{
  201. ID: existingPr.ID,
  202. IssueID: existingPr.Index,
  203. HeadRepoID: existingPr.HeadRepoID,
  204. BaseRepoID: existingPr.BaseRepoID,
  205. HeadBranch: existingPr.HeadBranch,
  206. BaseBranch: existingPr.BaseBranch,
  207. }
  208. ctx.Error(http.StatusConflict, "GetUnmergedPullRequest", err)
  209. return
  210. }
  211. if len(form.Labels) > 0 {
  212. labels, err := models.GetLabelsInRepoByIDs(ctx.Repo.Repository.ID, form.Labels)
  213. if err != nil {
  214. ctx.Error(http.StatusInternalServerError, "GetLabelsInRepoByIDs", err)
  215. return
  216. }
  217. labelIDs = make([]int64, len(labels))
  218. for i := range labels {
  219. labelIDs[i] = labels[i].ID
  220. }
  221. }
  222. if form.Milestone > 0 {
  223. milestone, err := models.GetMilestoneByRepoID(ctx.Repo.Repository.ID, milestoneID)
  224. if err != nil {
  225. if models.IsErrMilestoneNotExist(err) {
  226. ctx.NotFound()
  227. } else {
  228. ctx.Error(http.StatusInternalServerError, "GetMilestoneByRepoID", err)
  229. }
  230. return
  231. }
  232. milestoneID = milestone.ID
  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(http.StatusUnprocessableEntity, "", fmt.Sprintf("Assignee does not exist: [name: %s]", err))
  264. } else {
  265. ctx.Error(http.StatusInternalServerError, "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(http.StatusInternalServerError, "GetUserByID", err)
  274. return
  275. }
  276. valid, err := models.CanBeAssigned(assignee, repo, true)
  277. if err != nil {
  278. ctx.Error(http.StatusInternalServerError, "canBeAssigned", err)
  279. return
  280. }
  281. if !valid {
  282. ctx.Error(http.StatusUnprocessableEntity, "canBeAssigned", models.ErrUserDoesNotHaveAccessToRepo{UserID: aID, RepoName: repo.Name})
  283. return
  284. }
  285. }
  286. if err := pull_service.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, assigneeIDs); err != nil {
  287. if models.IsErrUserDoesNotHaveAccessToRepo(err) {
  288. ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err)
  289. return
  290. }
  291. ctx.Error(http.StatusInternalServerError, "NewPullRequest", err)
  292. return
  293. }
  294. notification.NotifyNewPullRequest(pr)
  295. log.Trace("Pull request created: %d/%d", repo.ID, prIssue.ID)
  296. ctx.JSON(http.StatusCreated, pr.APIFormat())
  297. }
  298. // EditPullRequest does what it says
  299. func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
  300. // swagger:operation PATCH /repos/{owner}/{repo}/pulls/{index} repository repoEditPullRequest
  301. // ---
  302. // summary: Update a pull request. If using deadline only the date will be taken into account, and time of day ignored.
  303. // consumes:
  304. // - application/json
  305. // produces:
  306. // - application/json
  307. // parameters:
  308. // - name: owner
  309. // in: path
  310. // description: owner of the repo
  311. // type: string
  312. // required: true
  313. // - name: repo
  314. // in: path
  315. // description: name of the repo
  316. // type: string
  317. // required: true
  318. // - name: index
  319. // in: path
  320. // description: index of the pull request to edit
  321. // type: integer
  322. // format: int64
  323. // required: true
  324. // - name: body
  325. // in: body
  326. // schema:
  327. // "$ref": "#/definitions/EditPullRequestOption"
  328. // responses:
  329. // "201":
  330. // "$ref": "#/responses/PullRequest"
  331. // "403":
  332. // "$ref": "#/responses/forbidden"
  333. // "412":
  334. // "$ref": "#/responses/error"
  335. // "422":
  336. // "$ref": "#/responses/validationError"
  337. pr, err := models.GetPullRequestByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  338. if err != nil {
  339. if models.IsErrPullRequestNotExist(err) {
  340. ctx.NotFound()
  341. } else {
  342. ctx.Error(http.StatusInternalServerError, "GetPullRequestByIndex", err)
  343. }
  344. return
  345. }
  346. err = pr.LoadIssue()
  347. if err != nil {
  348. ctx.Error(http.StatusInternalServerError, "LoadIssue", err)
  349. return
  350. }
  351. issue := pr.Issue
  352. issue.Repo = ctx.Repo.Repository
  353. if !issue.IsPoster(ctx.User.ID) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) {
  354. ctx.Status(http.StatusForbidden)
  355. return
  356. }
  357. if len(form.Title) > 0 {
  358. issue.Title = form.Title
  359. }
  360. if len(form.Body) > 0 {
  361. issue.Content = form.Body
  362. }
  363. // Update or remove deadline if set
  364. if form.Deadline != nil || form.RemoveDeadline != nil {
  365. var deadlineUnix timeutil.TimeStamp
  366. if (form.RemoveDeadline == nil || !*form.RemoveDeadline) && !form.Deadline.IsZero() {
  367. deadline := time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(),
  368. 23, 59, 59, 0, form.Deadline.Location())
  369. deadlineUnix = timeutil.TimeStamp(deadline.Unix())
  370. }
  371. if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
  372. ctx.Error(http.StatusInternalServerError, "UpdateIssueDeadline", err)
  373. return
  374. }
  375. issue.DeadlineUnix = deadlineUnix
  376. }
  377. // Add/delete assignees
  378. // Deleting is done the GitHub way (quote from their api documentation):
  379. // https://developer.github.com/v3/issues/#edit-an-issue
  380. // "assignees" (array): Logins for Users to assign to this issue.
  381. // Pass one or more user logins to replace the set of assignees on this Issue.
  382. // Send an empty array ([]) to clear all assignees from the Issue.
  383. if ctx.Repo.CanWrite(models.UnitTypePullRequests) && (form.Assignees != nil || len(form.Assignee) > 0) {
  384. err = issue_service.UpdateAssignees(issue, form.Assignee, form.Assignees, ctx.User)
  385. if err != nil {
  386. if models.IsErrUserNotExist(err) {
  387. ctx.Error(http.StatusUnprocessableEntity, "", fmt.Sprintf("Assignee does not exist: [name: %s]", err))
  388. } else {
  389. ctx.Error(http.StatusInternalServerError, "UpdateAssignees", err)
  390. }
  391. return
  392. }
  393. }
  394. if ctx.Repo.CanWrite(models.UnitTypePullRequests) && form.Milestone != 0 &&
  395. issue.MilestoneID != form.Milestone {
  396. oldMilestoneID := issue.MilestoneID
  397. issue.MilestoneID = form.Milestone
  398. if err = issue_service.ChangeMilestoneAssign(issue, ctx.User, oldMilestoneID); err != nil {
  399. ctx.Error(http.StatusInternalServerError, "ChangeMilestoneAssign", err)
  400. return
  401. }
  402. }
  403. if ctx.Repo.CanWrite(models.UnitTypePullRequests) && form.Labels != nil {
  404. labels, err := models.GetLabelsInRepoByIDs(ctx.Repo.Repository.ID, form.Labels)
  405. if err != nil {
  406. ctx.Error(http.StatusInternalServerError, "GetLabelsInRepoByIDsError", err)
  407. return
  408. }
  409. if err = issue.ReplaceLabels(labels, ctx.User); err != nil {
  410. ctx.Error(http.StatusInternalServerError, "ReplaceLabelsError", err)
  411. return
  412. }
  413. }
  414. if err = models.UpdateIssue(issue); err != nil {
  415. ctx.Error(http.StatusInternalServerError, "UpdateIssue", err)
  416. return
  417. }
  418. if form.State != nil {
  419. if err = issue_service.ChangeStatus(issue, ctx.User, api.StateClosed == api.StateType(*form.State)); err != nil {
  420. if models.IsErrDependenciesLeft(err) {
  421. ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this pull request because it still has open dependencies")
  422. return
  423. }
  424. ctx.Error(http.StatusInternalServerError, "ChangeStatus", err)
  425. return
  426. }
  427. }
  428. // Refetch from database
  429. pr, err = models.GetPullRequestByIndex(ctx.Repo.Repository.ID, pr.Index)
  430. if err != nil {
  431. if models.IsErrPullRequestNotExist(err) {
  432. ctx.NotFound()
  433. } else {
  434. ctx.Error(http.StatusInternalServerError, "GetPullRequestByIndex", err)
  435. }
  436. return
  437. }
  438. // TODO this should be 200, not 201
  439. ctx.JSON(http.StatusCreated, pr.APIFormat())
  440. }
  441. // IsPullRequestMerged checks if a PR exists given an index
  442. func IsPullRequestMerged(ctx *context.APIContext) {
  443. // swagger:operation GET /repos/{owner}/{repo}/pulls/{index}/merge repository repoPullRequestIsMerged
  444. // ---
  445. // summary: Check if a pull request has been merged
  446. // produces:
  447. // - application/json
  448. // parameters:
  449. // - name: owner
  450. // in: path
  451. // description: owner of the repo
  452. // type: string
  453. // required: true
  454. // - name: repo
  455. // in: path
  456. // description: name of the repo
  457. // type: string
  458. // required: true
  459. // - name: index
  460. // in: path
  461. // description: index of the pull request
  462. // type: integer
  463. // format: int64
  464. // required: true
  465. // responses:
  466. // "204":
  467. // description: pull request has been merged
  468. // "404":
  469. // description: pull request has not been merged
  470. pr, err := models.GetPullRequestByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  471. if err != nil {
  472. if models.IsErrPullRequestNotExist(err) {
  473. ctx.NotFound()
  474. } else {
  475. ctx.Error(http.StatusInternalServerError, "GetPullRequestByIndex", err)
  476. }
  477. return
  478. }
  479. if pr.HasMerged {
  480. ctx.Status(http.StatusNoContent)
  481. }
  482. ctx.NotFound()
  483. }
  484. // MergePullRequest merges a PR given an index
  485. func MergePullRequest(ctx *context.APIContext, form auth.MergePullRequestForm) {
  486. // swagger:operation POST /repos/{owner}/{repo}/pulls/{index}/merge repository repoMergePullRequest
  487. // ---
  488. // summary: Merge a pull request
  489. // produces:
  490. // - application/json
  491. // parameters:
  492. // - name: owner
  493. // in: path
  494. // description: owner of the repo
  495. // type: string
  496. // required: true
  497. // - name: repo
  498. // in: path
  499. // description: name of the repo
  500. // type: string
  501. // required: true
  502. // - name: index
  503. // in: path
  504. // description: index of the pull request to merge
  505. // type: integer
  506. // format: int64
  507. // required: true
  508. // - name: body
  509. // in: body
  510. // schema:
  511. // $ref: "#/definitions/MergePullRequestOption"
  512. // responses:
  513. // "200":
  514. // "$ref": "#/responses/empty"
  515. // "405":
  516. // "$ref": "#/responses/empty"
  517. // "409":
  518. // "$ref": "#/responses/error"
  519. pr, err := models.GetPullRequestByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  520. if err != nil {
  521. if models.IsErrPullRequestNotExist(err) {
  522. ctx.NotFound("GetPullRequestByIndex", err)
  523. } else {
  524. ctx.Error(http.StatusInternalServerError, "GetPullRequestByIndex", err)
  525. }
  526. return
  527. }
  528. if err = pr.GetHeadRepo(); err != nil {
  529. ctx.ServerError("GetHeadRepo", err)
  530. return
  531. }
  532. err = pr.LoadIssue()
  533. if err != nil {
  534. ctx.Error(http.StatusInternalServerError, "LoadIssue", err)
  535. return
  536. }
  537. pr.Issue.Repo = ctx.Repo.Repository
  538. if ctx.IsSigned {
  539. // Update issue-user.
  540. if err = pr.Issue.ReadBy(ctx.User.ID); err != nil {
  541. ctx.Error(http.StatusInternalServerError, "ReadBy", err)
  542. return
  543. }
  544. }
  545. if pr.Issue.IsClosed {
  546. ctx.NotFound()
  547. return
  548. }
  549. if !pr.CanAutoMerge() || pr.HasMerged || pr.IsWorkInProgress() {
  550. ctx.Status(http.StatusMethodNotAllowed)
  551. return
  552. }
  553. isPass, err := pull_service.IsPullCommitStatusPass(pr)
  554. if err != nil {
  555. ctx.Error(http.StatusInternalServerError, "IsPullCommitStatusPass", err)
  556. return
  557. }
  558. if !isPass && !ctx.IsUserRepoAdmin() {
  559. ctx.Status(http.StatusMethodNotAllowed)
  560. return
  561. }
  562. if len(form.Do) == 0 {
  563. form.Do = string(models.MergeStyleMerge)
  564. }
  565. message := strings.TrimSpace(form.MergeTitleField)
  566. if len(message) == 0 {
  567. if models.MergeStyle(form.Do) == models.MergeStyleMerge {
  568. message = pr.GetDefaultMergeMessage()
  569. }
  570. if models.MergeStyle(form.Do) == models.MergeStyleSquash {
  571. message = pr.GetDefaultSquashMessage()
  572. }
  573. }
  574. form.MergeMessageField = strings.TrimSpace(form.MergeMessageField)
  575. if len(form.MergeMessageField) > 0 {
  576. message += "\n\n" + form.MergeMessageField
  577. }
  578. if err := pull_service.Merge(pr, ctx.User, ctx.Repo.GitRepo, models.MergeStyle(form.Do), message); err != nil {
  579. if models.IsErrInvalidMergeStyle(err) {
  580. ctx.Status(http.StatusMethodNotAllowed)
  581. return
  582. } else if models.IsErrMergeConflicts(err) {
  583. conflictError := err.(models.ErrMergeConflicts)
  584. ctx.JSON(http.StatusConflict, conflictError)
  585. } else if models.IsErrRebaseConflicts(err) {
  586. conflictError := err.(models.ErrRebaseConflicts)
  587. ctx.JSON(http.StatusConflict, conflictError)
  588. } else if models.IsErrMergeUnrelatedHistories(err) {
  589. conflictError := err.(models.ErrMergeUnrelatedHistories)
  590. ctx.JSON(http.StatusConflict, conflictError)
  591. } else if models.IsErrMergePushOutOfDate(err) {
  592. ctx.Error(http.StatusConflict, "Merge", "merge push out of date")
  593. return
  594. }
  595. ctx.Error(http.StatusInternalServerError, "Merge", err)
  596. return
  597. }
  598. log.Trace("Pull request merged: %d", pr.ID)
  599. ctx.Status(http.StatusOK)
  600. }
  601. func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption) (*models.User, *models.Repository, *git.Repository, *git.CompareInfo, string, string) {
  602. baseRepo := ctx.Repo.Repository
  603. // Get compared branches information
  604. // format: <base branch>...[<head repo>:]<head branch>
  605. // base<-head: master...head:feature
  606. // same repo: master...feature
  607. // TODO: Validate form first?
  608. baseBranch := form.Base
  609. var (
  610. headUser *models.User
  611. headBranch string
  612. isSameRepo bool
  613. err error
  614. )
  615. // If there is no head repository, it means pull request between same repository.
  616. headInfos := strings.Split(form.Head, ":")
  617. if len(headInfos) == 1 {
  618. isSameRepo = true
  619. headUser = ctx.Repo.Owner
  620. headBranch = headInfos[0]
  621. } else if len(headInfos) == 2 {
  622. headUser, err = models.GetUserByName(headInfos[0])
  623. if err != nil {
  624. if models.IsErrUserNotExist(err) {
  625. ctx.NotFound("GetUserByName")
  626. } else {
  627. ctx.ServerError("GetUserByName", err)
  628. }
  629. return nil, nil, nil, nil, "", ""
  630. }
  631. headBranch = headInfos[1]
  632. } else {
  633. ctx.NotFound()
  634. return nil, nil, nil, nil, "", ""
  635. }
  636. ctx.Repo.PullRequest.SameRepo = isSameRepo
  637. log.Info("Base branch: %s", baseBranch)
  638. log.Info("Repo path: %s", ctx.Repo.GitRepo.Path)
  639. // Check if base branch is valid.
  640. if !ctx.Repo.GitRepo.IsBranchExist(baseBranch) {
  641. ctx.NotFound("IsBranchExist")
  642. return nil, nil, nil, nil, "", ""
  643. }
  644. // Check if current user has fork of repository or in the same repository.
  645. headRepo, has := models.HasForkedRepo(headUser.ID, baseRepo.ID)
  646. if !has && !isSameRepo {
  647. log.Trace("parseCompareInfo[%d]: does not have fork or in same repository", baseRepo.ID)
  648. ctx.NotFound("HasForkedRepo")
  649. return nil, nil, nil, nil, "", ""
  650. }
  651. var headGitRepo *git.Repository
  652. if isSameRepo {
  653. headRepo = ctx.Repo.Repository
  654. headGitRepo = ctx.Repo.GitRepo
  655. } else {
  656. headGitRepo, err = git.OpenRepository(models.RepoPath(headUser.Name, headRepo.Name))
  657. if err != nil {
  658. ctx.Error(http.StatusInternalServerError, "OpenRepository", err)
  659. return nil, nil, nil, nil, "", ""
  660. }
  661. }
  662. // user should have permission to read baseRepo's codes and pulls, NOT headRepo's
  663. permBase, err := models.GetUserRepoPermission(baseRepo, ctx.User)
  664. if err != nil {
  665. headGitRepo.Close()
  666. ctx.ServerError("GetUserRepoPermission", err)
  667. return nil, nil, nil, nil, "", ""
  668. }
  669. if !permBase.CanReadIssuesOrPulls(true) || !permBase.CanRead(models.UnitTypeCode) {
  670. if log.IsTrace() {
  671. log.Trace("Permission Denied: User %-v cannot create/read pull requests or cannot read code in Repo %-v\nUser in baseRepo has Permissions: %-+v",
  672. ctx.User,
  673. baseRepo,
  674. permBase)
  675. }
  676. headGitRepo.Close()
  677. ctx.NotFound("Can't read pulls or can't read UnitTypeCode")
  678. return nil, nil, nil, nil, "", ""
  679. }
  680. // user should have permission to read headrepo's codes
  681. permHead, err := models.GetUserRepoPermission(headRepo, ctx.User)
  682. if err != nil {
  683. headGitRepo.Close()
  684. ctx.ServerError("GetUserRepoPermission", err)
  685. return nil, nil, nil, nil, "", ""
  686. }
  687. if !permHead.CanRead(models.UnitTypeCode) {
  688. if log.IsTrace() {
  689. log.Trace("Permission Denied: User: %-v cannot read code in Repo: %-v\nUser in headRepo has Permissions: %-+v",
  690. ctx.User,
  691. headRepo,
  692. permHead)
  693. }
  694. headGitRepo.Close()
  695. ctx.NotFound("Can't read headRepo UnitTypeCode")
  696. return nil, nil, nil, nil, "", ""
  697. }
  698. // Check if head branch is valid.
  699. if !headGitRepo.IsBranchExist(headBranch) {
  700. headGitRepo.Close()
  701. ctx.NotFound()
  702. return nil, nil, nil, nil, "", ""
  703. }
  704. compareInfo, err := headGitRepo.GetCompareInfo(models.RepoPath(baseRepo.Owner.Name, baseRepo.Name), baseBranch, headBranch)
  705. if err != nil {
  706. headGitRepo.Close()
  707. ctx.Error(http.StatusInternalServerError, "GetCompareInfo", err)
  708. return nil, nil, nil, nil, "", ""
  709. }
  710. return headUser, headRepo, headGitRepo, compareInfo, baseBranch, headBranch
  711. }