summaryrefslogtreecommitdiffstats
path: root/pkg/gui
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-01-07 20:33:34 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-01-09 14:09:53 +1100
commitee8ff6512f50803a70a8ad8919dbfa6aa6ea089b (patch)
tree37f1fa95893eaac47c8109fadb997dc9994a8abe /pkg/gui
parente8229f0ee0eafb2d94674a091cb7a8776468e9c1 (diff)
trim down gitcommand struct some more
Diffstat (limited to 'pkg/gui')
-rw-r--r--pkg/gui/custom_commands.go2
-rw-r--r--pkg/gui/git_flow.go20
-rw-r--r--pkg/gui/rebase_options_panel.go9
3 files changed, 15 insertions, 16 deletions
diff --git a/pkg/gui/custom_commands.go b/pkg/gui/custom_commands.go
index cc64be4a2..e7a7cbad1 100644
--- a/pkg/gui/custom_commands.go
+++ b/pkg/gui/custom_commands.go
@@ -203,7 +203,7 @@ func (gui *Gui) menuPromptFromCommand(prompt config.CustomCommandPrompt, promptR
}
// Run and save output
- message, err := gui.GitCommand.Cmd.New(cmdStr).RunWithOutput()
+ message, err := gui.GitCommand.Custom.RunWithOutput(cmdStr)
if err != nil {
return gui.surfaceError(err)
}
diff --git a/pkg/gui/git_flow.go b/pkg/gui/git_flow.go
index 959f22788..842f6c0cd 100644
--- a/pkg/gui/git_flow.go
+++ b/pkg/gui/git_flow.go
@@ -6,16 +6,6 @@ import (
"github.com/jesseduffield/lazygit/pkg/utils"
)
-func (gui *Gui) gitFlowFinishBranch(branchName string) error {
- cmdObj, err := gui.GitCommand.Flow.FinishCmdObj(branchName)
- if err != nil {
- return gui.surfaceError(err)
- }
-
- gui.logAction(gui.Tr.Actions.GitFlowFinish)
- return gui.runSubprocessWithSuspenseAndRefresh(cmdObj)
-}
-
func (gui *Gui) handleCreateGitFlowMenu() error {
branch := gui.getSelectedBranch()
if branch == nil {
@@ -70,3 +60,13 @@ func (gui *Gui) handleCreateGitFlowMenu() error {
return gui.createMenu("git flow", menuItems, createMenuOptions{})
}
+
+func (gui *Gui) gitFlowFinishBranch(branchName string) error {
+ cmdObj, err := gui.GitCommand.Flow.FinishCmdObj(branchName)
+ if err != nil {
+ return gui.surfaceError(err)
+ }
+
+ gui.logAction(gui.Tr.Actions.GitFlowFinish)
+ return gui.runSubprocessWithSuspenseAndRefresh(cmdObj)
+}
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go
index e9476cd5d..482640fa2 100644
--- a/pkg/gui/rebase_options_panel.go
+++ b/pkg/gui/rebase_options_panel.go
@@ -65,11 +65,10 @@ func (gui *Gui) genericMergeCommand(command string) error {
// it's impossible for a rebase to require a commit so we'll use a subprocess only if it's a merge
if status == enums.REBASE_MODE_MERGING && command != REBASE_OPTION_ABORT && gui.UserConfig.Git.Merging.ManualCommit {
- sub := gui.GitCommand.Cmd.New("git " + commandType + " --" + command)
- if sub != nil {
- return gui.runSubprocessWithSuspenseAndRefresh(sub)
- }
- return nil
+ // TODO: see if we should be calling more of the code from gui.GitCommand.Rebase.GenericMergeOrRebaseAction
+ return gui.runSubprocessWithSuspenseAndRefresh(
+ gui.GitCommand.Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command),
+ )
}
result := gui.GitCommand.Rebase.GenericMergeOrRebaseAction(commandType, command)
if err := gui.handleGenericMergeCommandResult(result); err != nil {