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

add commit files controller

Browse source
This commit is contained in:
Jesse Duffield 2022-02-22 20:13:11 +11:00
parent 85f2319897
commit ecaff7fc6c
13 changed files with 358 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pkg/gui/gui.go
View file

@ -497,6 +497,7 @@ func (gui *Gui) resetControllers() {
rebaseHelper := helpers.NewMergeAndRebaseHelper(controllerCommon, gui.State.Contexts, gui.git, gui.takeOverMergeConflictScrolling, refsHelper)
gui.helpers = &helpers.Helpers{
Refs: refsHelper,
PatchBuilding: helpers.NewPatchBuildingHelper(controllerCommon, gui.git),
Bisect: helpers.NewBisectHelper(controllerCommon, gui.git),
Suggestions: helpers.NewSuggestionsHelper(controllerCommon, model, gui.refreshSuggestions),
Files: helpers.NewFilesHelper(controllerCommon, gui.git, osCommand),
@ -534,8 +535,8 @@ func (gui *Gui) resetControllers() {
bisectController := controllers.NewBisectController(common)
reflogController := controllers.NewReflogController(common, gui.SwitchToCommitFilesContext)
subCommitsController := controllers.NewSubCommitsController(common, gui.SwitchToCommitFilesContext)
reflogController := controllers.NewReflogController(common)
subCommitsController := controllers.NewSubCommitsController(common)
gui.Controllers = Controllers{
Submodules: submodulesController,
@ -548,12 +549,8 @@ func (gui *Gui) resetControllers() {
func() string { return gui.State.failedCommitMessage },
gui.switchToMerge,
),
Tags: controllers.NewTagsController(common),
LocalCommits: controllers.NewLocalCommitsController(
common,
syncController.HandlePull,
gui.SwitchToCommitFilesContext,
),
Tags: controllers.NewTagsController(common),
LocalCommits: controllers.NewLocalCommitsController(common, syncController.HandlePull),
Remotes: controllers.NewRemotesController(
common,
func(branches []*models.RemoteBranch) { gui.State.Model.RemoteBranches = branches },
@ -567,6 +564,7 @@ func (gui *Gui) resetControllers() {
gitFlowController := controllers.NewGitFlowController(common)
filesRemoveController := controllers.NewFilesRemoveController(common)
stashController := controllers.NewStashController(common)
commitFilesController := controllers.NewCommitFilesController(common)
switchToSubCommitsControllerFactory := controllers.NewSubCommitsSwitchControllerFactory(
common,
@ -602,6 +600,7 @@ func (gui *Gui) resetControllers() {
controllers.AttachControllers(gui.State.Contexts.LocalCommits, gui.Controllers.LocalCommits, bisectController)
controllers.AttachControllers(gui.State.Contexts.ReflogCommits, reflogController)
controllers.AttachControllers(gui.State.Contexts.SubCommits, subCommitsController)
controllers.AttachControllers(gui.State.Contexts.CommitFiles, commitFilesController)
controllers.AttachControllers(gui.State.Contexts.Remotes, gui.Controllers.Remotes)
controllers.AttachControllers(gui.State.Contexts.Stash, stashController)
controllers.AttachControllers(gui.State.Contexts.Menu, gui.Controllers.Menu)