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#ifdef NO_FAST_WORKING_DIRECTORY
20#define FAST_WORKING_DIRECTORY 0
21#else
22#define FAST_WORKING_DIRECTORY 1
23#endif
24static int diff_detect_rename_default;
26static int diff_rename_limit_default = 200;
27static int diff_suppress_blank_empty;
28int diff_use_color_default = -1;
29static const char *diff_word_regex_cfg;
30static const char *external_diff_cmd_cfg;
31int diff_auto_refresh_index = 1;
32static int diff_mnemonic_prefix;
33static int diff_no_prefix;
34static 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};
46static void diff_filespec_load_driver(struct diff_filespec *one);
48static size_t fill_textconv(struct userdiff_driver *driver,
49 struct diff_filespec *df, char **outbuf);
50static 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}
71static 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/*
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 */
87int 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 return git_diff_basic_config(var, value, cb);
115}
116int 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 switch (userdiff_config(var, value)) {
125 case 0: break;
126 case -1: return -1;
127 default: return 0;
128 }
129 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 /* 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 return git_color_default_config(var, value, cb);
149}
150static 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 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}
168static const char *external_diff(void)
170{
171 static const char *external_diff_cmd = NULL;
172 static int done_preparing = 0;
173 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}
182static 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];
189typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
191struct 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};
206static 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}
229static 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 mf->ptr = one->data;
241 mf->size = one->size;
242 return 0;
243}
244static 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 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}
270static 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 at = count_lines(mf2->ptr, mf2->size);
287 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
288}
289static 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 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 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 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}
331static 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}
337static 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}
348static 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 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}
368static 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 /*
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 /* 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 /*
400 * trailing "\r\n"
401 */
402 for ( ; i < 3; i++)
403 if (line[len - i] == '\r' || line[len - i] == '\n')
404 len--;
405 /* 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 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 strbuf_add(&msgbuf, line + len, org_len - len);
423 emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
424 strbuf_release(&msgbuf);
425}
426static 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}
434static int remove_tempfile_installed;
436static 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}
446static void remove_tempfile_on_signal(int signo)
448{
449 remove_tempfile();
450 sigchain_pop(signo);
451 raise(signo);
452}
453static 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}
468static 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 while (0 < size) {
478 int len;
479 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}
500static 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 if (o && o->output_prefix) {
524 msgbuf = o->output_prefix(o, o->output_prefix_data);
525 line_prefix = msgbuf->buf;
526 }
527 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 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 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 size_one = fill_textconv(textconv_one, one, &data_one);
547 size_two = fill_textconv(textconv_two, two, &data_two);
548 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 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}
585struct 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};
594static 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}
605struct 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};
613struct diff_words_style
615{
616 enum diff_words_type type;
617 struct diff_words_style_elem new, old, ctx;
618 const char *newline;
619};
620struct 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};
626struct 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};
636static 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 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/*
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 */
702static 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}
713static 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 if (line[0] != '@' || parse_hunk_header(line, len,
725 &minus_first, &minus_len, &plus_first, &plus_len))
726 return;
727 assert(opt);
729 if (opt->output_prefix) {
730 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
731 line_prefix = msgbuf->buf;
732 }
733 /* 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 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 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 diff_words->current_plus = plus_end;
774 diff_words->last_minus = minus_first;
775}
776/* This function starts looking at *begin, and returns 0 iff a word was found. */
778static 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 /* find the next word */
794 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
795 (*begin)++;
796 if (*begin >= buffer->size)
797 return -1;
798 /* find the end of the word */
800 *end = *begin + 1;
801 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
802 (*end)++;
803 return 0;
805}
806/*
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 */
812static 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 out->size = 0;
819 out->ptr = NULL;
820 /* 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 for (i = 0; i < buffer->text.size; i++) {
827 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
828 return;
829 /* 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 /* 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 i = j - 1;
844 }
845}
846/* this executes the word diff on the accumulated buffers */
848static 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 struct diff_options *opt = diff_words->opt;
856 struct strbuf *msgbuf;
857 char *line_prefix = "";
858 assert(opt);
860 if (opt->output_prefix) {
861 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
862 line_prefix = msgbuf->buf;
863 }
864 /* 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 diff_words->current_plus = diff_words->plus.text.ptr;
877 diff_words->last_minus = 0;
878 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/* In "color-words" mode, show word-diff of words accumulated in the buffer */
904static 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}
910static 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}
924const 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}
931static 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 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}
949static 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}
964static 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 if (o && o->output_prefix) {
976 msgbuf = o->output_prefix(o, o->output_prefix_data);
977 line_prefix = msgbuf->buf;
978 }
979 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 if (ecbdata->label_path[0]) {
988 const char *name_a_tab, *name_b_tab;
989 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
991 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
992 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 if (diff_suppress_blank_empty
1001 && len == 2 && line[0] == ' ' && line[1] == '\n') {
1002 line[0] = '\n';
1003 len = 1;
1004 }
1005 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 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 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 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}
1059static 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 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 /* 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 /* 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 /*
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 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}
1126struct 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};
1140static 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}
1164static 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 if (line[0] == '+')
1171 x->added++;
1172 else if (line[0] == '-')
1173 x->deleted++;
1174}
1175const char mime_boundary_leader[] = "------------";
1177static 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}
1188static void show_name(FILE *file,
1190 const char *prefix, const char *name, int len)
1191{
1192 fprintf(file, " %s%-*s |", prefix, len, name);
1193}
1194static 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}
1204static void fill_print_name(struct diffstat_file *file)
1206{
1207 char *pname;
1208 if (file->print_name)
1210 return;
1211 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}
1225static 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 if (data->nr == 0)
1237 return;
1238 if (options->output_prefix) {
1240 msg = options->output_prefix(options, options->output_prefix_data);
1241 line_prefix = msg->buf;
1242 }
1243 width = options->stat_width ? options->stat_width : 80;
1245 name_width = options->stat_name_width ? options->stat_name_width : 50;
1246 /* 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 /* 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 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 if (file->is_binary || file->is_unmerged)
1272 continue;
1273 if (max_change < change)
1274 max_change = change;
1275 }
1276 /* 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 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 /*
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 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 /*
1338 * scale the add/delete
1339 */
1340 add = added;
1341 del = deleted;
1342 adds += add;
1343 dels += del;
1344 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}
1362static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1364{
1365 int i, adds = 0, dels = 0, total_files = data->nr;
1366 if (data->nr == 0)
1368 return;
1369 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}
1393static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1395{
1396 int i;
1397 if (data->nr == 0)
1399 return;
1400 for (i = 0; i < data->nr; i++) {
1402 struct diffstat_file *file = data->files[i];
1403 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 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}
1435struct dirstat_file {
1437 const char *name;
1438 unsigned long changed;
1439};
1440struct dirstat_dir {
1442 struct dirstat_file *files;
1443 int alloc, nr, percent, cumulative;
1444};
1445static 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 if (opt->output_prefix) {
1455 msg = opt->output_prefix(opt, opt->output_prefix_data);
1456 line_prefix = msg->buf;
1457 }
1458 while (dir->nr) {
1460 struct dirstat_file *f = dir->files;
1461 int namelen = strlen(f->name);
1462 unsigned long this;
1463 char *slash;
1464 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 /*
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}
1503static 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}
1510static 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 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 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 name = p->one->path ? p->one->path : p->two->path;
1531 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 /*
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 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 /* This can happen even with many files, if everything was renames */
1570 if (!changed)
1571 return;
1572 /* 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}
1577static 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}
1591struct 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};
1600static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
1602{
1603 char firstchar;
1604 int cnt;
1605 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}
1623static 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 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 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}
1673static 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 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 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}
1697static 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 /* 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 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 /* 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}
1758static 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}
1765static 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}
1773int 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}
1792static 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}
1798static const char *userdiff_word_regex(struct diff_filespec *one)
1800{
1801 diff_filespec_load_driver(one);
1802 return one->driver->word_regex;
1803}
1804void 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}
1812static 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 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 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 return one->driver;
1833}
1834static 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 struct diff_options *o,
1841 int complete_rewrite)
1842{
1843 mmfile_t mf1, mf2;
1844 const char *lbl[2];
1845 char *a_one, *b_two;
1846 const char *set = diff_get_color_opt(o, DIFF_METAINFO);
1847 const char *reset = diff_get_color_opt(o, DIFF_RESET);
1848 const char *a_prefix, *b_prefix;
1849 struct userdiff_driver *textconv_one = NULL;
1850 struct userdiff_driver *textconv_two = NULL;
1851 struct strbuf header = STRBUF_INIT;
1852 struct strbuf *msgbuf;
1853 char *line_prefix = "";
1854 if (o->output_prefix) {
1856 msgbuf = o->output_prefix(o, o->output_prefix_data);
1857 line_prefix = msgbuf->buf;
1858 }
1859 if (DIFF_OPT_TST(o, SUBMODULE_LOG) &&
1861 (!one->mode || S_ISGITLINK(one->mode)) &&
1862 (!two->mode || S_ISGITLINK(two->mode))) {
1863 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
1864 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
1865 show_submodule_summary(o->file, one ? one->path : two->path,
1866 one->sha1, two->sha1, two->dirty_submodule,
1867 del, add, reset);
1868 return;
1869 }
1870 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
1872 textconv_one = get_textconv(one);
1873 textconv_two = get_textconv(two);
1874 }
1875 diff_set_mnemonic_prefix(o, "a/", "b/");
1877 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
1878 a_prefix = o->b_prefix;
1879 b_prefix = o->a_prefix;
1880 } else {
1881 a_prefix = o->a_prefix;
1882 b_prefix = o->b_prefix;
1883 }
1884 /* Never use a non-valid filename anywhere if at all possible */
1886 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
1887 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
1888 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
1890 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
1891 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
1892 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
1893 strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, set, a_one, b_two, reset);
1894 if (lbl[0][0] == '/') {
1895 /* /dev/null */
1896 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, set, two->mode, reset);
1897 if (xfrm_msg)
1898 strbuf_addstr(&header, xfrm_msg);
1899 }
1900 else if (lbl[1][0] == '/') {
1901 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, set, one->mode, reset);
1902 if (xfrm_msg)
1903 strbuf_addstr(&header, xfrm_msg);
1904 }
1905 else {
1906 if (one->mode != two->mode) {
1907 strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, set, one->mode, reset);
1908 strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, set, two->mode, reset);
1909 }
1910 if (xfrm_msg)
1911 strbuf_addstr(&header, xfrm_msg);
1912 /*
1914 * we do not run diff between different kind
1915 * of objects.
1916 */
1917 if ((one->mode ^ two->mode) & S_IFMT)
1918 goto free_ab_and_return;
1919 if (complete_rewrite &&
1920 (textconv_one || !diff_filespec_is_binary(one)) &&
1921 (textconv_two || !diff_filespec_is_binary(two))) {
1922 fprintf(o->file, "%s", header.buf);
1923 strbuf_reset(&header);
1924 emit_rewrite_diff(name_a, name_b, one, two,
1925 textconv_one, textconv_two, o);
1926 o->found_changes = 1;
1927 goto free_ab_and_return;
1928 }
1929 }
1930 if (!DIFF_OPT_TST(o, TEXT) &&
1932 ( (!textconv_one && diff_filespec_is_binary(one)) ||
1933 (!textconv_two && diff_filespec_is_binary(two)) )) {
1934 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1935 die("unable to read files to diff");
1936 /* Quite common confusing case */
1937 if (mf1.size == mf2.size &&
1938 !memcmp(mf1.ptr, mf2.ptr, mf1.size))
1939 goto free_ab_and_return;
1940 fprintf(o->file, "%s", header.buf);
1941 strbuf_reset(&header);
1942 if (DIFF_OPT_TST(o, BINARY))
1943 emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
1944 else
1945 fprintf(o->file, "%sBinary files %s and %s differ\n",
1946 line_prefix, lbl[0], lbl[1]);
1947 o->found_changes = 1;
1948 }
1949 else {
1950 /* Crazy xdl interfaces.. */
1951 const char *diffopts = getenv("GIT_DIFF_OPTS");
1952 xpparam_t xpp;
1953 xdemitconf_t xecfg;
1954 struct emit_callback ecbdata;
1955 const struct userdiff_funcname *pe;
1956 if (!DIFF_XDL_TST(o, WHITESPACE_FLAGS)) {
1958 fprintf(o->file, "%s", header.buf);
1959 strbuf_reset(&header);
1960 }
1961 mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
1963 mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
1964 pe = diff_funcname_pattern(one);
1966 if (!pe)
1967 pe = diff_funcname_pattern(two);
1968 memset(&xpp, 0, sizeof(xpp));
1970 memset(&xecfg, 0, sizeof(xecfg));
1971 memset(&ecbdata, 0, sizeof(ecbdata));
1972 ecbdata.label_path = lbl;
1973 ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1974 ecbdata.found_changesp = &o->found_changes;
1975 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
1976 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
1977 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1978 ecbdata.opt = o;
1979 ecbdata.header = header.len ? &header : NULL;
1980 xpp.flags = o->xdl_opts;
1981 xecfg.ctxlen = o->context;
1982 xecfg.interhunkctxlen = o->interhunkcontext;
1983 xecfg.flags = XDL_EMIT_FUNCNAMES;
1984 if (pe)
1985 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
1986 if (!diffopts)
1987 ;
1988 else if (!prefixcmp(diffopts, "--unified="))
1989 xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
1990 else if (!prefixcmp(diffopts, "-u"))
1991 xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
1992 if (o->word_diff) {
1993 int i;
1994 ecbdata.diff_words =
1996 xcalloc(1, sizeof(struct diff_words_data));
1997 ecbdata.diff_words->type = o->word_diff;
1998 ecbdata.diff_words->opt = o;
1999 if (!o->word_regex)
2000 o->word_regex = userdiff_word_regex(one);
2001 if (!o->word_regex)
2002 o->word_regex = userdiff_word_regex(two);
2003 if (!o->word_regex)
2004 o->word_regex = diff_word_regex_cfg;
2005 if (o->word_regex) {
2006 ecbdata.diff_words->word_regex = (regex_t *)
2007 xmalloc(sizeof(regex_t));
2008 if (regcomp(ecbdata.diff_words->word_regex,
2009 o->word_regex,
2010 REG_EXTENDED | REG_NEWLINE))
2011 die ("Invalid regular expression: %s",
2012 o->word_regex);
2013 }
2014 for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
2015 if (o->word_diff == diff_words_styles[i].type) {
2016 ecbdata.diff_words->style =
2017 &diff_words_styles[i];
2018 break;
2019 }
2020 }
2021 if (DIFF_OPT_TST(o, COLOR_DIFF)) {
2022 struct diff_words_style *st = ecbdata.diff_words->style;
2023 st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
2024 st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
2025 st->ctx.color = diff_get_color_opt(o, DIFF_PLAIN);
2026 }
2027 }
2028 xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
2029 &xpp, &xecfg);
2030 if (o->word_diff)
2031 free_diff_words_data(&ecbdata);
2032 if (textconv_one)
2033 free(mf1.ptr);
2034 if (textconv_two)
2035 free(mf2.ptr);
2036 xdiff_clear_find_func(&xecfg);
2037 }
2038 free_ab_and_return:
2040 strbuf_release(&header);
2041 diff_free_filespec_data(one);
2042 diff_free_filespec_data(two);
2043 free(a_one);
2044 free(b_two);
2045 return;
2046}
2047static void builtin_diffstat(const char *name_a, const char *name_b,
2049 struct diff_filespec *one,
2050 struct diff_filespec *two,
2051 struct diffstat_t *diffstat,
2052 struct diff_options *o,
2053 int complete_rewrite)
2054{
2055 mmfile_t mf1, mf2;
2056 struct diffstat_file *data;
2057 data = diffstat_add(diffstat, name_a, name_b);
2059 if (!one || !two) {
2061 data->is_unmerged = 1;
2062 return;
2063 }
2064 if (complete_rewrite) {
2065 diff_populate_filespec(one, 0);
2066 diff_populate_filespec(two, 0);
2067 data->deleted = count_lines(one->data, one->size);
2068 data->added = count_lines(two->data, two->size);
2069 goto free_and_return;
2070 }
2071 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2072 die("unable to read files to diff");
2073 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
2075 data->is_binary = 1;
2076 data->added = mf2.size;
2077 data->deleted = mf1.size;
2078 } else {
2079 /* Crazy xdl interfaces.. */
2080 xpparam_t xpp;
2081 xdemitconf_t xecfg;
2082 memset(&xpp, 0, sizeof(xpp));
2084 memset(&xecfg, 0, sizeof(xecfg));
2085 xpp.flags = o->xdl_opts;
2086 xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
2087 &xpp, &xecfg);
2088 }
2089 free_and_return:
2091 diff_free_filespec_data(one);
2092 diff_free_filespec_data(two);
2093}
2094static void builtin_checkdiff(const char *name_a, const char *name_b,
2096 const char *attr_path,
2097 struct diff_filespec *one,
2098 struct diff_filespec *two,
2099 struct diff_options *o)
2100{
2101 mmfile_t mf1, mf2;
2102 struct checkdiff_t data;
2103 if (!two)
2105 return;
2106 memset(&data, 0, sizeof(data));
2108 data.filename = name_b ? name_b : name_a;
2109 data.lineno = 0;
2110 data.o = o;
2111 data.ws_rule = whitespace_rule(attr_path);
2112 data.conflict_marker_size = ll_merge_marker_size(attr_path);
2113 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2115 die("unable to read files to diff");
2116 /*
2118 * All the other codepaths check both sides, but not checking
2119 * the "old" side here is deliberate. We are checking the newly
2120 * introduced changes, and as long as the "new" side is text, we
2121 * can and should check what it introduces.
2122 */
2123 if (diff_filespec_is_binary(two))
2124 goto free_and_return;
2125 else {
2126 /* Crazy xdl interfaces.. */
2127 xpparam_t xpp;
2128 xdemitconf_t xecfg;
2129 memset(&xpp, 0, sizeof(xpp));
2131 memset(&xecfg, 0, sizeof(xecfg));
2132 xecfg.ctxlen = 1; /* at least one context line */
2133 xpp.flags = 0;
2134 xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
2135 &xpp, &xecfg);
2136 if (data.ws_rule & WS_BLANK_AT_EOF) {
2138 struct emit_callback ecbdata;
2139 int blank_at_eof;
2140 ecbdata.ws_rule = data.ws_rule;
2142 check_blank_at_eof(&mf1, &mf2, &ecbdata);
2143 blank_at_eof = ecbdata.blank_at_eof_in_preimage;
2144 if (blank_at_eof) {
2146 static char *err;
2147 if (!err)
2148 err = whitespace_error_string(WS_BLANK_AT_EOF);
2149 fprintf(o->file, "%s:%d: %s.\n",
2150 data.filename, blank_at_eof, err);
2151 data.status = 1; /* report errors */
2152 }
2153 }
2154 }
2155 free_and_return:
2156 diff_free_filespec_data(one);
2157 diff_free_filespec_data(two);
2158 if (data.status)
2159 DIFF_OPT_SET(o, CHECK_FAILED);
2160}
2161struct diff_filespec *alloc_filespec(const char *path)
2163{
2164 int namelen = strlen(path);
2165 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
2166 memset(spec, 0, sizeof(*spec));
2168 spec->path = (char *)(spec + 1);
2169 memcpy(spec->path, path, namelen+1);
2170 spec->count = 1;
2171 spec->is_binary = -1;
2172 return spec;
2173}
2174void free_filespec(struct diff_filespec *spec)
2176{
2177 if (!--spec->count) {
2178 diff_free_filespec_data(spec);
2179 free(spec);
2180 }
2181}
2182void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
2184 unsigned short mode)
2185{
2186 if (mode) {
2187 spec->mode = canon_mode(mode);
2188 hashcpy(spec->sha1, sha1);
2189 spec->sha1_valid = !is_null_sha1(sha1);
2190 }
2191}
2192/*
2194 * Given a name and sha1 pair, if the index tells us the file in
2195 * the work tree has that object contents, return true, so that
2196 * prepare_temp_file() does not have to inflate and extract.
2197 */
2198static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
2199{
2200 struct cache_entry *ce;
2201 struct stat st;
2202 int pos, len;
2203 /*
2205 * We do not read the cache ourselves here, because the
2206 * benchmark with my previous version that always reads cache
2207 * shows that it makes things worse for diff-tree comparing
2208 * two linux-2.6 kernel trees in an already checked out work
2209 * tree. This is because most diff-tree comparisons deal with
2210 * only a small number of files, while reading the cache is
2211 * expensive for a large project, and its cost outweighs the
2212 * savings we get by not inflating the object to a temporary
2213 * file. Practically, this code only helps when we are used
2214 * by diff-cache --cached, which does read the cache before
2215 * calling us.
2216 */
2217 if (!active_cache)
2218 return 0;
2219 /* We want to avoid the working directory if our caller
2221 * doesn't need the data in a normal file, this system
2222 * is rather slow with its stat/open/mmap/close syscalls,
2223 * and the object is contained in a pack file. The pack
2224 * is probably already open and will be faster to obtain
2225 * the data through than the working directory. Loose
2226 * objects however would tend to be slower as they need
2227 * to be individually opened and inflated.
2228 */
2229 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
2230 return 0;
2231 len = strlen(name);
2233 pos = cache_name_pos(name, len);
2234 if (pos < 0)
2235 return 0;
2236 ce = active_cache[pos];
2237 /*
2239 * This is not the sha1 we are looking for, or
2240 * unreusable because it is not a regular file.
2241 */
2242 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
2243 return 0;
2244 /*
2246 * If ce is marked as "assume unchanged", there is no
2247 * guarantee that work tree matches what we are looking for.
2248 */
2249 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
2250 return 0;
2251 /*
2253 * If ce matches the file in the work tree, we can reuse it.
2254 */
2255 if (ce_uptodate(ce) ||
2256 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
2257 return 1;
2258 return 0;
2260}
2261static int populate_from_stdin(struct diff_filespec *s)
2263{
2264 struct strbuf buf = STRBUF_INIT;
2265 size_t size = 0;
2266 if (strbuf_read(&buf, 0, 0) < 0)
2268 return error("error while reading from stdin %s",
2269 strerror(errno));
2270 s->should_munmap = 0;
2272 s->data = strbuf_detach(&buf, &size);
2273 s->size = size;
2274 s->should_free = 1;
2275 return 0;
2276}
2277static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2279{
2280 int len;
2281 char *data = xmalloc(100), *dirty = "";
2282 /* Are we looking at the work tree? */
2284 if (s->dirty_submodule)
2285 dirty = "-dirty";
2286 len = snprintf(data, 100,
2288 "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty);
2289 s->data = data;
2290 s->size = len;
2291 s->should_free = 1;
2292 if (size_only) {
2293 s->data = NULL;
2294 free(data);
2295 }
2296 return 0;
2297}
2298/*
2300 * While doing rename detection and pickaxe operation, we may need to
2301 * grab the data for the blob (or file) for our own in-core comparison.
2302 * diff_filespec has data and size fields for this purpose.
2303 */
2304int diff_populate_filespec(struct diff_filespec *s, int size_only)
2305{
2306 int err = 0;
2307 if (!DIFF_FILE_VALID(s))
2308 die("internal error: asking to populate invalid file.");
2309 if (S_ISDIR(s->mode))
2310 return -1;
2311 if (s->data)
2313 return 0;
2314 if (size_only && 0 < s->size)
2316 return 0;
2317 if (S_ISGITLINK(s->mode))
2319 return diff_populate_gitlink(s, size_only);
2320 if (!s->sha1_valid ||
2322 reuse_worktree_file(s->path, s->sha1, 0)) {
2323 struct strbuf buf = STRBUF_INIT;
2324 struct stat st;
2325 int fd;
2326 if (!strcmp(s->path, "-"))
2328 return populate_from_stdin(s);
2329 if (lstat(s->path, &st) < 0) {
2331 if (errno == ENOENT) {
2332 err_empty:
2333 err = -1;
2334 empty:
2335 s->data = (char *)"";
2336 s->size = 0;
2337 return err;
2338 }
2339 }
2340 s->size = xsize_t(st.st_size);
2341 if (!s->size)
2342 goto empty;
2343 if (S_ISLNK(st.st_mode)) {
2344 struct strbuf sb = STRBUF_INIT;
2345 if (strbuf_readlink(&sb, s->path, s->size))
2347 goto err_empty;
2348 s->size = sb.len;
2349 s->data = strbuf_detach(&sb, NULL);
2350 s->should_free = 1;
2351 return 0;
2352 }
2353 if (size_only)
2354 return 0;
2355 fd = open(s->path, O_RDONLY);
2356 if (fd < 0)
2357 goto err_empty;
2358 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2359 close(fd);
2360 s->should_munmap = 1;
2361 /*
2363 * Convert from working tree format to canonical git format
2364 */
2365 if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
2366 size_t size = 0;
2367 munmap(s->data, s->size);
2368 s->should_munmap = 0;
2369 s->data = strbuf_detach(&buf, &size);
2370 s->size = size;
2371 s->should_free = 1;
2372 }
2373 }
2374 else {
2375 enum object_type type;
2376 if (size_only)
2377 type = sha1_object_info(s->sha1, &s->size);
2378 else {
2379 s->data = read_sha1_file(s->sha1, &type, &s->size);
2380 s->should_free = 1;
2381 }
2382 }
2383 return 0;
2384}
2385void diff_free_filespec_blob(struct diff_filespec *s)
2387{
2388 if (s->should_free)
2389 free(s->data);
2390 else if (s->should_munmap)
2391 munmap(s->data, s->size);
2392 if (s->should_free || s->should_munmap) {
2394 s->should_free = s->should_munmap = 0;
2395 s->data = NULL;
2396 }
2397}
2398void diff_free_filespec_data(struct diff_filespec *s)
2400{
2401 diff_free_filespec_blob(s);
2402 free(s->cnt_data);
2403 s->cnt_data = NULL;
2404}
2405static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2407 void *blob,
2408 unsigned long size,
2409 const unsigned char *sha1,
2410 int mode)
2411{
2412 int fd;
2413 struct strbuf buf = STRBUF_INIT;
2414 struct strbuf template = STRBUF_INIT;
2415 char *path_dup = xstrdup(path);
2416 const char *base = basename(path_dup);
2417 /* Generate "XXXXXX_basename.ext" */
2419 strbuf_addstr(&template, "XXXXXX_");
2420 strbuf_addstr(&template, base);
2421 fd = git_mkstemps(temp->tmp_path, PATH_MAX, template.buf,
2423 strlen(base) + 1);
2424 if (fd < 0)
2425 die_errno("unable to create temp-file");
2426 if (convert_to_working_tree(path,
2427 (const char *)blob, (size_t)size, &buf)) {
2428 blob = buf.buf;
2429 size = buf.len;
2430 }
2431 if (write_in_full(fd, blob, size) != size)
2432 die_errno("unable to write temp-file");
2433 close(fd);
2434 temp->name = temp->tmp_path;
2435 strcpy(temp->hex, sha1_to_hex(sha1));
2436 temp->hex[40] = 0;
2437 sprintf(temp->mode, "%06o", mode);
2438 strbuf_release(&buf);
2439 strbuf_release(&template);
2440 free(path_dup);
2441}
2442static struct diff_tempfile *prepare_temp_file(const char *name,
2444 struct diff_filespec *one)
2445{
2446 struct diff_tempfile *temp = claim_diff_tempfile();
2447 if (!DIFF_FILE_VALID(one)) {
2449 not_a_valid_file:
2450 /* A '-' entry produces this for file-2, and
2451 * a '+' entry produces this for file-1.
2452 */
2453 temp->name = "/dev/null";
2454 strcpy(temp->hex, ".");
2455 strcpy(temp->mode, ".");
2456 return temp;
2457 }
2458 if (!remove_tempfile_installed) {
2460 atexit(remove_tempfile);
2461 sigchain_push_common(remove_tempfile_on_signal);
2462 remove_tempfile_installed = 1;
2463 }
2464 if (!one->sha1_valid ||
2466 reuse_worktree_file(name, one->sha1, 1)) {
2467 struct stat st;
2468 if (lstat(name, &st) < 0) {
2469 if (errno == ENOENT)
2470 goto not_a_valid_file;
2471 die_errno("stat(%s)", name);
2472 }
2473 if (S_ISLNK(st.st_mode)) {
2474 struct strbuf sb = STRBUF_INIT;
2475 if (strbuf_readlink(&sb, name, st.st_size) < 0)
2476 die_errno("readlink(%s)", name);
2477 prep_temp_blob(name, temp, sb.buf, sb.len,
2478 (one->sha1_valid ?
2479 one->sha1 : null_sha1),
2480 (one->sha1_valid ?
2481 one->mode : S_IFLNK));
2482 strbuf_release(&sb);
2483 }
2484 else {
2485 /* we can borrow from the file in the work tree */
2486 temp->name = name;
2487 if (!one->sha1_valid)
2488 strcpy(temp->hex, sha1_to_hex(null_sha1));
2489 else
2490 strcpy(temp->hex, sha1_to_hex(one->sha1));
2491 /* Even though we may sometimes borrow the
2492 * contents from the work tree, we always want
2493 * one->mode. mode is trustworthy even when
2494 * !(one->sha1_valid), as long as
2495 * DIFF_FILE_VALID(one).
2496 */
2497 sprintf(temp->mode, "%06o", one->mode);
2498 }
2499 return temp;
2500 }
2501 else {
2502 if (diff_populate_filespec(one, 0))
2503 die("cannot read data blob for %s", one->path);
2504 prep_temp_blob(name, temp, one->data, one->size,
2505 one->sha1, one->mode);
2506 }
2507 return temp;
2508}
2509/* An external diff command takes:
2511 *
2512 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2513 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2514 *
2515 */
2516static void run_external_diff(const char *pgm,
2517 const char *name,
2518 const char *other,
2519 struct diff_filespec *one,
2520 struct diff_filespec *two,
2521 const char *xfrm_msg,
2522 int complete_rewrite)
2523{
2524 const char *spawn_arg[10];
2525 int retval;
2526 const char **arg = &spawn_arg[0];
2527 if (one && two) {
2529 struct diff_tempfile *temp_one, *temp_two;
2530 const char *othername = (other ? other : name);
2531 temp_one = prepare_temp_file(name, one);
2532 temp_two = prepare_temp_file(othername, two);
2533 *arg++ = pgm;
2534 *arg++ = name;
2535 *arg++ = temp_one->name;
2536 *arg++ = temp_one->hex;
2537 *arg++ = temp_one->mode;
2538 *arg++ = temp_two->name;
2539 *arg++ = temp_two->hex;
2540 *arg++ = temp_two->mode;
2541 if (other) {
2542 *arg++ = other;
2543 *arg++ = xfrm_msg;
2544 }
2545 } else {
2546 *arg++ = pgm;
2547 *arg++ = name;
2548 }
2549 *arg = NULL;
2550 fflush(NULL);
2551 retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL);
2552 remove_tempfile();
2553 if (retval) {
2554 fprintf(stderr, "external diff died, stopping at %s.\n", name);
2555 exit(1);
2556 }
2557}
2558static int similarity_index(struct diff_filepair *p)
2560{
2561 return p->score * 100 / MAX_SCORE;
2562}
2563static void fill_metainfo(struct strbuf *msg,
2565 const char *name,
2566 const char *other,
2567 struct diff_filespec *one,
2568 struct diff_filespec *two,
2569 struct diff_options *o,
2570 struct diff_filepair *p,
2571 int use_color)
2572{
2573 const char *set = diff_get_color(use_color, DIFF_METAINFO);
2574 const char *reset = diff_get_color(use_color, DIFF_RESET);
2575 struct strbuf *msgbuf;
2576 char *line_prefix = "";
2577 if (o->output_prefix) {
2579 msgbuf = o->output_prefix(o, o->output_prefix_data);
2580 line_prefix = msgbuf->buf;
2581 }
2582 strbuf_init(msg, PATH_MAX * 2 + 300);
2584 switch (p->status) {
2585 case DIFF_STATUS_COPIED:
2586 strbuf_addf(msg, "%s%ssimilarity index %d%%",
2587 line_prefix, set, similarity_index(p));
2588 strbuf_addf(msg, "%s\n%s%scopy from ",
2589 reset, line_prefix, set);
2590 quote_c_style(name, msg, NULL, 0);
2591 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
2592 quote_c_style(other, msg, NULL, 0);
2593 strbuf_addf(msg, "%s\n", reset);
2594 break;
2595 case DIFF_STATUS_RENAMED:
2596 strbuf_addf(msg, "%s%ssimilarity index %d%%",
2597 line_prefix, set, similarity_index(p));
2598 strbuf_addf(msg, "%s\n%s%srename from ",
2599 reset, line_prefix, set);
2600 quote_c_style(name, msg, NULL, 0);
2601 strbuf_addf(msg, "%s\n%s%srename to ",
2602 reset, line_prefix, set);
2603 quote_c_style(other, msg, NULL, 0);
2604 strbuf_addf(msg, "%s\n", reset);
2605 break;
2606 case DIFF_STATUS_MODIFIED:
2607 if (p->score) {
2608 strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
2609 line_prefix,
2610 set, similarity_index(p), reset);
2611 break;
2612 }
2613 /* fallthru */
2614 default:
2615 /* nothing */
2616 ;
2617 }
2618 if (one && two && hashcmp(one->sha1, two->sha1)) {
2619 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
2620 if (DIFF_OPT_TST(o, BINARY)) {
2622 mmfile_t mf;
2623 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2624 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2625 abbrev = 40;
2626 }
2627 strbuf_addf(msg, "%s%sindex %s..", set,
2628 line_prefix,
2629 find_unique_abbrev(one->sha1, abbrev));
2630 strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
2631 if (one->mode == two->mode)
2632 strbuf_addf(msg, " %06o", one->mode);
2633 strbuf_addf(msg, "%s\n", reset);
2634 }
2635}
2636static void run_diff_cmd(const char *pgm,
2638 const char *name,
2639 const char *other,
2640 const char *attr_path,
2641 struct diff_filespec *one,
2642 struct diff_filespec *two,
2643 struct strbuf *msg,
2644 struct diff_options *o,
2645 struct diff_filepair *p)
2646{
2647 const char *xfrm_msg = NULL;
2648 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
2649 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
2651 pgm = NULL;
2652 else {
2653 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
2654 if (drv && drv->external)
2655 pgm = drv->external;
2656 }
2657 if (msg) {
2659 /*
2660 * don't use colors when the header is intended for an
2661 * external diff driver
2662 */
2663 fill_metainfo(msg, name, other, one, two, o, p,
2664 DIFF_OPT_TST(o, COLOR_DIFF) && !pgm);
2665 xfrm_msg = msg->len ? msg->buf : NULL;
2666 }
2667 if (pgm) {
2669 run_external_diff(pgm, name, other, one, two, xfrm_msg,
2670 complete_rewrite);
2671 return;
2672 }
2673 if (one && two)
2674 builtin_diff(name, other ? other : name,
2675 one, two, xfrm_msg, o, complete_rewrite);
2676 else
2677 fprintf(o->file, "* Unmerged path %s\n", name);
2678}
2679static void diff_fill_sha1_info(struct diff_filespec *one)
2681{
2682 if (DIFF_FILE_VALID(one)) {
2683 if (!one->sha1_valid) {
2684 struct stat st;
2685 if (!strcmp(one->path, "-")) {
2686 hashcpy(one->sha1, null_sha1);
2687 return;
2688 }
2689 if (lstat(one->path, &st) < 0)
2690 die_errno("stat '%s'", one->path);
2691 if (index_path(one->sha1, one->path, &st, 0))
2692 die("cannot hash %s", one->path);
2693 }
2694 }
2695 else
2696 hashclr(one->sha1);
2697}
2698static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
2700{
2701 /* Strip the prefix but do not molest /dev/null and absolute paths */
2702 if (*namep && **namep != '/')
2703 *namep += prefix_length;
2704 if (*otherp && **otherp != '/')
2705 *otherp += prefix_length;
2706}
2707static void run_diff(struct diff_filepair *p, struct diff_options *o)
2709{
2710 const char *pgm = external_diff();
2711 struct strbuf msg;
2712 struct diff_filespec *one = p->one;
2713 struct diff_filespec *two = p->two;
2714 const char *name;
2715 const char *other;
2716 const char *attr_path;
2717 name = p->one->path;
2719 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2720 attr_path = name;
2721 if (o->prefix_length)
2722 strip_prefix(o->prefix_length, &name, &other);
2723 if (DIFF_PAIR_UNMERGED(p)) {
2725 run_diff_cmd(pgm, name, NULL, attr_path,
2726 NULL, NULL, NULL, o, p);
2727 return;
2728 }
2729 diff_fill_sha1_info(one);
2731 diff_fill_sha1_info(two);
2732 if (!pgm &&
2734 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
2735 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
2736 /*
2737 * a filepair that changes between file and symlink
2738 * needs to be split into deletion and creation.
2739 */
2740 struct diff_filespec *null = alloc_filespec(two->path);
2741 run_diff_cmd(NULL, name, other, attr_path,
2742 one, null, &msg, o, p);
2743 free(null);
2744 strbuf_release(&msg);
2745 null = alloc_filespec(one->path);
2747 run_diff_cmd(NULL, name, other, attr_path,
2748 null, two, &msg, o, p);
2749 free(null);
2750 }
2751 else
2752 run_diff_cmd(pgm, name, other, attr_path,
2753 one, two, &msg, o, p);
2754 strbuf_release(&msg);
2756}
2757static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
2759 struct diffstat_t *diffstat)
2760{
2761 const char *name;
2762 const char *other;
2763 int complete_rewrite = 0;
2764 if (DIFF_PAIR_UNMERGED(p)) {
2766 /* unmerged */
2767 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
2768 return;
2769 }
2770 name = p->one->path;
2772 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2773 if (o->prefix_length)
2775 strip_prefix(o->prefix_length, &name, &other);
2776 diff_fill_sha1_info(p->one);
2778 diff_fill_sha1_info(p->two);
2779 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2781 complete_rewrite = 1;
2782 builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
2783}
2784static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
2786{
2787 const char *name;
2788 const char *other;
2789 const char *attr_path;
2790 if (DIFF_PAIR_UNMERGED(p)) {
2792 /* unmerged */
2793 return;
2794 }
2795 name = p->one->path;
2797 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2798 attr_path = other ? other : name;
2799 if (o->prefix_length)
2801 strip_prefix(o->prefix_length, &name, &other);
2802 diff_fill_sha1_info(p->one);
2804 diff_fill_sha1_info(p->two);
2805 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
2807}
2808void diff_setup(struct diff_options *options)
2810{
2811 memset(options, 0, sizeof(*options));
2812 memset(&diff_queued_diff, 0, sizeof(diff_queued_diff));
2813 options->file = stdout;
2815 options->line_termination = '\n';
2817 options->break_opt = -1;
2818 options->rename_limit = -1;
2819 options->dirstat_percent = 3;
2820 options->context = 3;
2821 options->change = diff_change;
2823 options->add_remove = diff_addremove;
2824 if (diff_use_color_default > 0)
2825 DIFF_OPT_SET(options, COLOR_DIFF);
2826 options->detect_rename = diff_detect_rename_default;
2827 if (diff_no_prefix) {
2829 options->a_prefix = options->b_prefix = "";
2830 } else if (!diff_mnemonic_prefix) {
2831 options->a_prefix = "a/";
2832 options->b_prefix = "b/";
2833 }
2834}
2835int diff_setup_done(struct diff_options *options)
2837{
2838 int count = 0;
2839 if (options->output_format & DIFF_FORMAT_NAME)
2841 count++;
2842 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
2843 count++;
2844 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
2845 count++;
2846 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
2847 count++;
2848 if (count > 1)
2849 die("--name-only, --name-status, --check and -s are mutually exclusive");
2850 /*
2852 * Most of the time we can say "there are changes"
2853 * only by checking if there are changed paths, but
2854 * --ignore-whitespace* options force us to look
2855 * inside contents.
2856 */
2857 if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
2859 DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
2860 DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
2861 DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
2862 else
2863 DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
2864 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
2866 options->detect_rename = DIFF_DETECT_COPY;
2867 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
2869 options->prefix = NULL;
2870 if (options->prefix)
2871 options->prefix_length = strlen(options->prefix);
2872 else
2873 options->prefix_length = 0;
2874 if (options->output_format & (DIFF_FORMAT_NAME |
2876 DIFF_FORMAT_NAME_STATUS |
2877 DIFF_FORMAT_CHECKDIFF |
2878 DIFF_FORMAT_NO_OUTPUT))
2879 options->output_format &= ~(DIFF_FORMAT_RAW |
2880 DIFF_FORMAT_NUMSTAT |
2881 DIFF_FORMAT_DIFFSTAT |
2882 DIFF_FORMAT_SHORTSTAT |
2883 DIFF_FORMAT_DIRSTAT |
2884 DIFF_FORMAT_SUMMARY |
2885 DIFF_FORMAT_PATCH);
2886 /*
2888 * These cases always need recursive; we do not drop caller-supplied
2889 * recursive bits for other formats here.
2890 */
2891 if (options->output_format & (DIFF_FORMAT_PATCH |
2892 DIFF_FORMAT_NUMSTAT |
2893 DIFF_FORMAT_DIFFSTAT |
2894 DIFF_FORMAT_SHORTSTAT |
2895 DIFF_FORMAT_DIRSTAT |
2896 DIFF_FORMAT_SUMMARY |
2897 DIFF_FORMAT_CHECKDIFF))
2898 DIFF_OPT_SET(options, RECURSIVE);
2899 /*
2900 * Also pickaxe would not work very well if you do not say recursive
2901 */
2902 if (options->pickaxe)
2903 DIFF_OPT_SET(options, RECURSIVE);
2904 /*
2905 * When patches are generated, submodules diffed against the work tree
2906 * must be checked for dirtiness too so it can be shown in the output
2907 */
2908 if (options->output_format & DIFF_FORMAT_PATCH)
2909 DIFF_OPT_SET(options, DIRTY_SUBMODULES);
2910 if (options->detect_rename && options->rename_limit < 0)
2912 options->rename_limit = diff_rename_limit_default;
2913 if (options->setup & DIFF_SETUP_USE_CACHE) {
2914 if (!active_cache)
2915 /* read-cache does not die even when it fails
2916 * so it is safe for us to do this here. Also
2917 * it does not smudge active_cache or active_nr
2918 * when it fails, so we do not have to worry about
2919 * cleaning it up ourselves either.
2920 */
2921 read_cache();
2922 }
2923 if (options->abbrev <= 0 || 40 < options->abbrev)
2924 options->abbrev = 40; /* full */
2925 /*
2927 * It does not make sense to show the first hit we happened
2928 * to have found. It does not make sense not to return with
2929 * exit code in such a case either.
2930 */
2931 if (DIFF_OPT_TST(options, QUICK)) {
2932 options->output_format = DIFF_FORMAT_NO_OUTPUT;
2933 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2934 }
2935 return 0;
2937}
2938static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
2940{
2941 char c, *eq;
2942 int len;
2943 if (*arg != '-')
2945 return 0;
2946 c = *++arg;
2947 if (!c)
2948 return 0;
2949 if (c == arg_short) {
2950 c = *++arg;
2951 if (!c)
2952 return 1;
2953 if (val && isdigit(c)) {
2954 char *end;
2955 int n = strtoul(arg, &end, 10);
2956 if (*end)
2957 return 0;
2958 *val = n;
2959 return 1;
2960 }
2961 return 0;
2962 }
2963 if (c != '-')
2964 return 0;
2965 arg++;
2966 eq = strchr(arg, '=');
2967 if (eq)
2968 len = eq - arg;
2969 else
2970 len = strlen(arg);
2971 if (!len || strncmp(arg, arg_long, len))
2972 return 0;
2973 if (eq) {
2974 int n;
2975 char *end;
2976 if (!isdigit(*++eq))
2977 return 0;
2978 n = strtoul(eq, &end, 10);
2979 if (*end)
2980 return 0;
2981 *val = n;
2982 }
2983 return 1;
2984}
2985static int diff_scoreopt_parse(const char *opt);
2987int diff_opt_parse(struct diff_options *options, const char **av, int ac)
2989{
2990 const char *arg = av[0];
2991 /* Output format options */
2993 if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch"))
2994 options->output_format |= DIFF_FORMAT_PATCH;
2995 else if (opt_arg(arg, 'U', "unified", &options->context))
2996 options->output_format |= DIFF_FORMAT_PATCH;
2997 else if (!strcmp(arg, "--raw"))
2998 options->output_format |= DIFF_FORMAT_RAW;
2999 else if (!strcmp(arg, "--patch-with-raw"))
3000 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
3001 else if (!strcmp(arg, "--numstat"))
3002 options->output_format |= DIFF_FORMAT_NUMSTAT;
3003 else if (!strcmp(arg, "--shortstat"))
3004 options->output_format |= DIFF_FORMAT_SHORTSTAT;
3005 else if (opt_arg(arg, 'X', "dirstat", &options->dirstat_percent))
3006 options->output_format |= DIFF_FORMAT_DIRSTAT;
3007 else if (!strcmp(arg, "--cumulative")) {
3008 options->output_format |= DIFF_FORMAT_DIRSTAT;
3009 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
3010 } else if (opt_arg(arg, 0, "dirstat-by-file",
3011 &options->dirstat_percent)) {
3012 options->output_format |= DIFF_FORMAT_DIRSTAT;
3013 DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
3014 }
3015 else if (!strcmp(arg, "--check"))
3016 options->output_format |= DIFF_FORMAT_CHECKDIFF;
3017 else if (!strcmp(arg, "--summary"))
3018 options->output_format |= DIFF_FORMAT_SUMMARY;
3019 else if (!strcmp(arg, "--patch-with-stat"))
3020 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
3021 else if (!strcmp(arg, "--name-only"))
3022 options->output_format |= DIFF_FORMAT_NAME;
3023 else if (!strcmp(arg, "--name-status"))
3024 options->output_format |= DIFF_FORMAT_NAME_STATUS;
3025 else if (!strcmp(arg, "-s"))
3026 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
3027 else if (!prefixcmp(arg, "--stat")) {
3028 char *end;
3029 int width = options->stat_width;
3030 int name_width = options->stat_name_width;
3031 arg += 6;
3032 end = (char *)arg;
3033 switch (*arg) {
3035 case '-':
3036 if (!prefixcmp(arg, "-width="))
3037 width = strtoul(arg + 7, &end, 10);
3038 else if (!prefixcmp(arg, "-name-width="))
3039 name_width = strtoul(arg + 12, &end, 10);
3040 break;
3041 case '=':
3042 width = strtoul(arg+1, &end, 10);
3043 if (*end == ',')
3044 name_width = strtoul(end+1, &end, 10);
3045 }
3046 /* Important! This checks all the error cases! */
3048 if (*end)
3049 return 0;
3050 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3051 options->stat_name_width = name_width;
3052 options->stat_width = width;
3053 }
3054 /* renames options */
3056 else if (!prefixcmp(arg, "-B")) {
3057 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
3058 return -1;
3059 }
3060 else if (!prefixcmp(arg, "-M")) {
3061 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3062 return -1;
3063 options->detect_rename = DIFF_DETECT_RENAME;
3064 }
3065 else if (!prefixcmp(arg, "-C")) {
3066 if (options->detect_rename == DIFF_DETECT_COPY)
3067 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3068 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3069 return -1;
3070 options->detect_rename = DIFF_DETECT_COPY;
3071 }
3072 else if (!strcmp(arg, "--no-renames"))
3073 options->detect_rename = 0;
3074 else if (!strcmp(arg, "--relative"))
3075 DIFF_OPT_SET(options, RELATIVE_NAME);
3076 else if (!prefixcmp(arg, "--relative=")) {
3077 DIFF_OPT_SET(options, RELATIVE_NAME);
3078 options->prefix = arg + 11;
3079 }
3080 /* xdiff options */
3082 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
3083 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
3084 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
3085 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
3086 else if (!strcmp(arg, "--ignore-space-at-eol"))
3087 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
3088 else if (!strcmp(arg, "--patience"))
3089 DIFF_XDL_SET(options, PATIENCE_DIFF);
3090 /* flags options */
3092 else if (!strcmp(arg, "--binary")) {
3093 options->output_format |= DIFF_FORMAT_PATCH;
3094 DIFF_OPT_SET(options, BINARY);
3095 }
3096 else if (!strcmp(arg, "--full-index"))
3097 DIFF_OPT_SET(options, FULL_INDEX);
3098 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
3099 DIFF_OPT_SET(options, TEXT);
3100 else if (!strcmp(arg, "-R"))
3101 DIFF_OPT_SET(options, REVERSE_DIFF);
3102 else if (!strcmp(arg, "--find-copies-harder"))
3103 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3104 else if (!strcmp(arg, "--follow"))
3105 DIFF_OPT_SET(options, FOLLOW_RENAMES);
3106 else if (!strcmp(arg, "--color"))
3107 DIFF_OPT_SET(options, COLOR_DIFF);
3108 else if (!prefixcmp(arg, "--color=")) {
3109 int value = git_config_colorbool(NULL, arg+8, -1);
3110 if (value == 0)
3111 DIFF_OPT_CLR(options, COLOR_DIFF);
3112 else if (value > 0)
3113 DIFF_OPT_SET(options, COLOR_DIFF);
3114 else
3115 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3116 }
3117 else if (!strcmp(arg, "--no-color"))
3118 DIFF_OPT_CLR(options, COLOR_DIFF);
3119 else if (!strcmp(arg, "--color-words")) {
3120 DIFF_OPT_SET(options, COLOR_DIFF);
3121 options->word_diff = DIFF_WORDS_COLOR;
3122 }
3123 else if (!prefixcmp(arg, "--color-words=")) {
3124 DIFF_OPT_SET(options, COLOR_DIFF);
3125 options->word_diff = DIFF_WORDS_COLOR;
3126 options->word_regex = arg + 14;
3127 }
3128 else if (!strcmp(arg, "--word-diff")) {
3129 if (options->word_diff == DIFF_WORDS_NONE)
3130 options->word_diff = DIFF_WORDS_PLAIN;
3131 }
3132 else if (!prefixcmp(arg, "--word-diff=")) {
3133 const char *type = arg + 12;
3134 if (!strcmp(type, "plain"))
3135 options->word_diff = DIFF_WORDS_PLAIN;
3136 else if (!strcmp(type, "color")) {
3137 DIFF_OPT_SET(options, COLOR_DIFF);
3138 options->word_diff = DIFF_WORDS_COLOR;
3139 }
3140 else if (!strcmp(type, "porcelain"))
3141 options->word_diff = DIFF_WORDS_PORCELAIN;
3142 else if (!strcmp(type, "none"))
3143 options->word_diff = DIFF_WORDS_NONE;
3144 else
3145 die("bad --word-diff argument: %s", type);
3146 }
3147 else if (!prefixcmp(arg, "--word-diff-regex=")) {
3148 if (options->word_diff == DIFF_WORDS_NONE)
3149 options->word_diff = DIFF_WORDS_PLAIN;
3150 options->word_regex = arg + 18;
3151 }
3152 else if (!strcmp(arg, "--exit-code"))
3153 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3154 else if (!strcmp(arg, "--quiet"))
3155 DIFF_OPT_SET(options, QUICK);
3156 else if (!strcmp(arg, "--ext-diff"))
3157 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
3158 else if (!strcmp(arg, "--no-ext-diff"))
3159 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
3160 else if (!strcmp(arg, "--textconv"))
3161 DIFF_OPT_SET(options, ALLOW_TEXTCONV);
3162 else if (!strcmp(arg, "--no-textconv"))
3163 DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
3164 else if (!strcmp(arg, "--ignore-submodules"))
3165 DIFF_OPT_SET(options, IGNORE_SUBMODULES);
3166 else if (!strcmp(arg, "--submodule"))
3167 DIFF_OPT_SET(options, SUBMODULE_LOG);
3168 else if (!prefixcmp(arg, "--submodule=")) {
3169 if (!strcmp(arg + 12, "log"))
3170 DIFF_OPT_SET(options, SUBMODULE_LOG);
3171 }
3172 /* misc options */
3174 else if (!strcmp(arg, "-z"))
3175 options->line_termination = 0;
3176 else if (!prefixcmp(arg, "-l"))
3177 options->rename_limit = strtoul(arg+2, NULL, 10);
3178 else if (!prefixcmp(arg, "-S"))
3179 options->pickaxe = arg + 2;
3180 else if (!strcmp(arg, "--pickaxe-all"))
3181 options->pickaxe_opts = DIFF_PICKAXE_ALL;
3182 else if (!strcmp(arg, "--pickaxe-regex"))
3183 options->pickaxe_opts = DIFF_PICKAXE_REGEX;
3184 else if (!prefixcmp(arg, "-O"))
3185 options->orderfile = arg + 2;
3186 else if (!prefixcmp(arg, "--diff-filter="))
3187 options->filter = arg + 14;
3188 else if (!strcmp(arg, "--abbrev"))
3189 options->abbrev = DEFAULT_ABBREV;
3190 else if (!prefixcmp(arg, "--abbrev=")) {
3191 options->abbrev = strtoul(arg + 9, NULL, 10);
3192 if (options->abbrev < MINIMUM_ABBREV)
3193 options->abbrev = MINIMUM_ABBREV;
3194 else if (40 < options->abbrev)
3195 options->abbrev = 40;
3196 }
3197 else if (!prefixcmp(arg, "--src-prefix="))
3198 options->a_prefix = arg + 13;
3199 else if (!prefixcmp(arg, "--dst-prefix="))
3200 options->b_prefix = arg + 13;
3201 else if (!strcmp(arg, "--no-prefix"))
3202 options->a_prefix = options->b_prefix = "";
3203 else if (opt_arg(arg, '\0', "inter-hunk-context",
3204 &options->interhunkcontext))
3205 ;
3206 else if (!prefixcmp(arg, "--output=")) {
3207 options->file = fopen(arg + strlen("--output="), "w");
3208 if (!options->file)
3209 die_errno("Could not open '%s'", arg + strlen("--output="));
3210 options->close_file = 1;
3211 } else
3212 return 0;
3213 return 1;
3214}
3215static int parse_num(const char **cp_p)
3217{
3218 unsigned long num, scale;
3219 int ch, dot;
3220 const char *cp = *cp_p;
3221 num = 0;
3223 scale = 1;
3224 dot = 0;
3225 for (;;) {
3226 ch = *cp;
3227 if ( !dot && ch == '.' ) {
3228 scale = 1;
3229 dot = 1;
3230 } else if ( ch == '%' ) {
3231 scale = dot ? scale*100 : 100;
3232 cp++; /* % is always at the end */
3233 break;
3234 } else if ( ch >= '0' && ch <= '9' ) {
3235 if ( scale < 100000 ) {
3236 scale *= 10;
3237 num = (num*10) + (ch-'0');
3238 }
3239 } else {
3240 break;
3241 }
3242 cp++;
3243 }
3244 *cp_p = cp;
3245 /* user says num divided by scale and we say internally that
3247 * is MAX_SCORE * num / scale.
3248 */
3249 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
3250}
3251static int diff_scoreopt_parse(const char *opt)
3253{
3254 int opt1, opt2, cmd;
3255 if (*opt++ != '-')
3257 return -1;
3258 cmd = *opt++;
3259 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
3260 return -1; /* that is not a -M, -C nor -B option */
3261 opt1 = parse_num(&opt);
3263 if (cmd != 'B')
3264 opt2 = 0;
3265 else {
3266 if (*opt == 0)
3267 opt2 = 0;
3268 else if (*opt != '/')
3269 return -1; /* we expect -B80/99 or -B80 */
3270 else {
3271 opt++;
3272 opt2 = parse_num(&opt);
3273 }
3274 }
3275 if (*opt != 0)
3276 return -1;
3277 return opt1 | (opt2 << 16);
3278}
3279struct diff_queue_struct diff_queued_diff;
3281void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
3283{
3284 if (queue->alloc <= queue->nr) {
3285 queue->alloc = alloc_nr(queue->alloc);
3286 queue->queue = xrealloc(queue->queue,
3287 sizeof(dp) * queue->alloc);
3288 }
3289 queue->queue[queue->nr++] = dp;
3290}
3291struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
3293 struct diff_filespec *one,
3294 struct diff_filespec *two)
3295{
3296 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
3297 dp->one = one;
3298 dp->two = two;
3299 if (queue)
3300 diff_q(queue, dp);
3301 return dp;
3302}
3303void diff_free_filepair(struct diff_filepair *p)
3305{
3306 free_filespec(p->one);
3307 free_filespec(p->two);
3308 free(p);
3309}
3310/* This is different from find_unique_abbrev() in that
3312 * it stuffs the result with dots for alignment.
3313 */
3314const char *diff_unique_abbrev(const unsigned char *sha1, int len)
3315{
3316 int abblen;
3317 const char *abbrev;
3318 if (len == 40)
3319 return sha1_to_hex(sha1);
3320 abbrev = find_unique_abbrev(sha1, len);
3322 abblen = strlen(abbrev);
3323 if (abblen < 37) {
3324 static char hex[41];
3325 if (len < abblen && abblen <= len + 2)
3326 sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
3327 else
3328 sprintf(hex, "%s...", abbrev);
3329 return hex;
3330 }
3331 return sha1_to_hex(sha1);
3332}
3333static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
3335{
3336 int line_termination = opt->line_termination;
3337 int inter_name_termination = line_termination ? '\t' : '\0';
3338 if (opt->output_prefix) {
3339 struct strbuf *msg = NULL;
3340 msg = opt->output_prefix(opt, opt->output_prefix_data);
3341 fprintf(opt->file, "%s", msg->buf);
3342 }
3343 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
3345 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
3346 diff_unique_abbrev(p->one->sha1, opt->abbrev));
3347 fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
3348 }
3349 if (p->score) {
3350 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
3351 inter_name_termination);
3352 } else {
3353 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
3354 }
3355 if (p->status == DIFF_STATUS_COPIED ||
3357 p->status == DIFF_STATUS_RENAMED) {
3358 const char *name_a, *name_b;
3359 name_a = p->one->path;
3360 name_b = p->two->path;
3361 strip_prefix(opt->prefix_length, &name_a, &name_b);
3362 write_name_quoted(name_a, opt->file, inter_name_termination);
3363 write_name_quoted(name_b, opt->file, line_termination);
3364 } else {
3365 const char *name_a, *name_b;
3366 name_a = p->one->mode ? p->one->path : p->two->path;
3367 name_b = NULL;
3368 strip_prefix(opt->prefix_length, &name_a, &name_b);
3369 write_name_quoted(name_a, opt->file, line_termination);
3370 }
3371}
3372int diff_unmodified_pair(struct diff_filepair *p)
3374{
3375 /* This function is written stricter than necessary to support
3376 * the currently implemented transformers, but the idea is to
3377 * let transformers to produce diff_filepairs any way they want,
3378 * and filter and clean them up here before producing the output.
3379 */
3380 struct diff_filespec *one = p->one, *two = p->two;
3381 if (DIFF_PAIR_UNMERGED(p))
3383 return 0; /* unmerged is interesting */
3384 /* deletion, addition, mode or type change
3386 * and rename are all interesting.
3387 */
3388 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
3389 DIFF_PAIR_MODE_CHANGED(p) ||
3390 strcmp(one->path, two->path))
3391 return 0;
3392 /* both are valid and point at the same path. that is, we are
3394 * dealing with a change.
3395 */
3396 if (one->sha1_valid && two->sha1_valid &&
3397 !hashcmp(one->sha1, two->sha1) &&
3398 !one->dirty_submodule && !two->dirty_submodule)
3399 return 1; /* no change */
3400 if (!one->sha1_valid && !two->sha1_valid)
3401 return 1; /* both look at the same file on the filesystem. */
3402 return 0;
3403}
3404static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
3406{
3407 if (diff_unmodified_pair(p))
3408 return;
3409 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3411 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3412 return; /* no tree diffs in patch format */
3413 run_diff(p, o);
3415}
3416static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
3418 struct diffstat_t *diffstat)
3419{
3420 if (diff_unmodified_pair(p))
3421 return;
3422 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3424 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3425 return; /* no tree diffs in patch format */
3426 run_diffstat(p, o, diffstat);
3428}
3429static void diff_flush_checkdiff(struct diff_filepair *p,
3431 struct diff_options *o)
3432{
3433 if (diff_unmodified_pair(p))
3434 return;
3435 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3437 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3438 return; /* no tree diffs in patch format */
3439 run_checkdiff(p, o);
3441}
3442int diff_queue_is_empty(void)
3444{
3445 struct diff_queue_struct *q = &diff_queued_diff;
3446 int i;
3447 for (i = 0; i < q->nr; i++)
3448 if (!diff_unmodified_pair(q->queue[i]))
3449 return 0;
3450 return 1;
3451}
3452#if DIFF_DEBUG
3454void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
3455{
3456 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
3457 x, one ? one : "",
3458 s->path,
3459 DIFF_FILE_VALID(s) ? "valid" : "invalid",
3460 s->mode,
3461 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
3462 fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
3463 x, one ? one : "",
3464 s->size, s->xfrm_flags);
3465}
3466void diff_debug_filepair(const struct diff_filepair *p, int i)
3468{
3469 diff_debug_filespec(p->one, i, "one");
3470 diff_debug_filespec(p->two, i, "two");
3471 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
3472 p->score, p->status ? p->status : '?',
3473 p->one->rename_used, p->broken_pair);
3474}
3475void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
3477{
3478 int i;
3479 if (msg)
3480 fprintf(stderr, "%s\n", msg);
3481 fprintf(stderr, "q->nr = %d\n", q->nr);
3482 for (i = 0; i < q->nr; i++) {
3483 struct diff_filepair *p = q->queue[i];
3484 diff_debug_filepair(p, i);
3485 }
3486}
3487#endif
3488static void diff_resolve_rename_copy(void)
3490{
3491 int i;
3492 struct diff_filepair *p;
3493 struct diff_queue_struct *q = &diff_queued_diff;
3494 diff_debug_queue("resolve-rename-copy", q);
3496 for (i = 0; i < q->nr; i++) {
3498 p = q->queue[i];
3499 p->status = 0; /* undecided */
3500 if (DIFF_PAIR_UNMERGED(p))
3501 p->status = DIFF_STATUS_UNMERGED;
3502 else if (!DIFF_FILE_VALID(p->one))
3503 p->status = DIFF_STATUS_ADDED;
3504 else if (!DIFF_FILE_VALID(p->two))
3505 p->status = DIFF_STATUS_DELETED;
3506 else if (DIFF_PAIR_TYPE_CHANGED(p))
3507 p->status = DIFF_STATUS_TYPE_CHANGED;
3508 /* from this point on, we are dealing with a pair
3510 * whose both sides are valid and of the same type, i.e.
3511 * either in-place edit or rename/copy edit.
3512 */
3513 else if (DIFF_PAIR_RENAME(p)) {
3514 /*
3515 * A rename might have re-connected a broken
3516 * pair up, causing the pathnames to be the
3517 * same again. If so, that's not a rename at
3518 * all, just a modification..
3519 *
3520 * Otherwise, see if this source was used for
3521 * multiple renames, in which case we decrement
3522 * the count, and call it a copy.
3523 */
3524 if (!strcmp(p->one->path, p->two->path))
3525 p->status = DIFF_STATUS_MODIFIED;
3526 else if (--p->one->rename_used > 0)
3527 p->status = DIFF_STATUS_COPIED;
3528 else
3529 p->status = DIFF_STATUS_RENAMED;
3530 }
3531 else if (hashcmp(p->one->sha1, p->two->sha1) ||
3532 p->one->mode != p->two->mode ||
3533 p->one->dirty_submodule ||
3534 p->two->dirty_submodule ||
3535 is_null_sha1(p->one->sha1))
3536 p->status = DIFF_STATUS_MODIFIED;
3537 else {
3538 /* This is a "no-change" entry and should not
3539 * happen anymore, but prepare for broken callers.
3540 */
3541 error("feeding unmodified %s to diffcore",
3542 p->one->path);
3543 p->status = DIFF_STATUS_UNKNOWN;
3544 }
3545 }
3546 diff_debug_queue("resolve-rename-copy done", q);
3547}
3548static int check_pair_status(struct diff_filepair *p)
3550{
3551 switch (p->status) {
3552 case DIFF_STATUS_UNKNOWN:
3553 return 0;
3554 case 0:
3555 die("internal error in diff-resolve-rename-copy");
3556 default:
3557 return 1;
3558 }
3559}
3560static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
3562{
3563 int fmt = opt->output_format;
3564 if (fmt & DIFF_FORMAT_CHECKDIFF)
3566 diff_flush_checkdiff(p, opt);
3567 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
3568 diff_flush_raw(p, opt);
3569 else if (fmt & DIFF_FORMAT_NAME) {
3570 const char *name_a, *name_b;
3571 name_a = p->two->path;
3572 name_b = NULL;
3573 strip_prefix(opt->prefix_length, &name_a, &name_b);
3574 write_name_quoted(name_a, opt->file, opt->line_termination);
3575 }
3576}
3577static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
3579{
3580 if (fs->mode)
3581 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
3582 else
3583 fprintf(file, " %s ", newdelete);
3584 write_name_quoted(fs->path, file, '\n');
3585}
3586static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name,
3589 const char *line_prefix)
3590{
3591 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
3592 fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode,
3593 p->two->mode, show_name ? ' ' : '\n');
3594 if (show_name) {
3595 write_name_quoted(p->two->path, file, '\n');
3596 }
3597 }
3598}
3599static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p,
3601 const char *line_prefix)
3602{
3603 char *names = pprint_rename(p->one->path, p->two->path);
3604 fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
3606 free(names);
3607 show_mode_change(file, p, 0, line_prefix);
3608}
3609static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
3611{
3612 FILE *file = opt->file;
3613 char *line_prefix = "";
3614 if (opt->output_prefix) {
3616 struct strbuf *buf = opt->output_prefix(opt, opt->output_prefix_data);
3617 line_prefix = buf->buf;
3618 }
3619 switch(p->status) {
3621 case DIFF_STATUS_DELETED:
3622 fputs(line_prefix, file);
3623 show_file_mode_name(file, "delete", p->one);
3624 break;
3625 case DIFF_STATUS_ADDED:
3626 fputs(line_prefix, file);
3627 show_file_mode_name(file, "create", p->two);
3628 break;
3629 case DIFF_STATUS_COPIED:
3630 fputs(line_prefix, file);
3631 show_rename_copy(file, "copy", p, line_prefix);
3632 break;
3633 case DIFF_STATUS_RENAMED:
3634 fputs(line_prefix, file);
3635 show_rename_copy(file, "rename", p, line_prefix);
3636 break;
3637 default:
3638 if (p->score) {
3639 fprintf(file, "%s rewrite ", line_prefix);
3640 write_name_quoted(p->two->path, file, ' ');
3641 fprintf(file, "(%d%%)\n", similarity_index(p));
3642 }
3643 show_mode_change(file, p, !p->score, line_prefix);
3644 break;
3645 }
3646}
3647struct patch_id_t {
3649 git_SHA_CTX *ctx;
3650 int patchlen;
3651};
3652static int remove_space(char *line, int len)
3654{
3655 int i;
3656 char *dst = line;
3657 unsigned char c;
3658 for (i = 0; i < len; i++)
3660 if (!isspace((c = line[i])))
3661 *dst++ = c;
3662 return dst - line;
3664}
3665static void patch_id_consume(void *priv, char *line, unsigned long len)
3667{
3668 struct patch_id_t *data = priv;
3669 int new_len;
3670 /* Ignore line numbers when computing the SHA1 of the patch */
3672 if (!prefixcmp(line, "@@ -"))
3673 return;
3674 new_len = remove_space(line, len);
3676 git_SHA1_Update(data->ctx, line, new_len);
3678 data->patchlen += new_len;
3679}
3680/* returns 0 upon success, and writes result into sha1 */
3682static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
3683{
3684 struct diff_queue_struct *q = &diff_queued_diff;
3685 int i;
3686 git_SHA_CTX ctx;
3687 struct patch_id_t data;
3688 char buffer[PATH_MAX * 4 + 20];
3689 git_SHA1_Init(&ctx);
3691 memset(&data, 0, sizeof(struct patch_id_t));
3692 data.ctx = &ctx;
3693 for (i = 0; i < q->nr; i++) {
3695 xpparam_t xpp;
3696 xdemitconf_t xecfg;
3697 mmfile_t mf1, mf2;
3698 struct diff_filepair *p = q->queue[i];
3699 int len1, len2;
3700 memset(&xpp, 0, sizeof(xpp));
3702 memset(&xecfg, 0, sizeof(xecfg));
3703 if (p->status == 0)
3704 return error("internal diff status error");
3705 if (p->status == DIFF_STATUS_UNKNOWN)
3706 continue;
3707 if (diff_unmodified_pair(p))
3708 continue;
3709 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3710 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3711 continue;
3712 if (DIFF_PAIR_UNMERGED(p))
3713 continue;
3714 diff_fill_sha1_info(p->one);
3716 diff_fill_sha1_info(p->two);
3717 if (fill_mmfile(&mf1, p->one) < 0 ||
3718 fill_mmfile(&mf2, p->two) < 0)
3719 return error("unable to read files to diff");
3720 len1 = remove_space(p->one->path, strlen(p->one->path));
3722 len2 = remove_space(p->two->path, strlen(p->two->path));
3723 if (p->one->mode == 0)
3724 len1 = snprintf(buffer, sizeof(buffer),
3725 "diff--gita/%.*sb/%.*s"
3726 "newfilemode%06o"
3727 "---/dev/null"
3728 "+++b/%.*s",
3729 len1, p->one->path,
3730 len2, p->two->path,
3731 p->two->mode,
3732 len2, p->two->path);
3733 else if (p->two->mode == 0)
3734 len1 = snprintf(buffer, sizeof(buffer),
3735 "diff--gita/%.*sb/%.*s"
3736 "deletedfilemode%06o"
3737 "---a/%.*s"
3738 "+++/dev/null",
3739 len1, p->one->path,
3740 len2, p->two->path,
3741 p->one->mode,
3742 len1, p->one->path);
3743 else
3744 len1 = snprintf(buffer, sizeof(buffer),
3745 "diff--gita/%.*sb/%.*s"
3746 "---a/%.*s"
3747 "+++b/%.*s",
3748 len1, p->one->path,
3749 len2, p->two->path,
3750 len1, p->one->path,
3751 len2, p->two->path);
3752 git_SHA1_Update(&ctx, buffer, len1);
3753 xpp.flags = 0;
3755 xecfg.ctxlen = 3;
3756 xecfg.flags = XDL_EMIT_FUNCNAMES;
3757 xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
3758 &xpp, &xecfg);
3759 }
3760 git_SHA1_Final(sha1, &ctx);
3762 return 0;
3763}
3764int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
3766{
3767 struct diff_queue_struct *q = &diff_queued_diff;
3768 int i;
3769 int result = diff_get_patch_id(options, sha1);
3770 for (i = 0; i < q->nr; i++)
3772 diff_free_filepair(q->queue[i]);
3773 free(q->queue);
3775 DIFF_QUEUE_CLEAR(q);
3776 return result;
3778}
3779static int is_summary_empty(const struct diff_queue_struct *q)
3781{
3782 int i;
3783 for (i = 0; i < q->nr; i++) {
3785 const struct diff_filepair *p = q->queue[i];
3786 switch (p->status) {
3788 case DIFF_STATUS_DELETED:
3789 case DIFF_STATUS_ADDED:
3790 case DIFF_STATUS_COPIED:
3791 case DIFF_STATUS_RENAMED:
3792 return 0;
3793 default:
3794 if (p->score)
3795 return 0;
3796 if (p->one->mode && p->two->mode &&
3797 p->one->mode != p->two->mode)
3798 return 0;
3799 break;
3800 }
3801 }
3802 return 1;
3803}
3804void diff_flush(struct diff_options *options)
3806{
3807 struct diff_queue_struct *q = &diff_queued_diff;
3808 int i, output_format = options->output_format;
3809 int separator = 0;
3810 /*
3812 * Order: raw, stat, summary, patch
3813 * or: name/name-status/checkdiff (other bits clear)
3814 */
3815 if (!q->nr)
3816 goto free_queue;
3817 if (output_format & (DIFF_FORMAT_RAW |
3819 DIFF_FORMAT_NAME |
3820 DIFF_FORMAT_NAME_STATUS |
3821 DIFF_FORMAT_CHECKDIFF)) {
3822 for (i = 0; i < q->nr; i++) {
3823 struct diff_filepair *p = q->queue[i];
3824 if (check_pair_status(p))
3825 flush_one_pair(p, options);
3826 }
3827 separator++;
3828 }
3829 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) {
3831 struct diffstat_t diffstat;
3832 memset(&diffstat, 0, sizeof(struct diffstat_t));
3834 for (i = 0; i < q->nr; i++) {
3835 struct diff_filepair *p = q->queue[i];
3836 if (check_pair_status(p))
3837 diff_flush_stat(p, options, &diffstat);
3838 }
3839 if (output_format & DIFF_FORMAT_NUMSTAT)
3840 show_numstat(&diffstat, options);
3841 if (output_format & DIFF_FORMAT_DIFFSTAT)
3842 show_stats(&diffstat, options);
3843 if (output_format & DIFF_FORMAT_SHORTSTAT)
3844 show_shortstats(&diffstat, options);
3845 free_diffstat_info(&diffstat);
3846 separator++;
3847 }
3848 if (output_format & DIFF_FORMAT_DIRSTAT)
3849 show_dirstat(options);
3850 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
3852 for (i = 0; i < q->nr; i++) {
3853 diff_summary(options, q->queue[i]);
3854 }
3855 separator++;
3856 }
3857 if (output_format & DIFF_FORMAT_NO_OUTPUT &&
3859 DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
3860 DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
3861 /*
3862 * run diff_flush_patch for the exit status. setting
3863 * options->file to /dev/null should be safe, becaue we
3864 * aren't supposed to produce any output anyway.
3865 */
3866 if (options->close_file)
3867 fclose(options->file);
3868 options->file = fopen("/dev/null", "w");
3869 if (!options->file)
3870 die_errno("Could not open /dev/null");
3871 options->close_file = 1;
3872 for (i = 0; i < q->nr; i++) {
3873 struct diff_filepair *p = q->queue[i];
3874 if (check_pair_status(p))
3875 diff_flush_patch(p, options);
3876 if (options->found_changes)
3877 break;
3878 }
3879 }
3880 if (output_format & DIFF_FORMAT_PATCH) {
3882 if (separator) {
3883 putc(options->line_termination, options->file);
3884 if (options->stat_sep) {
3885 /* attach patch instead of inline */
3886 fputs(options->stat_sep, options->file);
3887 }
3888 }
3889 for (i = 0; i < q->nr; i++) {
3891 struct diff_filepair *p = q->queue[i];
3892 if (check_pair_status(p))
3893 diff_flush_patch(p, options);
3894 }
3895 }
3896 if (output_format & DIFF_FORMAT_CALLBACK)
3898 options->format_callback(q, options, options->format_callback_data);
3899 for (i = 0; i < q->nr; i++)
3901 diff_free_filepair(q->queue[i]);
3902free_queue:
3903 free(q->queue);
3904 DIFF_QUEUE_CLEAR(q);
3905 if (options->close_file)
3906 fclose(options->file);
3907 /*
3909 * Report the content-level differences with HAS_CHANGES;
3910 * diff_addremove/diff_change does not set the bit when
3911 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
3912 */
3913 if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
3914 if (options->found_changes)
3915 DIFF_OPT_SET(options, HAS_CHANGES);
3916 else
3917 DIFF_OPT_CLR(options, HAS_CHANGES);
3918 }
3919}
3920static void diffcore_apply_filter(const char *filter)
3922{
3923 int i;
3924 struct diff_queue_struct *q = &diff_queued_diff;
3925 struct diff_queue_struct outq;
3926 DIFF_QUEUE_CLEAR(&outq);
3927 if (!filter)
3929 return;
3930 if (strchr(filter, DIFF_STATUS_FILTER_AON)) {
3932 int found;
3933 for (i = found = 0; !found && i < q->nr; i++) {
3934 struct diff_filepair *p = q->queue[i];
3935 if (((p->status == DIFF_STATUS_MODIFIED) &&
3936 ((p->score &&
3937 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3938 (!p->score &&
3939 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3940 ((p->status != DIFF_STATUS_MODIFIED) &&
3941 strchr(filter, p->status)))
3942 found++;
3943 }
3944 if (found)
3945 return;
3946 /* otherwise we will clear the whole queue
3948 * by copying the empty outq at the end of this
3949 * function, but first clear the current entries
3950 * in the queue.
3951 */
3952 for (i = 0; i < q->nr; i++)
3953 diff_free_filepair(q->queue[i]);
3954 }
3955 else {
3956 /* Only the matching ones */
3957 for (i = 0; i < q->nr; i++) {
3958 struct diff_filepair *p = q->queue[i];
3959 if (((p->status == DIFF_STATUS_MODIFIED) &&
3961 ((p->score &&
3962 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3963 (!p->score &&
3964 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3965 ((p->status != DIFF_STATUS_MODIFIED) &&
3966 strchr(filter, p->status)))
3967 diff_q(&outq, p);
3968 else
3969 diff_free_filepair(p);
3970 }
3971 }
3972 free(q->queue);
3973 *q = outq;
3974}
3975/* Check whether two filespecs with the same mode and size are identical */
3977static int diff_filespec_is_identical(struct diff_filespec *one,
3978 struct diff_filespec *two)
3979{
3980 if (S_ISGITLINK(one->mode))
3981 return 0;
3982 if (diff_populate_filespec(one, 0))
3983 return 0;
3984 if (diff_populate_filespec(two, 0))
3985 return 0;
3986 return !memcmp(one->data, two->data, one->size);
3987}
3988static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3990{
3991 int i;
3992 struct diff_queue_struct *q = &diff_queued_diff;
3993 struct diff_queue_struct outq;
3994 DIFF_QUEUE_CLEAR(&outq);
3995 for (i = 0; i < q->nr; i++) {
3997 struct diff_filepair *p = q->queue[i];
3998 /*
4000 * 1. Entries that come from stat info dirtiness
4001 * always have both sides (iow, not create/delete),
4002 * one side of the object name is unknown, with
4003 * the same mode and size. Keep the ones that
4004 * do not match these criteria. They have real
4005 * differences.
4006 *
4007 * 2. At this point, the file is known to be modified,
4008 * with the same mode and size, and the object
4009 * name of one side is unknown. Need to inspect
4010 * the identical contents.
4011 */
4012 if (!DIFF_FILE_VALID(p->one) || /* (1) */
4013 !DIFF_FILE_VALID(p->two) ||
4014 (p->one->sha1_valid && p->two->sha1_valid) ||
4015 (p->one->mode != p->two->mode) ||
4016 diff_populate_filespec(p->one, 1) ||
4017 diff_populate_filespec(p->two, 1) ||
4018 (p->one->size != p->two->size) ||
4019 !diff_filespec_is_identical(p->one, p->two)) /* (2) */
4020 diff_q(&outq, p);
4021 else {
4022 /*
4023 * The caller can subtract 1 from skip_stat_unmatch
4024 * to determine how many paths were dirty only
4025 * due to stat info mismatch.
4026 */
4027 if (!DIFF_OPT_TST(diffopt, NO_INDEX))
4028 diffopt->skip_stat_unmatch++;
4029 diff_free_filepair(p);
4030 }
4031 }
4032 free(q->queue);
4033 *q = outq;
4034}
4035static int diffnamecmp(const void *a_, const void *b_)
4037{
4038 const struct diff_filepair *a = *((const struct diff_filepair **)a_);
4039 const struct diff_filepair *b = *((const struct diff_filepair **)b_);
4040 const char *name_a, *name_b;
4041 name_a = a->one ? a->one->path : a->two->path;
4043 name_b = b->one ? b->one->path : b->two->path;
4044 return strcmp(name_a, name_b);
4045}
4046void diffcore_fix_diff_index(struct diff_options *options)
4048{
4049 struct diff_queue_struct *q = &diff_queued_diff;
4050 qsort(q->queue, q->nr, sizeof(q->queue[0]), diffnamecmp);
4051}
4052void diffcore_std(struct diff_options *options)
4054{
4055 /* We never run this function more than one time, because the
4056 * rename/copy detection logic can only run once.
4057 */
4058 if (diff_queued_diff.run)
4059 return;
4060 if (options->skip_stat_unmatch)
4062 diffcore_skip_stat_unmatch(options);
4063 if (options->break_opt != -1)
4064 diffcore_break(options->break_opt);
4065 if (options->detect_rename)
4066 diffcore_rename(options);
4067 if (options->break_opt != -1)
4068 diffcore_merge_broken();
4069 if (options->pickaxe)
4070 diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
4071 if (options->orderfile)
4072 diffcore_order(options->orderfile);
4073 diff_resolve_rename_copy();
4074 diffcore_apply_filter(options->filter);
4075 if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
4077 DIFF_OPT_SET(options, HAS_CHANGES);
4078 else
4079 DIFF_OPT_CLR(options, HAS_CHANGES);
4080 diff_queued_diff.run = 1;
4082}
4083int diff_result_code(struct diff_options *opt, int status)
4085{
4086 int result = 0;
4087 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
4088 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
4089 return status;
4090 if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
4091 DIFF_OPT_TST(opt, HAS_CHANGES))
4092 result |= 01;
4093 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
4094 DIFF_OPT_TST(opt, CHECK_FAILED))
4095 result |= 02;
4096 return result;
4097}
4098void diff_addremove(struct diff_options *options,
4100 int addremove, unsigned mode,
4101 const unsigned char *sha1,
4102 const char *concatpath, unsigned dirty_submodule)
4103{
4104 struct diff_filespec *one, *two;
4105 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(mode))
4107 return;
4108 /* This may look odd, but it is a preparation for
4110 * feeding "there are unchanged files which should
4111 * not produce diffs, but when you are doing copy
4112 * detection you would need them, so here they are"
4113 * entries to the diff-core. They will be prefixed
4114 * with something like '=' or '*' (I haven't decided
4115 * which but should not make any difference).
4116 * Feeding the same new and old to diff_change()
4117 * also has the same effect.
4118 * Before the final output happens, they are pruned after
4119 * merged into rename/copy pairs as appropriate.
4120 */
4121 if (DIFF_OPT_TST(options, REVERSE_DIFF))
4122 addremove = (addremove == '+' ? '-' :
4123 addremove == '-' ? '+' : addremove);
4124 if (options->prefix &&
4126 strncmp(concatpath, options->prefix, options->prefix_length))
4127 return;
4128 one = alloc_filespec(concatpath);
4130 two = alloc_filespec(concatpath);
4131 if (addremove != '+')
4133 fill_filespec(one, sha1, mode);
4134 if (addremove != '-') {
4135 fill_filespec(two, sha1, mode);
4136 two->dirty_submodule = dirty_submodule;
4137 }
4138 diff_queue(&diff_queued_diff, one, two);
4140 if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
4141 DIFF_OPT_SET(options, HAS_CHANGES);
4142}
4143void diff_change(struct diff_options *options,
4145 unsigned old_mode, unsigned new_mode,
4146 const unsigned char *old_sha1,
4147 const unsigned char *new_sha1,
4148 const char *concatpath,
4149 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
4150{
4151 struct diff_filespec *one, *two;
4152 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(old_mode)
4154 && S_ISGITLINK(new_mode))
4155 return;
4156 if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
4158 unsigned tmp;
4159 const unsigned char *tmp_c;
4160 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
4161 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
4162 tmp = old_dirty_submodule; old_dirty_submodule = new_dirty_submodule;
4163 new_dirty_submodule = tmp;
4164 }
4165 if (options->prefix &&
4167 strncmp(concatpath, options->prefix, options->prefix_length))
4168 return;
4169 one = alloc_filespec(concatpath);
4171 two = alloc_filespec(concatpath);
4172 fill_filespec(one, old_sha1, old_mode);
4173 fill_filespec(two, new_sha1, new_mode);
4174 one->dirty_submodule = old_dirty_submodule;
4175 two->dirty_submodule = new_dirty_submodule;
4176 diff_queue(&diff_queued_diff, one, two);
4178 if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
4179 DIFF_OPT_SET(options, HAS_CHANGES);
4180}
4181void diff_unmerge(struct diff_options *options,
4183 const char *path,
4184 unsigned mode, const unsigned char *sha1)
4185{
4186 struct diff_filespec *one, *two;
4187 if (options->prefix &&
4189 strncmp(path, options->prefix, options->prefix_length))
4190 return;
4191 one = alloc_filespec(path);
4193 two = alloc_filespec(path);
4194 fill_filespec(one, sha1, mode);
4195 diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;
4196}
4197static char *run_textconv(const char *pgm, struct diff_filespec *spec,
4199 size_t *outsize)
4200{
4201 struct diff_tempfile *temp;
4202 const char *argv[3];
4203 const char **arg = argv;
4204 struct child_process child;
4205 struct strbuf buf = STRBUF_INIT;
4206 int err = 0;
4207 temp = prepare_temp_file(spec->path, spec);
4209 *arg++ = pgm;
4210 *arg++ = temp->name;
4211 *arg = NULL;
4212 memset(&child, 0, sizeof(child));
4214 child.use_shell = 1;
4215 child.argv = argv;
4216 child.out = -1;
4217 if (start_command(&child)) {
4218 remove_tempfile();
4219 return NULL;
4220 }
4221 if (strbuf_read(&buf, child.out, 0) < 0)
4223 err = error("error reading from textconv command '%s'", pgm);
4224 close(child.out);
4225 if (finish_command(&child) || err) {
4227 strbuf_release(&buf);
4228 remove_tempfile();
4229 return NULL;
4230 }
4231 remove_tempfile();
4232 return strbuf_detach(&buf, outsize);
4234}
4235static size_t fill_textconv(struct userdiff_driver *driver,
4237 struct diff_filespec *df,
4238 char **outbuf)
4239{
4240 size_t size;
4241 if (!driver || !driver->textconv) {
4243 if (!DIFF_FILE_VALID(df)) {
4244 *outbuf = "";
4245 return 0;
4246 }
4247 if (diff_populate_filespec(df, 0))
4248 die("unable to read files to diff");
4249 *outbuf = df->data;
4250 return df->size;
4251 }
4252 if (driver->textconv_cache) {
4254 *outbuf = notes_cache_get(driver->textconv_cache, df->sha1,
4255 &size);
4256 if (*outbuf)
4257 return size;
4258 }
4259 *outbuf = run_textconv(driver->textconv, df, &size);
4261 if (!*outbuf)
4262 die("unable to read files to diff");
4263 if (driver->textconv_cache) {
4265 /* ignore errors, as we might be in a readonly repository */
4266 notes_cache_put(driver->textconv_cache, df->sha1, *outbuf,
4267 size);
4268 /*
4269 * we could save up changes and flush them all at the end,
4270 * but we would need an extra call after all diffing is done.
4271 * Since generating a cache entry is the slow path anyway,
4272 * this extra overhead probably isn't a big deal.
4273 */
4274 notes_cache_write(driver->textconv_cache);
4275 }
4276 return size;
4278}