go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-27 00:51:18 +02:00
Code Issues Releases Activity

Fixed view not defined error with git push and pull

Browse Source
This commit is contained in:
mjarkk
2018-11-02 15:07:10 +01:00
parent cb9ad5bc73
commit af54d7f015
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/gui/commit_message_panel.go
View File

@ -84,7 +84,6 @@ func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUn
// wait for username/passwords input // wait for username/passwords input
waitForGroup.Wait() waitForGroup.Wait()
_ = gui.switchFocus(g, pushPassUnameView, currentView)
return unamePassMessage return unamePassMessage
} }

40
pkg/gui/files_panel.go
View File

@ -350,20 +350,21 @@ func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error {
unamePassOpend = true unamePassOpend = true
return gui.waitForPassUname(g, v, passOrUname) return gui.waitForPassUname(g, v, passOrUname)
}) })
if unamePassOpend {
_, _ = g.SetViewOnBottom("pushPassUname")
_ = g.DeleteView("pushPassUname")
}
if err != nil { if err != nil {
errMessage := err.Error() errMessage := err.Error()
if errMessage == "exit status 128" { if errMessage == "exit status 128" {
errMessage = gui.Tr.SLocalize("PassUnameWrong") errMessage = gui.Tr.SLocalize("PassUnameWrong")
} }
_ = gui.createErrorPanel(gui.g, errMessage) _ = gui.createErrorPanel(g, errMessage)
} else { }
_ = gui.closeConfirmationPrompt(gui.g) if unamePassOpend {
_ = gui.refreshCommits(gui.g) _, _ = g.SetViewOnBottom("pushPassUname")
_ = gui.refreshStatus(gui.g) _ = g.DeleteView("pushPassUname")
}
if err == nil {
_ = gui.closeConfirmationPrompt(g)
_ = gui.refreshCommits(g)
_ = gui.refreshStatus(g)
} }
gui.refreshFiles(g) gui.refreshFiles(g)
}() }()
@ -371,7 +372,7 @@ func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error {
} }
func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error { func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error {
if err := gui.createMessagePanel(gui.g, v, "", gui.Tr.SLocalize("PushWait")); err != nil { if err := gui.createMessagePanel(g, v, "", gui.Tr.SLocalize("PushWait")); err != nil {
return err return err
} }
go func() { go func() {
@ -381,20 +382,21 @@ func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error
unamePassOpend = true unamePassOpend = true
return gui.waitForPassUname(g, v, passOrUname) return gui.waitForPassUname(g, v, passOrUname)
}) })
if unamePassOpend {
_, _ = g.SetViewOnBottom("pushPassUname")
_ = g.DeleteView("pushPassUname")
}
if err != nil { if err != nil {
errMessage := err.Error() errMessage := err.Error()
if errMessage == "exit status 128" { if errMessage == "exit status 128" {
errMessage = gui.Tr.SLocalize("PassUnameWrong") errMessage = gui.Tr.SLocalize("PassUnameWrong")
} }
_ = gui.createErrorPanel(gui.g, errMessage) _ = gui.createErrorPanel(g, errMessage)
} else { }
_ = gui.closeConfirmationPrompt(gui.g) if unamePassOpend {
_ = gui.refreshCommits(gui.g) _, _ = g.SetViewOnBottom("pushPassUname")
_ = gui.refreshStatus(gui.g) _ = g.DeleteView("pushPassUname")
}
if err == nil {
_ = gui.closeConfirmationPrompt(g)
_ = gui.refreshCommits(g)
_ = gui.refreshStatus(g)
} }
}() }()
return nil return nil