Add coloring for review state in "git appraise list"

commands/list.go

@@ -57,7 +57,7 @@ func listReviews(repo repository.Repo, args []string) error {
 		return nil
 	}
 	for _, r := range reviews {
-		output.PrintSummary(&r, &repo)
+		output.PrintSummary(&r)
 	}
 	return nil
 }

commands/output/output.go

@@ -87,30 +87,44 @@ func getStatusString(r *review.Summary) string {
 	return "rejected"
 }
 
-// PrintSummary prints a single-line summary of a review.
-func PrintSummary(r *review.Summary, repo *repository.Repo) {
-	var use_color bool = false
+func getColoredStatusString(repo repository.Repo, statusString string) string {
+	useColor, err := repo.GetColorBool("color.appraise")
+	if err != nil || !useColor {
+		return statusString
+	}
 
-	if repo != nil {
-		use_color = (*repo).GetColorBool("color.appraise")
+	var colorOn string
+	var colorOff string
+
+	defaultColor, _ := default_color[statusString]
+	colorOn, err = repo.GetColor(
+		fmt.Sprintf("color.appraise.%s", statusString),
+		defaultColor,
+	)
+	if err != nil {
+		return statusString
 	}
 
-	statusString := getStatusString(r)
-	indentedDescription := strings.Replace(r.Request.Description, "\n", "\n  ", -1)
+	colorOff, err = repo.GetColor("", "reset")
 
-	var colorOn string = ""
-	var colorOff string = ""
-	if use_color {
-		defaultColor, _ := default_color[statusString]
-		colorOn = (*repo).GetColor(
-			fmt.Sprintf("color.appraise.%s", statusString),
-			defaultColor,
-		)
-		colorOff = "\033[00m"
+	if err != nil {
+		return statusString
 	}
-	coloredStatusString := fmt.Sprintf("%s%s%s", colorOn, statusString, colorOff)
 
-	fmt.Printf(reviewSummaryTemplate, coloredStatusString, r.Revision, indentedDescription)
+	return fmt.Sprintf("%s%s%s", colorOn, statusString, colorOff)
+}
+
+// PrintSummary prints a single-line summary of a review.
+func PrintSummary(r *review.Summary) {
+	statusString := getStatusString(r)
+	indentedDescription := strings.Replace(r.Request.Description, "\n", "\n  ", -1)
+
+	fmt.Printf(
+		reviewSummaryTemplate,
+		getColoredStatusString(r.Repo, statusString),
+		r.Revision,
+		indentedDescription,
+	)
 }
 
 // reformatTimestamp takes a timestamp string of the form "0123456789" and changes it
@@ -213,7 +227,7 @@ func printComments(r *review.Review) error {
 
 // PrintDetails prints a multi-line overview of a review, including all comments.
 func PrintDetails(r *review.Review) error {
-	PrintSummary(r.Summary, nil)
+	PrintSummary(r.Summary)
 	fmt.Printf(reviewDetailsTemplate, r.Request.ReviewRef, r.Request.TargetRef,
 		strings.Join(r.Request.Reviewers, ", "),
 		r.Request.Requester, r.GetBuildStatusMessage())

repository/git.go

@@ -986,36 +986,11 @@ func (repo *GitRepo) FetchAndReturnNewReviewHashes(remote, notesRefPattern,
 	return updatedReviews, nil
 }
 
-func (repo *GitRepo) GetColorBool(name string) bool {
-	ok := repo.runGitCommandInline("config", "--get-colorbool", name)
-	return (ok == nil)
-}
-
-func (repo *GitRepo) GetColor(name, default_value string) string {
-	var res string
-	var ok error
-	if default_value == "" {
-		res, ok = repo.runGitCommand(
-			"config",
-			"--type=color",
-			"-z",
-			"--get",
-			name,
-		)
-	} else {
-		res, ok = repo.runGitCommand(
-			"config",
-			"--type=color",
-			"-z",
-			"--default",
-			default_value,
-			"--get",
-			name,
-		)
-	}
+func (repo *GitRepo) GetColorBool(name string) (bool, error) {
+	err := repo.runGitCommandInline("config", "--get-colorbool", name)
+	return (err == nil), nil
+}
 
-	if ok != nil {
-		return ""
-	}
-	return res
+func (repo *GitRepo) GetColor(name, defaultValue string) (string, error) {
+	return repo.runGitCommand("config", "--get-color", name, defaultValue)
 }

repository/mock_repo.go

@@ -612,10 +612,10 @@ func (repo *mockRepoForTest) FetchAndReturnNewReviewHashes(remote, notesRefPatte
 	return nil, nil
 }
 
-func (repo *mockRepoForTest) GetColorBool(name string) bool {
-	return false
+func (repo *mockRepoForTest) GetColorBool(name string) (bool, error) {
+	return false, nil
 }
 
-func (repo *mockRepoForTest) GetColor(name, default_value string) string {
-	return ""
+func (repo *mockRepoForTest) GetColor(name, default_value string) (string, error) {
+	return "", nil
 }

repository/repo.go

@@ -51,6 +51,12 @@ type Repo interface {
 	// GetSubmitStrategy returns the way in which a review is submitted
 	GetSubmitStrategy() (string, error)
 
+	// GetColorBool returns color setting for "name" (e.g. color.diff).
+	GetColorBool(name string) (bool, error)
+
+	// GetColor returns color configured for "name" (e.g. color.diff.new).
+	GetColor(name, default_value string) (string, error)
+
 	// HasUncommittedChanges returns true if there are local, uncommitted changes.
 	HasUncommittedChanges() (bool, error)
 
@@ -218,7 +224,4 @@ type Repo interface {
 	// changed because the _names_ of these files correspond to the revisions
 	// they point to.
 	FetchAndReturnNewReviewHashes(remote, notesRefPattern, archiveRefPattern string) ([]string, error)
-
-	GetColorBool(name string) bool
-	GetColor(name, default_value string) string
 }