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