sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Remove MergeAndRebaseHelper's dependency on RefsHelper

Browse Source 
We want to make MergeAndRebaseHelper a dependency of RefsHelper instead.
This commit is contained in:
Stefan Haller
2025-04-02 15:01:52 +02:00
parent 483195110a
commit 9d88d6a44e
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers.go
View File

@ -31,7 +31,7 @@ func (gui *Gui) resetHelpersAndControllers() {
suggestionsHelper := helpers.NewSuggestionsHelper(helperCommon) suggestionsHelper := helpers.NewSuggestionsHelper(helperCommon)
worktreeHelper := helpers.NewWorktreeHelper(helperCommon, reposHelper, refsHelper, suggestionsHelper) worktreeHelper := helpers.NewWorktreeHelper(helperCommon, reposHelper, refsHelper, suggestionsHelper)
rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon, refsHelper) rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon)
setCommitSummary := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage }) setCommitSummary := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage })
setCommitDescription := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitDescription }) setCommitDescription := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitDescription })

7
pkg/gui/controllers/helpers/merge_and_rebase_helper.go
View File

@ -17,17 +17,14 @@ import (
) )
type MergeAndRebaseHelper struct { type MergeAndRebaseHelper struct {
c *HelperCommon c *HelperCommon
refsHelper *RefsHelper
} }
func NewMergeAndRebaseHelper( func NewMergeAndRebaseHelper(
c *HelperCommon, c *HelperCommon,
refsHelper *RefsHelper,
) *MergeAndRebaseHelper { ) *MergeAndRebaseHelper {
return &MergeAndRebaseHelper{ return &MergeAndRebaseHelper{
c: c, c: c,
refsHelper: refsHelper,
} }
} }