From acfc961909a2b21f840358738be4f16d7efa3ca4 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 18 Mar 2019 21:40:32 +1100 Subject: move soft reset keybinding into reset options --- pkg/gui/files_panel.go | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'pkg/gui/files_panel.go') diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 2f91df519..8579e1bb8 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -472,19 +472,6 @@ func (gui *Gui) anyFilesWithMergeConflicts() bool { return false } -func (gui *Gui) handleSoftReset(g *gocui.Gui, v *gocui.View) error { - return gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("SoftReset"), gui.Tr.SLocalize("ConfirmSoftReset"), func(g *gocui.Gui, v *gocui.View) error { - if err := gui.GitCommand.SoftReset("HEAD^"); err != nil { - return gui.createErrorPanel(g, err.Error()) - } - - if err := gui.refreshCommits(gui.g); err != nil { - return err - } - return gui.refreshFiles() - }, nil) -} - type discardOption struct { handler func(fileName *commands.File) error description string @@ -552,7 +539,7 @@ func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error { return gui.createMenu(file.Name, options, handleMenuPress) } -func (gui *Gui) handleResetAndClean(g *gocui.Gui, v *gocui.View) error { +func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error { options := []*discardAllOption{ { description: gui.Tr.SLocalize("discardAllChangesToAllFiles"), @@ -575,6 +562,13 @@ func (gui *Gui) handleResetAndClean(g *gocui.Gui, v *gocui.View) error { return gui.GitCommand.RemoveUntrackedFiles() }, }, + { + description: gui.Tr.SLocalize("softReset"), + command: "git reset --soft HEAD", + handler: func() error { + return gui.GitCommand.ResetSoftHead() + }, + }, { description: gui.Tr.SLocalize("hardReset"), command: "git reset --hard HEAD", -- cgit v1.2.3