mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-12 11:15:00 +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
156 lines
4.3 KiB
Go
156 lines
4.3 KiB
Go
package git_commands
|
|
|
|
import (
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/go-errors/errors"
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
)
|
|
|
|
type FileCommands struct {
|
|
*GitCommon
|
|
}
|
|
|
|
func NewFileCommands(gitCommon *GitCommon) *FileCommands {
|
|
return &FileCommands{
|
|
GitCommon: gitCommon,
|
|
}
|
|
}
|
|
|
|
// Cat obtains the content of a file
|
|
func (self *FileCommands) Cat(fileName string) (string, error) {
|
|
buf, err := os.ReadFile(fileName)
|
|
if err != nil {
|
|
return "", nil
|
|
}
|
|
return string(buf), nil
|
|
}
|
|
|
|
func (self *FileCommands) GetEditCmdStrLegacy(filename string, lineNumber int) (string, error) {
|
|
editor := self.UserConfig.OS.EditCommand
|
|
|
|
if editor == "" {
|
|
editor = self.config.GetCoreEditor()
|
|
}
|
|
if editor == "" {
|
|
editor = self.os.Getenv("GIT_EDITOR")
|
|
}
|
|
if editor == "" {
|
|
editor = self.os.Getenv("VISUAL")
|
|
}
|
|
if editor == "" {
|
|
editor = self.os.Getenv("EDITOR")
|
|
}
|
|
if editor == "" {
|
|
if err := self.cmd.New([]string{"which", "vi"}).DontLog().Run(); err == nil {
|
|
editor = "vi"
|
|
}
|
|
}
|
|
if editor == "" {
|
|
return "", errors.New("No editor defined in config file, $GIT_EDITOR, $VISUAL, $EDITOR, or git config")
|
|
}
|
|
|
|
templateValues := map[string]string{
|
|
"editor": editor,
|
|
"filename": self.cmd.Quote(filename),
|
|
"line": strconv.Itoa(lineNumber),
|
|
}
|
|
|
|
editCmdTemplate := self.UserConfig.OS.EditCommandTemplate
|
|
if len(editCmdTemplate) == 0 {
|
|
switch editor {
|
|
case "emacs", "nano", "vi", "vim", "nvim":
|
|
editCmdTemplate = "{{editor}} +{{line}} -- {{filename}}"
|
|
case "subl":
|
|
editCmdTemplate = "{{editor}} -- {{filename}}:{{line}}"
|
|
case "code":
|
|
editCmdTemplate = "{{editor}} -r --goto -- {{filename}}:{{line}}"
|
|
default:
|
|
editCmdTemplate = "{{editor}} -- {{filename}}"
|
|
}
|
|
}
|
|
return utils.ResolvePlaceholderString(editCmdTemplate, templateValues), nil
|
|
}
|
|
|
|
func (self *FileCommands) GetEditCmdStr(filename string) (string, bool) {
|
|
// Legacy support for old config; to be removed at some point
|
|
if self.UserConfig.OS.Edit == "" && self.UserConfig.OS.EditCommandTemplate != "" {
|
|
if cmdStr, err := self.GetEditCmdStrLegacy(filename, 1); err == nil {
|
|
return cmdStr, true
|
|
}
|
|
}
|
|
|
|
template, editInTerminal := config.GetEditTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
|
|
|
|
templateValues := map[string]string{
|
|
"filename": self.cmd.Quote(filename),
|
|
}
|
|
|
|
cmdStr := utils.ResolvePlaceholderString(template, templateValues)
|
|
return cmdStr, editInTerminal
|
|
}
|
|
|
|
func (self *FileCommands) GetEditAtLineCmdStr(filename string, lineNumber int) (string, bool) {
|
|
// Legacy support for old config; to be removed at some point
|
|
if self.UserConfig.OS.EditAtLine == "" && self.UserConfig.OS.EditCommandTemplate != "" {
|
|
if cmdStr, err := self.GetEditCmdStrLegacy(filename, lineNumber); err == nil {
|
|
return cmdStr, true
|
|
}
|
|
}
|
|
|
|
template, editInTerminal := config.GetEditAtLineTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
|
|
|
|
templateValues := map[string]string{
|
|
"filename": self.cmd.Quote(filename),
|
|
"line": strconv.Itoa(lineNumber),
|
|
}
|
|
|
|
cmdStr := utils.ResolvePlaceholderString(template, templateValues)
|
|
return cmdStr, editInTerminal
|
|
}
|
|
|
|
func (self *FileCommands) GetEditAtLineAndWaitCmdStr(filename string, lineNumber int) string {
|
|
// Legacy support for old config; to be removed at some point
|
|
if self.UserConfig.OS.EditAtLineAndWait == "" && self.UserConfig.OS.EditCommandTemplate != "" {
|
|
if cmdStr, err := self.GetEditCmdStrLegacy(filename, lineNumber); err == nil {
|
|
return cmdStr
|
|
}
|
|
}
|
|
|
|
template := config.GetEditAtLineAndWaitTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
|
|
|
|
templateValues := map[string]string{
|
|
"filename": self.cmd.Quote(filename),
|
|
"line": strconv.Itoa(lineNumber),
|
|
}
|
|
|
|
cmdStr := utils.ResolvePlaceholderString(template, templateValues)
|
|
return cmdStr
|
|
}
|
|
|
|
func (self *FileCommands) guessDefaultEditor() string {
|
|
// Try to query a few places where editors get configured
|
|
editor := self.config.GetCoreEditor()
|
|
if editor == "" {
|
|
editor = self.os.Getenv("GIT_EDITOR")
|
|
}
|
|
if editor == "" {
|
|
editor = self.os.Getenv("VISUAL")
|
|
}
|
|
if editor == "" {
|
|
editor = self.os.Getenv("EDITOR")
|
|
}
|
|
|
|
if editor != "" {
|
|
// At this point, it might be more than just the name of the editor;
|
|
// e.g. it might be "code -w" or "vim -u myvim.rc". So assume that
|
|
// everything up to the first space is the editor name.
|
|
editor = strings.Split(editor, " ")[0]
|
|
}
|
|
|
|
return editor
|
|
}
|