2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
16 #include "submodule.h"
18 #ifdef NO_FAST_WORKING_DIRECTORY
19 #define FAST_WORKING_DIRECTORY 0
21 #define FAST_WORKING_DIRECTORY 1
24 static int diff_detect_rename_default;
25 static int diff_rename_limit_default = 200;
26 static int diff_suppress_blank_empty;
27 int diff_use_color_default = -1;
28 static const char *diff_word_regex_cfg;
29 static const char *external_diff_cmd_cfg;
30 int diff_auto_refresh_index = 1;
31 static int diff_mnemonic_prefix;
33 static char diff_colors[][COLOR_MAXLEN] = {
35 GIT_COLOR_NORMAL, /* PLAIN */
36 GIT_COLOR_BOLD, /* METAINFO */
37 GIT_COLOR_CYAN, /* FRAGINFO */
38 GIT_COLOR_RED, /* OLD */
39 GIT_COLOR_GREEN, /* NEW */
40 GIT_COLOR_YELLOW, /* COMMIT */
41 GIT_COLOR_BG_RED, /* WHITESPACE */
42 GIT_COLOR_NORMAL, /* FUNCINFO */
45 static void diff_filespec_load_driver(struct diff_filespec *one);
46 static char *run_textconv(const char *, struct diff_filespec *, size_t *);
48 static int parse_diff_color_slot(const char *var, int ofs)
50 if (!strcasecmp(var+ofs, "plain"))
52 if (!strcasecmp(var+ofs, "meta"))
54 if (!strcasecmp(var+ofs, "frag"))
56 if (!strcasecmp(var+ofs, "old"))
58 if (!strcasecmp(var+ofs, "new"))
60 if (!strcasecmp(var+ofs, "commit"))
62 if (!strcasecmp(var+ofs, "whitespace"))
63 return DIFF_WHITESPACE;
64 if (!strcasecmp(var+ofs, "func"))
69 static int git_config_rename(const char *var, const char *value)
72 return DIFF_DETECT_RENAME;
73 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
74 return DIFF_DETECT_COPY;
75 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
79 * These are to give UI layer defaults.
80 * The core-level commands such as git-diff-files should
81 * never be affected by the setting of diff.renames
82 * the user happens to have in the configuration file.
84 int git_diff_ui_config(const char *var, const char *value, void *cb)
86 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
87 diff_use_color_default = git_config_colorbool(var, value, -1);
90 if (!strcmp(var, "diff.renames")) {
91 diff_detect_rename_default = git_config_rename(var, value);
94 if (!strcmp(var, "diff.autorefreshindex")) {
95 diff_auto_refresh_index = git_config_bool(var, value);
98 if (!strcmp(var, "diff.mnemonicprefix")) {
99 diff_mnemonic_prefix = git_config_bool(var, value);
102 if (!strcmp(var, "diff.external"))
103 return git_config_string(&external_diff_cmd_cfg, var, value);
104 if (!strcmp(var, "diff.wordregex"))
105 return git_config_string(&diff_word_regex_cfg, var, value);
107 return git_diff_basic_config(var, value, cb);
110 int git_diff_basic_config(const char *var, const char *value, void *cb)
112 if (!strcmp(var, "diff.renamelimit")) {
113 diff_rename_limit_default = git_config_int(var, value);
117 switch (userdiff_config(var, value)) {
123 if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
124 int slot = parse_diff_color_slot(var, 11);
128 return config_error_nonbool(var);
129 color_parse(value, var, diff_colors[slot]);
133 /* like GNU diff's --suppress-blank-empty option */
134 if (!strcmp(var, "diff.suppressblankempty") ||
135 /* for backwards compatibility */
136 !strcmp(var, "diff.suppress-blank-empty")) {
137 diff_suppress_blank_empty = git_config_bool(var, value);
141 return git_color_default_config(var, value, cb);
144 static char *quote_two(const char *one, const char *two)
146 int need_one = quote_c_style(one, NULL, NULL, 1);
147 int need_two = quote_c_style(two, NULL, NULL, 1);
148 struct strbuf res = STRBUF_INIT;
150 if (need_one + need_two) {
151 strbuf_addch(&res, '"');
152 quote_c_style(one, &res, NULL, 1);
153 quote_c_style(two, &res, NULL, 1);
154 strbuf_addch(&res, '"');
156 strbuf_addstr(&res, one);
157 strbuf_addstr(&res, two);
159 return strbuf_detach(&res, NULL);
162 static const char *external_diff(void)
164 static const char *external_diff_cmd = NULL;
165 static int done_preparing = 0;
168 return external_diff_cmd;
169 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
170 if (!external_diff_cmd)
171 external_diff_cmd = external_diff_cmd_cfg;
173 return external_diff_cmd;
176 static struct diff_tempfile {
177 const char *name; /* filename external diff should read from */
180 char tmp_path[PATH_MAX];
183 typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
185 struct emit_callback {
188 int blank_at_eof_in_preimage;
189 int blank_at_eof_in_postimage;
191 int lno_in_postimage;
192 sane_truncate_fn truncate;
193 const char **label_path;
194 struct diff_words_data *diff_words;
199 static int count_lines(const char *data, int size)
201 int count, ch, completely_empty = 1, nl_just_seen = 0;
208 completely_empty = 0;
212 completely_empty = 0;
215 if (completely_empty)
218 count++; /* no trailing newline */
222 static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
224 if (!DIFF_FILE_VALID(one)) {
225 mf->ptr = (char *)""; /* does not matter */
229 else if (diff_populate_filespec(one, 0))
233 mf->size = one->size;
237 static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
240 long size = mf->size;
245 ptr += size - 1; /* pointing at the very end */
247 ; /* incomplete line */
249 ptr--; /* skip the last LF */
250 while (mf->ptr < ptr) {
252 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
253 if (*prev_eol == '\n')
255 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
263 static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
264 struct emit_callback *ecbdata)
267 unsigned ws_rule = ecbdata->ws_rule;
268 l1 = count_trailing_blank(mf1, ws_rule);
269 l2 = count_trailing_blank(mf2, ws_rule);
271 ecbdata->blank_at_eof_in_preimage = 0;
272 ecbdata->blank_at_eof_in_postimage = 0;
275 at = count_lines(mf1->ptr, mf1->size);
276 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
278 at = count_lines(mf2->ptr, mf2->size);
279 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
282 static void emit_line_0(FILE *file, const char *set, const char *reset,
283 int first, const char *line, int len)
285 int has_trailing_newline, has_trailing_carriage_return;
289 has_trailing_newline = (first == '\n');
290 has_trailing_carriage_return = (!has_trailing_newline &&
292 nofirst = has_trailing_newline || has_trailing_carriage_return;
294 has_trailing_newline = (len > 0 && line[len-1] == '\n');
295 if (has_trailing_newline)
297 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
298 if (has_trailing_carriage_return)
303 if (len || !nofirst) {
307 fwrite(line, len, 1, file);
310 if (has_trailing_carriage_return)
312 if (has_trailing_newline)
316 static void emit_line(FILE *file, const char *set, const char *reset,
317 const char *line, int len)
319 emit_line_0(file, set, reset, line[0], line+1, len-1);
322 static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
324 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
325 ecbdata->blank_at_eof_in_preimage &&
326 ecbdata->blank_at_eof_in_postimage &&
327 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
328 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
330 return ws_blank_line(line, len, ecbdata->ws_rule);
333 static void emit_add_line(const char *reset,
334 struct emit_callback *ecbdata,
335 const char *line, int len)
337 const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
338 const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
341 emit_line_0(ecbdata->file, set, reset, '+', line, len);
342 else if (new_blank_line_at_eof(ecbdata, line, len))
343 /* Blank line at EOF - paint '+' as well */
344 emit_line_0(ecbdata->file, ws, reset, '+', line, len);
346 /* Emit just the prefix, then the rest. */
347 emit_line_0(ecbdata->file, set, reset, '+', "", 0);
348 ws_check_emit(line, len, ecbdata->ws_rule,
349 ecbdata->file, set, reset, ws);
353 static void emit_hunk_header(struct emit_callback *ecbdata,
354 const char *line, int len)
356 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
357 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
358 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
359 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
360 static const char atat[2] = { '@', '@' };
364 * As a hunk header must begin with "@@ -<old>, +<new> @@",
365 * it always is at least 10 bytes long.
368 memcmp(line, atat, 2) ||
369 !(ep = memmem(line + 2, len - 2, atat, 2))) {
370 emit_line(ecbdata->file, plain, reset, line, len);
373 ep += 2; /* skip over @@ */
375 /* The hunk header in fraginfo color */
376 emit_line(ecbdata->file, frag, reset, line, ep - line);
378 /* blank before the func header */
379 for (cp = ep; ep - line < len; ep++)
380 if (*ep != ' ' && *ep != '\t')
383 emit_line(ecbdata->file, plain, reset, cp, ep - cp);
386 emit_line(ecbdata->file, func, reset, ep, line + len - ep);
389 static struct diff_tempfile *claim_diff_tempfile(void) {
391 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
392 if (!diff_temp[i].name)
393 return diff_temp + i;
394 die("BUG: diff is failing to clean up its tempfiles");
397 static int remove_tempfile_installed;
399 static void remove_tempfile(void)
402 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
403 if (diff_temp[i].name == diff_temp[i].tmp_path)
404 unlink_or_warn(diff_temp[i].name);
405 diff_temp[i].name = NULL;
409 static void remove_tempfile_on_signal(int signo)
416 static void print_line_count(FILE *file, int count)
420 fprintf(file, "0,0");
426 fprintf(file, "1,%d", count);
431 static void emit_rewrite_lines(struct emit_callback *ecb,
432 int prefix, const char *data, int size)
434 const char *endp = NULL;
435 static const char *nneof = " No newline at end of file\n";
436 const char *old = diff_get_color(ecb->color_diff, DIFF_FILE_OLD);
437 const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
442 endp = memchr(data, '\n', size);
443 len = endp ? (endp - data + 1) : size;
445 ecb->lno_in_preimage++;
446 emit_line_0(ecb->file, old, reset, '-',
449 ecb->lno_in_postimage++;
450 emit_add_line(reset, ecb, data, len);
456 const char *plain = diff_get_color(ecb->color_diff,
458 emit_line_0(ecb->file, plain, reset, '\\',
459 nneof, strlen(nneof));
463 static void emit_rewrite_diff(const char *name_a,
465 struct diff_filespec *one,
466 struct diff_filespec *two,
467 const char *textconv_one,
468 const char *textconv_two,
469 struct diff_options *o)
472 int color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
473 const char *name_a_tab, *name_b_tab;
474 const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO);
475 const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO);
476 const char *reset = diff_get_color(color_diff, DIFF_RESET);
477 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
478 const char *a_prefix, *b_prefix;
479 const char *data_one, *data_two;
480 size_t size_one, size_two;
481 struct emit_callback ecbdata;
483 if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
484 a_prefix = o->b_prefix;
485 b_prefix = o->a_prefix;
487 a_prefix = o->a_prefix;
488 b_prefix = o->b_prefix;
491 name_a += (*name_a == '/');
492 name_b += (*name_b == '/');
493 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
494 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
496 strbuf_reset(&a_name);
497 strbuf_reset(&b_name);
498 quote_two_c_style(&a_name, a_prefix, name_a, 0);
499 quote_two_c_style(&b_name, b_prefix, name_b, 0);
501 diff_populate_filespec(one, 0);
502 diff_populate_filespec(two, 0);
504 data_one = run_textconv(textconv_one, one, &size_one);
506 die("unable to read files to diff");
509 data_one = one->data;
510 size_one = one->size;
513 data_two = run_textconv(textconv_two, two, &size_two);
515 die("unable to read files to diff");
518 data_two = two->data;
519 size_two = two->size;
522 memset(&ecbdata, 0, sizeof(ecbdata));
523 ecbdata.color_diff = color_diff;
524 ecbdata.found_changesp = &o->found_changes;
525 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
526 ecbdata.file = o->file;
527 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
529 mf1.ptr = (char *)data_one;
530 mf2.ptr = (char *)data_two;
533 check_blank_at_eof(&mf1, &mf2, &ecbdata);
535 ecbdata.lno_in_preimage = 1;
536 ecbdata.lno_in_postimage = 1;
538 lc_a = count_lines(data_one, size_one);
539 lc_b = count_lines(data_two, size_two);
541 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
542 metainfo, a_name.buf, name_a_tab, reset,
543 metainfo, b_name.buf, name_b_tab, reset, fraginfo);
544 print_line_count(o->file, lc_a);
545 fprintf(o->file, " +");
546 print_line_count(o->file, lc_b);
547 fprintf(o->file, " @@%s\n", reset);
549 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
551 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
554 struct diff_words_buffer {
557 struct diff_words_orig {
558 const char *begin, *end;
560 int orig_nr, orig_alloc;
563 static void diff_words_append(char *line, unsigned long len,
564 struct diff_words_buffer *buffer)
566 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
569 memcpy(buffer->text.ptr + buffer->text.size, line, len);
570 buffer->text.size += len;
571 buffer->text.ptr[buffer->text.size] = '\0';
574 struct diff_words_data {
575 struct diff_words_buffer minus, plus;
576 const char *current_plus;
581 static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
583 struct diff_words_data *diff_words = priv;
584 int minus_first, minus_len, plus_first, plus_len;
585 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
587 if (line[0] != '@' || parse_hunk_header(line, len,
588 &minus_first, &minus_len, &plus_first, &plus_len))
591 /* POSIX requires that first be decremented by one if len == 0... */
593 minus_begin = diff_words->minus.orig[minus_first].begin;
595 diff_words->minus.orig[minus_first + minus_len - 1].end;
597 minus_begin = minus_end =
598 diff_words->minus.orig[minus_first].end;
601 plus_begin = diff_words->plus.orig[plus_first].begin;
602 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
604 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
606 if (diff_words->current_plus != plus_begin)
607 fwrite(diff_words->current_plus,
608 plus_begin - diff_words->current_plus, 1,
610 if (minus_begin != minus_end)
611 color_fwrite_lines(diff_words->file,
612 diff_get_color(1, DIFF_FILE_OLD),
613 minus_end - minus_begin, minus_begin);
614 if (plus_begin != plus_end)
615 color_fwrite_lines(diff_words->file,
616 diff_get_color(1, DIFF_FILE_NEW),
617 plus_end - plus_begin, plus_begin);
619 diff_words->current_plus = plus_end;
622 /* This function starts looking at *begin, and returns 0 iff a word was found. */
623 static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
624 int *begin, int *end)
626 if (word_regex && *begin < buffer->size) {
628 if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) {
629 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
630 '\n', match[0].rm_eo - match[0].rm_so);
631 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
632 *begin += match[0].rm_so;
633 return *begin >= *end;
638 /* find the next word */
639 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
641 if (*begin >= buffer->size)
644 /* find the end of the word */
646 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
653 * This function splits the words in buffer->text, stores the list with
654 * newline separator into out, and saves the offsets of the original words
657 static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
666 /* fake an empty "0th" word */
667 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
668 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
671 for (i = 0; i < buffer->text.size; i++) {
672 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
675 /* store original boundaries */
676 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
678 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
679 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
683 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
684 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
685 out->ptr[out->size + j - i] = '\n';
686 out->size += j - i + 1;
692 /* this executes the word diff on the accumulated buffers */
693 static void diff_words_show(struct diff_words_data *diff_words)
698 mmfile_t minus, plus;
700 /* special case: only removal */
701 if (!diff_words->plus.text.size) {
702 color_fwrite_lines(diff_words->file,
703 diff_get_color(1, DIFF_FILE_OLD),
704 diff_words->minus.text.size, diff_words->minus.text.ptr);
705 diff_words->minus.text.size = 0;
709 diff_words->current_plus = diff_words->plus.text.ptr;
711 memset(&xpp, 0, sizeof(xpp));
712 memset(&xecfg, 0, sizeof(xecfg));
713 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
714 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
715 xpp.flags = XDF_NEED_MINIMAL;
716 /* as only the hunk header will be parsed, we need a 0-context */
718 xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
722 if (diff_words->current_plus != diff_words->plus.text.ptr +
723 diff_words->plus.text.size)
724 fwrite(diff_words->current_plus,
725 diff_words->plus.text.ptr + diff_words->plus.text.size
726 - diff_words->current_plus, 1,
728 diff_words->minus.text.size = diff_words->plus.text.size = 0;
731 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
732 static void diff_words_flush(struct emit_callback *ecbdata)
734 if (ecbdata->diff_words->minus.text.size ||
735 ecbdata->diff_words->plus.text.size)
736 diff_words_show(ecbdata->diff_words);
739 static void free_diff_words_data(struct emit_callback *ecbdata)
741 if (ecbdata->diff_words) {
742 diff_words_flush(ecbdata);
743 free (ecbdata->diff_words->minus.text.ptr);
744 free (ecbdata->diff_words->minus.orig);
745 free (ecbdata->diff_words->plus.text.ptr);
746 free (ecbdata->diff_words->plus.orig);
747 free(ecbdata->diff_words->word_regex);
748 free(ecbdata->diff_words);
749 ecbdata->diff_words = NULL;
753 const char *diff_get_color(int diff_use_color, enum color_diff ix)
756 return diff_colors[ix];
760 static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
767 return ecb->truncate(line, len);
771 (void) utf8_width(&cp, &l);
773 break; /* truncated in the middle? */
778 static void find_lno(const char *line, struct emit_callback *ecbdata)
781 ecbdata->lno_in_preimage = 0;
782 ecbdata->lno_in_postimage = 0;
783 p = strchr(line, '-');
785 return; /* cannot happen */
786 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
789 return; /* cannot happen */
790 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
793 static void fn_out_consume(void *priv, char *line, unsigned long len)
795 struct emit_callback *ecbdata = priv;
796 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
797 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
798 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
800 *(ecbdata->found_changesp) = 1;
802 if (ecbdata->label_path[0]) {
803 const char *name_a_tab, *name_b_tab;
805 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
806 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
808 fprintf(ecbdata->file, "%s--- %s%s%s\n",
809 meta, ecbdata->label_path[0], reset, name_a_tab);
810 fprintf(ecbdata->file, "%s+++ %s%s%s\n",
811 meta, ecbdata->label_path[1], reset, name_b_tab);
812 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
815 if (diff_suppress_blank_empty
816 && len == 2 && line[0] == ' ' && line[1] == '\n') {
821 if (line[0] == '@') {
822 if (ecbdata->diff_words)
823 diff_words_flush(ecbdata);
824 len = sane_truncate_line(ecbdata, line, len);
825 find_lno(line, ecbdata);
826 emit_hunk_header(ecbdata, line, len);
827 if (line[len-1] != '\n')
828 putc('\n', ecbdata->file);
833 emit_line(ecbdata->file, reset, reset, line, len);
837 if (ecbdata->diff_words) {
838 if (line[0] == '-') {
839 diff_words_append(line, len,
840 &ecbdata->diff_words->minus);
842 } else if (line[0] == '+') {
843 diff_words_append(line, len,
844 &ecbdata->diff_words->plus);
847 diff_words_flush(ecbdata);
850 emit_line(ecbdata->file, plain, reset, line, len);
854 if (line[0] != '+') {
856 diff_get_color(ecbdata->color_diff,
857 line[0] == '-' ? DIFF_FILE_OLD : DIFF_PLAIN);
858 ecbdata->lno_in_preimage++;
860 ecbdata->lno_in_postimage++;
861 emit_line(ecbdata->file, color, reset, line, len);
863 ecbdata->lno_in_postimage++;
864 emit_add_line(reset, ecbdata, line + 1, len - 1);
868 static char *pprint_rename(const char *a, const char *b)
872 struct strbuf name = STRBUF_INIT;
873 int pfx_length, sfx_length;
874 int len_a = strlen(a);
875 int len_b = strlen(b);
876 int a_midlen, b_midlen;
877 int qlen_a = quote_c_style(a, NULL, NULL, 0);
878 int qlen_b = quote_c_style(b, NULL, NULL, 0);
880 if (qlen_a || qlen_b) {
881 quote_c_style(a, &name, NULL, 0);
882 strbuf_addstr(&name, " => ");
883 quote_c_style(b, &name, NULL, 0);
884 return strbuf_detach(&name, NULL);
887 /* Find common prefix */
889 while (*old && *new && *old == *new) {
891 pfx_length = old - a + 1;
896 /* Find common suffix */
900 while (a <= old && b <= new && *old == *new) {
902 sfx_length = len_a - (old - a);
908 * pfx{mid-a => mid-b}sfx
909 * {pfx-a => pfx-b}sfx
910 * pfx{sfx-a => sfx-b}
913 a_midlen = len_a - pfx_length - sfx_length;
914 b_midlen = len_b - pfx_length - sfx_length;
920 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
921 if (pfx_length + sfx_length) {
922 strbuf_add(&name, a, pfx_length);
923 strbuf_addch(&name, '{');
925 strbuf_add(&name, a + pfx_length, a_midlen);
926 strbuf_addstr(&name, " => ");
927 strbuf_add(&name, b + pfx_length, b_midlen);
928 if (pfx_length + sfx_length) {
929 strbuf_addch(&name, '}');
930 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
932 return strbuf_detach(&name, NULL);
938 struct diffstat_file {
942 unsigned is_unmerged:1;
943 unsigned is_binary:1;
944 unsigned is_renamed:1;
945 unsigned int added, deleted;
949 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
953 struct diffstat_file *x;
954 x = xcalloc(sizeof (*x), 1);
955 if (diffstat->nr == diffstat->alloc) {
956 diffstat->alloc = alloc_nr(diffstat->alloc);
957 diffstat->files = xrealloc(diffstat->files,
958 diffstat->alloc * sizeof(x));
960 diffstat->files[diffstat->nr++] = x;
962 x->from_name = xstrdup(name_a);
963 x->name = xstrdup(name_b);
968 x->name = xstrdup(name_a);
973 static void diffstat_consume(void *priv, char *line, unsigned long len)
975 struct diffstat_t *diffstat = priv;
976 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
980 else if (line[0] == '-')
984 const char mime_boundary_leader[] = "------------";
986 static int scale_linear(int it, int width, int max_change)
989 * make sure that at least one '-' is printed if there were deletions,
990 * and likewise for '+'.
994 return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1);
997 static void show_name(FILE *file,
998 const char *prefix, const char *name, int len)
1000 fprintf(file, " %s%-*s |", prefix, len, name);
1003 static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
1007 fprintf(file, "%s", set);
1010 fprintf(file, "%s", reset);
1013 static void fill_print_name(struct diffstat_file *file)
1017 if (file->print_name)
1020 if (!file->is_renamed) {
1021 struct strbuf buf = STRBUF_INIT;
1022 if (quote_c_style(file->name, &buf, NULL, 0)) {
1023 pname = strbuf_detach(&buf, NULL);
1026 strbuf_release(&buf);
1029 pname = pprint_rename(file->from_name, file->name);
1031 file->print_name = pname;
1034 static void show_stats(struct diffstat_t *data, struct diff_options *options)
1036 int i, len, add, del, adds = 0, dels = 0;
1037 int max_change = 0, max_len = 0;
1038 int total_files = data->nr;
1039 int width, name_width;
1040 const char *reset, *set, *add_c, *del_c;
1045 width = options->stat_width ? options->stat_width : 80;
1046 name_width = options->stat_name_width ? options->stat_name_width : 50;
1048 /* Sanity: give at least 5 columns to the graph,
1049 * but leave at least 10 columns for the name.
1053 if (name_width < 10)
1055 else if (width < name_width + 15)
1056 name_width = width - 15;
1058 /* Find the longest filename and max number of changes */
1059 reset = diff_get_color_opt(options, DIFF_RESET);
1060 set = diff_get_color_opt(options, DIFF_PLAIN);
1061 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1062 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1064 for (i = 0; i < data->nr; i++) {
1065 struct diffstat_file *file = data->files[i];
1066 int change = file->added + file->deleted;
1067 fill_print_name(file);
1068 len = strlen(file->print_name);
1072 if (file->is_binary || file->is_unmerged)
1074 if (max_change < change)
1075 max_change = change;
1078 /* Compute the width of the graph part;
1079 * 10 is for one blank at the beginning of the line plus
1080 * " | count " between the name and the graph.
1082 * From here on, name_width is the width of the name area,
1083 * and width is the width of the graph area.
1085 name_width = (name_width < max_len) ? name_width : max_len;
1086 if (width < (name_width + 10) + max_change)
1087 width = width - (name_width + 10);
1091 for (i = 0; i < data->nr; i++) {
1092 const char *prefix = "";
1093 char *name = data->files[i]->print_name;
1094 int added = data->files[i]->added;
1095 int deleted = data->files[i]->deleted;
1099 * "scale" the filename
1102 name_len = strlen(name);
1103 if (name_width < name_len) {
1107 name += name_len - len;
1108 slash = strchr(name, '/');
1113 if (data->files[i]->is_binary) {
1114 show_name(options->file, prefix, name, len);
1115 fprintf(options->file, " Bin ");
1116 fprintf(options->file, "%s%d%s", del_c, deleted, reset);
1117 fprintf(options->file, " -> ");
1118 fprintf(options->file, "%s%d%s", add_c, added, reset);
1119 fprintf(options->file, " bytes");
1120 fprintf(options->file, "\n");
1123 else if (data->files[i]->is_unmerged) {
1124 show_name(options->file, prefix, name, len);
1125 fprintf(options->file, " Unmerged\n");
1128 else if (!data->files[i]->is_renamed &&
1129 (added + deleted == 0)) {
1135 * scale the add/delete
1142 if (width <= max_change) {
1143 add = scale_linear(add, width, max_change);
1144 del = scale_linear(del, width, max_change);
1146 show_name(options->file, prefix, name, len);
1147 fprintf(options->file, "%5d%s", added + deleted,
1148 added + deleted ? " " : "");
1149 show_graph(options->file, '+', add, add_c, reset);
1150 show_graph(options->file, '-', del, del_c, reset);
1151 fprintf(options->file, "\n");
1153 fprintf(options->file,
1154 " %d files changed, %d insertions(+), %d deletions(-)\n",
1155 total_files, adds, dels);
1158 static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1160 int i, adds = 0, dels = 0, total_files = data->nr;
1165 for (i = 0; i < data->nr; i++) {
1166 if (!data->files[i]->is_binary &&
1167 !data->files[i]->is_unmerged) {
1168 int added = data->files[i]->added;
1169 int deleted= data->files[i]->deleted;
1170 if (!data->files[i]->is_renamed &&
1171 (added + deleted == 0)) {
1179 fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
1180 total_files, adds, dels);
1183 static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1190 for (i = 0; i < data->nr; i++) {
1191 struct diffstat_file *file = data->files[i];
1193 if (file->is_binary)
1194 fprintf(options->file, "-\t-\t");
1196 fprintf(options->file,
1197 "%d\t%d\t", file->added, file->deleted);
1198 if (options->line_termination) {
1199 fill_print_name(file);
1200 if (!file->is_renamed)
1201 write_name_quoted(file->name, options->file,
1202 options->line_termination);
1204 fputs(file->print_name, options->file);
1205 putc(options->line_termination, options->file);
1208 if (file->is_renamed) {
1209 putc('\0', options->file);
1210 write_name_quoted(file->from_name, options->file, '\0');
1212 write_name_quoted(file->name, options->file, '\0');
1217 struct dirstat_file {
1219 unsigned long changed;
1222 struct dirstat_dir {
1223 struct dirstat_file *files;
1224 int alloc, nr, percent, cumulative;
1227 static long gather_dirstat(FILE *file, struct dirstat_dir *dir, unsigned long changed, const char *base, int baselen)
1229 unsigned long this_dir = 0;
1230 unsigned int sources = 0;
1233 struct dirstat_file *f = dir->files;
1234 int namelen = strlen(f->name);
1238 if (namelen < baselen)
1240 if (memcmp(f->name, base, baselen))
1242 slash = strchr(f->name + baselen, '/');
1244 int newbaselen = slash + 1 - f->name;
1245 this = gather_dirstat(file, dir, changed, f->name, newbaselen);
1257 * We don't report dirstat's for
1259 * - or cases where everything came from a single directory
1260 * under this directory (sources == 1).
1262 if (baselen && sources != 1) {
1263 int permille = this_dir * 1000 / changed;
1265 int percent = permille / 10;
1266 if (percent >= dir->percent) {
1267 fprintf(file, "%4d.%01d%% %.*s\n", percent, permille % 10, baselen, base);
1268 if (!dir->cumulative)
1276 static int dirstat_compare(const void *_a, const void *_b)
1278 const struct dirstat_file *a = _a;
1279 const struct dirstat_file *b = _b;
1280 return strcmp(a->name, b->name);
1283 static void show_dirstat(struct diff_options *options)
1286 unsigned long changed;
1287 struct dirstat_dir dir;
1288 struct diff_queue_struct *q = &diff_queued_diff;
1293 dir.percent = options->dirstat_percent;
1294 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1297 for (i = 0; i < q->nr; i++) {
1298 struct diff_filepair *p = q->queue[i];
1300 unsigned long copied, added, damage;
1302 name = p->one->path ? p->one->path : p->two->path;
1304 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1305 diff_populate_filespec(p->one, 0);
1306 diff_populate_filespec(p->two, 0);
1307 diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1309 diff_free_filespec_data(p->one);
1310 diff_free_filespec_data(p->two);
1311 } else if (DIFF_FILE_VALID(p->one)) {
1312 diff_populate_filespec(p->one, 1);
1314 diff_free_filespec_data(p->one);
1315 } else if (DIFF_FILE_VALID(p->two)) {
1316 diff_populate_filespec(p->two, 1);
1318 added = p->two->size;
1319 diff_free_filespec_data(p->two);
1324 * Original minus copied is the removed material,
1325 * added is the new material. They are both damages
1326 * made to the preimage. In --dirstat-by-file mode, count
1327 * damaged files, not damaged lines. This is done by
1328 * counting only a single damaged line per file.
1330 damage = (p->one->size - copied) + added;
1331 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE) && damage > 0)
1334 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1335 dir.files[dir.nr].name = name;
1336 dir.files[dir.nr].changed = damage;
1341 /* This can happen even with many files, if everything was renames */
1345 /* Show all directories with more than x% of the changes */
1346 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1347 gather_dirstat(options->file, &dir, changed, "", 0);
1350 static void free_diffstat_info(struct diffstat_t *diffstat)
1353 for (i = 0; i < diffstat->nr; i++) {
1354 struct diffstat_file *f = diffstat->files[i];
1355 if (f->name != f->print_name)
1356 free(f->print_name);
1361 free(diffstat->files);
1364 struct checkdiff_t {
1365 const char *filename;
1367 struct diff_options *o;
1372 static int is_conflict_marker(const char *line, unsigned long len)
1379 firstchar = line[0];
1380 switch (firstchar) {
1381 case '=': case '>': case '<':
1386 for (cnt = 1; cnt < 7; cnt++)
1387 if (line[cnt] != firstchar)
1389 /* line[0] thru line[6] are same as firstchar */
1390 if (firstchar == '=') {
1391 /* divider between ours and theirs? */
1392 if (len != 8 || line[7] != '\n')
1394 } else if (len < 8 || !isspace(line[7])) {
1395 /* not divider before ours nor after theirs */
1401 static void checkdiff_consume(void *priv, char *line, unsigned long len)
1403 struct checkdiff_t *data = priv;
1404 int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF);
1405 const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE);
1406 const char *reset = diff_get_color(color_diff, DIFF_RESET);
1407 const char *set = diff_get_color(color_diff, DIFF_FILE_NEW);
1410 if (line[0] == '+') {
1413 if (is_conflict_marker(line + 1, len - 1)) {
1415 fprintf(data->o->file,
1416 "%s:%d: leftover conflict marker\n",
1417 data->filename, data->lineno);
1419 bad = ws_check(line + 1, len - 1, data->ws_rule);
1422 data->status |= bad;
1423 err = whitespace_error_string(bad);
1424 fprintf(data->o->file, "%s:%d: %s.\n",
1425 data->filename, data->lineno, err);
1427 emit_line(data->o->file, set, reset, line, 1);
1428 ws_check_emit(line + 1, len - 1, data->ws_rule,
1429 data->o->file, set, reset, ws);
1430 } else if (line[0] == ' ') {
1432 } else if (line[0] == '@') {
1433 char *plus = strchr(line, '+');
1435 data->lineno = strtol(plus, NULL, 10) - 1;
1437 die("invalid diff");
1441 static unsigned char *deflate_it(char *data,
1443 unsigned long *result_size)
1446 unsigned char *deflated;
1449 memset(&stream, 0, sizeof(stream));
1450 deflateInit(&stream, zlib_compression_level);
1451 bound = deflateBound(&stream, size);
1452 deflated = xmalloc(bound);
1453 stream.next_out = deflated;
1454 stream.avail_out = bound;
1456 stream.next_in = (unsigned char *)data;
1457 stream.avail_in = size;
1458 while (deflate(&stream, Z_FINISH) == Z_OK)
1460 deflateEnd(&stream);
1461 *result_size = stream.total_out;
1465 static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two)
1471 unsigned long orig_size;
1472 unsigned long delta_size;
1473 unsigned long deflate_size;
1474 unsigned long data_size;
1476 /* We could do deflated delta, or we could do just deflated two,
1477 * whichever is smaller.
1480 deflated = deflate_it(two->ptr, two->size, &deflate_size);
1481 if (one->size && two->size) {
1482 delta = diff_delta(one->ptr, one->size,
1483 two->ptr, two->size,
1484 &delta_size, deflate_size);
1486 void *to_free = delta;
1487 orig_size = delta_size;
1488 delta = deflate_it(delta, delta_size, &delta_size);
1493 if (delta && delta_size < deflate_size) {
1494 fprintf(file, "delta %lu\n", orig_size);
1497 data_size = delta_size;
1500 fprintf(file, "literal %lu\n", two->size);
1503 data_size = deflate_size;
1506 /* emit data encoded in base85 */
1509 int bytes = (52 < data_size) ? 52 : data_size;
1513 line[0] = bytes + 'A' - 1;
1515 line[0] = bytes - 26 + 'a' - 1;
1516 encode_85(line + 1, cp, bytes);
1517 cp = (char *) cp + bytes;
1521 fprintf(file, "\n");
1525 static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two)
1527 fprintf(file, "GIT binary patch\n");
1528 emit_binary_diff_body(file, one, two);
1529 emit_binary_diff_body(file, two, one);
1532 static void diff_filespec_load_driver(struct diff_filespec *one)
1535 one->driver = userdiff_find_by_path(one->path);
1537 one->driver = userdiff_find_by_name("default");
1540 int diff_filespec_is_binary(struct diff_filespec *one)
1542 if (one->is_binary == -1) {
1543 diff_filespec_load_driver(one);
1544 if (one->driver->binary != -1)
1545 one->is_binary = one->driver->binary;
1547 if (!one->data && DIFF_FILE_VALID(one))
1548 diff_populate_filespec(one, 0);
1550 one->is_binary = buffer_is_binary(one->data,
1552 if (one->is_binary == -1)
1556 return one->is_binary;
1559 static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
1561 diff_filespec_load_driver(one);
1562 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
1565 static const char *userdiff_word_regex(struct diff_filespec *one)
1567 diff_filespec_load_driver(one);
1568 return one->driver->word_regex;
1571 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
1573 if (!options->a_prefix)
1574 options->a_prefix = a;
1575 if (!options->b_prefix)
1576 options->b_prefix = b;
1579 static const char *get_textconv(struct diff_filespec *one)
1581 if (!DIFF_FILE_VALID(one))
1583 if (!S_ISREG(one->mode))
1585 diff_filespec_load_driver(one);
1586 return one->driver->textconv;
1589 static void builtin_diff(const char *name_a,
1591 struct diff_filespec *one,
1592 struct diff_filespec *two,
1593 const char *xfrm_msg,
1594 struct diff_options *o,
1595 int complete_rewrite)
1599 char *a_one, *b_two;
1600 const char *set = diff_get_color_opt(o, DIFF_METAINFO);
1601 const char *reset = diff_get_color_opt(o, DIFF_RESET);
1602 const char *a_prefix, *b_prefix;
1603 const char *textconv_one = NULL, *textconv_two = NULL;
1605 if (DIFF_OPT_TST(o, SUBMODULE_LOG) &&
1606 (!one->mode || S_ISGITLINK(one->mode)) &&
1607 (!two->mode || S_ISGITLINK(two->mode))) {
1608 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
1609 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
1610 show_submodule_summary(o->file, one ? one->path : two->path,
1611 one->sha1, two->sha1,
1616 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
1617 textconv_one = get_textconv(one);
1618 textconv_two = get_textconv(two);
1621 diff_set_mnemonic_prefix(o, "a/", "b/");
1622 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
1623 a_prefix = o->b_prefix;
1624 b_prefix = o->a_prefix;
1626 a_prefix = o->a_prefix;
1627 b_prefix = o->b_prefix;
1630 /* Never use a non-valid filename anywhere if at all possible */
1631 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
1632 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
1634 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
1635 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
1636 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
1637 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
1638 fprintf(o->file, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
1639 if (lbl[0][0] == '/') {
1641 fprintf(o->file, "%snew file mode %06o%s\n", set, two->mode, reset);
1642 if (xfrm_msg && xfrm_msg[0])
1643 fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1645 else if (lbl[1][0] == '/') {
1646 fprintf(o->file, "%sdeleted file mode %06o%s\n", set, one->mode, reset);
1647 if (xfrm_msg && xfrm_msg[0])
1648 fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1651 if (one->mode != two->mode) {
1652 fprintf(o->file, "%sold mode %06o%s\n", set, one->mode, reset);
1653 fprintf(o->file, "%snew mode %06o%s\n", set, two->mode, reset);
1655 if (xfrm_msg && xfrm_msg[0])
1656 fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1658 * we do not run diff between different kind
1661 if ((one->mode ^ two->mode) & S_IFMT)
1662 goto free_ab_and_return;
1663 if (complete_rewrite &&
1664 (textconv_one || !diff_filespec_is_binary(one)) &&
1665 (textconv_two || !diff_filespec_is_binary(two))) {
1666 emit_rewrite_diff(name_a, name_b, one, two,
1667 textconv_one, textconv_two, o);
1668 o->found_changes = 1;
1669 goto free_ab_and_return;
1673 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1674 die("unable to read files to diff");
1676 if (!DIFF_OPT_TST(o, TEXT) &&
1677 ( (diff_filespec_is_binary(one) && !textconv_one) ||
1678 (diff_filespec_is_binary(two) && !textconv_two) )) {
1679 /* Quite common confusing case */
1680 if (mf1.size == mf2.size &&
1681 !memcmp(mf1.ptr, mf2.ptr, mf1.size))
1682 goto free_ab_and_return;
1683 if (DIFF_OPT_TST(o, BINARY))
1684 emit_binary_diff(o->file, &mf1, &mf2);
1686 fprintf(o->file, "Binary files %s and %s differ\n",
1688 o->found_changes = 1;
1691 /* Crazy xdl interfaces.. */
1692 const char *diffopts = getenv("GIT_DIFF_OPTS");
1696 struct emit_callback ecbdata;
1697 const struct userdiff_funcname *pe;
1701 mf1.ptr = run_textconv(textconv_one, one, &size);
1703 die("unable to read files to diff");
1708 mf2.ptr = run_textconv(textconv_two, two, &size);
1710 die("unable to read files to diff");
1714 pe = diff_funcname_pattern(one);
1716 pe = diff_funcname_pattern(two);
1718 memset(&xpp, 0, sizeof(xpp));
1719 memset(&xecfg, 0, sizeof(xecfg));
1720 memset(&ecbdata, 0, sizeof(ecbdata));
1721 ecbdata.label_path = lbl;
1722 ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1723 ecbdata.found_changesp = &o->found_changes;
1724 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
1725 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
1726 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1727 ecbdata.file = o->file;
1728 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1729 xecfg.ctxlen = o->context;
1730 xecfg.interhunkctxlen = o->interhunkcontext;
1731 xecfg.flags = XDL_EMIT_FUNCNAMES;
1733 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
1736 else if (!prefixcmp(diffopts, "--unified="))
1737 xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
1738 else if (!prefixcmp(diffopts, "-u"))
1739 xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
1740 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) {
1741 ecbdata.diff_words =
1742 xcalloc(1, sizeof(struct diff_words_data));
1743 ecbdata.diff_words->file = o->file;
1745 o->word_regex = userdiff_word_regex(one);
1747 o->word_regex = userdiff_word_regex(two);
1749 o->word_regex = diff_word_regex_cfg;
1750 if (o->word_regex) {
1751 ecbdata.diff_words->word_regex = (regex_t *)
1752 xmalloc(sizeof(regex_t));
1753 if (regcomp(ecbdata.diff_words->word_regex,
1755 REG_EXTENDED | REG_NEWLINE))
1756 die ("Invalid regular expression: %s",
1760 xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
1761 &xpp, &xecfg, &ecb);
1762 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
1763 free_diff_words_data(&ecbdata);
1768 xdiff_clear_find_func(&xecfg);
1772 diff_free_filespec_data(one);
1773 diff_free_filespec_data(two);
1779 static void builtin_diffstat(const char *name_a, const char *name_b,
1780 struct diff_filespec *one,
1781 struct diff_filespec *two,
1782 struct diffstat_t *diffstat,
1783 struct diff_options *o,
1784 int complete_rewrite)
1787 struct diffstat_file *data;
1789 data = diffstat_add(diffstat, name_a, name_b);
1792 data->is_unmerged = 1;
1795 if (complete_rewrite) {
1796 diff_populate_filespec(one, 0);
1797 diff_populate_filespec(two, 0);
1798 data->deleted = count_lines(one->data, one->size);
1799 data->added = count_lines(two->data, two->size);
1800 goto free_and_return;
1802 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1803 die("unable to read files to diff");
1805 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
1806 data->is_binary = 1;
1807 data->added = mf2.size;
1808 data->deleted = mf1.size;
1810 /* Crazy xdl interfaces.. */
1815 memset(&xpp, 0, sizeof(xpp));
1816 memset(&xecfg, 0, sizeof(xecfg));
1817 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1818 xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
1819 &xpp, &xecfg, &ecb);
1823 diff_free_filespec_data(one);
1824 diff_free_filespec_data(two);
1827 static void builtin_checkdiff(const char *name_a, const char *name_b,
1828 const char *attr_path,
1829 struct diff_filespec *one,
1830 struct diff_filespec *two,
1831 struct diff_options *o)
1834 struct checkdiff_t data;
1839 memset(&data, 0, sizeof(data));
1840 data.filename = name_b ? name_b : name_a;
1843 data.ws_rule = whitespace_rule(attr_path);
1845 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1846 die("unable to read files to diff");
1849 * All the other codepaths check both sides, but not checking
1850 * the "old" side here is deliberate. We are checking the newly
1851 * introduced changes, and as long as the "new" side is text, we
1852 * can and should check what it introduces.
1854 if (diff_filespec_is_binary(two))
1855 goto free_and_return;
1857 /* Crazy xdl interfaces.. */
1862 memset(&xpp, 0, sizeof(xpp));
1863 memset(&xecfg, 0, sizeof(xecfg));
1864 xecfg.ctxlen = 1; /* at least one context line */
1865 xpp.flags = XDF_NEED_MINIMAL;
1866 xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
1867 &xpp, &xecfg, &ecb);
1869 if (data.ws_rule & WS_BLANK_AT_EOF) {
1870 struct emit_callback ecbdata;
1873 ecbdata.ws_rule = data.ws_rule;
1874 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1875 blank_at_eof = ecbdata.blank_at_eof_in_preimage;
1880 err = whitespace_error_string(WS_BLANK_AT_EOF);
1881 fprintf(o->file, "%s:%d: %s.\n",
1882 data.filename, blank_at_eof, err);
1883 data.status = 1; /* report errors */
1888 diff_free_filespec_data(one);
1889 diff_free_filespec_data(two);
1891 DIFF_OPT_SET(o, CHECK_FAILED);
1894 struct diff_filespec *alloc_filespec(const char *path)
1896 int namelen = strlen(path);
1897 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
1899 memset(spec, 0, sizeof(*spec));
1900 spec->path = (char *)(spec + 1);
1901 memcpy(spec->path, path, namelen+1);
1903 spec->is_binary = -1;
1907 void free_filespec(struct diff_filespec *spec)
1909 if (!--spec->count) {
1910 diff_free_filespec_data(spec);
1915 void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
1916 unsigned short mode)
1919 spec->mode = canon_mode(mode);
1920 hashcpy(spec->sha1, sha1);
1921 spec->sha1_valid = !is_null_sha1(sha1);
1926 * Given a name and sha1 pair, if the index tells us the file in
1927 * the work tree has that object contents, return true, so that
1928 * prepare_temp_file() does not have to inflate and extract.
1930 static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
1932 struct cache_entry *ce;
1937 * We do not read the cache ourselves here, because the
1938 * benchmark with my previous version that always reads cache
1939 * shows that it makes things worse for diff-tree comparing
1940 * two linux-2.6 kernel trees in an already checked out work
1941 * tree. This is because most diff-tree comparisons deal with
1942 * only a small number of files, while reading the cache is
1943 * expensive for a large project, and its cost outweighs the
1944 * savings we get by not inflating the object to a temporary
1945 * file. Practically, this code only helps when we are used
1946 * by diff-cache --cached, which does read the cache before
1952 /* We want to avoid the working directory if our caller
1953 * doesn't need the data in a normal file, this system
1954 * is rather slow with its stat/open/mmap/close syscalls,
1955 * and the object is contained in a pack file. The pack
1956 * is probably already open and will be faster to obtain
1957 * the data through than the working directory. Loose
1958 * objects however would tend to be slower as they need
1959 * to be individually opened and inflated.
1961 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
1965 pos = cache_name_pos(name, len);
1968 ce = active_cache[pos];
1971 * This is not the sha1 we are looking for, or
1972 * unreusable because it is not a regular file.
1974 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
1978 * If ce is marked as "assume unchanged", there is no
1979 * guarantee that work tree matches what we are looking for.
1981 if (ce->ce_flags & CE_VALID)
1985 * If ce matches the file in the work tree, we can reuse it.
1987 if (ce_uptodate(ce) ||
1988 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
1994 static int populate_from_stdin(struct diff_filespec *s)
1996 struct strbuf buf = STRBUF_INIT;
1999 if (strbuf_read(&buf, 0, 0) < 0)
2000 return error("error while reading from stdin %s",
2003 s->should_munmap = 0;
2004 s->data = strbuf_detach(&buf, &size);
2010 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2013 char *data = xmalloc(100);
2014 len = snprintf(data, 100,
2015 "Subproject commit %s\n", sha1_to_hex(s->sha1));
2027 * While doing rename detection and pickaxe operation, we may need to
2028 * grab the data for the blob (or file) for our own in-core comparison.
2029 * diff_filespec has data and size fields for this purpose.
2031 int diff_populate_filespec(struct diff_filespec *s, int size_only)
2034 if (!DIFF_FILE_VALID(s))
2035 die("internal error: asking to populate invalid file.");
2036 if (S_ISDIR(s->mode))
2042 if (size_only && 0 < s->size)
2045 if (S_ISGITLINK(s->mode))
2046 return diff_populate_gitlink(s, size_only);
2048 if (!s->sha1_valid ||
2049 reuse_worktree_file(s->path, s->sha1, 0)) {
2050 struct strbuf buf = STRBUF_INIT;
2054 if (!strcmp(s->path, "-"))
2055 return populate_from_stdin(s);
2057 if (lstat(s->path, &st) < 0) {
2058 if (errno == ENOENT) {
2062 s->data = (char *)"";
2067 s->size = xsize_t(st.st_size);
2070 if (S_ISLNK(st.st_mode)) {
2071 struct strbuf sb = STRBUF_INIT;
2073 if (strbuf_readlink(&sb, s->path, s->size))
2076 s->data = strbuf_detach(&sb, NULL);
2082 fd = open(s->path, O_RDONLY);
2085 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2087 s->should_munmap = 1;
2090 * Convert from working tree format to canonical git format
2092 if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
2094 munmap(s->data, s->size);
2095 s->should_munmap = 0;
2096 s->data = strbuf_detach(&buf, &size);
2102 enum object_type type;
2104 type = sha1_object_info(s->sha1, &s->size);
2106 s->data = read_sha1_file(s->sha1, &type, &s->size);
2113 void diff_free_filespec_blob(struct diff_filespec *s)
2117 else if (s->should_munmap)
2118 munmap(s->data, s->size);
2120 if (s->should_free || s->should_munmap) {
2121 s->should_free = s->should_munmap = 0;
2126 void diff_free_filespec_data(struct diff_filespec *s)
2128 diff_free_filespec_blob(s);
2133 static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2136 const unsigned char *sha1,
2140 struct strbuf buf = STRBUF_INIT;
2141 struct strbuf template = STRBUF_INIT;
2142 char *path_dup = xstrdup(path);
2143 const char *base = basename(path_dup);
2145 /* Generate "XXXXXX_basename.ext" */
2146 strbuf_addstr(&template, "XXXXXX_");
2147 strbuf_addstr(&template, base);
2149 fd = git_mkstemps(temp->tmp_path, PATH_MAX, template.buf,
2152 die_errno("unable to create temp-file");
2153 if (convert_to_working_tree(path,
2154 (const char *)blob, (size_t)size, &buf)) {
2158 if (write_in_full(fd, blob, size) != size)
2159 die_errno("unable to write temp-file");
2161 temp->name = temp->tmp_path;
2162 strcpy(temp->hex, sha1_to_hex(sha1));
2164 sprintf(temp->mode, "%06o", mode);
2165 strbuf_release(&buf);
2166 strbuf_release(&template);
2170 static struct diff_tempfile *prepare_temp_file(const char *name,
2171 struct diff_filespec *one)
2173 struct diff_tempfile *temp = claim_diff_tempfile();
2175 if (!DIFF_FILE_VALID(one)) {
2177 /* A '-' entry produces this for file-2, and
2178 * a '+' entry produces this for file-1.
2180 temp->name = "/dev/null";
2181 strcpy(temp->hex, ".");
2182 strcpy(temp->mode, ".");
2186 if (!remove_tempfile_installed) {
2187 atexit(remove_tempfile);
2188 sigchain_push_common(remove_tempfile_on_signal);
2189 remove_tempfile_installed = 1;
2192 if (!one->sha1_valid ||
2193 reuse_worktree_file(name, one->sha1, 1)) {
2195 if (lstat(name, &st) < 0) {
2196 if (errno == ENOENT)
2197 goto not_a_valid_file;
2198 die_errno("stat(%s)", name);
2200 if (S_ISLNK(st.st_mode)) {
2201 struct strbuf sb = STRBUF_INIT;
2202 if (strbuf_readlink(&sb, name, st.st_size) < 0)
2203 die_errno("readlink(%s)", name);
2204 prep_temp_blob(name, temp, sb.buf, sb.len,
2206 one->sha1 : null_sha1),
2208 one->mode : S_IFLNK));
2209 strbuf_release(&sb);
2212 /* we can borrow from the file in the work tree */
2214 if (!one->sha1_valid)
2215 strcpy(temp->hex, sha1_to_hex(null_sha1));
2217 strcpy(temp->hex, sha1_to_hex(one->sha1));
2218 /* Even though we may sometimes borrow the
2219 * contents from the work tree, we always want
2220 * one->mode. mode is trustworthy even when
2221 * !(one->sha1_valid), as long as
2222 * DIFF_FILE_VALID(one).
2224 sprintf(temp->mode, "%06o", one->mode);
2229 if (diff_populate_filespec(one, 0))
2230 die("cannot read data blob for %s", one->path);
2231 prep_temp_blob(name, temp, one->data, one->size,
2232 one->sha1, one->mode);
2237 /* An external diff command takes:
2239 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2240 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2243 static void run_external_diff(const char *pgm,
2246 struct diff_filespec *one,
2247 struct diff_filespec *two,
2248 const char *xfrm_msg,
2249 int complete_rewrite)
2251 const char *spawn_arg[10];
2253 const char **arg = &spawn_arg[0];
2256 struct diff_tempfile *temp_one, *temp_two;
2257 const char *othername = (other ? other : name);
2258 temp_one = prepare_temp_file(name, one);
2259 temp_two = prepare_temp_file(othername, two);
2262 *arg++ = temp_one->name;
2263 *arg++ = temp_one->hex;
2264 *arg++ = temp_one->mode;
2265 *arg++ = temp_two->name;
2266 *arg++ = temp_two->hex;
2267 *arg++ = temp_two->mode;
2278 retval = run_command_v_opt(spawn_arg, 0);
2281 fprintf(stderr, "external diff died, stopping at %s.\n", name);
2286 static int similarity_index(struct diff_filepair *p)
2288 return p->score * 100 / MAX_SCORE;
2291 static void fill_metainfo(struct strbuf *msg,
2294 struct diff_filespec *one,
2295 struct diff_filespec *two,
2296 struct diff_options *o,
2297 struct diff_filepair *p)
2299 strbuf_init(msg, PATH_MAX * 2 + 300);
2300 switch (p->status) {
2301 case DIFF_STATUS_COPIED:
2302 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2303 strbuf_addstr(msg, "\ncopy from ");
2304 quote_c_style(name, msg, NULL, 0);
2305 strbuf_addstr(msg, "\ncopy to ");
2306 quote_c_style(other, msg, NULL, 0);
2307 strbuf_addch(msg, '\n');
2309 case DIFF_STATUS_RENAMED:
2310 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2311 strbuf_addstr(msg, "\nrename from ");
2312 quote_c_style(name, msg, NULL, 0);
2313 strbuf_addstr(msg, "\nrename to ");
2314 quote_c_style(other, msg, NULL, 0);
2315 strbuf_addch(msg, '\n');
2317 case DIFF_STATUS_MODIFIED:
2319 strbuf_addf(msg, "dissimilarity index %d%%\n",
2320 similarity_index(p));
2328 if (one && two && hashcmp(one->sha1, two->sha1)) {
2329 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
2331 if (DIFF_OPT_TST(o, BINARY)) {
2333 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2334 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2337 strbuf_addf(msg, "index %.*s..%.*s",
2338 abbrev, sha1_to_hex(one->sha1),
2339 abbrev, sha1_to_hex(two->sha1));
2340 if (one->mode == two->mode)
2341 strbuf_addf(msg, " %06o", one->mode);
2342 strbuf_addch(msg, '\n');
2345 strbuf_setlen(msg, msg->len - 1);
2348 static void run_diff_cmd(const char *pgm,
2351 const char *attr_path,
2352 struct diff_filespec *one,
2353 struct diff_filespec *two,
2355 struct diff_options *o,
2356 struct diff_filepair *p)
2358 const char *xfrm_msg = NULL;
2359 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
2362 fill_metainfo(msg, name, other, one, two, o, p);
2363 xfrm_msg = msg->len ? msg->buf : NULL;
2366 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
2369 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
2370 if (drv && drv->external)
2371 pgm = drv->external;
2375 run_external_diff(pgm, name, other, one, two, xfrm_msg,
2380 builtin_diff(name, other ? other : name,
2381 one, two, xfrm_msg, o, complete_rewrite);
2383 fprintf(o->file, "* Unmerged path %s\n", name);
2386 static void diff_fill_sha1_info(struct diff_filespec *one)
2388 if (DIFF_FILE_VALID(one)) {
2389 if (!one->sha1_valid) {
2391 if (!strcmp(one->path, "-")) {
2392 hashcpy(one->sha1, null_sha1);
2395 if (lstat(one->path, &st) < 0)
2396 die_errno("stat '%s'", one->path);
2397 if (index_path(one->sha1, one->path, &st, 0))
2398 die("cannot hash %s", one->path);
2405 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
2407 /* Strip the prefix but do not molest /dev/null and absolute paths */
2408 if (*namep && **namep != '/')
2409 *namep += prefix_length;
2410 if (*otherp && **otherp != '/')
2411 *otherp += prefix_length;
2414 static void run_diff(struct diff_filepair *p, struct diff_options *o)
2416 const char *pgm = external_diff();
2418 struct diff_filespec *one = p->one;
2419 struct diff_filespec *two = p->two;
2422 const char *attr_path;
2424 name = p->one->path;
2425 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2427 if (o->prefix_length)
2428 strip_prefix(o->prefix_length, &name, &other);
2430 if (DIFF_PAIR_UNMERGED(p)) {
2431 run_diff_cmd(pgm, name, NULL, attr_path,
2432 NULL, NULL, NULL, o, p);
2436 diff_fill_sha1_info(one);
2437 diff_fill_sha1_info(two);
2440 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
2441 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
2443 * a filepair that changes between file and symlink
2444 * needs to be split into deletion and creation.
2446 struct diff_filespec *null = alloc_filespec(two->path);
2447 run_diff_cmd(NULL, name, other, attr_path,
2448 one, null, &msg, o, p);
2450 strbuf_release(&msg);
2452 null = alloc_filespec(one->path);
2453 run_diff_cmd(NULL, name, other, attr_path,
2454 null, two, &msg, o, p);
2458 run_diff_cmd(pgm, name, other, attr_path,
2459 one, two, &msg, o, p);
2461 strbuf_release(&msg);
2464 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
2465 struct diffstat_t *diffstat)
2469 int complete_rewrite = 0;
2471 if (DIFF_PAIR_UNMERGED(p)) {
2473 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
2477 name = p->one->path;
2478 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2480 if (o->prefix_length)
2481 strip_prefix(o->prefix_length, &name, &other);
2483 diff_fill_sha1_info(p->one);
2484 diff_fill_sha1_info(p->two);
2486 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2487 complete_rewrite = 1;
2488 builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
2491 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
2495 const char *attr_path;
2497 if (DIFF_PAIR_UNMERGED(p)) {
2502 name = p->one->path;
2503 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2504 attr_path = other ? other : name;
2506 if (o->prefix_length)
2507 strip_prefix(o->prefix_length, &name, &other);
2509 diff_fill_sha1_info(p->one);
2510 diff_fill_sha1_info(p->two);
2512 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
2515 void diff_setup(struct diff_options *options)
2517 memset(options, 0, sizeof(*options));
2519 options->file = stdout;
2521 options->line_termination = '\n';
2522 options->break_opt = -1;
2523 options->rename_limit = -1;
2524 options->dirstat_percent = 3;
2525 options->context = 3;
2527 options->change = diff_change;
2528 options->add_remove = diff_addremove;
2529 if (diff_use_color_default > 0)
2530 DIFF_OPT_SET(options, COLOR_DIFF);
2531 options->detect_rename = diff_detect_rename_default;
2533 if (!diff_mnemonic_prefix) {
2534 options->a_prefix = "a/";
2535 options->b_prefix = "b/";
2539 int diff_setup_done(struct diff_options *options)
2543 if (options->output_format & DIFF_FORMAT_NAME)
2545 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
2547 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
2549 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
2552 die("--name-only, --name-status, --check and -s are mutually exclusive");
2554 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
2555 options->detect_rename = DIFF_DETECT_COPY;
2557 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
2558 options->prefix = NULL;
2559 if (options->prefix)
2560 options->prefix_length = strlen(options->prefix);
2562 options->prefix_length = 0;
2564 if (options->output_format & (DIFF_FORMAT_NAME |
2565 DIFF_FORMAT_NAME_STATUS |
2566 DIFF_FORMAT_CHECKDIFF |
2567 DIFF_FORMAT_NO_OUTPUT))
2568 options->output_format &= ~(DIFF_FORMAT_RAW |
2569 DIFF_FORMAT_NUMSTAT |
2570 DIFF_FORMAT_DIFFSTAT |
2571 DIFF_FORMAT_SHORTSTAT |
2572 DIFF_FORMAT_DIRSTAT |
2573 DIFF_FORMAT_SUMMARY |
2577 * These cases always need recursive; we do not drop caller-supplied
2578 * recursive bits for other formats here.
2580 if (options->output_format & (DIFF_FORMAT_PATCH |
2581 DIFF_FORMAT_NUMSTAT |
2582 DIFF_FORMAT_DIFFSTAT |
2583 DIFF_FORMAT_SHORTSTAT |
2584 DIFF_FORMAT_DIRSTAT |
2585 DIFF_FORMAT_SUMMARY |
2586 DIFF_FORMAT_CHECKDIFF))
2587 DIFF_OPT_SET(options, RECURSIVE);
2589 * Also pickaxe would not work very well if you do not say recursive
2591 if (options->pickaxe)
2592 DIFF_OPT_SET(options, RECURSIVE);
2594 if (options->detect_rename && options->rename_limit < 0)
2595 options->rename_limit = diff_rename_limit_default;
2596 if (options->setup & DIFF_SETUP_USE_CACHE) {
2598 /* read-cache does not die even when it fails
2599 * so it is safe for us to do this here. Also
2600 * it does not smudge active_cache or active_nr
2601 * when it fails, so we do not have to worry about
2602 * cleaning it up ourselves either.
2606 if (options->abbrev <= 0 || 40 < options->abbrev)
2607 options->abbrev = 40; /* full */
2610 * It does not make sense to show the first hit we happened
2611 * to have found. It does not make sense not to return with
2612 * exit code in such a case either.
2614 if (DIFF_OPT_TST(options, QUIET)) {
2615 options->output_format = DIFF_FORMAT_NO_OUTPUT;
2616 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2622 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
2632 if (c == arg_short) {
2636 if (val && isdigit(c)) {
2638 int n = strtoul(arg, &end, 10);
2649 eq = strchr(arg, '=');
2654 if (!len || strncmp(arg, arg_long, len))
2659 if (!isdigit(*++eq))
2661 n = strtoul(eq, &end, 10);
2669 static int diff_scoreopt_parse(const char *opt);
2671 int diff_opt_parse(struct diff_options *options, const char **av, int ac)
2673 const char *arg = av[0];
2675 /* Output format options */
2676 if (!strcmp(arg, "-p") || !strcmp(arg, "-u"))
2677 options->output_format |= DIFF_FORMAT_PATCH;
2678 else if (opt_arg(arg, 'U', "unified", &options->context))
2679 options->output_format |= DIFF_FORMAT_PATCH;
2680 else if (!strcmp(arg, "--raw"))
2681 options->output_format |= DIFF_FORMAT_RAW;
2682 else if (!strcmp(arg, "--patch-with-raw"))
2683 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
2684 else if (!strcmp(arg, "--numstat"))
2685 options->output_format |= DIFF_FORMAT_NUMSTAT;
2686 else if (!strcmp(arg, "--shortstat"))
2687 options->output_format |= DIFF_FORMAT_SHORTSTAT;
2688 else if (opt_arg(arg, 'X', "dirstat", &options->dirstat_percent))
2689 options->output_format |= DIFF_FORMAT_DIRSTAT;
2690 else if (!strcmp(arg, "--cumulative")) {
2691 options->output_format |= DIFF_FORMAT_DIRSTAT;
2692 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
2693 } else if (opt_arg(arg, 0, "dirstat-by-file",
2694 &options->dirstat_percent)) {
2695 options->output_format |= DIFF_FORMAT_DIRSTAT;
2696 DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
2698 else if (!strcmp(arg, "--check"))
2699 options->output_format |= DIFF_FORMAT_CHECKDIFF;
2700 else if (!strcmp(arg, "--summary"))
2701 options->output_format |= DIFF_FORMAT_SUMMARY;
2702 else if (!strcmp(arg, "--patch-with-stat"))
2703 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
2704 else if (!strcmp(arg, "--name-only"))
2705 options->output_format |= DIFF_FORMAT_NAME;
2706 else if (!strcmp(arg, "--name-status"))
2707 options->output_format |= DIFF_FORMAT_NAME_STATUS;
2708 else if (!strcmp(arg, "-s"))
2709 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
2710 else if (!prefixcmp(arg, "--stat")) {
2712 int width = options->stat_width;
2713 int name_width = options->stat_name_width;
2719 if (!prefixcmp(arg, "-width="))
2720 width = strtoul(arg + 7, &end, 10);
2721 else if (!prefixcmp(arg, "-name-width="))
2722 name_width = strtoul(arg + 12, &end, 10);
2725 width = strtoul(arg+1, &end, 10);
2727 name_width = strtoul(end+1, &end, 10);
2730 /* Important! This checks all the error cases! */
2733 options->output_format |= DIFF_FORMAT_DIFFSTAT;
2734 options->stat_name_width = name_width;
2735 options->stat_width = width;
2738 /* renames options */
2739 else if (!prefixcmp(arg, "-B")) {
2740 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
2743 else if (!prefixcmp(arg, "-M")) {
2744 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2746 options->detect_rename = DIFF_DETECT_RENAME;
2748 else if (!prefixcmp(arg, "-C")) {
2749 if (options->detect_rename == DIFF_DETECT_COPY)
2750 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2751 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2753 options->detect_rename = DIFF_DETECT_COPY;
2755 else if (!strcmp(arg, "--no-renames"))
2756 options->detect_rename = 0;
2757 else if (!strcmp(arg, "--relative"))
2758 DIFF_OPT_SET(options, RELATIVE_NAME);
2759 else if (!prefixcmp(arg, "--relative=")) {
2760 DIFF_OPT_SET(options, RELATIVE_NAME);
2761 options->prefix = arg + 11;
2765 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
2766 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
2767 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
2768 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
2769 else if (!strcmp(arg, "--ignore-space-at-eol"))
2770 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
2771 else if (!strcmp(arg, "--patience"))
2772 DIFF_XDL_SET(options, PATIENCE_DIFF);
2775 else if (!strcmp(arg, "--binary")) {
2776 options->output_format |= DIFF_FORMAT_PATCH;
2777 DIFF_OPT_SET(options, BINARY);
2779 else if (!strcmp(arg, "--full-index"))
2780 DIFF_OPT_SET(options, FULL_INDEX);
2781 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
2782 DIFF_OPT_SET(options, TEXT);
2783 else if (!strcmp(arg, "-R"))
2784 DIFF_OPT_SET(options, REVERSE_DIFF);
2785 else if (!strcmp(arg, "--find-copies-harder"))
2786 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2787 else if (!strcmp(arg, "--follow"))
2788 DIFF_OPT_SET(options, FOLLOW_RENAMES);
2789 else if (!strcmp(arg, "--color"))
2790 DIFF_OPT_SET(options, COLOR_DIFF);
2791 else if (!strcmp(arg, "--no-color"))
2792 DIFF_OPT_CLR(options, COLOR_DIFF);
2793 else if (!strcmp(arg, "--color-words")) {
2794 DIFF_OPT_SET(options, COLOR_DIFF);
2795 DIFF_OPT_SET(options, COLOR_DIFF_WORDS);
2797 else if (!prefixcmp(arg, "--color-words=")) {
2798 DIFF_OPT_SET(options, COLOR_DIFF);
2799 DIFF_OPT_SET(options, COLOR_DIFF_WORDS);
2800 options->word_regex = arg + 14;
2802 else if (!strcmp(arg, "--exit-code"))
2803 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2804 else if (!strcmp(arg, "--quiet"))
2805 DIFF_OPT_SET(options, QUIET);
2806 else if (!strcmp(arg, "--ext-diff"))
2807 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
2808 else if (!strcmp(arg, "--no-ext-diff"))
2809 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
2810 else if (!strcmp(arg, "--textconv"))
2811 DIFF_OPT_SET(options, ALLOW_TEXTCONV);
2812 else if (!strcmp(arg, "--no-textconv"))
2813 DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
2814 else if (!strcmp(arg, "--ignore-submodules"))
2815 DIFF_OPT_SET(options, IGNORE_SUBMODULES);
2816 else if (!strcmp(arg, "--submodule"))
2817 DIFF_OPT_SET(options, SUBMODULE_LOG);
2818 else if (!prefixcmp(arg, "--submodule=")) {
2819 if (!strcmp(arg + 12, "log"))
2820 DIFF_OPT_SET(options, SUBMODULE_LOG);
2824 else if (!strcmp(arg, "-z"))
2825 options->line_termination = 0;
2826 else if (!prefixcmp(arg, "-l"))
2827 options->rename_limit = strtoul(arg+2, NULL, 10);
2828 else if (!prefixcmp(arg, "-S"))
2829 options->pickaxe = arg + 2;
2830 else if (!strcmp(arg, "--pickaxe-all"))
2831 options->pickaxe_opts = DIFF_PICKAXE_ALL;
2832 else if (!strcmp(arg, "--pickaxe-regex"))
2833 options->pickaxe_opts = DIFF_PICKAXE_REGEX;
2834 else if (!prefixcmp(arg, "-O"))
2835 options->orderfile = arg + 2;
2836 else if (!prefixcmp(arg, "--diff-filter="))
2837 options->filter = arg + 14;
2838 else if (!strcmp(arg, "--abbrev"))
2839 options->abbrev = DEFAULT_ABBREV;
2840 else if (!prefixcmp(arg, "--abbrev=")) {
2841 options->abbrev = strtoul(arg + 9, NULL, 10);
2842 if (options->abbrev < MINIMUM_ABBREV)
2843 options->abbrev = MINIMUM_ABBREV;
2844 else if (40 < options->abbrev)
2845 options->abbrev = 40;
2847 else if (!prefixcmp(arg, "--src-prefix="))
2848 options->a_prefix = arg + 13;
2849 else if (!prefixcmp(arg, "--dst-prefix="))
2850 options->b_prefix = arg + 13;
2851 else if (!strcmp(arg, "--no-prefix"))
2852 options->a_prefix = options->b_prefix = "";
2853 else if (opt_arg(arg, '\0', "inter-hunk-context",
2854 &options->interhunkcontext))
2856 else if (!prefixcmp(arg, "--output=")) {
2857 options->file = fopen(arg + strlen("--output="), "w");
2858 options->close_file = 1;
2864 static int parse_num(const char **cp_p)
2866 unsigned long num, scale;
2868 const char *cp = *cp_p;
2875 if ( !dot && ch == '.' ) {
2878 } else if ( ch == '%' ) {
2879 scale = dot ? scale*100 : 100;
2880 cp++; /* % is always at the end */
2882 } else if ( ch >= '0' && ch <= '9' ) {
2883 if ( scale < 100000 ) {
2885 num = (num*10) + (ch-'0');
2894 /* user says num divided by scale and we say internally that
2895 * is MAX_SCORE * num / scale.
2897 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
2900 static int diff_scoreopt_parse(const char *opt)
2902 int opt1, opt2, cmd;
2907 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
2908 return -1; /* that is not a -M, -C nor -B option */
2910 opt1 = parse_num(&opt);
2916 else if (*opt != '/')
2917 return -1; /* we expect -B80/99 or -B80 */
2920 opt2 = parse_num(&opt);
2925 return opt1 | (opt2 << 16);
2928 struct diff_queue_struct diff_queued_diff;
2930 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
2932 if (queue->alloc <= queue->nr) {
2933 queue->alloc = alloc_nr(queue->alloc);
2934 queue->queue = xrealloc(queue->queue,
2935 sizeof(dp) * queue->alloc);
2937 queue->queue[queue->nr++] = dp;
2940 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
2941 struct diff_filespec *one,
2942 struct diff_filespec *two)
2944 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
2952 void diff_free_filepair(struct diff_filepair *p)
2954 free_filespec(p->one);
2955 free_filespec(p->two);
2959 /* This is different from find_unique_abbrev() in that
2960 * it stuffs the result with dots for alignment.
2962 const char *diff_unique_abbrev(const unsigned char *sha1, int len)
2967 return sha1_to_hex(sha1);
2969 abbrev = find_unique_abbrev(sha1, len);
2970 abblen = strlen(abbrev);
2972 static char hex[41];
2973 if (len < abblen && abblen <= len + 2)
2974 sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
2976 sprintf(hex, "%s...", abbrev);
2979 return sha1_to_hex(sha1);
2982 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
2984 int line_termination = opt->line_termination;
2985 int inter_name_termination = line_termination ? '\t' : '\0';
2987 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
2988 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
2989 diff_unique_abbrev(p->one->sha1, opt->abbrev));
2990 fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
2993 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
2994 inter_name_termination);
2996 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
2999 if (p->status == DIFF_STATUS_COPIED ||
3000 p->status == DIFF_STATUS_RENAMED) {
3001 const char *name_a, *name_b;
3002 name_a = p->one->path;
3003 name_b = p->two->path;
3004 strip_prefix(opt->prefix_length, &name_a, &name_b);
3005 write_name_quoted(name_a, opt->file, inter_name_termination);
3006 write_name_quoted(name_b, opt->file, line_termination);
3008 const char *name_a, *name_b;
3009 name_a = p->one->mode ? p->one->path : p->two->path;
3011 strip_prefix(opt->prefix_length, &name_a, &name_b);
3012 write_name_quoted(name_a, opt->file, line_termination);
3016 int diff_unmodified_pair(struct diff_filepair *p)
3018 /* This function is written stricter than necessary to support
3019 * the currently implemented transformers, but the idea is to
3020 * let transformers to produce diff_filepairs any way they want,
3021 * and filter and clean them up here before producing the output.
3023 struct diff_filespec *one = p->one, *two = p->two;
3025 if (DIFF_PAIR_UNMERGED(p))
3026 return 0; /* unmerged is interesting */
3028 /* deletion, addition, mode or type change
3029 * and rename are all interesting.
3031 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
3032 DIFF_PAIR_MODE_CHANGED(p) ||
3033 strcmp(one->path, two->path))
3036 /* both are valid and point at the same path. that is, we are
3037 * dealing with a change.
3039 if (one->sha1_valid && two->sha1_valid &&
3040 !hashcmp(one->sha1, two->sha1))
3041 return 1; /* no change */
3042 if (!one->sha1_valid && !two->sha1_valid)
3043 return 1; /* both look at the same file on the filesystem. */
3047 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
3049 if (diff_unmodified_pair(p))
3052 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3053 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3054 return; /* no tree diffs in patch format */
3059 static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
3060 struct diffstat_t *diffstat)
3062 if (diff_unmodified_pair(p))
3065 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3066 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3067 return; /* no tree diffs in patch format */
3069 run_diffstat(p, o, diffstat);
3072 static void diff_flush_checkdiff(struct diff_filepair *p,
3073 struct diff_options *o)
3075 if (diff_unmodified_pair(p))
3078 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3079 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3080 return; /* no tree diffs in patch format */
3082 run_checkdiff(p, o);
3085 int diff_queue_is_empty(void)
3087 struct diff_queue_struct *q = &diff_queued_diff;
3089 for (i = 0; i < q->nr; i++)
3090 if (!diff_unmodified_pair(q->queue[i]))
3096 void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
3098 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
3101 DIFF_FILE_VALID(s) ? "valid" : "invalid",
3103 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
3104 fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
3106 s->size, s->xfrm_flags);
3109 void diff_debug_filepair(const struct diff_filepair *p, int i)
3111 diff_debug_filespec(p->one, i, "one");
3112 diff_debug_filespec(p->two, i, "two");
3113 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
3114 p->score, p->status ? p->status : '?',
3115 p->one->rename_used, p->broken_pair);
3118 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
3122 fprintf(stderr, "%s\n", msg);
3123 fprintf(stderr, "q->nr = %d\n", q->nr);
3124 for (i = 0; i < q->nr; i++) {
3125 struct diff_filepair *p = q->queue[i];
3126 diff_debug_filepair(p, i);
3131 static void diff_resolve_rename_copy(void)
3134 struct diff_filepair *p;
3135 struct diff_queue_struct *q = &diff_queued_diff;
3137 diff_debug_queue("resolve-rename-copy", q);
3139 for (i = 0; i < q->nr; i++) {
3141 p->status = 0; /* undecided */
3142 if (DIFF_PAIR_UNMERGED(p))
3143 p->status = DIFF_STATUS_UNMERGED;
3144 else if (!DIFF_FILE_VALID(p->one))
3145 p->status = DIFF_STATUS_ADDED;
3146 else if (!DIFF_FILE_VALID(p->two))
3147 p->status = DIFF_STATUS_DELETED;
3148 else if (DIFF_PAIR_TYPE_CHANGED(p))
3149 p->status = DIFF_STATUS_TYPE_CHANGED;
3151 /* from this point on, we are dealing with a pair
3152 * whose both sides are valid and of the same type, i.e.
3153 * either in-place edit or rename/copy edit.
3155 else if (DIFF_PAIR_RENAME(p)) {
3157 * A rename might have re-connected a broken
3158 * pair up, causing the pathnames to be the
3159 * same again. If so, that's not a rename at
3160 * all, just a modification..
3162 * Otherwise, see if this source was used for
3163 * multiple renames, in which case we decrement
3164 * the count, and call it a copy.
3166 if (!strcmp(p->one->path, p->two->path))
3167 p->status = DIFF_STATUS_MODIFIED;
3168 else if (--p->one->rename_used > 0)
3169 p->status = DIFF_STATUS_COPIED;
3171 p->status = DIFF_STATUS_RENAMED;
3173 else if (hashcmp(p->one->sha1, p->two->sha1) ||
3174 p->one->mode != p->two->mode ||
3175 is_null_sha1(p->one->sha1))
3176 p->status = DIFF_STATUS_MODIFIED;
3178 /* This is a "no-change" entry and should not
3179 * happen anymore, but prepare for broken callers.
3181 error("feeding unmodified %s to diffcore",
3183 p->status = DIFF_STATUS_UNKNOWN;
3186 diff_debug_queue("resolve-rename-copy done", q);
3189 static int check_pair_status(struct diff_filepair *p)
3191 switch (p->status) {
3192 case DIFF_STATUS_UNKNOWN:
3195 die("internal error in diff-resolve-rename-copy");
3201 static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
3203 int fmt = opt->output_format;
3205 if (fmt & DIFF_FORMAT_CHECKDIFF)
3206 diff_flush_checkdiff(p, opt);
3207 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
3208 diff_flush_raw(p, opt);
3209 else if (fmt & DIFF_FORMAT_NAME) {
3210 const char *name_a, *name_b;
3211 name_a = p->two->path;
3213 strip_prefix(opt->prefix_length, &name_a, &name_b);
3214 write_name_quoted(name_a, opt->file, opt->line_termination);
3218 static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
3221 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
3223 fprintf(file, " %s ", newdelete);
3224 write_name_quoted(fs->path, file, '\n');
3228 static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name)
3230 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
3231 fprintf(file, " mode change %06o => %06o%c", p->one->mode, p->two->mode,
3232 show_name ? ' ' : '\n');
3234 write_name_quoted(p->two->path, file, '\n');
3239 static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p)
3241 char *names = pprint_rename(p->one->path, p->two->path);
3243 fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
3245 show_mode_change(file, p, 0);
3248 static void diff_summary(FILE *file, struct diff_filepair *p)
3251 case DIFF_STATUS_DELETED:
3252 show_file_mode_name(file, "delete", p->one);
3254 case DIFF_STATUS_ADDED:
3255 show_file_mode_name(file, "create", p->two);
3257 case DIFF_STATUS_COPIED:
3258 show_rename_copy(file, "copy", p);
3260 case DIFF_STATUS_RENAMED:
3261 show_rename_copy(file, "rename", p);
3265 fputs(" rewrite ", file);
3266 write_name_quoted(p->two->path, file, ' ');
3267 fprintf(file, "(%d%%)\n", similarity_index(p));
3269 show_mode_change(file, p, !p->score);
3279 static int remove_space(char *line, int len)
3285 for (i = 0; i < len; i++)
3286 if (!isspace((c = line[i])))
3292 static void patch_id_consume(void *priv, char *line, unsigned long len)
3294 struct patch_id_t *data = priv;
3297 /* Ignore line numbers when computing the SHA1 of the patch */
3298 if (!prefixcmp(line, "@@ -"))
3301 new_len = remove_space(line, len);
3303 git_SHA1_Update(data->ctx, line, new_len);
3304 data->patchlen += new_len;
3307 /* returns 0 upon success, and writes result into sha1 */
3308 static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
3310 struct diff_queue_struct *q = &diff_queued_diff;
3313 struct patch_id_t data;
3314 char buffer[PATH_MAX * 4 + 20];
3316 git_SHA1_Init(&ctx);
3317 memset(&data, 0, sizeof(struct patch_id_t));
3320 for (i = 0; i < q->nr; i++) {
3325 struct diff_filepair *p = q->queue[i];
3328 memset(&xpp, 0, sizeof(xpp));
3329 memset(&xecfg, 0, sizeof(xecfg));
3331 return error("internal diff status error");
3332 if (p->status == DIFF_STATUS_UNKNOWN)
3334 if (diff_unmodified_pair(p))
3336 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3337 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3339 if (DIFF_PAIR_UNMERGED(p))
3342 diff_fill_sha1_info(p->one);
3343 diff_fill_sha1_info(p->two);
3344 if (fill_mmfile(&mf1, p->one) < 0 ||
3345 fill_mmfile(&mf2, p->two) < 0)
3346 return error("unable to read files to diff");
3348 len1 = remove_space(p->one->path, strlen(p->one->path));
3349 len2 = remove_space(p->two->path, strlen(p->two->path));
3350 if (p->one->mode == 0)
3351 len1 = snprintf(buffer, sizeof(buffer),
3352 "diff--gita/%.*sb/%.*s"
3359 len2, p->two->path);
3360 else if (p->two->mode == 0)
3361 len1 = snprintf(buffer, sizeof(buffer),
3362 "diff--gita/%.*sb/%.*s"
3363 "deletedfilemode%06o"
3369 len1, p->one->path);
3371 len1 = snprintf(buffer, sizeof(buffer),
3372 "diff--gita/%.*sb/%.*s"
3378 len2, p->two->path);
3379 git_SHA1_Update(&ctx, buffer, len1);
3381 xpp.flags = XDF_NEED_MINIMAL;
3383 xecfg.flags = XDL_EMIT_FUNCNAMES;
3384 xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
3385 &xpp, &xecfg, &ecb);
3388 git_SHA1_Final(sha1, &ctx);
3392 int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
3394 struct diff_queue_struct *q = &diff_queued_diff;
3396 int result = diff_get_patch_id(options, sha1);
3398 for (i = 0; i < q->nr; i++)
3399 diff_free_filepair(q->queue[i]);
3403 q->nr = q->alloc = 0;
3408 static int is_summary_empty(const struct diff_queue_struct *q)
3412 for (i = 0; i < q->nr; i++) {
3413 const struct diff_filepair *p = q->queue[i];
3415 switch (p->status) {
3416 case DIFF_STATUS_DELETED:
3417 case DIFF_STATUS_ADDED:
3418 case DIFF_STATUS_COPIED:
3419 case DIFF_STATUS_RENAMED:
3424 if (p->one->mode && p->two->mode &&
3425 p->one->mode != p->two->mode)
3433 void diff_flush(struct diff_options *options)
3435 struct diff_queue_struct *q = &diff_queued_diff;
3436 int i, output_format = options->output_format;
3440 * Order: raw, stat, summary, patch
3441 * or: name/name-status/checkdiff (other bits clear)
3446 if (output_format & (DIFF_FORMAT_RAW |
3448 DIFF_FORMAT_NAME_STATUS |
3449 DIFF_FORMAT_CHECKDIFF)) {
3450 for (i = 0; i < q->nr; i++) {
3451 struct diff_filepair *p = q->queue[i];
3452 if (check_pair_status(p))
3453 flush_one_pair(p, options);
3458 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) {
3459 struct diffstat_t diffstat;
3461 memset(&diffstat, 0, sizeof(struct diffstat_t));
3462 for (i = 0; i < q->nr; i++) {
3463 struct diff_filepair *p = q->queue[i];
3464 if (check_pair_status(p))
3465 diff_flush_stat(p, options, &diffstat);
3467 if (output_format & DIFF_FORMAT_NUMSTAT)
3468 show_numstat(&diffstat, options);
3469 if (output_format & DIFF_FORMAT_DIFFSTAT)
3470 show_stats(&diffstat, options);
3471 if (output_format & DIFF_FORMAT_SHORTSTAT)
3472 show_shortstats(&diffstat, options);
3473 free_diffstat_info(&diffstat);
3476 if (output_format & DIFF_FORMAT_DIRSTAT)
3477 show_dirstat(options);
3479 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
3480 for (i = 0; i < q->nr; i++)
3481 diff_summary(options->file, q->queue[i]);
3485 if (output_format & DIFF_FORMAT_PATCH) {
3487 putc(options->line_termination, options->file);
3488 if (options->stat_sep) {
3489 /* attach patch instead of inline */
3490 fputs(options->stat_sep, options->file);
3494 for (i = 0; i < q->nr; i++) {
3495 struct diff_filepair *p = q->queue[i];
3496 if (check_pair_status(p))
3497 diff_flush_patch(p, options);
3501 if (output_format & DIFF_FORMAT_CALLBACK)
3502 options->format_callback(q, options, options->format_callback_data);
3504 for (i = 0; i < q->nr; i++)
3505 diff_free_filepair(q->queue[i]);
3509 q->nr = q->alloc = 0;
3510 if (options->close_file)
3511 fclose(options->file);
3514 static void diffcore_apply_filter(const char *filter)
3517 struct diff_queue_struct *q = &diff_queued_diff;
3518 struct diff_queue_struct outq;
3520 outq.nr = outq.alloc = 0;
3525 if (strchr(filter, DIFF_STATUS_FILTER_AON)) {
3527 for (i = found = 0; !found && i < q->nr; i++) {
3528 struct diff_filepair *p = q->queue[i];
3529 if (((p->status == DIFF_STATUS_MODIFIED) &&
3531 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3533 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3534 ((p->status != DIFF_STATUS_MODIFIED) &&
3535 strchr(filter, p->status)))
3541 /* otherwise we will clear the whole queue
3542 * by copying the empty outq at the end of this
3543 * function, but first clear the current entries
3546 for (i = 0; i < q->nr; i++)
3547 diff_free_filepair(q->queue[i]);
3550 /* Only the matching ones */
3551 for (i = 0; i < q->nr; i++) {
3552 struct diff_filepair *p = q->queue[i];
3554 if (((p->status == DIFF_STATUS_MODIFIED) &&
3556 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3558 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3559 ((p->status != DIFF_STATUS_MODIFIED) &&
3560 strchr(filter, p->status)))
3563 diff_free_filepair(p);
3570 /* Check whether two filespecs with the same mode and size are identical */
3571 static int diff_filespec_is_identical(struct diff_filespec *one,
3572 struct diff_filespec *two)
3574 if (S_ISGITLINK(one->mode))
3576 if (diff_populate_filespec(one, 0))
3578 if (diff_populate_filespec(two, 0))
3580 return !memcmp(one->data, two->data, one->size);
3583 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3586 struct diff_queue_struct *q = &diff_queued_diff;
3587 struct diff_queue_struct outq;
3589 outq.nr = outq.alloc = 0;
3591 for (i = 0; i < q->nr; i++) {
3592 struct diff_filepair *p = q->queue[i];
3595 * 1. Entries that come from stat info dirtyness
3596 * always have both sides (iow, not create/delete),
3597 * one side of the object name is unknown, with
3598 * the same mode and size. Keep the ones that
3599 * do not match these criteria. They have real
3602 * 2. At this point, the file is known to be modified,
3603 * with the same mode and size, and the object
3604 * name of one side is unknown. Need to inspect
3605 * the identical contents.
3607 if (!DIFF_FILE_VALID(p->one) || /* (1) */
3608 !DIFF_FILE_VALID(p->two) ||
3609 (p->one->sha1_valid && p->two->sha1_valid) ||
3610 (p->one->mode != p->two->mode) ||
3611 diff_populate_filespec(p->one, 1) ||
3612 diff_populate_filespec(p->two, 1) ||
3613 (p->one->size != p->two->size) ||
3614 !diff_filespec_is_identical(p->one, p->two)) /* (2) */
3618 * The caller can subtract 1 from skip_stat_unmatch
3619 * to determine how many paths were dirty only
3620 * due to stat info mismatch.
3622 if (!DIFF_OPT_TST(diffopt, NO_INDEX))
3623 diffopt->skip_stat_unmatch++;
3624 diff_free_filepair(p);
3631 void diffcore_std(struct diff_options *options)
3633 if (options->skip_stat_unmatch)
3634 diffcore_skip_stat_unmatch(options);
3635 if (options->break_opt != -1)
3636 diffcore_break(options->break_opt);
3637 if (options->detect_rename)
3638 diffcore_rename(options);
3639 if (options->break_opt != -1)
3640 diffcore_merge_broken();
3641 if (options->pickaxe)
3642 diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
3643 if (options->orderfile)
3644 diffcore_order(options->orderfile);
3645 diff_resolve_rename_copy();
3646 diffcore_apply_filter(options->filter);
3648 if (diff_queued_diff.nr)
3649 DIFF_OPT_SET(options, HAS_CHANGES);
3651 DIFF_OPT_CLR(options, HAS_CHANGES);
3654 int diff_result_code(struct diff_options *opt, int status)
3657 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3658 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
3660 if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3661 DIFF_OPT_TST(opt, HAS_CHANGES))
3663 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
3664 DIFF_OPT_TST(opt, CHECK_FAILED))
3669 void diff_addremove(struct diff_options *options,
3670 int addremove, unsigned mode,
3671 const unsigned char *sha1,
3672 const char *concatpath)
3674 struct diff_filespec *one, *two;
3676 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(mode))
3679 /* This may look odd, but it is a preparation for
3680 * feeding "there are unchanged files which should
3681 * not produce diffs, but when you are doing copy
3682 * detection you would need them, so here they are"
3683 * entries to the diff-core. They will be prefixed
3684 * with something like '=' or '*' (I haven't decided
3685 * which but should not make any difference).
3686 * Feeding the same new and old to diff_change()
3687 * also has the same effect.
3688 * Before the final output happens, they are pruned after
3689 * merged into rename/copy pairs as appropriate.
3691 if (DIFF_OPT_TST(options, REVERSE_DIFF))
3692 addremove = (addremove == '+' ? '-' :
3693 addremove == '-' ? '+' : addremove);
3695 if (options->prefix &&
3696 strncmp(concatpath, options->prefix, options->prefix_length))
3699 one = alloc_filespec(concatpath);
3700 two = alloc_filespec(concatpath);
3702 if (addremove != '+')
3703 fill_filespec(one, sha1, mode);
3704 if (addremove != '-')
3705 fill_filespec(two, sha1, mode);
3707 diff_queue(&diff_queued_diff, one, two);
3708 DIFF_OPT_SET(options, HAS_CHANGES);
3711 void diff_change(struct diff_options *options,
3712 unsigned old_mode, unsigned new_mode,
3713 const unsigned char *old_sha1,
3714 const unsigned char *new_sha1,
3715 const char *concatpath)
3717 struct diff_filespec *one, *two;
3719 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(old_mode)
3720 && S_ISGITLINK(new_mode))
3723 if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
3725 const unsigned char *tmp_c;
3726 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
3727 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
3730 if (options->prefix &&
3731 strncmp(concatpath, options->prefix, options->prefix_length))
3734 one = alloc_filespec(concatpath);
3735 two = alloc_filespec(concatpath);
3736 fill_filespec(one, old_sha1, old_mode);
3737 fill_filespec(two, new_sha1, new_mode);
3739 diff_queue(&diff_queued_diff, one, two);
3740 DIFF_OPT_SET(options, HAS_CHANGES);
3743 void diff_unmerge(struct diff_options *options,
3745 unsigned mode, const unsigned char *sha1)
3747 struct diff_filespec *one, *two;
3749 if (options->prefix &&
3750 strncmp(path, options->prefix, options->prefix_length))
3753 one = alloc_filespec(path);
3754 two = alloc_filespec(path);
3755 fill_filespec(one, sha1, mode);
3756 diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;
3759 static char *run_textconv(const char *pgm, struct diff_filespec *spec,
3762 struct diff_tempfile *temp;
3763 const char *argv[3];
3764 const char **arg = argv;
3765 struct child_process child;
3766 struct strbuf buf = STRBUF_INIT;
3768 temp = prepare_temp_file(spec->path, spec);
3770 *arg++ = temp->name;
3773 memset(&child, 0, sizeof(child));
3776 if (start_command(&child) != 0 ||
3777 strbuf_read(&buf, child.out, 0) < 0 ||
3778 finish_command(&child) != 0) {
3779 strbuf_release(&buf);
3781 error("error running textconv command '%s'", pgm);
3786 return strbuf_detach(&buf, outsize);