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

workingtree controller fixed with new references for commit in staged menu

Browse Source
This commit is contained in:
Arnaud PERALTA
2022-11-27 01:10:24 +01:00
committed by Jesse Duffield
parent 8b894d7bf5
commit 0af63daf18
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/gui/controllers.go
View File

@ -24,6 +24,10 @@ func (gui *Gui) resetControllers() {
rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon, gui.State.Contexts, gui.git, refsHelper) rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon, gui.State.Contexts, gui.git, refsHelper)
suggestionsHelper := helpers.NewSuggestionsHelper(helperCommon, model, gui.refreshSuggestions) suggestionsHelper := helpers.NewSuggestionsHelper(helperCommon, model, gui.refreshSuggestions)
setCommitMessage := gui.getSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage })
getSavedCommitMessage := func() string {
return gui.State.savedCommitMessage
}
gui.helpers = &helpers.Helpers{ gui.helpers = &helpers.Helpers{
Refs: refsHelper, Refs: refsHelper,
Host: helpers.NewHostHelper(helperCommon, gui.git), Host: helpers.NewHostHelper(helperCommon, gui.git),
@ -31,7 +35,7 @@ func (gui *Gui) resetControllers() {
Bisect: helpers.NewBisectHelper(helperCommon, gui.git), Bisect: helpers.NewBisectHelper(helperCommon, gui.git),
Suggestions: suggestionsHelper, Suggestions: suggestionsHelper,
Files: helpers.NewFilesHelper(helperCommon, gui.git, osCommand), Files: helpers.NewFilesHelper(helperCommon, gui.git, osCommand),
WorkingTree: helpers.NewWorkingTreeHelper(helperCommon, gui.git, model), WorkingTree: helpers.NewWorkingTreeHelper(helperCommon, gui.git, gui.State.Contexts, refsHelper, model, setCommitMessage, getSavedCommitMessage),
Tags: helpers.NewTagsHelper(helperCommon, gui.git), Tags: helpers.NewTagsHelper(helperCommon, gui.git),
GPG: helpers.NewGpgHelper(helperCommon, gui.os, gui.git), GPG: helpers.NewGpgHelper(helperCommon, gui.os, gui.git),
MergeAndRebase: rebaseHelper, MergeAndRebase: rebaseHelper,
@ -76,16 +80,10 @@ func (gui *Gui) resetControllers() {
bisectController := controllers.NewBisectController(common) bisectController := controllers.NewBisectController(common)
getSavedCommitMessage := func() string {
return gui.State.savedCommitMessage
}
getCommitMessage := func() string { getCommitMessage := func() string {
return strings.TrimSpace(gui.Views.CommitMessage.TextArea.GetContent()) return strings.TrimSpace(gui.Views.CommitMessage.TextArea.GetContent())
} }
setCommitMessage := gui.getSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage })
onCommitAttempt := func(message string) { onCommitAttempt := func(message string) {
gui.State.savedCommitMessage = message gui.State.savedCommitMessage = message
gui.Views.CommitMessage.ClearTextArea() gui.Views.CommitMessage.ClearTextArea()

40
pkg/gui/controllers/helpers/working_tree_helper.go
View File

@ -2,13 +2,14 @@ package helpers
import ( import (
"fmt" "fmt"
"regexp" "regexp"
"github.com/jesseduffield/lazygit/pkg/commands" "github.com/jesseduffield/lazygit/pkg/commands"
"github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/config"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/context"
"github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils"
) )
type IWorkingTreeHelper interface { type IWorkingTreeHelper interface {
@ -19,30 +20,30 @@ type IWorkingTreeHelper interface {
} }
type WorkingTreeHelper struct { type WorkingTreeHelper struct {
c *types.HelperCommon c *types.HelperCommon
git *commands.GitCommand git *commands.GitCommand
contexts *context.ContextTree contexts *context.ContextTree
refHelper *RefsHelper refHelper *RefsHelper
model *types.Model model *types.Model
setCommitMessage func(message string) setCommitMessage func(message string)
getSavedCommitMessage func() string getSavedCommitMessage func() string
} }
func NewWorkingTreeHelper( func NewWorkingTreeHelper(
c *types.HelperCommon, c *types.HelperCommon,
git *commands.GitCommand, git *commands.GitCommand,
contexts *context.ContextTree, contexts *context.ContextTree,
refHelper *RefsHelper, refHelper *RefsHelper,
model *types.Model, model *types.Model,
setCommitMessage func(message string), setCommitMessage func(message string),
getSavedCommitMessage func() string, getSavedCommitMessage func() string,
) *WorkingTreeHelper { ) *WorkingTreeHelper {
return &WorkingTreeHelper{ return &WorkingTreeHelper{
c: c, c: c,
git: git, git: git,
contexts: contexts, contexts: contexts,
refHelper: refHelper, refHelper: refHelper,
model: model, model: model,
setCommitMessage: setCommitMessage, setCommitMessage: setCommitMessage,
getSavedCommitMessage: getSavedCommitMessage, getSavedCommitMessage: getSavedCommitMessage,
} }
@ -190,7 +191,7 @@ func (self *WorkingTreeHelper) prepareFilesForCommit() error {
return err return err
} }
return self.syncRefresh(); return self.syncRefresh()
} }
return nil return nil
@ -204,4 +205,3 @@ func (self *WorkingTreeHelper) commitPrefixConfigForRepo() *config.CommitPrefixC
return &cfg return &cfg
} }