diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-11-28 13:14:48 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-11-28 20:48:17 +1100 |
| commit | da3b0bf7c8aa6202d5eb9c8178f6648bc695336a (patch) | |
| tree | cd0666ae4253469f8f2f1e349357be37bfb3d571 /pkg/gui/files_panel.go | |
| parent | 90ade3225f55652d40c6f0266e50f5328390f02b (diff) | |
Start on supporting auto-suggestions when checking out a branch
switch to other fuzzy package with no dependencies
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 1d17b7771..665a403cf 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -183,7 +183,7 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error if file.HasMergeConflicts { return gui.createErrorPanel(gui.Tr.FileStagingRequirements) } - _ = gui.switchContext(gui.Contexts.Staging.Context) + _ = gui.pushContext(gui.Contexts.Staging.Context) return gui.handleRefreshStagingPanel(forceSecondaryFocused, selectedLineIdx) // TODO: check if this is broken, try moving into context code } @@ -341,7 +341,7 @@ func (gui *Gui) handleCommitPress() error { } gui.g.Update(func(g *gocui.Gui) error { - if err := gui.switchContext(gui.Contexts.CommitMessage.Context); err != nil { + if err := gui.pushContext(gui.Contexts.CommitMessage.Context); err != nil { return err } @@ -642,7 +642,7 @@ func (gui *Gui) handleSwitchToMerge() error { return gui.createErrorPanel(gui.Tr.FileNoMergeCons) } - return gui.switchContext(gui.Contexts.Merging.Context) + return gui.pushContext(gui.Contexts.Merging.Context) } func (gui *Gui) openFile(filename string) error { |