git_config_colorbool: refactor stdout_is_tty handling

Usually this function figures out for itself whether stdout
is a tty. However, it has an extra parameter just to allow
git-config to override the auto-detection for its
--get-colorbool option.

Instead of an extra parameter, let's just use a global
variable. This makes calling easier in the common case, and
will make refactoring the colorbool code much simpler.

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

diff --git a/builtin/branch.c b/builtin/branch.c
index 3142daa57a6fa1c8a7d21095946bf5d26443d0e0..b15fee5e31893ece7f0d9f7d6cd2b8c1f51ab6f4 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -71,7 +71,7 @@ static int parse_branch_color_slot(const char *var, int ofs)
 static int git_branch_config(const char *var, const char *value, void *cb)
 {
        if (!strcmp(var, "color.branch")) {
 static int git_branch_config(const char *var, const char *value, void *cb)
 {
        if (!strcmp(var, "color.branch")) {

-               branch_use_color = git_config_colorbool(var, value, -1);
+               branch_use_color = git_config_colorbool(var, value);

                return 0;
        }
        if (!prefixcmp(var, "color.branch.")) {
                return 0;
        }
        if (!prefixcmp(var, "color.branch.")) {

diff --git a/builtin/commit.c b/builtin/commit.c
index e1af9b19f0be71484ae9341762dc2bf89cabb70c..295803a265fbf04345af6b98af8f28873735143f 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1144,7 +1144,7 @@ static int git_status_config(const char *k, const char *v, void *cb)
                return 0;
        }
        if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
                return 0;
        }
        if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {

-               s->use_color = git_config_colorbool(k, v, -1);
+               s->use_color = git_config_colorbool(k, v);

                return 0;
        }
        if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
                return 0;
        }
        if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {

diff --git a/builtin/config.c b/builtin/config.c
index 211e118d575411b712ccf0387db2408708576902..5505ced8c13c5b7a93baa02fe6bd23c54fc1b1b1 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -303,24 +303,17 @@ static void get_color(const char *def_color)
        fputs(parsed_color, stdout);
 }
 
        fputs(parsed_color, stdout);
 }
 

-static int stdout_is_tty;

 static int get_colorbool_found;
 static int get_diff_color_found;
 static int git_get_colorbool_config(const char *var, const char *value,
                void *cb)
 {
 static int get_colorbool_found;
 static int get_diff_color_found;
 static int git_get_colorbool_config(const char *var, const char *value,
                void *cb)
 {

-       if (!strcmp(var, get_colorbool_slot)) {
-               get_colorbool_found =
-                       git_config_colorbool(var, value, stdout_is_tty);
-       }
-       if (!strcmp(var, "diff.color")) {
-               get_diff_color_found =
-                       git_config_colorbool(var, value, stdout_is_tty);
-       }
-       if (!strcmp(var, "color.ui")) {
-               git_use_color_default = git_config_colorbool(var, value, stdout_is_tty);
-               return 0;
-       }
+       if (!strcmp(var, get_colorbool_slot))
+               get_colorbool_found = git_config_colorbool(var, value);
+       else if (!strcmp(var, "diff.color"))
+               get_diff_color_found = git_config_colorbool(var, value);
+       else if (!strcmp(var, "color.ui"))
+               git_use_color_default = git_config_colorbool(var, value);

        return 0;
 }
 
        return 0;
 }
 


@@ -510,9 +503,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
        }
        else if (actions == ACTION_GET_COLORBOOL) {
                if (argc == 1)
        }
        else if (actions == ACTION_GET_COLORBOOL) {
                if (argc == 1)

-                       stdout_is_tty = git_config_bool("command line", argv[0]);
-               else if (argc == 0)
-                       stdout_is_tty = isatty(1);
+                       color_stdout_is_tty = git_config_bool("command line", argv[0]);

                return get_colorbool(argc != 0);
        }
 
                return get_colorbool(argc != 0);
        }
 

diff --git a/builtin/grep.c b/builtin/grep.c
index 871afaa3c76ea34b67671a6e4a46957a08a946e5..c17d7de562d1903fdd5ed8736d05014fec4e9f4a 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -316,7 +316,7 @@ static int grep_config(const char *var, const char *value, void *cb)
        }
 
        if (!strcmp(var, "color.grep"))
        }
 
        if (!strcmp(var, "color.grep"))

-               opt->color = git_config_colorbool(var, value, -1);
+               opt->color = git_config_colorbool(var, value);

        else if (!strcmp(var, "color.grep.context"))
                color = opt->color_context;
        else if (!strcmp(var, "color.grep.filename"))
        else if (!strcmp(var, "color.grep.context"))
                color = opt->color_context;
        else if (!strcmp(var, "color.grep.filename"))

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index facc63a79ec0c86fd9df59792cd4f20030af5db1..e6650b483722b9c5ad2df1d6eb59af1cb9a88c39 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -573,7 +573,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
        }
 
        if (!strcmp(var, "color.showbranch")) {
        }
 
        if (!strcmp(var, "color.showbranch")) {

-               showbranch_use_color = git_config_colorbool(var, value, -1);
+               showbranch_use_color = git_config_colorbool(var, value);

                return 0;
        }
 
                return 0;
        }
 

diff --git a/color.c b/color.c
index 3db214c24720496f13481b718e46810c21f53b8d..67affa4765cff33186766143f935f7f7ec3ec91c 100644 (file)
--- a/color.c
+++ b/color.c
@@ -2,6 +2,7 @@
 #include "color.h"
 
 int git_use_color_default = 0;
 #include "color.h"
 
 int git_use_color_default = 0;

+int color_stdout_is_tty = -1;

 
 /*
  * The list of available column colors.
 
 /*
  * The list of available column colors.


@@ -157,7 +158,7 @@ void color_parse_mem(const char *value, int value_len, const char *var,
        die("bad color value '%.*s' for variable '%s'", value_len, value, var);
 }
 
        die("bad color value '%.*s' for variable '%s'", value_len, value, var);
 }
 

-int git_config_colorbool(const char *var, const char *value, int stdout_is_tty)
+int git_config_colorbool(const char *var, const char *value)

 {
        if (value) {
                if (!strcasecmp(value, "never"))
 {
        if (value) {
                if (!strcasecmp(value, "never"))


@@ -177,9 +178,9 @@ int git_config_colorbool(const char *var, const char *value, int stdout_is_tty)
 
        /* any normal truth value defaults to 'auto' */
  auto_color:
 
        /* any normal truth value defaults to 'auto' */
  auto_color:

-       if (stdout_is_tty < 0)
-               stdout_is_tty = isatty(1);
-       if (stdout_is_tty || (pager_in_use() && pager_use_color)) {
+       if (color_stdout_is_tty < 0)
+               color_stdout_is_tty = isatty(1);
+       if (color_stdout_is_tty || (pager_in_use() && pager_use_color)) {

                char *term = getenv("TERM");
                if (term && strcmp(term, "dumb"))
                        return 1;
                char *term = getenv("TERM");
                if (term && strcmp(term, "dumb"))
                        return 1;


@@ -190,7 +191,7 @@ int git_config_colorbool(const char *var, const char *value, int stdout_is_tty)
 int git_color_default_config(const char *var, const char *value, void *cb)
 {
        if (!strcmp(var, "color.ui")) {
 int git_color_default_config(const char *var, const char *value, void *cb)
 {
        if (!strcmp(var, "color.ui")) {

-               git_use_color_default = git_config_colorbool(var, value, -1);
+               git_use_color_default = git_config_colorbool(var, value);

                return 0;
        }
 
                return 0;
        }
 

diff --git a/color.h b/color.h
index 68a926a2cdfb870ae0da0bfbc4c5b36681609911..a190a2522b12aa8711ff1ec74bd9a861b8267e35 100644 (file)
--- a/color.h
+++ b/color.h
@@ -57,12 +57,18 @@ extern int git_use_color_default;
 extern const char *column_colors_ansi[];
 extern const int column_colors_ansi_max;
 
 extern const char *column_colors_ansi[];
 extern const int column_colors_ansi_max;
 

+/*
+ * Generally the color code will lazily figure this out itself, but
+ * this provides a mechanism for callers to override autodetection.
+ */
+extern int color_stdout_is_tty;
+

 /*
  * Use this instead of git_default_config if you need the value of color.ui.
  */
 int git_color_default_config(const char *var, const char *value, void *cb);
 
 /*
  * Use this instead of git_default_config if you need the value of color.ui.
  */
 int git_color_default_config(const char *var, const char *value, void *cb);
 

-int git_config_colorbool(const char *var, const char *value, int stdout_is_tty);
+int git_config_colorbool(const char *var, const char *value);

 void color_parse(const char *value, const char *var, char *dst);
 void color_parse_mem(const char *value, int len, const char *var, char *dst);
 __attribute__((format (printf, 3, 4)))
 void color_parse(const char *value, const char *var, char *dst);
 void color_parse_mem(const char *value, int len, const char *var, char *dst);
 __attribute__((format (printf, 3, 4)))

diff --git a/diff.c b/diff.c
index cd5ad7525babd815b36797aded562f7049bb5895..1f87f23190fd9817a2bae388197a1ca26cd7e1ae 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -137,7 +137,7 @@ static int git_config_rename(const char *var, const char *value)
 int git_diff_ui_config(const char *var, const char *value, void *cb)
 {
        if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
 int git_diff_ui_config(const char *var, const char *value, void *cb)
 {
        if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {

-               diff_use_color_default = git_config_colorbool(var, value, -1);
+               diff_use_color_default = git_config_colorbool(var, value);

                return 0;
        }
        if (!strcmp(var, "diff.renames")) {
                return 0;
        }
        if (!strcmp(var, "diff.renames")) {


@@ -3373,7 +3373,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
        else if (!strcmp(arg, "--color"))
                options->use_color = 1;
        else if (!prefixcmp(arg, "--color=")) {
        else if (!strcmp(arg, "--color"))
                options->use_color = 1;
        else if (!prefixcmp(arg, "--color=")) {

-               int value = git_config_colorbool(NULL, arg+8, -1);
+               int value = git_config_colorbool(NULL, arg+8);

                if (value == 0)
                        options->use_color = 0;
                else if (value > 0)
                if (value == 0)
                        options->use_color = 0;
                else if (value > 0)

diff --git a/parse-options.c b/parse-options.c
index 73bd28ad90986af1618d82176076133186d045de..12a5b25d09ca8725c7e948192235f3d53b331b18 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -620,7 +620,7 @@ int parse_opt_color_flag_cb(const struct option *opt, const char *arg,
 
        if (!arg)
                arg = unset ? "never" : (const char *)opt->defval;
 
        if (!arg)
                arg = unset ? "never" : (const char *)opt->defval;

-       value = git_config_colorbool(NULL, arg, -1);
+       value = git_config_colorbool(NULL, arg);

        if (value < 0)
                return opterror(opt,
                        "expects \"always\", \"auto\", or \"never\"", 0);
        if (value < 0)
                return opterror(opt,
                        "expects \"always\", \"auto\", or \"never\"", 0);