mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-24 10:13:41 -05:00
Stefan HallerandClaude Opus 4.8
88811e6795
With sync vs async now derived from the calling thread, the Mode field and its SYNC/ASYNC constants no longer carry any information: Refresh is always async, RefreshFromWorker always sync. Drop the field, the type, and the Mode argument at every call site, and reduce the debug log's mode name to a plain sync/async derived from calledFromWorker. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
107 lines
3.1 KiB
Go
107 lines
3.1 KiB
Go
package helpers
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
|
"github.com/jesseduffield/lazygit/pkg/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
type GpgHelper struct {
|
|
c *HelperCommon
|
|
}
|
|
|
|
func NewGpgHelper(c *HelperCommon) *GpgHelper {
|
|
return &GpgHelper{
|
|
c: c,
|
|
}
|
|
}
|
|
|
|
func (self *GpgHelper) WithGpgHandling(
|
|
cmdObj *oscommands.CmdObj,
|
|
configKey git_commands.GpgConfigKey,
|
|
waitingStatus string,
|
|
onSuccess func() error,
|
|
refreshScope []types.RefreshableView,
|
|
) error {
|
|
refreshOptions := types.RefreshOptions{Scope: refreshScope}
|
|
return self.withGpgHandling(
|
|
cmdObj, configKey, waitingStatus, onSuccess, refreshOptions, refreshOptions)
|
|
}
|
|
|
|
// WithGpgHandlingAndSelectHeadCommit is like WithGpgHandling, but on success it
|
|
// selects the new HEAD commit rather than restoring the previous selection. For
|
|
// committing, where the commit we just created is the one we want selected.
|
|
func (self *GpgHelper) WithGpgHandlingAndSelectHeadCommit(
|
|
cmdObj *oscommands.CmdObj,
|
|
configKey git_commands.GpgConfigKey,
|
|
waitingStatus string,
|
|
onSuccess func() error,
|
|
) error {
|
|
failureRefreshOptions := types.RefreshOptions{}
|
|
successRefreshOptions := types.RefreshOptions{CommitSelection: types.SelectHeadCommit}
|
|
return self.withGpgHandling(
|
|
cmdObj, configKey, waitingStatus, onSuccess, failureRefreshOptions, successRefreshOptions)
|
|
}
|
|
|
|
// Currently there is a bug where if we switch to a subprocess from within
|
|
// WithWaitingStatus we get stuck there and can't return to lazygit. We could
|
|
// fix this bug, or just stop running subprocesses from within there, given that
|
|
// we don't need to see a loading status if we're in a subprocess.
|
|
func (self *GpgHelper) withGpgHandling(
|
|
cmdObj *oscommands.CmdObj,
|
|
configKey git_commands.GpgConfigKey,
|
|
waitingStatus string,
|
|
onSuccess func() error,
|
|
failureRefreshOptions types.RefreshOptions,
|
|
successRefreshOptions types.RefreshOptions,
|
|
) error {
|
|
useSubprocess := self.c.Git().Config.NeedsGpgSubprocess(configKey)
|
|
if useSubprocess {
|
|
success, err := self.c.RunSubprocess(cmdObj)
|
|
if success && onSuccess != nil {
|
|
if err := onSuccess(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if success {
|
|
self.c.Refresh(successRefreshOptions)
|
|
} else {
|
|
self.c.Refresh(failureRefreshOptions)
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
return self.runAndStream(
|
|
cmdObj, waitingStatus, onSuccess, failureRefreshOptions, successRefreshOptions)
|
|
}
|
|
|
|
func (self *GpgHelper) runAndStream(
|
|
cmdObj *oscommands.CmdObj,
|
|
waitingStatus string,
|
|
onSuccess func() error,
|
|
failureRefreshOptions types.RefreshOptions,
|
|
successRefreshOptions types.RefreshOptions,
|
|
) error {
|
|
return self.c.WithWaitingStatus(waitingStatus, func(gocui.Task) error {
|
|
if err := cmdObj.StreamOutput().Run(); err != nil {
|
|
self.c.RefreshFromWorker(failureRefreshOptions)
|
|
return fmt.Errorf(
|
|
self.c.Tr.GitCommandFailed, self.c.UserConfig().Keybinding.Universal.ExtrasMenu,
|
|
)
|
|
}
|
|
|
|
if onSuccess != nil {
|
|
if err := onSuccess(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
self.c.RefreshFromWorker(successRefreshOptions)
|
|
return nil
|
|
})
|
|
}
|