diff --git a/commits_panel.go b/commits_panel.go index 048807ca9..88c7b8ebe 100644 --- a/commits_panel.go +++ b/commits_panel.go @@ -131,7 +131,7 @@ func getSelectedCommit(g *gocui.Gui) (Commit, error) { } lineNumber := getItemPosition(v) if lineNumber > len(state.Commits)-1 { - colorLog(color.FgRed, "potential error in getSelected Commit (mismatched ui and state)", state.Commits, lineNumber) + devLog("potential error in getSelected Commit (mismatched ui and state)", state.Commits, lineNumber) return state.Commits[len(state.Commits)-1], nil } return state.Commits[lineNumber], nil diff --git a/main.go b/main.go index 82574b2f6..c918c7348 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,6 @@ import ( "os/user" "path/filepath" - "github.com/fatih/color" "github.com/jesseduffield/gocui" git "gopkg.in/src-d/go-git.v4" ) @@ -45,18 +44,14 @@ func projectPath(path string) string { } func devLog(objects ...interface{}) { - localLog(color.FgWhite, "development.log", objects...) -} - -func colorLog(colour color.Attribute, objects ...interface{}) { - localLog(colour, "development.log", objects...) + localLog("development.log", objects...) } func commandLog(objects ...interface{}) { - localLog(color.FgWhite, "commands.log", objects...) + localLog("commands.log", objects...) } -func localLog(colour color.Attribute, path string, objects ...interface{}) { +func localLog(path string, objects ...interface{}) { if !*debuggingFlag { return } @@ -65,9 +60,9 @@ func localLog(colour color.Attribute, path string, objects ...interface{}) { panic(err.Error()) } defer f.Close() + log.SetOutput(f) for _, object := range objects { - colorFunction := color.New(colour).SprintFunc() - f.WriteString(colorFunction(fmt.Sprint(object)) + "\n") + log.Println(fmt.Sprint(object)) } } diff --git a/merge_panel.go b/merge_panel.go index 54ff7c21d..6602dbbf1 100644 --- a/merge_panel.go +++ b/merge_panel.go @@ -136,7 +136,6 @@ func pushFileSnapshot(g *gocui.Gui) error { } func handlePopFileSnapshot(g *gocui.Gui, v *gocui.View) error { - colorLog(color.FgCyan, "IM HERE") if state.EditHistory.Len() == 0 { return nil }