mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-10 20:05:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

minor cleanup

Browse source
This commit is contained in:
Jesse Duffield 2018-08-13 21:35:54 +10:00
parent 9e725ae24e
commit 12de0345e4
2 changed files with 1 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

54
main.go
View file

@ -9,11 +9,8 @@ import (
"os/user" "os/user"
"path/filepath" "path/filepath"
"github.com/davecgh/go-spew/spew"
"github.com/jesseduffield/lazygit/pkg/app" "github.com/jesseduffield/lazygit/pkg/app"
"github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/config"
git "gopkg.in/src-d/go-git.v4"
) )
var ( var (
@ -23,9 +20,6 @@ var (
debuggingFlag = flag.Bool("debug", false, "a boolean") debuggingFlag = flag.Bool("debug", false, "a boolean")
versionFlag = flag.Bool("v", false, "Print the current version") versionFlag = flag.Bool("v", false, "Print the current version")
w *git.Worktree
r *git.Repository
) )
func homeDirectory() string { func homeDirectory() string {
@ -41,37 +35,6 @@ func projectPath(path string) string {
return filepath.FromSlash(gopath + "/src/github.com/jesseduffield/lazygit/" + path) return filepath.FromSlash(gopath + "/src/github.com/jesseduffield/lazygit/" + path)
} }
func devLog(objects ...interface{}) {
localLog("development.log", objects...)
}
func objectLog(object interface{}) {
if !*debuggingFlag {
return
}
str := spew.Sdump(object)
localLog("development.log", str)
}
func commandLog(objects ...interface{}) {
localLog("commands.log", objects...)
}
func localLog(path string, objects ...interface{}) {
if !*debuggingFlag {
return
}
f, err := os.OpenFile(projectPath(path), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644)
if err != nil {
panic(err.Error())
}
defer f.Close()
log.SetOutput(f)
for _, object := range objects {
log.Println(fmt.Sprint(object))
}
}
// when building the binary, `version` is set as a compile-time variable, along // when building the binary, `version` is set as a compile-time variable, along
// with `date` and `commit`. If this program has been opened directly via go, // with `date` and `commit`. If this program has been opened directly via go,
// we will populate the `version` with VERSION in the lazygit root directory // we will populate the `version` with VERSION in the lazygit root directory
@ -84,19 +47,6 @@ func fallbackVersion() string {
return string(byteVersion) return string(byteVersion)
} }
func setupWorktree() {
var err error
r, err = git.PlainOpen(".")
if err != nil {
panic(err)
}
w, err = r.Worktree()
if err != nil {
panic(err)
}
}
func main() { func main() {
flag.Parse() flag.Parse()
if version == "unversioned" { if version == "unversioned" {
@ -115,10 +65,6 @@ func main() {
} }
app, err := app.NewApp(appConfig) app, err := app.NewApp(appConfig)
app.Log.Info(err) app.Log.Info(err)
app.GitCommand.SetupGit() app.GitCommand.SetupGit()
// TODO remove this once r, w not used
setupWorktree()
app.Gui.RunWithSubprocesses() app.Gui.RunWithSubprocesses()
} }

1
pkg/gui/gui.go
View file

@ -335,6 +335,7 @@ func (gui *Gui) RunWithSubprocesses() {
break break
} else if err == ErrSubProcess { } else if err == ErrSubProcess {
gui.SubProcess.Run() gui.SubProcess.Run()
gui.SubProcess = nil
} else { } else {
log.Panicln(err) log.Panicln(err)
} }