diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-02-13 17:01:53 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | 371b8d638b55ecce5c99700072051a9d15df7d96 (patch) | |
| tree | 2b13700b359a54045cda8f76e730f3ace4473115 /pkg/gui/gui.go | |
| parent | 55af07a1bb4e1d3f85a456c2604c46e5535aca40 (diff) | |
more consistent naming
Diffstat (limited to 'pkg/gui/gui.go')
| -rw-r--r-- | pkg/gui/gui.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 84203c9e5..8b5cef4c4 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -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) |