mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove controllers struct

Browse source
This commit is contained in:
Jesse Duffield 2022-03-26 15:52:35 +11:00
parent f0a4dcfdc3
commit 0dfb7c08b7
10 changed files with 57 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pkg/gui/controllers/helpers/working_tree_helper.go
View file

@ -1,6 +1,7 @@
package helpers
import (
"github.com/jesseduffield/lazygit/pkg/commands"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/gui/types"
)
@ -13,11 +14,16 @@ type IWorkingTreeHelper interface {
}
type WorkingTreeHelper struct {
c *types.HelperCommon
git *commands.GitCommand
model *types.Model
}
func NewWorkingTreeHelper(model *types.Model) *WorkingTreeHelper {
func NewWorkingTreeHelper(c *types.HelperCommon, git *commands.GitCommand, model *types.Model) *WorkingTreeHelper {
return &WorkingTreeHelper{
c: c,
git: git,
model: model,
}
}
@ -53,3 +59,16 @@ func (self *WorkingTreeHelper) FileForSubmodule(submodule *models.SubmoduleConfi
return nil
}
func (self *WorkingTreeHelper) OpenMergeTool() error {
return self.c.Ask(types.AskOpts{
Title: self.c.Tr.MergeToolTitle,
Prompt: self.c.Tr.MergeToolPrompt,
HandleConfirm: func() error {
self.c.LogAction(self.c.Tr.Actions.OpenMergeTool)
return self.c.RunSubprocessAndRefresh(
self.git.WorkingTree.OpenMergeToolCmdObj(),
)
},
})
}