+53 -31

add-interactive.c

··· 20 20 #include "prompt.h" 21 21 #include "tree.h" 22 22 23 23 - static void init_color(struct repository *r, struct add_i_state *s, 23 23 + static void init_color(struct repository *r, int use_color, 24 24 const char *section_and_slot, char *dst, 25 25 const char *default_color) 26 26 { 27 27 char *key = xstrfmt("color.%s", section_and_slot); 28 28 const char *value; 29 29 30 30 - if (!s->use_color) 30 30 + if (!use_color) 31 31 dst[0] = '\0'; 32 32 else if (repo_config_get_value(r, key, &value) || 33 33 color_parse(value, dst)) ··· 36 36 free(key); 37 37 } 38 38 39 39 - void init_add_i_state(struct add_i_state *s, struct repository *r, 40 40 - struct add_p_opt *add_p_opt) 39 39 + static int check_color_config(struct repository *r, const char *var) 41 40 { 42 41 const char *value; 42 42 + int ret; 43 43 44 44 + if (repo_config_get_value(r, var, &value)) 45 45 + ret = -1; 46 46 + else 47 47 + ret = git_config_colorbool(var, value); 48 48 + 49 49 + /* 50 50 + * Do not rely on want_color() to fall back to color.ui for us. It uses 51 51 + * the value parsed by git_color_config(), which may not have been 52 52 + * called by the main command. 53 53 + */ 54 54 + if (ret < 0 && !repo_config_get_value(r, "color.ui", &value)) 55 55 + ret = git_config_colorbool("color.ui", value); 56 56 + 57 57 + return want_color(ret); 58 58 + } 59 59 + 60 60 + void init_add_i_state(struct add_i_state *s, struct repository *r, 61 61 + struct add_p_opt *add_p_opt) 62 62 + { 44 63 s->r = r; 45 64 s->context = -1; 46 65 s->interhunkcontext = -1; 47 66 48 48 - if (repo_config_get_value(r, "color.interactive", &value)) 49 49 - s->use_color = -1; 50 50 - else 51 51 - s->use_color = 52 52 - git_config_colorbool("color.interactive", value); 53 53 - s->use_color = want_color(s->use_color); 67 67 + s->use_color_interactive = check_color_config(r, "color.interactive"); 54 68 55 55 - init_color(r, s, "interactive.header", s->header_color, GIT_COLOR_BOLD); 56 56 - init_color(r, s, "interactive.help", s->help_color, GIT_COLOR_BOLD_RED); 57 57 - init_color(r, s, "interactive.prompt", s->prompt_color, 58 58 - GIT_COLOR_BOLD_BLUE); 59 59 - init_color(r, s, "interactive.error", s->error_color, 60 60 - GIT_COLOR_BOLD_RED); 69 69 + init_color(r, s->use_color_interactive, "interactive.header", 70 70 + s->header_color, GIT_COLOR_BOLD); 71 71 + init_color(r, s->use_color_interactive, "interactive.help", 72 72 + s->help_color, GIT_COLOR_BOLD_RED); 73 73 + init_color(r, s->use_color_interactive, "interactive.prompt", 74 74 + s->prompt_color, GIT_COLOR_BOLD_BLUE); 75 75 + init_color(r, s->use_color_interactive, "interactive.error", 76 76 + s->error_color, GIT_COLOR_BOLD_RED); 77 77 + strlcpy(s->reset_color_interactive, 78 78 + s->use_color_interactive ? GIT_COLOR_RESET : "", COLOR_MAXLEN); 61 79 62 62 - init_color(r, s, "diff.frag", s->fraginfo_color, 63 63 - diff_get_color(s->use_color, DIFF_FRAGINFO)); 64 64 - init_color(r, s, "diff.context", s->context_color, "fall back"); 80 80 + s->use_color_diff = check_color_config(r, "color.diff"); 81 81 + 82 82 + init_color(r, s->use_color_diff, "diff.frag", s->fraginfo_color, 83 83 + diff_get_color(s->use_color_diff, DIFF_FRAGINFO)); 84 84 + init_color(r, s->use_color_diff, "diff.context", s->context_color, 85 85 + "fall back"); 65 86 if (!strcmp(s->context_color, "fall back")) 66 66 - init_color(r, s, "diff.plain", s->context_color, 67 67 - diff_get_color(s->use_color, DIFF_CONTEXT)); 68 68 - init_color(r, s, "diff.old", s->file_old_color, 69 69 - diff_get_color(s->use_color, DIFF_FILE_OLD)); 70 70 - init_color(r, s, "diff.new", s->file_new_color, 71 71 - diff_get_color(s->use_color, DIFF_FILE_NEW)); 72 72 - 73 73 - strlcpy(s->reset_color, 74 74 - s->use_color ? GIT_COLOR_RESET : "", COLOR_MAXLEN); 87 87 + init_color(r, s->use_color_diff, "diff.plain", 88 88 + s->context_color, 89 89 + diff_get_color(s->use_color_diff, DIFF_CONTEXT)); 90 90 + init_color(r, s->use_color_diff, "diff.old", s->file_old_color, 91 91 + diff_get_color(s->use_color_diff, DIFF_FILE_OLD)); 92 92 + init_color(r, s->use_color_diff, "diff.new", s->file_new_color, 93 93 + diff_get_color(s->use_color_diff, DIFF_FILE_NEW)); 94 94 + strlcpy(s->reset_color_diff, 95 95 + s->use_color_diff ? GIT_COLOR_RESET : "", COLOR_MAXLEN); 75 96 76 97 FREE_AND_NULL(s->interactive_diff_filter); 77 98 repo_config_get_string(r, "interactive.difffilter", ··· 109 130 FREE_AND_NULL(s->interactive_diff_filter); 110 131 FREE_AND_NULL(s->interactive_diff_algorithm); 111 132 memset(s, 0, sizeof(*s)); 112 112 - s->use_color = -1; 133 133 + s->use_color_interactive = -1; 134 134 + s->use_color_diff = -1; 113 135 } 114 136 115 137 /* ··· 1188 1210 * When color was asked for, use the prompt color for 1189 1211 * highlighting, otherwise use square brackets. 1190 1212 */ 1191 1191 - if (s.use_color) { 1213 1213 + if (s.use_color_interactive) { 1192 1214 data.color = s.prompt_color; 1193 1193 - data.reset = s.reset_color; 1215 1215 + data.reset = s.reset_color_interactive; 1194 1216 } 1195 1217 print_file_item_data.color = data.color; 1196 1218 print_file_item_data.reset = data.reset;

+5 -2

add-interactive.h

··· 12 12 13 13 struct add_i_state { 14 14 struct repository *r; 15 15 - int use_color; 15 15 + int use_color_interactive; 16 16 + int use_color_diff; 16 17 char header_color[COLOR_MAXLEN]; 17 18 char help_color[COLOR_MAXLEN]; 18 19 char prompt_color[COLOR_MAXLEN]; 19 20 char error_color[COLOR_MAXLEN]; 20 20 - char reset_color[COLOR_MAXLEN]; 21 21 + char reset_color_interactive[COLOR_MAXLEN]; 22 22 + 21 23 char fraginfo_color[COLOR_MAXLEN]; 22 24 char context_color[COLOR_MAXLEN]; 23 25 char file_old_color[COLOR_MAXLEN]; 24 26 char file_new_color[COLOR_MAXLEN]; 27 27 + char reset_color_diff[COLOR_MAXLEN]; 25 28 26 29 int use_single_key; 27 30 char *interactive_diff_filter, *interactive_diff_algorithm;

+6 -6

add-patch.c

··· 300 300 va_start(args, fmt); 301 301 fputs(s->s.error_color, stdout); 302 302 vprintf(fmt, args); 303 303 - puts(s->s.reset_color); 303 303 + puts(s->s.reset_color_interactive); 304 304 va_end(args); 305 305 } 306 306 ··· 457 457 } 458 458 strbuf_complete_line(plain); 459 459 460 460 - if (want_color_fd(1, -1)) { 460 460 + if (want_color_fd(1, s->s.use_color_diff)) { 461 461 struct child_process colored_cp = CHILD_PROCESS_INIT; 462 462 const char *diff_filter = s->s.interactive_diff_filter; 463 463 ··· 714 714 if (len) 715 715 strbuf_add(out, p, len); 716 716 else if (colored) 717 717 - strbuf_addf(out, "%s\n", s->s.reset_color); 717 717 + strbuf_addf(out, "%s\n", s->s.reset_color_diff); 718 718 else 719 719 strbuf_addch(out, '\n'); 720 720 } ··· 1107 1107 s->s.file_new_color : 1108 1108 s->s.context_color); 1109 1109 strbuf_add(&s->colored, plain + current, eol - current); 1110 1110 - strbuf_addstr(&s->colored, s->s.reset_color); 1110 1110 + strbuf_addstr(&s->colored, s->s.reset_color_diff); 1111 1111 if (next > eol) 1112 1112 strbuf_add(&s->colored, plain + eol, next - eol); 1113 1113 current = next; ··· 1528 1528 : 1)); 1529 1529 printf(_(s->mode->prompt_mode[prompt_mode_type]), 1530 1530 s->buf.buf); 1531 1531 - if (*s->s.reset_color) 1532 1532 - fputs(s->s.reset_color, stdout); 1531 1531 + if (*s->s.reset_color_interactive) 1532 1532 + fputs(s->s.reset_color_interactive, stdout); 1533 1533 fflush(stdout); 1534 1534 if (read_single_character(s) == EOF) 1535 1535 break;

+4 -1

builtin/stash.c

··· 377 377 * however it should be done together with apply_cached. 378 378 */ 379 379 cp.git_cmd = 1; 380 380 - strvec_pushl(&cp.args, "diff-tree", "--binary", NULL); 380 380 + strvec_pushl(&cp.args, "diff-tree", "--binary", "--no-color", NULL); 381 381 strvec_pushf(&cp.args, "%s^2^..%s^2", w_commit_hex, w_commit_hex); 382 382 383 383 return pipe_command(&cp, NULL, 0, out, 0, NULL, 0); ··· 1283 1283 1284 1284 cp_diff_tree.git_cmd = 1; 1285 1285 strvec_pushl(&cp_diff_tree.args, "diff-tree", "-p", "--binary", 1286 1286 + "--no-color", 1286 1287 "-U1", "HEAD", oid_to_hex(&info->w_tree), "--", NULL); 1287 1288 if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) { 1288 1289 ret = -1; ··· 1345 1346 1346 1347 cp_diff_tree.git_cmd = 1; 1347 1348 strvec_pushl(&cp_diff_tree.args, "diff-tree", "-p", "-U1", "HEAD", 1349 1349 + "--no-color", 1348 1350 oid_to_hex(&info->w_tree), "--", NULL); 1349 1351 if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) { 1350 1352 ret = -1; ··· 1719 1721 1720 1722 cp_diff.git_cmd = 1; 1721 1723 strvec_pushl(&cp_diff.args, "diff-index", "-p", 1724 1724 + "--no-color", 1722 1725 "--cached", "--binary", "HEAD", "--", 1723 1726 NULL); 1724 1727 add_pathspecs(&cp_diff.args, ps);

+8

contrib/diff-highlight/README

··· 58 58 diff = diff-highlight | less 59 59 --------------------------------------------- 60 60 61 61 + If you use the interactive patch mode of `git add -p`, `git checkout 62 62 + -p`, etc, you may also want to configure it to be used there: 63 63 + 64 64 + --------------------------------------------- 65 65 + [interactive] 66 66 + diffFilter = diff-highlight 67 67 + --------------------------------------------- 68 68 + 61 69 62 70 Color Config 63 71 ------------

+53

t/t3701-add-interactive.sh

··· 866 866 test_grep "old<" output 867 867 ' 868 868 869 869 + test_expect_success 'diff color respects color.diff' ' 870 870 + git reset --hard && 871 871 + 872 872 + echo old >test && 873 873 + git add test && 874 874 + echo new >test && 875 875 + 876 876 + printf n >n && 877 877 + force_color git \ 878 878 + -c color.interactive=auto \ 879 879 + -c color.interactive.prompt=blue \ 880 880 + -c color.diff=false \ 881 881 + -c color.diff.old=red \ 882 882 + add -p >output.raw 2>&1 <n && 883 883 + test_decode_color <output.raw >output && 884 884 + test_grep "BLUE.*Stage this hunk" output && 885 885 + test_grep ! "RED" output 886 886 + ' 887 887 + 888 888 + test_expect_success 're-coloring diff without color.interactive' ' 889 889 + git reset --hard && 890 890 + 891 891 + test_write_lines 1 2 3 >test && 892 892 + git add test && 893 893 + test_write_lines one 2 three >test && 894 894 + 895 895 + test_write_lines s n n | 896 896 + force_color git \ 897 897 + -c color.interactive=false \ 898 898 + -c color.interactive.prompt=blue \ 899 899 + -c color.diff=true \ 900 900 + -c color.diff.frag="bold magenta" \ 901 901 + add -p >output.raw 2>&1 && 902 902 + test_decode_color <output.raw >output && 903 903 + test_grep "<BOLD;MAGENTA>@@" output && 904 904 + test_grep ! "BLUE" output 905 905 + ' 906 906 + 869 907 test_expect_success 'diffFilter filters diff' ' 870 908 git reset --hard && 871 909 ··· 1283 1321 test_grep "@@ -2,20 +2,20 @@" actual 1284 1322 ' 1285 1323 1324 1324 + test_expect_success 'set up base for -p color tests' ' 1325 1325 + echo commit >file && 1326 1326 + git commit -am "commit state" && 1327 1327 + git tag patch-base 1328 1328 + ' 1329 1329 + 1286 1330 for cmd in add checkout commit reset restore "stash save" "stash push" 1287 1331 do 1288 1332 test_expect_success "$cmd rejects invalid context options" ' ··· 1298 1342 1299 1343 test_must_fail git $cmd --inter-hunk-context 2 2>actual && 1300 1344 test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual 1345 1345 + ' 1346 1346 + 1347 1347 + test_expect_success "$cmd falls back to color.ui" ' 1348 1348 + git reset --hard patch-base && 1349 1349 + echo working-tree >file && 1350 1350 + test_write_lines y | 1351 1351 + force_color git -c color.ui=false $cmd -p >output.raw 2>&1 && 1352 1352 + test_decode_color <output.raw >output && 1353 1353 + test_cmp output.raw output 1301 1354 ' 1302 1355 done 1303 1356

+19

t/t3904-stash-patch.sh

··· 107 107 ! grep "added line 2" test 108 108 ' 109 109 110 110 + test_expect_success 'stash -p not confused by GIT_PAGER_IN_USE' ' 111 111 + echo to-stash >test && 112 112 + # Set both GIT_PAGER_IN_USE and TERM. Our goal is to entice any 113 113 + # diff subprocesses into thinking that they could output 114 114 + # color, even though their stdout is not going into a tty. 115 115 + echo y | 116 116 + GIT_PAGER_IN_USE=1 TERM=vt100 git stash -p && 117 117 + git diff --exit-code 118 118 + ' 119 119 + 120 120 + test_expect_success 'index push not confused by GIT_PAGER_IN_USE' ' 121 121 + echo index >test && 122 122 + git add test && 123 123 + echo working-tree >test && 124 124 + # As above, we try to entice the child diff into using color. 125 125 + GIT_PAGER_IN_USE=1 TERM=vt100 git stash push test && 126 126 + git diff --exit-code 127 127 + ' 128 128 + 110 129 test_done