2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
16 #include "submodule.h"
19 #ifdef NO_FAST_WORKING_DIRECTORY
20 #define FAST_WORKING_DIRECTORY 0
22 #define FAST_WORKING_DIRECTORY 1
25 static int diff_detect_rename_default;
26 static int diff_rename_limit_default = 200;
27 static int diff_suppress_blank_empty;
28 int diff_use_color_default = -1;
29 static const char *diff_word_regex_cfg;
30 static const char *external_diff_cmd_cfg;
31 int diff_auto_refresh_index = 1;
32 static int diff_mnemonic_prefix;
34 static char diff_colors[][COLOR_MAXLEN] = {
36 GIT_COLOR_NORMAL, /* PLAIN */
37 GIT_COLOR_BOLD, /* METAINFO */
38 GIT_COLOR_CYAN, /* FRAGINFO */
39 GIT_COLOR_RED, /* OLD */
40 GIT_COLOR_GREEN, /* NEW */
41 GIT_COLOR_YELLOW, /* COMMIT */
42 GIT_COLOR_BG_RED, /* WHITESPACE */
43 GIT_COLOR_NORMAL, /* FUNCINFO */
46 static void diff_filespec_load_driver(struct diff_filespec *one);
47 static char *run_textconv(const char *, struct diff_filespec *, size_t *);
49 static int parse_diff_color_slot(const char *var, int ofs)
51 if (!strcasecmp(var+ofs, "plain"))
53 if (!strcasecmp(var+ofs, "meta"))
55 if (!strcasecmp(var+ofs, "frag"))
57 if (!strcasecmp(var+ofs, "old"))
59 if (!strcasecmp(var+ofs, "new"))
61 if (!strcasecmp(var+ofs, "commit"))
63 if (!strcasecmp(var+ofs, "whitespace"))
64 return DIFF_WHITESPACE;
65 if (!strcasecmp(var+ofs, "func"))
70 static int git_config_rename(const char *var, const char *value)
73 return DIFF_DETECT_RENAME;
74 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
75 return DIFF_DETECT_COPY;
76 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
80 * These are to give UI layer defaults.
81 * The core-level commands such as git-diff-files should
82 * never be affected by the setting of diff.renames
83 * the user happens to have in the configuration file.
85 int git_diff_ui_config(const char *var, const char *value, void *cb)
87 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
88 diff_use_color_default = git_config_colorbool(var, value, -1);
91 if (!strcmp(var, "diff.renames")) {
92 diff_detect_rename_default = git_config_rename(var, value);
95 if (!strcmp(var, "diff.autorefreshindex")) {
96 diff_auto_refresh_index = git_config_bool(var, value);
99 if (!strcmp(var, "diff.mnemonicprefix")) {
100 diff_mnemonic_prefix = git_config_bool(var, value);
103 if (!strcmp(var, "diff.external"))
104 return git_config_string(&external_diff_cmd_cfg, var, value);
105 if (!strcmp(var, "diff.wordregex"))
106 return git_config_string(&diff_word_regex_cfg, var, value);
108 return git_diff_basic_config(var, value, cb);
111 int git_diff_basic_config(const char *var, const char *value, void *cb)
113 if (!strcmp(var, "diff.renamelimit")) {
114 diff_rename_limit_default = git_config_int(var, value);
118 switch (userdiff_config(var, value)) {
124 if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
125 int slot = parse_diff_color_slot(var, 11);
129 return config_error_nonbool(var);
130 color_parse(value, var, diff_colors[slot]);
134 /* like GNU diff's --suppress-blank-empty option */
135 if (!strcmp(var, "diff.suppressblankempty") ||
136 /* for backwards compatibility */
137 !strcmp(var, "diff.suppress-blank-empty")) {
138 diff_suppress_blank_empty = git_config_bool(var, value);
142 return git_color_default_config(var, value, cb);
145 static char *quote_two(const char *one, const char *two)
147 int need_one = quote_c_style(one, NULL, NULL, 1);
148 int need_two = quote_c_style(two, NULL, NULL, 1);
149 struct strbuf res = STRBUF_INIT;
151 if (need_one + need_two) {
152 strbuf_addch(&res, '"');
153 quote_c_style(one, &res, NULL, 1);
154 quote_c_style(two, &res, NULL, 1);
155 strbuf_addch(&res, '"');
157 strbuf_addstr(&res, one);
158 strbuf_addstr(&res, two);
160 return strbuf_detach(&res, NULL);
163 static const char *external_diff(void)
165 static const char *external_diff_cmd = NULL;
166 static int done_preparing = 0;
169 return external_diff_cmd;
170 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
171 if (!external_diff_cmd)
172 external_diff_cmd = external_diff_cmd_cfg;
174 return external_diff_cmd;
177 static struct diff_tempfile {
178 const char *name; /* filename external diff should read from */
181 char tmp_path[PATH_MAX];
184 typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
186 struct emit_callback {
189 int blank_at_eof_in_preimage;
190 int blank_at_eof_in_postimage;
192 int lno_in_postimage;
193 sane_truncate_fn truncate;
194 const char **label_path;
195 struct diff_words_data *diff_words;
198 struct strbuf *header;
201 static int count_lines(const char *data, int size)
203 int count, ch, completely_empty = 1, nl_just_seen = 0;
210 completely_empty = 0;
214 completely_empty = 0;
217 if (completely_empty)
220 count++; /* no trailing newline */
224 static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
226 if (!DIFF_FILE_VALID(one)) {
227 mf->ptr = (char *)""; /* does not matter */
231 else if (diff_populate_filespec(one, 0))
235 mf->size = one->size;
239 static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
242 long size = mf->size;
247 ptr += size - 1; /* pointing at the very end */
249 ; /* incomplete line */
251 ptr--; /* skip the last LF */
252 while (mf->ptr < ptr) {
254 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
255 if (*prev_eol == '\n')
257 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
265 static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
266 struct emit_callback *ecbdata)
269 unsigned ws_rule = ecbdata->ws_rule;
270 l1 = count_trailing_blank(mf1, ws_rule);
271 l2 = count_trailing_blank(mf2, ws_rule);
273 ecbdata->blank_at_eof_in_preimage = 0;
274 ecbdata->blank_at_eof_in_postimage = 0;
277 at = count_lines(mf1->ptr, mf1->size);
278 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
280 at = count_lines(mf2->ptr, mf2->size);
281 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
284 static void emit_line_0(FILE *file, const char *set, const char *reset,
285 int first, const char *line, int len)
287 int has_trailing_newline, has_trailing_carriage_return;
291 has_trailing_newline = (first == '\n');
292 has_trailing_carriage_return = (!has_trailing_newline &&
294 nofirst = has_trailing_newline || has_trailing_carriage_return;
296 has_trailing_newline = (len > 0 && line[len-1] == '\n');
297 if (has_trailing_newline)
299 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
300 if (has_trailing_carriage_return)
305 if (len || !nofirst) {
309 fwrite(line, len, 1, file);
312 if (has_trailing_carriage_return)
314 if (has_trailing_newline)
318 static void emit_line(FILE *file, const char *set, const char *reset,
319 const char *line, int len)
321 emit_line_0(file, set, reset, line[0], line+1, len-1);
324 static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
326 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
327 ecbdata->blank_at_eof_in_preimage &&
328 ecbdata->blank_at_eof_in_postimage &&
329 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
330 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
332 return ws_blank_line(line, len, ecbdata->ws_rule);
335 static void emit_add_line(const char *reset,
336 struct emit_callback *ecbdata,
337 const char *line, int len)
339 const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
340 const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
343 emit_line_0(ecbdata->file, set, reset, '+', line, len);
344 else if (new_blank_line_at_eof(ecbdata, line, len))
345 /* Blank line at EOF - paint '+' as well */
346 emit_line_0(ecbdata->file, ws, reset, '+', line, len);
348 /* Emit just the prefix, then the rest. */
349 emit_line_0(ecbdata->file, set, reset, '+', "", 0);
350 ws_check_emit(line, len, ecbdata->ws_rule,
351 ecbdata->file, set, reset, ws);
355 static void emit_hunk_header(struct emit_callback *ecbdata,
356 const char *line, int len)
358 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
359 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
360 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
361 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
362 static const char atat[2] = { '@', '@' };
366 * As a hunk header must begin with "@@ -<old>, +<new> @@",
367 * it always is at least 10 bytes long.
370 memcmp(line, atat, 2) ||
371 !(ep = memmem(line + 2, len - 2, atat, 2))) {
372 emit_line(ecbdata->file, plain, reset, line, len);
375 ep += 2; /* skip over @@ */
377 /* The hunk header in fraginfo color */
378 emit_line(ecbdata->file, frag, reset, line, ep - line);
380 /* blank before the func header */
381 for (cp = ep; ep - line < len; ep++)
382 if (*ep != ' ' && *ep != '\t')
385 emit_line(ecbdata->file, plain, reset, cp, ep - cp);
388 emit_line(ecbdata->file, func, reset, ep, line + len - ep);
391 static struct diff_tempfile *claim_diff_tempfile(void) {
393 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
394 if (!diff_temp[i].name)
395 return diff_temp + i;
396 die("BUG: diff is failing to clean up its tempfiles");
399 static int remove_tempfile_installed;
401 static void remove_tempfile(void)
404 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
405 if (diff_temp[i].name == diff_temp[i].tmp_path)
406 unlink_or_warn(diff_temp[i].name);
407 diff_temp[i].name = NULL;
411 static void remove_tempfile_on_signal(int signo)
418 static void print_line_count(FILE *file, int count)
422 fprintf(file, "0,0");
428 fprintf(file, "1,%d", count);
433 static void emit_rewrite_lines(struct emit_callback *ecb,
434 int prefix, const char *data, int size)
436 const char *endp = NULL;
437 static const char *nneof = " No newline at end of file\n";
438 const char *old = diff_get_color(ecb->color_diff, DIFF_FILE_OLD);
439 const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
444 endp = memchr(data, '\n', size);
445 len = endp ? (endp - data + 1) : size;
447 ecb->lno_in_preimage++;
448 emit_line_0(ecb->file, old, reset, '-',
451 ecb->lno_in_postimage++;
452 emit_add_line(reset, ecb, data, len);
458 const char *plain = diff_get_color(ecb->color_diff,
460 emit_line_0(ecb->file, plain, reset, '\\',
461 nneof, strlen(nneof));
465 static void emit_rewrite_diff(const char *name_a,
467 struct diff_filespec *one,
468 struct diff_filespec *two,
469 const char *textconv_one,
470 const char *textconv_two,
471 struct diff_options *o)
474 int color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
475 const char *name_a_tab, *name_b_tab;
476 const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO);
477 const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO);
478 const char *reset = diff_get_color(color_diff, DIFF_RESET);
479 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
480 const char *a_prefix, *b_prefix;
481 const char *data_one, *data_two;
482 size_t size_one, size_two;
483 struct emit_callback ecbdata;
485 if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
486 a_prefix = o->b_prefix;
487 b_prefix = o->a_prefix;
489 a_prefix = o->a_prefix;
490 b_prefix = o->b_prefix;
493 name_a += (*name_a == '/');
494 name_b += (*name_b == '/');
495 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
496 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
498 strbuf_reset(&a_name);
499 strbuf_reset(&b_name);
500 quote_two_c_style(&a_name, a_prefix, name_a, 0);
501 quote_two_c_style(&b_name, b_prefix, name_b, 0);
503 diff_populate_filespec(one, 0);
504 diff_populate_filespec(two, 0);
506 data_one = run_textconv(textconv_one, one, &size_one);
508 die("unable to read files to diff");
511 data_one = one->data;
512 size_one = one->size;
515 data_two = run_textconv(textconv_two, two, &size_two);
517 die("unable to read files to diff");
520 data_two = two->data;
521 size_two = two->size;
524 memset(&ecbdata, 0, sizeof(ecbdata));
525 ecbdata.color_diff = color_diff;
526 ecbdata.found_changesp = &o->found_changes;
527 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
528 ecbdata.file = o->file;
529 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
531 mf1.ptr = (char *)data_one;
532 mf2.ptr = (char *)data_two;
535 check_blank_at_eof(&mf1, &mf2, &ecbdata);
537 ecbdata.lno_in_preimage = 1;
538 ecbdata.lno_in_postimage = 1;
540 lc_a = count_lines(data_one, size_one);
541 lc_b = count_lines(data_two, size_two);
543 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
544 metainfo, a_name.buf, name_a_tab, reset,
545 metainfo, b_name.buf, name_b_tab, reset, fraginfo);
546 print_line_count(o->file, lc_a);
547 fprintf(o->file, " +");
548 print_line_count(o->file, lc_b);
549 fprintf(o->file, " @@%s\n", reset);
551 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
553 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
555 free((char *)data_one);
557 free((char *)data_two);
560 struct diff_words_buffer {
563 struct diff_words_orig {
564 const char *begin, *end;
566 int orig_nr, orig_alloc;
569 static void diff_words_append(char *line, unsigned long len,
570 struct diff_words_buffer *buffer)
572 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
575 memcpy(buffer->text.ptr + buffer->text.size, line, len);
576 buffer->text.size += len;
577 buffer->text.ptr[buffer->text.size] = '\0';
580 struct diff_words_data {
581 struct diff_words_buffer minus, plus;
582 const char *current_plus;
587 static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
589 struct diff_words_data *diff_words = priv;
590 int minus_first, minus_len, plus_first, plus_len;
591 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
593 if (line[0] != '@' || parse_hunk_header(line, len,
594 &minus_first, &minus_len, &plus_first, &plus_len))
597 /* POSIX requires that first be decremented by one if len == 0... */
599 minus_begin = diff_words->minus.orig[minus_first].begin;
601 diff_words->minus.orig[minus_first + minus_len - 1].end;
603 minus_begin = minus_end =
604 diff_words->minus.orig[minus_first].end;
607 plus_begin = diff_words->plus.orig[plus_first].begin;
608 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
610 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
612 if (diff_words->current_plus != plus_begin)
613 fwrite(diff_words->current_plus,
614 plus_begin - diff_words->current_plus, 1,
616 if (minus_begin != minus_end)
617 color_fwrite_lines(diff_words->file,
618 diff_get_color(1, DIFF_FILE_OLD),
619 minus_end - minus_begin, minus_begin);
620 if (plus_begin != plus_end)
621 color_fwrite_lines(diff_words->file,
622 diff_get_color(1, DIFF_FILE_NEW),
623 plus_end - plus_begin, plus_begin);
625 diff_words->current_plus = plus_end;
628 /* This function starts looking at *begin, and returns 0 iff a word was found. */
629 static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
630 int *begin, int *end)
632 if (word_regex && *begin < buffer->size) {
634 if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) {
635 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
636 '\n', match[0].rm_eo - match[0].rm_so);
637 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
638 *begin += match[0].rm_so;
639 return *begin >= *end;
644 /* find the next word */
645 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
647 if (*begin >= buffer->size)
650 /* find the end of the word */
652 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
659 * This function splits the words in buffer->text, stores the list with
660 * newline separator into out, and saves the offsets of the original words
663 static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
672 /* fake an empty "0th" word */
673 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
674 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
677 for (i = 0; i < buffer->text.size; i++) {
678 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
681 /* store original boundaries */
682 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
684 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
685 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
689 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
690 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
691 out->ptr[out->size + j - i] = '\n';
692 out->size += j - i + 1;
698 /* this executes the word diff on the accumulated buffers */
699 static void diff_words_show(struct diff_words_data *diff_words)
703 mmfile_t minus, plus;
705 /* special case: only removal */
706 if (!diff_words->plus.text.size) {
707 color_fwrite_lines(diff_words->file,
708 diff_get_color(1, DIFF_FILE_OLD),
709 diff_words->minus.text.size, diff_words->minus.text.ptr);
710 diff_words->minus.text.size = 0;
714 diff_words->current_plus = diff_words->plus.text.ptr;
716 memset(&xpp, 0, sizeof(xpp));
717 memset(&xecfg, 0, sizeof(xecfg));
718 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
719 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
721 /* as only the hunk header will be parsed, we need a 0-context */
723 xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
727 if (diff_words->current_plus != diff_words->plus.text.ptr +
728 diff_words->plus.text.size)
729 fwrite(diff_words->current_plus,
730 diff_words->plus.text.ptr + diff_words->plus.text.size
731 - diff_words->current_plus, 1,
733 diff_words->minus.text.size = diff_words->plus.text.size = 0;
736 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
737 static void diff_words_flush(struct emit_callback *ecbdata)
739 if (ecbdata->diff_words->minus.text.size ||
740 ecbdata->diff_words->plus.text.size)
741 diff_words_show(ecbdata->diff_words);
744 static void free_diff_words_data(struct emit_callback *ecbdata)
746 if (ecbdata->diff_words) {
747 diff_words_flush(ecbdata);
748 free (ecbdata->diff_words->minus.text.ptr);
749 free (ecbdata->diff_words->minus.orig);
750 free (ecbdata->diff_words->plus.text.ptr);
751 free (ecbdata->diff_words->plus.orig);
752 free(ecbdata->diff_words->word_regex);
753 free(ecbdata->diff_words);
754 ecbdata->diff_words = NULL;
758 const char *diff_get_color(int diff_use_color, enum color_diff ix)
761 return diff_colors[ix];
765 static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
772 return ecb->truncate(line, len);
776 (void) utf8_width(&cp, &l);
778 break; /* truncated in the middle? */
783 static void find_lno(const char *line, struct emit_callback *ecbdata)
786 ecbdata->lno_in_preimage = 0;
787 ecbdata->lno_in_postimage = 0;
788 p = strchr(line, '-');
790 return; /* cannot happen */
791 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
794 return; /* cannot happen */
795 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
798 static void fn_out_consume(void *priv, char *line, unsigned long len)
800 struct emit_callback *ecbdata = priv;
801 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
802 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
803 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
805 if (ecbdata->header) {
806 fprintf(ecbdata->file, "%s", ecbdata->header->buf);
807 strbuf_reset(ecbdata->header);
808 ecbdata->header = NULL;
810 *(ecbdata->found_changesp) = 1;
812 if (ecbdata->label_path[0]) {
813 const char *name_a_tab, *name_b_tab;
815 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
816 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
818 fprintf(ecbdata->file, "%s--- %s%s%s\n",
819 meta, ecbdata->label_path[0], reset, name_a_tab);
820 fprintf(ecbdata->file, "%s+++ %s%s%s\n",
821 meta, ecbdata->label_path[1], reset, name_b_tab);
822 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
825 if (diff_suppress_blank_empty
826 && len == 2 && line[0] == ' ' && line[1] == '\n') {
831 if (line[0] == '@') {
832 if (ecbdata->diff_words)
833 diff_words_flush(ecbdata);
834 len = sane_truncate_line(ecbdata, line, len);
835 find_lno(line, ecbdata);
836 emit_hunk_header(ecbdata, line, len);
837 if (line[len-1] != '\n')
838 putc('\n', ecbdata->file);
843 emit_line(ecbdata->file, reset, reset, line, len);
847 if (ecbdata->diff_words) {
848 if (line[0] == '-') {
849 diff_words_append(line, len,
850 &ecbdata->diff_words->minus);
852 } else if (line[0] == '+') {
853 diff_words_append(line, len,
854 &ecbdata->diff_words->plus);
857 diff_words_flush(ecbdata);
860 emit_line(ecbdata->file, plain, reset, line, len);
864 if (line[0] != '+') {
866 diff_get_color(ecbdata->color_diff,
867 line[0] == '-' ? DIFF_FILE_OLD : DIFF_PLAIN);
868 ecbdata->lno_in_preimage++;
870 ecbdata->lno_in_postimage++;
871 emit_line(ecbdata->file, color, reset, line, len);
873 ecbdata->lno_in_postimage++;
874 emit_add_line(reset, ecbdata, line + 1, len - 1);
878 static char *pprint_rename(const char *a, const char *b)
882 struct strbuf name = STRBUF_INIT;
883 int pfx_length, sfx_length;
884 int len_a = strlen(a);
885 int len_b = strlen(b);
886 int a_midlen, b_midlen;
887 int qlen_a = quote_c_style(a, NULL, NULL, 0);
888 int qlen_b = quote_c_style(b, NULL, NULL, 0);
890 if (qlen_a || qlen_b) {
891 quote_c_style(a, &name, NULL, 0);
892 strbuf_addstr(&name, " => ");
893 quote_c_style(b, &name, NULL, 0);
894 return strbuf_detach(&name, NULL);
897 /* Find common prefix */
899 while (*old && *new && *old == *new) {
901 pfx_length = old - a + 1;
906 /* Find common suffix */
910 while (a <= old && b <= new && *old == *new) {
912 sfx_length = len_a - (old - a);
918 * pfx{mid-a => mid-b}sfx
919 * {pfx-a => pfx-b}sfx
920 * pfx{sfx-a => sfx-b}
923 a_midlen = len_a - pfx_length - sfx_length;
924 b_midlen = len_b - pfx_length - sfx_length;
930 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
931 if (pfx_length + sfx_length) {
932 strbuf_add(&name, a, pfx_length);
933 strbuf_addch(&name, '{');
935 strbuf_add(&name, a + pfx_length, a_midlen);
936 strbuf_addstr(&name, " => ");
937 strbuf_add(&name, b + pfx_length, b_midlen);
938 if (pfx_length + sfx_length) {
939 strbuf_addch(&name, '}');
940 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
942 return strbuf_detach(&name, NULL);
948 struct diffstat_file {
952 unsigned is_unmerged:1;
953 unsigned is_binary:1;
954 unsigned is_renamed:1;
955 uintmax_t added, deleted;
959 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
963 struct diffstat_file *x;
964 x = xcalloc(sizeof (*x), 1);
965 if (diffstat->nr == diffstat->alloc) {
966 diffstat->alloc = alloc_nr(diffstat->alloc);
967 diffstat->files = xrealloc(diffstat->files,
968 diffstat->alloc * sizeof(x));
970 diffstat->files[diffstat->nr++] = x;
972 x->from_name = xstrdup(name_a);
973 x->name = xstrdup(name_b);
978 x->name = xstrdup(name_a);
983 static void diffstat_consume(void *priv, char *line, unsigned long len)
985 struct diffstat_t *diffstat = priv;
986 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
990 else if (line[0] == '-')
994 const char mime_boundary_leader[] = "------------";
996 static int scale_linear(int it, int width, int max_change)
999 * make sure that at least one '-' is printed if there were deletions,
1000 * and likewise for '+'.
1004 return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1);
1007 static void show_name(FILE *file,
1008 const char *prefix, const char *name, int len)
1010 fprintf(file, " %s%-*s |", prefix, len, name);
1013 static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
1017 fprintf(file, "%s", set);
1020 fprintf(file, "%s", reset);
1023 static void fill_print_name(struct diffstat_file *file)
1027 if (file->print_name)
1030 if (!file->is_renamed) {
1031 struct strbuf buf = STRBUF_INIT;
1032 if (quote_c_style(file->name, &buf, NULL, 0)) {
1033 pname = strbuf_detach(&buf, NULL);
1036 strbuf_release(&buf);
1039 pname = pprint_rename(file->from_name, file->name);
1041 file->print_name = pname;
1044 static void show_stats(struct diffstat_t *data, struct diff_options *options)
1046 int i, len, add, del, adds = 0, dels = 0;
1047 uintmax_t max_change = 0, max_len = 0;
1048 int total_files = data->nr;
1049 int width, name_width;
1050 const char *reset, *set, *add_c, *del_c;
1055 width = options->stat_width ? options->stat_width : 80;
1056 name_width = options->stat_name_width ? options->stat_name_width : 50;
1058 /* Sanity: give at least 5 columns to the graph,
1059 * but leave at least 10 columns for the name.
1063 if (name_width < 10)
1065 else if (width < name_width + 15)
1066 name_width = width - 15;
1068 /* Find the longest filename and max number of changes */
1069 reset = diff_get_color_opt(options, DIFF_RESET);
1070 set = diff_get_color_opt(options, DIFF_PLAIN);
1071 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1072 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1074 for (i = 0; i < data->nr; i++) {
1075 struct diffstat_file *file = data->files[i];
1076 uintmax_t change = file->added + file->deleted;
1077 fill_print_name(file);
1078 len = strlen(file->print_name);
1082 if (file->is_binary || file->is_unmerged)
1084 if (max_change < change)
1085 max_change = change;
1088 /* Compute the width of the graph part;
1089 * 10 is for one blank at the beginning of the line plus
1090 * " | count " between the name and the graph.
1092 * From here on, name_width is the width of the name area,
1093 * and width is the width of the graph area.
1095 name_width = (name_width < max_len) ? name_width : max_len;
1096 if (width < (name_width + 10) + max_change)
1097 width = width - (name_width + 10);
1101 for (i = 0; i < data->nr; i++) {
1102 const char *prefix = "";
1103 char *name = data->files[i]->print_name;
1104 uintmax_t added = data->files[i]->added;
1105 uintmax_t deleted = data->files[i]->deleted;
1109 * "scale" the filename
1112 name_len = strlen(name);
1113 if (name_width < name_len) {
1117 name += name_len - len;
1118 slash = strchr(name, '/');
1123 if (data->files[i]->is_binary) {
1124 show_name(options->file, prefix, name, len);
1125 fprintf(options->file, " Bin ");
1126 fprintf(options->file, "%s%"PRIuMAX"%s",
1127 del_c, deleted, reset);
1128 fprintf(options->file, " -> ");
1129 fprintf(options->file, "%s%"PRIuMAX"%s",
1130 add_c, added, reset);
1131 fprintf(options->file, " bytes");
1132 fprintf(options->file, "\n");
1135 else if (data->files[i]->is_unmerged) {
1136 show_name(options->file, prefix, name, len);
1137 fprintf(options->file, " Unmerged\n");
1140 else if (!data->files[i]->is_renamed &&
1141 (added + deleted == 0)) {
1147 * scale the add/delete
1154 if (width <= max_change) {
1155 add = scale_linear(add, width, max_change);
1156 del = scale_linear(del, width, max_change);
1158 show_name(options->file, prefix, name, len);
1159 fprintf(options->file, "%5"PRIuMAX"%s", added + deleted,
1160 added + deleted ? " " : "");
1161 show_graph(options->file, '+', add, add_c, reset);
1162 show_graph(options->file, '-', del, del_c, reset);
1163 fprintf(options->file, "\n");
1165 fprintf(options->file,
1166 " %d files changed, %d insertions(+), %d deletions(-)\n",
1167 total_files, adds, dels);
1170 static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1172 int i, adds = 0, dels = 0, total_files = data->nr;
1177 for (i = 0; i < data->nr; i++) {
1178 if (!data->files[i]->is_binary &&
1179 !data->files[i]->is_unmerged) {
1180 int added = data->files[i]->added;
1181 int deleted= data->files[i]->deleted;
1182 if (!data->files[i]->is_renamed &&
1183 (added + deleted == 0)) {
1191 fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
1192 total_files, adds, dels);
1195 static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1202 for (i = 0; i < data->nr; i++) {
1203 struct diffstat_file *file = data->files[i];
1205 if (file->is_binary)
1206 fprintf(options->file, "-\t-\t");
1208 fprintf(options->file,
1209 "%"PRIuMAX"\t%"PRIuMAX"\t",
1210 file->added, file->deleted);
1211 if (options->line_termination) {
1212 fill_print_name(file);
1213 if (!file->is_renamed)
1214 write_name_quoted(file->name, options->file,
1215 options->line_termination);
1217 fputs(file->print_name, options->file);
1218 putc(options->line_termination, options->file);
1221 if (file->is_renamed) {
1222 putc('\0', options->file);
1223 write_name_quoted(file->from_name, options->file, '\0');
1225 write_name_quoted(file->name, options->file, '\0');
1230 struct dirstat_file {
1232 unsigned long changed;
1235 struct dirstat_dir {
1236 struct dirstat_file *files;
1237 int alloc, nr, percent, cumulative;
1240 static long gather_dirstat(FILE *file, struct dirstat_dir *dir, unsigned long changed, const char *base, int baselen)
1242 unsigned long this_dir = 0;
1243 unsigned int sources = 0;
1246 struct dirstat_file *f = dir->files;
1247 int namelen = strlen(f->name);
1251 if (namelen < baselen)
1253 if (memcmp(f->name, base, baselen))
1255 slash = strchr(f->name + baselen, '/');
1257 int newbaselen = slash + 1 - f->name;
1258 this = gather_dirstat(file, dir, changed, f->name, newbaselen);
1270 * We don't report dirstat's for
1272 * - or cases where everything came from a single directory
1273 * under this directory (sources == 1).
1275 if (baselen && sources != 1) {
1276 int permille = this_dir * 1000 / changed;
1278 int percent = permille / 10;
1279 if (percent >= dir->percent) {
1280 fprintf(file, "%4d.%01d%% %.*s\n", percent, permille % 10, baselen, base);
1281 if (!dir->cumulative)
1289 static int dirstat_compare(const void *_a, const void *_b)
1291 const struct dirstat_file *a = _a;
1292 const struct dirstat_file *b = _b;
1293 return strcmp(a->name, b->name);
1296 static void show_dirstat(struct diff_options *options)
1299 unsigned long changed;
1300 struct dirstat_dir dir;
1301 struct diff_queue_struct *q = &diff_queued_diff;
1306 dir.percent = options->dirstat_percent;
1307 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1310 for (i = 0; i < q->nr; i++) {
1311 struct diff_filepair *p = q->queue[i];
1313 unsigned long copied, added, damage;
1315 name = p->one->path ? p->one->path : p->two->path;
1317 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1318 diff_populate_filespec(p->one, 0);
1319 diff_populate_filespec(p->two, 0);
1320 diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1322 diff_free_filespec_data(p->one);
1323 diff_free_filespec_data(p->two);
1324 } else if (DIFF_FILE_VALID(p->one)) {
1325 diff_populate_filespec(p->one, 1);
1327 diff_free_filespec_data(p->one);
1328 } else if (DIFF_FILE_VALID(p->two)) {
1329 diff_populate_filespec(p->two, 1);
1331 added = p->two->size;
1332 diff_free_filespec_data(p->two);
1337 * Original minus copied is the removed material,
1338 * added is the new material. They are both damages
1339 * made to the preimage. In --dirstat-by-file mode, count
1340 * damaged files, not damaged lines. This is done by
1341 * counting only a single damaged line per file.
1343 damage = (p->one->size - copied) + added;
1344 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE) && damage > 0)
1347 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1348 dir.files[dir.nr].name = name;
1349 dir.files[dir.nr].changed = damage;
1354 /* This can happen even with many files, if everything was renames */
1358 /* Show all directories with more than x% of the changes */
1359 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1360 gather_dirstat(options->file, &dir, changed, "", 0);
1363 static void free_diffstat_info(struct diffstat_t *diffstat)
1366 for (i = 0; i < diffstat->nr; i++) {
1367 struct diffstat_file *f = diffstat->files[i];
1368 if (f->name != f->print_name)
1369 free(f->print_name);
1374 free(diffstat->files);
1377 struct checkdiff_t {
1378 const char *filename;
1380 int conflict_marker_size;
1381 struct diff_options *o;
1386 static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
1391 if (len < marker_size + 1)
1393 firstchar = line[0];
1394 switch (firstchar) {
1395 case '=': case '>': case '<': case '|':
1400 for (cnt = 1; cnt < marker_size; cnt++)
1401 if (line[cnt] != firstchar)
1403 /* line[1] thru line[marker_size-1] are same as firstchar */
1404 if (len < marker_size + 1 || !isspace(line[marker_size]))
1409 static void checkdiff_consume(void *priv, char *line, unsigned long len)
1411 struct checkdiff_t *data = priv;
1412 int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF);
1413 int marker_size = data->conflict_marker_size;
1414 const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE);
1415 const char *reset = diff_get_color(color_diff, DIFF_RESET);
1416 const char *set = diff_get_color(color_diff, DIFF_FILE_NEW);
1419 if (line[0] == '+') {
1422 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
1424 fprintf(data->o->file,
1425 "%s:%d: leftover conflict marker\n",
1426 data->filename, data->lineno);
1428 bad = ws_check(line + 1, len - 1, data->ws_rule);
1431 data->status |= bad;
1432 err = whitespace_error_string(bad);
1433 fprintf(data->o->file, "%s:%d: %s.\n",
1434 data->filename, data->lineno, err);
1436 emit_line(data->o->file, set, reset, line, 1);
1437 ws_check_emit(line + 1, len - 1, data->ws_rule,
1438 data->o->file, set, reset, ws);
1439 } else if (line[0] == ' ') {
1441 } else if (line[0] == '@') {
1442 char *plus = strchr(line, '+');
1444 data->lineno = strtol(plus, NULL, 10) - 1;
1446 die("invalid diff");
1450 static unsigned char *deflate_it(char *data,
1452 unsigned long *result_size)
1455 unsigned char *deflated;
1458 memset(&stream, 0, sizeof(stream));
1459 deflateInit(&stream, zlib_compression_level);
1460 bound = deflateBound(&stream, size);
1461 deflated = xmalloc(bound);
1462 stream.next_out = deflated;
1463 stream.avail_out = bound;
1465 stream.next_in = (unsigned char *)data;
1466 stream.avail_in = size;
1467 while (deflate(&stream, Z_FINISH) == Z_OK)
1469 deflateEnd(&stream);
1470 *result_size = stream.total_out;
1474 static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two)
1480 unsigned long orig_size;
1481 unsigned long delta_size;
1482 unsigned long deflate_size;
1483 unsigned long data_size;
1485 /* We could do deflated delta, or we could do just deflated two,
1486 * whichever is smaller.
1489 deflated = deflate_it(two->ptr, two->size, &deflate_size);
1490 if (one->size && two->size) {
1491 delta = diff_delta(one->ptr, one->size,
1492 two->ptr, two->size,
1493 &delta_size, deflate_size);
1495 void *to_free = delta;
1496 orig_size = delta_size;
1497 delta = deflate_it(delta, delta_size, &delta_size);
1502 if (delta && delta_size < deflate_size) {
1503 fprintf(file, "delta %lu\n", orig_size);
1506 data_size = delta_size;
1509 fprintf(file, "literal %lu\n", two->size);
1512 data_size = deflate_size;
1515 /* emit data encoded in base85 */
1518 int bytes = (52 < data_size) ? 52 : data_size;
1522 line[0] = bytes + 'A' - 1;
1524 line[0] = bytes - 26 + 'a' - 1;
1525 encode_85(line + 1, cp, bytes);
1526 cp = (char *) cp + bytes;
1530 fprintf(file, "\n");
1534 static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two)
1536 fprintf(file, "GIT binary patch\n");
1537 emit_binary_diff_body(file, one, two);
1538 emit_binary_diff_body(file, two, one);
1541 static void diff_filespec_load_driver(struct diff_filespec *one)
1544 one->driver = userdiff_find_by_path(one->path);
1546 one->driver = userdiff_find_by_name("default");
1549 int diff_filespec_is_binary(struct diff_filespec *one)
1551 if (one->is_binary == -1) {
1552 diff_filespec_load_driver(one);
1553 if (one->driver->binary != -1)
1554 one->is_binary = one->driver->binary;
1556 if (!one->data && DIFF_FILE_VALID(one))
1557 diff_populate_filespec(one, 0);
1559 one->is_binary = buffer_is_binary(one->data,
1561 if (one->is_binary == -1)
1565 return one->is_binary;
1568 static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
1570 diff_filespec_load_driver(one);
1571 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
1574 static const char *userdiff_word_regex(struct diff_filespec *one)
1576 diff_filespec_load_driver(one);
1577 return one->driver->word_regex;
1580 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
1582 if (!options->a_prefix)
1583 options->a_prefix = a;
1584 if (!options->b_prefix)
1585 options->b_prefix = b;
1588 static const char *get_textconv(struct diff_filespec *one)
1590 if (!DIFF_FILE_VALID(one))
1592 if (!S_ISREG(one->mode))
1594 diff_filespec_load_driver(one);
1595 return one->driver->textconv;
1598 static void builtin_diff(const char *name_a,
1600 struct diff_filespec *one,
1601 struct diff_filespec *two,
1602 const char *xfrm_msg,
1603 struct diff_options *o,
1604 int complete_rewrite)
1608 char *a_one, *b_two;
1609 const char *set = diff_get_color_opt(o, DIFF_METAINFO);
1610 const char *reset = diff_get_color_opt(o, DIFF_RESET);
1611 const char *a_prefix, *b_prefix;
1612 const char *textconv_one = NULL, *textconv_two = NULL;
1613 struct strbuf header = STRBUF_INIT;
1615 if (DIFF_OPT_TST(o, SUBMODULE_LOG) &&
1616 (!one->mode || S_ISGITLINK(one->mode)) &&
1617 (!two->mode || S_ISGITLINK(two->mode))) {
1618 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
1619 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
1620 show_submodule_summary(o->file, one ? one->path : two->path,
1621 one->sha1, two->sha1, two->dirty_submodule,
1626 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
1627 textconv_one = get_textconv(one);
1628 textconv_two = get_textconv(two);
1631 diff_set_mnemonic_prefix(o, "a/", "b/");
1632 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
1633 a_prefix = o->b_prefix;
1634 b_prefix = o->a_prefix;
1636 a_prefix = o->a_prefix;
1637 b_prefix = o->b_prefix;
1640 /* Never use a non-valid filename anywhere if at all possible */
1641 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
1642 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
1644 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
1645 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
1646 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
1647 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
1648 strbuf_addf(&header, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
1649 if (lbl[0][0] == '/') {
1651 strbuf_addf(&header, "%snew file mode %06o%s\n", set, two->mode, reset);
1652 if (xfrm_msg && xfrm_msg[0])
1653 strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset);
1655 else if (lbl[1][0] == '/') {
1656 strbuf_addf(&header, "%sdeleted file mode %06o%s\n", set, one->mode, reset);
1657 if (xfrm_msg && xfrm_msg[0])
1658 strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset);
1661 if (one->mode != two->mode) {
1662 strbuf_addf(&header, "%sold mode %06o%s\n", set, one->mode, reset);
1663 strbuf_addf(&header, "%snew mode %06o%s\n", set, two->mode, reset);
1665 if (xfrm_msg && xfrm_msg[0])
1666 strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset);
1669 * we do not run diff between different kind
1672 if ((one->mode ^ two->mode) & S_IFMT)
1673 goto free_ab_and_return;
1674 if (complete_rewrite &&
1675 (textconv_one || !diff_filespec_is_binary(one)) &&
1676 (textconv_two || !diff_filespec_is_binary(two))) {
1677 fprintf(o->file, "%s", header.buf);
1678 strbuf_reset(&header);
1679 emit_rewrite_diff(name_a, name_b, one, two,
1680 textconv_one, textconv_two, o);
1681 o->found_changes = 1;
1682 goto free_ab_and_return;
1686 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1687 die("unable to read files to diff");
1689 if (!DIFF_OPT_TST(o, TEXT) &&
1690 ( (diff_filespec_is_binary(one) && !textconv_one) ||
1691 (diff_filespec_is_binary(two) && !textconv_two) )) {
1692 /* Quite common confusing case */
1693 if (mf1.size == mf2.size &&
1694 !memcmp(mf1.ptr, mf2.ptr, mf1.size))
1695 goto free_ab_and_return;
1696 fprintf(o->file, "%s", header.buf);
1697 strbuf_reset(&header);
1698 if (DIFF_OPT_TST(o, BINARY))
1699 emit_binary_diff(o->file, &mf1, &mf2);
1701 fprintf(o->file, "Binary files %s and %s differ\n",
1703 o->found_changes = 1;
1706 /* Crazy xdl interfaces.. */
1707 const char *diffopts = getenv("GIT_DIFF_OPTS");
1710 struct emit_callback ecbdata;
1711 const struct userdiff_funcname *pe;
1713 if (!DIFF_XDL_TST(o, WHITESPACE_FLAGS)) {
1714 fprintf(o->file, "%s", header.buf);
1715 strbuf_reset(&header);
1720 mf1.ptr = run_textconv(textconv_one, one, &size);
1722 die("unable to read files to diff");
1727 mf2.ptr = run_textconv(textconv_two, two, &size);
1729 die("unable to read files to diff");
1733 pe = diff_funcname_pattern(one);
1735 pe = diff_funcname_pattern(two);
1737 memset(&xpp, 0, sizeof(xpp));
1738 memset(&xecfg, 0, sizeof(xecfg));
1739 memset(&ecbdata, 0, sizeof(ecbdata));
1740 ecbdata.label_path = lbl;
1741 ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1742 ecbdata.found_changesp = &o->found_changes;
1743 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
1744 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
1745 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1746 ecbdata.file = o->file;
1747 ecbdata.header = header.len ? &header : NULL;
1748 xpp.flags = o->xdl_opts;
1749 xecfg.ctxlen = o->context;
1750 xecfg.interhunkctxlen = o->interhunkcontext;
1751 xecfg.flags = XDL_EMIT_FUNCNAMES;
1753 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
1756 else if (!prefixcmp(diffopts, "--unified="))
1757 xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
1758 else if (!prefixcmp(diffopts, "-u"))
1759 xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
1760 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) {
1761 ecbdata.diff_words =
1762 xcalloc(1, sizeof(struct diff_words_data));
1763 ecbdata.diff_words->file = o->file;
1765 o->word_regex = userdiff_word_regex(one);
1767 o->word_regex = userdiff_word_regex(two);
1769 o->word_regex = diff_word_regex_cfg;
1770 if (o->word_regex) {
1771 ecbdata.diff_words->word_regex = (regex_t *)
1772 xmalloc(sizeof(regex_t));
1773 if (regcomp(ecbdata.diff_words->word_regex,
1775 REG_EXTENDED | REG_NEWLINE))
1776 die ("Invalid regular expression: %s",
1780 xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
1782 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
1783 free_diff_words_data(&ecbdata);
1788 xdiff_clear_find_func(&xecfg);
1792 strbuf_release(&header);
1793 diff_free_filespec_data(one);
1794 diff_free_filespec_data(two);
1800 static void builtin_diffstat(const char *name_a, const char *name_b,
1801 struct diff_filespec *one,
1802 struct diff_filespec *two,
1803 struct diffstat_t *diffstat,
1804 struct diff_options *o,
1805 int complete_rewrite)
1808 struct diffstat_file *data;
1810 data = diffstat_add(diffstat, name_a, name_b);
1813 data->is_unmerged = 1;
1816 if (complete_rewrite) {
1817 diff_populate_filespec(one, 0);
1818 diff_populate_filespec(two, 0);
1819 data->deleted = count_lines(one->data, one->size);
1820 data->added = count_lines(two->data, two->size);
1821 goto free_and_return;
1823 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1824 die("unable to read files to diff");
1826 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
1827 data->is_binary = 1;
1828 data->added = mf2.size;
1829 data->deleted = mf1.size;
1831 /* Crazy xdl interfaces.. */
1835 memset(&xpp, 0, sizeof(xpp));
1836 memset(&xecfg, 0, sizeof(xecfg));
1837 xpp.flags = o->xdl_opts;
1838 xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
1843 diff_free_filespec_data(one);
1844 diff_free_filespec_data(two);
1847 static void builtin_checkdiff(const char *name_a, const char *name_b,
1848 const char *attr_path,
1849 struct diff_filespec *one,
1850 struct diff_filespec *two,
1851 struct diff_options *o)
1854 struct checkdiff_t data;
1859 memset(&data, 0, sizeof(data));
1860 data.filename = name_b ? name_b : name_a;
1863 data.ws_rule = whitespace_rule(attr_path);
1864 data.conflict_marker_size = ll_merge_marker_size(attr_path);
1866 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1867 die("unable to read files to diff");
1870 * All the other codepaths check both sides, but not checking
1871 * the "old" side here is deliberate. We are checking the newly
1872 * introduced changes, and as long as the "new" side is text, we
1873 * can and should check what it introduces.
1875 if (diff_filespec_is_binary(two))
1876 goto free_and_return;
1878 /* Crazy xdl interfaces.. */
1882 memset(&xpp, 0, sizeof(xpp));
1883 memset(&xecfg, 0, sizeof(xecfg));
1884 xecfg.ctxlen = 1; /* at least one context line */
1886 xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
1889 if (data.ws_rule & WS_BLANK_AT_EOF) {
1890 struct emit_callback ecbdata;
1893 ecbdata.ws_rule = data.ws_rule;
1894 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1895 blank_at_eof = ecbdata.blank_at_eof_in_preimage;
1900 err = whitespace_error_string(WS_BLANK_AT_EOF);
1901 fprintf(o->file, "%s:%d: %s.\n",
1902 data.filename, blank_at_eof, err);
1903 data.status = 1; /* report errors */
1908 diff_free_filespec_data(one);
1909 diff_free_filespec_data(two);
1911 DIFF_OPT_SET(o, CHECK_FAILED);
1914 struct diff_filespec *alloc_filespec(const char *path)
1916 int namelen = strlen(path);
1917 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
1919 memset(spec, 0, sizeof(*spec));
1920 spec->path = (char *)(spec + 1);
1921 memcpy(spec->path, path, namelen+1);
1923 spec->is_binary = -1;
1927 void free_filespec(struct diff_filespec *spec)
1929 if (!--spec->count) {
1930 diff_free_filespec_data(spec);
1935 void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
1936 unsigned short mode)
1939 spec->mode = canon_mode(mode);
1940 hashcpy(spec->sha1, sha1);
1941 spec->sha1_valid = !is_null_sha1(sha1);
1946 * Given a name and sha1 pair, if the index tells us the file in
1947 * the work tree has that object contents, return true, so that
1948 * prepare_temp_file() does not have to inflate and extract.
1950 static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
1952 struct cache_entry *ce;
1957 * We do not read the cache ourselves here, because the
1958 * benchmark with my previous version that always reads cache
1959 * shows that it makes things worse for diff-tree comparing
1960 * two linux-2.6 kernel trees in an already checked out work
1961 * tree. This is because most diff-tree comparisons deal with
1962 * only a small number of files, while reading the cache is
1963 * expensive for a large project, and its cost outweighs the
1964 * savings we get by not inflating the object to a temporary
1965 * file. Practically, this code only helps when we are used
1966 * by diff-cache --cached, which does read the cache before
1972 /* We want to avoid the working directory if our caller
1973 * doesn't need the data in a normal file, this system
1974 * is rather slow with its stat/open/mmap/close syscalls,
1975 * and the object is contained in a pack file. The pack
1976 * is probably already open and will be faster to obtain
1977 * the data through than the working directory. Loose
1978 * objects however would tend to be slower as they need
1979 * to be individually opened and inflated.
1981 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
1985 pos = cache_name_pos(name, len);
1988 ce = active_cache[pos];
1991 * This is not the sha1 we are looking for, or
1992 * unreusable because it is not a regular file.
1994 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
1998 * If ce is marked as "assume unchanged", there is no
1999 * guarantee that work tree matches what we are looking for.
2001 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
2005 * If ce matches the file in the work tree, we can reuse it.
2007 if (ce_uptodate(ce) ||
2008 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
2014 static int populate_from_stdin(struct diff_filespec *s)
2016 struct strbuf buf = STRBUF_INIT;
2019 if (strbuf_read(&buf, 0, 0) < 0)
2020 return error("error while reading from stdin %s",
2023 s->should_munmap = 0;
2024 s->data = strbuf_detach(&buf, &size);
2030 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2033 char *data = xmalloc(100), *dirty = "";
2035 /* Are we looking at the work tree? */
2036 if (s->dirty_submodule)
2039 len = snprintf(data, 100,
2040 "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty);
2052 * While doing rename detection and pickaxe operation, we may need to
2053 * grab the data for the blob (or file) for our own in-core comparison.
2054 * diff_filespec has data and size fields for this purpose.
2056 int diff_populate_filespec(struct diff_filespec *s, int size_only)
2059 if (!DIFF_FILE_VALID(s))
2060 die("internal error: asking to populate invalid file.");
2061 if (S_ISDIR(s->mode))
2067 if (size_only && 0 < s->size)
2070 if (S_ISGITLINK(s->mode))
2071 return diff_populate_gitlink(s, size_only);
2073 if (!s->sha1_valid ||
2074 reuse_worktree_file(s->path, s->sha1, 0)) {
2075 struct strbuf buf = STRBUF_INIT;
2079 if (!strcmp(s->path, "-"))
2080 return populate_from_stdin(s);
2082 if (lstat(s->path, &st) < 0) {
2083 if (errno == ENOENT) {
2087 s->data = (char *)"";
2092 s->size = xsize_t(st.st_size);
2095 if (S_ISLNK(st.st_mode)) {
2096 struct strbuf sb = STRBUF_INIT;
2098 if (strbuf_readlink(&sb, s->path, s->size))
2101 s->data = strbuf_detach(&sb, NULL);
2107 fd = open(s->path, O_RDONLY);
2110 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2112 s->should_munmap = 1;
2115 * Convert from working tree format to canonical git format
2117 if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
2119 munmap(s->data, s->size);
2120 s->should_munmap = 0;
2121 s->data = strbuf_detach(&buf, &size);
2127 enum object_type type;
2129 type = sha1_object_info(s->sha1, &s->size);
2131 s->data = read_sha1_file(s->sha1, &type, &s->size);
2138 void diff_free_filespec_blob(struct diff_filespec *s)
2142 else if (s->should_munmap)
2143 munmap(s->data, s->size);
2145 if (s->should_free || s->should_munmap) {
2146 s->should_free = s->should_munmap = 0;
2151 void diff_free_filespec_data(struct diff_filespec *s)
2153 diff_free_filespec_blob(s);
2158 static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2161 const unsigned char *sha1,
2165 struct strbuf buf = STRBUF_INIT;
2166 struct strbuf template = STRBUF_INIT;
2167 char *path_dup = xstrdup(path);
2168 const char *base = basename(path_dup);
2170 /* Generate "XXXXXX_basename.ext" */
2171 strbuf_addstr(&template, "XXXXXX_");
2172 strbuf_addstr(&template, base);
2174 fd = git_mkstemps(temp->tmp_path, PATH_MAX, template.buf,
2177 die_errno("unable to create temp-file");
2178 if (convert_to_working_tree(path,
2179 (const char *)blob, (size_t)size, &buf)) {
2183 if (write_in_full(fd, blob, size) != size)
2184 die_errno("unable to write temp-file");
2186 temp->name = temp->tmp_path;
2187 strcpy(temp->hex, sha1_to_hex(sha1));
2189 sprintf(temp->mode, "%06o", mode);
2190 strbuf_release(&buf);
2191 strbuf_release(&template);
2195 static struct diff_tempfile *prepare_temp_file(const char *name,
2196 struct diff_filespec *one)
2198 struct diff_tempfile *temp = claim_diff_tempfile();
2200 if (!DIFF_FILE_VALID(one)) {
2202 /* A '-' entry produces this for file-2, and
2203 * a '+' entry produces this for file-1.
2205 temp->name = "/dev/null";
2206 strcpy(temp->hex, ".");
2207 strcpy(temp->mode, ".");
2211 if (!remove_tempfile_installed) {
2212 atexit(remove_tempfile);
2213 sigchain_push_common(remove_tempfile_on_signal);
2214 remove_tempfile_installed = 1;
2217 if (!one->sha1_valid ||
2218 reuse_worktree_file(name, one->sha1, 1)) {
2220 if (lstat(name, &st) < 0) {
2221 if (errno == ENOENT)
2222 goto not_a_valid_file;
2223 die_errno("stat(%s)", name);
2225 if (S_ISLNK(st.st_mode)) {
2226 struct strbuf sb = STRBUF_INIT;
2227 if (strbuf_readlink(&sb, name, st.st_size) < 0)
2228 die_errno("readlink(%s)", name);
2229 prep_temp_blob(name, temp, sb.buf, sb.len,
2231 one->sha1 : null_sha1),
2233 one->mode : S_IFLNK));
2234 strbuf_release(&sb);
2237 /* we can borrow from the file in the work tree */
2239 if (!one->sha1_valid)
2240 strcpy(temp->hex, sha1_to_hex(null_sha1));
2242 strcpy(temp->hex, sha1_to_hex(one->sha1));
2243 /* Even though we may sometimes borrow the
2244 * contents from the work tree, we always want
2245 * one->mode. mode is trustworthy even when
2246 * !(one->sha1_valid), as long as
2247 * DIFF_FILE_VALID(one).
2249 sprintf(temp->mode, "%06o", one->mode);
2254 if (diff_populate_filespec(one, 0))
2255 die("cannot read data blob for %s", one->path);
2256 prep_temp_blob(name, temp, one->data, one->size,
2257 one->sha1, one->mode);
2262 /* An external diff command takes:
2264 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2265 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2268 static void run_external_diff(const char *pgm,
2271 struct diff_filespec *one,
2272 struct diff_filespec *two,
2273 const char *xfrm_msg,
2274 int complete_rewrite)
2276 const char *spawn_arg[10];
2278 const char **arg = &spawn_arg[0];
2281 struct diff_tempfile *temp_one, *temp_two;
2282 const char *othername = (other ? other : name);
2283 temp_one = prepare_temp_file(name, one);
2284 temp_two = prepare_temp_file(othername, two);
2287 *arg++ = temp_one->name;
2288 *arg++ = temp_one->hex;
2289 *arg++ = temp_one->mode;
2290 *arg++ = temp_two->name;
2291 *arg++ = temp_two->hex;
2292 *arg++ = temp_two->mode;
2303 retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL);
2306 fprintf(stderr, "external diff died, stopping at %s.\n", name);
2311 static int similarity_index(struct diff_filepair *p)
2313 return p->score * 100 / MAX_SCORE;
2316 static void fill_metainfo(struct strbuf *msg,
2319 struct diff_filespec *one,
2320 struct diff_filespec *two,
2321 struct diff_options *o,
2322 struct diff_filepair *p)
2324 strbuf_init(msg, PATH_MAX * 2 + 300);
2325 switch (p->status) {
2326 case DIFF_STATUS_COPIED:
2327 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2328 strbuf_addstr(msg, "\ncopy from ");
2329 quote_c_style(name, msg, NULL, 0);
2330 strbuf_addstr(msg, "\ncopy to ");
2331 quote_c_style(other, msg, NULL, 0);
2332 strbuf_addch(msg, '\n');
2334 case DIFF_STATUS_RENAMED:
2335 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2336 strbuf_addstr(msg, "\nrename from ");
2337 quote_c_style(name, msg, NULL, 0);
2338 strbuf_addstr(msg, "\nrename to ");
2339 quote_c_style(other, msg, NULL, 0);
2340 strbuf_addch(msg, '\n');
2342 case DIFF_STATUS_MODIFIED:
2344 strbuf_addf(msg, "dissimilarity index %d%%\n",
2345 similarity_index(p));
2353 if (one && two && hashcmp(one->sha1, two->sha1)) {
2354 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
2356 if (DIFF_OPT_TST(o, BINARY)) {
2358 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2359 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2362 strbuf_addf(msg, "index %.*s..%.*s",
2363 abbrev, sha1_to_hex(one->sha1),
2364 abbrev, sha1_to_hex(two->sha1));
2365 if (one->mode == two->mode)
2366 strbuf_addf(msg, " %06o", one->mode);
2367 strbuf_addch(msg, '\n');
2370 strbuf_setlen(msg, msg->len - 1);
2373 static void run_diff_cmd(const char *pgm,
2376 const char *attr_path,
2377 struct diff_filespec *one,
2378 struct diff_filespec *two,
2380 struct diff_options *o,
2381 struct diff_filepair *p)
2383 const char *xfrm_msg = NULL;
2384 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
2387 fill_metainfo(msg, name, other, one, two, o, p);
2388 xfrm_msg = msg->len ? msg->buf : NULL;
2391 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
2394 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
2395 if (drv && drv->external)
2396 pgm = drv->external;
2400 run_external_diff(pgm, name, other, one, two, xfrm_msg,
2405 builtin_diff(name, other ? other : name,
2406 one, two, xfrm_msg, o, complete_rewrite);
2408 fprintf(o->file, "* Unmerged path %s\n", name);
2411 static void diff_fill_sha1_info(struct diff_filespec *one)
2413 if (DIFF_FILE_VALID(one)) {
2414 if (!one->sha1_valid) {
2416 if (!strcmp(one->path, "-")) {
2417 hashcpy(one->sha1, null_sha1);
2420 if (lstat(one->path, &st) < 0)
2421 die_errno("stat '%s'", one->path);
2422 if (index_path(one->sha1, one->path, &st, 0))
2423 die("cannot hash %s", one->path);
2430 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
2432 /* Strip the prefix but do not molest /dev/null and absolute paths */
2433 if (*namep && **namep != '/')
2434 *namep += prefix_length;
2435 if (*otherp && **otherp != '/')
2436 *otherp += prefix_length;
2439 static void run_diff(struct diff_filepair *p, struct diff_options *o)
2441 const char *pgm = external_diff();
2443 struct diff_filespec *one = p->one;
2444 struct diff_filespec *two = p->two;
2447 const char *attr_path;
2449 name = p->one->path;
2450 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2452 if (o->prefix_length)
2453 strip_prefix(o->prefix_length, &name, &other);
2455 if (DIFF_PAIR_UNMERGED(p)) {
2456 run_diff_cmd(pgm, name, NULL, attr_path,
2457 NULL, NULL, NULL, o, p);
2461 diff_fill_sha1_info(one);
2462 diff_fill_sha1_info(two);
2465 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
2466 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
2468 * a filepair that changes between file and symlink
2469 * needs to be split into deletion and creation.
2471 struct diff_filespec *null = alloc_filespec(two->path);
2472 run_diff_cmd(NULL, name, other, attr_path,
2473 one, null, &msg, o, p);
2475 strbuf_release(&msg);
2477 null = alloc_filespec(one->path);
2478 run_diff_cmd(NULL, name, other, attr_path,
2479 null, two, &msg, o, p);
2483 run_diff_cmd(pgm, name, other, attr_path,
2484 one, two, &msg, o, p);
2486 strbuf_release(&msg);
2489 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
2490 struct diffstat_t *diffstat)
2494 int complete_rewrite = 0;
2496 if (DIFF_PAIR_UNMERGED(p)) {
2498 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
2502 name = p->one->path;
2503 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2505 if (o->prefix_length)
2506 strip_prefix(o->prefix_length, &name, &other);
2508 diff_fill_sha1_info(p->one);
2509 diff_fill_sha1_info(p->two);
2511 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2512 complete_rewrite = 1;
2513 builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
2516 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
2520 const char *attr_path;
2522 if (DIFF_PAIR_UNMERGED(p)) {
2527 name = p->one->path;
2528 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2529 attr_path = other ? other : name;
2531 if (o->prefix_length)
2532 strip_prefix(o->prefix_length, &name, &other);
2534 diff_fill_sha1_info(p->one);
2535 diff_fill_sha1_info(p->two);
2537 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
2540 void diff_setup(struct diff_options *options)
2542 memset(options, 0, sizeof(*options));
2544 options->file = stdout;
2546 options->line_termination = '\n';
2547 options->break_opt = -1;
2548 options->rename_limit = -1;
2549 options->dirstat_percent = 3;
2550 options->context = 3;
2552 options->change = diff_change;
2553 options->add_remove = diff_addremove;
2554 if (diff_use_color_default > 0)
2555 DIFF_OPT_SET(options, COLOR_DIFF);
2556 options->detect_rename = diff_detect_rename_default;
2558 if (!diff_mnemonic_prefix) {
2559 options->a_prefix = "a/";
2560 options->b_prefix = "b/";
2564 int diff_setup_done(struct diff_options *options)
2568 if (options->output_format & DIFF_FORMAT_NAME)
2570 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
2572 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
2574 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
2577 die("--name-only, --name-status, --check and -s are mutually exclusive");
2580 * Most of the time we can say "there are changes"
2581 * only by checking if there are changed paths, but
2582 * --ignore-whitespace* options force us to look
2586 if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
2587 DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
2588 DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
2589 DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
2591 DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
2593 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
2594 options->detect_rename = DIFF_DETECT_COPY;
2596 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
2597 options->prefix = NULL;
2598 if (options->prefix)
2599 options->prefix_length = strlen(options->prefix);
2601 options->prefix_length = 0;
2603 if (options->output_format & (DIFF_FORMAT_NAME |
2604 DIFF_FORMAT_NAME_STATUS |
2605 DIFF_FORMAT_CHECKDIFF |
2606 DIFF_FORMAT_NO_OUTPUT))
2607 options->output_format &= ~(DIFF_FORMAT_RAW |
2608 DIFF_FORMAT_NUMSTAT |
2609 DIFF_FORMAT_DIFFSTAT |
2610 DIFF_FORMAT_SHORTSTAT |
2611 DIFF_FORMAT_DIRSTAT |
2612 DIFF_FORMAT_SUMMARY |
2616 * These cases always need recursive; we do not drop caller-supplied
2617 * recursive bits for other formats here.
2619 if (options->output_format & (DIFF_FORMAT_PATCH |
2620 DIFF_FORMAT_NUMSTAT |
2621 DIFF_FORMAT_DIFFSTAT |
2622 DIFF_FORMAT_SHORTSTAT |
2623 DIFF_FORMAT_DIRSTAT |
2624 DIFF_FORMAT_SUMMARY |
2625 DIFF_FORMAT_CHECKDIFF))
2626 DIFF_OPT_SET(options, RECURSIVE);
2628 * Also pickaxe would not work very well if you do not say recursive
2630 if (options->pickaxe)
2631 DIFF_OPT_SET(options, RECURSIVE);
2633 * When patches are generated, submodules diffed against the work tree
2634 * must be checked for dirtiness too so it can be shown in the output
2636 if (options->output_format & DIFF_FORMAT_PATCH)
2637 DIFF_OPT_SET(options, DIRTY_SUBMODULES);
2639 if (options->detect_rename && options->rename_limit < 0)
2640 options->rename_limit = diff_rename_limit_default;
2641 if (options->setup & DIFF_SETUP_USE_CACHE) {
2643 /* read-cache does not die even when it fails
2644 * so it is safe for us to do this here. Also
2645 * it does not smudge active_cache or active_nr
2646 * when it fails, so we do not have to worry about
2647 * cleaning it up ourselves either.
2651 if (options->abbrev <= 0 || 40 < options->abbrev)
2652 options->abbrev = 40; /* full */
2655 * It does not make sense to show the first hit we happened
2656 * to have found. It does not make sense not to return with
2657 * exit code in such a case either.
2659 if (DIFF_OPT_TST(options, QUICK)) {
2660 options->output_format = DIFF_FORMAT_NO_OUTPUT;
2661 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2667 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
2677 if (c == arg_short) {
2681 if (val && isdigit(c)) {
2683 int n = strtoul(arg, &end, 10);
2694 eq = strchr(arg, '=');
2699 if (!len || strncmp(arg, arg_long, len))
2704 if (!isdigit(*++eq))
2706 n = strtoul(eq, &end, 10);
2714 static int diff_scoreopt_parse(const char *opt);
2716 int diff_opt_parse(struct diff_options *options, const char **av, int ac)
2718 const char *arg = av[0];
2720 /* Output format options */
2721 if (!strcmp(arg, "-p") || !strcmp(arg, "-u"))
2722 options->output_format |= DIFF_FORMAT_PATCH;
2723 else if (opt_arg(arg, 'U', "unified", &options->context))
2724 options->output_format |= DIFF_FORMAT_PATCH;
2725 else if (!strcmp(arg, "--raw"))
2726 options->output_format |= DIFF_FORMAT_RAW;
2727 else if (!strcmp(arg, "--patch-with-raw"))
2728 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
2729 else if (!strcmp(arg, "--numstat"))
2730 options->output_format |= DIFF_FORMAT_NUMSTAT;
2731 else if (!strcmp(arg, "--shortstat"))
2732 options->output_format |= DIFF_FORMAT_SHORTSTAT;
2733 else if (opt_arg(arg, 'X', "dirstat", &options->dirstat_percent))
2734 options->output_format |= DIFF_FORMAT_DIRSTAT;
2735 else if (!strcmp(arg, "--cumulative")) {
2736 options->output_format |= DIFF_FORMAT_DIRSTAT;
2737 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
2738 } else if (opt_arg(arg, 0, "dirstat-by-file",
2739 &options->dirstat_percent)) {
2740 options->output_format |= DIFF_FORMAT_DIRSTAT;
2741 DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
2743 else if (!strcmp(arg, "--check"))
2744 options->output_format |= DIFF_FORMAT_CHECKDIFF;
2745 else if (!strcmp(arg, "--summary"))
2746 options->output_format |= DIFF_FORMAT_SUMMARY;
2747 else if (!strcmp(arg, "--patch-with-stat"))
2748 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
2749 else if (!strcmp(arg, "--name-only"))
2750 options->output_format |= DIFF_FORMAT_NAME;
2751 else if (!strcmp(arg, "--name-status"))
2752 options->output_format |= DIFF_FORMAT_NAME_STATUS;
2753 else if (!strcmp(arg, "-s"))
2754 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
2755 else if (!prefixcmp(arg, "--stat")) {
2757 int width = options->stat_width;
2758 int name_width = options->stat_name_width;
2764 if (!prefixcmp(arg, "-width="))
2765 width = strtoul(arg + 7, &end, 10);
2766 else if (!prefixcmp(arg, "-name-width="))
2767 name_width = strtoul(arg + 12, &end, 10);
2770 width = strtoul(arg+1, &end, 10);
2772 name_width = strtoul(end+1, &end, 10);
2775 /* Important! This checks all the error cases! */
2778 options->output_format |= DIFF_FORMAT_DIFFSTAT;
2779 options->stat_name_width = name_width;
2780 options->stat_width = width;
2783 /* renames options */
2784 else if (!prefixcmp(arg, "-B")) {
2785 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
2788 else if (!prefixcmp(arg, "-M")) {
2789 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2791 options->detect_rename = DIFF_DETECT_RENAME;
2793 else if (!prefixcmp(arg, "-C")) {
2794 if (options->detect_rename == DIFF_DETECT_COPY)
2795 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2796 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2798 options->detect_rename = DIFF_DETECT_COPY;
2800 else if (!strcmp(arg, "--no-renames"))
2801 options->detect_rename = 0;
2802 else if (!strcmp(arg, "--relative"))
2803 DIFF_OPT_SET(options, RELATIVE_NAME);
2804 else if (!prefixcmp(arg, "--relative=")) {
2805 DIFF_OPT_SET(options, RELATIVE_NAME);
2806 options->prefix = arg + 11;
2810 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
2811 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
2812 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
2813 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
2814 else if (!strcmp(arg, "--ignore-space-at-eol"))
2815 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
2816 else if (!strcmp(arg, "--patience"))
2817 DIFF_XDL_SET(options, PATIENCE_DIFF);
2820 else if (!strcmp(arg, "--binary")) {
2821 options->output_format |= DIFF_FORMAT_PATCH;
2822 DIFF_OPT_SET(options, BINARY);
2824 else if (!strcmp(arg, "--full-index"))
2825 DIFF_OPT_SET(options, FULL_INDEX);
2826 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
2827 DIFF_OPT_SET(options, TEXT);
2828 else if (!strcmp(arg, "-R"))
2829 DIFF_OPT_SET(options, REVERSE_DIFF);
2830 else if (!strcmp(arg, "--find-copies-harder"))
2831 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2832 else if (!strcmp(arg, "--follow"))
2833 DIFF_OPT_SET(options, FOLLOW_RENAMES);
2834 else if (!strcmp(arg, "--color"))
2835 DIFF_OPT_SET(options, COLOR_DIFF);
2836 else if (!prefixcmp(arg, "--color=")) {
2837 int value = git_config_colorbool(NULL, arg+8, -1);
2839 DIFF_OPT_CLR(options, COLOR_DIFF);
2841 DIFF_OPT_SET(options, COLOR_DIFF);
2843 return error("option `color' expects \"always\", \"auto\", or \"never\"");
2845 else if (!strcmp(arg, "--no-color"))
2846 DIFF_OPT_CLR(options, COLOR_DIFF);
2847 else if (!strcmp(arg, "--color-words")) {
2848 DIFF_OPT_SET(options, COLOR_DIFF);
2849 DIFF_OPT_SET(options, COLOR_DIFF_WORDS);
2851 else if (!prefixcmp(arg, "--color-words=")) {
2852 DIFF_OPT_SET(options, COLOR_DIFF);
2853 DIFF_OPT_SET(options, COLOR_DIFF_WORDS);
2854 options->word_regex = arg + 14;
2856 else if (!strcmp(arg, "--exit-code"))
2857 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2858 else if (!strcmp(arg, "--quiet"))
2859 DIFF_OPT_SET(options, QUICK);
2860 else if (!strcmp(arg, "--ext-diff"))
2861 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
2862 else if (!strcmp(arg, "--no-ext-diff"))
2863 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
2864 else if (!strcmp(arg, "--textconv"))
2865 DIFF_OPT_SET(options, ALLOW_TEXTCONV);
2866 else if (!strcmp(arg, "--no-textconv"))
2867 DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
2868 else if (!strcmp(arg, "--ignore-submodules"))
2869 DIFF_OPT_SET(options, IGNORE_SUBMODULES);
2870 else if (!strcmp(arg, "--submodule"))
2871 DIFF_OPT_SET(options, SUBMODULE_LOG);
2872 else if (!prefixcmp(arg, "--submodule=")) {
2873 if (!strcmp(arg + 12, "log"))
2874 DIFF_OPT_SET(options, SUBMODULE_LOG);
2878 else if (!strcmp(arg, "-z"))
2879 options->line_termination = 0;
2880 else if (!prefixcmp(arg, "-l"))
2881 options->rename_limit = strtoul(arg+2, NULL, 10);
2882 else if (!prefixcmp(arg, "-S"))
2883 options->pickaxe = arg + 2;
2884 else if (!strcmp(arg, "--pickaxe-all"))
2885 options->pickaxe_opts = DIFF_PICKAXE_ALL;
2886 else if (!strcmp(arg, "--pickaxe-regex"))
2887 options->pickaxe_opts = DIFF_PICKAXE_REGEX;
2888 else if (!prefixcmp(arg, "-O"))
2889 options->orderfile = arg + 2;
2890 else if (!prefixcmp(arg, "--diff-filter="))
2891 options->filter = arg + 14;
2892 else if (!strcmp(arg, "--abbrev"))
2893 options->abbrev = DEFAULT_ABBREV;
2894 else if (!prefixcmp(arg, "--abbrev=")) {
2895 options->abbrev = strtoul(arg + 9, NULL, 10);
2896 if (options->abbrev < MINIMUM_ABBREV)
2897 options->abbrev = MINIMUM_ABBREV;
2898 else if (40 < options->abbrev)
2899 options->abbrev = 40;
2901 else if (!prefixcmp(arg, "--src-prefix="))
2902 options->a_prefix = arg + 13;
2903 else if (!prefixcmp(arg, "--dst-prefix="))
2904 options->b_prefix = arg + 13;
2905 else if (!strcmp(arg, "--no-prefix"))
2906 options->a_prefix = options->b_prefix = "";
2907 else if (opt_arg(arg, '\0', "inter-hunk-context",
2908 &options->interhunkcontext))
2910 else if (!prefixcmp(arg, "--output=")) {
2911 options->file = fopen(arg + strlen("--output="), "w");
2913 die_errno("Could not open '%s'", arg + strlen("--output="));
2914 options->close_file = 1;
2920 static int parse_num(const char **cp_p)
2922 unsigned long num, scale;
2924 const char *cp = *cp_p;
2931 if ( !dot && ch == '.' ) {
2934 } else if ( ch == '%' ) {
2935 scale = dot ? scale*100 : 100;
2936 cp++; /* % is always at the end */
2938 } else if ( ch >= '0' && ch <= '9' ) {
2939 if ( scale < 100000 ) {
2941 num = (num*10) + (ch-'0');
2950 /* user says num divided by scale and we say internally that
2951 * is MAX_SCORE * num / scale.
2953 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
2956 static int diff_scoreopt_parse(const char *opt)
2958 int opt1, opt2, cmd;
2963 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
2964 return -1; /* that is not a -M, -C nor -B option */
2966 opt1 = parse_num(&opt);
2972 else if (*opt != '/')
2973 return -1; /* we expect -B80/99 or -B80 */
2976 opt2 = parse_num(&opt);
2981 return opt1 | (opt2 << 16);
2984 struct diff_queue_struct diff_queued_diff;
2986 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
2988 if (queue->alloc <= queue->nr) {
2989 queue->alloc = alloc_nr(queue->alloc);
2990 queue->queue = xrealloc(queue->queue,
2991 sizeof(dp) * queue->alloc);
2993 queue->queue[queue->nr++] = dp;
2996 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
2997 struct diff_filespec *one,
2998 struct diff_filespec *two)
3000 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
3008 void diff_free_filepair(struct diff_filepair *p)
3010 free_filespec(p->one);
3011 free_filespec(p->two);
3015 /* This is different from find_unique_abbrev() in that
3016 * it stuffs the result with dots for alignment.
3018 const char *diff_unique_abbrev(const unsigned char *sha1, int len)
3023 return sha1_to_hex(sha1);
3025 abbrev = find_unique_abbrev(sha1, len);
3026 abblen = strlen(abbrev);
3028 static char hex[41];
3029 if (len < abblen && abblen <= len + 2)
3030 sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
3032 sprintf(hex, "%s...", abbrev);
3035 return sha1_to_hex(sha1);
3038 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
3040 int line_termination = opt->line_termination;
3041 int inter_name_termination = line_termination ? '\t' : '\0';
3043 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
3044 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
3045 diff_unique_abbrev(p->one->sha1, opt->abbrev));
3046 fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
3049 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
3050 inter_name_termination);
3052 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
3055 if (p->status == DIFF_STATUS_COPIED ||
3056 p->status == DIFF_STATUS_RENAMED) {
3057 const char *name_a, *name_b;
3058 name_a = p->one->path;
3059 name_b = p->two->path;
3060 strip_prefix(opt->prefix_length, &name_a, &name_b);
3061 write_name_quoted(name_a, opt->file, inter_name_termination);
3062 write_name_quoted(name_b, opt->file, line_termination);
3064 const char *name_a, *name_b;
3065 name_a = p->one->mode ? p->one->path : p->two->path;
3067 strip_prefix(opt->prefix_length, &name_a, &name_b);
3068 write_name_quoted(name_a, opt->file, line_termination);
3072 int diff_unmodified_pair(struct diff_filepair *p)
3074 /* This function is written stricter than necessary to support
3075 * the currently implemented transformers, but the idea is to
3076 * let transformers to produce diff_filepairs any way they want,
3077 * and filter and clean them up here before producing the output.
3079 struct diff_filespec *one = p->one, *two = p->two;
3081 if (DIFF_PAIR_UNMERGED(p))
3082 return 0; /* unmerged is interesting */
3084 /* deletion, addition, mode or type change
3085 * and rename are all interesting.
3087 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
3088 DIFF_PAIR_MODE_CHANGED(p) ||
3089 strcmp(one->path, two->path))
3092 /* both are valid and point at the same path. that is, we are
3093 * dealing with a change.
3095 if (one->sha1_valid && two->sha1_valid &&
3096 !hashcmp(one->sha1, two->sha1) &&
3097 !one->dirty_submodule && !two->dirty_submodule)
3098 return 1; /* no change */
3099 if (!one->sha1_valid && !two->sha1_valid)
3100 return 1; /* both look at the same file on the filesystem. */
3104 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
3106 if (diff_unmodified_pair(p))
3109 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3110 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3111 return; /* no tree diffs in patch format */
3116 static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
3117 struct diffstat_t *diffstat)
3119 if (diff_unmodified_pair(p))
3122 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3123 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3124 return; /* no tree diffs in patch format */
3126 run_diffstat(p, o, diffstat);
3129 static void diff_flush_checkdiff(struct diff_filepair *p,
3130 struct diff_options *o)
3132 if (diff_unmodified_pair(p))
3135 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3136 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3137 return; /* no tree diffs in patch format */
3139 run_checkdiff(p, o);
3142 int diff_queue_is_empty(void)
3144 struct diff_queue_struct *q = &diff_queued_diff;
3146 for (i = 0; i < q->nr; i++)
3147 if (!diff_unmodified_pair(q->queue[i]))
3153 void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
3155 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
3158 DIFF_FILE_VALID(s) ? "valid" : "invalid",
3160 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
3161 fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
3163 s->size, s->xfrm_flags);
3166 void diff_debug_filepair(const struct diff_filepair *p, int i)
3168 diff_debug_filespec(p->one, i, "one");
3169 diff_debug_filespec(p->two, i, "two");
3170 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
3171 p->score, p->status ? p->status : '?',
3172 p->one->rename_used, p->broken_pair);
3175 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
3179 fprintf(stderr, "%s\n", msg);
3180 fprintf(stderr, "q->nr = %d\n", q->nr);
3181 for (i = 0; i < q->nr; i++) {
3182 struct diff_filepair *p = q->queue[i];
3183 diff_debug_filepair(p, i);
3188 static void diff_resolve_rename_copy(void)
3191 struct diff_filepair *p;
3192 struct diff_queue_struct *q = &diff_queued_diff;
3194 diff_debug_queue("resolve-rename-copy", q);
3196 for (i = 0; i < q->nr; i++) {
3198 p->status = 0; /* undecided */
3199 if (DIFF_PAIR_UNMERGED(p))
3200 p->status = DIFF_STATUS_UNMERGED;
3201 else if (!DIFF_FILE_VALID(p->one))
3202 p->status = DIFF_STATUS_ADDED;
3203 else if (!DIFF_FILE_VALID(p->two))
3204 p->status = DIFF_STATUS_DELETED;
3205 else if (DIFF_PAIR_TYPE_CHANGED(p))
3206 p->status = DIFF_STATUS_TYPE_CHANGED;
3208 /* from this point on, we are dealing with a pair
3209 * whose both sides are valid and of the same type, i.e.
3210 * either in-place edit or rename/copy edit.
3212 else if (DIFF_PAIR_RENAME(p)) {
3214 * A rename might have re-connected a broken
3215 * pair up, causing the pathnames to be the
3216 * same again. If so, that's not a rename at
3217 * all, just a modification..
3219 * Otherwise, see if this source was used for
3220 * multiple renames, in which case we decrement
3221 * the count, and call it a copy.
3223 if (!strcmp(p->one->path, p->two->path))
3224 p->status = DIFF_STATUS_MODIFIED;
3225 else if (--p->one->rename_used > 0)
3226 p->status = DIFF_STATUS_COPIED;
3228 p->status = DIFF_STATUS_RENAMED;
3230 else if (hashcmp(p->one->sha1, p->two->sha1) ||
3231 p->one->mode != p->two->mode ||
3232 p->one->dirty_submodule ||
3233 p->two->dirty_submodule ||
3234 is_null_sha1(p->one->sha1))
3235 p->status = DIFF_STATUS_MODIFIED;
3237 /* This is a "no-change" entry and should not
3238 * happen anymore, but prepare for broken callers.
3240 error("feeding unmodified %s to diffcore",
3242 p->status = DIFF_STATUS_UNKNOWN;
3245 diff_debug_queue("resolve-rename-copy done", q);
3248 static int check_pair_status(struct diff_filepair *p)
3250 switch (p->status) {
3251 case DIFF_STATUS_UNKNOWN:
3254 die("internal error in diff-resolve-rename-copy");
3260 static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
3262 int fmt = opt->output_format;
3264 if (fmt & DIFF_FORMAT_CHECKDIFF)
3265 diff_flush_checkdiff(p, opt);
3266 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
3267 diff_flush_raw(p, opt);
3268 else if (fmt & DIFF_FORMAT_NAME) {
3269 const char *name_a, *name_b;
3270 name_a = p->two->path;
3272 strip_prefix(opt->prefix_length, &name_a, &name_b);
3273 write_name_quoted(name_a, opt->file, opt->line_termination);
3277 static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
3280 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
3282 fprintf(file, " %s ", newdelete);
3283 write_name_quoted(fs->path, file, '\n');
3287 static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name)
3289 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
3290 fprintf(file, " mode change %06o => %06o%c", p->one->mode, p->two->mode,
3291 show_name ? ' ' : '\n');
3293 write_name_quoted(p->two->path, file, '\n');
3298 static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p)
3300 char *names = pprint_rename(p->one->path, p->two->path);
3302 fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
3304 show_mode_change(file, p, 0);
3307 static void diff_summary(FILE *file, struct diff_filepair *p)
3310 case DIFF_STATUS_DELETED:
3311 show_file_mode_name(file, "delete", p->one);
3313 case DIFF_STATUS_ADDED:
3314 show_file_mode_name(file, "create", p->two);
3316 case DIFF_STATUS_COPIED:
3317 show_rename_copy(file, "copy", p);
3319 case DIFF_STATUS_RENAMED:
3320 show_rename_copy(file, "rename", p);
3324 fputs(" rewrite ", file);
3325 write_name_quoted(p->two->path, file, ' ');
3326 fprintf(file, "(%d%%)\n", similarity_index(p));
3328 show_mode_change(file, p, !p->score);
3338 static int remove_space(char *line, int len)
3344 for (i = 0; i < len; i++)
3345 if (!isspace((c = line[i])))
3351 static void patch_id_consume(void *priv, char *line, unsigned long len)
3353 struct patch_id_t *data = priv;
3356 /* Ignore line numbers when computing the SHA1 of the patch */
3357 if (!prefixcmp(line, "@@ -"))
3360 new_len = remove_space(line, len);
3362 git_SHA1_Update(data->ctx, line, new_len);
3363 data->patchlen += new_len;
3366 /* returns 0 upon success, and writes result into sha1 */
3367 static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
3369 struct diff_queue_struct *q = &diff_queued_diff;
3372 struct patch_id_t data;
3373 char buffer[PATH_MAX * 4 + 20];
3375 git_SHA1_Init(&ctx);
3376 memset(&data, 0, sizeof(struct patch_id_t));
3379 for (i = 0; i < q->nr; i++) {
3383 struct diff_filepair *p = q->queue[i];
3386 memset(&xpp, 0, sizeof(xpp));
3387 memset(&xecfg, 0, sizeof(xecfg));
3389 return error("internal diff status error");
3390 if (p->status == DIFF_STATUS_UNKNOWN)
3392 if (diff_unmodified_pair(p))
3394 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3395 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3397 if (DIFF_PAIR_UNMERGED(p))
3400 diff_fill_sha1_info(p->one);
3401 diff_fill_sha1_info(p->two);
3402 if (fill_mmfile(&mf1, p->one) < 0 ||
3403 fill_mmfile(&mf2, p->two) < 0)
3404 return error("unable to read files to diff");
3406 len1 = remove_space(p->one->path, strlen(p->one->path));
3407 len2 = remove_space(p->two->path, strlen(p->two->path));
3408 if (p->one->mode == 0)
3409 len1 = snprintf(buffer, sizeof(buffer),
3410 "diff--gita/%.*sb/%.*s"
3417 len2, p->two->path);
3418 else if (p->two->mode == 0)
3419 len1 = snprintf(buffer, sizeof(buffer),
3420 "diff--gita/%.*sb/%.*s"
3421 "deletedfilemode%06o"
3427 len1, p->one->path);
3429 len1 = snprintf(buffer, sizeof(buffer),
3430 "diff--gita/%.*sb/%.*s"
3436 len2, p->two->path);
3437 git_SHA1_Update(&ctx, buffer, len1);
3441 xecfg.flags = XDL_EMIT_FUNCNAMES;
3442 xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
3446 git_SHA1_Final(sha1, &ctx);
3450 int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
3452 struct diff_queue_struct *q = &diff_queued_diff;
3454 int result = diff_get_patch_id(options, sha1);
3456 for (i = 0; i < q->nr; i++)
3457 diff_free_filepair(q->queue[i]);
3461 q->nr = q->alloc = 0;
3466 static int is_summary_empty(const struct diff_queue_struct *q)
3470 for (i = 0; i < q->nr; i++) {
3471 const struct diff_filepair *p = q->queue[i];
3473 switch (p->status) {
3474 case DIFF_STATUS_DELETED:
3475 case DIFF_STATUS_ADDED:
3476 case DIFF_STATUS_COPIED:
3477 case DIFF_STATUS_RENAMED:
3482 if (p->one->mode && p->two->mode &&
3483 p->one->mode != p->two->mode)
3491 void diff_flush(struct diff_options *options)
3493 struct diff_queue_struct *q = &diff_queued_diff;
3494 int i, output_format = options->output_format;
3498 * Order: raw, stat, summary, patch
3499 * or: name/name-status/checkdiff (other bits clear)
3504 if (output_format & (DIFF_FORMAT_RAW |
3506 DIFF_FORMAT_NAME_STATUS |
3507 DIFF_FORMAT_CHECKDIFF)) {
3508 for (i = 0; i < q->nr; i++) {
3509 struct diff_filepair *p = q->queue[i];
3510 if (check_pair_status(p))
3511 flush_one_pair(p, options);
3516 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) {
3517 struct diffstat_t diffstat;
3519 memset(&diffstat, 0, sizeof(struct diffstat_t));
3520 for (i = 0; i < q->nr; i++) {
3521 struct diff_filepair *p = q->queue[i];
3522 if (check_pair_status(p))
3523 diff_flush_stat(p, options, &diffstat);
3525 if (output_format & DIFF_FORMAT_NUMSTAT)
3526 show_numstat(&diffstat, options);
3527 if (output_format & DIFF_FORMAT_DIFFSTAT)
3528 show_stats(&diffstat, options);
3529 if (output_format & DIFF_FORMAT_SHORTSTAT)
3530 show_shortstats(&diffstat, options);
3531 free_diffstat_info(&diffstat);
3534 if (output_format & DIFF_FORMAT_DIRSTAT)
3535 show_dirstat(options);
3537 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
3538 for (i = 0; i < q->nr; i++)
3539 diff_summary(options->file, q->queue[i]);
3543 if (output_format & DIFF_FORMAT_NO_OUTPUT &&
3544 DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
3545 DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
3547 * run diff_flush_patch for the exit status. setting
3548 * options->file to /dev/null should be safe, becaue we
3549 * aren't supposed to produce any output anyway.
3551 if (options->close_file)
3552 fclose(options->file);
3553 options->file = fopen("/dev/null", "w");
3555 die_errno("Could not open /dev/null");
3556 options->close_file = 1;
3557 for (i = 0; i < q->nr; i++) {
3558 struct diff_filepair *p = q->queue[i];
3559 if (check_pair_status(p))
3560 diff_flush_patch(p, options);
3561 if (options->found_changes)
3566 if (output_format & DIFF_FORMAT_PATCH) {
3568 putc(options->line_termination, options->file);
3569 if (options->stat_sep) {
3570 /* attach patch instead of inline */
3571 fputs(options->stat_sep, options->file);
3575 for (i = 0; i < q->nr; i++) {
3576 struct diff_filepair *p = q->queue[i];
3577 if (check_pair_status(p))
3578 diff_flush_patch(p, options);
3582 if (output_format & DIFF_FORMAT_CALLBACK)
3583 options->format_callback(q, options, options->format_callback_data);
3585 for (i = 0; i < q->nr; i++)
3586 diff_free_filepair(q->queue[i]);
3590 q->nr = q->alloc = 0;
3591 if (options->close_file)
3592 fclose(options->file);
3595 * Report the content-level differences with HAS_CHANGES;
3596 * diff_addremove/diff_change does not set the bit when
3597 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
3599 if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
3600 if (options->found_changes)
3601 DIFF_OPT_SET(options, HAS_CHANGES);
3603 DIFF_OPT_CLR(options, HAS_CHANGES);
3607 static void diffcore_apply_filter(const char *filter)
3610 struct diff_queue_struct *q = &diff_queued_diff;
3611 struct diff_queue_struct outq;
3613 outq.nr = outq.alloc = 0;
3618 if (strchr(filter, DIFF_STATUS_FILTER_AON)) {
3620 for (i = found = 0; !found && i < q->nr; i++) {
3621 struct diff_filepair *p = q->queue[i];
3622 if (((p->status == DIFF_STATUS_MODIFIED) &&
3624 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3626 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3627 ((p->status != DIFF_STATUS_MODIFIED) &&
3628 strchr(filter, p->status)))
3634 /* otherwise we will clear the whole queue
3635 * by copying the empty outq at the end of this
3636 * function, but first clear the current entries
3639 for (i = 0; i < q->nr; i++)
3640 diff_free_filepair(q->queue[i]);
3643 /* Only the matching ones */
3644 for (i = 0; i < q->nr; i++) {
3645 struct diff_filepair *p = q->queue[i];
3647 if (((p->status == DIFF_STATUS_MODIFIED) &&
3649 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3651 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3652 ((p->status != DIFF_STATUS_MODIFIED) &&
3653 strchr(filter, p->status)))
3656 diff_free_filepair(p);
3663 /* Check whether two filespecs with the same mode and size are identical */
3664 static int diff_filespec_is_identical(struct diff_filespec *one,
3665 struct diff_filespec *two)
3667 if (S_ISGITLINK(one->mode))
3669 if (diff_populate_filespec(one, 0))
3671 if (diff_populate_filespec(two, 0))
3673 return !memcmp(one->data, two->data, one->size);
3676 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3679 struct diff_queue_struct *q = &diff_queued_diff;
3680 struct diff_queue_struct outq;
3682 outq.nr = outq.alloc = 0;
3684 for (i = 0; i < q->nr; i++) {
3685 struct diff_filepair *p = q->queue[i];
3688 * 1. Entries that come from stat info dirtiness
3689 * always have both sides (iow, not create/delete),
3690 * one side of the object name is unknown, with
3691 * the same mode and size. Keep the ones that
3692 * do not match these criteria. They have real
3695 * 2. At this point, the file is known to be modified,
3696 * with the same mode and size, and the object
3697 * name of one side is unknown. Need to inspect
3698 * the identical contents.
3700 if (!DIFF_FILE_VALID(p->one) || /* (1) */
3701 !DIFF_FILE_VALID(p->two) ||
3702 (p->one->sha1_valid && p->two->sha1_valid) ||
3703 (p->one->mode != p->two->mode) ||
3704 diff_populate_filespec(p->one, 1) ||
3705 diff_populate_filespec(p->two, 1) ||
3706 (p->one->size != p->two->size) ||
3707 !diff_filespec_is_identical(p->one, p->two)) /* (2) */
3711 * The caller can subtract 1 from skip_stat_unmatch
3712 * to determine how many paths were dirty only
3713 * due to stat info mismatch.
3715 if (!DIFF_OPT_TST(diffopt, NO_INDEX))
3716 diffopt->skip_stat_unmatch++;
3717 diff_free_filepair(p);
3724 static int diffnamecmp(const void *a_, const void *b_)
3726 const struct diff_filepair *a = *((const struct diff_filepair **)a_);
3727 const struct diff_filepair *b = *((const struct diff_filepair **)b_);
3728 const char *name_a, *name_b;
3730 name_a = a->one ? a->one->path : a->two->path;
3731 name_b = b->one ? b->one->path : b->two->path;
3732 return strcmp(name_a, name_b);
3735 void diffcore_fix_diff_index(struct diff_options *options)
3737 struct diff_queue_struct *q = &diff_queued_diff;
3738 qsort(q->queue, q->nr, sizeof(q->queue[0]), diffnamecmp);
3741 void diffcore_std(struct diff_options *options)
3743 if (options->skip_stat_unmatch)
3744 diffcore_skip_stat_unmatch(options);
3745 if (options->break_opt != -1)
3746 diffcore_break(options->break_opt);
3747 if (options->detect_rename)
3748 diffcore_rename(options);
3749 if (options->break_opt != -1)
3750 diffcore_merge_broken();
3751 if (options->pickaxe)
3752 diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
3753 if (options->orderfile)
3754 diffcore_order(options->orderfile);
3755 diff_resolve_rename_copy();
3756 diffcore_apply_filter(options->filter);
3758 if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
3759 DIFF_OPT_SET(options, HAS_CHANGES);
3761 DIFF_OPT_CLR(options, HAS_CHANGES);
3764 int diff_result_code(struct diff_options *opt, int status)
3767 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3768 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
3770 if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3771 DIFF_OPT_TST(opt, HAS_CHANGES))
3773 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
3774 DIFF_OPT_TST(opt, CHECK_FAILED))
3779 void diff_addremove(struct diff_options *options,
3780 int addremove, unsigned mode,
3781 const unsigned char *sha1,
3782 const char *concatpath, unsigned dirty_submodule)
3784 struct diff_filespec *one, *two;
3786 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(mode))
3789 /* This may look odd, but it is a preparation for
3790 * feeding "there are unchanged files which should
3791 * not produce diffs, but when you are doing copy
3792 * detection you would need them, so here they are"
3793 * entries to the diff-core. They will be prefixed
3794 * with something like '=' or '*' (I haven't decided
3795 * which but should not make any difference).
3796 * Feeding the same new and old to diff_change()
3797 * also has the same effect.
3798 * Before the final output happens, they are pruned after
3799 * merged into rename/copy pairs as appropriate.
3801 if (DIFF_OPT_TST(options, REVERSE_DIFF))
3802 addremove = (addremove == '+' ? '-' :
3803 addremove == '-' ? '+' : addremove);
3805 if (options->prefix &&
3806 strncmp(concatpath, options->prefix, options->prefix_length))
3809 one = alloc_filespec(concatpath);
3810 two = alloc_filespec(concatpath);
3812 if (addremove != '+')
3813 fill_filespec(one, sha1, mode);
3814 if (addremove != '-') {
3815 fill_filespec(two, sha1, mode);
3816 two->dirty_submodule = dirty_submodule;
3819 diff_queue(&diff_queued_diff, one, two);
3820 if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
3821 DIFF_OPT_SET(options, HAS_CHANGES);
3824 void diff_change(struct diff_options *options,
3825 unsigned old_mode, unsigned new_mode,
3826 const unsigned char *old_sha1,
3827 const unsigned char *new_sha1,
3828 const char *concatpath,
3829 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
3831 struct diff_filespec *one, *two;
3833 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(old_mode)
3834 && S_ISGITLINK(new_mode))
3837 if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
3839 const unsigned char *tmp_c;
3840 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
3841 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
3842 tmp = old_dirty_submodule; old_dirty_submodule = new_dirty_submodule;
3843 new_dirty_submodule = tmp;
3846 if (options->prefix &&
3847 strncmp(concatpath, options->prefix, options->prefix_length))
3850 one = alloc_filespec(concatpath);
3851 two = alloc_filespec(concatpath);
3852 fill_filespec(one, old_sha1, old_mode);
3853 fill_filespec(two, new_sha1, new_mode);
3854 one->dirty_submodule = old_dirty_submodule;
3855 two->dirty_submodule = new_dirty_submodule;
3857 diff_queue(&diff_queued_diff, one, two);
3858 if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
3859 DIFF_OPT_SET(options, HAS_CHANGES);
3862 void diff_unmerge(struct diff_options *options,
3864 unsigned mode, const unsigned char *sha1)
3866 struct diff_filespec *one, *two;
3868 if (options->prefix &&
3869 strncmp(path, options->prefix, options->prefix_length))
3872 one = alloc_filespec(path);
3873 two = alloc_filespec(path);
3874 fill_filespec(one, sha1, mode);
3875 diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;
3878 static char *run_textconv(const char *pgm, struct diff_filespec *spec,
3881 struct diff_tempfile *temp;
3882 const char *argv[3];
3883 const char **arg = argv;
3884 struct child_process child;
3885 struct strbuf buf = STRBUF_INIT;
3888 temp = prepare_temp_file(spec->path, spec);
3890 *arg++ = temp->name;
3893 memset(&child, 0, sizeof(child));
3894 child.use_shell = 1;
3897 if (start_command(&child)) {
3902 if (strbuf_read(&buf, child.out, 0) < 0)
3903 err = error("error reading from textconv command '%s'", pgm);
3906 if (finish_command(&child) || err) {
3907 strbuf_release(&buf);
3913 return strbuf_detach(&buf, outsize);