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