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

allow applying patch directly

Browse Source
This commit is contained in:
Jesse Duffield
2020-03-26 21:00:08 +11:00
parent 83757f1065
commit 95b147079f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/gui/patch_options_panel.go
View File

@ -20,6 +20,10 @@ func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error
displayString: "pull patch out into index", displayString: "pull patch out into index",
onPress: gui.handlePullPatchIntoWorkingTree, onPress: gui.handlePullPatchIntoWorkingTree,
}, },
{
displayString: "apply patch",
onPress: gui.handleApplyPatch,
},
{ {
displayString: "reset patch", displayString: "reset patch",
onPress: gui.handleResetPatch, onPress: gui.handleResetPatch,
@ -116,6 +120,17 @@ func (gui *Gui) handlePullPatchIntoWorkingTree() error {
}) })
} }
func (gui *Gui) handleApplyPatch() error {
if err := gui.returnFocusFromLineByLinePanelIfNecessary(); err != nil {
return err
}
if err := gui.GitCommand.PatchManager.ApplyPatches(false); err != nil {
return gui.createErrorPanel(gui.g, err.Error())
}
return gui.refreshSidePanels(gui.g)
}
func (gui *Gui) handleResetPatch() error { func (gui *Gui) handleResetPatch() error {
gui.GitCommand.PatchManager.Reset() gui.GitCommand.PatchManager.Reset()
return gui.refreshCommitFilesView() return gui.refreshCommitFilesView()