Make Args method take spreaded slice

Author: jesseduffield

pkg/commands/git_commands/commit_file_loader.go

@@ -25,14 +25,9 @@ func NewCommitFileLoader(common *common.Common, cmd oscommands.ICmdObjBuilder) *
 // GetFilesInDiff get the specified commit files
 func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse bool) ([]*models.CommitFile, error) {
 cmdStr := NewGitCmd("diff").
-Arg("--submodule").
-Arg("--no-ext-diff").
-Arg("--name-status").
-Arg("-z").
-Arg("--no-renames").
+Args("--submodule", "--no-ext-diff", "--name-status", "-z", "--no-renames").
 ArgIf(reverse, "-R").
-Arg(from).
-Arg(to).
+Args(from, to).
 ToString()
 
 filenames, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()

pkg/commands/git_commands/commit_loader.go

@@ -203,11 +203,8 @@ func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode
 cmdObj := self.cmd.New(
 NewGitCmd("show").
 Config("log.showSignature=false").
-Arg("--no-patch").
-Arg("--oneline").
-Arg(strings.Join(commitShas, " ")).
-Arg(prettyFormat).
-Arg("--abbrev=20").
+Args("--no-patch", "--oneline", "--abbrev=20", prettyFormat).
+Args(commitShas...).
 ToString(),
 ).DontLog()
 
@@ -380,8 +377,7 @@ func (self *CommitLoader) getMergeBase(refName string) string {
 
 output, err := self.cmd.New(
 NewGitCmd("merge-base").
-Arg(self.cmd.Quote(refName)).
-Arg(*self.quotedMainBranches).
+Args(self.cmd.Quote(refName), *self.quotedMainBranches).
 ToString(),
 ).DontLog().RunWithOutput()
 if err != nil {
@@ -399,7 +395,7 @@ func (self *CommitLoader) getExistingMainBranches() string {
 func(branchName string, _ int) (string, bool) {
 quotedRef := self.cmd.Quote("refs/heads/" + branchName)
 if err := self.cmd.New(
-NewGitCmd("rev-parse").Arg("--verify").Arg("--quiet").Arg(quotedRef).ToString(),
+NewGitCmd("rev-parse").Args("--verify", "--quiet", quotedRef).ToString(),
 ).DontLog().Run(); err != nil {
 return "", false
 }
@@ -423,8 +419,10 @@ func (self *CommitLoader) getFirstPushedCommit(refName string) (string, error) {
 output, err := self.cmd.
 New(
 NewGitCmd("merge-base").
-Arg(self.cmd.Quote(refName)).
-Arg(self.cmd.Quote(strings.TrimPrefix(refName, "refs/heads/")) + "@{u}").
+Args(
+self.cmd.Quote(refName),
+self.cmd.Quote(strings.TrimPrefix(refName, "refs/heads/"))+"@{u}",
+).
 ToString(),
 ).
 DontLog().

pkg/commands/git_commands/git_command_builder.go

@@ -38,7 +38,7 @@ func (self *GitCommandBuilder) ArgIfElse(isTrue bool, onTrue string, onFalse str
 }
 }
 
-func (self *GitCommandBuilder) Args(args []string) *GitCommandBuilder {
+func (self *GitCommandBuilder) Args(args ...string) *GitCommandBuilder {
 for _, arg := range args {
 self.Arg(arg)
 }

pkg/commands/git_commands/git_command_builder_test.go

@@ -0,0 +1,56 @@
+package git_commands
+
+import (
+"testing"
+
+"github.com/stretchr/testify/assert"
+)
+
+func TestGitCommandBuilder(t *testing.T) {
+scenarios := []struct {
+input string
+expected string
+}{
+{
+input: NewGitCmd("push").
+Arg("--force-with-lease").
+Arg("--set-upstream").
+Arg("origin").
+Arg("master").
+ToString(),
+expected: "git push --force-with-lease --set-upstream origin master",
+},
+{
+input: NewGitCmd("push").ArgIf(true, "--test").ToString(),
+expected: "git push --test",
+},
+{
+input: NewGitCmd("push").ArgIf(false, "--test").ToString(),
+expected: "git push",
+},
+{
+input: NewGitCmd("push").ArgIfElse(true, "-b", "-a").ToString(),
+expected: "git push -b",
+},
+{
+input: NewGitCmd("push").ArgIfElse(false, "-a", "-b").ToString(),
+expected: "git push -b",
+},
+{
+input: NewGitCmd("push").Args("-a", "-b").ToString(),
+expected: "git push -a -b",
+},
+{
+input: NewGitCmd("push").Config("user.name=foo").Config("user.email=bar").ToString(),
+expected: "git -c user.email=bar -c user.name=foo push",
+},
+{
+input: NewGitCmd("push").RepoPath("a/b/c").ToString(),
+expected: "git -C a/b/c push",
+},
+}
+
+for _, s := range scenarios {
+assert.Equal(t, s.input, s.expected)
+}
+}

pkg/commands/git_commands/submodule.go

@@ -83,66 +83,51 @@ func (self *SubmoduleCommands) Stash(submodule *models.SubmoduleConfig) error {
 
 cmdStr := NewGitCmd("stash").
 RepoPath(self.cmd.Quote(submodule.Path)).
-Arg("--include-untracked").
+Args("--include-untracked").
 ToString()
 
 return self.cmd.New(cmdStr).Run()
 }
 
 func (self *SubmoduleCommands) Reset(submodule *models.SubmoduleConfig) error {
 cmdStr := NewGitCmd("submodule").
-Arg("update").
-Arg("--init").
-Arg("--force").
-Arg("--").
-Arg(self.cmd.Quote(submodule.Path)).
+Args("update", "--init", "--force", "--", self.cmd.Quote(submodule.Path)).
 ToString()
 
 return self.cmd.New(cmdStr).Run()
 }
 
 func (self *SubmoduleCommands) UpdateAll() error {
 // not doing an --init here because the user probably doesn't want that
-cmdStr := NewGitCmd("submodule").
-Arg("update").
-Arg("--force").
-ToString()
+cmdStr := NewGitCmd("submodule").Args("update", "--force").ToString()
 
 return self.cmd.New(cmdStr).Run()
 }
 
 func (self *SubmoduleCommands) Delete(submodule *models.SubmoduleConfig) error {
 // based on https://gist.github.com/myusuf3/7f645819ded92bda6677
 
-deinitCmdStr := NewGitCmd("submodule").
-Arg("deinit").
-Arg("--force").
-Arg("--").
-Arg(self.cmd.Quote(submodule.Path)).
-ToString()
-
-if err := self.cmd.New(deinitCmdStr).Run(); err != nil {
+if err := self.cmd.New(
+NewGitCmd("submodule").
+Args("deinit", "--force", "--", self.cmd.Quote(submodule.Path)).ToString(),
+).Run(); err != nil {
 if !strings.Contains(err.Error(), "did not match any file(s) known to git") {
 return err
 }
 
-removeFileCmd := NewGitCmd("config").
-Arg("--file").
-Arg(".gitmodules").
-Arg("--remove-section").
-Arg("submodule." + self.cmd.Quote(submodule.Path)).
-ToString()
-
-removeCmd := NewGitCmd("config").
-Arg("--remove-section").
-Arg("submodule." + self.cmd.Quote(submodule.Path)).
-ToString()
-
-if err := self.cmd.New(removeFileCmd).Run(); err != nil {
+if err := self.cmd.New(
+NewGitCmd("config").
+Args("--file", ".gitmodules", "--remove-section", "submodule."+self.cmd.Quote(submodule.Path)).
+ToString(),
+).Run(); err != nil {
 return err
 }
 
-if err := self.cmd.New(removeCmd).Run(); err != nil {
+if err := self.cmd.New(
+NewGitCmd("config").
+Args("--remove-section", "submodule."+self.cmd.Quote(submodule.Path)).
+ToString(),
+).Run(); err != nil {
 return err
 }
 }