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

Worked and fixed a view comments

Browse Source
This commit is contained in:
mjarkk 2018-12-09 13:04:19 +01:00
parent efb82a58ae
commit f14effe5f5
6 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/exec_live_default.go
View File

@ -31,7 +31,7 @@ func RunCommandWithOutputLiveWrapper(c *OSCommand, command string, output func(s
tty, err := pty.Start(cmd)
if err != nil {
return errorMessage, err
return "", err
}
stopAsking := make(chan struct{})

4
pkg/commands/git.go
View File

@ -261,9 +261,9 @@ func (c *GitCommand) RenameCommit(name string) error {
}
// Fetch fetch git repo
func (c *GitCommand) Fetch(unamePassQuestion func(string) string, canSskForCredentials bool) error {
func (c *GitCommand) Fetch(unamePassQuestion func(string) string, canAskForCredentials bool) error {
return c.OSCommand.DetectUnamePass("git fetch", func(question string) string {
if canSskForCredentials {
if canAskForCredentials {
return unamePassQuestion(question)
}
return "-"

5
pkg/commands/os.go
View File

@ -87,7 +87,10 @@ func (c *OSCommand) DetectUnamePass(command string, ask func(string) string) err
}
for askFor, prompt := range prompts {
if match, _ := regexp.MatchString(prompt.pattern, ttyText); match && prompt.canAskFor {
if !prompt.canAskFor {
continue
}
if match, _ := regexp.MatchString(prompt.pattern, ttyText); match {
prompt.canAskFor = false
ttyText = ""
return ask(askFor)

2
pkg/config/app_config.go
View File

@ -245,7 +245,7 @@ func getDefaultAppState() []byte {
return []byte(`
lastUpdateCheck: 0
recentRepos: []
RecentPrivateRepos: []
recentPrivateRepos: []
`)
}

13
pkg/gui/branches_panel.go
View File

@ -136,12 +136,13 @@ func (gui *Gui) handleGitFetch(g *gocui.Gui, v *gocui.View) error {
errMessage = gui.Tr.SLocalize("PassUnameWrong")
}
_ = gui.createErrorPanel(g, errMessage)
}
if unamePassOpend {
_, _ = g.SetViewOnBottom("pushPassUname")
_ = g.DeleteView("pushPassUname")
}
if err == nil {
if unamePassOpend {
_ = g.DeleteView("pushPassUname")
}
} else {
if unamePassOpend {
_ = g.DeleteView("pushPassUname")
}
_ = gui.closeConfirmationPrompt(g)
_ = gui.refreshCommits(g)
_ = gui.refreshStatus(g)

26
pkg/gui/files_panel.go
View File

@ -394,12 +394,13 @@ func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error {
errMessage = gui.Tr.SLocalize("PassUnameWrong")
}
_ = gui.createErrorPanel(g, errMessage)
}
if unamePassOpend {
_, _ = g.SetViewOnBottom("pushPassUname")
_ = g.DeleteView("pushPassUname")
}
if err == nil {
if unamePassOpend {
_ = g.DeleteView("pushPassUname")
}
} else {
if unamePassOpend {
_ = g.DeleteView("pushPassUname")
}
_ = gui.closeConfirmationPrompt(g)
_ = gui.refreshCommits(g)
_ = gui.refreshStatus(g)
@ -426,12 +427,13 @@ func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error
errMessage = gui.Tr.SLocalize("PassUnameWrong")
}
_ = gui.createErrorPanel(g, errMessage)
}
if unamePassOpend {
_, _ = g.SetViewOnBottom("pushPassUname")
_ = g.DeleteView("pushPassUname")
}
if err == nil {
if unamePassOpend {
_ = g.DeleteView("pushPassUname")
}
} else {
if unamePassOpend {
_ = g.DeleteView("pushPassUname")
}
_ = gui.closeConfirmationPrompt(g)
_ = gui.refreshSidePanels(g)
}