mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-10 04:07:18 +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
61 lines
1.6 KiB
Go
61 lines
1.6 KiB
Go
package custom_commands
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var MenuFromCommandsOutput = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Using prompt response in menuFromCommand entries",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
EmptyCommit("foo").
|
|
NewBranch("feature/foo").
|
|
EmptyCommit("bar").
|
|
NewBranch("feature/bar").
|
|
EmptyCommit("baz")
|
|
},
|
|
SetupConfig: func(cfg *config.AppConfig) {
|
|
cfg.UserConfig.CustomCommands = []config.CustomCommand{
|
|
{
|
|
Key: "a",
|
|
Context: "localBranches",
|
|
Command: "git checkout {{ index .PromptResponses 1 }}",
|
|
Prompts: []config.CustomCommandPrompt{
|
|
{
|
|
Type: "input",
|
|
Title: "Which git command do you want to run?",
|
|
InitialValue: "branch",
|
|
},
|
|
{
|
|
Type: "menuFromCommand",
|
|
Title: "Branch:",
|
|
Command: `git {{ index .PromptResponses 0 }} --format='%(refname:short)'`,
|
|
Filter: "(?P<branch>.*)",
|
|
ValueFormat: `{{ .branch }}`,
|
|
LabelFormat: `{{ .branch | green }}`,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Git().CurrentBranchName("feature/bar")
|
|
|
|
t.Views().Branches().
|
|
Focus().
|
|
Press("a")
|
|
|
|
t.ExpectPopup().Prompt().
|
|
Title(Equals("Which git command do you want to run?")).
|
|
InitialText(Equals("branch")).
|
|
Confirm()
|
|
|
|
t.ExpectPopup().Menu().Title(Equals("Branch:")).Select(Equals("master")).Confirm()
|
|
|
|
t.Git().CurrentBranchName("master")
|
|
},
|
|
})
|