aboutsummaryrefslogtreecommitdiffstats
path: root/modules/repository/cache.go
diff options
context:
space:
mode:
Diffstat (limited to 'modules/repository/cache.go')
-rw-r--r--modules/repository/cache.go54
1 files changed, 2 insertions, 52 deletions
diff --git a/modules/repository/cache.go b/modules/repository/cache.go
index 508e5bec0b..0852771a55 100644
--- a/modules/repository/cache.go
+++ b/modules/repository/cache.go
@@ -5,57 +5,14 @@
package repository
import (
- "path"
"strings"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/cache"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
-
- cgobject "github.com/go-git/go-git/v5/plumbing/object/commitgraph"
)
-func recusiveCache(gitRepo *git.Repository, c cgobject.CommitNode, tree *git.Tree, treePath string, ca *cache.LastCommitCache, level int) error {
- if level == 0 {
- return nil
- }
-
- entries, err := tree.ListEntries()
- if err != nil {
- return err
- }
-
- entryPaths := make([]string, len(entries))
- entryMap := make(map[string]*git.TreeEntry)
- for i, entry := range entries {
- entryPaths[i] = entry.Name()
- entryMap[entry.Name()] = entry
- }
-
- commits, err := git.GetLastCommitForPaths(c, treePath, entryPaths)
- if err != nil {
- return err
- }
-
- for entry, cm := range commits {
- if err := ca.Put(c.ID().String(), path.Join(treePath, entry), cm.ID().String()); err != nil {
- return err
- }
- if entryMap[entry].IsDir() {
- subTree, err := tree.SubTree(entry)
- if err != nil {
- return err
- }
- if err := recusiveCache(gitRepo, c, subTree, entry, ca, level-1); err != nil {
- return err
- }
- }
- }
-
- return nil
-}
-
func getRefName(fullRefName string) string {
if strings.HasPrefix(fullRefName, git.TagPrefix) {
return fullRefName[len(git.TagPrefix):]
@@ -84,14 +41,7 @@ func CacheRef(repo *models.Repository, gitRepo *git.Repository, fullRefName stri
return nil
}
- commitNodeIndex, _ := gitRepo.CommitNodeIndex()
-
- c, err := commitNodeIndex.Get(commit.ID)
- if err != nil {
- return err
- }
-
- ca := cache.NewLastCommitCache(repo.FullName(), gitRepo, int64(setting.CacheService.LastCommit.TTL.Seconds()))
+ commitCache := git.NewLastCommitCache(repo.FullName(), gitRepo, int64(setting.CacheService.LastCommit.TTL.Seconds()), cache.GetCache())
- return recusiveCache(gitRepo, c, &commit.Tree, "", ca, 1)
+ return commitCache.CacheCommit(commit)
}