1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00

Extract a function fetchCommandBuilder

This commit is contained in:
Stefan Haller
2024-01-02 21:07:44 +01:00
parent 6255728e63
commit 5b91cd0cc8

View File

@ -49,10 +49,13 @@ func (self *SyncCommands) Push(task gocui.Task, opts PushOpts) error {
return cmdObj.Run() return cmdObj.Run()
} }
func (self *SyncCommands) fetchCommandBuilder(fetchAll bool) *GitCommandBuilder {
return NewGitCmd("fetch").
ArgIf(fetchAll, "--all")
}
func (self *SyncCommands) FetchCmdObj(task gocui.Task) oscommands.ICmdObj { func (self *SyncCommands) FetchCmdObj(task gocui.Task) oscommands.ICmdObj {
cmdArgs := NewGitCmd("fetch"). cmdArgs := self.fetchCommandBuilder(self.UserConfig.Git.FetchAll).ToArgv()
ArgIf(self.UserConfig.Git.FetchAll, "--all").
ToArgv()
cmdObj := self.cmd.New(cmdArgs) cmdObj := self.cmd.New(cmdArgs)
cmdObj.PromptOnCredentialRequest(task) cmdObj.PromptOnCredentialRequest(task)
@ -64,9 +67,7 @@ func (self *SyncCommands) Fetch(task gocui.Task) error {
} }
func (self *SyncCommands) FetchBackgroundCmdObj() oscommands.ICmdObj { func (self *SyncCommands) FetchBackgroundCmdObj() oscommands.ICmdObj {
cmdArgs := NewGitCmd("fetch"). cmdArgs := self.fetchCommandBuilder(self.UserConfig.Git.FetchAll).ToArgv()
ArgIf(self.UserConfig.Git.FetchAll, "--all").
ToArgv()
cmdObj := self.cmd.New(cmdArgs) cmdObj := self.cmd.New(cmdArgs)
cmdObj.DontLog().FailOnCredentialRequest() cmdObj.DontLog().FailOnCredentialRequest()
@ -104,7 +105,7 @@ func (self *SyncCommands) FastForward(
remoteName string, remoteName string,
remoteBranchName string, remoteBranchName string,
) error { ) error {
cmdArgs := NewGitCmd("fetch"). cmdArgs := self.fetchCommandBuilder(false).
Arg(remoteName). Arg(remoteName).
Arg(remoteBranchName + ":" + branchName). Arg(remoteBranchName + ":" + branchName).
ToArgv() ToArgv()
@ -113,7 +114,7 @@ func (self *SyncCommands) FastForward(
} }
func (self *SyncCommands) FetchRemote(task gocui.Task, remoteName string) error { func (self *SyncCommands) FetchRemote(task gocui.Task, remoteName string) error {
cmdArgs := NewGitCmd("fetch"). cmdArgs := self.fetchCommandBuilder(false).
Arg(remoteName). Arg(remoteName).
ToArgv() ToArgv()