Fix bug

Author: lunny

routers/common/artifacts.go renamed to modules/actions/artifacts.go

@@ -1,7 +1,7 @@
 // Copyright 2025 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package common
+package actions
 
 import (
 	"net/http"

modules/git/ref.go

@@ -84,6 +84,18 @@ func RefNameFromCommit(shortName string) RefName {
 	return RefName(shortName)
 }
 
+func RefNameFromObjectTypeAndShortName(objectType ObjectType, shortName string) RefName {
+	switch objectType {
+	case ObjectBranch:
+		return RefNameFromBranch(shortName)
+	case ObjectTag:
+		return RefNameFromTag(shortName)
+	case ObjectCommit:
+		return RefNameFromCommit(shortName)
+	}
+	return RefName(shortName)
+}
+
 func (ref RefName) String() string {
 	return string(ref)
 }

routers/api/v1/utils/git.go

@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/services/context"
-	repo_service "code.gitea.io/gitea/services/repository"
 )
 
 // ResolveRefOrSha resolve ref to sha if exist
@@ -39,7 +38,7 @@ func ResolveRefOrSha(ctx *context.APIContext, ref string) string {
 	sha = MustConvertToSHA1(ctx, ctx.Repo, sha)
 
 	if ctx.Repo.GitRepo != nil {
-		commitsCount, _ := repo_service.GetRefCommitsCount(ctx, ctx.Repo.Repository.ID, git.RefName(ref))
+		commitsCount, _ := context.GetRefCommitsCount(ctx, ctx.Repo.Repository.ID, git.RefName(ref))
 		err := ctx.Repo.GitRepo.AddLastCommitCache(commitsCount, ctx.Repo.Repository.FullName(), sha)
 		if err != nil {
 			log.Error("Unable to get commits count for %s in %s. Error: %v", sha, ctx.Repo.Repository.FullName(), err)

routers/web/repo/repo.go

@@ -71,7 +71,7 @@ func CommitInfoCache(ctx *context.Context) {
 		ctx.ServerError("GetBranchCommit", err)
 		return
 	}
-	ctx.Repo.CommitsCount, err = ctx.Repo.GetCommitsCount()
+	ctx.Repo.CommitsCount, err = ctx.Repo.GetCommitsCount(ctx)
 	if err != nil {
 		ctx.ServerError("GetCommitsCount", err)
 		return

services/context/repo.go

@@ -32,7 +32,6 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
 	asymkey_service "code.gitea.io/gitea/services/asymkey"
-	repo_service "code.gitea.io/gitea/services/repository"
 
 	"github.com/editorconfig/editorconfig-core-go/v2"
 )
@@ -164,12 +163,32 @@ func (r *Repository) CanCreateIssueDependencies(ctx context.Context, user *user_
 	return r.Repository.IsDependenciesEnabled(ctx) && r.Permission.CanWriteIssuesOrPulls(isPull)
 }
 
+func GetRefCommitsCount(ctx context.Context, repoID int64, refFullName git.RefName) (int64, error) {
+	// Get the commit count of the branch or the tag
+	switch {
+	case refFullName.IsBranch():
+		branch, err := git_model.GetBranch(ctx, repoID, refFullName.BranchName())
+		if err != nil {
+			return 0, err
+		}
+		return branch.CommitCount, nil
+	case refFullName.IsTag():
+		tag, err := repo_model.GetRelease(ctx, repoID, refFullName.TagName())
+		if err != nil {
+			return 0, err
+		}
+		return tag.NumCommits, nil
+	default:
+		return 0, nil
+	}
+}
+
 // GetCommitsCount returns cached commit count for current view
 func (r *Repository) GetCommitsCount(ctx context.Context) (int64, error) {
 	if r.Commit == nil {
 		return 0, nil
 	}
-	return repo_service.GetRefCommitsCount(ctx, r.Repository.ID, r.RefFullName)
+	return GetRefCommitsCount(ctx, r.Repository.ID, r.RefFullName)
 }
 
 // GetCommitGraphsCount returns cached commit count for current view

services/repository/cache.go

@@ -6,32 +6,12 @@ package repository
 import (
 	"context"
 
-	git_model "code.gitea.io/gitea/models/git"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/git"
+	context_service "code.gitea.io/gitea/services/context"
 )
 
-func GetRefCommitsCount(ctx context.Context, repoID int64, refFullName git.RefName) (int64, error) {
-	// Get the commit count of the branch or the tag
-	switch {
-	case refFullName.IsBranch():
-		branch, err := git_model.GetBranch(ctx, repoID, refFullName.BranchName())
-		if err != nil {
-			return 0, err
-		}
-		return branch.CommitCount, nil
-	case refFullName.IsTag():
-		tag, err := repo_model.GetRelease(ctx, repoID, refFullName.TagName())
-		if err != nil {
-			return 0, err
-		}
-		return tag.NumCommits, nil
-	default:
-		return 0, nil
-	}
-}
-
 // CacheRef cachhe last commit information of the branch or the tag
 func CacheRef(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, fullRefName git.RefName) error {
 	commit, err := gitRepo.GetCommit(fullRefName.String())
@@ -40,7 +20,7 @@ func CacheRef(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Rep
 	}
 
 	if gitRepo.LastCommitCache == nil {
-		commitsCount, err := GetRefCommitsCount(ctx, repo.ID, fullRefName)
+		commitsCount, err := context_service.GetRefCommitsCount(ctx, repo.ID, fullRefName)
 		if err != nil {
 			return err
 		}

services/repository/commit.go

@@ -24,7 +24,7 @@ type namedLink struct { // TODO: better name?
 }
 
 // LoadBranchesAndTags creates a new repository branch
-func LoadBranchesAndTags(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, repoLink string, commitSHA string) (*ContainedLinks, error) {
+func LoadBranchesAndTags(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, repoLink, commitSHA string) (*ContainedLinks, error) {
 	containedTags, err := gitRepo.ListOccurrences(ctx, "tag", commitSHA)
 	if err != nil {
 		return nil, fmt.Errorf("encountered a problem while querying %s: %w", "tags", err)

services/repository/files/content.go

@@ -16,6 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/util"
+	context_service "code.gitea.io/gitea/services/context"
 )
 
 // ContentType repo content type
@@ -165,7 +166,11 @@ func GetContents(ctx context.Context, repo *repo_model.Repository, treePath, ref
 	}
 	selfURLString := selfURL.String()
 
-	err = gitRepo.AddLastCommitCache(repo.GetCommitsCountCacheKey(ref, refType != git.ObjectCommit), repo.FullName(), commitID)
+	refName := git.RefNameFromObjectTypeAndShortName(refType, ref)
+
+	commitsCount, _ := context_service.GetRefCommitsCount(ctx, repo.ID, refName)
+
+	err = gitRepo.AddLastCommitCache(commitsCount, repo.FullName(), commitID)
 	if err != nil {
 		return nil, err
 	}