finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor various strings (#17784)

Browse source 
Fixes #16478

Co-authored-by: Gusted <williamzijl7@hotmail.com>

Co-authored-by: Gusted <williamzijl7@hotmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
mscherer 2021-12-02 08:28:08 +01:00 • committed by GitHub
parent ba57e30f13
commit 34b5436ae1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 46 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/convert/pull.go
View file

@ -79,7 +79,7 @@ func ToAPIPullRequest(pr *models.PullRequest, doer *user_model.User) *api.PullRe
},
Head: &api.PRBranchInfo{
Name: pr.HeadBranch,
Ref: fmt.Sprintf("refs/pull/%d/head", pr.Index),
Ref: fmt.Sprintf(git.PullPrefix+"%d/head", pr.Index),
RepoID: -1,
},
}

2
modules/git/commit.go
View file

@ -141,7 +141,7 @@ func CommitChangesWithArgs(repoPath string, args []string, opts CommitChangesOpt
func AllCommitsCount(repoPath string, hidePRRefs bool, files ...string) (int64, error) {
args := []string{"--all", "--count"}
if hidePRRefs {
args = append([]string{"--exclude=refs/pull/*"}, args...)
args = append([]string{"--exclude=" + PullPrefix + "*"}, args...)
}
cmd := NewCommand("rev-list")
cmd.AddArguments(args...)

33
modules/git/ref.go
View file

@ -6,6 +6,15 @@ package git
import "strings"
const (
// RemotePrefix is the base directory of the remotes information of git.
RemotePrefix = "refs/remotes/"
// PullPrefix is the base directory of the pull information of git.
PullPrefix = "refs/pull/"
pullLen = len(PullPrefix)
)
// Reference represents a Git ref.
type Reference struct {
Name string
@ -24,17 +33,17 @@ func (ref *Reference) ShortName() string {
if ref == nil {
return ""
}
if strings.HasPrefix(ref.Name, "refs/heads/") {
return ref.Name[11:]
if strings.HasPrefix(ref.Name, BranchPrefix) {
return strings.TrimPrefix(ref.Name, BranchPrefix)
}
if strings.HasPrefix(ref.Name, "refs/tags/") {
return ref.Name[10:]
if strings.HasPrefix(ref.Name, TagPrefix) {
return strings.TrimPrefix(ref.Name, TagPrefix)
}
if strings.HasPrefix(ref.Name, "refs/remotes/") {
return ref.Name[13:]
if strings.HasPrefix(ref.Name, RemotePrefix) {
return strings.TrimPrefix(ref.Name, RemotePrefix)
}
if strings.HasPrefix(ref.Name, "refs/pull/") && strings.IndexByte(ref.Name[10:], '/') > -1 {
return ref.Name[10 : strings.IndexByte(ref.Name[10:], '/')+10]
if strings.HasPrefix(ref.Name, PullPrefix) && strings.IndexByte(ref.Name[pullLen:], '/') > -1 {
return ref.Name[pullLen : strings.IndexByte(ref.Name[pullLen:], '/')+pullLen]
}
return ref.Name
@ -45,16 +54,16 @@ func (ref *Reference) RefGroup() string {
if ref == nil {
return ""
}
if strings.HasPrefix(ref.Name, "refs/heads/") {
if strings.HasPrefix(ref.Name, BranchPrefix) {
return "heads"
}
if strings.HasPrefix(ref.Name, "refs/tags/") {
if strings.HasPrefix(ref.Name, TagPrefix) {
return "tags"
}
if strings.HasPrefix(ref.Name, "refs/remotes/") {
if strings.HasPrefix(ref.Name, RemotePrefix) {
return "remotes"
}
if strings.HasPrefix(ref.Name, "refs/pull/") && strings.IndexByte(ref.Name[10:], '/') > -1 {
if strings.HasPrefix(ref.Name, PullPrefix) && strings.IndexByte(ref.Name[pullLen:], '/') > -1 {
return "pull"
}
return ""

2
modules/git/repo.go
View file

@ -371,7 +371,7 @@ func parseSize(objects string) *CountObject {
// GetLatestCommitTime returns time for latest commit in repository (across all branches)
func GetLatestCommitTime(repoPath string) (time.Time, error) {
cmd := NewCommand("for-each-ref", "--sort=-committerdate", "refs/heads/", "--count", "1", "--format=%(committerdate)")
cmd := NewCommand("for-each-ref", "--sort=-committerdate", BranchPrefix, "--count", "1", "--format=%(committerdate)")
stdout, err := cmd.RunInDir(repoPath)
if err != nil {
return time.Time{}, err

2
modules/git/repo_compare.go
View file

@ -33,7 +33,7 @@ func (repo *Repository) GetMergeBase(tmpRemote string, base, head string) (strin
}
if tmpRemote != "origin" {
tmpBaseName := "refs/remotes/" + tmpRemote + "/tmp_" + base
tmpBaseName := RemotePrefix + tmpRemote + "/tmp_" + base
// Fetch commit into a temporary branch in order to be able to handle commits and tags
_, err := NewCommandContext(repo.Ctx, "fetch", tmpRemote, base+":"+tmpBaseName).RunInDir(repo.Path)
if err == nil {

2
modules/git/repo_ref_nogogit.go
View file

@ -66,7 +66,7 @@ func (repo *Repository) GetRefsFiltered(pattern string) ([]*Reference, error) {
refName = refName[:len(refName)-1]
// refName cannot be HEAD but can be remotes or stash
if strings.HasPrefix(refName, "/refs/remotes/") || refName == "/refs/stash" {
if strings.HasPrefix(refName, RemotePrefix) || refName == "/refs/stash" {
continue
}

2
modules/gitgraph/graph.go
View file

@ -29,7 +29,7 @@ func GetCommitGraph(r *git.Repository, page int, maxAllowedColors int, hidePRRef
args = append(args, "--graph", "--date-order", "--decorate=full")
if hidePRRefs {
args = append(args, "--exclude=refs/pull/*")
args = append(args, "--exclude="+git.PullPrefix+"*")
}
if len(branches) == 0 {

4
modules/migration/pullrequest.go
View file

@ -8,6 +8,8 @@ package migration
import (
"fmt"
"time"
"code.gitea.io/gitea/modules/git"
)
// PullRequest defines a standard pull request information
@ -43,7 +45,7 @@ func (p *PullRequest) IsForkPullRequest() bool {
// GetGitRefName returns pull request relative path to head
func (p PullRequest) GetGitRefName() string {
return fmt.Sprintf("refs/pull/%d/head", p.Number)
return fmt.Sprintf(git.PullPrefix+"%d/head", p.Number)
}
// PullRequestBranch represents a pull request branch