go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-23 22:50:41 +02:00
Code Issues Releases Activity

minor refactor

Browse Source
This commit is contained in:
Jesse Duffield 2020-08-11 21:29:18 +10:00
parent 8ff74072f8
commit f49e4946f2
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/gui/branches_panel.go
View File

@ -131,10 +131,7 @@ func (gui *Gui) handleGitFetch(g *gocui.Gui, v *gocui.View) error {
go func() { go func() {
err := gui.fetch(true) err := gui.fetch(true)
gui.HandleCredentialsPopup(err) gui.HandleCredentialsPopup(err)
if err == nil { _ = gui.refreshSidePanels(refreshOptions{mode: ASYNC})
_ = gui.closeConfirmationPrompt(gui.g, true)
_ = gui.refreshSidePanels(refreshOptions{mode: ASYNC})
}
}() }()
return nil return nil
} }

2
pkg/gui/credentials_panel.go
View File

@ -86,5 +86,7 @@ func (gui *Gui) HandleCredentialsPopup(cmdErr error) {
} }
// we are not logging this error because it may contain a password // we are not logging this error because it may contain a password
_ = gui.createSpecificErrorPanel(errMessage, gui.getFilesView(), false) _ = gui.createSpecificErrorPanel(errMessage, gui.getFilesView(), false)
} else {
_ = gui.closeConfirmationPrompt(gui.g, true)
} }
} }

36
pkg/gui/files_panel.go
View File

@ -487,20 +487,23 @@ func (gui *Gui) pullFiles(opts PullFilesOptions) error {
}, },
) )
gui.HandleCredentialsPopup(err) gui.HandleCredentialsPopup(err)
if err == nil { if err != nil {
switch strategy { _ = gui.refreshSidePanels(refreshOptions{mode: ASYNC})
case "rebase": return
err := gui.GitCommand.RebaseBranch("FETCH_HEAD") }
_ = gui.handleGenericMergeCommandResult(err)
case "merge": switch strategy {
err := gui.GitCommand.Merge("FETCH_HEAD", commands.MergeOpts{}) case "rebase":
_ = gui.handleGenericMergeCommandResult(err) err := gui.GitCommand.RebaseBranch("FETCH_HEAD")
case "ff-only": _ = gui.handleGenericMergeCommandResult(err)
err := gui.GitCommand.Merge("FETCH_HEAD", commands.MergeOpts{FastForwardOnly: true}) case "merge":
_ = gui.handleGenericMergeCommandResult(err) err := gui.GitCommand.Merge("FETCH_HEAD", commands.MergeOpts{})
default: _ = gui.handleGenericMergeCommandResult(err)
_ = gui.createErrorPanel(fmt.Sprintf("git pull strategy '%s' unrecognised", strategy)) case "ff-only":
} err := gui.GitCommand.Merge("FETCH_HEAD", commands.MergeOpts{FastForwardOnly: true})
_ = gui.handleGenericMergeCommandResult(err)
default:
_ = gui.createErrorPanel(fmt.Sprintf("git pull strategy '%s' unrecognised", strategy))
} }
}() }()
@ -515,10 +518,7 @@ func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstr
branchName := gui.getCheckedOutBranch().Name branchName := gui.getCheckedOutBranch().Name
err := gui.GitCommand.Push(branchName, force, upstream, args, gui.promptUserForCredential) err := gui.GitCommand.Push(branchName, force, upstream, args, gui.promptUserForCredential)
gui.HandleCredentialsPopup(err) gui.HandleCredentialsPopup(err)
if err == nil { _ = gui.refreshSidePanels(refreshOptions{mode: ASYNC})
_ = gui.closeConfirmationPrompt(gui.g, true)
_ = gui.refreshSidePanels(refreshOptions{mode: ASYNC})
}
}() }()
return nil return nil
} }