go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-09-16 09:16:26 +02:00
Code Issues Releases Activity

Removed a lot of duplicated code

Browse Source
This commit is contained in:
mjarkk
2018-12-10 08:22:52 +01:00
parent 8e3f5e19e0
commit 50f20de8f3
3 changed files with 23 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/gui/files_panel.go
View File

@@ -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
}