diff options
author | mjarkk <mkopenga@gmail.com> | 2018-12-10 08:22:52 +0100 |
---|---|---|
committer | mjarkk <mkopenga@gmail.com> | 2018-12-10 08:22:52 +0100 |
commit | 50f20de8f34b53b808710e91fea501cb1e26ff89 (patch) | |
tree | 779de132630f6c72aadc4a2ba483041384e3403b /pkg/gui/files_panel.go | |
parent | 8e3f5e19e0ad1b9ebfe6c19d47cc6538f3fa9085 (diff) |
Removed a lot of duplicated code
Diffstat (limited to 'pkg/gui/files_panel.go')
-rw-r--r-- | pkg/gui/files_panel.go | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 6e525e006..a89138161 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -388,24 +388,7 @@ func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error { unamePassOpend = true return gui.waitForPassUname(g, v, passOrUname) }) - if err != nil { - errMessage := err.Error() - if errMessage == "exit status 128" { - errMessage = gui.Tr.SLocalize("PassUnameWrong") - } - _ = gui.createErrorPanel(g, errMessage) - if unamePassOpend { - _ = g.DeleteView("credentials") - } - } else { - if unamePassOpend { - _ = g.DeleteView("credentials") - } - _ = gui.closeConfirmationPrompt(g) - _ = gui.refreshCommits(g) - _ = gui.refreshStatus(g) - } - gui.refreshFiles(g) + gui.HandleCredentialsPopup(g, unamePassOpend, err) }() return nil } @@ -421,22 +404,7 @@ func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error unamePassOpend = true return gui.waitForPassUname(g, v, passOrUname) }) - if err != nil { - errMessage := err.Error() - if errMessage == "exit status 128" { - errMessage = gui.Tr.SLocalize("PassUnameWrong") - } - _ = gui.createErrorPanel(g, errMessage) - if unamePassOpend { - _ = g.DeleteView("credentials") - } - } else { - if unamePassOpend { - _ = g.DeleteView("credentials") - } - _ = gui.closeConfirmationPrompt(g) - _ = gui.refreshSidePanels(g) - } + gui.HandleCredentialsPopup(g, unamePassOpend, err) }() return nil } |