mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-14 11:23:09 +02:00
e33fe37a99
We've been sometimes using lo and sometimes using my slices package, and we need to pick one for consistency. Lo is more extensive and better maintained so we're going with that. My slices package was a superset of go's own slices package so in some places I've just used the official one (the methods were just wrappers anyway). I've also moved the remaining methods into the utils package.
61 lines
1.6 KiB
Go
61 lines
1.6 KiB
Go
package git_commands
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
|
"github.com/jesseduffield/lazygit/pkg/common"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
type CommitFileLoader struct {
|
|
*common.Common
|
|
cmd oscommands.ICmdObjBuilder
|
|
}
|
|
|
|
func NewCommitFileLoader(common *common.Common, cmd oscommands.ICmdObjBuilder) *CommitFileLoader {
|
|
return &CommitFileLoader{
|
|
Common: common,
|
|
cmd: cmd,
|
|
}
|
|
}
|
|
|
|
// GetFilesInDiff get the specified commit files
|
|
func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse bool) ([]*models.CommitFile, error) {
|
|
cmdArgs := NewGitCmd("diff").
|
|
Arg("--submodule").
|
|
Arg("--no-ext-diff").
|
|
Arg("--name-status").
|
|
Arg("-z").
|
|
Arg("--no-renames").
|
|
ArgIf(reverse, "-R").
|
|
Arg(from).
|
|
Arg(to).
|
|
ToArgv()
|
|
|
|
filenames, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return getCommitFilesFromFilenames(filenames), nil
|
|
}
|
|
|
|
// filenames string is something like "MM\x00file1\x00MU\x00file2\x00AA\x00file3\x00"
|
|
// so we need to split it by the null character and then map each status-name pair to a commit file
|
|
func getCommitFilesFromFilenames(filenames string) []*models.CommitFile {
|
|
lines := strings.Split(strings.TrimRight(filenames, "\x00"), "\x00")
|
|
if len(lines) == 1 {
|
|
return []*models.CommitFile{}
|
|
}
|
|
|
|
// typical result looks like 'A my_file' meaning my_file was added
|
|
return lo.Map(lo.Chunk(lines, 2), func(chunk []string, _ int) *models.CommitFile {
|
|
return &models.CommitFile{
|
|
ChangeStatus: chunk[0],
|
|
Name: chunk[1],
|
|
}
|
|
})
|
|
}
|