Some fix

Author: lunny

models/repo/repo.go

@@ -376,6 +376,17 @@ func (repo *Repository) APIURL() string {
 	return setting.AppURL + "api/v1/repos/" + url.PathEscape(repo.OwnerName) + "/" + url.PathEscape(repo.Name)
 }
 
+// GetCommitsCountCacheKey returns cache key used for commits count caching.
+func (repo *Repository) GetCommitsCountCacheKey(contextName string, isRef bool) string {
+	var prefix string
+	if isRef {
+		prefix = "ref"
+	} else {
+		prefix = "commit"
+	}
+	return fmt.Sprintf("commits-count-%d-%s-%s", repo.ID, prefix, contextName)
+}
+
 // LoadUnits loads repo units into repo.Units
 func (repo *Repository) LoadUnits(ctx context.Context) (err error) {
 	if repo.Units != nil {

routers/api/v1/utils/git.go

@@ -38,7 +38,7 @@ func ResolveRefOrSha(ctx *context.APIContext, ref string) string {
 	sha = MustConvertToSHA1(ctx, ctx.Repo, sha)
 
 	if ctx.Repo.GitRepo != nil {
-		commitsCount, _ := context.GetRefCommitsCount(ctx, ctx.Repo.Repository.ID, git.RefName(ref))
+		commitsCount, _ := context.GetRefCommitsCount(ctx, ctx.Repo.Repository.ID, ctx.Repo.GitRepo, 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/commit.go

@@ -263,7 +263,7 @@ func FileHistory(ctx *context.Context) {
 }
 
 func LoadBranchesAndTags(ctx *context.Context) {
-	response, err := repo_service.LoadBranchesAndTags(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, ctx.Repo.RepoLink, ctx.PathParam("sha"))
+	response, err := repo_service.LoadBranchesAndTags(ctx, ctx.Repo, ctx.PathParam("sha"))
 	if err == nil {
 		ctx.JSON(http.StatusOK, response)
 		return

services/context/repo.go

@@ -163,7 +163,12 @@ 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) {
+// getCommitsCountCacheKey returns cache key used for commits count caching.
+func getCommitsCountCacheKey(contextName string, repoID int64) string {
+	return fmt.Sprintf("commits-count-%d-commit-%s", repoID, contextName)
+}
+
+func GetRefCommitsCount(ctx context.Context, repoID int64, gitRepo *git.Repository, refFullName git.RefName) (int64, error) {
 	// Get the commit count of the branch or the tag
 	switch {
 	case refFullName.IsBranch():
@@ -178,6 +183,14 @@ func GetRefCommitsCount(ctx context.Context, repoID int64, refFullName git.RefNa
 			return 0, err
 		}
 		return tag.NumCommits, nil
+	case refFullName.RefType() == git.RefTypeCommit:
+		return cache.GetInt64(getCommitsCountCacheKey(string(refFullName), repoID), func() (int64, error) {
+			commit, err := gitRepo.GetCommit(string(refFullName))
+			if err != nil {
+				return 0, err
+			}
+			return commit.CommitsCount()
+		})
 	default:
 		return 0, nil
 	}
@@ -188,7 +201,7 @@ func (r *Repository) GetCommitsCount(ctx context.Context) (int64, error) {
 	if r.Commit == nil {
 		return 0, nil
 	}
-	return GetRefCommitsCount(ctx, r.Repository.ID, r.RefFullName)
+	return GetRefCommitsCount(ctx, r.Repository.ID, r.GitRepo, r.RefFullName)
 }
 
 // GetCommitGraphsCount returns cached commit count for current view

services/mirror/mirror_pull.go

@@ -410,7 +410,9 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
 		log.Trace("SyncMirrors [repo: %-v Wiki]: git remote update complete", m.Repo)
 	}
 
-	repo_service.SyncRepoBranchesCommitsCount(ctx, m.Repo)
+	if err := repo_service.SyncRepoBranchesCommitsCount(ctx, m.Repo); err != nil {
+		log.Error("SyncMirrors [repo: %-v]: failed to sync branches commits count: %v", m.Repo, err)
+	}
 
 	m.UpdatedUnix = timeutil.TimeStampNow()
 	return parseRemoteUpdateOutput(output, m.GetRemoteName()), true
@@ -606,8 +608,6 @@ func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, re
 		hasDefault = hasDefault || name == defaultBranchName
 		hasMaster = hasMaster || name == "master"
 		hasMain = hasMain || name == "main"
-
-		// TODO: update branch commits count
 	}
 
 	if len(firstName) > 0 {

services/repository/cache.go

@@ -20,7 +20,7 @@ func CacheRef(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Rep
 	}
 
 	if gitRepo.LastCommitCache == nil {
-		commitsCount, err := context_service.GetRefCommitsCount(ctx, repo.ID, fullRefName)
+		commitsCount, err := context_service.GetRefCommitsCount(ctx, repo.ID, gitRepo, fullRefName)
 		if err != nil {
 			return err
 		}

services/repository/commit.go

@@ -7,9 +7,8 @@ import (
 	"context"
 	"fmt"
 
-	repo_model "code.gitea.io/gitea/models/repo"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/util"
+	gitea_ctx "code.gitea.io/gitea/services/context"
 )
 
 type ContainedLinks struct { // TODO: better name?
@@ -24,32 +23,32 @@ 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, commitSHA string) (*ContainedLinks, error) {
-	containedTags, err := gitRepo.ListOccurrences(ctx, "tag", commitSHA)
+func LoadBranchesAndTags(ctx context.Context, baseRepo *gitea_ctx.Repository, commitSHA string) (*ContainedLinks, error) {
+	containedTags, err := baseRepo.GitRepo.ListOccurrences(ctx, "tag", commitSHA)
 	if err != nil {
 		return nil, fmt.Errorf("encountered a problem while querying %s: %w", "tags", err)
 	}
-	containedBranches, err := gitRepo.ListOccurrences(ctx, "branch", commitSHA)
+	containedBranches, err := baseRepo.GitRepo.ListOccurrences(ctx, "branch", commitSHA)
 	if err != nil {
 		return nil, fmt.Errorf("encountered a problem while querying %s: %w", "branches", err)
 	}
 
 	result := &ContainedLinks{
-		DefaultBranch: repo.DefaultBranch,
+		DefaultBranch: baseRepo.Repository.DefaultBranch,
 		Branches:      make([]*namedLink, 0, len(containedBranches)),
 		Tags:          make([]*namedLink, 0, len(containedTags)),
 	}
 	for _, tag := range containedTags {
 		// TODO: Use a common method to get the link to a branch/tag instead of hard-coding it here
 		result.Tags = append(result.Tags, &namedLink{
 			Name:    tag,
-			WebLink: fmt.Sprintf("%s/src/tag/%s", repoLink, util.PathEscapeSegments(tag)),
+			WebLink: fmt.Sprintf("%s/src/tag/%s", baseRepo.RepoLink, util.PathEscapeSegments(tag)),
 		})
 	}
 	for _, branch := range containedBranches {
 		result.Branches = append(result.Branches, &namedLink{
 			Name:    branch,
-			WebLink: fmt.Sprintf("%s/src/branch/%s", repoLink, util.PathEscapeSegments(branch)),
+			WebLink: fmt.Sprintf("%s/src/branch/%s", baseRepo.RepoLink, util.PathEscapeSegments(branch)),
 		})
 	}
 	return result, nil

services/repository/files/content.go

@@ -168,7 +168,7 @@ func GetContents(ctx context.Context, repo *repo_model.Repository, treePath, ref
 
 	refName := git.RefNameFromObjectTypeAndShortName(refType, ref)
 
-	commitsCount, _ := context_service.GetRefCommitsCount(ctx, repo.ID, refName)
+	commitsCount, _ := context_service.GetRefCommitsCount(ctx, repo.ID, gitRepo, refName)
 
 	err = gitRepo.AddLastCommitCache(commitsCount, repo.FullName(), commitID)
 	if err != nil {