go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-01 13:17:53 +02:00
Code Issues Releases Activity

Fixed golangcibot surgestions

Browse Source
This commit is contained in:
mjarkk 2018-10-20 18:58:37 +02:00
parent 12425f0aa7
commit b72841ca0c
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/gui/commit_message_panel.go
View File

@ -58,6 +58,8 @@ var waitForGroupActie = false
// waitForPassUname wait for a username or password input from the pushPassUname popup // waitForPassUname wait for a username or password input from the pushPassUname popup
func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUname string) string { func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUname string) string {
waitForGroupActie = true
waitForGroup.Add(1)
pushPassUnameView := gui.getPushPassUnameView(g) pushPassUnameView := gui.getPushPassUnameView(g)
if passOrUname == "username" { if passOrUname == "username" {
pushPassUnameView.Title = gui.Tr.SLocalize("PushUsername") pushPassUnameView.Title = gui.Tr.SLocalize("PushUsername")
@ -67,15 +69,18 @@ func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUn
pushPassUnameView.Mask = '*' pushPassUnameView.Mask = '*'
} }
g.Update(func(g *gocui.Gui) error { g.Update(func(g *gocui.Gui) error {
g.SetViewOnTop("pushPassUname") _, err := g.SetViewOnTop("pushPassUname")
gui.switchFocus(g, currentView, pushPassUnameView) if err != nil {
return err
}
err = gui.switchFocus(g, currentView, pushPassUnameView)
if err != nil {
return err
}
gui.RenderCommitLength() gui.RenderCommitLength()
return nil return nil
}) })
waitForGroupActie = true
waitForGroup.Add(1)
waitForGroup.Wait() waitForGroup.Wait()
return unamePassMessage return unamePassMessage
} }
@ -85,16 +90,31 @@ func (gui *Gui) handlePushConfirm(g *gocui.Gui, v *gocui.View) error {
if waitForGroupActie { if waitForGroupActie {
defer waitForGroup.Done() defer waitForGroup.Done()
} }
gui.refreshFiles(g) err := gui.refreshFiles(g)
if err != nil {
return err
}
v.Clear() v.Clear()
v.SetCursor(0, 0) err = v.SetCursor(0, 0)
g.SetViewOnBottom("pushPassUname") if err != nil {
gui.switchFocus(g, v, gui.getFilesView(g)) return err
}
_, err = g.SetViewOnBottom("pushPassUname")
if err != nil {
return err
}
err = gui.switchFocus(g, v, gui.getFilesView(g))
if err != nil {
return err
}
return gui.refreshCommits(g) return gui.refreshCommits(g)
} }
func (gui *Gui) handlePushClose(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handlePushClose(g *gocui.Gui, v *gocui.View) error {
g.SetViewOnBottom("pushPassUname") _, err := g.SetViewOnBottom("pushPassUname")
if err != nil {
return err
}
unamePassMessage = "" unamePassMessage = ""
if waitForGroupActie { if waitForGroupActie {
defer waitForGroup.Done() defer waitForGroup.Done()

5
pkg/gui/gui.go
View File

@ -274,7 +274,10 @@ func (gui *Gui) layout(g *gocui.Gui) error {
if err != gocui.ErrUnknownView { if err != gocui.ErrUnknownView {
return err return err
} }
g.SetViewOnBottom("pushPassUname") _, err := g.SetViewOnBottom("pushPassUname")
if err != nil {
return err
}
pushPassUnameView.Title = gui.Tr.SLocalize("PushUsername") pushPassUnameView.Title = gui.Tr.SLocalize("PushUsername")
pushPassUnameView.FgColor = gocui.ColorWhite pushPassUnameView.FgColor = gocui.ColorWhite
pushPassUnameView.Editable = true pushPassUnameView.Editable = true