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