2016-12-02 16:40:39 +05:30
// Copyright 2016 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package repo
import (
2021-07-13 04:56:25 +05:30
"errors"
2016-12-02 16:40:39 +05:30
"fmt"
2021-07-02 17:49:57 +05:30
"math"
2018-07-18 02:53:58 +05:30
"net/http"
2021-07-02 17:49:57 +05:30
"strconv"
2016-12-02 16:40:39 +05:30
"strings"
2019-11-03 20:16:32 +05:30
"time"
2016-12-02 16:40:39 +05:30
"code.gitea.io/gitea/models"
2021-12-10 06:57:50 +05:30
repo_model "code.gitea.io/gitea/models/repo"
2021-11-10 01:27:58 +05:30
"code.gitea.io/gitea/models/unit"
2021-11-24 15:19:20 +05:30
user_model "code.gitea.io/gitea/models/user"
2016-12-02 16:40:39 +05:30
"code.gitea.io/gitea/modules/context"
2020-01-10 13:23:53 +05:30
"code.gitea.io/gitea/modules/convert"
2019-03-27 15:03:00 +05:30
"code.gitea.io/gitea/modules/git"
2016-12-02 16:40:39 +05:30
"code.gitea.io/gitea/modules/log"
2020-05-17 02:35:19 +05:30
"code.gitea.io/gitea/modules/notification"
2019-05-11 15:51:34 +05:30
api "code.gitea.io/gitea/modules/structs"
2019-08-15 20:16:21 +05:30
"code.gitea.io/gitea/modules/timeutil"
2021-01-26 21:06:53 +05:30
"code.gitea.io/gitea/modules/web"
2020-01-25 00:30:29 +05:30
"code.gitea.io/gitea/routers/api/v1/utils"
2021-12-10 13:44:24 +05:30
asymkey_service "code.gitea.io/gitea/services/asymkey"
2021-04-07 01:14:05 +05:30
"code.gitea.io/gitea/services/forms"
2019-10-25 20:16:37 +05:30
issue_service "code.gitea.io/gitea/services/issue"
2019-09-27 05:52:36 +05:30
pull_service "code.gitea.io/gitea/services/pull"
2021-07-13 04:56:25 +05:30
repo_service "code.gitea.io/gitea/services/repository"
2016-12-02 16:40:39 +05:30
)
// ListPullRequests returns a list of all PRs
2021-01-26 21:06:53 +05:30
func ListPullRequests ( ctx * context . APIContext ) {
2017-11-13 12:32:25 +05:30
// swagger:operation GET /repos/{owner}/{repo}/pulls repository repoListPullRequests
// ---
// summary: List a repo's pull requests
// produces:
// - application/json
// parameters:
// - name: owner
// in: path
// description: owner of the repo
// type: string
// required: true
// - name: repo
// in: path
// description: name of the repo
// type: string
// required: true
2018-10-21 09:10:42 +05:30
// - name: state
// in: query
// description: "State of pull request: open or closed (optional)"
// type: string
// enum: [closed, open, all]
// - name: sort
// in: query
// description: "Type of sort"
// type: string
// enum: [oldest, recentupdate, leastupdate, mostcomment, leastcomment, priority]
// - name: milestone
// in: query
// description: "ID of the milestone"
// type: integer
// format: int64
// - name: labels
// in: query
// description: "Label IDs"
// type: array
// collectionFormat: multi
// items:
// type: integer
// format: int64
2020-01-25 00:30:29 +05:30
// - name: page
// in: query
// description: page number of results to return (1-based)
// type: integer
// - name: limit
// in: query
2020-06-09 10:27:38 +05:30
// description: page size of results
2020-01-25 00:30:29 +05:30
// type: integer
2017-11-13 12:32:25 +05:30
// responses:
// "200":
// "$ref": "#/responses/PullRequestList"
2019-12-20 22:37:12 +05:30
2020-01-25 00:30:29 +05:30
listOptions := utils . GetListOptions ( ctx )
2016-12-02 16:40:39 +05:30
prs , maxResults , err := models . PullRequests ( ctx . Repo . Repository . ID , & models . PullRequestsOptions {
2020-01-25 00:30:29 +05:30
ListOptions : listOptions ,
2021-07-29 07:12:15 +05:30
State : ctx . FormTrim ( "state" ) ,
SortType : ctx . FormTrim ( "sort" ) ,
Labels : ctx . FormStrings ( "labels" ) ,
MilestoneID : ctx . FormInt64 ( "milestone" ) ,
2016-12-02 16:40:39 +05:30
} )
if err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "PullRequests" , err )
2016-12-02 16:40:39 +05:30
return
}
apiPrs := make ( [ ] * api . PullRequest , len ( prs ) )
for i := range prs {
2017-11-04 23:40:01 +05:30
if err = prs [ i ] . LoadIssue ( ) ; err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "LoadIssue" , err )
2017-11-04 23:40:01 +05:30
return
}
if err = prs [ i ] . LoadAttributes ( ) ; err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "LoadAttributes" , err )
2017-11-04 23:40:01 +05:30
return
}
2020-03-03 04:01:55 +05:30
if err = prs [ i ] . LoadBaseRepo ( ) ; err != nil {
ctx . Error ( http . StatusInternalServerError , "LoadBaseRepo" , err )
2017-11-04 23:40:01 +05:30
return
}
2020-03-03 04:01:55 +05:30
if err = prs [ i ] . LoadHeadRepo ( ) ; err != nil {
ctx . Error ( http . StatusInternalServerError , "LoadHeadRepo" , err )
2017-11-04 23:40:01 +05:30
return
}
2021-10-07 05:33:37 +05:30
apiPrs [ i ] = convert . ToAPIPullRequest ( prs [ i ] , ctx . User )
2016-12-02 16:40:39 +05:30
}
2020-01-25 00:30:29 +05:30
ctx . SetLinkHeader ( int ( maxResults ) , listOptions . PageSize )
2021-08-12 18:13:08 +05:30
ctx . SetTotalCountHeader ( maxResults )
2019-12-20 22:37:12 +05:30
ctx . JSON ( http . StatusOK , & apiPrs )
2016-12-02 16:40:39 +05:30
}
// GetPullRequest returns a single PR based on index
func GetPullRequest ( ctx * context . APIContext ) {
2017-11-13 12:32:25 +05:30
// swagger:operation GET /repos/{owner}/{repo}/pulls/{index} repository repoGetPullRequest
// ---
// summary: Get a pull request
// produces:
// - application/json
// parameters:
// - name: owner
// in: path
// description: owner of the repo
// type: string
// required: true
// - name: repo
// in: path
// description: name of the repo
// type: string
// required: true
// - name: index
// in: path
// description: index of the pull request to get
// type: integer
2018-10-21 09:10:42 +05:30
// format: int64
2017-11-13 12:32:25 +05:30
// required: true
// responses:
// "200":
// "$ref": "#/responses/PullRequest"
2020-01-09 17:26:32 +05:30
// "404":
// "$ref": "#/responses/notFound"
2019-12-20 22:37:12 +05:30
2016-12-02 16:40:39 +05:30
pr , err := models . GetPullRequestByIndex ( ctx . Repo . Repository . ID , ctx . ParamsInt64 ( ":index" ) )
if err != nil {
if models . IsErrPullRequestNotExist ( err ) {
2019-03-19 07:59:43 +05:30
ctx . NotFound ( )
2016-12-02 16:40:39 +05:30
} else {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetPullRequestByIndex" , err )
2016-12-02 16:40:39 +05:30
}
return
}
2020-03-03 04:01:55 +05:30
if err = pr . LoadBaseRepo ( ) ; err != nil {
ctx . Error ( http . StatusInternalServerError , "LoadBaseRepo" , err )
2017-11-04 23:40:01 +05:30
return
}
2020-03-03 04:01:55 +05:30
if err = pr . LoadHeadRepo ( ) ; err != nil {
ctx . Error ( http . StatusInternalServerError , "LoadHeadRepo" , err )
2017-11-04 23:40:01 +05:30
return
}
2021-10-07 05:33:37 +05:30
ctx . JSON ( http . StatusOK , convert . ToAPIPullRequest ( pr , ctx . User ) )
2016-12-02 16:40:39 +05:30
}
2021-09-22 04:34:53 +05:30
// DownloadPullDiffOrPatch render a pull's raw diff or patch
func DownloadPullDiffOrPatch ( ctx * context . APIContext ) {
// swagger:operation GET /repos/{owner}/{repo}/pulls/{index}.{diffType} repository repoDownloadPullDiffOrPatch
2020-06-05 16:33:12 +05:30
// ---
2021-09-22 04:34:53 +05:30
// summary: Get a pull request diff or patch
2020-06-05 16:33:12 +05:30
// produces:
// - text/plain
// parameters:
// - name: owner
// in: path
// description: owner of the repo
// type: string
// required: true
// - name: repo
// in: path
// description: name of the repo
// type: string
// required: true
// - name: index
// in: path
// description: index of the pull request to get
// type: integer
// format: int64
// required: true
2021-09-22 04:34:53 +05:30
// - name: diffType
2020-06-05 16:33:12 +05:30
// in: path
2021-09-22 04:34:53 +05:30
// description: whether the output is diff or patch
2020-06-05 16:33:12 +05:30
// type: string
2021-09-22 04:34:53 +05:30
// enum: [diff, patch]
2020-06-05 16:33:12 +05:30
// required: true
2021-09-28 02:39:49 +05:30
// - name: binary
// in: query
// description: whether to include binary file changes. if true, the diff is applicable with `git apply`
// type: boolean
2020-06-05 16:33:12 +05:30
// responses:
// "200":
// "$ref": "#/responses/string"
// "404":
// "$ref": "#/responses/notFound"
pr , err := models . GetPullRequestByIndex ( ctx . Repo . Repository . ID , ctx . ParamsInt64 ( ":index" ) )
if err != nil {
if models . IsErrPullRequestNotExist ( err ) {
ctx . NotFound ( )
} else {
ctx . InternalServerError ( err )
}
return
}
2021-09-22 04:34:53 +05:30
var patch bool
if ctx . Params ( ":diffType" ) == "diff" {
patch = false
} else {
patch = true
}
2020-06-05 16:33:12 +05:30
2021-09-28 02:39:49 +05:30
binary := ctx . FormBool ( "binary" )
if err := pull_service . DownloadDiffOrPatch ( pr , ctx , patch , binary ) ; err != nil {
2020-06-05 16:33:12 +05:30
ctx . InternalServerError ( err )
return
}
}
2016-12-02 16:40:39 +05:30
// CreatePullRequest does what it says
2021-01-26 21:06:53 +05:30
func CreatePullRequest ( ctx * context . APIContext ) {
2017-11-13 12:32:25 +05:30
// swagger:operation POST /repos/{owner}/{repo}/pulls repository repoCreatePullRequest
// ---
// summary: Create a pull request
// consumes:
// - application/json
// produces:
// - application/json
// parameters:
// - name: owner
// in: path
// description: owner of the repo
// type: string
// required: true
// - name: repo
// in: path
// description: name of the repo
// type: string
// required: true
// - name: body
// in: body
// schema:
// "$ref": "#/definitions/CreatePullRequestOption"
// responses:
// "201":
// "$ref": "#/responses/PullRequest"
2019-12-20 22:37:12 +05:30
// "409":
// "$ref": "#/responses/error"
// "422":
// "$ref": "#/responses/validationError"
2021-01-26 21:06:53 +05:30
form := * web . GetForm ( ctx ) . ( * api . CreatePullRequestOption )
2020-10-26 14:35:27 +05:30
if form . Head == form . Base {
ctx . Error ( http . StatusUnprocessableEntity , "BaseHeadSame" ,
"Invalid PullRequest: There are no changes between the head and the base" )
return
}
2016-12-02 16:40:39 +05:30
var (
repo = ctx . Repo . Repository
labelIDs [ ] int64
milestoneID int64
)
// Get repo/branch information
2019-10-18 16:43:31 +05:30
_ , headRepo , headGitRepo , compareInfo , baseBranch , headBranch := parseCompareInfo ( ctx , form )
2016-12-02 16:40:39 +05:30
if ctx . Written ( ) {
return
}
2019-11-13 12:31:19 +05:30
defer headGitRepo . Close ( )
2016-12-02 16:40:39 +05:30
// Check if another PR exists with the same targets
2021-07-28 15:12:56 +05:30
existingPr , err := models . GetUnmergedPullRequest ( headRepo . ID , ctx . Repo . Repository . ID , headBranch , baseBranch , models . PullRequestFlowGithub )
2016-12-02 16:40:39 +05:30
if err != nil {
if ! models . IsErrPullRequestNotExist ( err ) {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetUnmergedPullRequest" , err )
2016-12-02 16:40:39 +05:30
return
}
} else {
err = models . ErrPullRequestAlreadyExists {
ID : existingPr . ID ,
IssueID : existingPr . Index ,
HeadRepoID : existingPr . HeadRepoID ,
BaseRepoID : existingPr . BaseRepoID ,
HeadBranch : existingPr . HeadBranch ,
BaseBranch : existingPr . BaseBranch ,
}
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusConflict , "GetUnmergedPullRequest" , err )
2016-12-02 16:40:39 +05:30
return
}
if len ( form . Labels ) > 0 {
labels , err := models . GetLabelsInRepoByIDs ( ctx . Repo . Repository . ID , form . Labels )
if err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetLabelsInRepoByIDs" , err )
2016-12-02 16:40:39 +05:30
return
}
2020-04-20 18:40:45 +05:30
labelIDs = make ( [ ] int64 , len ( form . Labels ) )
orgLabelIDs := make ( [ ] int64 , len ( form . Labels ) )
2016-12-02 16:40:39 +05:30
for i := range labels {
labelIDs [ i ] = labels [ i ] . ID
}
2020-04-20 18:40:45 +05:30
if ctx . Repo . Owner . IsOrganization ( ) {
orgLabels , err := models . GetLabelsInOrgByIDs ( ctx . Repo . Owner . ID , form . Labels )
if err != nil {
ctx . Error ( http . StatusInternalServerError , "GetLabelsInOrgByIDs" , err )
return
}
for i := range orgLabels {
orgLabelIDs [ i ] = orgLabels [ i ] . ID
}
}
labelIDs = append ( labelIDs , orgLabelIDs ... )
2016-12-02 16:40:39 +05:30
}
if form . Milestone > 0 {
2021-03-13 23:36:52 +05:30
milestone , err := models . GetMilestoneByRepoID ( ctx . Repo . Repository . ID , form . Milestone )
2016-12-02 16:40:39 +05:30
if err != nil {
if models . IsErrMilestoneNotExist ( err ) {
2019-03-19 07:59:43 +05:30
ctx . NotFound ( )
2016-12-02 16:40:39 +05:30
} else {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetMilestoneByRepoID" , err )
2016-12-02 16:40:39 +05:30
}
return
}
milestoneID = milestone . ID
}
2019-08-15 20:16:21 +05:30
var deadlineUnix timeutil . TimeStamp
2018-05-02 00:35:28 +05:30
if form . Deadline != nil {
2019-08-15 20:16:21 +05:30
deadlineUnix = timeutil . TimeStamp ( form . Deadline . Unix ( ) )
2018-05-02 00:35:28 +05:30
}
2016-12-02 16:40:39 +05:30
prIssue := & models . Issue {
2018-05-02 00:35:28 +05:30
RepoID : repo . ID ,
Title : form . Title ,
PosterID : ctx . User . ID ,
Poster : ctx . User ,
MilestoneID : milestoneID ,
IsPull : true ,
Content : form . Body ,
DeadlineUnix : deadlineUnix ,
2016-12-02 16:40:39 +05:30
}
pr := & models . PullRequest {
2019-10-18 16:43:31 +05:30
HeadRepoID : headRepo . ID ,
BaseRepoID : repo . ID ,
HeadBranch : headBranch ,
BaseBranch : baseBranch ,
HeadRepo : headRepo ,
BaseRepo : repo ,
MergeBase : compareInfo . MergeBase ,
Type : models . PullRequestGitea ,
2016-12-02 16:40:39 +05:30
}
2018-05-09 21:59:04 +05:30
// Get all assignee IDs
assigneeIDs , err := models . MakeIDsFromAPIAssigneesToAdd ( form . Assignee , form . Assignees )
if err != nil {
2021-11-24 15:19:20 +05:30
if user_model . IsErrUserNotExist ( err ) {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusUnprocessableEntity , "" , fmt . Sprintf ( "Assignee does not exist: [name: %s]" , err ) )
2018-05-09 21:59:04 +05:30
} else {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "AddAssigneeByName" , err )
2018-05-09 21:59:04 +05:30
}
return
}
2019-10-25 20:16:37 +05:30
// Check if the passed assignees is assignable
for _ , aID := range assigneeIDs {
2021-11-24 15:19:20 +05:30
assignee , err := user_model . GetUserByID ( aID )
2019-10-25 20:16:37 +05:30
if err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetUserByID" , err )
2019-10-25 20:16:37 +05:30
return
}
2018-05-09 21:59:04 +05:30
2019-10-25 20:16:37 +05:30
valid , err := models . CanBeAssigned ( assignee , repo , true )
if err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "canBeAssigned" , err )
2019-10-25 20:16:37 +05:30
return
}
if ! valid {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusUnprocessableEntity , "canBeAssigned" , models . ErrUserDoesNotHaveAccessToRepo { UserID : aID , RepoName : repo . Name } )
2019-10-25 20:16:37 +05:30
return
}
}
2019-12-14 03:51:06 +05:30
if err := pull_service . NewPullRequest ( repo , prIssue , labelIDs , [ ] string { } , pr , assigneeIDs ) ; err != nil {
2018-05-09 21:59:04 +05:30
if models . IsErrUserDoesNotHaveAccessToRepo ( err ) {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusBadRequest , "UserDoesNotHaveAccessToRepo" , err )
2018-05-09 21:59:04 +05:30
return
}
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "NewPullRequest" , err )
2016-12-02 16:40:39 +05:30
return
}
log . Trace ( "Pull request created: %d/%d" , repo . ID , prIssue . ID )
2021-10-07 05:33:37 +05:30
ctx . JSON ( http . StatusCreated , convert . ToAPIPullRequest ( pr , ctx . User ) )
2016-12-02 16:40:39 +05:30
}
// EditPullRequest does what it says
2021-01-26 21:06:53 +05:30
func EditPullRequest ( ctx * context . APIContext ) {
2017-11-13 12:32:25 +05:30
// swagger:operation PATCH /repos/{owner}/{repo}/pulls/{index} repository repoEditPullRequest
// ---
2019-11-03 20:16:32 +05:30
// summary: Update a pull request. If using deadline only the date will be taken into account, and time of day ignored.
2017-11-13 12:32:25 +05:30
// consumes:
// - application/json
// produces:
// - application/json
// parameters:
// - name: owner
// in: path
// description: owner of the repo
// type: string
// required: true
// - name: repo
// in: path
// description: name of the repo
// type: string
// required: true
// - name: index
// in: path
// description: index of the pull request to edit
// type: integer
2018-10-21 09:10:42 +05:30
// format: int64
2017-11-13 12:32:25 +05:30
// required: true
// - name: body
// in: body
// schema:
// "$ref": "#/definitions/EditPullRequestOption"
// responses:
// "201":
// "$ref": "#/responses/PullRequest"
2019-12-20 22:37:12 +05:30
// "403":
// "$ref": "#/responses/forbidden"
2020-06-08 00:43:40 +05:30
// "409":
// "$ref": "#/responses/error"
2019-12-20 22:37:12 +05:30
// "412":
// "$ref": "#/responses/error"
// "422":
// "$ref": "#/responses/validationError"
2021-01-26 21:06:53 +05:30
form := web . GetForm ( ctx ) . ( * api . EditPullRequestOption )
2016-12-02 16:40:39 +05:30
pr , err := models . GetPullRequestByIndex ( ctx . Repo . Repository . ID , ctx . ParamsInt64 ( ":index" ) )
if err != nil {
if models . IsErrPullRequestNotExist ( err ) {
2019-03-19 07:59:43 +05:30
ctx . NotFound ( )
2016-12-02 16:40:39 +05:30
} else {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetPullRequestByIndex" , err )
2016-12-02 16:40:39 +05:30
}
return
}
2019-06-13 01:11:28 +05:30
err = pr . LoadIssue ( )
if err != nil {
ctx . Error ( http . StatusInternalServerError , "LoadIssue" , err )
return
}
2016-12-02 16:40:39 +05:30
issue := pr . Issue
2018-12-13 21:25:43 +05:30
issue . Repo = ctx . Repo . Repository
2016-12-02 16:40:39 +05:30
2021-11-10 01:27:58 +05:30
if ! issue . IsPoster ( ctx . User . ID ) && ! ctx . Repo . CanWrite ( unit . TypePullRequests ) {
2019-12-20 22:37:12 +05:30
ctx . Status ( http . StatusForbidden )
2016-12-02 16:40:39 +05:30
return
}
2020-05-17 02:35:19 +05:30
oldTitle := issue . Title
2016-12-02 16:40:39 +05:30
if len ( form . Title ) > 0 {
issue . Title = form . Title
}
if len ( form . Body ) > 0 {
issue . Content = form . Body
}
2019-11-03 20:16:32 +05:30
// Update or remove deadline if set
if form . Deadline != nil || form . RemoveDeadline != nil {
var deadlineUnix timeutil . TimeStamp
if ( form . RemoveDeadline == nil || ! * form . RemoveDeadline ) && ! form . Deadline . IsZero ( ) {
deadline := time . Date ( form . Deadline . Year ( ) , form . Deadline . Month ( ) , form . Deadline . Day ( ) ,
23 , 59 , 59 , 0 , form . Deadline . Location ( ) )
deadlineUnix = timeutil . TimeStamp ( deadline . Unix ( ) )
}
2019-10-28 05:05:20 +05:30
if err := models . UpdateIssueDeadline ( issue , deadlineUnix , ctx . User ) ; err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "UpdateIssueDeadline" , err )
2019-10-28 05:05:20 +05:30
return
}
issue . DeadlineUnix = deadlineUnix
2018-05-02 00:35:28 +05:30
}
2018-05-09 21:59:04 +05:30
// Add/delete assignees
2016-12-02 16:40:39 +05:30
2019-03-10 02:45:45 +05:30
// Deleting is done the GitHub way (quote from their api documentation):
2018-05-09 21:59:04 +05:30
// https://developer.github.com/v3/issues/#edit-an-issue
// "assignees" (array): Logins for Users to assign to this issue.
// Pass one or more user logins to replace the set of assignees on this Issue.
// Send an empty array ([]) to clear all assignees from the Issue.
2021-11-10 01:27:58 +05:30
if ctx . Repo . CanWrite ( unit . TypePullRequests ) && ( form . Assignees != nil || len ( form . Assignee ) > 0 ) {
2019-10-25 20:16:37 +05:30
err = issue_service . UpdateAssignees ( issue , form . Assignee , form . Assignees , ctx . User )
2018-05-09 21:59:04 +05:30
if err != nil {
2021-11-24 15:19:20 +05:30
if user_model . IsErrUserNotExist ( err ) {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusUnprocessableEntity , "" , fmt . Sprintf ( "Assignee does not exist: [name: %s]" , err ) )
2018-05-09 21:59:04 +05:30
} else {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "UpdateAssignees" , err )
2018-05-09 21:59:04 +05:30
}
2016-12-02 16:40:39 +05:30
return
}
}
2018-05-09 21:59:04 +05:30
2021-11-10 01:27:58 +05:30
if ctx . Repo . CanWrite ( unit . TypePullRequests ) && form . Milestone != 0 &&
2016-12-02 16:40:39 +05:30
issue . MilestoneID != form . Milestone {
oldMilestoneID := issue . MilestoneID
issue . MilestoneID = form . Milestone
2019-11-02 09:03:20 +05:30
if err = issue_service . ChangeMilestoneAssign ( issue , ctx . User , oldMilestoneID ) ; err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "ChangeMilestoneAssign" , err )
2016-12-02 16:40:39 +05:30
return
}
}
2021-11-10 01:27:58 +05:30
if ctx . Repo . CanWrite ( unit . TypePullRequests ) && form . Labels != nil {
2018-11-16 16:42:44 +05:30
labels , err := models . GetLabelsInRepoByIDs ( ctx . Repo . Repository . ID , form . Labels )
if err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetLabelsInRepoByIDsError" , err )
2018-11-16 16:42:44 +05:30
return
}
2020-04-20 18:40:45 +05:30
if ctx . Repo . Owner . IsOrganization ( ) {
orgLabels , err := models . GetLabelsInOrgByIDs ( ctx . Repo . Owner . ID , form . Labels )
if err != nil {
ctx . Error ( http . StatusInternalServerError , "GetLabelsInOrgByIDs" , err )
return
}
labels = append ( labels , orgLabels ... )
}
2018-11-16 16:42:44 +05:30
if err = issue . ReplaceLabels ( labels , ctx . User ) ; err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "ReplaceLabelsError" , err )
2018-11-16 16:42:44 +05:30
return
}
}
2016-12-02 16:40:39 +05:30
if form . State != nil {
2021-10-03 08:41:17 +05:30
if pr . HasMerged {
ctx . Error ( http . StatusPreconditionFailed , "MergedPRState" , "cannot change state of this pull request, it was already merged" )
return
}
2021-04-09 13:10:34 +05:30
issue . IsClosed = api . StateClosed == api . StateType ( * form . State )
2020-05-17 02:35:19 +05:30
}
statusChangeComment , titleChanged , err := models . UpdateIssueByAPI ( issue , ctx . User )
if err != nil {
if models . IsErrDependenciesLeft ( err ) {
ctx . Error ( http . StatusPreconditionFailed , "DependenciesLeft" , "cannot close this pull request because it still has open dependencies" )
2016-12-02 16:40:39 +05:30
return
}
2020-05-17 02:35:19 +05:30
ctx . Error ( http . StatusInternalServerError , "UpdateIssueByAPI" , err )
return
}
if titleChanged {
notification . NotifyIssueChangeTitle ( ctx . User , issue , oldTitle )
}
if statusChangeComment != nil {
notification . NotifyIssueChangeStatus ( ctx . User , issue , statusChangeComment , issue . IsClosed )
2016-12-02 16:40:39 +05:30
}
2020-06-08 00:43:40 +05:30
// change pull target branch
2021-10-03 08:41:17 +05:30
if ! pr . HasMerged && len ( form . Base ) != 0 && form . Base != pr . BaseBranch {
2020-06-08 00:43:40 +05:30
if ! ctx . Repo . GitRepo . IsBranchExist ( form . Base ) {
ctx . Error ( http . StatusNotFound , "NewBaseBranchNotExist" , fmt . Errorf ( "new base '%s' not exist" , form . Base ) )
return
}
if err := pull_service . ChangeTargetBranch ( pr , ctx . User , form . Base ) ; err != nil {
if models . IsErrPullRequestAlreadyExists ( err ) {
ctx . Error ( http . StatusConflict , "IsErrPullRequestAlreadyExists" , err )
return
} else if models . IsErrIssueIsClosed ( err ) {
ctx . Error ( http . StatusUnprocessableEntity , "IsErrIssueIsClosed" , err )
return
} else if models . IsErrPullRequestHasMerged ( err ) {
ctx . Error ( http . StatusConflict , "IsErrPullRequestHasMerged" , err )
return
} else {
ctx . InternalServerError ( err )
}
return
}
notification . NotifyPullRequestChangeTargetBranch ( ctx . User , pr , form . Base )
}
2016-12-02 16:40:39 +05:30
// Refetch from database
pr , err = models . GetPullRequestByIndex ( ctx . Repo . Repository . ID , pr . Index )
if err != nil {
if models . IsErrPullRequestNotExist ( err ) {
2019-03-19 07:59:43 +05:30
ctx . NotFound ( )
2016-12-02 16:40:39 +05:30
} else {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetPullRequestByIndex" , err )
2016-12-02 16:40:39 +05:30
}
return
}
2017-11-13 12:32:25 +05:30
// TODO this should be 200, not 201
2021-10-07 05:33:37 +05:30
ctx . JSON ( http . StatusCreated , convert . ToAPIPullRequest ( pr , ctx . User ) )
2016-12-02 16:40:39 +05:30
}
// IsPullRequestMerged checks if a PR exists given an index
func IsPullRequestMerged ( ctx * context . APIContext ) {
2017-11-13 12:32:25 +05:30
// swagger:operation GET /repos/{owner}/{repo}/pulls/{index}/merge repository repoPullRequestIsMerged
// ---
// summary: Check if a pull request has been merged
// produces:
// - application/json
// parameters:
// - name: owner
// in: path
// description: owner of the repo
// type: string
// required: true
// - name: repo
// in: path
// description: name of the repo
// type: string
// required: true
// - name: index
// in: path
// description: index of the pull request
// type: integer
2018-10-21 09:10:42 +05:30
// format: int64
2017-11-13 12:32:25 +05:30
// required: true
// responses:
// "204":
// description: pull request has been merged
// "404":
// description: pull request has not been merged
2019-12-20 22:37:12 +05:30
2016-12-02 16:40:39 +05:30
pr , err := models . GetPullRequestByIndex ( ctx . Repo . Repository . ID , ctx . ParamsInt64 ( ":index" ) )
if err != nil {
if models . IsErrPullRequestNotExist ( err ) {
2019-03-19 07:59:43 +05:30
ctx . NotFound ( )
2016-12-02 16:40:39 +05:30
} else {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetPullRequestByIndex" , err )
2016-12-02 16:40:39 +05:30
}
return
}
if pr . HasMerged {
2019-12-20 22:37:12 +05:30
ctx . Status ( http . StatusNoContent )
2016-12-02 16:40:39 +05:30
}
2019-03-19 07:59:43 +05:30
ctx . NotFound ( )
2016-12-02 16:40:39 +05:30
}
// MergePullRequest merges a PR given an index
2021-01-26 21:06:53 +05:30
func MergePullRequest ( ctx * context . APIContext ) {
2017-11-13 12:32:25 +05:30
// swagger:operation POST /repos/{owner}/{repo}/pulls/{index}/merge repository repoMergePullRequest
// ---
// summary: Merge a pull request
// produces:
// - application/json
// parameters:
// - name: owner
// in: path
// description: owner of the repo
// type: string
// required: true
// - name: repo
// in: path
// description: name of the repo
// type: string
// required: true
// - name: index
// in: path
// description: index of the pull request to merge
// type: integer
2018-10-21 09:10:42 +05:30
// format: int64
2017-11-13 12:32:25 +05:30
// required: true
2019-02-08 13:38:38 +05:30
// - name: body
// in: body
// schema:
// $ref: "#/definitions/MergePullRequestOption"
2017-11-13 12:32:25 +05:30
// responses:
// "200":
// "$ref": "#/responses/empty"
// "405":
// "$ref": "#/responses/empty"
2019-12-20 22:37:12 +05:30
// "409":
// "$ref": "#/responses/error"
2021-04-07 01:14:05 +05:30
form := web . GetForm ( ctx ) . ( * forms . MergePullRequestForm )
2016-12-02 16:40:39 +05:30
pr , err := models . GetPullRequestByIndex ( ctx . Repo . Repository . ID , ctx . ParamsInt64 ( ":index" ) )
if err != nil {
if models . IsErrPullRequestNotExist ( err ) {
2018-01-11 03:04:17 +05:30
ctx . NotFound ( "GetPullRequestByIndex" , err )
2016-12-02 16:40:39 +05:30
} else {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetPullRequestByIndex" , err )
2016-12-02 16:40:39 +05:30
}
return
}
2020-03-03 04:01:55 +05:30
if err = pr . LoadHeadRepo ( ) ; err != nil {
2020-09-21 01:50:14 +05:30
ctx . Error ( http . StatusInternalServerError , "LoadHeadRepo" , err )
2016-12-02 16:40:39 +05:30
return
}
2019-06-13 01:11:28 +05:30
err = pr . LoadIssue ( )
if err != nil {
ctx . Error ( http . StatusInternalServerError , "LoadIssue" , err )
return
}
2016-12-02 16:40:39 +05:30
pr . Issue . Repo = ctx . Repo . Repository
if ctx . IsSigned {
// Update issue-user.
if err = pr . Issue . ReadBy ( ctx . User . ID ) ; err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "ReadBy" , err )
2016-12-02 16:40:39 +05:30
return
}
}
if pr . Issue . IsClosed {
2019-03-19 07:59:43 +05:30
ctx . NotFound ( )
2016-12-02 16:40:39 +05:30
return
}
2020-01-16 19:48:30 +05:30
allowedMerge , err := pull_service . IsUserAllowedToMerge ( pr , ctx . Repo . Permission , ctx . User )
2019-09-18 11:09:45 +05:30
if err != nil {
2020-01-11 12:59:34 +05:30
ctx . Error ( http . StatusInternalServerError , "IsUSerAllowedToMerge" , err )
return
}
if ! allowedMerge {
ctx . Error ( http . StatusMethodNotAllowed , "Merge" , "User not allowed to merge PR" )
2019-09-18 11:09:45 +05:30
return
}
2021-03-04 09:11:23 +05:30
if pr . HasMerged {
ctx . Error ( http . StatusMethodNotAllowed , "PR already merged" , "" )
2020-08-20 03:05:06 +05:30
return
}
2021-03-04 09:11:23 +05:30
// handle manually-merged mark
2021-12-10 06:57:50 +05:30
if repo_model . MergeStyle ( form . Do ) == repo_model . MergeStyleManuallyMerged {
2021-03-04 09:11:23 +05:30
if err = pull_service . MergedManually ( pr , ctx . User , ctx . Repo . GitRepo , form . MergeCommitID ) ; err != nil {
if models . IsErrInvalidMergeStyle ( err ) {
2021-12-10 06:57:50 +05:30
ctx . Error ( http . StatusMethodNotAllowed , "Invalid merge style" , fmt . Errorf ( "%s is not allowed an allowed merge style for this repository" , repo_model . MergeStyle ( form . Do ) ) )
2021-03-04 09:11:23 +05:30
return
}
if strings . Contains ( err . Error ( ) , "Wrong commit ID" ) {
ctx . JSON ( http . StatusConflict , err )
return
}
ctx . Error ( http . StatusInternalServerError , "Manually-Merged" , err )
return
}
ctx . Status ( http . StatusOK )
return
}
if ! pr . CanAutoMerge ( ) {
ctx . Error ( http . StatusMethodNotAllowed , "PR not in mergeable state" , "Please try again later" )
2020-08-20 03:05:06 +05:30
return
}
if pr . IsWorkInProgress ( ) {
ctx . Error ( http . StatusMethodNotAllowed , "PR is a work in progress" , "Work in progress PRs cannot be merged" )
2019-09-18 11:09:45 +05:30
return
}
2020-10-14 00:20:57 +05:30
if err := pull_service . CheckPRReadyToMerge ( pr , false ) ; err != nil {
2020-01-11 12:59:34 +05:30
if ! models . IsErrNotAllowedToMerge ( err ) {
ctx . Error ( http . StatusInternalServerError , "CheckPRReadyToMerge" , err )
return
}
if form . ForceMerge != nil && * form . ForceMerge {
if isRepoAdmin , err := models . IsUserRepoAdmin ( pr . BaseRepo , ctx . User ) ; err != nil {
ctx . Error ( http . StatusInternalServerError , "IsUserRepoAdmin" , err )
return
} else if ! isRepoAdmin {
ctx . Error ( http . StatusMethodNotAllowed , "Merge" , "Only repository admin can merge if not all checks are ok (force merge)" )
}
} else {
ctx . Error ( http . StatusMethodNotAllowed , "PR is not ready to be merged" , err )
return
}
}
2020-01-15 14:02:57 +05:30
if _ , err := pull_service . IsSignedIfRequired ( pr , ctx . User ) ; err != nil {
2021-12-10 13:44:24 +05:30
if ! asymkey_service . IsErrWontSign ( err ) {
2020-01-15 14:02:57 +05:30
ctx . Error ( http . StatusInternalServerError , "IsSignedIfRequired" , err )
return
}
ctx . Error ( http . StatusMethodNotAllowed , fmt . Sprintf ( "Protected branch %s requires signed commits but this merge would not be signed" , pr . BaseBranch ) , err )
return
}
2018-01-06 00:26:50 +05:30
if len ( form . Do ) == 0 {
2021-12-10 06:57:50 +05:30
form . Do = string ( repo_model . MergeStyleMerge )
2018-01-06 00:26:50 +05:30
}
message := strings . TrimSpace ( form . MergeTitleField )
if len ( message ) == 0 {
2021-12-10 06:57:50 +05:30
if repo_model . MergeStyle ( form . Do ) == repo_model . MergeStyleMerge {
2018-01-06 00:26:50 +05:30
message = pr . GetDefaultMergeMessage ( )
}
2021-12-10 06:57:50 +05:30
if repo_model . MergeStyle ( form . Do ) == repo_model . MergeStyleSquash {
2018-01-06 00:26:50 +05:30
message = pr . GetDefaultSquashMessage ( )
}
}
form . MergeMessageField = strings . TrimSpace ( form . MergeMessageField )
if len ( form . MergeMessageField ) > 0 {
message += "\n\n" + form . MergeMessageField
}
2021-12-10 06:57:50 +05:30
if err := pull_service . Merge ( pr , ctx . User , ctx . Repo . GitRepo , repo_model . MergeStyle ( form . Do ) , message ) ; err != nil {
2018-01-06 00:26:50 +05:30
if models . IsErrInvalidMergeStyle ( err ) {
2021-12-10 06:57:50 +05:30
ctx . Error ( http . StatusMethodNotAllowed , "Invalid merge style" , fmt . Errorf ( "%s is not allowed an allowed merge style for this repository" , repo_model . MergeStyle ( form . Do ) ) )
2018-01-06 00:26:50 +05:30
return
2019-11-10 14:12:51 +05:30
} else if models . IsErrMergeConflicts ( err ) {
conflictError := err . ( models . ErrMergeConflicts )
ctx . JSON ( http . StatusConflict , conflictError )
} else if models . IsErrRebaseConflicts ( err ) {
conflictError := err . ( models . ErrRebaseConflicts )
ctx . JSON ( http . StatusConflict , conflictError )
} else if models . IsErrMergeUnrelatedHistories ( err ) {
conflictError := err . ( models . ErrMergeUnrelatedHistories )
ctx . JSON ( http . StatusConflict , conflictError )
2020-03-28 09:43:18 +05:30
} else if git . IsErrPushOutOfDate ( err ) {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusConflict , "Merge" , "merge push out of date" )
2019-11-10 14:12:51 +05:30
return
2020-03-28 09:43:18 +05:30
} else if git . IsErrPushRejected ( err ) {
errPushRej := err . ( * git . ErrPushRejected )
2020-02-22 18:38:48 +05:30
if len ( errPushRej . Message ) == 0 {
ctx . Error ( http . StatusConflict , "Merge" , "PushRejected without remote error message" )
return
}
ctx . Error ( http . StatusConflict , "Merge" , "PushRejected with remote message: " + errPushRej . Message )
return
2018-01-06 00:26:50 +05:30
}
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "Merge" , err )
2016-12-02 16:40:39 +05:30
return
}
log . Trace ( "Pull request merged: %d" , pr . ID )
2021-07-13 04:56:25 +05:30
if form . DeleteBranchAfterMerge {
var headRepo * git . Repository
if ctx . Repo != nil && ctx . Repo . Repository != nil && ctx . Repo . Repository . ID == pr . HeadRepoID && ctx . Repo . GitRepo != nil {
headRepo = ctx . Repo . GitRepo
} else {
headRepo , err = git . OpenRepository ( pr . HeadRepo . RepoPath ( ) )
if err != nil {
ctx . ServerError ( fmt . Sprintf ( "OpenRepository[%s]" , pr . HeadRepo . RepoPath ( ) ) , err )
return
}
defer headRepo . Close ( )
}
if err := repo_service . DeleteBranch ( ctx . User , pr . HeadRepo , headRepo , pr . HeadBranch ) ; err != nil {
switch {
case git . IsErrBranchNotExist ( err ) :
ctx . NotFound ( err )
case errors . Is ( err , repo_service . ErrBranchIsDefault ) :
ctx . Error ( http . StatusForbidden , "DefaultBranch" , fmt . Errorf ( "can not delete default branch" ) )
case errors . Is ( err , repo_service . ErrBranchIsProtected ) :
ctx . Error ( http . StatusForbidden , "IsProtectedBranch" , fmt . Errorf ( "branch protected" ) )
default :
ctx . Error ( http . StatusInternalServerError , "DeleteBranch" , err )
}
return
}
if err := models . AddDeletePRBranchComment ( ctx . User , pr . BaseRepo , pr . Issue . ID , pr . HeadBranch ) ; err != nil {
// Do not fail here as branch has already been deleted
log . Error ( "DeleteBranch: %v" , err )
}
}
2019-12-20 22:37:12 +05:30
ctx . Status ( http . StatusOK )
2016-12-02 16:40:39 +05:30
}
2021-12-10 06:57:50 +05:30
func parseCompareInfo ( ctx * context . APIContext , form api . CreatePullRequestOption ) ( * user_model . User , * repo_model . Repository , * git . Repository , * git . CompareInfo , string , string ) {
2016-12-02 16:40:39 +05:30
baseRepo := ctx . Repo . Repository
// Get compared branches information
// format: <base branch>...[<head repo>:]<head branch>
// base<-head: master...head:feature
// same repo: master...feature
// TODO: Validate form first?
baseBranch := form . Base
var (
2021-11-24 15:19:20 +05:30
headUser * user_model . User
2016-12-02 16:40:39 +05:30
headBranch string
isSameRepo bool
err error
)
// If there is no head repository, it means pull request between same repository.
headInfos := strings . Split ( form . Head , ":" )
if len ( headInfos ) == 1 {
isSameRepo = true
headUser = ctx . Repo . Owner
headBranch = headInfos [ 0 ]
} else if len ( headInfos ) == 2 {
2021-11-24 15:19:20 +05:30
headUser , err = user_model . GetUserByName ( headInfos [ 0 ] )
2016-12-02 16:40:39 +05:30
if err != nil {
2021-11-24 15:19:20 +05:30
if user_model . IsErrUserNotExist ( err ) {
2019-05-07 22:50:23 +05:30
ctx . NotFound ( "GetUserByName" )
2016-12-02 16:40:39 +05:30
} else {
2020-09-21 01:50:14 +05:30
ctx . Error ( http . StatusInternalServerError , "GetUserByName" , err )
2016-12-02 16:40:39 +05:30
}
return nil , nil , nil , nil , "" , ""
}
headBranch = headInfos [ 1 ]
} else {
2019-03-19 07:59:43 +05:30
ctx . NotFound ( )
2016-12-02 16:40:39 +05:30
return nil , nil , nil , nil , "" , ""
}
ctx . Repo . PullRequest . SameRepo = isSameRepo
log . Info ( "Base branch: %s" , baseBranch )
log . Info ( "Repo path: %s" , ctx . Repo . GitRepo . Path )
// Check if base branch is valid.
if ! ctx . Repo . GitRepo . IsBranchExist ( baseBranch ) {
2019-05-07 22:50:23 +05:30
ctx . NotFound ( "IsBranchExist" )
2016-12-02 16:40:39 +05:30
return nil , nil , nil , nil , "" , ""
}
// Check if current user has fork of repository or in the same repository.
2021-12-12 21:18:20 +05:30
headRepo := repo_model . GetForkedRepo ( headUser . ID , baseRepo . ID )
2021-11-22 20:51:55 +05:30
if headRepo == nil && ! isSameRepo {
2016-12-02 16:40:39 +05:30
log . Trace ( "parseCompareInfo[%d]: does not have fork or in same repository" , baseRepo . ID )
2021-11-22 20:51:55 +05:30
ctx . NotFound ( "GetForkedRepo" )
2016-12-02 16:40:39 +05:30
return nil , nil , nil , nil , "" , ""
}
var headGitRepo * git . Repository
if isSameRepo {
headRepo = ctx . Repo . Repository
headGitRepo = ctx . Repo . GitRepo
} else {
2021-12-10 06:57:50 +05:30
headGitRepo , err = git . OpenRepository ( repo_model . RepoPath ( headUser . Name , headRepo . Name ) )
2016-12-02 16:40:39 +05:30
if err != nil {
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "OpenRepository" , err )
2016-12-02 16:40:39 +05:30
return nil , nil , nil , nil , "" , ""
}
}
2019-05-07 22:50:23 +05:30
// user should have permission to read baseRepo's codes and pulls, NOT headRepo's
permBase , err := models . GetUserRepoPermission ( baseRepo , ctx . User )
2018-11-28 16:56:14 +05:30
if err != nil {
2019-11-13 12:31:19 +05:30
headGitRepo . Close ( )
2020-09-21 01:50:14 +05:30
ctx . Error ( http . StatusInternalServerError , "GetUserRepoPermission" , err )
2018-11-28 16:56:14 +05:30
return nil , nil , nil , nil , "" , ""
}
2021-11-10 01:27:58 +05:30
if ! permBase . CanReadIssuesOrPulls ( true ) || ! permBase . CanRead ( unit . TypeCode ) {
2019-04-23 02:10:51 +05:30
if log . IsTrace ( ) {
2019-05-07 22:50:23 +05:30
log . Trace ( "Permission Denied: User %-v cannot create/read pull requests or cannot read code in Repo %-v\nUser in baseRepo has Permissions: %-+v" ,
ctx . User ,
baseRepo ,
permBase )
}
2019-11-13 12:31:19 +05:30
headGitRepo . Close ( )
2019-05-07 22:50:23 +05:30
ctx . NotFound ( "Can't read pulls or can't read UnitTypeCode" )
return nil , nil , nil , nil , "" , ""
}
// user should have permission to read headrepo's codes
permHead , err := models . GetUserRepoPermission ( headRepo , ctx . User )
if err != nil {
2019-11-13 12:31:19 +05:30
headGitRepo . Close ( )
2020-09-21 01:50:14 +05:30
ctx . Error ( http . StatusInternalServerError , "GetUserRepoPermission" , err )
2019-05-07 22:50:23 +05:30
return nil , nil , nil , nil , "" , ""
}
2021-11-10 01:27:58 +05:30
if ! permHead . CanRead ( unit . TypeCode ) {
2019-05-07 22:50:23 +05:30
if log . IsTrace ( ) {
log . Trace ( "Permission Denied: User: %-v cannot read code in Repo: %-v\nUser in headRepo has Permissions: %-+v" ,
2019-04-23 02:10:51 +05:30
ctx . User ,
headRepo ,
2019-05-07 22:50:23 +05:30
permHead )
2019-04-23 02:10:51 +05:30
}
2019-11-13 12:31:19 +05:30
headGitRepo . Close ( )
2019-05-07 22:50:23 +05:30
ctx . NotFound ( "Can't read headRepo UnitTypeCode" )
2016-12-02 16:40:39 +05:30
return nil , nil , nil , nil , "" , ""
}
// Check if head branch is valid.
if ! headGitRepo . IsBranchExist ( headBranch ) {
2019-11-13 12:31:19 +05:30
headGitRepo . Close ( )
2019-03-19 07:59:43 +05:30
ctx . NotFound ( )
2016-12-02 16:40:39 +05:30
return nil , nil , nil , nil , "" , ""
}
2021-12-10 06:57:50 +05:30
compareInfo , err := headGitRepo . GetCompareInfo ( repo_model . RepoPath ( baseRepo . Owner . Name , baseRepo . Name ) , baseBranch , headBranch , true , false )
2016-12-02 16:40:39 +05:30
if err != nil {
2019-11-13 12:31:19 +05:30
headGitRepo . Close ( )
2019-12-20 22:37:12 +05:30
ctx . Error ( http . StatusInternalServerError , "GetCompareInfo" , err )
2016-12-02 16:40:39 +05:30
return nil , nil , nil , nil , "" , ""
}
2019-06-08 01:59:29 +05:30
return headUser , headRepo , headGitRepo , compareInfo , baseBranch , headBranch
2016-12-02 16:40:39 +05:30
}
2020-08-05 02:25:22 +05:30
// UpdatePullRequest merge PR's baseBranch into headBranch
func UpdatePullRequest ( ctx * context . APIContext ) {
// swagger:operation POST /repos/{owner}/{repo}/pulls/{index}/update repository repoUpdatePullRequest
// ---
// summary: Merge PR's baseBranch into headBranch
// produces:
// - application/json
// parameters:
// - name: owner
// in: path
// description: owner of the repo
// type: string
// required: true
// - name: repo
// in: path
// description: name of the repo
// type: string
// required: true
// - name: index
// in: path
// description: index of the pull request to get
// type: integer
// format: int64
// required: true
2021-08-31 19:33:45 +05:30
// - name: style
// in: query
// description: how to update pull request
// type: string
// enum: [merge, rebase]
2020-08-05 02:25:22 +05:30
// responses:
// "200":
// "$ref": "#/responses/empty"
// "403":
// "$ref": "#/responses/forbidden"
// "404":
// "$ref": "#/responses/notFound"
// "409":
// "$ref": "#/responses/error"
// "422":
// "$ref": "#/responses/validationError"
pr , err := models . GetPullRequestByIndex ( ctx . Repo . Repository . ID , ctx . ParamsInt64 ( ":index" ) )
if err != nil {
if models . IsErrPullRequestNotExist ( err ) {
ctx . NotFound ( )
} else {
ctx . Error ( http . StatusInternalServerError , "GetPullRequestByIndex" , err )
}
return
}
if pr . HasMerged {
ctx . Error ( http . StatusUnprocessableEntity , "UpdatePullRequest" , err )
return
}
if err = pr . LoadIssue ( ) ; err != nil {
ctx . Error ( http . StatusInternalServerError , "LoadIssue" , err )
return
}
if pr . Issue . IsClosed {
ctx . Error ( http . StatusUnprocessableEntity , "UpdatePullRequest" , err )
return
}
if err = pr . LoadBaseRepo ( ) ; err != nil {
ctx . Error ( http . StatusInternalServerError , "LoadBaseRepo" , err )
return
}
if err = pr . LoadHeadRepo ( ) ; err != nil {
ctx . Error ( http . StatusInternalServerError , "LoadHeadRepo" , err )
return
}
2021-08-31 19:33:45 +05:30
rebase := ctx . FormString ( "style" ) == "rebase"
allowedUpdateByMerge , allowedUpdateByRebase , err := pull_service . IsUserAllowedToUpdate ( pr , ctx . User )
2020-08-05 02:25:22 +05:30
if err != nil {
ctx . Error ( http . StatusInternalServerError , "IsUserAllowedToMerge" , err )
return
}
2021-08-31 19:33:45 +05:30
if ( ! allowedUpdateByMerge && ! rebase ) || ( rebase && ! allowedUpdateByRebase ) {
2020-08-05 02:25:22 +05:30
ctx . Status ( http . StatusForbidden )
return
}
// default merge commit message
message := fmt . Sprintf ( "Merge branch '%s' into %s" , pr . BaseBranch , pr . HeadBranch )
2021-08-31 19:33:45 +05:30
if err = pull_service . Update ( pr , ctx . User , message , rebase ) ; err != nil {
2020-08-05 02:25:22 +05:30
if models . IsErrMergeConflicts ( err ) {
ctx . Error ( http . StatusConflict , "Update" , "merge failed because of conflict" )
return
2021-09-05 15:00:40 +05:30
} else if models . IsErrRebaseConflicts ( err ) {
ctx . Error ( http . StatusConflict , "Update" , "rebase failed because of conflict" )
return
2020-08-05 02:25:22 +05:30
}
ctx . Error ( http . StatusInternalServerError , "pull_service.Update" , err )
return
}
ctx . Status ( http . StatusOK )
}
2021-07-02 17:49:57 +05:30
// GetPullRequestCommits gets all commits associated with a given PR
func GetPullRequestCommits ( ctx * context . APIContext ) {
// swagger:operation GET /repos/{owner}/{repo}/pulls/{index}/commits repository repoGetPullRequestCommits
// ---
// summary: Get commits for a pull request
// produces:
// - application/json
// parameters:
// - name: owner
// in: path
// description: owner of the repo
// type: string
// required: true
// - name: repo
// in: path
// description: name of the repo
// type: string
// required: true
// - name: index
// in: path
// description: index of the pull request to get
// type: integer
// format: int64
// required: true
// - name: page
// in: query
// description: page number of results to return (1-based)
// type: integer
// - name: limit
// in: query
// description: page size of results
// type: integer
// responses:
// "200":
// "$ref": "#/responses/CommitList"
// "404":
// "$ref": "#/responses/notFound"
pr , err := models . GetPullRequestByIndex ( ctx . Repo . Repository . ID , ctx . ParamsInt64 ( ":index" ) )
if err != nil {
if models . IsErrPullRequestNotExist ( err ) {
ctx . NotFound ( )
} else {
ctx . Error ( http . StatusInternalServerError , "GetPullRequestByIndex" , err )
}
return
}
if err := pr . LoadBaseRepo ( ) ; err != nil {
ctx . InternalServerError ( err )
return
}
var prInfo * git . CompareInfo
baseGitRepo , err := git . OpenRepository ( pr . BaseRepo . RepoPath ( ) )
if err != nil {
ctx . ServerError ( "OpenRepository" , err )
return
}
defer baseGitRepo . Close ( )
if pr . HasMerged {
2021-10-15 21:35:33 +05:30
prInfo , err = baseGitRepo . GetCompareInfo ( pr . BaseRepo . RepoPath ( ) , pr . MergeBase , pr . GetGitRefName ( ) , true , false )
2021-07-02 17:49:57 +05:30
} else {
2021-10-15 21:35:33 +05:30
prInfo , err = baseGitRepo . GetCompareInfo ( pr . BaseRepo . RepoPath ( ) , pr . BaseBranch , pr . GetGitRefName ( ) , true , false )
2021-07-02 17:49:57 +05:30
}
if err != nil {
ctx . ServerError ( "GetCompareInfo" , err )
return
}
commits := prInfo . Commits
listOptions := utils . GetListOptions ( ctx )
2021-08-09 23:38:51 +05:30
totalNumberOfCommits := len ( commits )
2021-07-02 17:49:57 +05:30
totalNumberOfPages := int ( math . Ceil ( float64 ( totalNumberOfCommits ) / float64 ( listOptions . PageSize ) ) )
2021-11-24 15:19:20 +05:30
userCache := make ( map [ string ] * user_model . User )
2021-07-02 17:49:57 +05:30
start , end := listOptions . GetStartEnd ( )
if end > totalNumberOfCommits {
end = totalNumberOfCommits
}
2021-08-09 23:38:51 +05:30
apiCommits := make ( [ ] * api . Commit , 0 , end - start )
for i := start ; i < end ; i ++ {
apiCommit , err := convert . ToCommit ( ctx . Repo . Repository , commits [ i ] , userCache )
2021-07-02 17:49:57 +05:30
if err != nil {
ctx . ServerError ( "toCommit" , err )
return
}
2021-08-09 23:38:51 +05:30
apiCommits = append ( apiCommits , apiCommit )
2021-07-02 17:49:57 +05:30
}
2021-08-12 18:13:08 +05:30
ctx . SetLinkHeader ( totalNumberOfCommits , listOptions . PageSize )
ctx . SetTotalCountHeader ( int64 ( totalNumberOfCommits ) )
2021-07-02 17:49:57 +05:30
2021-12-15 12:29:57 +05:30
ctx . RespHeader ( ) . Set ( "X-Page" , strconv . Itoa ( listOptions . Page ) )
ctx . RespHeader ( ) . Set ( "X-PerPage" , strconv . Itoa ( listOptions . PageSize ) )
ctx . RespHeader ( ) . Set ( "X-PageCount" , strconv . Itoa ( totalNumberOfPages ) )
ctx . RespHeader ( ) . Set ( "X-HasMore" , strconv . FormatBool ( listOptions . Page < totalNumberOfPages ) )
2021-08-12 18:13:08 +05:30
ctx . AppendAccessControlExposeHeaders ( "X-Page" , "X-PerPage" , "X-PageCount" , "X-HasMore" )
2021-07-02 17:49:57 +05:30
ctx . JSON ( http . StatusOK , & apiCommits )
}