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