mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-23 21:51:07 +02:00
The global counter approach is easy to understand but it's brittle and depends on implicit behaviour that is not very discoverable. With a global counter, if any goroutine accidentally decrements the counter twice, we'll think lazygit is idle when it's actually busy. Likewise if a goroutine accidentally increments the counter twice we'll think lazygit is busy when it's actually idle. With the new approach we have a map of tasks where each task can either be busy or not. We create a new task and add it to the map when we spawn a worker goroutine (among other things) and we remove it once the task is done. The task can also be paused and continued for situations where we switch back and forth between running a program and asking for user input. In order for this to work with `git push` (and other commands that require credentials) we need to obtain the task from gocui when we create the worker goroutine, and then pass it along to the commands package to pause/continue the task as required. This is MUCH more discoverable than the old approach which just decremented and incremented the global counter from within the commands package, but it's at the cost of expanding some function signatures (arguably a good thing). Likewise, whenever you want to call WithWaitingStatus or WithLoaderPanel the callback will now have access to the task for pausing/ continuing. We only need to actually make use of this functionality in a couple of places so it's a high price to pay, but I don't know if I want to introduce a WithWaitingStatusTask and WithLoaderPanelTask function (open to suggestions).
218 lines
5.8 KiB
Go
218 lines
5.8 KiB
Go
package oscommands
|
|
|
|
import (
|
|
"os/exec"
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/gocui"
|
|
"github.com/samber/lo"
|
|
"github.com/sasha-s/go-deadlock"
|
|
)
|
|
|
|
// A command object is a general way to represent a command to be run on the
|
|
// command line.
|
|
type ICmdObj interface {
|
|
GetCmd() *exec.Cmd
|
|
// outputs string representation of command. Note that if the command was built
|
|
// using NewFromArgs, the output won't be quite the same as what you would type
|
|
// into a terminal e.g. 'sh -c git commit' as opposed to 'sh -c "git commit"'
|
|
ToString() string
|
|
|
|
// outputs args vector e.g. ["git", "commit", "-m", "my message"]
|
|
Args() []string
|
|
|
|
AddEnvVars(...string) ICmdObj
|
|
GetEnvVars() []string
|
|
|
|
// runs the command and returns an error if any
|
|
Run() error
|
|
// runs the command and returns the output as a string, and an error if any
|
|
RunWithOutput() (string, error)
|
|
// runs the command and returns stdout and stderr as a string, and an error if any
|
|
RunWithOutputs() (string, string, error)
|
|
// runs the command and runs a callback function on each line of the output. If the callback returns true for the boolean value, we kill the process and return.
|
|
RunAndProcessLines(onLine func(line string) (bool, error)) error
|
|
|
|
// Be calling DontLog(), we're saying that once we call Run(), we don't want to
|
|
// log the command in the UI (it'll still be logged in the log file). The general rule
|
|
// is that if a command doesn't change the git state (e.g. read commands like `git diff`)
|
|
// then we don't want to log it. If we are changing something (e.g. `git add .`) then
|
|
// we do. The only exception is if we're running a command in the background periodically
|
|
// like `git fetch`, which technically does mutate stuff but isn't something we need
|
|
// to notify the user about.
|
|
DontLog() ICmdObj
|
|
|
|
// This returns false if DontLog() was called
|
|
ShouldLog() bool
|
|
|
|
// when you call this, then call Run(), we'll stream the output to the cmdWriter (i.e. the command log panel)
|
|
StreamOutput() ICmdObj
|
|
// returns true if StreamOutput() was called
|
|
ShouldStreamOutput() bool
|
|
|
|
// if you call this before ShouldStreamOutput we'll consider an error with no
|
|
// stderr content as a non-error. Not yet supported for Run or RunWithOutput (
|
|
// but adding support is trivial)
|
|
IgnoreEmptyError() ICmdObj
|
|
// returns true if IgnoreEmptyError() was called
|
|
ShouldIgnoreEmptyError() bool
|
|
|
|
PromptOnCredentialRequest(task *gocui.Task) ICmdObj
|
|
FailOnCredentialRequest() ICmdObj
|
|
|
|
WithMutex(mutex *deadlock.Mutex) ICmdObj
|
|
Mutex() *deadlock.Mutex
|
|
|
|
GetCredentialStrategy() CredentialStrategy
|
|
GetTask() *gocui.Task
|
|
}
|
|
|
|
type CmdObj struct {
|
|
// the secureexec package will swap out the first arg with the full path to the binary,
|
|
// so we store these args separately so that ToString() will output the original
|
|
args []string
|
|
|
|
cmd *exec.Cmd
|
|
|
|
runner ICmdObjRunner
|
|
|
|
// see DontLog()
|
|
dontLog bool
|
|
|
|
// see StreamOutput()
|
|
streamOutput bool
|
|
|
|
// see IgnoreEmptyError()
|
|
ignoreEmptyError bool
|
|
|
|
// if set to true, it means we might be asked to enter a username/password by this command.
|
|
credentialStrategy CredentialStrategy
|
|
task *gocui.Task
|
|
|
|
// can be set so that we don't run certain commands simultaneously
|
|
mutex *deadlock.Mutex
|
|
}
|
|
|
|
type CredentialStrategy int
|
|
|
|
const (
|
|
// do not expect a credential request. If we end up getting one
|
|
// we'll be in trouble because the command will hang indefinitely
|
|
NONE CredentialStrategy = iota
|
|
// expect a credential request and if we get one, prompt the user to enter their username/password
|
|
PROMPT
|
|
// in this case we will check for a credential request (i.e. the command pauses to ask for
|
|
// username/password) and if we get one, we just submit a newline, forcing the
|
|
// command to fail. We use this e.g. for a background `git fetch` to prevent it
|
|
// from hanging indefinitely.
|
|
FAIL
|
|
)
|
|
|
|
var _ ICmdObj = &CmdObj{}
|
|
|
|
func (self *CmdObj) GetCmd() *exec.Cmd {
|
|
return self.cmd
|
|
}
|
|
|
|
func (self *CmdObj) ToString() string {
|
|
// if a given arg contains a space, we need to wrap it in quotes
|
|
quotedArgs := lo.Map(self.args, func(arg string, _ int) string {
|
|
if strings.Contains(arg, " ") {
|
|
return `"` + arg + `"`
|
|
}
|
|
return arg
|
|
})
|
|
|
|
return strings.Join(quotedArgs, " ")
|
|
}
|
|
|
|
func (self *CmdObj) Args() []string {
|
|
return self.args
|
|
}
|
|
|
|
func (self *CmdObj) AddEnvVars(vars ...string) ICmdObj {
|
|
self.cmd.Env = append(self.cmd.Env, vars...)
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *CmdObj) GetEnvVars() []string {
|
|
return self.cmd.Env
|
|
}
|
|
|
|
func (self *CmdObj) DontLog() ICmdObj {
|
|
self.dontLog = true
|
|
return self
|
|
}
|
|
|
|
func (self *CmdObj) ShouldLog() bool {
|
|
return !self.dontLog
|
|
}
|
|
|
|
func (self *CmdObj) StreamOutput() ICmdObj {
|
|
self.streamOutput = true
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *CmdObj) ShouldStreamOutput() bool {
|
|
return self.streamOutput
|
|
}
|
|
|
|
func (self *CmdObj) IgnoreEmptyError() ICmdObj {
|
|
self.ignoreEmptyError = true
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *CmdObj) Mutex() *deadlock.Mutex {
|
|
return self.mutex
|
|
}
|
|
|
|
func (self *CmdObj) WithMutex(mutex *deadlock.Mutex) ICmdObj {
|
|
self.mutex = mutex
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *CmdObj) ShouldIgnoreEmptyError() bool {
|
|
return self.ignoreEmptyError
|
|
}
|
|
|
|
func (self *CmdObj) Run() error {
|
|
return self.runner.Run(self)
|
|
}
|
|
|
|
func (self *CmdObj) RunWithOutput() (string, error) {
|
|
return self.runner.RunWithOutput(self)
|
|
}
|
|
|
|
func (self *CmdObj) RunWithOutputs() (string, string, error) {
|
|
return self.runner.RunWithOutputs(self)
|
|
}
|
|
|
|
func (self *CmdObj) RunAndProcessLines(onLine func(line string) (bool, error)) error {
|
|
return self.runner.RunAndProcessLines(self, onLine)
|
|
}
|
|
|
|
func (self *CmdObj) PromptOnCredentialRequest(task *gocui.Task) ICmdObj {
|
|
self.credentialStrategy = PROMPT
|
|
self.task = task
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *CmdObj) FailOnCredentialRequest() ICmdObj {
|
|
self.credentialStrategy = FAIL
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *CmdObj) GetCredentialStrategy() CredentialStrategy {
|
|
return self.credentialStrategy
|
|
}
|
|
|
|
func (self *CmdObj) GetTask() *gocui.Task {
|
|
return self.task
|
|
}
|