summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorKN4CK3R <admin@oldschoolhack.me>2021-11-18 00:50:17 +0100
committerGitHub <noreply@github.com>2021-11-17 23:50:17 +0000
commitea42d3c04ef48b9ff0354ea196179d1a5025c04a (patch)
tree8a95df877dae7a5cf62364a525cc532205d5d188 /modules
parent3c4724d70e4ac7bfc06b97f6fad8936f97479b6b (diff)
downloadgitea-ea42d3c04ef48b9ff0354ea196179d1a5025c04a.tar.gz
gitea-ea42d3c04ef48b9ff0354ea196179d1a5025c04a.zip
Fixed commit count. (#17698)
Added "Tag" label. Unified branch, tag and commit name.
Diffstat (limited to 'modules')
-rw-r--r--modules/context/repo.go18
1 files changed, 11 insertions, 7 deletions
diff --git a/modules/context/repo.go b/modules/context/repo.go
index 3be33f2483..e3d66fc3b9 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -59,6 +59,7 @@ type Repository struct {
Commit *git.Commit
Tag *git.Tag
GitRepo *git.Repository
+ RefName string
BranchName string
TagName string
TreePath string
@@ -191,9 +192,9 @@ func (r *Repository) BranchNameSubURL() string {
case r.IsViewBranch:
return "branch/" + util.PathEscapeSegments(r.BranchName)
case r.IsViewTag:
- return "tag/" + util.PathEscapeSegments(r.BranchName)
+ return "tag/" + util.PathEscapeSegments(r.TagName)
case r.IsViewCommit:
- return "commit/" + util.PathEscapeSegments(r.BranchName)
+ return "commit/" + util.PathEscapeSegments(r.CommitID)
}
log.Error("Unknown view type for repo: %v", r)
return ""
@@ -563,8 +564,6 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) {
ctx.Data["Branches"] = brs
ctx.Data["BranchesCount"] = len(brs)
- ctx.Data["TagName"] = ctx.Repo.TagName
-
// If not branch selected, try default one.
// If default branch doesn't exists, fall back to some other branch.
if len(ctx.Repo.BranchName) == 0 {
@@ -573,9 +572,9 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) {
} else if len(brs) > 0 {
ctx.Repo.BranchName = brs[0]
}
+ ctx.Repo.RefName = ctx.Repo.BranchName
}
ctx.Data["BranchName"] = ctx.Repo.BranchName
- ctx.Data["CommitID"] = ctx.Repo.CommitID
// People who have push access or have forked repository can propose a new pull request.
canPush := ctx.Repo.CanWrite(unit_model.TypeCode) || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID))
@@ -781,7 +780,6 @@ func RepoRefByType(refType RepoRefType, ignoreNotExistErr ...bool) func(*Context
// Get default branch.
if len(ctx.Params("*")) == 0 {
refName = ctx.Repo.Repository.DefaultBranch
- ctx.Repo.BranchName = refName
if !ctx.Repo.GitRepo.IsBranchExist(refName) {
brs, _, err := ctx.Repo.GitRepo.GetBranches(0, 0)
if err != nil {
@@ -795,6 +793,8 @@ func RepoRefByType(refType RepoRefType, ignoreNotExistErr ...bool) func(*Context
}
refName = brs[0]
}
+ ctx.Repo.RefName = refName
+ ctx.Repo.BranchName = refName
ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetBranchCommit(refName)
if err != nil {
ctx.ServerError("GetBranchCommit", err)
@@ -805,7 +805,7 @@ func RepoRefByType(refType RepoRefType, ignoreNotExistErr ...bool) func(*Context
} else {
refName = getRefName(ctx, refType)
- ctx.Repo.BranchName = refName
+ ctx.Repo.RefName = refName
isRenamedBranch, has := ctx.Data["IsRenamedBranch"].(bool)
if isRenamedBranch && has {
renamedBranchName := ctx.Data["RenamedBranchName"].(string)
@@ -817,6 +817,7 @@ func RepoRefByType(refType RepoRefType, ignoreNotExistErr ...bool) func(*Context
if refType.RefTypeIncludesBranches() && ctx.Repo.GitRepo.IsBranchExist(refName) {
ctx.Repo.IsViewBranch = true
+ ctx.Repo.BranchName = refName
ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetBranchCommit(refName)
if err != nil {
@@ -827,6 +828,8 @@ func RepoRefByType(refType RepoRefType, ignoreNotExistErr ...bool) func(*Context
} else if refType.RefTypeIncludesTags() && ctx.Repo.GitRepo.IsTagExist(refName) {
ctx.Repo.IsViewTag = true
+ ctx.Repo.TagName = refName
+
ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetTagCommit(refName)
if err != nil {
ctx.ServerError("GetTagCommit", err)
@@ -870,6 +873,7 @@ func RepoRefByType(refType RepoRefType, ignoreNotExistErr ...bool) func(*Context
ctx.Data["BranchName"] = ctx.Repo.BranchName
ctx.Data["BranchNameSubURL"] = ctx.Repo.BranchNameSubURL()
+ ctx.Data["TagName"] = ctx.Repo.TagName
ctx.Data["CommitID"] = ctx.Repo.CommitID
ctx.Data["TreePath"] = ctx.Repo.TreePath
ctx.Data["IsViewBranch"] = ctx.Repo.IsViewBranch