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