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