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

more consistent naming

This commit is contained in:
Jesse Duffield
2022-02-13 17:01:53 +11:00
parent 55af07a1bb
commit 371b8d638b
18 changed files with 48 additions and 48 deletions

View File

@ -278,7 +278,7 @@ type guiMutexes struct {
RefreshingFilesMutex *sync.Mutex
RefreshingStatusMutex *sync.Mutex
SyncMutex *sync.Mutex
BranchCommitsMutex *sync.Mutex
LocalCommitsMutex *sync.Mutex
LineByLinePanelMutex *sync.Mutex
SubprocessMutex *sync.Mutex
}
@ -337,7 +337,7 @@ func (gui *Gui) resetState(filterPath string, reuseState bool) {
var initialContext types.IListContext = contextTree.Files
if filterPath != "" {
screenMode = SCREEN_HALF
initialContext = contextTree.BranchCommits
initialContext = contextTree.LocalCommits
}
viewContextMap := context.NewViewContextMap()
@ -397,7 +397,7 @@ func initialViewContextMapping(contextTree *context.ContextTree) map[string]type
"status": contextTree.Status,
"files": contextTree.Files,
"branches": contextTree.Branches,
"commits": contextTree.BranchCommits,
"commits": contextTree.LocalCommits,
"commitFiles": contextTree.CommitFiles,
"stash": contextTree.Stash,
"menu": contextTree.Menu,
@ -440,7 +440,7 @@ func NewGui(
RefreshingFilesMutex: &sync.Mutex{},
RefreshingStatusMutex: &sync.Mutex{},
SyncMutex: &sync.Mutex{},
BranchCommitsMutex: &sync.Mutex{},
LocalCommitsMutex: &sync.Mutex{},
LineByLinePanelMutex: &sync.Mutex{},
SubprocessMutex: &sync.Mutex{},
},
@ -579,7 +579,7 @@ func (gui *Gui) resetControllers() {
controllers.AttachControllers(gui.State.Contexts.Files, gui.Controllers.Files)
controllers.AttachControllers(gui.State.Contexts.Tags, gui.Controllers.Tags)
controllers.AttachControllers(gui.State.Contexts.Submodules, gui.Controllers.Submodules)
controllers.AttachControllers(gui.State.Contexts.BranchCommits, gui.Controllers.LocalCommits, bisectController)
controllers.AttachControllers(gui.State.Contexts.LocalCommits, gui.Controllers.LocalCommits, bisectController)
controllers.AttachControllers(gui.State.Contexts.Remotes, gui.Controllers.Remotes)
controllers.AttachControllers(gui.State.Contexts.Menu, gui.Controllers.Menu)
controllers.AttachControllers(gui.State.Contexts.Global, gui.Controllers.Sync, gui.Controllers.Undo, gui.Controllers.Global)