kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git config: reorganize get_color* 

In preparation for parseopt.

Also remove some unecessary comments since the usage is described in the
documentation.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 2009-02-21 02:48:57 +02:00 committed by Junio C Hamano
parent b408457f2e
commit 0e854a280a
1 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
builtin-config.c
View File

@ -192,29 +192,8 @@ static int git_get_color_config(const char *var, const char *value, void *cb)
return 0; return 0;
} }


static int get_color(int argc, const char **argv) static void get_color(const char *def_color)
{ {
/*
* grab the color setting for the given slot from the configuration,
* or parse the default value if missing, and return ANSI color
* escape sequence.
*
* e.g.
* git config --get-color color.diff.whitespace "blue reverse"
*/
const char *def_color = NULL;

switch (argc) {
default:
usage(git_config_set_usage);
case 2:
def_color = argv[1];
/* fallthru */
case 1:
get_color_slot = argv[0];
break;
}

get_color_found = 0; get_color_found = 0;
parsed_color[0] = '\0'; parsed_color[0] = '\0';
git_config(git_get_color_config, NULL); git_config(git_get_color_config, NULL);
@ -223,7 +202,6 @@ static int get_color(int argc, const char **argv)
color_parse(def_color, "command line", parsed_color); color_parse(def_color, "command line", parsed_color);


fputs(parsed_color, stdout); fputs(parsed_color, stdout);
return 0;
} }


static int stdout_is_tty; static int stdout_is_tty;
@ -247,24 +225,10 @@ static int git_get_colorbool_config(const char *var, const char *value,
return 0; return 0;
} }


static int get_colorbool(int argc, const char **argv) static int get_colorbool(int print)
{ {
/*
* git config --get-colorbool <slot> [<stdout-is-tty>]
*
* returns "true" or "false" depending on how <slot>
* is configured.
*/

if (argc == 2)
stdout_is_tty = git_config_bool("command line", argv[1]);
else if (argc == 1)
stdout_is_tty = isatty(1);
else
usage(git_config_set_usage);
get_colorbool_found = -1; get_colorbool_found = -1;
get_diff_color_found = -1; get_diff_color_found = -1;
get_colorbool_slot = argv[0];
git_config(git_get_colorbool_config, NULL); git_config(git_get_colorbool_config, NULL);


if (get_colorbool_found < 0) { if (get_colorbool_found < 0) {
@ -274,12 +238,11 @@ static int get_colorbool(int argc, const char **argv)
get_colorbool_found = git_use_color_default; get_colorbool_found = git_use_color_default;
} }


if (argc == 1) { if (print) {
return get_colorbool_found ? 0 : 1;
} else {
printf("%s\n", get_colorbool_found ? "true" : "false"); printf("%s\n", get_colorbool_found ? "true" : "false");
return 0; return 0;
} } else
return get_colorbool_found ? 0 : 1;
} }


int cmd_config(int argc, const char **argv, const char *unused_prefix) int cmd_config(int argc, const char **argv, const char *unused_prefix)
@ -363,9 +326,20 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)
} }
return 0; return 0;
} else if (!strcmp(argv[1], "--get-color")) { } else if (!strcmp(argv[1], "--get-color")) {
return get_color(argc-2, argv+2); if (argc > 4 || argc < 3)
usage(git_config_set_usage);
get_color_slot = argv[2];
get_color(argv[3]);
return 0;
} else if (!strcmp(argv[1], "--get-colorbool")) { } else if (!strcmp(argv[1], "--get-colorbool")) {
return get_colorbool(argc-2, argv+2); if (argc == 4)
stdout_is_tty = git_config_bool("command line", argv[3]);
else if (argc == 3)
stdout_is_tty = isatty(1);
else
usage(git_config_set_usage);
get_colorbool_slot = argv[2];
return get_colorbool(argc != 3);
} else if (!strcmp(argv[1], "--edit") || !strcmp(argv[1], "-e")) { } else if (!strcmp(argv[1], "--edit") || !strcmp(argv[1], "-e")) {
if (argc != 2) if (argc != 2)
usage(git_config_set_usage); usage(git_config_set_usage);