diff: refactor COLOR_DIFF from a flag into an int

This lets us store more than just a bit flag for whether we
want color; we can also store whether we want automatic
colors. This can be useful for making the automatic-color
decision closer to the point of use.

This mostly just involves replacing DIFF_OPT_* calls with
manipulations of the flag. The biggest exception is that
calls to DIFF_OPT_TST must check for "o->use_color > 0",
which lets an "unknown" value (i.e., the default) stay at
"no color". In the previous code, a value of "-1" was not
propagated at all.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 325891edb610945d01899b102993202af279bf3f..7209edf76af7f43e1e1de149e736c50d6c84c114 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -390,8 +390,6 @@ static void finish(const unsigned char *new_head, const char *msg)
                opts.output_format |=
                        DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
                opts.detect_rename = DIFF_DETECT_RENAME;
                opts.output_format |=
                        DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
                opts.detect_rename = DIFF_DETECT_RENAME;

-               if (diff_use_color_default > 0)
-                       DIFF_OPT_SET(&opts, COLOR_DIFF);

                if (diff_setup_done(&opts) < 0)
                        die(_("diff_setup_done failed"));
                diff_tree_sha1(head, new_head, "", &opts);
                if (diff_setup_done(&opts) < 0)
                        die(_("diff_setup_done failed"));
                diff_tree_sha1(head, new_head, "", &opts);

diff --git a/combine-diff.c b/combine-diff.c
index be67cfcd45469497f81e0c36ed87a11fd409daee..c588c79351a3b12a52ee5b2ce224b98db9c9d8e0 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -702,9 +702,8 @@ static void show_combined_header(struct combine_diff_path *elem,
        int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
        const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/";
        const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/";
        int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
        const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/";
        const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/";

-       int use_color = DIFF_OPT_TST(opt, COLOR_DIFF);
-       const char *c_meta = diff_get_color(use_color, DIFF_METAINFO);
-       const char *c_reset = diff_get_color(use_color, DIFF_RESET);
+       const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO);
+       const char *c_reset = diff_get_color_opt(opt, DIFF_RESET);

        const char *abb;
        int added = 0;
        int deleted = 0;
        const char *abb;
        int added = 0;
        int deleted = 0;


@@ -964,7 +963,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
                show_combined_header(elem, num_parent, dense, rev,
                                     mode_differs, 1);
                dump_sline(sline, cnt, num_parent,
                show_combined_header(elem, num_parent, dense, rev,
                                     mode_differs, 1);
                dump_sline(sline, cnt, num_parent,

-                          DIFF_OPT_TST(opt, COLOR_DIFF), result_deleted);
+                          opt->use_color, result_deleted);

        }
        free(result);
 
        }
        free(result);
 

diff --git a/diff.c b/diff.c
index 9038f190ece061696a3290acf8f1e9951e9d0a6c..cd5ad7525babd815b36797aded562f7049bb5895 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -583,11 +583,10 @@ static void emit_rewrite_diff(const char *name_a,
                              struct diff_options *o)
 {
        int lc_a, lc_b;
                              struct diff_options *o)
 {
        int lc_a, lc_b;

-       int color_diff = DIFF_OPT_TST(o, COLOR_DIFF);

        const char *name_a_tab, *name_b_tab;
        const char *name_a_tab, *name_b_tab;

-       const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO);
-       const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO);
-       const char *reset = diff_get_color(color_diff, DIFF_RESET);
+       const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO);
+       const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
+       const char *reset = diff_get_color(o->use_color, DIFF_RESET);

        static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
        const char *a_prefix, *b_prefix;
        char *data_one, *data_two;
        static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
        const char *a_prefix, *b_prefix;
        char *data_one, *data_two;


@@ -623,7 +622,7 @@ static void emit_rewrite_diff(const char *name_a,
        size_two = fill_textconv(textconv_two, two, &data_two);
 
        memset(&ecbdata, 0, sizeof(ecbdata));
        size_two = fill_textconv(textconv_two, two, &data_two);
 
        memset(&ecbdata, 0, sizeof(ecbdata));

-       ecbdata.color_diff = color_diff;
+       ecbdata.color_diff = o->use_color > 0;

        ecbdata.found_changesp = &o->found_changes;
        ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
        ecbdata.opt = o;
        ecbdata.found_changesp = &o->found_changes;
        ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
        ecbdata.opt = o;


@@ -1004,7 +1003,7 @@ static void free_diff_words_data(struct emit_callback *ecbdata)
 
 const char *diff_get_color(int diff_use_color, enum color_diff ix)
 {
 
 const char *diff_get_color(int diff_use_color, enum color_diff ix)
 {

-       if (diff_use_color)
+       if (diff_use_color > 0)

                return diff_colors[ix];
        return "";
 }
                return diff_colors[ix];
        return "";
 }


@@ -1786,11 +1785,10 @@ static int is_conflict_marker(const char *line, int marker_size, unsigned long l
 static void checkdiff_consume(void *priv, char *line, unsigned long len)
 {
        struct checkdiff_t *data = priv;
 static void checkdiff_consume(void *priv, char *line, unsigned long len)
 {
        struct checkdiff_t *data = priv;

-       int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF);

        int marker_size = data->conflict_marker_size;
        int marker_size = data->conflict_marker_size;

-       const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE);
-       const char *reset = diff_get_color(color_diff, DIFF_RESET);
-       const char *set = diff_get_color(color_diff, DIFF_FILE_NEW);
+       const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
+       const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
+       const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);

        char *err;
        char *line_prefix = "";
        struct strbuf *msgbuf;
        char *err;
        char *line_prefix = "";
        struct strbuf *msgbuf;


@@ -2135,7 +2133,7 @@ static void builtin_diff(const char *name_a,
                memset(&xecfg, 0, sizeof(xecfg));
                memset(&ecbdata, 0, sizeof(ecbdata));
                ecbdata.label_path = lbl;
                memset(&xecfg, 0, sizeof(xecfg));
                memset(&ecbdata, 0, sizeof(ecbdata));
                ecbdata.label_path = lbl;

-               ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
+               ecbdata.color_diff = o->use_color > 0;

                ecbdata.found_changesp = &o->found_changes;
                ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
                if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
                ecbdata.found_changesp = &o->found_changes;
                ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
                if (ecbdata.ws_rule & WS_BLANK_AT_EOF)


@@ -2183,7 +2181,7 @@ static void builtin_diff(const char *name_a,
                                        break;
                                }
                        }
                                        break;
                                }
                        }

-                       if (DIFF_OPT_TST(o, COLOR_DIFF)) {
+                       if (o->use_color > 0) {

                                struct diff_words_style *st = ecbdata.diff_words->style;
                                st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
                                st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
                                struct diff_words_style *st = ecbdata.diff_words->style;
                                st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
                                st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);


@@ -2833,7 +2831,7 @@ static void run_diff_cmd(const char *pgm,
                 */
                fill_metainfo(msg, name, other, one, two, o, p,
                              &must_show_header,
                 */
                fill_metainfo(msg, name, other, one, two, o, p,
                              &must_show_header,

-                             DIFF_OPT_TST(o, COLOR_DIFF) && !pgm);
+                             o->use_color > 0 && !pgm);

                xfrm_msg = msg->len ? msg->buf : NULL;
        }
 
                xfrm_msg = msg->len ? msg->buf : NULL;
        }
 


@@ -2999,8 +2997,7 @@ void diff_setup(struct diff_options *options)
 
        options->change = diff_change;
        options->add_remove = diff_addremove;
 
        options->change = diff_change;
        options->add_remove = diff_addremove;

-       if (diff_use_color_default > 0)
-               DIFF_OPT_SET(options, COLOR_DIFF);
+       options->use_color = diff_use_color_default;

        options->detect_rename = diff_detect_rename_default;
 
        if (diff_no_prefix) {
        options->detect_rename = diff_detect_rename_default;
 
        if (diff_no_prefix) {


@@ -3374,24 +3371,24 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
        else if (!strcmp(arg, "--follow"))
                DIFF_OPT_SET(options, FOLLOW_RENAMES);
        else if (!strcmp(arg, "--color"))
        else if (!strcmp(arg, "--follow"))
                DIFF_OPT_SET(options, FOLLOW_RENAMES);
        else if (!strcmp(arg, "--color"))

-               DIFF_OPT_SET(options, COLOR_DIFF);
+               options->use_color = 1;

        else if (!prefixcmp(arg, "--color=")) {
                int value = git_config_colorbool(NULL, arg+8, -1);
                if (value == 0)
        else if (!prefixcmp(arg, "--color=")) {
                int value = git_config_colorbool(NULL, arg+8, -1);
                if (value == 0)

-                       DIFF_OPT_CLR(options, COLOR_DIFF);
+                       options->use_color = 0;

                else if (value > 0)
                else if (value > 0)

-                       DIFF_OPT_SET(options, COLOR_DIFF);
+                       options->use_color = 1;

                else
                        return error("option `color' expects \"always\", \"auto\", or \"never\"");
        }
        else if (!strcmp(arg, "--no-color"))
                else
                        return error("option `color' expects \"always\", \"auto\", or \"never\"");
        }
        else if (!strcmp(arg, "--no-color"))

-               DIFF_OPT_CLR(options, COLOR_DIFF);
+               options->use_color = 0;

        else if (!strcmp(arg, "--color-words")) {
        else if (!strcmp(arg, "--color-words")) {

-               DIFF_OPT_SET(options, COLOR_DIFF);
+               options->use_color = 1;

                options->word_diff = DIFF_WORDS_COLOR;
        }
        else if (!prefixcmp(arg, "--color-words=")) {
                options->word_diff = DIFF_WORDS_COLOR;
        }
        else if (!prefixcmp(arg, "--color-words=")) {

-               DIFF_OPT_SET(options, COLOR_DIFF);
+               options->use_color = 1;

                options->word_diff = DIFF_WORDS_COLOR;
                options->word_regex = arg + 14;
        }
                options->word_diff = DIFF_WORDS_COLOR;
                options->word_regex = arg + 14;
        }


@@ -3404,7 +3401,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
                if (!strcmp(type, "plain"))
                        options->word_diff = DIFF_WORDS_PLAIN;
                else if (!strcmp(type, "color")) {
                if (!strcmp(type, "plain"))
                        options->word_diff = DIFF_WORDS_PLAIN;
                else if (!strcmp(type, "color")) {

-                       DIFF_OPT_SET(options, COLOR_DIFF);
+                       options->use_color = 1;

                        options->word_diff = DIFF_WORDS_COLOR;
                }
                else if (!strcmp(type, "porcelain"))
                        options->word_diff = DIFF_WORDS_COLOR;
                }
                else if (!strcmp(type, "porcelain"))

diff --git a/diff.h b/diff.h
index 6d303c1d50aa799ec90aeb64b2a1b1f55811dd46..04a9ad781b54e4beef2987a050b7e6c6f6cd33cf 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -58,7 +58,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
 #define DIFF_OPT_SILENT_ON_REMOVE    (1 <<  5)
 #define DIFF_OPT_FIND_COPIES_HARDER  (1 <<  6)
 #define DIFF_OPT_FOLLOW_RENAMES      (1 <<  7)
 #define DIFF_OPT_SILENT_ON_REMOVE    (1 <<  5)
 #define DIFF_OPT_FIND_COPIES_HARDER  (1 <<  6)
 #define DIFF_OPT_FOLLOW_RENAMES      (1 <<  7)

-#define DIFF_OPT_COLOR_DIFF          (1 <<  8)
+/* (1 <<  8) unused */

 /* (1 <<  9) unused */
 #define DIFF_OPT_HAS_CHANGES         (1 << 10)
 #define DIFF_OPT_QUICK               (1 << 11)
 /* (1 <<  9) unused */
 #define DIFF_OPT_HAS_CHANGES         (1 << 10)
 #define DIFF_OPT_QUICK               (1 << 11)


@@ -101,6 +101,7 @@ struct diff_options {
        const char *single_follow;
        const char *a_prefix, *b_prefix;
        unsigned flags;
        const char *single_follow;
        const char *a_prefix, *b_prefix;
        unsigned flags;

+       int use_color;

        int context;
        int interhunkcontext;
        int break_opt;
        int context;
        int interhunkcontext;
        int break_opt;


@@ -159,7 +160,7 @@ enum color_diff {
 };
 const char *diff_get_color(int diff_use_color, enum color_diff ix);
 #define diff_get_color_opt(o, ix) \
 };
 const char *diff_get_color(int diff_use_color, enum color_diff ix);
 #define diff_get_color_opt(o, ix) \

-       diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
+       diff_get_color((o)->use_color, ix)

 
 
 extern const char mime_boundary_leader[];
 
 
 extern const char mime_boundary_leader[];

diff --git a/graph.c b/graph.c
index 2f6893dc4f97dfbccad6f22f66861c24021a3c46..556834a973863fa2bc3f9f8d02fe16cabc4359d8 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -347,7 +347,7 @@ static struct commit_list *first_interesting_parent(struct git_graph *graph)
 
 static unsigned short graph_get_current_column_color(const struct git_graph *graph)
 {
 
 static unsigned short graph_get_current_column_color(const struct git_graph *graph)
 {

-       if (!DIFF_OPT_TST(&graph->revs->diffopt, COLOR_DIFF))
+       if (graph->revs->diffopt.use_color <= 0)

                return column_colors_max;
        return graph->default_column_color;
 }
                return column_colors_max;
        return graph->default_column_color;
 }

diff --git a/log-tree.c b/log-tree.c
index e9457019d5ac7aff1e185e195f37b851732f6210..9ba8fb2af37ae0b027b4f9df1f01e3bcf1f2888c 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -31,7 +31,7 @@ static char decoration_colors[][COLOR_MAXLEN] = {
 
 static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
 {
 
 static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
 {

-       if (decorate_use_color)
+       if (decorate_use_color > 0)

                return decoration_colors[ix];
        return "";
 }
                return decoration_colors[ix];
        return "";
 }


@@ -77,7 +77,7 @@ int parse_decorate_color_config(const char *var, const int ofs, const char *valu
  * for showing the commit sha1, use the same check for --decorate
  */
 #define decorate_get_color_opt(o, ix) \
  * for showing the commit sha1, use the same check for --decorate
  */
 #define decorate_get_color_opt(o, ix) \

-       decorate_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
+       decorate_get_color((o)->use_color, ix)

 
 static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
 {
 
 static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
 {

diff --git a/wt-status.c b/wt-status.c
index 9f4e0ba9c17120ca2903b30b95b6d8fbcc62cd9c..da4bce5816c1437c2f761db9d8aedbcb72aba019 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -681,7 +681,7 @@ static void wt_status_print_verbose(struct wt_status *s)
         * will have checked isatty on stdout).
         */
        if (s->fp != stdout)
         * will have checked isatty on stdout).
         */
        if (s->fp != stdout)

-               DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF);
+               rev.diffopt.use_color = 0;

        run_diff_index(&rev, 1);
 }
 
        run_diff_index(&rev, 1);
 }