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

merge master

Browse Source
This commit is contained in:
Jesse Duffield
2018-08-07 18:13:45 +10:00
parent f6a9c727fa f8ca0ddcad
commit 7fe54e889d
286 changed files with 168565 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
files_panel.go
View File

@ -59,11 +59,8 @@ func handleFilePress(g *gocui.Gui, v *gocui.View) error {
if err := refreshFiles(g); err != nil {
return err
}
if err := handleFileSelect(g, v); err != nil {
return err
}
return nil
return handleFileSelect(g, v)
}
func getSelectedFile(g *gocui.Gui) (GitFile, error) {
@ -81,6 +78,9 @@ func getSelectedFile(g *gocui.Gui) (GitFile, error) {
func handleFileRemove(g *gocui.Gui, v *gocui.View) error {
file, err := getSelectedFile(g)
if err != nil {
if err == ErrNoFiles {
return nil
}
return err
}
var deleteVerb string
@ -163,8 +163,8 @@ func handleCommitPress(g *gocui.Gui, filesView *gocui.View) error {
if message == "" {
return createErrorPanel(g, "You cannot commit without a commit message")
}
if err := gitCommit(message); err != nil {
panic(err)
if output, err := gitCommit(message); err != nil {
return createErrorPanel(g, output)
}
refreshFiles(g)
return refreshCommits(g)
@ -180,8 +180,10 @@ func genericFileOpen(g *gocui.Gui, v *gocui.View, open func(*gocui.Gui, string)
}
return nil
}
_, err = open(g, file.Name)
return err
if output, err := open(file.Name); err != nil {
return createErrorPanel(g, output)
}
return nil
}
func handleFileEdit(g *gocui.Gui, v *gocui.View) error {