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