diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-19 19:13:47 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | 7ebed76d16026348abf586ff19e534f7297d7fce (patch) | |
| tree | cd6ddb2e6b5ec134db209b30c7e443028f9b9ade /pkg/gui/commits_panel.go | |
| parent | 2b812b01e9d80409a0bf212eb7208dcdd6f5c974 (diff) | |
WIP
Diffstat (limited to 'pkg/gui/commits_panel.go')
| -rw-r--r-- | pkg/gui/commits_panel.go | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go index 6e5e2d201..1103b6867 100644 --- a/pkg/gui/commits_panel.go +++ b/pkg/gui/commits_panel.go @@ -119,13 +119,7 @@ func (gui *Gui) refreshCommitsWithLimit() error { } gui.State.Commits = commits - if gui.getCommitsView().Context == "branch-commits" { - if err := gui.renderBranchCommitsWithSelection(); err != nil { - return err - } - } - - return nil + return gui.postRefreshUpdate(gui.Contexts.BranchCommits.Context) } // specific functions @@ -439,12 +433,12 @@ func (gui *Gui) handleCopyCommit(g *gocui.Gui, v *gocui.View) error { for index, cherryPickedCommit := range gui.State.CherryPickedCommits { if commit.Sha == cherryPickedCommit.Sha { gui.State.CherryPickedCommits = append(gui.State.CherryPickedCommits[0:index], gui.State.CherryPickedCommits[index+1:]...) - return gui.renderBranchCommitsWithSelection() + return gui.Contexts.BranchCommits.Context.HandleRender() } } gui.addCommitToCherryPickedCommits(gui.State.Panels.Commits.SelectedLine) - return gui.renderBranchCommitsWithSelection() + return gui.Contexts.BranchCommits.Context.HandleRender() } func (gui *Gui) cherryPickedCommitShaMap() map[string]bool { @@ -492,7 +486,7 @@ func (gui *Gui) handleCopyCommitRange(g *gocui.Gui, v *gocui.View) error { gui.addCommitToCherryPickedCommits(index) } - return gui.renderBranchCommitsWithSelection() + return gui.Contexts.BranchCommits.Context.HandleRender() } // HandlePasteCommits begins a cherry-pick rebase with the commits the user has copied @@ -678,7 +672,7 @@ func (gui *Gui) refreshCommitsViewWithSelection() error { switch commitsView.Context { case "branch-commits": - return gui.renderBranchCommitsWithSelection() + return gui.Contexts.BranchCommits.Context.HandleRender() case "reflog-commits": return gui.renderReflogCommitsWithSelection() } @@ -721,7 +715,7 @@ func (gui *Gui) handleOpenSearchForCommitsPanel(g *gocui.Gui, v *gocui.View) err func (gui *Gui) handleResetCherryPick(g *gocui.Gui, v *gocui.View) error { gui.State.CherryPickedCommits = []*commands.Commit{} - return gui.renderBranchCommitsWithSelection() + return gui.Contexts.BranchCommits.Context.HandleRender() } func (gui *Gui) handleGotoBottomForCommitsPanel(g *gocui.Gui, v *gocui.View) error { |