diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-18 21:40:32 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-23 13:26:17 +1100 |
commit | acfc961909a2b21f840358738be4f16d7efa3ca4 (patch) | |
tree | 673e46c5a67fc872d5725e295c4371dca3ce62ba /pkg/gui | |
parent | f502f75e1f56bf8f34d3fdf42e934919cd045d85 (diff) |
move soft reset keybinding into reset options
Diffstat (limited to 'pkg/gui')
-rw-r--r-- | pkg/gui/files_panel.go | 22 | ||||
-rw-r--r-- | pkg/gui/keybindings.go | 10 |
2 files changed, 10 insertions, 22 deletions
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"), @@ -576,6 +563,13 @@ func (gui *Gui) handleResetAndClean(g *gocui.Gui, v *gocui.View) error { }, }, { + 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", handler: func() error { diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 172e76896..518575550 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -210,12 +210,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Description: gui.Tr.SLocalize("stashFiles"), }, { ViewName: "files", - Key: 's', - Modifier: gocui.ModNone, - Handler: gui.handleSoftReset, - Description: gui.Tr.SLocalize("softReset"), - }, { - ViewName: "files", Key: 'a', Modifier: gocui.ModNone, Handler: gui.handleStageAll, @@ -230,8 +224,8 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { ViewName: "files", Key: 'D', Modifier: gocui.ModNone, - Handler: gui.handleResetAndClean, - Description: gui.Tr.SLocalize("resetHard"), + Handler: gui.handleCreateResetMenu, + Description: gui.Tr.SLocalize("viewResetOptions"), }, { ViewName: "files", Key: gocui.KeyEnter, |