diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-07-21 18:12:05 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-07-21 18:24:39 +1000 |
| commit | f4718a904769b372b52cf3cd2c890b34d751620a (patch) | |
| tree | 91a9c9a44c7524bd664521af005fbdc8eb9d32f1 | |
| parent | 7d5fe4b66c908cdd55487ee40ddb461efe333f11 (diff) | |
allow editing commit filesv0.20.11
| -rw-r--r-- | docs/keybindings/Keybindings_en.md | 1 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_nl.md | 1 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_pl.md | 1 | ||||
| -rw-r--r-- | pkg/gui/commit_files_panel.go | 13 | ||||
| -rw-r--r-- | pkg/gui/keybindings.go | 6 |
5 files changed, 22 insertions, 0 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index c4ea18d97..1c8a29d91 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -104,6 +104,7 @@ <kbd>c</kbd>: checkout file <kbd>d</kbd>: discard this commit's changes to this file <kbd>o</kbd>: open file + <kbd>e</kbd>: edit file <kbd>space</kbd>: toggle file included in patch <kbd>enter</kbd>: enter file to add selected lines to the patch <kbd>,</kbd>: previous page diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index f3bd9b37d..51c87919b 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -104,6 +104,7 @@ <kbd>c</kbd>: bestand uitchecken <kbd>d</kbd>: uitsluit deze commit zijn veranderingen aan dit bestand <kbd>o</kbd>: open bestand + <kbd>e</kbd>: verander bestand <kbd>space</kbd>: toggle file included in patch <kbd>enter</kbd>: enter file to add selected lines to the patch <kbd>,</kbd>: previous page diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 3ea71d5d0..cab96715f 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -104,6 +104,7 @@ <kbd>c</kbd>: checkout file <kbd>d</kbd>: discard this commit's changes to this file <kbd>o</kbd>: otwórz plik + <kbd>e</kbd>: edytuj plik <kbd>space</kbd>: toggle file included in patch <kbd>enter</kbd>: enter file to add selected lines to the patch <kbd>,</kbd>: previous page diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go index 4870876c0..886fe3d7b 100644 --- a/pkg/gui/commit_files_panel.go +++ b/pkg/gui/commit_files_panel.go @@ -121,9 +121,22 @@ func (gui *Gui) refreshCommitFilesView() error { func (gui *Gui) handleOpenOldCommitFile(g *gocui.Gui, v *gocui.View) error { file := gui.getSelectedCommitFile() + if file == nil { + return nil + } + return gui.openFile(file.Name) } +func (gui *Gui) handleEditCommitFile(g *gocui.Gui, v *gocui.View) error { + file := gui.getSelectedCommitFile() + if file == nil { + return nil + } + + return gui.editFile(file.Name) +} + func (gui *Gui) handleToggleFileForPatch(g *gocui.Gui, v *gocui.View) error { if ok, err := gui.validateNormalWorkingTreeState(); !ok { return err diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 283daa779..66d9f086f 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -880,6 +880,12 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { }, { ViewName: "commitFiles", + Key: gui.getKey("universal.edit"), + Handler: gui.handleEditCommitFile, + Description: gui.Tr.SLocalize("editFile"), + }, + { + ViewName: "commitFiles", Key: gui.getKey("universal.select"), Handler: gui.handleToggleFileForPatch, Description: gui.Tr.SLocalize("toggleAddToPatch"), |