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
62 lines
1.4 KiB
Go
62 lines
1.4 KiB
Go
package git_commands
|
|
|
|
import (
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/go-errors/errors"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
|
)
|
|
|
|
type FlowCommands struct {
|
|
*GitCommon
|
|
}
|
|
|
|
func NewFlowCommands(
|
|
gitCommon *GitCommon,
|
|
) *FlowCommands {
|
|
return &FlowCommands{
|
|
GitCommon: gitCommon,
|
|
}
|
|
}
|
|
|
|
func (self *FlowCommands) GitFlowEnabled() bool {
|
|
return self.config.GetGitFlowPrefixes() != ""
|
|
}
|
|
|
|
func (self *FlowCommands) FinishCmdObj(branchName string) (oscommands.ICmdObj, error) {
|
|
prefixes := self.config.GetGitFlowPrefixes()
|
|
|
|
// need to find out what kind of branch this is
|
|
prefix := strings.SplitAfterN(branchName, "/", 2)[0]
|
|
suffix := strings.Replace(branchName, prefix, "", 1)
|
|
|
|
branchType := ""
|
|
for _, line := range strings.Split(strings.TrimSpace(prefixes), "\n") {
|
|
if strings.HasPrefix(line, "gitflow.prefix.") && strings.HasSuffix(line, prefix) {
|
|
|
|
regex := regexp.MustCompile("gitflow.prefix.([^ ]*) .*")
|
|
matches := regex.FindAllStringSubmatch(line, 1)
|
|
|
|
if len(matches) > 0 && len(matches[0]) > 1 {
|
|
branchType = matches[0][1]
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
if branchType == "" {
|
|
return nil, errors.New(self.Tr.NotAGitFlowBranch)
|
|
}
|
|
|
|
cmdArgs := NewGitCmd("flow").Arg(branchType, "finish", suffix).ToArgv()
|
|
|
|
return self.cmd.New(cmdArgs), nil
|
|
}
|
|
|
|
func (self *FlowCommands) StartCmdObj(branchType string, name string) oscommands.ICmdObj {
|
|
cmdArgs := NewGitCmd("flow").Arg(branchType, "start", name).ToArgv()
|
|
|
|
return self.cmd.New(cmdArgs)
|
|
}
|