mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-25 08:54:17 -05:00
ca46385637
* Use PathUnescape instead of QueryUnescape when working with branch names Currently branch names with a '+' fail in certain situations because QueryUnescape replaces the + character with a blank space. Using PathUnescape should be better since it is defined as: // PathUnescape is identical to QueryUnescape except that it does not // unescape '+' to ' ' (space). Fixes #6333 * Change error to match new function name * Add new util function PathEscapeSegments This function simply runs PathEscape on each segment of a path without touching the forward slash itself. We want to use this instead of PathEscape/QueryEscape in most cases because a forward slash is a valid name for a branch etc... and we don't want that escaped in a URL. Putting this in new file url.go and also moving a couple similar functions into that file as well. * Use EscapePathSegments where appropriate Replace various uses of EscapePath/EscapeQuery with new EscapePathSegments. Also remove uncessary uses of various escape/unescape functions when the text had already been escaped or was not escaped. * Reformat comment to make drone build happy * Remove no longer used url library * Requested code changes
83 lines
2.1 KiB
Go
83 lines
2.1 KiB
Go
// Copyright 2018 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 private
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"code.gitea.io/gitea/models"
|
|
|
|
macaron "gopkg.in/macaron.v1"
|
|
)
|
|
|
|
// GetRepository return the default branch of a repository
|
|
func GetRepository(ctx *macaron.Context) {
|
|
repoID := ctx.ParamsInt64(":rid")
|
|
repository, err := models.GetRepositoryByID(repoID)
|
|
repository.MustOwnerName()
|
|
allowPulls := repository.AllowsPulls()
|
|
// put it back to nil because json unmarshal can't unmarshal it
|
|
repository.Units = nil
|
|
|
|
if err != nil {
|
|
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
|
|
"err": err.Error(),
|
|
})
|
|
return
|
|
}
|
|
|
|
if repository.IsFork {
|
|
repository.GetBaseRepo()
|
|
if err != nil {
|
|
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
|
|
"err": err.Error(),
|
|
})
|
|
return
|
|
}
|
|
repository.BaseRepo.MustOwnerName()
|
|
allowPulls = repository.BaseRepo.AllowsPulls()
|
|
// put it back to nil because json unmarshal can't unmarshal it
|
|
repository.BaseRepo.Units = nil
|
|
}
|
|
|
|
ctx.JSON(http.StatusOK, struct {
|
|
Repository *models.Repository
|
|
AllowPullRequest bool
|
|
}{
|
|
Repository: repository,
|
|
AllowPullRequest: allowPulls,
|
|
})
|
|
}
|
|
|
|
// GetActivePullRequest return an active pull request when it exists or an empty object
|
|
func GetActivePullRequest(ctx *macaron.Context) {
|
|
baseRepoID := ctx.QueryInt64("baseRepoID")
|
|
headRepoID := ctx.QueryInt64("headRepoID")
|
|
baseBranch := ctx.QueryTrim("baseBranch")
|
|
if len(baseBranch) == 0 {
|
|
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
|
|
"err": "QueryTrim failed",
|
|
})
|
|
return
|
|
}
|
|
|
|
headBranch := ctx.QueryTrim("headBranch")
|
|
if len(headBranch) == 0 {
|
|
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
|
|
"err": "QueryTrim failed",
|
|
})
|
|
return
|
|
}
|
|
|
|
pr, err := models.GetUnmergedPullRequest(headRepoID, baseRepoID, headBranch, baseBranch)
|
|
if err != nil && !models.IsErrPullRequestNotExist(err) {
|
|
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
|
|
"err": err.Error(),
|
|
})
|
|
return
|
|
}
|
|
|
|
ctx.JSON(http.StatusOK, pr)
|
|
}
|