?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge branch 'jc/push-cert' into pu
[git/jrn.git] / diff.c
blob2be09d5017594a92f0f29afc61890a777a4e1d3e
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #include "cache.h"
5 #include "quote.h"
6 #include "diff.h"
7 #include "diffcore.h"
8 #include "delta.h"
9 #include "xdiff-interface.h"
10 #include "color.h"
11 #include "attr.h"
12 #include "run-command.h"
13 #include "utf8.h"
14 #include "userdiff.h"
15 #include "sigchain.h"
16 #include "submodule-config.h"
17 #include "submodule.h"
18 #include "ll-merge.h"
19 #include "string-list.h"
20 #include "argv-array.h"
21
22 #ifdef NO_FAST_WORKING_DIRECTORY
23 #define FAST_WORKING_DIRECTORY 0
24 #else
25 #define FAST_WORKING_DIRECTORY 1
26 #endif
27
28 static int diff_detect_rename_default;
29 static int diff_rename_limit_default = 400;
30 static int diff_suppress_blank_empty;
31 static int diff_use_color_default = -1;
32 static int diff_context_default = 3;
33 static const char *diff_word_regex_cfg;
34 static const char *external_diff_cmd_cfg;
35 static const char *diff_order_file_cfg;
36 int diff_auto_refresh_index = 1;
37 static int diff_mnemonic_prefix;
38 static int diff_no_prefix;
39 static int diff_stat_graph_width;
40 static int diff_dirstat_permille_default = 30;
41 static struct diff_options default_diff_options;
42 static long diff_algorithm;
43
44 static char diff_colors[][COLOR_MAXLEN] = {
45 GIT_COLOR_RESET,
46 GIT_COLOR_NORMAL, /* PLAIN */
47 GIT_COLOR_BOLD, /* METAINFO */
48 GIT_COLOR_CYAN, /* FRAGINFO */
49 GIT_COLOR_RED, /* OLD */
50 GIT_COLOR_GREEN, /* NEW */
51 GIT_COLOR_YELLOW, /* COMMIT */
52 GIT_COLOR_BG_RED, /* WHITESPACE */
53 GIT_COLOR_NORMAL, /* FUNCINFO */
54 };
55
56 static int parse_diff_color_slot(const char *var)
57 {
58 if (!strcasecmp(var, "plain"))
59 return DIFF_PLAIN;
60 if (!strcasecmp(var, "meta"))
61 return DIFF_METAINFO;
62 if (!strcasecmp(var, "frag"))
63 return DIFF_FRAGINFO;
64 if (!strcasecmp(var, "old"))
65 return DIFF_FILE_OLD;
66 if (!strcasecmp(var, "new"))
67 return DIFF_FILE_NEW;
68 if (!strcasecmp(var, "commit"))
69 return DIFF_COMMIT;
70 if (!strcasecmp(var, "whitespace"))
71 return DIFF_WHITESPACE;
72 if (!strcasecmp(var, "func"))
73 return DIFF_FUNCINFO;
74 return -1;
75 }
76
77 static int parse_dirstat_params(struct diff_options *options, const char *params_string,
78 struct strbuf *errmsg)
79 {
80 char *params_copy = xstrdup(params_string);
81 struct string_list params = STRING_LIST_INIT_NODUP;
82 int ret = 0;
83 int i;
84
85 if (*params_copy)
86 string_list_split_in_place(&params, params_copy, ',', -1);
87 for (i = 0; i < params.nr; i++) {
88 const char *p = params.items[i].string;
89 if (!strcmp(p, "changes")) {
90 DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
91 DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
92 } else if (!strcmp(p, "lines")) {
93 DIFF_OPT_SET(options, DIRSTAT_BY_LINE);
94 DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
95 } else if (!strcmp(p, "files")) {
96 DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
97 DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
98 } else if (!strcmp(p, "noncumulative")) {
99 DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
100 } else if (!strcmp(p, "cumulative")) {
101 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
102 } else if (isdigit(*p)) {
103 char *end;
104 int permille = strtoul(p, &end, 10) * 10;
105 if (*end == '.' && isdigit(*++end)) {
106 /* only use first digit */
107 permille += *end - '0';
108 /* .. and ignore any further digits */
109 while (isdigit(*++end))
110 ; /* nothing */
111 }
112 if (!*end)
113 options->dirstat_permille = permille;
114 else {
115 strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
116 p);
117 ret++;
118 }
119 } else {
120 strbuf_addf(errmsg, _(" Unknown dirstat parameter '%s'\n"), p);
121 ret++;
122 }
123
124 }
125 string_list_clear(&params, 0);
126 free(params_copy);
127 return ret;
128 }
129
130 static int parse_submodule_params(struct diff_options *options, const char *value)
131 {
132 if (!strcmp(value, "log"))
133 DIFF_OPT_SET(options, SUBMODULE_LOG);
134 else if (!strcmp(value, "short"))
135 DIFF_OPT_CLR(options, SUBMODULE_LOG);
136 else
137 return -1;
138 return 0;
139 }
140
141 static int git_config_rename(const char *var, const char *value)
142 {
143 if (!value)
144 return DIFF_DETECT_RENAME;
145 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
146 return DIFF_DETECT_COPY;
147 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
148 }
149
150 long parse_algorithm_value(const char *value)
151 {
152 if (!value)
153 return -1;
154 else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default"))
155 return 0;
156 else if (!strcasecmp(value, "minimal"))
157 return XDF_NEED_MINIMAL;
158 else if (!strcasecmp(value, "patience"))
159 return XDF_PATIENCE_DIFF;
160 else if (!strcasecmp(value, "histogram"))
161 return XDF_HISTOGRAM_DIFF;
162 return -1;
163 }
164
165 /*
166 * These are to give UI layer defaults.
167 * The core-level commands such as git-diff-files should
168 * never be affected by the setting of diff.renames
169 * the user happens to have in the configuration file.
170 */
171 int git_diff_ui_config(const char *var, const char *value, void *cb)
172 {
173 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
174 diff_use_color_default = git_config_colorbool(var, value);
175 return 0;
176 }
177 if (!strcmp(var, "diff.context")) {
178 diff_context_default = git_config_int(var, value);
179 if (diff_context_default < 0)
180 return -1;
181 return 0;
182 }
183 if (!strcmp(var, "diff.renames")) {
184 diff_detect_rename_default = git_config_rename(var, value);
185 return 0;
186 }
187 if (!strcmp(var, "diff.autorefreshindex")) {
188 diff_auto_refresh_index = git_config_bool(var, value);
189 return 0;
190 }
191 if (!strcmp(var, "diff.mnemonicprefix")) {
192 diff_mnemonic_prefix = git_config_bool(var, value);
193 return 0;
194 }
195 if (!strcmp(var, "diff.noprefix")) {
196 diff_no_prefix = git_config_bool(var, value);
197 return 0;
198 }
199 if (!strcmp(var, "diff.statgraphwidth")) {
200 diff_stat_graph_width = git_config_int(var, value);
201 return 0;
202 }
203 if (!strcmp(var, "diff.external"))
204 return git_config_string(&external_diff_cmd_cfg, var, value);
205 if (!strcmp(var, "diff.wordregex"))
206 return git_config_string(&diff_word_regex_cfg, var, value);
207 if (!strcmp(var, "diff.orderfile"))
208 return git_config_pathname(&diff_order_file_cfg, var, value);
209
210 if (!strcmp(var, "diff.ignoresubmodules"))
211 handle_ignore_submodules_arg(&default_diff_options, value);
212
213 if (!strcmp(var, "diff.submodule")) {
214 if (parse_submodule_params(&default_diff_options, value))
215 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
216 value);
217 return 0;
218 }
219
220 if (!strcmp(var, "diff.algorithm")) {
221 diff_algorithm = parse_algorithm_value(value);
222 if (diff_algorithm < 0)
223 return -1;
224 return 0;
225 }
226
227 if (git_color_config(var, value, cb) < 0)
228 return -1;
229
230 return git_diff_basic_config(var, value, cb);
231 }
232
233 int git_diff_basic_config(const char *var, const char *value, void *cb)
234 {
235 const char *name;
236
237 if (!strcmp(var, "diff.renamelimit")) {
238 diff_rename_limit_default = git_config_int(var, value);
239 return 0;
240 }
241
242 if (userdiff_config(var, value) < 0)
243 return -1;
244
245 if (skip_prefix(var, "diff.color.", &name) ||
246 skip_prefix(var, "color.diff.", &name)) {
247 int slot = parse_diff_color_slot(name);
248 if (slot < 0)
249 return 0;
250 if (!value)
251 return config_error_nonbool(var);
252 color_parse(value, var, diff_colors[slot]);
253 return 0;
254 }
255
256 /* like GNU diff's --suppress-blank-empty option */
257 if (!strcmp(var, "diff.suppressblankempty") ||
258 /* for backwards compatibility */
259 !strcmp(var, "diff.suppress-blank-empty")) {
260 diff_suppress_blank_empty = git_config_bool(var, value);
261 return 0;
262 }
263
264 if (!strcmp(var, "diff.dirstat")) {
265 struct strbuf errmsg = STRBUF_INIT;
266 default_diff_options.dirstat_permille = diff_dirstat_permille_default;
267 if (parse_dirstat_params(&default_diff_options, value, &errmsg))
268 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
269 errmsg.buf);
270 strbuf_release(&errmsg);
271 diff_dirstat_permille_default = default_diff_options.dirstat_permille;
272 return 0;
273 }
274
275 if (starts_with(var, "submodule."))
276 return parse_submodule_config_option(var, value);
277
278 return git_default_config(var, value, cb);
279 }
280
281 static char *quote_two(const char *one, const char *two)
282 {
283 int need_one = quote_c_style(one, NULL, NULL, 1);
284 int need_two = quote_c_style(two, NULL, NULL, 1);
285 struct strbuf res = STRBUF_INIT;
286
287 if (need_one + need_two) {
288 strbuf_addch(&res, '"');
289 quote_c_style(one, &res, NULL, 1);
290 quote_c_style(two, &res, NULL, 1);
291 strbuf_addch(&res, '"');
292 } else {
293 strbuf_addstr(&res, one);
294 strbuf_addstr(&res, two);
295 }
296 return strbuf_detach(&res, NULL);
297 }
298
299 static const char *external_diff(void)
300 {
301 static const char *external_diff_cmd = NULL;
302 static int done_preparing = 0;
303
304 if (done_preparing)
305 return external_diff_cmd;
306 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
307 if (!external_diff_cmd)
308 external_diff_cmd = external_diff_cmd_cfg;
309 done_preparing = 1;
310 return external_diff_cmd;
311 }
312
313 static struct diff_tempfile {
314 const char *name; /* filename external diff should read from */
315 char hex[41];
316 char mode[10];
317 char tmp_path[PATH_MAX];
318 } diff_temp[2];
319
320 typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
321
322 struct emit_callback {
323 int color_diff;
324 unsigned ws_rule;
325 int blank_at_eof_in_preimage;
326 int blank_at_eof_in_postimage;
327 int lno_in_preimage;
328 int lno_in_postimage;
329 sane_truncate_fn truncate;
330 const char **label_path;
331 struct diff_words_data *diff_words;
332 struct diff_options *opt;
333 int *found_changesp;
334 struct strbuf *header;
335 };
336
337 static int count_lines(const char *data, int size)
338 {
339 int count, ch, completely_empty = 1, nl_just_seen = 0;
340 count = 0;
341 while (0 < size--) {
342 ch = *data++;
343 if (ch == '\n') {
344 count++;
345 nl_just_seen = 1;
346 completely_empty = 0;
347 }
348 else {
349 nl_just_seen = 0;
350 completely_empty = 0;
351 }
352 }
353 if (completely_empty)
354 return 0;
355 if (!nl_just_seen)
356 count++; /* no trailing newline */
357 return count;
358 }
359
360 static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
361 {
362 if (!DIFF_FILE_VALID(one)) {
363 mf->ptr = (char *)""; /* does not matter */
364 mf->size = 0;
365 return 0;
366 }
367 else if (diff_populate_filespec(one, 0))
368 return -1;
369
370 mf->ptr = one->data;
371 mf->size = one->size;
372 return 0;
373 }
374
375 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
376 static unsigned long diff_filespec_size(struct diff_filespec *one)
377 {
378 if (!DIFF_FILE_VALID(one))
379 return 0;
380 diff_populate_filespec(one, CHECK_SIZE_ONLY);
381 return one->size;
382 }
383
384 static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
385 {
386 char *ptr = mf->ptr;
387 long size = mf->size;
388 int cnt = 0;
389
390 if (!size)
391 return cnt;
392 ptr += size - 1; /* pointing at the very end */
393 if (*ptr != '\n')
394 ; /* incomplete line */
395 else
396 ptr--; /* skip the last LF */
397 while (mf->ptr < ptr) {
398 char *prev_eol;
399 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
400 if (*prev_eol == '\n')
401 break;
402 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
403 break;
404 cnt++;
405 ptr = prev_eol - 1;
406 }
407 return cnt;
408 }
409
410 static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
411 struct emit_callback *ecbdata)
412 {
413 int l1, l2, at;
414 unsigned ws_rule = ecbdata->ws_rule;
415 l1 = count_trailing_blank(mf1, ws_rule);
416 l2 = count_trailing_blank(mf2, ws_rule);
417 if (l2 <= l1) {
418 ecbdata->blank_at_eof_in_preimage = 0;
419 ecbdata->blank_at_eof_in_postimage = 0;
420 return;
421 }
422 at = count_lines(mf1->ptr, mf1->size);
423 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
424
425 at = count_lines(mf2->ptr, mf2->size);
426 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
427 }
428
429 static void emit_line_0(struct diff_options *o, const char *set, const char *reset,
430 int first, const char *line, int len)
431 {
432 int has_trailing_newline, has_trailing_carriage_return;
433 int nofirst;
434 FILE *file = o->file;
435
436 fputs(diff_line_prefix(o), file);
437
438 if (len == 0) {
439 has_trailing_newline = (first == '\n');
440 has_trailing_carriage_return = (!has_trailing_newline &&
441 (first == '\r'));
442 nofirst = has_trailing_newline || has_trailing_carriage_return;
443 } else {
444 has_trailing_newline = (len > 0 && line[len-1] == '\n');
445 if (has_trailing_newline)
446 len--;
447 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
448 if (has_trailing_carriage_return)
449 len--;
450 nofirst = 0;
451 }
452
453 if (len || !nofirst) {
454 fputs(set, file);
455 if (!nofirst)
456 fputc(first, file);
457 fwrite(line, len, 1, file);
458 fputs(reset, file);
459 }
460 if (has_trailing_carriage_return)
461 fputc('\r', file);
462 if (has_trailing_newline)
463 fputc('\n', file);
464 }
465
466 static void emit_line(struct diff_options *o, const char *set, const char *reset,
467 const char *line, int len)
468 {
469 emit_line_0(o, set, reset, line[0], line+1, len-1);
470 }
471
472 static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
473 {
474 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
475 ecbdata->blank_at_eof_in_preimage &&
476 ecbdata->blank_at_eof_in_postimage &&
477 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
478 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
479 return 0;
480 return ws_blank_line(line, len, ecbdata->ws_rule);
481 }
482
483 static void emit_add_line(const char *reset,
484 struct emit_callback *ecbdata,
485 const char *line, int len)
486 {
487 const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
488 const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
489
490 if (!*ws)
491 emit_line_0(ecbdata->opt, set, reset, '+', line, len);
492 else if (new_blank_line_at_eof(ecbdata, line, len))
493 /* Blank line at EOF - paint '+' as well */
494 emit_line_0(ecbdata->opt, ws, reset, '+', line, len);
495 else {
496 /* Emit just the prefix, then the rest. */
497 emit_line_0(ecbdata->opt, set, reset, '+', "", 0);
498 ws_check_emit(line, len, ecbdata->ws_rule,
499 ecbdata->opt->file, set, reset, ws);
500 }
501 }
502
503 static void emit_hunk_header(struct emit_callback *ecbdata,
504 const char *line, int len)
505 {
506 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
507 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
508 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
509 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
510 static const char atat[2] = { '@', '@' };
511 const char *cp, *ep;
512 struct strbuf msgbuf = STRBUF_INIT;
513 int org_len = len;
514 int i = 1;
515
516 /*
517 * As a hunk header must begin with "@@ -<old>, +<new> @@",
518 * it always is at least 10 bytes long.
519 */
520 if (len < 10 ||
521 memcmp(line, atat, 2) ||
522 !(ep = memmem(line + 2, len - 2, atat, 2))) {
523 emit_line(ecbdata->opt, plain, reset, line, len);
524 return;
525 }
526 ep += 2; /* skip over @@ */
527
528 /* The hunk header in fraginfo color */
529 strbuf_addstr(&msgbuf, frag);
530 strbuf_add(&msgbuf, line, ep - line);
531 strbuf_addstr(&msgbuf, reset);
532
533 /*
534 * trailing "\r\n"
535 */
536 for ( ; i < 3; i++)
537 if (line[len - i] == '\r' || line[len - i] == '\n')
538 len--;
539
540 /* blank before the func header */
541 for (cp = ep; ep - line < len; ep++)
542 if (*ep != ' ' && *ep != '\t')
543 break;
544 if (ep != cp) {
545 strbuf_addstr(&msgbuf, plain);
546 strbuf_add(&msgbuf, cp, ep - cp);
547 strbuf_addstr(&msgbuf, reset);
548 }
549
550 if (ep < line + len) {
551 strbuf_addstr(&msgbuf, func);
552 strbuf_add(&msgbuf, ep, line + len - ep);
553 strbuf_addstr(&msgbuf, reset);
554 }
555
556 strbuf_add(&msgbuf, line + len, org_len - len);
557 emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
558 strbuf_release(&msgbuf);
559 }
560
561 static struct diff_tempfile *claim_diff_tempfile(void) {
562 int i;
563 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
564 if (!diff_temp[i].name)
565 return diff_temp + i;
566 die("BUG: diff is failing to clean up its tempfiles");
567 }
568
569 static int remove_tempfile_installed;
570
571 static void remove_tempfile(void)
572 {
573 int i;
574 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
575 if (diff_temp[i].name == diff_temp[i].tmp_path)
576 unlink_or_warn(diff_temp[i].name);
577 diff_temp[i].name = NULL;
578 }
579 }
580
581 static void remove_tempfile_on_signal(int signo)
582 {
583 remove_tempfile();
584 sigchain_pop(signo);
585 raise(signo);
586 }
587
588 static void print_line_count(FILE *file, int count)
589 {
590 switch (count) {
591 case 0:
592 fprintf(file, "0,0");
593 break;
594 case 1:
595 fprintf(file, "1");
596 break;
597 default:
598 fprintf(file, "1,%d", count);
599 break;
600 }
601 }
602
603 static void emit_rewrite_lines(struct emit_callback *ecb,
604 int prefix, const char *data, int size)
605 {
606 const char *endp = NULL;
607 static const char *nneof = " No newline at end of file\n";
608 const char *old = diff_get_color(ecb->color_diff, DIFF_FILE_OLD);
609 const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
610
611 while (0 < size) {
612 int len;
613
614 endp = memchr(data, '\n', size);
615 len = endp ? (endp - data + 1) : size;
616 if (prefix != '+') {
617 ecb->lno_in_preimage++;
618 emit_line_0(ecb->opt, old, reset, '-',
619 data, len);
620 } else {
621 ecb->lno_in_postimage++;
622 emit_add_line(reset, ecb, data, len);
623 }
624 size -= len;
625 data += len;
626 }
627 if (!endp) {
628 const char *plain = diff_get_color(ecb->color_diff,
629 DIFF_PLAIN);
630 putc('\n', ecb->opt->file);
631 emit_line_0(ecb->opt, plain, reset, '\\',
632 nneof, strlen(nneof));
633 }
634 }
635
636 static void emit_rewrite_diff(const char *name_a,
637 const char *name_b,
638 struct diff_filespec *one,
639 struct diff_filespec *two,
640 struct userdiff_driver *textconv_one,
641 struct userdiff_driver *textconv_two,
642 struct diff_options *o)
643 {
644 int lc_a, lc_b;
645 const char *name_a_tab, *name_b_tab;
646 const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO);
647 const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
648 const char *reset = diff_get_color(o->use_color, DIFF_RESET);
649 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
650 const char *a_prefix, *b_prefix;
651 char *data_one, *data_two;
652 size_t size_one, size_two;
653 struct emit_callback ecbdata;
654 const char *line_prefix = diff_line_prefix(o);
655
656 if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
657 a_prefix = o->b_prefix;
658 b_prefix = o->a_prefix;
659 } else {
660 a_prefix = o->a_prefix;
661 b_prefix = o->b_prefix;
662 }
663
664 name_a += (*name_a == '/');
665 name_b += (*name_b == '/');
666 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
667 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
668
669 strbuf_reset(&a_name);
670 strbuf_reset(&b_name);
671 quote_two_c_style(&a_name, a_prefix, name_a, 0);
672 quote_two_c_style(&b_name, b_prefix, name_b, 0);
673
674 size_one = fill_textconv(textconv_one, one, &data_one);
675 size_two = fill_textconv(textconv_two, two, &data_two);
676
677 memset(&ecbdata, 0, sizeof(ecbdata));
678 ecbdata.color_diff = want_color(o->use_color);
679 ecbdata.found_changesp = &o->found_changes;
680 ecbdata.ws_rule = whitespace_rule(name_b);
681 ecbdata.opt = o;
682 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
683 mmfile_t mf1, mf2;
684 mf1.ptr = (char *)data_one;
685 mf2.ptr = (char *)data_two;
686 mf1.size = size_one;
687 mf2.size = size_two;
688 check_blank_at_eof(&mf1, &mf2, &ecbdata);
689 }
690 ecbdata.lno_in_preimage = 1;
691 ecbdata.lno_in_postimage = 1;
692
693 lc_a = count_lines(data_one, size_one);
694 lc_b = count_lines(data_two, size_two);
695 fprintf(o->file,
696 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
697 line_prefix, metainfo, a_name.buf, name_a_tab, reset,
698 line_prefix, metainfo, b_name.buf, name_b_tab, reset,
699 line_prefix, fraginfo);
700 if (!o->irreversible_delete)
701 print_line_count(o->file, lc_a);
702 else
703 fprintf(o->file, "?,?");
704 fprintf(o->file, " +");
705 print_line_count(o->file, lc_b);
706 fprintf(o->file, " @@%s\n", reset);
707 if (lc_a && !o->irreversible_delete)
708 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
709 if (lc_b)
710 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
711 if (textconv_one)
712 free((char *)data_one);
713 if (textconv_two)
714 free((char *)data_two);
715 }
716
717 struct diff_words_buffer {
718 mmfile_t text;
719 long alloc;
720 struct diff_words_orig {
721 const char *begin, *end;
722 } *orig;
723 int orig_nr, orig_alloc;
724 };
725
726 static void diff_words_append(char *line, unsigned long len,
727 struct diff_words_buffer *buffer)
728 {
729 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
730 line++;
731 len--;
732 memcpy(buffer->text.ptr + buffer->text.size, line, len);
733 buffer->text.size += len;
734 buffer->text.ptr[buffer->text.size] = '\0';
735 }
736
737 struct diff_words_style_elem {
738 const char *prefix;
739 const char *suffix;
740 const char *color; /* NULL; filled in by the setup code if
741 * color is enabled */
742 };
743
744 struct diff_words_style {
745 enum diff_words_type type;
746 struct diff_words_style_elem new, old, ctx;
747 const char *newline;
748 };
749
750 static struct diff_words_style diff_words_styles[] = {
751 { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
752 { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
753 { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
754 };
755
756 struct diff_words_data {
757 struct diff_words_buffer minus, plus;
758 const char *current_plus;
759 int last_minus;
760 struct diff_options *opt;
761 regex_t *word_regex;
762 enum diff_words_type type;
763 struct diff_words_style *style;
764 };
765
766 static int fn_out_diff_words_write_helper(FILE *fp,
767 struct diff_words_style_elem *st_el,
768 const char *newline,
769 size_t count, const char *buf,
770 const char *line_prefix)
771 {
772 int print = 0;
773
774 while (count) {
775 char *p = memchr(buf, '\n', count);
776 if (print)
777 fputs(line_prefix, fp);
778 if (p != buf) {
779 if (st_el->color && fputs(st_el->color, fp) < 0)
780 return -1;
781 if (fputs(st_el->prefix, fp) < 0 ||
782 fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
783 fputs(st_el->suffix, fp) < 0)
784 return -1;
785 if (st_el->color && *st_el->color
786 && fputs(GIT_COLOR_RESET, fp) < 0)
787 return -1;
788 }
789 if (!p)
790 return 0;
791 if (fputs(newline, fp) < 0)
792 return -1;
793 count -= p + 1 - buf;
794 buf = p + 1;
795 print = 1;
796 }
797 return 0;
798 }
799
800 /*
801 * '--color-words' algorithm can be described as:
802 *
803 * 1. collect a the minus/plus lines of a diff hunk, divided into
804 * minus-lines and plus-lines;
805 *
806 * 2. break both minus-lines and plus-lines into words and
807 * place them into two mmfile_t with one word for each line;
808 *
809 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
810 *
811 * And for the common parts of the both file, we output the plus side text.
812 * diff_words->current_plus is used to trace the current position of the plus file
813 * which printed. diff_words->last_minus is used to trace the last minus word
814 * printed.
815 *
816 * For '--graph' to work with '--color-words', we need to output the graph prefix
817 * on each line of color words output. Generally, there are two conditions on
818 * which we should output the prefix.
819 *
820 * 1. diff_words->last_minus == 0 &&
821 * diff_words->current_plus == diff_words->plus.text.ptr
822 *
823 * that is: the plus text must start as a new line, and if there is no minus
824 * word printed, a graph prefix must be printed.
825 *
826 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
827 * *(diff_words->current_plus - 1) == '\n'
828 *
829 * that is: a graph prefix must be printed following a '\n'
830 */
831 static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
832 {
833 if ((diff_words->last_minus == 0 &&
834 diff_words->current_plus == diff_words->plus.text.ptr) ||
835 (diff_words->current_plus > diff_words->plus.text.ptr &&
836 *(diff_words->current_plus - 1) == '\n')) {
837 return 1;
838 } else {
839 return 0;
840 }
841 }
842
843 static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
844 {
845 struct diff_words_data *diff_words = priv;
846 struct diff_words_style *style = diff_words->style;
847 int minus_first, minus_len, plus_first, plus_len;
848 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
849 struct diff_options *opt = diff_words->opt;
850 const char *line_prefix;
851
852 if (line[0] != '@' || parse_hunk_header(line, len,
853 &minus_first, &minus_len, &plus_first, &plus_len))
854 return;
855
856 assert(opt);
857 line_prefix = diff_line_prefix(opt);
858
859 /* POSIX requires that first be decremented by one if len == 0... */
860 if (minus_len) {
861 minus_begin = diff_words->minus.orig[minus_first].begin;
862 minus_end =
863 diff_words->minus.orig[minus_first + minus_len - 1].end;
864 } else
865 minus_begin = minus_end =
866 diff_words->minus.orig[minus_first].end;
867
868 if (plus_len) {
869 plus_begin = diff_words->plus.orig[plus_first].begin;
870 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
871 } else
872 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
873
874 if (color_words_output_graph_prefix(diff_words)) {
875 fputs(line_prefix, diff_words->opt->file);
876 }
877 if (diff_words->current_plus != plus_begin) {
878 fn_out_diff_words_write_helper(diff_words->opt->file,
879 &style->ctx, style->newline,
880 plus_begin - diff_words->current_plus,
881 diff_words->current_plus, line_prefix);
882 if (*(plus_begin - 1) == '\n')
883 fputs(line_prefix, diff_words->opt->file);
884 }
885 if (minus_begin != minus_end) {
886 fn_out_diff_words_write_helper(diff_words->opt->file,
887 &style->old, style->newline,
888 minus_end - minus_begin, minus_begin,
889 line_prefix);
890 }
891 if (plus_begin != plus_end) {
892 fn_out_diff_words_write_helper(diff_words->opt->file,
893 &style->new, style->newline,
894 plus_end - plus_begin, plus_begin,
895 line_prefix);
896 }
897
898 diff_words->current_plus = plus_end;
899 diff_words->last_minus = minus_first;
900 }
901
902 /* This function starts looking at *begin, and returns 0 iff a word was found. */
903 static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
904 int *begin, int *end)
905 {
906 if (word_regex && *begin < buffer->size) {
907 regmatch_t match[1];
908 if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) {
909 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
910 '\n', match[0].rm_eo - match[0].rm_so);
911 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
912 *begin += match[0].rm_so;
913 return *begin >= *end;
914 }
915 return -1;
916 }
917
918 /* find the next word */
919 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
920 (*begin)++;
921 if (*begin >= buffer->size)
922 return -1;
923
924 /* find the end of the word */
925 *end = *begin + 1;
926 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
927 (*end)++;
928
929 return 0;
930 }
931
932 /*
933 * This function splits the words in buffer->text, stores the list with
934 * newline separator into out, and saves the offsets of the original words
935 * in buffer->orig.
936 */
937 static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
938 regex_t *word_regex)
939 {
940 int i, j;
941 long alloc = 0;
942
943 out->size = 0;
944 out->ptr = NULL;
945
946 /* fake an empty "0th" word */
947 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
948 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
949 buffer->orig_nr = 1;
950
951 for (i = 0; i < buffer->text.size; i++) {
952 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
953 return;
954
955 /* store original boundaries */
956 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
957 buffer->orig_alloc);
958 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
959 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
960 buffer->orig_nr++;
961
962 /* store one word */
963 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
964 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
965 out->ptr[out->size + j - i] = '\n';
966 out->size += j - i + 1;
967
968 i = j - 1;
969 }
970 }
971
972 /* this executes the word diff on the accumulated buffers */
973 static void diff_words_show(struct diff_words_data *diff_words)
974 {
975 xpparam_t xpp;
976 xdemitconf_t xecfg;
977 mmfile_t minus, plus;
978 struct diff_words_style *style = diff_words->style;
979
980 struct diff_options *opt = diff_words->opt;
981 const char *line_prefix;
982
983 assert(opt);
984 line_prefix = diff_line_prefix(opt);
985
986 /* special case: only removal */
987 if (!diff_words->plus.text.size) {
988 fputs(line_prefix, diff_words->opt->file);
989 fn_out_diff_words_write_helper(diff_words->opt->file,
990 &style->old, style->newline,
991 diff_words->minus.text.size,
992 diff_words->minus.text.ptr, line_prefix);
993 diff_words->minus.text.size = 0;
994 return;
995 }
996
997 diff_words->current_plus = diff_words->plus.text.ptr;
998 diff_words->last_minus = 0;
999
1000 memset(&xpp, 0, sizeof(xpp));
1001 memset(&xecfg, 0, sizeof(xecfg));
1002 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
1003 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
1004 xpp.flags = 0;
1005 /* as only the hunk header will be parsed, we need a 0-context */
1006 xecfg.ctxlen = 0;
1007 xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
1008 &xpp, &xecfg);
1009 free(minus.ptr);
1010 free(plus.ptr);
1011 if (diff_words->current_plus != diff_words->plus.text.ptr +
1012 diff_words->plus.text.size) {
1013 if (color_words_output_graph_prefix(diff_words))
1014 fputs(line_prefix, diff_words->opt->file);
1015 fn_out_diff_words_write_helper(diff_words->opt->file,
1016 &style->ctx, style->newline,
1017 diff_words->plus.text.ptr + diff_words->plus.text.size
1018 - diff_words->current_plus, diff_words->current_plus,
1019 line_prefix);
1020 }
1021 diff_words->minus.text.size = diff_words->plus.text.size = 0;
1022 }
1023
1024 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
1025 static void diff_words_flush(struct emit_callback *ecbdata)
1026 {
1027 if (ecbdata->diff_words->minus.text.size ||
1028 ecbdata->diff_words->plus.text.size)
1029 diff_words_show(ecbdata->diff_words);
1030 }
1031
1032 static void diff_filespec_load_driver(struct diff_filespec *one)
1033 {
1034 /* Use already-loaded driver */
1035 if (one->driver)
1036 return;
1037
1038 if (S_ISREG(one->mode))
1039 one->driver = userdiff_find_by_path(one->path);
1040
1041 /* Fallback to default settings */
1042 if (!one->driver)
1043 one->driver = userdiff_find_by_name("default");
1044 }
1045
1046 static const char *userdiff_word_regex(struct diff_filespec *one)
1047 {
1048 diff_filespec_load_driver(one);
1049 return one->driver->word_regex;
1050 }
1051
1052 static void init_diff_words_data(struct emit_callback *ecbdata,
1053 struct diff_options *orig_opts,
1054 struct diff_filespec *one,
1055 struct diff_filespec *two)
1056 {
1057 int i;
1058 struct diff_options *o = xmalloc(sizeof(struct diff_options));
1059 memcpy(o, orig_opts, sizeof(struct diff_options));
1060
1061 ecbdata->diff_words =
1062 xcalloc(1, sizeof(struct diff_words_data));
1063 ecbdata->diff_words->type = o->word_diff;
1064 ecbdata->diff_words->opt = o;
1065 if (!o->word_regex)
1066 o->word_regex = userdiff_word_regex(one);
1067 if (!o->word_regex)
1068 o->word_regex = userdiff_word_regex(two);
1069 if (!o->word_regex)
1070 o->word_regex = diff_word_regex_cfg;
1071 if (o->word_regex) {
1072 ecbdata->diff_words->word_regex = (regex_t *)
1073 xmalloc(sizeof(regex_t));
1074 if (regcomp(ecbdata->diff_words->word_regex,
1075 o->word_regex,
1076 REG_EXTENDED | REG_NEWLINE))
1077 die ("Invalid regular expression: %s",
1078 o->word_regex);
1079 }
1080 for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
1081 if (o->word_diff == diff_words_styles[i].type) {
1082 ecbdata->diff_words->style =
1083 &diff_words_styles[i];
1084 break;
1085 }
1086 }
1087 if (want_color(o->use_color)) {
1088 struct diff_words_style *st = ecbdata->diff_words->style;
1089 st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
1090 st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
1091 st->ctx.color = diff_get_color_opt(o, DIFF_PLAIN);
1092 }
1093 }
1094
1095 static void free_diff_words_data(struct emit_callback *ecbdata)
1096 {
1097 if (ecbdata->diff_words) {
1098 diff_words_flush(ecbdata);
1099 free (ecbdata->diff_words->opt);
1100 free (ecbdata->diff_words->minus.text.ptr);
1101 free (ecbdata->diff_words->minus.orig);
1102 free (ecbdata->diff_words->plus.text.ptr);
1103 free (ecbdata->diff_words->plus.orig);
1104 if (ecbdata->diff_words->word_regex) {
1105 regfree(ecbdata->diff_words->word_regex);
1106 free(ecbdata->diff_words->word_regex);
1107 }
1108 free(ecbdata->diff_words);
1109 ecbdata->diff_words = NULL;
1110 }
1111 }
1112
1113 const char *diff_get_color(int diff_use_color, enum color_diff ix)
1114 {
1115 if (want_color(diff_use_color))
1116 return diff_colors[ix];
1117 return "";
1118 }
1119
1120 const char *diff_line_prefix(struct diff_options *opt)
1121 {
1122 struct strbuf *msgbuf;
1123 if (!opt->output_prefix)
1124 return "";
1125
1126 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
1127 return msgbuf->buf;
1128 }
1129
1130 static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
1131 {
1132 const char *cp;
1133 unsigned long allot;
1134 size_t l = len;
1135
1136 if (ecb->truncate)
1137 return ecb->truncate(line, len);
1138 cp = line;
1139 allot = l;
1140 while (0 < l) {
1141 (void) utf8_width(&cp, &l);
1142 if (!cp)
1143 break; /* truncated in the middle? */
1144 }
1145 return allot - l;
1146 }
1147
1148 static void find_lno(const char *line, struct emit_callback *ecbdata)
1149 {
1150 const char *p;
1151 ecbdata->lno_in_preimage = 0;
1152 ecbdata->lno_in_postimage = 0;
1153 p = strchr(line, '-');
1154 if (!p)
1155 return; /* cannot happen */
1156 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
1157 p = strchr(p, '+');
1158 if (!p)
1159 return; /* cannot happen */
1160 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
1161 }
1162
1163 static void fn_out_consume(void *priv, char *line, unsigned long len)
1164 {
1165 struct emit_callback *ecbdata = priv;
1166 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
1167 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
1168 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
1169 struct diff_options *o = ecbdata->opt;
1170 const char *line_prefix = diff_line_prefix(o);
1171
1172 if (ecbdata->header) {
1173 fprintf(ecbdata->opt->file, "%s", ecbdata->header->buf);
1174 strbuf_reset(ecbdata->header);
1175 ecbdata->header = NULL;
1176 }
1177 *(ecbdata->found_changesp) = 1;
1178
1179 if (ecbdata->label_path[0]) {
1180 const char *name_a_tab, *name_b_tab;
1181
1182 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
1183 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
1184
1185 fprintf(ecbdata->opt->file, "%s%s--- %s%s%s\n",
1186 line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
1187 fprintf(ecbdata->opt->file, "%s%s+++ %s%s%s\n",
1188 line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
1189 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
1190 }
1191
1192 if (diff_suppress_blank_empty
1193 && len == 2 && line[0] == ' ' && line[1] == '\n') {
1194 line[0] = '\n';
1195 len = 1;
1196 }
1197
1198 if (line[0] == '@') {
1199 if (ecbdata->diff_words)
1200 diff_words_flush(ecbdata);
1201 len = sane_truncate_line(ecbdata, line, len);
1202 find_lno(line, ecbdata);
1203 emit_hunk_header(ecbdata, line, len);
1204 if (line[len-1] != '\n')
1205 putc('\n', ecbdata->opt->file);
1206 return;
1207 }
1208
1209 if (len < 1) {
1210 emit_line(ecbdata->opt, reset, reset, line, len);
1211 if (ecbdata->diff_words
1212 && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
1213 fputs("~\n", ecbdata->opt->file);
1214 return;
1215 }
1216
1217 if (ecbdata->diff_words) {
1218 if (line[0] == '-') {
1219 diff_words_append(line, len,
1220 &ecbdata->diff_words->minus);
1221 return;
1222 } else if (line[0] == '+') {
1223 diff_words_append(line, len,
1224 &ecbdata->diff_words->plus);
1225 return;
1226 } else if (starts_with(line, "\\ ")) {
1227 /*
1228 * Eat the "no newline at eof" marker as if we
1229 * saw a "+" or "-" line with nothing on it,
1230 * and return without diff_words_flush() to
1231 * defer processing. If this is the end of
1232 * preimage, more "+" lines may come after it.
1233 */
1234 return;
1235 }
1236 diff_words_flush(ecbdata);
1237 if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
1238 emit_line(ecbdata->opt, plain, reset, line, len);
1239 fputs("~\n", ecbdata->opt->file);
1240 } else {
1241 /*
1242 * Skip the prefix character, if any. With
1243 * diff_suppress_blank_empty, there may be
1244 * none.
1245 */
1246 if (line[0] != '\n') {
1247 line++;
1248 len--;
1249 }
1250 emit_line(ecbdata->opt, plain, reset, line, len);
1251 }
1252 return;
1253 }
1254
1255 if (line[0] != '+') {
1256 const char *color =
1257 diff_get_color(ecbdata->color_diff,
1258 line[0] == '-' ? DIFF_FILE_OLD : DIFF_PLAIN);
1259 ecbdata->lno_in_preimage++;
1260 if (line[0] == ' ')
1261 ecbdata->lno_in_postimage++;
1262 emit_line(ecbdata->opt, color, reset, line, len);
1263 } else {
1264 ecbdata->lno_in_postimage++;
1265 emit_add_line(reset, ecbdata, line + 1, len - 1);
1266 }
1267 }
1268
1269 static char *pprint_rename(const char *a, const char *b)
1270 {
1271 const char *old = a;
1272 const char *new = b;
1273 struct strbuf name = STRBUF_INIT;
1274 int pfx_length, sfx_length;
1275 int pfx_adjust_for_slash;
1276 int len_a = strlen(a);
1277 int len_b = strlen(b);
1278 int a_midlen, b_midlen;
1279 int qlen_a = quote_c_style(a, NULL, NULL, 0);
1280 int qlen_b = quote_c_style(b, NULL, NULL, 0);
1281
1282 if (qlen_a || qlen_b) {
1283 quote_c_style(a, &name, NULL, 0);
1284 strbuf_addstr(&name, " => ");
1285 quote_c_style(b, &name, NULL, 0);
1286 return strbuf_detach(&name, NULL);
1287 }
1288
1289 /* Find common prefix */
1290 pfx_length = 0;
1291 while (*old && *new && *old == *new) {
1292 if (*old == '/')
1293 pfx_length = old - a + 1;
1294 old++;
1295 new++;
1296 }
1297
1298 /* Find common suffix */
1299 old = a + len_a;
1300 new = b + len_b;
1301 sfx_length = 0;
1302 /*
1303 * If there is a common prefix, it must end in a slash. In
1304 * that case we let this loop run 1 into the prefix to see the
1305 * same slash.
1306 *
1307 * If there is no common prefix, we cannot do this as it would
1308 * underrun the input strings.
1309 */
1310 pfx_adjust_for_slash = (pfx_length ? 1 : 0);
1311 while (a + pfx_length - pfx_adjust_for_slash <= old &&
1312 b + pfx_length - pfx_adjust_for_slash <= new &&
1313 *old == *new) {
1314 if (*old == '/')
1315 sfx_length = len_a - (old - a);
1316 old--;
1317 new--;
1318 }
1319
1320 /*
1321 * pfx{mid-a => mid-b}sfx
1322 * {pfx-a => pfx-b}sfx
1323 * pfx{sfx-a => sfx-b}
1324 * name-a => name-b
1325 */
1326 a_midlen = len_a - pfx_length - sfx_length;
1327 b_midlen = len_b - pfx_length - sfx_length;
1328 if (a_midlen < 0)
1329 a_midlen = 0;
1330 if (b_midlen < 0)
1331 b_midlen = 0;
1332
1333 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
1334 if (pfx_length + sfx_length) {
1335 strbuf_add(&name, a, pfx_length);
1336 strbuf_addch(&name, '{');
1337 }
1338 strbuf_add(&name, a + pfx_length, a_midlen);
1339 strbuf_addstr(&name, " => ");
1340 strbuf_add(&name, b + pfx_length, b_midlen);
1341 if (pfx_length + sfx_length) {
1342 strbuf_addch(&name, '}');
1343 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
1344 }
1345 return strbuf_detach(&name, NULL);
1346 }
1347
1348 struct diffstat_t {
1349 int nr;
1350 int alloc;
1351 struct diffstat_file {
1352 char *from_name;
1353 char *name;
1354 char *print_name;
1355 unsigned is_unmerged:1;
1356 unsigned is_binary:1;
1357 unsigned is_renamed:1;
1358 unsigned is_interesting:1;
1359 uintmax_t added, deleted;
1360 } **files;
1361 };
1362
1363 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
1364 const char *name_a,
1365 const char *name_b)
1366 {
1367 struct diffstat_file *x;
1368 x = xcalloc(1, sizeof(*x));
1369 ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
1370 diffstat->files[diffstat->nr++] = x;
1371 if (name_b) {
1372 x->from_name = xstrdup(name_a);
1373 x->name = xstrdup(name_b);
1374 x->is_renamed = 1;
1375 }
1376 else {
1377 x->from_name = NULL;
1378 x->name = xstrdup(name_a);
1379 }
1380 return x;
1381 }
1382
1383 static void diffstat_consume(void *priv, char *line, unsigned long len)
1384 {
1385 struct diffstat_t *diffstat = priv;
1386 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
1387
1388 if (line[0] == '+')
1389 x->added++;
1390 else if (line[0] == '-')
1391 x->deleted++;
1392 }
1393
1394 const char mime_boundary_leader[] = "------------";
1395
1396 static int scale_linear(int it, int width, int max_change)
1397 {
1398 if (!it)
1399 return 0;
1400 /*
1401 * make sure that at least one '-' or '+' is printed if
1402 * there is any change to this path. The easiest way is to
1403 * scale linearly as if the alloted width is one column shorter
1404 * than it is, and then add 1 to the result.
1405 */
1406 return 1 + (it * (width - 1) / max_change);
1407 }
1408
1409 static void show_name(FILE *file,
1410 const char *prefix, const char *name, int len)
1411 {
1412 fprintf(file, " %s%-*s |", prefix, len, name);
1413 }
1414
1415 static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
1416 {
1417 if (cnt <= 0)
1418 return;
1419 fprintf(file, "%s", set);
1420 while (cnt--)
1421 putc(ch, file);
1422 fprintf(file, "%s", reset);
1423 }
1424
1425 static void fill_print_name(struct diffstat_file *file)
1426 {
1427 char *pname;
1428
1429 if (file->print_name)
1430 return;
1431
1432 if (!file->is_renamed) {
1433 struct strbuf buf = STRBUF_INIT;
1434 if (quote_c_style(file->name, &buf, NULL, 0)) {
1435 pname = strbuf_detach(&buf, NULL);
1436 } else {
1437 pname = file->name;
1438 strbuf_release(&buf);
1439 }
1440 } else {
1441 pname = pprint_rename(file->from_name, file->name);
1442 }
1443 file->print_name = pname;
1444 }
1445
1446 int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
1447 {
1448 struct strbuf sb = STRBUF_INIT;
1449 int ret;
1450
1451 if (!files) {
1452 assert(insertions == 0 && deletions == 0);
1453 return fprintf(fp, "%s\n", " 0 files changed");
1454 }
1455
1456 strbuf_addf(&sb,
1457 (files == 1) ? " %d file changed" : " %d files changed",
1458 files);
1459
1460 /*
1461 * For binary diff, the caller may want to print "x files
1462 * changed" with insertions == 0 && deletions == 0.
1463 *
1464 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1465 * is probably less confusing (i.e skip over "2 files changed
1466 * but nothing about added/removed lines? Is this a bug in Git?").
1467 */
1468 if (insertions || deletions == 0) {
1469 strbuf_addf(&sb,
1470 (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
1471 insertions);
1472 }
1473
1474 if (deletions || insertions == 0) {
1475 strbuf_addf(&sb,
1476 (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
1477 deletions);
1478 }
1479 strbuf_addch(&sb, '\n');
1480 ret = fputs(sb.buf, fp);
1481 strbuf_release(&sb);
1482 return ret;
1483 }
1484
1485 static void show_stats(struct diffstat_t *data, struct diff_options *options)
1486 {
1487 int i, len, add, del, adds = 0, dels = 0;
1488 uintmax_t max_change = 0, max_len = 0;
1489 int total_files = data->nr, count;
1490 int width, name_width, graph_width, number_width = 0, bin_width = 0;
1491 const char *reset, *add_c, *del_c;
1492 const char *line_prefix = "";
1493 int extra_shown = 0;
1494
1495 if (data->nr == 0)
1496 return;
1497
1498 line_prefix = diff_line_prefix(options);
1499 count = options->stat_count ? options->stat_count : data->nr;
1500
1501 reset = diff_get_color_opt(options, DIFF_RESET);
1502 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1503 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1504
1505 /*
1506 * Find the longest filename and max number of changes
1507 */
1508 for (i = 0; (i < count) && (i < data->nr); i++) {
1509 struct diffstat_file *file = data->files[i];
1510 uintmax_t change = file->added + file->deleted;
1511
1512 if (!file->is_interesting && (change == 0)) {
1513 count++; /* not shown == room for one more */
1514 continue;
1515 }
1516 fill_print_name(file);
1517 len = strlen(file->print_name);
1518 if (max_len < len)
1519 max_len = len;
1520
1521 if (file->is_unmerged) {
1522 /* "Unmerged" is 8 characters */
1523 bin_width = bin_width < 8 ? 8 : bin_width;
1524 continue;
1525 }
1526 if (file->is_binary) {
1527 /* "Bin XXX -> YYY bytes" */
1528 int w = 14 + decimal_width(file->added)
1529 + decimal_width(file->deleted);
1530 bin_width = bin_width < w ? w : bin_width;
1531 /* Display change counts aligned with "Bin" */
1532 number_width = 3;
1533 continue;
1534 }
1535
1536 if (max_change < change)
1537 max_change = change;
1538 }
1539 count = i; /* where we can stop scanning in data->files[] */
1540
1541 /*
1542 * We have width = stat_width or term_columns() columns total.
1543 * We want a maximum of min(max_len, stat_name_width) for the name part.
1544 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1545 * We also need 1 for " " and 4 + decimal_width(max_change)
1546 * for " | NNNN " and one the empty column at the end, altogether
1547 * 6 + decimal_width(max_change).
1548 *
1549 * If there's not enough space, we will use the smaller of
1550 * stat_name_width (if set) and 5/8*width for the filename,
1551 * and the rest for constant elements + graph part, but no more
1552 * than stat_graph_width for the graph part.
1553 * (5/8 gives 50 for filename and 30 for the constant parts + graph
1554 * for the standard terminal size).
1555 *
1556 * In other words: stat_width limits the maximum width, and
1557 * stat_name_width fixes the maximum width of the filename,
1558 * and is also used to divide available columns if there
1559 * aren't enough.
1560 *
1561 * Binary files are displayed with "Bin XXX -> YYY bytes"
1562 * instead of the change count and graph. This part is treated
1563 * similarly to the graph part, except that it is not
1564 * "scaled". If total width is too small to accommodate the
1565 * guaranteed minimum width of the filename part and the
1566 * separators and this message, this message will "overflow"
1567 * making the line longer than the maximum width.
1568 */
1569
1570 if (options->stat_width == -1)
1571 width = term_columns() - options->output_prefix_length;
1572 else
1573 width = options->stat_width ? options->stat_width : 80;
1574 number_width = decimal_width(max_change) > number_width ?
1575 decimal_width(max_change) : number_width;
1576
1577 if (options->stat_graph_width == -1)
1578 options->stat_graph_width = diff_stat_graph_width;
1579
1580 /*
1581 * Guarantee 3/8*16==6 for the graph part
1582 * and 5/8*16==10 for the filename part
1583 */
1584 if (width < 16 + 6 + number_width)
1585 width = 16 + 6 + number_width;
1586
1587 /*
1588 * First assign sizes that are wanted, ignoring available width.
1589 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1590 * starting from "XXX" should fit in graph_width.
1591 */
1592 graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
1593 if (options->stat_graph_width &&
1594 options->stat_graph_width < graph_width)
1595 graph_width = options->stat_graph_width;
1596
1597 name_width = (options->stat_name_width > 0 &&
1598 options->stat_name_width < max_len) ?
1599 options->stat_name_width : max_len;
1600
1601 /*
1602 * Adjust adjustable widths not to exceed maximum width
1603 */
1604 if (name_width + number_width + 6 + graph_width > width) {
1605 if (graph_width > width * 3/8 - number_width - 6) {
1606 graph_width = width * 3/8 - number_width - 6;
1607 if (graph_width < 6)
1608 graph_width = 6;
1609 }
1610
1611 if (options->stat_graph_width &&
1612 graph_width > options->stat_graph_width)
1613 graph_width = options->stat_graph_width;
1614 if (name_width > width - number_width - 6 - graph_width)
1615 name_width = width - number_width - 6 - graph_width;
1616 else
1617 graph_width = width - number_width - 6 - name_width;
1618 }
1619
1620 /*
1621 * From here name_width is the width of the name area,
1622 * and graph_width is the width of the graph area.
1623 * max_change is used to scale graph properly.
1624 */
1625 for (i = 0; i < count; i++) {
1626 const char *prefix = "";
1627 struct diffstat_file *file = data->files[i];
1628 char *name = file->print_name;
1629 uintmax_t added = file->added;
1630 uintmax_t deleted = file->deleted;
1631 int name_len;
1632
1633 if (!file->is_interesting && (added + deleted == 0))
1634 continue;
1635
1636 /*
1637 * "scale" the filename
1638 */
1639 len = name_width;
1640 name_len = strlen(name);
1641 if (name_width < name_len) {
1642 char *slash;
1643 prefix = "...";
1644 len -= 3;
1645 name += name_len - len;
1646 slash = strchr(name, '/');
1647 if (slash)
1648 name = slash;
1649 }
1650
1651 if (file->is_binary) {
1652 fprintf(options->file, "%s", line_prefix);
1653 show_name(options->file, prefix, name, len);
1654 fprintf(options->file, " %*s", number_width, "Bin");
1655 if (!added && !deleted) {
1656 putc('\n', options->file);
1657 continue;
1658 }
1659 fprintf(options->file, " %s%"PRIuMAX"%s",
1660 del_c, deleted, reset);
1661 fprintf(options->file, " -> ");
1662 fprintf(options->file, "%s%"PRIuMAX"%s",
1663 add_c, added, reset);
1664 fprintf(options->file, " bytes");
1665 fprintf(options->file, "\n");
1666 continue;
1667 }
1668 else if (file->is_unmerged) {
1669 fprintf(options->file, "%s", line_prefix);
1670 show_name(options->file, prefix, name, len);
1671 fprintf(options->file, " Unmerged\n");
1672 continue;
1673 }
1674
1675 /*
1676 * scale the add/delete
1677 */
1678 add = added;
1679 del = deleted;
1680
1681 if (graph_width <= max_change) {
1682 int total = scale_linear(add + del, graph_width, max_change);
1683 if (total < 2 && add && del)
1684 /* width >= 2 due to the sanity check */
1685 total = 2;
1686 if (add < del) {
1687 add = scale_linear(add, graph_width, max_change);
1688 del = total - add;
1689 } else {
1690 del = scale_linear(del, graph_width, max_change);
1691 add = total - del;
1692 }
1693 }
1694 fprintf(options->file, "%s", line_prefix);
1695 show_name(options->file, prefix, name, len);
1696 fprintf(options->file, " %*"PRIuMAX"%s",
1697 number_width, added + deleted,
1698 added + deleted ? " " : "");
1699 show_graph(options->file, '+', add, add_c, reset);
1700 show_graph(options->file, '-', del, del_c, reset);
1701 fprintf(options->file, "\n");
1702 }
1703
1704 for (i = 0; i < data->nr; i++) {
1705 struct diffstat_file *file = data->files[i];
1706 uintmax_t added = file->added;
1707 uintmax_t deleted = file->deleted;
1708
1709 if (file->is_unmerged ||
1710 (!file->is_interesting && (added + deleted == 0))) {
1711 total_files--;
1712 continue;
1713 }
1714
1715 if (!file->is_binary) {
1716 adds += added;
1717 dels += deleted;
1718 }
1719 if (i < count)
1720 continue;
1721 if (!extra_shown)
1722 fprintf(options->file, "%s ...\n", line_prefix);
1723 extra_shown = 1;
1724 }
1725 fprintf(options->file, "%s", line_prefix);
1726 print_stat_summary(options->file, total_files, adds, dels);
1727 }
1728
1729 static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1730 {
1731 int i, adds = 0, dels = 0, total_files = data->nr;
1732
1733 if (data->nr == 0)
1734 return;
1735
1736 for (i = 0; i < data->nr; i++) {
1737 int added = data->files[i]->added;
1738 int deleted= data->files[i]->deleted;
1739
1740 if (data->files[i]->is_unmerged ||
1741 (!data->files[i]->is_interesting && (added + deleted == 0))) {
1742 total_files--;
1743 } else if (!data->files[i]->is_binary) { /* don't count bytes */
1744 adds += added;
1745 dels += deleted;
1746 }
1747 }
1748 fprintf(options->file, "%s", diff_line_prefix(options));
1749 print_stat_summary(options->file, total_files, adds, dels);
1750 }
1751
1752 static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1753 {
1754 int i;
1755
1756 if (data->nr == 0)
1757 return;
1758
1759 for (i = 0; i < data->nr; i++) {
1760 struct diffstat_file *file = data->files[i];
1761
1762 fprintf(options->file, "%s", diff_line_prefix(options));
1763
1764 if (file->is_binary)
1765 fprintf(options->file, "-\t-\t");
1766 else
1767 fprintf(options->file,
1768 "%"PRIuMAX"\t%"PRIuMAX"\t",
1769 file->added, file->deleted);
1770 if (options->line_termination) {
1771 fill_print_name(file);
1772 if (!file->is_renamed)
1773 write_name_quoted(file->name, options->file,
1774 options->line_termination);
1775 else {
1776 fputs(file->print_name, options->file);
1777 putc(options->line_termination, options->file);
1778 }
1779 } else {
1780 if (file->is_renamed) {
1781 putc('\0', options->file);
1782 write_name_quoted(file->from_name, options->file, '\0');
1783 }
1784 write_name_quoted(file->name, options->file, '\0');
1785 }
1786 }
1787 }
1788
1789 struct dirstat_file {
1790 const char *name;
1791 unsigned long changed;
1792 };
1793
1794 struct dirstat_dir {
1795 struct dirstat_file *files;
1796 int alloc, nr, permille, cumulative;
1797 };
1798
1799 static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
1800 unsigned long changed, const char *base, int baselen)
1801 {
1802 unsigned long this_dir = 0;
1803 unsigned int sources = 0;
1804 const char *line_prefix = diff_line_prefix(opt);
1805
1806 while (dir->nr) {
1807 struct dirstat_file *f = dir->files;
1808 int namelen = strlen(f->name);
1809 unsigned long this;
1810 char *slash;
1811
1812 if (namelen < baselen)
1813 break;
1814 if (memcmp(f->name, base, baselen))
1815 break;
1816 slash = strchr(f->name + baselen, '/');
1817 if (slash) {
1818 int newbaselen = slash + 1 - f->name;
1819 this = gather_dirstat(opt, dir, changed, f->name, newbaselen);
1820 sources++;
1821 } else {
1822 this = f->changed;
1823 dir->files++;
1824 dir->nr--;
1825 sources += 2;
1826 }
1827 this_dir += this;
1828 }
1829
1830 /*
1831 * We don't report dirstat's for
1832 * - the top level
1833 * - or cases where everything came from a single directory
1834 * under this directory (sources == 1).
1835 */
1836 if (baselen && sources != 1) {
1837 if (this_dir) {
1838 int permille = this_dir * 1000 / changed;
1839 if (permille >= dir->permille) {
1840 fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
1841 permille / 10, permille % 10, baselen, base);
1842 if (!dir->cumulative)
1843 return 0;
1844 }
1845 }
1846 }
1847 return this_dir;
1848 }
1849
1850 static int dirstat_compare(const void *_a, const void *_b)
1851 {
1852 const struct dirstat_file *a = _a;
1853 const struct dirstat_file *b = _b;
1854 return strcmp(a->name, b->name);
1855 }
1856
1857 static void show_dirstat(struct diff_options *options)
1858 {
1859 int i;
1860 unsigned long changed;
1861 struct dirstat_dir dir;
1862 struct diff_queue_struct *q = &diff_queued_diff;
1863
1864 dir.files = NULL;
1865 dir.alloc = 0;
1866 dir.nr = 0;
1867 dir.permille = options->dirstat_permille;
1868 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1869
1870 changed = 0;
1871 for (i = 0; i < q->nr; i++) {
1872 struct diff_filepair *p = q->queue[i];
1873 const char *name;
1874 unsigned long copied, added, damage;
1875 int content_changed;
1876
1877 name = p->two->path ? p->two->path : p->one->path;
1878
1879 if (p->one->sha1_valid && p->two->sha1_valid)
1880 content_changed = hashcmp(p->one->sha1, p->two->sha1);
1881 else
1882 content_changed = 1;
1883
1884 if (!content_changed) {
1885 /*
1886 * The SHA1 has not changed, so pre-/post-content is
1887 * identical. We can therefore skip looking at the
1888 * file contents altogether.
1889 */
1890 damage = 0;
1891 goto found_damage;
1892 }
1893
1894 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) {
1895 /*
1896 * In --dirstat-by-file mode, we don't really need to
1897 * look at the actual file contents at all.
1898 * The fact that the SHA1 changed is enough for us to
1899 * add this file to the list of results
1900 * (with each file contributing equal damage).
1901 */
1902 damage = 1;
1903 goto found_damage;
1904 }
1905
1906 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1907 diff_populate_filespec(p->one, 0);
1908 diff_populate_filespec(p->two, 0);
1909 diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1910 &copied, &added);
1911 diff_free_filespec_data(p->one);
1912 diff_free_filespec_data(p->two);
1913 } else if (DIFF_FILE_VALID(p->one)) {
1914 diff_populate_filespec(p->one, CHECK_SIZE_ONLY);
1915 copied = added = 0;
1916 diff_free_filespec_data(p->one);
1917 } else if (DIFF_FILE_VALID(p->two)) {
1918 diff_populate_filespec(p->two, CHECK_SIZE_ONLY);
1919 copied = 0;
1920 added = p->two->size;
1921 diff_free_filespec_data(p->two);
1922 } else
1923 continue;
1924
1925 /*
1926 * Original minus copied is the removed material,
1927 * added is the new material. They are both damages
1928 * made to the preimage.
1929 * If the resulting damage is zero, we know that
1930 * diffcore_count_changes() considers the two entries to
1931 * be identical, but since content_changed is true, we
1932 * know that there must have been _some_ kind of change,
1933 * so we force all entries to have damage > 0.
1934 */
1935 damage = (p->one->size - copied) + added;
1936 if (!damage)
1937 damage = 1;
1938
1939 found_damage:
1940 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1941 dir.files[dir.nr].name = name;
1942 dir.files[dir.nr].changed = damage;
1943 changed += damage;
1944 dir.nr++;
1945 }
1946
1947 /* This can happen even with many files, if everything was renames */
1948 if (!changed)
1949 return;
1950
1951 /* Show all directories with more than x% of the changes */
1952 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1953 gather_dirstat(options, &dir, changed, "", 0);
1954 }
1955
1956 static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
1957 {
1958 int i;
1959 unsigned long changed;
1960 struct dirstat_dir dir;
1961
1962 if (data->nr == 0)
1963 return;
1964
1965 dir.files = NULL;
1966 dir.alloc = 0;
1967 dir.nr = 0;
1968 dir.permille = options->dirstat_permille;
1969 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1970
1971 changed = 0;
1972 for (i = 0; i < data->nr; i++) {
1973 struct diffstat_file *file = data->files[i];
1974 unsigned long damage = file->added + file->deleted;
1975 if (file->is_binary)
1976 /*
1977 * binary files counts bytes, not lines. Must find some
1978 * way to normalize binary bytes vs. textual lines.
1979 * The following heuristic assumes that there are 64
1980 * bytes per "line".
1981 * This is stupid and ugly, but very cheap...
1982 */
1983 damage = (damage + 63) / 64;
1984 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1985 dir.files[dir.nr].name = file->name;
1986 dir.files[dir.nr].changed = damage;
1987 changed += damage;
1988 dir.nr++;
1989 }
1990
1991 /* This can happen even with many files, if everything was renames */
1992 if (!changed)
1993 return;
1994
1995 /* Show all directories with more than x% of the changes */
1996 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1997 gather_dirstat(options, &dir, changed, "", 0);
1998 }
1999
2000 static void free_diffstat_info(struct diffstat_t *diffstat)
2001 {
2002 int i;
2003 for (i = 0; i < diffstat->nr; i++) {
2004 struct diffstat_file *f = diffstat->files[i];
2005 if (f->name != f->print_name)
2006 free(f->print_name);
2007 free(f->name);
2008 free(f->from_name);
2009 free(f);
2010 }
2011 free(diffstat->files);
2012 }
2013
2014 struct checkdiff_t {
2015 const char *filename;
2016 int lineno;
2017 int conflict_marker_size;
2018 struct diff_options *o;
2019 unsigned ws_rule;
2020 unsigned status;
2021 };
2022
2023 static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
2024 {
2025 char firstchar;
2026 int cnt;
2027
2028 if (len < marker_size + 1)
2029 return 0;
2030 firstchar = line[0];
2031 switch (firstchar) {
2032 case '=': case '>': case '<': case '|':
2033 break;
2034 default:
2035 return 0;
2036 }
2037 for (cnt = 1; cnt < marker_size; cnt++)
2038 if (line[cnt] != firstchar)
2039 return 0;
2040 /* line[1] thru line[marker_size-1] are same as firstchar */
2041 if (len < marker_size + 1 || !isspace(line[marker_size]))
2042 return 0;
2043 return 1;
2044 }
2045
2046 static void checkdiff_consume(void *priv, char *line, unsigned long len)
2047 {
2048 struct checkdiff_t *data = priv;
2049 int marker_size = data->conflict_marker_size;
2050 const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
2051 const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
2052 const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
2053 char *err;
2054 const char *line_prefix;
2055
2056 assert(data->o);
2057 line_prefix = diff_line_prefix(data->o);
2058
2059 if (line[0] == '+') {
2060 unsigned bad;
2061 data->lineno++;
2062 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
2063 data->status |= 1;
2064 fprintf(data->o->file,
2065 "%s%s:%d: leftover conflict marker\n",
2066 line_prefix, data->filename, data->lineno);
2067 }
2068 bad = ws_check(line + 1, len - 1, data->ws_rule);
2069 if (!bad)
2070 return;
2071 data->status |= bad;
2072 err = whitespace_error_string(bad);
2073 fprintf(data->o->file, "%s%s:%d: %s.\n",
2074 line_prefix, data->filename, data->lineno, err);
2075 free(err);
2076 emit_line(data->o, set, reset, line, 1);
2077 ws_check_emit(line + 1, len - 1, data->ws_rule,
2078 data->o->file, set, reset, ws);
2079 } else if (line[0] == ' ') {
2080 data->lineno++;
2081 } else if (line[0] == '@') {
2082 char *plus = strchr(line, '+');
2083 if (plus)
2084 data->lineno = strtol(plus, NULL, 10) - 1;
2085 else
2086 die("invalid diff");
2087 }
2088 }
2089
2090 static unsigned char *deflate_it(char *data,
2091 unsigned long size,
2092 unsigned long *result_size)
2093 {
2094 int bound;
2095 unsigned char *deflated;
2096 git_zstream stream;
2097
2098 memset(&stream, 0, sizeof(stream));
2099 git_deflate_init(&stream, zlib_compression_level);
2100 bound = git_deflate_bound(&stream, size);
2101 deflated = xmalloc(bound);
2102 stream.next_out = deflated;
2103 stream.avail_out = bound;
2104
2105 stream.next_in = (unsigned char *)data;
2106 stream.avail_in = size;
2107 while (git_deflate(&stream, Z_FINISH) == Z_OK)
2108 ; /* nothing */
2109 git_deflate_end(&stream);
2110 *result_size = stream.total_out;
2111 return deflated;
2112 }
2113
2114 static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
2115 const char *prefix)
2116 {
2117 void *cp;
2118 void *delta;
2119 void *deflated;
2120 void *data;
2121 unsigned long orig_size;
2122 unsigned long delta_size;
2123 unsigned long deflate_size;
2124 unsigned long data_size;
2125
2126 /* We could do deflated delta, or we could do just deflated two,
2127 * whichever is smaller.
2128 */
2129 delta = NULL;
2130 deflated = deflate_it(two->ptr, two->size, &deflate_size);
2131 if (one->size && two->size) {
2132 delta = diff_delta(one->ptr, one->size,
2133 two->ptr, two->size,
2134 &delta_size, deflate_size);
2135 if (delta) {
2136 void *to_free = delta;
2137 orig_size = delta_size;
2138 delta = deflate_it(delta, delta_size, &delta_size);
2139 free(to_free);
2140 }
2141 }
2142
2143 if (delta && delta_size < deflate_size) {
2144 fprintf(file, "%sdelta %lu\n", prefix, orig_size);
2145 free(deflated);
2146 data = delta;
2147 data_size = delta_size;
2148 }
2149 else {
2150 fprintf(file, "%sliteral %lu\n", prefix, two->size);
2151 free(delta);
2152 data = deflated;
2153 data_size = deflate_size;
2154 }
2155
2156 /* emit data encoded in base85 */
2157 cp = data;
2158 while (data_size) {
2159 int bytes = (52 < data_size) ? 52 : data_size;
2160 char line[70];
2161 data_size -= bytes;
2162 if (bytes <= 26)
2163 line[0] = bytes + 'A' - 1;
2164 else
2165 line[0] = bytes - 26 + 'a' - 1;
2166 encode_85(line + 1, cp, bytes);
2167 cp = (char *) cp + bytes;
2168 fprintf(file, "%s", prefix);
2169 fputs(line, file);
2170 fputc('\n', file);
2171 }
2172 fprintf(file, "%s\n", prefix);
2173 free(data);
2174 }
2175
2176 static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two,
2177 const char *prefix)
2178 {
2179 fprintf(file, "%sGIT binary patch\n", prefix);
2180 emit_binary_diff_body(file, one, two, prefix);
2181 emit_binary_diff_body(file, two, one, prefix);
2182 }
2183
2184 int diff_filespec_is_binary(struct diff_filespec *one)
2185 {
2186 if (one->is_binary == -1) {
2187 diff_filespec_load_driver(one);
2188 if (one->driver->binary != -1)
2189 one->is_binary = one->driver->binary;
2190 else {
2191 if (!one->data && DIFF_FILE_VALID(one))
2192 diff_populate_filespec(one, CHECK_BINARY);
2193 if (one->is_binary == -1 && one->data)
2194 one->is_binary = buffer_is_binary(one->data,
2195 one->size);
2196 if (one->is_binary == -1)
2197 one->is_binary = 0;
2198 }
2199 }
2200 return one->is_binary;
2201 }
2202
2203 static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
2204 {
2205 diff_filespec_load_driver(one);
2206 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
2207 }
2208
2209 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
2210 {
2211 if (!options->a_prefix)
2212 options->a_prefix = a;
2213 if (!options->b_prefix)
2214 options->b_prefix = b;
2215 }
2216
2217 struct userdiff_driver *get_textconv(struct diff_filespec *one)
2218 {
2219 if (!DIFF_FILE_VALID(one))
2220 return NULL;
2221
2222 diff_filespec_load_driver(one);
2223 return userdiff_get_textconv(one->driver);
2224 }
2225
2226 static void builtin_diff(const char *name_a,
2227 const char *name_b,
2228 struct diff_filespec *one,
2229 struct diff_filespec *two,
2230 const char *xfrm_msg,
2231 int must_show_header,
2232 struct diff_options *o,
2233 int complete_rewrite)
2234 {
2235 mmfile_t mf1, mf2;
2236 const char *lbl[2];
2237 char *a_one, *b_two;
2238 const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
2239 const char *reset = diff_get_color_opt(o, DIFF_RESET);
2240 const char *a_prefix, *b_prefix;
2241 struct userdiff_driver *textconv_one = NULL;
2242 struct userdiff_driver *textconv_two = NULL;
2243 struct strbuf header = STRBUF_INIT;
2244 const char *line_prefix = diff_line_prefix(o);
2245
2246 if (DIFF_OPT_TST(o, SUBMODULE_LOG) &&
2247 (!one->mode || S_ISGITLINK(one->mode)) &&
2248 (!two->mode || S_ISGITLINK(two->mode))) {
2249 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
2250 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2251 show_submodule_summary(o->file, one->path ? one->path : two->path,
2252 line_prefix,
2253 one->sha1, two->sha1, two->dirty_submodule,
2254 meta, del, add, reset);
2255 return;
2256 }
2257
2258 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
2259 textconv_one = get_textconv(one);
2260 textconv_two = get_textconv(two);
2261 }
2262
2263 diff_set_mnemonic_prefix(o, "a/", "b/");
2264 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
2265 a_prefix = o->b_prefix;
2266 b_prefix = o->a_prefix;
2267 } else {
2268 a_prefix = o->a_prefix;
2269 b_prefix = o->b_prefix;
2270 }
2271
2272 /* Never use a non-valid filename anywhere if at all possible */
2273 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
2274 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
2275
2276 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
2277 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
2278 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
2279 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
2280 strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
2281 if (lbl[0][0] == '/') {
2282 /* /dev/null */
2283 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
2284 if (xfrm_msg)
2285 strbuf_addstr(&header, xfrm_msg);
2286 must_show_header = 1;
2287 }
2288 else if (lbl[1][0] == '/') {
2289 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
2290 if (xfrm_msg)
2291 strbuf_addstr(&header, xfrm_msg);
2292 must_show_header = 1;
2293 }
2294 else {
2295 if (one->mode != two->mode) {
2296 strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
2297 strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
2298 must_show_header = 1;
2299 }
2300 if (xfrm_msg)
2301 strbuf_addstr(&header, xfrm_msg);
2302
2303 /*
2304 * we do not run diff between different kind
2305 * of objects.
2306 */
2307 if ((one->mode ^ two->mode) & S_IFMT)
2308 goto free_ab_and_return;
2309 if (complete_rewrite &&
2310 (textconv_one || !diff_filespec_is_binary(one)) &&
2311 (textconv_two || !diff_filespec_is_binary(two))) {
2312 fprintf(o->file, "%s", header.buf);
2313 strbuf_reset(&header);
2314 emit_rewrite_diff(name_a, name_b, one, two,
2315 textconv_one, textconv_two, o);
2316 o->found_changes = 1;
2317 goto free_ab_and_return;
2318 }
2319 }
2320
2321 if (o->irreversible_delete && lbl[1][0] == '/') {
2322 fprintf(o->file, "%s", header.buf);
2323 strbuf_reset(&header);
2324 goto free_ab_and_return;
2325 } else if (!DIFF_OPT_TST(o, TEXT) &&
2326 ( (!textconv_one && diff_filespec_is_binary(one)) ||
2327 (!textconv_two && diff_filespec_is_binary(two)) )) {
2328 if (!one->data && !two->data &&
2329 S_ISREG(one->mode) && S_ISREG(two->mode) &&
2330 !DIFF_OPT_TST(o, BINARY)) {
2331 if (!hashcmp(one->sha1, two->sha1)) {
2332 if (must_show_header)
2333 fprintf(o->file, "%s", header.buf);
2334 goto free_ab_and_return;
2335 }
2336 fprintf(o->file, "%s", header.buf);
2337 fprintf(o->file, "%sBinary files %s and %s differ\n",
2338 line_prefix, lbl[0], lbl[1]);
2339 goto free_ab_and_return;
2340 }
2341 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2342 die("unable to read files to diff");
2343 /* Quite common confusing case */
2344 if (mf1.size == mf2.size &&
2345 !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
2346 if (must_show_header)
2347 fprintf(o->file, "%s", header.buf);
2348 goto free_ab_and_return;
2349 }
2350 fprintf(o->file, "%s", header.buf);
2351 strbuf_reset(&header);
2352 if (DIFF_OPT_TST(o, BINARY))
2353 emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
2354 else
2355 fprintf(o->file, "%sBinary files %s and %s differ\n",
2356 line_prefix, lbl[0], lbl[1]);
2357 o->found_changes = 1;
2358 } else {
2359 /* Crazy xdl interfaces.. */
2360 const char *diffopts = getenv("GIT_DIFF_OPTS");
2361 const char *v;
2362 xpparam_t xpp;
2363 xdemitconf_t xecfg;
2364 struct emit_callback ecbdata;
2365 const struct userdiff_funcname *pe;
2366
2367 if (must_show_header) {
2368 fprintf(o->file, "%s", header.buf);
2369 strbuf_reset(&header);
2370 }
2371
2372 mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
2373 mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
2374
2375 pe = diff_funcname_pattern(one);
2376 if (!pe)
2377 pe = diff_funcname_pattern(two);
2378
2379 memset(&xpp, 0, sizeof(xpp));
2380 memset(&xecfg, 0, sizeof(xecfg));
2381 memset(&ecbdata, 0, sizeof(ecbdata));
2382 ecbdata.label_path = lbl;
2383 ecbdata.color_diff = want_color(o->use_color);
2384 ecbdata.found_changesp = &o->found_changes;
2385 ecbdata.ws_rule = whitespace_rule(name_b);
2386 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
2387 check_blank_at_eof(&mf1, &mf2, &ecbdata);
2388 ecbdata.opt = o;
2389 ecbdata.header = header.len ? &header : NULL;
2390 xpp.flags = o->xdl_opts;
2391 xecfg.ctxlen = o->context;
2392 xecfg.interhunkctxlen = o->interhunkcontext;
2393 xecfg.flags = XDL_EMIT_FUNCNAMES;
2394 if (DIFF_OPT_TST(o, FUNCCONTEXT))
2395 xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
2396 if (pe)
2397 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
2398 if (!diffopts)
2399 ;
2400 else if (skip_prefix(diffopts, "--unified=", &v))
2401 xecfg.ctxlen = strtoul(v, NULL, 10);
2402 else if (skip_prefix(diffopts, "-u", &v))
2403 xecfg.ctxlen = strtoul(v, NULL, 10);
2404 if (o->word_diff)
2405 init_diff_words_data(&ecbdata, o, one, two);
2406 xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
2407 &xpp, &xecfg);
2408 if (o->word_diff)
2409 free_diff_words_data(&ecbdata);
2410 if (textconv_one)
2411 free(mf1.ptr);
2412 if (textconv_two)
2413 free(mf2.ptr);
2414 xdiff_clear_find_func(&xecfg);
2415 }
2416
2417 free_ab_and_return:
2418 strbuf_release(&header);
2419 diff_free_filespec_data(one);
2420 diff_free_filespec_data(two);
2421 free(a_one);
2422 free(b_two);
2423 return;
2424 }
2425
2426 static void builtin_diffstat(const char *name_a, const char *name_b,
2427 struct diff_filespec *one,
2428 struct diff_filespec *two,
2429 struct diffstat_t *diffstat,
2430 struct diff_options *o,
2431 struct diff_filepair *p)
2432 {
2433 mmfile_t mf1, mf2;
2434 struct diffstat_file *data;
2435 int same_contents;
2436 int complete_rewrite = 0;
2437
2438 if (!DIFF_PAIR_UNMERGED(p)) {
2439 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2440 complete_rewrite = 1;
2441 }
2442
2443 data = diffstat_add(diffstat, name_a, name_b);
2444 data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;
2445
2446 if (!one || !two) {
2447 data->is_unmerged = 1;
2448 return;
2449 }
2450
2451 same_contents = !hashcmp(one->sha1, two->sha1);
2452
2453 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
2454 data->is_binary = 1;
2455 if (same_contents) {
2456 data->added = 0;
2457 data->deleted = 0;
2458 } else {
2459 data->added = diff_filespec_size(two);
2460 data->deleted = diff_filespec_size(one);
2461 }
2462 }
2463
2464 else if (complete_rewrite) {
2465 diff_populate_filespec(one, 0);
2466 diff_populate_filespec(two, 0);
2467 data->deleted = count_lines(one->data, one->size);
2468 data->added = count_lines(two->data, two->size);
2469 }
2470
2471 else if (!same_contents) {
2472 /* Crazy xdl interfaces.. */
2473 xpparam_t xpp;
2474 xdemitconf_t xecfg;
2475
2476 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2477 die("unable to read files to diff");
2478
2479 memset(&xpp, 0, sizeof(xpp));
2480 memset(&xecfg, 0, sizeof(xecfg));
2481 xpp.flags = o->xdl_opts;
2482 xecfg.ctxlen = o->context;
2483 xecfg.interhunkctxlen = o->interhunkcontext;
2484 xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
2485 &xpp, &xecfg);
2486 }
2487
2488 diff_free_filespec_data(one);
2489 diff_free_filespec_data(two);
2490 }
2491
2492 static void builtin_checkdiff(const char *name_a, const char *name_b,
2493 const char *attr_path,
2494 struct diff_filespec *one,
2495 struct diff_filespec *two,
2496 struct diff_options *o)
2497 {
2498 mmfile_t mf1, mf2;
2499 struct checkdiff_t data;
2500
2501 if (!two)
2502 return;
2503
2504 memset(&data, 0, sizeof(data));
2505 data.filename = name_b ? name_b : name_a;
2506 data.lineno = 0;
2507 data.o = o;
2508 data.ws_rule = whitespace_rule(attr_path);
2509 data.conflict_marker_size = ll_merge_marker_size(attr_path);
2510
2511 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2512 die("unable to read files to diff");
2513
2514 /*
2515 * All the other codepaths check both sides, but not checking
2516 * the "old" side here is deliberate. We are checking the newly
2517 * introduced changes, and as long as the "new" side is text, we
2518 * can and should check what it introduces.
2519 */
2520 if (diff_filespec_is_binary(two))
2521 goto free_and_return;
2522 else {
2523 /* Crazy xdl interfaces.. */
2524 xpparam_t xpp;
2525 xdemitconf_t xecfg;
2526
2527 memset(&xpp, 0, sizeof(xpp));
2528 memset(&xecfg, 0, sizeof(xecfg));
2529 xecfg.ctxlen = 1; /* at least one context line */
2530 xpp.flags = 0;
2531 xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
2532 &xpp, &xecfg);
2533
2534 if (data.ws_rule & WS_BLANK_AT_EOF) {
2535 struct emit_callback ecbdata;
2536 int blank_at_eof;
2537
2538 ecbdata.ws_rule = data.ws_rule;
2539 check_blank_at_eof(&mf1, &mf2, &ecbdata);
2540 blank_at_eof = ecbdata.blank_at_eof_in_postimage;
2541
2542 if (blank_at_eof) {
2543 static char *err;
2544 if (!err)
2545 err = whitespace_error_string(WS_BLANK_AT_EOF);
2546 fprintf(o->file, "%s:%d: %s.\n",
2547 data.filename, blank_at_eof, err);
2548 data.status = 1; /* report errors */
2549 }
2550 }
2551 }
2552 free_and_return:
2553 diff_free_filespec_data(one);
2554 diff_free_filespec_data(two);
2555 if (data.status)
2556 DIFF_OPT_SET(o, CHECK_FAILED);
2557 }
2558
2559 struct diff_filespec *alloc_filespec(const char *path)
2560 {
2561 int namelen = strlen(path);
2562 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
2563
2564 memset(spec, 0, sizeof(*spec));
2565 spec->path = (char *)(spec + 1);
2566 memcpy(spec->path, path, namelen+1);
2567 spec->count = 1;
2568 spec->is_binary = -1;
2569 return spec;
2570 }
2571
2572 void free_filespec(struct diff_filespec *spec)
2573 {
2574 if (!--spec->count) {
2575 diff_free_filespec_data(spec);
2576 free(spec);
2577 }
2578 }
2579
2580 void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
2581 int sha1_valid, unsigned short mode)
2582 {
2583 if (mode) {
2584 spec->mode = canon_mode(mode);
2585 hashcpy(spec->sha1, sha1);
2586 spec->sha1_valid = sha1_valid;
2587 }
2588 }
2589
2590 /*
2591 * Given a name and sha1 pair, if the index tells us the file in
2592 * the work tree has that object contents, return true, so that
2593 * prepare_temp_file() does not have to inflate and extract.
2594 */
2595 static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
2596 {
2597 const struct cache_entry *ce;
2598 struct stat st;
2599 int pos, len;
2600
2601 /*
2602 * We do not read the cache ourselves here, because the
2603 * benchmark with my previous version that always reads cache
2604 * shows that it makes things worse for diff-tree comparing
2605 * two linux-2.6 kernel trees in an already checked out work
2606 * tree. This is because most diff-tree comparisons deal with
2607 * only a small number of files, while reading the cache is
2608 * expensive for a large project, and its cost outweighs the
2609 * savings we get by not inflating the object to a temporary
2610 * file. Practically, this code only helps when we are used
2611 * by diff-cache --cached, which does read the cache before
2612 * calling us.
2613 */
2614 if (!active_cache)
2615 return 0;
2616
2617 /* We want to avoid the working directory if our caller
2618 * doesn't need the data in a normal file, this system
2619 * is rather slow with its stat/open/mmap/close syscalls,
2620 * and the object is contained in a pack file. The pack
2621 * is probably already open and will be faster to obtain
2622 * the data through than the working directory. Loose
2623 * objects however would tend to be slower as they need
2624 * to be individually opened and inflated.
2625 */
2626 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
2627 return 0;
2628
2629 len = strlen(name);
2630 pos = cache_name_pos(name, len);
2631 if (pos < 0)
2632 return 0;
2633 ce = active_cache[pos];
2634
2635 /*
2636 * This is not the sha1 we are looking for, or
2637 * unreusable because it is not a regular file.
2638 */
2639 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
2640 return 0;
2641
2642 /*
2643 * If ce is marked as "assume unchanged", there is no
2644 * guarantee that work tree matches what we are looking for.
2645 */
2646 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
2647 return 0;
2648
2649 /*
2650 * If ce matches the file in the work tree, we can reuse it.
2651 */
2652 if (ce_uptodate(ce) ||
2653 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
2654 return 1;
2655
2656 return 0;
2657 }
2658
2659 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2660 {
2661 int len;
2662 char *data = xmalloc(100), *dirty = "";
2663
2664 /* Are we looking at the work tree? */
2665 if (s->dirty_submodule)
2666 dirty = "-dirty";
2667
2668 len = snprintf(data, 100,
2669 "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty);
2670 s->data = data;
2671 s->size = len;
2672 s->should_free = 1;
2673 if (size_only) {
2674 s->data = NULL;
2675 free(data);
2676 }
2677 return 0;
2678 }
2679
2680 /*
2681 * While doing rename detection and pickaxe operation, we may need to
2682 * grab the data for the blob (or file) for our own in-core comparison.
2683 * diff_filespec has data and size fields for this purpose.
2684 */
2685 int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
2686 {
2687 int size_only = flags & CHECK_SIZE_ONLY;
2688 int err = 0;
2689 /*
2690 * demote FAIL to WARN to allow inspecting the situation
2691 * instead of refusing.
2692 */
2693 enum safe_crlf crlf_warn = (safe_crlf == SAFE_CRLF_FAIL
2694 ? SAFE_CRLF_WARN
2695 : safe_crlf);
2696
2697 if (!DIFF_FILE_VALID(s))
2698 die("internal error: asking to populate invalid file.");
2699 if (S_ISDIR(s->mode))
2700 return -1;
2701
2702 if (s->data)
2703 return 0;
2704
2705 if (size_only && 0 < s->size)
2706 return 0;
2707
2708 if (S_ISGITLINK(s->mode))
2709 return diff_populate_gitlink(s, size_only);
2710
2711 if (!s->sha1_valid ||
2712 reuse_worktree_file(s->path, s->sha1, 0)) {
2713 struct strbuf buf = STRBUF_INIT;
2714 struct stat st;
2715 int fd;
2716
2717 if (lstat(s->path, &st) < 0) {
2718 if (errno == ENOENT) {
2719 err_empty:
2720 err = -1;
2721 empty:
2722 s->data = (char *)"";
2723 s->size = 0;
2724 return err;
2725 }
2726 }
2727 s->size = xsize_t(st.st_size);
2728 if (!s->size)
2729 goto empty;
2730 if (S_ISLNK(st.st_mode)) {
2731 struct strbuf sb = STRBUF_INIT;
2732
2733 if (strbuf_readlink(&sb, s->path, s->size))
2734 goto err_empty;
2735 s->size = sb.len;
2736 s->data = strbuf_detach(&sb, NULL);
2737 s->should_free = 1;
2738 return 0;
2739 }
2740 if (size_only)
2741 return 0;
2742 if ((flags & CHECK_BINARY) &&
2743 s->size > big_file_threshold && s->is_binary == -1) {
2744 s->is_binary = 1;
2745 return 0;
2746 }
2747 fd = open(s->path, O_RDONLY);
2748 if (fd < 0)
2749 goto err_empty;
2750 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2751 close(fd);
2752 s->should_munmap = 1;
2753
2754 /*
2755 * Convert from working tree format to canonical git format
2756 */
2757 if (convert_to_git(s->path, s->data, s->size, &buf, crlf_warn)) {
2758 size_t size = 0;
2759 munmap(s->data, s->size);
2760 s->should_munmap = 0;
2761 s->data = strbuf_detach(&buf, &size);
2762 s->size = size;
2763 s->should_free = 1;
2764 }
2765 }
2766 else {
2767 enum object_type type;
2768 if (size_only || (flags & CHECK_BINARY)) {
2769 type = sha1_object_info(s->sha1, &s->size);
2770 if (type < 0)
2771 die("unable to read %s", sha1_to_hex(s->sha1));
2772 if (size_only)
2773 return 0;
2774 if (s->size > big_file_threshold && s->is_binary == -1) {
2775 s->is_binary = 1;
2776 return 0;
2777 }
2778 }
2779 s->data = read_sha1_file(s->sha1, &type, &s->size);
2780 if (!s->data)
2781 die("unable to read %s", sha1_to_hex(s->sha1));
2782 s->should_free = 1;
2783 }
2784 return 0;
2785 }
2786
2787 void diff_free_filespec_blob(struct diff_filespec *s)
2788 {
2789 if (s->should_free)
2790 free(s->data);
2791 else if (s->should_munmap)
2792 munmap(s->data, s->size);
2793
2794 if (s->should_free || s->should_munmap) {
2795 s->should_free = s->should_munmap = 0;
2796 s->data = NULL;
2797 }
2798 }
2799
2800 void diff_free_filespec_data(struct diff_filespec *s)
2801 {
2802 diff_free_filespec_blob(s);
2803 free(s->cnt_data);
2804 s->cnt_data = NULL;
2805 }
2806
2807 static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2808 void *blob,
2809 unsigned long size,
2810 const unsigned char *sha1,
2811 int mode)
2812 {
2813 int fd;
2814 struct strbuf buf = STRBUF_INIT;
2815 struct strbuf template = STRBUF_INIT;
2816 char *path_dup = xstrdup(path);
2817 const char *base = basename(path_dup);
2818
2819 /* Generate "XXXXXX_basename.ext" */
2820 strbuf_addstr(&template, "XXXXXX_");
2821 strbuf_addstr(&template, base);
2822
2823 fd = git_mkstemps(temp->tmp_path, PATH_MAX, template.buf,
2824 strlen(base) + 1);
2825 if (fd < 0)
2826 die_errno("unable to create temp-file");
2827 if (convert_to_working_tree(path,
2828 (const char *)blob, (size_t)size, &buf)) {
2829 blob = buf.buf;
2830 size = buf.len;
2831 }
2832 if (write_in_full(fd, blob, size) != size)
2833 die_errno("unable to write temp-file");
2834 close(fd);
2835 temp->name = temp->tmp_path;
2836 strcpy(temp->hex, sha1_to_hex(sha1));
2837 temp->hex[40] = 0;
2838 sprintf(temp->mode, "%06o", mode);
2839 strbuf_release(&buf);
2840 strbuf_release(&template);
2841 free(path_dup);
2842 }
2843
2844 static struct diff_tempfile *prepare_temp_file(const char *name,
2845 struct diff_filespec *one)
2846 {
2847 struct diff_tempfile *temp = claim_diff_tempfile();
2848
2849 if (!DIFF_FILE_VALID(one)) {
2850 not_a_valid_file:
2851 /* A '-' entry produces this for file-2, and
2852 * a '+' entry produces this for file-1.
2853 */
2854 temp->name = "/dev/null";
2855 strcpy(temp->hex, ".");
2856 strcpy(temp->mode, ".");
2857 return temp;
2858 }
2859
2860 if (!remove_tempfile_installed) {
2861 atexit(remove_tempfile);
2862 sigchain_push_common(remove_tempfile_on_signal);
2863 remove_tempfile_installed = 1;
2864 }
2865
2866 if (!S_ISGITLINK(one->mode) &&
2867 (!one->sha1_valid ||
2868 reuse_worktree_file(name, one->sha1, 1))) {
2869 struct stat st;
2870 if (lstat(name, &st) < 0) {
2871 if (errno == ENOENT)
2872 goto not_a_valid_file;
2873 die_errno("stat(%s)", name);
2874 }
2875 if (S_ISLNK(st.st_mode)) {
2876 struct strbuf sb = STRBUF_INIT;
2877 if (strbuf_readlink(&sb, name, st.st_size) < 0)
2878 die_errno("readlink(%s)", name);
2879 prep_temp_blob(name, temp, sb.buf, sb.len,
2880 (one->sha1_valid ?
2881 one->sha1 : null_sha1),
2882 (one->sha1_valid ?
2883 one->mode : S_IFLNK));
2884 strbuf_release(&sb);
2885 }
2886 else {
2887 /* we can borrow from the file in the work tree */
2888 temp->name = name;
2889 if (!one->sha1_valid)
2890 strcpy(temp->hex, sha1_to_hex(null_sha1));
2891 else
2892 strcpy(temp->hex, sha1_to_hex(one->sha1));
2893 /* Even though we may sometimes borrow the
2894 * contents from the work tree, we always want
2895 * one->mode. mode is trustworthy even when
2896 * !(one->sha1_valid), as long as
2897 * DIFF_FILE_VALID(one).
2898 */
2899 sprintf(temp->mode, "%06o", one->mode);
2900 }
2901 return temp;
2902 }
2903 else {
2904 if (diff_populate_filespec(one, 0))
2905 die("cannot read data blob for %s", one->path);
2906 prep_temp_blob(name, temp, one->data, one->size,
2907 one->sha1, one->mode);
2908 }
2909 return temp;
2910 }
2911
2912 static void add_external_diff_name(struct argv_array *argv,
2913 const char *name,
2914 struct diff_filespec *df)
2915 {
2916 struct diff_tempfile *temp = prepare_temp_file(name, df);
2917 argv_array_push(argv, temp->name);
2918 argv_array_push(argv, temp->hex);
2919 argv_array_push(argv, temp->mode);
2920 }
2921
2922 /* An external diff command takes:
2923 *
2924 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2925 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2926 *
2927 */
2928 static void run_external_diff(const char *pgm,
2929 const char *name,
2930 const char *other,
2931 struct diff_filespec *one,
2932 struct diff_filespec *two,
2933 const char *xfrm_msg,
2934 int complete_rewrite,
2935 struct diff_options *o)
2936 {
2937 struct argv_array argv = ARGV_ARRAY_INIT;
2938 struct argv_array env = ARGV_ARRAY_INIT;
2939 struct diff_queue_struct *q = &diff_queued_diff;
2940
2941 argv_array_push(&argv, pgm);
2942 argv_array_push(&argv, name);
2943
2944 if (one && two) {
2945 add_external_diff_name(&argv, name, one);
2946 if (!other)
2947 add_external_diff_name(&argv, name, two);
2948 else {
2949 add_external_diff_name(&argv, other, two);
2950 argv_array_push(&argv, other);
2951 argv_array_push(&argv, xfrm_msg);
2952 }
2953 }
2954
2955 argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
2956 argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
2957
2958 if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
2959 die(_("external diff died, stopping at %s"), name);
2960
2961 remove_tempfile();
2962 argv_array_clear(&argv);
2963 argv_array_clear(&env);
2964 }
2965
2966 static int similarity_index(struct diff_filepair *p)
2967 {
2968 return p->score * 100 / MAX_SCORE;
2969 }
2970
2971 static void fill_metainfo(struct strbuf *msg,
2972 const char *name,
2973 const char *other,
2974 struct diff_filespec *one,
2975 struct diff_filespec *two,
2976 struct diff_options *o,
2977 struct diff_filepair *p,
2978 int *must_show_header,
2979 int use_color)
2980 {
2981 const char *set = diff_get_color(use_color, DIFF_METAINFO);
2982 const char *reset = diff_get_color(use_color, DIFF_RESET);
2983 const char *line_prefix = diff_line_prefix(o);
2984
2985 *must_show_header = 1;
2986 strbuf_init(msg, PATH_MAX * 2 + 300);
2987 switch (p->status) {
2988 case DIFF_STATUS_COPIED:
2989 strbuf_addf(msg, "%s%ssimilarity index %d%%",
2990 line_prefix, set, similarity_index(p));
2991 strbuf_addf(msg, "%s\n%s%scopy from ",
2992 reset, line_prefix, set);
2993 quote_c_style(name, msg, NULL, 0);
2994 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
2995 quote_c_style(other, msg, NULL, 0);
2996 strbuf_addf(msg, "%s\n", reset);
2997 break;
2998 case DIFF_STATUS_RENAMED:
2999 strbuf_addf(msg, "%s%ssimilarity index %d%%",
3000 line_prefix, set, similarity_index(p));
3001 strbuf_addf(msg, "%s\n%s%srename from ",
3002 reset, line_prefix, set);
3003 quote_c_style(name, msg, NULL, 0);
3004 strbuf_addf(msg, "%s\n%s%srename to ",
3005 reset, line_prefix, set);
3006 quote_c_style(other, msg, NULL, 0);
3007 strbuf_addf(msg, "%s\n", reset);
3008 break;
3009 case DIFF_STATUS_MODIFIED:
3010 if (p->score) {
3011 strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
3012 line_prefix,
3013 set, similarity_index(p), reset);
3014 break;
3015 }
3016 /* fallthru */
3017 default:
3018 *must_show_header = 0;
3019 }
3020 if (one && two && hashcmp(one->sha1, two->sha1)) {
3021 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
3022
3023 if (DIFF_OPT_TST(o, BINARY)) {
3024 mmfile_t mf;
3025 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
3026 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
3027 abbrev = 40;
3028 }
3029 strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
3030 find_unique_abbrev(one->sha1, abbrev));
3031 strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
3032 if (one->mode == two->mode)
3033 strbuf_addf(msg, " %06o", one->mode);
3034 strbuf_addf(msg, "%s\n", reset);
3035 }
3036 }
3037
3038 static void run_diff_cmd(const char *pgm,
3039 const char *name,
3040 const char *other,
3041 const char *attr_path,
3042 struct diff_filespec *one,
3043 struct diff_filespec *two,
3044 struct strbuf *msg,
3045 struct diff_options *o,
3046 struct diff_filepair *p)
3047 {
3048 const char *xfrm_msg = NULL;
3049 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
3050 int must_show_header = 0;
3051
3052
3053 if (DIFF_OPT_TST(o, ALLOW_EXTERNAL)) {
3054 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
3055 if (drv && drv->external)
3056 pgm = drv->external;
3057 }
3058
3059 if (msg) {
3060 /*
3061 * don't use colors when the header is intended for an
3062 * external diff driver
3063 */
3064 fill_metainfo(msg, name, other, one, two, o, p,
3065 &must_show_header,
3066 want_color(o->use_color) && !pgm);
3067 xfrm_msg = msg->len ? msg->buf : NULL;
3068 }
3069
3070 if (pgm) {
3071 run_external_diff(pgm, name, other, one, two, xfrm_msg,
3072 complete_rewrite, o);
3073 return;
3074 }
3075 if (one && two)
3076 builtin_diff(name, other ? other : name,
3077 one, two, xfrm_msg, must_show_header,
3078 o, complete_rewrite);
3079 else
3080 fprintf(o->file, "* Unmerged path %s\n", name);
3081 }
3082
3083 static void diff_fill_sha1_info(struct diff_filespec *one)
3084 {
3085 if (DIFF_FILE_VALID(one)) {
3086 if (!one->sha1_valid) {
3087 struct stat st;
3088 if (one->is_stdin) {
3089 hashcpy(one->sha1, null_sha1);
3090 return;
3091 }
3092 if (lstat(one->path, &st) < 0)
3093 die_errno("stat '%s'", one->path);
3094 if (index_path(one->sha1, one->path, &st, 0))
3095 die("cannot hash %s", one->path);
3096 }
3097 }
3098 else
3099 hashclr(one->sha1);
3100 }
3101
3102 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
3103 {
3104 /* Strip the prefix but do not molest /dev/null and absolute paths */
3105 if (*namep && **namep != '/') {
3106 *namep += prefix_length;
3107 if (**namep == '/')
3108 ++*namep;
3109 }
3110 if (*otherp && **otherp != '/') {
3111 *otherp += prefix_length;
3112 if (**otherp == '/')
3113 ++*otherp;
3114 }
3115 }
3116
3117 static void run_diff(struct diff_filepair *p, struct diff_options *o)
3118 {
3119 const char *pgm = external_diff();
3120 struct strbuf msg;
3121 struct diff_filespec *one = p->one;
3122 struct diff_filespec *two = p->two;
3123 const char *name;
3124 const char *other;
3125 const char *attr_path;
3126
3127 name = p->one->path;
3128 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3129 attr_path = name;
3130 if (o->prefix_length)
3131 strip_prefix(o->prefix_length, &name, &other);
3132
3133 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
3134 pgm = NULL;
3135
3136 if (DIFF_PAIR_UNMERGED(p)) {
3137 run_diff_cmd(pgm, name, NULL, attr_path,
3138 NULL, NULL, NULL, o, p);
3139 return;
3140 }
3141
3142 diff_fill_sha1_info(one);
3143 diff_fill_sha1_info(two);
3144
3145 if (!pgm &&
3146 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
3147 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
3148 /*
3149 * a filepair that changes between file and symlink
3150 * needs to be split into deletion and creation.
3151 */
3152 struct diff_filespec *null = alloc_filespec(two->path);
3153 run_diff_cmd(NULL, name, other, attr_path,
3154 one, null, &msg, o, p);
3155 free(null);
3156 strbuf_release(&msg);
3157
3158 null = alloc_filespec(one->path);
3159 run_diff_cmd(NULL, name, other, attr_path,
3160 null, two, &msg, o, p);
3161 free(null);
3162 }
3163 else
3164 run_diff_cmd(pgm, name, other, attr_path,
3165 one, two, &msg, o, p);
3166
3167 strbuf_release(&msg);
3168 }
3169
3170 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
3171 struct diffstat_t *diffstat)
3172 {
3173 const char *name;
3174 const char *other;
3175
3176 if (DIFF_PAIR_UNMERGED(p)) {
3177 /* unmerged */
3178 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, p);
3179 return;
3180 }
3181
3182 name = p->one->path;
3183 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3184
3185 if (o->prefix_length)
3186 strip_prefix(o->prefix_length, &name, &other);
3187
3188 diff_fill_sha1_info(p->one);
3189 diff_fill_sha1_info(p->two);
3190
3191 builtin_diffstat(name, other, p->one, p->two, diffstat, o, p);
3192 }
3193
3194 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
3195 {
3196 const char *name;
3197 const char *other;
3198 const char *attr_path;
3199
3200 if (DIFF_PAIR_UNMERGED(p)) {
3201 /* unmerged */
3202 return;
3203 }
3204
3205 name = p->one->path;
3206 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3207 attr_path = other ? other : name;
3208
3209 if (o->prefix_length)
3210 strip_prefix(o->prefix_length, &name, &other);
3211
3212 diff_fill_sha1_info(p->one);
3213 diff_fill_sha1_info(p->two);
3214
3215 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
3216 }
3217
3218 void diff_setup(struct diff_options *options)
3219 {
3220 memcpy(options, &default_diff_options, sizeof(*options));
3221
3222 options->file = stdout;
3223
3224 options->line_termination = '\n';
3225 options->break_opt = -1;
3226 options->rename_limit = -1;
3227 options->dirstat_permille = diff_dirstat_permille_default;
3228 options->context = diff_context_default;
3229 DIFF_OPT_SET(options, RENAME_EMPTY);
3230
3231 /* pathchange left =NULL by default */
3232 options->change = diff_change;
3233 options->add_remove = diff_addremove;
3234 options->use_color = diff_use_color_default;
3235 options->detect_rename = diff_detect_rename_default;
3236 options->xdl_opts |= diff_algorithm;
3237
3238 options->orderfile = diff_order_file_cfg;
3239
3240 if (diff_no_prefix) {
3241 options->a_prefix = options->b_prefix = "";
3242 } else if (!diff_mnemonic_prefix) {
3243 options->a_prefix = "a/";
3244 options->b_prefix = "b/";
3245 }
3246 }
3247
3248 void diff_setup_done(struct diff_options *options)
3249 {
3250 int count = 0;
3251
3252 if (options->set_default)
3253 options->set_default(options);
3254
3255 if (options->output_format & DIFF_FORMAT_NAME)
3256 count++;
3257 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
3258 count++;
3259 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
3260 count++;
3261 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
3262 count++;
3263 if (count > 1)
3264 die("--name-only, --name-status, --check and -s are mutually exclusive");
3265
3266 /*
3267 * Most of the time we can say "there are changes"
3268 * only by checking if there are changed paths, but
3269 * --ignore-whitespace* options force us to look
3270 * inside contents.
3271 */
3272
3273 if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
3274 DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
3275 DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
3276 DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
3277 else
3278 DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
3279
3280 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
3281 options->detect_rename = DIFF_DETECT_COPY;
3282
3283 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
3284 options->prefix = NULL;
3285 if (options->prefix)
3286 options->prefix_length = strlen(options->prefix);
3287 else
3288 options->prefix_length = 0;
3289
3290 if (options->output_format & (DIFF_FORMAT_NAME |
3291 DIFF_FORMAT_NAME_STATUS |
3292 DIFF_FORMAT_CHECKDIFF |
3293 DIFF_FORMAT_NO_OUTPUT))
3294 options->output_format &= ~(DIFF_FORMAT_RAW |
3295 DIFF_FORMAT_NUMSTAT |
3296 DIFF_FORMAT_DIFFSTAT |
3297 DIFF_FORMAT_SHORTSTAT |
3298 DIFF_FORMAT_DIRSTAT |
3299 DIFF_FORMAT_SUMMARY |
3300 DIFF_FORMAT_PATCH);
3301
3302 /*
3303 * These cases always need recursive; we do not drop caller-supplied
3304 * recursive bits for other formats here.
3305 */
3306 if (options->output_format & (DIFF_FORMAT_PATCH |
3307 DIFF_FORMAT_NUMSTAT |
3308 DIFF_FORMAT_DIFFSTAT |
3309 DIFF_FORMAT_SHORTSTAT |
3310 DIFF_FORMAT_DIRSTAT |
3311 DIFF_FORMAT_SUMMARY |
3312 DIFF_FORMAT_CHECKDIFF))
3313 DIFF_OPT_SET(options, RECURSIVE);
3314 /*
3315 * Also pickaxe would not work very well if you do not say recursive
3316 */
3317 if (options->pickaxe)
3318 DIFF_OPT_SET(options, RECURSIVE);
3319 /*
3320 * When patches are generated, submodules diffed against the work tree
3321 * must be checked for dirtiness too so it can be shown in the output
3322 */
3323 if (options->output_format & DIFF_FORMAT_PATCH)
3324 DIFF_OPT_SET(options, DIRTY_SUBMODULES);
3325
3326 if (options->detect_rename && options->rename_limit < 0)
3327 options->rename_limit = diff_rename_limit_default;
3328 if (options->setup & DIFF_SETUP_USE_CACHE) {
3329 if (!active_cache)
3330 /* read-cache does not die even when it fails
3331 * so it is safe for us to do this here. Also
3332 * it does not smudge active_cache or active_nr
3333 * when it fails, so we do not have to worry about
3334 * cleaning it up ourselves either.
3335 */
3336 read_cache();
3337 }
3338 if (options->abbrev <= 0 || 40 < options->abbrev)
3339 options->abbrev = 40; /* full */
3340
3341 /*
3342 * It does not make sense to show the first hit we happened
3343 * to have found. It does not make sense not to return with
3344 * exit code in such a case either.
3345 */
3346 if (DIFF_OPT_TST(options, QUICK)) {
3347 options->output_format = DIFF_FORMAT_NO_OUTPUT;
3348 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3349 }
3350
3351 options->diff_path_counter = 0;
3352
3353 if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
3354 die(_("--follow requires exactly one pathspec"));
3355 }
3356
3357 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
3358 {
3359 char c, *eq;
3360 int len;
3361
3362 if (*arg != '-')
3363 return 0;
3364 c = *++arg;
3365 if (!c)
3366 return 0;
3367 if (c == arg_short) {
3368 c = *++arg;
3369 if (!c)
3370 return 1;
3371 if (val && isdigit(c)) {
3372 char *end;
3373 int n = strtoul(arg, &end, 10);
3374 if (*end)
3375 return 0;
3376 *val = n;
3377 return 1;
3378 }
3379 return 0;
3380 }
3381 if (c != '-')
3382 return 0;
3383 arg++;
3384 eq = strchrnul(arg, '=');
3385 len = eq - arg;
3386 if (!len || strncmp(arg, arg_long, len))
3387 return 0;
3388 if (*eq) {
3389 int n;
3390 char *end;
3391 if (!isdigit(*++eq))
3392 return 0;
3393 n = strtoul(eq, &end, 10);
3394 if (*end)
3395 return 0;
3396 *val = n;
3397 }
3398 return 1;
3399 }
3400
3401 static int diff_scoreopt_parse(const char *opt);
3402
3403 static inline int short_opt(char opt, const char **argv,
3404 const char **optarg)
3405 {
3406 const char *arg = argv[0];
3407 if (arg[0] != '-' || arg[1] != opt)
3408 return 0;
3409 if (arg[2] != '\0') {
3410 *optarg = arg + 2;
3411 return 1;
3412 }
3413 if (!argv[1])
3414 die("Option '%c' requires a value", opt);
3415 *optarg = argv[1];
3416 return 2;
3417 }
3418
3419 int parse_long_opt(const char *opt, const char **argv,
3420 const char **optarg)
3421 {
3422 const char *arg = argv[0];
3423 if (!skip_prefix(arg, "--", &arg))
3424 return 0;
3425 if (!skip_prefix(arg, opt, &arg))
3426 return 0;
3427 if (*arg == '=') { /* stuck form: --option=value */
3428 *optarg = arg + 1;
3429 return 1;
3430 }
3431 if (*arg != '\0')
3432 return 0;
3433 /* separate form: --option value */
3434 if (!argv[1])
3435 die("Option '--%s' requires a value", opt);
3436 *optarg = argv[1];
3437 return 2;
3438 }
3439
3440 static int stat_opt(struct diff_options *options, const char **av)
3441 {
3442 const char *arg = av[0];
3443 char *end;
3444 int width = options->stat_width;
3445 int name_width = options->stat_name_width;
3446 int graph_width = options->stat_graph_width;
3447 int count = options->stat_count;
3448 int argcount = 1;
3449
3450 if (!skip_prefix(arg, "--stat", &arg))
3451 die("BUG: stat option does not begin with --stat: %s", arg);
3452 end = (char *)arg;
3453
3454 switch (*arg) {
3455 case '-':
3456 if (skip_prefix(arg, "-width", &arg)) {
3457 if (*arg == '=')
3458 width = strtoul(arg + 1, &end, 10);
3459 else if (!*arg && !av[1])
3460 die("Option '--stat-width' requires a value");
3461 else if (!*arg) {
3462 width = strtoul(av[1], &end, 10);
3463 argcount = 2;
3464 }
3465 } else if (skip_prefix(arg, "-name-width", &arg)) {
3466 if (*arg == '=')
3467 name_width = strtoul(arg + 1, &end, 10);
3468 else if (!*arg && !av[1])
3469 die("Option '--stat-name-width' requires a value");
3470 else if (!*arg) {
3471 name_width = strtoul(av[1], &end, 10);
3472 argcount = 2;
3473 }
3474 } else if (skip_prefix(arg, "-graph-width", &arg)) {
3475 if (*arg == '=')
3476 graph_width = strtoul(arg + 1, &end, 10);
3477 else if (!*arg && !av[1])
3478 die("Option '--stat-graph-width' requires a value");
3479 else if (!*arg) {
3480 graph_width = strtoul(av[1], &end, 10);
3481 argcount = 2;
3482 }
3483 } else if (skip_prefix(arg, "-count", &arg)) {
3484 if (*arg == '=')
3485 count = strtoul(arg + 1, &end, 10);
3486 else if (!*arg && !av[1])
3487 die("Option '--stat-count' requires a value");
3488 else if (!*arg) {
3489 count = strtoul(av[1], &end, 10);
3490 argcount = 2;
3491 }
3492 }
3493 break;
3494 case '=':
3495 width = strtoul(arg+1, &end, 10);
3496 if (*end == ',')
3497 name_width = strtoul(end+1, &end, 10);
3498 if (*end == ',')
3499 count = strtoul(end+1, &end, 10);
3500 }
3501
3502 /* Important! This checks all the error cases! */
3503 if (*end)
3504 return 0;
3505 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3506 options->stat_name_width = name_width;
3507 options->stat_graph_width = graph_width;
3508 options->stat_width = width;
3509 options->stat_count = count;
3510 return argcount;
3511 }
3512
3513 static int parse_dirstat_opt(struct diff_options *options, const char *params)
3514 {
3515 struct strbuf errmsg = STRBUF_INIT;
3516 if (parse_dirstat_params(options, params, &errmsg))
3517 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3518 errmsg.buf);
3519 strbuf_release(&errmsg);
3520 /*
3521 * The caller knows a dirstat-related option is given from the command
3522 * line; allow it to say "return this_function();"
3523 */
3524 options->output_format |= DIFF_FORMAT_DIRSTAT;
3525 return 1;
3526 }
3527
3528 static int parse_submodule_opt(struct diff_options *options, const char *value)
3529 {
3530 if (parse_submodule_params(options, value))
3531 die(_("Failed to parse --submodule option parameter: '%s'"),
3532 value);
3533 return 1;
3534 }
3535
3536 static const char diff_status_letters[] = {
3537 DIFF_STATUS_ADDED,
3538 DIFF_STATUS_COPIED,
3539 DIFF_STATUS_DELETED,
3540 DIFF_STATUS_MODIFIED,
3541 DIFF_STATUS_RENAMED,
3542 DIFF_STATUS_TYPE_CHANGED,
3543 DIFF_STATUS_UNKNOWN,
3544 DIFF_STATUS_UNMERGED,
3545 DIFF_STATUS_FILTER_AON,
3546 DIFF_STATUS_FILTER_BROKEN,
3547 '\0',
3548 };
3549
3550 static unsigned int filter_bit['Z' + 1];
3551
3552 static void prepare_filter_bits(void)
3553 {
3554 int i;
3555
3556 if (!filter_bit[DIFF_STATUS_ADDED]) {
3557 for (i = 0; diff_status_letters[i]; i++)
3558 filter_bit[(int) diff_status_letters[i]] = (1 << i);
3559 }
3560 }
3561
3562 static unsigned filter_bit_tst(char status, const struct diff_options *opt)
3563 {
3564 return opt->filter & filter_bit[(int) status];
3565 }
3566
3567 static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
3568 {
3569 int i, optch;
3570
3571 prepare_filter_bits();
3572
3573 /*
3574 * If there is a negation e.g. 'd' in the input, and we haven't
3575 * initialized the filter field with another --diff-filter, start
3576 * from full set of bits, except for AON.
3577 */
3578 if (!opt->filter) {
3579 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3580 if (optch < 'a' || 'z' < optch)
3581 continue;
3582 opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
3583 opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
3584 break;
3585 }
3586 }
3587
3588 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3589 unsigned int bit;
3590 int negate;
3591
3592 if ('a' <= optch && optch <= 'z') {
3593 negate = 1;
3594 optch = toupper(optch);
3595 } else {
3596 negate = 0;
3597 }
3598
3599 bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
3600 if (!bit)
3601 return optarg[i];
3602 if (negate)
3603 opt->filter &= ~bit;
3604 else
3605 opt->filter |= bit;
3606 }
3607 return 0;
3608 }
3609
3610 static void enable_patch_output(int *fmt) {
3611 *fmt &= ~DIFF_FORMAT_NO_OUTPUT;
3612 *fmt |= DIFF_FORMAT_PATCH;
3613 }
3614
3615 int diff_opt_parse(struct diff_options *options, const char **av, int ac)
3616 {
3617 const char *arg = av[0];
3618 const char *optarg;
3619 int argcount;
3620
3621 /* Output format options */
3622 if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")
3623 || opt_arg(arg, 'U', "unified", &options->context))
3624 enable_patch_output(&options->output_format);
3625 else if (!strcmp(arg, "--raw"))
3626 options->output_format |= DIFF_FORMAT_RAW;
3627 else if (!strcmp(arg, "--patch-with-raw")) {
3628 enable_patch_output(&options->output_format);
3629 options->output_format |= DIFF_FORMAT_RAW;
3630 } else if (!strcmp(arg, "--numstat"))
3631 options->output_format |= DIFF_FORMAT_NUMSTAT;
3632 else if (!strcmp(arg, "--shortstat"))
3633 options->output_format |= DIFF_FORMAT_SHORTSTAT;
3634 else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat"))
3635 return parse_dirstat_opt(options, "");
3636 else if (skip_prefix(arg, "-X", &arg))
3637 return parse_dirstat_opt(options, arg);
3638 else if (skip_prefix(arg, "--dirstat=", &arg))
3639 return parse_dirstat_opt(options, arg);
3640 else if (!strcmp(arg, "--cumulative"))
3641 return parse_dirstat_opt(options, "cumulative");
3642 else if (!strcmp(arg, "--dirstat-by-file"))
3643 return parse_dirstat_opt(options, "files");
3644 else if (skip_prefix(arg, "--dirstat-by-file=", &arg)) {
3645 parse_dirstat_opt(options, "files");
3646 return parse_dirstat_opt(options, arg);
3647 }
3648 else if (!strcmp(arg, "--check"))
3649 options->output_format |= DIFF_FORMAT_CHECKDIFF;
3650 else if (!strcmp(arg, "--summary"))
3651 options->output_format |= DIFF_FORMAT_SUMMARY;
3652 else if (!strcmp(arg, "--patch-with-stat")) {
3653 enable_patch_output(&options->output_format);
3654 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3655 } else if (!strcmp(arg, "--name-only"))
3656 options->output_format |= DIFF_FORMAT_NAME;
3657 else if (!strcmp(arg, "--name-status"))
3658 options->output_format |= DIFF_FORMAT_NAME_STATUS;
3659 else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
3660 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
3661 else if (starts_with(arg, "--stat"))
3662 /* --stat, --stat-width, --stat-name-width, or --stat-count */
3663 return stat_opt(options, av);
3664
3665 /* renames options */
3666 else if (starts_with(arg, "-B") || starts_with(arg, "--break-rewrites=") ||
3667 !strcmp(arg, "--break-rewrites")) {
3668 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
3669 return error("invalid argument to -B: %s", arg+2);
3670 }
3671 else if (starts_with(arg, "-M") || starts_with(arg, "--find-renames=") ||
3672 !strcmp(arg, "--find-renames")) {
3673 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3674 return error("invalid argument to -M: %s", arg+2);
3675 options->detect_rename = DIFF_DETECT_RENAME;
3676 }
3677 else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
3678 options->irreversible_delete = 1;
3679 }
3680 else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") ||
3681 !strcmp(arg, "--find-copies")) {
3682 if (options->detect_rename == DIFF_DETECT_COPY)
3683 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3684 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3685 return error("invalid argument to -C: %s", arg+2);
3686 options->detect_rename = DIFF_DETECT_COPY;
3687 }
3688 else if (!strcmp(arg, "--no-renames"))
3689 options->detect_rename = 0;
3690 else if (!strcmp(arg, "--rename-empty"))
3691 DIFF_OPT_SET(options, RENAME_EMPTY);
3692 else if (!strcmp(arg, "--no-rename-empty"))
3693 DIFF_OPT_CLR(options, RENAME_EMPTY);
3694 else if (!strcmp(arg, "--relative"))
3695 DIFF_OPT_SET(options, RELATIVE_NAME);
3696 else if (skip_prefix(arg, "--relative=", &arg)) {
3697 DIFF_OPT_SET(options, RELATIVE_NAME);
3698 options->prefix = arg;
3699 }
3700
3701 /* xdiff options */
3702 else if (!strcmp(arg, "--minimal"))
3703 DIFF_XDL_SET(options, NEED_MINIMAL);
3704 else if (!strcmp(arg, "--no-minimal"))
3705 DIFF_XDL_CLR(options, NEED_MINIMAL);
3706 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
3707 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
3708 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
3709 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
3710 else if (!strcmp(arg, "--ignore-space-at-eol"))
3711 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
3712 else if (!strcmp(arg, "--ignore-blank-lines"))
3713 DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
3714 else if (!strcmp(arg, "--patience"))
3715 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
3716 else if (!strcmp(arg, "--histogram"))
3717 options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
3718 else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) {
3719 long value = parse_algorithm_value(optarg);
3720 if (value < 0)
3721 return error("option diff-algorithm accepts \"myers\", "
3722 "\"minimal\", \"patience\" and \"histogram\"");
3723 /* clear out previous settings */
3724 DIFF_XDL_CLR(options, NEED_MINIMAL);
3725 options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
3726 options->xdl_opts |= value;
3727 return argcount;
3728 }
3729
3730 /* flags options */
3731 else if (!strcmp(arg, "--binary")) {
3732 enable_patch_output(&options->output_format);
3733 DIFF_OPT_SET(options, BINARY);
3734 }
3735 else if (!strcmp(arg, "--full-index"))
3736 DIFF_OPT_SET(options, FULL_INDEX);
3737 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
3738 DIFF_OPT_SET(options, TEXT);
3739 else if (!strcmp(arg, "-R"))
3740 DIFF_OPT_SET(options, REVERSE_DIFF);
3741 else if (!strcmp(arg, "--find-copies-harder"))
3742 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3743 else if (!strcmp(arg, "--follow"))
3744 DIFF_OPT_SET(options, FOLLOW_RENAMES);
3745 else if (!strcmp(arg, "--no-follow"))
3746 DIFF_OPT_CLR(options, FOLLOW_RENAMES);
3747 else if (!strcmp(arg, "--color"))
3748 options->use_color = 1;
3749 else if (skip_prefix(arg, "--color=", &arg)) {
3750 int value = git_config_colorbool(NULL, arg);
3751 if (value < 0)
3752 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3753 options->use_color = value;
3754 }
3755 else if (!strcmp(arg, "--no-color"))
3756 options->use_color = 0;
3757 else if (!strcmp(arg, "--color-words")) {
3758 options->use_color = 1;
3759 options->word_diff = DIFF_WORDS_COLOR;
3760 }
3761 else if (skip_prefix(arg, "--color-words=", &arg)) {
3762 options->use_color = 1;
3763 options->word_diff = DIFF_WORDS_COLOR;
3764 options->word_regex = arg;
3765 }
3766 else if (!strcmp(arg, "--word-diff")) {
3767 if (options->word_diff == DIFF_WORDS_NONE)
3768 options->word_diff = DIFF_WORDS_PLAIN;
3769 }
3770 else if (skip_prefix(arg, "--word-diff=", &arg)) {
3771 if (!strcmp(arg, "plain"))
3772 options->word_diff = DIFF_WORDS_PLAIN;
3773 else if (!strcmp(arg, "color")) {
3774 options->use_color = 1;
3775 options->word_diff = DIFF_WORDS_COLOR;
3776 }
3777 else if (!strcmp(arg, "porcelain"))
3778 options->word_diff = DIFF_WORDS_PORCELAIN;
3779 else if (!strcmp(arg, "none"))
3780 options->word_diff = DIFF_WORDS_NONE;
3781 else
3782 die("bad --word-diff argument: %s", arg);
3783 }
3784 else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) {
3785 if (options->word_diff == DIFF_WORDS_NONE)
3786 options->word_diff = DIFF_WORDS_PLAIN;
3787 options->word_regex = optarg;
3788 return argcount;
3789 }
3790 else if (!strcmp(arg, "--exit-code"))
3791 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3792 else if (!strcmp(arg, "--quiet"))
3793 DIFF_OPT_SET(options, QUICK);
3794 else if (!strcmp(arg, "--ext-diff"))
3795 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
3796 else if (!strcmp(arg, "--no-ext-diff"))
3797 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
3798 else if (!strcmp(arg, "--textconv"))
3799 DIFF_OPT_SET(options, ALLOW_TEXTCONV);
3800 else if (!strcmp(arg, "--no-textconv"))
3801 DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
3802 else if (!strcmp(arg, "--ignore-submodules")) {
3803 DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3804 handle_ignore_submodules_arg(options, "all");
3805 } else if (skip_prefix(arg, "--ignore-submodules=", &arg)) {
3806 DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3807 handle_ignore_submodules_arg(options, arg);
3808 } else if (!strcmp(arg, "--submodule"))
3809 DIFF_OPT_SET(options, SUBMODULE_LOG);
3810 else if (skip_prefix(arg, "--submodule=", &arg))
3811 return parse_submodule_opt(options, arg);
3812
3813 /* misc options */
3814 else if (!strcmp(arg, "-z"))
3815 options->line_termination = 0;
3816 else if ((argcount = short_opt('l', av, &optarg))) {
3817 options->rename_limit = strtoul(optarg, NULL, 10);
3818 return argcount;
3819 }
3820 else if ((argcount = short_opt('S', av, &optarg))) {
3821 options->pickaxe = optarg;
3822 options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
3823 return argcount;
3824 } else if ((argcount = short_opt('G', av, &optarg))) {
3825 options->pickaxe = optarg;
3826 options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
3827 return argcount;
3828 }
3829 else if (!strcmp(arg, "--pickaxe-all"))
3830 options->pickaxe_opts |= DIFF_PICKAXE_ALL;
3831 else if (!strcmp(arg, "--pickaxe-regex"))
3832 options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
3833 else if ((argcount = short_opt('O', av, &optarg))) {
3834 options->orderfile = optarg;
3835 return argcount;
3836 }
3837 else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
3838 int offending = parse_diff_filter_opt(optarg, options);
3839 if (offending)
3840 die("unknown change class '%c' in --diff-filter=%s",
3841 offending, optarg);
3842 return argcount;
3843 }
3844 else if (!strcmp(arg, "--abbrev"))
3845 options->abbrev = DEFAULT_ABBREV;
3846 else if (skip_prefix(arg, "--abbrev=", &arg)) {
3847 options->abbrev = strtoul(arg, NULL, 10);
3848 if (options->abbrev < MINIMUM_ABBREV)
3849 options->abbrev = MINIMUM_ABBREV;
3850 else if (40 < options->abbrev)
3851 options->abbrev = 40;
3852 }
3853 else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
3854 options->a_prefix = optarg;
3855 return argcount;
3856 }
3857 else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) {
3858 options->b_prefix = optarg;
3859 return argcount;
3860 }
3861 else if (!strcmp(arg, "--no-prefix"))
3862 options->a_prefix = options->b_prefix = "";
3863 else if (opt_arg(arg, '\0', "inter-hunk-context",
3864 &options->interhunkcontext))
3865 ;
3866 else if (!strcmp(arg, "-W"))
3867 DIFF_OPT_SET(options, FUNCCONTEXT);
3868 else if (!strcmp(arg, "--function-context"))
3869 DIFF_OPT_SET(options, FUNCCONTEXT);
3870 else if (!strcmp(arg, "--no-function-context"))
3871 DIFF_OPT_CLR(options, FUNCCONTEXT);
3872 else if ((argcount = parse_long_opt("output", av, &optarg))) {
3873 options->file = fopen(optarg, "w");
3874 if (!options->file)
3875 die_errno("Could not open '%s'", optarg);
3876 options->close_file = 1;
3877 return argcount;
3878 } else
3879 return 0;
3880 return 1;
3881 }
3882
3883 int parse_rename_score(const char **cp_p)
3884 {
3885 unsigned long num, scale;
3886 int ch, dot;
3887 const char *cp = *cp_p;
3888
3889 num = 0;
3890 scale = 1;
3891 dot = 0;
3892 for (;;) {
3893 ch = *cp;
3894 if ( !dot && ch == '.' ) {
3895 scale = 1;
3896 dot = 1;
3897 } else if ( ch == '%' ) {
3898 scale = dot ? scale*100 : 100;
3899 cp++; /* % is always at the end */
3900 break;
3901 } else if ( ch >= '0' && ch <= '9' ) {
3902 if ( scale < 100000 ) {
3903 scale *= 10;
3904 num = (num*10) + (ch-'0');
3905 }
3906 } else {
3907 break;
3908 }
3909 cp++;
3910 }
3911 *cp_p = cp;
3912
3913 /* user says num divided by scale and we say internally that
3914 * is MAX_SCORE * num / scale.
3915 */
3916 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
3917 }
3918
3919 static int diff_scoreopt_parse(const char *opt)
3920 {
3921 int opt1, opt2, cmd;
3922
3923 if (*opt++ != '-')
3924 return -1;
3925 cmd = *opt++;
3926 if (cmd == '-') {
3927 /* convert the long-form arguments into short-form versions */
3928 if (skip_prefix(opt, "break-rewrites", &opt)) {
3929 if (*opt == 0 || *opt++ == '=')
3930 cmd = 'B';
3931 } else if (skip_prefix(opt, "find-copies", &opt)) {
3932 if (*opt == 0 || *opt++ == '=')
3933 cmd = 'C';
3934 } else if (skip_prefix(opt, "find-renames", &opt)) {
3935 if (*opt == 0 || *opt++ == '=')
3936 cmd = 'M';
3937 }
3938 }
3939 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
3940 return -1; /* that is not a -M, -C, or -B option */
3941
3942 opt1 = parse_rename_score(&opt);
3943 if (cmd != 'B')
3944 opt2 = 0;
3945 else {
3946 if (*opt == 0)
3947 opt2 = 0;
3948 else if (*opt != '/')
3949 return -1; /* we expect -B80/99 or -B80 */
3950 else {
3951 opt++;
3952 opt2 = parse_rename_score(&opt);
3953 }
3954 }
3955 if (*opt != 0)
3956 return -1;
3957 return opt1 | (opt2 << 16);
3958 }
3959
3960 struct diff_queue_struct diff_queued_diff;
3961
3962 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
3963 {
3964 ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc);
3965 queue->queue[queue->nr++] = dp;
3966 }
3967
3968 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
3969 struct diff_filespec *one,
3970 struct diff_filespec *two)
3971 {
3972 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
3973 dp->one = one;
3974 dp->two = two;
3975 if (queue)
3976 diff_q(queue, dp);
3977 return dp;
3978 }
3979
3980 void diff_free_filepair(struct diff_filepair *p)
3981 {
3982 free_filespec(p->one);
3983 free_filespec(p->two);
3984 free(p);
3985 }
3986
3987 /* This is different from find_unique_abbrev() in that
3988 * it stuffs the result with dots for alignment.
3989 */
3990 const char *diff_unique_abbrev(const unsigned char *sha1, int len)
3991 {
3992 int abblen;
3993 const char *abbrev;
3994 if (len == 40)
3995 return sha1_to_hex(sha1);
3996
3997 abbrev = find_unique_abbrev(sha1, len);
3998 abblen = strlen(abbrev);
3999 if (abblen < 37) {
4000 static char hex[41];
4001 if (len < abblen && abblen <= len + 2)
4002 sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
4003 else
4004 sprintf(hex, "%s...", abbrev);
4005 return hex;
4006 }
4007 return sha1_to_hex(sha1);
4008 }
4009
4010 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
4011 {
4012 int line_termination = opt->line_termination;
4013 int inter_name_termination = line_termination ? '\t' : '\0';
4014
4015 fprintf(opt->file, "%s", diff_line_prefix(opt));
4016 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
4017 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
4018 diff_unique_abbrev(p->one->sha1, opt->abbrev));
4019 fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
4020 }
4021 if (p->score) {
4022 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
4023 inter_name_termination);
4024 } else {
4025 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
4026 }
4027
4028 if (p->status == DIFF_STATUS_COPIED ||
4029 p->status == DIFF_STATUS_RENAMED) {
4030 const char *name_a, *name_b;
4031 name_a = p->one->path;
4032 name_b = p->two->path;
4033 strip_prefix(opt->prefix_length, &name_a, &name_b);
4034 write_name_quoted(name_a, opt->file, inter_name_termination);
4035 write_name_quoted(name_b, opt->file, line_termination);
4036 } else {
4037 const char *name_a, *name_b;
4038 name_a = p->one->mode ? p->one->path : p->two->path;
4039 name_b = NULL;
4040 strip_prefix(opt->prefix_length, &name_a, &name_b);
4041 write_name_quoted(name_a, opt->file, line_termination);
4042 }
4043 }
4044
4045 int diff_unmodified_pair(struct diff_filepair *p)
4046 {
4047 /* This function is written stricter than necessary to support
4048 * the currently implemented transformers, but the idea is to
4049 * let transformers to produce diff_filepairs any way they want,
4050 * and filter and clean them up here before producing the output.
4051 */
4052 struct diff_filespec *one = p->one, *two = p->two;
4053
4054 if (DIFF_PAIR_UNMERGED(p))
4055 return 0; /* unmerged is interesting */
4056
4057 /* deletion, addition, mode or type change
4058 * and rename are all interesting.
4059 */
4060 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
4061 DIFF_PAIR_MODE_CHANGED(p) ||
4062 strcmp(one->path, two->path))
4063 return 0;
4064
4065 /* both are valid and point at the same path. that is, we are
4066 * dealing with a change.
4067 */
4068 if (one->sha1_valid && two->sha1_valid &&
4069 !hashcmp(one->sha1, two->sha1) &&
4070 !one->dirty_submodule && !two->dirty_submodule)
4071 return 1; /* no change */
4072 if (!one->sha1_valid && !two->sha1_valid)
4073 return 1; /* both look at the same file on the filesystem. */
4074 return 0;
4075 }
4076
4077 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
4078 {
4079 if (diff_unmodified_pair(p))
4080 return;
4081
4082 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4083 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4084 return; /* no tree diffs in patch format */
4085
4086 run_diff(p, o);
4087 }
4088
4089 static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
4090 struct diffstat_t *diffstat)
4091 {
4092 if (diff_unmodified_pair(p))
4093 return;
4094
4095 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4096 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4097 return; /* no useful stat for tree diffs */
4098
4099 run_diffstat(p, o, diffstat);
4100 }
4101
4102 static void diff_flush_checkdiff(struct diff_filepair *p,
4103 struct diff_options *o)
4104 {
4105 if (diff_unmodified_pair(p))
4106 return;
4107
4108 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4109 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4110 return; /* nothing to check in tree diffs */
4111
4112 run_checkdiff(p, o);
4113 }
4114
4115 int diff_queue_is_empty(void)
4116 {
4117 struct diff_queue_struct *q = &diff_queued_diff;
4118 int i;
4119 for (i = 0; i < q->nr; i++)
4120 if (!diff_unmodified_pair(q->queue[i]))
4121 return 0;
4122 return 1;
4123 }
4124
4125 #if DIFF_DEBUG
4126 void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
4127 {
4128 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
4129 x, one ? one : "",
4130 s->path,
4131 DIFF_FILE_VALID(s) ? "valid" : "invalid",
4132 s->mode,
4133 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
4134 fprintf(stderr, "queue[%d] %s size %lu\n",
4135 x, one ? one : "",
4136 s->size);
4137 }
4138
4139 void diff_debug_filepair(const struct diff_filepair *p, int i)
4140 {
4141 diff_debug_filespec(p->one, i, "one");
4142 diff_debug_filespec(p->two, i, "two");
4143 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
4144 p->score, p->status ? p->status : '?',
4145 p->one->rename_used, p->broken_pair);
4146 }
4147
4148 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
4149 {
4150 int i;
4151 if (msg)
4152 fprintf(stderr, "%s\n", msg);
4153 fprintf(stderr, "q->nr = %d\n", q->nr);
4154 for (i = 0; i < q->nr; i++) {
4155 struct diff_filepair *p = q->queue[i];
4156 diff_debug_filepair(p, i);
4157 }
4158 }
4159 #endif
4160
4161 static void diff_resolve_rename_copy(void)
4162 {
4163 int i;
4164 struct diff_filepair *p;
4165 struct diff_queue_struct *q = &diff_queued_diff;
4166
4167 diff_debug_queue("resolve-rename-copy", q);
4168
4169 for (i = 0; i < q->nr; i++) {
4170 p = q->queue[i];
4171 p->status = 0; /* undecided */
4172 if (DIFF_PAIR_UNMERGED(p))
4173 p->status = DIFF_STATUS_UNMERGED;
4174 else if (!DIFF_FILE_VALID(p->one))
4175 p->status = DIFF_STATUS_ADDED;
4176 else if (!DIFF_FILE_VALID(p->two))
4177 p->status = DIFF_STATUS_DELETED;
4178 else if (DIFF_PAIR_TYPE_CHANGED(p))
4179 p->status = DIFF_STATUS_TYPE_CHANGED;
4180
4181 /* from this point on, we are dealing with a pair
4182 * whose both sides are valid and of the same type, i.e.
4183 * either in-place edit or rename/copy edit.
4184 */
4185 else if (DIFF_PAIR_RENAME(p)) {
4186 /*
4187 * A rename might have re-connected a broken
4188 * pair up, causing the pathnames to be the
4189 * same again. If so, that's not a rename at
4190 * all, just a modification..
4191 *
4192 * Otherwise, see if this source was used for
4193 * multiple renames, in which case we decrement
4194 * the count, and call it a copy.
4195 */
4196 if (!strcmp(p->one->path, p->two->path))
4197 p->status = DIFF_STATUS_MODIFIED;
4198 else if (--p->one->rename_used > 0)
4199 p->status = DIFF_STATUS_COPIED;
4200 else
4201 p->status = DIFF_STATUS_RENAMED;
4202 }
4203 else if (hashcmp(p->one->sha1, p->two->sha1) ||
4204 p->one->mode != p->two->mode ||
4205 p->one->dirty_submodule ||
4206 p->two->dirty_submodule ||
4207 is_null_sha1(p->one->sha1))
4208 p->status = DIFF_STATUS_MODIFIED;
4209 else {
4210 /* This is a "no-change" entry and should not
4211 * happen anymore, but prepare for broken callers.
4212 */
4213 error("feeding unmodified %s to diffcore",
4214 p->one->path);
4215 p->status = DIFF_STATUS_UNKNOWN;
4216 }
4217 }
4218 diff_debug_queue("resolve-rename-copy done", q);
4219 }
4220
4221 static int check_pair_status(struct diff_filepair *p)
4222 {
4223 switch (p->status) {
4224 case DIFF_STATUS_UNKNOWN:
4225 return 0;
4226 case 0:
4227 die("internal error in diff-resolve-rename-copy");
4228 default:
4229 return 1;
4230 }
4231 }
4232
4233 static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
4234 {
4235 int fmt = opt->output_format;
4236
4237 if (fmt & DIFF_FORMAT_CHECKDIFF)
4238 diff_flush_checkdiff(p, opt);
4239 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
4240 diff_flush_raw(p, opt);
4241 else if (fmt & DIFF_FORMAT_NAME) {
4242 const char *name_a, *name_b;
4243 name_a = p->two->path;
4244 name_b = NULL;
4245 strip_prefix(opt->prefix_length, &name_a, &name_b);
4246 write_name_quoted(name_a, opt->file, opt->line_termination);
4247 }
4248 }
4249
4250 static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
4251 {
4252 if (fs->mode)
4253 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
4254 else
4255 fprintf(file, " %s ", newdelete);
4256 write_name_quoted(fs->path, file, '\n');
4257 }
4258
4259
4260 static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name,
4261 const char *line_prefix)
4262 {
4263 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
4264 fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode,
4265 p->two->mode, show_name ? ' ' : '\n');
4266 if (show_name) {
4267 write_name_quoted(p->two->path, file, '\n');
4268 }
4269 }
4270 }
4271
4272 static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p,
4273 const char *line_prefix)
4274 {
4275 char *names = pprint_rename(p->one->path, p->two->path);
4276
4277 fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
4278 free(names);
4279 show_mode_change(file, p, 0, line_prefix);
4280 }
4281
4282 static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
4283 {
4284 FILE *file = opt->file;
4285 const char *line_prefix = diff_line_prefix(opt);
4286
4287 switch(p->status) {
4288 case DIFF_STATUS_DELETED:
4289 fputs(line_prefix, file);
4290 show_file_mode_name(file, "delete", p->one);
4291 break;
4292 case DIFF_STATUS_ADDED:
4293 fputs(line_prefix, file);
4294 show_file_mode_name(file, "create", p->two);
4295 break;
4296 case DIFF_STATUS_COPIED:
4297 fputs(line_prefix, file);
4298 show_rename_copy(file, "copy", p, line_prefix);
4299 break;
4300 case DIFF_STATUS_RENAMED:
4301 fputs(line_prefix, file);
4302 show_rename_copy(file, "rename", p, line_prefix);
4303 break;
4304 default:
4305 if (p->score) {
4306 fprintf(file, "%s rewrite ", line_prefix);
4307 write_name_quoted(p->two->path, file, ' ');
4308 fprintf(file, "(%d%%)\n", similarity_index(p));
4309 }
4310 show_mode_change(file, p, !p->score, line_prefix);
4311 break;
4312 }
4313 }
4314
4315 struct patch_id_t {
4316 git_SHA_CTX *ctx;
4317 int patchlen;
4318 };
4319
4320 static int remove_space(char *line, int len)
4321 {
4322 int i;
4323 char *dst = line;
4324 unsigned char c;
4325
4326 for (i = 0; i < len; i++)
4327 if (!isspace((c = line[i])))
4328 *dst++ = c;
4329
4330 return dst - line;
4331 }
4332
4333 static void patch_id_consume(void *priv, char *line, unsigned long len)
4334 {
4335 struct patch_id_t *data = priv;
4336 int new_len;
4337
4338 /* Ignore line numbers when computing the SHA1 of the patch */
4339 if (starts_with(line, "@@ -"))
4340 return;
4341
4342 new_len = remove_space(line, len);
4343
4344 git_SHA1_Update(data->ctx, line, new_len);
4345 data->patchlen += new_len;
4346 }
4347
4348 /* returns 0 upon success, and writes result into sha1 */
4349 static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
4350 {
4351 struct diff_queue_struct *q = &diff_queued_diff;
4352 int i;
4353 git_SHA_CTX ctx;
4354 struct patch_id_t data;
4355 char buffer[PATH_MAX * 4 + 20];
4356
4357 git_SHA1_Init(&ctx);
4358 memset(&data, 0, sizeof(struct patch_id_t));
4359 data.ctx = &ctx;
4360
4361 for (i = 0; i < q->nr; i++) {
4362 xpparam_t xpp;
4363 xdemitconf_t xecfg;
4364 mmfile_t mf1, mf2;
4365 struct diff_filepair *p = q->queue[i];
4366 int len1, len2;
4367
4368 memset(&xpp, 0, sizeof(xpp));
4369 memset(&xecfg, 0, sizeof(xecfg));
4370 if (p->status == 0)
4371 return error("internal diff status error");
4372 if (p->status == DIFF_STATUS_UNKNOWN)
4373 continue;
4374 if (diff_unmodified_pair(p))
4375 continue;
4376 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4377 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4378 continue;
4379 if (DIFF_PAIR_UNMERGED(p))
4380 continue;
4381
4382 diff_fill_sha1_info(p->one);
4383 diff_fill_sha1_info(p->two);
4384 if (fill_mmfile(&mf1, p->one) < 0 ||
4385 fill_mmfile(&mf2, p->two) < 0)
4386 return error("unable to read files to diff");
4387
4388 len1 = remove_space(p->one->path, strlen(p->one->path));
4389 len2 = remove_space(p->two->path, strlen(p->two->path));
4390 if (p->one->mode == 0)
4391 len1 = snprintf(buffer, sizeof(buffer),
4392 "diff--gita/%.*sb/%.*s"
4393 "newfilemode%06o"
4394 "---/dev/null"
4395 "+++b/%.*s",
4396 len1, p->one->path,
4397 len2, p->two->path,
4398 p->two->mode,
4399 len2, p->two->path);
4400 else if (p->two->mode == 0)
4401 len1 = snprintf(buffer, sizeof(buffer),
4402 "diff--gita/%.*sb/%.*s"
4403 "deletedfilemode%06o"
4404 "---a/%.*s"
4405 "+++/dev/null",
4406 len1, p->one->path,
4407 len2, p->two->path,
4408 p->one->mode,
4409 len1, p->one->path);
4410 else
4411 len1 = snprintf(buffer, sizeof(buffer),
4412 "diff--gita/%.*sb/%.*s"
4413 "---a/%.*s"
4414 "+++b/%.*s",
4415 len1, p->one->path,
4416 len2, p->two->path,
4417 len1, p->one->path,
4418 len2, p->two->path);
4419 git_SHA1_Update(&ctx, buffer, len1);
4420
4421 if (diff_filespec_is_binary(p->one) ||
4422 diff_filespec_is_binary(p->two)) {
4423 git_SHA1_Update(&ctx, sha1_to_hex(p->one->sha1), 40);
4424 git_SHA1_Update(&ctx, sha1_to_hex(p->two->sha1), 40);
4425 continue;
4426 }
4427
4428 xpp.flags = 0;
4429 xecfg.ctxlen = 3;
4430 xecfg.flags = 0;
4431 xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
4432 &xpp, &xecfg);
4433 }
4434
4435 git_SHA1_Final(sha1, &ctx);
4436 return 0;
4437 }
4438
4439 int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
4440 {
4441 struct diff_queue_struct *q = &diff_queued_diff;
4442 int i;
4443 int result = diff_get_patch_id(options, sha1);
4444
4445 for (i = 0; i < q->nr; i++)
4446 diff_free_filepair(q->queue[i]);
4447
4448 free(q->queue);
4449 DIFF_QUEUE_CLEAR(q);
4450
4451 return result;
4452 }
4453
4454 static int is_summary_empty(const struct diff_queue_struct *q)
4455 {
4456 int i;
4457
4458 for (i = 0; i < q->nr; i++) {
4459 const struct diff_filepair *p = q->queue[i];
4460
4461 switch (p->status) {
4462 case DIFF_STATUS_DELETED:
4463 case DIFF_STATUS_ADDED:
4464 case DIFF_STATUS_COPIED:
4465 case DIFF_STATUS_RENAMED:
4466 return 0;
4467 default:
4468 if (p->score)
4469 return 0;
4470 if (p->one->mode && p->two->mode &&
4471 p->one->mode != p->two->mode)
4472 return 0;
4473 break;
4474 }
4475 }
4476 return 1;
4477 }
4478
4479 static const char rename_limit_warning[] =
4480 "inexact rename detection was skipped due to too many files.";
4481
4482 static const char degrade_cc_to_c_warning[] =
4483 "only found copies from modified paths due to too many files.";
4484
4485 static const char rename_limit_advice[] =
4486 "you may want to set your %s variable to at least "
4487 "%d and retry the command.";
4488
4489 void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
4490 {
4491 if (degraded_cc)
4492 warning(degrade_cc_to_c_warning);
4493 else if (needed)
4494 warning(rename_limit_warning);
4495 else
4496 return;
4497 if (0 < needed && needed < 32767)
4498 warning(rename_limit_advice, varname, needed);
4499 }
4500
4501 void diff_flush(struct diff_options *options)
4502 {
4503 struct diff_queue_struct *q = &diff_queued_diff;
4504 int i, output_format = options->output_format;
4505 int separator = 0;
4506 int dirstat_by_line = 0;
4507
4508 /*
4509 * Order: raw, stat, summary, patch
4510 * or: name/name-status/checkdiff (other bits clear)
4511 */
4512 if (!q->nr)
4513 goto free_queue;
4514
4515 if (output_format & (DIFF_FORMAT_RAW |
4516 DIFF_FORMAT_NAME |
4517 DIFF_FORMAT_NAME_STATUS |
4518 DIFF_FORMAT_CHECKDIFF)) {
4519 for (i = 0; i < q->nr; i++) {
4520 struct diff_filepair *p = q->queue[i];
4521 if (check_pair_status(p))
4522 flush_one_pair(p, options);
4523 }
4524 separator++;
4525 }
4526
4527 if (output_format & DIFF_FORMAT_DIRSTAT && DIFF_OPT_TST(options, DIRSTAT_BY_LINE))
4528 dirstat_by_line = 1;
4529
4530 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
4531 dirstat_by_line) {
4532 struct diffstat_t diffstat;
4533
4534 memset(&diffstat, 0, sizeof(struct diffstat_t));
4535 for (i = 0; i < q->nr; i++) {
4536 struct diff_filepair *p = q->queue[i];
4537 if (check_pair_status(p))
4538 diff_flush_stat(p, options, &diffstat);
4539 }
4540 if (output_format & DIFF_FORMAT_NUMSTAT)
4541 show_numstat(&diffstat, options);
4542 if (output_format & DIFF_FORMAT_DIFFSTAT)
4543 show_stats(&diffstat, options);
4544 if (output_format & DIFF_FORMAT_SHORTSTAT)
4545 show_shortstats(&diffstat, options);
4546 if (output_format & DIFF_FORMAT_DIRSTAT)
4547 show_dirstat_by_line(&diffstat, options);
4548 free_diffstat_info(&diffstat);
4549 separator++;
4550 }
4551 if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line)
4552 show_dirstat(options);
4553
4554 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
4555 for (i = 0; i < q->nr; i++) {
4556 diff_summary(options, q->queue[i]);
4557 }
4558 separator++;
4559 }
4560
4561 if (output_format & DIFF_FORMAT_NO_OUTPUT &&
4562 DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
4563 DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
4564 /*
4565 * run diff_flush_patch for the exit status. setting
4566 * options->file to /dev/null should be safe, because we
4567 * aren't supposed to produce any output anyway.
4568 */
4569 if (options->close_file)
4570 fclose(options->file);
4571 options->file = fopen("/dev/null", "w");
4572 if (!options->file)
4573 die_errno("Could not open /dev/null");
4574 options->close_file = 1;
4575 for (i = 0; i < q->nr; i++) {
4576 struct diff_filepair *p = q->queue[i];
4577 if (check_pair_status(p))
4578 diff_flush_patch(p, options);
4579 if (options->found_changes)
4580 break;
4581 }
4582 }
4583
4584 if (output_format & DIFF_FORMAT_PATCH) {
4585 if (separator) {
4586 fprintf(options->file, "%s%c",
4587 diff_line_prefix(options),
4588 options->line_termination);
4589 if (options->stat_sep) {
4590 /* attach patch instead of inline */
4591 fputs(options->stat_sep, options->file);
4592 }
4593 }
4594
4595 for (i = 0; i < q->nr; i++) {
4596 struct diff_filepair *p = q->queue[i];
4597 if (check_pair_status(p))
4598 diff_flush_patch(p, options);
4599 }
4600 }
4601
4602 if (output_format & DIFF_FORMAT_CALLBACK)
4603 options->format_callback(q, options, options->format_callback_data);
4604
4605 for (i = 0; i < q->nr; i++)
4606 diff_free_filepair(q->queue[i]);
4607 free_queue:
4608 free(q->queue);
4609 DIFF_QUEUE_CLEAR(q);
4610 if (options->close_file)
4611 fclose(options->file);
4612
4613 /*
4614 * Report the content-level differences with HAS_CHANGES;
4615 * diff_addremove/diff_change does not set the bit when
4616 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4617 */
4618 if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
4619 if (options->found_changes)
4620 DIFF_OPT_SET(options, HAS_CHANGES);
4621 else
4622 DIFF_OPT_CLR(options, HAS_CHANGES);
4623 }
4624 }
4625
4626 static int match_filter(const struct diff_options *options, const struct diff_filepair *p)
4627 {
4628 return (((p->status == DIFF_STATUS_MODIFIED) &&
4629 ((p->score &&
4630 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) ||
4631 (!p->score &&
4632 filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) ||
4633 ((p->status != DIFF_STATUS_MODIFIED) &&
4634 filter_bit_tst(p->status, options)));
4635 }
4636
4637 static void diffcore_apply_filter(struct diff_options *options)
4638 {
4639 int i;
4640 struct diff_queue_struct *q = &diff_queued_diff;
4641 struct diff_queue_struct outq;
4642
4643 DIFF_QUEUE_CLEAR(&outq);
4644
4645 if (!options->filter)
4646 return;
4647
4648 if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) {
4649 int found;
4650 for (i = found = 0; !found && i < q->nr; i++) {
4651 if (match_filter(options, q->queue[i]))
4652 found++;
4653 }
4654 if (found)
4655 return;
4656
4657 /* otherwise we will clear the whole queue
4658 * by copying the empty outq at the end of this
4659 * function, but first clear the current entries
4660 * in the queue.
4661 */
4662 for (i = 0; i < q->nr; i++)
4663 diff_free_filepair(q->queue[i]);
4664 }
4665 else {
4666 /* Only the matching ones */
4667 for (i = 0; i < q->nr; i++) {
4668 struct diff_filepair *p = q->queue[i];
4669 if (match_filter(options, p))
4670 diff_q(&outq, p);
4671 else
4672 diff_free_filepair(p);
4673 }
4674 }
4675 free(q->queue);
4676 *q = outq;
4677 }
4678
4679 /* Check whether two filespecs with the same mode and size are identical */
4680 static int diff_filespec_is_identical(struct diff_filespec *one,
4681 struct diff_filespec *two)
4682 {
4683 if (S_ISGITLINK(one->mode))
4684 return 0;
4685 if (diff_populate_filespec(one, 0))
4686 return 0;
4687 if (diff_populate_filespec(two, 0))
4688 return 0;
4689 return !memcmp(one->data, two->data, one->size);
4690 }
4691
4692 static int diff_filespec_check_stat_unmatch(struct diff_filepair *p)
4693 {
4694 if (p->done_skip_stat_unmatch)
4695 return p->skip_stat_unmatch_result;
4696
4697 p->done_skip_stat_unmatch = 1;
4698 p->skip_stat_unmatch_result = 0;
4699 /*
4700 * 1. Entries that come from stat info dirtiness
4701 * always have both sides (iow, not create/delete),
4702 * one side of the object name is unknown, with
4703 * the same mode and size. Keep the ones that
4704 * do not match these criteria. They have real
4705 * differences.
4706 *
4707 * 2. At this point, the file is known to be modified,
4708 * with the same mode and size, and the object
4709 * name of one side is unknown. Need to inspect
4710 * the identical contents.
4711 */
4712 if (!DIFF_FILE_VALID(p->one) || /* (1) */
4713 !DIFF_FILE_VALID(p->two) ||
4714 (p->one->sha1_valid && p->two->sha1_valid) ||
4715 (p->one->mode != p->two->mode) ||
4716 diff_populate_filespec(p->one, CHECK_SIZE_ONLY) ||
4717 diff_populate_filespec(p->two, CHECK_SIZE_ONLY) ||
4718 (p->one->size != p->two->size) ||
4719 !diff_filespec_is_identical(p->one, p->two)) /* (2) */
4720 p->skip_stat_unmatch_result = 1;
4721 return p->skip_stat_unmatch_result;
4722 }
4723
4724 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
4725 {
4726 int i;
4727 struct diff_queue_struct *q = &diff_queued_diff;
4728 struct diff_queue_struct outq;
4729 DIFF_QUEUE_CLEAR(&outq);
4730
4731 for (i = 0; i < q->nr; i++) {
4732 struct diff_filepair *p = q->queue[i];
4733
4734 if (diff_filespec_check_stat_unmatch(p))
4735 diff_q(&outq, p);
4736 else {
4737 /*
4738 * The caller can subtract 1 from skip_stat_unmatch
4739 * to determine how many paths were dirty only
4740 * due to stat info mismatch.
4741 */
4742 if (!DIFF_OPT_TST(diffopt, NO_INDEX))
4743 diffopt->skip_stat_unmatch++;
4744 diff_free_filepair(p);
4745 }
4746 }
4747 free(q->queue);
4748 *q = outq;
4749 }
4750
4751 static int diffnamecmp(const void *a_, const void *b_)
4752 {
4753 const struct diff_filepair *a = *((const struct diff_filepair **)a_);
4754 const struct diff_filepair *b = *((const struct diff_filepair **)b_);
4755 const char *name_a, *name_b;
4756
4757 name_a = a->one ? a->one->path : a->two->path;
4758 name_b = b->one ? b->one->path : b->two->path;
4759 return strcmp(name_a, name_b);
4760 }
4761
4762 void diffcore_fix_diff_index(struct diff_options *options)
4763 {
4764 struct diff_queue_struct *q = &diff_queued_diff;
4765 qsort(q->queue, q->nr, sizeof(q->queue[0]), diffnamecmp);
4766 }
4767
4768 void diffcore_std(struct diff_options *options)
4769 {
4770 /* NOTE please keep the following in sync with diff_tree_combined() */
4771 if (options->skip_stat_unmatch)
4772 diffcore_skip_stat_unmatch(options);
4773 if (!options->found_follow) {
4774 /* See try_to_follow_renames() in tree-diff.c */
4775 if (options->break_opt != -1)
4776 diffcore_break(options->break_opt);
4777 if (options->detect_rename)
4778 diffcore_rename(options);
4779 if (options->break_opt != -1)
4780 diffcore_merge_broken();
4781 }
4782 if (options->pickaxe)
4783 diffcore_pickaxe(options);
4784 if (options->orderfile)
4785 diffcore_order(options->orderfile);
4786 if (!options->found_follow)
4787 /* See try_to_follow_renames() in tree-diff.c */
4788 diff_resolve_rename_copy();
4789 diffcore_apply_filter(options);
4790
4791 if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
4792 DIFF_OPT_SET(options, HAS_CHANGES);
4793 else
4794 DIFF_OPT_CLR(options, HAS_CHANGES);
4795
4796 options->found_follow = 0;
4797 }
4798
4799 int diff_result_code(struct diff_options *opt, int status)
4800 {
4801 int result = 0;
4802
4803 diff_warn_rename_limit("diff.renameLimit",
4804 opt->needed_rename_limit,
4805 opt->degraded_cc_to_c);
4806 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
4807 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
4808 return status;
4809 if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
4810 DIFF_OPT_TST(opt, HAS_CHANGES))
4811 result |= 01;
4812 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
4813 DIFF_OPT_TST(opt, CHECK_FAILED))
4814 result |= 02;
4815 return result;
4816 }
4817
4818 int diff_can_quit_early(struct diff_options *opt)
4819 {
4820 return (DIFF_OPT_TST(opt, QUICK) &&
4821 !opt->filter &&
4822 DIFF_OPT_TST(opt, HAS_CHANGES));
4823 }
4824
4825 /*
4826 * Shall changes to this submodule be ignored?
4827 *
4828 * Submodule changes can be configured to be ignored separately for each path,
4829 * but that configuration can be overridden from the command line.
4830 */
4831 static int is_submodule_ignored(const char *path, struct diff_options *options)
4832 {
4833 int ignored = 0;
4834 unsigned orig_flags = options->flags;
4835 if (!DIFF_OPT_TST(options, OVERRIDE_SUBMODULE_CONFIG))
4836 set_diffopt_flags_from_submodule_config(options, path);
4837 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES))
4838 ignored = 1;
4839 options->flags = orig_flags;
4840 return ignored;
4841 }
4842
4843 void diff_addremove(struct diff_options *options,
4844 int addremove, unsigned mode,
4845 const unsigned char *sha1,
4846 int sha1_valid,
4847 const char *concatpath, unsigned dirty_submodule)
4848 {
4849 struct diff_filespec *one, *two;
4850
4851 if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options))
4852 return;
4853
4854 /* This may look odd, but it is a preparation for
4855 * feeding "there are unchanged files which should
4856 * not produce diffs, but when you are doing copy
4857 * detection you would need them, so here they are"
4858 * entries to the diff-core. They will be prefixed
4859 * with something like '=' or '*' (I haven't decided
4860 * which but should not make any difference).
4861 * Feeding the same new and old to diff_change()
4862 * also has the same effect.
4863 * Before the final output happens, they are pruned after
4864 * merged into rename/copy pairs as appropriate.
4865 */
4866 if (DIFF_OPT_TST(options, REVERSE_DIFF))
4867 addremove = (addremove == '+' ? '-' :
4868 addremove == '-' ? '+' : addremove);
4869
4870 if (options->prefix &&
4871 strncmp(concatpath, options->prefix, options->prefix_length))
4872 return;
4873
4874 one = alloc_filespec(concatpath);
4875 two = alloc_filespec(concatpath);
4876
4877 if (addremove != '+')
4878 fill_filespec(one, sha1, sha1_valid, mode);
4879 if (addremove != '-') {
4880 fill_filespec(two, sha1, sha1_valid, mode);
4881 two->dirty_submodule = dirty_submodule;
4882 }
4883
4884 diff_queue(&diff_queued_diff, one, two);
4885 if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
4886 DIFF_OPT_SET(options, HAS_CHANGES);
4887 }
4888
4889 void diff_change(struct diff_options *options,
4890 unsigned old_mode, unsigned new_mode,
4891 const unsigned char *old_sha1,
4892 const unsigned char *new_sha1,
4893 int old_sha1_valid, int new_sha1_valid,
4894 const char *concatpath,
4895 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
4896 {
4897 struct diff_filespec *one, *two;
4898 struct diff_filepair *p;
4899
4900 if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) &&
4901 is_submodule_ignored(concatpath, options))
4902 return;
4903
4904 if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
4905 unsigned tmp;
4906 const unsigned char *tmp_c;
4907 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
4908 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
4909 tmp = old_sha1_valid; old_sha1_valid = new_sha1_valid;
4910 new_sha1_valid = tmp;
4911 tmp = old_dirty_submodule; old_dirty_submodule = new_dirty_submodule;
4912 new_dirty_submodule = tmp;
4913 }
4914
4915 if (options->prefix &&
4916 strncmp(concatpath, options->prefix, options->prefix_length))
4917 return;
4918
4919 one = alloc_filespec(concatpath);
4920 two = alloc_filespec(concatpath);
4921 fill_filespec(one, old_sha1, old_sha1_valid, old_mode);
4922 fill_filespec(two, new_sha1, new_sha1_valid, new_mode);
4923 one->dirty_submodule = old_dirty_submodule;
4924 two->dirty_submodule = new_dirty_submodule;
4925 p = diff_queue(&diff_queued_diff, one, two);
4926
4927 if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
4928 return;
4929
4930 if (DIFF_OPT_TST(options, QUICK) && options->skip_stat_unmatch &&
4931 !diff_filespec_check_stat_unmatch(p))
4932 return;
4933
4934 DIFF_OPT_SET(options, HAS_CHANGES);
4935 }
4936
4937 struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
4938 {
4939 struct diff_filepair *pair;
4940 struct diff_filespec *one, *two;
4941
4942 if (options->prefix &&
4943 strncmp(path, options->prefix, options->prefix_length))
4944 return NULL;
4945
4946 one = alloc_filespec(path);
4947 two = alloc_filespec(path);
4948 pair = diff_queue(&diff_queued_diff, one, two);
4949 pair->is_unmerged = 1;
4950 return pair;
4951 }
4952
4953 static char *run_textconv(const char *pgm, struct diff_filespec *spec,
4954 size_t *outsize)
4955 {
4956 struct diff_tempfile *temp;
4957 const char *argv[3];
4958 const char **arg = argv;
4959 struct child_process child = CHILD_PROCESS_INIT;
4960 struct strbuf buf = STRBUF_INIT;
4961 int err = 0;
4962
4963 temp = prepare_temp_file(spec->path, spec);
4964 *arg++ = pgm;
4965 *arg++ = temp->name;
4966 *arg = NULL;
4967
4968 child.use_shell = 1;
4969 child.argv = argv;
4970 child.out = -1;
4971 if (start_command(&child)) {
4972 remove_tempfile();
4973 return NULL;
4974 }
4975
4976 if (strbuf_read(&buf, child.out, 0) < 0)
4977 err = error("error reading from textconv command '%s'", pgm);
4978 close(child.out);
4979
4980 if (finish_command(&child) || err) {
4981 strbuf_release(&buf);
4982 remove_tempfile();
4983 return NULL;
4984 }
4985 remove_tempfile();
4986
4987 return strbuf_detach(&buf, outsize);
4988 }
4989
4990 size_t fill_textconv(struct userdiff_driver *driver,
4991 struct diff_filespec *df,
4992 char **outbuf)
4993 {
4994 size_t size;
4995
4996 if (!driver || !driver->textconv) {
4997 if (!DIFF_FILE_VALID(df)) {
4998 *outbuf = "";
4999 return 0;
5000 }
5001 if (diff_populate_filespec(df, 0))
5002 die("unable to read files to diff");
5003 *outbuf = df->data;
5004 return df->size;
5005 }
5006
5007 if (driver->textconv_cache && df->sha1_valid) {
5008 *outbuf = notes_cache_get(driver->textconv_cache, df->sha1,
5009 &size);
5010 if (*outbuf)
5011 return size;
5012 }
5013
5014 *outbuf = run_textconv(driver->textconv, df, &size);
5015 if (!*outbuf)
5016 die("unable to read files to diff");
5017
5018 if (driver->textconv_cache && df->sha1_valid) {
5019 /* ignore errors, as we might be in a readonly repository */
5020 notes_cache_put(driver->textconv_cache, df->sha1, *outbuf,
5021 size);
5022 /*
5023 * we could save up changes and flush them all at the end,
5024 * but we would need an extra call after all diffing is done.
5025 * Since generating a cache entry is the slow path anyway,
5026 * this extra overhead probably isn't a big deal.
5027 */
5028 notes_cache_write(driver->textconv_cache);
5029 }
5030
5031 return size;
5032 }
5033
5034 void setup_diff_pager(struct diff_options *opt)
5035 {
5036 /*
5037 * If the user asked for our exit code, then either they want --quiet
5038 * or --exit-code. We should definitely not bother with a pager in the
5039 * former case, as we will generate no output. Since we still properly
5040 * report our exit code even when a pager is run, we _could_ run a
5041 * pager with --exit-code. But since we have not done so historically,
5042 * and because it is easy to find people oneline advising "git diff
5043 * --exit-code" in hooks and other scripts, we do not do so.
5044 */
5045 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
5046 check_pager_config("diff") != 0)
5047 setup_pager();
5048 }
Jonathan Nieder’s miscellaneous git branches