Code

diff.c: the builtin_diff() deals with only two-file comparison
[git.git] / diff.c
1 /*
2  * Copyright (C) 2005 Junio C Hamano
3  */
4 #include "cache.h"
5 #include "quote.h"
6 #include "diff.h"
7 #include "diffcore.h"
8 #include "delta.h"
9 #include "xdiff-interface.h"
10 #include "color.h"
11 #include "attr.h"
12 #include "run-command.h"
13 #include "utf8.h"
15 #ifdef NO_FAST_WORKING_DIRECTORY
16 #define FAST_WORKING_DIRECTORY 0
17 #else
18 #define FAST_WORKING_DIRECTORY 1
19 #endif
21 static int diff_detect_rename_default;
22 static int diff_rename_limit_default = 200;
23 int diff_use_color_default = -1;
24 static const char *external_diff_cmd_cfg;
25 int diff_auto_refresh_index = 1;
27 static char diff_colors[][COLOR_MAXLEN] = {
28         "\033[m",       /* reset */
29         "",             /* PLAIN (normal) */
30         "\033[1m",      /* METAINFO (bold) */
31         "\033[36m",     /* FRAGINFO (cyan) */
32         "\033[31m",     /* OLD (red) */
33         "\033[32m",     /* NEW (green) */
34         "\033[33m",     /* COMMIT (yellow) */
35         "\033[41m",     /* WHITESPACE (red background) */
36 };
38 static int parse_diff_color_slot(const char *var, int ofs)
39 {
40         if (!strcasecmp(var+ofs, "plain"))
41                 return DIFF_PLAIN;
42         if (!strcasecmp(var+ofs, "meta"))
43                 return DIFF_METAINFO;
44         if (!strcasecmp(var+ofs, "frag"))
45                 return DIFF_FRAGINFO;
46         if (!strcasecmp(var+ofs, "old"))
47                 return DIFF_FILE_OLD;
48         if (!strcasecmp(var+ofs, "new"))
49                 return DIFF_FILE_NEW;
50         if (!strcasecmp(var+ofs, "commit"))
51                 return DIFF_COMMIT;
52         if (!strcasecmp(var+ofs, "whitespace"))
53                 return DIFF_WHITESPACE;
54         die("bad config variable '%s'", var);
55 }
57 static struct ll_diff_driver {
58         const char *name;
59         struct ll_diff_driver *next;
60         const char *cmd;
61 } *user_diff, **user_diff_tail;
63 /*
64  * Currently there is only "diff.<drivername>.command" variable;
65  * because there are "diff.color.<slot>" variables, we are parsing
66  * this in a bit convoluted way to allow low level diff driver
67  * called "color".
68  */
69 static int parse_lldiff_command(const char *var, const char *ep, const char *value)
70 {
71         const char *name;
72         int namelen;
73         struct ll_diff_driver *drv;
75         name = var + 5;
76         namelen = ep - name;
77         for (drv = user_diff; drv; drv = drv->next)
78                 if (!strncmp(drv->name, name, namelen) && !drv->name[namelen])
79                         break;
80         if (!drv) {
81                 drv = xcalloc(1, sizeof(struct ll_diff_driver));
82                 drv->name = xmemdupz(name, namelen);
83                 if (!user_diff_tail)
84                         user_diff_tail = &user_diff;
85                 *user_diff_tail = drv;
86                 user_diff_tail = &(drv->next);
87         }
89         return git_config_string(&(drv->cmd), var, value);
90 }
92 /*
93  * 'diff.<what>.funcname' attribute can be specified in the configuration
94  * to define a customized regexp to find the beginning of a function to
95  * be used for hunk header lines of "diff -p" style output.
96  */
97 struct funcname_pattern_entry {
98         char *name;
99         char *pattern;
100         int cflags;
101 };
102 static struct funcname_pattern_list {
103         struct funcname_pattern_list *next;
104         struct funcname_pattern_entry e;
105 } *funcname_pattern_list;
107 static int parse_funcname_pattern(const char *var, const char *ep, const char *value, int cflags)
109         const char *name;
110         int namelen;
111         struct funcname_pattern_list *pp;
113         name = var + 5; /* "diff." */
114         namelen = ep - name;
116         for (pp = funcname_pattern_list; pp; pp = pp->next)
117                 if (!strncmp(pp->e.name, name, namelen) && !pp->e.name[namelen])
118                         break;
119         if (!pp) {
120                 pp = xcalloc(1, sizeof(*pp));
121                 pp->e.name = xmemdupz(name, namelen);
122                 pp->next = funcname_pattern_list;
123                 funcname_pattern_list = pp;
124         }
125         free(pp->e.pattern);
126         pp->e.pattern = xstrdup(value);
127         pp->e.cflags = cflags;
128         return 0;
131 /*
132  * These are to give UI layer defaults.
133  * The core-level commands such as git-diff-files should
134  * never be affected by the setting of diff.renames
135  * the user happens to have in the configuration file.
136  */
137 int git_diff_ui_config(const char *var, const char *value, void *cb)
139         if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
140                 diff_use_color_default = git_config_colorbool(var, value, -1);
141                 return 0;
142         }
143         if (!strcmp(var, "diff.renames")) {
144                 if (!value)
145                         diff_detect_rename_default = DIFF_DETECT_RENAME;
146                 else if (!strcasecmp(value, "copies") ||
147                          !strcasecmp(value, "copy"))
148                         diff_detect_rename_default = DIFF_DETECT_COPY;
149                 else if (git_config_bool(var,value))
150                         diff_detect_rename_default = DIFF_DETECT_RENAME;
151                 return 0;
152         }
153         if (!strcmp(var, "diff.autorefreshindex")) {
154                 diff_auto_refresh_index = git_config_bool(var, value);
155                 return 0;
156         }
157         if (!strcmp(var, "diff.external"))
158                 return git_config_string(&external_diff_cmd_cfg, var, value);
159         if (!prefixcmp(var, "diff.")) {
160                 const char *ep = strrchr(var, '.');
162                 if (ep != var + 4 && !strcmp(ep, ".command"))
163                         return parse_lldiff_command(var, ep, value);
164         }
166         return git_diff_basic_config(var, value, cb);
169 int git_diff_basic_config(const char *var, const char *value, void *cb)
171         if (!strcmp(var, "diff.renamelimit")) {
172                 diff_rename_limit_default = git_config_int(var, value);
173                 return 0;
174         }
176         if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
177                 int slot = parse_diff_color_slot(var, 11);
178                 if (!value)
179                         return config_error_nonbool(var);
180                 color_parse(value, var, diff_colors[slot]);
181                 return 0;
182         }
184         if (!prefixcmp(var, "diff.")) {
185                 const char *ep = strrchr(var, '.');
186                 if (ep != var + 4) {
187                         if (!strcmp(ep, ".funcname")) {
188                                 if (!value)
189                                         return config_error_nonbool(var);
190                                 return parse_funcname_pattern(var, ep, value,
191                                         0);
192                         } else if (!strcmp(ep, ".xfuncname")) {
193                                 if (!value)
194                                         return config_error_nonbool(var);
195                                 return parse_funcname_pattern(var, ep, value,
196                                         REG_EXTENDED);
197                         }
198                 }
199         }
201         return git_color_default_config(var, value, cb);
204 static char *quote_two(const char *one, const char *two)
206         int need_one = quote_c_style(one, NULL, NULL, 1);
207         int need_two = quote_c_style(two, NULL, NULL, 1);
208         struct strbuf res;
210         strbuf_init(&res, 0);
211         if (need_one + need_two) {
212                 strbuf_addch(&res, '"');
213                 quote_c_style(one, &res, NULL, 1);
214                 quote_c_style(two, &res, NULL, 1);
215                 strbuf_addch(&res, '"');
216         } else {
217                 strbuf_addstr(&res, one);
218                 strbuf_addstr(&res, two);
219         }
220         return strbuf_detach(&res, NULL);
223 static const char *external_diff(void)
225         static const char *external_diff_cmd = NULL;
226         static int done_preparing = 0;
228         if (done_preparing)
229                 return external_diff_cmd;
230         external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
231         if (!external_diff_cmd)
232                 external_diff_cmd = external_diff_cmd_cfg;
233         done_preparing = 1;
234         return external_diff_cmd;
237 static struct diff_tempfile {
238         const char *name; /* filename external diff should read from */
239         char hex[41];
240         char mode[10];
241         char tmp_path[PATH_MAX];
242 } diff_temp[2];
244 static int count_lines(const char *data, int size)
246         int count, ch, completely_empty = 1, nl_just_seen = 0;
247         count = 0;
248         while (0 < size--) {
249                 ch = *data++;
250                 if (ch == '\n') {
251                         count++;
252                         nl_just_seen = 1;
253                         completely_empty = 0;
254                 }
255                 else {
256                         nl_just_seen = 0;
257                         completely_empty = 0;
258                 }
259         }
260         if (completely_empty)
261                 return 0;
262         if (!nl_just_seen)
263                 count++; /* no trailing newline */
264         return count;
267 static void print_line_count(FILE *file, int count)
269         switch (count) {
270         case 0:
271                 fprintf(file, "0,0");
272                 break;
273         case 1:
274                 fprintf(file, "1");
275                 break;
276         default:
277                 fprintf(file, "1,%d", count);
278                 break;
279         }
282 static void copy_file_with_prefix(FILE *file,
283                                   int prefix, const char *data, int size,
284                                   const char *set, const char *reset)
286         int ch, nl_just_seen = 1;
287         while (0 < size--) {
288                 ch = *data++;
289                 if (nl_just_seen) {
290                         fputs(set, file);
291                         putc(prefix, file);
292                 }
293                 if (ch == '\n') {
294                         nl_just_seen = 1;
295                         fputs(reset, file);
296                 } else
297                         nl_just_seen = 0;
298                 putc(ch, file);
299         }
300         if (!nl_just_seen)
301                 fprintf(file, "%s\n\\ No newline at end of file\n", reset);
304 static void emit_rewrite_diff(const char *name_a,
305                               const char *name_b,
306                               struct diff_filespec *one,
307                               struct diff_filespec *two,
308                               struct diff_options *o)
310         int lc_a, lc_b;
311         int color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
312         const char *name_a_tab, *name_b_tab;
313         const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO);
314         const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO);
315         const char *old = diff_get_color(color_diff, DIFF_FILE_OLD);
316         const char *new = diff_get_color(color_diff, DIFF_FILE_NEW);
317         const char *reset = diff_get_color(color_diff, DIFF_RESET);
318         static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
320         name_a += (*name_a == '/');
321         name_b += (*name_b == '/');
322         name_a_tab = strchr(name_a, ' ') ? "\t" : "";
323         name_b_tab = strchr(name_b, ' ') ? "\t" : "";
325         strbuf_reset(&a_name);
326         strbuf_reset(&b_name);
327         quote_two_c_style(&a_name, o->a_prefix, name_a, 0);
328         quote_two_c_style(&b_name, o->b_prefix, name_b, 0);
330         diff_populate_filespec(one, 0);
331         diff_populate_filespec(two, 0);
332         lc_a = count_lines(one->data, one->size);
333         lc_b = count_lines(two->data, two->size);
334         fprintf(o->file,
335                 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
336                 metainfo, a_name.buf, name_a_tab, reset,
337                 metainfo, b_name.buf, name_b_tab, reset, fraginfo);
338         print_line_count(o->file, lc_a);
339         fprintf(o->file, " +");
340         print_line_count(o->file, lc_b);
341         fprintf(o->file, " @@%s\n", reset);
342         if (lc_a)
343                 copy_file_with_prefix(o->file, '-', one->data, one->size, old, reset);
344         if (lc_b)
345                 copy_file_with_prefix(o->file, '+', two->data, two->size, new, reset);
348 static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
350         if (!DIFF_FILE_VALID(one)) {
351                 mf->ptr = (char *)""; /* does not matter */
352                 mf->size = 0;
353                 return 0;
354         }
355         else if (diff_populate_filespec(one, 0))
356                 return -1;
357         mf->ptr = one->data;
358         mf->size = one->size;
359         return 0;
362 struct diff_words_buffer {
363         mmfile_t text;
364         long alloc;
365         long current; /* output pointer */
366         int suppressed_newline;
367 };
369 static void diff_words_append(char *line, unsigned long len,
370                 struct diff_words_buffer *buffer)
372         if (buffer->text.size + len > buffer->alloc) {
373                 buffer->alloc = (buffer->text.size + len) * 3 / 2;
374                 buffer->text.ptr = xrealloc(buffer->text.ptr, buffer->alloc);
375         }
376         line++;
377         len--;
378         memcpy(buffer->text.ptr + buffer->text.size, line, len);
379         buffer->text.size += len;
382 struct diff_words_data {
383         struct xdiff_emit_state xm;
384         struct diff_words_buffer minus, plus;
385         FILE *file;
386 };
388 static void print_word(FILE *file, struct diff_words_buffer *buffer, int len, int color,
389                 int suppress_newline)
391         const char *ptr;
392         int eol = 0;
394         if (len == 0)
395                 return;
397         ptr  = buffer->text.ptr + buffer->current;
398         buffer->current += len;
400         if (ptr[len - 1] == '\n') {
401                 eol = 1;
402                 len--;
403         }
405         fputs(diff_get_color(1, color), file);
406         fwrite(ptr, len, 1, file);
407         fputs(diff_get_color(1, DIFF_RESET), file);
409         if (eol) {
410                 if (suppress_newline)
411                         buffer->suppressed_newline = 1;
412                 else
413                         putc('\n', file);
414         }
417 static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
419         struct diff_words_data *diff_words = priv;
421         if (diff_words->minus.suppressed_newline) {
422                 if (line[0] != '+')
423                         putc('\n', diff_words->file);
424                 diff_words->minus.suppressed_newline = 0;
425         }
427         len--;
428         switch (line[0]) {
429                 case '-':
430                         print_word(diff_words->file,
431                                    &diff_words->minus, len, DIFF_FILE_OLD, 1);
432                         break;
433                 case '+':
434                         print_word(diff_words->file,
435                                    &diff_words->plus, len, DIFF_FILE_NEW, 0);
436                         break;
437                 case ' ':
438                         print_word(diff_words->file,
439                                    &diff_words->plus, len, DIFF_PLAIN, 0);
440                         diff_words->minus.current += len;
441                         break;
442         }
445 /* this executes the word diff on the accumulated buffers */
446 static void diff_words_show(struct diff_words_data *diff_words)
448         xpparam_t xpp;
449         xdemitconf_t xecfg;
450         xdemitcb_t ecb;
451         mmfile_t minus, plus;
452         int i;
454         memset(&xecfg, 0, sizeof(xecfg));
455         minus.size = diff_words->minus.text.size;
456         minus.ptr = xmalloc(minus.size);
457         memcpy(minus.ptr, diff_words->minus.text.ptr, minus.size);
458         for (i = 0; i < minus.size; i++)
459                 if (isspace(minus.ptr[i]))
460                         minus.ptr[i] = '\n';
461         diff_words->minus.current = 0;
463         plus.size = diff_words->plus.text.size;
464         plus.ptr = xmalloc(plus.size);
465         memcpy(plus.ptr, diff_words->plus.text.ptr, plus.size);
466         for (i = 0; i < plus.size; i++)
467                 if (isspace(plus.ptr[i]))
468                         plus.ptr[i] = '\n';
469         diff_words->plus.current = 0;
471         xpp.flags = XDF_NEED_MINIMAL;
472         xecfg.ctxlen = diff_words->minus.alloc + diff_words->plus.alloc;
473         ecb.outf = xdiff_outf;
474         ecb.priv = diff_words;
475         diff_words->xm.consume = fn_out_diff_words_aux;
476         xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
478         free(minus.ptr);
479         free(plus.ptr);
480         diff_words->minus.text.size = diff_words->plus.text.size = 0;
482         if (diff_words->minus.suppressed_newline) {
483                 putc('\n', diff_words->file);
484                 diff_words->minus.suppressed_newline = 0;
485         }
488 typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
490 struct emit_callback {
491         struct xdiff_emit_state xm;
492         int color_diff;
493         unsigned ws_rule;
494         sane_truncate_fn truncate;
495         const char **label_path;
496         struct diff_words_data *diff_words;
497         int *found_changesp;
498         FILE *file;
499 };
501 static void free_diff_words_data(struct emit_callback *ecbdata)
503         if (ecbdata->diff_words) {
504                 /* flush buffers */
505                 if (ecbdata->diff_words->minus.text.size ||
506                                 ecbdata->diff_words->plus.text.size)
507                         diff_words_show(ecbdata->diff_words);
509                 free (ecbdata->diff_words->minus.text.ptr);
510                 free (ecbdata->diff_words->plus.text.ptr);
511                 free(ecbdata->diff_words);
512                 ecbdata->diff_words = NULL;
513         }
516 const char *diff_get_color(int diff_use_color, enum color_diff ix)
518         if (diff_use_color)
519                 return diff_colors[ix];
520         return "";
523 static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)
525         int has_trailing_newline, has_trailing_carriage_return;
527         has_trailing_newline = (len > 0 && line[len-1] == '\n');
528         if (has_trailing_newline)
529                 len--;
530         has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
531         if (has_trailing_carriage_return)
532                 len--;
534         fputs(set, file);
535         fwrite(line, len, 1, file);
536         fputs(reset, file);
537         if (has_trailing_carriage_return)
538                 fputc('\r', file);
539         if (has_trailing_newline)
540                 fputc('\n', file);
543 static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len)
545         const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
546         const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
548         if (!*ws)
549                 emit_line(ecbdata->file, set, reset, line, len);
550         else {
551                 /* Emit just the prefix, then the rest. */
552                 emit_line(ecbdata->file, set, reset, line, 1);
553                 ws_check_emit(line + 1, len - 1, ecbdata->ws_rule,
554                               ecbdata->file, set, reset, ws);
555         }
558 static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
560         const char *cp;
561         unsigned long allot;
562         size_t l = len;
564         if (ecb->truncate)
565                 return ecb->truncate(line, len);
566         cp = line;
567         allot = l;
568         while (0 < l) {
569                 (void) utf8_width(&cp, &l);
570                 if (!cp)
571                         break; /* truncated in the middle? */
572         }
573         return allot - l;
576 static void fn_out_consume(void *priv, char *line, unsigned long len)
578         int color;
579         struct emit_callback *ecbdata = priv;
580         const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
581         const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
582         const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
584         *(ecbdata->found_changesp) = 1;
586         if (ecbdata->label_path[0]) {
587                 const char *name_a_tab, *name_b_tab;
589                 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
590                 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
592                 fprintf(ecbdata->file, "%s--- %s%s%s\n",
593                         meta, ecbdata->label_path[0], reset, name_a_tab);
594                 fprintf(ecbdata->file, "%s+++ %s%s%s\n",
595                         meta, ecbdata->label_path[1], reset, name_b_tab);
596                 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
597         }
599         if (line[0] == '@') {
600                 len = sane_truncate_line(ecbdata, line, len);
601                 emit_line(ecbdata->file,
602                           diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO),
603                           reset, line, len);
604                 if (line[len-1] != '\n')
605                         putc('\n', ecbdata->file);
606                 return;
607         }
609         if (len < 1) {
610                 emit_line(ecbdata->file, reset, reset, line, len);
611                 return;
612         }
614         color = DIFF_PLAIN;
615         if (ecbdata->diff_words) {
616                 if (line[0] == '-') {
617                         diff_words_append(line, len,
618                                           &ecbdata->diff_words->minus);
619                         return;
620                 } else if (line[0] == '+') {
621                         diff_words_append(line, len,
622                                           &ecbdata->diff_words->plus);
623                         return;
624                 }
625                 if (ecbdata->diff_words->minus.text.size ||
626                     ecbdata->diff_words->plus.text.size)
627                         diff_words_show(ecbdata->diff_words);
628                 line++;
629                 len--;
630                 emit_line(ecbdata->file, plain, reset, line, len);
631                 return;
632         }
633         if (line[0] == '-')
634                 color = DIFF_FILE_OLD;
635         else if (line[0] == '+')
636                 color = DIFF_FILE_NEW;
637         if (color != DIFF_FILE_NEW) {
638                 emit_line(ecbdata->file,
639                           diff_get_color(ecbdata->color_diff, color),
640                           reset, line, len);
641                 return;
642         }
643         emit_add_line(reset, ecbdata, line, len);
646 static char *pprint_rename(const char *a, const char *b)
648         const char *old = a;
649         const char *new = b;
650         struct strbuf name;
651         int pfx_length, sfx_length;
652         int len_a = strlen(a);
653         int len_b = strlen(b);
654         int a_midlen, b_midlen;
655         int qlen_a = quote_c_style(a, NULL, NULL, 0);
656         int qlen_b = quote_c_style(b, NULL, NULL, 0);
658         strbuf_init(&name, 0);
659         if (qlen_a || qlen_b) {
660                 quote_c_style(a, &name, NULL, 0);
661                 strbuf_addstr(&name, " => ");
662                 quote_c_style(b, &name, NULL, 0);
663                 return strbuf_detach(&name, NULL);
664         }
666         /* Find common prefix */
667         pfx_length = 0;
668         while (*old && *new && *old == *new) {
669                 if (*old == '/')
670                         pfx_length = old - a + 1;
671                 old++;
672                 new++;
673         }
675         /* Find common suffix */
676         old = a + len_a;
677         new = b + len_b;
678         sfx_length = 0;
679         while (a <= old && b <= new && *old == *new) {
680                 if (*old == '/')
681                         sfx_length = len_a - (old - a);
682                 old--;
683                 new--;
684         }
686         /*
687          * pfx{mid-a => mid-b}sfx
688          * {pfx-a => pfx-b}sfx
689          * pfx{sfx-a => sfx-b}
690          * name-a => name-b
691          */
692         a_midlen = len_a - pfx_length - sfx_length;
693         b_midlen = len_b - pfx_length - sfx_length;
694         if (a_midlen < 0)
695                 a_midlen = 0;
696         if (b_midlen < 0)
697                 b_midlen = 0;
699         strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
700         if (pfx_length + sfx_length) {
701                 strbuf_add(&name, a, pfx_length);
702                 strbuf_addch(&name, '{');
703         }
704         strbuf_add(&name, a + pfx_length, a_midlen);
705         strbuf_addstr(&name, " => ");
706         strbuf_add(&name, b + pfx_length, b_midlen);
707         if (pfx_length + sfx_length) {
708                 strbuf_addch(&name, '}');
709                 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
710         }
711         return strbuf_detach(&name, NULL);
714 struct diffstat_t {
715         struct xdiff_emit_state xm;
717         int nr;
718         int alloc;
719         struct diffstat_file {
720                 char *from_name;
721                 char *name;
722                 char *print_name;
723                 unsigned is_unmerged:1;
724                 unsigned is_binary:1;
725                 unsigned is_renamed:1;
726                 unsigned int added, deleted;
727         } **files;
728 };
730 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
731                                           const char *name_a,
732                                           const char *name_b)
734         struct diffstat_file *x;
735         x = xcalloc(sizeof (*x), 1);
736         if (diffstat->nr == diffstat->alloc) {
737                 diffstat->alloc = alloc_nr(diffstat->alloc);
738                 diffstat->files = xrealloc(diffstat->files,
739                                 diffstat->alloc * sizeof(x));
740         }
741         diffstat->files[diffstat->nr++] = x;
742         if (name_b) {
743                 x->from_name = xstrdup(name_a);
744                 x->name = xstrdup(name_b);
745                 x->is_renamed = 1;
746         }
747         else {
748                 x->from_name = NULL;
749                 x->name = xstrdup(name_a);
750         }
751         return x;
754 static void diffstat_consume(void *priv, char *line, unsigned long len)
756         struct diffstat_t *diffstat = priv;
757         struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
759         if (line[0] == '+')
760                 x->added++;
761         else if (line[0] == '-')
762                 x->deleted++;
765 const char mime_boundary_leader[] = "------------";
767 static int scale_linear(int it, int width, int max_change)
769         /*
770          * make sure that at least one '-' is printed if there were deletions,
771          * and likewise for '+'.
772          */
773         if (max_change < 2)
774                 return it;
775         return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1);
778 static void show_name(FILE *file,
779                       const char *prefix, const char *name, int len,
780                       const char *reset, const char *set)
782         fprintf(file, " %s%s%-*s%s |", set, prefix, len, name, reset);
785 static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
787         if (cnt <= 0)
788                 return;
789         fprintf(file, "%s", set);
790         while (cnt--)
791                 putc(ch, file);
792         fprintf(file, "%s", reset);
795 static void fill_print_name(struct diffstat_file *file)
797         char *pname;
799         if (file->print_name)
800                 return;
802         if (!file->is_renamed) {
803                 struct strbuf buf;
804                 strbuf_init(&buf, 0);
805                 if (quote_c_style(file->name, &buf, NULL, 0)) {
806                         pname = strbuf_detach(&buf, NULL);
807                 } else {
808                         pname = file->name;
809                         strbuf_release(&buf);
810                 }
811         } else {
812                 pname = pprint_rename(file->from_name, file->name);
813         }
814         file->print_name = pname;
817 static void show_stats(struct diffstat_t* data, struct diff_options *options)
819         int i, len, add, del, total, adds = 0, dels = 0;
820         int max_change = 0, max_len = 0;
821         int total_files = data->nr;
822         int width, name_width;
823         const char *reset, *set, *add_c, *del_c;
825         if (data->nr == 0)
826                 return;
828         width = options->stat_width ? options->stat_width : 80;
829         name_width = options->stat_name_width ? options->stat_name_width : 50;
831         /* Sanity: give at least 5 columns to the graph,
832          * but leave at least 10 columns for the name.
833          */
834         if (width < 25)
835                 width = 25;
836         if (name_width < 10)
837                 name_width = 10;
838         else if (width < name_width + 15)
839                 name_width = width - 15;
841         /* Find the longest filename and max number of changes */
842         reset = diff_get_color_opt(options, DIFF_RESET);
843         set   = diff_get_color_opt(options, DIFF_PLAIN);
844         add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
845         del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
847         for (i = 0; i < data->nr; i++) {
848                 struct diffstat_file *file = data->files[i];
849                 int change = file->added + file->deleted;
850                 fill_print_name(file);
851                 len = strlen(file->print_name);
852                 if (max_len < len)
853                         max_len = len;
855                 if (file->is_binary || file->is_unmerged)
856                         continue;
857                 if (max_change < change)
858                         max_change = change;
859         }
861         /* Compute the width of the graph part;
862          * 10 is for one blank at the beginning of the line plus
863          * " | count " between the name and the graph.
864          *
865          * From here on, name_width is the width of the name area,
866          * and width is the width of the graph area.
867          */
868         name_width = (name_width < max_len) ? name_width : max_len;
869         if (width < (name_width + 10) + max_change)
870                 width = width - (name_width + 10);
871         else
872                 width = max_change;
874         for (i = 0; i < data->nr; i++) {
875                 const char *prefix = "";
876                 char *name = data->files[i]->print_name;
877                 int added = data->files[i]->added;
878                 int deleted = data->files[i]->deleted;
879                 int name_len;
881                 /*
882                  * "scale" the filename
883                  */
884                 len = name_width;
885                 name_len = strlen(name);
886                 if (name_width < name_len) {
887                         char *slash;
888                         prefix = "...";
889                         len -= 3;
890                         name += name_len - len;
891                         slash = strchr(name, '/');
892                         if (slash)
893                                 name = slash;
894                 }
896                 if (data->files[i]->is_binary) {
897                         show_name(options->file, prefix, name, len, reset, set);
898                         fprintf(options->file, "  Bin ");
899                         fprintf(options->file, "%s%d%s", del_c, deleted, reset);
900                         fprintf(options->file, " -> ");
901                         fprintf(options->file, "%s%d%s", add_c, added, reset);
902                         fprintf(options->file, " bytes");
903                         fprintf(options->file, "\n");
904                         continue;
905                 }
906                 else if (data->files[i]->is_unmerged) {
907                         show_name(options->file, prefix, name, len, reset, set);
908                         fprintf(options->file, "  Unmerged\n");
909                         continue;
910                 }
911                 else if (!data->files[i]->is_renamed &&
912                          (added + deleted == 0)) {
913                         total_files--;
914                         continue;
915                 }
917                 /*
918                  * scale the add/delete
919                  */
920                 add = added;
921                 del = deleted;
922                 total = add + del;
923                 adds += add;
924                 dels += del;
926                 if (width <= max_change) {
927                         add = scale_linear(add, width, max_change);
928                         del = scale_linear(del, width, max_change);
929                         total = add + del;
930                 }
931                 show_name(options->file, prefix, name, len, reset, set);
932                 fprintf(options->file, "%5d%s", added + deleted,
933                                 added + deleted ? " " : "");
934                 show_graph(options->file, '+', add, add_c, reset);
935                 show_graph(options->file, '-', del, del_c, reset);
936                 fprintf(options->file, "\n");
937         }
938         fprintf(options->file,
939                "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
940                set, total_files, adds, dels, reset);
943 static void show_shortstats(struct diffstat_t* data, struct diff_options *options)
945         int i, adds = 0, dels = 0, total_files = data->nr;
947         if (data->nr == 0)
948                 return;
950         for (i = 0; i < data->nr; i++) {
951                 if (!data->files[i]->is_binary &&
952                     !data->files[i]->is_unmerged) {
953                         int added = data->files[i]->added;
954                         int deleted= data->files[i]->deleted;
955                         if (!data->files[i]->is_renamed &&
956                             (added + deleted == 0)) {
957                                 total_files--;
958                         } else {
959                                 adds += added;
960                                 dels += deleted;
961                         }
962                 }
963         }
964         fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
965                total_files, adds, dels);
968 static void show_numstat(struct diffstat_t* data, struct diff_options *options)
970         int i;
972         if (data->nr == 0)
973                 return;
975         for (i = 0; i < data->nr; i++) {
976                 struct diffstat_file *file = data->files[i];
978                 if (file->is_binary)
979                         fprintf(options->file, "-\t-\t");
980                 else
981                         fprintf(options->file,
982                                 "%d\t%d\t", file->added, file->deleted);
983                 if (options->line_termination) {
984                         fill_print_name(file);
985                         if (!file->is_renamed)
986                                 write_name_quoted(file->name, options->file,
987                                                   options->line_termination);
988                         else {
989                                 fputs(file->print_name, options->file);
990                                 putc(options->line_termination, options->file);
991                         }
992                 } else {
993                         if (file->is_renamed) {
994                                 putc('\0', options->file);
995                                 write_name_quoted(file->from_name, options->file, '\0');
996                         }
997                         write_name_quoted(file->name, options->file, '\0');
998                 }
999         }
1002 struct dirstat_file {
1003         const char *name;
1004         unsigned long changed;
1005 };
1007 struct dirstat_dir {
1008         struct dirstat_file *files;
1009         int alloc, nr, percent, cumulative;
1010 };
1012 static long gather_dirstat(FILE *file, struct dirstat_dir *dir, unsigned long changed, const char *base, int baselen)
1014         unsigned long this_dir = 0;
1015         unsigned int sources = 0;
1017         while (dir->nr) {
1018                 struct dirstat_file *f = dir->files;
1019                 int namelen = strlen(f->name);
1020                 unsigned long this;
1021                 char *slash;
1023                 if (namelen < baselen)
1024                         break;
1025                 if (memcmp(f->name, base, baselen))
1026                         break;
1027                 slash = strchr(f->name + baselen, '/');
1028                 if (slash) {
1029                         int newbaselen = slash + 1 - f->name;
1030                         this = gather_dirstat(file, dir, changed, f->name, newbaselen);
1031                         sources++;
1032                 } else {
1033                         this = f->changed;
1034                         dir->files++;
1035                         dir->nr--;
1036                         sources += 2;
1037                 }
1038                 this_dir += this;
1039         }
1041         /*
1042          * We don't report dirstat's for
1043          *  - the top level
1044          *  - or cases where everything came from a single directory
1045          *    under this directory (sources == 1).
1046          */
1047         if (baselen && sources != 1) {
1048                 int permille = this_dir * 1000 / changed;
1049                 if (permille) {
1050                         int percent = permille / 10;
1051                         if (percent >= dir->percent) {
1052                                 fprintf(file, "%4d.%01d%% %.*s\n", percent, permille % 10, baselen, base);
1053                                 if (!dir->cumulative)
1054                                         return 0;
1055                         }
1056                 }
1057         }
1058         return this_dir;
1061 static int dirstat_compare(const void *_a, const void *_b)
1063         const struct dirstat_file *a = _a;
1064         const struct dirstat_file *b = _b;
1065         return strcmp(a->name, b->name);
1068 static void show_dirstat(struct diff_options *options)
1070         int i;
1071         unsigned long changed;
1072         struct dirstat_dir dir;
1073         struct diff_queue_struct *q = &diff_queued_diff;
1075         dir.files = NULL;
1076         dir.alloc = 0;
1077         dir.nr = 0;
1078         dir.percent = options->dirstat_percent;
1079         dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1081         changed = 0;
1082         for (i = 0; i < q->nr; i++) {
1083                 struct diff_filepair *p = q->queue[i];
1084                 const char *name;
1085                 unsigned long copied, added, damage;
1087                 name = p->one->path ? p->one->path : p->two->path;
1089                 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1090                         diff_populate_filespec(p->one, 0);
1091                         diff_populate_filespec(p->two, 0);
1092                         diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1093                                                &copied, &added);
1094                         diff_free_filespec_data(p->one);
1095                         diff_free_filespec_data(p->two);
1096                 } else if (DIFF_FILE_VALID(p->one)) {
1097                         diff_populate_filespec(p->one, 1);
1098                         copied = added = 0;
1099                         diff_free_filespec_data(p->one);
1100                 } else if (DIFF_FILE_VALID(p->two)) {
1101                         diff_populate_filespec(p->two, 1);
1102                         copied = 0;
1103                         added = p->two->size;
1104                         diff_free_filespec_data(p->two);
1105                 } else
1106                         continue;
1108                 /*
1109                  * Original minus copied is the removed material,
1110                  * added is the new material.  They are both damages
1111                  * made to the preimage.
1112                  */
1113                 damage = (p->one->size - copied) + added;
1115                 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1116                 dir.files[dir.nr].name = name;
1117                 dir.files[dir.nr].changed = damage;
1118                 changed += damage;
1119                 dir.nr++;
1120         }
1122         /* This can happen even with many files, if everything was renames */
1123         if (!changed)
1124                 return;
1126         /* Show all directories with more than x% of the changes */
1127         qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1128         gather_dirstat(options->file, &dir, changed, "", 0);
1131 static void free_diffstat_info(struct diffstat_t *diffstat)
1133         int i;
1134         for (i = 0; i < diffstat->nr; i++) {
1135                 struct diffstat_file *f = diffstat->files[i];
1136                 if (f->name != f->print_name)
1137                         free(f->print_name);
1138                 free(f->name);
1139                 free(f->from_name);
1140                 free(f);
1141         }
1142         free(diffstat->files);
1145 struct checkdiff_t {
1146         struct xdiff_emit_state xm;
1147         const char *filename;
1148         int lineno;
1149         struct diff_options *o;
1150         unsigned ws_rule;
1151         unsigned status;
1152         int trailing_blanks_start;
1153 };
1155 static int is_conflict_marker(const char *line, unsigned long len)
1157         char firstchar;
1158         int cnt;
1160         if (len < 8)
1161                 return 0;
1162         firstchar = line[0];
1163         switch (firstchar) {
1164         case '=': case '>': case '<':
1165                 break;
1166         default:
1167                 return 0;
1168         }
1169         for (cnt = 1; cnt < 7; cnt++)
1170                 if (line[cnt] != firstchar)
1171                         return 0;
1172         /* line[0] thru line[6] are same as firstchar */
1173         if (firstchar == '=') {
1174                 /* divider between ours and theirs? */
1175                 if (len != 8 || line[7] != '\n')
1176                         return 0;
1177         } else if (len < 8 || !isspace(line[7])) {
1178                 /* not divider before ours nor after theirs */
1179                 return 0;
1180         }
1181         return 1;
1184 static void checkdiff_consume(void *priv, char *line, unsigned long len)
1186         struct checkdiff_t *data = priv;
1187         int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF);
1188         const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE);
1189         const char *reset = diff_get_color(color_diff, DIFF_RESET);
1190         const char *set = diff_get_color(color_diff, DIFF_FILE_NEW);
1191         char *err;
1193         if (line[0] == '+') {
1194                 unsigned bad;
1195                 data->lineno++;
1196                 if (!ws_blank_line(line + 1, len - 1, data->ws_rule))
1197                         data->trailing_blanks_start = 0;
1198                 else if (!data->trailing_blanks_start)
1199                         data->trailing_blanks_start = data->lineno;
1200                 if (is_conflict_marker(line + 1, len - 1)) {
1201                         data->status |= 1;
1202                         fprintf(data->o->file,
1203                                 "%s:%d: leftover conflict marker\n",
1204                                 data->filename, data->lineno);
1205                 }
1206                 bad = ws_check(line + 1, len - 1, data->ws_rule);
1207                 if (!bad)
1208                         return;
1209                 data->status |= bad;
1210                 err = whitespace_error_string(bad);
1211                 fprintf(data->o->file, "%s:%d: %s.\n",
1212                         data->filename, data->lineno, err);
1213                 free(err);
1214                 emit_line(data->o->file, set, reset, line, 1);
1215                 ws_check_emit(line + 1, len - 1, data->ws_rule,
1216                               data->o->file, set, reset, ws);
1217         } else if (line[0] == ' ') {
1218                 data->lineno++;
1219                 data->trailing_blanks_start = 0;
1220         } else if (line[0] == '@') {
1221                 char *plus = strchr(line, '+');
1222                 if (plus)
1223                         data->lineno = strtol(plus, NULL, 10) - 1;
1224                 else
1225                         die("invalid diff");
1226                 data->trailing_blanks_start = 0;
1227         }
1230 static unsigned char *deflate_it(char *data,
1231                                  unsigned long size,
1232                                  unsigned long *result_size)
1234         int bound;
1235         unsigned char *deflated;
1236         z_stream stream;
1238         memset(&stream, 0, sizeof(stream));
1239         deflateInit(&stream, zlib_compression_level);
1240         bound = deflateBound(&stream, size);
1241         deflated = xmalloc(bound);
1242         stream.next_out = deflated;
1243         stream.avail_out = bound;
1245         stream.next_in = (unsigned char *)data;
1246         stream.avail_in = size;
1247         while (deflate(&stream, Z_FINISH) == Z_OK)
1248                 ; /* nothing */
1249         deflateEnd(&stream);
1250         *result_size = stream.total_out;
1251         return deflated;
1254 static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two)
1256         void *cp;
1257         void *delta;
1258         void *deflated;
1259         void *data;
1260         unsigned long orig_size;
1261         unsigned long delta_size;
1262         unsigned long deflate_size;
1263         unsigned long data_size;
1265         /* We could do deflated delta, or we could do just deflated two,
1266          * whichever is smaller.
1267          */
1268         delta = NULL;
1269         deflated = deflate_it(two->ptr, two->size, &deflate_size);
1270         if (one->size && two->size) {
1271                 delta = diff_delta(one->ptr, one->size,
1272                                    two->ptr, two->size,
1273                                    &delta_size, deflate_size);
1274                 if (delta) {
1275                         void *to_free = delta;
1276                         orig_size = delta_size;
1277                         delta = deflate_it(delta, delta_size, &delta_size);
1278                         free(to_free);
1279                 }
1280         }
1282         if (delta && delta_size < deflate_size) {
1283                 fprintf(file, "delta %lu\n", orig_size);
1284                 free(deflated);
1285                 data = delta;
1286                 data_size = delta_size;
1287         }
1288         else {
1289                 fprintf(file, "literal %lu\n", two->size);
1290                 free(delta);
1291                 data = deflated;
1292                 data_size = deflate_size;
1293         }
1295         /* emit data encoded in base85 */
1296         cp = data;
1297         while (data_size) {
1298                 int bytes = (52 < data_size) ? 52 : data_size;
1299                 char line[70];
1300                 data_size -= bytes;
1301                 if (bytes <= 26)
1302                         line[0] = bytes + 'A' - 1;
1303                 else
1304                         line[0] = bytes - 26 + 'a' - 1;
1305                 encode_85(line + 1, cp, bytes);
1306                 cp = (char *) cp + bytes;
1307                 fputs(line, file);
1308                 fputc('\n', file);
1309         }
1310         fprintf(file, "\n");
1311         free(data);
1314 static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two)
1316         fprintf(file, "GIT binary patch\n");
1317         emit_binary_diff_body(file, one, two);
1318         emit_binary_diff_body(file, two, one);
1321 static void setup_diff_attr_check(struct git_attr_check *check)
1323         static struct git_attr *attr_diff;
1325         if (!attr_diff) {
1326                 attr_diff = git_attr("diff", 4);
1327         }
1328         check[0].attr = attr_diff;
1331 static void diff_filespec_check_attr(struct diff_filespec *one)
1333         struct git_attr_check attr_diff_check;
1334         int check_from_data = 0;
1336         if (one->checked_attr)
1337                 return;
1339         setup_diff_attr_check(&attr_diff_check);
1340         one->is_binary = 0;
1341         one->funcname_pattern_ident = NULL;
1343         if (!git_checkattr(one->path, 1, &attr_diff_check)) {
1344                 const char *value;
1346                 /* binaryness */
1347                 value = attr_diff_check.value;
1348                 if (ATTR_TRUE(value))
1349                         ;
1350                 else if (ATTR_FALSE(value))
1351                         one->is_binary = 1;
1352                 else
1353                         check_from_data = 1;
1355                 /* funcname pattern ident */
1356                 if (ATTR_TRUE(value) || ATTR_FALSE(value) || ATTR_UNSET(value))
1357                         ;
1358                 else
1359                         one->funcname_pattern_ident = value;
1360         }
1362         if (check_from_data) {
1363                 if (!one->data && DIFF_FILE_VALID(one))
1364                         diff_populate_filespec(one, 0);
1366                 if (one->data)
1367                         one->is_binary = buffer_is_binary(one->data, one->size);
1368         }
1371 int diff_filespec_is_binary(struct diff_filespec *one)
1373         diff_filespec_check_attr(one);
1374         return one->is_binary;
1377 static const struct funcname_pattern_entry *funcname_pattern(const char *ident)
1379         struct funcname_pattern_list *pp;
1381         for (pp = funcname_pattern_list; pp; pp = pp->next)
1382                 if (!strcmp(ident, pp->e.name))
1383                         return &pp->e;
1384         return NULL;
1387 static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
1388         { "java",
1389           "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
1390           "^[ \t]*(([ \t]*[A-Za-z_][A-Za-z_0-9]*){2,}[ \t]*\\([^;]*)$",
1391           REG_EXTENDED },
1392         { "pascal",
1393           "^((procedure|function|constructor|destructor|interface|"
1394                 "implementation|initialization|finalization)[ \t]*.*)$"
1395           "|"
1396           "^(.*=[ \t]*(class|record).*)$",
1397           REG_EXTENDED },
1398         { "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
1399           REG_EXTENDED },
1400         { "tex",
1401           "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
1402           REG_EXTENDED },
1403         { "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
1404           REG_EXTENDED },
1405 };
1407 static const struct funcname_pattern_entry *diff_funcname_pattern(struct diff_filespec *one)
1409         const char *ident;
1410         const struct funcname_pattern_entry *pe;
1411         int i;
1413         diff_filespec_check_attr(one);
1414         ident = one->funcname_pattern_ident;
1416         if (!ident)
1417                 /*
1418                  * If the config file has "funcname.default" defined, that
1419                  * regexp is used; otherwise NULL is returned and xemit uses
1420                  * the built-in default.
1421                  */
1422                 return funcname_pattern("default");
1424         /* Look up custom "funcname.$ident" regexp from config. */
1425         pe = funcname_pattern(ident);
1426         if (pe)
1427                 return pe;
1429         /*
1430          * And define built-in fallback patterns here.  Note that
1431          * these can be overridden by the user's config settings.
1432          */
1433         for (i = 0; i < ARRAY_SIZE(builtin_funcname_pattern); i++)
1434                 if (!strcmp(ident, builtin_funcname_pattern[i].name))
1435                         return &builtin_funcname_pattern[i];
1437         return NULL;
1440 static void builtin_diff(const char *name_a,
1441                          const char *name_b,
1442                          struct diff_filespec *one,
1443                          struct diff_filespec *two,
1444                          const char *xfrm_msg,
1445                          struct diff_options *o,
1446                          int complete_rewrite)
1448         mmfile_t mf1, mf2;
1449         const char *lbl[2];
1450         char *a_one, *b_two;
1451         const char *set = diff_get_color_opt(o, DIFF_METAINFO);
1452         const char *reset = diff_get_color_opt(o, DIFF_RESET);
1454         /* Never use a non-valid filename anywhere if at all possible */
1455         name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
1456         name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
1458         a_one = quote_two(o->a_prefix, name_a + (*name_a == '/'));
1459         b_two = quote_two(o->b_prefix, name_b + (*name_b == '/'));
1460         lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
1461         lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
1462         fprintf(o->file, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
1463         if (lbl[0][0] == '/') {
1464                 /* /dev/null */
1465                 fprintf(o->file, "%snew file mode %06o%s\n", set, two->mode, reset);
1466                 if (xfrm_msg && xfrm_msg[0])
1467                         fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1468         }
1469         else if (lbl[1][0] == '/') {
1470                 fprintf(o->file, "%sdeleted file mode %06o%s\n", set, one->mode, reset);
1471                 if (xfrm_msg && xfrm_msg[0])
1472                         fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1473         }
1474         else {
1475                 if (one->mode != two->mode) {
1476                         fprintf(o->file, "%sold mode %06o%s\n", set, one->mode, reset);
1477                         fprintf(o->file, "%snew mode %06o%s\n", set, two->mode, reset);
1478                 }
1479                 if (xfrm_msg && xfrm_msg[0])
1480                         fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1481                 /*
1482                  * we do not run diff between different kind
1483                  * of objects.
1484                  */
1485                 if ((one->mode ^ two->mode) & S_IFMT)
1486                         goto free_ab_and_return;
1487                 if (complete_rewrite) {
1488                         emit_rewrite_diff(name_a, name_b, one, two, o);
1489                         o->found_changes = 1;
1490                         goto free_ab_and_return;
1491                 }
1492         }
1494         if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1495                 die("unable to read files to diff");
1497         if (!DIFF_OPT_TST(o, TEXT) &&
1498             (diff_filespec_is_binary(one) || diff_filespec_is_binary(two))) {
1499                 /* Quite common confusing case */
1500                 if (mf1.size == mf2.size &&
1501                     !memcmp(mf1.ptr, mf2.ptr, mf1.size))
1502                         goto free_ab_and_return;
1503                 if (DIFF_OPT_TST(o, BINARY))
1504                         emit_binary_diff(o->file, &mf1, &mf2);
1505                 else
1506                         fprintf(o->file, "Binary files %s and %s differ\n",
1507                                 lbl[0], lbl[1]);
1508                 o->found_changes = 1;
1509         }
1510         else {
1511                 /* Crazy xdl interfaces.. */
1512                 const char *diffopts = getenv("GIT_DIFF_OPTS");
1513                 xpparam_t xpp;
1514                 xdemitconf_t xecfg;
1515                 xdemitcb_t ecb;
1516                 struct emit_callback ecbdata;
1517                 const struct funcname_pattern_entry *pe;
1519                 pe = diff_funcname_pattern(one);
1520                 if (!pe)
1521                         pe = diff_funcname_pattern(two);
1523                 memset(&xecfg, 0, sizeof(xecfg));
1524                 memset(&ecbdata, 0, sizeof(ecbdata));
1525                 ecbdata.label_path = lbl;
1526                 ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1527                 ecbdata.found_changesp = &o->found_changes;
1528                 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
1529                 ecbdata.file = o->file;
1530                 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1531                 xecfg.ctxlen = o->context;
1532                 xecfg.flags = XDL_EMIT_FUNCNAMES;
1533                 if (pe)
1534                         xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
1535                 if (!diffopts)
1536                         ;
1537                 else if (!prefixcmp(diffopts, "--unified="))
1538                         xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
1539                 else if (!prefixcmp(diffopts, "-u"))
1540                         xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
1541                 ecb.outf = xdiff_outf;
1542                 ecb.priv = &ecbdata;
1543                 ecbdata.xm.consume = fn_out_consume;
1544                 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) {
1545                         ecbdata.diff_words =
1546                                 xcalloc(1, sizeof(struct diff_words_data));
1547                         ecbdata.diff_words->file = o->file;
1548                 }
1549                 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
1550                 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
1551                         free_diff_words_data(&ecbdata);
1552         }
1554  free_ab_and_return:
1555         diff_free_filespec_data(one);
1556         diff_free_filespec_data(two);
1557         free(a_one);
1558         free(b_two);
1559         return;
1562 static void builtin_diffstat(const char *name_a, const char *name_b,
1563                              struct diff_filespec *one,
1564                              struct diff_filespec *two,
1565                              struct diffstat_t *diffstat,
1566                              struct diff_options *o,
1567                              int complete_rewrite)
1569         mmfile_t mf1, mf2;
1570         struct diffstat_file *data;
1572         data = diffstat_add(diffstat, name_a, name_b);
1574         if (!one || !two) {
1575                 data->is_unmerged = 1;
1576                 return;
1577         }
1578         if (complete_rewrite) {
1579                 diff_populate_filespec(one, 0);
1580                 diff_populate_filespec(two, 0);
1581                 data->deleted = count_lines(one->data, one->size);
1582                 data->added = count_lines(two->data, two->size);
1583                 goto free_and_return;
1584         }
1585         if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1586                 die("unable to read files to diff");
1588         if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
1589                 data->is_binary = 1;
1590                 data->added = mf2.size;
1591                 data->deleted = mf1.size;
1592         } else {
1593                 /* Crazy xdl interfaces.. */
1594                 xpparam_t xpp;
1595                 xdemitconf_t xecfg;
1596                 xdemitcb_t ecb;
1598                 memset(&xecfg, 0, sizeof(xecfg));
1599                 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1600                 ecb.outf = xdiff_outf;
1601                 ecb.priv = diffstat;
1602                 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
1603         }
1605  free_and_return:
1606         diff_free_filespec_data(one);
1607         diff_free_filespec_data(two);
1610 static void builtin_checkdiff(const char *name_a, const char *name_b,
1611                               const char *attr_path,
1612                               struct diff_filespec *one,
1613                               struct diff_filespec *two,
1614                               struct diff_options *o)
1616         mmfile_t mf1, mf2;
1617         struct checkdiff_t data;
1619         if (!two)
1620                 return;
1622         memset(&data, 0, sizeof(data));
1623         data.xm.consume = checkdiff_consume;
1624         data.filename = name_b ? name_b : name_a;
1625         data.lineno = 0;
1626         data.o = o;
1627         data.ws_rule = whitespace_rule(attr_path);
1629         if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1630                 die("unable to read files to diff");
1632         /*
1633          * All the other codepaths check both sides, but not checking
1634          * the "old" side here is deliberate.  We are checking the newly
1635          * introduced changes, and as long as the "new" side is text, we
1636          * can and should check what it introduces.
1637          */
1638         if (diff_filespec_is_binary(two))
1639                 goto free_and_return;
1640         else {
1641                 /* Crazy xdl interfaces.. */
1642                 xpparam_t xpp;
1643                 xdemitconf_t xecfg;
1644                 xdemitcb_t ecb;
1646                 memset(&xecfg, 0, sizeof(xecfg));
1647                 xecfg.ctxlen = 1; /* at least one context line */
1648                 xpp.flags = XDF_NEED_MINIMAL;
1649                 ecb.outf = xdiff_outf;
1650                 ecb.priv = &data;
1651                 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
1653                 if ((data.ws_rule & WS_TRAILING_SPACE) &&
1654                     data.trailing_blanks_start) {
1655                         fprintf(o->file, "%s:%d: ends with blank lines.\n",
1656                                 data.filename, data.trailing_blanks_start);
1657                         data.status = 1; /* report errors */
1658                 }
1659         }
1660  free_and_return:
1661         diff_free_filespec_data(one);
1662         diff_free_filespec_data(two);
1663         if (data.status)
1664                 DIFF_OPT_SET(o, CHECK_FAILED);
1667 struct diff_filespec *alloc_filespec(const char *path)
1669         int namelen = strlen(path);
1670         struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
1672         memset(spec, 0, sizeof(*spec));
1673         spec->path = (char *)(spec + 1);
1674         memcpy(spec->path, path, namelen+1);
1675         spec->count = 1;
1676         return spec;
1679 void free_filespec(struct diff_filespec *spec)
1681         if (!--spec->count) {
1682                 diff_free_filespec_data(spec);
1683                 free(spec);
1684         }
1687 void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
1688                    unsigned short mode)
1690         if (mode) {
1691                 spec->mode = canon_mode(mode);
1692                 hashcpy(spec->sha1, sha1);
1693                 spec->sha1_valid = !is_null_sha1(sha1);
1694         }
1697 /*
1698  * Given a name and sha1 pair, if the index tells us the file in
1699  * the work tree has that object contents, return true, so that
1700  * prepare_temp_file() does not have to inflate and extract.
1701  */
1702 static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
1704         struct cache_entry *ce;
1705         struct stat st;
1706         int pos, len;
1708         /* We do not read the cache ourselves here, because the
1709          * benchmark with my previous version that always reads cache
1710          * shows that it makes things worse for diff-tree comparing
1711          * two linux-2.6 kernel trees in an already checked out work
1712          * tree.  This is because most diff-tree comparisons deal with
1713          * only a small number of files, while reading the cache is
1714          * expensive for a large project, and its cost outweighs the
1715          * savings we get by not inflating the object to a temporary
1716          * file.  Practically, this code only helps when we are used
1717          * by diff-cache --cached, which does read the cache before
1718          * calling us.
1719          */
1720         if (!active_cache)
1721                 return 0;
1723         /* We want to avoid the working directory if our caller
1724          * doesn't need the data in a normal file, this system
1725          * is rather slow with its stat/open/mmap/close syscalls,
1726          * and the object is contained in a pack file.  The pack
1727          * is probably already open and will be faster to obtain
1728          * the data through than the working directory.  Loose
1729          * objects however would tend to be slower as they need
1730          * to be individually opened and inflated.
1731          */
1732         if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))
1733                 return 0;
1735         len = strlen(name);
1736         pos = cache_name_pos(name, len);
1737         if (pos < 0)
1738                 return 0;
1739         ce = active_cache[pos];
1741         /*
1742          * This is not the sha1 we are looking for, or
1743          * unreusable because it is not a regular file.
1744          */
1745         if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
1746                 return 0;
1748         /*
1749          * If ce matches the file in the work tree, we can reuse it.
1750          */
1751         if (ce_uptodate(ce) ||
1752             (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
1753                 return 1;
1755         return 0;
1758 static int populate_from_stdin(struct diff_filespec *s)
1760         struct strbuf buf;
1761         size_t size = 0;
1763         strbuf_init(&buf, 0);
1764         if (strbuf_read(&buf, 0, 0) < 0)
1765                 return error("error while reading from stdin %s",
1766                                      strerror(errno));
1768         s->should_munmap = 0;
1769         s->data = strbuf_detach(&buf, &size);
1770         s->size = size;
1771         s->should_free = 1;
1772         return 0;
1775 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
1777         int len;
1778         char *data = xmalloc(100);
1779         len = snprintf(data, 100,
1780                 "Subproject commit %s\n", sha1_to_hex(s->sha1));
1781         s->data = data;
1782         s->size = len;
1783         s->should_free = 1;
1784         if (size_only) {
1785                 s->data = NULL;
1786                 free(data);
1787         }
1788         return 0;
1791 /*
1792  * While doing rename detection and pickaxe operation, we may need to
1793  * grab the data for the blob (or file) for our own in-core comparison.
1794  * diff_filespec has data and size fields for this purpose.
1795  */
1796 int diff_populate_filespec(struct diff_filespec *s, int size_only)
1798         int err = 0;
1799         if (!DIFF_FILE_VALID(s))
1800                 die("internal error: asking to populate invalid file.");
1801         if (S_ISDIR(s->mode))
1802                 return -1;
1804         if (s->data)
1805                 return 0;
1807         if (size_only && 0 < s->size)
1808                 return 0;
1810         if (S_ISGITLINK(s->mode))
1811                 return diff_populate_gitlink(s, size_only);
1813         if (!s->sha1_valid ||
1814             reuse_worktree_file(s->path, s->sha1, 0)) {
1815                 struct strbuf buf;
1816                 struct stat st;
1817                 int fd;
1819                 if (!strcmp(s->path, "-"))
1820                         return populate_from_stdin(s);
1822                 if (lstat(s->path, &st) < 0) {
1823                         if (errno == ENOENT) {
1824                         err_empty:
1825                                 err = -1;
1826                         empty:
1827                                 s->data = (char *)"";
1828                                 s->size = 0;
1829                                 return err;
1830                         }
1831                 }
1832                 s->size = xsize_t(st.st_size);
1833                 if (!s->size)
1834                         goto empty;
1835                 if (size_only)
1836                         return 0;
1837                 if (S_ISLNK(st.st_mode)) {
1838                         int ret;
1839                         s->data = xmalloc(s->size);
1840                         s->should_free = 1;
1841                         ret = readlink(s->path, s->data, s->size);
1842                         if (ret < 0) {
1843                                 free(s->data);
1844                                 goto err_empty;
1845                         }
1846                         return 0;
1847                 }
1848                 fd = open(s->path, O_RDONLY);
1849                 if (fd < 0)
1850                         goto err_empty;
1851                 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
1852                 close(fd);
1853                 s->should_munmap = 1;
1855                 /*
1856                  * Convert from working tree format to canonical git format
1857                  */
1858                 strbuf_init(&buf, 0);
1859                 if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
1860                         size_t size = 0;
1861                         munmap(s->data, s->size);
1862                         s->should_munmap = 0;
1863                         s->data = strbuf_detach(&buf, &size);
1864                         s->size = size;
1865                         s->should_free = 1;
1866                 }
1867         }
1868         else {
1869                 enum object_type type;
1870                 if (size_only)
1871                         type = sha1_object_info(s->sha1, &s->size);
1872                 else {
1873                         s->data = read_sha1_file(s->sha1, &type, &s->size);
1874                         s->should_free = 1;
1875                 }
1876         }
1877         return 0;
1880 void diff_free_filespec_blob(struct diff_filespec *s)
1882         if (s->should_free)
1883                 free(s->data);
1884         else if (s->should_munmap)
1885                 munmap(s->data, s->size);
1887         if (s->should_free || s->should_munmap) {
1888                 s->should_free = s->should_munmap = 0;
1889                 s->data = NULL;
1890         }
1893 void diff_free_filespec_data(struct diff_filespec *s)
1895         diff_free_filespec_blob(s);
1896         free(s->cnt_data);
1897         s->cnt_data = NULL;
1900 static void prep_temp_blob(struct diff_tempfile *temp,
1901                            void *blob,
1902                            unsigned long size,
1903                            const unsigned char *sha1,
1904                            int mode)
1906         int fd;
1908         fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
1909         if (fd < 0)
1910                 die("unable to create temp-file: %s", strerror(errno));
1911         if (write_in_full(fd, blob, size) != size)
1912                 die("unable to write temp-file");
1913         close(fd);
1914         temp->name = temp->tmp_path;
1915         strcpy(temp->hex, sha1_to_hex(sha1));
1916         temp->hex[40] = 0;
1917         sprintf(temp->mode, "%06o", mode);
1920 static void prepare_temp_file(const char *name,
1921                               struct diff_tempfile *temp,
1922                               struct diff_filespec *one)
1924         if (!DIFF_FILE_VALID(one)) {
1925         not_a_valid_file:
1926                 /* A '-' entry produces this for file-2, and
1927                  * a '+' entry produces this for file-1.
1928                  */
1929                 temp->name = "/dev/null";
1930                 strcpy(temp->hex, ".");
1931                 strcpy(temp->mode, ".");
1932                 return;
1933         }
1935         if (!one->sha1_valid ||
1936             reuse_worktree_file(name, one->sha1, 1)) {
1937                 struct stat st;
1938                 if (lstat(name, &st) < 0) {
1939                         if (errno == ENOENT)
1940                                 goto not_a_valid_file;
1941                         die("stat(%s): %s", name, strerror(errno));
1942                 }
1943                 if (S_ISLNK(st.st_mode)) {
1944                         int ret;
1945                         char buf[PATH_MAX + 1]; /* ought to be SYMLINK_MAX */
1946                         size_t sz = xsize_t(st.st_size);
1947                         if (sizeof(buf) <= st.st_size)
1948                                 die("symlink too long: %s", name);
1949                         ret = readlink(name, buf, sz);
1950                         if (ret < 0)
1951                                 die("readlink(%s)", name);
1952                         prep_temp_blob(temp, buf, sz,
1953                                        (one->sha1_valid ?
1954                                         one->sha1 : null_sha1),
1955                                        (one->sha1_valid ?
1956                                         one->mode : S_IFLNK));
1957                 }
1958                 else {
1959                         /* we can borrow from the file in the work tree */
1960                         temp->name = name;
1961                         if (!one->sha1_valid)
1962                                 strcpy(temp->hex, sha1_to_hex(null_sha1));
1963                         else
1964                                 strcpy(temp->hex, sha1_to_hex(one->sha1));
1965                         /* Even though we may sometimes borrow the
1966                          * contents from the work tree, we always want
1967                          * one->mode.  mode is trustworthy even when
1968                          * !(one->sha1_valid), as long as
1969                          * DIFF_FILE_VALID(one).
1970                          */
1971                         sprintf(temp->mode, "%06o", one->mode);
1972                 }
1973                 return;
1974         }
1975         else {
1976                 if (diff_populate_filespec(one, 0))
1977                         die("cannot read data blob for %s", one->path);
1978                 prep_temp_blob(temp, one->data, one->size,
1979                                one->sha1, one->mode);
1980         }
1983 static void remove_tempfile(void)
1985         int i;
1987         for (i = 0; i < 2; i++)
1988                 if (diff_temp[i].name == diff_temp[i].tmp_path) {
1989                         unlink(diff_temp[i].name);
1990                         diff_temp[i].name = NULL;
1991                 }
1994 static void remove_tempfile_on_signal(int signo)
1996         remove_tempfile();
1997         signal(SIGINT, SIG_DFL);
1998         raise(signo);
2001 /* An external diff command takes:
2002  *
2003  * diff-cmd name infile1 infile1-sha1 infile1-mode \
2004  *               infile2 infile2-sha1 infile2-mode [ rename-to ]
2005  *
2006  */
2007 static void run_external_diff(const char *pgm,
2008                               const char *name,
2009                               const char *other,
2010                               struct diff_filespec *one,
2011                               struct diff_filespec *two,
2012                               const char *xfrm_msg,
2013                               int complete_rewrite)
2015         const char *spawn_arg[10];
2016         struct diff_tempfile *temp = diff_temp;
2017         int retval;
2018         static int atexit_asked = 0;
2019         const char *othername;
2020         const char **arg = &spawn_arg[0];
2022         othername = (other? other : name);
2023         if (one && two) {
2024                 prepare_temp_file(name, &temp[0], one);
2025                 prepare_temp_file(othername, &temp[1], two);
2026                 if (! atexit_asked &&
2027                     (temp[0].name == temp[0].tmp_path ||
2028                      temp[1].name == temp[1].tmp_path)) {
2029                         atexit_asked = 1;
2030                         atexit(remove_tempfile);
2031                 }
2032                 signal(SIGINT, remove_tempfile_on_signal);
2033         }
2035         if (one && two) {
2036                 *arg++ = pgm;
2037                 *arg++ = name;
2038                 *arg++ = temp[0].name;
2039                 *arg++ = temp[0].hex;
2040                 *arg++ = temp[0].mode;
2041                 *arg++ = temp[1].name;
2042                 *arg++ = temp[1].hex;
2043                 *arg++ = temp[1].mode;
2044                 if (other) {
2045                         *arg++ = other;
2046                         *arg++ = xfrm_msg;
2047                 }
2048         } else {
2049                 *arg++ = pgm;
2050                 *arg++ = name;
2051         }
2052         *arg = NULL;
2053         fflush(NULL);
2054         retval = run_command_v_opt(spawn_arg, 0);
2055         remove_tempfile();
2056         if (retval) {
2057                 fprintf(stderr, "external diff died, stopping at %s.\n", name);
2058                 exit(1);
2059         }
2062 static const char *external_diff_attr(const char *name)
2064         struct git_attr_check attr_diff_check;
2066         if (!name)
2067                 return NULL;
2069         setup_diff_attr_check(&attr_diff_check);
2070         if (!git_checkattr(name, 1, &attr_diff_check)) {
2071                 const char *value = attr_diff_check.value;
2072                 if (!ATTR_TRUE(value) &&
2073                     !ATTR_FALSE(value) &&
2074                     !ATTR_UNSET(value)) {
2075                         struct ll_diff_driver *drv;
2077                         for (drv = user_diff; drv; drv = drv->next)
2078                                 if (!strcmp(drv->name, value))
2079                                         return drv->cmd;
2080                 }
2081         }
2082         return NULL;
2085 static int similarity_index(struct diff_filepair *p)
2087         return p->score * 100 / MAX_SCORE;
2090 static void fill_metainfo(struct strbuf *msg,
2091                           const char *name,
2092                           const char *other,
2093                           struct diff_filespec *one,
2094                           struct diff_filespec *two,
2095                           struct diff_options *o,
2096                           struct diff_filepair *p)
2098         strbuf_init(msg, PATH_MAX * 2 + 300);
2099         switch (p->status) {
2100         case DIFF_STATUS_COPIED:
2101                 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2102                 strbuf_addstr(msg, "\ncopy from ");
2103                 quote_c_style(name, msg, NULL, 0);
2104                 strbuf_addstr(msg, "\ncopy to ");
2105                 quote_c_style(other, msg, NULL, 0);
2106                 strbuf_addch(msg, '\n');
2107                 break;
2108         case DIFF_STATUS_RENAMED:
2109                 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2110                 strbuf_addstr(msg, "\nrename from ");
2111                 quote_c_style(name, msg, NULL, 0);
2112                 strbuf_addstr(msg, "\nrename to ");
2113                 quote_c_style(other, msg, NULL, 0);
2114                 strbuf_addch(msg, '\n');
2115                 break;
2116         case DIFF_STATUS_MODIFIED:
2117                 if (p->score) {
2118                         strbuf_addf(msg, "dissimilarity index %d%%\n",
2119                                     similarity_index(p));
2120                         break;
2121                 }
2122                 /* fallthru */
2123         default:
2124                 /* nothing */
2125                 ;
2126         }
2127         if (one && two && hashcmp(one->sha1, two->sha1)) {
2128                 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
2130                 if (DIFF_OPT_TST(o, BINARY)) {
2131                         mmfile_t mf;
2132                         if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2133                             (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2134                                 abbrev = 40;
2135                 }
2136                 strbuf_addf(msg, "index %.*s..%.*s",
2137                             abbrev, sha1_to_hex(one->sha1),
2138                             abbrev, sha1_to_hex(two->sha1));
2139                 if (one->mode == two->mode)
2140                         strbuf_addf(msg, " %06o", one->mode);
2141                 strbuf_addch(msg, '\n');
2142         }
2143         if (msg->len)
2144                 strbuf_setlen(msg, msg->len - 1);
2147 static void run_diff_cmd(const char *pgm,
2148                          const char *name,
2149                          const char *other,
2150                          const char *attr_path,
2151                          struct diff_filespec *one,
2152                          struct diff_filespec *two,
2153                          struct strbuf *msg,
2154                          struct diff_options *o,
2155                          struct diff_filepair *p)
2157         const char *xfrm_msg = NULL;
2158         int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
2160         if (msg) {
2161                 fill_metainfo(msg, name, other, one, two, o, p);
2162                 xfrm_msg = msg->len ? msg->buf : NULL;
2163         }
2165         if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
2166                 pgm = NULL;
2167         else {
2168                 const char *cmd = external_diff_attr(attr_path);
2169                 if (cmd)
2170                         pgm = cmd;
2171         }
2173         if (pgm) {
2174                 run_external_diff(pgm, name, other, one, two, xfrm_msg,
2175                                   complete_rewrite);
2176                 return;
2177         }
2178         if (one && two)
2179                 builtin_diff(name, other ? other : name,
2180                              one, two, xfrm_msg, o, complete_rewrite);
2181         else
2182                 fprintf(o->file, "* Unmerged path %s\n", name);
2185 static void diff_fill_sha1_info(struct diff_filespec *one)
2187         if (DIFF_FILE_VALID(one)) {
2188                 if (!one->sha1_valid) {
2189                         struct stat st;
2190                         if (!strcmp(one->path, "-")) {
2191                                 hashcpy(one->sha1, null_sha1);
2192                                 return;
2193                         }
2194                         if (lstat(one->path, &st) < 0)
2195                                 die("stat %s", one->path);
2196                         if (index_path(one->sha1, one->path, &st, 0))
2197                                 die("cannot hash %s\n", one->path);
2198                 }
2199         }
2200         else
2201                 hashclr(one->sha1);
2204 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
2206         /* Strip the prefix but do not molest /dev/null and absolute paths */
2207         if (*namep && **namep != '/')
2208                 *namep += prefix_length;
2209         if (*otherp && **otherp != '/')
2210                 *otherp += prefix_length;
2213 static void run_diff(struct diff_filepair *p, struct diff_options *o)
2215         const char *pgm = external_diff();
2216         struct strbuf msg;
2217         struct diff_filespec *one = p->one;
2218         struct diff_filespec *two = p->two;
2219         const char *name;
2220         const char *other;
2221         const char *attr_path;
2223         name  = p->one->path;
2224         other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2225         attr_path = name;
2226         if (o->prefix_length)
2227                 strip_prefix(o->prefix_length, &name, &other);
2229         if (DIFF_PAIR_UNMERGED(p)) {
2230                 run_diff_cmd(pgm, name, NULL, attr_path,
2231                              NULL, NULL, NULL, o, p);
2232                 return;
2233         }
2235         diff_fill_sha1_info(one);
2236         diff_fill_sha1_info(two);
2238         if (!pgm &&
2239             DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
2240             (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
2241                 /*
2242                  * a filepair that changes between file and symlink
2243                  * needs to be split into deletion and creation.
2244                  */
2245                 struct diff_filespec *null = alloc_filespec(two->path);
2246                 run_diff_cmd(NULL, name, other, attr_path,
2247                              one, null, &msg, o, p);
2248                 free(null);
2249                 strbuf_release(&msg);
2251                 null = alloc_filespec(one->path);
2252                 run_diff_cmd(NULL, name, other, attr_path,
2253                              null, two, &msg, o, p);
2254                 free(null);
2255         }
2256         else
2257                 run_diff_cmd(pgm, name, other, attr_path,
2258                              one, two, &msg, o, p);
2260         strbuf_release(&msg);
2263 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
2264                          struct diffstat_t *diffstat)
2266         const char *name;
2267         const char *other;
2268         int complete_rewrite = 0;
2270         if (DIFF_PAIR_UNMERGED(p)) {
2271                 /* unmerged */
2272                 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
2273                 return;
2274         }
2276         name = p->one->path;
2277         other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2279         if (o->prefix_length)
2280                 strip_prefix(o->prefix_length, &name, &other);
2282         diff_fill_sha1_info(p->one);
2283         diff_fill_sha1_info(p->two);
2285         if (p->status == DIFF_STATUS_MODIFIED && p->score)
2286                 complete_rewrite = 1;
2287         builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
2290 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
2292         const char *name;
2293         const char *other;
2294         const char *attr_path;
2296         if (DIFF_PAIR_UNMERGED(p)) {
2297                 /* unmerged */
2298                 return;
2299         }
2301         name = p->one->path;
2302         other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2303         attr_path = other ? other : name;
2305         if (o->prefix_length)
2306                 strip_prefix(o->prefix_length, &name, &other);
2308         diff_fill_sha1_info(p->one);
2309         diff_fill_sha1_info(p->two);
2311         builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
2314 void diff_setup(struct diff_options *options)
2316         memset(options, 0, sizeof(*options));
2318         options->file = stdout;
2320         options->line_termination = '\n';
2321         options->break_opt = -1;
2322         options->rename_limit = -1;
2323         options->dirstat_percent = 3;
2324         DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
2325         options->context = 3;
2327         options->change = diff_change;
2328         options->add_remove = diff_addremove;
2329         if (diff_use_color_default > 0)
2330                 DIFF_OPT_SET(options, COLOR_DIFF);
2331         else
2332                 DIFF_OPT_CLR(options, COLOR_DIFF);
2333         options->detect_rename = diff_detect_rename_default;
2335         options->a_prefix = "a/";
2336         options->b_prefix = "b/";
2339 int diff_setup_done(struct diff_options *options)
2341         int count = 0;
2343         if (options->output_format & DIFF_FORMAT_NAME)
2344                 count++;
2345         if (options->output_format & DIFF_FORMAT_NAME_STATUS)
2346                 count++;
2347         if (options->output_format & DIFF_FORMAT_CHECKDIFF)
2348                 count++;
2349         if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
2350                 count++;
2351         if (count > 1)
2352                 die("--name-only, --name-status, --check and -s are mutually exclusive");
2354         if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
2355                 options->detect_rename = DIFF_DETECT_COPY;
2357         if (!DIFF_OPT_TST(options, RELATIVE_NAME))
2358                 options->prefix = NULL;
2359         if (options->prefix)
2360                 options->prefix_length = strlen(options->prefix);
2361         else
2362                 options->prefix_length = 0;
2364         if (options->output_format & (DIFF_FORMAT_NAME |
2365                                       DIFF_FORMAT_NAME_STATUS |
2366                                       DIFF_FORMAT_CHECKDIFF |
2367                                       DIFF_FORMAT_NO_OUTPUT))
2368                 options->output_format &= ~(DIFF_FORMAT_RAW |
2369                                             DIFF_FORMAT_NUMSTAT |
2370                                             DIFF_FORMAT_DIFFSTAT |
2371                                             DIFF_FORMAT_SHORTSTAT |
2372                                             DIFF_FORMAT_DIRSTAT |
2373                                             DIFF_FORMAT_SUMMARY |
2374                                             DIFF_FORMAT_PATCH);
2376         /*
2377          * These cases always need recursive; we do not drop caller-supplied
2378          * recursive bits for other formats here.
2379          */
2380         if (options->output_format & (DIFF_FORMAT_PATCH |
2381                                       DIFF_FORMAT_NUMSTAT |
2382                                       DIFF_FORMAT_DIFFSTAT |
2383                                       DIFF_FORMAT_SHORTSTAT |
2384                                       DIFF_FORMAT_DIRSTAT |
2385                                       DIFF_FORMAT_SUMMARY |
2386                                       DIFF_FORMAT_CHECKDIFF))
2387                 DIFF_OPT_SET(options, RECURSIVE);
2388         /*
2389          * Also pickaxe would not work very well if you do not say recursive
2390          */
2391         if (options->pickaxe)
2392                 DIFF_OPT_SET(options, RECURSIVE);
2394         if (options->detect_rename && options->rename_limit < 0)
2395                 options->rename_limit = diff_rename_limit_default;
2396         if (options->setup & DIFF_SETUP_USE_CACHE) {
2397                 if (!active_cache)
2398                         /* read-cache does not die even when it fails
2399                          * so it is safe for us to do this here.  Also
2400                          * it does not smudge active_cache or active_nr
2401                          * when it fails, so we do not have to worry about
2402                          * cleaning it up ourselves either.
2403                          */
2404                         read_cache();
2405         }
2406         if (options->abbrev <= 0 || 40 < options->abbrev)
2407                 options->abbrev = 40; /* full */
2409         /*
2410          * It does not make sense to show the first hit we happened
2411          * to have found.  It does not make sense not to return with
2412          * exit code in such a case either.
2413          */
2414         if (DIFF_OPT_TST(options, QUIET)) {
2415                 options->output_format = DIFF_FORMAT_NO_OUTPUT;
2416                 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2417         }
2419         return 0;
2422 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
2424         char c, *eq;
2425         int len;
2427         if (*arg != '-')
2428                 return 0;
2429         c = *++arg;
2430         if (!c)
2431                 return 0;
2432         if (c == arg_short) {
2433                 c = *++arg;
2434                 if (!c)
2435                         return 1;
2436                 if (val && isdigit(c)) {
2437                         char *end;
2438                         int n = strtoul(arg, &end, 10);
2439                         if (*end)
2440                                 return 0;
2441                         *val = n;
2442                         return 1;
2443                 }
2444                 return 0;
2445         }
2446         if (c != '-')
2447                 return 0;
2448         arg++;
2449         eq = strchr(arg, '=');
2450         if (eq)
2451                 len = eq - arg;
2452         else
2453                 len = strlen(arg);
2454         if (!len || strncmp(arg, arg_long, len))
2455                 return 0;
2456         if (eq) {
2457                 int n;
2458                 char *end;
2459                 if (!isdigit(*++eq))
2460                         return 0;
2461                 n = strtoul(eq, &end, 10);
2462                 if (*end)
2463                         return 0;
2464                 *val = n;
2465         }
2466         return 1;
2469 static int diff_scoreopt_parse(const char *opt);
2471 int diff_opt_parse(struct diff_options *options, const char **av, int ac)
2473         const char *arg = av[0];
2475         /* Output format options */
2476         if (!strcmp(arg, "-p") || !strcmp(arg, "-u"))
2477                 options->output_format |= DIFF_FORMAT_PATCH;
2478         else if (opt_arg(arg, 'U', "unified", &options->context))
2479                 options->output_format |= DIFF_FORMAT_PATCH;
2480         else if (!strcmp(arg, "--raw"))
2481                 options->output_format |= DIFF_FORMAT_RAW;
2482         else if (!strcmp(arg, "--patch-with-raw"))
2483                 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
2484         else if (!strcmp(arg, "--numstat"))
2485                 options->output_format |= DIFF_FORMAT_NUMSTAT;
2486         else if (!strcmp(arg, "--shortstat"))
2487                 options->output_format |= DIFF_FORMAT_SHORTSTAT;
2488         else if (opt_arg(arg, 'X', "dirstat", &options->dirstat_percent))
2489                 options->output_format |= DIFF_FORMAT_DIRSTAT;
2490         else if (!strcmp(arg, "--cumulative")) {
2491                 options->output_format |= DIFF_FORMAT_DIRSTAT;
2492                 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
2493         }
2494         else if (!strcmp(arg, "--check"))
2495                 options->output_format |= DIFF_FORMAT_CHECKDIFF;
2496         else if (!strcmp(arg, "--summary"))
2497                 options->output_format |= DIFF_FORMAT_SUMMARY;
2498         else if (!strcmp(arg, "--patch-with-stat"))
2499                 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
2500         else if (!strcmp(arg, "--name-only"))
2501                 options->output_format |= DIFF_FORMAT_NAME;
2502         else if (!strcmp(arg, "--name-status"))
2503                 options->output_format |= DIFF_FORMAT_NAME_STATUS;
2504         else if (!strcmp(arg, "-s"))
2505                 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
2506         else if (!prefixcmp(arg, "--stat")) {
2507                 char *end;
2508                 int width = options->stat_width;
2509                 int name_width = options->stat_name_width;
2510                 arg += 6;
2511                 end = (char *)arg;
2513                 switch (*arg) {
2514                 case '-':
2515                         if (!prefixcmp(arg, "-width="))
2516                                 width = strtoul(arg + 7, &end, 10);
2517                         else if (!prefixcmp(arg, "-name-width="))
2518                                 name_width = strtoul(arg + 12, &end, 10);
2519                         break;
2520                 case '=':
2521                         width = strtoul(arg+1, &end, 10);
2522                         if (*end == ',')
2523                                 name_width = strtoul(end+1, &end, 10);
2524                 }
2526                 /* Important! This checks all the error cases! */
2527                 if (*end)
2528                         return 0;
2529                 options->output_format |= DIFF_FORMAT_DIFFSTAT;
2530                 options->stat_name_width = name_width;
2531                 options->stat_width = width;
2532         }
2534         /* renames options */
2535         else if (!prefixcmp(arg, "-B")) {
2536                 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
2537                         return -1;
2538         }
2539         else if (!prefixcmp(arg, "-M")) {
2540                 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2541                         return -1;
2542                 options->detect_rename = DIFF_DETECT_RENAME;
2543         }
2544         else if (!prefixcmp(arg, "-C")) {
2545                 if (options->detect_rename == DIFF_DETECT_COPY)
2546                         DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2547                 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2548                         return -1;
2549                 options->detect_rename = DIFF_DETECT_COPY;
2550         }
2551         else if (!strcmp(arg, "--no-renames"))
2552                 options->detect_rename = 0;
2553         else if (!strcmp(arg, "--relative"))
2554                 DIFF_OPT_SET(options, RELATIVE_NAME);
2555         else if (!prefixcmp(arg, "--relative=")) {
2556                 DIFF_OPT_SET(options, RELATIVE_NAME);
2557                 options->prefix = arg + 11;
2558         }
2560         /* xdiff options */
2561         else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
2562                 options->xdl_opts |= XDF_IGNORE_WHITESPACE;
2563         else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
2564                 options->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2565         else if (!strcmp(arg, "--ignore-space-at-eol"))
2566                 options->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2568         /* flags options */
2569         else if (!strcmp(arg, "--binary")) {
2570                 options->output_format |= DIFF_FORMAT_PATCH;
2571                 DIFF_OPT_SET(options, BINARY);
2572         }
2573         else if (!strcmp(arg, "--full-index"))
2574                 DIFF_OPT_SET(options, FULL_INDEX);
2575         else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
2576                 DIFF_OPT_SET(options, TEXT);
2577         else if (!strcmp(arg, "-R"))
2578                 DIFF_OPT_SET(options, REVERSE_DIFF);
2579         else if (!strcmp(arg, "--find-copies-harder"))
2580                 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2581         else if (!strcmp(arg, "--follow"))
2582                 DIFF_OPT_SET(options, FOLLOW_RENAMES);
2583         else if (!strcmp(arg, "--color"))
2584                 DIFF_OPT_SET(options, COLOR_DIFF);
2585         else if (!strcmp(arg, "--no-color"))
2586                 DIFF_OPT_CLR(options, COLOR_DIFF);
2587         else if (!strcmp(arg, "--color-words"))
2588                 options->flags |= DIFF_OPT_COLOR_DIFF | DIFF_OPT_COLOR_DIFF_WORDS;
2589         else if (!strcmp(arg, "--exit-code"))
2590                 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2591         else if (!strcmp(arg, "--quiet"))
2592                 DIFF_OPT_SET(options, QUIET);
2593         else if (!strcmp(arg, "--ext-diff"))
2594                 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
2595         else if (!strcmp(arg, "--no-ext-diff"))
2596                 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
2597         else if (!strcmp(arg, "--ignore-submodules"))
2598                 DIFF_OPT_SET(options, IGNORE_SUBMODULES);
2600         /* misc options */
2601         else if (!strcmp(arg, "-z"))
2602                 options->line_termination = 0;
2603         else if (!prefixcmp(arg, "-l"))
2604                 options->rename_limit = strtoul(arg+2, NULL, 10);
2605         else if (!prefixcmp(arg, "-S"))
2606                 options->pickaxe = arg + 2;
2607         else if (!strcmp(arg, "--pickaxe-all"))
2608                 options->pickaxe_opts = DIFF_PICKAXE_ALL;
2609         else if (!strcmp(arg, "--pickaxe-regex"))
2610                 options->pickaxe_opts = DIFF_PICKAXE_REGEX;
2611         else if (!prefixcmp(arg, "-O"))
2612                 options->orderfile = arg + 2;
2613         else if (!prefixcmp(arg, "--diff-filter="))
2614                 options->filter = arg + 14;
2615         else if (!strcmp(arg, "--abbrev"))
2616                 options->abbrev = DEFAULT_ABBREV;
2617         else if (!prefixcmp(arg, "--abbrev=")) {
2618                 options->abbrev = strtoul(arg + 9, NULL, 10);
2619                 if (options->abbrev < MINIMUM_ABBREV)
2620                         options->abbrev = MINIMUM_ABBREV;
2621                 else if (40 < options->abbrev)
2622                         options->abbrev = 40;
2623         }
2624         else if (!prefixcmp(arg, "--src-prefix="))
2625                 options->a_prefix = arg + 13;
2626         else if (!prefixcmp(arg, "--dst-prefix="))
2627                 options->b_prefix = arg + 13;
2628         else if (!strcmp(arg, "--no-prefix"))
2629                 options->a_prefix = options->b_prefix = "";
2630         else if (!prefixcmp(arg, "--output=")) {
2631                 options->file = fopen(arg + strlen("--output="), "w");
2632                 options->close_file = 1;
2633         } else
2634                 return 0;
2635         return 1;
2638 static int parse_num(const char **cp_p)
2640         unsigned long num, scale;
2641         int ch, dot;
2642         const char *cp = *cp_p;
2644         num = 0;
2645         scale = 1;
2646         dot = 0;
2647         for(;;) {
2648                 ch = *cp;
2649                 if ( !dot && ch == '.' ) {
2650                         scale = 1;
2651                         dot = 1;
2652                 } else if ( ch == '%' ) {
2653                         scale = dot ? scale*100 : 100;
2654                         cp++;   /* % is always at the end */
2655                         break;
2656                 } else if ( ch >= '0' && ch <= '9' ) {
2657                         if ( scale < 100000 ) {
2658                                 scale *= 10;
2659                                 num = (num*10) + (ch-'0');
2660                         }
2661                 } else {
2662                         break;
2663                 }
2664                 cp++;
2665         }
2666         *cp_p = cp;
2668         /* user says num divided by scale and we say internally that
2669          * is MAX_SCORE * num / scale.
2670          */
2671         return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
2674 static int diff_scoreopt_parse(const char *opt)
2676         int opt1, opt2, cmd;
2678         if (*opt++ != '-')
2679                 return -1;
2680         cmd = *opt++;
2681         if (cmd != 'M' && cmd != 'C' && cmd != 'B')
2682                 return -1; /* that is not a -M, -C nor -B option */
2684         opt1 = parse_num(&opt);
2685         if (cmd != 'B')
2686                 opt2 = 0;
2687         else {
2688                 if (*opt == 0)
2689                         opt2 = 0;
2690                 else if (*opt != '/')
2691                         return -1; /* we expect -B80/99 or -B80 */
2692                 else {
2693                         opt++;
2694                         opt2 = parse_num(&opt);
2695                 }
2696         }
2697         if (*opt != 0)
2698                 return -1;
2699         return opt1 | (opt2 << 16);
2702 struct diff_queue_struct diff_queued_diff;
2704 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
2706         if (queue->alloc <= queue->nr) {
2707                 queue->alloc = alloc_nr(queue->alloc);
2708                 queue->queue = xrealloc(queue->queue,
2709                                         sizeof(dp) * queue->alloc);
2710         }
2711         queue->queue[queue->nr++] = dp;
2714 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
2715                                  struct diff_filespec *one,
2716                                  struct diff_filespec *two)
2718         struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
2719         dp->one = one;
2720         dp->two = two;
2721         if (queue)
2722                 diff_q(queue, dp);
2723         return dp;
2726 void diff_free_filepair(struct diff_filepair *p)
2728         free_filespec(p->one);
2729         free_filespec(p->two);
2730         free(p);
2733 /* This is different from find_unique_abbrev() in that
2734  * it stuffs the result with dots for alignment.
2735  */
2736 const char *diff_unique_abbrev(const unsigned char *sha1, int len)
2738         int abblen;
2739         const char *abbrev;
2740         if (len == 40)
2741                 return sha1_to_hex(sha1);
2743         abbrev = find_unique_abbrev(sha1, len);
2744         abblen = strlen(abbrev);
2745         if (abblen < 37) {
2746                 static char hex[41];
2747                 if (len < abblen && abblen <= len + 2)
2748                         sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
2749                 else
2750                         sprintf(hex, "%s...", abbrev);
2751                 return hex;
2752         }
2753         return sha1_to_hex(sha1);
2756 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
2758         int line_termination = opt->line_termination;
2759         int inter_name_termination = line_termination ? '\t' : '\0';
2761         if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
2762                 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
2763                         diff_unique_abbrev(p->one->sha1, opt->abbrev));
2764                 fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
2765         }
2766         if (p->score) {
2767                 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
2768                         inter_name_termination);
2769         } else {
2770                 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
2771         }
2773         if (p->status == DIFF_STATUS_COPIED ||
2774             p->status == DIFF_STATUS_RENAMED) {
2775                 const char *name_a, *name_b;
2776                 name_a = p->one->path;
2777                 name_b = p->two->path;
2778                 strip_prefix(opt->prefix_length, &name_a, &name_b);
2779                 write_name_quoted(name_a, opt->file, inter_name_termination);
2780                 write_name_quoted(name_b, opt->file, line_termination);
2781         } else {
2782                 const char *name_a, *name_b;
2783                 name_a = p->one->mode ? p->one->path : p->two->path;
2784                 name_b = NULL;
2785                 strip_prefix(opt->prefix_length, &name_a, &name_b);
2786                 write_name_quoted(name_a, opt->file, line_termination);
2787         }
2790 int diff_unmodified_pair(struct diff_filepair *p)
2792         /* This function is written stricter than necessary to support
2793          * the currently implemented transformers, but the idea is to
2794          * let transformers to produce diff_filepairs any way they want,
2795          * and filter and clean them up here before producing the output.
2796          */
2797         struct diff_filespec *one = p->one, *two = p->two;
2799         if (DIFF_PAIR_UNMERGED(p))
2800                 return 0; /* unmerged is interesting */
2802         /* deletion, addition, mode or type change
2803          * and rename are all interesting.
2804          */
2805         if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
2806             DIFF_PAIR_MODE_CHANGED(p) ||
2807             strcmp(one->path, two->path))
2808                 return 0;
2810         /* both are valid and point at the same path.  that is, we are
2811          * dealing with a change.
2812          */
2813         if (one->sha1_valid && two->sha1_valid &&
2814             !hashcmp(one->sha1, two->sha1))
2815                 return 1; /* no change */
2816         if (!one->sha1_valid && !two->sha1_valid)
2817                 return 1; /* both look at the same file on the filesystem. */
2818         return 0;
2821 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
2823         if (diff_unmodified_pair(p))
2824                 return;
2826         if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2827             (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2828                 return; /* no tree diffs in patch format */
2830         run_diff(p, o);
2833 static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
2834                             struct diffstat_t *diffstat)
2836         if (diff_unmodified_pair(p))
2837                 return;
2839         if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2840             (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2841                 return; /* no tree diffs in patch format */
2843         run_diffstat(p, o, diffstat);
2846 static void diff_flush_checkdiff(struct diff_filepair *p,
2847                 struct diff_options *o)
2849         if (diff_unmodified_pair(p))
2850                 return;
2852         if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2853             (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2854                 return; /* no tree diffs in patch format */
2856         run_checkdiff(p, o);
2859 int diff_queue_is_empty(void)
2861         struct diff_queue_struct *q = &diff_queued_diff;
2862         int i;
2863         for (i = 0; i < q->nr; i++)
2864                 if (!diff_unmodified_pair(q->queue[i]))
2865                         return 0;
2866         return 1;
2869 #if DIFF_DEBUG
2870 void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
2872         fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
2873                 x, one ? one : "",
2874                 s->path,
2875                 DIFF_FILE_VALID(s) ? "valid" : "invalid",
2876                 s->mode,
2877                 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
2878         fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
2879                 x, one ? one : "",
2880                 s->size, s->xfrm_flags);
2883 void diff_debug_filepair(const struct diff_filepair *p, int i)
2885         diff_debug_filespec(p->one, i, "one");
2886         diff_debug_filespec(p->two, i, "two");
2887         fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
2888                 p->score, p->status ? p->status : '?',
2889                 p->one->rename_used, p->broken_pair);
2892 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
2894         int i;
2895         if (msg)
2896                 fprintf(stderr, "%s\n", msg);
2897         fprintf(stderr, "q->nr = %d\n", q->nr);
2898         for (i = 0; i < q->nr; i++) {
2899                 struct diff_filepair *p = q->queue[i];
2900                 diff_debug_filepair(p, i);
2901         }
2903 #endif
2905 static void diff_resolve_rename_copy(void)
2907         int i;
2908         struct diff_filepair *p;
2909         struct diff_queue_struct *q = &diff_queued_diff;
2911         diff_debug_queue("resolve-rename-copy", q);
2913         for (i = 0; i < q->nr; i++) {
2914                 p = q->queue[i];
2915                 p->status = 0; /* undecided */
2916                 if (DIFF_PAIR_UNMERGED(p))
2917                         p->status = DIFF_STATUS_UNMERGED;
2918                 else if (!DIFF_FILE_VALID(p->one))
2919                         p->status = DIFF_STATUS_ADDED;
2920                 else if (!DIFF_FILE_VALID(p->two))
2921                         p->status = DIFF_STATUS_DELETED;
2922                 else if (DIFF_PAIR_TYPE_CHANGED(p))
2923                         p->status = DIFF_STATUS_TYPE_CHANGED;
2925                 /* from this point on, we are dealing with a pair
2926                  * whose both sides are valid and of the same type, i.e.
2927                  * either in-place edit or rename/copy edit.
2928                  */
2929                 else if (DIFF_PAIR_RENAME(p)) {
2930                         /*
2931                          * A rename might have re-connected a broken
2932                          * pair up, causing the pathnames to be the
2933                          * same again. If so, that's not a rename at
2934                          * all, just a modification..
2935                          *
2936                          * Otherwise, see if this source was used for
2937                          * multiple renames, in which case we decrement
2938                          * the count, and call it a copy.
2939                          */
2940                         if (!strcmp(p->one->path, p->two->path))
2941                                 p->status = DIFF_STATUS_MODIFIED;
2942                         else if (--p->one->rename_used > 0)
2943                                 p->status = DIFF_STATUS_COPIED;
2944                         else
2945                                 p->status = DIFF_STATUS_RENAMED;
2946                 }
2947                 else if (hashcmp(p->one->sha1, p->two->sha1) ||
2948                          p->one->mode != p->two->mode ||
2949                          is_null_sha1(p->one->sha1))
2950                         p->status = DIFF_STATUS_MODIFIED;
2951                 else {
2952                         /* This is a "no-change" entry and should not
2953                          * happen anymore, but prepare for broken callers.
2954                          */
2955                         error("feeding unmodified %s to diffcore",
2956                               p->one->path);
2957                         p->status = DIFF_STATUS_UNKNOWN;
2958                 }
2959         }
2960         diff_debug_queue("resolve-rename-copy done", q);
2963 static int check_pair_status(struct diff_filepair *p)
2965         switch (p->status) {
2966         case DIFF_STATUS_UNKNOWN:
2967                 return 0;
2968         case 0:
2969                 die("internal error in diff-resolve-rename-copy");
2970         default:
2971                 return 1;
2972         }
2975 static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
2977         int fmt = opt->output_format;
2979         if (fmt & DIFF_FORMAT_CHECKDIFF)
2980                 diff_flush_checkdiff(p, opt);
2981         else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
2982                 diff_flush_raw(p, opt);
2983         else if (fmt & DIFF_FORMAT_NAME) {
2984                 const char *name_a, *name_b;
2985                 name_a = p->two->path;
2986                 name_b = NULL;
2987                 strip_prefix(opt->prefix_length, &name_a, &name_b);
2988                 write_name_quoted(name_a, opt->file, opt->line_termination);
2989         }
2992 static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
2994         if (fs->mode)
2995                 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
2996         else
2997                 fprintf(file, " %s ", newdelete);
2998         write_name_quoted(fs->path, file, '\n');
3002 static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name)
3004         if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
3005                 fprintf(file, " mode change %06o => %06o%c", p->one->mode, p->two->mode,
3006                         show_name ? ' ' : '\n');
3007                 if (show_name) {
3008                         write_name_quoted(p->two->path, file, '\n');
3009                 }
3010         }
3013 static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p)
3015         char *names = pprint_rename(p->one->path, p->two->path);
3017         fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
3018         free(names);
3019         show_mode_change(file, p, 0);
3022 static void diff_summary(FILE *file, struct diff_filepair *p)
3024         switch(p->status) {
3025         case DIFF_STATUS_DELETED:
3026                 show_file_mode_name(file, "delete", p->one);
3027                 break;
3028         case DIFF_STATUS_ADDED:
3029                 show_file_mode_name(file, "create", p->two);
3030                 break;
3031         case DIFF_STATUS_COPIED:
3032                 show_rename_copy(file, "copy", p);
3033                 break;
3034         case DIFF_STATUS_RENAMED:
3035                 show_rename_copy(file, "rename", p);
3036                 break;
3037         default:
3038                 if (p->score) {
3039                         fputs(" rewrite ", file);
3040                         write_name_quoted(p->two->path, file, ' ');
3041                         fprintf(file, "(%d%%)\n", similarity_index(p));
3042                 }
3043                 show_mode_change(file, p, !p->score);
3044                 break;
3045         }
3048 struct patch_id_t {
3049         struct xdiff_emit_state xm;
3050         SHA_CTX *ctx;
3051         int patchlen;
3052 };
3054 static int remove_space(char *line, int len)
3056         int i;
3057         char *dst = line;
3058         unsigned char c;
3060         for (i = 0; i < len; i++)
3061                 if (!isspace((c = line[i])))
3062                         *dst++ = c;
3064         return dst - line;
3067 static void patch_id_consume(void *priv, char *line, unsigned long len)
3069         struct patch_id_t *data = priv;
3070         int new_len;
3072         /* Ignore line numbers when computing the SHA1 of the patch */
3073         if (!prefixcmp(line, "@@ -"))
3074                 return;
3076         new_len = remove_space(line, len);
3078         SHA1_Update(data->ctx, line, new_len);
3079         data->patchlen += new_len;
3082 /* returns 0 upon success, and writes result into sha1 */
3083 static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
3085         struct diff_queue_struct *q = &diff_queued_diff;
3086         int i;
3087         SHA_CTX ctx;
3088         struct patch_id_t data;
3089         char buffer[PATH_MAX * 4 + 20];
3091         SHA1_Init(&ctx);
3092         memset(&data, 0, sizeof(struct patch_id_t));
3093         data.ctx = &ctx;
3094         data.xm.consume = patch_id_consume;
3096         for (i = 0; i < q->nr; i++) {
3097                 xpparam_t xpp;
3098                 xdemitconf_t xecfg;
3099                 xdemitcb_t ecb;
3100                 mmfile_t mf1, mf2;
3101                 struct diff_filepair *p = q->queue[i];
3102                 int len1, len2;
3104                 memset(&xecfg, 0, sizeof(xecfg));
3105                 if (p->status == 0)
3106                         return error("internal diff status error");
3107                 if (p->status == DIFF_STATUS_UNKNOWN)
3108                         continue;
3109                 if (diff_unmodified_pair(p))
3110                         continue;
3111                 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3112                     (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3113                         continue;
3114                 if (DIFF_PAIR_UNMERGED(p))
3115                         continue;
3117                 diff_fill_sha1_info(p->one);
3118                 diff_fill_sha1_info(p->two);
3119                 if (fill_mmfile(&mf1, p->one) < 0 ||
3120                                 fill_mmfile(&mf2, p->two) < 0)
3121                         return error("unable to read files to diff");
3123                 len1 = remove_space(p->one->path, strlen(p->one->path));
3124                 len2 = remove_space(p->two->path, strlen(p->two->path));
3125                 if (p->one->mode == 0)
3126                         len1 = snprintf(buffer, sizeof(buffer),
3127                                         "diff--gita/%.*sb/%.*s"
3128                                         "newfilemode%06o"
3129                                         "---/dev/null"
3130                                         "+++b/%.*s",
3131                                         len1, p->one->path,
3132                                         len2, p->two->path,
3133                                         p->two->mode,
3134                                         len2, p->two->path);
3135                 else if (p->two->mode == 0)
3136                         len1 = snprintf(buffer, sizeof(buffer),
3137                                         "diff--gita/%.*sb/%.*s"
3138                                         "deletedfilemode%06o"
3139                                         "---a/%.*s"
3140                                         "+++/dev/null",
3141                                         len1, p->one->path,
3142                                         len2, p->two->path,
3143                                         p->one->mode,
3144                                         len1, p->one->path);
3145                 else
3146                         len1 = snprintf(buffer, sizeof(buffer),
3147                                         "diff--gita/%.*sb/%.*s"
3148                                         "---a/%.*s"
3149                                         "+++b/%.*s",
3150                                         len1, p->one->path,
3151                                         len2, p->two->path,
3152                                         len1, p->one->path,
3153                                         len2, p->two->path);
3154                 SHA1_Update(&ctx, buffer, len1);
3156                 xpp.flags = XDF_NEED_MINIMAL;
3157                 xecfg.ctxlen = 3;
3158                 xecfg.flags = XDL_EMIT_FUNCNAMES;
3159                 ecb.outf = xdiff_outf;
3160                 ecb.priv = &data;
3161                 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
3162         }
3164         SHA1_Final(sha1, &ctx);
3165         return 0;
3168 int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
3170         struct diff_queue_struct *q = &diff_queued_diff;
3171         int i;
3172         int result = diff_get_patch_id(options, sha1);
3174         for (i = 0; i < q->nr; i++)
3175                 diff_free_filepair(q->queue[i]);
3177         free(q->queue);
3178         q->queue = NULL;
3179         q->nr = q->alloc = 0;
3181         return result;
3184 static int is_summary_empty(const struct diff_queue_struct *q)
3186         int i;
3188         for (i = 0; i < q->nr; i++) {
3189                 const struct diff_filepair *p = q->queue[i];
3191                 switch (p->status) {
3192                 case DIFF_STATUS_DELETED:
3193                 case DIFF_STATUS_ADDED:
3194                 case DIFF_STATUS_COPIED:
3195                 case DIFF_STATUS_RENAMED:
3196                         return 0;
3197                 default:
3198                         if (p->score)
3199                                 return 0;
3200                         if (p->one->mode && p->two->mode &&
3201                             p->one->mode != p->two->mode)
3202                                 return 0;
3203                         break;
3204                 }
3205         }
3206         return 1;
3209 void diff_flush(struct diff_options *options)
3211         struct diff_queue_struct *q = &diff_queued_diff;
3212         int i, output_format = options->output_format;
3213         int separator = 0;
3215         /*
3216          * Order: raw, stat, summary, patch
3217          * or:    name/name-status/checkdiff (other bits clear)
3218          */
3219         if (!q->nr)
3220                 goto free_queue;
3222         if (output_format & (DIFF_FORMAT_RAW |
3223                              DIFF_FORMAT_NAME |
3224                              DIFF_FORMAT_NAME_STATUS |
3225                              DIFF_FORMAT_CHECKDIFF)) {
3226                 for (i = 0; i < q->nr; i++) {
3227                         struct diff_filepair *p = q->queue[i];
3228                         if (check_pair_status(p))
3229                                 flush_one_pair(p, options);
3230                 }
3231                 separator++;
3232         }
3234         if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) {
3235                 struct diffstat_t diffstat;
3237                 memset(&diffstat, 0, sizeof(struct diffstat_t));
3238                 diffstat.xm.consume = diffstat_consume;
3239                 for (i = 0; i < q->nr; i++) {
3240                         struct diff_filepair *p = q->queue[i];
3241                         if (check_pair_status(p))
3242                                 diff_flush_stat(p, options, &diffstat);
3243                 }
3244                 if (output_format & DIFF_FORMAT_NUMSTAT)
3245                         show_numstat(&diffstat, options);
3246                 if (output_format & DIFF_FORMAT_DIFFSTAT)
3247                         show_stats(&diffstat, options);
3248                 if (output_format & DIFF_FORMAT_SHORTSTAT)
3249                         show_shortstats(&diffstat, options);
3250                 free_diffstat_info(&diffstat);
3251                 separator++;
3252         }
3253         if (output_format & DIFF_FORMAT_DIRSTAT)
3254                 show_dirstat(options);
3256         if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
3257                 for (i = 0; i < q->nr; i++)
3258                         diff_summary(options->file, q->queue[i]);
3259                 separator++;
3260         }
3262         if (output_format & DIFF_FORMAT_PATCH) {
3263                 if (separator) {
3264                         putc(options->line_termination, options->file);
3265                         if (options->stat_sep) {
3266                                 /* attach patch instead of inline */
3267                                 fputs(options->stat_sep, options->file);
3268                         }
3269                 }
3271                 for (i = 0; i < q->nr; i++) {
3272                         struct diff_filepair *p = q->queue[i];
3273                         if (check_pair_status(p))
3274                                 diff_flush_patch(p, options);
3275                 }
3276         }
3278         if (output_format & DIFF_FORMAT_CALLBACK)
3279                 options->format_callback(q, options, options->format_callback_data);
3281         for (i = 0; i < q->nr; i++)
3282                 diff_free_filepair(q->queue[i]);
3283 free_queue:
3284         free(q->queue);
3285         q->queue = NULL;
3286         q->nr = q->alloc = 0;
3287         if (options->close_file)
3288                 fclose(options->file);
3291 static void diffcore_apply_filter(const char *filter)
3293         int i;
3294         struct diff_queue_struct *q = &diff_queued_diff;
3295         struct diff_queue_struct outq;
3296         outq.queue = NULL;
3297         outq.nr = outq.alloc = 0;
3299         if (!filter)
3300                 return;
3302         if (strchr(filter, DIFF_STATUS_FILTER_AON)) {
3303                 int found;
3304                 for (i = found = 0; !found && i < q->nr; i++) {
3305                         struct diff_filepair *p = q->queue[i];
3306                         if (((p->status == DIFF_STATUS_MODIFIED) &&
3307                              ((p->score &&
3308                                strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3309                               (!p->score &&
3310                                strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3311                             ((p->status != DIFF_STATUS_MODIFIED) &&
3312                              strchr(filter, p->status)))
3313                                 found++;
3314                 }
3315                 if (found)
3316                         return;
3318                 /* otherwise we will clear the whole queue
3319                  * by copying the empty outq at the end of this
3320                  * function, but first clear the current entries
3321                  * in the queue.
3322                  */
3323                 for (i = 0; i < q->nr; i++)
3324                         diff_free_filepair(q->queue[i]);
3325         }
3326         else {
3327                 /* Only the matching ones */
3328                 for (i = 0; i < q->nr; i++) {
3329                         struct diff_filepair *p = q->queue[i];
3331                         if (((p->status == DIFF_STATUS_MODIFIED) &&
3332                              ((p->score &&
3333                                strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3334                               (!p->score &&
3335                                strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3336                             ((p->status != DIFF_STATUS_MODIFIED) &&
3337                              strchr(filter, p->status)))
3338                                 diff_q(&outq, p);
3339                         else
3340                                 diff_free_filepair(p);
3341                 }
3342         }
3343         free(q->queue);
3344         *q = outq;
3347 /* Check whether two filespecs with the same mode and size are identical */
3348 static int diff_filespec_is_identical(struct diff_filespec *one,
3349                                       struct diff_filespec *two)
3351         if (S_ISGITLINK(one->mode))
3352                 return 0;
3353         if (diff_populate_filespec(one, 0))
3354                 return 0;
3355         if (diff_populate_filespec(two, 0))
3356                 return 0;
3357         return !memcmp(one->data, two->data, one->size);
3360 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3362         int i;
3363         struct diff_queue_struct *q = &diff_queued_diff;
3364         struct diff_queue_struct outq;
3365         outq.queue = NULL;
3366         outq.nr = outq.alloc = 0;
3368         for (i = 0; i < q->nr; i++) {
3369                 struct diff_filepair *p = q->queue[i];
3371                 /*
3372                  * 1. Entries that come from stat info dirtyness
3373                  *    always have both sides (iow, not create/delete),
3374                  *    one side of the object name is unknown, with
3375                  *    the same mode and size.  Keep the ones that
3376                  *    do not match these criteria.  They have real
3377                  *    differences.
3378                  *
3379                  * 2. At this point, the file is known to be modified,
3380                  *    with the same mode and size, and the object
3381                  *    name of one side is unknown.  Need to inspect
3382                  *    the identical contents.
3383                  */
3384                 if (!DIFF_FILE_VALID(p->one) || /* (1) */
3385                     !DIFF_FILE_VALID(p->two) ||
3386                     (p->one->sha1_valid && p->two->sha1_valid) ||
3387                     (p->one->mode != p->two->mode) ||
3388                     diff_populate_filespec(p->one, 1) ||
3389                     diff_populate_filespec(p->two, 1) ||
3390                     (p->one->size != p->two->size) ||
3391                     !diff_filespec_is_identical(p->one, p->two)) /* (2) */
3392                         diff_q(&outq, p);
3393                 else {
3394                         /*
3395                          * The caller can subtract 1 from skip_stat_unmatch
3396                          * to determine how many paths were dirty only
3397                          * due to stat info mismatch.
3398                          */
3399                         if (!DIFF_OPT_TST(diffopt, NO_INDEX))
3400                                 diffopt->skip_stat_unmatch++;
3401                         diff_free_filepair(p);
3402                 }
3403         }
3404         free(q->queue);
3405         *q = outq;
3408 void diffcore_std(struct diff_options *options)
3410         if (options->skip_stat_unmatch)
3411                 diffcore_skip_stat_unmatch(options);
3412         if (options->break_opt != -1)
3413                 diffcore_break(options->break_opt);
3414         if (options->detect_rename)
3415                 diffcore_rename(options);
3416         if (options->break_opt != -1)
3417                 diffcore_merge_broken();
3418         if (options->pickaxe)
3419                 diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
3420         if (options->orderfile)
3421                 diffcore_order(options->orderfile);
3422         diff_resolve_rename_copy();
3423         diffcore_apply_filter(options->filter);
3425         if (diff_queued_diff.nr)
3426                 DIFF_OPT_SET(options, HAS_CHANGES);
3427         else
3428                 DIFF_OPT_CLR(options, HAS_CHANGES);
3431 int diff_result_code(struct diff_options *opt, int status)
3433         int result = 0;
3434         if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3435             !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
3436                 return status;
3437         if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3438             DIFF_OPT_TST(opt, HAS_CHANGES))
3439                 result |= 01;
3440         if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
3441             DIFF_OPT_TST(opt, CHECK_FAILED))
3442                 result |= 02;
3443         return result;
3446 void diff_addremove(struct diff_options *options,
3447                     int addremove, unsigned mode,
3448                     const unsigned char *sha1,
3449                     const char *concatpath)
3451         struct diff_filespec *one, *two;
3453         if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(mode))
3454                 return;
3456         /* This may look odd, but it is a preparation for
3457          * feeding "there are unchanged files which should
3458          * not produce diffs, but when you are doing copy
3459          * detection you would need them, so here they are"
3460          * entries to the diff-core.  They will be prefixed
3461          * with something like '=' or '*' (I haven't decided
3462          * which but should not make any difference).
3463          * Feeding the same new and old to diff_change()
3464          * also has the same effect.
3465          * Before the final output happens, they are pruned after
3466          * merged into rename/copy pairs as appropriate.
3467          */
3468         if (DIFF_OPT_TST(options, REVERSE_DIFF))
3469                 addremove = (addremove == '+' ? '-' :
3470                              addremove == '-' ? '+' : addremove);
3472         if (options->prefix &&
3473             strncmp(concatpath, options->prefix, options->prefix_length))
3474                 return;
3476         one = alloc_filespec(concatpath);
3477         two = alloc_filespec(concatpath);
3479         if (addremove != '+')
3480                 fill_filespec(one, sha1, mode);
3481         if (addremove != '-')
3482                 fill_filespec(two, sha1, mode);
3484         diff_queue(&diff_queued_diff, one, two);
3485         DIFF_OPT_SET(options, HAS_CHANGES);
3488 void diff_change(struct diff_options *options,
3489                  unsigned old_mode, unsigned new_mode,
3490                  const unsigned char *old_sha1,
3491                  const unsigned char *new_sha1,
3492                  const char *concatpath)
3494         struct diff_filespec *one, *two;
3496         if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(old_mode)
3497                         && S_ISGITLINK(new_mode))
3498                 return;
3500         if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
3501                 unsigned tmp;
3502                 const unsigned char *tmp_c;
3503                 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
3504                 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
3505         }
3507         if (options->prefix &&
3508             strncmp(concatpath, options->prefix, options->prefix_length))
3509                 return;
3511         one = alloc_filespec(concatpath);
3512         two = alloc_filespec(concatpath);
3513         fill_filespec(one, old_sha1, old_mode);
3514         fill_filespec(two, new_sha1, new_mode);
3516         diff_queue(&diff_queued_diff, one, two);
3517         DIFF_OPT_SET(options, HAS_CHANGES);
3520 void diff_unmerge(struct diff_options *options,
3521                   const char *path,
3522                   unsigned mode, const unsigned char *sha1)
3524         struct diff_filespec *one, *two;
3526         if (options->prefix &&
3527             strncmp(path, options->prefix, options->prefix_length))
3528                 return;
3530         one = alloc_filespec(path);
3531         two = alloc_filespec(path);
3532         fill_filespec(one, sha1, mode);
3533         diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;