mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 18:24:17 -05:00
Stefan HallerandClaude Fable 5
568a4276d7
The cached git config runs its `git config` reads through raw exec.Command calls, outside the pinned git command builder, so they followed the process working directory. A cache miss on a stale instance — one still in use by a refresh that crossed a repo switch — would therefore read the new repo's local config while computing data for the old one. Give the cache a directory, set once by NewGitCommand right after it determines the repo paths (the object is created fresh for every repo switch, so no cross-repo cache invalidation is needed), and run every config command there. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
122 lines
3.0 KiB
Go
122 lines
3.0 KiB
Go
package git_config
|
|
|
|
import (
|
|
"os/exec"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
type IGitConfig interface {
|
|
// this is for when you want to pass 'mykey' (it calls `git config --get --null mykey` under the hood)
|
|
Get(string) string
|
|
// this is for when you want to pass '--local --get-regexp mykey'
|
|
GetGeneral(string) string
|
|
// this is for when you want to pass 'mykey' and check if the result is truthy
|
|
GetBool(string) bool
|
|
|
|
// SetDir pins the config commands to the given repo directory, so that
|
|
// they keep reading that repo's local config even if the process working
|
|
// directory changes later (i.e. the user switches repos while this
|
|
// instance is still in use by in-flight work). Called once, before the
|
|
// first read.
|
|
SetDir(string)
|
|
|
|
DropCache()
|
|
}
|
|
|
|
type CachedGitConfig struct {
|
|
cache map[string]string
|
|
dir string
|
|
runGitConfigCmd func(*exec.Cmd) (string, error)
|
|
log *logrus.Entry
|
|
mutex sync.Mutex
|
|
}
|
|
|
|
func NewStdCachedGitConfig(log *logrus.Entry) *CachedGitConfig {
|
|
return NewCachedGitConfig(runGitConfigCmd, log)
|
|
}
|
|
|
|
func NewCachedGitConfig(runGitConfigCmd func(*exec.Cmd) (string, error), log *logrus.Entry) *CachedGitConfig {
|
|
return &CachedGitConfig{
|
|
cache: make(map[string]string),
|
|
runGitConfigCmd: runGitConfigCmd,
|
|
log: log,
|
|
mutex: sync.Mutex{},
|
|
}
|
|
}
|
|
|
|
func (self *CachedGitConfig) SetDir(dir string) {
|
|
self.mutex.Lock()
|
|
defer self.mutex.Unlock()
|
|
|
|
self.dir = dir
|
|
}
|
|
|
|
func (self *CachedGitConfig) Get(key string) string {
|
|
self.mutex.Lock()
|
|
defer self.mutex.Unlock()
|
|
|
|
if value, ok := self.cache[key]; ok {
|
|
self.log.Debug("using cache for key " + key)
|
|
return value
|
|
}
|
|
|
|
value := self.getAux(key)
|
|
self.cache[key] = value
|
|
return value
|
|
}
|
|
|
|
func (self *CachedGitConfig) GetGeneral(args string) string {
|
|
self.mutex.Lock()
|
|
defer self.mutex.Unlock()
|
|
|
|
if value, ok := self.cache[args]; ok {
|
|
self.log.Debug("using cache for args " + args)
|
|
return value
|
|
}
|
|
|
|
value := self.getGeneralAux(args)
|
|
self.cache[args] = value
|
|
return value
|
|
}
|
|
|
|
func (self *CachedGitConfig) getGeneralAux(args string) string {
|
|
cmd := getGitConfigGeneralCmd(args)
|
|
cmd.Dir = self.dir
|
|
value, err := self.runGitConfigCmd(cmd)
|
|
if err != nil {
|
|
self.log.Debugf("Error getting git config value for args: %s. Error: %v", args, err.Error())
|
|
return ""
|
|
}
|
|
return strings.TrimSpace(value)
|
|
}
|
|
|
|
func (self *CachedGitConfig) getAux(key string) string {
|
|
cmd := getGitConfigCmd(key)
|
|
cmd.Dir = self.dir
|
|
value, err := self.runGitConfigCmd(cmd)
|
|
if err != nil {
|
|
self.log.Debugf("Error getting git config value for key: %s. Error: %v", key, err.Error())
|
|
return ""
|
|
}
|
|
return strings.TrimSpace(value)
|
|
}
|
|
|
|
func (self *CachedGitConfig) GetBool(key string) bool {
|
|
return isTruthy(self.Get(key))
|
|
}
|
|
|
|
func isTruthy(value string) bool {
|
|
lcValue := strings.ToLower(value)
|
|
return lcValue == "true" || lcValue == "1" || lcValue == "yes" || lcValue == "on"
|
|
}
|
|
|
|
func (self *CachedGitConfig) DropCache() {
|
|
self.mutex.Lock()
|
|
defer self.mutex.Unlock()
|
|
|
|
self.cache = make(map[string]string)
|
|
}
|