go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

Extract a SubCommitsHelper from SwitchToSubCommitsController

Browse Source 
We want to use it from BranchesController too.
This commit is contained in:
Stefan Haller
2023-08-05 11:19:16 +02:00
parent 4de3fadb00
commit e8fac6ca73
4 changed files with 88 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/gui/controllers.go
View File

@ -76,6 +76,13 @@ func (gui *Gui) resetHelpersAndControllers() {
helperCommon,
func() *status.StatusManager { return gui.statusManager },
)
setSubCommits := func(commits []*models.Commit) {
gui.Mutexes.SubCommitsMutex.Lock()
defer gui.Mutexes.SubCommitsMutex.Unlock()
gui.State.Model.SubCommits = commits
}
gui.helpers = &helpers.Helpers{
Refs: refsHelper,
Host: helpers.NewHostHelper(helperCommon),
@ -111,8 +118,9 @@ func (gui *Gui) resetHelpersAndControllers() {
modeHelper,
appStatusHelper,
),
Search: helpers.NewSearchHelper(helperCommon),
Worktree: worktreeHelper,
Search: helpers.NewSearchHelper(helperCommon),
Worktree: worktreeHelper,
SubCommits: helpers.NewSubCommitsHelper(helperCommon, refreshHelper, setSubCommits),
}
gui.CustomCommandsClient = custom_commands.NewClient(
@ -206,13 +214,6 @@ func (gui *Gui) resetHelpersAndControllers() {
controllers.AttachControllers(context, sideWindowControllerFactory.Create(context))
}
setSubCommits := func(commits []*models.Commit) {
gui.Mutexes.SubCommitsMutex.Lock()
defer gui.Mutexes.SubCommitsMutex.Unlock()
gui.State.Model.SubCommits = commits
}
for _, context := range []controllers.CanSwitchToSubCommits{
gui.State.Contexts.Branches,
gui.State.Contexts.RemoteBranches,
@ -220,7 +221,7 @@ func (gui *Gui) resetHelpersAndControllers() {
gui.State.Contexts.ReflogCommits,
} {
controllers.AttachControllers(context, controllers.NewSwitchToSubCommitsController(
common, setSubCommits, context,
common, context,
))
}