diff --color-moved=zebra: be stricter with color alternation
[git/git.git] / diff.c
CommitLineData
6973dcae
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
6973dcae 4#include "cache.h"
b2141fc1 5#include "config.h"
284098f1 6#include "tempfile.h"
6973dcae
JH
7#include "quote.h"
8#include "diff.h"
9#include "diffcore.h"
051308f6 10#include "delta.h"
6973dcae 11#include "xdiff-interface.h"
7c92fe0e 12#include "color.h"
8c701249 13#include "attr.h"
d5535ec7 14#include "run-command.h"
23707811 15#include "utf8.h"
cbd53a21 16#include "object-store.h"
be58e70d 17#include "userdiff.h"
851e18c3 18#include "submodule-config.h"
752c0c24 19#include "submodule.h"
2e2d5ac1 20#include "hashmap.h"
a757c646 21#include "ll-merge.h"
02e8ca0e 22#include "string-list.h"
82fbf269 23#include "argv-array.h"
660e113c 24#include "graph.h"
150e3001 25#include "packfile.h"
3ac68a93 26#include "help.h"
6973dcae 27
1510fea7
SP
28#ifdef NO_FAST_WORKING_DIRECTORY
29#define FAST_WORKING_DIRECTORY 0
30#else
31#define FAST_WORKING_DIRECTORY 1
32#endif
33
96f1e58f 34static int diff_detect_rename_default;
33de7163 35static int diff_indent_heuristic = 1;
92c57e5c 36static int diff_rename_limit_default = 400;
a624eaa7 37static int diff_suppress_blank_empty;
d2aea137 38static int diff_use_color_default = -1;
2e2d5ac1 39static int diff_color_moved_default;
626c0b5d 40static int diff_color_moved_ws_default;
6468a4e5 41static int diff_context_default = 3;
c4888677 42static int diff_interhunk_context_default;
98a4d87b 43static const char *diff_word_regex_cfg;
cbe02100 44static const char *external_diff_cmd_cfg;
6d8940b5 45static const char *diff_order_file_cfg;
aecbf914 46int diff_auto_refresh_index = 1;
a5a818ee 47static int diff_mnemonic_prefix;
f89504dd 48static int diff_no_prefix;
df44483a 49static int diff_stat_graph_width;
712d2c7d 50static int diff_dirstat_permille_default = 30;
be4f2b40 51static struct diff_options default_diff_options;
07ab4dec 52static long diff_algorithm;
a17505f2 53static unsigned ws_error_highlight_default = WSEH_NEW;
6973dcae 54
7c92fe0e 55static char diff_colors[][COLOR_MAXLEN] = {
dc6ebd4c 56 GIT_COLOR_RESET,
8dbf3eb6 57 GIT_COLOR_NORMAL, /* CONTEXT */
dc6ebd4c
AL
58 GIT_COLOR_BOLD, /* METAINFO */
59 GIT_COLOR_CYAN, /* FRAGINFO */
60 GIT_COLOR_RED, /* OLD */
61 GIT_COLOR_GREEN, /* NEW */
62 GIT_COLOR_YELLOW, /* COMMIT */
63 GIT_COLOR_BG_RED, /* WHITESPACE */
89cb73a1 64 GIT_COLOR_NORMAL, /* FUNCINFO */
86b452e2
SB
65 GIT_COLOR_BOLD_MAGENTA, /* OLD_MOVED */
66 GIT_COLOR_BOLD_BLUE, /* OLD_MOVED ALTERNATIVE */
67 GIT_COLOR_FAINT, /* OLD_MOVED_DIM */
68 GIT_COLOR_FAINT_ITALIC, /* OLD_MOVED_ALTERNATIVE_DIM */
69 GIT_COLOR_BOLD_CYAN, /* NEW_MOVED */
70 GIT_COLOR_BOLD_YELLOW, /* NEW_MOVED ALTERNATIVE */
71 GIT_COLOR_FAINT, /* NEW_MOVED_DIM */
72 GIT_COLOR_FAINT_ITALIC, /* NEW_MOVED_ALTERNATIVE_DIM */
a7be92ac
JS
73 GIT_COLOR_FAINT, /* CONTEXT_DIM */
74 GIT_COLOR_FAINT_RED, /* OLD_DIM */
75 GIT_COLOR_FAINT_GREEN, /* NEW_DIM */
76 GIT_COLOR_BOLD, /* CONTEXT_BOLD */
77 GIT_COLOR_BOLD_RED, /* OLD_BOLD */
78 GIT_COLOR_BOLD_GREEN, /* NEW_BOLD */
cd112cef
JS
79};
80
a73b3680
NTND
81static const char *color_diff_slots[] = {
82 [DIFF_CONTEXT] = "context",
83 [DIFF_METAINFO] = "meta",
84 [DIFF_FRAGINFO] = "frag",
85 [DIFF_FILE_OLD] = "old",
86 [DIFF_FILE_NEW] = "new",
87 [DIFF_COMMIT] = "commit",
88 [DIFF_WHITESPACE] = "whitespace",
89 [DIFF_FUNCINFO] = "func",
90 [DIFF_FILE_OLD_MOVED] = "oldMoved",
91 [DIFF_FILE_OLD_MOVED_ALT] = "oldMovedAlternative",
92 [DIFF_FILE_OLD_MOVED_DIM] = "oldMovedDimmed",
93 [DIFF_FILE_OLD_MOVED_ALT_DIM] = "oldMovedAlternativeDimmed",
94 [DIFF_FILE_NEW_MOVED] = "newMoved",
95 [DIFF_FILE_NEW_MOVED_ALT] = "newMovedAlternative",
96 [DIFF_FILE_NEW_MOVED_DIM] = "newMovedDimmed",
97 [DIFF_FILE_NEW_MOVED_ALT_DIM] = "newMovedAlternativeDimmed",
a7be92ac
JS
98 [DIFF_CONTEXT_DIM] = "contextDimmed",
99 [DIFF_FILE_OLD_DIM] = "oldDimmed",
100 [DIFF_FILE_NEW_DIM] = "newDimmed",
101 [DIFF_CONTEXT_BOLD] = "contextBold",
102 [DIFF_FILE_OLD_BOLD] = "oldBold",
103 [DIFF_FILE_NEW_BOLD] = "newBold",
a73b3680
NTND
104};
105
a2f05c94
JNA
106static NORETURN void die_want_option(const char *option_name)
107{
108 die(_("option '%s' requires a value"), option_name);
109}
110
3ac68a93
NTND
111define_list_config_array_extra(color_diff_slots, {"plain"});
112
9e1a5ebe 113static int parse_diff_color_slot(const char *var)
801235c5 114{
a73b3680 115 if (!strcasecmp(var, "plain"))
8dbf3eb6 116 return DIFF_CONTEXT;
a73b3680 117 return LOOKUP_CONFIG(color_diff_slots, var);
801235c5
JH
118}
119
02e8ca0e 120static int parse_dirstat_params(struct diff_options *options, const char *params_string,
51670fc8 121 struct strbuf *errmsg)
333f3fb0 122{
02e8ca0e
MH
123 char *params_copy = xstrdup(params_string);
124 struct string_list params = STRING_LIST_INIT_NODUP;
125 int ret = 0;
126 int i;
51670fc8 127
02e8ca0e
MH
128 if (*params_copy)
129 string_list_split_in_place(&params, params_copy, ',', -1);
130 for (i = 0; i < params.nr; i++) {
131 const char *p = params.items[i].string;
132 if (!strcmp(p, "changes")) {
0d1e0e78
BW
133 options->flags.dirstat_by_line = 0;
134 options->flags.dirstat_by_file = 0;
02e8ca0e 135 } else if (!strcmp(p, "lines")) {
0d1e0e78
BW
136 options->flags.dirstat_by_line = 1;
137 options->flags.dirstat_by_file = 0;
02e8ca0e 138 } else if (!strcmp(p, "files")) {
0d1e0e78
BW
139 options->flags.dirstat_by_line = 0;
140 options->flags.dirstat_by_file = 1;
02e8ca0e 141 } else if (!strcmp(p, "noncumulative")) {
0d1e0e78 142 options->flags.dirstat_cumulative = 0;
02e8ca0e 143 } else if (!strcmp(p, "cumulative")) {
0d1e0e78 144 options->flags.dirstat_cumulative = 1;
333f3fb0
JH
145 } else if (isdigit(*p)) {
146 char *end;
51670fc8
JH
147 int permille = strtoul(p, &end, 10) * 10;
148 if (*end == '.' && isdigit(*++end)) {
712d2c7d 149 /* only use first digit */
51670fc8 150 permille += *end - '0';
712d2c7d 151 /* .. and ignore any further digits */
51670fc8 152 while (isdigit(*++end))
712d2c7d
JH
153 ; /* nothing */
154 }
02e8ca0e 155 if (!*end)
51670fc8
JH
156 options->dirstat_permille = permille;
157 else {
02e8ca0e
MH
158 strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
159 p);
51670fc8
JH
160 ret++;
161 }
162 } else {
02e8ca0e 163 strbuf_addf(errmsg, _(" Unknown dirstat parameter '%s'\n"), p);
51670fc8 164 ret++;
333f3fb0 165 }
51670fc8 166
333f3fb0 167 }
02e8ca0e
MH
168 string_list_clear(&params, 0);
169 free(params_copy);
51670fc8 170 return ret;
333f3fb0
JH
171}
172
c47ef57c
RR
173static int parse_submodule_params(struct diff_options *options, const char *value)
174{
175 if (!strcmp(value, "log"))
61cfbc05 176 options->submodule_format = DIFF_SUBMODULE_LOG;
c47ef57c 177 else if (!strcmp(value, "short"))
61cfbc05 178 options->submodule_format = DIFF_SUBMODULE_SHORT;
fd47ae6a
JK
179 else if (!strcmp(value, "diff"))
180 options->submodule_format = DIFF_SUBMODULE_INLINE_DIFF;
c47ef57c
RR
181 else
182 return -1;
183 return 0;
184}
185
85b46030 186int git_config_rename(const char *var, const char *value)
cced5fbc
LT
187{
188 if (!value)
189 return DIFF_DETECT_RENAME;
190 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
191 return DIFF_DETECT_COPY;
192 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
193}
194
07924d4d 195long parse_algorithm_value(const char *value)
07ab4dec
MP
196{
197 if (!value)
198 return -1;
199 else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default"))
200 return 0;
201 else if (!strcasecmp(value, "minimal"))
202 return XDF_NEED_MINIMAL;
203 else if (!strcasecmp(value, "patience"))
204 return XDF_PATIENCE_DIFF;
205 else if (!strcasecmp(value, "histogram"))
206 return XDF_HISTOGRAM_DIFF;
207 return -1;
208}
209
0b4b42e7
JH
210static int parse_one_token(const char **arg, const char *token)
211{
212 const char *rest;
213 if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) {
214 *arg = rest;
215 return 1;
216 }
217 return 0;
218}
219
220static int parse_ws_error_highlight(const char *arg)
221{
222 const char *orig_arg = arg;
223 unsigned val = 0;
224
225 while (*arg) {
226 if (parse_one_token(&arg, "none"))
227 val = 0;
228 else if (parse_one_token(&arg, "default"))
229 val = WSEH_NEW;
230 else if (parse_one_token(&arg, "all"))
231 val = WSEH_NEW | WSEH_OLD | WSEH_CONTEXT;
232 else if (parse_one_token(&arg, "new"))
233 val |= WSEH_NEW;
234 else if (parse_one_token(&arg, "old"))
235 val |= WSEH_OLD;
236 else if (parse_one_token(&arg, "context"))
237 val |= WSEH_CONTEXT;
238 else {
239 return -1 - (int)(arg - orig_arg);
240 }
241 if (*arg)
242 arg++;
243 }
244 return val;
245}
246
83ad63cf
JH
247/*
248 * These are to give UI layer defaults.
249 * The core-level commands such as git-diff-files should
250 * never be affected by the setting of diff.renames
251 * the user happens to have in the configuration file.
252 */
5404c116
MM
253void init_diff_ui_defaults(void)
254{
06dba2b0 255 diff_detect_rename_default = DIFF_DETECT_RENAME;
5404c116
MM
256}
257
5b162879
MH
258int git_diff_heuristic_config(const char *var, const char *value, void *cb)
259{
3cde4e02 260 if (!strcmp(var, "diff.indentheuristic"))
5b162879 261 diff_indent_heuristic = git_config_bool(var, value);
5b162879
MH
262 return 0;
263}
264
2e2d5ac1
SB
265static int parse_color_moved(const char *arg)
266{
267 switch (git_parse_maybe_bool(arg)) {
268 case 0:
269 return COLOR_MOVED_NO;
270 case 1:
271 return COLOR_MOVED_DEFAULT;
272 default:
273 break;
274 }
275
276 if (!strcmp(arg, "no"))
277 return COLOR_MOVED_NO;
176841f0
SB
278 else if (!strcmp(arg, "plain"))
279 return COLOR_MOVED_PLAIN;
51da15eb
SB
280 else if (!strcmp(arg, "blocks"))
281 return COLOR_MOVED_BLOCKS;
2e2d5ac1
SB
282 else if (!strcmp(arg, "zebra"))
283 return COLOR_MOVED_ZEBRA;
284 else if (!strcmp(arg, "default"))
285 return COLOR_MOVED_DEFAULT;
e3f2f5f9
ES
286 else if (!strcmp(arg, "dimmed-zebra"))
287 return COLOR_MOVED_ZEBRA_DIM;
86b452e2
SB
288 else if (!strcmp(arg, "dimmed_zebra"))
289 return COLOR_MOVED_ZEBRA_DIM;
2e2d5ac1 290 else
706b0b5e 291 return error(_("color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"));
2e2d5ac1
SB
292}
293
b3095712
SB
294static int parse_color_moved_ws(const char *arg)
295{
296 int ret = 0;
297 struct string_list l = STRING_LIST_INIT_DUP;
298 struct string_list_item *i;
299
300 string_list_split(&l, arg, ',', -1);
301
302 for_each_string_list_item(i, &l) {
303 struct strbuf sb = STRBUF_INIT;
304 strbuf_addstr(&sb, i->string);
305 strbuf_trim(&sb);
306
b73bcbac
PW
307 if (!strcmp(sb.buf, "no"))
308 ret = 0;
309 else if (!strcmp(sb.buf, "ignore-space-change"))
b3095712
SB
310 ret |= XDF_IGNORE_WHITESPACE_CHANGE;
311 else if (!strcmp(sb.buf, "ignore-space-at-eol"))
312 ret |= XDF_IGNORE_WHITESPACE_AT_EOL;
313 else if (!strcmp(sb.buf, "ignore-all-space"))
314 ret |= XDF_IGNORE_WHITESPACE;
ca1f4ae4
SB
315 else if (!strcmp(sb.buf, "allow-indentation-change"))
316 ret |= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE;
b3095712
SB
317 else
318 error(_("ignoring unknown color-moved-ws mode '%s'"), sb.buf);
319
320 strbuf_release(&sb);
321 }
322
ca1f4ae4
SB
323 if ((ret & COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) &&
324 (ret & XDF_WHITESPACE_FLAGS))
748aa1aa 325 die(_("color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes"));
ca1f4ae4 326
b3095712
SB
327 string_list_clear(&l, 0);
328
329 return ret;
2e2d5ac1
SB
330}
331
ef90d6d4 332int git_diff_ui_config(const char *var, const char *value, void *cb)
801235c5 333{
a159ca0c 334 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
e269eb79 335 diff_use_color_default = git_config_colorbool(var, value);
801235c5
JH
336 return 0;
337 }
2e2d5ac1
SB
338 if (!strcmp(var, "diff.colormoved")) {
339 int cm = parse_color_moved(value);
340 if (cm < 0)
341 return -1;
342 diff_color_moved_default = cm;
343 return 0;
344 }
626c0b5d
SB
345 if (!strcmp(var, "diff.colormovedws")) {
346 int cm = parse_color_moved_ws(value);
347 if (cm < 0)
348 return -1;
349 diff_color_moved_ws_default = cm;
350 return 0;
351 }
6468a4e5
JM
352 if (!strcmp(var, "diff.context")) {
353 diff_context_default = git_config_int(var, value);
354 if (diff_context_default < 0)
355 return -1;
356 return 0;
357 }
c4888677
VN
358 if (!strcmp(var, "diff.interhunkcontext")) {
359 diff_interhunk_context_default = git_config_int(var, value);
360 if (diff_interhunk_context_default < 0)
361 return -1;
362 return 0;
363 }
b68ea12e 364 if (!strcmp(var, "diff.renames")) {
cced5fbc 365 diff_detect_rename_default = git_config_rename(var, value);
b68ea12e
EW
366 return 0;
367 }
aecbf914
JH
368 if (!strcmp(var, "diff.autorefreshindex")) {
369 diff_auto_refresh_index = git_config_bool(var, value);
370 return 0;
371 }
a5a818ee
JH
372 if (!strcmp(var, "diff.mnemonicprefix")) {
373 diff_mnemonic_prefix = git_config_bool(var, value);
374 return 0;
375 }
f89504dd
EC
376 if (!strcmp(var, "diff.noprefix")) {
377 diff_no_prefix = git_config_bool(var, value);
378 return 0;
379 }
df44483a
ZJS
380 if (!strcmp(var, "diff.statgraphwidth")) {
381 diff_stat_graph_width = git_config_int(var, value);
382 return 0;
383 }
daec808c
BH
384 if (!strcmp(var, "diff.external"))
385 return git_config_string(&external_diff_cmd_cfg, var, value);
98a4d87b
BSSJ
386 if (!strcmp(var, "diff.wordregex"))
387 return git_config_string(&diff_word_regex_cfg, var, value);
6d8940b5
SB
388 if (!strcmp(var, "diff.orderfile"))
389 return git_config_pathname(&diff_order_file_cfg, var, value);
f1af60bd 390
be4f2b40
JS
391 if (!strcmp(var, "diff.ignoresubmodules"))
392 handle_ignore_submodules_arg(&default_diff_options, value);
393
c47ef57c
RR
394 if (!strcmp(var, "diff.submodule")) {
395 if (parse_submodule_params(&default_diff_options, value))
396 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
397 value);
398 return 0;
399 }
400
07ab4dec
MP
401 if (!strcmp(var, "diff.algorithm")) {
402 diff_algorithm = parse_algorithm_value(value);
403 if (diff_algorithm < 0)
404 return -1;
405 return 0;
406 }
407
a17505f2
JH
408 if (!strcmp(var, "diff.wserrorhighlight")) {
409 int val = parse_ws_error_highlight(value);
410 if (val < 0)
411 return -1;
412 ws_error_highlight_default = val;
413 return 0;
414 }
415
33c643bb
JK
416 if (git_color_config(var, value, cb) < 0)
417 return -1;
418
ef90d6d4 419 return git_diff_basic_config(var, value, cb);
9a1805a8
JK
420}
421
ef90d6d4 422int git_diff_basic_config(const char *var, const char *value, void *cb)
9a1805a8 423{
ae021d87
JK
424 const char *name;
425
2b6ca6df
LT
426 if (!strcmp(var, "diff.renamelimit")) {
427 diff_rename_limit_default = git_config_int(var, value);
428 return 0;
429 }
430
6680a087
JK
431 if (userdiff_config(var, value) < 0)
432 return -1;
c7534ef4 433
ae021d87
JK
434 if (skip_prefix(var, "diff.color.", &name) ||
435 skip_prefix(var, "color.diff.", &name)) {
436 int slot = parse_diff_color_slot(name);
8b8e8624
JK
437 if (slot < 0)
438 return 0;
64f30e94
JH
439 if (!value)
440 return config_error_nonbool(var);
f6c5a296 441 return color_parse(value, diff_colors[slot]);
801235c5 442 }
f1af60bd 443
a624eaa7 444 /* like GNU diff's --suppress-blank-empty option */
950db879
JS
445 if (!strcmp(var, "diff.suppressblankempty") ||
446 /* for backwards compatibility */
447 !strcmp(var, "diff.suppress-blank-empty")) {
a624eaa7
JM
448 diff_suppress_blank_empty = git_config_bool(var, value);
449 return 0;
450 }
451
2d174951 452 if (!strcmp(var, "diff.dirstat")) {
51670fc8 453 struct strbuf errmsg = STRBUF_INIT;
712d2c7d 454 default_diff_options.dirstat_permille = diff_dirstat_permille_default;
51670fc8 455 if (parse_dirstat_params(&default_diff_options, value, &errmsg))
7478ac57 456 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
51670fc8
JH
457 errmsg.buf);
458 strbuf_release(&errmsg);
712d2c7d 459 diff_dirstat_permille_default = default_diff_options.dirstat_permille;
2d174951
JH
460 return 0;
461 }
462
cf5e7722
MB
463 if (git_diff_heuristic_config(var, value, cb) < 0)
464 return -1;
465
3e1dd17a 466 return git_default_config(var, value, cb);
801235c5
JH
467}
468
6973dcae
JH
469static char *quote_two(const char *one, const char *two)
470{
471 int need_one = quote_c_style(one, NULL, NULL, 1);
472 int need_two = quote_c_style(two, NULL, NULL, 1);
f285a2d7 473 struct strbuf res = STRBUF_INIT;
6973dcae
JH
474
475 if (need_one + need_two) {
663af342
PH
476 strbuf_addch(&res, '"');
477 quote_c_style(one, &res, NULL, 1);
478 quote_c_style(two, &res, NULL, 1);
479 strbuf_addch(&res, '"');
480 } else {
481 strbuf_addstr(&res, one);
482 strbuf_addstr(&res, two);
6973dcae 483 }
b315c5c0 484 return strbuf_detach(&res, NULL);
6973dcae
JH
485}
486
487static const char *external_diff(void)
488{
489 static const char *external_diff_cmd = NULL;
490 static int done_preparing = 0;
491
492 if (done_preparing)
493 return external_diff_cmd;
494 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
cbe02100
JS
495 if (!external_diff_cmd)
496 external_diff_cmd = external_diff_cmd_cfg;
6973dcae
JH
497 done_preparing = 1;
498 return external_diff_cmd;
499}
500
284098f1
MH
501/*
502 * Keep track of files used for diffing. Sometimes such an entry
503 * refers to a temporary file, sometimes to an existing file, and
504 * sometimes to "/dev/null".
505 */
6973dcae 506static struct diff_tempfile {
284098f1
MH
507 /*
508 * filename external diff should read from, or NULL if this
509 * entry is currently not in use:
510 */
511 const char *name;
512
dc01505f 513 char hex[GIT_MAX_HEXSZ + 1];
6973dcae 514 char mode[10];
284098f1
MH
515
516 /*
517 * If this diff_tempfile instance refers to a temporary file,
518 * this tempfile object is used to manage its lifetime.
519 */
076aa2cb 520 struct tempfile *tempfile;
6973dcae
JH
521} diff_temp[2];
522
6957eb9a 523struct emit_callback {
6957eb9a
JH
524 int color_diff;
525 unsigned ws_rule;
526 int blank_at_eof_in_preimage;
527 int blank_at_eof_in_postimage;
528 int lno_in_preimage;
529 int lno_in_postimage;
6957eb9a
JH
530 const char **label_path;
531 struct diff_words_data *diff_words;
a3c158d4 532 struct diff_options *opt;
3e97c7c6 533 struct strbuf *header;
6957eb9a
JH
534};
535
6973dcae
JH
536static int count_lines(const char *data, int size)
537{
538 int count, ch, completely_empty = 1, nl_just_seen = 0;
539 count = 0;
540 while (0 < size--) {
541 ch = *data++;
542 if (ch == '\n') {
543 count++;
544 nl_just_seen = 1;
545 completely_empty = 0;
546 }
547 else {
548 nl_just_seen = 0;
549 completely_empty = 0;
550 }
551 }
552 if (completely_empty)
553 return 0;
554 if (!nl_just_seen)
555 count++; /* no trailing newline */
556 return count;
557}
558
b78ea5fc
NTND
559static int fill_mmfile(struct repository *r, mmfile_t *mf,
560 struct diff_filespec *one)
6957eb9a
JH
561{
562 if (!DIFF_FILE_VALID(one)) {
563 mf->ptr = (char *)""; /* does not matter */
564 mf->size = 0;
565 return 0;
566 }
b78ea5fc 567 else if (diff_populate_filespec(r, one, 0))
6957eb9a 568 return -1;
bb35fefb 569
6957eb9a
JH
570 mf->ptr = one->data;
571 mf->size = one->size;
572 return 0;
573}
574
abb371a1 575/* like fill_mmfile, but only for size, so we can avoid retrieving blob */
b78ea5fc
NTND
576static unsigned long diff_filespec_size(struct repository *r,
577 struct diff_filespec *one)
abb371a1
JK
578{
579 if (!DIFF_FILE_VALID(one))
580 return 0;
b78ea5fc 581 diff_populate_filespec(r, one, CHECK_SIZE_ONLY);
abb371a1
JK
582 return one->size;
583}
584
6957eb9a
JH
585static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
586{
587 char *ptr = mf->ptr;
588 long size = mf->size;
589 int cnt = 0;
590
591 if (!size)
592 return cnt;
593 ptr += size - 1; /* pointing at the very end */
594 if (*ptr != '\n')
595 ; /* incomplete line */
596 else
597 ptr--; /* skip the last LF */
598 while (mf->ptr < ptr) {
599 char *prev_eol;
600 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
601 if (*prev_eol == '\n')
602 break;
603 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
604 break;
605 cnt++;
606 ptr = prev_eol - 1;
607 }
608 return cnt;
609}
610
611static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
612 struct emit_callback *ecbdata)
613{
614 int l1, l2, at;
615 unsigned ws_rule = ecbdata->ws_rule;
616 l1 = count_trailing_blank(mf1, ws_rule);
617 l2 = count_trailing_blank(mf2, ws_rule);
618 if (l2 <= l1) {
619 ecbdata->blank_at_eof_in_preimage = 0;
620 ecbdata->blank_at_eof_in_postimage = 0;
621 return;
622 }
623 at = count_lines(mf1->ptr, mf1->size);
624 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
625
626 at = count_lines(mf2->ptr, mf2->size);
627 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
628}
629
f7c3b4e2 630static void emit_line_0(struct diff_options *o,
017ac45e 631 const char *set_sign, const char *set, unsigned reverse, const char *reset,
250f7993 632 int first, const char *line, int len)
6957eb9a
JH
633{
634 int has_trailing_newline, has_trailing_carriage_return;
44410679 635 int needs_reset = 0; /* at the end of the line */
a3c158d4
BY
636 FILE *file = o->file;
637
f103a6fa 638 fputs(diff_line_prefix(o), file);
6957eb9a 639
44410679
SB
640 has_trailing_newline = (len > 0 && line[len-1] == '\n');
641 if (has_trailing_newline)
642 len--;
643
644 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
645 if (has_trailing_carriage_return)
646 len--;
647
648 if (!len && !first)
649 goto end_of_line;
650
651 if (reverse && want_color(o->use_color)) {
652 fputs(GIT_COLOR_REVERSE, file);
653 needs_reset = 1;
250f7993 654 }
6957eb9a 655
44410679
SB
656 if (set_sign) {
657 fputs(set_sign, file);
658 needs_reset = 1;
06a47552 659 }
44410679
SB
660
661 if (first)
662 fputc(first, file);
663
664 if (!len)
665 goto end_of_line;
666
667 if (set) {
668 if (set_sign && set != set_sign)
669 fputs(reset, file);
06a47552 670 fputs(set, file);
44410679 671 needs_reset = 1;
06a47552 672 }
44410679
SB
673 fwrite(line, len, 1, file);
674 needs_reset = 1; /* 'line' may contain color codes. */
675
676end_of_line:
677 if (needs_reset)
678 fputs(reset, file);
6957eb9a
JH
679 if (has_trailing_carriage_return)
680 fputc('\r', file);
681 if (has_trailing_newline)
682 fputc('\n', file);
683}
684
a3c158d4 685static void emit_line(struct diff_options *o, const char *set, const char *reset,
250f7993
JH
686 const char *line, int len)
687{
44410679 688 emit_line_0(o, set, NULL, 0, reset, 0, line, len);
250f7993
JH
689}
690
36a4cefd 691enum diff_symbol {
4eed0ebd
SB
692 DIFF_SYMBOL_BINARY_DIFF_HEADER,
693 DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
694 DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
695 DIFF_SYMBOL_BINARY_DIFF_BODY,
696 DIFF_SYMBOL_BINARY_DIFF_FOOTER,
0911c475
SB
697 DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
698 DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
699 DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
700 DIFF_SYMBOL_STATS_LINE,
bd033291 701 DIFF_SYMBOL_WORD_DIFF,
30b7e1e7 702 DIFF_SYMBOL_STAT_SEP,
146fdb0d 703 DIFF_SYMBOL_SUMMARY,
f3597138
SB
704 DIFF_SYMBOL_SUBMODULE_ADD,
705 DIFF_SYMBOL_SUBMODULE_DEL,
706 DIFF_SYMBOL_SUBMODULE_UNTRACKED,
707 DIFF_SYMBOL_SUBMODULE_MODIFIED,
708 DIFF_SYMBOL_SUBMODULE_HEADER,
709 DIFF_SYMBOL_SUBMODULE_ERROR,
710 DIFF_SYMBOL_SUBMODULE_PIPETHROUGH,
5af6ea95 711 DIFF_SYMBOL_REWRITE_DIFF,
4acaaa7a 712 DIFF_SYMBOL_BINARY_FILES,
a29b0a13 713 DIFF_SYMBOL_HEADER,
3ee8b7bf
SB
714 DIFF_SYMBOL_FILEPAIR_PLUS,
715 DIFF_SYMBOL_FILEPAIR_MINUS,
ff958679
SB
716 DIFF_SYMBOL_WORDS_PORCELAIN,
717 DIFF_SYMBOL_WORDS,
091f8e28 718 DIFF_SYMBOL_CONTEXT,
f2bb1218 719 DIFF_SYMBOL_CONTEXT_INCOMPLETE,
091f8e28
SB
720 DIFF_SYMBOL_PLUS,
721 DIFF_SYMBOL_MINUS,
b9cbfde6 722 DIFF_SYMBOL_NO_LF_EOF,
68abc6f1 723 DIFF_SYMBOL_CONTEXT_FRAGINFO,
c64b420b 724 DIFF_SYMBOL_CONTEXT_MARKER,
36a4cefd
SB
725 DIFF_SYMBOL_SEPARATOR
726};
091f8e28
SB
727/*
728 * Flags for content lines:
729 * 0..12 are whitespace rules
730 * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
731 * 16 is marking if the line is blank at EOF
732 */
2e2d5ac1
SB
733#define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF (1<<16)
734#define DIFF_SYMBOL_MOVED_LINE (1<<17)
735#define DIFF_SYMBOL_MOVED_LINE_ALT (1<<18)
86b452e2 736#define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING (1<<19)
091f8e28
SB
737#define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)
738
e6e045f8
SB
739/*
740 * This struct is used when we need to buffer the output of the diff output.
741 *
742 * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
743 * into the pre/post image file. This pointer could be a union with the
744 * line pointer. By storing an offset into the file instead of the literal line,
745 * we can decrease the memory footprint for the buffered output. At first we
746 * may want to only have indirection for the content lines, but we could also
747 * enhance the state for emitting prefabricated lines, e.g. the similarity
748 * score line or hunk/file headers would only need to store a number or path
749 * and then the output can be constructed later on depending on state.
750 */
751struct emitted_diff_symbol {
752 const char *line;
753 int len;
754 int flags;
755 enum diff_symbol s;
756};
757#define EMITTED_DIFF_SYMBOL_INIT {NULL}
758
759struct emitted_diff_symbols {
760 struct emitted_diff_symbol *buf;
761 int nr, alloc;
762};
763#define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
764
765static void append_emitted_diff_symbol(struct diff_options *o,
766 struct emitted_diff_symbol *e)
6957eb9a 767{
e6e045f8
SB
768 struct emitted_diff_symbol *f;
769
770 ALLOC_GROW(o->emitted_symbols->buf,
771 o->emitted_symbols->nr + 1,
772 o->emitted_symbols->alloc);
773 f = &o->emitted_symbols->buf[o->emitted_symbols->nr++];
774
775 memcpy(f, e, sizeof(struct emitted_diff_symbol));
776 f->line = e->line ? xmemdupz(e->line, e->len) : NULL;
6957eb9a
JH
777}
778
2e2d5ac1
SB
779struct moved_entry {
780 struct hashmap_entry ent;
781 const struct emitted_diff_symbol *es;
782 struct moved_entry *next_line;
783};
784
ca1f4ae4
SB
785/**
786 * The struct ws_delta holds white space differences between moved lines, i.e.
787 * between '+' and '-' lines that have been detected to be a move.
788 * The string contains the difference in leading white spaces, before the
789 * rest of the line is compared using the white space config for move
790 * coloring. The current_longer indicates if the first string in the
791 * comparision is longer than the second.
792 */
793struct ws_delta {
794 char *string;
795 unsigned int current_longer : 1;
2e2d5ac1 796};
ca1f4ae4
SB
797#define WS_DELTA_INIT { NULL, 0 }
798
74d156f4
PW
799struct moved_block {
800 struct moved_entry *match;
801 struct ws_delta wsd;
802};
803
804static void moved_block_clear(struct moved_block *b)
805{
806 FREE_AND_NULL(b->wsd.string);
807 b->match = NULL;
808}
809
ca1f4ae4
SB
810static int compute_ws_delta(const struct emitted_diff_symbol *a,
811 const struct emitted_diff_symbol *b,
812 struct ws_delta *out)
813{
814 const struct emitted_diff_symbol *longer = a->len > b->len ? a : b;
815 const struct emitted_diff_symbol *shorter = a->len > b->len ? b : a;
816 int d = longer->len - shorter->len;
817
fe4516d1
PW
818 if (strncmp(longer->line + d, shorter->line, shorter->len))
819 return 0;
820
ca1f4ae4
SB
821 out->string = xmemdupz(longer->line, d);
822 out->current_longer = (a == longer);
823
fe4516d1 824 return 1;
ca1f4ae4
SB
825}
826
827static int cmp_in_block_with_wsd(const struct diff_options *o,
828 const struct moved_entry *cur,
829 const struct moved_entry *match,
74d156f4 830 struct moved_block *pmb,
ca1f4ae4
SB
831 int n)
832{
833 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
834 int al = cur->es->len, cl = l->len;
835 const char *a = cur->es->line,
836 *b = match->es->line,
837 *c = l->line;
838
839 int wslen;
840
841 /*
842 * We need to check if 'cur' is equal to 'match'.
843 * As those are from the same (+/-) side, we do not need to adjust for
844 * indent changes. However these were found using fuzzy matching
845 * so we do have to check if they are equal.
846 */
847 if (strcmp(a, b))
848 return 1;
849
74d156f4 850 if (!pmb->wsd.string)
ca1f4ae4 851 /*
74d156f4
PW
852 * The white space delta is not active? This can happen
853 * when we exit early in this function.
ca1f4ae4
SB
854 */
855 return 1;
856
857 /*
74d156f4 858 * The indent changes of the block are known and stored in
ca1f4ae4
SB
859 * pmb->wsd; however we need to check if the indent changes of the
860 * current line are still the same as before.
861 *
862 * To do so we need to compare 'l' to 'cur', adjusting the
863 * one of them for the white spaces, depending which was longer.
864 */
865
74d156f4
PW
866 wslen = strlen(pmb->wsd.string);
867 if (pmb->wsd.current_longer) {
ca1f4ae4
SB
868 c += wslen;
869 cl -= wslen;
870 } else {
871 a += wslen;
872 al -= wslen;
873 }
874
cf074a9b 875 if (al != cl || memcmp(a, c, al))
ca1f4ae4
SB
876 return 1;
877
878 return 0;
879}
2e2d5ac1 880
ee1df66f
SB
881static int moved_entry_cmp(const void *hashmap_cmp_fn_data,
882 const void *entry,
883 const void *entry_or_key,
2e2d5ac1
SB
884 const void *keydata)
885{
ee1df66f
SB
886 const struct diff_options *diffopt = hashmap_cmp_fn_data;
887 const struct moved_entry *a = entry;
888 const struct moved_entry *b = entry_or_key;
b3095712
SB
889 unsigned flags = diffopt->color_moved_ws_handling
890 & XDF_WHITESPACE_FLAGS;
ee1df66f 891
ca1f4ae4
SB
892 if (diffopt->color_moved_ws_handling &
893 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
894 /*
895 * As there is not specific white space config given,
896 * we'd need to check for a new block, so ignore all
897 * white space. The setup of the white space
898 * configuration for the next block is done else where
899 */
900 flags |= XDF_IGNORE_WHITESPACE;
901
01be97c2
SB
902 return !xdiff_compare_lines(a->es->line, a->es->len,
903 b->es->line, b->es->len,
b3095712 904 flags);
2e2d5ac1
SB
905}
906
907static struct moved_entry *prepare_entry(struct diff_options *o,
908 int line_no)
909{
910 struct moved_entry *ret = xmalloc(sizeof(*ret));
911 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no];
b3095712 912 unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS;
2e2d5ac1 913
b3095712 914 ret->ent.hash = xdiff_hash_string(l->line, l->len, flags);
2e2d5ac1
SB
915 ret->es = l;
916 ret->next_line = NULL;
917
918 return ret;
919}
920
921static void add_lines_to_move_detection(struct diff_options *o,
922 struct hashmap *add_lines,
923 struct hashmap *del_lines)
924{
925 struct moved_entry *prev_line = NULL;
926
927 int n;
928 for (n = 0; n < o->emitted_symbols->nr; n++) {
929 struct hashmap *hm;
930 struct moved_entry *key;
931
932 switch (o->emitted_symbols->buf[n].s) {
933 case DIFF_SYMBOL_PLUS:
934 hm = add_lines;
935 break;
936 case DIFF_SYMBOL_MINUS:
937 hm = del_lines;
938 break;
939 default:
940 prev_line = NULL;
941 continue;
942 }
943
944 key = prepare_entry(o, n);
945 if (prev_line && prev_line->es->s == o->emitted_symbols->buf[n].s)
946 prev_line->next_line = key;
947
948 hashmap_add(hm, key);
949 prev_line = key;
950 }
951}
952
e2fe6abc
SB
953static void pmb_advance_or_null(struct diff_options *o,
954 struct moved_entry *match,
955 struct hashmap *hm,
74d156f4 956 struct moved_block *pmb,
e2fe6abc
SB
957 int pmb_nr)
958{
959 int i;
960 for (i = 0; i < pmb_nr; i++) {
74d156f4 961 struct moved_entry *prev = pmb[i].match;
e2fe6abc
SB
962 struct moved_entry *cur = (prev && prev->next_line) ?
963 prev->next_line : NULL;
964 if (cur && !hm->cmpfn(o, cur, match, NULL)) {
74d156f4 965 pmb[i].match = cur;
e2fe6abc 966 } else {
74d156f4 967 pmb[i].match = NULL;
e2fe6abc
SB
968 }
969 }
970}
971
ca1f4ae4
SB
972static void pmb_advance_or_null_multi_match(struct diff_options *o,
973 struct moved_entry *match,
974 struct hashmap *hm,
74d156f4 975 struct moved_block *pmb,
ca1f4ae4
SB
976 int pmb_nr, int n)
977{
978 int i;
979 char *got_match = xcalloc(1, pmb_nr);
980
981 for (; match; match = hashmap_get_next(hm, match)) {
982 for (i = 0; i < pmb_nr; i++) {
74d156f4 983 struct moved_entry *prev = pmb[i].match;
ca1f4ae4
SB
984 struct moved_entry *cur = (prev && prev->next_line) ?
985 prev->next_line : NULL;
986 if (!cur)
987 continue;
74d156f4 988 if (!cmp_in_block_with_wsd(o, cur, match, &pmb[i], n))
ca1f4ae4
SB
989 got_match[i] |= 1;
990 }
991 }
992
993 for (i = 0; i < pmb_nr; i++) {
994 if (got_match[i]) {
74d156f4
PW
995 /* Advance to the next line */
996 pmb[i].match = pmb[i].match->next_line;
fab01ec5 997 } else {
74d156f4 998 moved_block_clear(&pmb[i]);
fab01ec5 999 }
ca1f4ae4 1000 }
9c1a6c2b
PW
1001
1002 free(got_match);
ca1f4ae4
SB
1003}
1004
74d156f4 1005static int shrink_potential_moved_blocks(struct moved_block *pmb,
2e2d5ac1
SB
1006 int pmb_nr)
1007{
1008 int lp, rp;
1009
1010 /* Shrink the set of potential block to the remaining running */
1011 for (lp = 0, rp = pmb_nr - 1; lp <= rp;) {
74d156f4 1012 while (lp < pmb_nr && pmb[lp].match)
2e2d5ac1
SB
1013 lp++;
1014 /* lp points at the first NULL now */
1015
74d156f4 1016 while (rp > -1 && !pmb[rp].match)
2e2d5ac1
SB
1017 rp--;
1018 /* rp points at the last non-NULL */
1019
1020 if (lp < pmb_nr && rp > -1 && lp < rp) {
1021 pmb[lp] = pmb[rp];
74d156f4
PW
1022 pmb[rp].match = NULL;
1023 pmb[rp].wsd.string = NULL;
2e2d5ac1
SB
1024 rp--;
1025 lp++;
1026 }
1027 }
1028
1029 /* Remember the number of running sets */
1030 return rp + 1;
1031}
1032
09153277
JT
1033/*
1034 * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
1035 *
f0b8fb6e
JT
1036 * Otherwise, if the last block has fewer alphanumeric characters than
1037 * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
09153277
JT
1038 * that block.
1039 *
1040 * The last block consists of the (n - block_length)'th line up to but not
1041 * including the nth line.
f0b8fb6e 1042 *
b0a2ba47
PW
1043 * Returns 0 if the last block is empty or is unset by this function, non zero
1044 * otherwise.
1045 *
f0b8fb6e
JT
1046 * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
1047 * Think of a way to unify them.
09153277 1048 */
b0a2ba47 1049static int adjust_last_block(struct diff_options *o, int n, int block_length)
09153277 1050{
f0b8fb6e
JT
1051 int i, alnum_count = 0;
1052 if (o->color_moved == COLOR_MOVED_PLAIN)
b0a2ba47 1053 return block_length;
f0b8fb6e
JT
1054 for (i = 1; i < block_length + 1; i++) {
1055 const char *c = o->emitted_symbols->buf[n - i].line;
1056 for (; *c; c++) {
1057 if (!isalnum(*c))
1058 continue;
1059 alnum_count++;
1060 if (alnum_count >= COLOR_MOVED_MIN_ALNUM_COUNT)
b0a2ba47 1061 return 1;
f0b8fb6e
JT
1062 }
1063 }
09153277
JT
1064 for (i = 1; i < block_length + 1; i++)
1065 o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE;
b0a2ba47 1066 return 0;
09153277
JT
1067}
1068
2e2d5ac1
SB
1069/* Find blocks of moved code, delegate actual coloring decision to helper */
1070static void mark_color_as_moved(struct diff_options *o,
1071 struct hashmap *add_lines,
1072 struct hashmap *del_lines)
1073{
74d156f4 1074 struct moved_block *pmb = NULL; /* potentially moved blocks */
2e2d5ac1 1075 int pmb_nr = 0, pmb_alloc = 0;
b0a2ba47 1076 int n, flipped_block = 0, block_length = 0;
2e2d5ac1
SB
1077
1078
1079 for (n = 0; n < o->emitted_symbols->nr; n++) {
1080 struct hashmap *hm = NULL;
1081 struct moved_entry *key;
1082 struct moved_entry *match = NULL;
1083 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
b0a2ba47 1084 enum diff_symbol last_symbol = 0;
2e2d5ac1
SB
1085
1086 switch (l->s) {
1087 case DIFF_SYMBOL_PLUS:
1088 hm = del_lines;
1089 key = prepare_entry(o, n);
3783aad4 1090 match = hashmap_get(hm, key, NULL);
2e2d5ac1
SB
1091 free(key);
1092 break;
1093 case DIFF_SYMBOL_MINUS:
1094 hm = add_lines;
1095 key = prepare_entry(o, n);
3783aad4 1096 match = hashmap_get(hm, key, NULL);
2e2d5ac1
SB
1097 free(key);
1098 break;
1099 default:
b0a2ba47 1100 flipped_block = 0;
2e2d5ac1
SB
1101 }
1102
1103 if (!match) {
74d156f4
PW
1104 int i;
1105
09153277 1106 adjust_last_block(o, n, block_length);
74d156f4
PW
1107 for(i = 0; i < pmb_nr; i++)
1108 moved_block_clear(&pmb[i]);
2e2d5ac1
SB
1109 pmb_nr = 0;
1110 block_length = 0;
b0a2ba47
PW
1111 flipped_block = 0;
1112 last_symbol = l->s;
2e2d5ac1
SB
1113 continue;
1114 }
1115
2034b473 1116 if (o->color_moved == COLOR_MOVED_PLAIN) {
b0a2ba47 1117 last_symbol = l->s;
2034b473 1118 l->flags |= DIFF_SYMBOL_MOVED_LINE;
176841f0 1119 continue;
2034b473 1120 }
176841f0 1121
ca1f4ae4
SB
1122 if (o->color_moved_ws_handling &
1123 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
1124 pmb_advance_or_null_multi_match(o, match, hm, pmb, pmb_nr, n);
1125 else
1126 pmb_advance_or_null(o, match, hm, pmb, pmb_nr);
2e2d5ac1
SB
1127
1128 pmb_nr = shrink_potential_moved_blocks(pmb, pmb_nr);
1129
1130 if (pmb_nr == 0) {
1131 /*
1132 * The current line is the start of a new block.
1133 * Setup the set of potential blocks.
1134 */
1135 for (; match; match = hashmap_get_next(hm, match)) {
1136 ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
ca1f4ae4
SB
1137 if (o->color_moved_ws_handling &
1138 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) {
74d156f4
PW
1139 if (compute_ws_delta(l, match->es,
1140 &pmb[pmb_nr].wsd))
1141 pmb[pmb_nr++].match = match;
ca1f4ae4 1142 } else {
74d156f4
PW
1143 pmb[pmb_nr].wsd.string = NULL;
1144 pmb[pmb_nr++].match = match;
ca1f4ae4 1145 }
2e2d5ac1
SB
1146 }
1147
b0a2ba47
PW
1148 if (adjust_last_block(o, n, block_length) &&
1149 pmb_nr && last_symbol != l->s)
1150 flipped_block = (flipped_block + 1) % 2;
1151 else
1152 flipped_block = 0;
f0b8fb6e 1153
f0b8fb6e 1154 block_length = 0;
2e2d5ac1
SB
1155 }
1156
2034b473
PW
1157 if (pmb_nr) {
1158 block_length++;
2034b473
PW
1159 l->flags |= DIFF_SYMBOL_MOVED_LINE;
1160 if (flipped_block && o->color_moved != COLOR_MOVED_BLOCKS)
1161 l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;
1162 }
b0a2ba47 1163 last_symbol = l->s;
2e2d5ac1 1164 }
09153277 1165 adjust_last_block(o, n, block_length);
2e2d5ac1 1166
74d156f4
PW
1167 for(n = 0; n < pmb_nr; n++)
1168 moved_block_clear(&pmb[n]);
2e2d5ac1
SB
1169 free(pmb);
1170}
e6e045f8 1171
86b452e2
SB
1172#define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
1173 (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
1174static void dim_moved_lines(struct diff_options *o)
1175{
1176 int n;
1177 for (n = 0; n < o->emitted_symbols->nr; n++) {
1178 struct emitted_diff_symbol *prev = (n != 0) ?
1179 &o->emitted_symbols->buf[n - 1] : NULL;
1180 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
1181 struct emitted_diff_symbol *next =
1182 (n < o->emitted_symbols->nr - 1) ?
1183 &o->emitted_symbols->buf[n + 1] : NULL;
1184
1185 /* Not a plus or minus line? */
1186 if (l->s != DIFF_SYMBOL_PLUS && l->s != DIFF_SYMBOL_MINUS)
1187 continue;
1188
1189 /* Not a moved line? */
1190 if (!(l->flags & DIFF_SYMBOL_MOVED_LINE))
1191 continue;
1192
1193 /*
1194 * If prev or next are not a plus or minus line,
1195 * pretend they don't exist
1196 */
1197 if (prev && prev->s != DIFF_SYMBOL_PLUS &&
1198 prev->s != DIFF_SYMBOL_MINUS)
1199 prev = NULL;
1200 if (next && next->s != DIFF_SYMBOL_PLUS &&
1201 next->s != DIFF_SYMBOL_MINUS)
1202 next = NULL;
1203
1204 /* Inside a block? */
1205 if ((prev &&
1206 (prev->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
1207 (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK)) &&
1208 (next &&
1209 (next->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
1210 (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK))) {
1211 l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
1212 continue;
1213 }
1214
1215 /* Check if we are at an interesting bound: */
1216 if (prev && (prev->flags & DIFF_SYMBOL_MOVED_LINE) &&
1217 (prev->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
1218 (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
1219 continue;
1220 if (next && (next->flags & DIFF_SYMBOL_MOVED_LINE) &&
1221 (next->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
1222 (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
1223 continue;
1224
1225 /*
1226 * The boundary to prev and next are not interesting,
1227 * so this line is not interesting as a whole
1228 */
1229 l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
1230 }
1231}
1232
091f8e28 1233static void emit_line_ws_markup(struct diff_options *o,
9d1e16bf
SB
1234 const char *set_sign, const char *set,
1235 const char *reset,
bc9feb05 1236 int sign_index, const char *line, int len,
091f8e28 1237 unsigned ws_rule, int blank_at_eof)
6957eb9a 1238{
b8767f79 1239 const char *ws = NULL;
bc9feb05 1240 int sign = o->output_indicators[sign_index];
6957eb9a 1241
091f8e28
SB
1242 if (o->ws_error_highlight & ws_rule) {
1243 ws = diff_get_color_opt(o, DIFF_WHITESPACE);
b8767f79
JH
1244 if (!*ws)
1245 ws = NULL;
1246 }
1247
f7c3b4e2 1248 if (!ws && !set_sign)
017ac45e 1249 emit_line_0(o, set, NULL, 0, reset, sign, line, len);
f7c3b4e2 1250 else if (!ws) {
29ef759d 1251 emit_line_0(o, set_sign, set, !!set_sign, reset, sign, line, len);
f7c3b4e2 1252 } else if (blank_at_eof)
6957eb9a 1253 /* Blank line at EOF - paint '+' as well */
017ac45e 1254 emit_line_0(o, ws, NULL, 0, reset, sign, line, len);
6957eb9a
JH
1255 else {
1256 /* Emit just the prefix, then the rest. */
017ac45e 1257 emit_line_0(o, set_sign ? set_sign : set, NULL, !!set_sign, reset,
f7c3b4e2 1258 sign, "", 0);
091f8e28
SB
1259 ws_check_emit(line, len, ws_rule,
1260 o->file, set, reset, ws);
6957eb9a
JH
1261 }
1262}
1263
e6e045f8
SB
1264static void emit_diff_symbol_from_struct(struct diff_options *o,
1265 struct emitted_diff_symbol *eds)
36a4cefd 1266{
b9cbfde6 1267 static const char *nneof = " No newline at end of file\n";
f7c3b4e2 1268 const char *context, *reset, *set, *set_sign, *meta, *fraginfo;
0911c475 1269 struct strbuf sb = STRBUF_INIT;
e6e045f8
SB
1270
1271 enum diff_symbol s = eds->s;
1272 const char *line = eds->line;
1273 int len = eds->len;
1274 unsigned flags = eds->flags;
1275
36a4cefd 1276 switch (s) {
b9cbfde6
SB
1277 case DIFF_SYMBOL_NO_LF_EOF:
1278 context = diff_get_color_opt(o, DIFF_CONTEXT);
1279 reset = diff_get_color_opt(o, DIFF_RESET);
1280 putc('\n', o->file);
017ac45e 1281 emit_line_0(o, context, NULL, 0, reset, '\\',
b9cbfde6
SB
1282 nneof, strlen(nneof));
1283 break;
f3597138
SB
1284 case DIFF_SYMBOL_SUBMODULE_HEADER:
1285 case DIFF_SYMBOL_SUBMODULE_ERROR:
1286 case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH:
0911c475 1287 case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES:
146fdb0d 1288 case DIFF_SYMBOL_SUMMARY:
0911c475 1289 case DIFF_SYMBOL_STATS_LINE:
4eed0ebd 1290 case DIFF_SYMBOL_BINARY_DIFF_BODY:
68abc6f1
SB
1291 case DIFF_SYMBOL_CONTEXT_FRAGINFO:
1292 emit_line(o, "", "", line, len);
1293 break;
f2bb1218 1294 case DIFF_SYMBOL_CONTEXT_INCOMPLETE:
c64b420b
SB
1295 case DIFF_SYMBOL_CONTEXT_MARKER:
1296 context = diff_get_color_opt(o, DIFF_CONTEXT);
1297 reset = diff_get_color_opt(o, DIFF_RESET);
1298 emit_line(o, context, reset, line, len);
1299 break;
36a4cefd
SB
1300 case DIFF_SYMBOL_SEPARATOR:
1301 fprintf(o->file, "%s%c",
1302 diff_line_prefix(o),
1303 o->line_termination);
1304 break;
091f8e28
SB
1305 case DIFF_SYMBOL_CONTEXT:
1306 set = diff_get_color_opt(o, DIFF_CONTEXT);
1307 reset = diff_get_color_opt(o, DIFF_RESET);
f7c3b4e2
JS
1308 set_sign = NULL;
1309 if (o->flags.dual_color_diffed_diffs) {
1310 char c = !len ? 0 : line[0];
1311
1312 if (c == '+')
1313 set = diff_get_color_opt(o, DIFF_FILE_NEW);
1314 else if (c == '@')
1315 set = diff_get_color_opt(o, DIFF_FRAGINFO);
1316 else if (c == '-')
1317 set = diff_get_color_opt(o, DIFF_FILE_OLD);
1318 }
7648b79e 1319 emit_line_ws_markup(o, set_sign, set, reset,
bc9feb05 1320 OUTPUT_INDICATOR_CONTEXT, line, len,
091f8e28
SB
1321 flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0);
1322 break;
1323 case DIFF_SYMBOL_PLUS:
86b452e2
SB
1324 switch (flags & (DIFF_SYMBOL_MOVED_LINE |
1325 DIFF_SYMBOL_MOVED_LINE_ALT |
1326 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
1327 case DIFF_SYMBOL_MOVED_LINE |
1328 DIFF_SYMBOL_MOVED_LINE_ALT |
1329 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1330 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT_DIM);
1331 break;
1332 case DIFF_SYMBOL_MOVED_LINE |
1333 DIFF_SYMBOL_MOVED_LINE_ALT:
2e2d5ac1 1334 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT);
86b452e2
SB
1335 break;
1336 case DIFF_SYMBOL_MOVED_LINE |
1337 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1338 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_DIM);
1339 break;
1340 case DIFF_SYMBOL_MOVED_LINE:
2e2d5ac1 1341 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED);
86b452e2
SB
1342 break;
1343 default:
2e2d5ac1 1344 set = diff_get_color_opt(o, DIFF_FILE_NEW);
86b452e2 1345 }
091f8e28 1346 reset = diff_get_color_opt(o, DIFF_RESET);
f7c3b4e2
JS
1347 if (!o->flags.dual_color_diffed_diffs)
1348 set_sign = NULL;
1349 else {
1350 char c = !len ? 0 : line[0];
1351
1352 set_sign = set;
1353 if (c == '-')
a7be92ac 1354 set = diff_get_color_opt(o, DIFF_FILE_OLD_BOLD);
f7c3b4e2
JS
1355 else if (c == '@')
1356 set = diff_get_color_opt(o, DIFF_FRAGINFO);
a7be92ac
JS
1357 else if (c == '+')
1358 set = diff_get_color_opt(o, DIFF_FILE_NEW_BOLD);
1359 else
1360 set = diff_get_color_opt(o, DIFF_CONTEXT_BOLD);
0b91faa0 1361 flags &= ~DIFF_SYMBOL_CONTENT_WS_MASK;
f7c3b4e2 1362 }
7648b79e 1363 emit_line_ws_markup(o, set_sign, set, reset,
bc9feb05 1364 OUTPUT_INDICATOR_NEW, line, len,
091f8e28
SB
1365 flags & DIFF_SYMBOL_CONTENT_WS_MASK,
1366 flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF);
1367 break;
1368 case DIFF_SYMBOL_MINUS:
86b452e2
SB
1369 switch (flags & (DIFF_SYMBOL_MOVED_LINE |
1370 DIFF_SYMBOL_MOVED_LINE_ALT |
1371 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
1372 case DIFF_SYMBOL_MOVED_LINE |
1373 DIFF_SYMBOL_MOVED_LINE_ALT |
1374 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1375 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT_DIM);
1376 break;
1377 case DIFF_SYMBOL_MOVED_LINE |
1378 DIFF_SYMBOL_MOVED_LINE_ALT:
2e2d5ac1 1379 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT);
86b452e2
SB
1380 break;
1381 case DIFF_SYMBOL_MOVED_LINE |
1382 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1383 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_DIM);
1384 break;
1385 case DIFF_SYMBOL_MOVED_LINE:
2e2d5ac1 1386 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED);
86b452e2
SB
1387 break;
1388 default:
2e2d5ac1 1389 set = diff_get_color_opt(o, DIFF_FILE_OLD);
86b452e2 1390 }
091f8e28 1391 reset = diff_get_color_opt(o, DIFF_RESET);
f7c3b4e2
JS
1392 if (!o->flags.dual_color_diffed_diffs)
1393 set_sign = NULL;
1394 else {
1395 char c = !len ? 0 : line[0];
1396
1397 set_sign = set;
1398 if (c == '+')
a7be92ac 1399 set = diff_get_color_opt(o, DIFF_FILE_NEW_DIM);
f7c3b4e2
JS
1400 else if (c == '@')
1401 set = diff_get_color_opt(o, DIFF_FRAGINFO);
a7be92ac
JS
1402 else if (c == '-')
1403 set = diff_get_color_opt(o, DIFF_FILE_OLD_DIM);
1404 else
1405 set = diff_get_color_opt(o, DIFF_CONTEXT_DIM);
f7c3b4e2 1406 }
7648b79e 1407 emit_line_ws_markup(o, set_sign, set, reset,
bc9feb05 1408 OUTPUT_INDICATOR_OLD, line, len,
091f8e28
SB
1409 flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0);
1410 break;
ff958679
SB
1411 case DIFF_SYMBOL_WORDS_PORCELAIN:
1412 context = diff_get_color_opt(o, DIFF_CONTEXT);
1413 reset = diff_get_color_opt(o, DIFF_RESET);
1414 emit_line(o, context, reset, line, len);
1415 fputs("~\n", o->file);
1416 break;
1417 case DIFF_SYMBOL_WORDS:
1418 context = diff_get_color_opt(o, DIFF_CONTEXT);
1419 reset = diff_get_color_opt(o, DIFF_RESET);
1420 /*
1421 * Skip the prefix character, if any. With
1422 * diff_suppress_blank_empty, there may be
1423 * none.
1424 */
1425 if (line[0] != '\n') {
1426 line++;
1427 len--;
1428 }
1429 emit_line(o, context, reset, line, len);
1430 break;
3ee8b7bf
SB
1431 case DIFF_SYMBOL_FILEPAIR_PLUS:
1432 meta = diff_get_color_opt(o, DIFF_METAINFO);
1433 reset = diff_get_color_opt(o, DIFF_RESET);
1434 fprintf(o->file, "%s%s+++ %s%s%s\n", diff_line_prefix(o), meta,
1435 line, reset,
1436 strchr(line, ' ') ? "\t" : "");
1437 break;
1438 case DIFF_SYMBOL_FILEPAIR_MINUS:
1439 meta = diff_get_color_opt(o, DIFF_METAINFO);
1440 reset = diff_get_color_opt(o, DIFF_RESET);
1441 fprintf(o->file, "%s%s--- %s%s%s\n", diff_line_prefix(o), meta,
1442 line, reset,
1443 strchr(line, ' ') ? "\t" : "");
1444 break;
4acaaa7a 1445 case DIFF_SYMBOL_BINARY_FILES:
a29b0a13
SB
1446 case DIFF_SYMBOL_HEADER:
1447 fprintf(o->file, "%s", line);
1448 break;
4eed0ebd
SB
1449 case DIFF_SYMBOL_BINARY_DIFF_HEADER:
1450 fprintf(o->file, "%sGIT binary patch\n", diff_line_prefix(o));
1451 break;
1452 case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA:
1453 fprintf(o->file, "%sdelta %s\n", diff_line_prefix(o), line);
1454 break;
1455 case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL:
1456 fprintf(o->file, "%sliteral %s\n", diff_line_prefix(o), line);
1457 break;
1458 case DIFF_SYMBOL_BINARY_DIFF_FOOTER:
1459 fputs(diff_line_prefix(o), o->file);
1460 fputc('\n', o->file);
1461 break;
5af6ea95
SB
1462 case DIFF_SYMBOL_REWRITE_DIFF:
1463 fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
1464 reset = diff_get_color_opt(o, DIFF_RESET);
1465 emit_line(o, fraginfo, reset, line, len);
1466 break;
f3597138
SB
1467 case DIFF_SYMBOL_SUBMODULE_ADD:
1468 set = diff_get_color_opt(o, DIFF_FILE_NEW);
1469 reset = diff_get_color_opt(o, DIFF_RESET);
1470 emit_line(o, set, reset, line, len);
1471 break;
1472 case DIFF_SYMBOL_SUBMODULE_DEL:
1473 set = diff_get_color_opt(o, DIFF_FILE_OLD);
1474 reset = diff_get_color_opt(o, DIFF_RESET);
1475 emit_line(o, set, reset, line, len);
1476 break;
1477 case DIFF_SYMBOL_SUBMODULE_UNTRACKED:
1478 fprintf(o->file, "%sSubmodule %s contains untracked content\n",
1479 diff_line_prefix(o), line);
1480 break;
1481 case DIFF_SYMBOL_SUBMODULE_MODIFIED:
1482 fprintf(o->file, "%sSubmodule %s contains modified content\n",
1483 diff_line_prefix(o), line);
1484 break;
0911c475
SB
1485 case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES:
1486 emit_line(o, "", "", " 0 files changed\n",
1487 strlen(" 0 files changed\n"));
1488 break;
1489 case DIFF_SYMBOL_STATS_SUMMARY_ABBREV:
1490 emit_line(o, "", "", " ...\n", strlen(" ...\n"));
1491 break;
bd033291
SB
1492 case DIFF_SYMBOL_WORD_DIFF:
1493 fprintf(o->file, "%.*s", len, line);
1494 break;
30b7e1e7
SB
1495 case DIFF_SYMBOL_STAT_SEP:
1496 fputs(o->stat_sep, o->file);
1497 break;
36a4cefd 1498 default:
033abf97 1499 BUG("unknown diff symbol");
36a4cefd 1500 }
0911c475 1501 strbuf_release(&sb);
36a4cefd
SB
1502}
1503
e6e045f8
SB
1504static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
1505 const char *line, int len, unsigned flags)
1506{
1507 struct emitted_diff_symbol e = {line, len, flags, s};
1508
1509 if (o->emitted_symbols)
1510 append_emitted_diff_symbol(o, &e);
1511 else
1512 emit_diff_symbol_from_struct(o, &e);
1513}
1514
f3597138
SB
1515void diff_emit_submodule_del(struct diff_options *o, const char *line)
1516{
1517 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_DEL, line, strlen(line), 0);
1518}
1519
1520void diff_emit_submodule_add(struct diff_options *o, const char *line)
1521{
1522 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ADD, line, strlen(line), 0);
1523}
1524
1525void diff_emit_submodule_untracked(struct diff_options *o, const char *path)
1526{
1527 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_UNTRACKED,
1528 path, strlen(path), 0);
1529}
1530
1531void diff_emit_submodule_modified(struct diff_options *o, const char *path)
1532{
1533 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_MODIFIED,
1534 path, strlen(path), 0);
1535}
1536
1537void diff_emit_submodule_header(struct diff_options *o, const char *header)
1538{
1539 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_HEADER,
1540 header, strlen(header), 0);
1541}
1542
1543void diff_emit_submodule_error(struct diff_options *o, const char *err)
1544{
1545 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ERROR, err, strlen(err), 0);
1546}
1547
1548void diff_emit_submodule_pipethrough(struct diff_options *o,
1549 const char *line, int len)
1550{
1551 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH, line, len, 0);
1552}
1553
6957eb9a
JH
1554static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
1555{
1556 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
1557 ecbdata->blank_at_eof_in_preimage &&
1558 ecbdata->blank_at_eof_in_postimage &&
1559 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
1560 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
1561 return 0;
018cff70 1562 return ws_blank_line(line, len, ecbdata->ws_rule);
6957eb9a
JH
1563}
1564
b8767f79 1565static void emit_add_line(const char *reset,
0e383e18
JH
1566 struct emit_callback *ecbdata,
1567 const char *line, int len)
1568{
091f8e28
SB
1569 unsigned flags = WSEH_NEW | ecbdata->ws_rule;
1570 if (new_blank_line_at_eof(ecbdata, line, len))
1571 flags |= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF;
1572
1573 emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_PLUS, line, len, flags);
b8767f79 1574}
0e383e18 1575
b8767f79
JH
1576static void emit_del_line(const char *reset,
1577 struct emit_callback *ecbdata,
1578 const char *line, int len)
1579{
091f8e28
SB
1580 unsigned flags = WSEH_OLD | ecbdata->ws_rule;
1581 emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags);
0e383e18
JH
1582}
1583
1584static void emit_context_line(const char *reset,
1585 struct emit_callback *ecbdata,
1586 const char *line, int len)
1587{
091f8e28
SB
1588 unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule;
1589 emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_CONTEXT, line, len, flags);
0e383e18
JH
1590}
1591
89cb73a1
BW
1592static void emit_hunk_header(struct emit_callback *ecbdata,
1593 const char *line, int len)
1594{
8dbf3eb6 1595 const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
89cb73a1
BW
1596 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
1597 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
1598 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
f7c3b4e2 1599 const char *reverse = ecbdata->color_diff ? GIT_COLOR_REVERSE : "";
89cb73a1
BW
1600 static const char atat[2] = { '@', '@' };
1601 const char *cp, *ep;
2efcc977
BY
1602 struct strbuf msgbuf = STRBUF_INIT;
1603 int org_len = len;
1604 int i = 1;
89cb73a1
BW
1605
1606 /*
1607 * As a hunk header must begin with "@@ -<old>, +<new> @@",
1608 * it always is at least 10 bytes long.
1609 */
1610 if (len < 10 ||
1611 memcmp(line, atat, 2) ||
1612 !(ep = memmem(line + 2, len - 2, atat, 2))) {
c64b420b 1613 emit_diff_symbol(ecbdata->opt,
091f8e28 1614 DIFF_SYMBOL_CONTEXT_MARKER, line, len, 0);
89cb73a1
BW
1615 return;
1616 }
1617 ep += 2; /* skip over @@ */
1618
1619 /* The hunk header in fraginfo color */
f7c3b4e2
JS
1620 if (ecbdata->opt->flags.dual_color_diffed_diffs)
1621 strbuf_addstr(&msgbuf, reverse);
cedc61a9 1622 strbuf_addstr(&msgbuf, frag);
2efcc977 1623 strbuf_add(&msgbuf, line, ep - line);
cedc61a9 1624 strbuf_addstr(&msgbuf, reset);
2efcc977
BY
1625
1626 /*
1627 * trailing "\r\n"
1628 */
1629 for ( ; i < 3; i++)
1630 if (line[len - i] == '\r' || line[len - i] == '\n')
1631 len--;
89cb73a1
BW
1632
1633 /* blank before the func header */
1634 for (cp = ep; ep - line < len; ep++)
1635 if (*ep != ' ' && *ep != '\t')
1636 break;
2efcc977 1637 if (ep != cp) {
8dbf3eb6 1638 strbuf_addstr(&msgbuf, context);
2efcc977 1639 strbuf_add(&msgbuf, cp, ep - cp);
cedc61a9 1640 strbuf_addstr(&msgbuf, reset);
2efcc977
BY
1641 }
1642
1643 if (ep < line + len) {
cedc61a9 1644 strbuf_addstr(&msgbuf, func);
2efcc977 1645 strbuf_add(&msgbuf, ep, line + len - ep);
cedc61a9 1646 strbuf_addstr(&msgbuf, reset);
2efcc977 1647 }
89cb73a1 1648
2efcc977 1649 strbuf_add(&msgbuf, line + len, org_len - len);
dfb7728f 1650 strbuf_complete_line(&msgbuf);
68abc6f1 1651 emit_diff_symbol(ecbdata->opt,
091f8e28 1652 DIFF_SYMBOL_CONTEXT_FRAGINFO, msgbuf.buf, msgbuf.len, 0);
2efcc977 1653 strbuf_release(&msgbuf);
89cb73a1
BW
1654}
1655
479b0ae8
JK
1656static struct diff_tempfile *claim_diff_tempfile(void) {
1657 int i;
1658 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
1659 if (!diff_temp[i].name)
1660 return diff_temp + i;
033abf97 1661 BUG("diff is failing to clean up its tempfiles");
479b0ae8
JK
1662}
1663
479b0ae8
JK
1664static void remove_tempfile(void)
1665{
1666 int i;
a8344abe 1667 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
076aa2cb 1668 if (is_tempfile_active(diff_temp[i].tempfile))
284098f1 1669 delete_tempfile(&diff_temp[i].tempfile);
a8344abe
NR
1670 diff_temp[i].name = NULL;
1671 }
479b0ae8
JK
1672}
1673
5af6ea95 1674static void add_line_count(struct strbuf *out, int count)
6973dcae
JH
1675{
1676 switch (count) {
1677 case 0:
5af6ea95 1678 strbuf_addstr(out, "0,0");
6973dcae
JH
1679 break;
1680 case 1:
5af6ea95 1681 strbuf_addstr(out, "1");
6973dcae
JH
1682 break;
1683 default:
5af6ea95 1684 strbuf_addf(out, "1,%d", count);
6973dcae
JH
1685 break;
1686 }
1687}
1688
7f7ee2ff
JH
1689static void emit_rewrite_lines(struct emit_callback *ecb,
1690 int prefix, const char *data, int size)
6973dcae 1691{
7f7ee2ff 1692 const char *endp = NULL;
7f7ee2ff
JH
1693 const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
1694
1695 while (0 < size) {
1696 int len;
1697
1698 endp = memchr(data, '\n', size);
1699 len = endp ? (endp - data + 1) : size;
1700 if (prefix != '+') {
1701 ecb->lno_in_preimage++;
0e383e18 1702 emit_del_line(reset, ecb, data, len);
7f7ee2ff
JH
1703 } else {
1704 ecb->lno_in_postimage++;
1705 emit_add_line(reset, ecb, data, len);
13e36ec5 1706 }
7f7ee2ff
JH
1707 size -= len;
1708 data += len;
1709 }
b9cbfde6 1710 if (!endp)
091f8e28 1711 emit_diff_symbol(ecb->opt, DIFF_SYMBOL_NO_LF_EOF, NULL, 0, 0);
6973dcae
JH
1712}
1713
1714static void emit_rewrite_diff(const char *name_a,
1715 const char *name_b,
1716 struct diff_filespec *one,
13e36ec5 1717 struct diff_filespec *two,
d9bae1a1
JK
1718 struct userdiff_driver *textconv_one,
1719 struct userdiff_driver *textconv_two,
eab9a40b 1720 struct diff_options *o)
6973dcae
JH
1721{
1722 int lc_a, lc_b;
d5625091 1723 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
a5a818ee 1724 const char *a_prefix, *b_prefix;
840383b2 1725 char *data_one, *data_two;
3aa1f7ca 1726 size_t size_one, size_two;
7f7ee2ff 1727 struct emit_callback ecbdata;
5af6ea95 1728 struct strbuf out = STRBUF_INIT;
a5a818ee 1729
0d1e0e78 1730 if (diff_mnemonic_prefix && o->flags.reverse_diff) {
a5a818ee
JH
1731 a_prefix = o->b_prefix;
1732 b_prefix = o->a_prefix;
1733 } else {
1734 a_prefix = o->a_prefix;
1735 b_prefix = o->b_prefix;
1736 }
1a9eb3b9 1737
8a13becc
JH
1738 name_a += (*name_a == '/');
1739 name_b += (*name_b == '/');
1a9eb3b9 1740
d5625091
JH
1741 strbuf_reset(&a_name);
1742 strbuf_reset(&b_name);
a5a818ee
JH
1743 quote_two_c_style(&a_name, a_prefix, name_a, 0);
1744 quote_two_c_style(&b_name, b_prefix, name_b, 0);
d5625091 1745
6afaf807
NTND
1746 size_one = fill_textconv(o->repo, textconv_one, one, &data_one);
1747 size_two = fill_textconv(o->repo, textconv_two, two, &data_two);
3aa1f7ca 1748
d91ba8fa 1749 memset(&ecbdata, 0, sizeof(ecbdata));
daa0c3d9 1750 ecbdata.color_diff = want_color(o->use_color);
26d024ec 1751 ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b);
a3c158d4 1752 ecbdata.opt = o;
d91ba8fa
JH
1753 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
1754 mmfile_t mf1, mf2;
1755 mf1.ptr = (char *)data_one;
1756 mf2.ptr = (char *)data_two;
1757 mf1.size = size_one;
1758 mf2.size = size_two;
1759 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1760 }
1761 ecbdata.lno_in_preimage = 1;
1762 ecbdata.lno_in_postimage = 1;
1763
3aa1f7ca
JK
1764 lc_a = count_lines(data_one, size_one);
1765 lc_b = count_lines(data_two, size_two);
3ee8b7bf
SB
1766
1767 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
1768 a_name.buf, a_name.len, 0);
1769 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
1770 b_name.buf, b_name.len, 0);
1771
5af6ea95 1772 strbuf_addstr(&out, "@@ -");
467ddc14 1773 if (!o->irreversible_delete)
5af6ea95 1774 add_line_count(&out, lc_a);
467ddc14 1775 else
5af6ea95
SB
1776 strbuf_addstr(&out, "?,?");
1777 strbuf_addstr(&out, " +");
1778 add_line_count(&out, lc_b);
1779 strbuf_addstr(&out, " @@\n");
1780 emit_diff_symbol(o, DIFF_SYMBOL_REWRITE_DIFF, out.buf, out.len, 0);
1781 strbuf_release(&out);
1782
467ddc14 1783 if (lc_a && !o->irreversible_delete)
d91ba8fa 1784 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
6973dcae 1785 if (lc_b)
d91ba8fa 1786 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
b76c056b 1787 if (textconv_one)
aed6ca52 1788 free((char *)data_one);
b76c056b 1789 if (textconv_two)
aed6ca52 1790 free((char *)data_two);
6973dcae
JH
1791}
1792
f59a59e2
JS
1793struct diff_words_buffer {
1794 mmfile_t text;
071bcaab 1795 unsigned long alloc;
2e5d2003
JS
1796 struct diff_words_orig {
1797 const char *begin, *end;
1798 } *orig;
1799 int orig_nr, orig_alloc;
f59a59e2
JS
1800};
1801
1802static void diff_words_append(char *line, unsigned long len,
1803 struct diff_words_buffer *buffer)
1804{
23c1575f 1805 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
f59a59e2
JS
1806 line++;
1807 len--;
1808 memcpy(buffer->text.ptr + buffer->text.size, line, len);
1809 buffer->text.size += len;
2b6a5417 1810 buffer->text.ptr[buffer->text.size] = '\0';
f59a59e2
JS
1811}
1812
9cba13ca 1813struct diff_words_style_elem {
882749a0
TR
1814 const char *prefix;
1815 const char *suffix;
1816 const char *color; /* NULL; filled in by the setup code if
1817 * color is enabled */
1818};
1819
9cba13ca 1820struct diff_words_style {
882749a0 1821 enum diff_words_type type;
63a01c3f 1822 struct diff_words_style_elem new_word, old_word, ctx;
882749a0
TR
1823 const char *newline;
1824};
1825
c2e86add 1826static struct diff_words_style diff_words_styles[] = {
882749a0
TR
1827 { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
1828 { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
1829 { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
1830};
1831
f59a59e2 1832struct diff_words_data {
f59a59e2 1833 struct diff_words_buffer minus, plus;
2e5d2003 1834 const char *current_plus;
4297c0ae
BY
1835 int last_minus;
1836 struct diff_options *opt;
2b6a5417 1837 regex_t *word_regex;
882749a0
TR
1838 enum diff_words_type type;
1839 struct diff_words_style *style;
f59a59e2
JS
1840};
1841
bd033291 1842static int fn_out_diff_words_write_helper(struct diff_options *o,
882749a0
TR
1843 struct diff_words_style_elem *st_el,
1844 const char *newline,
bd033291 1845 size_t count, const char *buf)
882749a0 1846{
4297c0ae 1847 int print = 0;
bd033291 1848 struct strbuf sb = STRBUF_INIT;
4297c0ae 1849
882749a0
TR
1850 while (count) {
1851 char *p = memchr(buf, '\n', count);
4297c0ae 1852 if (print)
bd033291
SB
1853 strbuf_addstr(&sb, diff_line_prefix(o));
1854
882749a0 1855 if (p != buf) {
bd033291
SB
1856 const char *reset = st_el->color && *st_el->color ?
1857 GIT_COLOR_RESET : NULL;
1858 if (st_el->color && *st_el->color)
1859 strbuf_addstr(&sb, st_el->color);
1860 strbuf_addstr(&sb, st_el->prefix);
1861 strbuf_add(&sb, buf, p ? p - buf : count);
1862 strbuf_addstr(&sb, st_el->suffix);
1863 if (reset)
1864 strbuf_addstr(&sb, reset);
882749a0
TR
1865 }
1866 if (!p)
bd033291
SB
1867 goto out;
1868
1869 strbuf_addstr(&sb, newline);
882749a0
TR
1870 count -= p + 1 - buf;
1871 buf = p + 1;
4297c0ae 1872 print = 1;
bd033291
SB
1873 if (count) {
1874 emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
1875 sb.buf, sb.len, 0);
1876 strbuf_reset(&sb);
1877 }
882749a0 1878 }
bd033291
SB
1879
1880out:
1881 if (sb.len)
1882 emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
1883 sb.buf, sb.len, 0);
1884 strbuf_release(&sb);
882749a0
TR
1885 return 0;
1886}
1887
4297c0ae
BY
1888/*
1889 * '--color-words' algorithm can be described as:
1890 *
5621760f 1891 * 1. collect the minus/plus lines of a diff hunk, divided into
4297c0ae
BY
1892 * minus-lines and plus-lines;
1893 *
1894 * 2. break both minus-lines and plus-lines into words and
1895 * place them into two mmfile_t with one word for each line;
1896 *
1897 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
1898 *
1899 * And for the common parts of the both file, we output the plus side text.
1900 * diff_words->current_plus is used to trace the current position of the plus file
1901 * which printed. diff_words->last_minus is used to trace the last minus word
1902 * printed.
1903 *
1904 * For '--graph' to work with '--color-words', we need to output the graph prefix
1905 * on each line of color words output. Generally, there are two conditions on
1906 * which we should output the prefix.
1907 *
1908 * 1. diff_words->last_minus == 0 &&
1909 * diff_words->current_plus == diff_words->plus.text.ptr
1910 *
1911 * that is: the plus text must start as a new line, and if there is no minus
1912 * word printed, a graph prefix must be printed.
1913 *
1914 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
1915 * *(diff_words->current_plus - 1) == '\n'
1916 *
1917 * that is: a graph prefix must be printed following a '\n'
1918 */
1919static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
1920{
1921 if ((diff_words->last_minus == 0 &&
1922 diff_words->current_plus == diff_words->plus.text.ptr) ||
1923 (diff_words->current_plus > diff_words->plus.text.ptr &&
1924 *(diff_words->current_plus - 1) == '\n')) {
1925 return 1;
1926 } else {
1927 return 0;
1928 }
1929}
1930
7c61e25f
JK
1931static void fn_out_diff_words_aux(void *priv,
1932 long minus_first, long minus_len,
1933 long plus_first, long plus_len,
1934 const char *func, long funclen)
f59a59e2 1935{
f59a59e2 1936 struct diff_words_data *diff_words = priv;
882749a0 1937 struct diff_words_style *style = diff_words->style;
2e5d2003 1938 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
4297c0ae 1939 struct diff_options *opt = diff_words->opt;
30997bb8 1940 const char *line_prefix;
f59a59e2 1941
4297c0ae 1942 assert(opt);
30997bb8 1943 line_prefix = diff_line_prefix(opt);
4297c0ae 1944
2e5d2003
JS
1945 /* POSIX requires that first be decremented by one if len == 0... */
1946 if (minus_len) {
1947 minus_begin = diff_words->minus.orig[minus_first].begin;
1948 minus_end =
1949 diff_words->minus.orig[minus_first + minus_len - 1].end;
1950 } else
1951 minus_begin = minus_end =
1952 diff_words->minus.orig[minus_first].end;
1953
1954 if (plus_len) {
1955 plus_begin = diff_words->plus.orig[plus_first].begin;
1956 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
1957 } else
1958 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
1959
4297c0ae
BY
1960 if (color_words_output_graph_prefix(diff_words)) {
1961 fputs(line_prefix, diff_words->opt->file);
1962 }
1963 if (diff_words->current_plus != plus_begin) {
bd033291 1964 fn_out_diff_words_write_helper(diff_words->opt,
882749a0
TR
1965 &style->ctx, style->newline,
1966 plus_begin - diff_words->current_plus,
bd033291 1967 diff_words->current_plus);
4297c0ae
BY
1968 }
1969 if (minus_begin != minus_end) {
bd033291 1970 fn_out_diff_words_write_helper(diff_words->opt,
63a01c3f 1971 &style->old_word, style->newline,
bd033291 1972 minus_end - minus_begin, minus_begin);
4297c0ae
BY
1973 }
1974 if (plus_begin != plus_end) {
bd033291 1975 fn_out_diff_words_write_helper(diff_words->opt,
63a01c3f 1976 &style->new_word, style->newline,
bd033291 1977 plus_end - plus_begin, plus_begin);
4297c0ae 1978 }
2e5d2003
JS
1979
1980 diff_words->current_plus = plus_end;
4297c0ae 1981 diff_words->last_minus = minus_first;
f59a59e2
JS
1982}
1983
2b6a5417
JS
1984/* This function starts looking at *begin, and returns 0 iff a word was found. */
1985static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
1986 int *begin, int *end)
1987{
1988 if (word_regex && *begin < buffer->size) {
1989 regmatch_t match[1];
b7d36ffc
JS
1990 if (!regexec_buf(word_regex, buffer->ptr + *begin,
1991 buffer->size - *begin, 1, match, 0)) {
2b6a5417
JS
1992 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
1993 '\n', match[0].rm_eo - match[0].rm_so);
1994 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
1995 *begin += match[0].rm_so;
1996 return *begin >= *end;
1997 }
1998 return -1;
f59a59e2
JS
1999 }
2000
2b6a5417
JS
2001 /* find the next word */
2002 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
2003 (*begin)++;
2004 if (*begin >= buffer->size)
2005 return -1;
f59a59e2 2006
2b6a5417
JS
2007 /* find the end of the word */
2008 *end = *begin + 1;
2009 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
2010 (*end)++;
2011
2012 return 0;
f59a59e2
JS
2013}
2014
23c1575f 2015/*
2e5d2003
JS
2016 * This function splits the words in buffer->text, stores the list with
2017 * newline separator into out, and saves the offsets of the original words
2018 * in buffer->orig.
23c1575f 2019 */
2b6a5417
JS
2020static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
2021 regex_t *word_regex)
f59a59e2 2022{
2e5d2003 2023 int i, j;
2b6a5417 2024 long alloc = 0;
f59a59e2 2025
2e5d2003 2026 out->size = 0;
2b6a5417 2027 out->ptr = NULL;
f59a59e2 2028
2e5d2003
JS
2029 /* fake an empty "0th" word */
2030 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
2031 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
2032 buffer->orig_nr = 1;
2033
2034 for (i = 0; i < buffer->text.size; i++) {
2b6a5417
JS
2035 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
2036 return;
2e5d2003
JS
2037
2038 /* store original boundaries */
2039 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
2040 buffer->orig_alloc);
2041 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
2042 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
2043 buffer->orig_nr++;
2044
2045 /* store one word */
2b6a5417 2046 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
2e5d2003
JS
2047 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
2048 out->ptr[out->size + j - i] = '\n';
2049 out->size += j - i + 1;
2050
2051 i = j - 1;
f59a59e2
JS
2052 }
2053}
2054
2055/* this executes the word diff on the accumulated buffers */
2056static void diff_words_show(struct diff_words_data *diff_words)
2057{
2058 xpparam_t xpp;
2059 xdemitconf_t xecfg;
f59a59e2 2060 mmfile_t minus, plus;
882749a0 2061 struct diff_words_style *style = diff_words->style;
f59a59e2 2062
4297c0ae 2063 struct diff_options *opt = diff_words->opt;
30997bb8 2064 const char *line_prefix;
4297c0ae
BY
2065
2066 assert(opt);
30997bb8 2067 line_prefix = diff_line_prefix(opt);
4297c0ae 2068
2e5d2003
JS
2069 /* special case: only removal */
2070 if (!diff_words->plus.text.size) {
bd033291
SB
2071 emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
2072 line_prefix, strlen(line_prefix), 0);
2073 fn_out_diff_words_write_helper(diff_words->opt,
63a01c3f 2074 &style->old_word, style->newline,
4297c0ae 2075 diff_words->minus.text.size,
bd033291 2076 diff_words->minus.text.ptr);
2e5d2003
JS
2077 diff_words->minus.text.size = 0;
2078 return;
2079 }
2080
2081 diff_words->current_plus = diff_words->plus.text.ptr;
4297c0ae 2082 diff_words->last_minus = 0;
f59a59e2 2083
9ccd0a88 2084 memset(&xpp, 0, sizeof(xpp));
30b25010 2085 memset(&xecfg, 0, sizeof(xecfg));
2b6a5417
JS
2086 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
2087 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
582aa00b 2088 xpp.flags = 0;
2b6a5417 2089 /* as only the hunk header will be parsed, we need a 0-context */
2e5d2003 2090 xecfg.ctxlen = 0;
7c61e25f 2091 if (xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, NULL,
9346d6d1 2092 diff_words, &xpp, &xecfg))
3efb9880 2093 die("unable to generate word diff");
f59a59e2
JS
2094 free(minus.ptr);
2095 free(plus.ptr);
2e5d2003 2096 if (diff_words->current_plus != diff_words->plus.text.ptr +
4297c0ae
BY
2097 diff_words->plus.text.size) {
2098 if (color_words_output_graph_prefix(diff_words))
bd033291
SB
2099 emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
2100 line_prefix, strlen(line_prefix), 0);
2101 fn_out_diff_words_write_helper(diff_words->opt,
882749a0 2102 &style->ctx, style->newline,
2e5d2003 2103 diff_words->plus.text.ptr + diff_words->plus.text.size
bd033291 2104 - diff_words->current_plus, diff_words->current_plus);
4297c0ae 2105 }
f59a59e2 2106 diff_words->minus.text.size = diff_words->plus.text.size = 0;
f59a59e2
JS
2107}
2108
76fd2828
JH
2109/* In "color-words" mode, show word-diff of words accumulated in the buffer */
2110static void diff_words_flush(struct emit_callback *ecbdata)
2111{
e6e045f8
SB
2112 struct diff_options *wo = ecbdata->diff_words->opt;
2113
76fd2828
JH
2114 if (ecbdata->diff_words->minus.text.size ||
2115 ecbdata->diff_words->plus.text.size)
2116 diff_words_show(ecbdata->diff_words);
e6e045f8
SB
2117
2118 if (wo->emitted_symbols) {
2119 struct diff_options *o = ecbdata->opt;
2120 struct emitted_diff_symbols *wol = wo->emitted_symbols;
2121 int i;
2122
2123 /*
2124 * NEEDSWORK:
2125 * Instead of appending each, concat all words to a line?
2126 */
2127 for (i = 0; i < wol->nr; i++)
2128 append_emitted_diff_symbol(o, &wol->buf[i]);
2129
2130 for (i = 0; i < wol->nr; i++)
2131 free((void *)wol->buf[i].line);
2132
2133 wol->nr = 0;
2134 }
76fd2828
JH
2135}
2136
acd00ea0
NTND
2137static void diff_filespec_load_driver(struct diff_filespec *one,
2138 struct index_state *istate)
77d1a520
TR
2139{
2140 /* Use already-loaded driver */
2141 if (one->driver)
2142 return;
2143
2144 if (S_ISREG(one->mode))
acd00ea0 2145 one->driver = userdiff_find_by_path(istate, one->path);
77d1a520
TR
2146
2147 /* Fallback to default settings */
2148 if (!one->driver)
2149 one->driver = userdiff_find_by_name("default");
2150}
2151
acd00ea0
NTND
2152static const char *userdiff_word_regex(struct diff_filespec *one,
2153 struct index_state *istate)
77d1a520 2154{
acd00ea0 2155 diff_filespec_load_driver(one, istate);
77d1a520
TR
2156 return one->driver->word_regex;
2157}
2158
2159static void init_diff_words_data(struct emit_callback *ecbdata,
6440d341 2160 struct diff_options *orig_opts,
77d1a520
TR
2161 struct diff_filespec *one,
2162 struct diff_filespec *two)
2163{
2164 int i;
6440d341
TR
2165 struct diff_options *o = xmalloc(sizeof(struct diff_options));
2166 memcpy(o, orig_opts, sizeof(struct diff_options));
77d1a520
TR
2167
2168 ecbdata->diff_words =
2169 xcalloc(1, sizeof(struct diff_words_data));
2170 ecbdata->diff_words->type = o->word_diff;
2171 ecbdata->diff_words->opt = o;
e6e045f8
SB
2172
2173 if (orig_opts->emitted_symbols)
2174 o->emitted_symbols =
2175 xcalloc(1, sizeof(struct emitted_diff_symbols));
2176
77d1a520 2177 if (!o->word_regex)
acd00ea0 2178 o->word_regex = userdiff_word_regex(one, o->repo->index);
77d1a520 2179 if (!o->word_regex)
acd00ea0 2180 o->word_regex = userdiff_word_regex(two, o->repo->index);
77d1a520
TR
2181 if (!o->word_regex)
2182 o->word_regex = diff_word_regex_cfg;
2183 if (o->word_regex) {
2184 ecbdata->diff_words->word_regex = (regex_t *)
2185 xmalloc(sizeof(regex_t));
2186 if (regcomp(ecbdata->diff_words->word_regex,
2187 o->word_regex,
2188 REG_EXTENDED | REG_NEWLINE))
1a07e59c
NTND
2189 die("invalid regular expression: %s",
2190 o->word_regex);
77d1a520
TR
2191 }
2192 for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
2193 if (o->word_diff == diff_words_styles[i].type) {
2194 ecbdata->diff_words->style =
2195 &diff_words_styles[i];
2196 break;
2197 }
2198 }
2199 if (want_color(o->use_color)) {
2200 struct diff_words_style *st = ecbdata->diff_words->style;
63a01c3f
BW
2201 st->old_word.color = diff_get_color_opt(o, DIFF_FILE_OLD);
2202 st->new_word.color = diff_get_color_opt(o, DIFF_FILE_NEW);
8dbf3eb6 2203 st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
77d1a520
TR
2204 }
2205}
2206
f59a59e2
JS
2207static void free_diff_words_data(struct emit_callback *ecbdata)
2208{
2209 if (ecbdata->diff_words) {
76fd2828 2210 diff_words_flush(ecbdata);
e6e045f8 2211 free (ecbdata->diff_words->opt->emitted_symbols);
6440d341 2212 free (ecbdata->diff_words->opt);
8e0f7003 2213 free (ecbdata->diff_words->minus.text.ptr);
2e5d2003 2214 free (ecbdata->diff_words->minus.orig);
8e0f7003 2215 free (ecbdata->diff_words->plus.text.ptr);
2e5d2003 2216 free (ecbdata->diff_words->plus.orig);
ef5644ea
BC
2217 if (ecbdata->diff_words->word_regex) {
2218 regfree(ecbdata->diff_words->word_regex);
2219 free(ecbdata->diff_words->word_regex);
2220 }
6a83d902 2221 FREE_AND_NULL(ecbdata->diff_words);
f59a59e2
JS
2222 }
2223}
2224
ce436973 2225const char *diff_get_color(int diff_use_color, enum color_diff ix)
cd112cef 2226{
daa0c3d9 2227 if (want_color(diff_use_color))
50f575fc
LT
2228 return diff_colors[ix];
2229 return "";
cd112cef
JS
2230}
2231
f1922234
JK
2232const char *diff_line_prefix(struct diff_options *opt)
2233{
2234 struct strbuf *msgbuf;
2235 if (!opt->output_prefix)
2236 return "";
2237
2238 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
2239 return msgbuf->buf;
2240}
2241
23707811
JH
2242static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
2243{
2244 const char *cp;
2245 unsigned long allot;
2246 size_t l = len;
2247
23707811
JH
2248 cp = line;
2249 allot = l;
2250 while (0 < l) {
2251 (void) utf8_width(&cp, &l);
2252 if (!cp)
2253 break; /* truncated in the middle? */
2254 }
2255 return allot - l;
2256}
2257
d68fe26f 2258static void find_lno(const char *line, struct emit_callback *ecbdata)
690ed843 2259{
d68fe26f
JH
2260 const char *p;
2261 ecbdata->lno_in_preimage = 0;
2262 ecbdata->lno_in_postimage = 0;
2263 p = strchr(line, '-');
690ed843 2264 if (!p)
d68fe26f
JH
2265 return; /* cannot happen */
2266 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
2267 p = strchr(p, '+');
2268 if (!p)
2269 return; /* cannot happen */
2270 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
690ed843
JH
2271}
2272
cd112cef 2273static void fn_out_consume(void *priv, char *line, unsigned long len)
6973dcae 2274{
6973dcae 2275 struct emit_callback *ecbdata = priv;
ce436973 2276 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
7be57610 2277 struct diff_options *o = ecbdata->opt;
6973dcae 2278
ba16233c
SB
2279 o->found_changes = 1;
2280
3e97c7c6 2281 if (ecbdata->header) {
a29b0a13
SB
2282 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
2283 ecbdata->header->buf, ecbdata->header->len, 0);
3e97c7c6
GB
2284 strbuf_reset(ecbdata->header);
2285 ecbdata->header = NULL;
2286 }
34a5e1a2 2287
6973dcae 2288 if (ecbdata->label_path[0]) {
3ee8b7bf
SB
2289 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
2290 ecbdata->label_path[0],
2291 strlen(ecbdata->label_path[0]), 0);
2292 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
2293 ecbdata->label_path[1],
2294 strlen(ecbdata->label_path[1]), 0);
6973dcae
JH
2295 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
2296 }
cd112cef 2297
a624eaa7
JM
2298 if (diff_suppress_blank_empty
2299 && len == 2 && line[0] == ' ' && line[1] == '\n') {
2300 line[0] = '\n';
2301 len = 1;
2302 }
2303
b8d9c1a6 2304 if (line[0] == '@') {
76fd2828
JH
2305 if (ecbdata->diff_words)
2306 diff_words_flush(ecbdata);
23707811 2307 len = sane_truncate_line(ecbdata, line, len);
d68fe26f 2308 find_lno(line, ecbdata);
89cb73a1 2309 emit_hunk_header(ecbdata, line, len);
448c3ef1 2310 return;
cd112cef 2311 }
448c3ef1 2312
448c3ef1 2313 if (ecbdata->diff_words) {
ff958679
SB
2314 enum diff_symbol s =
2315 ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN ?
2316 DIFF_SYMBOL_WORDS_PORCELAIN : DIFF_SYMBOL_WORDS;
448c3ef1
JH
2317 if (line[0] == '-') {
2318 diff_words_append(line, len,
2319 &ecbdata->diff_words->minus);
2320 return;
2321 } else if (line[0] == '+') {
2322 diff_words_append(line, len,
2323 &ecbdata->diff_words->plus);
2324 return;
59556548 2325 } else if (starts_with(line, "\\ ")) {
c7c2bc0a
TR
2326 /*
2327 * Eat the "no newline at eof" marker as if we
2328 * saw a "+" or "-" line with nothing on it,
2329 * and return without diff_words_flush() to
2330 * defer processing. If this is the end of
2331 * preimage, more "+" lines may come after it.
2332 */
2333 return;
448c3ef1 2334 }
76fd2828 2335 diff_words_flush(ecbdata);
ff958679 2336 emit_diff_symbol(o, s, line, len, 0);
448c3ef1
JH
2337 return;
2338 }
448c3ef1 2339
0e383e18
JH
2340 switch (line[0]) {
2341 case '+':
d68fe26f 2342 ecbdata->lno_in_postimage++;
018cff70 2343 emit_add_line(reset, ecbdata, line + 1, len - 1);
0e383e18
JH
2344 break;
2345 case '-':
2346 ecbdata->lno_in_preimage++;
2347 emit_del_line(reset, ecbdata, line + 1, len - 1);
2348 break;
2349 case ' ':
2350 ecbdata->lno_in_postimage++;
2351 ecbdata->lno_in_preimage++;
2352 emit_context_line(reset, ecbdata, line + 1, len - 1);
2353 break;
2354 default:
2355 /* incomplete line at the end */
2356 ecbdata->lno_in_preimage++;
f2bb1218
SB
2357 emit_diff_symbol(o, DIFF_SYMBOL_CONTEXT_INCOMPLETE,
2358 line, len, 0);
0e383e18 2359 break;
448c3ef1 2360 }
6973dcae
JH
2361}
2362
c905cbc4 2363static void pprint_rename(struct strbuf *name, const char *a, const char *b)
6973dcae 2364{
63a01c3f
BW
2365 const char *old_name = a;
2366 const char *new_name = b;
6973dcae 2367 int pfx_length, sfx_length;
dd281f09 2368 int pfx_adjust_for_slash;
6973dcae
JH
2369 int len_a = strlen(a);
2370 int len_b = strlen(b);
663af342 2371 int a_midlen, b_midlen;
e5bfbf9b
AJ
2372 int qlen_a = quote_c_style(a, NULL, NULL, 0);
2373 int qlen_b = quote_c_style(b, NULL, NULL, 0);
2374
2375 if (qlen_a || qlen_b) {
c905cbc4
NTND
2376 quote_c_style(a, name, NULL, 0);
2377 strbuf_addstr(name, " => ");
2378 quote_c_style(b, name, NULL, 0);
2379 return;
e5bfbf9b 2380 }
6973dcae
JH
2381
2382 /* Find common prefix */
2383 pfx_length = 0;
63a01c3f
BW
2384 while (*old_name && *new_name && *old_name == *new_name) {
2385 if (*old_name == '/')
2386 pfx_length = old_name - a + 1;
2387 old_name++;
2388 new_name++;
6973dcae
JH
2389 }
2390
2391 /* Find common suffix */
63a01c3f
BW
2392 old_name = a + len_a;
2393 new_name = b + len_b;
6973dcae 2394 sfx_length = 0;
d020e27f 2395 /*
dd281f09
TR
2396 * If there is a common prefix, it must end in a slash. In
2397 * that case we let this loop run 1 into the prefix to see the
2398 * same slash.
2399 *
2400 * If there is no common prefix, we cannot do this as it would
2401 * underrun the input strings.
d020e27f 2402 */
dd281f09 2403 pfx_adjust_for_slash = (pfx_length ? 1 : 0);
63a01c3f
BW
2404 while (a + pfx_length - pfx_adjust_for_slash <= old_name &&
2405 b + pfx_length - pfx_adjust_for_slash <= new_name &&
2406 *old_name == *new_name) {
2407 if (*old_name == '/')
2408 sfx_length = len_a - (old_name - a);
2409 old_name--;
2410 new_name--;
6973dcae
JH
2411 }
2412
2413 /*
2414 * pfx{mid-a => mid-b}sfx
2415 * {pfx-a => pfx-b}sfx
2416 * pfx{sfx-a => sfx-b}
2417 * name-a => name-b
2418 */
663af342
PH
2419 a_midlen = len_a - pfx_length - sfx_length;
2420 b_midlen = len_b - pfx_length - sfx_length;
2421 if (a_midlen < 0)
2422 a_midlen = 0;
2423 if (b_midlen < 0)
2424 b_midlen = 0;
2425
c905cbc4 2426 strbuf_grow(name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
6973dcae 2427 if (pfx_length + sfx_length) {
c905cbc4
NTND
2428 strbuf_add(name, a, pfx_length);
2429 strbuf_addch(name, '{');
6973dcae 2430 }
c905cbc4
NTND
2431 strbuf_add(name, a + pfx_length, a_midlen);
2432 strbuf_addstr(name, " => ");
2433 strbuf_add(name, b + pfx_length, b_midlen);
663af342 2434 if (pfx_length + sfx_length) {
c905cbc4
NTND
2435 strbuf_addch(name, '}');
2436 strbuf_add(name, a + len_a - sfx_length, sfx_length);
6973dcae 2437 }
6973dcae
JH
2438}
2439
2440struct diffstat_t {
6973dcae
JH
2441 int nr;
2442 int alloc;
2443 struct diffstat_file {
f604652e 2444 char *from_name;
6973dcae 2445 char *name;
f604652e 2446 char *print_name;
ddf88fa6 2447 const char *comments;
6973dcae
JH
2448 unsigned is_unmerged:1;
2449 unsigned is_binary:1;
2450 unsigned is_renamed:1;
74faaa16 2451 unsigned is_interesting:1;
0974c117 2452 uintmax_t added, deleted;
6973dcae
JH
2453 } **files;
2454};
2455
2456static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
2457 const char *name_a,
2458 const char *name_b)
2459{
2460 struct diffstat_file *x;
1a4927c5 2461 x = xcalloc(1, sizeof(*x));
4c960a43 2462 ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
6973dcae
JH
2463 diffstat->files[diffstat->nr++] = x;
2464 if (name_b) {
f604652e
JH
2465 x->from_name = xstrdup(name_a);
2466 x->name = xstrdup(name_b);
6973dcae
JH
2467 x->is_renamed = 1;
2468 }
f604652e
JH
2469 else {
2470 x->from_name = NULL;
9befac47 2471 x->name = xstrdup(name_a);
f604652e 2472 }
6973dcae
JH
2473 return x;
2474}
2475
2476static void diffstat_consume(void *priv, char *line, unsigned long len)
2477{
2478 struct diffstat_t *diffstat = priv;
2479 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
2480
2481 if (line[0] == '+')
2482 x->added++;
2483 else if (line[0] == '-')
2484 x->deleted++;
2485}
2486
698ce6f8 2487const char mime_boundary_leader[] = "------------";
6973dcae 2488
a2540023
JH
2489static int scale_linear(int it, int width, int max_change)
2490{
2eeeef24
JH
2491 if (!it)
2492 return 0;
a2540023 2493 /*
2eeeef24
JH
2494 * make sure that at least one '-' or '+' is printed if
2495 * there is any change to this path. The easiest way is to
2496 * scale linearly as if the alloted width is one column shorter
2497 * than it is, and then add 1 to the result.
a2540023 2498 */
2eeeef24 2499 return 1 + (it * (width - 1) / max_change);
a2540023
JH
2500}
2501
0911c475
SB
2502static void show_graph(struct strbuf *out, char ch, int cnt,
2503 const char *set, const char *reset)
a2540023
JH
2504{
2505 if (cnt <= 0)
2506 return;
0911c475
SB
2507 strbuf_addstr(out, set);
2508 strbuf_addchars(out, ch, cnt);
2509 strbuf_addstr(out, reset);
a2540023
JH
2510}
2511
f604652e
JH
2512static void fill_print_name(struct diffstat_file *file)
2513{
c905cbc4 2514 struct strbuf pname = STRBUF_INIT;
f604652e
JH
2515
2516 if (file->print_name)
2517 return;
2518
c905cbc4
NTND
2519 if (file->is_renamed)
2520 pprint_rename(&pname, file->from_name, file->name);
2521 else
2522 quote_c_style(file->name, &pname, NULL, 0);
2523
ddf88fa6
NTND
2524 if (file->comments)
2525 strbuf_addf(&pname, " (%s)", file->comments);
2526
c905cbc4 2527 file->print_name = strbuf_detach(&pname, NULL);
f604652e
JH
2528}
2529
0911c475
SB
2530static void print_stat_summary_inserts_deletes(struct diff_options *options,
2531 int files, int insertions, int deletions)
7f814632
NTND
2532{
2533 struct strbuf sb = STRBUF_INIT;
7f814632
NTND
2534
2535 if (!files) {
2536 assert(insertions == 0 && deletions == 0);
0911c475
SB
2537 emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
2538 NULL, 0, 0);
2539 return;
7f814632
NTND
2540 }
2541
2542 strbuf_addf(&sb,
218adaaa 2543 (files == 1) ? " %d file changed" : " %d files changed",
7f814632
NTND
2544 files);
2545
2546 /*
2547 * For binary diff, the caller may want to print "x files
2548 * changed" with insertions == 0 && deletions == 0.
2549 *
2550 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
2551 * is probably less confusing (i.e skip over "2 files changed
2552 * but nothing about added/removed lines? Is this a bug in Git?").
2553 */
2554 if (insertions || deletions == 0) {
7f814632 2555 strbuf_addf(&sb,
218adaaa 2556 (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
7f814632
NTND
2557 insertions);
2558 }
2559
2560 if (deletions || insertions == 0) {
7f814632 2561 strbuf_addf(&sb,
218adaaa 2562 (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
7f814632
NTND
2563 deletions);
2564 }
2565 strbuf_addch(&sb, '\n');
0911c475
SB
2566 emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
2567 sb.buf, sb.len, 0);
7f814632 2568 strbuf_release(&sb);
0911c475
SB
2569}
2570
2571void print_stat_summary(FILE *fp, int files,
2572 int insertions, int deletions)
2573{
2574 struct diff_options o;
2575 memset(&o, 0, sizeof(o));
2576 o.file = fp;
2577
2578 print_stat_summary_inserts_deletes(&o, files, insertions, deletions);
7f814632
NTND
2579}
2580
4b25d091 2581static void show_stats(struct diffstat_t *data, struct diff_options *options)
6973dcae 2582{
eb3a9dd3 2583 int i, len, add, del, adds = 0, dels = 0;
0974c117 2584 uintmax_t max_change = 0, max_len = 0;
dc801e71
ZJS
2585 int total_files = data->nr, count;
2586 int width, name_width, graph_width, number_width = 0, bin_width = 0;
c0aa335c 2587 const char *reset, *add_c, *del_c;
e5f85df8 2588 int extra_shown = 0;
0911c475
SB
2589 const char *line_prefix = diff_line_prefix(options);
2590 struct strbuf out = STRBUF_INIT;
6973dcae
JH
2591
2592 if (data->nr == 0)
2593 return;
2594
808e1db2 2595 count = options->stat_count ? options->stat_count : data->nr;
a2540023 2596
8f67f8ae 2597 reset = diff_get_color_opt(options, DIFF_RESET);
8f67f8ae
PH
2598 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
2599 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
785f7432 2600
1b058bc3
ZJS
2601 /*
2602 * Find the longest filename and max number of changes
2603 */
808e1db2 2604 for (i = 0; (i < count) && (i < data->nr); i++) {
6973dcae 2605 struct diffstat_file *file = data->files[i];
0974c117 2606 uintmax_t change = file->added + file->deleted;
af0ed819
JH
2607
2608 if (!file->is_interesting && (change == 0)) {
808e1db2 2609 count++; /* not shown == room for one more */
358e460e
MG
2610 continue;
2611 }
f604652e
JH
2612 fill_print_name(file);
2613 len = strlen(file->print_name);
6973dcae
JH
2614 if (max_len < len)
2615 max_len = len;
2616
dc801e71
ZJS
2617 if (file->is_unmerged) {
2618 /* "Unmerged" is 8 characters */
2619 bin_width = bin_width < 8 ? 8 : bin_width;
6973dcae 2620 continue;
dc801e71
ZJS
2621 }
2622 if (file->is_binary) {
2623 /* "Bin XXX -> YYY bytes" */
2624 int w = 14 + decimal_width(file->added)
2625 + decimal_width(file->deleted);
2626 bin_width = bin_width < w ? w : bin_width;
2627 /* Display change counts aligned with "Bin" */
2628 number_width = 3;
2629 continue;
2630 }
2631
a2540023
JH
2632 if (max_change < change)
2633 max_change = change;
6973dcae 2634 }
a20d3c0d 2635 count = i; /* where we can stop scanning in data->files[] */
6973dcae 2636
1b058bc3
ZJS
2637 /*
2638 * We have width = stat_width or term_columns() columns total.
2639 * We want a maximum of min(max_len, stat_name_width) for the name part.
969fe57b 2640 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1b058bc3
ZJS
2641 * We also need 1 for " " and 4 + decimal_width(max_change)
2642 * for " | NNNN " and one the empty column at the end, altogether
2643 * 6 + decimal_width(max_change).
2644 *
2645 * If there's not enough space, we will use the smaller of
2646 * stat_name_width (if set) and 5/8*width for the filename,
969fe57b
ZJS
2647 * and the rest for constant elements + graph part, but no more
2648 * than stat_graph_width for the graph part.
1b058bc3
ZJS
2649 * (5/8 gives 50 for filename and 30 for the constant parts + graph
2650 * for the standard terminal size).
a2540023 2651 *
1b058bc3
ZJS
2652 * In other words: stat_width limits the maximum width, and
2653 * stat_name_width fixes the maximum width of the filename,
2654 * and is also used to divide available columns if there
2655 * aren't enough.
dc801e71
ZJS
2656 *
2657 * Binary files are displayed with "Bin XXX -> YYY bytes"
2658 * instead of the change count and graph. This part is treated
2659 * similarly to the graph part, except that it is not
41ccfdd9 2660 * "scaled". If total width is too small to accommodate the
dc801e71
ZJS
2661 * guaranteed minimum width of the filename part and the
2662 * separators and this message, this message will "overflow"
2663 * making the line longer than the maximum width.
a2540023 2664 */
1b058bc3
ZJS
2665
2666 if (options->stat_width == -1)
cd48dadb 2667 width = term_columns() - strlen(line_prefix);
a2540023 2668 else
1b058bc3 2669 width = options->stat_width ? options->stat_width : 80;
dc801e71
ZJS
2670 number_width = decimal_width(max_change) > number_width ?
2671 decimal_width(max_change) : number_width;
a2540023 2672
df44483a
ZJS
2673 if (options->stat_graph_width == -1)
2674 options->stat_graph_width = diff_stat_graph_width;
a2540023 2675
1b058bc3
ZJS
2676 /*
2677 * Guarantee 3/8*16==6 for the graph part
2678 * and 5/8*16==10 for the filename part
2679 */
2680 if (width < 16 + 6 + number_width)
2681 width = 16 + 6 + number_width;
2682
2683 /*
2684 * First assign sizes that are wanted, ignoring available width.
dc801e71
ZJS
2685 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
2686 * starting from "XXX" should fit in graph_width.
1b058bc3 2687 */
dc801e71
ZJS
2688 graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
2689 if (options->stat_graph_width &&
2690 options->stat_graph_width < graph_width)
2691 graph_width = options->stat_graph_width;
2692
1b058bc3
ZJS
2693 name_width = (options->stat_name_width > 0 &&
2694 options->stat_name_width < max_len) ?
2695 options->stat_name_width : max_len;
2696
2697 /*
2698 * Adjust adjustable widths not to exceed maximum width
2699 */
2700 if (name_width + number_width + 6 + graph_width > width) {
678c5741 2701 if (graph_width > width * 3/8 - number_width - 6) {
1b058bc3 2702 graph_width = width * 3/8 - number_width - 6;
678c5741
LP
2703 if (graph_width < 6)
2704 graph_width = 6;
2705 }
2706
969fe57b
ZJS
2707 if (options->stat_graph_width &&
2708 graph_width > options->stat_graph_width)
2709 graph_width = options->stat_graph_width;
1b058bc3
ZJS
2710 if (name_width > width - number_width - 6 - graph_width)
2711 name_width = width - number_width - 6 - graph_width;
2712 else
2713 graph_width = width - number_width - 6 - name_width;
2714 }
2715
2716 /*
2717 * From here name_width is the width of the name area,
2718 * and graph_width is the width of the graph area.
2719 * max_change is used to scale graph properly.
2720 */
808e1db2 2721 for (i = 0; i < count; i++) {
d2543b8e 2722 const char *prefix = "";
af0ed819
JH
2723 struct diffstat_file *file = data->files[i];
2724 char *name = file->print_name;
2725 uintmax_t added = file->added;
2726 uintmax_t deleted = file->deleted;
a2540023 2727 int name_len;
6973dcae 2728
a20d3c0d 2729 if (!file->is_interesting && (added + deleted == 0))
358e460e 2730 continue;
a20d3c0d 2731
6973dcae
JH
2732 /*
2733 * "scale" the filename
2734 */
a2540023
JH
2735 len = name_width;
2736 name_len = strlen(name);
2737 if (name_width < name_len) {
6973dcae
JH
2738 char *slash;
2739 prefix = "...";
a2540023
JH
2740 len -= 3;
2741 name += name_len - len;
6973dcae
JH
2742 slash = strchr(name, '/');
2743 if (slash)
2744 name = slash;
2745 }
6973dcae 2746
af0ed819 2747 if (file->is_binary) {
0911c475
SB
2748 strbuf_addf(&out, " %s%-*s |", prefix, len, name);
2749 strbuf_addf(&out, " %*s", number_width, "Bin");
e18872b2 2750 if (!added && !deleted) {
0911c475
SB
2751 strbuf_addch(&out, '\n');
2752 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2753 out.buf, out.len, 0);
2754 strbuf_reset(&out);
e18872b2
ZJS
2755 continue;
2756 }
0911c475 2757 strbuf_addf(&out, " %s%"PRIuMAX"%s",
0974c117 2758 del_c, deleted, reset);
0911c475
SB
2759 strbuf_addstr(&out, " -> ");
2760 strbuf_addf(&out, "%s%"PRIuMAX"%s",
0974c117 2761 add_c, added, reset);
0911c475
SB
2762 strbuf_addstr(&out, " bytes\n");
2763 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2764 out.buf, out.len, 0);
2765 strbuf_reset(&out);
f604652e 2766 continue;
6973dcae 2767 }
af0ed819 2768 else if (file->is_unmerged) {
0911c475
SB
2769 strbuf_addf(&out, " %s%-*s |", prefix, len, name);
2770 strbuf_addstr(&out, " Unmerged\n");
2771 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2772 out.buf, out.len, 0);
2773 strbuf_reset(&out);
f604652e 2774 continue;
6973dcae 2775 }
6973dcae 2776
a2540023
JH
2777 /*
2778 * scale the add/delete
2779 */
6973dcae
JH
2780 add = added;
2781 del = deleted;
6973dcae 2782
1b058bc3 2783 if (graph_width <= max_change) {
d3c9cf32 2784 int total = scale_linear(add + del, graph_width, max_change);
2eeeef24
JH
2785 if (total < 2 && add && del)
2786 /* width >= 2 due to the sanity check */
2787 total = 2;
2788 if (add < del) {
1b058bc3 2789 add = scale_linear(add, graph_width, max_change);
2eeeef24
JH
2790 del = total - add;
2791 } else {
1b058bc3 2792 del = scale_linear(del, graph_width, max_change);
2eeeef24
JH
2793 add = total - del;
2794 }
6973dcae 2795 }
0911c475
SB
2796 strbuf_addf(&out, " %s%-*s |", prefix, len, name);
2797 strbuf_addf(&out, " %*"PRIuMAX"%s",
dc801e71
ZJS
2798 number_width, added + deleted,
2799 added + deleted ? " " : "");
0911c475
SB
2800 show_graph(&out, '+', add, add_c, reset);
2801 show_graph(&out, '-', del, del_c, reset);
2802 strbuf_addch(&out, '\n');
2803 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2804 out.buf, out.len, 0);
2805 strbuf_reset(&out);
c0c77734 2806 }
a20d3c0d
JH
2807
2808 for (i = 0; i < data->nr; i++) {
af0ed819
JH
2809 struct diffstat_file *file = data->files[i];
2810 uintmax_t added = file->added;
2811 uintmax_t deleted = file->deleted;
82dfc2c4
JH
2812
2813 if (file->is_unmerged ||
2814 (!file->is_interesting && (added + deleted == 0))) {
808e1db2
MG
2815 total_files--;
2816 continue;
2817 }
a20d3c0d 2818
82dfc2c4 2819 if (!file->is_binary) {
a20d3c0d
JH
2820 adds += added;
2821 dels += deleted;
2822 }
2823 if (i < count)
2824 continue;
e5f85df8 2825 if (!extra_shown)
0911c475
SB
2826 emit_diff_symbol(options,
2827 DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
2828 NULL, 0, 0);
e5f85df8 2829 extra_shown = 1;
808e1db2 2830 }
0911c475
SB
2831
2832 print_stat_summary_inserts_deletes(options, total_files, adds, dels);
5a612017 2833 strbuf_release(&out);
6973dcae
JH
2834}
2835
2775d92c 2836static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
ebd124c6
NP
2837{
2838 int i, adds = 0, dels = 0, total_files = data->nr;
2839
2840 if (data->nr == 0)
2841 return;
2842
2843 for (i = 0; i < data->nr; i++) {
e18872b2 2844 int added = data->files[i]->added;
0911c475 2845 int deleted = data->files[i]->deleted;
e18872b2 2846
20c8cde4
JH
2847 if (data->files[i]->is_unmerged ||
2848 (!data->files[i]->is_interesting && (added + deleted == 0))) {
e18872b2 2849 total_files--;
de9658b5 2850 } else if (!data->files[i]->is_binary) { /* don't count bytes */
e18872b2
ZJS
2851 adds += added;
2852 dels += deleted;
ebd124c6 2853 }
ebd124c6 2854 }
0911c475 2855 print_stat_summary_inserts_deletes(options, total_files, adds, dels);
ebd124c6
NP
2856}
2857
4b25d091 2858static void show_numstat(struct diffstat_t *data, struct diff_options *options)
74e2abe5
JH
2859{
2860 int i;
2861
f604652e
JH
2862 if (data->nr == 0)
2863 return;
2864
74e2abe5
JH
2865 for (i = 0; i < data->nr; i++) {
2866 struct diffstat_file *file = data->files[i];
2867
30997bb8 2868 fprintf(options->file, "%s", diff_line_prefix(options));
7be57610 2869
bfddbc5e 2870 if (file->is_binary)
c0c77734 2871 fprintf(options->file, "-\t-\t");
bfddbc5e 2872 else
c0c77734 2873 fprintf(options->file,
0974c117
JK
2874 "%"PRIuMAX"\t%"PRIuMAX"\t",
2875 file->added, file->deleted);
f604652e
JH
2876 if (options->line_termination) {
2877 fill_print_name(file);
2878 if (!file->is_renamed)
c0c77734 2879 write_name_quoted(file->name, options->file,
f604652e
JH
2880 options->line_termination);
2881 else {
c0c77734
DB
2882 fputs(file->print_name, options->file);
2883 putc(options->line_termination, options->file);
f604652e 2884 }
663af342 2885 } else {
f604652e 2886 if (file->is_renamed) {
c0c77734
DB
2887 putc('\0', options->file);
2888 write_name_quoted(file->from_name, options->file, '\0');
f604652e 2889 }
c0c77734 2890 write_name_quoted(file->name, options->file, '\0');
663af342 2891 }
74e2abe5
JH
2892 }
2893}
2894
c04a7155
JH
2895struct dirstat_file {
2896 const char *name;
2897 unsigned long changed;
7df7c019
LT
2898};
2899
c04a7155
JH
2900struct dirstat_dir {
2901 struct dirstat_file *files;
712d2c7d 2902 int alloc, nr, permille, cumulative;
c04a7155
JH
2903};
2904
7be57610
BY
2905static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
2906 unsigned long changed, const char *base, int baselen)
7df7c019 2907{
585c0e2e 2908 unsigned long sum_changes = 0;
7df7c019 2909 unsigned int sources = 0;
30997bb8 2910 const char *line_prefix = diff_line_prefix(opt);
7df7c019
LT
2911
2912 while (dir->nr) {
c04a7155 2913 struct dirstat_file *f = dir->files;
7df7c019 2914 int namelen = strlen(f->name);
585c0e2e 2915 unsigned long changes;
7df7c019
LT
2916 char *slash;
2917
2918 if (namelen < baselen)
2919 break;
2920 if (memcmp(f->name, base, baselen))
2921 break;
2922 slash = strchr(f->name + baselen, '/');
2923 if (slash) {
2924 int newbaselen = slash + 1 - f->name;
585c0e2e 2925 changes = gather_dirstat(opt, dir, changed, f->name, newbaselen);
7df7c019
LT
2926 sources++;
2927 } else {
585c0e2e 2928 changes = f->changed;
7df7c019
LT
2929 dir->files++;
2930 dir->nr--;
2931 sources += 2;
2932 }
585c0e2e 2933 sum_changes += changes;
7df7c019
LT
2934 }
2935
2936 /*
2937 * We don't report dirstat's for
2938 * - the top level
2939 * - or cases where everything came from a single directory
2940 * under this directory (sources == 1).
2941 */
2942 if (baselen && sources != 1) {
585c0e2e
BW
2943 if (sum_changes) {
2944 int permille = sum_changes * 1000 / changed;
712d2c7d 2945 if (permille >= dir->permille) {
7be57610 2946 fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
712d2c7d 2947 permille / 10, permille % 10, baselen, base);
7df7c019
LT
2948 if (!dir->cumulative)
2949 return 0;
2950 }
2951 }
2952 }
585c0e2e 2953 return sum_changes;
7df7c019
LT
2954}
2955
441bca0b
LT
2956static int dirstat_compare(const void *_a, const void *_b)
2957{
2958 const struct dirstat_file *a = _a;
2959 const struct dirstat_file *b = _b;
2960 return strcmp(a->name, b->name);
2961}
2962
c04a7155 2963static void show_dirstat(struct diff_options *options)
7df7c019
LT
2964{
2965 int i;
2966 unsigned long changed;
c04a7155
JH
2967 struct dirstat_dir dir;
2968 struct diff_queue_struct *q = &diff_queued_diff;
2969
2970 dir.files = NULL;
2971 dir.alloc = 0;
2972 dir.nr = 0;
712d2c7d 2973 dir.permille = options->dirstat_permille;
0d1e0e78 2974 dir.cumulative = options->flags.dirstat_cumulative;
7df7c019 2975
7df7c019 2976 changed = 0;
c04a7155
JH
2977 for (i = 0; i < q->nr; i++) {
2978 struct diff_filepair *p = q->queue[i];
2979 const char *name;
2980 unsigned long copied, added, damage;
2981
2ca86714 2982 name = p->two->path ? p->two->path : p->one->path;
c04a7155 2983
d9f62dfa
JK
2984 if (p->one->oid_valid && p->two->oid_valid &&
2985 oideq(&p->one->oid, &p->two->oid)) {
2ff3a803
JH
2986 /*
2987 * The SHA1 has not changed, so pre-/post-content is
2988 * identical. We can therefore skip looking at the
2989 * file contents altogether.
2990 */
2991 damage = 0;
2992 goto found_damage;
2993 }
2994
0d1e0e78 2995 if (options->flags.dirstat_by_file) {
0133dab7
JH
2996 /*
2997 * In --dirstat-by-file mode, we don't really need to
2998 * look at the actual file contents at all.
2999 * The fact that the SHA1 changed is enough for us to
3000 * add this file to the list of results
3001 * (with each file contributing equal damage).
3002 */
2ff3a803 3003 damage = 1;
0133dab7
JH
3004 goto found_damage;
3005 }
c04a7155
JH
3006
3007 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
b78ea5fc
NTND
3008 diff_populate_filespec(options->repo, p->one, 0);
3009 diff_populate_filespec(options->repo, p->two, 0);
3010 diffcore_count_changes(options->repo,
3011 p->one, p->two, NULL, NULL,
c04a7155
JH
3012 &copied, &added);
3013 diff_free_filespec_data(p->one);
3014 diff_free_filespec_data(p->two);
3015 } else if (DIFF_FILE_VALID(p->one)) {
b78ea5fc 3016 diff_populate_filespec(options->repo, p->one, CHECK_SIZE_ONLY);
c04a7155
JH
3017 copied = added = 0;
3018 diff_free_filespec_data(p->one);
3019 } else if (DIFF_FILE_VALID(p->two)) {
b78ea5fc 3020 diff_populate_filespec(options->repo, p->two, CHECK_SIZE_ONLY);
c04a7155
JH
3021 copied = 0;
3022 added = p->two->size;
3023 diff_free_filespec_data(p->two);
3024 } else
2b0b551d 3025 continue;
c04a7155
JH
3026
3027 /*
3028 * Original minus copied is the removed material,
3029 * added is the new material. They are both damages
0133dab7 3030 * made to the preimage.
2ff3a803
JH
3031 * If the resulting damage is zero, we know that
3032 * diffcore_count_changes() considers the two entries to
d9f62dfa 3033 * be identical, but since the oid changed, we
2ff3a803
JH
3034 * know that there must have been _some_ kind of change,
3035 * so we force all entries to have damage > 0.
c04a7155
JH
3036 */
3037 damage = (p->one->size - copied) + added;
2ff3a803 3038 if (!damage)
fd33777b 3039 damage = 1;
c04a7155 3040
0133dab7 3041found_damage:
c04a7155
JH
3042 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
3043 dir.files[dir.nr].name = name;
3044 dir.files[dir.nr].changed = damage;
3045 changed += damage;
3046 dir.nr++;
7df7c019
LT
3047 }
3048
3049 /* This can happen even with many files, if everything was renames */
3050 if (!changed)
3051 return;
3052
3053 /* Show all directories with more than x% of the changes */
9ed0d8d6 3054 QSORT(dir.files, dir.nr, dirstat_compare);
7be57610 3055 gather_dirstat(options, &dir, changed, "", 0);
7df7c019
LT
3056}
3057
1c57a627
JH
3058static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
3059{
3060 int i;
3061 unsigned long changed;
3062 struct dirstat_dir dir;
3063
3064 if (data->nr == 0)
3065 return;
3066
3067 dir.files = NULL;
3068 dir.alloc = 0;
3069 dir.nr = 0;
3070 dir.permille = options->dirstat_permille;
0d1e0e78 3071 dir.cumulative = options->flags.dirstat_cumulative;
1c57a627
JH
3072
3073 changed = 0;
3074 for (i = 0; i < data->nr; i++) {
3075 struct diffstat_file *file = data->files[i];
3076 unsigned long damage = file->added + file->deleted;
3077 if (file->is_binary)
3078 /*
3079 * binary files counts bytes, not lines. Must find some
3080 * way to normalize binary bytes vs. textual lines.
3081 * The following heuristic assumes that there are 64
3082 * bytes per "line".
3083 * This is stupid and ugly, but very cheap...
3084 */
42c78a21 3085 damage = DIV_ROUND_UP(damage, 64);
1c57a627
JH
3086 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
3087 dir.files[dir.nr].name = file->name;
3088 dir.files[dir.nr].changed = damage;
3089 changed += damage;
3090 dir.nr++;
3091 }
3092
3093 /* This can happen even with many files, if everything was renames */
3094 if (!changed)
3095 return;
3096
3097 /* Show all directories with more than x% of the changes */
9ed0d8d6 3098 QSORT(dir.files, dir.nr, dirstat_compare);
1c57a627
JH
3099 gather_dirstat(options, &dir, changed, "", 0);
3100}
3101
f604652e
JH
3102static void free_diffstat_info(struct diffstat_t *diffstat)
3103{
3104 int i;
3105 for (i = 0; i < diffstat->nr; i++) {
3106 struct diffstat_file *f = diffstat->files[i];
c905cbc4 3107 free(f->print_name);
f604652e
JH
3108 free(f->name);
3109 free(f->from_name);
3110 free(f);
3111 }
3112 free(diffstat->files);
3113}
3114
88246898 3115struct checkdiff_t {
88246898 3116 const char *filename;
1ba111d1 3117 int lineno;
a757c646 3118 int conflict_marker_size;
1ba111d1 3119 struct diff_options *o;
cf1b7869 3120 unsigned ws_rule;
62c64895 3121 unsigned status;
88246898
JS
3122};
3123
a757c646 3124static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
04954043
JH
3125{
3126 char firstchar;
3127 int cnt;
3128
a757c646 3129 if (len < marker_size + 1)
04954043
JH
3130 return 0;
3131 firstchar = line[0];
3132 switch (firstchar) {
a757c646 3133 case '=': case '>': case '<': case '|':
04954043
JH
3134 break;
3135 default:
3136 return 0;
3137 }
a757c646 3138 for (cnt = 1; cnt < marker_size; cnt++)
04954043
JH
3139 if (line[cnt] != firstchar)
3140 return 0;
a757c646
JH
3141 /* line[1] thru line[marker_size-1] are same as firstchar */
3142 if (len < marker_size + 1 || !isspace(line[marker_size]))
04954043 3143 return 0;
04954043
JH
3144 return 1;
3145}
3146
75ab7630
JK
3147static void checkdiff_consume_hunk(void *priv,
3148 long ob, long on, long nb, long nn,
3149 const char *func, long funclen)
3150
3151{
3152 struct checkdiff_t *data = priv;
3153 data->lineno = nb - 1;
3154}
3155
88246898
JS
3156static void checkdiff_consume(void *priv, char *line, unsigned long len)
3157{
3158 struct checkdiff_t *data = priv;
a757c646 3159 int marker_size = data->conflict_marker_size;
f1c96261
JK
3160 const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
3161 const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
3162 const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
c1795bb0 3163 char *err;
30997bb8 3164 const char *line_prefix;
7be57610
BY
3165
3166 assert(data->o);
30997bb8 3167 line_prefix = diff_line_prefix(data->o);
88246898
JS
3168
3169 if (line[0] == '+') {
18374e58 3170 unsigned bad;
0ef617f4 3171 data->lineno++;
a757c646 3172 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
04954043
JH
3173 data->status |= 1;
3174 fprintf(data->o->file,
7be57610
BY
3175 "%s%s:%d: leftover conflict marker\n",
3176 line_prefix, data->filename, data->lineno);
04954043 3177 }
8f8841e9 3178 bad = ws_check(line + 1, len - 1, data->ws_rule);
18374e58 3179 if (!bad)
c1795bb0 3180 return;
18374e58
JH
3181 data->status |= bad;
3182 err = whitespace_error_string(bad);
7be57610
BY
3183 fprintf(data->o->file, "%s%s:%d: %s.\n",
3184 line_prefix, data->filename, data->lineno, err);
c1795bb0 3185 free(err);
a3c158d4 3186 emit_line(data->o, set, reset, line, 1);
8f8841e9 3187 ws_check_emit(line + 1, len - 1, data->ws_rule,
1ba111d1 3188 data->o->file, set, reset, ws);
877f23cc 3189 } else if (line[0] == ' ') {
88246898 3190 data->lineno++;
88246898
JS
3191 }
3192}
3193
0660626c
JH
3194static unsigned char *deflate_it(char *data,
3195 unsigned long size,
3196 unsigned long *result_size)
051308f6 3197{
0660626c
JH
3198 int bound;
3199 unsigned char *deflated;
ef49a7a0 3200 git_zstream stream;
0660626c 3201
55bb5c91 3202 git_deflate_init(&stream, zlib_compression_level);
225a6f10 3203 bound = git_deflate_bound(&stream, size);
0660626c
JH
3204 deflated = xmalloc(bound);
3205 stream.next_out = deflated;
3206 stream.avail_out = bound;
3207
3208 stream.next_in = (unsigned char *)data;
3209 stream.avail_in = size;
55bb5c91 3210 while (git_deflate(&stream, Z_FINISH) == Z_OK)
0660626c 3211 ; /* nothing */
55bb5c91 3212 git_deflate_end(&stream);
0660626c
JH
3213 *result_size = stream.total_out;
3214 return deflated;
051308f6
JH
3215}
3216
4eed0ebd
SB
3217static void emit_binary_diff_body(struct diff_options *o,
3218 mmfile_t *one, mmfile_t *two)
051308f6 3219{
0660626c
JH
3220 void *cp;
3221 void *delta;
3222 void *deflated;
3223 void *data;
3224 unsigned long orig_size;
3225 unsigned long delta_size;
3226 unsigned long deflate_size;
3227 unsigned long data_size;
051308f6 3228
0660626c
JH
3229 /* We could do deflated delta, or we could do just deflated two,
3230 * whichever is smaller.
051308f6 3231 */
0660626c
JH
3232 delta = NULL;
3233 deflated = deflate_it(two->ptr, two->size, &deflate_size);
3234 if (one->size && two->size) {
3235 delta = diff_delta(one->ptr, one->size,
3236 two->ptr, two->size,
3237 &delta_size, deflate_size);
3238 if (delta) {
3239 void *to_free = delta;
3240 orig_size = delta_size;
3241 delta = deflate_it(delta, delta_size, &delta_size);
3242 free(to_free);
051308f6
JH
3243 }
3244 }
051308f6 3245
0660626c 3246 if (delta && delta_size < deflate_size) {
ca473cef 3247 char *s = xstrfmt("%"PRIuMAX , (uintmax_t)orig_size);
4eed0ebd
SB
3248 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
3249 s, strlen(s), 0);
3250 free(s);
0660626c
JH
3251 free(deflated);
3252 data = delta;
3253 data_size = delta_size;
4eed0ebd
SB
3254 } else {
3255 char *s = xstrfmt("%lu", two->size);
3256 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
3257 s, strlen(s), 0);
3258 free(s);
0660626c
JH
3259 free(delta);
3260 data = deflated;
3261 data_size = deflate_size;
3262 }
051308f6 3263
0660626c
JH
3264 /* emit data encoded in base85 */
3265 cp = data;
3266 while (data_size) {
4eed0ebd 3267 int len;
0660626c 3268 int bytes = (52 < data_size) ? 52 : data_size;
4eed0ebd 3269 char line[71];
0660626c 3270 data_size -= bytes;
051308f6
JH
3271 if (bytes <= 26)
3272 line[0] = bytes + 'A' - 1;
3273 else
3274 line[0] = bytes - 26 + 'a' - 1;
3275 encode_85(line + 1, cp, bytes);
1d7f171c 3276 cp = (char *) cp + bytes;
4eed0ebd
SB
3277
3278 len = strlen(line);
3279 line[len++] = '\n';
3280 line[len] = '\0';
3281
3282 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_BODY,
3283 line, len, 0);
051308f6 3284 }
4eed0ebd 3285 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_FOOTER, NULL, 0, 0);
0660626c 3286 free(data);
051308f6
JH
3287}
3288
4eed0ebd
SB
3289static void emit_binary_diff(struct diff_options *o,
3290 mmfile_t *one, mmfile_t *two)
d4c452f0 3291{
4eed0ebd
SB
3292 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER, NULL, 0, 0);
3293 emit_binary_diff_body(o, one, two);
3294 emit_binary_diff_body(o, two, one);
d4c452f0
JH
3295}
3296
b78ea5fc
NTND
3297int diff_filespec_is_binary(struct repository *r,
3298 struct diff_filespec *one)
29a3eefd 3299{
122aa6f9 3300 if (one->is_binary == -1) {
acd00ea0 3301 diff_filespec_load_driver(one, r->index);
122aa6f9
JK
3302 if (one->driver->binary != -1)
3303 one->is_binary = one->driver->binary;
3304 else {
3305 if (!one->data && DIFF_FILE_VALID(one))
b78ea5fc 3306 diff_populate_filespec(r, one, CHECK_BINARY);
6bf3b813 3307 if (one->is_binary == -1 && one->data)
122aa6f9
JK
3308 one->is_binary = buffer_is_binary(one->data,
3309 one->size);
3310 if (one->is_binary == -1)
3311 one->is_binary = 0;
3312 }
3313 }
29a3eefd 3314 return one->is_binary;
6973dcae
JH
3315}
3316
acd00ea0
NTND
3317static const struct userdiff_funcname *
3318diff_funcname_pattern(struct diff_options *o, struct diff_filespec *one)
f258475a 3319{
acd00ea0 3320 diff_filespec_load_driver(one, o->repo->index);
122aa6f9 3321 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
f258475a
JH
3322}
3323
a5a818ee
JH
3324void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
3325{
3326 if (!options->a_prefix)
3327 options->a_prefix = a;
3328 if (!options->b_prefix)
3329 options->b_prefix = b;
3330}
3331
acd00ea0
NTND
3332struct userdiff_driver *get_textconv(struct index_state *istate,
3333 struct diff_filespec *one)
04427ac8
JK
3334{
3335 if (!DIFF_FILE_VALID(one))
3336 return NULL;
d391c0ff 3337
acd00ea0 3338 diff_filespec_load_driver(one, istate);
3813e690 3339 return userdiff_get_textconv(one->driver);
04427ac8
JK
3340}
3341
6973dcae
JH
3342static void builtin_diff(const char *name_a,
3343 const char *name_b,
3344 struct diff_filespec *one,
3345 struct diff_filespec *two,
3346 const char *xfrm_msg,
296c6bb2 3347 int must_show_header,
051308f6 3348 struct diff_options *o,
6973dcae
JH
3349 int complete_rewrite)
3350{
3351 mmfile_t mf1, mf2;
3352 const char *lbl[2];
3353 char *a_one, *b_two;
d9c552f1 3354 const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
8f67f8ae 3355 const char *reset = diff_get_color_opt(o, DIFF_RESET);
a5a818ee 3356 const char *a_prefix, *b_prefix;
d9bae1a1
JK
3357 struct userdiff_driver *textconv_one = NULL;
3358 struct userdiff_driver *textconv_two = NULL;
3e97c7c6 3359 struct strbuf header = STRBUF_INIT;
30997bb8 3360 const char *line_prefix = diff_line_prefix(o);
a5a818ee 3361
fd47ae6a 3362 diff_set_mnemonic_prefix(o, "a/", "b/");
0d1e0e78 3363 if (o->flags.reverse_diff) {
fd47ae6a
JK
3364 a_prefix = o->b_prefix;
3365 b_prefix = o->a_prefix;
3366 } else {
3367 a_prefix = o->a_prefix;
3368 b_prefix = o->b_prefix;
3369 }
3370
61cfbc05
JK
3371 if (o->submodule_format == DIFF_SUBMODULE_LOG &&
3372 (!one->mode || S_ISGITLINK(one->mode)) &&
3373 (!two->mode || S_ISGITLINK(two->mode))) {
f3597138 3374 show_submodule_summary(o, one->path ? one->path : two->path,
602a283a 3375 &one->oid, &two->oid,
f3597138 3376 two->dirty_submodule);
752c0c24 3377 return;
fd47ae6a
JK
3378 } else if (o->submodule_format == DIFF_SUBMODULE_INLINE_DIFF &&
3379 (!one->mode || S_ISGITLINK(one->mode)) &&
3380 (!two->mode || S_ISGITLINK(two->mode))) {
f3597138 3381 show_submodule_inline_diff(o, one->path ? one->path : two->path,
fd47ae6a 3382 &one->oid, &two->oid,
f3597138 3383 two->dirty_submodule);
fd47ae6a 3384 return;
752c0c24
JS
3385 }
3386
0d1e0e78 3387 if (o->flags.allow_textconv) {
acd00ea0
NTND
3388 textconv_one = get_textconv(o->repo->index, one);
3389 textconv_two = get_textconv(o->repo->index, two);
3aa1f7ca
JK
3390 }
3391
71b989e7
LT
3392 /* Never use a non-valid filename anywhere if at all possible */
3393 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
3394 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
3395
a5a818ee
JH
3396 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
3397 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
6973dcae
JH
3398 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
3399 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
d9c552f1 3400 strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
6973dcae
JH
3401 if (lbl[0][0] == '/') {
3402 /* /dev/null */
d9c552f1 3403 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
37466447
BW
3404 if (xfrm_msg)
3405 strbuf_addstr(&header, xfrm_msg);
296c6bb2 3406 must_show_header = 1;
6973dcae
JH
3407 }
3408 else if (lbl[1][0] == '/') {
d9c552f1 3409 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
37466447
BW
3410 if (xfrm_msg)
3411 strbuf_addstr(&header, xfrm_msg);
296c6bb2 3412 must_show_header = 1;
6973dcae
JH
3413 }
3414 else {
3415 if (one->mode != two->mode) {
d9c552f1
JK
3416 strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
3417 strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
296c6bb2 3418 must_show_header = 1;
cd112cef 3419 }
37466447
BW
3420 if (xfrm_msg)
3421 strbuf_addstr(&header, xfrm_msg);
3e97c7c6 3422
6973dcae
JH
3423 /*
3424 * we do not run diff between different kind
3425 * of objects.
3426 */
3427 if ((one->mode ^ two->mode) & S_IFMT)
3428 goto free_ab_and_return;
0c01857d 3429 if (complete_rewrite &&
b78ea5fc
NTND
3430 (textconv_one || !diff_filespec_is_binary(o->repo, one)) &&
3431 (textconv_two || !diff_filespec_is_binary(o->repo, two))) {
a29b0a13
SB
3432 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3433 header.buf, header.len, 0);
3e97c7c6 3434 strbuf_reset(&header);
3aa1f7ca 3435 emit_rewrite_diff(name_a, name_b, one, two,
b78ea5fc 3436 textconv_one, textconv_two, o);
34a5e1a2 3437 o->found_changes = 1;
6973dcae
JH
3438 goto free_ab_and_return;
3439 }
3440 }
3441
467ddc14 3442 if (o->irreversible_delete && lbl[1][0] == '/') {
a29b0a13
SB
3443 emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf,
3444 header.len, 0);
467ddc14
JH
3445 strbuf_reset(&header);
3446 goto free_ab_and_return;
0d1e0e78 3447 } else if (!o->flags.text &&
b78ea5fc
NTND
3448 ( (!textconv_one && diff_filespec_is_binary(o->repo, one)) ||
3449 (!textconv_two && diff_filespec_is_binary(o->repo, two)) )) {
4acaaa7a 3450 struct strbuf sb = STRBUF_INIT;
1aaf69e6
NTND
3451 if (!one->data && !two->data &&
3452 S_ISREG(one->mode) && S_ISREG(two->mode) &&
0d1e0e78 3453 !o->flags.binary) {
4a7e27e9 3454 if (oideq(&one->oid, &two->oid)) {
1aaf69e6 3455 if (must_show_header)
a29b0a13
SB
3456 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3457 header.buf, header.len,
3458 0);
1aaf69e6
NTND
3459 goto free_ab_and_return;
3460 }
a29b0a13
SB
3461 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3462 header.buf, header.len, 0);
4acaaa7a
SB
3463 strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
3464 diff_line_prefix(o), lbl[0], lbl[1]);
3465 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
3466 sb.buf, sb.len, 0);
3467 strbuf_release(&sb);
1aaf69e6
NTND
3468 goto free_ab_and_return;
3469 }
b78ea5fc
NTND
3470 if (fill_mmfile(o->repo, &mf1, one) < 0 ||
3471 fill_mmfile(o->repo, &mf2, two) < 0)
b3373982 3472 die("unable to read files to diff");
0660626c
JH
3473 /* Quite common confusing case */
3474 if (mf1.size == mf2.size &&
296c6bb2
CC
3475 !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
3476 if (must_show_header)
a29b0a13
SB
3477 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3478 header.buf, header.len, 0);
0660626c 3479 goto free_ab_and_return;
296c6bb2 3480 }
a29b0a13 3481 emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf, header.len, 0);
3e97c7c6 3482 strbuf_reset(&header);
0d1e0e78 3483 if (o->flags.binary)
4eed0ebd 3484 emit_binary_diff(o, &mf1, &mf2);
4acaaa7a
SB
3485 else {
3486 strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
3487 diff_line_prefix(o), lbl[0], lbl[1]);
3488 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
3489 sb.buf, sb.len, 0);
3490 strbuf_release(&sb);
3491 }
34a5e1a2 3492 o->found_changes = 1;
467ddc14 3493 } else {
6973dcae
JH
3494 /* Crazy xdl interfaces.. */
3495 const char *diffopts = getenv("GIT_DIFF_OPTS");
ae021d87 3496 const char *v;
6973dcae
JH
3497 xpparam_t xpp;
3498 xdemitconf_t xecfg;
6973dcae 3499 struct emit_callback ecbdata;
be58e70d 3500 const struct userdiff_funcname *pe;
f258475a 3501
b3f01ff2 3502 if (must_show_header) {
a29b0a13
SB
3503 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3504 header.buf, header.len, 0);
3e97c7c6
GB
3505 strbuf_reset(&header);
3506 }
3507
6afaf807
NTND
3508 mf1.size = fill_textconv(o->repo, textconv_one, one, &mf1.ptr);
3509 mf2.size = fill_textconv(o->repo, textconv_two, two, &mf2.ptr);
04427ac8 3510
acd00ea0 3511 pe = diff_funcname_pattern(o, one);
45e7ca0f 3512 if (!pe)
acd00ea0 3513 pe = diff_funcname_pattern(o, two);
6973dcae 3514
9ccd0a88 3515 memset(&xpp, 0, sizeof(xpp));
30b25010 3516 memset(&xecfg, 0, sizeof(xecfg));
cd112cef 3517 memset(&ecbdata, 0, sizeof(ecbdata));
1cdde296
JS
3518 if (o->flags.suppress_diff_headers)
3519 lbl[0] = NULL;
6973dcae 3520 ecbdata.label_path = lbl;
daa0c3d9 3521 ecbdata.color_diff = want_color(o->use_color);
26d024ec 3522 ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b);
690ed843 3523 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
d68fe26f 3524 check_blank_at_eof(&mf1, &mf2, &ecbdata);
a3c158d4 3525 ecbdata.opt = o;
1cdde296
JS
3526 if (header.len && !o->flags.suppress_diff_headers)
3527 ecbdata.header = &header;
582aa00b 3528 xpp.flags = o->xdl_opts;
2477ab2e
JT
3529 xpp.anchors = o->anchors;
3530 xpp.anchors_nr = o->anchors_nr;
ee1e5412 3531 xecfg.ctxlen = o->context;
6d0e674a 3532 xecfg.interhunkctxlen = o->interhunkcontext;
6973dcae 3533 xecfg.flags = XDL_EMIT_FUNCNAMES;
0d1e0e78 3534 if (o->flags.funccontext)
14937c2c 3535 xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
45e7ca0f 3536 if (pe)
a013585b 3537 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
6973dcae
JH
3538 if (!diffopts)
3539 ;
ae021d87
JK
3540 else if (skip_prefix(diffopts, "--unified=", &v))
3541 xecfg.ctxlen = strtoul(v, NULL, 10);
3542 else if (skip_prefix(diffopts, "-u", &v))
3543 xecfg.ctxlen = strtoul(v, NULL, 10);
77d1a520
TR
3544 if (o->word_diff)
3545 init_diff_words_data(&ecbdata, o, one, two);
9346d6d1
JK
3546 if (xdi_diff_outf(&mf1, &mf2, NULL, fn_out_consume,
3547 &ecbdata, &xpp, &xecfg))
3efb9880 3548 die("unable to generate diff for %s", one->path);