diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 11:47:54 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 11:59:45 +1100 |
| commit | 814ee24c8d13ae554925530ec68f325394ddfe6d (patch) | |
| tree | d4713ad9927e84ad043b640165d132fcc6113dca /pkg/gui/stash_panel.go | |
| parent | 7876cddf4a8390e9d22631e9be036c75b05f418c (diff) | |
better error handling
Diffstat (limited to 'pkg/gui/stash_panel.go')
| -rw-r--r-- | pkg/gui/stash_panel.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/stash_panel.go b/pkg/gui/stash_panel.go index cd41b4909..4fae6085c 100644 --- a/pkg/gui/stash_panel.go +++ b/pkg/gui/stash_panel.go @@ -86,21 +86,21 @@ func (gui *Gui) stashDo(g *gocui.Gui, v *gocui.View, method string) error { "method": method, }, ) - return gui.createErrorPanel(g, errorMessage) + return gui.createErrorPanel(errorMessage) } if err := gui.GitCommand.StashDo(stashEntry.Index, method); err != nil { - return gui.createErrorPanel(g, err.Error()) + return gui.surfaceError(err) } return gui.refreshSidePanels(refreshOptions{scope: []int{STASH, FILES}}) } func (gui *Gui) handleStashSave(stashFunc func(message string) error) error { if len(gui.trackedFiles()) == 0 && len(gui.stagedFiles()) == 0 { - return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoTrackedStagedFilesStash")) + return gui.createErrorPanel(gui.Tr.SLocalize("NoTrackedStagedFilesStash")) } return gui.createPromptPanel(gui.g, gui.getFilesView(), gui.Tr.SLocalize("StashChanges"), "", func(g *gocui.Gui, v *gocui.View) error { if err := stashFunc(gui.trimmedContent(v)); err != nil { - return gui.createErrorPanel(g, err.Error()) + return gui.surfaceError(err) } return gui.refreshSidePanels(refreshOptions{scope: []int{STASH, FILES}}) }) |