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