From 905e6c16ba6e6fbfbd01338538f730b93504303e Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 15 Aug 2018 15:15:21 +1000 Subject: [PATCH 1/3] add credential helper to config of test repo --- test/repos/gpg.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/repos/gpg.sh b/test/repos/gpg.sh index 94e0742e5..719c6467b 100755 --- a/test/repos/gpg.sh +++ b/test/repos/gpg.sh @@ -6,6 +6,8 @@ git init git config gpg.program $(which gpg) git config user.signingkey E304229F # test key git config commit.gpgsign true +git config credential.helper store +git config credential.helper cache 1 touch foo git add foo From 7c33c0293082161aa0e5e79115e30289175a26fd Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 15 Aug 2018 21:43:31 +1000 Subject: [PATCH 2/3] dont panic if unable to close confirmation prompt --- pkg/gui/confirmation_panel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go index 3bec18419..2dd721c81 100644 --- a/pkg/gui/confirmation_panel.go +++ b/pkg/gui/confirmation_panel.go @@ -79,7 +79,7 @@ func (gui *Gui) createConfirmationPanel(g *gocui.Gui, currentView *gocui.View, t // delete the existing confirmation panel if it exists if view, _ := g.View("confirmation"); view != nil { if err := gui.closeConfirmationPrompt(g); err != nil { - panic(err) + gui.Log.Error("Could not close confirmation prompt: ", err.Error()) } } x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, prompt) From 8d99b400fd9b5ba050e1c8f87b5427482bd50c7b Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 15 Aug 2018 21:49:38 +1000 Subject: [PATCH 3/3] factor out code for new popup panels --- pkg/gui/confirmation_panel.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go index 2dd721c81..5018d0a9f 100644 --- a/pkg/gui/confirmation_panel.go +++ b/pkg/gui/confirmation_panel.go @@ -57,7 +57,7 @@ func (gui *Gui) getConfirmationPanelDimensions(g *gocui.Gui, prompt string) (int } func (gui *Gui) createPromptPanel(g *gocui.Gui, currentView *gocui.View, title string, handleConfirm func(*gocui.Gui, *gocui.View) error) error { - g.SetViewOnBottom("commitMessage") + gui.onNewPopupPanel() // only need to fit one line x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, "") if confirmationView, err := g.SetView("confirmation", x0, y0, x1, y1, 0); err != nil { @@ -73,8 +73,12 @@ func (gui *Gui) createPromptPanel(g *gocui.Gui, currentView *gocui.View, title s return nil } +func (gui *Gui) onNewPopupPanel() { + gui.g.SetViewOnBottom("commitMessage") +} + func (gui *Gui) createConfirmationPanel(g *gocui.Gui, currentView *gocui.View, title, prompt string, handleConfirm, handleClose func(*gocui.Gui, *gocui.View) error) error { - g.SetViewOnBottom("commitMessage") + gui.onNewPopupPanel() g.Update(func(g *gocui.Gui) error { // delete the existing confirmation panel if it exists if view, _ := g.View("confirmation"); view != nil {