go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-13 13:59:06 +02:00
Code Issues Releases Activity

add checkout reflog commit keybinding

Browse Source
This commit is contained in:
Jesse Duffield 2020-01-09 22:08:28 +11:00
parent 9b32e99eb8
commit 1b64ea3210
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/commits_panel.go
View File

@ -612,7 +612,7 @@ func (gui *Gui) handleCreateLightweightTag(commitSha string) error {
func (gui *Gui) handleCheckoutCommit(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleCheckoutCommit(g *gocui.Gui, v *gocui.View) error {
commit := gui.getSelectedCommit(g) commit := gui.getSelectedCommit(g)
if commit == nil { if commit == nil {
return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch")) return nil
} }
return gui.createConfirmationPanel(g, gui.getCommitsView(), true, gui.Tr.SLocalize("checkoutCommit"), gui.Tr.SLocalize("SureCheckoutThisCommit"), func(g *gocui.Gui, v *gocui.View) error { return gui.createConfirmationPanel(g, gui.getCommitsView(), true, gui.Tr.SLocalize("checkoutCommit"), gui.Tr.SLocalize("SureCheckoutThisCommit"), func(g *gocui.Gui, v *gocui.View) error {

8
pkg/gui/keybindings.go
View File

@ -777,6 +777,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleTagCommit, Handler: gui.handleTagCommit,
Description: gui.Tr.SLocalize("tagCommit"), Description: gui.Tr.SLocalize("tagCommit"),
}, },
{
ViewName: "commits",
Contexts: []string{"reflog-commits"},
Key: gui.getKey("universal.select"),
Modifier: gocui.ModNone,
Handler: gui.handleCheckoutReflogCommit,
Description: gui.Tr.SLocalize("checkoutCommit"),
},
{ {
ViewName: "stash", ViewName: "stash",
Key: gui.getKey("universal.select"), Key: gui.getKey("universal.select"),

18
pkg/gui/reflog_panel.go
View File

@ -74,3 +74,21 @@ func (gui *Gui) renderReflogCommitsWithSelection() error {
return nil return nil
} }
func (gui *Gui) handleCheckoutReflogCommit(g *gocui.Gui, v *gocui.View) error {
commit := gui.getSelectedReflogCommit()
if commit == nil {
return nil
}
err := gui.createConfirmationPanel(g, gui.getCommitsView(), true, gui.Tr.SLocalize("checkoutCommit"), gui.Tr.SLocalize("SureCheckoutThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
return gui.handleCheckoutRef(commit.Sha)
}, nil)
if err != nil {
return err
}
gui.State.Panels.ReflogCommits.SelectedLine = 0
return nil
}