mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 21:05:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Removed some variables and placed them inside the gui struct

Browse source
This commit is contained in:
mjarkk 2018-11-10 09:27:03 +01:00
parent 32ecc6d745
commit 8742c4c110
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
pkg/gui/commit_message_panel.go
View file

@ -52,14 +52,16 @@ func (gui *Gui) handleCommitFocused(g *gocui.Gui, v *gocui.View) error {
return gui.renderString(g, "options", message) return gui.renderString(g, "options", message)
} }
var unamePassMessage = "" type credentials struct {
var waitForGroup sync.WaitGroup unamePassMessage string
var waitForGroupActie = false waitForGroup sync.WaitGroup
waitForGroupActie bool
}
// 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 gui.credentials.waitForGroupActie = true
waitForGroup.Add(1) gui.credentials.waitForGroup.Add(1)
pushPassUnameView, _ := g.View("pushPassUname") pushPassUnameView, _ := g.View("pushPassUname")
if passOrUname == "username" { if passOrUname == "username" {
@ -83,8 +85,8 @@ func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUn
}) })
// wait for username/passwords input // wait for username/passwords input
waitForGroup.Wait() gui.credentials.waitForGroup.Wait()
return unamePassMessage return gui.credentials.unamePassMessage
} }
func (gui *Gui) handlePushConfirm(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handlePushConfirm(g *gocui.Gui, v *gocui.View) error {
@ -94,10 +96,10 @@ func (gui *Gui) handlePushConfirm(g *gocui.Gui, v *gocui.View) error {
// if not dune the push progress will run forever // if not dune the push progress will run forever
message = "-" message = "-"
} }
unamePassMessage = message gui.credentials.unamePassMessage = message
if waitForGroupActie { if gui.credentials.waitForGroupActie {
waitForGroup.Done() gui.credentials.waitForGroup.Done()
waitForGroupActie = false gui.credentials.waitForGroupActie = false
} }
err := gui.refreshFiles(g) err := gui.refreshFiles(g)
if err != nil { if err != nil {
@ -124,10 +126,10 @@ func (gui *Gui) handlePushClose(g *gocui.Gui, v *gocui.View) error {
if err != nil { if err != nil {
return err return err
} }
unamePassMessage = "" gui.credentials.unamePassMessage = ""
if waitForGroupActie { if gui.credentials.waitForGroupActie {
waitForGroup.Done() gui.credentials.waitForGroup.Done()
waitForGroupActie = false gui.credentials.waitForGroupActie = false
} }
return gui.switchFocus(g, v, gui.getFilesView(g)) return gui.switchFocus(g, v, gui.getFilesView(g))
} }

1
pkg/gui/gui.go
View file

@ -70,6 +70,7 @@ type Gui struct {
Errors SentinelErrors Errors SentinelErrors
Updater *updates.Updater Updater *updates.Updater
statusManager *statusManager statusManager *statusManager
credentials credentials
} }
type guiState struct { type guiState struct {