?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
replace and remove run_command_v_opt_tr2()
[git/debian.git] / diff.c
blob8451c230d9e7eac820a886d9b50a22c4e8e131bb
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 child_process cmd = CHILD_PROCESS_INIT;
4282 struct diff_queue_struct *q = &diff_queued_diff;
4283
4284 strvec_push(&cmd.args, pgm);
4285 strvec_push(&cmd.args, name);
4286
4287 if (one && two) {
4288 add_external_diff_name(o->repo, &cmd.args, name, one);
4289 if (!other)
4290 add_external_diff_name(o->repo, &cmd.args, name, two);
4291 else {
4292 add_external_diff_name(o->repo, &cmd.args, other, two);
4293 strvec_push(&cmd.args, other);
4294 strvec_push(&cmd.args, xfrm_msg);
4295 }
4296 }
4297
4298 strvec_pushf(&cmd.env, "GIT_DIFF_PATH_COUNTER=%d",
4299 ++o->diff_path_counter);
4300 strvec_pushf(&cmd.env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
4301
4302 diff_free_filespec_data(one);
4303 diff_free_filespec_data(two);
4304 cmd.use_shell = 1;
4305 if (run_command(&cmd))
4306 die(_("external diff died, stopping at %s"), name);
4307
4308 remove_tempfile();
4309 }
4310
4311 static int similarity_index(struct diff_filepair *p)
4312 {
4313 return p->score * 100 / MAX_SCORE;
4314 }
4315
4316 static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)
4317 {
4318 if (startup_info->have_repository)
4319 return find_unique_abbrev(oid, abbrev);
4320 else {
4321 char *hex = oid_to_hex(oid);
4322 if (abbrev < 0)
4323 abbrev = FALLBACK_DEFAULT_ABBREV;
4324 if (abbrev > the_hash_algo->hexsz)
4325 BUG("oid abbreviation out of range: %d", abbrev);
4326 if (abbrev)
4327 hex[abbrev] = '\0';
4328 return hex;
4329 }
4330 }
4331
4332 static void fill_metainfo(struct strbuf *msg,
4333 const char *name,
4334 const char *other,
4335 struct diff_filespec *one,
4336 struct diff_filespec *two,
4337 struct diff_options *o,
4338 struct diff_filepair *p,
4339 int *must_show_header,
4340 int use_color)
4341 {
4342 const char *set = diff_get_color(use_color, DIFF_METAINFO);
4343 const char *reset = diff_get_color(use_color, DIFF_RESET);
4344 const char *line_prefix = diff_line_prefix(o);
4345 struct string_list *more_headers = NULL;
4346
4347 *must_show_header = 1;
4348 strbuf_init(msg, PATH_MAX * 2 + 300);
4349 switch (p->status) {
4350 case DIFF_STATUS_COPIED:
4351 strbuf_addf(msg, "%s%ssimilarity index %d%%",
4352 line_prefix, set, similarity_index(p));
4353 strbuf_addf(msg, "%s\n%s%scopy from ",
4354 reset, line_prefix, set);
4355 quote_c_style(name, msg, NULL, 0);
4356 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
4357 quote_c_style(other, msg, NULL, 0);
4358 strbuf_addf(msg, "%s\n", reset);
4359 break;
4360 case DIFF_STATUS_RENAMED:
4361 strbuf_addf(msg, "%s%ssimilarity index %d%%",
4362 line_prefix, set, similarity_index(p));
4363 strbuf_addf(msg, "%s\n%s%srename from ",
4364 reset, line_prefix, set);
4365 quote_c_style(name, msg, NULL, 0);
4366 strbuf_addf(msg, "%s\n%s%srename to ",
4367 reset, line_prefix, set);
4368 quote_c_style(other, msg, NULL, 0);
4369 strbuf_addf(msg, "%s\n", reset);
4370 break;
4371 case DIFF_STATUS_MODIFIED:
4372 if (p->score) {
4373 strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
4374 line_prefix,
4375 set, similarity_index(p), reset);
4376 break;
4377 }
4378 /* fallthru */
4379 default:
4380 *must_show_header = 0;
4381 }
4382 if ((more_headers = additional_headers(o, name))) {
4383 add_formatted_headers(msg, more_headers,
4384 line_prefix, set, reset);
4385 *must_show_header = 1;
4386 }
4387 if (one && two && !oideq(&one->oid, &two->oid)) {
4388 const unsigned hexsz = the_hash_algo->hexsz;
4389 int abbrev = o->abbrev ? o->abbrev : DEFAULT_ABBREV;
4390
4391 if (o->flags.full_index)
4392 abbrev = hexsz;
4393
4394 if (o->flags.binary) {
4395 mmfile_t mf;
4396 if ((!fill_mmfile(o->repo, &mf, one) &&
4397 diff_filespec_is_binary(o->repo, one)) ||
4398 (!fill_mmfile(o->repo, &mf, two) &&
4399 diff_filespec_is_binary(o->repo, two)))
4400 abbrev = hexsz;
4401 }
4402 strbuf_addf(msg, "%s%sindex %s..%s", line_prefix, set,
4403 diff_abbrev_oid(&one->oid, abbrev),
4404 diff_abbrev_oid(&two->oid, abbrev));
4405 if (one->mode == two->mode)
4406 strbuf_addf(msg, " %06o", one->mode);
4407 strbuf_addf(msg, "%s\n", reset);
4408 }
4409 }
4410
4411 static void run_diff_cmd(const char *pgm,
4412 const char *name,
4413 const char *other,
4414 const char *attr_path,
4415 struct diff_filespec *one,
4416 struct diff_filespec *two,
4417 struct strbuf *msg,
4418 struct diff_options *o,
4419 struct diff_filepair *p)
4420 {
4421 const char *xfrm_msg = NULL;
4422 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
4423 int must_show_header = 0;
4424
4425
4426 if (o->flags.allow_external) {
4427 struct userdiff_driver *drv;
4428
4429 drv = userdiff_find_by_path(o->repo->index, attr_path);
4430 if (drv && drv->external)
4431 pgm = drv->external;
4432 }
4433
4434 if (msg) {
4435 /*
4436 * don't use colors when the header is intended for an
4437 * external diff driver
4438 */
4439 fill_metainfo(msg, name, other, one, two, o, p,
4440 &must_show_header,
4441 want_color(o->use_color) && !pgm);
4442 xfrm_msg = msg->len ? msg->buf : NULL;
4443 }
4444
4445 if (pgm) {
4446 run_external_diff(pgm, name, other, one, two, xfrm_msg, o);
4447 return;
4448 }
4449 if (one && two)
4450 builtin_diff(name, other ? other : name,
4451 one, two, xfrm_msg, must_show_header,
4452 o, complete_rewrite);
4453 else
4454 fprintf(o->file, "* Unmerged path %s\n", name);
4455 }
4456
4457 static void diff_fill_oid_info(struct diff_filespec *one, struct index_state *istate)
4458 {
4459 if (DIFF_FILE_VALID(one)) {
4460 if (!one->oid_valid) {
4461 struct stat st;
4462 if (one->is_stdin) {
4463 oidclr(&one->oid);
4464 return;
4465 }
4466 if (lstat(one->path, &st) < 0)
4467 die_errno("stat '%s'", one->path);
4468 if (index_path(istate, &one->oid, one->path, &st, 0))
4469 die("cannot hash %s", one->path);
4470 }
4471 }
4472 else
4473 oidclr(&one->oid);
4474 }
4475
4476 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
4477 {
4478 /* Strip the prefix but do not molest /dev/null and absolute paths */
4479 if (*namep && !is_absolute_path(*namep)) {
4480 *namep += prefix_length;
4481 if (**namep == '/')
4482 ++*namep;
4483 }
4484 if (*otherp && !is_absolute_path(*otherp)) {
4485 *otherp += prefix_length;
4486 if (**otherp == '/')
4487 ++*otherp;
4488 }
4489 }
4490
4491 static void run_diff(struct diff_filepair *p, struct diff_options *o)
4492 {
4493 const char *pgm = external_diff();
4494 struct strbuf msg;
4495 struct diff_filespec *one = p->one;
4496 struct diff_filespec *two = p->two;
4497 const char *name;
4498 const char *other;
4499 const char *attr_path;
4500
4501 name = one->path;
4502 other = (strcmp(name, two->path) ? two->path : NULL);
4503 attr_path = name;
4504 if (o->prefix_length)
4505 strip_prefix(o->prefix_length, &name, &other);
4506
4507 if (!o->flags.allow_external)
4508 pgm = NULL;
4509
4510 if (DIFF_PAIR_UNMERGED(p)) {
4511 run_diff_cmd(pgm, name, NULL, attr_path,
4512 NULL, NULL, NULL, o, p);
4513 return;
4514 }
4515
4516 diff_fill_oid_info(one, o->repo->index);
4517 diff_fill_oid_info(two, o->repo->index);
4518
4519 if (!pgm &&
4520 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
4521 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
4522 /*
4523 * a filepair that changes between file and symlink
4524 * needs to be split into deletion and creation.
4525 */
4526 struct diff_filespec *null = alloc_filespec(two->path);
4527 run_diff_cmd(NULL, name, other, attr_path,
4528 one, null, &msg,
4529 o, p);
4530 free(null);
4531 strbuf_release(&msg);
4532
4533 null = alloc_filespec(one->path);
4534 run_diff_cmd(NULL, name, other, attr_path,
4535 null, two, &msg, o, p);
4536 free(null);
4537 }
4538 else
4539 run_diff_cmd(pgm, name, other, attr_path,
4540 one, two, &msg, o, p);
4541
4542 strbuf_release(&msg);
4543 }
4544
4545 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
4546 struct diffstat_t *diffstat)
4547 {
4548 const char *name;
4549 const char *other;
4550
4551 if (DIFF_PAIR_UNMERGED(p)) {
4552 /* unmerged */
4553 builtin_diffstat(p->one->path, NULL, NULL, NULL,
4554 diffstat, o, p);
4555 return;
4556 }
4557
4558 name = p->one->path;
4559 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
4560
4561 if (o->prefix_length)
4562 strip_prefix(o->prefix_length, &name, &other);
4563
4564 diff_fill_oid_info(p->one, o->repo->index);
4565 diff_fill_oid_info(p->two, o->repo->index);
4566
4567 builtin_diffstat(name, other, p->one, p->two,
4568 diffstat, o, p);
4569 }
4570
4571 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
4572 {
4573 const char *name;
4574 const char *other;
4575 const char *attr_path;
4576
4577 if (DIFF_PAIR_UNMERGED(p)) {
4578 /* unmerged */
4579 return;
4580 }
4581
4582 name = p->one->path;
4583 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
4584 attr_path = other ? other : name;
4585
4586 if (o->prefix_length)
4587 strip_prefix(o->prefix_length, &name, &other);
4588
4589 diff_fill_oid_info(p->one, o->repo->index);
4590 diff_fill_oid_info(p->two, o->repo->index);
4591
4592 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
4593 }
4594
4595 static void prep_parse_options(struct diff_options *options);
4596
4597 void repo_diff_setup(struct repository *r, struct diff_options *options)
4598 {
4599 memcpy(options, &default_diff_options, sizeof(*options));
4600
4601 options->file = stdout;
4602 options->repo = r;
4603
4604 options->output_indicators[OUTPUT_INDICATOR_NEW] = '+';
4605 options->output_indicators[OUTPUT_INDICATOR_OLD] = '-';
4606 options->output_indicators[OUTPUT_INDICATOR_CONTEXT] = ' ';
4607 options->abbrev = DEFAULT_ABBREV;
4608 options->line_termination = '\n';
4609 options->break_opt = -1;
4610 options->rename_limit = -1;
4611 options->dirstat_permille = diff_dirstat_permille_default;
4612 options->context = diff_context_default;
4613 options->interhunkcontext = diff_interhunk_context_default;
4614 options->ws_error_highlight = ws_error_highlight_default;
4615 options->flags.rename_empty = 1;
4616 options->flags.relative_name = diff_relative;
4617 options->objfind = NULL;
4618
4619 /* pathchange left =NULL by default */
4620 options->change = diff_change;
4621 options->add_remove = diff_addremove;
4622 options->use_color = diff_use_color_default;
4623 options->detect_rename = diff_detect_rename_default;
4624 options->xdl_opts |= diff_algorithm;
4625 if (diff_indent_heuristic)
4626 DIFF_XDL_SET(options, INDENT_HEURISTIC);
4627
4628 options->orderfile = diff_order_file_cfg;
4629
4630 if (!options->flags.ignore_submodule_set)
4631 options->flags.ignore_untracked_in_submodules = 1;
4632
4633 if (diff_no_prefix) {
4634 options->a_prefix = options->b_prefix = "";
4635 } else if (!diff_mnemonic_prefix) {
4636 options->a_prefix = "a/";
4637 options->b_prefix = "b/";
4638 }
4639
4640 options->color_moved = diff_color_moved_default;
4641 options->color_moved_ws_handling = diff_color_moved_ws_default;
4642
4643 prep_parse_options(options);
4644 }
4645
4646 static const char diff_status_letters[] = {
4647 DIFF_STATUS_ADDED,
4648 DIFF_STATUS_COPIED,
4649 DIFF_STATUS_DELETED,
4650 DIFF_STATUS_MODIFIED,
4651 DIFF_STATUS_RENAMED,
4652 DIFF_STATUS_TYPE_CHANGED,
4653 DIFF_STATUS_UNKNOWN,
4654 DIFF_STATUS_UNMERGED,
4655 DIFF_STATUS_FILTER_AON,
4656 DIFF_STATUS_FILTER_BROKEN,
4657 '\0',
4658 };
4659
4660 static unsigned int filter_bit['Z' + 1];
4661
4662 static void prepare_filter_bits(void)
4663 {
4664 int i;
4665
4666 if (!filter_bit[DIFF_STATUS_ADDED]) {
4667 for (i = 0; diff_status_letters[i]; i++)
4668 filter_bit[(int) diff_status_letters[i]] = (1 << i);
4669 }
4670 }
4671
4672 static unsigned filter_bit_tst(char status, const struct diff_options *opt)
4673 {
4674 return opt->filter & filter_bit[(int) status];
4675 }
4676
4677 unsigned diff_filter_bit(char status)
4678 {
4679 prepare_filter_bits();
4680 return filter_bit[(int) status];
4681 }
4682
4683 void diff_setup_done(struct diff_options *options)
4684 {
4685 unsigned check_mask = DIFF_FORMAT_NAME |
4686 DIFF_FORMAT_NAME_STATUS |
4687 DIFF_FORMAT_CHECKDIFF |
4688 DIFF_FORMAT_NO_OUTPUT;
4689 /*
4690 * This must be signed because we're comparing against a potentially
4691 * negative value.
4692 */
4693 const int hexsz = the_hash_algo->hexsz;
4694
4695 if (options->set_default)
4696 options->set_default(options);
4697
4698 if (HAS_MULTI_BITS(options->output_format & check_mask))
4699 die(_("options '%s', '%s', '%s', and '%s' cannot be used together"),
4700 "--name-only", "--name-status", "--check", "-s");
4701
4702 if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
4703 die(_("options '%s', '%s', and '%s' cannot be used together"),
4704 "-G", "-S", "--find-object");
4705
4706 if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_G_REGEX_MASK))
4707 die(_("options '%s' and '%s' cannot be used together, use '%s' with '%s'"),
4708 "-G", "--pickaxe-regex", "--pickaxe-regex", "-S");
4709
4710 if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))
4711 die(_("options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"),
4712 "--pickaxe-all", "--find-object", "--pickaxe-all", "-G", "-S");
4713
4714 /*
4715 * Most of the time we can say "there are changes"
4716 * only by checking if there are changed paths, but
4717 * --ignore-whitespace* options force us to look
4718 * inside contents.
4719 */
4720
4721 if ((options->xdl_opts & XDF_WHITESPACE_FLAGS) ||
4722 options->ignore_regex_nr)
4723 options->flags.diff_from_contents = 1;
4724 else
4725 options->flags.diff_from_contents = 0;
4726
4727 if (options->flags.find_copies_harder)
4728 options->detect_rename = DIFF_DETECT_COPY;
4729
4730 if (!options->flags.relative_name)
4731 options->prefix = NULL;
4732 if (options->prefix)
4733 options->prefix_length = strlen(options->prefix);
4734 else
4735 options->prefix_length = 0;
4736
4737 if (options->output_format & (DIFF_FORMAT_NAME |
4738 DIFF_FORMAT_NAME_STATUS |
4739 DIFF_FORMAT_CHECKDIFF |
4740 DIFF_FORMAT_NO_OUTPUT))
4741 options->output_format &= ~(DIFF_FORMAT_RAW |
4742 DIFF_FORMAT_NUMSTAT |
4743 DIFF_FORMAT_DIFFSTAT |
4744 DIFF_FORMAT_SHORTSTAT |
4745 DIFF_FORMAT_DIRSTAT |
4746 DIFF_FORMAT_SUMMARY |
4747 DIFF_FORMAT_PATCH);
4748
4749 /*
4750 * These cases always need recursive; we do not drop caller-supplied
4751 * recursive bits for other formats here.
4752 */
4753 if (options->output_format & (DIFF_FORMAT_PATCH |
4754 DIFF_FORMAT_NUMSTAT |
4755 DIFF_FORMAT_DIFFSTAT |
4756 DIFF_FORMAT_SHORTSTAT |
4757 DIFF_FORMAT_DIRSTAT |
4758 DIFF_FORMAT_SUMMARY |
4759 DIFF_FORMAT_CHECKDIFF))
4760 options->flags.recursive = 1;
4761 /*
4762 * Also pickaxe would not work very well if you do not say recursive
4763 */
4764 if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)
4765 options->flags.recursive = 1;
4766 /*
4767 * When patches are generated, submodules diffed against the work tree
4768 * must be checked for dirtiness too so it can be shown in the output
4769 */
4770 if (options->output_format & DIFF_FORMAT_PATCH)
4771 options->flags.dirty_submodules = 1;
4772
4773 if (options->detect_rename && options->rename_limit < 0)
4774 options->rename_limit = diff_rename_limit_default;
4775 if (hexsz < options->abbrev)
4776 options->abbrev = hexsz; /* full */
4777
4778 /*
4779 * It does not make sense to show the first hit we happened
4780 * to have found. It does not make sense not to return with
4781 * exit code in such a case either.
4782 */
4783 if (options->flags.quick) {
4784 options->output_format = DIFF_FORMAT_NO_OUTPUT;
4785 options->flags.exit_with_status = 1;
4786 }
4787
4788 options->diff_path_counter = 0;
4789
4790 if (options->flags.follow_renames && options->pathspec.nr != 1)
4791 die(_("--follow requires exactly one pathspec"));
4792
4793 if (!options->use_color || external_diff())
4794 options->color_moved = 0;
4795
4796 if (options->filter_not) {
4797 if (!options->filter)
4798 options->filter = ~filter_bit[DIFF_STATUS_FILTER_AON];
4799 options->filter &= ~options->filter_not;
4800 }
4801
4802 FREE_AND_NULL(options->parseopts);
4803 }
4804
4805 int parse_long_opt(const char *opt, const char **argv,
4806 const char **optarg)
4807 {
4808 const char *arg = argv[0];
4809 if (!skip_prefix(arg, "--", &arg))
4810 return 0;
4811 if (!skip_prefix(arg, opt, &arg))
4812 return 0;
4813 if (*arg == '=') { /* stuck form: --option=value */
4814 *optarg = arg + 1;
4815 return 1;
4816 }
4817 if (*arg != '\0')
4818 return 0;
4819 /* separate form: --option value */
4820 if (!argv[1])
4821 die("Option '--%s' requires a value", opt);
4822 *optarg = argv[1];
4823 return 2;
4824 }
4825
4826 static int diff_opt_stat(const struct option *opt, const char *value, int unset)
4827 {
4828 struct diff_options *options = opt->value;
4829 int width = options->stat_width;
4830 int name_width = options->stat_name_width;
4831 int graph_width = options->stat_graph_width;
4832 int count = options->stat_count;
4833 char *end;
4834
4835 BUG_ON_OPT_NEG(unset);
4836
4837 if (!strcmp(opt->long_name, "stat")) {
4838 if (value) {
4839 width = strtoul(value, &end, 10);
4840 if (*end == ',')
4841 name_width = strtoul(end+1, &end, 10);
4842 if (*end == ',')
4843 count = strtoul(end+1, &end, 10);
4844 if (*end)
4845 return error(_("invalid --stat value: %s"), value);
4846 }
4847 } else if (!strcmp(opt->long_name, "stat-width")) {
4848 width = strtoul(value, &end, 10);
4849 if (*end)
4850 return error(_("%s expects a numerical value"),
4851 opt->long_name);
4852 } else if (!strcmp(opt->long_name, "stat-name-width")) {
4853 name_width = strtoul(value, &end, 10);
4854 if (*end)
4855 return error(_("%s expects a numerical value"),
4856 opt->long_name);
4857 } else if (!strcmp(opt->long_name, "stat-graph-width")) {
4858 graph_width = strtoul(value, &end, 10);
4859 if (*end)
4860 return error(_("%s expects a numerical value"),
4861 opt->long_name);
4862 } else if (!strcmp(opt->long_name, "stat-count")) {
4863 count = strtoul(value, &end, 10);
4864 if (*end)
4865 return error(_("%s expects a numerical value"),
4866 opt->long_name);
4867 } else
4868 BUG("%s should not get here", opt->long_name);
4869
4870 options->output_format |= DIFF_FORMAT_DIFFSTAT;
4871 options->stat_name_width = name_width;
4872 options->stat_graph_width = graph_width;
4873 options->stat_width = width;
4874 options->stat_count = count;
4875 return 0;
4876 }
4877
4878 static int parse_dirstat_opt(struct diff_options *options, const char *params)
4879 {
4880 struct strbuf errmsg = STRBUF_INIT;
4881 if (parse_dirstat_params(options, params, &errmsg))
4882 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
4883 errmsg.buf);
4884 strbuf_release(&errmsg);
4885 /*
4886 * The caller knows a dirstat-related option is given from the command
4887 * line; allow it to say "return this_function();"
4888 */
4889 options->output_format |= DIFF_FORMAT_DIRSTAT;
4890 return 1;
4891 }
4892
4893 static int diff_opt_diff_filter(const struct option *option,
4894 const char *optarg, int unset)
4895 {
4896 struct diff_options *opt = option->value;
4897 int i, optch;
4898
4899 BUG_ON_OPT_NEG(unset);
4900 prepare_filter_bits();
4901
4902 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
4903 unsigned int bit;
4904 int negate;
4905
4906 if ('a' <= optch && optch <= 'z') {
4907 negate = 1;
4908 optch = toupper(optch);
4909 } else {
4910 negate = 0;
4911 }
4912
4913 bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
4914 if (!bit)
4915 return error(_("unknown change class '%c' in --diff-filter=%s"),
4916 optarg[i], optarg);
4917 if (negate)
4918 opt->filter_not |= bit;
4919 else
4920 opt->filter |= bit;
4921 }
4922 return 0;
4923 }
4924
4925 static void enable_patch_output(int *fmt)
4926 {
4927 *fmt &= ~DIFF_FORMAT_NO_OUTPUT;
4928 *fmt |= DIFF_FORMAT_PATCH;
4929 }
4930
4931 static int diff_opt_ws_error_highlight(const struct option *option,
4932 const char *arg, int unset)
4933 {
4934 struct diff_options *opt = option->value;
4935 int val = parse_ws_error_highlight(arg);
4936
4937 BUG_ON_OPT_NEG(unset);
4938 if (val < 0)
4939 return error(_("unknown value after ws-error-highlight=%.*s"),
4940 -1 - val, arg);
4941 opt->ws_error_highlight = val;
4942 return 0;
4943 }
4944
4945 static int diff_opt_find_object(const struct option *option,
4946 const char *arg, int unset)
4947 {
4948 struct diff_options *opt = option->value;
4949 struct object_id oid;
4950
4951 BUG_ON_OPT_NEG(unset);
4952 if (get_oid(arg, &oid))
4953 return error(_("unable to resolve '%s'"), arg);
4954
4955 if (!opt->objfind)
4956 CALLOC_ARRAY(opt->objfind, 1);
4957
4958 opt->pickaxe_opts |= DIFF_PICKAXE_KIND_OBJFIND;
4959 opt->flags.recursive = 1;
4960 opt->flags.tree_in_recursive = 1;
4961 oidset_insert(opt->objfind, &oid);
4962 return 0;
4963 }
4964
4965 static int diff_opt_anchored(const struct option *opt,
4966 const char *arg, int unset)
4967 {
4968 struct diff_options *options = opt->value;
4969
4970 BUG_ON_OPT_NEG(unset);
4971 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
4972 ALLOC_GROW(options->anchors, options->anchors_nr + 1,
4973 options->anchors_alloc);
4974 options->anchors[options->anchors_nr++] = xstrdup(arg);
4975 return 0;
4976 }
4977
4978 static int diff_opt_binary(const struct option *opt,
4979 const char *arg, int unset)
4980 {
4981 struct diff_options *options = opt->value;
4982
4983 BUG_ON_OPT_NEG(unset);
4984 BUG_ON_OPT_ARG(arg);
4985 enable_patch_output(&options->output_format);
4986 options->flags.binary = 1;
4987 return 0;
4988 }
4989
4990 static int diff_opt_break_rewrites(const struct option *opt,
4991 const char *arg, int unset)
4992 {
4993 int *break_opt = opt->value;
4994 int opt1, opt2;
4995
4996 BUG_ON_OPT_NEG(unset);
4997 if (!arg)
4998 arg = "";
4999 opt1 = parse_rename_score(&arg);
5000 if (*arg == 0)
5001 opt2 = 0;
5002 else if (*arg != '/')
5003 return error(_("%s expects <n>/<m> form"), opt->long_name);
5004 else {
5005 arg++;
5006 opt2 = parse_rename_score(&arg);
5007 }
5008 if (*arg != 0)
5009 return error(_("%s expects <n>/<m> form"), opt->long_name);
5010 *break_opt = opt1 | (opt2 << 16);
5011 return 0;
5012 }
5013
5014 static int diff_opt_char(const struct option *opt,
5015 const char *arg, int unset)
5016 {
5017 char *value = opt->value;
5018
5019 BUG_ON_OPT_NEG(unset);
5020 if (arg[1])
5021 return error(_("%s expects a character, got '%s'"),
5022 opt->long_name, arg);
5023 *value = arg[0];
5024 return 0;
5025 }
5026
5027 static int diff_opt_color_moved(const struct option *opt,
5028 const char *arg, int unset)
5029 {
5030 struct diff_options *options = opt->value;
5031
5032 if (unset) {
5033 options->color_moved = COLOR_MOVED_NO;
5034 } else if (!arg) {
5035 if (diff_color_moved_default)
5036 options->color_moved = diff_color_moved_default;
5037 if (options->color_moved == COLOR_MOVED_NO)
5038 options->color_moved = COLOR_MOVED_DEFAULT;
5039 } else {
5040 int cm = parse_color_moved(arg);
5041 if (cm < 0)
5042 return error(_("bad --color-moved argument: %s"), arg);
5043 options->color_moved = cm;
5044 }
5045 return 0;
5046 }
5047
5048 static int diff_opt_color_moved_ws(const struct option *opt,
5049 const char *arg, int unset)
5050 {
5051 struct diff_options *options = opt->value;
5052 unsigned cm;
5053
5054 if (unset) {
5055 options->color_moved_ws_handling = 0;
5056 return 0;
5057 }
5058
5059 cm = parse_color_moved_ws(arg);
5060 if (cm & COLOR_MOVED_WS_ERROR)
5061 return error(_("invalid mode '%s' in --color-moved-ws"), arg);
5062 options->color_moved_ws_handling = cm;
5063 return 0;
5064 }
5065
5066 static int diff_opt_color_words(const struct option *opt,
5067 const char *arg, int unset)
5068 {
5069 struct diff_options *options = opt->value;
5070
5071 BUG_ON_OPT_NEG(unset);
5072 options->use_color = 1;
5073 options->word_diff = DIFF_WORDS_COLOR;
5074 options->word_regex = arg;
5075 return 0;
5076 }
5077
5078 static int diff_opt_compact_summary(const struct option *opt,
5079 const char *arg, int unset)
5080 {
5081 struct diff_options *options = opt->value;
5082
5083 BUG_ON_OPT_ARG(arg);
5084 if (unset) {
5085 options->flags.stat_with_summary = 0;
5086 } else {
5087 options->flags.stat_with_summary = 1;
5088 options->output_format |= DIFF_FORMAT_DIFFSTAT;
5089 }
5090 return 0;
5091 }
5092
5093 static int diff_opt_diff_algorithm(const struct option *opt,
5094 const char *arg, int unset)
5095 {
5096 struct diff_options *options = opt->value;
5097 long value = parse_algorithm_value(arg);
5098
5099 BUG_ON_OPT_NEG(unset);
5100 if (value < 0)
5101 return error(_("option diff-algorithm accepts \"myers\", "
5102 "\"minimal\", \"patience\" and \"histogram\""));
5103
5104 /* clear out previous settings */
5105 DIFF_XDL_CLR(options, NEED_MINIMAL);
5106 options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
5107 options->xdl_opts |= value;
5108 return 0;
5109 }
5110
5111 static int diff_opt_dirstat(const struct option *opt,
5112 const char *arg, int unset)
5113 {
5114 struct diff_options *options = opt->value;
5115
5116 BUG_ON_OPT_NEG(unset);
5117 if (!strcmp(opt->long_name, "cumulative")) {
5118 if (arg)
5119 BUG("how come --cumulative take a value?");
5120 arg = "cumulative";
5121 } else if (!strcmp(opt->long_name, "dirstat-by-file"))
5122 parse_dirstat_opt(options, "files");
5123 parse_dirstat_opt(options, arg ? arg : "");
5124 return 0;
5125 }
5126
5127 static int diff_opt_find_copies(const struct option *opt,
5128 const char *arg, int unset)
5129 {
5130 struct diff_options *options = opt->value;
5131
5132 BUG_ON_OPT_NEG(unset);
5133 if (!arg)
5134 arg = "";
5135 options->rename_score = parse_rename_score(&arg);
5136 if (*arg != 0)
5137 return error(_("invalid argument to %s"), opt->long_name);
5138
5139 if (options->detect_rename == DIFF_DETECT_COPY)
5140 options->flags.find_copies_harder = 1;
5141 else
5142 options->detect_rename = DIFF_DETECT_COPY;
5143
5144 return 0;
5145 }
5146
5147 static int diff_opt_find_renames(const struct option *opt,
5148 const char *arg, int unset)
5149 {
5150 struct diff_options *options = opt->value;
5151
5152 BUG_ON_OPT_NEG(unset);
5153 if (!arg)
5154 arg = "";
5155 options->rename_score = parse_rename_score(&arg);
5156 if (*arg != 0)
5157 return error(_("invalid argument to %s"), opt->long_name);
5158
5159 options->detect_rename = DIFF_DETECT_RENAME;
5160 return 0;
5161 }
5162
5163 static int diff_opt_follow(const struct option *opt,
5164 const char *arg, int unset)
5165 {
5166 struct diff_options *options = opt->value;
5167
5168 BUG_ON_OPT_ARG(arg);
5169 if (unset) {
5170 options->flags.follow_renames = 0;
5171 options->flags.default_follow_renames = 0;
5172 } else {
5173 options->flags.follow_renames = 1;
5174 }
5175 return 0;
5176 }
5177
5178 static int diff_opt_ignore_submodules(const struct option *opt,
5179 const char *arg, int unset)
5180 {
5181 struct diff_options *options = opt->value;
5182
5183 BUG_ON_OPT_NEG(unset);
5184 if (!arg)
5185 arg = "all";
5186 options->flags.override_submodule_config = 1;
5187 handle_ignore_submodules_arg(options, arg);
5188 return 0;
5189 }
5190
5191 static int diff_opt_line_prefix(const struct option *opt,
5192 const char *optarg, int unset)
5193 {
5194 struct diff_options *options = opt->value;
5195
5196 BUG_ON_OPT_NEG(unset);
5197 options->line_prefix = optarg;
5198 options->line_prefix_length = strlen(options->line_prefix);
5199 graph_setup_line_prefix(options);
5200 return 0;
5201 }
5202
5203 static int diff_opt_no_prefix(const struct option *opt,
5204 const char *optarg, int unset)
5205 {
5206 struct diff_options *options = opt->value;
5207
5208 BUG_ON_OPT_NEG(unset);
5209 BUG_ON_OPT_ARG(optarg);
5210 options->a_prefix = "";
5211 options->b_prefix = "";
5212 return 0;
5213 }
5214
5215 static enum parse_opt_result diff_opt_output(struct parse_opt_ctx_t *ctx,
5216 const struct option *opt,
5217 const char *arg, int unset)
5218 {
5219 struct diff_options *options = opt->value;
5220 char *path;
5221
5222 BUG_ON_OPT_NEG(unset);
5223 path = prefix_filename(ctx->prefix, arg);
5224 options->file = xfopen(path, "w");
5225 options->close_file = 1;
5226 if (options->use_color != GIT_COLOR_ALWAYS)
5227 options->use_color = GIT_COLOR_NEVER;
5228 free(path);
5229 return 0;
5230 }
5231
5232 static int diff_opt_patience(const struct option *opt,
5233 const char *arg, int unset)
5234 {
5235 struct diff_options *options = opt->value;
5236 int i;
5237
5238 BUG_ON_OPT_NEG(unset);
5239 BUG_ON_OPT_ARG(arg);
5240 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
5241 /*
5242 * Both --patience and --anchored use PATIENCE_DIFF
5243 * internally, so remove any anchors previously
5244 * specified.
5245 */
5246 for (i = 0; i < options->anchors_nr; i++)
5247 free(options->anchors[i]);
5248 options->anchors_nr = 0;
5249 return 0;
5250 }
5251
5252 static int diff_opt_ignore_regex(const struct option *opt,
5253 const char *arg, int unset)
5254 {
5255 struct diff_options *options = opt->value;
5256 regex_t *regex;
5257
5258 BUG_ON_OPT_NEG(unset);
5259 regex = xmalloc(sizeof(*regex));
5260 if (regcomp(regex, arg, REG_EXTENDED | REG_NEWLINE))
5261 return error(_("invalid regex given to -I: '%s'"), arg);
5262 ALLOC_GROW(options->ignore_regex, options->ignore_regex_nr + 1,
5263 options->ignore_regex_alloc);
5264 options->ignore_regex[options->ignore_regex_nr++] = regex;
5265 return 0;
5266 }
5267
5268 static int diff_opt_pickaxe_regex(const struct option *opt,
5269 const char *arg, int unset)
5270 {
5271 struct diff_options *options = opt->value;
5272
5273 BUG_ON_OPT_NEG(unset);
5274 options->pickaxe = arg;
5275 options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
5276 return 0;
5277 }
5278
5279 static int diff_opt_pickaxe_string(const struct option *opt,
5280 const char *arg, int unset)
5281 {
5282 struct diff_options *options = opt->value;
5283
5284 BUG_ON_OPT_NEG(unset);
5285 options->pickaxe = arg;
5286 options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
5287 return 0;
5288 }
5289
5290 static int diff_opt_relative(const struct option *opt,
5291 const char *arg, int unset)
5292 {
5293 struct diff_options *options = opt->value;
5294
5295 options->flags.relative_name = !unset;
5296 if (arg)
5297 options->prefix = arg;
5298 return 0;
5299 }
5300
5301 static int diff_opt_submodule(const struct option *opt,
5302 const char *arg, int unset)
5303 {
5304 struct diff_options *options = opt->value;
5305
5306 BUG_ON_OPT_NEG(unset);
5307 if (!arg)
5308 arg = "log";
5309 if (parse_submodule_params(options, arg))
5310 return error(_("failed to parse --submodule option parameter: '%s'"),
5311 arg);
5312 return 0;
5313 }
5314
5315 static int diff_opt_textconv(const struct option *opt,
5316 const char *arg, int unset)
5317 {
5318 struct diff_options *options = opt->value;
5319
5320 BUG_ON_OPT_ARG(arg);
5321 if (unset) {
5322 options->flags.allow_textconv = 0;
5323 } else {
5324 options->flags.allow_textconv = 1;
5325 options->flags.textconv_set_via_cmdline = 1;
5326 }
5327 return 0;
5328 }
5329
5330 static int diff_opt_unified(const struct option *opt,
5331 const char *arg, int unset)
5332 {
5333 struct diff_options *options = opt->value;
5334 char *s;
5335
5336 BUG_ON_OPT_NEG(unset);
5337
5338 if (arg) {
5339 options->context = strtol(arg, &s, 10);
5340 if (*s)
5341 return error(_("%s expects a numerical value"), "--unified");
5342 }
5343 enable_patch_output(&options->output_format);
5344
5345 return 0;
5346 }
5347
5348 static int diff_opt_word_diff(const struct option *opt,
5349 const char *arg, int unset)
5350 {
5351 struct diff_options *options = opt->value;
5352
5353 BUG_ON_OPT_NEG(unset);
5354 if (arg) {
5355 if (!strcmp(arg, "plain"))
5356 options->word_diff = DIFF_WORDS_PLAIN;
5357 else if (!strcmp(arg, "color")) {
5358 options->use_color = 1;
5359 options->word_diff = DIFF_WORDS_COLOR;
5360 }
5361 else if (!strcmp(arg, "porcelain"))
5362 options->word_diff = DIFF_WORDS_PORCELAIN;
5363 else if (!strcmp(arg, "none"))
5364 options->word_diff = DIFF_WORDS_NONE;
5365 else
5366 return error(_("bad --word-diff argument: %s"), arg);
5367 } else {
5368 if (options->word_diff == DIFF_WORDS_NONE)
5369 options->word_diff = DIFF_WORDS_PLAIN;
5370 }
5371 return 0;
5372 }
5373
5374 static int diff_opt_word_diff_regex(const struct option *opt,
5375 const char *arg, int unset)
5376 {
5377 struct diff_options *options = opt->value;
5378
5379 BUG_ON_OPT_NEG(unset);
5380 if (options->word_diff == DIFF_WORDS_NONE)
5381 options->word_diff = DIFF_WORDS_PLAIN;
5382 options->word_regex = arg;
5383 return 0;
5384 }
5385
5386 static int diff_opt_rotate_to(const struct option *opt, const char *arg, int unset)
5387 {
5388 struct diff_options *options = opt->value;
5389
5390 BUG_ON_OPT_NEG(unset);
5391 if (!strcmp(opt->long_name, "skip-to"))
5392 options->skip_instead_of_rotate = 1;
5393 else
5394 options->skip_instead_of_rotate = 0;
5395 options->rotate_to = arg;
5396 return 0;
5397 }
5398
5399 static void prep_parse_options(struct diff_options *options)
5400 {
5401 struct option parseopts[] = {
5402 OPT_GROUP(N_("Diff output format options")),
5403 OPT_BITOP('p', "patch", &options->output_format,
5404 N_("generate patch"),
5405 DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
5406 OPT_BIT_F('s', "no-patch", &options->output_format,
5407 N_("suppress diff output"),
5408 DIFF_FORMAT_NO_OUTPUT, PARSE_OPT_NONEG),
5409 OPT_BITOP('u', NULL, &options->output_format,
5410 N_("generate patch"),
5411 DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
5412 OPT_CALLBACK_F('U', "unified", options, N_("<n>"),
5413 N_("generate diffs with <n> lines context"),
5414 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_unified),
5415 OPT_BOOL('W', "function-context", &options->flags.funccontext,
5416 N_("generate diffs with <n> lines context")),
5417 OPT_BIT_F(0, "raw", &options->output_format,
5418 N_("generate the diff in raw format"),
5419 DIFF_FORMAT_RAW, PARSE_OPT_NONEG),
5420 OPT_BITOP(0, "patch-with-raw", &options->output_format,
5421 N_("synonym for '-p --raw'"),
5422 DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW,
5423 DIFF_FORMAT_NO_OUTPUT),
5424 OPT_BITOP(0, "patch-with-stat", &options->output_format,
5425 N_("synonym for '-p --stat'"),
5426 DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT,
5427 DIFF_FORMAT_NO_OUTPUT),
5428 OPT_BIT_F(0, "numstat", &options->output_format,
5429 N_("machine friendly --stat"),
5430 DIFF_FORMAT_NUMSTAT, PARSE_OPT_NONEG),
5431 OPT_BIT_F(0, "shortstat", &options->output_format,
5432 N_("output only the last line of --stat"),
5433 DIFF_FORMAT_SHORTSTAT, PARSE_OPT_NONEG),
5434 OPT_CALLBACK_F('X', "dirstat", options, N_("<param1,param2>..."),
5435 N_("output the distribution of relative amount of changes for each sub-directory"),
5436 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5437 diff_opt_dirstat),
5438 OPT_CALLBACK_F(0, "cumulative", options, NULL,
5439 N_("synonym for --dirstat=cumulative"),
5440 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
5441 diff_opt_dirstat),
5442 OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1,param2>..."),
5443 N_("synonym for --dirstat=files,param1,param2..."),
5444 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5445 diff_opt_dirstat),
5446 OPT_BIT_F(0, "check", &options->output_format,
5447 N_("warn if changes introduce conflict markers or whitespace errors"),
5448 DIFF_FORMAT_CHECKDIFF, PARSE_OPT_NONEG),
5449 OPT_BIT_F(0, "summary", &options->output_format,
5450 N_("condensed summary such as creations, renames and mode changes"),
5451 DIFF_FORMAT_SUMMARY, PARSE_OPT_NONEG),
5452 OPT_BIT_F(0, "name-only", &options->output_format,
5453 N_("show only names of changed files"),
5454 DIFF_FORMAT_NAME, PARSE_OPT_NONEG),
5455 OPT_BIT_F(0, "name-status", &options->output_format,
5456 N_("show only names and status of changed files"),
5457 DIFF_FORMAT_NAME_STATUS, PARSE_OPT_NONEG),
5458 OPT_CALLBACK_F(0, "stat", options, N_("<width>[,<name-width>[,<count>]]"),
5459 N_("generate diffstat"),
5460 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_stat),
5461 OPT_CALLBACK_F(0, "stat-width", options, N_("<width>"),
5462 N_("generate diffstat with a given width"),
5463 PARSE_OPT_NONEG, diff_opt_stat),
5464 OPT_CALLBACK_F(0, "stat-name-width", options, N_("<width>"),
5465 N_("generate diffstat with a given name width"),
5466 PARSE_OPT_NONEG, diff_opt_stat),
5467 OPT_CALLBACK_F(0, "stat-graph-width", options, N_("<width>"),
5468 N_("generate diffstat with a given graph width"),
5469 PARSE_OPT_NONEG, diff_opt_stat),
5470 OPT_CALLBACK_F(0, "stat-count", options, N_("<count>"),
5471 N_("generate diffstat with limited lines"),
5472 PARSE_OPT_NONEG, diff_opt_stat),
5473 OPT_CALLBACK_F(0, "compact-summary", options, NULL,
5474 N_("generate compact summary in diffstat"),
5475 PARSE_OPT_NOARG, diff_opt_compact_summary),
5476 OPT_CALLBACK_F(0, "binary", options, NULL,
5477 N_("output a binary diff that can be applied"),
5478 PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_binary),
5479 OPT_BOOL(0, "full-index", &options->flags.full_index,
5480 N_("show full pre- and post-image object names on the \"index\" lines")),
5481 OPT_COLOR_FLAG(0, "color", &options->use_color,
5482 N_("show colored diff")),
5483 OPT_CALLBACK_F(0, "ws-error-highlight", options, N_("<kind>"),
5484 N_("highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff"),
5485 PARSE_OPT_NONEG, diff_opt_ws_error_highlight),
5486 OPT_SET_INT('z', NULL, &options->line_termination,
5487 N_("do not munge pathnames and use NULs as output field terminators in --raw or --numstat"),
5488 0),
5489 OPT__ABBREV(&options->abbrev),
5490 OPT_STRING_F(0, "src-prefix", &options->a_prefix, N_("<prefix>"),
5491 N_("show the given source prefix instead of \"a/\""),
5492 PARSE_OPT_NONEG),
5493 OPT_STRING_F(0, "dst-prefix", &options->b_prefix, N_("<prefix>"),
5494 N_("show the given destination prefix instead of \"b/\""),
5495 PARSE_OPT_NONEG),
5496 OPT_CALLBACK_F(0, "line-prefix", options, N_("<prefix>"),
5497 N_("prepend an additional prefix to every line of output"),
5498 PARSE_OPT_NONEG, diff_opt_line_prefix),
5499 OPT_CALLBACK_F(0, "no-prefix", options, NULL,
5500 N_("do not show any source or destination prefix"),
5501 PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_no_prefix),
5502 OPT_INTEGER_F(0, "inter-hunk-context", &options->interhunkcontext,
5503 N_("show context between diff hunks up to the specified number of lines"),
5504 PARSE_OPT_NONEG),
5505 OPT_CALLBACK_F(0, "output-indicator-new",
5506 &options->output_indicators[OUTPUT_INDICATOR_NEW],
5507 N_("<char>"),
5508 N_("specify the character to indicate a new line instead of '+'"),
5509 PARSE_OPT_NONEG, diff_opt_char),
5510 OPT_CALLBACK_F(0, "output-indicator-old",
5511 &options->output_indicators[OUTPUT_INDICATOR_OLD],
5512 N_("<char>"),
5513 N_("specify the character to indicate an old line instead of '-'"),
5514 PARSE_OPT_NONEG, diff_opt_char),
5515 OPT_CALLBACK_F(0, "output-indicator-context",
5516 &options->output_indicators[OUTPUT_INDICATOR_CONTEXT],
5517 N_("<char>"),
5518 N_("specify the character to indicate a context instead of ' '"),
5519 PARSE_OPT_NONEG, diff_opt_char),
5520
5521 OPT_GROUP(N_("Diff rename options")),
5522 OPT_CALLBACK_F('B', "break-rewrites", &options->break_opt, N_("<n>[/<m>]"),
5523 N_("break complete rewrite changes into pairs of delete and create"),
5524 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5525 diff_opt_break_rewrites),
5526 OPT_CALLBACK_F('M', "find-renames", options, N_("<n>"),
5527 N_("detect renames"),
5528 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5529 diff_opt_find_renames),
5530 OPT_SET_INT_F('D', "irreversible-delete", &options->irreversible_delete,
5531 N_("omit the preimage for deletes"),
5532 1, PARSE_OPT_NONEG),
5533 OPT_CALLBACK_F('C', "find-copies", options, N_("<n>"),
5534 N_("detect copies"),
5535 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5536 diff_opt_find_copies),
5537 OPT_BOOL(0, "find-copies-harder", &options->flags.find_copies_harder,
5538 N_("use unmodified files as source to find copies")),
5539 OPT_SET_INT_F(0, "no-renames", &options->detect_rename,
5540 N_("disable rename detection"),
5541 0, PARSE_OPT_NONEG),
5542 OPT_BOOL(0, "rename-empty", &options->flags.rename_empty,
5543 N_("use empty blobs as rename source")),
5544 OPT_CALLBACK_F(0, "follow", options, NULL,
5545 N_("continue listing the history of a file beyond renames"),
5546 PARSE_OPT_NOARG, diff_opt_follow),
5547 OPT_INTEGER('l', NULL, &options->rename_limit,
5548 N_("prevent rename/copy detection if the number of rename/copy targets exceeds given limit")),
5549
5550 OPT_GROUP(N_("Diff algorithm options")),
5551 OPT_BIT(0, "minimal", &options->xdl_opts,
5552 N_("produce the smallest possible diff"),
5553 XDF_NEED_MINIMAL),
5554 OPT_BIT_F('w', "ignore-all-space", &options->xdl_opts,
5555 N_("ignore whitespace when comparing lines"),
5556 XDF_IGNORE_WHITESPACE, PARSE_OPT_NONEG),
5557 OPT_BIT_F('b', "ignore-space-change", &options->xdl_opts,
5558 N_("ignore changes in amount of whitespace"),
5559 XDF_IGNORE_WHITESPACE_CHANGE, PARSE_OPT_NONEG),
5560 OPT_BIT_F(0, "ignore-space-at-eol", &options->xdl_opts,
5561 N_("ignore changes in whitespace at EOL"),
5562 XDF_IGNORE_WHITESPACE_AT_EOL, PARSE_OPT_NONEG),
5563 OPT_BIT_F(0, "ignore-cr-at-eol", &options->xdl_opts,
5564 N_("ignore carrier-return at the end of line"),
5565 XDF_IGNORE_CR_AT_EOL, PARSE_OPT_NONEG),
5566 OPT_BIT_F(0, "ignore-blank-lines", &options->xdl_opts,
5567 N_("ignore changes whose lines are all blank"),
5568 XDF_IGNORE_BLANK_LINES, PARSE_OPT_NONEG),
5569 OPT_CALLBACK_F('I', "ignore-matching-lines", options, N_("<regex>"),
5570 N_("ignore changes whose all lines match <regex>"),
5571 0, diff_opt_ignore_regex),
5572 OPT_BIT(0, "indent-heuristic", &options->xdl_opts,
5573 N_("heuristic to shift diff hunk boundaries for easy reading"),
5574 XDF_INDENT_HEURISTIC),
5575 OPT_CALLBACK_F(0, "patience", options, NULL,
5576 N_("generate diff using the \"patience diff\" algorithm"),
5577 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
5578 diff_opt_patience),
5579 OPT_BITOP(0, "histogram", &options->xdl_opts,
5580 N_("generate diff using the \"histogram diff\" algorithm"),
5581 XDF_HISTOGRAM_DIFF, XDF_DIFF_ALGORITHM_MASK),
5582 OPT_CALLBACK_F(0, "diff-algorithm", options, N_("<algorithm>"),
5583 N_("choose a diff algorithm"),
5584 PARSE_OPT_NONEG, diff_opt_diff_algorithm),
5585 OPT_CALLBACK_F(0, "anchored", options, N_("<text>"),
5586 N_("generate diff using the \"anchored diff\" algorithm"),
5587 PARSE_OPT_NONEG, diff_opt_anchored),
5588 OPT_CALLBACK_F(0, "word-diff", options, N_("<mode>"),
5589 N_("show word diff, using <mode> to delimit changed words"),
5590 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_word_diff),
5591 OPT_CALLBACK_F(0, "word-diff-regex", options, N_("<regex>"),
5592 N_("use <regex> to decide what a word is"),
5593 PARSE_OPT_NONEG, diff_opt_word_diff_regex),
5594 OPT_CALLBACK_F(0, "color-words", options, N_("<regex>"),
5595 N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
5596 PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
5597 OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
5598 N_("moved lines of code are colored differently"),
5599 PARSE_OPT_OPTARG, diff_opt_color_moved),
5600 OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
5601 N_("how white spaces are ignored in --color-moved"),
5602 0, diff_opt_color_moved_ws),
5603
5604 OPT_GROUP(N_("Other diff options")),
5605 OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
5606 N_("when run from subdir, exclude changes outside and show relative paths"),
5607 PARSE_OPT_OPTARG,
5608 diff_opt_relative),
5609 OPT_BOOL('a', "text", &options->flags.text,
5610 N_("treat all files as text")),
5611 OPT_BOOL('R', NULL, &options->flags.reverse_diff,
5612 N_("swap two inputs, reverse the diff")),
5613 OPT_BOOL(0, "exit-code", &options->flags.exit_with_status,
5614 N_("exit with 1 if there were differences, 0 otherwise")),
5615 OPT_BOOL(0, "quiet", &options->flags.quick,
5616 N_("disable all output of the program")),
5617 OPT_BOOL(0, "ext-diff", &options->flags.allow_external,
5618 N_("allow an external diff helper to be executed")),
5619 OPT_CALLBACK_F(0, "textconv", options, NULL,
5620 N_("run external text conversion filters when comparing binary files"),
5621 PARSE_OPT_NOARG, diff_opt_textconv),
5622 OPT_CALLBACK_F(0, "ignore-submodules", options, N_("<when>"),
5623 N_("ignore changes to submodules in the diff generation"),
5624 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5625 diff_opt_ignore_submodules),
5626 OPT_CALLBACK_F(0, "submodule", options, N_("<format>"),
5627 N_("specify how differences in submodules are shown"),
5628 PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
5629 diff_opt_submodule),
5630 OPT_SET_INT_F(0, "ita-invisible-in-index", &options->ita_invisible_in_index,
5631 N_("hide 'git add -N' entries from the index"),
5632 1, PARSE_OPT_NONEG),
5633 OPT_SET_INT_F(0, "ita-visible-in-index", &options->ita_invisible_in_index,
5634 N_("treat 'git add -N' entries as real in the index"),
5635 0, PARSE_OPT_NONEG),
5636 OPT_CALLBACK_F('S', NULL, options, N_("<string>"),
5637 N_("look for differences that change the number of occurrences of the specified string"),
5638 0, diff_opt_pickaxe_string),
5639 OPT_CALLBACK_F('G', NULL, options, N_("<regex>"),
5640 N_("look for differences that change the number of occurrences of the specified regex"),
5641 0, diff_opt_pickaxe_regex),
5642 OPT_BIT_F(0, "pickaxe-all", &options->pickaxe_opts,
5643 N_("show all changes in the changeset with -S or -G"),
5644 DIFF_PICKAXE_ALL, PARSE_OPT_NONEG),
5645 OPT_BIT_F(0, "pickaxe-regex", &options->pickaxe_opts,
5646 N_("treat <string> in -S as extended POSIX regular expression"),
5647 DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
5648 OPT_FILENAME('O', NULL, &options->orderfile,
5649 N_("control the order in which files appear in the output")),
5650 OPT_CALLBACK_F(0, "rotate-to", options, N_("<path>"),
5651 N_("show the change in the specified path first"),
5652 PARSE_OPT_NONEG, diff_opt_rotate_to),
5653 OPT_CALLBACK_F(0, "skip-to", options, N_("<path>"),
5654 N_("skip the output to the specified path"),
5655 PARSE_OPT_NONEG, diff_opt_rotate_to),
5656 OPT_CALLBACK_F(0, "find-object", options, N_("<object-id>"),
5657 N_("look for differences that change the number of occurrences of the specified object"),
5658 PARSE_OPT_NONEG, diff_opt_find_object),
5659 OPT_CALLBACK_F(0, "diff-filter", options, N_("[(A|C|D|M|R|T|U|X|B)...[*]]"),
5660 N_("select files by diff type"),
5661 PARSE_OPT_NONEG, diff_opt_diff_filter),
5662 { OPTION_CALLBACK, 0, "output", options, N_("<file>"),
5663 N_("output to a specific file"),
5664 PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
5665
5666 OPT_END()
5667 };
5668
5669 ALLOC_ARRAY(options->parseopts, ARRAY_SIZE(parseopts));
5670 memcpy(options->parseopts, parseopts, sizeof(parseopts));
5671 }
5672
5673 int diff_opt_parse(struct diff_options *options,
5674 const char **av, int ac, const char *prefix)
5675 {
5676 if (!prefix)
5677 prefix = "";
5678
5679 ac = parse_options(ac, av, prefix, options->parseopts, NULL,
5680 PARSE_OPT_KEEP_DASHDASH |
5681 PARSE_OPT_KEEP_UNKNOWN_OPT |
5682 PARSE_OPT_NO_INTERNAL_HELP |
5683 PARSE_OPT_ONE_SHOT |
5684 PARSE_OPT_STOP_AT_NON_OPTION);
5685
5686 return ac;
5687 }
5688
5689 int parse_rename_score(const char **cp_p)
5690 {
5691 unsigned long num, scale;
5692 int ch, dot;
5693 const char *cp = *cp_p;
5694
5695 num = 0;
5696 scale = 1;
5697 dot = 0;
5698 for (;;) {
5699 ch = *cp;
5700 if ( !dot && ch == '.' ) {
5701 scale = 1;
5702 dot = 1;
5703 } else if ( ch == '%' ) {
5704 scale = dot ? scale*100 : 100;
5705 cp++; /* % is always at the end */
5706 break;
5707 } else if ( ch >= '0' && ch <= '9' ) {
5708 if ( scale < 100000 ) {
5709 scale *= 10;
5710 num = (num*10) + (ch-'0');
5711 }
5712 } else {
5713 break;
5714 }
5715 cp++;
5716 }
5717 *cp_p = cp;
5718
5719 /* user says num divided by scale and we say internally that
5720 * is MAX_SCORE * num / scale.
5721 */
5722 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
5723 }
5724
5725 struct diff_queue_struct diff_queued_diff;
5726
5727 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
5728 {
5729 ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc);
5730 queue->queue[queue->nr++] = dp;
5731 }
5732
5733 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
5734 struct diff_filespec *one,
5735 struct diff_filespec *two)
5736 {
5737 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
5738 dp->one = one;
5739 dp->two = two;
5740 if (queue)
5741 diff_q(queue, dp);
5742 return dp;
5743 }
5744
5745 void diff_free_filepair(struct diff_filepair *p)
5746 {
5747 free_filespec(p->one);
5748 free_filespec(p->two);
5749 free(p);
5750 }
5751
5752 const char *diff_aligned_abbrev(const struct object_id *oid, int len)
5753 {
5754 int abblen;
5755 const char *abbrev;
5756
5757 /* Do we want all 40 hex characters? */
5758 if (len == the_hash_algo->hexsz)
5759 return oid_to_hex(oid);
5760
5761 /* An abbreviated value is fine, possibly followed by an ellipsis. */
5762 abbrev = diff_abbrev_oid(oid, len);
5763
5764 if (!print_sha1_ellipsis())
5765 return abbrev;
5766
5767 abblen = strlen(abbrev);
5768
5769 /*
5770 * In well-behaved cases, where the abbreviated result is the
5771 * same as the requested length, append three dots after the
5772 * abbreviation (hence the whole logic is limited to the case
5773 * where abblen < 37); when the actual abbreviated result is a
5774 * bit longer than the requested length, we reduce the number
5775 * of dots so that they match the well-behaved ones. However,
5776 * if the actual abbreviation is longer than the requested
5777 * length by more than three, we give up on aligning, and add
5778 * three dots anyway, to indicate that the output is not the
5779 * full object name. Yes, this may be suboptimal, but this
5780 * appears only in "diff --raw --abbrev" output and it is not
5781 * worth the effort to change it now. Note that this would
5782 * likely to work fine when the automatic sizing of default
5783 * abbreviation length is used--we would be fed -1 in "len" in
5784 * that case, and will end up always appending three-dots, but
5785 * the automatic sizing is supposed to give abblen that ensures
5786 * uniqueness across all objects (statistically speaking).
5787 */
5788 if (abblen < the_hash_algo->hexsz - 3) {
5789 static char hex[GIT_MAX_HEXSZ + 1];
5790 if (len < abblen && abblen <= len + 2)
5791 xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, "..");
5792 else
5793 xsnprintf(hex, sizeof(hex), "%s...", abbrev);
5794 return hex;
5795 }
5796
5797 return oid_to_hex(oid);
5798 }
5799
5800 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
5801 {
5802 int line_termination = opt->line_termination;
5803 int inter_name_termination = line_termination ? '\t' : '\0';
5804
5805 fprintf(opt->file, "%s", diff_line_prefix(opt));
5806 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
5807 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
5808 diff_aligned_abbrev(&p->one->oid, opt->abbrev));
5809 fprintf(opt->file, "%s ",
5810 diff_aligned_abbrev(&p->two->oid, opt->abbrev));
5811 }
5812 if (p->score) {
5813 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
5814 inter_name_termination);
5815 } else {
5816 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
5817 }
5818
5819 if (p->status == DIFF_STATUS_COPIED ||
5820 p->status == DIFF_STATUS_RENAMED) {
5821 const char *name_a, *name_b;
5822 name_a = p->one->path;
5823 name_b = p->two->path;
5824 strip_prefix(opt->prefix_length, &name_a, &name_b);
5825 write_name_quoted(name_a, opt->file, inter_name_termination);
5826 write_name_quoted(name_b, opt->file, line_termination);
5827 } else {
5828 const char *name_a, *name_b;
5829 name_a = p->one->mode ? p->one->path : p->two->path;
5830 name_b = NULL;
5831 strip_prefix(opt->prefix_length, &name_a, &name_b);
5832 write_name_quoted(name_a, opt->file, line_termination);
5833 }
5834 }
5835
5836 int diff_unmodified_pair(struct diff_filepair *p)
5837 {
5838 /* This function is written stricter than necessary to support
5839 * the currently implemented transformers, but the idea is to
5840 * let transformers to produce diff_filepairs any way they want,
5841 * and filter and clean them up here before producing the output.
5842 */
5843 struct diff_filespec *one = p->one, *two = p->two;
5844
5845 if (DIFF_PAIR_UNMERGED(p))
5846 return 0; /* unmerged is interesting */
5847
5848 /* deletion, addition, mode or type change
5849 * and rename are all interesting.
5850 */
5851 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
5852 DIFF_PAIR_MODE_CHANGED(p) ||
5853 strcmp(one->path, two->path))
5854 return 0;
5855
5856 /* both are valid and point at the same path. that is, we are
5857 * dealing with a change.
5858 */
5859 if (one->oid_valid && two->oid_valid &&
5860 oideq(&one->oid, &two->oid) &&
5861 !one->dirty_submodule && !two->dirty_submodule)
5862 return 1; /* no change */
5863 if (!one->oid_valid && !two->oid_valid)
5864 return 1; /* both look at the same file on the filesystem. */
5865 return 0;
5866 }
5867
5868 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
5869 {
5870 int include_conflict_headers =
5871 (additional_headers(o, p->one->path) &&
5872 !o->pickaxe_opts &&
5873 (!o->filter || filter_bit_tst(DIFF_STATUS_UNMERGED, o)));
5874
5875 /*
5876 * Check if we can return early without showing a diff. Note that
5877 * diff_filepair only stores {oid, path, mode, is_valid}
5878 * information for each path, and thus diff_unmodified_pair() only
5879 * considers those bits of info. However, we do not want pairs
5880 * created by create_filepairs_for_header_only_notifications()
5881 * (which always look like unmodified pairs) to be ignored, so
5882 * return early if both p is unmodified AND we don't want to
5883 * include_conflict_headers.
5884 */
5885 if (diff_unmodified_pair(p) && !include_conflict_headers)
5886 return;
5887
5888 /* Actually, we can also return early to avoid showing tree diffs */
5889 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
5890 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
5891 return;
5892
5893 run_diff(p, o);
5894 }
5895
5896 static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
5897 struct diffstat_t *diffstat)
5898 {
5899 if (diff_unmodified_pair(p))
5900 return;
5901
5902 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
5903 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
5904 return; /* no useful stat for tree diffs */
5905
5906 run_diffstat(p, o, diffstat);
5907 }
5908
5909 static void diff_flush_checkdiff(struct diff_filepair *p,
5910 struct diff_options *o)
5911 {
5912 if (diff_unmodified_pair(p))
5913 return;
5914
5915 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
5916 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
5917 return; /* nothing to check in tree diffs */
5918
5919 run_checkdiff(p, o);
5920 }
5921
5922 int diff_queue_is_empty(struct diff_options *o)
5923 {
5924 struct diff_queue_struct *q = &diff_queued_diff;
5925 int i;
5926 int include_conflict_headers =
5927 (o->additional_path_headers &&
5928 strmap_get_size(o->additional_path_headers) &&
5929 !o->pickaxe_opts &&
5930 (!o->filter || filter_bit_tst(DIFF_STATUS_UNMERGED, o)));
5931
5932 if (include_conflict_headers)
5933 return 0;
5934
5935 for (i = 0; i < q->nr; i++)
5936 if (!diff_unmodified_pair(q->queue[i]))
5937 return 0;
5938 return 1;
5939 }
5940
5941 #if DIFF_DEBUG
5942 void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
5943 {
5944 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
5945 x, one ? one : "",
5946 s->path,
5947 DIFF_FILE_VALID(s) ? "valid" : "invalid",
5948 s->mode,
5949 s->oid_valid ? oid_to_hex(&s->oid) : "");
5950 fprintf(stderr, "queue[%d] %s size %lu\n",
5951 x, one ? one : "",
5952 s->size);
5953 }
5954
5955 void diff_debug_filepair(const struct diff_filepair *p, int i)
5956 {
5957 diff_debug_filespec(p->one, i, "one");
5958 diff_debug_filespec(p->two, i, "two");
5959 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
5960 p->score, p->status ? p->status : '?',
5961 p->one->rename_used, p->broken_pair);
5962 }
5963
5964 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
5965 {
5966 int i;
5967 if (msg)
5968 fprintf(stderr, "%s\n", msg);
5969 fprintf(stderr, "q->nr = %d\n", q->nr);
5970 for (i = 0; i < q->nr; i++) {
5971 struct diff_filepair *p = q->queue[i];
5972 diff_debug_filepair(p, i);
5973 }
5974 }
5975 #endif
5976
5977 static void diff_resolve_rename_copy(void)
5978 {
5979 int i;
5980 struct diff_filepair *p;
5981 struct diff_queue_struct *q = &diff_queued_diff;
5982
5983 diff_debug_queue("resolve-rename-copy", q);
5984
5985 for (i = 0; i < q->nr; i++) {
5986 p = q->queue[i];
5987 p->status = 0; /* undecided */
5988 if (DIFF_PAIR_UNMERGED(p))
5989 p->status = DIFF_STATUS_UNMERGED;
5990 else if (!DIFF_FILE_VALID(p->one))
5991 p->status = DIFF_STATUS_ADDED;
5992 else if (!DIFF_FILE_VALID(p->two))
5993 p->status = DIFF_STATUS_DELETED;
5994 else if (DIFF_PAIR_TYPE_CHANGED(p))
5995 p->status = DIFF_STATUS_TYPE_CHANGED;
5996
5997 /* from this point on, we are dealing with a pair
5998 * whose both sides are valid and of the same type, i.e.
5999 * either in-place edit or rename/copy edit.
6000 */
6001 else if (DIFF_PAIR_RENAME(p)) {
6002 /*
6003 * A rename might have re-connected a broken
6004 * pair up, causing the pathnames to be the
6005 * same again. If so, that's not a rename at
6006 * all, just a modification..
6007 *
6008 * Otherwise, see if this source was used for
6009 * multiple renames, in which case we decrement
6010 * the count, and call it a copy.
6011 */
6012 if (!strcmp(p->one->path, p->two->path))
6013 p->status = DIFF_STATUS_MODIFIED;
6014 else if (--p->one->rename_used > 0)
6015 p->status = DIFF_STATUS_COPIED;
6016 else
6017 p->status = DIFF_STATUS_RENAMED;
6018 }
6019 else if (!oideq(&p->one->oid, &p->two->oid) ||
6020 p->one->mode != p->two->mode ||
6021 p->one->dirty_submodule ||
6022 p->two->dirty_submodule ||
6023 is_null_oid(&p->one->oid))
6024 p->status = DIFF_STATUS_MODIFIED;
6025 else {
6026 /* This is a "no-change" entry and should not
6027 * happen anymore, but prepare for broken callers.
6028 */
6029 error("feeding unmodified %s to diffcore",
6030 p->one->path);
6031 p->status = DIFF_STATUS_UNKNOWN;
6032 }
6033 }
6034 diff_debug_queue("resolve-rename-copy done", q);
6035 }
6036
6037 static int check_pair_status(struct diff_filepair *p)
6038 {
6039 switch (p->status) {
6040 case DIFF_STATUS_UNKNOWN:
6041 return 0;
6042 case 0:
6043 die("internal error in diff-resolve-rename-copy");
6044 default:
6045 return 1;
6046 }
6047 }
6048
6049 static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
6050 {
6051 int fmt = opt->output_format;
6052
6053 if (fmt & DIFF_FORMAT_CHECKDIFF)
6054 diff_flush_checkdiff(p, opt);
6055 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
6056 diff_flush_raw(p, opt);
6057 else if (fmt & DIFF_FORMAT_NAME) {
6058 const char *name_a, *name_b;
6059 name_a = p->two->path;
6060 name_b = NULL;
6061 strip_prefix(opt->prefix_length, &name_a, &name_b);
6062 fprintf(opt->file, "%s", diff_line_prefix(opt));
6063 write_name_quoted(name_a, opt->file, opt->line_termination);
6064 }
6065 }
6066
6067 static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs)
6068 {
6069 struct strbuf sb = STRBUF_INIT;
6070 if (fs->mode)
6071 strbuf_addf(&sb, " %s mode %06o ", newdelete, fs->mode);
6072 else
6073 strbuf_addf(&sb, " %s ", newdelete);
6074
6075 quote_c_style(fs->path, &sb, NULL, 0);
6076 strbuf_addch(&sb, '\n');
6077 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
6078 sb.buf, sb.len, 0);
6079 strbuf_release(&sb);
6080 }
6081
6082 static void show_mode_change(struct diff_options *opt, struct diff_filepair *p,
6083 int show_name)
6084 {
6085 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
6086 struct strbuf sb = STRBUF_INIT;
6087 strbuf_addf(&sb, " mode change %06o => %06o",
6088 p->one->mode, p->two->mode);
6089 if (show_name) {
6090 strbuf_addch(&sb, ' ');
6091 quote_c_style(p->two->path, &sb, NULL, 0);
6092 }
6093 strbuf_addch(&sb, '\n');
6094 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
6095 sb.buf, sb.len, 0);
6096 strbuf_release(&sb);
6097 }
6098 }
6099
6100 static void show_rename_copy(struct diff_options *opt, const char *renamecopy,
6101 struct diff_filepair *p)
6102 {
6103 struct strbuf sb = STRBUF_INIT;
6104 struct strbuf names = STRBUF_INIT;
6105
6106 pprint_rename(&names, p->one->path, p->two->path);
6107 strbuf_addf(&sb, " %s %s (%d%%)\n",
6108 renamecopy, names.buf, similarity_index(p));
6109 strbuf_release(&names);
6110 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
6111 sb.buf, sb.len, 0);
6112 show_mode_change(opt, p, 0);
6113 strbuf_release(&sb);
6114 }
6115
6116 static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
6117 {
6118 switch(p->status) {
6119 case DIFF_STATUS_DELETED:
6120 show_file_mode_name(opt, "delete", p->one);
6121 break;
6122 case DIFF_STATUS_ADDED:
6123 show_file_mode_name(opt, "create", p->two);
6124 break;
6125 case DIFF_STATUS_COPIED:
6126 show_rename_copy(opt, "copy", p);
6127 break;
6128 case DIFF_STATUS_RENAMED:
6129 show_rename_copy(opt, "rename", p);
6130 break;
6131 default:
6132 if (p->score) {
6133 struct strbuf sb = STRBUF_INIT;
6134 strbuf_addstr(&sb, " rewrite ");
6135 quote_c_style(p->two->path, &sb, NULL, 0);
6136 strbuf_addf(&sb, " (%d%%)\n", similarity_index(p));
6137 emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
6138 sb.buf, sb.len, 0);
6139 strbuf_release(&sb);
6140 }
6141 show_mode_change(opt, p, !p->score);
6142 break;
6143 }
6144 }
6145
6146 struct patch_id_t {
6147 git_hash_ctx *ctx;
6148 int patchlen;
6149 };
6150
6151 static int remove_space(char *line, int len)
6152 {
6153 int i;
6154 char *dst = line;
6155 unsigned char c;
6156
6157 for (i = 0; i < len; i++)
6158 if (!isspace((c = line[i])))
6159 *dst++ = c;
6160
6161 return dst - line;
6162 }
6163
6164 void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx)
6165 {
6166 unsigned char hash[GIT_MAX_RAWSZ];
6167 unsigned short carry = 0;
6168 int i;
6169
6170 the_hash_algo->final_fn(hash, ctx);
6171 the_hash_algo->init_fn(ctx);
6172 /* 20-byte sum, with carry */
6173 for (i = 0; i < the_hash_algo->rawsz; ++i) {
6174 carry += result->hash[i] + hash[i];
6175 result->hash[i] = carry;
6176 carry >>= 8;
6177 }
6178 }
6179
6180 static int patch_id_consume(void *priv, char *line, unsigned long len)
6181 {
6182 struct patch_id_t *data = priv;
6183 int new_len;
6184
6185 if (len > 12 && starts_with(line, "\\ "))
6186 return 0;
6187 new_len = remove_space(line, len);
6188
6189 the_hash_algo->update_fn(data->ctx, line, new_len);
6190 data->patchlen += new_len;
6191 return 0;
6192 }
6193
6194 static void patch_id_add_string(git_hash_ctx *ctx, const char *str)
6195 {
6196 the_hash_algo->update_fn(ctx, str, strlen(str));
6197 }
6198
6199 static void patch_id_add_mode(git_hash_ctx *ctx, unsigned mode)
6200 {
6201 /* large enough for 2^32 in octal */
6202 char buf[12];
6203 int len = xsnprintf(buf, sizeof(buf), "%06o", mode);
6204 the_hash_algo->update_fn(ctx, buf, len);
6205 }
6206
6207 /* returns 0 upon success, and writes result into oid */
6208 static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
6209 {
6210 struct diff_queue_struct *q = &diff_queued_diff;
6211 int i;
6212 git_hash_ctx ctx;
6213 struct patch_id_t data;
6214
6215 the_hash_algo->init_fn(&ctx);
6216 memset(&data, 0, sizeof(struct patch_id_t));
6217 data.ctx = &ctx;
6218 oidclr(oid);
6219
6220 for (i = 0; i < q->nr; i++) {
6221 xpparam_t xpp;
6222 xdemitconf_t xecfg;
6223 mmfile_t mf1, mf2;
6224 struct diff_filepair *p = q->queue[i];
6225 int len1, len2;
6226
6227 memset(&xpp, 0, sizeof(xpp));
6228 memset(&xecfg, 0, sizeof(xecfg));
6229 if (p->status == 0)
6230 return error("internal diff status error");
6231 if (p->status == DIFF_STATUS_UNKNOWN)
6232 continue;
6233 if (diff_unmodified_pair(p))
6234 continue;
6235 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
6236 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
6237 continue;
6238 if (DIFF_PAIR_UNMERGED(p))
6239 continue;
6240
6241 diff_fill_oid_info(p->one, options->repo->index);
6242 diff_fill_oid_info(p->two, options->repo->index);
6243
6244 len1 = remove_space(p->one->path, strlen(p->one->path));
6245 len2 = remove_space(p->two->path, strlen(p->two->path));
6246 patch_id_add_string(&ctx, "diff--git");
6247 patch_id_add_string(&ctx, "a/");
6248 the_hash_algo->update_fn(&ctx, p->one->path, len1);
6249 patch_id_add_string(&ctx, "b/");
6250 the_hash_algo->update_fn(&ctx, p->two->path, len2);
6251
6252 if (p->one->mode == 0) {
6253 patch_id_add_string(&ctx, "newfilemode");
6254 patch_id_add_mode(&ctx, p->two->mode);
6255 patch_id_add_string(&ctx, "---/dev/null");
6256 patch_id_add_string(&ctx, "+++b/");
6257 the_hash_algo->update_fn(&ctx, p->two->path, len2);
6258 } else if (p->two->mode == 0) {
6259 patch_id_add_string(&ctx, "deletedfilemode");
6260 patch_id_add_mode(&ctx, p->one->mode);
6261 patch_id_add_string(&ctx, "---a/");
6262 the_hash_algo->update_fn(&ctx, p->one->path, len1);
6263 patch_id_add_string(&ctx, "+++/dev/null");
6264 } else {
6265 patch_id_add_string(&ctx, "---a/");
6266 the_hash_algo->update_fn(&ctx, p->one->path, len1);
6267 patch_id_add_string(&ctx, "+++b/");
6268 the_hash_algo->update_fn(&ctx, p->two->path, len2);
6269 }
6270
6271 if (diff_header_only)
6272 continue;
6273
6274 if (fill_mmfile(options->repo, &mf1, p->one) < 0 ||
6275 fill_mmfile(options->repo, &mf2, p->two) < 0)
6276 return error("unable to read files to diff");
6277
6278 if (diff_filespec_is_binary(options->repo, p->one) ||
6279 diff_filespec_is_binary(options->repo, p->two)) {
6280 the_hash_algo->update_fn(&ctx, oid_to_hex(&p->one->oid),
6281 the_hash_algo->hexsz);
6282 the_hash_algo->update_fn(&ctx, oid_to_hex(&p->two->oid),
6283 the_hash_algo->hexsz);
6284 continue;
6285 }
6286
6287 xpp.flags = 0;
6288 xecfg.ctxlen = 3;
6289 xecfg.flags = XDL_EMIT_NO_HUNK_HDR;
6290 if (xdi_diff_outf(&mf1, &mf2, NULL,
6291 patch_id_consume, &data, &xpp, &xecfg))
6292 return error("unable to generate patch-id diff for %s",
6293 p->one->path);
6294
6295 if (stable)
6296 flush_one_hunk(oid, &ctx);
6297 }
6298
6299 if (!stable)
6300 the_hash_algo->final_oid_fn(oid, &ctx);
6301
6302 return 0;
6303 }
6304
6305 int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
6306 {
6307 struct diff_queue_struct *q = &diff_queued_diff;
6308 int i;
6309 int result = diff_get_patch_id(options, oid, diff_header_only, stable);
6310
6311 for (i = 0; i < q->nr; i++)
6312 diff_free_filepair(q->queue[i]);
6313
6314 free(q->queue);
6315 DIFF_QUEUE_CLEAR(q);
6316
6317 return result;
6318 }
6319
6320 static int is_summary_empty(const struct diff_queue_struct *q)
6321 {
6322 int i;
6323
6324 for (i = 0; i < q->nr; i++) {
6325 const struct diff_filepair *p = q->queue[i];
6326
6327 switch (p->status) {
6328 case DIFF_STATUS_DELETED:
6329 case DIFF_STATUS_ADDED:
6330 case DIFF_STATUS_COPIED:
6331 case DIFF_STATUS_RENAMED:
6332 return 0;
6333 default:
6334 if (p->score)
6335 return 0;
6336 if (p->one->mode && p->two->mode &&
6337 p->one->mode != p->two->mode)
6338 return 0;
6339 break;
6340 }
6341 }
6342 return 1;
6343 }
6344
6345 static const char rename_limit_warning[] =
6346 N_("exhaustive rename detection was skipped due to too many files.");
6347
6348 static const char degrade_cc_to_c_warning[] =
6349 N_("only found copies from modified paths due to too many files.");
6350
6351 static const char rename_limit_advice[] =
6352 N_("you may want to set your %s variable to at least "
6353 "%d and retry the command.");
6354
6355 void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
6356 {
6357 fflush(stdout);
6358 if (degraded_cc)
6359 warning(_(degrade_cc_to_c_warning));
6360 else if (needed)
6361 warning(_(rename_limit_warning));
6362 else
6363 return;
6364 if (0 < needed)
6365 warning(_(rename_limit_advice), varname, needed);
6366 }
6367
6368 static void create_filepairs_for_header_only_notifications(struct diff_options *o)
6369 {
6370 struct strset present;
6371 struct diff_queue_struct *q = &diff_queued_diff;
6372 struct hashmap_iter iter;
6373 struct strmap_entry *e;
6374 int i;
6375
6376 strset_init_with_options(&present, /*pool*/ NULL, /*strdup*/ 0);
6377
6378 /*
6379 * Find out which paths exist in diff_queued_diff, preferring
6380 * one->path for any pair that has multiple paths.
6381 */
6382 for (i = 0; i < q->nr; i++) {
6383 struct diff_filepair *p = q->queue[i];
6384 char *path = p->one->path ? p->one->path : p->two->path;
6385
6386 if (strmap_contains(o->additional_path_headers, path))
6387 strset_add(&present, path);
6388 }
6389
6390 /*
6391 * Loop over paths in additional_path_headers; for each NOT already
6392 * in diff_queued_diff, create a synthetic filepair and insert that
6393 * into diff_queued_diff.
6394 */
6395 strmap_for_each_entry(o->additional_path_headers, &iter, e) {
6396 if (!strset_contains(&present, e->key)) {
6397 struct diff_filespec *one, *two;
6398 struct diff_filepair *p;
6399
6400 one = alloc_filespec(e->key);
6401 two = alloc_filespec(e->key);
6402 fill_filespec(one, null_oid(), 0, 0);
6403 fill_filespec(two, null_oid(), 0, 0);
6404 p = diff_queue(q, one, two);
6405 p->status = DIFF_STATUS_MODIFIED;
6406 }
6407 }
6408
6409 /* Re-sort the filepairs */
6410 diffcore_fix_diff_index();
6411
6412 /* Cleanup */
6413 strset_clear(&present);
6414 }
6415
6416 static void diff_flush_patch_all_file_pairs(struct diff_options *o)
6417 {
6418 int i;
6419 static struct emitted_diff_symbols esm = EMITTED_DIFF_SYMBOLS_INIT;
6420 struct diff_queue_struct *q = &diff_queued_diff;
6421
6422 if (WSEH_NEW & WS_RULE_MASK)
6423 BUG("WS rules bit mask overlaps with diff symbol flags");
6424
6425 if (o->color_moved)
6426 o->emitted_symbols = &esm;
6427
6428 if (o->additional_path_headers)
6429 create_filepairs_for_header_only_notifications(o);
6430
6431 for (i = 0; i < q->nr; i++) {
6432 struct diff_filepair *p = q->queue[i];
6433 if (check_pair_status(p))
6434 diff_flush_patch(p, o);
6435 }
6436
6437 if (o->emitted_symbols) {
6438 if (o->color_moved) {
6439 struct mem_pool entry_pool;
6440 struct moved_entry_list *entry_list;
6441
6442 mem_pool_init(&entry_pool, 1024 * 1024);
6443 entry_list = add_lines_to_move_detection(o,
6444 &entry_pool);
6445 mark_color_as_moved(o, entry_list);
6446 if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
6447 dim_moved_lines(o);
6448
6449 mem_pool_discard(&entry_pool, 0);
6450 free(entry_list);
6451 }
6452
6453 for (i = 0; i < esm.nr; i++)
6454 emit_diff_symbol_from_struct(o, &esm.buf[i]);
6455
6456 for (i = 0; i < esm.nr; i++)
6457 free((void *)esm.buf[i].line);
6458 esm.nr = 0;
6459
6460 o->emitted_symbols = NULL;
6461 }
6462 }
6463
6464 static void diff_free_file(struct diff_options *options)
6465 {
6466 if (options->close_file)
6467 fclose(options->file);
6468 }
6469
6470 static void diff_free_ignore_regex(struct diff_options *options)
6471 {
6472 int i;
6473
6474 for (i = 0; i < options->ignore_regex_nr; i++) {
6475 regfree(options->ignore_regex[i]);
6476 free(options->ignore_regex[i]);
6477 }
6478 free(options->ignore_regex);
6479 }
6480
6481 void diff_free(struct diff_options *options)
6482 {
6483 if (options->no_free)
6484 return;
6485
6486 diff_free_file(options);
6487 diff_free_ignore_regex(options);
6488 clear_pathspec(&options->pathspec);
6489 FREE_AND_NULL(options->parseopts);
6490 }
6491
6492 void diff_flush(struct diff_options *options)
6493 {
6494 struct diff_queue_struct *q = &diff_queued_diff;
6495 int i, output_format = options->output_format;
6496 int separator = 0;
6497 int dirstat_by_line = 0;
6498
6499 /*
6500 * Order: raw, stat, summary, patch
6501 * or: name/name-status/checkdiff (other bits clear)
6502 */
6503 if (!q->nr && !options->additional_path_headers)
6504 goto free_queue;
6505
6506 if (output_format & (DIFF_FORMAT_RAW |
6507 DIFF_FORMAT_NAME |
6508 DIFF_FORMAT_NAME_STATUS |
6509 DIFF_FORMAT_CHECKDIFF)) {
6510 for (i = 0; i < q->nr; i++) {
6511 struct diff_filepair *p = q->queue[i];
6512 if (check_pair_status(p))
6513 flush_one_pair(p, options);
6514 }
6515 separator++;
6516 }
6517
6518 if (output_format & DIFF_FORMAT_DIRSTAT && options->flags.dirstat_by_line)
6519 dirstat_by_line = 1;
6520
6521 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
6522 dirstat_by_line) {
6523 struct diffstat_t diffstat;
6524
6525 compute_diffstat(options, &diffstat, q);
6526 if (output_format & DIFF_FORMAT_NUMSTAT)
6527 show_numstat(&diffstat, options);
6528 if (output_format & DIFF_FORMAT_DIFFSTAT)
6529 show_stats(&diffstat, options);
6530 if (output_format & DIFF_FORMAT_SHORTSTAT)
6531 show_shortstats(&diffstat, options);
6532 if (output_format & DIFF_FORMAT_DIRSTAT && dirstat_by_line)
6533 show_dirstat_by_line(&diffstat, options);
6534 free_diffstat_info(&diffstat);
6535 separator++;
6536 }
6537 if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line)
6538 show_dirstat(options);
6539
6540 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
6541 for (i = 0; i < q->nr; i++) {
6542 diff_summary(options, q->queue[i]);
6543 }
6544 separator++;
6545 }
6546
6547 if (output_format & DIFF_FORMAT_NO_OUTPUT &&
6548 options->flags.exit_with_status &&
6549 options->flags.diff_from_contents) {
6550 /*
6551 * run diff_flush_patch for the exit status. setting
6552 * options->file to /dev/null should be safe, because we
6553 * aren't supposed to produce any output anyway.
6554 */
6555 diff_free_file(options);
6556 options->file = xfopen("/dev/null", "w");
6557 options->close_file = 1;
6558 options->color_moved = 0;
6559 for (i = 0; i < q->nr; i++) {
6560 struct diff_filepair *p = q->queue[i];
6561 if (check_pair_status(p))
6562 diff_flush_patch(p, options);
6563 if (options->found_changes)
6564 break;
6565 }
6566 }
6567
6568 if (output_format & DIFF_FORMAT_PATCH) {
6569 if (separator) {
6570 emit_diff_symbol(options, DIFF_SYMBOL_SEPARATOR, NULL, 0, 0);
6571 if (options->stat_sep)
6572 /* attach patch instead of inline */
6573 emit_diff_symbol(options, DIFF_SYMBOL_STAT_SEP,
6574 NULL, 0, 0);
6575 }
6576
6577 diff_flush_patch_all_file_pairs(options);
6578 }
6579
6580 if (output_format & DIFF_FORMAT_CALLBACK)
6581 options->format_callback(q, options, options->format_callback_data);
6582
6583 for (i = 0; i < q->nr; i++)
6584 diff_free_filepair(q->queue[i]);
6585 free_queue:
6586 free(q->queue);
6587 DIFF_QUEUE_CLEAR(q);
6588 diff_free(options);
6589
6590 /*
6591 * Report the content-level differences with HAS_CHANGES;
6592 * diff_addremove/diff_change does not set the bit when
6593 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
6594 */
6595 if (options->flags.diff_from_contents) {
6596 if (options->found_changes)
6597 options->flags.has_changes = 1;
6598 else
6599 options->flags.has_changes = 0;
6600 }
6601 }
6602
6603 static int match_filter(const struct diff_options *options, const struct diff_filepair *p)
6604 {
6605 return (((p->status == DIFF_STATUS_MODIFIED) &&
6606 ((p->score &&
6607 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) ||
6608 (!p->score &&
6609 filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) ||
6610 ((p->status != DIFF_STATUS_MODIFIED) &&
6611 filter_bit_tst(p->status, options)));
6612 }
6613
6614 static void diffcore_apply_filter(struct diff_options *options)
6615 {
6616 int i;
6617 struct diff_queue_struct *q = &diff_queued_diff;
6618 struct diff_queue_struct outq;
6619
6620 DIFF_QUEUE_CLEAR(&outq);
6621
6622 if (!options->filter)
6623 return;
6624
6625 if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) {
6626 int found;
6627 for (i = found = 0; !found && i < q->nr; i++) {
6628 if (match_filter(options, q->queue[i]))
6629 found++;
6630 }
6631 if (found)
6632 return;
6633
6634 /* otherwise we will clear the whole queue
6635 * by copying the empty outq at the end of this
6636 * function, but first clear the current entries
6637 * in the queue.
6638 */
6639 for (i = 0; i < q->nr; i++)
6640 diff_free_filepair(q->queue[i]);
6641 }
6642 else {
6643 /* Only the matching ones */
6644 for (i = 0; i < q->nr; i++) {
6645 struct diff_filepair *p = q->queue[i];
6646 if (match_filter(options, p))
6647 diff_q(&outq, p);
6648 else
6649 diff_free_filepair(p);
6650 }
6651 }
6652 free(q->queue);
6653 *q = outq;
6654 }
6655
6656 /* Check whether two filespecs with the same mode and size are identical */
6657 static int diff_filespec_is_identical(struct repository *r,
6658 struct diff_filespec *one,
6659 struct diff_filespec *two)
6660 {
6661 if (S_ISGITLINK(one->mode))
6662 return 0;
6663 if (diff_populate_filespec(r, one, NULL))
6664 return 0;
6665 if (diff_populate_filespec(r, two, NULL))
6666 return 0;
6667 return !memcmp(one->data, two->data, one->size);
6668 }
6669
6670 static int diff_filespec_check_stat_unmatch(struct repository *r,
6671 struct diff_filepair *p)
6672 {
6673 struct diff_populate_filespec_options dpf_options = {
6674 .check_size_only = 1,
6675 .missing_object_cb = diff_queued_diff_prefetch,
6676 .missing_object_data = r,
6677 };
6678
6679 if (p->done_skip_stat_unmatch)
6680 return p->skip_stat_unmatch_result;
6681
6682 p->done_skip_stat_unmatch = 1;
6683 p->skip_stat_unmatch_result = 0;
6684 /*
6685 * 1. Entries that come from stat info dirtiness
6686 * always have both sides (iow, not create/delete),
6687 * one side of the object name is unknown, with
6688 * the same mode and size. Keep the ones that
6689 * do not match these criteria. They have real
6690 * differences.
6691 *
6692 * 2. At this point, the file is known to be modified,
6693 * with the same mode and size, and the object
6694 * name of one side is unknown. Need to inspect
6695 * the identical contents.
6696 */
6697 if (!DIFF_FILE_VALID(p->one) || /* (1) */
6698 !DIFF_FILE_VALID(p->two) ||
6699 (p->one->oid_valid && p->two->oid_valid) ||
6700 (p->one->mode != p->two->mode) ||
6701 diff_populate_filespec(r, p->one, &dpf_options) ||
6702 diff_populate_filespec(r, p->two, &dpf_options) ||
6703 (p->one->size != p->two->size) ||
6704 !diff_filespec_is_identical(r, p->one, p->two)) /* (2) */
6705 p->skip_stat_unmatch_result = 1;
6706 return p->skip_stat_unmatch_result;
6707 }
6708
6709 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
6710 {
6711 int i;
6712 struct diff_queue_struct *q = &diff_queued_diff;
6713 struct diff_queue_struct outq;
6714 DIFF_QUEUE_CLEAR(&outq);
6715
6716 for (i = 0; i < q->nr; i++) {
6717 struct diff_filepair *p = q->queue[i];
6718
6719 if (diff_filespec_check_stat_unmatch(diffopt->repo, p))
6720 diff_q(&outq, p);
6721 else {
6722 /*
6723 * The caller can subtract 1 from skip_stat_unmatch
6724 * to determine how many paths were dirty only
6725 * due to stat info mismatch.
6726 */
6727 if (!diffopt->flags.no_index)
6728 diffopt->skip_stat_unmatch++;
6729 diff_free_filepair(p);
6730 }
6731 }
6732 free(q->queue);
6733 *q = outq;
6734 }
6735
6736 static int diffnamecmp(const void *a_, const void *b_)
6737 {
6738 const struct diff_filepair *a = *((const struct diff_filepair **)a_);
6739 const struct diff_filepair *b = *((const struct diff_filepair **)b_);
6740 const char *name_a, *name_b;
6741
6742 name_a = a->one ? a->one->path : a->two->path;
6743 name_b = b->one ? b->one->path : b->two->path;
6744 return strcmp(name_a, name_b);
6745 }
6746
6747 void diffcore_fix_diff_index(void)
6748 {
6749 struct diff_queue_struct *q = &diff_queued_diff;
6750 QSORT(q->queue, q->nr, diffnamecmp);
6751 }
6752
6753 void diff_add_if_missing(struct repository *r,
6754 struct oid_array *to_fetch,
6755 const struct diff_filespec *filespec)
6756 {
6757 if (filespec && filespec->oid_valid &&
6758 !S_ISGITLINK(filespec->mode) &&
6759 oid_object_info_extended(r, &filespec->oid, NULL,
6760 OBJECT_INFO_FOR_PREFETCH))
6761 oid_array_append(to_fetch, &filespec->oid);
6762 }
6763
6764 void diff_queued_diff_prefetch(void *repository)
6765 {
6766 struct repository *repo = repository;
6767 int i;
6768 struct diff_queue_struct *q = &diff_queued_diff;
6769 struct oid_array to_fetch = OID_ARRAY_INIT;
6770
6771 for (i = 0; i < q->nr; i++) {
6772 struct diff_filepair *p = q->queue[i];
6773 diff_add_if_missing(repo, &to_fetch, p->one);
6774 diff_add_if_missing(repo, &to_fetch, p->two);
6775 }
6776
6777 /*
6778 * NEEDSWORK: Consider deduplicating the OIDs sent.
6779 */
6780 promisor_remote_get_direct(repo, to_fetch.oid, to_fetch.nr);
6781
6782 oid_array_clear(&to_fetch);
6783 }
6784
6785 void diffcore_std(struct diff_options *options)
6786 {
6787 int output_formats_to_prefetch = DIFF_FORMAT_DIFFSTAT |
6788 DIFF_FORMAT_NUMSTAT |
6789 DIFF_FORMAT_PATCH |
6790 DIFF_FORMAT_SHORTSTAT |
6791 DIFF_FORMAT_DIRSTAT;
6792
6793 /*
6794 * Check if the user requested a blob-data-requiring diff output and/or
6795 * break-rewrite detection (which requires blob data). If yes, prefetch
6796 * the diff pairs.
6797 *
6798 * If no prefetching occurs, diffcore_rename() will prefetch if it
6799 * decides that it needs inexact rename detection.
6800 */
6801 if (options->repo == the_repository && has_promisor_remote() &&
6802 (options->output_format & output_formats_to_prefetch ||
6803 options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
6804 diff_queued_diff_prefetch(options->repo);
6805
6806 /* NOTE please keep the following in sync with diff_tree_combined() */
6807 if (options->skip_stat_unmatch)
6808 diffcore_skip_stat_unmatch(options);
6809 if (!options->found_follow) {
6810 /* See try_to_follow_renames() in tree-diff.c */
6811 if (options->break_opt != -1)
6812 diffcore_break(options->repo,
6813 options->break_opt);
6814 if (options->detect_rename)
6815 diffcore_rename(options);
6816 if (options->break_opt != -1)
6817 diffcore_merge_broken();
6818 }
6819 if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)
6820 diffcore_pickaxe(options);
6821 if (options->orderfile)
6822 diffcore_order(options->orderfile);
6823 if (options->rotate_to)
6824 diffcore_rotate(options);
6825 if (!options->found_follow)
6826 /* See try_to_follow_renames() in tree-diff.c */
6827 diff_resolve_rename_copy();
6828 diffcore_apply_filter(options);
6829
6830 if (diff_queued_diff.nr && !options->flags.diff_from_contents)
6831 options->flags.has_changes = 1;
6832 else
6833 options->flags.has_changes = 0;
6834
6835 options->found_follow = 0;
6836 }
6837
6838 int diff_result_code(struct diff_options *opt, int status)
6839 {
6840 int result = 0;
6841
6842 diff_warn_rename_limit("diff.renameLimit",
6843 opt->needed_rename_limit,
6844 opt->degraded_cc_to_c);
6845 if (!opt->flags.exit_with_status &&
6846 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
6847 return status;
6848 if (opt->flags.exit_with_status &&
6849 opt->flags.has_changes)
6850 result |= 01;
6851 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
6852 opt->flags.check_failed)
6853 result |= 02;
6854 return result;
6855 }
6856
6857 int diff_can_quit_early(struct diff_options *opt)
6858 {
6859 return (opt->flags.quick &&
6860 !opt->filter &&
6861 opt->flags.has_changes);
6862 }
6863
6864 /*
6865 * Shall changes to this submodule be ignored?
6866 *
6867 * Submodule changes can be configured to be ignored separately for each path,
6868 * but that configuration can be overridden from the command line.
6869 */
6870 static int is_submodule_ignored(const char *path, struct diff_options *options)
6871 {
6872 int ignored = 0;
6873 struct diff_flags orig_flags = options->flags;
6874 if (!options->flags.override_submodule_config)
6875 set_diffopt_flags_from_submodule_config(options, path);
6876 if (options->flags.ignore_submodules)
6877 ignored = 1;
6878 options->flags = orig_flags;
6879 return ignored;
6880 }
6881
6882 void compute_diffstat(struct diff_options *options,
6883 struct diffstat_t *diffstat,
6884 struct diff_queue_struct *q)
6885 {
6886 int i;
6887
6888 memset(diffstat, 0, sizeof(struct diffstat_t));
6889 for (i = 0; i < q->nr; i++) {
6890 struct diff_filepair *p = q->queue[i];
6891 if (check_pair_status(p))
6892 diff_flush_stat(p, options, diffstat);
6893 }
6894 }
6895
6896 void diff_addremove(struct diff_options *options,
6897 int addremove, unsigned mode,
6898 const struct object_id *oid,
6899 int oid_valid,
6900 const char *concatpath, unsigned dirty_submodule)
6901 {
6902 struct diff_filespec *one, *two;
6903
6904 if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options))
6905 return;
6906
6907 /* This may look odd, but it is a preparation for
6908 * feeding "there are unchanged files which should
6909 * not produce diffs, but when you are doing copy
6910 * detection you would need them, so here they are"
6911 * entries to the diff-core. They will be prefixed
6912 * with something like '=' or '*' (I haven't decided
6913 * which but should not make any difference).
6914 * Feeding the same new and old to diff_change()
6915 * also has the same effect.
6916 * Before the final output happens, they are pruned after
6917 * merged into rename/copy pairs as appropriate.
6918 */
6919 if (options->flags.reverse_diff)
6920 addremove = (addremove == '+' ? '-' :
6921 addremove == '-' ? '+' : addremove);
6922
6923 if (options->prefix &&
6924 strncmp(concatpath, options->prefix, options->prefix_length))
6925 return;
6926
6927 one = alloc_filespec(concatpath);
6928 two = alloc_filespec(concatpath);
6929
6930 if (addremove != '+')
6931 fill_filespec(one, oid, oid_valid, mode);
6932 if (addremove != '-') {
6933 fill_filespec(two, oid, oid_valid, mode);
6934 two->dirty_submodule = dirty_submodule;
6935 }
6936
6937 diff_queue(&diff_queued_diff, one, two);
6938 if (!options->flags.diff_from_contents)
6939 options->flags.has_changes = 1;
6940 }
6941
6942 void diff_change(struct diff_options *options,
6943 unsigned old_mode, unsigned new_mode,
6944 const struct object_id *old_oid,
6945 const struct object_id *new_oid,
6946 int old_oid_valid, int new_oid_valid,
6947 const char *concatpath,
6948 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
6949 {
6950 struct diff_filespec *one, *two;
6951 struct diff_filepair *p;
6952
6953 if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) &&
6954 is_submodule_ignored(concatpath, options))
6955 return;
6956
6957 if (options->flags.reverse_diff) {
6958 SWAP(old_mode, new_mode);
6959 SWAP(old_oid, new_oid);
6960 SWAP(old_oid_valid, new_oid_valid);
6961 SWAP(old_dirty_submodule, new_dirty_submodule);
6962 }
6963
6964 if (options->prefix &&
6965 strncmp(concatpath, options->prefix, options->prefix_length))
6966 return;
6967
6968 one = alloc_filespec(concatpath);
6969 two = alloc_filespec(concatpath);
6970 fill_filespec(one, old_oid, old_oid_valid, old_mode);
6971 fill_filespec(two, new_oid, new_oid_valid, new_mode);
6972 one->dirty_submodule = old_dirty_submodule;
6973 two->dirty_submodule = new_dirty_submodule;
6974 p = diff_queue(&diff_queued_diff, one, two);
6975
6976 if (options->flags.diff_from_contents)
6977 return;
6978
6979 if (options->flags.quick && options->skip_stat_unmatch &&
6980 !diff_filespec_check_stat_unmatch(options->repo, p)) {
6981 diff_free_filespec_data(p->one);
6982 diff_free_filespec_data(p->two);
6983 return;
6984 }
6985
6986 options->flags.has_changes = 1;
6987 }
6988
6989 struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
6990 {
6991 struct diff_filepair *pair;
6992 struct diff_filespec *one, *two;
6993
6994 if (options->prefix &&
6995 strncmp(path, options->prefix, options->prefix_length))
6996 return NULL;
6997
6998 one = alloc_filespec(path);
6999 two = alloc_filespec(path);
7000 pair = diff_queue(&diff_queued_diff, one, two);
7001 pair->is_unmerged = 1;
7002 return pair;
7003 }
7004
7005 static char *run_textconv(struct repository *r,
7006 const char *pgm,
7007 struct diff_filespec *spec,
7008 size_t *outsize)
7009 {
7010 struct diff_tempfile *temp;
7011 struct child_process child = CHILD_PROCESS_INIT;
7012 struct strbuf buf = STRBUF_INIT;
7013 int err = 0;
7014
7015 temp = prepare_temp_file(r, spec->path, spec);
7016 strvec_push(&child.args, pgm);
7017 strvec_push(&child.args, temp->name);
7018
7019 child.use_shell = 1;
7020 child.out = -1;
7021 if (start_command(&child)) {
7022 remove_tempfile();
7023 return NULL;
7024 }
7025
7026 if (strbuf_read(&buf, child.out, 0) < 0)
7027 err = error("error reading from textconv command '%s'", pgm);
7028 close(child.out);
7029
7030 if (finish_command(&child) || err) {
7031 strbuf_release(&buf);
7032 remove_tempfile();
7033 return NULL;
7034 }
7035 remove_tempfile();
7036
7037 return strbuf_detach(&buf, outsize);
7038 }
7039
7040 size_t fill_textconv(struct repository *r,
7041 struct userdiff_driver *driver,
7042 struct diff_filespec *df,
7043 char **outbuf)
7044 {
7045 size_t size;
7046
7047 if (!driver) {
7048 if (!DIFF_FILE_VALID(df)) {
7049 *outbuf = "";
7050 return 0;
7051 }
7052 if (diff_populate_filespec(r, df, NULL))
7053 die("unable to read files to diff");
7054 *outbuf = df->data;
7055 return df->size;
7056 }
7057
7058 if (!driver->textconv)
7059 BUG("fill_textconv called with non-textconv driver");
7060
7061 if (driver->textconv_cache && df->oid_valid) {
7062 *outbuf = notes_cache_get(driver->textconv_cache,
7063 &df->oid,
7064 &size);
7065 if (*outbuf)
7066 return size;
7067 }
7068
7069 *outbuf = run_textconv(r, driver->textconv, df, &size);
7070 if (!*outbuf)
7071 die("unable to read files to diff");
7072
7073 if (driver->textconv_cache && df->oid_valid) {
7074 /* ignore errors, as we might be in a readonly repository */
7075 notes_cache_put(driver->textconv_cache, &df->oid, *outbuf,
7076 size);
7077 /*
7078 * we could save up changes and flush them all at the end,
7079 * but we would need an extra call after all diffing is done.
7080 * Since generating a cache entry is the slow path anyway,
7081 * this extra overhead probably isn't a big deal.
7082 */
7083 notes_cache_write(driver->textconv_cache);
7084 }
7085
7086 return size;
7087 }
7088
7089 int textconv_object(struct repository *r,
7090 const char *path,
7091 unsigned mode,
7092 const struct object_id *oid,
7093 int oid_valid,
7094 char **buf,
7095 unsigned long *buf_size)
7096 {
7097 struct diff_filespec *df;
7098 struct userdiff_driver *textconv;
7099
7100 df = alloc_filespec(path);
7101 fill_filespec(df, oid, oid_valid, mode);
7102 textconv = get_textconv(r, df);
7103 if (!textconv) {
7104 free_filespec(df);
7105 return 0;
7106 }
7107
7108 *buf_size = fill_textconv(r, textconv, df, buf);
7109 free_filespec(df);
7110 return 1;
7111 }
7112
7113 void setup_diff_pager(struct diff_options *opt)
7114 {
7115 /*
7116 * If the user asked for our exit code, then either they want --quiet
7117 * or --exit-code. We should definitely not bother with a pager in the
7118 * former case, as we will generate no output. Since we still properly
7119 * report our exit code even when a pager is run, we _could_ run a
7120 * pager with --exit-code. But since we have not done so historically,
7121 * and because it is easy to find people oneline advising "git diff
7122 * --exit-code" in hooks and other scripts, we do not do so.
7123 */
7124 if (!opt->flags.exit_with_status &&
7125 check_pager_config("diff") != 0)
7126 setup_pager();
7127 }
git for Debian