diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-29 14:34:17 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-29 18:26:24 +1100 |
| commit | 40fbce91ce636eb037c2221946261ce4f4bf4317 (patch) | |
| tree | 9c31eb84b24e6e742ef519a4dad89218cca8092e /pkg/gui/stash_panel.go | |
| parent | 33d287d2f0c6335559ac75c1b9a4705dfaa9ad7b (diff) | |
add new diff mode
WIP
WIP
WIP
WIP
WIP
WIP
WIP
Diffstat (limited to 'pkg/gui/stash_panel.go')
| -rw-r--r-- | pkg/gui/stash_panel.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkg/gui/stash_panel.go b/pkg/gui/stash_panel.go index 67747b80f..cc368be66 100644 --- a/pkg/gui/stash_panel.go +++ b/pkg/gui/stash_panel.go @@ -8,7 +8,7 @@ import ( // list panel functions -func (gui *Gui) getSelectedStashEntry(v *gocui.View) *commands.StashEntry { +func (gui *Gui) getSelectedStashEntry() *commands.StashEntry { selectedLine := gui.State.Panels.Stash.SelectedLine if selectedLine == -1 { return nil @@ -30,12 +30,16 @@ func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error { gui.getMainView().Title = "Stash" - stashEntry := gui.getSelectedStashEntry(v) + stashEntry := gui.getSelectedStashEntry() if stashEntry == nil { return gui.newStringTask("main", gui.Tr.SLocalize("NoStashEntries")) } v.FocusPoint(0, gui.State.Panels.Stash.SelectedLine) + if gui.inDiffMode() { + return gui.renderDiff() + } + cmd := gui.OSCommand.ExecutableFromString( gui.GitCommand.ShowStashEntryCmdStr(stashEntry.Index), ) @@ -53,7 +57,7 @@ func (gui *Gui) refreshStashEntries(g *gocui.Gui) error { stashView := gui.getStashView() - displayStrings := presentation.GetStashEntryListDisplayStrings(gui.State.StashEntries) + displayStrings := presentation.GetStashEntryListDisplayStrings(gui.State.StashEntries, gui.State.Diff.Ref) gui.renderDisplayStrings(stashView, displayStrings) return gui.resetOrigin(stashView) @@ -78,7 +82,7 @@ func (gui *Gui) handleStashDrop(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) stashDo(g *gocui.Gui, v *gocui.View, method string) error { - stashEntry := gui.getSelectedStashEntry(v) + stashEntry := gui.getSelectedStashEntry() if stashEntry == nil { errorMessage := gui.Tr.TemplateLocalize( "NoStashTo", |