23358bc55d
* Improve get last commit using git log --name-status git log --name-status -c provides information about the diff between a commit and its parents. Using this and adjusting the algorithm to use the first change to a path allows for a much faster generation of commit info. There is a subtle change in the results generated but this will cause the results to more closely match those from elsewhere. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: Lauris BH <lauris@nix.lv>
108 lines
2.7 KiB
Go
108 lines
2.7 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// +build !gogit
|
|
|
|
package git
|
|
|
|
import (
|
|
"bufio"
|
|
"context"
|
|
"path"
|
|
)
|
|
|
|
// LastCommitCache represents a cache to store last commit
|
|
type LastCommitCache struct {
|
|
repoPath string
|
|
ttl func() int64
|
|
repo *Repository
|
|
commitCache map[string]*Commit
|
|
cache Cache
|
|
}
|
|
|
|
// NewLastCommitCache creates a new last commit cache for repo
|
|
func NewLastCommitCache(repoPath string, gitRepo *Repository, ttl func() int64, cache Cache) *LastCommitCache {
|
|
if cache == nil {
|
|
return nil
|
|
}
|
|
return &LastCommitCache{
|
|
repoPath: repoPath,
|
|
repo: gitRepo,
|
|
commitCache: make(map[string]*Commit),
|
|
ttl: ttl,
|
|
cache: cache,
|
|
}
|
|
}
|
|
|
|
// Get get the last commit information by commit id and entry path
|
|
func (c *LastCommitCache) Get(ref, entryPath string, wr WriteCloserError, rd *bufio.Reader) (interface{}, error) {
|
|
v := c.cache.Get(c.getCacheKey(c.repoPath, ref, entryPath))
|
|
if vs, ok := v.(string); ok {
|
|
log("LastCommitCache hit level 1: [%s:%s:%s]", ref, entryPath, vs)
|
|
if commit, ok := c.commitCache[vs]; ok {
|
|
log("LastCommitCache hit level 2: [%s:%s:%s]", ref, entryPath, vs)
|
|
return commit, nil
|
|
}
|
|
id, err := c.repo.ConvertToSHA1(vs)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if _, err := wr.Write([]byte(vs + "\n")); err != nil {
|
|
return nil, err
|
|
}
|
|
commit, err := c.repo.getCommitFromBatchReader(rd, id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
c.commitCache[vs] = commit
|
|
return commit, nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
// CacheCommit will cache the commit from the gitRepository
|
|
func (c *LastCommitCache) CacheCommit(ctx context.Context, commit *Commit) error {
|
|
return c.recursiveCache(ctx, commit, &commit.Tree, "", 1)
|
|
}
|
|
|
|
func (c *LastCommitCache) recursiveCache(ctx context.Context, commit *Commit, tree *Tree, treePath string, 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]*TreeEntry)
|
|
for i, entry := range entries {
|
|
entryPaths[i] = entry.Name()
|
|
entryMap[entry.Name()] = entry
|
|
}
|
|
|
|
commits, err := GetLastCommitForPaths(ctx, commit, treePath, entryPaths)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for entry, entryCommit := range commits {
|
|
if err := c.Put(commit.ID.String(), path.Join(treePath, entry), entryCommit.ID.String()); err != nil {
|
|
return err
|
|
}
|
|
if entryMap[entry].IsDir() {
|
|
subTree, err := tree.SubTree(entry)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := c.recursiveCache(ctx, commit, subTree, entry, level-1); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|