1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-01 00:54:58 +02:00

First good success

This commit is contained in:
mjarkk
2018-10-20 17:37:55 +02:00
parent 727ba9f42e
commit 12425f0aa7
7 changed files with 109 additions and 13 deletions

View File

@ -3,6 +3,7 @@ package gui
import (
"strconv"
"strings"
"sync"
"github.com/jesseduffield/gocui"
)
@ -51,6 +52,71 @@ func (gui *Gui) handleCommitFocused(g *gocui.Gui, v *gocui.View) error {
return gui.renderString(g, "options", message)
}
var unamePassMessage = ""
var waitForGroup sync.WaitGroup
var waitForGroupActie = false
// 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 {
pushPassUnameView := gui.getPushPassUnameView(g)
if passOrUname == "username" {
pushPassUnameView.Title = gui.Tr.SLocalize("PushUsername")
// pushPassUnameView.Mask = 1
} else {
pushPassUnameView.Title = gui.Tr.SLocalize("PushPassword")
pushPassUnameView.Mask = '*'
}
g.Update(func(g *gocui.Gui) error {
g.SetViewOnTop("pushPassUname")
gui.switchFocus(g, currentView, pushPassUnameView)
gui.RenderCommitLength()
return nil
})
waitForGroupActie = true
waitForGroup.Add(1)
waitForGroup.Wait()
return unamePassMessage
}
func (gui *Gui) handlePushConfirm(g *gocui.Gui, v *gocui.View) error {
message := gui.trimmedContent(v)
unamePassMessage = message
if waitForGroupActie {
defer waitForGroup.Done()
}
gui.refreshFiles(g)
v.Clear()
v.SetCursor(0, 0)
g.SetViewOnBottom("pushPassUname")
gui.switchFocus(g, v, gui.getFilesView(g))
return gui.refreshCommits(g)
}
func (gui *Gui) handlePushClose(g *gocui.Gui, v *gocui.View) error {
g.SetViewOnBottom("pushPassUname")
unamePassMessage = ""
if waitForGroupActie {
defer waitForGroup.Done()
}
return gui.switchFocus(g, v, gui.getFilesView(g))
}
func (gui *Gui) handlePushFocused(g *gocui.Gui, v *gocui.View) error {
if _, err := g.SetViewOnTop("pushPassUname"); err != nil {
return err
}
message := gui.Tr.TemplateLocalize(
"CloseConfirm",
Teml{
"keyBindClose": "esc",
"keyBindConfirm": "enter",
},
)
return gui.renderString(g, "options", message)
}
func (gui *Gui) simpleEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
switch {
case key == gocui.KeyBackspace || key == gocui.KeyBackspace2: