mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-14 11:23:09 +02:00
63dc07fded
By constructing an arg vector manually, we no longer need to quote arguments Mandate that args must be passed when building a command Now you need to provide an args array when building a command. There are a handful of places where we need to deal with a string, such as with user-defined custom commands, and for those we now require that at the callsite they use str.ToArgv to do that. I don't want to provide a method out of the box for it because I want to discourage its use. For some reason we were invoking a command through a shell when amending a commit, and I don't believe we needed to do that as there was nothing user- supplied about the command. So I've switched to using a regular command out- side the shell there
83 lines
2.1 KiB
Go
83 lines
2.1 KiB
Go
package git_commands
|
|
|
|
import (
|
|
"regexp"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/generics/slices"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
|
"github.com/jesseduffield/lazygit/pkg/common"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
)
|
|
|
|
type StashLoader struct {
|
|
*common.Common
|
|
cmd oscommands.ICmdObjBuilder
|
|
}
|
|
|
|
func NewStashLoader(
|
|
common *common.Common,
|
|
cmd oscommands.ICmdObjBuilder,
|
|
) *StashLoader {
|
|
return &StashLoader{
|
|
Common: common,
|
|
cmd: cmd,
|
|
}
|
|
}
|
|
|
|
func (self *StashLoader) GetStashEntries(filterPath string) []*models.StashEntry {
|
|
if filterPath == "" {
|
|
return self.getUnfilteredStashEntries()
|
|
}
|
|
|
|
cmdArgs := NewGitCmd("stash").Arg("list", "--name-only").ToArgv()
|
|
rawString, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
|
|
if err != nil {
|
|
return self.getUnfilteredStashEntries()
|
|
}
|
|
stashEntries := []*models.StashEntry{}
|
|
var currentStashEntry *models.StashEntry
|
|
lines := utils.SplitLines(rawString)
|
|
isAStash := func(line string) bool { return strings.HasPrefix(line, "stash@{") }
|
|
re := regexp.MustCompile(`stash@\{(\d+)\}`)
|
|
|
|
outer:
|
|
for i := 0; i < len(lines); i++ {
|
|
if !isAStash(lines[i]) {
|
|
continue
|
|
}
|
|
match := re.FindStringSubmatch(lines[i])
|
|
idx, err := strconv.Atoi(match[1])
|
|
if err != nil {
|
|
return self.getUnfilteredStashEntries()
|
|
}
|
|
currentStashEntry = self.stashEntryFromLine(lines[i], idx)
|
|
for i+1 < len(lines) && !isAStash(lines[i+1]) {
|
|
i++
|
|
if lines[i] == filterPath {
|
|
stashEntries = append(stashEntries, currentStashEntry)
|
|
continue outer
|
|
}
|
|
}
|
|
}
|
|
return stashEntries
|
|
}
|
|
|
|
func (self *StashLoader) getUnfilteredStashEntries() []*models.StashEntry {
|
|
cmdArgs := NewGitCmd("stash").Arg("list", "-z", "--pretty=%gs").ToArgv()
|
|
|
|
rawString, _ := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
|
|
return slices.MapWithIndex(utils.SplitNul(rawString), func(line string, index int) *models.StashEntry {
|
|
return self.stashEntryFromLine(line, index)
|
|
})
|
|
}
|
|
|
|
func (c *StashLoader) stashEntryFromLine(line string, index int) *models.StashEntry {
|
|
return &models.StashEntry{
|
|
Name: line,
|
|
Index: index,
|
|
}
|
|
}
|