From 7b7621c18c437368d6796302fe576e665aded722 Mon Sep 17 00:00:00 2001 From: Anthony HAMON Date: Mon, 6 Aug 2018 07:37:14 +0200 Subject: [PATCH] apply gofmt -s -w --- commits_panel.go | 218 +++++++++++++++++++++++------------------------ status_panel.go | 68 +++++++-------- 2 files changed, 143 insertions(+), 143 deletions(-) diff --git a/commits_panel.go b/commits_panel.go index 767e49bcd..048807ca9 100644 --- a/commits_panel.go +++ b/commits_panel.go @@ -1,138 +1,138 @@ package main import ( - "errors" + "errors" - "github.com/fatih/color" - "github.com/jesseduffield/gocui" + "github.com/fatih/color" + "github.com/jesseduffield/gocui" ) var ( - // ErrNoCommits : When no commits are found for the branch - ErrNoCommits = errors.New("No commits for this branch") + // ErrNoCommits : When no commits are found for the branch + ErrNoCommits = errors.New("No commits for this branch") ) func refreshCommits(g *gocui.Gui) error { - g.Update(func(*gocui.Gui) error { - state.Commits = getCommits() - v, err := g.View("commits") - if err != nil { - panic(err) - } - v.Clear() - red := color.New(color.FgRed) - yellow := color.New(color.FgYellow) - white := color.New(color.FgWhite) - shaColor := white - for _, commit := range state.Commits { - if commit.Pushed { - shaColor = red - } else { - shaColor = yellow - } - shaColor.Fprint(v, commit.Sha+" ") - white.Fprintln(v, commit.Name) - } - refreshStatus(g) - return nil - }) - return nil + g.Update(func(*gocui.Gui) error { + state.Commits = getCommits() + v, err := g.View("commits") + if err != nil { + panic(err) + } + v.Clear() + red := color.New(color.FgRed) + yellow := color.New(color.FgYellow) + white := color.New(color.FgWhite) + shaColor := white + for _, commit := range state.Commits { + if commit.Pushed { + shaColor = red + } else { + shaColor = yellow + } + shaColor.Fprint(v, commit.Sha+" ") + white.Fprintln(v, commit.Name) + } + refreshStatus(g) + return nil + }) + return nil } func handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error { - return createConfirmationPanel(g, commitView, "Reset To Commit", "Are you sure you want to reset to this commit?", func(g *gocui.Gui, v *gocui.View) error { - commit, err := getSelectedCommit(g) - devLog(commit) - if err != nil { - panic(err) - } - if output, err := gitResetToCommit(commit.Sha); err != nil { - return createErrorPanel(g, output) - } - if err := refreshCommits(g); err != nil { - panic(err) - } - if err := refreshFiles(g); err != nil { - panic(err) - } - resetOrigin(commitView) - return handleCommitSelect(g, nil) - }, nil) + return createConfirmationPanel(g, commitView, "Reset To Commit", "Are you sure you want to reset to this commit?", func(g *gocui.Gui, v *gocui.View) error { + commit, err := getSelectedCommit(g) + devLog(commit) + if err != nil { + panic(err) + } + if output, err := gitResetToCommit(commit.Sha); err != nil { + return createErrorPanel(g, output) + } + if err := refreshCommits(g); err != nil { + panic(err) + } + if err := refreshFiles(g); err != nil { + panic(err) + } + resetOrigin(commitView) + return handleCommitSelect(g, nil) + }, nil) } func renderCommitsOptions(g *gocui.Gui) error { - return renderOptionsMap(g, map[string]string{ - "s": "squash down", - "r": "rename", - "g": "reset to this commit", - "← → ↑ ↓": "navigate", - }) + return renderOptionsMap(g, map[string]string{ + "s": "squash down", + "r": "rename", + "g": "reset to this commit", + "← → ↑ ↓": "navigate", + }) } func handleCommitSelect(g *gocui.Gui, v *gocui.View) error { - if err := renderCommitsOptions(g); err != nil { - return err - } - commit, err := getSelectedCommit(g) - if err != nil { - if err != ErrNoCommits { - return err - } - return renderString(g, "main", "No commits for this branch") - } - commitText := gitShow(commit.Sha) - return renderString(g, "main", commitText) + if err := renderCommitsOptions(g); err != nil { + return err + } + commit, err := getSelectedCommit(g) + if err != nil { + if err != ErrNoCommits { + return err + } + return renderString(g, "main", "No commits for this branch") + } + commitText := gitShow(commit.Sha) + return renderString(g, "main", commitText) } func handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error { - if getItemPosition(v) != 0 { - return createErrorPanel(g, "Can only squash topmost commit") - } - if len(state.Commits) == 1 { - return createErrorPanel(g, "You have no commits to squash with") - } - commit, err := getSelectedCommit(g) - if err != nil { - return err - } - if output, err := gitSquashPreviousTwoCommits(commit.Name); err != nil { - return createErrorPanel(g, output) - } - if err := refreshCommits(g); err != nil { - panic(err) - } - refreshStatus(g) - return handleCommitSelect(g, v) + if getItemPosition(v) != 0 { + return createErrorPanel(g, "Can only squash topmost commit") + } + if len(state.Commits) == 1 { + return createErrorPanel(g, "You have no commits to squash with") + } + commit, err := getSelectedCommit(g) + if err != nil { + return err + } + if output, err := gitSquashPreviousTwoCommits(commit.Name); err != nil { + return createErrorPanel(g, output) + } + if err := refreshCommits(g); err != nil { + panic(err) + } + refreshStatus(g) + return handleCommitSelect(g, v) } func handleRenameCommit(g *gocui.Gui, v *gocui.View) error { - if getItemPosition(v) != 0 { - return createErrorPanel(g, "Can only rename topmost commit") - } - createPromptPanel(g, v, "Rename Commit", func(g *gocui.Gui, v *gocui.View) error { - if output, err := gitRenameCommit(v.Buffer()); err != nil { - return createErrorPanel(g, output) - } - if err := refreshCommits(g); err != nil { - panic(err) - } - return handleCommitSelect(g, v) - }) - return nil + if getItemPosition(v) != 0 { + return createErrorPanel(g, "Can only rename topmost commit") + } + createPromptPanel(g, v, "Rename Commit", func(g *gocui.Gui, v *gocui.View) error { + if output, err := gitRenameCommit(v.Buffer()); err != nil { + return createErrorPanel(g, output) + } + if err := refreshCommits(g); err != nil { + panic(err) + } + return handleCommitSelect(g, v) + }) + return nil } func getSelectedCommit(g *gocui.Gui) (Commit, error) { - v, err := g.View("commits") - if err != nil { - panic(err) - } - if len(state.Commits) == 0 { - return Commit{}, ErrNoCommits - } - lineNumber := getItemPosition(v) - if lineNumber > len(state.Commits)-1 { - colorLog(color.FgRed, "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 + v, err := g.View("commits") + if err != nil { + panic(err) + } + if len(state.Commits) == 0 { + return Commit{}, ErrNoCommits + } + lineNumber := getItemPosition(v) + if lineNumber > len(state.Commits)-1 { + colorLog(color.FgRed, "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/status_panel.go b/status_panel.go index cbc6956a8..6e3ec35e8 100644 --- a/status_panel.go +++ b/status_panel.go @@ -1,43 +1,43 @@ package main import ( - "fmt" - "time" + "fmt" + "time" - "github.com/fatih/color" - "github.com/jesseduffield/gocui" + "github.com/fatih/color" + "github.com/jesseduffield/gocui" ) func refreshStatus(g *gocui.Gui) error { - v, err := g.View("status") - if err != nil { - panic(err) - } - // for some reason if this isn't wrapped in an update the clear seems to - // be applied after the other things or something like that; the panel's - // contents end up cleared - g.Update(func(*gocui.Gui) error { - v.Clear() - pushables, pullables := gitUpstreamDifferenceCount() - fmt.Fprint(v, "↑"+pushables+"↓"+pullables) - branches := state.Branches - if err := updateHasMergeConflictStatus(); err != nil { - return err - } - if state.HasMergeConflicts { - colour := color.New(color.FgYellow) - fmt.Fprint(v, coloredString(" (merging)", colour)) - } - if len(branches) == 0 { - return nil - } - branch := branches[0] - // utilising the fact these all have padding to only grab the name - // from the display string with the existing coloring applied - fmt.Fprint(v, " "+branch.DisplayString[4:]) - colorLog(color.FgCyan, time.Now().Sub(startTime)) - return nil - }) + v, err := g.View("status") + if err != nil { + panic(err) + } + // for some reason if this isn't wrapped in an update the clear seems to + // be applied after the other things or something like that; the panel's + // contents end up cleared + g.Update(func(*gocui.Gui) error { + v.Clear() + pushables, pullables := gitUpstreamDifferenceCount() + fmt.Fprint(v, "↑"+pushables+"↓"+pullables) + branches := state.Branches + if err := updateHasMergeConflictStatus(); err != nil { + return err + } + if state.HasMergeConflicts { + colour := color.New(color.FgYellow) + fmt.Fprint(v, coloredString(" (merging)", colour)) + } + if len(branches) == 0 { + return nil + } + branch := branches[0] + // utilising the fact these all have padding to only grab the name + // from the display string with the existing coloring applied + fmt.Fprint(v, " "+branch.DisplayString[4:]) + colorLog(color.FgCyan, time.Now().Sub(startTime)) + return nil + }) - return nil + return nil }