diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-27 21:25:37 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 11:59:45 +1100 |
| commit | c1a4bd0482ab06279700fa95404131ef24a2297d (patch) | |
| tree | f3c6a24a7a6cc482fe14f2001d704edefff59bc9 /pkg/gui/branches_panel.go | |
| parent | d0336fe16f3a365eb9bfff1086a4c02277e1f5dd (diff) | |
more smart refreshing
WIP
WIP
WIP
WIP
WIP
fix how diff entries are handled
WIP
WIP
WIP
WIP
WIP
WIP
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 996d3c7b2..1457d5138 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -358,7 +358,7 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error { if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil { _ = gui.createErrorPanel(gui.g, err.Error()) } - _ = gui.refreshCommits() + _ = gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{BRANCHES}}) } _ = gui.closeConfirmationPrompt(gui.g, true) @@ -453,6 +453,9 @@ func (gui *Gui) handleRenameBranch(g *gocui.Gui, v *gocui.View) error { return nil } + // TODO: find a way to not checkout the branch here if it's not the current branch (i.e. find some + // way to get it to show up in the reflog) + promptForNewName := func() error { return gui.createPromptPanel(g, v, gui.Tr.SLocalize("NewBranchNamePrompt")+" "+branch.Name+":", "", func(g *gocui.Gui, v *gocui.View) error { newName := gui.trimmedContent(v) @@ -465,7 +468,7 @@ func (gui *Gui) handleRenameBranch(g *gocui.Gui, v *gocui.View) error { return gui.createErrorPanel(gui.g, err.Error()) } - return gui.refreshCommits() + return gui.refreshSidePanels(refreshOptions{mode: ASYNC}) }) } |