diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-05 22:30:10 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-11 09:39:54 +1100 |
| commit | e0ff46fe53503d74fc63c90fc5ddc4d9468b60d5 (patch) | |
| tree | 137f8360a1416b08cc6c327ba47b07a4670366d6 /pkg/gui/branches_panel.go | |
| parent | cce6f405a5643ed46a6bc0b9fd7cf132c915c9f3 (diff) | |
more work on rebasing including visual indicators
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index f4a5e28f5..165a75a4a 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -96,7 +96,7 @@ func (gui *Gui) handleBranchesPrevLine(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error { - selectedBranch := gui.getSelectedBranch(v).Name + selectedBranch := gui.getSelectedBranch().Name checkedOutBranch := gui.State.Branches[0].Name title := "Rebasing" prompt := fmt.Sprintf("Are you sure you want to rebase %s onto %s?", checkedOutBranch, selectedBranch) @@ -109,11 +109,14 @@ func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error { if err := gui.GitCommand.RebaseBranch(selectedBranch); err != nil { gui.Log.Errorln(err) - if err := gui.createConfirmationPanel(g, v, "Rebase failed", "Rebasing failed, would you like to resolve it?", + if err := gui.createConfirmationPanel(g, v, "Rebase failed", "Damn, conflicts! To abort press 'esc', otherwise press 'enter'", func(g *gocui.Gui, v *gocui.View) error { return nil }, func(g *gocui.Gui, v *gocui.View) error { - return gui.GitCommand.AbortRebaseBranch() + if err := gui.GitCommand.AbortRebaseBranch(); err != nil { + return err + } + return gui.refreshSidePanels(g) }); err != nil { gui.Log.Errorln(err) } |