go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-17 12:06:38 +02:00
Code Issues Releases Activity

post-merge cleanup

Browse Source
This commit is contained in:
Jesse Duffield 2019-02-11 21:07:12 +11:00
parent 3d343e9b57
commit 77faf85cfc
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/confirmation_panel.go
View File

@ -89,7 +89,7 @@ func (gui *Gui) prepareConfirmationPanel(currentView *gocui.View, title, prompt
} }
func (gui *Gui) onNewPopupPanel() { func (gui *Gui) onNewPopupPanel() {
viewNames = []string{"commitMessage", viewNames := []string{"commitMessage",
"credentials", "credentials",
"menu"} "menu"}
for _, viewName := range viewNames { for _, viewName := range viewNames {

8
pkg/gui/credentials_panel.go
View File

@ -36,7 +36,7 @@ func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUn
func (gui *Gui) handleSubmitCredential(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleSubmitCredential(g *gocui.Gui, v *gocui.View) error {
message := gui.trimmedContent(v) message := gui.trimmedContent(v)
gui.credentials <- message gui.credentials <- message
err := gui.refreshFiles(g) err := gui.refreshFiles()
if err != nil { if err != nil {
return err return err
} }
@ -51,7 +51,7 @@ func (gui *Gui) handleSubmitCredential(g *gocui.Gui, v *gocui.View) error {
} }
nextView, err := gui.g.View("confirmation") nextView, err := gui.g.View("confirmation")
if err != nil { if err != nil {
nextView = gui.getFilesView(g) nextView = gui.getFilesView()
} }
err = gui.switchFocus(g, nil, nextView) err = gui.switchFocus(g, nil, nextView)
if err != nil { if err != nil {
@ -67,7 +67,7 @@ func (gui *Gui) handleCloseCredentialsView(g *gocui.Gui, v *gocui.View) error {
} }
gui.credentials <- "" gui.credentials <- ""
return gui.switchFocus(g, nil, gui.getFilesView(g)) return gui.switchFocus(g, nil, gui.getFilesView())
} }
func (gui *Gui) handleCredentialsViewFocused(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleCredentialsViewFocused(g *gocui.Gui, v *gocui.View) error {
@ -96,7 +96,7 @@ func (gui *Gui) HandleCredentialsPopup(g *gocui.Gui, popupOpened bool, cmdErr er
errMessage = gui.Tr.SLocalize("PassUnameWrong") errMessage = gui.Tr.SLocalize("PassUnameWrong")
} }
// 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(gui.g), false) _ = gui.createSpecificErrorPanel(errMessage, gui.getFilesView(), false)
} else { } else {
_ = gui.closeConfirmationPrompt(g) _ = gui.closeConfirmationPrompt(g)
_ = gui.refreshSidePanels(g) _ = gui.refreshSidePanels(g)

4
pkg/gui/files_panel.go
View File

@ -50,7 +50,7 @@ func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View, alreadySelected bo
content := gui.GitCommand.Diff(file, false) content := gui.GitCommand.Diff(file, false)
if alreadySelected { if alreadySelected {
g.Update(func(*gocui.Gui) error { g.Update(func(*gocui.Gui) error {
return gui.setViewContent(gui.g, gui.getMainView(gui.g), content) return gui.setViewContent(gui.g, gui.getMainView(), content)
}) })
return nil return nil
} }
@ -200,7 +200,7 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
return err return err
} }
return gui.handleFileSelect(g, v) return gui.handleFileSelect(g, v, false)
} }
func (gui *Gui) handleAddPatch(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleAddPatch(g *gocui.Gui, v *gocui.View) error {

12
pkg/gui/gui.go
View File

@ -475,7 +475,7 @@ func (gui *Gui) fetch(g *gocui.Gui, v *gocui.View, canAskForCredentials bool) (u
return unamePassOpend, err return unamePassOpend, err
} }
func (gui *Gui) updateLoader(g *gocui.Gui) error { func (gui *Gui) updateLoader() error {
gui.g.Update(func(g *gocui.Gui) error { gui.g.Update(func(g *gocui.Gui) error {
if view, _ := g.View("confirmation"); view != nil { if view, _ := g.View("confirmation"); view != nil {
content := gui.trimmedContent(view) content := gui.trimmedContent(view)
@ -547,15 +547,15 @@ func (gui *Gui) Run() error {
if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew { if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew {
_ = gui.createConfirmationPanel(g, g.CurrentView(), gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), gui.Tr.SLocalize("NoAutomaticGitFetchBody"), nil, nil) _ = gui.createConfirmationPanel(g, g.CurrentView(), gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), gui.Tr.SLocalize("NoAutomaticGitFetchBody"), nil, nil)
} else { } else {
gui.goEvery(g, time.Second*60, func(g *gocui.Gui) error { gui.goEvery(time.Second*60, func() error {
_, err := gui.fetch(g, g.CurrentView(), false) _, err := gui.fetch(gui.g, gui.g.CurrentView(), false)
return err return err
}) })
} }
}() }()
gui.goEvery(g, time.Second*10, gui.refreshFiles) gui.goEvery(time.Second*10, gui.refreshFiles)
gui.goEvery(g, time.Millisecond*50, gui.updateLoader) gui.goEvery(time.Millisecond*50, gui.updateLoader)
gui.goEvery(g, time.Millisecond*50, gui.renderAppStatus) gui.goEvery(time.Millisecond*50, gui.renderAppStatus)
g.SetManagerFunc(gui.layout) g.SetManagerFunc(gui.layout)

1
pkg/gui/keybindings.go
View File

@ -237,7 +237,6 @@ func (gui *Gui) GetKeybindings() []*Binding {
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handlePickHunk, Handler: gui.handlePickHunk,
Description: gui.Tr.SLocalize("PickHunk"), Description: gui.Tr.SLocalize("PickHunk"),
KeyReadable: "space",
}, { }, {
ViewName: "merging", ViewName: "merging",
Key: 'b', Key: 'b',