?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
t/Makefile: remove 'test-results' on 'make clean'
[git/debian.git] / diff.c
blob648f6717a5597c30c423256a25e0fece08cd30de
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #include "cache.h"
5 #include "config.h"
6 #include "tempfile.h"
7 #include "quote.h"
8 #include "diff.h"
9 #include "diffcore.h"
10 #include "delta.h"
11 #include "xdiff-interface.h"
12 #include "color.h"
13 #include "attr.h"
14 #include "run-command.h"
15 #include "utf8.h"
16 #include "object-store.h"
17 #include "userdiff.h"
18 #include "submodule-config.h"
19 #include "submodule.h"
20 #include "hashmap.h"
21 #include "mem-pool.h"
22 #include "ll-merge.h"
23 #include "string-list.h"
24 #include "strvec.h"
25 #include "graph.h"
26 #include "packfile.h"
27 #include "parse-options.h"
28 #include "help.h"
29 #include "promisor-remote.h"
30 #include "dir.h"
31 #include "strmap.h"
32
33 #ifdef NO_FAST_WORKING_DIRECTORY
34 #define FAST_WORKING_DIRECTORY 0
35 #else
36 #define FAST_WORKING_DIRECTORY 1
37 #endif
38
39 static int diff_detect_rename_default;
40 static int diff_indent_heuristic = 1;
41 static int diff_rename_limit_default = 1000;
42 static int diff_suppress_blank_empty;
43 static int diff_use_color_default = -1;
44 static int diff_color_moved_default;
45 static int diff_color_moved_ws_default;
46 static int diff_context_default = 3;
47 static int diff_interhunk_context_default;
48 static const char *diff_word_regex_cfg;
49 static const char *external_diff_cmd_cfg;
50 static const char *diff_order_file_cfg;
51 int diff_auto_refresh_index = 1;
52 static int diff_mnemonic_prefix;
53 static int diff_no_prefix;
54 static int diff_relative;
55 static int diff_stat_graph_width;
56 static int diff_dirstat_permille_default = 30;
57 static struct diff_options default_diff_options;
58 static long diff_algorithm;
59 static unsigned ws_error_highlight_default = WSEH_NEW;
60
61 static char diff_colors[][COLOR_MAXLEN] = {
62 GIT_COLOR_RESET,
63 GIT_COLOR_NORMAL, /* CONTEXT */
64 GIT_COLOR_BOLD, /* METAINFO */
65 GIT_COLOR_CYAN, /* FRAGINFO */
66 GIT_COLOR_RED, /* OLD */
67 GIT_COLOR_GREEN, /* NEW */
68 GIT_COLOR_YELLOW, /* COMMIT */
69 GIT_COLOR_BG_RED, /* WHITESPACE */
70 GIT_COLOR_NORMAL, /* FUNCINFO */
71 GIT_COLOR_BOLD_MAGENTA, /* OLD_MOVED */
72 GIT_COLOR_BOLD_BLUE, /* OLD_MOVED ALTERNATIVE */
73 GIT_COLOR_FAINT, /* OLD_MOVED_DIM */
74 GIT_COLOR_FAINT_ITALIC, /* OLD_MOVED_ALTERNATIVE_DIM */
75 GIT_COLOR_BOLD_CYAN, /* NEW_MOVED */
76 GIT_COLOR_BOLD_YELLOW, /* NEW_MOVED ALTERNATIVE */
77 GIT_COLOR_FAINT, /* NEW_MOVED_DIM */
78 GIT_COLOR_FAINT_ITALIC, /* NEW_MOVED_ALTERNATIVE_DIM */
79 GIT_COLOR_FAINT, /* CONTEXT_DIM */
80 GIT_COLOR_FAINT_RED, /* OLD_DIM */
81 GIT_COLOR_FAINT_GREEN, /* NEW_DIM */
82 GIT_COLOR_BOLD, /* CONTEXT_BOLD */
83 GIT_COLOR_BOLD_RED, /* OLD_BOLD */
84 GIT_COLOR_BOLD_GREEN, /* NEW_BOLD */
85 };
86
87 static const char *color_diff_slots[] = {
88 [DIFF_CONTEXT] = "context",
89 [DIFF_METAINFO] = "meta",
90 [DIFF_FRAGINFO] = "frag",
91 [DIFF_FILE_OLD] = "old",
92 [DIFF_FILE_NEW] = "new",
93 [DIFF_COMMIT] = "commit",
94 [DIFF_WHITESPACE] = "whitespace",
95 [DIFF_FUNCINFO] = "func",
96 [DIFF_FILE_OLD_MOVED] = "oldMoved",
97 [DIFF_FILE_OLD_MOVED_ALT] = "oldMovedAlternative",
98 [DIFF_FILE_OLD_MOVED_DIM] = "oldMovedDimmed",
99 [DIFF_FILE_OLD_MOVED_ALT_DIM] = "oldMovedAlternativeDimmed",
100 [DIFF_FILE_NEW_MOVED] = "newMoved",
101 [DIFF_FILE_NEW_MOVED_ALT] = "newMovedAlternative",
102 [DIFF_FILE_NEW_MOVED_DIM] = "newMovedDimmed",
103 [DIFF_FILE_NEW_MOVED_ALT_DIM] = "newMovedAlternativeDimmed",
104 [DIFF_CONTEXT_DIM] = "contextDimmed",
105 [DIFF_FILE_OLD_DIM] = "oldDimmed",
106 [DIFF_FILE_NEW_DIM] = "newDimmed",
107 [DIFF_CONTEXT_BOLD] = "contextBold",
108 [DIFF_FILE_OLD_BOLD] = "oldBold",
109 [DIFF_FILE_NEW_BOLD] = "newBold",
110 };
111
112 define_list_config_array_extra(color_diff_slots, {"plain"});
113
114 static int parse_diff_color_slot(const char *var)
115 {
116 if (!strcasecmp(var, "plain"))
117 return DIFF_CONTEXT;
118 return LOOKUP_CONFIG(color_diff_slots, var);
119 }
120
121 static int parse_dirstat_params(struct diff_options *options, const char *params_string,
122 struct strbuf *errmsg)
123 {
124 char *params_copy = xstrdup(params_string);
125 struct string_list params = STRING_LIST_INIT_NODUP;
126 int ret = 0;
127 int i;
128
129 if (*params_copy)
130 string_list_split_in_place(&params, params_copy, ',', -1);
131 for (i = 0; i < params.nr; i++) {
132 const char *p = params.items[i].string;
133 if (!strcmp(p, "changes")) {
134 options->flags.dirstat_by_line = 0;
135 options->flags.dirstat_by_file = 0;
136 } else if (!strcmp(p, "lines")) {
137 options->flags.dirstat_by_line = 1;
138 options->flags.dirstat_by_file = 0;
139 } else if (!strcmp(p, "files")) {
140 options->flags.dirstat_by_line = 0;
141 options->flags.dirstat_by_file = 1;
142 } else if (!strcmp(p, "noncumulative")) {
143 options->flags.dirstat_cumulative = 0;
144 } else if (!strcmp(p, "cumulative")) {
145 options->flags.dirstat_cumulative = 1;
146 } else if (isdigit(*p)) {
147 char *end;
148 int permille = strtoul(p, &end, 10) * 10;
149 if (*end == '.' && isdigit(*++end)) {
150 /* only use first digit */
151 permille += *end - '0';
152 /* .. and ignore any further digits */
153 while (isdigit(*++end))
154 ; /* nothing */
155 }
156 if (!*end)
157 options->dirstat_permille = permille;
158 else {
159 strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
160 p);
161 ret++;
162 }
163 } else {
164 strbuf_addf(errmsg, _(" Unknown dirstat parameter '%s'\n"), p);
165 ret++;
166 }
167
168 }
169 string_list_clear(&params, 0);
170 free(params_copy);
171 return ret;
172 }
173
174 static int parse_submodule_params(struct diff_options *options, const char *value)
175 {
176 if (!strcmp(value, "log"))
177 options->submodule_format = DIFF_SUBMODULE_LOG;
178 else if (!strcmp(value, "short"))
179 options->submodule_format = DIFF_SUBMODULE_SHORT;
180 else if (!strcmp(value, "diff"))
181 options->submodule_format = DIFF_SUBMODULE_INLINE_DIFF;
182 /*
183 * Please update $__git_diff_submodule_formats in
184 * git-completion.bash when you add new formats.
185 */
186 else
187 return -1;
188 return 0;
189 }
190
191 int git_config_rename(const char *var, const char *value)
192 {
193 if (!value)
194 return DIFF_DETECT_RENAME;
195 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
196 return DIFF_DETECT_COPY;
197 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
198 }
199
200 long parse_algorithm_value(const char *value)
201 {
202 if (!value)
203 return -1;
204 else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default"))
205 return 0;
206 else if (!strcasecmp(value, "minimal"))
207 return XDF_NEED_MINIMAL;
208 else if (!strcasecmp(value, "patience"))
209 return XDF_PATIENCE_DIFF;
210 else if (!strcasecmp(value, "histogram"))
211 return XDF_HISTOGRAM_DIFF;
212 /*
213 * Please update $__git_diff_algorithms in git-completion.bash
214 * when you add new algorithms.
215 */
216 return -1;
217 }
218
219 static int parse_one_token(const char **arg, const char *token)
220 {
221 const char *rest;
222 if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) {
223 *arg = rest;
224 return 1;
225 }
226 return 0;
227 }
228
229 static int parse_ws_error_highlight(const char *arg)
230 {
231 const char *orig_arg = arg;
232 unsigned val = 0;
233
234 while (*arg) {
235 if (parse_one_token(&arg, "none"))
236 val = 0;
237 else if (parse_one_token(&arg, "default"))
238 val = WSEH_NEW;
239 else if (parse_one_token(&arg, "all"))
240 val = WSEH_NEW | WSEH_OLD | WSEH_CONTEXT;
241 else if (parse_one_token(&arg, "new"))
242 val |= WSEH_NEW;
243 else if (parse_one_token(&arg, "old"))
244 val |= WSEH_OLD;
245 else if (parse_one_token(&arg, "context"))
246 val |= WSEH_CONTEXT;
247 else {
248 return -1 - (int)(arg - orig_arg);
249 }
250 if (*arg)
251 arg++;
252 }
253 return val;
254 }
255
256 /*
257 * These are to give UI layer defaults.
258 * The core-level commands such as git-diff-files should
259 * never be affected by the setting of diff.renames
260 * the user happens to have in the configuration file.
261 */
262 void init_diff_ui_defaults(void)
263 {
264 diff_detect_rename_default = DIFF_DETECT_RENAME;
265 }
266
267 int git_diff_heuristic_config(const char *var, const char *value,
268 void *cb UNUSED)
269 {
270 if (!strcmp(var, "diff.indentheuristic"))
271 diff_indent_heuristic = git_config_bool(var, value);
272 return 0;
273 }
274
275 static int parse_color_moved(const char *arg)
276 {
277 switch (git_parse_maybe_bool(arg)) {
278 case 0:
279 return COLOR_MOVED_NO;
280 case 1:
281 return COLOR_MOVED_DEFAULT;
282 default:
283 break;
284 }
285
286 if (!strcmp(arg, "no"))
287 return COLOR_MOVED_NO;
288 else if (!strcmp(arg, "plain"))
289 return COLOR_MOVED_PLAIN;
290 else if (!strcmp(arg, "blocks"))
291 return COLOR_MOVED_BLOCKS;
292 else if (!strcmp(arg, "zebra"))
293 return COLOR_MOVED_ZEBRA;
294 else if (!strcmp(arg, "default"))
295 return COLOR_MOVED_DEFAULT;
296 else if (!strcmp(arg, "dimmed-zebra"))
297 return COLOR_MOVED_ZEBRA_DIM;
298 else if (!strcmp(arg, "dimmed_zebra"))
299 return COLOR_MOVED_ZEBRA_DIM;
300 else
301 return error(_("color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"));
302 }
303
304 static unsigned parse_color_moved_ws(const char *arg)
305 {
306 int ret = 0;
307 struct string_list l = STRING_LIST_INIT_DUP;
308 struct string_list_item *i;
309
310 string_list_split(&l, arg, ',', -1);
311
312 for_each_string_list_item(i, &l) {
313 struct strbuf sb = STRBUF_INIT;
314 strbuf_addstr(&sb, i->string);
315 strbuf_trim(&sb);
316
317 if (!strcmp(sb.buf, "no"))
318 ret = 0;
319 else if (!strcmp(sb.buf, "ignore-space-change"))
320 ret |= XDF_IGNORE_WHITESPACE_CHANGE;
321 else if (!strcmp(sb.buf, "ignore-space-at-eol"))
322 ret |= XDF_IGNORE_WHITESPACE_AT_EOL;
323 else if (!strcmp(sb.buf, "ignore-all-space"))
324 ret |= XDF_IGNORE_WHITESPACE;
325 else if (!strcmp(sb.buf, "allow-indentation-change"))
326 ret |= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE;
327 else {
328 ret |= COLOR_MOVED_WS_ERROR;
329 error(_("unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"), sb.buf);
330 }
331
332 strbuf_release(&sb);
333 }
334
335 if ((ret & COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) &&
336 (ret & XDF_WHITESPACE_FLAGS)) {
337 error(_("color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes"));
338 ret |= COLOR_MOVED_WS_ERROR;
339 }
340
341 string_list_clear(&l, 0);
342
343 return ret;
344 }
345
346 int git_diff_ui_config(const char *var, const char *value, void *cb)
347 {
348 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
349 diff_use_color_default = git_config_colorbool(var, value);
350 return 0;
351 }
352 if (!strcmp(var, "diff.colormoved")) {
353 int cm = parse_color_moved(value);
354 if (cm < 0)
355 return -1;
356 diff_color_moved_default = cm;
357 return 0;
358 }
359 if (!strcmp(var, "diff.colormovedws")) {
360 unsigned cm = parse_color_moved_ws(value);
361 if (cm & COLOR_MOVED_WS_ERROR)
362 return -1;
363 diff_color_moved_ws_default = cm;
364 return 0;
365 }
366 if (!strcmp(var, "diff.context")) {
367 diff_context_default = git_config_int(var, value);
368 if (diff_context_default < 0)
369 return -1;
370 return 0;
371 }
372 if (!strcmp(var, "diff.interhunkcontext")) {
373 diff_interhunk_context_default = git_config_int(var, value);
374 if (diff_interhunk_context_default < 0)
375 return -1;
376 return 0;
377 }
378 if (!strcmp(var, "diff.renames")) {
379 diff_detect_rename_default = git_config_rename(var, value);
380 return 0;
381 }
382 if (!strcmp(var, "diff.autorefreshindex")) {
383 diff_auto_refresh_index = git_config_bool(var, value);
384 return 0;
385 }
386 if (!strcmp(var, "diff.mnemonicprefix")) {
387 diff_mnemonic_prefix = git_config_bool(var, value);
388 return 0;
389 }
390 if (!strcmp(var, "diff.noprefix")) {
391 diff_no_prefix = git_config_bool(var, value);
392 return 0;
393 }
394 if (!strcmp(var, "diff.relative")) {
395 diff_relative = git_config_bool(var, value);
396 return 0;
397 }
398 if (!strcmp(var, "diff.statgraphwidth")) {
399 diff_stat_graph_width = git_config_int(var, value);
400 return 0;
401 }
402 if (!strcmp(var, "diff.external"))
403 return git_config_string(&external_diff_cmd_cfg, var, value);
404 if (!strcmp(var, "diff.wordregex"))
405 return git_config_string(&diff_word_regex_cfg, var, value);
406 if (!strcmp(var, "diff.orderfile"))
407 return git_config_pathname(&diff_order_file_cfg, var, value);
408
409 if (!strcmp(var, "diff.ignoresubmodules"))
410 handle_ignore_submodules_arg(&default_diff_options, value);
411
412 if (!strcmp(var, "diff.submodule")) {
413 if (parse_submodule_params(&default_diff_options, value))
414 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
415 value);
416 return 0;
417 }
418
419 if (!strcmp(var, "diff.algorithm")) {
420 diff_algorithm = parse_algorithm_value(value);
421 if (diff_algorithm < 0)
422 return -1;
423 return 0;
424 }
425
426 if (git_color_config(var, value, cb) < 0)
427 return -1;
428
429 return git_diff_basic_config(var, value, cb);
430 }
431
432 int git_diff_basic_config(const char *var, const char *value, void *cb)
433 {
434 const char *name;
435
436 if (!strcmp(var, "diff.renamelimit")) {
437 diff_rename_limit_default = git_config_int(var, value);
438 return 0;
439 }
440
441 if (userdiff_config(var, value) < 0)
442 return -1;
443
444 if (skip_prefix(var, "diff.color.", &name) ||
445 skip_prefix(var, "color.diff.", &name)) {
446 int slot = parse_diff_color_slot(name);
447 if (slot < 0)
448 return 0;
449 if (!value)
450 return config_error_nonbool(var);
451 return color_parse(value, diff_colors[slot]);
452 }
453
454 if (!strcmp(var, "diff.wserrorhighlight")) {
455 int val = parse_ws_error_highlight(value);
456 if (val < 0)
457 return -1;
458 ws_error_highlight_default = val;
459 return 0;
460 }
461
462 /* like GNU diff's --suppress-blank-empty option */
463 if (!strcmp(var, "diff.suppressblankempty") ||
464 /* for backwards compatibility */
465 !strcmp(var, "diff.suppress-blank-empty")) {
466 diff_suppress_blank_empty = git_config_bool(var, value);
467 return 0;
468 }
469
470 if (!strcmp(var, "diff.dirstat")) {
471 struct strbuf errmsg = STRBUF_INIT;
472 default_diff_options.dirstat_permille = diff_dirstat_permille_default;
473 if (parse_dirstat_params(&default_diff_options, value, &errmsg))
474 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
475 errmsg.buf);
476 strbuf_release(&errmsg);
477 diff_dirstat_permille_default = default_diff_options.dirstat_permille;
478 return 0;
479 }
480
481 if (git_diff_heuristic_config(var, value, cb) < 0)
482 return -1;
483
484 return git_default_config(var, value, cb);
485 }
486
487 static char *quote_two(const char *one, const char *two)
488 {
489 int need_one = quote_c_style(one, NULL, NULL, CQUOTE_NODQ);
490 int need_two = quote_c_style(two, NULL, NULL, CQUOTE_NODQ);
491 struct strbuf res = STRBUF_INIT;
492
493 if (need_one + need_two) {
494 strbuf_addch(&res, '"');
495 quote_c_style(one, &res, NULL, CQUOTE_NODQ);
496 quote_c_style(two, &res, NULL, CQUOTE_NODQ);
497 strbuf_addch(&res, '"');
498 } else {
499 strbuf_addstr(&res, one);
500 strbuf_addstr(&res, two);
501 }
502 return strbuf_detach(&res, NULL);
503 }
504
505 static const char *external_diff(void)
506 {
507 static const char *external_diff_cmd = NULL;
508 static int done_preparing = 0;
509
510 if (done_preparing)
511 return external_diff_cmd;
512 external_diff_cmd = xstrdup_or_null(getenv("GIT_EXTERNAL_DIFF"));
513 if (!external_diff_cmd)
514 external_diff_cmd = external_diff_cmd_cfg;
515 done_preparing = 1;
516 return external_diff_cmd;
517 }
518
519 /*
520 * Keep track of files used for diffing. Sometimes such an entry
521 * refers to a temporary file, sometimes to an existing file, and
522 * sometimes to "/dev/null".
523 */
524 static struct diff_tempfile {
525 /*
526 * filename external diff should read from, or NULL if this
527 * entry is currently not in use:
528 */
529 const char *name;
530
531 char hex[GIT_MAX_HEXSZ + 1];
532 char mode[10];
533
534 /*
535 * If this diff_tempfile instance refers to a temporary file,
536 * this tempfile object is used to manage its lifetime.
537 */
538 struct tempfile *tempfile;
539 } diff_temp[2];
540
541 struct emit_callback {
542 int color_diff;
543 unsigned ws_rule;
544 int blank_at_eof_in_preimage;
545 int blank_at_eof_in_postimage;
546 int lno_in_preimage;
547 int lno_in_postimage;
548 const char **label_path;
549 struct diff_words_data *diff_words;
550 struct diff_options *opt;
551 struct strbuf *header;
552 };
553
554 static int count_lines(const char *data, int size)
555 {
556 int count, ch, completely_empty = 1, nl_just_seen = 0;
557 count = 0;
558 while (0 < size--) {
559 ch = *data++;
560 if (ch == '\n') {
561 count++;
562 nl_just_seen = 1;
563 completely_empty = 0;
564 }
565 else {
566 nl_just_seen = 0;
567 completely_empty = 0;
568 }
569 }
570 if (completely_empty)
571 return 0;
572 if (!nl_just_seen)
573 count++; /* no trailing newline */
574 return count;
575 }
576
577 static int fill_mmfile(struct repository *r, mmfile_t *mf,
578 struct diff_filespec *one)
579 {
580 if (!DIFF_FILE_VALID(one)) {
581 mf->ptr = (char *)""; /* does not matter */
582 mf->size = 0;
583 return 0;
584 }
585 else if (diff_populate_filespec(r, one, NULL))
586 return -1;
587
588 mf->ptr = one->data;
589 mf->size = one->size;
590 return 0;
591 }
592
593 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
594 static unsigned long diff_filespec_size(struct repository *r,
595 struct diff_filespec *one)
596 {
597 struct diff_populate_filespec_options dpf_options = {
598 .check_size_only = 1,
599 };
600
601 if (!DIFF_FILE_VALID(one))
602 return 0;
603 diff_populate_filespec(r, one, &dpf_options);
604 return one->size;
605 }
606
607 static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
608 {
609 char *ptr = mf->ptr;
610 long size = mf->size;
611 int cnt = 0;
612
613 if (!size)
614 return cnt;
615 ptr += size - 1; /* pointing at the very end */
616 if (*ptr != '\n')
617 ; /* incomplete line */
618 else
619 ptr--; /* skip the last LF */
620 while (mf->ptr < ptr) {
621 char *prev_eol;
622 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
623 if (*prev_eol == '\n')
624 break;
625 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
626 break;
627 cnt++;
628 ptr = prev_eol - 1;
629 }
630 return cnt;
631 }
632
633 static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
634 struct emit_callback *ecbdata)
635 {
636 int l1, l2, at;
637 unsigned ws_rule = ecbdata->ws_rule;
638 l1 = count_trailing_blank(mf1, ws_rule);
639 l2 = count_trailing_blank(mf2, ws_rule);
640 if (l2 <= l1) {
641 ecbdata->blank_at_eof_in_preimage = 0;
642 ecbdata->blank_at_eof_in_postimage = 0;
643 return;
644 }
645 at = count_lines(mf1->ptr, mf1->size);
646 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
647
648 at = count_lines(mf2->ptr, mf2->size);
649 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
650 }
651
652 static void emit_line_0(struct diff_options *o,
653 const char *set_sign, const char *set, unsigned reverse, const char *reset,
654 int first, const char *line, int len)
655 {
656 int has_trailing_newline, has_trailing_carriage_return;
657 int needs_reset = 0; /* at the end of the line */
658 FILE *file = o->file;
659
660 fputs(diff_line_prefix(o), file);
661
662 has_trailing_newline = (len > 0 && line[len-1] == '\n');
663 if (has_trailing_newline)
664 len--;
665
666 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
667 if (has_trailing_carriage_return)
668 len--;
669
670 if (!len && !first)
671 goto end_of_line;
672
673 if (reverse && want_color(o->use_color)) {
674 fputs(GIT_COLOR_REVERSE, file);
675 needs_reset = 1;
676 }
677
678 if (set_sign) {
679 fputs(set_sign, file);
680 needs_reset = 1;
681 }
682
683 if (first)
684 fputc(first, file);
685
686 if (!len)
687 goto end_of_line;
688
689 if (set) {
690 if (set_sign && set != set_sign)
691 fputs(reset, file);
692 fputs(set, file);
693 needs_reset = 1;
694 }
695 fwrite(line, len, 1, file);
696 needs_reset = 1; /* 'line' may contain color codes. */
697
698 end_of_line:
699 if (needs_reset)
700 fputs(reset, file);
701 if (has_trailing_carriage_return)
702 fputc('\r', file);
703 if (has_trailing_newline)
704 fputc('\n', file);
705 }
706
707 static void emit_line(struct diff_options *o, const char *set, const char *reset,
708 const char *line, int len)
709 {
710 emit_line_0(o, set, NULL, 0, reset, 0, line, len);
711 }
712
713 enum diff_symbol {
714 DIFF_SYMBOL_BINARY_DIFF_HEADER,
715 DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
716 DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
717 DIFF_SYMBOL_BINARY_DIFF_BODY,
718 DIFF_SYMBOL_BINARY_DIFF_FOOTER,
719 DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
720 DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
721 DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
722 DIFF_SYMBOL_STATS_LINE,
723 DIFF_SYMBOL_WORD_DIFF,
724 DIFF_SYMBOL_STAT_SEP,
725 DIFF_SYMBOL_SUMMARY,
726 DIFF_SYMBOL_SUBMODULE_ADD,
727 DIFF_SYMBOL_SUBMODULE_DEL,
728 DIFF_SYMBOL_SUBMODULE_UNTRACKED,
729 DIFF_SYMBOL_SUBMODULE_MODIFIED,
730 DIFF_SYMBOL_SUBMODULE_HEADER,
731 DIFF_SYMBOL_SUBMODULE_ERROR,
732 DIFF_SYMBOL_SUBMODULE_PIPETHROUGH,
733 DIFF_SYMBOL_REWRITE_DIFF,
734 DIFF_SYMBOL_BINARY_FILES,
735 DIFF_SYMBOL_HEADER,
736 DIFF_SYMBOL_FILEPAIR_PLUS,
737 DIFF_SYMBOL_FILEPAIR_MINUS,
738 DIFF_SYMBOL_WORDS_PORCELAIN,
739 DIFF_SYMBOL_WORDS,
740 DIFF_SYMBOL_CONTEXT,
741 DIFF_SYMBOL_CONTEXT_INCOMPLETE,
742 DIFF_SYMBOL_PLUS,
743 DIFF_SYMBOL_MINUS,
744 DIFF_SYMBOL_NO_LF_EOF,
745 DIFF_SYMBOL_CONTEXT_FRAGINFO,
746 DIFF_SYMBOL_CONTEXT_MARKER,
747 DIFF_SYMBOL_SEPARATOR
748 };
749 /*
750 * Flags for content lines:
751 * 0..12 are whitespace rules
752 * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
753 * 16 is marking if the line is blank at EOF
754 */
755 #define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF (1<<16)
756 #define DIFF_SYMBOL_MOVED_LINE (1<<17)
757 #define DIFF_SYMBOL_MOVED_LINE_ALT (1<<18)
758 #define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING (1<<19)
759 #define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)
760
761 /*
762 * This struct is used when we need to buffer the output of the diff output.
763 *
764 * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
765 * into the pre/post image file. This pointer could be a union with the
766 * line pointer. By storing an offset into the file instead of the literal line,
767 * we can decrease the memory footprint for the buffered output. At first we
768 * may want to only have indirection for the content lines, but we could also
769 * enhance the state for emitting prefabricated lines, e.g. the similarity
770 * score line or hunk/file headers would only need to store a number or path
771 * and then the output can be constructed later on depending on state.
772 */
773 struct emitted_diff_symbol {
774 const char *line;
775 int len;
776 int flags;
777 int indent_off; /* Offset to first non-whitespace character */
778 int indent_width; /* The visual width of the indentation */
779 unsigned id;
780 enum diff_symbol s;
781 };
782 #define EMITTED_DIFF_SYMBOL_INIT { 0 }
783
784 struct emitted_diff_symbols {
785 struct emitted_diff_symbol *buf;
786 int nr, alloc;
787 };
788 #define EMITTED_DIFF_SYMBOLS_INIT { 0 }
789
790 static void append_emitted_diff_symbol(struct diff_options *o,
791 struct emitted_diff_symbol *e)
792 {
793 struct emitted_diff_symbol *f;
794
795 ALLOC_GROW(o->emitted_symbols->buf,
796 o->emitted_symbols->nr + 1,
797 o->emitted_symbols->alloc);
798 f = &o->emitted_symbols->buf[o->emitted_symbols->nr++];
799
800 memcpy(f, e, sizeof(struct emitted_diff_symbol));
801 f->line = e->line ? xmemdupz(e->line, e->len) : NULL;
802 }
803
804 static void free_emitted_diff_symbols(struct emitted_diff_symbols *e)
805 {
806 if (!e)
807 return;
808 free(e->buf);
809 free(e);
810 }
811
812 struct moved_entry {
813 const struct emitted_diff_symbol *es;
814 struct moved_entry *next_line;
815 struct moved_entry *next_match;
816 };
817
818 struct moved_block {
819 struct moved_entry *match;
820 int wsd; /* The whitespace delta of this block */
821 };
822
823 #define INDENT_BLANKLINE INT_MIN
824
825 static void fill_es_indent_data(struct emitted_diff_symbol *es)
826 {
827 unsigned int off = 0, i;
828 int width = 0, tab_width = es->flags & WS_TAB_WIDTH_MASK;
829 const char *s = es->line;
830 const int len = es->len;
831
832 /* skip any \v \f \r at start of indentation */
833 while (s[off] == '\f' || s[off] == '\v' ||
834 (s[off] == '\r' && off < len - 1))
835 off++;
836
837 /* calculate the visual width of indentation */
838 while(1) {
839 if (s[off] == ' ') {
840 width++;
841 off++;
842 } else if (s[off] == '\t') {
843 width += tab_width - (width % tab_width);
844 while (s[++off] == '\t')
845 width += tab_width;
846 } else {
847 break;
848 }
849 }
850
851 /* check if this line is blank */
852 for (i = off; i < len; i++)
853 if (!isspace(s[i]))
854 break;
855
856 if (i == len) {
857 es->indent_width = INDENT_BLANKLINE;
858 es->indent_off = len;
859 } else {
860 es->indent_off = off;
861 es->indent_width = width;
862 }
863 }
864
865 static int compute_ws_delta(const struct emitted_diff_symbol *a,
866 const struct emitted_diff_symbol *b)
867 {
868 int a_width = a->indent_width,
869 b_width = b->indent_width;
870
871 if (a_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE)
872 return INDENT_BLANKLINE;
873
874 return a_width - b_width;
875 }
876
877 static int cmp_in_block_with_wsd(const struct moved_entry *cur,
878 const struct emitted_diff_symbol *l,
879 struct moved_block *pmb)
880 {
881 int a_width = cur->es->indent_width, b_width = l->indent_width;
882 int delta;
883
884 /* The text of each line must match */
885 if (cur->es->id != l->id)
886 return 1;
887
888 /*
889 * If 'l' and 'cur' are both blank then we don't need to check the
890 * indent. We only need to check cur as we know the strings match.
891 * */
892 if (a_width == INDENT_BLANKLINE)
893 return 0;
894
895 /*
896 * The indent changes of the block are known and stored in pmb->wsd;
897 * however we need to check if the indent changes of the current line
898 * match those of the current block.
899 */
900 delta = b_width - a_width;
901
902 /*
903 * If the previous lines of this block were all blank then set its
904 * whitespace delta.
905 */
906 if (pmb->wsd == INDENT_BLANKLINE)
907 pmb->wsd = delta;
908
909 return delta != pmb->wsd;
910 }
911
912 struct interned_diff_symbol {
913 struct hashmap_entry ent;
914 struct emitted_diff_symbol *es;
915 };
916
917 static int interned_diff_symbol_cmp(const void *hashmap_cmp_fn_data,
918 const struct hashmap_entry *eptr,
919 const struct hashmap_entry *entry_or_key,
920 const void *keydata UNUSED)
921 {
922 const struct diff_options *diffopt = hashmap_cmp_fn_data;
923 const struct emitted_diff_symbol *a, *b;
924 unsigned flags = diffopt->color_moved_ws_handling
925 & XDF_WHITESPACE_FLAGS;
926
927 a = container_of(eptr, const struct interned_diff_symbol, ent)->es;
928 b = container_of(entry_or_key, const struct interned_diff_symbol, ent)->es;
929
930 return !xdiff_compare_lines(a->line + a->indent_off,
931 a->len - a->indent_off,
932 b->line + b->indent_off,
933 b->len - b->indent_off, flags);
934 }
935
936 static void prepare_entry(struct diff_options *o, struct emitted_diff_symbol *l,
937 struct interned_diff_symbol *s)
938 {
939 unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS;
940 unsigned int hash = xdiff_hash_string(l->line + l->indent_off,
941 l->len - l->indent_off, flags);
942
943 hashmap_entry_init(&s->ent, hash);
944 s->es = l;
945 }
946
947 struct moved_entry_list {
948 struct moved_entry *add, *del;
949 };
950
951 static struct moved_entry_list *add_lines_to_move_detection(struct diff_options *o,
952 struct mem_pool *entry_mem_pool)
953 {
954 struct moved_entry *prev_line = NULL;
955 struct mem_pool interned_pool;
956 struct hashmap interned_map;
957 struct moved_entry_list *entry_list = NULL;
958 size_t entry_list_alloc = 0;
959 unsigned id = 0;
960 int n;
961
962 hashmap_init(&interned_map, interned_diff_symbol_cmp, o, 8096);
963 mem_pool_init(&interned_pool, 1024 * 1024);
964
965 for (n = 0; n < o->emitted_symbols->nr; n++) {
966 struct interned_diff_symbol key;
967 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
968 struct interned_diff_symbol *s;
969 struct moved_entry *entry;
970
971 if (l->s != DIFF_SYMBOL_PLUS && l->s != DIFF_SYMBOL_MINUS) {
972 prev_line = NULL;
973 continue;
974 }
975
976 if (o->color_moved_ws_handling &
977 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
978 fill_es_indent_data(l);
979
980 prepare_entry(o, l, &key);
981 s = hashmap_get_entry(&interned_map, &key, ent, &key.ent);
982 if (s) {
983 l->id = s->es->id;
984 } else {
985 l->id = id;
986 ALLOC_GROW_BY(entry_list, id, 1, entry_list_alloc);
987 hashmap_add(&interned_map,
988 memcpy(mem_pool_alloc(&interned_pool,
989 sizeof(key)),
990 &key, sizeof(key)));
991 }
992 entry = mem_pool_alloc(entry_mem_pool, sizeof(*entry));
993 entry->es = l;
994 entry->next_line = NULL;
995 if (prev_line && prev_line->es->s == l->s)
996 prev_line->next_line = entry;
997 prev_line = entry;
998 if (l->s == DIFF_SYMBOL_PLUS) {
999 entry->next_match = entry_list[l->id].add;
1000 entry_list[l->id].add = entry;
1001 } else {
1002 entry->next_match = entry_list[l->id].del;
1003 entry_list[l->id].del = entry;
1004 }
1005 }
1006
1007 hashmap_clear(&interned_map);
1008 mem_pool_discard(&interned_pool, 0);
1009
1010 return entry_list;
1011 }
1012
1013 static void pmb_advance_or_null(struct diff_options *o,
1014 struct emitted_diff_symbol *l,
1015 struct moved_block *pmb,
1016 int *pmb_nr)
1017 {
1018 int i, j;
1019
1020 for (i = 0, j = 0; i < *pmb_nr; i++) {
1021 int match;
1022 struct moved_entry *prev = pmb[i].match;
1023 struct moved_entry *cur = (prev && prev->next_line) ?
1024 prev->next_line : NULL;
1025
1026 if (o->color_moved_ws_handling &
1027 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
1028 match = cur &&
1029 !cmp_in_block_with_wsd(cur, l, &pmb[i]);
1030 else
1031 match = cur && cur->es->id == l->id;
1032
1033 if (match) {
1034 pmb[j] = pmb[i];
1035 pmb[j++].match = cur;
1036 }
1037 }
1038 *pmb_nr = j;
1039 }
1040
1041 static void fill_potential_moved_blocks(struct diff_options *o,
1042 struct moved_entry *match,
1043 struct emitted_diff_symbol *l,
1044 struct moved_block **pmb_p,
1045 int *pmb_alloc_p, int *pmb_nr_p)
1046
1047 {
1048 struct moved_block *pmb = *pmb_p;
1049 int pmb_alloc = *pmb_alloc_p, pmb_nr = *pmb_nr_p;
1050
1051 /*
1052 * The current line is the start of a new block.
1053 * Setup the set of potential blocks.
1054 */
1055 for (; match; match = match->next_match) {
1056 ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
1057 if (o->color_moved_ws_handling &
1058 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
1059 pmb[pmb_nr].wsd = compute_ws_delta(l, match->es);
1060 else
1061 pmb[pmb_nr].wsd = 0;
1062 pmb[pmb_nr++].match = match;
1063 }
1064
1065 *pmb_p = pmb;
1066 *pmb_alloc_p = pmb_alloc;
1067 *pmb_nr_p = pmb_nr;
1068 }
1069
1070 /*
1071 * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
1072 *
1073 * Otherwise, if the last block has fewer alphanumeric characters than
1074 * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
1075 * that block.
1076 *
1077 * The last block consists of the (n - block_length)'th line up to but not
1078 * including the nth line.
1079 *
1080 * Returns 0 if the last block is empty or is unset by this function, non zero
1081 * otherwise.
1082 *
1083 * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
1084 * Think of a way to unify them.
1085 */
1086 #define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
1087 (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
1088 static int adjust_last_block(struct diff_options *o, int n, int block_length)
1089 {
1090 int i, alnum_count = 0;
1091 if (o->color_moved == COLOR_MOVED_PLAIN)
1092 return block_length;
1093 for (i = 1; i < block_length + 1; i++) {
1094 const char *c = o->emitted_symbols->buf[n - i].line;
1095 for (; *c; c++) {
1096 if (!isalnum(*c))
1097 continue;
1098 alnum_count++;
1099 if (alnum_count >= COLOR_MOVED_MIN_ALNUM_COUNT)
1100 return 1;
1101 }
1102 }
1103 for (i = 1; i < block_length + 1; i++)
1104 o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK;
1105 return 0;
1106 }
1107
1108 /* Find blocks of moved code, delegate actual coloring decision to helper */
1109 static void mark_color_as_moved(struct diff_options *o,
1110 struct moved_entry_list *entry_list)
1111 {
1112 struct moved_block *pmb = NULL; /* potentially moved blocks */
1113 int pmb_nr = 0, pmb_alloc = 0;
1114 int n, flipped_block = 0, block_length = 0;
1115 enum diff_symbol moved_symbol = DIFF_SYMBOL_BINARY_DIFF_HEADER;
1116
1117
1118 for (n = 0; n < o->emitted_symbols->nr; n++) {
1119 struct moved_entry *match = NULL;
1120 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
1121
1122 switch (l->s) {
1123 case DIFF_SYMBOL_PLUS:
1124 match = entry_list[l->id].del;
1125 break;
1126 case DIFF_SYMBOL_MINUS:
1127 match = entry_list[l->id].add;
1128 break;
1129 default:
1130 flipped_block = 0;
1131 }
1132
1133 if (pmb_nr && (!match || l->s != moved_symbol)) {
1134 if (!adjust_last_block(o, n, block_length) &&
1135 block_length > 1) {
1136 /*
1137 * Rewind in case there is another match
1138 * starting at the second line of the block
1139 */
1140 match = NULL;
1141 n -= block_length;
1142 }
1143 pmb_nr = 0;
1144 block_length = 0;
1145 flipped_block = 0;
1146 }
1147 if (!match) {
1148 moved_symbol = DIFF_SYMBOL_BINARY_DIFF_HEADER;
1149 continue;
1150 }
1151
1152 if (o->color_moved == COLOR_MOVED_PLAIN) {
1153 l->flags |= DIFF_SYMBOL_MOVED_LINE;
1154 continue;
1155 }
1156
1157 pmb_advance_or_null(o, l, pmb, &pmb_nr);
1158
1159 if (pmb_nr == 0) {
1160 int contiguous = adjust_last_block(o, n, block_length);
1161
1162 if (!contiguous && block_length > 1)
1163 /*
1164 * Rewind in case there is another match
1165 * starting at the second line of the block
1166 */
1167 n -= block_length;
1168 else
1169 fill_potential_moved_blocks(o, match, l,
1170 &pmb, &pmb_alloc,
1171 &pmb_nr);
1172
1173 if (contiguous && pmb_nr && moved_symbol == l->s)
1174 flipped_block = (flipped_block + 1) % 2;
1175 else
1176 flipped_block = 0;
1177
1178 if (pmb_nr)
1179 moved_symbol = l->s;
1180 else
1181 moved_symbol = DIFF_SYMBOL_BINARY_DIFF_HEADER;
1182
1183 block_length = 0;
1184 }
1185
1186 if (pmb_nr) {
1187 block_length++;
1188 l->flags |= DIFF_SYMBOL_MOVED_LINE;
1189 if (flipped_block && o->color_moved != COLOR_MOVED_BLOCKS)
1190 l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;
1191 }
1192 }
1193 adjust_last_block(o, n, block_length);
1194
1195 free(pmb);
1196 }
1197
1198 static void dim_moved_lines(struct diff_options *o)
1199 {
1200 int n;
1201 for (n = 0; n < o->emitted_symbols->nr; n++) {
1202 struct emitted_diff_symbol *prev = (n != 0) ?
1203 &o->emitted_symbols->buf[n - 1] : NULL;
1204 struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
1205 struct emitted_diff_symbol *next =
1206 (n < o->emitted_symbols->nr - 1) ?
1207 &o->emitted_symbols->buf[n + 1] : NULL;
1208
1209 /* Not a plus or minus line? */
1210 if (l->s != DIFF_SYMBOL_PLUS && l->s != DIFF_SYMBOL_MINUS)
1211 continue;
1212
1213 /* Not a moved line? */
1214 if (!(l->flags & DIFF_SYMBOL_MOVED_LINE))
1215 continue;
1216
1217 /*
1218 * If prev or next are not a plus or minus line,
1219 * pretend they don't exist
1220 */
1221 if (prev && prev->s != DIFF_SYMBOL_PLUS &&
1222 prev->s != DIFF_SYMBOL_MINUS)
1223 prev = NULL;
1224 if (next && next->s != DIFF_SYMBOL_PLUS &&
1225 next->s != DIFF_SYMBOL_MINUS)
1226 next = NULL;
1227
1228 /* Inside a block? */
1229 if ((prev &&
1230 (prev->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
1231 (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK)) &&
1232 (next &&
1233 (next->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
1234 (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK))) {
1235 l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
1236 continue;
1237 }
1238
1239 /* Check if we are at an interesting bound: */
1240 if (prev && (prev->flags & DIFF_SYMBOL_MOVED_LINE) &&
1241 (prev->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
1242 (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
1243 continue;
1244 if (next && (next->flags & DIFF_SYMBOL_MOVED_LINE) &&
1245 (next->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
1246 (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
1247 continue;
1248
1249 /*
1250 * The boundary to prev and next are not interesting,
1251 * so this line is not interesting as a whole
1252 */
1253 l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
1254 }
1255 }
1256
1257 static void emit_line_ws_markup(struct diff_options *o,
1258 const char *set_sign, const char *set,
1259 const char *reset,
1260 int sign_index, const char *line, int len,
1261 unsigned ws_rule, int blank_at_eof)
1262 {
1263 const char *ws = NULL;
1264 int sign = o->output_indicators[sign_index];
1265
1266 if (o->ws_error_highlight & ws_rule) {
1267 ws = diff_get_color_opt(o, DIFF_WHITESPACE);
1268 if (!*ws)
1269 ws = NULL;
1270 }
1271
1272 if (!ws && !set_sign)
1273 emit_line_0(o, set, NULL, 0, reset, sign, line, len);
1274 else if (!ws) {
1275 emit_line_0(o, set_sign, set, !!set_sign, reset, sign, line, len);
1276 } else if (blank_at_eof)
1277 /* Blank line at EOF - paint '+' as well */
1278 emit_line_0(o, ws, NULL, 0, reset, sign, line, len);
1279 else {
1280 /* Emit just the prefix, then the rest. */
1281 emit_line_0(o, set_sign ? set_sign : set, NULL, !!set_sign, reset,
1282 sign, "", 0);
1283 ws_check_emit(line, len, ws_rule,
1284 o->file, set, reset, ws);
1285 }
1286 }
1287
1288 static void emit_diff_symbol_from_struct(struct diff_options *o,
1289 struct emitted_diff_symbol *eds)
1290 {
1291 static const char *nneof = " No newline at end of file\n";
1292 const char *context, *reset, *set, *set_sign, *meta, *fraginfo;
1293
1294 enum diff_symbol s = eds->s;
1295 const char *line = eds->line;
1296 int len = eds->len;
1297 unsigned flags = eds->flags;
1298
1299 switch (s) {
1300 case DIFF_SYMBOL_NO_LF_EOF:
1301 context = diff_get_color_opt(o, DIFF_CONTEXT);
1302 reset = diff_get_color_opt(o, DIFF_RESET);
1303 putc('\n', o->file);
1304 emit_line_0(o, context, NULL, 0, reset, '\\',
1305 nneof, strlen(nneof));
1306 break;
1307 case DIFF_SYMBOL_SUBMODULE_HEADER:
1308 case DIFF_SYMBOL_SUBMODULE_ERROR:
1309 case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH:
1310 case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES:
1311 case DIFF_SYMBOL_SUMMARY:
1312 case DIFF_SYMBOL_STATS_LINE:
1313 case DIFF_SYMBOL_BINARY_DIFF_BODY:
1314 case DIFF_SYMBOL_CONTEXT_FRAGINFO:
1315 emit_line(o, "", "", line, len);
1316 break;
1317 case DIFF_SYMBOL_CONTEXT_INCOMPLETE:
1318 case DIFF_SYMBOL_CONTEXT_MARKER:
1319 context = diff_get_color_opt(o, DIFF_CONTEXT);
1320 reset = diff_get_color_opt(o, DIFF_RESET);
1321 emit_line(o, context, reset, line, len);
1322 break;
1323 case DIFF_SYMBOL_SEPARATOR:
1324 fprintf(o->file, "%s%c",
1325 diff_line_prefix(o),
1326 o->line_termination);
1327 break;
1328 case DIFF_SYMBOL_CONTEXT:
1329 set = diff_get_color_opt(o, DIFF_CONTEXT);
1330 reset = diff_get_color_opt(o, DIFF_RESET);
1331 set_sign = NULL;
1332 if (o->flags.dual_color_diffed_diffs) {
1333 char c = !len ? 0 : line[0];
1334
1335 if (c == '+')
1336 set = diff_get_color_opt(o, DIFF_FILE_NEW);
1337 else if (c == '@')
1338 set = diff_get_color_opt(o, DIFF_FRAGINFO);
1339 else if (c == '-')
1340 set = diff_get_color_opt(o, DIFF_FILE_OLD);
1341 }
1342 emit_line_ws_markup(o, set_sign, set, reset,
1343 OUTPUT_INDICATOR_CONTEXT, line, len,
1344 flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0);
1345 break;
1346 case DIFF_SYMBOL_PLUS:
1347 switch (flags & (DIFF_SYMBOL_MOVED_LINE |
1348 DIFF_SYMBOL_MOVED_LINE_ALT |
1349 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
1350 case DIFF_SYMBOL_MOVED_LINE |
1351 DIFF_SYMBOL_MOVED_LINE_ALT |
1352 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1353 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT_DIM);
1354 break;
1355 case DIFF_SYMBOL_MOVED_LINE |
1356 DIFF_SYMBOL_MOVED_LINE_ALT:
1357 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT);
1358 break;
1359 case DIFF_SYMBOL_MOVED_LINE |
1360 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1361 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_DIM);
1362 break;
1363 case DIFF_SYMBOL_MOVED_LINE:
1364 set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED);
1365 break;
1366 default:
1367 set = diff_get_color_opt(o, DIFF_FILE_NEW);
1368 }
1369 reset = diff_get_color_opt(o, DIFF_RESET);
1370 if (!o->flags.dual_color_diffed_diffs)
1371 set_sign = NULL;
1372 else {
1373 char c = !len ? 0 : line[0];
1374
1375 set_sign = set;
1376 if (c == '-')
1377 set = diff_get_color_opt(o, DIFF_FILE_OLD_BOLD);
1378 else if (c == '@')
1379 set = diff_get_color_opt(o, DIFF_FRAGINFO);
1380 else if (c == '+')
1381 set = diff_get_color_opt(o, DIFF_FILE_NEW_BOLD);
1382 else
1383 set = diff_get_color_opt(o, DIFF_CONTEXT_BOLD);
1384 flags &= ~DIFF_SYMBOL_CONTENT_WS_MASK;
1385 }
1386 emit_line_ws_markup(o, set_sign, set, reset,
1387 OUTPUT_INDICATOR_NEW, line, len,
1388 flags & DIFF_SYMBOL_CONTENT_WS_MASK,
1389 flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF);
1390 break;
1391 case DIFF_SYMBOL_MINUS:
1392 switch (flags & (DIFF_SYMBOL_MOVED_LINE |
1393 DIFF_SYMBOL_MOVED_LINE_ALT |
1394 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
1395 case DIFF_SYMBOL_MOVED_LINE |
1396 DIFF_SYMBOL_MOVED_LINE_ALT |
1397 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1398 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT_DIM);
1399 break;
1400 case DIFF_SYMBOL_MOVED_LINE |
1401 DIFF_SYMBOL_MOVED_LINE_ALT:
1402 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT);
1403 break;
1404 case DIFF_SYMBOL_MOVED_LINE |
1405 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
1406 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_DIM);
1407 break;
1408 case DIFF_SYMBOL_MOVED_LINE:
1409 set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED);
1410 break;
1411 default:
1412 set = diff_get_color_opt(o, DIFF_FILE_OLD);
1413 }
1414 reset = diff_get_color_opt(o, DIFF_RESET);
1415 if (!o->flags.dual_color_diffed_diffs)
1416 set_sign = NULL;
1417 else {
1418 char c = !len ? 0 : line[0];
1419
1420 set_sign = set;
1421 if (c == '+')
1422 set = diff_get_color_opt(o, DIFF_FILE_NEW_DIM);
1423 else if (c == '@')
1424 set = diff_get_color_opt(o, DIFF_FRAGINFO);
1425 else if (c == '-')
1426 set = diff_get_color_opt(o, DIFF_FILE_OLD_DIM);
1427 else
1428 set = diff_get_color_opt(o, DIFF_CONTEXT_DIM);
1429 }
1430 emit_line_ws_markup(o, set_sign, set, reset,
1431 OUTPUT_INDICATOR_OLD, line, len,
1432 flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0);
1433 break;
1434 case DIFF_SYMBOL_WORDS_PORCELAIN:
1435 context = diff_get_color_opt(o, DIFF_CONTEXT);
1436 reset = diff_get_color_opt(o, DIFF_RESET);
1437 emit_line(o, context, reset, line, len);
1438 fputs("~\n", o->file);
1439 break;
1440 case DIFF_SYMBOL_WORDS:
1441 context = diff_get_color_opt(o, DIFF_CONTEXT);
1442 reset = diff_get_color_opt(o, DIFF_RESET);
1443 /*
1444 * Skip the prefix character, if any. With
1445 * diff_suppress_blank_empty, there may be
1446 * none.
1447 */
1448 if (line[0] != '\n') {
1449 line++;
1450 len--;
1451 }
1452 emit_line(o, context, reset, line, len);
1453 break;
1454 case DIFF_SYMBOL_FILEPAIR_PLUS:
1455 meta = diff_get_color_opt(o, DIFF_METAINFO);
1456 reset = diff_get_color_opt(o, DIFF_RESET);
1457 fprintf(o->file, "%s%s+++ %s%s%s\n", diff_line_prefix(o), meta,
1458 line, reset,
1459 strchr(line, ' ') ? "\t" : "");
1460 break;
1461 case DIFF_SYMBOL_FILEPAIR_MINUS:
1462 meta = diff_get_color_opt(o, DIFF_METAINFO);
1463 reset = diff_get_color_opt(o, DIFF_RESET);
1464 fprintf(o->file, "%s%s--- %s%s%s\n", diff_line_prefix(o), meta,
1465 line, reset,
1466 strchr(line, ' ') ? "\t" : "");
1467 break;
1468 case DIFF_SYMBOL_BINARY_FILES:
1469 case DIFF_SYMBOL_HEADER:
1470 fprintf(o->file, "%s", line);
1471 break;
1472 case DIFF_SYMBOL_BINARY_DIFF_HEADER:
1473 fprintf(o->file, "%sGIT binary patch\n", diff_line_prefix(o));
1474 break;
1475 case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA:
1476 fprintf(o->file, "%sdelta %s\n", diff_line_prefix(o), line);
1477 break;
1478 case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL:
1479 fprintf(o->file, "%sliteral %s\n", diff_line_prefix(o), line);
1480 break;
1481 case DIFF_SYMBOL_BINARY_DIFF_FOOTER:
1482 fputs(diff_line_prefix(o), o->file);
1483 fputc('\n', o->file);
1484 break;
1485 case DIFF_SYMBOL_REWRITE_DIFF:
1486 fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
1487 reset = diff_get_color_opt(o, DIFF_RESET);
1488 emit_line(o, fraginfo, reset, line, len);
1489 break;
1490 case DIFF_SYMBOL_SUBMODULE_ADD:
1491 set = diff_get_color_opt(o, DIFF_FILE_NEW);
1492 reset = diff_get_color_opt(o, DIFF_RESET);
1493 emit_line(o, set, reset, line, len);
1494 break;
1495 case DIFF_SYMBOL_SUBMODULE_DEL:
1496 set = diff_get_color_opt(o, DIFF_FILE_OLD);
1497 reset = diff_get_color_opt(o, DIFF_RESET);
1498 emit_line(o, set, reset, line, len);
1499 break;
1500 case DIFF_SYMBOL_SUBMODULE_UNTRACKED:
1501 fprintf(o->file, "%sSubmodule %s contains untracked content\n",
1502 diff_line_prefix(o), line);
1503 break;
1504 case DIFF_SYMBOL_SUBMODULE_MODIFIED:
1505 fprintf(o->file, "%sSubmodule %s contains modified content\n",
1506 diff_line_prefix(o), line);
1507 break;
1508 case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES:
1509 emit_line(o, "", "", " 0 files changed\n",
1510 strlen(" 0 files changed\n"));
1511 break;
1512 case DIFF_SYMBOL_STATS_SUMMARY_ABBREV:
1513 emit_line(o, "", "", " ...\n", strlen(" ...\n"));
1514 break;
1515 case DIFF_SYMBOL_WORD_DIFF:
1516 fprintf(o->file, "%.*s", len, line);
1517 break;
1518 case DIFF_SYMBOL_STAT_SEP:
1519 fputs(o->stat_sep, o->file);
1520 break;
1521 default:
1522 BUG("unknown diff symbol");
1523 }
1524 }
1525
1526 static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
1527 const char *line, int len, unsigned flags)
1528 {
1529 struct emitted_diff_symbol e = {
1530 .line = line, .len = len, .flags = flags, .s = s
1531 };
1532
1533 if (o->emitted_symbols)
1534 append_emitted_diff_symbol(o, &e);
1535 else
1536 emit_diff_symbol_from_struct(o, &e);
1537 }
1538
1539 void diff_emit_submodule_del(struct diff_options *o, const char *line)
1540 {
1541 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_DEL, line, strlen(line), 0);
1542 }
1543
1544 void diff_emit_submodule_add(struct diff_options *o, const char *line)
1545 {
1546 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ADD, line, strlen(line), 0);
1547 }
1548
1549 void diff_emit_submodule_untracked(struct diff_options *o, const char *path)
1550 {
1551 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_UNTRACKED,
1552 path, strlen(path), 0);
1553 }
1554
1555 void diff_emit_submodule_modified(struct diff_options *o, const char *path)
1556 {
1557 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_MODIFIED,
1558 path, strlen(path), 0);
1559 }
1560
1561 void diff_emit_submodule_header(struct diff_options *o, const char *header)
1562 {
1563 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_HEADER,
1564 header, strlen(header), 0);
1565 }
1566
1567 void diff_emit_submodule_error(struct diff_options *o, const char *err)
1568 {
1569 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ERROR, err, strlen(err), 0);
1570 }
1571
1572 void diff_emit_submodule_pipethrough(struct diff_options *o,
1573 const char *line, int len)
1574 {
1575 emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH, line, len, 0);
1576 }
1577
1578 static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
1579 {
1580 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
1581 ecbdata->blank_at_eof_in_preimage &&
1582 ecbdata->blank_at_eof_in_postimage &&
1583 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
1584 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
1585 return 0;
1586 return ws_blank_line(line, len, ecbdata->ws_rule);
1587 }
1588
1589 static void emit_add_line(struct emit_callback *ecbdata,
1590 const char *line, int len)
1591 {
1592 unsigned flags = WSEH_NEW | ecbdata->ws_rule;
1593 if (new_blank_line_at_eof(ecbdata, line, len))
1594 flags |= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF;
1595
1596 emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_PLUS, line, len, flags);
1597 }
1598
1599 static void emit_del_line(struct emit_callback *ecbdata,
1600 const char *line, int len)
1601 {
1602 unsigned flags = WSEH_OLD | ecbdata->ws_rule;
1603 emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags);
1604 }
1605
1606 static void emit_context_line(struct emit_callback *ecbdata,
1607 const char *line, int len)
1608 {
1609 unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule;
1610 emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_CONTEXT, line, len, flags);
1611 }
1612
1613 static void emit_hunk_header(struct emit_callback *ecbdata,
1614 const char *line, int len)
1615 {
1616 const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
1617 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
1618 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
1619 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
1620 const char *reverse = ecbdata->color_diff ? GIT_COLOR_REVERSE : "";
1621 static const char atat[2] = { '@', '@' };
1622 const char *cp, *ep;
1623 struct strbuf msgbuf = STRBUF_INIT;
1624 int org_len = len;
1625 int i = 1;
1626
1627 /*
1628 * As a hunk header must begin with "@@ -<old>, +<new> @@",
1629 * it always is at least 10 bytes long.
1630 */
1631 if (len < 10 ||
1632 memcmp(line, atat, 2) ||
1633 !(ep = memmem(line + 2, len - 2, atat, 2))) {
1634 emit_diff_symbol(ecbdata->opt,
1635 DIFF_SYMBOL_CONTEXT_MARKER, line, len, 0);
1636 return;
1637 }
1638 ep += 2; /* skip over @@ */
1639
1640 /* The hunk header in fraginfo color */
1641 if (ecbdata->opt->flags.dual_color_diffed_diffs)
1642 strbuf_addstr(&msgbuf, reverse);
1643 strbuf_addstr(&msgbuf, frag);
1644 if (ecbdata->opt->flags.suppress_hunk_header_line_count)
1645 strbuf_add(&msgbuf, atat, sizeof(atat));
1646 else
1647 strbuf_add(&msgbuf, line, ep - line);
1648 strbuf_addstr(&msgbuf, reset);
1649
1650 /*
1651 * trailing "\r\n"
1652 */
1653 for ( ; i < 3; i++)
1654 if (line[len - i] == '\r' || line[len - i] == '\n')
1655 len--;
1656
1657 /* blank before the func header */
1658 for (cp = ep; ep - line < len; ep++)
1659 if (*ep != ' ' && *ep != '\t')
1660 break;
1661 if (ep != cp) {
1662 strbuf_addstr(&msgbuf, context);
1663 strbuf_add(&msgbuf, cp, ep - cp);
1664 strbuf_addstr(&msgbuf, reset);
1665 }
1666
1667 if (ep < line + len) {
1668 strbuf_addstr(&msgbuf, func);
1669 strbuf_add(&msgbuf, ep, line + len - ep);
1670 strbuf_addstr(&msgbuf, reset);
1671 }
1672
1673 strbuf_add(&msgbuf, line + len, org_len - len);
1674 strbuf_complete_line(&msgbuf);
1675 emit_diff_symbol(ecbdata->opt,
1676 DIFF_SYMBOL_CONTEXT_FRAGINFO, msgbuf.buf, msgbuf.len, 0);
1677 strbuf_release(&msgbuf);
1678 }
1679
1680 static struct diff_tempfile *claim_diff_tempfile(void)
1681 {
1682 int i;
1683 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
1684 if (!diff_temp[i].name)
1685 return diff_temp + i;
1686 BUG("diff is failing to clean up its tempfiles");
1687 }
1688
1689 static void remove_tempfile(void)
1690 {
1691 int i;
1692 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
1693 if (is_tempfile_active(diff_temp[i].tempfile))
1694 delete_tempfile(&diff_temp[i].tempfile);
1695 diff_temp[i].name = NULL;
1696 }
1697 }
1698
1699 static void add_line_count(struct strbuf *out, int count)
1700 {
1701 switch (count) {
1702 case 0:
1703 strbuf_addstr(out, "0,0");
1704 break;
1705 case 1:
1706 strbuf_addstr(out, "1");
1707 break;
1708 default:
1709 strbuf_addf(out, "1,%d", count);
1710 break;
1711 }
1712 }
1713
1714 static void emit_rewrite_lines(struct emit_callback *ecb,
1715 int prefix, const char *data, int size)
1716 {
1717 const char *endp = NULL;
1718
1719 while (0 < size) {
1720 int len;
1721
1722 endp = memchr(data, '\n', size);
1723 len = endp ? (endp - data + 1) : size;
1724 if (prefix != '+') {
1725 ecb->lno_in_preimage++;
1726 emit_del_line(ecb, data, len);
1727 } else {
1728 ecb->lno_in_postimage++;
1729 emit_add_line(ecb, data, len);
1730 }
1731 size -= len;
1732 data += len;
1733 }
1734 if (!endp)
1735 emit_diff_symbol(ecb->opt, DIFF_SYMBOL_NO_LF_EOF, NULL, 0, 0);
1736 }
1737
1738 static void emit_rewrite_diff(const char *name_a,
1739 const char *name_b,
1740 struct diff_filespec *one,
1741 struct diff_filespec *two,
1742 struct userdiff_driver *textconv_one,
1743 struct userdiff_driver *textconv_two,
1744 struct diff_options *o)
1745 {
1746 int lc_a, lc_b;
1747 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
1748 const char *a_prefix, *b_prefix;
1749 char *data_one, *data_two;
1750 size_t size_one, size_two;
1751 struct emit_callback ecbdata;
1752 struct strbuf out = STRBUF_INIT;
1753
1754 if (diff_mnemonic_prefix && o->flags.reverse_diff) {
1755 a_prefix = o->b_prefix;
1756 b_prefix = o->a_prefix;
1757 } else {
1758 a_prefix = o->a_prefix;
1759 b_prefix = o->b_prefix;
1760 }
1761
1762 name_a += (*name_a == '/');
1763 name_b += (*name_b == '/');
1764
1765 strbuf_reset(&a_name);
1766 strbuf_reset(&b_name);
1767 quote_two_c_style(&a_name, a_prefix, name_a, 0);
1768 quote_two_c_style(&b_name, b_prefix, name_b, 0);
1769
1770 size_one = fill_textconv(o->repo, textconv_one, one, &data_one);
1771 size_two = fill_textconv(o->repo, textconv_two, two, &data_two);
1772
1773 memset(&ecbdata, 0, sizeof(ecbdata));
1774 ecbdata.color_diff = want_color(o->use_color);
1775 ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b);
1776 ecbdata.opt = o;
1777 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
1778 mmfile_t mf1, mf2;
1779 mf1.ptr = (char *)data_one;
1780 mf2.ptr = (char *)data_two;
1781 mf1.size = size_one;
1782 mf2.size = size_two;
1783 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1784 }
1785 ecbdata.lno_in_preimage = 1;
1786 ecbdata.lno_in_postimage = 1;
1787
1788 lc_a = count_lines(data_one, size_one);
1789 lc_b = count_lines(data_two, size_two);
1790
1791 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
1792 a_name.buf, a_name.len, 0);
1793 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
1794 b_name.buf, b_name.len, 0);
1795
1796 strbuf_addstr(&out, "@@ -");
1797 if (!o->irreversible_delete)
1798 add_line_count(&out, lc_a);
1799 else
1800 strbuf_addstr(&out, "?,?");
1801 strbuf_addstr(&out, " +");
1802 add_line_count(&out, lc_b);
1803 strbuf_addstr(&out, " @@\n");
1804 emit_diff_symbol(o, DIFF_SYMBOL_REWRITE_DIFF, out.buf, out.len, 0);
1805 strbuf_release(&out);
1806
1807 if (lc_a && !o->irreversible_delete)
1808 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
1809 if (lc_b)
1810 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
1811 if (textconv_one)
1812 free((char *)data_one);
1813 if (textconv_two)
1814 free((char *)data_two);
1815 }
1816
1817 struct diff_words_buffer {
1818 mmfile_t text;
1819 unsigned long alloc;
1820 struct diff_words_orig {
1821 const char *begin, *end;
1822 } *orig;
1823 int orig_nr, orig_alloc;
1824 };
1825
1826 static void diff_words_append(char *line, unsigned long len,
1827 struct diff_words_buffer *buffer)
1828 {
1829 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
1830 line++;
1831 len--;
1832 memcpy(buffer->text.ptr + buffer->text.size, line, len);
1833 buffer->text.size += len;
1834 buffer->text.ptr[buffer->text.size] = '\0';
1835 }
1836
1837 struct diff_words_style_elem {
1838 const char *prefix;
1839 const char *suffix;
1840 const char *color; /* NULL; filled in by the setup code if
1841 * color is enabled */
1842 };
1843
1844 struct diff_words_style {
1845 enum diff_words_type type;
1846 struct diff_words_style_elem new_word, old_word, ctx;
1847 const char *newline;
1848 };
1849
1850 static struct diff_words_style diff_words_styles[] = {
1851 { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
1852 { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
1853 { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
1854 };
1855
1856 struct diff_words_data {
1857 struct diff_words_buffer minus, plus;
1858 const char *current_plus;
1859 int last_minus;
1860 struct diff_options *opt;
1861 regex_t *word_regex;
1862 enum diff_words_type type;
1863 struct diff_words_style *style;
1864 };
1865
1866 static int fn_out_diff_words_write_helper(struct diff_options *o,
1867 struct diff_words_style_elem *st_el,
1868 const char *newline,
1869 size_t count, const char *buf)
1870 {
1871 int print = 0;
1872 struct strbuf sb = STRBUF_INIT;
1873
1874 while (count) {
1875 char *p = memchr(buf, '\n', count);
1876 if (print)
1877 strbuf_addstr(&sb, diff_line_prefix(o));
1878
1879 if (p != buf) {
1880 const char *reset = st_el->color && *st_el->color ?
1881 GIT_COLOR_RESET : NULL;
1882 if (st_el->color && *st_el->color)
1883 strbuf_addstr(&sb, st_el->color);
1884 strbuf_addstr(&sb, st_el->prefix);
1885 strbuf_add(&sb, buf, p ? p - buf : count);
1886 strbuf_addstr(&sb, st_el->suffix);
1887 if (reset)
1888 strbuf_addstr(&sb, reset);
1889 }
1890 if (!p)
1891 goto out;
1892
1893 strbuf_addstr(&sb, newline);
1894 count -= p + 1 - buf;
1895 buf = p + 1;
1896 print = 1;
1897 if (count) {
1898 emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
1899 sb.buf, sb.len, 0);
1900 strbuf_reset(&sb);
1901 }
1902 }
1903
1904 out:
1905 if (sb.len)
1906 emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
1907 sb.buf, sb.len, 0);
1908 strbuf_release(&sb);
1909 return 0;
1910 }
1911
1912 /*
1913 * '--color-words' algorithm can be described as:
1914 *
1915 * 1. collect the minus/plus lines of a diff hunk, divided into
1916 * minus-lines and plus-lines;
1917 *
1918 * 2. break both minus-lines and plus-lines into words and
1919 * place them into two mmfile_t with one word for each line;
1920 *
1921 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
1922 *
1923 * And for the common parts of the both file, we output the plus side text.
1924 * diff_words->current_plus is used to trace the current position of the plus file
1925 * which printed. diff_words->last_minus is used to trace the last minus word
1926 * printed.
1927 *
1928 * For '--graph' to work with '--color-words', we need to output the graph prefix
1929 * on each line of color words output. Generally, there are two conditions on
1930 * which we should output the prefix.
1931 *
1932 * 1. diff_words->last_minus == 0 &&
1933 * diff_words->current_plus == diff_words->plus.text.ptr
1934 *
1935 * that is: the plus text must start as a new line, and if there is no minus
1936 * word printed, a graph prefix must be printed.
1937 *
1938 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
1939 * *(diff_words->current_plus - 1) == '\n'
1940 *
1941 * that is: a graph prefix must be printed following a '\n'
1942 */
1943 static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
1944 {
1945 if ((diff_words->last_minus == 0 &&
1946 diff_words->current_plus == diff_words->plus.text.ptr) ||
1947 (diff_words->current_plus > diff_words->plus.text.ptr &&
1948 *(diff_words->current_plus - 1) == '\n')) {
1949 return 1;
1950 } else {
1951 return 0;
1952 }
1953 }
1954
1955 static void fn_out_diff_words_aux(void *priv,
1956 long minus_first, long minus_len,
1957 long plus_first, long plus_len,
1958 const char *func, long funclen)
1959 {
1960 struct diff_words_data *diff_words = priv;
1961 struct diff_words_style *style = diff_words->style;
1962 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
1963 struct diff_options *opt = diff_words->opt;
1964 const char *line_prefix;
1965
1966 assert(opt);
1967 line_prefix = diff_line_prefix(opt);
1968
1969 /* POSIX requires that first be decremented by one if len == 0... */
1970 if (minus_len) {
1971 minus_begin = diff_words->minus.orig[minus_first].begin;
1972 minus_end =
1973 diff_words->minus.orig[minus_first + minus_len - 1].end;
1974 } else
1975 minus_begin = minus_end =
1976 diff_words->minus.orig[minus_first].end;
1977
1978 if (plus_len) {
1979 plus_begin = diff_words->plus.orig[plus_first].begin;
1980 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
1981 } else
1982 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
1983
1984 if (color_words_output_graph_prefix(diff_words)) {
1985 fputs(line_prefix, diff_words->opt->file);
1986 }
1987 if (diff_words->current_plus != plus_begin) {
1988 fn_out_diff_words_write_helper(diff_words->opt,
1989 &style->ctx, style->newline,
1990 plus_begin - diff_words->current_plus,
1991 diff_words->current_plus);
1992 }
1993 if (minus_begin != minus_end) {
1994 fn_out_diff_words_write_helper(diff_words->opt,
1995 &style->old_word, style->newline,
1996 minus_end - minus_begin, minus_begin);
1997 }
1998 if (plus_begin != plus_end) {
1999 fn_out_diff_words_write_helper(diff_words->opt,
2000 &style->new_word, style->newline,
2001 plus_end - plus_begin, plus_begin);
2002 }
2003
2004 diff_words->current_plus = plus_end;
2005 diff_words->last_minus = minus_first;
2006 }
2007
2008 /* This function starts looking at *begin, and returns 0 iff a word was found. */
2009 static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
2010 int *begin, int *end)
2011 {
2012 while (word_regex && *begin < buffer->size) {
2013 regmatch_t match[1];
2014 if (!regexec_buf(word_regex, buffer->ptr + *begin,
2015 buffer->size - *begin, 1, match, 0)) {
2016 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
2017 '\n', match[0].rm_eo - match[0].rm_so);
2018 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
2019 *begin += match[0].rm_so;
2020 if (*begin == *end)
2021 (*begin)++;
2022 else
2023 return *begin > *end;
2024 } else {
2025 return -1;
2026 }
2027 }
2028
2029 /* find the next word */
2030 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
2031 (*begin)++;
2032 if (*begin >= buffer->size)
2033 return -1;
2034
2035 /* find the end of the word */
2036 *end = *begin + 1;
2037 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
2038 (*end)++;
2039
2040 return 0;
2041 }
2042
2043 /*
2044 * This function splits the words in buffer->text, stores the list with
2045 * newline separator into out, and saves the offsets of the original words
2046 * in buffer->orig.
2047 */
2048 static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
2049 regex_t *word_regex)
2050 {
2051 int i, j;
2052 long alloc = 0;
2053
2054 out->size = 0;
2055 out->ptr = NULL;
2056
2057 /* fake an empty "0th" word */
2058 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
2059 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
2060 buffer->orig_nr = 1;
2061
2062 for (i = 0; i < buffer->text.size; i++) {
2063 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
2064 return;
2065
2066 /* store original boundaries */
2067 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
2068 buffer->orig_alloc);
2069 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
2070 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
2071 buffer->orig_nr++;
2072
2073 /* store one word */
2074 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
2075 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
2076 out->ptr[out->size + j - i] = '\n';
2077 out->size += j - i + 1;
2078
2079 i = j - 1;
2080 }
2081 }
2082
2083 /* this executes the word diff on the accumulated buffers */
2084 static void diff_words_show(struct diff_words_data *diff_words)
2085 {
2086 xpparam_t xpp;
2087 xdemitconf_t xecfg;
2088 mmfile_t minus, plus;
2089 struct diff_words_style *style = diff_words->style;
2090
2091 struct diff_options *opt = diff_words->opt;
2092 const char *line_prefix;
2093
2094 assert(opt);
2095 line_prefix = diff_line_prefix(opt);
2096
2097 /* special case: only removal */
2098 if (!diff_words->plus.text.size) {
2099 emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
2100 line_prefix, strlen(line_prefix), 0);
2101 fn_out_diff_words_write_helper(diff_words->opt,
2102 &style->old_word, style->newline,
2103 diff_words->minus.text.size,
2104 diff_words->minus.text.ptr);
2105 diff_words->minus.text.size = 0;
2106 return;
2107 }
2108
2109 diff_words->current_plus = diff_words->plus.text.ptr;
2110 diff_words->last_minus = 0;
2111
2112 memset(&xpp, 0, sizeof(xpp));
2113 memset(&xecfg, 0, sizeof(xecfg));
2114 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
2115 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
2116 xpp.flags = 0;
2117 /* as only the hunk header will be parsed, we need a 0-context */
2118 xecfg.ctxlen = 0;
2119 if (xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, NULL,
2120 diff_words, &xpp, &xecfg))
2121 die("unable to generate word diff");
2122 free(minus.ptr);
2123 free(plus.ptr);
2124 if (diff_words->current_plus != diff_words->plus.text.ptr +
2125 diff_words->plus.text.size) {
2126 if (color_words_output_graph_prefix(diff_words))
2127 emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
2128 line_prefix, strlen(line_prefix), 0);
2129 fn_out_diff_words_write_helper(diff_words->opt,
2130 &style->ctx, style->newline,
2131 diff_words->plus.text.ptr + diff_words->plus.text.size
2132 - diff_words->current_plus, diff_words->current_plus);
2133 }
2134 diff_words->minus.text.size = diff_words->plus.text.size = 0;
2135 }
2136
2137 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
2138 static void diff_words_flush(struct emit_callback *ecbdata)
2139 {
2140 struct diff_options *wo = ecbdata->diff_words->opt;
2141
2142 if (ecbdata->diff_words->minus.text.size ||
2143 ecbdata->diff_words->plus.text.size)
2144 diff_words_show(ecbdata->diff_words);
2145
2146 if (wo->emitted_symbols) {
2147 struct diff_options *o = ecbdata->opt;
2148 struct emitted_diff_symbols *wol = wo->emitted_symbols;
2149 int i;
2150
2151 /*
2152 * NEEDSWORK:
2153 * Instead of appending each, concat all words to a line?
2154 */
2155 for (i = 0; i < wol->nr; i++)
2156 append_emitted_diff_symbol(o, &wol->buf[i]);
2157
2158 for (i = 0; i < wol->nr; i++)
2159 free((void *)wol->buf[i].line);
2160
2161 wol->nr = 0;
2162 }
2163 }
2164
2165 static void diff_filespec_load_driver(struct diff_filespec *one,
2166 struct index_state *istate)
2167 {
2168 /* Use already-loaded driver */
2169 if (one->driver)
2170 return;
2171
2172 if (S_ISREG(one->mode))
2173 one->driver = userdiff_find_by_path(istate, one->path);
2174
2175 /* Fallback to default settings */
2176 if (!one->driver)
2177 one->driver = userdiff_find_by_name("default");
2178 }
2179
2180 static const char *userdiff_word_regex(struct diff_filespec *one,
2181 struct index_state *istate)
2182 {
2183 diff_filespec_load_driver(one, istate);
2184 return one->driver->word_regex;
2185 }
2186
2187 static void init_diff_words_data(struct emit_callback *ecbdata,
2188 struct diff_options *orig_opts,
2189 struct diff_filespec *one,
2190 struct diff_filespec *two)
2191 {
2192 int i;
2193 struct diff_options *o = xmalloc(sizeof(struct diff_options));
2194 memcpy(o, orig_opts, sizeof(struct diff_options));
2195
2196 CALLOC_ARRAY(ecbdata->diff_words, 1);
2197 ecbdata->diff_words->type = o->word_diff;
2198 ecbdata->diff_words->opt = o;
2199
2200 if (orig_opts->emitted_symbols)
2201 CALLOC_ARRAY(o->emitted_symbols, 1);
2202
2203 if (!o->word_regex)
2204 o->word_regex = userdiff_word_regex(one, o->repo->index);
2205 if (!o->word_regex)
2206 o->word_regex = userdiff_word_regex(two, o->repo->index);
2207 if (!o->word_regex)
2208 o->word_regex = diff_word_regex_cfg;
2209 if (o->word_regex) {
2210 ecbdata->diff_words->word_regex = (regex_t *)
2211 xmalloc(sizeof(regex_t));
2212 if (regcomp(ecbdata->diff_words->word_regex,
2213 o->word_regex,
2214 REG_EXTENDED | REG_NEWLINE))
2215 die("invalid regular expression: %s",
2216 o->word_regex);
2217 }
2218 for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
2219 if (o->word_diff == diff_words_styles[i].type) {
2220 ecbdata->diff_words->style =
2221 &diff_words_styles[i];
2222 break;
2223 }
2224 }
2225 if (want_color(o->use_color)) {
2226 struct diff_words_style *st = ecbdata->diff_words->style;
2227 st->old_word.color = diff_get_color_opt(o, DIFF_FILE_OLD);
2228 st->new_word.color = diff_get_color_opt(o, DIFF_FILE_NEW);
2229 st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
2230 }
2231 }
2232
2233 static void free_diff_words_data(struct emit_callback *ecbdata)
2234 {
2235 if (ecbdata->diff_words) {
2236 diff_words_flush(ecbdata);
2237 free_emitted_diff_symbols(ecbdata->diff_words->opt->emitted_symbols);
2238 free (ecbdata->diff_words->opt);
2239 free (ecbdata->diff_words->minus.text.ptr);
2240 free (ecbdata->diff_words->minus.orig);
2241 free (ecbdata->diff_words->plus.text.ptr);
2242 free (ecbdata->diff_words->plus.orig);
2243 if (ecbdata->diff_words->word_regex) {
2244 regfree(ecbdata->diff_words->word_regex);
2245 free(ecbdata->diff_words->word_regex);
2246 }
2247 FREE_AND_NULL(ecbdata->diff_words);
2248 }
2249 }
2250
2251 const char *diff_get_color(int diff_use_color, enum color_diff ix)
2252 {
2253 if (want_color(diff_use_color))
2254 return diff_colors[ix];
2255 return "";
2256 }
2257
2258 const char *diff_line_prefix(struct diff_options *opt)
2259 {
2260 struct strbuf *msgbuf;
2261 if (!opt->output_prefix)
2262 return "";
2263
2264 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
2265 return msgbuf->buf;
2266 }
2267
2268 static unsigned long sane_truncate_line(char *line, unsigned long len)
2269 {
2270 const char *cp;
2271 unsigned long allot;
2272 size_t l = len;
2273
2274 cp = line;
2275 allot = l;
2276 while (0 < l) {
2277 (void) utf8_width(&cp, &l);
2278 if (!cp)
2279 break; /* truncated in the middle? */
2280 }
2281 return allot - l;
2282 }
2283
2284 static void find_lno(const char *line, struct emit_callback *ecbdata)
2285 {
2286 const char *p;
2287 ecbdata->lno_in_preimage = 0;
2288 ecbdata->lno_in_postimage = 0;
2289 p = strchr(line, '-');
2290 if (!p)
2291 return; /* cannot happen */
2292 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
2293 p = strchr(p, '+');
2294 if (!p)
2295 return; /* cannot happen */
2296 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
2297 }
2298
2299 static int fn_out_consume(void *priv, char *line, unsigned long len)
2300 {
2301 struct emit_callback *ecbdata = priv;
2302 struct diff_options *o = ecbdata->opt;
2303
2304 o->found_changes = 1;
2305
2306 if (ecbdata->header) {
2307 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
2308 ecbdata->header->buf, ecbdata->header->len, 0);
2309 strbuf_reset(ecbdata->header);
2310 ecbdata->header = NULL;
2311 }
2312
2313 if (ecbdata->label_path[0]) {
2314 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
2315 ecbdata->label_path[0],
2316 strlen(ecbdata->label_path[0]), 0);
2317 emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
2318 ecbdata->label_path[1],
2319 strlen(ecbdata->label_path[1]), 0);
2320 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
2321 }
2322
2323 if (diff_suppress_blank_empty
2324 && len == 2 && line[0] == ' ' && line[1] == '\n') {
2325 line[0] = '\n';
2326 len = 1;
2327 }
2328
2329 if (line[0] == '@') {
2330 if (ecbdata->diff_words)
2331 diff_words_flush(ecbdata);
2332 len = sane_truncate_line(line, len);
2333 find_lno(line, ecbdata);
2334 emit_hunk_header(ecbdata, line, len);
2335 return 0;
2336 }
2337
2338 if (ecbdata->diff_words) {
2339 enum diff_symbol s =
2340 ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN ?
2341 DIFF_SYMBOL_WORDS_PORCELAIN : DIFF_SYMBOL_WORDS;
2342 if (line[0] == '-') {
2343 diff_words_append(line, len,
2344 &ecbdata->diff_words->minus);
2345 return 0;
2346 } else if (line[0] == '+') {
2347 diff_words_append(line, len,
2348 &ecbdata->diff_words->plus);
2349 return 0;
2350 } else if (starts_with(line, "\\ ")) {
2351 /*
2352 * Eat the "no newline at eof" marker as if we
2353 * saw a "+" or "-" line with nothing on it,
2354 * and return without diff_words_flush() to
2355 * defer processing. If this is the end of
2356 * preimage, more "+" lines may come after it.
2357 */
2358 return 0;
2359 }
2360 diff_words_flush(ecbdata);
2361 emit_diff_symbol(o, s, line, len, 0);
2362 return 0;
2363 }
2364
2365 switch (line[0]) {
2366 case '+':
2367 ecbdata->lno_in_postimage++;
2368 emit_add_line(ecbdata, line + 1, len - 1);
2369 break;
2370 case '-':
2371 ecbdata->lno_in_preimage++;
2372 emit_del_line(ecbdata, line + 1, len - 1);
2373 break;
2374 case ' ':
2375 ecbdata->lno_in_postimage++;
2376 ecbdata->lno_in_preimage++;
2377 emit_context_line(ecbdata, line + 1, len - 1);
2378 break;
2379 default:
2380 /* incomplete line at the end */
2381 ecbdata->lno_in_preimage++;
2382 emit_diff_symbol(o, DIFF_SYMBOL_CONTEXT_INCOMPLETE,
2383 line, len, 0);
2384 break;
2385 }
2386 return 0;
2387 }
2388
2389 static void pprint_rename(struct strbuf *name, const char *a, const char *b)
2390 {
2391 const char *old_name = a;
2392 const char *new_name = b;
2393 int pfx_length, sfx_length;
2394 int pfx_adjust_for_slash;
2395 int len_a = strlen(a);
2396 int len_b = strlen(b);
2397 int a_midlen, b_midlen;
2398 int qlen_a = quote_c_style(a, NULL, NULL, 0);
2399 int qlen_b = quote_c_style(b, NULL, NULL, 0);
2400
2401 if (qlen_a || qlen_b) {
2402 quote_c_style(a, name, NULL, 0);
2403 strbuf_addstr(name, " => ");
2404 quote_c_style(b, name, NULL, 0);
2405 return;
2406 }
2407
2408 /* Find common prefix */
2409 pfx_length = 0;
2410 while (*old_name && *new_name && *old_name == *new_name) {
2411 if (*old_name == '/')
2412 pfx_length = old_name - a + 1;
2413 old_name++;
2414 new_name++;
2415 }
2416
2417 /* Find common suffix */
2418 old_name = a + len_a;
2419 new_name = b + len_b;
2420 sfx_length = 0;
2421 /*
2422 * If there is a common prefix, it must end in a slash. In
2423 * that case we let this loop run 1 into the prefix to see the
2424 * same slash.
2425 *
2426 * If there is no common prefix, we cannot do this as it would
2427 * underrun the input strings.
2428 */
2429 pfx_adjust_for_slash = (pfx_length ? 1 : 0);
2430 while (a + pfx_length - pfx_adjust_for_slash <= old_name &&
2431 b + pfx_length - pfx_adjust_for_slash <= new_name &&
2432 *old_name == *new_name) {
2433 if (*old_name == '/')
2434 sfx_length = len_a - (old_name - a);
2435 old_name--;
2436 new_name--;
2437 }
2438
2439 /*
2440 * pfx{mid-a => mid-b}sfx
2441 * {pfx-a => pfx-b}sfx
2442 * pfx{sfx-a => sfx-b}
2443 * name-a => name-b
2444 */
2445 a_midlen = len_a - pfx_length - sfx_length;
2446 b_midlen = len_b - pfx_length - sfx_length;
2447 if (a_midlen < 0)
2448 a_midlen = 0;
2449 if (b_midlen < 0)
2450 b_midlen = 0;
2451
2452 strbuf_grow(name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
2453 if (pfx_length + sfx_length) {
2454 strbuf_add(name, a, pfx_length);
2455 strbuf_addch(name, '{');
2456 }
2457 strbuf_add(name, a + pfx_length, a_midlen);
2458 strbuf_addstr(name, " => ");
2459 strbuf_add(name, b + pfx_length, b_midlen);
2460 if (pfx_length + sfx_length) {
2461 strbuf_addch(name, '}');
2462 strbuf_add(name, a + len_a - sfx_length, sfx_length);
2463 }
2464 }
2465
2466 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
2467 const char *name_a,
2468 const char *name_b)
2469 {
2470 struct diffstat_file *x;
2471 CALLOC_ARRAY(x, 1);
2472 ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
2473 diffstat->files[diffstat->nr++] = x;
2474 if (name_b) {
2475 x->from_name = xstrdup(name_a);
2476 x->name = xstrdup(name_b);
2477 x->is_renamed = 1;
2478 }
2479 else {
2480 x->from_name = NULL;
2481 x->name = xstrdup(name_a);
2482 }
2483 return x;
2484 }
2485
2486 static int diffstat_consume(void *priv, char *line, unsigned long len)
2487 {
2488 struct diffstat_t *diffstat = priv;
2489 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
2490
2491 if (line[0] == '+')
2492 x->added++;
2493 else if (line[0] == '-')
2494 x->deleted++;
2495 return 0;
2496 }
2497
2498 const char mime_boundary_leader[] = "------------";
2499
2500 static int scale_linear(int it, int width, int max_change)
2501 {
2502 if (!it)
2503 return 0;
2504 /*
2505 * make sure that at least one '-' or '+' is printed if
2506 * there is any change to this path. The easiest way is to
2507 * scale linearly as if the allotted width is one column shorter
2508 * than it is, and then add 1 to the result.
2509 */
2510 return 1 + (it * (width - 1) / max_change);
2511 }
2512
2513 static void show_graph(struct strbuf *out, char ch, int cnt,
2514 const char *set, const char *reset)
2515 {
2516 if (cnt <= 0)
2517 return;
2518 strbuf_addstr(out, set);
2519 strbuf_addchars(out, ch, cnt);
2520 strbuf_addstr(out, reset);
2521 }
2522
2523 static void fill_print_name(struct diffstat_file *file)
2524 {
2525 struct strbuf pname = STRBUF_INIT;
2526
2527 if (file->print_name)
2528 return;
2529
2530 if (file->is_renamed)
2531 pprint_rename(&pname, file->from_name, file->name);
2532 else
2533 quote_c_style(file->name, &pname, NULL, 0);
2534
2535 if (file->comments)
2536 strbuf_addf(&pname, " (%s)", file->comments);
2537
2538 file->print_name = strbuf_detach(&pname, NULL);
2539 }
2540
2541 static void print_stat_summary_inserts_deletes(struct diff_options *options,
2542 int files, int insertions, int deletions)
2543 {
2544 struct strbuf sb = STRBUF_INIT;
2545
2546 if (!files) {
2547 assert(insertions == 0 && deletions == 0);
2548 emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
2549 NULL, 0, 0);
2550 return;
2551 }
2552
2553 strbuf_addf(&sb,
2554 (files == 1) ? " %d file changed" : " %d files changed",
2555 files);
2556
2557 /*
2558 * For binary diff, the caller may want to print "x files
2559 * changed" with insertions == 0 && deletions == 0.
2560 *
2561 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
2562 * is probably less confusing (i.e skip over "2 files changed
2563 * but nothing about added/removed lines? Is this a bug in Git?").
2564 */
2565 if (insertions || deletions == 0) {
2566 strbuf_addf(&sb,
2567 (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
2568 insertions);
2569 }
2570
2571 if (deletions || insertions == 0) {
2572 strbuf_addf(&sb,
2573 (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
2574 deletions);
2575 }
2576 strbuf_addch(&sb, '\n');
2577 emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
2578 sb.buf, sb.len, 0);
2579 strbuf_release(&sb);
2580 }
2581
2582 void print_stat_summary(FILE *fp, int files,
2583 int insertions, int deletions)
2584 {
2585 struct diff_options o;
2586 memset(&o, 0, sizeof(o));
2587 o.file = fp;
2588
2589 print_stat_summary_inserts_deletes(&o, files, insertions, deletions);
2590 }
2591
2592 static void show_stats(struct diffstat_t *data, struct diff_options *options)
2593 {
2594 int i, len, add, del, adds = 0, dels = 0;
2595 uintmax_t max_change = 0, max_len = 0;
2596 int total_files = data->nr, count;
2597 int width, name_width, graph_width, number_width = 0, bin_width = 0;
2598 const char *reset, *add_c, *del_c;
2599 int extra_shown = 0;
2600 const char *line_prefix = diff_line_prefix(options);
2601 struct strbuf out = STRBUF_INIT;
2602
2603 if (data->nr == 0)
2604 return;
2605
2606 count = options->stat_count ? options->stat_count : data->nr;
2607
2608 reset = diff_get_color_opt(options, DIFF_RESET);
2609 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
2610 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
2611
2612 /*
2613 * Find the longest filename and max number of changes
2614 */
2615 for (i = 0; (i < count) && (i < data->nr); i++) {
2616 struct diffstat_file *file = data->files[i];
2617 uintmax_t change = file->added + file->deleted;
2618
2619 if (!file->is_interesting && (change == 0)) {
2620 count++; /* not shown == room for one more */
2621 continue;
2622 }
2623 fill_print_name(file);
2624 len = strlen(file->print_name);
2625 if (max_len < len)
2626 max_len = len;
2627
2628 if (file->is_unmerged) {
2629 /* "Unmerged" is 8 characters */
2630 bin_width = bin_width < 8 ? 8 : bin_width;
2631 continue;
2632 }
2633 if (file->is_binary) {
2634 /* "Bin XXX -> YYY bytes" */
2635 int w = 14 + decimal_width(file->added)
2636 + decimal_width(file->deleted);
2637 bin_width = bin_width < w ? w : bin_width;
2638 /* Display change counts aligned with "Bin" */
2639 number_width = 3;
2640 continue;
2641 }
2642
2643 if (max_change < change)
2644 max_change = change;
2645 }
2646 count = i; /* where we can stop scanning in data->files[] */
2647
2648 /*
2649 * We have width = stat_width or term_columns() columns total.
2650 * We want a maximum of min(max_len, stat_name_width) for the name part.
2651 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
2652 * We also need 1 for " " and 4 + decimal_width(max_change)
2653 * for " | NNNN " and one the empty column at the end, altogether
2654 * 6 + decimal_width(max_change).
2655 *
2656 * If there's not enough space, we will use the smaller of
2657 * stat_name_width (if set) and 5/8*width for the filename,
2658 * and the rest for constant elements + graph part, but no more
2659 * than stat_graph_width for the graph part.
2660 * (5/8 gives 50 for filename and 30 for the constant parts + graph
2661 * for the standard terminal size).
2662 *
2663 * In other words: stat_width limits the maximum width, and
2664 * stat_name_width fixes the maximum width of the filename,
2665 * and is also used to divide available columns if there
2666 * aren't enough.
2667 *
2668 * Binary files are displayed with "Bin XXX -> YYY bytes"
2669 * instead of the change count and graph. This part is treated
2670 * similarly to the graph part, except that it is not
2671 * "scaled". If total width is too small to accommodate the
2672 * guaranteed minimum width of the filename part and the
2673 * separators and this message, this message will "overflow"
2674 * making the line longer than the maximum width.
2675 */
2676
2677 if (options->stat_width == -1)
2678 width = term_columns() - strlen(line_prefix);
2679 else
2680 width = options->stat_width ? options->stat_width : 80;
2681 number_width = decimal_width(max_change) > number_width ?
2682 decimal_width(max_change) : number_width;
2683
2684 if (options->stat_graph_width == -1)
2685 options->stat_graph_width = diff_stat_graph_width;
2686
2687 /*
2688 * Guarantee 3/8*16==6 for the graph part
2689 * and 5/8*16==10 for the filename part
2690 */
2691 if (width < 16 + 6 + number_width)
2692 width = 16 + 6 + number_width;
2693
2694 /*
2695 * First assign sizes that are wanted, ignoring available width.
2696 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
2697 * starting from "XXX" should fit in graph_width.
2698 */
2699 graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
2700 if (options->stat_graph_width &&
2701 options->stat_graph_width < graph_width)
2702 graph_width = options->stat_graph_width;
2703
2704 name_width = (options->stat_name_width > 0 &&
2705 options->stat_name_width < max_len) ?
2706 options->stat_name_width : max_len;
2707
2708 /*
2709 * Adjust adjustable widths not to exceed maximum width
2710 */
2711 if (name_width + number_width + 6 + graph_width > width) {
2712 if (graph_width > width * 3/8 - number_width - 6) {
2713 graph_width = width * 3/8 - number_width - 6;
2714 if (graph_width < 6)
2715 graph_width = 6;
2716 }
2717
2718 if (options->stat_graph_width &&
2719 graph_width > options->stat_graph_width)
2720 graph_width = options->stat_graph_width;
2721 if (name_width > width - number_width - 6 - graph_width)
2722 name_width = width - number_width - 6 - graph_width;
2723 else
2724 graph_width = width - number_width - 6 - name_width;
2725 }
2726
2727 /*
2728 * From here name_width is the width of the name area,
2729 * and graph_width is the width of the graph area.
2730 * max_change is used to scale graph properly.
2731 */
2732 for (i = 0; i < count; i++) {
2733 const char *prefix = "";
2734 struct diffstat_file *file = data->files[i];
2735 char *name = file->print_name;
2736 uintmax_t added = file->added;
2737 uintmax_t deleted = file->deleted;
2738 int name_len;
2739
2740 if (!file->is_interesting && (added + deleted == 0))
2741 continue;
2742
2743 /*
2744 * "scale" the filename
2745 */
2746 len = name_width;
2747 name_len = strlen(name);
2748 if (name_width < name_len) {
2749 char *slash;
2750 prefix = "...";
2751 len -= 3;
2752 name += name_len - len;
2753 slash = strchr(name, '/');
2754 if (slash)
2755 name = slash;
2756 }
2757
2758 if (file->is_binary) {
2759 strbuf_addf(&out, " %s%-*s |", prefix, len, name);
2760 strbuf_addf(&out, " %*s", number_width, "Bin");
2761 if (!added && !deleted) {
2762 strbuf_addch(&out, '\n');
2763 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2764 out.buf, out.len, 0);
2765 strbuf_reset(&out);
2766 continue;
2767 }
2768 strbuf_addf(&out, " %s%"PRIuMAX"%s",
2769 del_c, deleted, reset);
2770 strbuf_addstr(&out, " -> ");
2771 strbuf_addf(&out, "%s%"PRIuMAX"%s",
2772 add_c, added, reset);
2773 strbuf_addstr(&out, " bytes\n");
2774 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2775 out.buf, out.len, 0);
2776 strbuf_reset(&out);
2777 continue;
2778 }
2779 else if (file->is_unmerged) {
2780 strbuf_addf(&out, " %s%-*s |", prefix, len, name);
2781 strbuf_addstr(&out, " Unmerged\n");
2782 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2783 out.buf, out.len, 0);
2784 strbuf_reset(&out);
2785 continue;
2786 }
2787
2788 /*
2789 * scale the add/delete
2790 */
2791 add = added;
2792 del = deleted;
2793
2794 if (graph_width <= max_change) {
2795 int total = scale_linear(add + del, graph_width, max_change);
2796 if (total < 2 && add && del)
2797 /* width >= 2 due to the sanity check */
2798 total = 2;
2799 if (add < del) {
2800 add = scale_linear(add, graph_width, max_change);
2801 del = total - add;
2802 } else {
2803 del = scale_linear(del, graph_width, max_change);
2804 add = total - del;
2805 }
2806 }
2807 strbuf_addf(&out, " %s%-*s |", prefix, len, name);
2808 strbuf_addf(&out, " %*"PRIuMAX"%s",
2809 number_width, added + deleted,
2810 added + deleted ? " " : "");
2811 show_graph(&out, '+', add, add_c, reset);
2812 show_graph(&out, '-', del, del_c, reset);
2813 strbuf_addch(&out, '\n');
2814 emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
2815 out.buf, out.len, 0);
2816 strbuf_reset(&out);
2817 }
2818
2819 for (i = 0; i < data->nr; i++) {
2820 struct diffstat_file *file = data->files[i];
2821 uintmax_t added = file->added;
2822 uintmax_t deleted = file->deleted;
2823
2824 if (file->is_unmerged ||
2825 (!file->is_interesting && (added + deleted == 0))) {
2826 total_files--;
2827 continue;
2828 }
2829
2830 if (!file->is_binary) {
2831 adds += added;
2832 dels += deleted;
2833 }
2834 if (i < count)
2835 continue;
2836 if (!extra_shown)
2837 emit_diff_symbol(options,
2838 DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
2839 NULL, 0, 0);
2840 extra_shown = 1;
2841 }
2842
2843 print_stat_summary_inserts_deletes(options, total_files, adds, dels);
2844 strbuf_release(&out);
2845 }
2846
2847 static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
2848 {
2849 int i, adds = 0, dels = 0, total_files = data->nr;
2850
2851 if (data->nr == 0)
2852 return;
2853
2854 for (i = 0; i < data->nr; i++) {
2855 int added = data->files[i]->added;
2856 int deleted = data->files[i]->deleted;
2857
2858 if (data->files[i]->is_unmerged ||
2859 (!data->files[i]->is_interesting && (added + deleted == 0))) {
2860 total_files--;
2861 } else if (!data->files[i]->is_binary) { /* don't count bytes */
2862 adds += added;
2863 dels += deleted;
2864 }
2865 }
2866 print_stat_summary_inserts_deletes(options, total_files, adds, dels);
2867 }
2868
2869 static void show_numstat(struct diffstat_t *data, struct diff_options *options)
2870 {
2871 int i;
2872
2873 if (data->nr == 0)
2874 return;
2875
2876 for (i = 0; i < data->nr; i++) {
2877 struct diffstat_file *file = data->files[i];
2878
2879 fprintf(options->file, "%s", diff_line_prefix(options));
2880
2881 if (file->is_binary)
2882 fprintf(options->file, "-\t-\t");
2883 else
2884 fprintf(options->file,
2885 "%"PRIuMAX"\t%"PRIuMAX"\t",
2886 file->added, file->deleted);
2887 if (options->line_termination) {
2888 fill_print_name(file);
2889 if (!file->is_renamed)
2890 write_name_quoted(file->name, options->file,
2891 options->line_termination);
2892 else {
2893 fputs(file->print_name, options->file);
2894 putc(options->line_termination, options->file);
2895 }
2896 } else {
2897 if (file->is_renamed) {
2898 putc('\0', options->file);
2899 write_name_quoted(file->from_name, options->file, '\0');
2900 }
2901 write_name_quoted(file->name, options->file, '\0');
2902 }
2903 }
2904 }
2905
2906 struct dirstat_file {
2907 const char *name;
2908 unsigned long changed;
2909 };
2910
2911 struct dirstat_dir {
2912 struct dirstat_file *files;
2913 int alloc, nr, permille, cumulative;
2914 };
2915
2916 static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
2917 unsigned long changed, const char *base, int baselen)
2918 {
2919 unsigned long sum_changes = 0;
2920 unsigned int sources = 0;
2921 const char *line_prefix = diff_line_prefix(opt);
2922
2923 while (dir->nr) {
2924 struct dirstat_file *f = dir->files;
2925 int namelen = strlen(f->name);
2926 unsigned long changes;
2927 char *slash;
2928
2929 if (namelen < baselen)
2930 break;
2931 if (memcmp(f->name, base, baselen))
2932 break;
2933 slash = strchr(f->name + baselen, '/');
2934 if (slash) {
2935 int newbaselen = slash + 1 - f->name;
2936 changes = gather_dirstat(opt, dir, changed, f->name, newbaselen);
2937 sources++;
2938 } else {
2939 changes = f->changed;
2940 dir->files++;
2941 dir->nr--;
2942 sources += 2;
2943 }
2944 sum_changes += changes;
2945 }
2946
2947 /*
2948 * We don't report dirstat's for
2949 * - the top level
2950 * - or cases where everything came from a single directory
2951 * under this directory (sources == 1).
2952 */
2953 if (baselen && sources != 1) {
2954 if (sum_changes) {
2955 int permille = sum_changes * 1000 / changed;
2956 if (permille >= dir->permille) {
2957 fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
2958 permille / 10, permille % 10, baselen, base);
2959 if (!dir->cumulative)
2960 return 0;
2961 }
2962 }
2963 }
2964 return sum_changes;
2965 }
2966
2967 static int dirstat_compare(const void *_a, const void *_b)
2968 {
2969 const struct dirstat_file *a = _a;
2970 const struct dirstat_file *b = _b;
2971 return strcmp(a->name, b->name);
2972 }
2973
2974 static void show_dirstat(struct diff_options *options)
2975 {
2976 int i;
2977 unsigned long changed;
2978 struct dirstat_dir dir;
2979 struct diff_queue_struct *q = &diff_queued_diff;
2980
2981 dir.files = NULL;
2982 dir.alloc = 0;
2983 dir.nr = 0;
2984 dir.permille = options->dirstat_permille;
2985 dir.cumulative = options->flags.dirstat_cumulative;
2986
2987 changed = 0;
2988 for (i = 0; i < q->nr; i++) {
2989 struct diff_filepair *p = q->queue[i];
2990 const char *name;
2991 unsigned long copied, added, damage;
2992 struct diff_populate_filespec_options dpf_options = {
2993 .check_size_only = 1,
2994 };
2995
2996 name = p->two->path ? p->two->path : p->one->path;
2997
2998 if (p->one->oid_valid && p->two->oid_valid &&
2999 oideq(&p->one->oid, &p->two->oid)) {
3000 /*
3001 * The SHA1 has not changed, so pre-/post-content is
3002 * identical. We can therefore skip looking at the
3003 * file contents altogether.
3004 */
3005 damage = 0;
3006 goto found_damage;
3007 }
3008
3009 if (options->flags.dirstat_by_file) {
3010 /*
3011 * In --dirstat-by-file mode, we don't really need to
3012 * look at the actual file contents at all.
3013 * The fact that the SHA1 changed is enough for us to
3014 * add this file to the list of results
3015 * (with each file contributing equal damage).
3016 */
3017 damage = 1;
3018 goto found_damage;
3019 }
3020
3021 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
3022 diff_populate_filespec(options->repo, p->one, NULL);
3023 diff_populate_filespec(options->repo, p->two, NULL);
3024 diffcore_count_changes(options->repo,
3025 p->one, p->two, NULL, NULL,
3026 &copied, &added);
3027 diff_free_filespec_data(p->one);
3028 diff_free_filespec_data(p->two);
3029 } else if (DIFF_FILE_VALID(p->one)) {
3030 diff_populate_filespec(options->repo, p->one, &dpf_options);
3031 copied = added = 0;
3032 diff_free_filespec_data(p->one);
3033 } else if (DIFF_FILE_VALID(p->two)) {
3034 diff_populate_filespec(options->repo, p->two, &dpf_options);
3035 copied = 0;
3036 added = p->two->size;
3037 diff_free_filespec_data(p->two);
3038 } else
3039 continue;
3040
3041 /*
3042 * Original minus copied is the removed material,
3043 * added is the new material. They are both damages
3044 * made to the preimage.
3045 * If the resulting damage is zero, we know that
3046 * diffcore_count_changes() considers the two entries to
3047 * be identical, but since the oid changed, we
3048 * know that there must have been _some_ kind of change,
3049 * so we force all entries to have damage > 0.
3050 */
3051 damage = (p->one->size - copied) + added;
3052 if (!damage)
3053 damage = 1;
3054
3055 found_damage:
3056 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
3057 dir.files[dir.nr].name = name;
3058 dir.files[dir.nr].changed = damage;
3059 changed += damage;
3060 dir.nr++;
3061 }
3062
3063 /* This can happen even with many files, if everything was renames */
3064 if (!changed)
3065 return;
3066
3067 /* Show all directories with more than x% of the changes */
3068 QSORT(dir.files, dir.nr, dirstat_compare);
3069 gather_dirstat(options, &dir, changed, "", 0);
3070 }
3071
3072 static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
3073 {
3074 int i;
3075 unsigned long changed;
3076 struct dirstat_dir dir;
3077
3078 if (data->nr == 0)
3079 return;
3080
3081 dir.files = NULL;
3082 dir.alloc = 0;
3083 dir.nr = 0;
3084 dir.permille = options->dirstat_permille;
3085 dir.cumulative = options->flags.dirstat_cumulative;
3086
3087 changed = 0;
3088 for (i = 0; i < data->nr; i++) {
3089 struct diffstat_file *file = data->files[i];
3090 unsigned long damage = file->added + file->deleted;
3091 if (file->is_binary)
3092 /*
3093 * binary files counts bytes, not lines. Must find some
3094 * way to normalize binary bytes vs. textual lines.
3095 * The following heuristic assumes that there are 64
3096 * bytes per "line".
3097 * This is stupid and ugly, but very cheap...
3098 */
3099 damage = DIV_ROUND_UP(damage, 64);
3100 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
3101 dir.files[dir.nr].name = file->name;
3102 dir.files[dir.nr].changed = damage;
3103 changed += damage;
3104 dir.nr++;
3105 }
3106
3107 /* This can happen even with many files, if everything was renames */
3108 if (!changed)
3109 return;
3110
3111 /* Show all directories with more than x% of the changes */
3112 QSORT(dir.files, dir.nr, dirstat_compare);
3113 gather_dirstat(options, &dir, changed, "", 0);
3114 }
3115
3116 static void free_diffstat_file(struct diffstat_file *f)
3117 {
3118 free(f->print_name);
3119 free(f->name);
3120 free(f->from_name);
3121 free(f);
3122 }
3123
3124 void free_diffstat_info(struct diffstat_t *diffstat)
3125 {
3126 int i;
3127 for (i = 0; i < diffstat->nr; i++)
3128 free_diffstat_file(diffstat->files[i]);
3129 free(diffstat->files);
3130 }
3131
3132 struct checkdiff_t {
3133 const char *filename;
3134 int lineno;
3135 int conflict_marker_size;
3136 struct diff_options *o;
3137 unsigned ws_rule;
3138 unsigned status;
3139 };
3140
3141 static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
3142 {
3143 char firstchar;
3144 int cnt;
3145
3146 if (len < marker_size + 1)
3147 return 0;
3148 firstchar = line[0];
3149 switch (firstchar) {
3150 case '=': case '>': case '<': case '|':
3151 break;
3152 default:
3153 return 0;
3154 }
3155 for (cnt = 1; cnt < marker_size; cnt++)
3156 if (line[cnt] != firstchar)
3157 return 0;
3158 /* line[1] through line[marker_size-1] are same as firstchar */
3159 if (len < marker_size + 1 || !isspace(line[marker_size]))
3160 return 0;
3161 return 1;
3162 }
3163
3164 static void checkdiff_consume_hunk(void *priv,
3165 long ob, long on, long nb, long nn,
3166 const char *func, long funclen)
3167
3168 {
3169 struct checkdiff_t *data = priv;
3170 data->lineno = nb - 1;
3171 }
3172
3173 static int checkdiff_consume(void *priv, char *line, unsigned long len)
3174 {
3175 struct checkdiff_t *data = priv;
3176 int marker_size = data->conflict_marker_size;
3177 const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
3178 const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
3179 const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
3180 char *err;
3181 const char *line_prefix;
3182
3183 assert(data->o);
3184 line_prefix = diff_line_prefix(data->o);
3185
3186 if (line[0] == '+') {
3187 unsigned bad;
3188 data->lineno++;
3189 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
3190 data->status |= 1;
3191 fprintf(data->o->file,
3192 "%s%s:%d: leftover conflict marker\n",
3193 line_prefix, data->filename, data->lineno);
3194 }
3195 bad = ws_check(line + 1, len - 1, data->ws_rule);
3196 if (!bad)
3197 return 0;
3198 data->status |= bad;
3199 err = whitespace_error_string(bad);
3200 fprintf(data->o->file, "%s%s:%d: %s.\n",
3201 line_prefix, data->filename, data->lineno, err);
3202 free(err);
3203 emit_line(data->o, set, reset, line, 1);
3204 ws_check_emit(line + 1, len - 1, data->ws_rule,
3205 data->o->file, set, reset, ws);
3206 } else if (line[0] == ' ') {
3207 data->lineno++;
3208 }
3209 return 0;
3210 }
3211
3212 static unsigned char *deflate_it(char *data,
3213 unsigned long size,
3214 unsigned long *result_size)
3215 {
3216 int bound;
3217 unsigned char *deflated;
3218 git_zstream stream;
3219
3220 git_deflate_init(&stream, zlib_compression_level);
3221 bound = git_deflate_bound(&stream, size);
3222 deflated = xmalloc(bound);
3223 stream.next_out = deflated;
3224 stream.avail_out = bound;
3225
3226 stream.next_in = (unsigned char *)data;
3227 stream.avail_in = size;
3228 while (git_deflate(&stream, Z_FINISH) == Z_OK)
3229 ; /* nothing */
3230 git_deflate_end(&stream);
3231 *result_size = stream.total_out;
3232 return deflated;
3233 }
3234
3235 static void emit_binary_diff_body(struct diff_options *o,
3236 mmfile_t *one, mmfile_t *two)
3237 {
3238 void *cp;
3239 void *delta;
3240 void *deflated;
3241 void *data;
3242 unsigned long orig_size;
3243 unsigned long delta_size;
3244 unsigned long deflate_size;
3245 unsigned long data_size;
3246
3247 /* We could do deflated delta, or we could do just deflated two,
3248 * whichever is smaller.
3249 */
3250 delta = NULL;
3251 deflated = deflate_it(two->ptr, two->size, &deflate_size);
3252 if (one->size && two->size) {
3253 delta = diff_delta(one->ptr, one->size,
3254 two->ptr, two->size,
3255 &delta_size, deflate_size);
3256 if (delta) {
3257 void *to_free = delta;
3258 orig_size = delta_size;
3259 delta = deflate_it(delta, delta_size, &delta_size);
3260 free(to_free);
3261 }
3262 }
3263
3264 if (delta && delta_size < deflate_size) {
3265 char *s = xstrfmt("%"PRIuMAX , (uintmax_t)orig_size);
3266 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
3267 s, strlen(s), 0);
3268 free(s);
3269 free(deflated);
3270 data = delta;
3271 data_size = delta_size;
3272 } else {
3273 char *s = xstrfmt("%lu", two->size);
3274 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
3275 s, strlen(s), 0);
3276 free(s);
3277 free(delta);
3278 data = deflated;
3279 data_size = deflate_size;
3280 }
3281
3282 /* emit data encoded in base85 */
3283 cp = data;
3284 while (data_size) {
3285 int len;
3286 int bytes = (52 < data_size) ? 52 : data_size;
3287 char line[71];
3288 data_size -= bytes;
3289 if (bytes <= 26)
3290 line[0] = bytes + 'A' - 1;
3291 else
3292 line[0] = bytes - 26 + 'a' - 1;
3293 encode_85(line + 1, cp, bytes);
3294 cp = (char *) cp + bytes;
3295
3296 len = strlen(line);
3297 line[len++] = '\n';
3298 line[len] = '\0';
3299
3300 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_BODY,
3301 line, len, 0);
3302 }
3303 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_FOOTER, NULL, 0, 0);
3304 free(data);
3305 }
3306
3307 static void emit_binary_diff(struct diff_options *o,
3308 mmfile_t *one, mmfile_t *two)
3309 {
3310 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER, NULL, 0, 0);
3311 emit_binary_diff_body(o, one, two);
3312 emit_binary_diff_body(o, two, one);
3313 }
3314
3315 int diff_filespec_is_binary(struct repository *r,
3316 struct diff_filespec *one)
3317 {
3318 struct diff_populate_filespec_options dpf_options = {
3319 .check_binary = 1,
3320 };
3321
3322 if (one->is_binary == -1) {
3323 diff_filespec_load_driver(one, r->index);
3324 if (one->driver->binary != -1)
3325 one->is_binary = one->driver->binary;
3326 else {
3327 if (!one->data && DIFF_FILE_VALID(one))
3328 diff_populate_filespec(r, one, &dpf_options);
3329 if (one->is_binary == -1 && one->data)
3330 one->is_binary = buffer_is_binary(one->data,
3331 one->size);
3332 if (one->is_binary == -1)
3333 one->is_binary = 0;
3334 }
3335 }
3336 return one->is_binary;
3337 }
3338
3339 static const struct userdiff_funcname *
3340 diff_funcname_pattern(struct diff_options *o, struct diff_filespec *one)
3341 {
3342 diff_filespec_load_driver(one, o->repo->index);
3343 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
3344 }
3345
3346 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
3347 {
3348 if (!options->a_prefix)
3349 options->a_prefix = a;
3350 if (!options->b_prefix)
3351 options->b_prefix = b;
3352 }
3353
3354 struct userdiff_driver *get_textconv(struct repository *r,
3355 struct diff_filespec *one)
3356 {
3357 if (!DIFF_FILE_VALID(one))
3358 return NULL;
3359
3360 diff_filespec_load_driver(one, r->index);
3361 return userdiff_get_textconv(r, one->driver);
3362 }
3363
3364 static struct string_list *additional_headers(struct diff_options *o,
3365 const char *path)
3366 {
3367 if (!o->additional_path_headers)
3368 return NULL;
3369 return strmap_get(o->additional_path_headers, path);
3370 }
3371
3372 static void add_formatted_header(struct strbuf *msg,
3373 const char *header,
3374 const char *line_prefix,
3375 const char *meta,
3376 const char *reset)
3377 {
3378 const char *next, *newline;
3379
3380 for (next = header; *next; next = newline) {
3381 newline = strchrnul(next, '\n');
3382 strbuf_addf(msg, "%s%s%.*s%s\n", line_prefix, meta,
3383 (int)(newline - next), next, reset);
3384 if (*newline)
3385 newline++;
3386 }
3387 }
3388
3389 static void add_formatted_headers(struct strbuf *msg,
3390 struct string_list *more_headers,
3391 const char *line_prefix,
3392 const char *meta,
3393 const char *reset)
3394 {
3395 int i;
3396
3397 for (i = 0; i < more_headers->nr; i++)
3398 add_formatted_header(msg, more_headers->items[i].string,
3399 line_prefix, meta, reset);
3400 }
3401
3402 static int diff_filepair_is_phoney(struct diff_filespec *one,
3403 struct diff_filespec *two)
3404 {
3405 /*
3406 * This function specifically looks for pairs injected by
3407 * create_filepairs_for_header_only_notifications(). Such
3408 * pairs are "phoney" in that they do not represent any
3409 * content or even mode difference, but were inserted because
3410 * diff_queued_diff previously had no pair associated with
3411 * that path but we needed some pair to avoid losing the
3412 * "remerge CONFLICT" header associated with the path.
3413 */
3414 return !DIFF_FILE_VALID(one) && !DIFF_FILE_VALID(two);
3415 }
3416
3417 static void builtin_diff(const char *name_a,
3418 const char *name_b,
3419 struct diff_filespec *one,
3420 struct diff_filespec *two,
3421 const char *xfrm_msg,
3422 int must_show_header,
3423 struct diff_options *o,
3424 int complete_rewrite)
3425 {
3426 mmfile_t mf1, mf2;
3427 const char *lbl[2];
3428 char *a_one, *b_two;
3429 const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
3430 const char *reset = diff_get_color_opt(o, DIFF_RESET);
3431 const char *a_prefix, *b_prefix;
3432 struct userdiff_driver *textconv_one = NULL;
3433 struct userdiff_driver *textconv_two = NULL;
3434 struct strbuf header = STRBUF_INIT;
3435 const char *line_prefix = diff_line_prefix(o);
3436
3437 diff_set_mnemonic_prefix(o, "a/", "b/");
3438 if (o->flags.reverse_diff) {
3439 a_prefix = o->b_prefix;
3440 b_prefix = o->a_prefix;
3441 } else {
3442 a_prefix = o->a_prefix;
3443 b_prefix = o->b_prefix;
3444 }
3445
3446 if (o->submodule_format == DIFF_SUBMODULE_LOG &&
3447 (!one->mode || S_ISGITLINK(one->mode)) &&
3448 (!two->mode || S_ISGITLINK(two->mode)) &&
3449 (!diff_filepair_is_phoney(one, two))) {
3450 show_submodule_diff_summary(o, one->path ? one->path : two->path,
3451 &one->oid, &two->oid,
3452 two->dirty_submodule);
3453 return;
3454 } else if (o->submodule_format == DIFF_SUBMODULE_INLINE_DIFF &&
3455 (!one->mode || S_ISGITLINK(one->mode)) &&
3456 (!two->mode || S_ISGITLINK(two->mode)) &&
3457 (!diff_filepair_is_phoney(one, two))) {
3458 show_submodule_inline_diff(o, one->path ? one->path : two->path,
3459 &one->oid, &two->oid,
3460 two->dirty_submodule);
3461 return;
3462 }
3463
3464 if (o->flags.allow_textconv) {
3465 textconv_one = get_textconv(o->repo, one);
3466 textconv_two = get_textconv(o->repo, two);
3467 }
3468
3469 /* Never use a non-valid filename anywhere if at all possible */
3470 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
3471 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
3472
3473 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
3474 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
3475 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
3476 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
3477 if (diff_filepair_is_phoney(one, two)) {
3478 /*
3479 * We should only reach this point for pairs generated from
3480 * create_filepairs_for_header_only_notifications(). For
3481 * these, we want to avoid the "/dev/null" special casing
3482 * above, because we do not want such pairs shown as either
3483 * "new file" or "deleted file" below.
3484 */
3485 lbl[0] = a_one;
3486 lbl[1] = b_two;
3487 }
3488 strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
3489 if (lbl[0][0] == '/') {
3490 /* /dev/null */
3491 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
3492 if (xfrm_msg)
3493 strbuf_addstr(&header, xfrm_msg);
3494 must_show_header = 1;
3495 }
3496 else if (lbl[1][0] == '/') {
3497 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
3498 if (xfrm_msg)
3499 strbuf_addstr(&header, xfrm_msg);
3500 must_show_header = 1;
3501 }
3502 else {
3503 if (one->mode != two->mode) {
3504 strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
3505 strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
3506 must_show_header = 1;
3507 }
3508 if (xfrm_msg)
3509 strbuf_addstr(&header, xfrm_msg);
3510
3511 /*
3512 * we do not run diff between different kind
3513 * of objects.
3514 */
3515 if ((one->mode ^ two->mode) & S_IFMT)
3516 goto free_ab_and_return;
3517 if (complete_rewrite &&
3518 (textconv_one || !diff_filespec_is_binary(o->repo, one)) &&
3519 (textconv_two || !diff_filespec_is_binary(o->repo, two))) {
3520 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3521 header.buf, header.len, 0);
3522 strbuf_reset(&header);
3523 emit_rewrite_diff(name_a, name_b, one, two,
3524 textconv_one, textconv_two, o);
3525 o->found_changes = 1;
3526 goto free_ab_and_return;
3527 }
3528 }
3529
3530 if (o->irreversible_delete && lbl[1][0] == '/') {
3531 emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf,
3532 header.len, 0);
3533 strbuf_reset(&header);
3534 goto free_ab_and_return;
3535 } else if (!o->flags.text &&
3536 ( (!textconv_one && diff_filespec_is_binary(o->repo, one)) ||
3537 (!textconv_two && diff_filespec_is_binary(o->repo, two)) )) {
3538 struct strbuf sb = STRBUF_INIT;
3539 if (!one->data && !two->data &&
3540 S_ISREG(one->mode) && S_ISREG(two->mode) &&
3541 !o->flags.binary) {
3542 if (oideq(&one->oid, &two->oid)) {
3543 if (must_show_header)
3544 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3545 header.buf, header.len,
3546 0);
3547 goto free_ab_and_return;
3548 }
3549 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3550 header.buf, header.len, 0);
3551 strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
3552 diff_line_prefix(o), lbl[0], lbl[1]);
3553 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
3554 sb.buf, sb.len, 0);
3555 strbuf_release(&sb);
3556 goto free_ab_and_return;
3557 }
3558 if (fill_mmfile(o->repo, &mf1, one) < 0 ||
3559 fill_mmfile(o->repo, &mf2, two) < 0)
3560 die("unable to read files to diff");
3561 /* Quite common confusing case */
3562 if (mf1.size == mf2.size &&
3563 !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
3564 if (must_show_header)
3565 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3566 header.buf, header.len, 0);
3567 goto free_ab_and_return;
3568 }
3569 emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf, header.len, 0);
3570 strbuf_reset(&header);
3571 if (o->flags.binary)
3572 emit_binary_diff(o, &mf1, &mf2);
3573 else {
3574 strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
3575 diff_line_prefix(o), lbl[0], lbl[1]);
3576 emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
3577 sb.buf, sb.len, 0);
3578 strbuf_release(&sb);
3579 }
3580 o->found_changes = 1;
3581 } else {
3582 /* Crazy xdl interfaces.. */
3583 const char *diffopts;
3584 const char *v;
3585 xpparam_t xpp;
3586 xdemitconf_t xecfg;
3587 struct emit_callback ecbdata;
3588 const struct userdiff_funcname *pe;
3589
3590 if (must_show_header) {
3591 emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
3592 header.buf, header.len, 0);
3593 strbuf_reset(&header);
3594 }
3595
3596 mf1.size = fill_textconv(o->repo, textconv_one, one, &mf1.ptr);
3597 mf2.size = fill_textconv(o->repo, textconv_two, two, &mf2.ptr);
3598
3599 pe = diff_funcname_pattern(o, one);
3600 if (!pe)
3601 pe = diff_funcname_pattern(o, two);
3602
3603 memset(&xpp, 0, sizeof(xpp));
3604 memset(&xecfg, 0, sizeof(xecfg));
3605 memset(&ecbdata, 0, sizeof(ecbdata));
3606 if (o->flags.suppress_diff_headers)
3607 lbl[0] = NULL;
3608 ecbdata.label_path = lbl;
3609 ecbdata.color_diff = want_color(o->use_color);
3610 ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b);
3611 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
3612 check_blank_at_eof(&mf1, &mf2, &ecbdata);
3613 ecbdata.opt = o;
3614 if (header.len && !o->flags.suppress_diff_headers)
3615 ecbdata.header = &header;
3616 xpp.flags = o->xdl_opts;
3617 xpp.ignore_regex = o->ignore_regex;
3618 xpp.ignore_regex_nr = o->ignore_regex_nr;
3619 xpp.anchors = o->anchors;
3620 xpp.anchors_nr = o->anchors_nr;
3621 xecfg.ctxlen = o->context;
3622 xecfg.interhunkctxlen = o->interhunkcontext;
3623 xecfg.flags = XDL_EMIT_FUNCNAMES;
3624 if (o->flags.funccontext)
3625 xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
3626 if (pe)
3627 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
3628
3629 diffopts = getenv("GIT_DIFF_OPTS");
3630 if (!diffopts)
3631 ;
3632 else if (skip_prefix(diffopts, "--unified=", &v))
3633 xecfg.ctxlen = strtoul(v, NULL, 10);
3634 else if (skip_prefix(diffopts, "-u", &v))
3635 xecfg.ctxlen = strtoul(v, NULL, 10);
3636
3637 if (o->word_diff)
3638 init_diff_words_data(&ecbdata, o, one, two);
3639 if (xdi_diff_outf(&mf1, &mf2, NULL, fn_out_consume,
3640 &ecbdata, &xpp, &xecfg))
3641 die("unable to generate diff for %s", one->path);
3642 if (o->word_diff)
3643 free_diff_words_data(&ecbdata);
3644 if (textconv_one)
3645 free(mf1.ptr);
3646 if (textconv_two)
3647 free(mf2.ptr);
3648 xdiff_clear_find_func(&xecfg);
3649 }
3650
3651 free_ab_and_return:
3652 strbuf_release(&header);
3653 diff_free_filespec_data(one);
3654 diff_free_filespec_data(two);
3655 free(a_one);
3656 free(b_two);
3657 return;
3658 }
3659
3660 static char *get_compact_summary(const struct diff_filepair *p, int is_renamed)
3661 {
3662 if (!is_renamed) {
3663 if (p->status == DIFF_STATUS_ADDED) {
3664 if (S_ISLNK(p->two->mode))
3665 return "new +l";
3666 else if ((p->two->mode & 0777) == 0755)
3667 return "new +x";
3668 else
3669 return "new";
3670 } else if (p->status == DIFF_STATUS_DELETED)
3671 return "gone";
3672 }
3673 if (S_ISLNK(p->one->mode) && !S_ISLNK(p->two->mode))
3674 return "mode -l";
3675 else if (!S_ISLNK(p->one->mode) && S_ISLNK(p->two->mode))
3676 return "mode +l";
3677 else if ((p->one->mode & 0777) == 0644 &&
3678 (p->two->mode & 0777) == 0755)
3679 return "mode +x";
3680 else if ((p->one->mode & 0777) == 0755 &&
3681 (p->two->mode & 0777) == 0644)
3682 return "mode -x";
3683 return NULL;
3684 }
3685
3686 static void builtin_diffstat(const char *name_a, const char *name_b,
3687 struct diff_filespec *one,
3688 struct diff_filespec *two,
3689 struct diffstat_t *diffstat,
3690 struct diff_options *o,
3691 struct diff_filepair *p)
3692 {
3693 mmfile_t mf1, mf2;
3694 struct diffstat_file *data;
3695 int may_differ;
3696 int complete_rewrite = 0;
3697
3698 if (!DIFF_PAIR_UNMERGED(p)) {
3699 if (p->status == DIFF_STATUS_MODIFIED && p->score)
3700 complete_rewrite = 1;
3701 }
3702
3703 data = diffstat_add(diffstat, name_a, name_b);
3704 data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;
3705 if (o->flags.stat_with_summary)
3706 data->comments = get_compact_summary(p, data->is_renamed);
3707
3708 if (!one || !two) {
3709 data->is_unmerged = 1;
3710 return;
3711 }
3712
3713 /* saves some reads if true, not a guarantee of diff outcome */
3714 may_differ = !(one->oid_valid && two->oid_valid &&
3715 oideq(&one->oid, &two->oid));
3716
3717 if (diff_filespec_is_binary(o->repo, one) ||
3718 diff_filespec_is_binary(o->repo, two)) {
3719 data->is_binary = 1;
3720 if (!may_differ) {
3721 data->added = 0;
3722 data->deleted = 0;
3723 } else {
3724 data->added = diff_filespec_size(o->repo, two);
3725 data->deleted = diff_filespec_size(o->repo, one);
3726 }
3727 }
3728
3729 else if (complete_rewrite) {
3730 diff_populate_filespec(o->repo, one, NULL);
3731 diff_populate_filespec(o->repo, two, NULL);
3732 data->deleted = count_lines(one->data, one->size);
3733 data->added = count_lines(two->data, two->size);
3734 }
3735
3736 else if (may_differ) {
3737 /* Crazy xdl interfaces.. */
3738 xpparam_t xpp;
3739 xdemitconf_t xecfg;
3740
3741 if (fill_mmfile(o->repo, &mf1, one) < 0 ||
3742 fill_mmfile(o->repo, &mf2, two) < 0)
3743 die("unable to read files to diff");
3744
3745 memset(&xpp, 0, sizeof(xpp));
3746 memset(&xecfg, 0, sizeof(xecfg));
3747 xpp.flags = o->xdl_opts;
3748 xpp.ignore_regex = o->ignore_regex;
3749 xpp.ignore_regex_nr = o->ignore_regex_nr;
3750 xpp.anchors = o->anchors;
3751 xpp.anchors_nr = o->anchors_nr;
3752 xecfg.ctxlen = o->context;
3753 xecfg.interhunkctxlen = o->interhunkcontext;
3754 xecfg.flags = XDL_EMIT_NO_HUNK_HDR;
3755 if (xdi_diff_outf(&mf1, &mf2, NULL,
3756 diffstat_consume, diffstat, &xpp, &xecfg))
3757 die("unable to generate diffstat for %s", one->path);
3758
3759 if (DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two)) {
3760 struct diffstat_file *file =
3761 diffstat->files[diffstat->nr - 1];
3762 /*
3763 * Omit diffstats of modified files where nothing changed.
3764 * Even if may_differ, this might be the case due to
3765 * ignoring whitespace changes, etc.
3766 *
3767 * But note that we special-case additions, deletions,
3768 * renames, and mode changes as adding an empty file,
3769 * for example is still of interest.
3770 */
3771 if ((p->status == DIFF_STATUS_MODIFIED)
3772 && !file->added
3773 && !file->deleted
3774 && one->mode == two->mode) {
3775 free_diffstat_file(file);
3776 diffstat->nr--;
3777 }
3778 }
3779 }
3780
3781 diff_free_filespec_data(one);
3782 diff_free_filespec_data(two);
3783 }
3784
3785 static void builtin_checkdiff(const char *name_a, const char *name_b,
3786 const char *attr_path,
3787 struct diff_filespec *one,
3788 struct diff_filespec *two,
3789 struct diff_options *o)
3790 {
3791 mmfile_t mf1, mf2;
3792 struct checkdiff_t data;
3793
3794 if (!two)
3795 return;
3796
3797 memset(&data, 0, sizeof(data));
3798 data.filename = name_b ? name_b : name_a;
3799 data.lineno = 0;
3800 data.o = o;
3801 data.ws_rule = whitespace_rule(o->repo->index, attr_path);
3802 data.conflict_marker_size = ll_merge_marker_size(o->repo->index, attr_path);
3803
3804 if (fill_mmfile(o->repo, &mf1, one) < 0 ||
3805 fill_mmfile(o->repo, &mf2, two) < 0)
3806 die("unable to read files to diff");
3807
3808 /*
3809 * All the other codepaths check both sides, but not checking
3810 * the "old" side here is deliberate. We are checking the newly
3811 * introduced changes, and as long as the "new" side is text, we
3812 * can and should check what it introduces.
3813 */
3814 if (diff_filespec_is_binary(o->repo, two))
3815 goto free_and_return;
3816 else {
3817 /* Crazy xdl interfaces.. */
3818 xpparam_t xpp;
3819 xdemitconf_t xecfg;
3820
3821 memset(&xpp, 0, sizeof(xpp));
3822 memset(&xecfg, 0, sizeof(xecfg));
3823 xecfg.ctxlen = 1; /* at least one context line */
3824 xpp.flags = 0;
3825 if (xdi_diff_outf(&mf1, &mf2, checkdiff_consume_hunk,
3826 checkdiff_consume, &data,
3827 &xpp, &xecfg))
3828 die("unable to generate checkdiff for %s", one->path);
3829
3830 if (data.ws_rule & WS_BLANK_AT_EOF) {
3831 struct emit_callback ecbdata;
3832 int blank_at_eof;
3833
3834 ecbdata.ws_rule = data.ws_rule;
3835 check_blank_at_eof(&mf1, &mf2, &ecbdata);
3836 blank_at_eof = ecbdata.blank_at_eof_in_postimage;
3837
3838 if (blank_at_eof) {
3839 static char *err;
3840 if (!err)
3841 err = whitespace_error_string(WS_BLANK_AT_EOF);
3842 fprintf(o->file, "%s:%d: %s.\n",
3843 data.filename, blank_at_eof, err);
3844 data.status = 1; /* report errors */
3845 }
3846 }
3847 }
3848 free_and_return:
3849 diff_free_filespec_data(one);
3850 diff_free_filespec_data(two);
3851 if (data.status)
3852 o->flags.check_failed = 1;
3853 }
3854
3855 struct diff_filespec *alloc_filespec(const char *path)
3856 {
3857 struct diff_filespec *spec;
3858
3859 FLEXPTR_ALLOC_STR(spec, path, path);
3860 spec->count = 1;
3861 spec->is_binary = -1;
3862 return spec;
3863 }
3864
3865 void free_filespec(struct diff_filespec *spec)
3866 {
3867 if (!--spec->count) {
3868 diff_free_filespec_data(spec);
3869 free(spec);
3870 }
3871 }
3872
3873 void fill_filespec(struct diff_filespec *spec, const struct object_id *oid,
3874 int oid_valid, unsigned short mode)
3875 {
3876 if (mode) {
3877 spec->mode = canon_mode(mode);
3878 oidcpy(&spec->oid, oid);
3879 spec->oid_valid = oid_valid;
3880 }
3881 }
3882
3883 /*
3884 * Given a name and sha1 pair, if the index tells us the file in
3885 * the work tree has that object contents, return true, so that
3886 * prepare_temp_file() does not have to inflate and extract.
3887 */
3888 static int reuse_worktree_file(struct index_state *istate,
3889 const char *name,
3890 const struct object_id *oid,
3891 int want_file)
3892 {
3893 const struct cache_entry *ce;
3894 struct stat st;
3895 int pos, len;
3896
3897 /*
3898 * We do not read the cache ourselves here, because the
3899 * benchmark with my previous version that always reads cache
3900 * shows that it makes things worse for diff-tree comparing
3901 * two linux-2.6 kernel trees in an already checked out work
3902 * tree. This is because most diff-tree comparisons deal with
3903 * only a small number of files, while reading the cache is
3904 * expensive for a large project, and its cost outweighs the
3905 * savings we get by not inflating the object to a temporary
3906 * file. Practically, this code only helps when we are used
3907 * by diff-cache --cached, which does read the cache before
3908 * calling us.
3909 */
3910 if (!istate->cache)
3911 return 0;
3912
3913 /* We want to avoid the working directory if our caller
3914 * doesn't need the data in a normal file, this system
3915 * is rather slow with its stat/open/mmap/close syscalls,
3916 * and the object is contained in a pack file. The pack
3917 * is probably already open and will be faster to obtain
3918 * the data through than the working directory. Loose
3919 * objects however would tend to be slower as they need
3920 * to be individually opened and inflated.
3921 */
3922 if (!FAST_WORKING_DIRECTORY && !want_file && has_object_pack(oid))
3923 return 0;
3924
3925 /*
3926 * Similarly, if we'd have to convert the file contents anyway, that
3927 * makes the optimization not worthwhile.
3928 */
3929 if (!want_file && would_convert_to_git(istate, name))
3930 return 0;
3931
3932 /*
3933 * If this path does not match our sparse-checkout definition,
3934 * then the file will not be in the working directory.
3935 */
3936 if (!path_in_sparse_checkout(name, istate))
3937 return 0;
3938
3939 len = strlen(name);
3940 pos = index_name_pos(istate, name, len);
3941 if (pos < 0)
3942 return 0;
3943 ce = istate->cache[pos];
3944
3945 /*
3946 * This is not the sha1 we are looking for, or
3947 * unreusable because it is not a regular file.
3948 */
3949 if (!oideq(oid, &ce->oid) || !S_ISREG(ce->ce_mode))
3950 return 0;
3951
3952 /*
3953 * If ce is marked as "assume unchanged", there is no
3954 * guarantee that work tree matches what we are looking for.
3955 */
3956 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
3957 return 0;
3958
3959 /*
3960 * If ce matches the file in the work tree, we can reuse it.
3961 */
3962 if (ce_uptodate(ce) ||
3963 (!lstat(name, &st) && !ie_match_stat(istate, ce, &st, 0)))
3964 return 1;
3965
3966 return 0;
3967 }
3968
3969 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
3970 {
3971 struct strbuf buf = STRBUF_INIT;
3972 char *dirty = "";
3973
3974 /* Are we looking at the work tree? */
3975 if (s->dirty_submodule)
3976 dirty = "-dirty";
3977
3978 strbuf_addf(&buf, "Subproject commit %s%s\n",
3979 oid_to_hex(&s->oid), dirty);
3980 s->size = buf.len;
3981 if (size_only) {
3982 s->data = NULL;
3983 strbuf_release(&buf);
3984 } else {
3985 s->data = strbuf_detach(&buf, NULL);
3986 s->should_free = 1;
3987 }
3988 return 0;
3989 }
3990
3991 /*
3992 * While doing rename detection and pickaxe operation, we may need to
3993 * grab the data for the blob (or file) for our own in-core comparison.
3994 * diff_filespec has data and size fields for this purpose.
3995 */
3996 int diff_populate_filespec(struct repository *r,
3997 struct diff_filespec *s,
3998 const struct diff_populate_filespec_options *options)
3999 {
4000 int size_only = options ? options->check_size_only : 0;
4001 int check_binary = options ? options->check_binary : 0;
4002 int err = 0;
4003 int conv_flags = global_conv_flags_eol;
4004 /*
4005 * demote FAIL to WARN to allow inspecting the situation
4006 * instead of refusing.
4007 */
4008 if (conv_flags & CONV_EOL_RNDTRP_DIE)
4009 conv_flags = CONV_EOL_RNDTRP_WARN;
4010
4011 if (!DIFF_FILE_VALID(s))
4012 die("internal error: asking to populate invalid file.");
4013 if (S_ISDIR(s->mode))
4014 return -1;
4015
4016 if (s->data)
4017 return 0;
4018
4019 if (size_only && 0 < s->size)
4020 return 0;
4021
4022 if (S_ISGITLINK(s->mode))
4023 return diff_populate_gitlink(s, size_only);
4024
4025 if (!s->oid_valid ||
4026 reuse_worktree_file(r->index, s->path, &s->oid, 0)) {
4027 struct strbuf buf = STRBUF_INIT;
4028 struct stat st;
4029 int fd;
4030
4031 if (lstat(s->path, &st) < 0) {
4032 err_empty:
4033 err = -1;
4034 empty:
4035 s->data = (char *)"";
4036 s->size = 0;
4037 return err;
4038 }
4039 s->size = xsize_t(st.st_size);
4040 if (!s->size)
4041 goto empty;
4042 if (S_ISLNK(st.st_mode)) {
4043 struct strbuf sb = STRBUF_INIT;
4044
4045 if (strbuf_readlink(&sb, s->path, s->size))
4046 goto err_empty;
4047 s->size = sb.len;
4048 s->data = strbuf_detach(&sb, NULL);
4049 s->should_free = 1;
4050 return 0;
4051 }
4052
4053 /*
4054 * Even if the caller would be happy with getting
4055 * only the size, we cannot return early at this
4056 * point if the path requires us to run the content
4057 * conversion.
4058 */
4059 if (size_only && !would_convert_to_git(r->index, s->path))
4060 return 0;
4061
4062 /*
4063 * Note: this check uses xsize_t(st.st_size) that may
4064 * not be the true size of the blob after it goes
4065 * through convert_to_git(). This may not strictly be
4066 * correct, but the whole point of big_file_threshold
4067 * and is_binary check being that we want to avoid
4068 * opening the file and inspecting the contents, this
4069 * is probably fine.
4070 */
4071 if (check_binary &&
4072 s->size > big_file_threshold && s->is_binary == -1) {
4073 s->is_binary = 1;
4074 return 0;
4075 }
4076 fd = open(s->path, O_RDONLY);
4077 if (fd < 0)
4078 goto err_empty;
4079 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
4080 close(fd);
4081 s->should_munmap = 1;
4082
4083 /*
4084 * Convert from working tree format to canonical git format
4085 */
4086 if (convert_to_git(r->index, s->path, s->data, s->size, &buf, conv_flags)) {
4087 size_t size = 0;
4088 munmap(s->data, s->size);
4089 s->should_munmap = 0;
4090 s->data = strbuf_detach(&buf, &size);
4091 s->size = size;
4092 s->should_free = 1;
4093 }
4094 }
4095 else {
4096 struct object_info info = {
4097 .sizep = &s->size
4098 };
4099
4100 if (!(size_only || check_binary))
4101 /*
4102 * Set contentp, since there is no chance that merely
4103 * the size is sufficient.
4104 */
4105 info.contentp = &s->data;
4106
4107 if (options && options->missing_object_cb) {
4108 if (!oid_object_info_extended(r, &s->oid, &info,
4109 OBJECT_INFO_LOOKUP_REPLACE |
4110 OBJECT_INFO_SKIP_FETCH_OBJECT))
4111 goto object_read;
4112 options->missing_object_cb(options->missing_object_data);
4113 }
4114 if (oid_object_info_extended(r, &s->oid, &info,
4115 OBJECT_INFO_LOOKUP_REPLACE))
4116 die("unable to read %s", oid_to_hex(&s->oid));
4117
4118 object_read:
4119 if (size_only || check_binary) {
4120 if (size_only)
4121 return 0;
4122 if (s->size > big_file_threshold && s->is_binary == -1) {
4123 s->is_binary = 1;
4124 return 0;
4125 }
4126 }
4127 if (!info.contentp) {
4128 info.contentp = &s->data;
4129 if (oid_object_info_extended(r, &s->oid, &info,
4130 OBJECT_INFO_LOOKUP_REPLACE))
4131 die("unable to read %s", oid_to_hex(&s->oid));
4132 }
4133 s->should_free = 1;
4134 }
4135 return 0;
4136 }
4137
4138 void diff_free_filespec_blob(struct diff_filespec *s)
4139 {
4140 if (s->should_free)
4141 free(s->data);
4142 else if (s->should_munmap)
4143 munmap(s->data, s->size);
4144
4145 if (s->should_free || s->should_munmap) {
4146 s->should_free = s->should_munmap = 0;
4147 s->data = NULL;
4148 }
4149 }
4150
4151 void diff_free_filespec_data(struct diff_filespec *s)
4152 {
4153 if (!s)
4154 return;
4155
4156 diff_free_filespec_blob(s);
4157 FREE_AND_NULL(s->cnt_data);
4158 }
4159
4160 static void prep_temp_blob(struct index_state *istate,
4161 const char *path, struct diff_tempfile *temp,
4162 void *blob,
4163 unsigned long size,
4164 const struct object_id *oid,
4165 int mode)
4166 {
4167 struct strbuf buf = STRBUF_INIT;
4168 char *path_dup = xstrdup(path);
4169 const char *base = basename(path_dup);
4170 struct checkout_metadata meta;
4171
4172 init_checkout_metadata(&meta, NULL, NULL, oid);
4173
4174 temp->tempfile = mks_tempfile_dt("git-blob-XXXXXX", base);
4175 if (!temp->tempfile)
4176 die_errno("unable to create temp-file");
4177 if (convert_to_working_tree(istate, path,
4178 (const char *)blob, (size_t)size, &buf, &meta)) {
4179 blob = buf.buf;
4180 size = buf.len;
4181 }
4182 if (write_in_full(temp->tempfile->fd, blob, size) < 0 ||
4183 close_tempfile_gently(temp->tempfile))
4184 die_errno("unable to write temp-file");
4185 temp->name = get_tempfile_path(temp->tempfile);
4186 oid_to_hex_r(temp->hex, oid);
4187 xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
4188 strbuf_release(&buf);
4189 free(path_dup);
4190 }
4191
4192 static struct diff_tempfile *prepare_temp_file(struct repository *r,
4193 const char *name,
4194 struct diff_filespec *one)
4195 {
4196 struct diff_tempfile *temp = claim_diff_tempfile();
4197
4198 if (!DIFF_FILE_VALID(one)) {
4199 not_a_valid_file:
4200 /* A '-' entry produces this for file-2, and
4201 * a '+' entry produces this for file-1.
4202 */
4203 temp->name = "/dev/null";
4204 xsnprintf(temp->hex, sizeof(temp->hex), ".");
4205 xsnprintf(temp->mode, sizeof(temp->mode), ".");
4206 return temp;
4207 }
4208
4209 if (!S_ISGITLINK(one->mode) &&
4210 (!one->oid_valid ||
4211 reuse_worktree_file(r->index, name, &one->oid, 1))) {
4212 struct stat st;
4213 if (lstat(name, &st) < 0) {
4214 if (errno == ENOENT)
4215 goto not_a_valid_file;
4216 die_errno("stat(%s)", name);
4217 }
4218 if (S_ISLNK(st.st_mode)) {
4219 struct strbuf sb = STRBUF_INIT;
4220 if (strbuf_readlink(&sb, name, st.st_size) < 0)
4221 die_errno("readlink(%s)", name);
4222 prep_temp_blob(r->index, name, temp, sb.buf, sb.len,
4223 (one->oid_valid ?
4224 &one->oid : null_oid()),
4225 (one->oid_valid ?
4226 one->mode : S_IFLNK));
4227 strbuf_release(&sb);
4228 }
4229 else {
4230 /* we can borrow from the file in the work tree */
4231 temp->name = name;
4232 if (!one->oid_valid)
4233 oid_to_hex_r(temp->hex, null_oid());
4234 else
4235 oid_to_hex_r(temp->hex, &one->oid);
4236 /* Even though we may sometimes borrow the
4237 * contents from the work tree, we always want
4238 * one->mode. mode is trustworthy even when
4239 * !(one->oid_valid), as long as
4240 * DIFF_FILE_VALID(one).
4241 */
4242 xsnprintf(temp->mode, sizeof(temp->mode), "%06o", one->mode);
4243 }
4244 return temp;
4245 }
4246 else {
4247 if (diff_populate_filespec(r, one, NULL))
4248 die("cannot read data blob for %s", one->path);
4249 prep_temp_blob(r->index, name, temp,
4250 one->data, one->size,
4251 &one->oid, one->mode);
4252 }
4253 return temp;
4254 }
4255
4256 static void add_external_diff_name(struct repository *r,
4257 struct strvec *argv,
4258 const char *name,
4259 struct diff_filespec *df)
4260 {
4261 struct diff_tempfile *temp = prepare_temp_file(r, name, df);
4262 strvec_push(argv, temp->name);
4263 strvec_push(argv, temp->hex);
4264 strvec_push(argv, temp->mode);
4265 }
4266
4267 /* An external diff command takes:
4268 *
4269 * diff-cmd name infile1 infile1-sha1 infile1-mode \
4270 * infile2 infile2-sha1 infile2-mode [ rename-to ]
4271 *
4272 */
4273 static void run_external_diff(const char *pgm,
4274 const char *name,
4275 const char *other,
4276 struct diff_filespec *one,
4277 struct diff_filespec *two,
4278 const char *xfrm_msg,
4279 struct diff_options *o)
4280 {
4281 struct strvec argv = STRVEC_INIT;
4282 struct strvec env = STRVEC_INIT;
4283 struct diff_queue_struct *q = &diff_queued_diff;
4284
4285 strvec_push(&argv, pgm);
4286 strvec_push(&argv, name);
4287
4288 if (one && two) {
4289 add_external_diff_name(o->repo, &argv, name, one);
4290 if (!other)
4291 add_external_diff_name(o->repo, &argv, name, two);
4292 else {
4293 add_external_diff_name(o->repo, &argv, other, two);
4294 strvec_push(&argv, other);
4295 strvec_push(&argv, xfrm_msg);
4296 }
4297 }
4298
4299 strvec_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
4300 strvec_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
4301
4302 diff_free_filespec_data(one);
4303 diff_free_filespec_data(two);
4304 if (run_command_v_opt_cd_env(argv.v, RUN_USING_SHELL, NULL, env.v))
4305 die(_("external diff died, stopping at %s"), name);
4306
4307 remove_tempfile();
4308 strvec_clear(&argv);
4309 strvec_clear(&env);
4310 }
4311
4312 static int similarity_index(struct diff_filepair *p)
4313 {
4314 return p->score * 100 / MAX_SCORE;
4315 }
4316
4317 static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)
4318 {
4319 if (startup_info->have_repository)
4320 return find_unique_abbrev(oid, abbrev);
4321 else {
4322 char *hex = oid_to_hex(oid);
4323 if (abbrev < 0)
4324 abbrev = FALLBACK_DEFAULT_ABBREV;
4325 if (abbrev > the_hash_algo->hexsz)
4326 BUG("oid abbreviation out of range: %d", abbrev);
4327 if (abbrev)
4328 hex[abbrev] = '\0';
4329 return hex;
4330 }
4331 }
4332
4333 static void fill_metainfo(struct strbuf *msg,
4334 const char *name,
4335 const char *other,
4336 struct diff_filespec *one,
4337 struct diff_filespec *two,
4338 struct diff_options *o,
4339 struct diff_filepair *p,
4340 int *must_show_header,
4341 int use_color)
4342 {
4343 const char *set = diff_get_color(use_color, DIFF_METAINFO);
4344 const char *reset = diff_get_color(use_color, DIFF_RESET);
4345 const char *line_prefix = diff_line_prefix(o);
4346 struct string_list *more_headers = NULL;
4347
4348 *must_show_header = 1;
4349 strbuf_init(msg, PATH_MAX * 2 + 300);
4350 switch (p->status) {
4351 case DIFF_STATUS_COPIED:
4352 strbuf_addf(msg, "%s%ssimilarity index %d%%",
4353 line_prefix, set, similarity_index(p));
4354 strbuf_addf(msg, "%s\n%s%scopy from ",
4355 reset, line_prefix, set);
4356 quote_c_style(name, msg, NULL, 0);
4357 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
4358 quote_c_style(other, msg, NULL, 0);
4359 strbuf_addf(msg, "%s\n", reset);
4360 break;
4361 case DIFF_STATUS_RENAMED:
4362 strbuf_addf(msg, "%s%ssimilarity index %d%%",
4363 line_prefix, set, similarity_index(p));
4364 strbuf_addf(msg, "%s\n%s%srename from ",
4365 reset, line_prefix, set);
4366 quote_c_style(name, msg, NULL, 0);
4367 strbuf_addf(msg, "%s\n%s%srename to ",
4368 reset, line_prefix, set);
4369 quote_c_style(other, msg, NULL, 0);
4370 strbuf_addf(msg, "%s\n", reset);
4371 break;
4372 case DIFF_STATUS_MODIFIED:
4373 if (p->score) {
4374 strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
4375 line_prefix,
4376 set, similarity_index(p), reset);
4377 break;
4378 }
4379 /* fallthru */
4380 default:
4381 *must_show_header = 0;
4382 }
4383 if ((more_headers = additional_headers(o, name))) {
4384 add_formatted_headers(msg, more_headers,
4385 line_prefix, set, reset);
4386 *must_show_header = 1;
4387 }
4388 if (one && two && !oideq(&one->oid, &two->oid)) {
4389 const unsigned hexsz = the_hash_algo->hexsz;
4390 int abbrev = o->abbrev ? o->abbrev : DEFAULT_ABBREV;
4391
4392 if (o->flags.full_index)
4393 abbrev = hexsz;
4394
4395 if (o->flags.binary) {
4396 mmfile_t mf;
4397 if ((!fill_mmfile(o->repo, &mf, one) &&
4398 diff_filespec_is_binary(o->repo, one)) ||
4399 (!fill_mmfile(o->repo, &mf, two) &&
4400 diff_filespec_is_binary(o->repo, two)))
4401 abbrev = hexsz;
4402 }
4403 strbuf_addf(msg, "%s%sindex %s..%s", line_prefix, set,
4404 diff_abbrev_oid(&one->oid, abbrev),
4405 diff_abbrev_oid(&two->oid, abbrev));
4406 if (one->mode == two->mode)
4407 strbuf_addf(msg, " %06o", one->mode);
4408 strbuf_addf(msg, "%s\n", reset);
4409 }
4410 }
4411
4412 static void run_diff_cmd(const char *pgm,
4413 const char *name,
4414 const char *other,
4415 const char *attr_path,
4416 struct diff_filespec *one,
4417 struct diff_filespec *two,
4418 struct strbuf *msg,
4419 struct diff_options *o,
4420 struct diff_filepair *p)
4421 {
4422 const char *xfrm_msg = NULL;
4423 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
4424 int must_show_header = 0;
4425
4426
4427 if (o->flags.allow_external) {
4428 struct userdiff_driver *drv;
4429
4430 drv = userdiff_find_by_path(o->repo->index, attr_path);
4431 if (drv && drv->external)
4432 pgm = drv->external;
4433 }
4434
4435 if (msg) {
4436 /*
4437 * don't use colors when the header is intended for an
4438 * external diff driver
4439 */
4440 fill_metainfo(msg, name, other, one, two, o, p,
4441 &must_show_header,
4442 want_color(o->use_color) && !pgm);
4443 xfrm_msg = msg->len ? msg->buf : NULL;
4444 }
4445
4446 if (pgm) {
4447 run_external_diff(pgm, name, other, one, two, xfrm_msg, o);
4448 return;
4449 }
4450 if (one && two)
4451 builtin_diff(name, other ? other : name,
4452 one, two, xfrm_msg, must_show_header,
4453 o, complete_rewrite);
4454 else
4455 fprintf(o->file, "* Unmerged path %s\n", name);
4456 }
4457
4458 static void diff_fill_oid_info(struct diff_filespec *one, struct index_state *istate)
4459 {
4460 if (DIFF_FILE_VALID(one)) {
4461 if (!one->oid_valid) {
4462 struct stat st;
4463 if (one->is_stdin) {
4464 oidclr(&one->oid);
4465 return;
4466 }
4467 if (lstat(one->path, &st) < 0)
4468 die_errno("stat '%s'", one->path);
4469 if (index_path(istate, &one->oid, one->path, &st, 0))
4470 die("cannot hash %s", one->path);
4471 }
4472 }
4473 else
4474 oidclr(&one->oid);
4475 }
4476
4477 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
4478 {
4479 /* Strip the prefix but do not molest /dev/null and absolute paths */
4480 if (*namep && !is_absolute_path(*namep)) {
4481 *namep += prefix_length;
4482 if (**namep == '/')
4483 ++*namep;
4484 }
4485 if (*otherp && !is_absolute_path(*otherp)) {
4486 *otherp += prefix_length;
4487 if (**otherp == '/')
4488 ++*otherp;
4489 }
4490 }
4491
4492 static void run_diff(struct diff_filepair *p, struct diff_options *o)
4493 {
4494 const char *pgm = external_diff();
4495 struct strbuf msg;
4496 struct diff_filespec *one = p->one;
4497 struct diff_filespec *two = p->two;
4498 const char *name;
4499 const char *other;
4500 const char *attr_path;
4501
4502 name = one->path;
4503 other = (strcmp(name, two->path) ? two->path : NULL);
4504 attr_path = name;
4505 if (o->prefix_length)
4506 strip_prefix(o->prefix_length, &name, &other);
4507
4508 if (!o->flags.allow_external)
4509 pgm = NULL;
4510
4511 if (DIFF_PAIR_UNMERGED(p)) {
4512 run_diff_cmd(pgm, name, NULL, attr_path,
4513 NULL, NULL, NULL, o, p);
4514 return;
4515 }
4516
4517 diff_fill_oid_info(one, o->repo->index);
4518 diff_fill_oid_info(two, o->repo->index);
4519
4520 if (!pgm &&
4521 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
4522 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
4523 /*
4524 * a filepair that changes between file and symlink
4525 * needs to be split into deletion and creation.
4526 */
4527 struct diff_filespec *null = alloc_filespec(two->path);
4528 run_diff_cmd(NULL, name, other, attr_path,
4529 one, null, &msg,
4530 o, p);
4531 free(null);
4532 strbuf_release(&msg);
4533
4534 null = alloc_filespec(one->path);
4535 run_diff_cmd(NULL, name, other, attr_path,
4536 null, two, &msg, o, p);
4537 free(null);
4538 }
4539 else
4540 run_diff_cmd(pgm, name, other, attr_path,
4541 one, two, &msg, o, p);
4542
4543 strbuf_release(&msg);
4544 }
4545
4546 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
4547 struct diffstat_t *diffstat)
4548 {
4549 const char *name;
4550 const char *other;
4551
4552 if (DIFF_PAIR_UNMERGED(p)) {
4553 /* unmerged */
4554 builtin_diffstat(p->one->path, NULL, NULL, NULL,
4555 diffstat, o, p);
4556 return;
4557 }
4558
4559 name = p->one->path;
4560 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
4561
4562 if (o->prefix_length)
4563 strip_prefix(o->prefix_length, &name, &other);
4564
4565 diff_fill_oid_info(p->one, o->repo->index);
4566 diff_fill_oid_info(p->two, o->repo->index);
4567
4568 builtin_diffstat(name, other, p->one, p->two,
4569 diffstat, o, p);
4570 }
4571
4572 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
4573 {
4574 const char *name;
4575 const char *other;
4576 const char *attr_path;
4577
4578 if (DIFF_PAIR_UNMERGED(p)) {
4579 /* unmerged */
4580 return;
4581 }
4582
4583 name = p->one->path;
4584 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
4585 attr_path = other ? other : name;
4586
4587 if (o->prefix_length)
4588 strip_prefix(o->prefix_length, &name, &other);
4589
4590 diff_fill_oid_info(p->one, o->repo->index);
4591 diff_fill_oid_info(p->two, o->repo->index);
4592
4593 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
4594 }
4595
4596 static void prep_parse_options(struct diff_options *options);
4597
4598 void repo_diff_setup(struct repository *r, struct diff_options *options)
4599 {
4600 memcpy(options, &default_diff_options, sizeof(*options));
4601
4602 options->file = stdout;
4603 options->repo = r;
4604
4605 options->output_indicators[OUTPUT_INDICATOR_NEW] = '+';
4606 options->output_indicators[OUTPUT_INDICATOR_OLD] = '-';
4607 options->output_indicators[OUTPUT_INDICATOR_CONTEXT] = ' ';
4608 options->abbrev = DEFAULT_ABBREV;
4609 options->line_termination = '\n';
4610 options->break_opt = -1;
4611 options->rename_limit = -1;
4612 options->dirstat_permille = diff_dirstat_permille_default;
4613 options->context = diff_context_default;
4614 options->interhunkcontext = diff_interhunk_context_default;
4615 options->ws_error_highlight = ws_error_highlight_default;
4616 options->flags.rename_empty = 1;
4617 options->flags.relative_name = diff_relative;
4618 options->objfind = NULL;
4619
4620 /* pathchange left =NULL by default */
4621 options->change = diff_change;
4622 options->add_remove = diff_addremove;
4623 options->use_color = diff_use_color_default;
4624 options->detect_rename = diff_detect_rename_default;
4625 options->xdl_opts |= diff_algorithm;
4626 if (diff_indent_heuristic)
4627 DIFF_XDL_SET(options, INDENT_HEURISTIC);
4628
4629 options->orderfile = diff_order_file_cfg;
4630
4631 if (!options->flags.ignore_submodule_set)
4632 options->flags.ignore_untracked_in_submodules = 1;
4633
4634 if (diff_no_prefix) {
4635 options->a_prefix = options->b_prefix = "";
4636 } else if (!diff_mnemonic_prefix) {
4637 options->a_prefix = "a/";
4638 options->b_prefix = "b/";
4639 }
4640
4641 options->color_moved = diff_color_moved_default;
4642 options->color_moved_ws_handling = diff_color_moved_ws_default;
4643
4644 prep_parse_options(options);
4645 }
4646
4647 static const char diff_status_letters[] = {
4648 DIFF_STATUS_ADDED,
4649 DIFF_STATUS_COPIED,
4650 DIFF_STATUS_DELETED,
4651 DIFF_STATUS_MODIFIED,
4652 DIFF_STATUS_RENAMED,
4653 DIFF_STATUS_TYPE_CHANGED,
4654 DIFF_STATUS_UNKNOWN,
4655 DIFF_STATUS_UNMERGED,
4656 DIFF_STATUS_FILTER_AON,
4657 DIFF_STATUS_FILTER_BROKEN,
4658 '\0',
4659 };
4660
4661 static unsigned int filter_bit['Z' + 1];
4662
4663 static void prepare_filter_bits(void)
4664 {
4665 int i;
4666
4667 if (!filter_bit[DIFF_STATUS_ADDED]) {
4668 for (i = 0; diff_status_letters[i]; i++)
4669 filter_bit[(int) diff_status_letters[i]] = (1 << i);
4670 }
4671 }
4672
4673 static unsigned filter_bit_tst(char status, const struct diff_options *opt)
4674 {
4675 return opt->filter & filter_bit[(int) status];
4676 }
4677
4678 unsigned diff_filter_bit(char status)
4679 {
4680 prepare_filter_bits();
4681 return filter_bit[(int) status];
4682 }
4683
4684 void diff_setup_done(struct diff_options *options)
4685 {
4686 unsigned check_mask = DIFF_FORMAT_NAME |
4687 DIFF_FORMAT_NAME_STATUS |
4688 DIFF_FORMAT_CHECKDIFF |
4689 DIFF_FORMAT_NO_OUTPUT;
4690 /*
4691 * This must be signed because we're comparing against a potentially
4692 * negative value.
4693 */
4694 const int hexsz = the_hash_algo->hexsz;
4695
4696 if (options->set_default)
4697 options->set_default(options);
4698
4699 if (HAS_MULTI_BITS(options->output_format & check_mask))
4700 die(_("options '%s', '%s', '%s', and '%s' cannot be used together"),
4701 "--name-only", "--name-status", "--check", "-s");
4702
4703 if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
4704 die(_("options '%s', '%s', and '%s' cannot be used together"),
4705 "-G", "-S", "--find-object");
4706
4707 if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_G_REGEX_MASK))
4708 die(_("options '%s' and '%s' cannot be used together, use '%s' with '%s'"),
4709 "-G", "--pickaxe-regex", "--pickaxe-regex", "-S");
4710
4711 if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))
4712 die(_("options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"),
4713 "--pickaxe-all", "--find-object", "--pickaxe-all", "-G", "-S");
4714
4715 /*
4716 * Most of the time we can say "there are changes"
4717 * only by checking if there are changed paths, but
4718 * --ignore-whitespace* options force us to look
4719 * inside contents.
4720 */
4721
4722 if ((options->xdl_opts & XDF_WHITESPACE_FLAGS) ||
4723 options->ignore_regex_nr)
4724 options->flags.diff_from_contents = 1;
4725 else
4726 options->flags.diff_from_contents = 0;
4727
4728 if (options->flags.find_copies_harder)
4729 options->detect_rename = DIFF_DETECT_COPY;
4730
4731 if (!options->flags.relative_name)
4732 options->prefix = NULL;
4733 if (options->prefix)
4734 options->prefix_length = strlen(options->prefix);
4735 else
4736 options->prefix_length = 0;
4737
4738 if (options->output_format & (DIFF_FORMAT_NAME |
4739 DIFF_FORMAT_NAME_STATUS |
4740 DIFF_FORMAT_CHECKDIFF |
4741 DIFF_FORMAT_NO_OUTPUT))
4742 options->output_format &= ~(DIFF_FORMAT_RAW |
4743 DIFF_FORMAT_NUMSTAT |
4744 DIFF_FORMAT_DIFFSTAT |
4745 DIFF_FORMAT_SHORTSTAT |
4746 DIFF_FORMAT_DIRSTAT |
4747 DIFF_FORMAT_SUMMARY |
4748 DIFF_FORMAT_PATCH);
4749
4750 /*
4751 * These cases always need recursive; we do not drop caller-supplied
4752 * recursive bits for other formats here.
4753 */
4754 if (options->output_format & (DIFF_FORMAT_PATCH |
4755 DIFF_FORMAT_NUMSTAT |
4756 DIFF_FORMAT_DIFFSTAT |
4757 DIFF_FORMAT_SHORTSTAT |
4758 DIFF_FORMAT_DIRSTAT |
4759 DIFF_FORMAT_SUMMARY |
4760 DIFF_FORMAT_CHECKDIFF))
4761 options->flags.recursive = 1;
4762 /*
4763 * Also pickaxe would not work very well if you do not say recursive
4764 */
4765 if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)
4766 options->flags.recursive = 1;
4767 /*
4768 * When patches are generated, submodules diffed against the work tree
4769 * must be checked for dirtiness too so it can be shown in the output
4770 */
4771 if (options->output_format & DIFF_FORMAT_PATCH)
4772 options->flags.dirty_submodules = 1;
4773
4774 if (options->detect_rename && options->rename_limit < 0)
4775 options->rename_limit = diff_rename_limit_default;
4776 if (hexsz < options->abbrev)
4777 options->abbrev = hexsz; /* full */
4778
4779 /*
4780 * It does not make sense to show the first hit we happened
4781 * to have found. It does not make sense not to return with
4782 * exit code in such a case either.
4783 */
4784 if (options->flags.quick) {
4785 options->output_format = DIFF_FORMAT_NO_OUTPUT;
4786 options->flags.exit_with_status = 1;
4787 }
4788
4789 options->diff_path_counter = 0;
4790
4791 if (options->flags.follow_renames && options->pathspec.nr != 1)
4792 die(_("--follow requires exactly one pathspec"));
4793
4794 if (!options->use_color || external_diff())
4795 options->color_moved = 0;
4796
4797 if (options->filter_not) {
4798 if (!options->filter)
4799 options->filter = ~filter_bit[DIFF_STATUS_FILTER_AON];
4800 options->filter &= ~options->filter_not;
4801 }
4802
4803 FREE_AND_NULL(options->parseopts);
4804 }
4805
4806 int parse_long_opt(const char *opt, const char **argv,
4807 const char **optarg)
4808 {
4809 const char *arg = argv[0];
4810 if (!skip_prefix(arg, "--", &arg))
4811 return 0;
4812 if (!skip_prefix(arg, opt, &arg))
4813 return 0;
4814 if (*arg == '=') { /* stuck form: --option=value */
4815 *optarg = arg + 1;
4816 return 1;
4817 }
4818 if (*arg != '\0')
4819 return 0;
4820 /* separate form: --option value */
4821 if (!argv[1])
4822 die("Option '--%s' requires a value", opt);
4823 *optarg = argv[1];
4824 return 2;
4825 }
4826
4827 static int diff_opt_stat(const struct option *opt, const char *value, int unset)
4828 {
4829 struct diff_options *options = opt->value;
4830 int width = options->stat_width;
4831 int name_width = options->stat_name_width;
4832 int graph_width = options->stat_graph_width;
4833 int count = options->stat_count;
4834 char *end;
4835
4836 BUG_ON_OPT_NEG(unset);
4837
4838 if (!strcmp(opt->long_name, "stat")) {
4839 if (value) {
4840 width = strtoul(value, &end, 10);
4841 if (*end == ',')
4842 name_width = strtoul(end+1, &end, 10);
4843 if (*end == ',')
4844 count = strtoul(end+1, &end, 10);
4845 if (*end)
4846 return error(_("invalid --stat value: %s"), value);
4847 }
4848 } else if (!strcmp(opt->long_name, "stat-width")) {
4849 width = strtoul(value, &end, 10);
4850 if (*end)
4851 return error(_("%s expects a numerical value"),
4852 opt->long_name);
4853 } else if (!strcmp(opt->long_name, "stat-name-width")) {
4854 name_width = strtoul(value, &end, 10);
4855 if (*end)
4856 return error(_("%s expects a numerical value"),
4857 opt->long_name);
4858 } else if (!strcmp(opt->long_name, "stat-graph-width")) {
4859 graph_width = strtoul(value, &end, 10);
4860 if (*end)
4861 return error(_("%s expects a numerical value"),
4862 opt->long_name);
4863 } else if (!strcmp(opt->long_name, "stat-count")) {
4864 count = strtoul(value, &end, 10);
4865 if (*end)
4866 return error(_("%s expects a numerical value"),
4867 opt->long_name);
4868 } else
4869 BUG("%s should not get here", opt->long_name);
4870
4871 options->output_format |= DIFF_FORMAT_DIFFSTAT;
4872 options->stat_name_width = name_width;
4873 options->stat_graph_width = graph_width;
4874 options->stat_width = width;
4875 options->stat_count = count;
4876 return 0;
4877 }
4878
4879 static int parse_dirstat_opt(struct diff_options *options, const char *params)
4880 {
4881 struct strbuf errmsg = STRBUF_INIT;
4882 if (parse_dirstat_params(options, params, &errmsg))
4883 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
4884 errmsg.buf);
4885 strbuf_release(&errmsg);
4886 /*
4887 * The caller knows a dirstat-related option is given from the command
4888 * line; allow it to say "return this_function();"
4889 */
4890 options->output_format |= DIFF_FORMAT_DIRSTAT;
4891 return 1;
4892 }
4893
4894 static int diff_opt_diff_filter(const struct option *option,
4895 const char *optarg, int unset)
4896 {
4897 struct diff_options *opt = option->value;
4898 int i, optch;
4899
4900 BUG_ON_OPT_NEG(unset);
4901 prepare_filter_bits();
4902
4903 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
4904 unsigned int bit;
4905 int negate;
4906
4907 if ('a' <= optch && optch <= 'z') {
4908 negate = 1;
4909 optch = toupper(optch);
4910 } else {
4911 negate = 0;
4912 }
4913
4914 bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
4915 if (!bit)
4916 return error(_("unknown change class '%c' in --diff-filter=%s"),
4917 optarg[i], optarg);
4918 if (negate)
4919 opt->filter_not |= bit;
4920 else
4921 opt->filter |= bit;
4922 }
4923 return 0;
4924 }
4925
4926 static void enable_patch_output(int *fmt)
4927 {
4928 *fmt &= ~DIFF_FORMAT_NO_OUTPUT;
4929 *fmt |= DIFF_FORMAT_PATCH;
4930 }
4931
4932 static int diff_opt_ws_error_highlight(const struct option *option,
4933 const char *arg, int unset)
4934 {
4935 struct diff_options *opt = option->value;
4936 int val = parse_ws_error_highlight(arg);
4937
4938 BUG_ON_OPT_NEG(unset);
4939 if (val < 0)
4940 return error(_("unknown value after ws-error-highlight=%.*s"),
4941 -1 - val, arg);
4942 opt->ws_error_highlight = val;
4943 return 0;
4944 }
4945
4946 static int diff_opt_find_object(const struct option *option,
4947 const char *arg, int unset)
4948 {
4949 struct diff_options *opt = option->value;
4950 struct object_id oid;
4951
4952 BUG_ON_OPT_NEG(unset);
4953 if (get_oid(arg, &oid))
4954 return error(_("unable to resolve '%s'"), arg);
4955
4956 if (!opt->objfind)
4957 CALLOC_ARRAY(opt->objfind, 1);
4958
4959 opt->pickaxe_opts |= DIFF_PICKAXE_KIND_OBJFIND;
4960 opt->flags.recursive = 1;
4961 opt->flags.tree_in_recursive = 1;
4962 oidset_insert(opt->objfind, &oid);
4963 return 0;
4964 }
4965
4966 static int diff_opt_anchored(const struct option *opt,
4967 const char *arg, int unset)
4968 {
4969 struct diff_options *options = opt->value;
4970
4971 BUG_ON_OPT_NEG(unset);
4972 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
4973 ALLOC_GROW(options->anchors, options->anchors_nr + 1,
4974 options->anchors_alloc);
4975 options->anchors[options->anchors_nr++] = xstrdup(arg);
4976 return 0;
4977 }
4978
4979 static int diff_opt_binary(const struct option *opt,
4980 const char *arg, int unset)
4981 {
4982 struct diff_options *options = opt->value;
4983
4984 BUG_ON_OPT_NEG(unset);
4985 BUG_ON_OPT_ARG(arg);
4986 enable_patch_output(&options->output_format);
4987 options->flags.binary = 1;
4988 return 0;
4989 }
4990
4991 static int diff_opt_break_rewrites(const struct option *opt,
4992 const char *arg, int unset)
4993 {
4994 int *break_opt = opt->value;
4995 int opt1, opt2;
4996
4997 BUG_ON_OPT_NEG(unset);
4998 if (!arg)
4999 arg = "";
5000 opt1 = parse_rename_score(&arg);
5001 if (*arg == 0)
5002 opt2 = 0;
5003 else if (*arg != '/')
5004 return error(_("%s expects <n>/<m> form"), opt->long_name);
5005 else {
5006 arg++;
5007 opt2 = parse_rename_score(&arg);
5008 }
5009 if (*arg != 0)
5010 return error(_("%s expects <n>/<m> form"), opt->long_name);
5011 *break_opt = opt1 | (opt2 << 16);
5012 return 0;
5013 }
5014
5015 static int diff_opt_char(const struct option *opt,
5016 const char *arg, int unset)
5017 {
5018 char *value = opt->value;
5019
5020 BUG_ON_OPT_NEG(unset);
5021 if (arg[1])
5022 return error(_("%s expects a character, got '%s'"),
5023 opt->long_name, arg);
5024 *value = arg[0];
5025 return 0;
5026 }
5027
5028 static int diff_opt_color_moved(const struct option *opt,
5029 const char *arg, int unset)
5030 {
5031 struct diff_options *options = opt->value;
5032
5033 if (unset) {
5034 options->color_moved = COLOR_MOVED_NO;
5035 } else if (!arg) {
5036 if (diff_color_moved_default)
5037 options->color_moved = diff_color_moved_default;
5038 if (options->color_moved == COLOR_MOVED_NO)
5039 options->color_moved = COLOR_MOVED_DEFAULT;
5040 } else {
5041 int cm = parse_color_moved(arg);
5042 if (cm < 0)
5043 return error(_("bad --color-moved argument: %s"), arg);
5044 options->color_moved = cm;
5045 }
5046 return 0;
5047 }
5048
5049 static int diff_opt_color_moved_ws(const struct option *opt,
5050 const char *arg, int unset)
5051 {
5052 struct diff_options *options = opt->value;
5053 unsigned cm;
5054
5055 if (unset) {
5056 options->color_moved_ws_handling = 0;
5057 return 0;
5058 }
5059
5060 cm = parse_color_moved_ws(arg);
5061 if (cm & COLOR_MOVED_WS_ERROR)
5062 return error(_("invalid mode '%s' in --color-moved-ws"), arg);
5063 options->color_moved_ws_handling = cm;
5064 return 0;
5065 }
5066
5067 static int diff_opt_color_words(const struct option *opt,
5068 const char *arg, int unset)
5069 {
5070 struct diff_options *options = opt->value;
5071
5072 BUG_ON_OPT_NEG(unset);
5073 options->use_color = 1;
5074 options->word_diff = DIFF_WORDS_COLOR;
5075 options->word_regex = arg;
5076 return 0;
5077 }
5078
5079 static int diff_opt_compact_summary(const struct option *opt,
5080 const char *arg, int unset)
5081 {
5082 struct diff_options *options = opt->value;
5083
5084 BUG_ON_OPT_ARG(arg);
5085 if (unset) {
5086 options->flags.stat_with_summary = 0;
5087 } else {
5088 options->flags.stat_with_summary = 1;
5089 options->output_format |= DIFF_FORMAT_DIFFSTAT;
5090 }
5091 return 0;
5092 }
5093
5094 static int diff_opt_diff_algorithm(const struct option *opt,
5095 const char *arg, int unset)
5096 {
5097 struct diff_options *options = opt->value;
5098 long value = parse_algorithm_value(arg);
5099
5100 BUG_ON_OPT_NEG(unset);
5101 if (value < 0)
5102 return error(_("option diff-algorithm accepts \"myers\", "
5103 "\"minimal\", \"patience\" and \"histogram\""));
5104
5105 /* clear out previous settings */
5106 DIFF_XDL_CLR(options, NEED_MINIMAL);
5107 options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
5108 options->xdl_opts |= value;
5109 return 0;
5110 }
5111
5112 static int diff_opt_dirstat(const struct option *opt,
5113 const char *arg, int unset)
5114 {
5115 struct diff_options *options = opt->value;
5116
5117 BUG_ON_OPT_NEG(unset);
5118 if (!strcmp(opt->long_name, "cumulative")) {
5119 if (arg)
5120 BUG("how come --cumulative take a value?");
5121 arg = "cumulative";
5122 } else if (!strcmp(opt->long_name, "dirstat-by-file"))
5123 parse_dirstat_opt(options, "files");
5124 parse_dirstat_opt(options, arg ? arg : "");
5125 return 0;
5126 }
5127
5128 static int diff_opt_find_copies(const struct option *opt,
5129 const char *arg, int unset)
5130 {
5131 struct diff_options *options = opt->value;
5132
5133 BUG_ON_OPT_NEG(unset);
5134 if (!arg)
5135 arg = "";
5136 options->rename_score = parse_rename_score(&arg);
5137 if (*arg != 0)
5138 return error(_("invalid argument to %s"), opt->long_name);
5139
5140 if (options->detect_rename == DIFF_DETECT_COPY)
5141 options->flags.find_copies_harder = 1;
5142 else
5143 options->detect_rename = DIFF_DETECT_COPY;
5144
5145 return 0;
5146 }
5147
5148 static int diff_opt_find_renames(const struct option *opt,
5149 const char *arg, int unset)
5150 {
5151 struct diff_options *options = opt->value;
5152
5153 BUG_ON_OPT_NEG(unset);
5154 if (!arg)
5155 arg = "";
5156 options->rename_score = parse_rename_score(&arg);
5157 if (*arg != 0)
5158 return error(_("invalid argument to %s"), opt->long_name);
5159
5160 options->detect_rename = DIFF_DETECT_RENAME;
5161 return 0;
5162 }
5163
5164 static int diff_opt_follow(const struct option *opt,
5165 const char *arg, int unset)
5166 {
5167 struct diff_options *options = opt->value;
5168
5169 BUG_ON_OPT_ARG(arg);
5170 if (unset) {
5171 options->flags.follow_renames = 0;
5172 options->flags.default_follow_renames = 0;
5173 } else {
5174 options->flags.follow_renames = 1;
5175 }
5176 return 0;
5177 }
5178
5179 static int diff_opt_ignore_submodules(const struct option *opt,
5180 const char *arg, int unset)
5181 {
5182 struct diff_options *options = opt->value;
5183
5184 BUG_ON_OPT_NEG(unset);
5185 if (!arg)
5186 arg = "all";
5187 options->flags.override_submodule_config = 1;
5188 handle_ignore_submodules_arg(options, arg);
5189 return 0;
5190 }
5191
5192 static int diff_opt_line_prefix(const struct option *opt,
5193 const char *optarg, int unset)
5194 {
5195 struct diff_options *options = opt->value;
5196
5197 BUG_ON_OPT_NEG(unset);
5198 options->line_prefix = optarg;
5199 options->line_prefix_length = strlen(options->line_prefix);
5200 graph_setup_line_prefix(options);
5201 return 0;
5202 }
5203
5204 static int diff_opt_no_prefix(const struct option *opt,
5205 const char *optarg, int unset)
5206 {
5207 struct diff_options *options = opt->value;
5208
5209 BUG_ON_OPT_NEG(unset);
5210 BUG_ON_OPT_ARG(optarg);
5211 options->a_prefix = "";
5212 options->b_prefix = "";
5213 return 0;
5214 }
5215
5216 static enum parse_opt_result diff_opt_output(struct parse_opt_ctx_t *ctx,
5217 const struct option *opt,
5218 const char *arg, int unset)
5219 {
5220 struct diff_options *options = opt->value;
5221 char *path;
5222
5223 BUG_ON_OPT_NEG(unset);
5224 path = prefix_filename(ctx->prefix, arg);
5225 options->file = xfopen(path, "w");
5226 options->close_file = 1;
5227 if (options->use_color != GIT_COLOR_ALWAYS)
5228 options->use_color = GIT_COLOR_NEVER;
5229 free(path);
5230 return 0;
5231 }
5232
5233 static int diff_opt_patience(const struct option *opt,
5234 const char *arg, int unset)
5235 {
5236 struct diff_options *options = opt->value;
5237 int i;
5238
5239 BUG_ON_OPT_NEG(unset);
5240 BUG_ON_OPT_ARG(arg);
5241 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
5242 /*
5243 * Both --patience and --anchored use PATIENCE_DIFF
5244 * internally, so remove any anchors previously
5245 * specified.
5246 */
5247 for (i = 0; i < options->anchors_nr; i++)
5248 free(options->anchors[i]);
5249 options->anchors_nr = 0;
5250 return 0;
5251 }
5252
5253 static int diff_opt_ignore_regex(const struct option *opt,
5254 const char *arg, int unset)
5255 {
5256 struct diff_options *options = opt->value;
5257 regex_t *regex;
5258
5259 BUG_ON_OPT_NEG(unset);
5260 regex = xmalloc(sizeof(*regex));
5261 if (regcomp(regex, arg, REG_EXTENDED | REG_NEWLINE))
5262 return error(_("invalid regex given to -I: '%s'"), arg);
5263 ALLOC_GROW(options->ignore_regex, options->ignore_regex_nr + 1,
5264 options->ignore_regex_alloc);
5265 options->ignore_regex[options->ignore_regex_nr++] = regex;
5266 return 0;
5267 }
5268
5269 static int diff_opt_pickaxe_regex(const struct option *opt,
5270 const char *arg, int unset)
5271 {
5272 struct diff_options *options = opt->value;
5273
5274 BUG_ON_OPT_NEG(unset);
5275 options->pickaxe = arg;
5276 options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
5277 return 0;
5278 }
5279
5280 static int diff_opt_pickaxe_string(const struct option *opt,
5281 const char *arg, int unset)
5282 {
5283 struct diff_options *options = opt->value;
5284
5285 BUG_ON_OPT_NEG(unset);
5286 options->pickaxe = arg;
5287 options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
5288 return 0;
5289 }
5290
5291 static int diff_opt_relative(const struct option *opt,
5292 const char *arg, int unset)
5293 {
5294 struct diff_options *options = opt->value;
5295
5296 options->flags.relative_name = !unset;
5297 if (arg)
5298 options->prefix = arg;
5299 return 0;
5300 }
5301
5302 static int diff_opt_submodule(const struct option *opt,
5303 const char *arg, int unset)
5304 {
5305 struct diff_options *options = opt->value;
5306
5307 BUG_ON_OPT_NEG(unset);
5308 if (!arg)
5309 arg = "log";
5310 if (parse_submodule_params(options, arg))
5311 return error(_("failed to parse --submodule option parameter: '%s'"),
5312 arg);
5313 return 0;
5314 }
5315
5316 static int diff_opt_textconv(const struct option *opt,
5317 const char *arg, int unset)
5318 {
5319 struct diff_options *options = opt->value;
5320
5321 BUG_ON_OPT_ARG(arg);
5322 if (unset) {
5323 options->flags.allow_textconv = 0;
5324 } else {
5325 options->flags.allow_textconv = 1;
5326 options->flags.textconv_set_via_cmdline = 1;
5327 }
5328 return 0;
5329 }
5330
5331 static int diff_opt_unified(const struct option *opt,
5332 const char *arg, int unset)
5333 {
5334 struct diff_options *options = opt->value;
5335 char *s;
5336
5337 BUG_ON_OPT_NEG(unset);
5338
5339 if (arg) {
5340 options->context = strtol(arg, &s, 10);
5341 if (*s)
5342 return error(_("%s expects a numerical value"), "--unified");
5343 }
5344 enable_patch_output(&options->output_format);
5345
5346 return 0;
5347 }
5348
5349 static int diff_opt_word_diff(const struct option *opt,
5350 const char *arg, int unset)
5351 {
5352 struct diff_options *options = opt->value;
5353
5354 BUG_ON_OPT_NEG(unset);
5355 if (arg) {
5356 if (!strcmp(arg, "plain"))
5357 options->word_diff = DIFF_WORDS_PLAIN;
5358 else if (!strcmp(arg, "color")) {
5359 options->use_color = 1;
5360 options->word_diff = DIFF_WORDS_COLOR;
5361 }
5362 else if (!strcmp(arg, "porcelain"))
5363 options->word_diff = DIFF_WORDS_PORCELAIN;
5364 else if (!strcmp(arg, "none"))
5365 options->word_diff = DIFF_WORDS_NONE;
5366 else
5367 return error(_("bad --word-diff argument: %s"), arg);
5368 } else {
5369 if (options->word_diff == DIFF_WORDS_NONE)
5370 options->word_diff = DIFF_WORDS_PLAIN;
5371 }
5372 return 0;
5373 }
5374
5375 static int diff_opt_word_diff_regex(const struct option *opt,
5376 const char *arg, int unset)
5377 {
5378 struct diff_options *options = opt->value;
5379
5380 BUG_ON_OPT_NEG(unset);
5381 if (options->word_diff == DIFF_WORDS_NONE)
5382 options->word_diff = DIFF_WORDS_PLAIN;
5383 options->word_regex = arg;
5384 return 0;
5385 }
5386
5387 static int diff_opt_rotate_to(const struct option *opt, const char *arg, int unset)
5388 {
5389 struct diff_options *options = opt->value;
5390
5391 BUG_ON_OPT_NEG(unset);
5392 if (!strcmp(opt->long_name, "skip-to"))
5393 options->skip_instead_of_rotate = 1;
5394 else
5395 options->skip_instead_of_rotate = 0;
5396 options->rotate_to = arg;
5397 return 0;
5398 }
5399
5400 static void prep_parse_options(struct diff_options *options)
5401 {
5402 struct option parseopts[] = {
5403 OPT_GROUP(N_("Diff output format options")),
5404 OPT_BITOP('p', "patch", &options->output_format,
5405 N_("generate patch"),
5406 DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
5407 OPT_BIT_F('s', "no-patch", &options->output_format,
5408 N_("suppress diff output"),
5409 DIFF_FORMAT_NO_OUTPUT, PARSE_OPT_NONEG),
5410 OPT_BITOP('u', NULL, &options->output_format,
5411 N_("generate patch"),
5412 DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
5413 OPT_CALLBACK_F('U', "unified", options, N_("<n>"),
5414 N_("generate diffs with <n> lines context"),
5415 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_unified),
5416 OPT_BOOL('W', "function-context", &options->flags.funccontext,
5417 N_("generate diffs with <n> lines context")),
5418 OPT_BIT_F(0, "raw", &options->output_format,
5419 N_("generate the diff in raw format"),
5420 DIFF_FORMAT_RAW, PARSE_OPT_NONEG),
5421 OPT_BITOP(0, "patch-with-raw", &options->output_format,
5422 N_("synonym for '-p --raw'"),
5423 DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW,
5424 DIFF_FORMAT_NO_OUTPUT),
5425 OPT_BITOP(0, "patch-with-stat", &options->output_format,
5426 N_("synonym for '-p --stat'"),
5427 DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT,
5428 DIFF_FORMAT_NO_OUTPUT),
5429 OPT_BIT_F(0, "numstat", &options->output_format,
5430 N_("machine friendly --stat"),
5431 DIFF_FORMAT_NUMSTAT, PARSE_OPT_NONEG),
5432 OPT_BIT_F(0, "shortstat", &options->output_format,
5433 N_("output only the last line of --stat"),
5434 DIFF_FORMAT_SHORTSTAT, PARSE_OPT_NONEG),
5435 OPT_CALLBACK_F('X', "dirstat", options, N_("<param1,param2>..."),
5436 N_("output the distribution of relative amount of changes for each sub-directory"),
5437 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5438 diff_opt_dirstat),
5439 OPT_CALLBACK_F(0, "cumulative", options, NULL,
5440 N_("synonym for --dirstat=cumulative"),
5441 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
5442 diff_opt_dirstat),
5443 OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1,param2>..."),
5444 N_("synonym for --dirstat=files,param1,param2..."),
5445 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5446 diff_opt_dirstat),
5447 OPT_BIT_F(0, "check", &options->output_format,
5448 N_("warn if changes introduce conflict markers or whitespace errors"),
5449 DIFF_FORMAT_CHECKDIFF, PARSE_OPT_NONEG),
5450 OPT_BIT_F(0, "summary", &options->output_format,
5451 N_("condensed summary such as creations, renames and mode changes"),
5452 DIFF_FORMAT_SUMMARY, PARSE_OPT_NONEG),
5453 OPT_BIT_F(0, "name-only", &options->output_format,
5454 N_("show only names of changed files"),
5455 DIFF_FORMAT_NAME, PARSE_OPT_NONEG),
5456 OPT_BIT_F(0, "name-status", &options->output_format,
5457 N_("show only names and status of changed files"),
5458 DIFF_FORMAT_NAME_STATUS, PARSE_OPT_NONEG),
5459 OPT_CALLBACK_F(0, "stat", options, N_("<width>[,<name-width>[,<count>]]"),
5460 N_("generate diffstat"),
5461 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_stat),
5462 OPT_CALLBACK_F(0, "stat-width", options, N_("<width>"),
5463 N_("generate diffstat with a given width"),
5464 PARSE_OPT_NONEG, diff_opt_stat),
5465 OPT_CALLBACK_F(0, "stat-name-width", options, N_("<width>"),
5466 N_("generate diffstat with a given name width"),
5467 PARSE_OPT_NONEG, diff_opt_stat),
5468 OPT_CALLBACK_F(0, "stat-graph-width", options, N_("<width>"),
5469 N_("generate diffstat with a given graph width"),
5470 PARSE_OPT_NONEG, diff_opt_stat),
5471 OPT_CALLBACK_F(0, "stat-count", options, N_("<count>"),
5472 N_("generate diffstat with limited lines"),
5473 PARSE_OPT_NONEG, diff_opt_stat),
5474 OPT_CALLBACK_F(0, "compact-summary", options, NULL,
5475 N_("generate compact summary in diffstat"),
5476 PARSE_OPT_NOARG, diff_opt_compact_summary),
5477 OPT_CALLBACK_F(0, "binary", options, NULL,
5478 N_("output a binary diff that can be applied"),
5479 PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_binary),
5480 OPT_BOOL(0, "full-index", &options->flags.full_index,
5481 N_("show full pre- and post-image object names on the \"index\" lines")),
5482 OPT_COLOR_FLAG(0, "color", &options->use_color,
5483 N_("show colored diff")),
5484 OPT_CALLBACK_F(0, "ws-error-highlight", options, N_("<kind>"),
5485 N_("highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff"),
5486 PARSE_OPT_NONEG, diff_opt_ws_error_highlight),
5487 OPT_SET_INT('z', NULL, &options->line_termination,
5488 N_("do not munge pathnames and use NULs as output field terminators in --raw or --numstat"),
5489 0),
5490 OPT__ABBREV(&options->abbrev),
5491 OPT_STRING_F(0, "src-prefix", &options->a_prefix, N_("<prefix>"),
5492 N_("show the given source prefix instead of \"a/\""),
5493 PARSE_OPT_NONEG),
5494 OPT_STRING_F(0, "dst-prefix", &options->b_prefix, N_("<prefix>"),
5495 N_("show the given destination prefix instead of \"b/\""),
5496 PARSE_OPT_NONEG),
5497 OPT_CALLBACK_F(0, "line-prefix", options, N_("<prefix>"),
5498 N_("prepend an additional prefix to every line of output"),
5499 PARSE_OPT_NONEG, diff_opt_line_prefix),
5500 OPT_CALLBACK_F(0, "no-prefix", options, NULL,
5501 N_("do not show any source or destination prefix"),
5502 PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_no_prefix),
5503 OPT_INTEGER_F(0, "inter-hunk-context", &options->interhunkcontext,
5504 N_("show context between diff hunks up to the specified number of lines"),
5505 PARSE_OPT_NONEG),
5506 OPT_CALLBACK_F(0, "output-indicator-new",
5507 &options->output_indicators[OUTPUT_INDICATOR_NEW],
5508 N_("<char>"),
5509 N_("specify the character to indicate a new line instead of '+'"),
5510 PARSE_OPT_NONEG, diff_opt_char),
5511 OPT_CALLBACK_F(0, "output-indicator-old",
5512 &options->output_indicators[OUTPUT_INDICATOR_OLD],
5513 N_("<char>"),
5514 N_("specify the character to indicate an old line instead of '-'"),
5515 PARSE_OPT_NONEG, diff_opt_char),
5516 OPT_CALLBACK_F(0, "output-indicator-context",
5517 &options->output_indicators[OUTPUT_INDICATOR_CONTEXT],
5518 N_("<char>"),
5519 N_("specify the character to indicate a context instead of ' '"),
5520 PARSE_OPT_NONEG, diff_opt_char),
5521
5522 OPT_GROUP(N_("Diff rename options")),
5523 OPT_CALLBACK_F('B', "break-rewrites", &options->break_opt, N_("<n>[/<m>]"),
5524 N_("break complete rewrite changes into pairs of delete and create"),
5525 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5526 diff_opt_break_rewrites),
5527 OPT_CALLBACK_F('M', "find-renames", options, N_("<n>"),
5528 N_("detect renames"),
5529 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5530 diff_opt_find_renames),
5531 OPT_SET_INT_F('D', "irreversible-delete", &options->irreversible_delete,
5532 N_("omit the preimage for deletes"),
5533 1, PARSE_OPT_NONEG),
5534 OPT_CALLBACK_F('C', "find-copies", options, N_("<n>"),
5535 N_("detect copies"),
5536 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5537 diff_opt_find_copies),
5538 OPT_BOOL(0, "find-copies-harder", &options->flags.find_copies_harder,
5539 N_("use unmodified files as source to find copies")),
5540 OPT_SET_INT_F(0, "no-renames", &options->detect_rename,
5541 N_("disable rename detection"),
5542 0, PARSE_OPT_NONEG),
5543 OPT_BOOL(0, "rename-empty", &options->flags.rename_empty,
5544 N_("use empty blobs as rename source")),
5545 OPT_CALLBACK_F(0, "follow", options, NULL,
5546 N_("continue listing the history of a file beyond renames"),
5547 PARSE_OPT_NOARG, diff_opt_follow),
5548 OPT_INTEGER('l', NULL, &options->rename_limit,
5549 N_("prevent rename/copy detection if the number of rename/copy targets exceeds given limit")),
5550
5551 OPT_GROUP(N_("Diff algorithm options")),
5552 OPT_BIT(0, "minimal", &options->xdl_opts,
5553 N_("produce the smallest possible diff"),
5554 XDF_NEED_MINIMAL),
5555 OPT_BIT_F('w', "ignore-all-space", &options->xdl_opts,
5556 N_("ignore whitespace when comparing lines"),
5557 XDF_IGNORE_WHITESPACE, PARSE_OPT_NONEG),
5558 OPT_BIT_F('b', "ignore-space-change", &options->xdl_opts,
5559 N_("ignore changes in amount of whitespace"),
5560 XDF_IGNORE_WHITESPACE_CHANGE, PARSE_OPT_NONEG),
5561 OPT_BIT_F(0, "ignore-space-at-eol", &options->xdl_opts,
5562 N_("ignore changes in whitespace at EOL"),
5563 XDF_IGNORE_WHITESPACE_AT_EOL, PARSE_OPT_NONEG),
5564 OPT_BIT_F(0, "ignore-cr-at-eol", &options->xdl_opts,
5565 N_("ignore carrier-return at the end of line"),
5566 XDF_IGNORE_CR_AT_EOL, PARSE_OPT_NONEG),
5567 OPT_BIT_F(0, "ignore-blank-lines", &options->xdl_opts,
5568 N_("ignore changes whose lines are all blank"),
5569 XDF_IGNORE_BLANK_LINES, PARSE_OPT_NONEG),
5570 OPT_CALLBACK_F('I', "ignore-matching-lines", options, N_("<regex>"),
5571 N_("ignore changes whose all lines match <regex>"),
5572 0, diff_opt_ignore_regex),
5573 OPT_BIT(0, "indent-heuristic", &options->xdl_opts,
5574 N_("heuristic to shift diff hunk boundaries for easy reading"),
5575 XDF_INDENT_HEURISTIC),
5576 OPT_CALLBACK_F(0, "patience", options, NULL,
5577 N_("generate diff using the \"patience diff\" algorithm"),
5578 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
5579 diff_opt_patience),
5580 OPT_BITOP(0, "histogram", &options->xdl_opts,
5581 N_("generate diff using the \"histogram diff\" algorithm"),
5582 XDF_HISTOGRAM_DIFF, XDF_DIFF_ALGORITHM_MASK),
5583 OPT_CALLBACK_F(0, "diff-algorithm", options, N_("<algorithm>"),
5584 N_("choose a diff algorithm"),
5585 PARSE_OPT_NONEG, diff_opt_diff_algorithm),
5586 OPT_CALLBACK_F(0, "anchored", options, N_("<text>"),
5587 N_("generate diff using the \"anchored diff\" algorithm"),
5588 PARSE_OPT_NONEG, diff_opt_anchored),
5589 OPT_CALLBACK_F(0, "word-diff", options, N_("<mode>"),
5590 N_("show word diff, using <mode> to delimit changed words"),
5591 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_word_diff),
5592 OPT_CALLBACK_F(0, "word-diff-regex", options, N_("<regex>"),
5593 N_("use <regex> to decide what a word is"),
5594 PARSE_OPT_NONEG, diff_opt_word_diff_regex),
5595 OPT_CALLBACK_F(0, "color-words", options, N_("<regex>"),
5596 N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
5597 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
5598 OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
5599 N_("moved lines of code are colored differently"),
5600 PARSE_OPT_OPTARG, diff_opt_color_moved),
5601 OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
5602 N_("how white spaces are ignored in --color-moved"),
5603 0, diff_opt_color_moved_ws),
5604
5605 OPT_GROUP(N_("Other diff options")),
5606 OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
5607 N_("when run from subdir, exclude changes outside and show relative paths"),
5608 PARSE_OPT_OPTARG,
5609 diff_opt_relative),
5610 OPT_BOOL('a', "text", &options->flags.text,
5611 N_("treat all files as text")),
5612 OPT_BOOL('R', NULL, &options->flags.reverse_diff,
5613 N_("swap two inputs, reverse the diff")),
5614 OPT_BOOL(0, "exit-code", &options->flags.exit_with_status,
5615 N_("exit with 1 if there were differences, 0 otherwise")),
5616 OPT_BOOL(0, "quiet", &options->flags.quick,
5617 N_("disable all output of the program")),
5618 OPT_BOOL(0, "ext-diff", &options->flags.allow_external,
5619 N_("allow an external diff helper to be executed")),
5620 OPT_CALLBACK_F(0, "textconv", options, NULL,
5621 N_("run external text conversion filters when comparing binary files"),
5622 PARSE_OPT_NOARG, diff_opt_textconv),
5623 OPT_CALLBACK_F(0, "ignore-submodules", options, N_("<when>"),
5624 N_("ignore changes to submodules in the diff generation"),
5625 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5626 diff_opt_ignore_submodules),
5627 OPT_CALLBACK_F(0, "submodule", options, N_("<format>"),
5628 N_("specify how differences in submodules are shown"),
5629 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5630 diff_opt_submodule),
5631 OPT_SET_INT_F(0, "ita-invisible-in-index", &options->ita_invisible_in_index,
5632 N_("hide 'git add -N' entries from the index"),
5633 1, PARSE_OPT_NONEG),
5634 OPT_SET_INT_F(0, "ita-visible-in-index", &options->ita_invisible_in_index,
5635 N_("treat 'git add -N' entries as real in the index"),
5636 0, PARSE_OPT_NONEG),
5637 OPT_CALLBACK_F('S', NULL, options, N_("<string>"),
5638 N_("look for differences that change the number of occurrences of the specified string"),
5639 0, diff_opt_pickaxe_string),
5640 OPT_CALLBACK_F('G', NULL, options, N_("<regex>"),
5641 N_("look for differences that change the number of occurrences of the specified regex"),
5642 0, diff_opt_pickaxe_regex),
5643 OPT_BIT_F(0, "pickaxe-all", &options->pickaxe_opts,
5644 N_("show all changes in the changeset with -S or -G"),
5645 DIFF_PICKAXE_ALL, PARSE_OPT_NONEG),
5646 OPT_BIT_F(0, "pickaxe-regex", &options->pickaxe_opts,
5647 N_("treat <string> in -S as extended POSIX regular expression"),
5648 DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
5649 OPT_FILENAME('O', NULL, &options->orderfile,
5650 N_("control the order in which files appear in the output")),
5651 OPT_CALLBACK_F(0, "rotate-to", options, N_("<path>"),
5652 N_("show the change in the specified path first"),
5653 PARSE_OPT_NONEG, diff_opt_rotate_to),
5654 OPT_CALLBACK_F(0, "skip-to", options, N_("<path>"),
5655 N_("skip the output to the specified path"),
5656 PARSE_OPT_NONEG, diff_opt_rotate_to),
5657 OPT_CALLBACK_F(0, "find-object", options, N_("<object-id>"),
5658 N_("look for differences that change the number of occurrences of the specified object"),
5659 PARSE_OPT_NONEG, diff_opt_find_object),
5660 OPT_CALLBACK_F(0, "diff-filter", options, N_("[(A|C|D|M|R|T|U|X|B)...[*]]"),
5661 N_("select files by diff type"),
5662 PARSE_OPT_NONEG, diff_opt_diff_filter),
5663 { OPTION_CALLBACK, 0, "output", options, N_("<file>"),
5664 N_("output to a specific file"),
5665 PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
5666
5667 OPT_END()
5668 };
5669
5670 ALLOC_ARRAY(options->parseopts, ARRAY_SIZE(parseopts));
5671 memcpy(options->parseopts, parseopts, sizeof(parseopts));
5672 }
5673
5674 int diff_opt_parse(struct diff_options *options,
5675 const char **av, int ac, const char *prefix)
5676 {
5677 if (!prefix)
5678 prefix = "";
5679
5680 ac = parse_options(ac, av, prefix, options->parseopts, NULL,
5681 PARSE_OPT_KEEP_DASHDASH |
5682 PARSE_OPT_KEEP_UNKNOWN_OPT |
5683 PARSE_OPT_NO_INTERNAL_HELP |
5684 PARSE_OPT_ONE_SHOT |
5685 PARSE_OPT_STOP_AT_NON_OPTION);
5686
5687 return ac;
5688 }
5689
5690 int parse_rename_score(const char **cp_p)
5691 {
5692 unsigned long num, scale;
5693 int ch, dot;
5694 const char *cp = *cp_p;
5695
5696 num = 0;
5697 scale = 1;
5698 dot = 0;
5699 for (;;) {
5700 ch = *cp;
5701 if ( !dot && ch == '.' ) {
5702 scale = 1;
5703 dot = 1;
5704 } else if ( ch == '%' ) {
5705 scale = dot ? scale*100 : 100;
5706 cp++; /* % is always at the end */
5707 break;
5708 } else if ( ch >= '0' && ch <= '9' ) {
5709 if ( scale < 100000 ) {
5710 scale *= 10;
5711 num = (num*10) + (ch-'0');
5712 }
5713 } else {
5714 break;
5715 }
5716 cp++;
5717 }
5718 *cp_p = cp;
5719
5720 /* user says num divided by scale and we say internally that
5721 * is MAX_SCORE * num / scale.
5722 */
5723 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
5724 }
5725
5726 struct diff_queue_struct diff_queued_diff;
5727
5728 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
5729 {
5730 ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc);
5731 queue->queue[queue->nr++] = dp;
5732 }
5733
5734 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
5735 struct diff_filespec *one,
5736 struct diff_filespec *two)
5737 {
5738 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
5739 dp->one = one;
5740 dp->two = two;
5741 if (queue)
5742 diff_q(queue, dp);
5743 return dp;
5744 }
5745
5746 void diff_free_filepair(struct diff_filepair *p)
5747 {
5748 free_filespec(p->one);
5749 free_filespec(p->two);
5750 free(p);
5751 }
5752
5753 const char *diff_aligned_abbrev(const struct object_id *oid, int len)
5754 {
5755 int abblen;
5756 const char *abbrev;
5757
5758 /* Do we want all 40 hex characters? */
5759 if (len == the_hash_algo->hexsz)
5760 return oid_to_hex(oid);
5761
5762 /* An abbreviated value is fine, possibly followed by an ellipsis. */
5763 abbrev = diff_abbrev_oid(oid, len);
5764
5765 if (!print_sha1_ellipsis())
5766 return abbrev;
5767
5768 abblen = strlen(abbrev);
5769
5770 /*
5771 * In well-behaved cases, where the abbreviated result is the
5772 * same as the requested length, append three dots after the
5773 * abbreviation (hence the whole logic is limited to the case
5774 * where abblen < 37); when the actual abbreviated result is a
5775 * bit longer than the requested length, we reduce the number
5776 * of dots so that they match the well-behaved ones. However,
5777 * if the actual abbreviation is longer than the requested
5778 * length by more than three, we give up on aligning, and add
5779 * three dots anyway, to indicate that the output is not the
5780 * full object name. Yes, this may be suboptimal, but this
5781 * appears only in "diff --raw --abbrev" output and it is not
5782 * worth the effort to change it now. Note that this would
5783 * likely to work fine when the automatic sizing of default
5784 * abbreviation length is used--we would be fed -1 in "len" in
5785 * that case, and will end up always appending three-dots, but
5786 * the automatic sizing is supposed to give abblen that ensures
5787 * uniqueness across all objects (statistically speaking).
5788 */
5789 if (abblen < the_hash_algo->hexsz - 3) {
5790 static char hex[GIT_MAX_HEXSZ + 1];
5791 if (len < abblen && abblen <= len + 2)
5792 xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, "..");
5793 else
5794 xsnprintf(hex, sizeof(hex), "%s...", abbrev);
5795 return hex;
5796 }
5797
5798 return oid_to_hex(oid);
5799 }
5800
5801 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
5802 {
5803 int line_termination = opt->line_termination;
5804 int inter_name_termination = line_termination ? '\t' : '\0';
5805
5806 fprintf(opt->file, "%s", diff_line_prefix(opt));
5807 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
5808 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
5809 diff_aligned_abbrev(&p->one->oid, opt->abbrev));
5810 fprintf(opt->file, "%s ",
5811 diff_aligned_abbrev(&p->two->oid, opt->abbrev));
5812 }
5813 if (p->score) {
5814 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
5815 inter_name_termination);
5816 } else {
5817 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
5818 }
5819
5820 if (p->status == DIFF_STATUS_COPIED ||
5821 p->status == DIFF_STATUS_RENAMED) {
5822 const char *name_a, *name_b;
5823 name_a = p->one->path;
5824 name_b = p->two->path;
5825 strip_prefix(opt->prefix_length, &name_a, &name_b);
5826 write_name_quoted(name_a, opt->file, inter_name_termination);
5827 write_name_quoted(name_b, opt->file, line_termination);
5828 } else {
5829 const char *name_a, *name_b;
5830 name_a = p->one->mode ? p->one->path : p->two->path;
5831 name_b = NULL;
5832 strip_prefix(opt->prefix_length, &name_a, &name_b);
5833 write_name_quoted(name_a, opt->file, line_termination);
5834 }
5835 }
5836
5837 int diff_unmodified_pair(struct diff_filepair *p)
5838 {
5839 /* This function is written stricter than necessary to support
5840 * the currently implemented transformers, but the idea is to
5841 * let transformers to produce diff_filepairs any way they want,
5842 * and filter and clean them up here before producing the output.
5843 */
5844 struct diff_filespec *one = p->one, *two = p->two;
5845
5846 if (DIFF_PAIR_UNMERGED(p))
5847 return 0; /* unmerged is interesting */
5848
5849 /* deletion, addition, mode or type change
5850 * and rename are all interesting.
5851 */
5852 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
5853 DIFF_PAIR_MODE_CHANGED(p) ||
5854 strcmp(one->path, two->path))
5855 return 0;
5856
5857 /* both are valid and point at the same path. that is, we are
5858 * dealing with a change.
5859 */
5860 if (one->oid_valid && two->oid_valid &&
5861 oideq(&one->oid, &two->oid) &&
5862 !one->dirty_submodule && !two->dirty_submodule)
5863 return 1; /* no change */
5864 if (!one->oid_valid && !two->oid_valid)
5865 return 1; /* both look at the same file on the filesystem. */
5866 return 0;
5867 }
5868
5869 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
5870 {
5871 int include_conflict_headers =
5872 (additional_headers(o, p->one->path) &&
5873 !o->pickaxe_opts &&
5874 (!o->filter || filter_bit_tst(DIFF_STATUS_UNMERGED, o)));
5875
5876 /*
5877 * Check if we can return early without showing a diff. Note that
5878 * diff_filepair only stores {oid, path, mode, is_valid}
5879 * information for each path, and thus diff_unmodified_pair() only
5880 * considers those bits of info. However, we do not want pairs
5881 * created by create_filepairs_for_header_only_notifications()
5882 * (which always look like unmodified pairs) to be ignored, so
5883 * return early if both p is unmodified AND we don't want to
5884 * include_conflict_headers.
5885 */
5886 if (diff_unmodified_pair(p) && !include_conflict_headers)
5887 return;
5888
5889 /* Actually, we can also return early to avoid showing tree diffs */
5890 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
5891 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
5892 return;
5893
5894 run_diff(p, o);
5895 }
5896
5897 static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
5898 struct diffstat_t *diffstat)
5899 {
5900 if (diff_unmodified_pair(p))
5901 return;
5902
5903 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
5904 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
5905 return; /* no useful stat for tree diffs */
5906
5907 run_diffstat(p, o, diffstat);
5908 }
5909
5910 static void diff_flush_checkdiff(struct diff_filepair *p,
5911 struct diff_options *o)
5912 {
5913 if (diff_unmodified_pair(p))
5914 return;
5915
5916 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
5917 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
5918 return; /* nothing to check in tree diffs */
5919
5920 run_checkdiff(p, o);
5921 }
5922
5923 int diff_queue_is_empty(struct diff_options *o)
5924 {
5925 struct diff_queue_struct *q = &diff_queued_diff;
5926 int i;
5927 int include_conflict_headers =
5928 (o->additional_path_headers &&
5929 strmap_get_size(o->additional_path_headers) &&
5930 !o->pickaxe_opts &&
5931 (!o->filter || filter_bit_tst(DIFF_STATUS_UNMERGED, o)));
5932
5933 if (include_conflict_headers)
5934 return 0;
5935
5936 for (i = 0; i < q->nr; i++)
5937 if (!diff_unmodified_pair(q->queue[i]))
5938 return 0;
5939 return 1;
5940 }
5941
5942 #if DIFF_DEBUG
5943 void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
5944 {
5945 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
5946 x, one ? one : "",
5947 s->path,
5948 DIFF_FILE_VALID(s) ? "valid" : "invalid",
5949 s->mode,
5950 s->oid_valid ? oid_to_hex(&s->oid) : "");
5951 fprintf(stderr, "queue[%d] %s size %lu\n",
5952 x, one ? one : "",
5953 s->size);
5954 }
5955
5956 void diff_debug_filepair(const struct diff_filepair *p, int i)
5957 {
5958 diff_debug_filespec(p->one, i, "one");
5959 diff_debug_filespec(p->two, i, "two");
5960 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
5961 p->score, p->status ? p->status : '?',
5962 p->one->rename_used, p->broken_pair);
5963 }
5964
5965 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
5966 {
5967 int i;
5968 if (msg)
5969 fprintf(stderr, "%s\n", msg);
5970 fprintf(stderr, "q->nr = %d\n", q->nr);
5971 for (i = 0; i < q->nr; i++) {
5972 struct diff_filepair *p = q->queue[i];
5973 diff_debug_filepair(p, i);
5974 }
5975 }
5976 #endif
5977
5978 static void diff_resolve_rename_copy(void)
5979 {
5980 int i;
5981 struct diff_filepair *p;
5982 struct diff_queue_struct *q = &diff_queued_diff;
5983
5984 diff_debug_queue("resolve-rename-copy", q);
5985
5986 for (i = 0; i < q->nr; i++) {
5987 p = q->queue[i];
5988 p->status = 0; /* undecided */
5989 if (DIFF_PAIR_UNMERGED(p))
5990 p->status = DIFF_STATUS_UNMERGED;
5991 else if (!DIFF_FILE_VALID(p->one))
5992 p->status = DIFF_STATUS_ADDED;
5993 else if (!DIFF_FILE_VALID(p->two))
5994 p->status = DIFF_STATUS_DELETED;
5995 else if (DIFF_PAIR_TYPE_CHANGED(p))
5996 p->status = DIFF_STATUS_TYPE_CHANGED;
5997
5998 /* from this point on, we are dealing with a pair
5999 * whose both sides are valid and of the same type, i.e.
6000 * either in-place edit or rename/copy edit.
6001 */
6002 else if (DIFF_PAIR_RENAME(p)) {
6003 /*
6004 * A rename might have re-connected a broken
6005 * pair up, causing the pathnames to be the
6006 * same again. If so, that's not a rename at
6007 * all, just a modification..
6008 *
6009 * Otherwise, see if this source was used for
6010 * multiple renames, in which case we decrement
6011 * the count, and call it a copy.
6012 */
6013 if (!strcmp(p->one->path, p->two->path))
6014 p->status = DIFF_STATUS_MODIFIED;
6015 else if (--p->one->rename_used > 0)
6016 p->status = DIFF_STATUS_COPIED;
6017 else
6018 p->status = DIFF_STATUS_RENAMED;
6019 }
6020 else if (!oideq(&p->one->oid, &p->two->oid) ||
6021 p->one->mode != p->two->mode ||
6022 p->one->dirty_submodule ||
6023 p->two->dirty_submodule ||
6024 is_null_oid(&p->one->oid))
6025 p->status = DIFF_STATUS_MODIFIED;
6026 else {
6027 /* This is a "no-change" entry and should not
6028 * happen anymore, but prepare for broken callers.
6029 */
6030 error("feeding unmodified %s to diffcore",
6031 p->one->path);
6032 p->status = DIFF_STATUS_UNKNOWN;
6033 }
6034 }
6035 diff_debug_queue("resolve-rename-copy done", q);
6036 }
6037
6038 static int check_pair_status(struct diff_filepair *p)
6039 {
6040 switch (p->status) {
6041 case DIFF_STATUS_UNKNOWN:
6042 return 0;
6043 case 0:
6044 die("internal error in diff-resolve-rename-copy");
6045 default:
6046 return 1;
6047 }
6048 }
6049
6050 static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
6051 {
6052 int fmt = opt->output_format;
6053
6054 if (fmt & DIFF_FORMAT_CHECKDIFF)
6055 diff_flush_checkdiff(p, opt);
6056 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
6057 diff_flush_raw(p, opt);
6058 else if (fmt & DIFF_FORMAT_NAME) {
6059 const char *name_a, *name_b;
6060 name_a = p->two->path;
6061 name_b = NULL;
6062 strip_prefix(opt->prefix_length, &name_a, &name_b);
6063 fprintf(opt->file, "%s", diff_line_prefix(opt));
6064 write_name_quoted(name_a, opt->file, opt->line_termination);
6065 }
6066 }
6067
6068 static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs)
6069 {
6070 struct strbuf sb = STRBUF_INIT;
6071 if (fs->mode)
6072 strbuf_addf(&sb, " %s mode %06o ", newdelete, fs->mode);
6073 else
6074 strbuf_addf(&sb, " %s ", newdelete);
6075
6076 quote_c_style(fs->path, &sb, NULL, 0);
6077 strbuf_addch(&sb, '\n');
6078 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
6079 sb.buf, sb.len, 0);
6080 strbuf_release(&sb);
6081 }
6082
6083 static void show_mode_change(struct diff_options *opt, struct diff_filepair *p,
6084 int show_name)
6085 {
6086 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
6087 struct strbuf sb = STRBUF_INIT;
6088 strbuf_addf(&sb, " mode change %06o => %06o",
6089 p->one->mode, p->two->mode);
6090 if (show_name) {
6091 strbuf_addch(&sb, ' ');
6092 quote_c_style(p->two->path, &sb, NULL, 0);
6093 }
6094 strbuf_addch(&sb, '\n');
6095 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
6096 sb.buf, sb.len, 0);
6097 strbuf_release(&sb);
6098 }
6099 }
6100
6101 static void show_rename_copy(struct diff_options *opt, const char *renamecopy,
6102 struct diff_filepair *p)
6103 {
6104 struct strbuf sb = STRBUF_INIT;
6105 struct strbuf names = STRBUF_INIT;
6106
6107 pprint_rename(&names, p->one->path, p->two->path);
6108 strbuf_addf(&sb, " %s %s (%d%%)\n",
6109 renamecopy, names.buf, similarity_index(p));
6110 strbuf_release(&names);
6111 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
6112 sb.buf, sb.len, 0);
6113 show_mode_change(opt, p, 0);
6114 strbuf_release(&sb);
6115 }
6116
6117 static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
6118 {
6119 switch(p->status) {
6120 case DIFF_STATUS_DELETED:
6121 show_file_mode_name(opt, "delete", p->one);
6122 break;
6123 case DIFF_STATUS_ADDED:
6124 show_file_mode_name(opt, "create", p->two);
6125 break;
6126 case DIFF_STATUS_COPIED:
6127 show_rename_copy(opt, "copy", p);
6128 break;
6129 case DIFF_STATUS_RENAMED:
6130 show_rename_copy(opt, "rename", p);
6131 break;
6132 default:
6133 if (p->score) {
6134 struct strbuf sb = STRBUF_INIT;
6135 strbuf_addstr(&sb, " rewrite ");
6136 quote_c_style(p->two->path, &sb, NULL, 0);
6137 strbuf_addf(&sb, " (%d%%)\n", similarity_index(p));
6138 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
6139 sb.buf, sb.len, 0);
6140 strbuf_release(&sb);
6141 }
6142 show_mode_change(opt, p, !p->score);
6143 break;
6144 }
6145 }
6146
6147 struct patch_id_t {
6148 git_hash_ctx *ctx;
6149 int patchlen;
6150 };
6151
6152 static int remove_space(char *line, int len)
6153 {
6154 int i;
6155 char *dst = line;
6156 unsigned char c;
6157
6158 for (i = 0; i < len; i++)
6159 if (!isspace((c = line[i])))
6160 *dst++ = c;
6161
6162 return dst - line;
6163 }
6164
6165 void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx)
6166 {
6167 unsigned char hash[GIT_MAX_RAWSZ];
6168 unsigned short carry = 0;
6169 int i;
6170
6171 the_hash_algo->final_fn(hash, ctx);
6172 the_hash_algo->init_fn(ctx);
6173 /* 20-byte sum, with carry */
6174 for (i = 0; i < the_hash_algo->rawsz; ++i) {
6175 carry += result->hash[i] + hash[i];
6176 result->hash[i] = carry;
6177 carry >>= 8;
6178 }
6179 }
6180
6181 static int patch_id_consume(void *priv, char *line, unsigned long len)
6182 {
6183 struct patch_id_t *data = priv;
6184 int new_len;
6185
6186 if (len > 12 && starts_with(line, "\\ "))
6187 return 0;
6188 new_len = remove_space(line, len);
6189
6190 the_hash_algo->update_fn(data->ctx, line, new_len);
6191 data->patchlen += new_len;
6192 return 0;
6193 }
6194
6195 static void patch_id_add_string(git_hash_ctx *ctx, const char *str)
6196 {
6197 the_hash_algo->update_fn(ctx, str, strlen(str));
6198 }
6199
6200 static void patch_id_add_mode(git_hash_ctx *ctx, unsigned mode)
6201 {
6202 /* large enough for 2^32 in octal */
6203 char buf[12];
6204 int len = xsnprintf(buf, sizeof(buf), "%06o", mode);
6205 the_hash_algo->update_fn(ctx, buf, len);
6206 }
6207
6208 /* returns 0 upon success, and writes result into oid */
6209 static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
6210 {
6211 struct diff_queue_struct *q = &diff_queued_diff;
6212 int i;
6213 git_hash_ctx ctx;
6214 struct patch_id_t data;
6215
6216 the_hash_algo->init_fn(&ctx);
6217 memset(&data, 0, sizeof(struct patch_id_t));
6218 data.ctx = &ctx;
6219 oidclr(oid);
6220
6221 for (i = 0; i < q->nr; i++) {
6222 xpparam_t xpp;
6223 xdemitconf_t xecfg;
6224 mmfile_t mf1, mf2;
6225 struct diff_filepair *p = q->queue[i];
6226 int len1, len2;
6227
6228 memset(&xpp, 0, sizeof(xpp));
6229 memset(&xecfg, 0, sizeof(xecfg));
6230 if (p->status == 0)
6231 return error("internal diff status error");
6232 if (p->status == DIFF_STATUS_UNKNOWN)
6233 continue;
6234 if (diff_unmodified_pair(p))
6235 continue;
6236 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
6237 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
6238 continue;
6239 if (DIFF_PAIR_UNMERGED(p))
6240 continue;
6241
6242 diff_fill_oid_info(p->one, options->repo->index);
6243 diff_fill_oid_info(p->two, options->repo->index);
6244
6245 len1 = remove_space(p->one->path, strlen(p->one->path));
6246 len2 = remove_space(p->two->path, strlen(p->two->path));
6247 patch_id_add_string(&ctx, "diff--git");
6248 patch_id_add_string(&ctx, "a/");
6249 the_hash_algo->update_fn(&ctx, p->one->path, len1);
6250 patch_id_add_string(&ctx, "b/");
6251 the_hash_algo->update_fn(&ctx, p->two->path, len2);
6252
6253 if (p->one->mode == 0) {
6254 patch_id_add_string(&ctx, "newfilemode");
6255 patch_id_add_mode(&ctx, p->two->mode);
6256 patch_id_add_string(&ctx, "---/dev/null");
6257 patch_id_add_string(&ctx, "+++b/");
6258 the_hash_algo->update_fn(&ctx, p->two->path, len2);
6259 } else if (p->two->mode == 0) {
6260 patch_id_add_string(&ctx, "deletedfilemode");
6261 patch_id_add_mode(&ctx, p->one->mode);
6262 patch_id_add_string(&ctx, "---a/");
6263 the_hash_algo->update_fn(&ctx, p->one->path, len1);
6264 patch_id_add_string(&ctx, "+++/dev/null");
6265 } else {
6266 patch_id_add_string(&ctx, "---a/");
6267 the_hash_algo->update_fn(&ctx, p->one->path, len1);
6268 patch_id_add_string(&ctx, "+++b/");
6269 the_hash_algo->update_fn(&ctx, p->two->path, len2);
6270 }
6271
6272 if (diff_header_only)
6273 continue;
6274
6275 if (fill_mmfile(options->repo, &mf1, p->one) < 0 ||
6276 fill_mmfile(options->repo, &mf2, p->two) < 0)
6277 return error("unable to read files to diff");
6278
6279 if (diff_filespec_is_binary(options->repo, p->one) ||
6280 diff_filespec_is_binary(options->repo, p->two)) {
6281 the_hash_algo->update_fn(&ctx, oid_to_hex(&p->one->oid),
6282 the_hash_algo->hexsz);
6283 the_hash_algo->update_fn(&ctx, oid_to_hex(&p->two->oid),
6284 the_hash_algo->hexsz);
6285 continue;
6286 }
6287
6288 xpp.flags = 0;
6289 xecfg.ctxlen = 3;
6290 xecfg.flags = XDL_EMIT_NO_HUNK_HDR;
6291 if (xdi_diff_outf(&mf1, &mf2, NULL,
6292 patch_id_consume, &data, &xpp, &xecfg))
6293 return error("unable to generate patch-id diff for %s",
6294 p->one->path);
6295
6296 if (stable)
6297 flush_one_hunk(oid, &ctx);
6298 }
6299
6300 if (!stable)
6301 the_hash_algo->final_oid_fn(oid, &ctx);
6302
6303 return 0;
6304 }
6305
6306 int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
6307 {
6308 struct diff_queue_struct *q = &diff_queued_diff;
6309 int i;
6310 int result = diff_get_patch_id(options, oid, diff_header_only, stable);
6311
6312 for (i = 0; i < q->nr; i++)
6313 diff_free_filepair(q->queue[i]);
6314
6315 free(q->queue);
6316 DIFF_QUEUE_CLEAR(q);
6317
6318 return result;
6319 }
6320
6321 static int is_summary_empty(const struct diff_queue_struct *q)
6322 {
6323 int i;
6324
6325 for (i = 0; i < q->nr; i++) {
6326 const struct diff_filepair *p = q->queue[i];
6327
6328 switch (p->status) {
6329 case DIFF_STATUS_DELETED:
6330 case DIFF_STATUS_ADDED:
6331 case DIFF_STATUS_COPIED:
6332 case DIFF_STATUS_RENAMED:
6333 return 0;
6334 default:
6335 if (p->score)
6336 return 0;
6337 if (p->one->mode && p->two->mode &&
6338 p->one->mode != p->two->mode)
6339 return 0;
6340 break;
6341 }
6342 }
6343 return 1;
6344 }
6345
6346 static const char rename_limit_warning[] =
6347 N_("exhaustive rename detection was skipped due to too many files.");
6348
6349 static const char degrade_cc_to_c_warning[] =
6350 N_("only found copies from modified paths due to too many files.");
6351
6352 static const char rename_limit_advice[] =
6353 N_("you may want to set your %s variable to at least "
6354 "%d and retry the command.");
6355
6356 void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
6357 {
6358 fflush(stdout);
6359 if (degraded_cc)
6360 warning(_(degrade_cc_to_c_warning));
6361 else if (needed)
6362 warning(_(rename_limit_warning));
6363 else
6364 return;
6365 if (0 < needed)
6366 warning(_(rename_limit_advice), varname, needed);
6367 }
6368
6369 static void create_filepairs_for_header_only_notifications(struct diff_options *o)
6370 {
6371 struct strset present;
6372 struct diff_queue_struct *q = &diff_queued_diff;
6373 struct hashmap_iter iter;
6374 struct strmap_entry *e;
6375 int i;
6376
6377 strset_init_with_options(&present, /*pool*/ NULL, /*strdup*/ 0);
6378
6379 /*
6380 * Find out which paths exist in diff_queued_diff, preferring
6381 * one->path for any pair that has multiple paths.
6382 */
6383 for (i = 0; i < q->nr; i++) {
6384 struct diff_filepair *p = q->queue[i];
6385 char *path = p->one->path ? p->one->path : p->two->path;
6386
6387 if (strmap_contains(o->additional_path_headers, path))
6388 strset_add(&present, path);
6389 }
6390
6391 /*
6392 * Loop over paths in additional_path_headers; for each NOT already
6393 * in diff_queued_diff, create a synthetic filepair and insert that
6394 * into diff_queued_diff.
6395 */
6396 strmap_for_each_entry(o->additional_path_headers, &iter, e) {
6397 if (!strset_contains(&present, e->key)) {
6398 struct diff_filespec *one, *two;
6399 struct diff_filepair *p;
6400
6401 one = alloc_filespec(e->key);
6402 two = alloc_filespec(e->key);
6403 fill_filespec(one, null_oid(), 0, 0);
6404 fill_filespec(two, null_oid(), 0, 0);
6405 p = diff_queue(q, one, two);
6406 p->status = DIFF_STATUS_MODIFIED;
6407 }
6408 }
6409
6410 /* Re-sort the filepairs */
6411 diffcore_fix_diff_index();
6412
6413 /* Cleanup */
6414 strset_clear(&present);
6415 }
6416
6417 static void diff_flush_patch_all_file_pairs(struct diff_options *o)
6418 {
6419 int i;
6420 static struct emitted_diff_symbols esm = EMITTED_DIFF_SYMBOLS_INIT;
6421 struct diff_queue_struct *q = &diff_queued_diff;
6422
6423 if (WSEH_NEW & WS_RULE_MASK)
6424 BUG("WS rules bit mask overlaps with diff symbol flags");
6425
6426 if (o->color_moved)
6427 o->emitted_symbols = &esm;
6428
6429 if (o->additional_path_headers)
6430 create_filepairs_for_header_only_notifications(o);
6431
6432 for (i = 0; i < q->nr; i++) {
6433 struct diff_filepair *p = q->queue[i];
6434 if (check_pair_status(p))
6435 diff_flush_patch(p, o);
6436 }
6437
6438 if (o->emitted_symbols) {
6439 if (o->color_moved) {
6440 struct mem_pool entry_pool;
6441 struct moved_entry_list *entry_list;
6442
6443 mem_pool_init(&entry_pool, 1024 * 1024);
6444 entry_list = add_lines_to_move_detection(o,
6445 &entry_pool);
6446 mark_color_as_moved(o, entry_list);
6447 if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
6448 dim_moved_lines(o);
6449
6450 mem_pool_discard(&entry_pool, 0);
6451 free(entry_list);
6452 }
6453
6454 for (i = 0; i < esm.nr; i++)
6455 emit_diff_symbol_from_struct(o, &esm.buf[i]);
6456
6457 for (i = 0; i < esm.nr; i++)
6458 free((void *)esm.buf[i].line);
6459 esm.nr = 0;
6460
6461 o->emitted_symbols = NULL;
6462 }
6463 }
6464
6465 static void diff_free_file(struct diff_options *options)
6466 {
6467 if (options->close_file)
6468 fclose(options->file);
6469 }
6470
6471 static void diff_free_ignore_regex(struct diff_options *options)
6472 {
6473 int i;
6474
6475 for (i = 0; i < options->ignore_regex_nr; i++) {
6476 regfree(options->ignore_regex[i]);
6477 free(options->ignore_regex[i]);
6478 }
6479 free(options->ignore_regex);
6480 }
6481
6482 void diff_free(struct diff_options *options)
6483 {
6484 if (options->no_free)
6485 return;
6486
6487 diff_free_file(options);
6488 diff_free_ignore_regex(options);
6489 clear_pathspec(&options->pathspec);
6490 FREE_AND_NULL(options->parseopts);
6491 }
6492
6493 void diff_flush(struct diff_options *options)
6494 {
6495 struct diff_queue_struct *q = &diff_queued_diff;
6496 int i, output_format = options->output_format;
6497 int separator = 0;
6498 int dirstat_by_line = 0;
6499
6500 /*
6501 * Order: raw, stat, summary, patch
6502 * or: name/name-status/checkdiff (other bits clear)
6503 */
6504 if (!q->nr && !options->additional_path_headers)
6505 goto free_queue;
6506
6507 if (output_format & (DIFF_FORMAT_RAW |
6508 DIFF_FORMAT_NAME |
6509 DIFF_FORMAT_NAME_STATUS |
6510 DIFF_FORMAT_CHECKDIFF)) {
6511 for (i = 0; i < q->nr; i++) {
6512 struct diff_filepair *p = q->queue[i];
6513 if (check_pair_status(p))
6514 flush_one_pair(p, options);
6515 }
6516 separator++;
6517 }
6518
6519 if (output_format & DIFF_FORMAT_DIRSTAT && options->flags.dirstat_by_line)
6520 dirstat_by_line = 1;
6521
6522 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
6523 dirstat_by_line) {
6524 struct diffstat_t diffstat;
6525
6526 compute_diffstat(options, &diffstat, q);
6527 if (output_format & DIFF_FORMAT_NUMSTAT)
6528 show_numstat(&diffstat, options);
6529 if (output_format & DIFF_FORMAT_DIFFSTAT)
6530 show_stats(&diffstat, options);
6531 if (output_format & DIFF_FORMAT_SHORTSTAT)
6532 show_shortstats(&diffstat, options);
6533 if (output_format & DIFF_FORMAT_DIRSTAT && dirstat_by_line)
6534 show_dirstat_by_line(&diffstat, options);
6535 free_diffstat_info(&diffstat);
6536 separator++;
6537 }
6538 if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line)
6539 show_dirstat(options);
6540
6541 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
6542 for (i = 0; i < q->nr; i++) {
6543 diff_summary(options, q->queue[i]);
6544 }
6545 separator++;
6546 }
6547
6548 if (output_format & DIFF_FORMAT_NO_OUTPUT &&
6549 options->flags.exit_with_status &&
6550 options->flags.diff_from_contents) {
6551 /*
6552 * run diff_flush_patch for the exit status. setting
6553 * options->file to /dev/null should be safe, because we
6554 * aren't supposed to produce any output anyway.
6555 */
6556 diff_free_file(options);
6557 options->file = xfopen("/dev/null", "w");
6558 options->close_file = 1;
6559 options->color_moved = 0;
6560 for (i = 0; i < q->nr; i++) {
6561 struct diff_filepair *p = q->queue[i];
6562 if (check_pair_status(p))
6563 diff_flush_patch(p, options);
6564 if (options->found_changes)
6565 break;
6566 }
6567 }
6568
6569 if (output_format & DIFF_FORMAT_PATCH) {
6570 if (separator) {
6571 emit_diff_symbol(options, DIFF_SYMBOL_SEPARATOR, NULL, 0, 0);
6572 if (options->stat_sep)
6573 /* attach patch instead of inline */
6574 emit_diff_symbol(options, DIFF_SYMBOL_STAT_SEP,
6575 NULL, 0, 0);
6576 }
6577
6578 diff_flush_patch_all_file_pairs(options);
6579 }
6580
6581 if (output_format & DIFF_FORMAT_CALLBACK)
6582 options->format_callback(q, options, options->format_callback_data);
6583
6584 for (i = 0; i < q->nr; i++)
6585 diff_free_filepair(q->queue[i]);
6586 free_queue:
6587 free(q->queue);
6588 DIFF_QUEUE_CLEAR(q);
6589 diff_free(options);
6590
6591 /*
6592 * Report the content-level differences with HAS_CHANGES;
6593 * diff_addremove/diff_change does not set the bit when
6594 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
6595 */
6596 if (options->flags.diff_from_contents) {
6597 if (options->found_changes)
6598 options->flags.has_changes = 1;
6599 else
6600 options->flags.has_changes = 0;
6601 }
6602 }
6603
6604 static int match_filter(const struct diff_options *options, const struct diff_filepair *p)
6605 {
6606 return (((p->status == DIFF_STATUS_MODIFIED) &&
6607 ((p->score &&
6608 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) ||
6609 (!p->score &&
6610 filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) ||
6611 ((p->status != DIFF_STATUS_MODIFIED) &&
6612 filter_bit_tst(p->status, options)));
6613 }
6614
6615 static void diffcore_apply_filter(struct diff_options *options)
6616 {
6617 int i;
6618 struct diff_queue_struct *q = &diff_queued_diff;
6619 struct diff_queue_struct outq;
6620
6621 DIFF_QUEUE_CLEAR(&outq);
6622
6623 if (!options->filter)
6624 return;
6625
6626 if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) {
6627 int found;
6628 for (i = found = 0; !found && i < q->nr; i++) {
6629 if (match_filter(options, q->queue[i]))
6630 found++;
6631 }
6632 if (found)
6633 return;
6634
6635 /* otherwise we will clear the whole queue
6636 * by copying the empty outq at the end of this
6637 * function, but first clear the current entries
6638 * in the queue.
6639 */
6640 for (i = 0; i < q->nr; i++)
6641 diff_free_filepair(q->queue[i]);
6642 }
6643 else {
6644 /* Only the matching ones */
6645 for (i = 0; i < q->nr; i++) {
6646 struct diff_filepair *p = q->queue[i];
6647 if (match_filter(options, p))
6648 diff_q(&outq, p);
6649 else
6650 diff_free_filepair(p);
6651 }
6652 }
6653 free(q->queue);
6654 *q = outq;
6655 }
6656
6657 /* Check whether two filespecs with the same mode and size are identical */
6658 static int diff_filespec_is_identical(struct repository *r,
6659 struct diff_filespec *one,
6660 struct diff_filespec *two)
6661 {
6662 if (S_ISGITLINK(one->mode))
6663 return 0;
6664 if (diff_populate_filespec(r, one, NULL))
6665 return 0;
6666 if (diff_populate_filespec(r, two, NULL))
6667 return 0;
6668 return !memcmp(one->data, two->data, one->size);
6669 }
6670
6671 static int diff_filespec_check_stat_unmatch(struct repository *r,
6672 struct diff_filepair *p)
6673 {
6674 struct diff_populate_filespec_options dpf_options = {
6675 .check_size_only = 1,
6676 .missing_object_cb = diff_queued_diff_prefetch,
6677 .missing_object_data = r,
6678 };
6679
6680 if (p->done_skip_stat_unmatch)
6681 return p->skip_stat_unmatch_result;
6682
6683 p->done_skip_stat_unmatch = 1;
6684 p->skip_stat_unmatch_result = 0;
6685 /*
6686 * 1. Entries that come from stat info dirtiness
6687 * always have both sides (iow, not create/delete),
6688 * one side of the object name is unknown, with
6689 * the same mode and size. Keep the ones that
6690 * do not match these criteria. They have real
6691 * differences.
6692 *
6693 * 2. At this point, the file is known to be modified,
6694 * with the same mode and size, and the object
6695 * name of one side is unknown. Need to inspect
6696 * the identical contents.
6697 */
6698 if (!DIFF_FILE_VALID(p->one) || /* (1) */
6699 !DIFF_FILE_VALID(p->two) ||
6700 (p->one->oid_valid && p->two->oid_valid) ||
6701 (p->one->mode != p->two->mode) ||
6702 diff_populate_filespec(r, p->one, &dpf_options) ||
6703 diff_populate_filespec(r, p->two, &dpf_options) ||
6704 (p->one->size != p->two->size) ||
6705 !diff_filespec_is_identical(r, p->one, p->two)) /* (2) */
6706 p->skip_stat_unmatch_result = 1;
6707 return p->skip_stat_unmatch_result;
6708 }
6709
6710 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
6711 {
6712 int i;
6713 struct diff_queue_struct *q = &diff_queued_diff;
6714 struct diff_queue_struct outq;
6715 DIFF_QUEUE_CLEAR(&outq);
6716
6717 for (i = 0; i < q->nr; i++) {
6718 struct diff_filepair *p = q->queue[i];
6719
6720 if (diff_filespec_check_stat_unmatch(diffopt->repo, p))
6721 diff_q(&outq, p);
6722 else {
6723 /*
6724 * The caller can subtract 1 from skip_stat_unmatch
6725 * to determine how many paths were dirty only
6726 * due to stat info mismatch.
6727 */
6728 if (!diffopt->flags.no_index)
6729 diffopt->skip_stat_unmatch++;
6730 diff_free_filepair(p);
6731 }
6732 }
6733 free(q->queue);
6734 *q = outq;
6735 }
6736
6737 static int diffnamecmp(const void *a_, const void *b_)
6738 {
6739 const struct diff_filepair *a = *((const struct diff_filepair **)a_);
6740 const struct diff_filepair *b = *((const struct diff_filepair **)b_);
6741 const char *name_a, *name_b;
6742
6743 name_a = a->one ? a->one->path : a->two->path;
6744 name_b = b->one ? b->one->path : b->two->path;
6745 return strcmp(name_a, name_b);
6746 }
6747
6748 void diffcore_fix_diff_index(void)
6749 {
6750 struct diff_queue_struct *q = &diff_queued_diff;
6751 QSORT(q->queue, q->nr, diffnamecmp);
6752 }
6753
6754 void diff_add_if_missing(struct repository *r,
6755 struct oid_array *to_fetch,
6756 const struct diff_filespec *filespec)
6757 {
6758 if (filespec && filespec->oid_valid &&
6759 !S_ISGITLINK(filespec->mode) &&
6760 oid_object_info_extended(r, &filespec->oid, NULL,
6761 OBJECT_INFO_FOR_PREFETCH))
6762 oid_array_append(to_fetch, &filespec->oid);
6763 }
6764
6765 void diff_queued_diff_prefetch(void *repository)
6766 {
6767 struct repository *repo = repository;
6768 int i;
6769 struct diff_queue_struct *q = &diff_queued_diff;
6770 struct oid_array to_fetch = OID_ARRAY_INIT;
6771
6772 for (i = 0; i < q->nr; i++) {
6773 struct diff_filepair *p = q->queue[i];
6774 diff_add_if_missing(repo, &to_fetch, p->one);
6775 diff_add_if_missing(repo, &to_fetch, p->two);
6776 }
6777
6778 /*
6779 * NEEDSWORK: Consider deduplicating the OIDs sent.
6780 */
6781 promisor_remote_get_direct(repo, to_fetch.oid, to_fetch.nr);
6782
6783 oid_array_clear(&to_fetch);
6784 }
6785
6786 void diffcore_std(struct diff_options *options)
6787 {
6788 int output_formats_to_prefetch = DIFF_FORMAT_DIFFSTAT |
6789 DIFF_FORMAT_NUMSTAT |
6790 DIFF_FORMAT_PATCH |
6791 DIFF_FORMAT_SHORTSTAT |
6792 DIFF_FORMAT_DIRSTAT;
6793
6794 /*
6795 * Check if the user requested a blob-data-requiring diff output and/or
6796 * break-rewrite detection (which requires blob data). If yes, prefetch
6797 * the diff pairs.
6798 *
6799 * If no prefetching occurs, diffcore_rename() will prefetch if it
6800 * decides that it needs inexact rename detection.
6801 */
6802 if (options->repo == the_repository && has_promisor_remote() &&
6803 (options->output_format & output_formats_to_prefetch ||
6804 options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
6805 diff_queued_diff_prefetch(options->repo);
6806
6807 /* NOTE please keep the following in sync with diff_tree_combined() */
6808 if (options->skip_stat_unmatch)
6809 diffcore_skip_stat_unmatch(options);
6810 if (!options->found_follow) {
6811 /* See try_to_follow_renames() in tree-diff.c */
6812 if (options->break_opt != -1)
6813 diffcore_break(options->repo,
6814 options->break_opt);
6815 if (options->detect_rename)
6816 diffcore_rename(options);
6817 if (options->break_opt != -1)
6818 diffcore_merge_broken();
6819 }
6820 if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)
6821 diffcore_pickaxe(options);
6822 if (options->orderfile)
6823 diffcore_order(options->orderfile);
6824 if (options->rotate_to)
6825 diffcore_rotate(options);
6826 if (!options->found_follow)
6827 /* See try_to_follow_renames() in tree-diff.c */
6828 diff_resolve_rename_copy();
6829 diffcore_apply_filter(options);
6830
6831 if (diff_queued_diff.nr && !options->flags.diff_from_contents)
6832 options->flags.has_changes = 1;
6833 else
6834 options->flags.has_changes = 0;
6835
6836 options->found_follow = 0;
6837 }
6838
6839 int diff_result_code(struct diff_options *opt, int status)
6840 {
6841 int result = 0;
6842
6843 diff_warn_rename_limit("diff.renameLimit",
6844 opt->needed_rename_limit,
6845 opt->degraded_cc_to_c);
6846 if (!opt->flags.exit_with_status &&
6847 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
6848 return status;
6849 if (opt->flags.exit_with_status &&
6850 opt->flags.has_changes)
6851 result |= 01;
6852 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
6853 opt->flags.check_failed)
6854 result |= 02;
6855 return result;
6856 }
6857
6858 int diff_can_quit_early(struct diff_options *opt)
6859 {
6860 return (opt->flags.quick &&
6861 !opt->filter &&
6862 opt->flags.has_changes);
6863 }
6864
6865 /*
6866 * Shall changes to this submodule be ignored?
6867 *
6868 * Submodule changes can be configured to be ignored separately for each path,
6869 * but that configuration can be overridden from the command line.
6870 */
6871 static int is_submodule_ignored(const char *path, struct diff_options *options)
6872 {
6873 int ignored = 0;
6874 struct diff_flags orig_flags = options->flags;
6875 if (!options->flags.override_submodule_config)
6876 set_diffopt_flags_from_submodule_config(options, path);
6877 if (options->flags.ignore_submodules)
6878 ignored = 1;
6879 options->flags = orig_flags;
6880 return ignored;
6881 }
6882
6883 void compute_diffstat(struct diff_options *options,
6884 struct diffstat_t *diffstat,
6885 struct diff_queue_struct *q)
6886 {
6887 int i;
6888
6889 memset(diffstat, 0, sizeof(struct diffstat_t));
6890 for (i = 0; i < q->nr; i++) {
6891 struct diff_filepair *p = q->queue[i];
6892 if (check_pair_status(p))
6893 diff_flush_stat(p, options, diffstat);
6894 }
6895 }
6896
6897 void diff_addremove(struct diff_options *options,
6898 int addremove, unsigned mode,
6899 const struct object_id *oid,
6900 int oid_valid,
6901 const char *concatpath, unsigned dirty_submodule)
6902 {
6903 struct diff_filespec *one, *two;
6904
6905 if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options))
6906 return;
6907
6908 /* This may look odd, but it is a preparation for
6909 * feeding "there are unchanged files which should
6910 * not produce diffs, but when you are doing copy
6911 * detection you would need them, so here they are"
6912 * entries to the diff-core. They will be prefixed
6913 * with something like '=' or '*' (I haven't decided
6914 * which but should not make any difference).
6915 * Feeding the same new and old to diff_change()
6916 * also has the same effect.
6917 * Before the final output happens, they are pruned after
6918 * merged into rename/copy pairs as appropriate.
6919 */
6920 if (options->flags.reverse_diff)
6921 addremove = (addremove == '+' ? '-' :
6922 addremove == '-' ? '+' : addremove);
6923
6924 if (options->prefix &&
6925 strncmp(concatpath, options->prefix, options->prefix_length))
6926 return;
6927
6928 one = alloc_filespec(concatpath);
6929 two = alloc_filespec(concatpath);
6930
6931 if (addremove != '+')
6932 fill_filespec(one, oid, oid_valid, mode);
6933 if (addremove != '-') {
6934 fill_filespec(two, oid, oid_valid, mode);
6935 two->dirty_submodule = dirty_submodule;
6936 }
6937
6938 diff_queue(&diff_queued_diff, one, two);
6939 if (!options->flags.diff_from_contents)
6940 options->flags.has_changes = 1;
6941 }
6942
6943 void diff_change(struct diff_options *options,
6944 unsigned old_mode, unsigned new_mode,
6945 const struct object_id *old_oid,
6946 const struct object_id *new_oid,
6947 int old_oid_valid, int new_oid_valid,
6948 const char *concatpath,
6949 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
6950 {
6951 struct diff_filespec *one, *two;
6952 struct diff_filepair *p;
6953
6954 if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) &&
6955 is_submodule_ignored(concatpath, options))
6956 return;
6957
6958 if (options->flags.reverse_diff) {
6959 SWAP(old_mode, new_mode);
6960 SWAP(old_oid, new_oid);
6961 SWAP(old_oid_valid, new_oid_valid);
6962 SWAP(old_dirty_submodule, new_dirty_submodule);
6963 }
6964
6965 if (options->prefix &&
6966 strncmp(concatpath, options->prefix, options->prefix_length))
6967 return;
6968
6969 one = alloc_filespec(concatpath);
6970 two = alloc_filespec(concatpath);
6971 fill_filespec(one, old_oid, old_oid_valid, old_mode);
6972 fill_filespec(two, new_oid, new_oid_valid, new_mode);
6973 one->dirty_submodule = old_dirty_submodule;
6974 two->dirty_submodule = new_dirty_submodule;
6975 p = diff_queue(&diff_queued_diff, one, two);
6976
6977 if (options->flags.diff_from_contents)
6978 return;
6979
6980 if (options->flags.quick && options->skip_stat_unmatch &&
6981 !diff_filespec_check_stat_unmatch(options->repo, p)) {
6982 diff_free_filespec_data(p->one);
6983 diff_free_filespec_data(p->two);
6984 return;
6985 }
6986
6987 options->flags.has_changes = 1;
6988 }
6989
6990 struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
6991 {
6992 struct diff_filepair *pair;
6993 struct diff_filespec *one, *two;
6994
6995 if (options->prefix &&
6996 strncmp(path, options->prefix, options->prefix_length))
6997 return NULL;
6998
6999 one = alloc_filespec(path);
7000 two = alloc_filespec(path);
7001 pair = diff_queue(&diff_queued_diff, one, two);
7002 pair->is_unmerged = 1;
7003 return pair;
7004 }
7005
7006 static char *run_textconv(struct repository *r,
7007 const char *pgm,
7008 struct diff_filespec *spec,
7009 size_t *outsize)
7010 {
7011 struct diff_tempfile *temp;
7012 struct child_process child = CHILD_PROCESS_INIT;
7013 struct strbuf buf = STRBUF_INIT;
7014 int err = 0;
7015
7016 temp = prepare_temp_file(r, spec->path, spec);
7017 strvec_push(&child.args, pgm);
7018 strvec_push(&child.args, temp->name);
7019
7020 child.use_shell = 1;
7021 child.out = -1;
7022 if (start_command(&child)) {
7023 remove_tempfile();
7024 return NULL;
7025 }
7026
7027 if (strbuf_read(&buf, child.out, 0) < 0)
7028 err = error("error reading from textconv command '%s'", pgm);
7029 close(child.out);
7030
7031 if (finish_command(&child) || err) {
7032 strbuf_release(&buf);
7033 remove_tempfile();
7034 return NULL;
7035 }
7036 remove_tempfile();
7037
7038 return strbuf_detach(&buf, outsize);
7039 }
7040
7041 size_t fill_textconv(struct repository *r,
7042 struct userdiff_driver *driver,
7043 struct diff_filespec *df,
7044 char **outbuf)
7045 {
7046 size_t size;
7047
7048 if (!driver) {
7049 if (!DIFF_FILE_VALID(df)) {
7050 *outbuf = "";
7051 return 0;
7052 }
7053 if (diff_populate_filespec(r, df, NULL))
7054 die("unable to read files to diff");
7055 *outbuf = df->data;
7056 return df->size;
7057 }
7058
7059 if (!driver->textconv)
7060 BUG("fill_textconv called with non-textconv driver");
7061
7062 if (driver->textconv_cache && df->oid_valid) {
7063 *outbuf = notes_cache_get(driver->textconv_cache,
7064 &df->oid,
7065 &size);
7066 if (*outbuf)
7067 return size;
7068 }
7069
7070 *outbuf = run_textconv(r, driver->textconv, df, &size);
7071 if (!*outbuf)
7072 die("unable to read files to diff");
7073
7074 if (driver->textconv_cache && df->oid_valid) {
7075 /* ignore errors, as we might be in a readonly repository */
7076 notes_cache_put(driver->textconv_cache, &df->oid, *outbuf,
7077 size);
7078 /*
7079 * we could save up changes and flush them all at the end,
7080 * but we would need an extra call after all diffing is done.
7081 * Since generating a cache entry is the slow path anyway,
7082 * this extra overhead probably isn't a big deal.
7083 */
7084 notes_cache_write(driver->textconv_cache);
7085 }
7086
7087 return size;
7088 }
7089
7090 int textconv_object(struct repository *r,
7091 const char *path,
7092 unsigned mode,
7093 const struct object_id *oid,
7094 int oid_valid,
7095 char **buf,
7096 unsigned long *buf_size)
7097 {
7098 struct diff_filespec *df;
7099 struct userdiff_driver *textconv;
7100
7101 df = alloc_filespec(path);
7102 fill_filespec(df, oid, oid_valid, mode);
7103 textconv = get_textconv(r, df);
7104 if (!textconv) {
7105 free_filespec(df);
7106 return 0;
7107 }
7108
7109 *buf_size = fill_textconv(r, textconv, df, buf);
7110 free_filespec(df);
7111 return 1;
7112 }
7113
7114 void setup_diff_pager(struct diff_options *opt)
7115 {
7116 /*
7117 * If the user asked for our exit code, then either they want --quiet
7118 * or --exit-code. We should definitely not bother with a pager in the
7119 * former case, as we will generate no output. Since we still properly
7120 * report our exit code even when a pager is run, we _could_ run a
7121 * pager with --exit-code. But since we have not done so historically,
7122 * and because it is easy to find people oneline advising "git diff
7123 * --exit-code" in hooks and other scripts, we do not do so.
7124 */
7125 if (!opt->flags.exit_with_status &&
7126 check_pager_config("diff") != 0)
7127 setup_pager();
7128 }
git for Debian