Clean up use of ANSI color sequences

Remove the literal ANSI escape sequences and replace them by readable
constants.

Signed-off-by: Arjen Laarhoven <arjen@yaph.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-branch.c b/builtin-branch.c
index 56a1971d690e32ca1cb0bc2d66ee05be48bfe565..fe139e1f053eabaeb5e51079a9e57fec673c79af 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -32,11 +32,11 @@ static unsigned char head_sha1[20];
 
 static int branch_use_color = -1;
 static char branch_colors[][COLOR_MAXLEN] = {
-       "\033[m",       /* reset */
-       "",             /* PLAIN (normal) */
-       "\033[31m",     /* REMOTE (red) */
-       "",             /* LOCAL (normal) */
-       "\033[32m",     /* CURRENT (green) */
+       GIT_COLOR_RESET,
+       GIT_COLOR_NORMAL,       /* PLAIN */
+       GIT_COLOR_RED,          /* REMOTE */
+       GIT_COLOR_NORMAL,       /* LOCAL */
+       GIT_COLOR_GREEN,        /* CURRENT */
 };
 enum color_branch {
        COLOR_BRANCH_RESET = 0,

diff --git a/color.c b/color.c
index db4dccfb77d80c9bd8981719fe2d0dc17c6772b6..62977f4808ae339fdfe797e16b4eb28dc6abb85d 100644 (file)
--- a/color.c
+++ b/color.c
@@ -1,8 +1,6 @@
 #include "cache.h"
 #include "color.h"
 
-#define COLOR_RESET "\033[m"
-
 int git_use_color_default = 0;
 
 static int parse_color(const char *name, int len)
@@ -54,7 +52,7 @@ void color_parse_mem(const char *value, int value_len, const char *var,
        int bg = -2;
 
        if (!strncasecmp(value, "reset", len)) {
-               strcpy(dst, "\033[m");
+               strcpy(dst, GIT_COLOR_RESET);
                return;
        }
 
@@ -175,7 +173,7 @@ static int color_vfprintf(FILE *fp, const char *color, const char *fmt,
                r += fprintf(fp, "%s", color);
        r += vfprintf(fp, fmt, args);
        if (*color)
-               r += fprintf(fp, "%s", COLOR_RESET);
+               r += fprintf(fp, "%s", GIT_COLOR_RESET);
        if (trail)
                r += fprintf(fp, "%s", trail);
        return r;
@@ -217,7 +215,7 @@ int color_fwrite_lines(FILE *fp, const char *color,
                char *p = memchr(buf, '\n', count);
                if (p != buf && (fputs(color, fp) < 0 ||
                                fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
-                               fputs(COLOR_RESET, fp) < 0))
+                               fputs(GIT_COLOR_RESET, fp) < 0))
                        return -1;
                if (!p)
                        return 0;

diff --git a/color.h b/color.h
index 5019df82f79f1888b3aa57b9752a6a55b13f475a..6846be1706c1842f5a53abafd4e03758a36695e9 100644 (file)
--- a/color.h
+++ b/color.h
@@ -4,6 +4,16 @@
 /* "\033[1;38;5;2xx;48;5;2xxm\0" is 23 bytes */
 #define COLOR_MAXLEN 24
 
+#define GIT_COLOR_NORMAL       ""
+#define GIT_COLOR_RESET                "\033[m"
+#define GIT_COLOR_BOLD         "\033[1m"
+#define GIT_COLOR_RED          "\033[31m"
+#define GIT_COLOR_GREEN                "\033[32m"
+#define GIT_COLOR_YELLOW       "\033[33m"
+#define GIT_COLOR_BLUE         "\033[34m"
+#define GIT_COLOR_CYAN         "\033[36m"
+#define GIT_COLOR_BG_RED       "\033[41m"
+
 /*
  * This variable stores the value of color.ui
  */

diff --git a/diff.c b/diff.c
index be3859e0a7b48ddd79f993866513d204cd83575f..a3db16ea66b13dbc1715e6e54b6a2f0ae4669677 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -30,14 +30,14 @@ int diff_auto_refresh_index = 1;
 static int diff_mnemonic_prefix;
 
 static char diff_colors[][COLOR_MAXLEN] = {
-       "\033[m",       /* reset */
-       "",             /* PLAIN (normal) */
-       "\033[1m",      /* METAINFO (bold) */
-       "\033[36m",     /* FRAGINFO (cyan) */
-       "\033[31m",     /* OLD (red) */
-       "\033[32m",     /* NEW (green) */
-       "\033[33m",     /* COMMIT (yellow) */
-       "\033[41m",     /* WHITESPACE (red background) */
+       GIT_COLOR_RESET,
+       GIT_COLOR_NORMAL,       /* PLAIN */
+       GIT_COLOR_BOLD,         /* METAINFO */
+       GIT_COLOR_CYAN,         /* FRAGINFO */
+       GIT_COLOR_RED,          /* OLD */
+       GIT_COLOR_GREEN,        /* NEW */
+       GIT_COLOR_YELLOW,       /* COMMIT */
+       GIT_COLOR_BG_RED,       /* WHITESPACE */
 };
 
 static void diff_filespec_load_driver(struct diff_filespec *one);

diff --git a/pretty.c b/pretty.c
index cc460b56970c3869e67feb816f76f4804e37e7ce..66bae42f99ec791257a3005951dd2ab33301882f 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -567,16 +567,16 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
                        return end - placeholder + 1;
                }
                if (!prefixcmp(placeholder + 1, "red")) {
-                       strbuf_addstr(sb, "\033[31m");
+                       strbuf_addstr(sb, GIT_COLOR_RED);
                        return 4;
                } else if (!prefixcmp(placeholder + 1, "green")) {
-                       strbuf_addstr(sb, "\033[32m");
+                       strbuf_addstr(sb, GIT_COLOR_GREEN);
                        return 6;
                } else if (!prefixcmp(placeholder + 1, "blue")) {
-                       strbuf_addstr(sb, "\033[34m");
+                       strbuf_addstr(sb, GIT_COLOR_BLUE);
                        return 5;
                } else if (!prefixcmp(placeholder + 1, "reset")) {
-                       strbuf_addstr(sb, "\033[m");
+                       strbuf_addstr(sb, GIT_COLOR_RESET);
                        return 6;
                } else
                        return 0;

diff --git a/wt-status.c b/wt-status.c
index 96ff2f8f564b907b9ef77bd2ea41b5e854a13085..dd87339ff7b0faeb60091b087e5839c3cce9898c 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -15,11 +15,11 @@ int wt_status_relative_paths = 1;
 int wt_status_use_color = -1;
 int wt_status_submodule_summary;
 static char wt_status_colors[][COLOR_MAXLEN] = {
-       "",         /* WT_STATUS_HEADER: normal */
-       "\033[32m", /* WT_STATUS_UPDATED: green */
-       "\033[31m", /* WT_STATUS_CHANGED: red */
-       "\033[31m", /* WT_STATUS_UNTRACKED: red */
-       "\033[31m", /* WT_STATUS_NOBRANCH: red */
+       GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
+       GIT_COLOR_GREEN,  /* WT_STATUS_UPDATED */
+       GIT_COLOR_RED,    /* WT_STATUS_CHANGED */
+       GIT_COLOR_RED,    /* WT_STATUS_UNTRACKED */
+       GIT_COLOR_RED,    /* WT_STATUS_NOBRANCH */
 };
 
 enum untracked_status_type show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;