add reset to reflog commit menu

jermainlaforce · Feb 15, 2020 · 0a69c1a · 0a69c1a
1 parent feaf98b
commit 0a69c1a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 67 deletions.
diff --git a/pkg/gui/patch_options_panel.go b/pkg/gui/patch_options_panel.go
@@ -6,16 +6,6 @@ import (
 	"github.com/jesseduffield/gocui"
 )
 
-type patchMenuOption struct {
-	displayName string
-	function    func() error
-}
-
-// GetDisplayStrings is a function.
-func (o *patchMenuOption) GetDisplayStrings(isFocused bool) []string {
-	return []string{o.displayName}
-}
-
 func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error {
 	if !gui.GitCommand.PatchManager.CommitSelected() {
 		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoPatchError"))

diff --git a/pkg/gui/reflog_panel.go b/pkg/gui/reflog_panel.go
@@ -95,3 +95,9 @@ func (gui *Gui) handleCheckoutReflogCommit(g *gocui.Gui, v *gocui.View) error {
 
 	return nil
 }
+
+func (gui *Gui) handleCreateReflogResetMenu(g *gocui.Gui, v *gocui.View) error {
+	commit := gui.getSelectedReflogCommit()
+
+	return gui.createResetMenu(commit.Sha)
+}
diff --git a/pkg/gui/reflog_reset_options_panel.go b/pkg/gui/reflog_reset_options_panel.go
diff --git a/pkg/gui/reset_menu_panel.go b/pkg/gui/reset_menu_panel.go
@@ -20,9 +20,13 @@ func (gui *Gui) createResetMenu(ref string) error {
 			},
 			onPress: func() error {
 				if err := gui.GitCommand.ResetToCommit(ref, innerStrength); err != nil {
-					return err
+					return gui.createErrorPanel(gui.g, err.Error())
 				}
 
+				gui.switchCommitsPanelContext("branch-commits")
+				gui.State.Panels.Commits.SelectedLine = 0
+				gui.State.Panels.ReflogCommits.SelectedLine = 0
+
 				if err := gui.refreshCommits(gui.g); err != nil {
 					return err
 				}
@@ -33,7 +37,6 @@ func (gui *Gui) createResetMenu(ref string) error {
 					return err
 				}
 
-				gui.State.Panels.Commits.SelectedLine = 0
 				return gui.handleCommitSelect(gui.g, gui.getCommitsView())
 			},
 		}