![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
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 = 100;
23 static int diff_use_color_default;
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 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 if (!value)
90 return error("%s: lacks value", var);
91 drv->cmd = strdup(value);
92 return 0;
93 }
95 /*
96 * 'diff.<what>.funcname' attribute can be specified in the configuration
97 * to define a customized regexp to find the beginning of a function to
98 * be used for hunk header lines of "diff -p" style output.
99 */
100 static struct funcname_pattern {
101 char *name;
102 char *pattern;
103 struct funcname_pattern *next;
104 } *funcname_pattern_list;
106 static int parse_funcname_pattern(const char *var, const char *ep, const char *value)
107 {
108 const char *name;
109 int namelen;
110 struct funcname_pattern *pp;
112 name = var + 5; /* "diff." */
113 namelen = ep - name;
115 for (pp = funcname_pattern_list; pp; pp = pp->next)
116 if (!strncmp(pp->name, name, namelen) && !pp->name[namelen])
117 break;
118 if (!pp) {
119 pp = xcalloc(1, sizeof(*pp));
120 pp->name = xmemdupz(name, namelen);
121 pp->next = funcname_pattern_list;
122 funcname_pattern_list = pp;
123 }
124 if (pp->pattern)
125 free(pp->pattern);
126 pp->pattern = xstrdup(value);
127 return 0;
128 }
130 /*
131 * These are to give UI layer defaults.
132 * The core-level commands such as git-diff-files should
133 * never be affected by the setting of diff.renames
134 * the user happens to have in the configuration file.
135 */
136 int git_diff_ui_config(const char *var, const char *value)
137 {
138 if (!strcmp(var, "diff.renamelimit")) {
139 diff_rename_limit_default = git_config_int(var, value);
140 return 0;
141 }
142 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
143 diff_use_color_default = git_config_colorbool(var, value, -1);
144 return 0;
145 }
146 if (!strcmp(var, "diff.renames")) {
147 if (!value)
148 diff_detect_rename_default = DIFF_DETECT_RENAME;
149 else if (!strcasecmp(value, "copies") ||
150 !strcasecmp(value, "copy"))
151 diff_detect_rename_default = DIFF_DETECT_COPY;
152 else if (git_config_bool(var,value))
153 diff_detect_rename_default = DIFF_DETECT_RENAME;
154 return 0;
155 }
156 if (!strcmp(var, "diff.autorefreshindex")) {
157 diff_auto_refresh_index = git_config_bool(var, value);
158 return 0;
159 }
160 if (!strcmp(var, "diff.external")) {
161 external_diff_cmd_cfg = xstrdup(value);
162 return 0;
163 }
164 if (!prefixcmp(var, "diff.")) {
165 const char *ep = strrchr(var, '.');
167 if (ep != var + 4) {
168 if (!strcmp(ep, ".command"))
169 return parse_lldiff_command(var, ep, value);
170 }
171 }
173 return git_diff_basic_config(var, value);
174 }
176 int git_diff_basic_config(const char *var, const char *value)
177 {
178 if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
179 int slot = parse_diff_color_slot(var, 11);
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 return parse_funcname_pattern(var, ep, value);
189 }
190 }
192 return git_default_config(var, value);
193 }
195 static char *quote_two(const char *one, const char *two)
196 {
197 int need_one = quote_c_style(one, NULL, NULL, 1);
198 int need_two = quote_c_style(two, NULL, NULL, 1);
199 struct strbuf res;
201 strbuf_init(&res, 0);
202 if (need_one + need_two) {
203 strbuf_addch(&res, '"');
204 quote_c_style(one, &res, NULL, 1);
205 quote_c_style(two, &res, NULL, 1);
206 strbuf_addch(&res, '"');
207 } else {
208 strbuf_addstr(&res, one);
209 strbuf_addstr(&res, two);
210 }
211 return strbuf_detach(&res, NULL);
212 }
214 static const char *external_diff(void)
215 {
216 static const char *external_diff_cmd = NULL;
217 static int done_preparing = 0;
219 if (done_preparing)
220 return external_diff_cmd;
221 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
222 if (!external_diff_cmd)
223 external_diff_cmd = external_diff_cmd_cfg;
224 done_preparing = 1;
225 return external_diff_cmd;
226 }
228 static struct diff_tempfile {
229 const char *name; /* filename external diff should read from */
230 char hex[41];
231 char mode[10];
232 char tmp_path[PATH_MAX];
233 } diff_temp[2];
235 static int count_lines(const char *data, int size)
236 {
237 int count, ch, completely_empty = 1, nl_just_seen = 0;
238 count = 0;
239 while (0 < size--) {
240 ch = *data++;
241 if (ch == '\n') {
242 count++;
243 nl_just_seen = 1;
244 completely_empty = 0;
245 }
246 else {
247 nl_just_seen = 0;
248 completely_empty = 0;
249 }
250 }
251 if (completely_empty)
252 return 0;
253 if (!nl_just_seen)
254 count++; /* no trailing newline */
255 return count;
256 }
258 static void print_line_count(int count)
259 {
260 switch (count) {
261 case 0:
262 printf("0,0");
263 break;
264 case 1:
265 printf("1");
266 break;
267 default:
268 printf("1,%d", count);
269 break;
270 }
271 }
273 static void copy_file(int prefix, const char *data, int size,
274 const char *set, const char *reset)
275 {
276 int ch, nl_just_seen = 1;
277 while (0 < size--) {
278 ch = *data++;
279 if (nl_just_seen) {
280 fputs(set, stdout);
281 putchar(prefix);
282 }
283 if (ch == '\n') {
284 nl_just_seen = 1;
285 fputs(reset, stdout);
286 } else
287 nl_just_seen = 0;
288 putchar(ch);
289 }
290 if (!nl_just_seen)
291 printf("%s\n\\ No newline at end of file\n", reset);
292 }
294 static void emit_rewrite_diff(const char *name_a,
295 const char *name_b,
296 struct diff_filespec *one,
297 struct diff_filespec *two,
298 struct diff_options *o)
299 {
300 int lc_a, lc_b;
301 int color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
302 const char *name_a_tab, *name_b_tab;
303 const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO);
304 const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO);
305 const char *old = diff_get_color(color_diff, DIFF_FILE_OLD);
306 const char *new = diff_get_color(color_diff, DIFF_FILE_NEW);
307 const char *reset = diff_get_color(color_diff, DIFF_RESET);
308 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
310 name_a += (*name_a == '/');
311 name_b += (*name_b == '/');
312 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
313 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
315 strbuf_reset(&a_name);
316 strbuf_reset(&b_name);
317 quote_two_c_style(&a_name, o->a_prefix, name_a, 0);
318 quote_two_c_style(&b_name, o->b_prefix, name_b, 0);
320 diff_populate_filespec(one, 0);
321 diff_populate_filespec(two, 0);
322 lc_a = count_lines(one->data, one->size);
323 lc_b = count_lines(two->data, two->size);
324 printf("%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
325 metainfo, a_name.buf, name_a_tab, reset,
326 metainfo, b_name.buf, name_b_tab, reset, fraginfo);
327 print_line_count(lc_a);
328 printf(" +");
329 print_line_count(lc_b);
330 printf(" @@%s\n", reset);
331 if (lc_a)
332 copy_file('-', one->data, one->size, old, reset);
333 if (lc_b)
334 copy_file('+', two->data, two->size, new, reset);
335 }
337 static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
338 {
339 if (!DIFF_FILE_VALID(one)) {
340 mf->ptr = (char *)""; /* does not matter */
341 mf->size = 0;
342 return 0;
343 }
344 else if (diff_populate_filespec(one, 0))
345 return -1;
346 mf->ptr = one->data;
347 mf->size = one->size;
348 return 0;
349 }
351 struct diff_words_buffer {
352 mmfile_t text;
353 long alloc;
354 long current; /* output pointer */
355 int suppressed_newline;
356 };
358 static void diff_words_append(char *line, unsigned long len,
359 struct diff_words_buffer *buffer)
360 {
361 if (buffer->text.size + len > buffer->alloc) {
362 buffer->alloc = (buffer->text.size + len) * 3 / 2;
363 buffer->text.ptr = xrealloc(buffer->text.ptr, buffer->alloc);
364 }
365 line++;
366 len--;
367 memcpy(buffer->text.ptr + buffer->text.size, line, len);
368 buffer->text.size += len;
369 }
371 struct diff_words_data {
372 struct xdiff_emit_state xm;
373 struct diff_words_buffer minus, plus;
374 };
376 static void print_word(struct diff_words_buffer *buffer, int len, int color,
377 int suppress_newline)
378 {
379 const char *ptr;
380 int eol = 0;
382 if (len == 0)
383 return;
385 ptr = buffer->text.ptr + buffer->current;
386 buffer->current += len;
388 if (ptr[len - 1] == '\n') {
389 eol = 1;
390 len--;
391 }
393 fputs(diff_get_color(1, color), stdout);
394 fwrite(ptr, len, 1, stdout);
395 fputs(diff_get_color(1, DIFF_RESET), stdout);
397 if (eol) {
398 if (suppress_newline)
399 buffer->suppressed_newline = 1;
400 else
401 putchar('\n');
402 }
403 }
405 static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
406 {
407 struct diff_words_data *diff_words = priv;
409 if (diff_words->minus.suppressed_newline) {
410 if (line[0] != '+')
411 putchar('\n');
412 diff_words->minus.suppressed_newline = 0;
413 }
415 len--;
416 switch (line[0]) {
417 case '-':
418 print_word(&diff_words->minus, len, DIFF_FILE_OLD, 1);
419 break;
420 case '+':
421 print_word(&diff_words->plus, len, DIFF_FILE_NEW, 0);
422 break;
423 case ' ':
424 print_word(&diff_words->plus, len, DIFF_PLAIN, 0);
425 diff_words->minus.current += len;
426 break;
427 }
428 }
430 /* this executes the word diff on the accumulated buffers */
431 static void diff_words_show(struct diff_words_data *diff_words)
432 {
433 xpparam_t xpp;
434 xdemitconf_t xecfg;
435 xdemitcb_t ecb;
436 mmfile_t minus, plus;
437 int i;
439 memset(&xecfg, 0, sizeof(xecfg));
440 minus.size = diff_words->minus.text.size;
441 minus.ptr = xmalloc(minus.size);
442 memcpy(minus.ptr, diff_words->minus.text.ptr, minus.size);
443 for (i = 0; i < minus.size; i++)
444 if (isspace(minus.ptr[i]))
445 minus.ptr[i] = '\n';
446 diff_words->minus.current = 0;
448 plus.size = diff_words->plus.text.size;
449 plus.ptr = xmalloc(plus.size);
450 memcpy(plus.ptr, diff_words->plus.text.ptr, plus.size);
451 for (i = 0; i < plus.size; i++)
452 if (isspace(plus.ptr[i]))
453 plus.ptr[i] = '\n';
454 diff_words->plus.current = 0;
456 xpp.flags = XDF_NEED_MINIMAL;
457 xecfg.ctxlen = diff_words->minus.alloc + diff_words->plus.alloc;
458 ecb.outf = xdiff_outf;
459 ecb.priv = diff_words;
460 diff_words->xm.consume = fn_out_diff_words_aux;
461 xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
463 free(minus.ptr);
464 free(plus.ptr);
465 diff_words->minus.text.size = diff_words->plus.text.size = 0;
467 if (diff_words->minus.suppressed_newline) {
468 putchar('\n');
469 diff_words->minus.suppressed_newline = 0;
470 }
471 }
473 typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
475 struct emit_callback {
476 struct xdiff_emit_state xm;
477 int nparents, color_diff;
478 unsigned ws_rule;
479 sane_truncate_fn truncate;
480 const char **label_path;
481 struct diff_words_data *diff_words;
482 int *found_changesp;
483 };
485 static void free_diff_words_data(struct emit_callback *ecbdata)
486 {
487 if (ecbdata->diff_words) {
488 /* flush buffers */
489 if (ecbdata->diff_words->minus.text.size ||
490 ecbdata->diff_words->plus.text.size)
491 diff_words_show(ecbdata->diff_words);
493 if (ecbdata->diff_words->minus.text.ptr)
494 free (ecbdata->diff_words->minus.text.ptr);
495 if (ecbdata->diff_words->plus.text.ptr)
496 free (ecbdata->diff_words->plus.text.ptr);
497 free(ecbdata->diff_words);
498 ecbdata->diff_words = NULL;
499 }
500 }
502 const char *diff_get_color(int diff_use_color, enum color_diff ix)
503 {
504 if (diff_use_color)
505 return diff_colors[ix];
506 return "";
507 }
509 static void emit_line(const char *set, const char *reset, const char *line, int len)
510 {
511 fputs(set, stdout);
512 fwrite(line, len, 1, stdout);
513 fputs(reset, stdout);
514 }
516 static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len)
517 {
518 const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
519 const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
521 if (!*ws)
522 emit_line(set, reset, line, len);
523 else {
524 /* Emit just the prefix, then the rest. */
525 emit_line(set, reset, line, ecbdata->nparents);
526 (void)check_and_emit_line(line + ecbdata->nparents,
527 len - ecbdata->nparents, ecbdata->ws_rule,
528 stdout, set, reset, ws);
529 }
530 }
532 static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
533 {
534 const char *cp;
535 unsigned long allot;
536 size_t l = len;
538 if (ecb->truncate)
539 return ecb->truncate(line, len);
540 cp = line;
541 allot = l;
542 while (0 < l) {
543 (void) utf8_width(&cp, &l);
544 if (!cp)
545 break; /* truncated in the middle? */
546 }
547 return allot - l;
548 }
550 static void fn_out_consume(void *priv, char *line, unsigned long len)
551 {
552 int i;
553 int color;
554 struct emit_callback *ecbdata = priv;
555 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
556 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
557 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
559 *(ecbdata->found_changesp) = 1;
561 if (ecbdata->label_path[0]) {
562 const char *name_a_tab, *name_b_tab;
564 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
565 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
567 printf("%s--- %s%s%s\n",
568 meta, ecbdata->label_path[0], reset, name_a_tab);
569 printf("%s+++ %s%s%s\n",
570 meta, ecbdata->label_path[1], reset, name_b_tab);
571 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
572 }
574 /* This is not really necessary for now because
575 * this codepath only deals with two-way diffs.
576 */
577 for (i = 0; i < len && line[i] == '@'; i++)
578 ;
579 if (2 <= i && i < len && line[i] == ' ') {
580 ecbdata->nparents = i - 1;
581 len = sane_truncate_line(ecbdata, line, len);
582 emit_line(diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO),
583 reset, line, len);
584 if (line[len-1] != '\n')
585 putchar('\n');
586 return;
587 }
589 if (len < ecbdata->nparents) {
590 emit_line(reset, reset, line, len);
591 return;
592 }
594 color = DIFF_PLAIN;
595 if (ecbdata->diff_words && ecbdata->nparents != 1)
596 /* fall back to normal diff */
597 free_diff_words_data(ecbdata);
598 if (ecbdata->diff_words) {
599 if (line[0] == '-') {
600 diff_words_append(line, len,
601 &ecbdata->diff_words->minus);
602 return;
603 } else if (line[0] == '+') {
604 diff_words_append(line, len,
605 &ecbdata->diff_words->plus);
606 return;
607 }
608 if (ecbdata->diff_words->minus.text.size ||
609 ecbdata->diff_words->plus.text.size)
610 diff_words_show(ecbdata->diff_words);
611 line++;
612 len--;
613 emit_line(plain, reset, line, len);
614 return;
615 }
616 for (i = 0; i < ecbdata->nparents && len; i++) {
617 if (line[i] == '-')
618 color = DIFF_FILE_OLD;
619 else if (line[i] == '+')
620 color = DIFF_FILE_NEW;
621 }
623 if (color != DIFF_FILE_NEW) {
624 emit_line(diff_get_color(ecbdata->color_diff, color),
625 reset, line, len);
626 return;
627 }
628 emit_add_line(reset, ecbdata, line, len);
629 }
631 static char *pprint_rename(const char *a, const char *b)
632 {
633 const char *old = a;
634 const char *new = b;
635 struct strbuf name;
636 int pfx_length, sfx_length;
637 int len_a = strlen(a);
638 int len_b = strlen(b);
639 int a_midlen, b_midlen;
640 int qlen_a = quote_c_style(a, NULL, NULL, 0);
641 int qlen_b = quote_c_style(b, NULL, NULL, 0);
643 strbuf_init(&name, 0);
644 if (qlen_a || qlen_b) {
645 quote_c_style(a, &name, NULL, 0);
646 strbuf_addstr(&name, " => ");
647 quote_c_style(b, &name, NULL, 0);
648 return strbuf_detach(&name, NULL);
649 }
651 /* Find common prefix */
652 pfx_length = 0;
653 while (*old && *new && *old == *new) {
654 if (*old == '/')
655 pfx_length = old - a + 1;
656 old++;
657 new++;
658 }
660 /* Find common suffix */
661 old = a + len_a;
662 new = b + len_b;
663 sfx_length = 0;
664 while (a <= old && b <= new && *old == *new) {
665 if (*old == '/')
666 sfx_length = len_a - (old - a);
667 old--;
668 new--;
669 }
671 /*
672 * pfx{mid-a => mid-b}sfx
673 * {pfx-a => pfx-b}sfx
674 * pfx{sfx-a => sfx-b}
675 * name-a => name-b
676 */
677 a_midlen = len_a - pfx_length - sfx_length;
678 b_midlen = len_b - pfx_length - sfx_length;
679 if (a_midlen < 0)
680 a_midlen = 0;
681 if (b_midlen < 0)
682 b_midlen = 0;
684 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
685 if (pfx_length + sfx_length) {
686 strbuf_add(&name, a, pfx_length);
687 strbuf_addch(&name, '{');
688 }
689 strbuf_add(&name, a + pfx_length, a_midlen);
690 strbuf_addstr(&name, " => ");
691 strbuf_add(&name, b + pfx_length, b_midlen);
692 if (pfx_length + sfx_length) {
693 strbuf_addch(&name, '}');
694 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
695 }
696 return strbuf_detach(&name, NULL);
697 }
699 struct diffstat_t {
700 struct xdiff_emit_state xm;
702 int nr;
703 int alloc;
704 struct diffstat_file {
705 char *from_name;
706 char *name;
707 char *print_name;
708 unsigned is_unmerged:1;
709 unsigned is_binary:1;
710 unsigned is_renamed:1;
711 unsigned int added, deleted;
712 } **files;
713 };
715 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
716 const char *name_a,
717 const char *name_b)
718 {
719 struct diffstat_file *x;
720 x = xcalloc(sizeof (*x), 1);
721 if (diffstat->nr == diffstat->alloc) {
722 diffstat->alloc = alloc_nr(diffstat->alloc);
723 diffstat->files = xrealloc(diffstat->files,
724 diffstat->alloc * sizeof(x));
725 }
726 diffstat->files[diffstat->nr++] = x;
727 if (name_b) {
728 x->from_name = xstrdup(name_a);
729 x->name = xstrdup(name_b);
730 x->is_renamed = 1;
731 }
732 else {
733 x->from_name = NULL;
734 x->name = xstrdup(name_a);
735 }
736 return x;
737 }
739 static void diffstat_consume(void *priv, char *line, unsigned long len)
740 {
741 struct diffstat_t *diffstat = priv;
742 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
744 if (line[0] == '+')
745 x->added++;
746 else if (line[0] == '-')
747 x->deleted++;
748 }
750 const char mime_boundary_leader[] = "------------";
752 static int scale_linear(int it, int width, int max_change)
753 {
754 /*
755 * make sure that at least one '-' is printed if there were deletions,
756 * and likewise for '+'.
757 */
758 if (max_change < 2)
759 return it;
760 return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1);
761 }
763 static void show_name(const char *prefix, const char *name, int len,
764 const char *reset, const char *set)
765 {
766 printf(" %s%s%-*s%s |", set, prefix, len, name, reset);
767 }
769 static void show_graph(char ch, int cnt, const char *set, const char *reset)
770 {
771 if (cnt <= 0)
772 return;
773 printf("%s", set);
774 while (cnt--)
775 putchar(ch);
776 printf("%s", reset);
777 }
779 static void fill_print_name(struct diffstat_file *file)
780 {
781 char *pname;
783 if (file->print_name)
784 return;
786 if (!file->is_renamed) {
787 struct strbuf buf;
788 strbuf_init(&buf, 0);
789 if (quote_c_style(file->name, &buf, NULL, 0)) {
790 pname = strbuf_detach(&buf, NULL);
791 } else {
792 pname = file->name;
793 strbuf_release(&buf);
794 }
795 } else {
796 pname = pprint_rename(file->from_name, file->name);
797 }
798 file->print_name = pname;
799 }
801 static void show_stats(struct diffstat_t* data, struct diff_options *options)
802 {
803 int i, len, add, del, total, adds = 0, dels = 0;
804 int max_change = 0, max_len = 0;
805 int total_files = data->nr;
806 int width, name_width;
807 const char *reset, *set, *add_c, *del_c;
809 if (data->nr == 0)
810 return;
812 width = options->stat_width ? options->stat_width : 80;
813 name_width = options->stat_name_width ? options->stat_name_width : 50;
815 /* Sanity: give at least 5 columns to the graph,
816 * but leave at least 10 columns for the name.
817 */
818 if (width < name_width + 15) {
819 if (name_width <= 25)
820 width = name_width + 15;
821 else
822 name_width = width - 15;
823 }
825 /* Find the longest filename and max number of changes */
826 reset = diff_get_color_opt(options, DIFF_RESET);
827 set = diff_get_color_opt(options, DIFF_PLAIN);
828 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
829 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
831 for (i = 0; i < data->nr; i++) {
832 struct diffstat_file *file = data->files[i];
833 int change = file->added + file->deleted;
834 fill_print_name(file);
835 len = strlen(file->print_name);
836 if (max_len < len)
837 max_len = len;
839 if (file->is_binary || file->is_unmerged)
840 continue;
841 if (max_change < change)
842 max_change = change;
843 }
845 /* Compute the width of the graph part;
846 * 10 is for one blank at the beginning of the line plus
847 * " | count " between the name and the graph.
848 *
849 * From here on, name_width is the width of the name area,
850 * and width is the width of the graph area.
851 */
852 name_width = (name_width < max_len) ? name_width : max_len;
853 if (width < (name_width + 10) + max_change)
854 width = width - (name_width + 10);
855 else
856 width = max_change;
858 for (i = 0; i < data->nr; i++) {
859 const char *prefix = "";
860 char *name = data->files[i]->print_name;
861 int added = data->files[i]->added;
862 int deleted = data->files[i]->deleted;
863 int name_len;
865 /*
866 * "scale" the filename
867 */
868 len = name_width;
869 name_len = strlen(name);
870 if (name_width < name_len) {
871 char *slash;
872 prefix = "...";
873 len -= 3;
874 name += name_len - len;
875 slash = strchr(name, '/');
876 if (slash)
877 name = slash;
878 }
880 if (data->files[i]->is_binary) {
881 show_name(prefix, name, len, reset, set);
882 printf(" Bin ");
883 printf("%s%d%s", del_c, deleted, reset);
884 printf(" -> ");
885 printf("%s%d%s", add_c, added, reset);
886 printf(" bytes");
887 printf("\n");
888 continue;
889 }
890 else if (data->files[i]->is_unmerged) {
891 show_name(prefix, name, len, reset, set);
892 printf(" Unmerged\n");
893 continue;
894 }
895 else if (!data->files[i]->is_renamed &&
896 (added + deleted == 0)) {
897 total_files--;
898 continue;
899 }
901 /*
902 * scale the add/delete
903 */
904 add = added;
905 del = deleted;
906 total = add + del;
907 adds += add;
908 dels += del;
910 if (width <= max_change) {
911 add = scale_linear(add, width, max_change);
912 del = scale_linear(del, width, max_change);
913 total = add + del;
914 }
915 show_name(prefix, name, len, reset, set);
916 printf("%5d ", added + deleted);
917 show_graph('+', add, add_c, reset);
918 show_graph('-', del, del_c, reset);
919 putchar('\n');
920 }
921 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
922 set, total_files, adds, dels, reset);
923 }
925 static void show_shortstats(struct diffstat_t* data)
926 {
927 int i, adds = 0, dels = 0, total_files = data->nr;
929 if (data->nr == 0)
930 return;
932 for (i = 0; i < data->nr; i++) {
933 if (!data->files[i]->is_binary &&
934 !data->files[i]->is_unmerged) {
935 int added = data->files[i]->added;
936 int deleted= data->files[i]->deleted;
937 if (!data->files[i]->is_renamed &&
938 (added + deleted == 0)) {
939 total_files--;
940 } else {
941 adds += added;
942 dels += deleted;
943 }
944 }
945 }
946 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
947 total_files, adds, dels);
948 }
950 static void show_numstat(struct diffstat_t* data, struct diff_options *options)
951 {
952 int i;
954 if (data->nr == 0)
955 return;
957 for (i = 0; i < data->nr; i++) {
958 struct diffstat_file *file = data->files[i];
960 if (file->is_binary)
961 printf("-\t-\t");
962 else
963 printf("%d\t%d\t", file->added, file->deleted);
964 if (options->line_termination) {
965 fill_print_name(file);
966 if (!file->is_renamed)
967 write_name_quoted(file->name, stdout,
968 options->line_termination);
969 else {
970 fputs(file->print_name, stdout);
971 putchar(options->line_termination);
972 }
973 } else {
974 if (file->is_renamed) {
975 putchar('\0');
976 write_name_quoted(file->from_name, stdout, '\0');
977 }
978 write_name_quoted(file->name, stdout, '\0');
979 }
980 }
981 }
983 static void free_diffstat_info(struct diffstat_t *diffstat)
984 {
985 int i;
986 for (i = 0; i < diffstat->nr; i++) {
987 struct diffstat_file *f = diffstat->files[i];
988 if (f->name != f->print_name)
989 free(f->print_name);
990 free(f->name);
991 free(f->from_name);
992 free(f);
993 }
994 free(diffstat->files);
995 }
997 struct checkdiff_t {
998 struct xdiff_emit_state xm;
999 const char *filename;
1000 int lineno, color_diff;
1001 unsigned ws_rule;
1002 unsigned status;
1003 };
1005 static void checkdiff_consume(void *priv, char *line, unsigned long len)
1006 {
1007 struct checkdiff_t *data = priv;
1008 const char *ws = diff_get_color(data->color_diff, DIFF_WHITESPACE);
1009 const char *reset = diff_get_color(data->color_diff, DIFF_RESET);
1010 const char *set = diff_get_color(data->color_diff, DIFF_FILE_NEW);
1011 char *err;
1013 if (line[0] == '+') {
1014 data->status = check_and_emit_line(line + 1, len - 1,
1015 data->ws_rule, NULL, NULL, NULL, NULL);
1016 if (!data->status)
1017 return;
1018 err = whitespace_error_string(data->status);
1019 printf("%s:%d: %s.\n", data->filename, data->lineno, err);
1020 free(err);
1021 emit_line(set, reset, line, 1);
1022 (void)check_and_emit_line(line + 1, len - 1, data->ws_rule,
1023 stdout, set, reset, ws);
1024 data->lineno++;
1025 } else if (line[0] == ' ')
1026 data->lineno++;
1027 else if (line[0] == '@') {
1028 char *plus = strchr(line, '+');
1029 if (plus)
1030 data->lineno = strtol(plus, NULL, 10);
1031 else
1032 die("invalid diff");
1033 }
1034 }
1036 static unsigned char *deflate_it(char *data,
1037 unsigned long size,
1038 unsigned long *result_size)
1039 {
1040 int bound;
1041 unsigned char *deflated;
1042 z_stream stream;
1044 memset(&stream, 0, sizeof(stream));
1045 deflateInit(&stream, zlib_compression_level);
1046 bound = deflateBound(&stream, size);
1047 deflated = xmalloc(bound);
1048 stream.next_out = deflated;
1049 stream.avail_out = bound;
1051 stream.next_in = (unsigned char *)data;
1052 stream.avail_in = size;
1053 while (deflate(&stream, Z_FINISH) == Z_OK)
1054 ; /* nothing */
1055 deflateEnd(&stream);
1056 *result_size = stream.total_out;
1057 return deflated;
1058 }
1060 static void emit_binary_diff_body(mmfile_t *one, mmfile_t *two)
1061 {
1062 void *cp;
1063 void *delta;
1064 void *deflated;
1065 void *data;
1066 unsigned long orig_size;
1067 unsigned long delta_size;
1068 unsigned long deflate_size;
1069 unsigned long data_size;
1071 /* We could do deflated delta, or we could do just deflated two,
1072 * whichever is smaller.
1073 */
1074 delta = NULL;
1075 deflated = deflate_it(two->ptr, two->size, &deflate_size);
1076 if (one->size && two->size) {
1077 delta = diff_delta(one->ptr, one->size,
1078 two->ptr, two->size,
1079 &delta_size, deflate_size);
1080 if (delta) {
1081 void *to_free = delta;
1082 orig_size = delta_size;
1083 delta = deflate_it(delta, delta_size, &delta_size);
1084 free(to_free);
1085 }
1086 }
1088 if (delta && delta_size < deflate_size) {
1089 printf("delta %lu\n", orig_size);
1090 free(deflated);
1091 data = delta;
1092 data_size = delta_size;
1093 }
1094 else {
1095 printf("literal %lu\n", two->size);
1096 free(delta);
1097 data = deflated;
1098 data_size = deflate_size;
1099 }
1101 /* emit data encoded in base85 */
1102 cp = data;
1103 while (data_size) {
1104 int bytes = (52 < data_size) ? 52 : data_size;
1105 char line[70];
1106 data_size -= bytes;
1107 if (bytes <= 26)
1108 line[0] = bytes + 'A' - 1;
1109 else
1110 line[0] = bytes - 26 + 'a' - 1;
1111 encode_85(line + 1, cp, bytes);
1112 cp = (char *) cp + bytes;
1113 puts(line);
1114 }
1115 printf("\n");
1116 free(data);
1117 }
1119 static void emit_binary_diff(mmfile_t *one, mmfile_t *two)
1120 {
1121 printf("GIT binary patch\n");
1122 emit_binary_diff_body(one, two);
1123 emit_binary_diff_body(two, one);
1124 }
1126 static void setup_diff_attr_check(struct git_attr_check *check)
1127 {
1128 static struct git_attr *attr_diff;
1130 if (!attr_diff) {
1131 attr_diff = git_attr("diff", 4);
1132 }
1133 check[0].attr = attr_diff;
1134 }
1136 static void diff_filespec_check_attr(struct diff_filespec *one)
1137 {
1138 struct git_attr_check attr_diff_check;
1139 int check_from_data = 0;
1141 if (one->checked_attr)
1142 return;
1144 setup_diff_attr_check(&attr_diff_check);
1145 one->is_binary = 0;
1146 one->funcname_pattern_ident = NULL;
1148 if (!git_checkattr(one->path, 1, &attr_diff_check)) {
1149 const char *value;
1151 /* binaryness */
1152 value = attr_diff_check.value;
1153 if (ATTR_TRUE(value))
1154 ;
1155 else if (ATTR_FALSE(value))
1156 one->is_binary = 1;
1157 else
1158 check_from_data = 1;
1160 /* funcname pattern ident */
1161 if (ATTR_TRUE(value) || ATTR_FALSE(value) || ATTR_UNSET(value))
1162 ;
1163 else
1164 one->funcname_pattern_ident = value;
1165 }
1167 if (check_from_data) {
1168 if (!one->data && DIFF_FILE_VALID(one))
1169 diff_populate_filespec(one, 0);
1171 if (one->data)
1172 one->is_binary = buffer_is_binary(one->data, one->size);
1173 }
1174 }
1176 int diff_filespec_is_binary(struct diff_filespec *one)
1177 {
1178 diff_filespec_check_attr(one);
1179 return one->is_binary;
1180 }
1182 static const char *funcname_pattern(const char *ident)
1183 {
1184 struct funcname_pattern *pp;
1186 for (pp = funcname_pattern_list; pp; pp = pp->next)
1187 if (!strcmp(ident, pp->name))
1188 return pp->pattern;
1189 return NULL;
1190 }
1192 static struct builtin_funcname_pattern {
1193 const char *name;
1194 const char *pattern;
1195 } builtin_funcname_pattern[] = {
1196 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1197 "new\\|return\\|switch\\|throw\\|while\\)\n"
1198 "^[ ]*\\(\\([ ]*"
1199 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1200 "[ ]*([^;]*$\\)" },
1201 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1202 };
1204 static const char *diff_funcname_pattern(struct diff_filespec *one)
1205 {
1206 const char *ident, *pattern;
1207 int i;
1209 diff_filespec_check_attr(one);
1210 ident = one->funcname_pattern_ident;
1212 if (!ident)
1213 /*
1214 * If the config file has "funcname.default" defined, that
1215 * regexp is used; otherwise NULL is returned and xemit uses
1216 * the built-in default.
1217 */
1218 return funcname_pattern("default");
1220 /* Look up custom "funcname.$ident" regexp from config. */
1221 pattern = funcname_pattern(ident);
1222 if (pattern)
1223 return pattern;
1225 /*
1226 * And define built-in fallback patterns here. Note that
1227 * these can be overridden by the user's config settings.
1228 */
1229 for (i = 0; i < ARRAY_SIZE(builtin_funcname_pattern); i++)
1230 if (!strcmp(ident, builtin_funcname_pattern[i].name))
1231 return builtin_funcname_pattern[i].pattern;
1233 return NULL;
1234 }
1236 static void builtin_diff(const char *name_a,
1237 const char *name_b,
1238 struct diff_filespec *one,
1239 struct diff_filespec *two,
1240 const char *xfrm_msg,
1241 struct diff_options *o,
1242 int complete_rewrite)
1243 {
1244 mmfile_t mf1, mf2;
1245 const char *lbl[2];
1246 char *a_one, *b_two;
1247 const char *set = diff_get_color_opt(o, DIFF_METAINFO);
1248 const char *reset = diff_get_color_opt(o, DIFF_RESET);
1250 a_one = quote_two(o->a_prefix, name_a + (*name_a == '/'));
1251 b_two = quote_two(o->b_prefix, name_b + (*name_b == '/'));
1252 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
1253 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
1254 printf("%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
1255 if (lbl[0][0] == '/') {
1256 /* /dev/null */
1257 printf("%snew file mode %06o%s\n", set, two->mode, reset);
1258 if (xfrm_msg && xfrm_msg[0])
1259 printf("%s%s%s\n", set, xfrm_msg, reset);
1260 }
1261 else if (lbl[1][0] == '/') {
1262 printf("%sdeleted file mode %06o%s\n", set, one->mode, reset);
1263 if (xfrm_msg && xfrm_msg[0])
1264 printf("%s%s%s\n", set, xfrm_msg, reset);
1265 }
1266 else {
1267 if (one->mode != two->mode) {
1268 printf("%sold mode %06o%s\n", set, one->mode, reset);
1269 printf("%snew mode %06o%s\n", set, two->mode, reset);
1270 }
1271 if (xfrm_msg && xfrm_msg[0])
1272 printf("%s%s%s\n", set, xfrm_msg, reset);
1273 /*
1274 * we do not run diff between different kind
1275 * of objects.
1276 */
1277 if ((one->mode ^ two->mode) & S_IFMT)
1278 goto free_ab_and_return;
1279 if (complete_rewrite) {
1280 emit_rewrite_diff(name_a, name_b, one, two, o);
1281 o->found_changes = 1;
1282 goto free_ab_and_return;
1283 }
1284 }
1286 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1287 die("unable to read files to diff");
1289 if (!DIFF_OPT_TST(o, TEXT) &&
1290 (diff_filespec_is_binary(one) || diff_filespec_is_binary(two))) {
1291 /* Quite common confusing case */
1292 if (mf1.size == mf2.size &&
1293 !memcmp(mf1.ptr, mf2.ptr, mf1.size))
1294 goto free_ab_and_return;
1295 if (DIFF_OPT_TST(o, BINARY))
1296 emit_binary_diff(&mf1, &mf2);
1297 else
1298 printf("Binary files %s and %s differ\n",
1299 lbl[0], lbl[1]);
1300 o->found_changes = 1;
1301 }
1302 else {
1303 /* Crazy xdl interfaces.. */
1304 const char *diffopts = getenv("GIT_DIFF_OPTS");
1305 xpparam_t xpp;
1306 xdemitconf_t xecfg;
1307 xdemitcb_t ecb;
1308 struct emit_callback ecbdata;
1309 const char *funcname_pattern;
1311 funcname_pattern = diff_funcname_pattern(one);
1312 if (!funcname_pattern)
1313 funcname_pattern = diff_funcname_pattern(two);
1315 memset(&xecfg, 0, sizeof(xecfg));
1316 memset(&ecbdata, 0, sizeof(ecbdata));
1317 ecbdata.label_path = lbl;
1318 ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1319 ecbdata.found_changesp = &o->found_changes;
1320 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
1321 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1322 xecfg.ctxlen = o->context;
1323 xecfg.flags = XDL_EMIT_FUNCNAMES;
1324 if (funcname_pattern)
1325 xdiff_set_find_func(&xecfg, funcname_pattern);
1326 if (!diffopts)
1327 ;
1328 else if (!prefixcmp(diffopts, "--unified="))
1329 xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
1330 else if (!prefixcmp(diffopts, "-u"))
1331 xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
1332 ecb.outf = xdiff_outf;
1333 ecb.priv = &ecbdata;
1334 ecbdata.xm.consume = fn_out_consume;
1335 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
1336 ecbdata.diff_words =
1337 xcalloc(1, sizeof(struct diff_words_data));
1338 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
1339 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
1340 free_diff_words_data(&ecbdata);
1341 }
1343 free_ab_and_return:
1344 diff_free_filespec_data(one);
1345 diff_free_filespec_data(two);
1346 free(a_one);
1347 free(b_two);
1348 return;
1349 }
1351 static void builtin_diffstat(const char *name_a, const char *name_b,
1352 struct diff_filespec *one,
1353 struct diff_filespec *two,
1354 struct diffstat_t *diffstat,
1355 struct diff_options *o,
1356 int complete_rewrite)
1357 {
1358 mmfile_t mf1, mf2;
1359 struct diffstat_file *data;
1361 data = diffstat_add(diffstat, name_a, name_b);
1363 if (!one || !two) {
1364 data->is_unmerged = 1;
1365 return;
1366 }
1367 if (complete_rewrite) {
1368 diff_populate_filespec(one, 0);
1369 diff_populate_filespec(two, 0);
1370 data->deleted = count_lines(one->data, one->size);
1371 data->added = count_lines(two->data, two->size);
1372 goto free_and_return;
1373 }
1374 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1375 die("unable to read files to diff");
1377 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
1378 data->is_binary = 1;
1379 data->added = mf2.size;
1380 data->deleted = mf1.size;
1381 } else {
1382 /* Crazy xdl interfaces.. */
1383 xpparam_t xpp;
1384 xdemitconf_t xecfg;
1385 xdemitcb_t ecb;
1387 memset(&xecfg, 0, sizeof(xecfg));
1388 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1389 ecb.outf = xdiff_outf;
1390 ecb.priv = diffstat;
1391 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
1392 }
1394 free_and_return:
1395 diff_free_filespec_data(one);
1396 diff_free_filespec_data(two);
1397 }
1399 static void builtin_checkdiff(const char *name_a, const char *name_b,
1400 const char *attr_path,
1401 struct diff_filespec *one,
1402 struct diff_filespec *two, struct diff_options *o)
1403 {
1404 mmfile_t mf1, mf2;
1405 struct checkdiff_t data;
1407 if (!two)
1408 return;
1410 memset(&data, 0, sizeof(data));
1411 data.xm.consume = checkdiff_consume;
1412 data.filename = name_b ? name_b : name_a;
1413 data.lineno = 0;
1414 data.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1415 data.ws_rule = whitespace_rule(attr_path);
1417 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1418 die("unable to read files to diff");
1420 if (diff_filespec_is_binary(two))
1421 goto free_and_return;
1422 else {
1423 /* Crazy xdl interfaces.. */
1424 xpparam_t xpp;
1425 xdemitconf_t xecfg;
1426 xdemitcb_t ecb;
1428 memset(&xecfg, 0, sizeof(xecfg));
1429 xpp.flags = XDF_NEED_MINIMAL;
1430 ecb.outf = xdiff_outf;
1431 ecb.priv = &data;
1432 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
1433 }
1434 free_and_return:
1435 diff_free_filespec_data(one);
1436 diff_free_filespec_data(two);
1437 if (data.status)
1438 DIFF_OPT_SET(o, CHECK_FAILED);
1439 }
1441 struct diff_filespec *alloc_filespec(const char *path)
1442 {
1443 int namelen = strlen(path);
1444 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
1446 memset(spec, 0, sizeof(*spec));
1447 spec->path = (char *)(spec + 1);
1448 memcpy(spec->path, path, namelen+1);
1449 spec->count = 1;
1450 return spec;
1451 }
1453 void free_filespec(struct diff_filespec *spec)
1454 {
1455 if (!--spec->count) {
1456 diff_free_filespec_data(spec);
1457 free(spec);
1458 }
1459 }
1461 void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
1462 unsigned short mode)
1463 {
1464 if (mode) {
1465 spec->mode = canon_mode(mode);
1466 hashcpy(spec->sha1, sha1);
1467 spec->sha1_valid = !is_null_sha1(sha1);
1468 }
1469 }
1471 /*
1472 * Given a name and sha1 pair, if the index tells us the file in
1473 * the work tree has that object contents, return true, so that
1474 * prepare_temp_file() does not have to inflate and extract.
1475 */
1476 static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
1477 {
1478 struct cache_entry *ce;
1479 struct stat st;
1480 int pos, len;
1482 /* We do not read the cache ourselves here, because the
1483 * benchmark with my previous version that always reads cache
1484 * shows that it makes things worse for diff-tree comparing
1485 * two linux-2.6 kernel trees in an already checked out work
1486 * tree. This is because most diff-tree comparisons deal with
1487 * only a small number of files, while reading the cache is
1488 * expensive for a large project, and its cost outweighs the
1489 * savings we get by not inflating the object to a temporary
1490 * file. Practically, this code only helps when we are used
1491 * by diff-cache --cached, which does read the cache before
1492 * calling us.
1493 */
1494 if (!active_cache)
1495 return 0;
1497 /* We want to avoid the working directory if our caller
1498 * doesn't need the data in a normal file, this system
1499 * is rather slow with its stat/open/mmap/close syscalls,
1500 * and the object is contained in a pack file. The pack
1501 * is probably already open and will be faster to obtain
1502 * the data through than the working directory. Loose
1503 * objects however would tend to be slower as they need
1504 * to be individually opened and inflated.
1505 */
1506 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))
1507 return 0;
1509 len = strlen(name);
1510 pos = cache_name_pos(name, len);
1511 if (pos < 0)
1512 return 0;
1513 ce = active_cache[pos];
1514 if ((lstat(name, &st) < 0) ||
1515 !S_ISREG(st.st_mode) || /* careful! */
1516 ce_match_stat(ce, &st, 0) ||
1517 hashcmp(sha1, ce->sha1))
1518 return 0;
1519 /* we return 1 only when we can stat, it is a regular file,
1520 * stat information matches, and sha1 recorded in the cache
1521 * matches. I.e. we know the file in the work tree really is
1522 * the same as the <name, sha1> pair.
1523 */
1524 return 1;
1525 }
1527 static int populate_from_stdin(struct diff_filespec *s)
1528 {
1529 struct strbuf buf;
1530 size_t size = 0;
1532 strbuf_init(&buf, 0);
1533 if (strbuf_read(&buf, 0, 0) < 0)
1534 return error("error while reading from stdin %s",
1535 strerror(errno));
1537 s->should_munmap = 0;
1538 s->data = strbuf_detach(&buf, &size);
1539 s->size = size;
1540 s->should_free = 1;
1541 return 0;
1542 }
1544 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
1545 {
1546 int len;
1547 char *data = xmalloc(100);
1548 len = snprintf(data, 100,
1549 "Subproject commit %s\n", sha1_to_hex(s->sha1));
1550 s->data = data;
1551 s->size = len;
1552 s->should_free = 1;
1553 if (size_only) {
1554 s->data = NULL;
1555 free(data);
1556 }
1557 return 0;
1558 }
1560 /*
1561 * While doing rename detection and pickaxe operation, we may need to
1562 * grab the data for the blob (or file) for our own in-core comparison.
1563 * diff_filespec has data and size fields for this purpose.
1564 */
1565 int diff_populate_filespec(struct diff_filespec *s, int size_only)
1566 {
1567 int err = 0;
1568 if (!DIFF_FILE_VALID(s))
1569 die("internal error: asking to populate invalid file.");
1570 if (S_ISDIR(s->mode))
1571 return -1;
1573 if (s->data)
1574 return 0;
1576 if (size_only && 0 < s->size)
1577 return 0;
1579 if (S_ISGITLINK(s->mode))
1580 return diff_populate_gitlink(s, size_only);
1582 if (!s->sha1_valid ||
1583 reuse_worktree_file(s->path, s->sha1, 0)) {
1584 struct strbuf buf;
1585 struct stat st;
1586 int fd;
1588 if (!strcmp(s->path, "-"))
1589 return populate_from_stdin(s);
1591 if (lstat(s->path, &st) < 0) {
1592 if (errno == ENOENT) {
1593 err_empty:
1594 err = -1;
1595 empty:
1596 s->data = (char *)"";
1597 s->size = 0;
1598 return err;
1599 }
1600 }
1601 s->size = xsize_t(st.st_size);
1602 if (!s->size)
1603 goto empty;
1604 if (size_only)
1605 return 0;
1606 if (S_ISLNK(st.st_mode)) {
1607 int ret;
1608 s->data = xmalloc(s->size);
1609 s->should_free = 1;
1610 ret = readlink(s->path, s->data, s->size);
1611 if (ret < 0) {
1612 free(s->data);
1613 goto err_empty;
1614 }
1615 return 0;
1616 }
1617 fd = open(s->path, O_RDONLY);
1618 if (fd < 0)
1619 goto err_empty;
1620 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
1621 close(fd);
1622 s->should_munmap = 1;
1624 /*
1625 * Convert from working tree format to canonical git format
1626 */
1627 strbuf_init(&buf, 0);
1628 if (convert_to_git(s->path, s->data, s->size, &buf)) {
1629 size_t size = 0;
1630 munmap(s->data, s->size);
1631 s->should_munmap = 0;
1632 s->data = strbuf_detach(&buf, &size);
1633 s->size = size;
1634 s->should_free = 1;
1635 }
1636 }
1637 else {
1638 enum object_type type;
1639 if (size_only)
1640 type = sha1_object_info(s->sha1, &s->size);
1641 else {
1642 s->data = read_sha1_file(s->sha1, &type, &s->size);
1643 s->should_free = 1;
1644 }
1645 }
1646 return 0;
1647 }
1649 void diff_free_filespec_blob(struct diff_filespec *s)
1650 {
1651 if (s->should_free)
1652 free(s->data);
1653 else if (s->should_munmap)
1654 munmap(s->data, s->size);
1656 if (s->should_free || s->should_munmap) {
1657 s->should_free = s->should_munmap = 0;
1658 s->data = NULL;
1659 }
1660 }
1662 void diff_free_filespec_data(struct diff_filespec *s)
1663 {
1664 diff_free_filespec_blob(s);
1665 free(s->cnt_data);
1666 s->cnt_data = NULL;
1667 }
1669 static void prep_temp_blob(struct diff_tempfile *temp,
1670 void *blob,
1671 unsigned long size,
1672 const unsigned char *sha1,
1673 int mode)
1674 {
1675 int fd;
1677 fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
1678 if (fd < 0)
1679 die("unable to create temp-file: %s", strerror(errno));
1680 if (write_in_full(fd, blob, size) != size)
1681 die("unable to write temp-file");
1682 close(fd);
1683 temp->name = temp->tmp_path;
1684 strcpy(temp->hex, sha1_to_hex(sha1));
1685 temp->hex[40] = 0;
1686 sprintf(temp->mode, "%06o", mode);
1687 }
1689 static void prepare_temp_file(const char *name,
1690 struct diff_tempfile *temp,
1691 struct diff_filespec *one)
1692 {
1693 if (!DIFF_FILE_VALID(one)) {
1694 not_a_valid_file:
1695 /* A '-' entry produces this for file-2, and
1696 * a '+' entry produces this for file-1.
1697 */
1698 temp->name = "/dev/null";
1699 strcpy(temp->hex, ".");
1700 strcpy(temp->mode, ".");
1701 return;
1702 }
1704 if (!one->sha1_valid ||
1705 reuse_worktree_file(name, one->sha1, 1)) {
1706 struct stat st;
1707 if (lstat(name, &st) < 0) {
1708 if (errno == ENOENT)
1709 goto not_a_valid_file;
1710 die("stat(%s): %s", name, strerror(errno));
1711 }
1712 if (S_ISLNK(st.st_mode)) {
1713 int ret;
1714 char buf[PATH_MAX + 1]; /* ought to be SYMLINK_MAX */
1715 size_t sz = xsize_t(st.st_size);
1716 if (sizeof(buf) <= st.st_size)
1717 die("symlink too long: %s", name);
1718 ret = readlink(name, buf, sz);
1719 if (ret < 0)
1720 die("readlink(%s)", name);
1721 prep_temp_blob(temp, buf, sz,
1722 (one->sha1_valid ?
1723 one->sha1 : null_sha1),
1724 (one->sha1_valid ?
1725 one->mode : S_IFLNK));
1726 }
1727 else {
1728 /* we can borrow from the file in the work tree */
1729 temp->name = name;
1730 if (!one->sha1_valid)
1731 strcpy(temp->hex, sha1_to_hex(null_sha1));
1732 else
1733 strcpy(temp->hex, sha1_to_hex(one->sha1));
1734 /* Even though we may sometimes borrow the
1735 * contents from the work tree, we always want
1736 * one->mode. mode is trustworthy even when
1737 * !(one->sha1_valid), as long as
1738 * DIFF_FILE_VALID(one).
1739 */
1740 sprintf(temp->mode, "%06o", one->mode);
1741 }
1742 return;
1743 }
1744 else {
1745 if (diff_populate_filespec(one, 0))
1746 die("cannot read data blob for %s", one->path);
1747 prep_temp_blob(temp, one->data, one->size,
1748 one->sha1, one->mode);
1749 }
1750 }
1752 static void remove_tempfile(void)
1753 {
1754 int i;
1756 for (i = 0; i < 2; i++)
1757 if (diff_temp[i].name == diff_temp[i].tmp_path) {
1758 unlink(diff_temp[i].name);
1759 diff_temp[i].name = NULL;
1760 }
1761 }
1763 static void remove_tempfile_on_signal(int signo)
1764 {
1765 remove_tempfile();
1766 signal(SIGINT, SIG_DFL);
1767 raise(signo);
1768 }
1770 /* An external diff command takes:
1771 *
1772 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1773 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1774 *
1775 */
1776 static void run_external_diff(const char *pgm,
1777 const char *name,
1778 const char *other,
1779 struct diff_filespec *one,
1780 struct diff_filespec *two,
1781 const char *xfrm_msg,
1782 int complete_rewrite)
1783 {
1784 const char *spawn_arg[10];
1785 struct diff_tempfile *temp = diff_temp;
1786 int retval;
1787 static int atexit_asked = 0;
1788 const char *othername;
1789 const char **arg = &spawn_arg[0];
1791 othername = (other? other : name);
1792 if (one && two) {
1793 prepare_temp_file(name, &temp[0], one);
1794 prepare_temp_file(othername, &temp[1], two);
1795 if (! atexit_asked &&
1796 (temp[0].name == temp[0].tmp_path ||
1797 temp[1].name == temp[1].tmp_path)) {
1798 atexit_asked = 1;
1799 atexit(remove_tempfile);
1800 }
1801 signal(SIGINT, remove_tempfile_on_signal);
1802 }
1804 if (one && two) {
1805 *arg++ = pgm;
1806 *arg++ = name;
1807 *arg++ = temp[0].name;
1808 *arg++ = temp[0].hex;
1809 *arg++ = temp[0].mode;
1810 *arg++ = temp[1].name;
1811 *arg++ = temp[1].hex;
1812 *arg++ = temp[1].mode;
1813 if (other) {
1814 *arg++ = other;
1815 *arg++ = xfrm_msg;
1816 }
1817 } else {
1818 *arg++ = pgm;
1819 *arg++ = name;
1820 }
1821 *arg = NULL;
1822 fflush(NULL);
1823 retval = run_command_v_opt(spawn_arg, 0);
1824 remove_tempfile();
1825 if (retval) {
1826 fprintf(stderr, "external diff died, stopping at %s.\n", name);
1827 exit(1);
1828 }
1829 }
1831 static const char *external_diff_attr(const char *name)
1832 {
1833 struct git_attr_check attr_diff_check;
1835 if (!name)
1836 return NULL;
1838 setup_diff_attr_check(&attr_diff_check);
1839 if (!git_checkattr(name, 1, &attr_diff_check)) {
1840 const char *value = attr_diff_check.value;
1841 if (!ATTR_TRUE(value) &&
1842 !ATTR_FALSE(value) &&
1843 !ATTR_UNSET(value)) {
1844 struct ll_diff_driver *drv;
1846 for (drv = user_diff; drv; drv = drv->next)
1847 if (!strcmp(drv->name, value))
1848 return drv->cmd;
1849 }
1850 }
1851 return NULL;
1852 }
1854 static void run_diff_cmd(const char *pgm,
1855 const char *name,
1856 const char *other,
1857 const char *attr_path,
1858 struct diff_filespec *one,
1859 struct diff_filespec *two,
1860 const char *xfrm_msg,
1861 struct diff_options *o,
1862 int complete_rewrite)
1863 {
1864 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
1865 pgm = NULL;
1866 else {
1867 const char *cmd = external_diff_attr(attr_path);
1868 if (cmd)
1869 pgm = cmd;
1870 }
1872 if (pgm) {
1873 run_external_diff(pgm, name, other, one, two, xfrm_msg,
1874 complete_rewrite);
1875 return;
1876 }
1877 if (one && two)
1878 builtin_diff(name, other ? other : name,
1879 one, two, xfrm_msg, o, complete_rewrite);
1880 else
1881 printf("* Unmerged path %s\n", name);
1882 }
1884 static void diff_fill_sha1_info(struct diff_filespec *one)
1885 {
1886 if (DIFF_FILE_VALID(one)) {
1887 if (!one->sha1_valid) {
1888 struct stat st;
1889 if (!strcmp(one->path, "-")) {
1890 hashcpy(one->sha1, null_sha1);
1891 return;
1892 }
1893 if (lstat(one->path, &st) < 0)
1894 die("stat %s", one->path);
1895 if (index_path(one->sha1, one->path, &st, 0))
1896 die("cannot hash %s\n", one->path);
1897 }
1898 }
1899 else
1900 hashclr(one->sha1);
1901 }
1903 static int similarity_index(struct diff_filepair *p)
1904 {
1905 return p->score * 100 / MAX_SCORE;
1906 }
1908 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
1909 {
1910 /* Strip the prefix but do not molest /dev/null and absolute paths */
1911 if (*namep && **namep != '/')
1912 *namep += prefix_length;
1913 if (*otherp && **otherp != '/')
1914 *otherp += prefix_length;
1915 }
1917 static void run_diff(struct diff_filepair *p, struct diff_options *o)
1918 {
1919 const char *pgm = external_diff();
1920 struct strbuf msg;
1921 char *xfrm_msg;
1922 struct diff_filespec *one = p->one;
1923 struct diff_filespec *two = p->two;
1924 const char *name;
1925 const char *other;
1926 const char *attr_path;
1927 int complete_rewrite = 0;
1929 name = p->one->path;
1930 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
1931 attr_path = name;
1932 if (o->prefix_length)
1933 strip_prefix(o->prefix_length, &name, &other);
1935 if (DIFF_PAIR_UNMERGED(p)) {
1936 run_diff_cmd(pgm, name, NULL, attr_path,
1937 NULL, NULL, NULL, o, 0);
1938 return;
1939 }
1941 diff_fill_sha1_info(one);
1942 diff_fill_sha1_info(two);
1944 strbuf_init(&msg, PATH_MAX * 2 + 300);
1945 switch (p->status) {
1946 case DIFF_STATUS_COPIED:
1947 strbuf_addf(&msg, "similarity index %d%%", similarity_index(p));
1948 strbuf_addstr(&msg, "\ncopy from ");
1949 quote_c_style(name, &msg, NULL, 0);
1950 strbuf_addstr(&msg, "\ncopy to ");
1951 quote_c_style(other, &msg, NULL, 0);
1952 strbuf_addch(&msg, '\n');
1953 break;
1954 case DIFF_STATUS_RENAMED:
1955 strbuf_addf(&msg, "similarity index %d%%", similarity_index(p));
1956 strbuf_addstr(&msg, "\nrename from ");
1957 quote_c_style(name, &msg, NULL, 0);
1958 strbuf_addstr(&msg, "\nrename to ");
1959 quote_c_style(other, &msg, NULL, 0);
1960 strbuf_addch(&msg, '\n');
1961 break;
1962 case DIFF_STATUS_MODIFIED:
1963 if (p->score) {
1964 strbuf_addf(&msg, "dissimilarity index %d%%\n",
1965 similarity_index(p));
1966 complete_rewrite = 1;
1967 break;
1968 }
1969 /* fallthru */
1970 default:
1971 /* nothing */
1972 ;
1973 }
1975 if (hashcmp(one->sha1, two->sha1)) {
1976 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
1978 if (DIFF_OPT_TST(o, BINARY)) {
1979 mmfile_t mf;
1980 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
1981 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
1982 abbrev = 40;
1983 }
1984 strbuf_addf(&msg, "index %.*s..%.*s",
1985 abbrev, sha1_to_hex(one->sha1),
1986 abbrev, sha1_to_hex(two->sha1));
1987 if (one->mode == two->mode)
1988 strbuf_addf(&msg, " %06o", one->mode);
1989 strbuf_addch(&msg, '\n');
1990 }
1992 if (msg.len)
1993 strbuf_setlen(&msg, msg.len - 1);
1994 xfrm_msg = msg.len ? msg.buf : NULL;
1996 if (!pgm &&
1997 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
1998 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
1999 /* a filepair that changes between file and symlink
2000 * needs to be split into deletion and creation.
2001 */
2002 struct diff_filespec *null = alloc_filespec(two->path);
2003 run_diff_cmd(NULL, name, other, attr_path,
2004 one, null, xfrm_msg, o, 0);
2005 free(null);
2006 null = alloc_filespec(one->path);
2007 run_diff_cmd(NULL, name, other, attr_path,
2008 null, two, xfrm_msg, o, 0);
2009 free(null);
2010 }
2011 else
2012 run_diff_cmd(pgm, name, other, attr_path,
2013 one, two, xfrm_msg, o, complete_rewrite);
2015 strbuf_release(&msg);
2016 }
2018 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
2019 struct diffstat_t *diffstat)
2020 {
2021 const char *name;
2022 const char *other;
2023 int complete_rewrite = 0;
2025 if (DIFF_PAIR_UNMERGED(p)) {
2026 /* unmerged */
2027 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
2028 return;
2029 }
2031 name = p->one->path;
2032 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2034 if (o->prefix_length)
2035 strip_prefix(o->prefix_length, &name, &other);
2037 diff_fill_sha1_info(p->one);
2038 diff_fill_sha1_info(p->two);
2040 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2041 complete_rewrite = 1;
2042 builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
2043 }
2045 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
2046 {
2047 const char *name;
2048 const char *other;
2049 const char *attr_path;
2051 if (DIFF_PAIR_UNMERGED(p)) {
2052 /* unmerged */
2053 return;
2054 }
2056 name = p->one->path;
2057 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2058 attr_path = other ? other : name;
2060 if (o->prefix_length)
2061 strip_prefix(o->prefix_length, &name, &other);
2063 diff_fill_sha1_info(p->one);
2064 diff_fill_sha1_info(p->two);
2066 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
2067 }
2069 void diff_setup(struct diff_options *options)
2070 {
2071 memset(options, 0, sizeof(*options));
2072 options->line_termination = '\n';
2073 options->break_opt = -1;
2074 options->rename_limit = -1;
2075 options->context = 3;
2076 options->msg_sep = "";
2078 options->change = diff_change;
2079 options->add_remove = diff_addremove;
2080 if (diff_use_color_default)
2081 DIFF_OPT_SET(options, COLOR_DIFF);
2082 else
2083 DIFF_OPT_CLR(options, COLOR_DIFF);
2084 options->detect_rename = diff_detect_rename_default;
2086 options->a_prefix = "a/";
2087 options->b_prefix = "b/";
2088 }
2090 int diff_setup_done(struct diff_options *options)
2091 {
2092 int count = 0;
2094 if (options->output_format & DIFF_FORMAT_NAME)
2095 count++;
2096 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
2097 count++;
2098 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
2099 count++;
2100 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
2101 count++;
2102 if (count > 1)
2103 die("--name-only, --name-status, --check and -s are mutually exclusive");
2105 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
2106 options->detect_rename = DIFF_DETECT_COPY;
2108 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
2109 options->prefix = NULL;
2110 if (options->prefix)
2111 options->prefix_length = strlen(options->prefix);
2112 else
2113 options->prefix_length = 0;
2115 if (options->output_format & (DIFF_FORMAT_NAME |
2116 DIFF_FORMAT_NAME_STATUS |
2117 DIFF_FORMAT_CHECKDIFF |
2118 DIFF_FORMAT_NO_OUTPUT))
2119 options->output_format &= ~(DIFF_FORMAT_RAW |
2120 DIFF_FORMAT_NUMSTAT |
2121 DIFF_FORMAT_DIFFSTAT |
2122 DIFF_FORMAT_SHORTSTAT |
2123 DIFF_FORMAT_SUMMARY |
2124 DIFF_FORMAT_PATCH);
2126 /*
2127 * These cases always need recursive; we do not drop caller-supplied
2128 * recursive bits for other formats here.
2129 */
2130 if (options->output_format & (DIFF_FORMAT_PATCH |
2131 DIFF_FORMAT_NUMSTAT |
2132 DIFF_FORMAT_DIFFSTAT |
2133 DIFF_FORMAT_SHORTSTAT |
2134 DIFF_FORMAT_SUMMARY |
2135 DIFF_FORMAT_CHECKDIFF))
2136 DIFF_OPT_SET(options, RECURSIVE);
2137 /*
2138 * Also pickaxe would not work very well if you do not say recursive
2139 */
2140 if (options->pickaxe)
2141 DIFF_OPT_SET(options, RECURSIVE);
2143 if (options->detect_rename && options->rename_limit < 0)
2144 options->rename_limit = diff_rename_limit_default;
2145 if (options->setup & DIFF_SETUP_USE_CACHE) {
2146 if (!active_cache)
2147 /* read-cache does not die even when it fails
2148 * so it is safe for us to do this here. Also
2149 * it does not smudge active_cache or active_nr
2150 * when it fails, so we do not have to worry about
2151 * cleaning it up ourselves either.
2152 */
2153 read_cache();
2154 }
2155 if (options->abbrev <= 0 || 40 < options->abbrev)
2156 options->abbrev = 40; /* full */
2158 /*
2159 * It does not make sense to show the first hit we happened
2160 * to have found. It does not make sense not to return with
2161 * exit code in such a case either.
2162 */
2163 if (DIFF_OPT_TST(options, QUIET)) {
2164 options->output_format = DIFF_FORMAT_NO_OUTPUT;
2165 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2166 }
2168 /*
2169 * If we postprocess in diffcore, we cannot simply return
2170 * upon the first hit. We need to run diff as usual.
2171 */
2172 if (options->pickaxe || options->filter)
2173 DIFF_OPT_CLR(options, QUIET);
2175 return 0;
2176 }
2178 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
2179 {
2180 char c, *eq;
2181 int len;
2183 if (*arg != '-')
2184 return 0;
2185 c = *++arg;
2186 if (!c)
2187 return 0;
2188 if (c == arg_short) {
2189 c = *++arg;
2190 if (!c)
2191 return 1;
2192 if (val && isdigit(c)) {
2193 char *end;
2194 int n = strtoul(arg, &end, 10);
2195 if (*end)
2196 return 0;
2197 *val = n;
2198 return 1;
2199 }
2200 return 0;
2201 }
2202 if (c != '-')
2203 return 0;
2204 arg++;
2205 eq = strchr(arg, '=');
2206 if (eq)
2207 len = eq - arg;
2208 else
2209 len = strlen(arg);
2210 if (!len || strncmp(arg, arg_long, len))
2211 return 0;
2212 if (eq) {
2213 int n;
2214 char *end;
2215 if (!isdigit(*++eq))
2216 return 0;
2217 n = strtoul(eq, &end, 10);
2218 if (*end)
2219 return 0;
2220 *val = n;
2221 }
2222 return 1;
2223 }
2225 static int diff_scoreopt_parse(const char *opt);
2227 int diff_opt_parse(struct diff_options *options, const char **av, int ac)
2228 {
2229 const char *arg = av[0];
2231 /* Output format options */
2232 if (!strcmp(arg, "-p") || !strcmp(arg, "-u"))
2233 options->output_format |= DIFF_FORMAT_PATCH;
2234 else if (opt_arg(arg, 'U', "unified", &options->context))
2235 options->output_format |= DIFF_FORMAT_PATCH;
2236 else if (!strcmp(arg, "--raw"))
2237 options->output_format |= DIFF_FORMAT_RAW;
2238 else if (!strcmp(arg, "--patch-with-raw"))
2239 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
2240 else if (!strcmp(arg, "--numstat"))
2241 options->output_format |= DIFF_FORMAT_NUMSTAT;
2242 else if (!strcmp(arg, "--shortstat"))
2243 options->output_format |= DIFF_FORMAT_SHORTSTAT;
2244 else if (!strcmp(arg, "--check"))
2245 options->output_format |= DIFF_FORMAT_CHECKDIFF;
2246 else if (!strcmp(arg, "--summary"))
2247 options->output_format |= DIFF_FORMAT_SUMMARY;
2248 else if (!strcmp(arg, "--patch-with-stat"))
2249 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
2250 else if (!strcmp(arg, "--name-only"))
2251 options->output_format |= DIFF_FORMAT_NAME;
2252 else if (!strcmp(arg, "--name-status"))
2253 options->output_format |= DIFF_FORMAT_NAME_STATUS;
2254 else if (!strcmp(arg, "-s"))
2255 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
2256 else if (!prefixcmp(arg, "--stat")) {
2257 char *end;
2258 int width = options->stat_width;
2259 int name_width = options->stat_name_width;
2260 arg += 6;
2261 end = (char *)arg;
2263 switch (*arg) {
2264 case '-':
2265 if (!prefixcmp(arg, "-width="))
2266 width = strtoul(arg + 7, &end, 10);
2267 else if (!prefixcmp(arg, "-name-width="))
2268 name_width = strtoul(arg + 12, &end, 10);
2269 break;
2270 case '=':
2271 width = strtoul(arg+1, &end, 10);
2272 if (*end == ',')
2273 name_width = strtoul(end+1, &end, 10);
2274 }
2276 /* Important! This checks all the error cases! */
2277 if (*end)
2278 return 0;
2279 options->output_format |= DIFF_FORMAT_DIFFSTAT;
2280 options->stat_name_width = name_width;
2281 options->stat_width = width;
2282 }
2284 /* renames options */
2285 else if (!prefixcmp(arg, "-B")) {
2286 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
2287 return -1;
2288 }
2289 else if (!prefixcmp(arg, "-M")) {
2290 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2291 return -1;
2292 options->detect_rename = DIFF_DETECT_RENAME;
2293 }
2294 else if (!prefixcmp(arg, "-C")) {
2295 if (options->detect_rename == DIFF_DETECT_COPY)
2296 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2297 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2298 return -1;
2299 options->detect_rename = DIFF_DETECT_COPY;
2300 }
2301 else if (!strcmp(arg, "--no-renames"))
2302 options->detect_rename = 0;
2303 else if (!strcmp(arg, "--relative"))
2304 DIFF_OPT_SET(options, RELATIVE_NAME);
2306 /* xdiff options */
2307 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
2308 options->xdl_opts |= XDF_IGNORE_WHITESPACE;
2309 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
2310 options->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2311 else if (!strcmp(arg, "--ignore-space-at-eol"))
2312 options->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2314 /* flags options */
2315 else if (!strcmp(arg, "--binary")) {
2316 options->output_format |= DIFF_FORMAT_PATCH;
2317 DIFF_OPT_SET(options, BINARY);
2318 }
2319 else if (!strcmp(arg, "--full-index"))
2320 DIFF_OPT_SET(options, FULL_INDEX);
2321 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
2322 DIFF_OPT_SET(options, TEXT);
2323 else if (!strcmp(arg, "-R"))
2324 DIFF_OPT_SET(options, REVERSE_DIFF);
2325 else if (!strcmp(arg, "--find-copies-harder"))
2326 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2327 else if (!strcmp(arg, "--follow"))
2328 DIFF_OPT_SET(options, FOLLOW_RENAMES);
2329 else if (!strcmp(arg, "--color"))
2330 DIFF_OPT_SET(options, COLOR_DIFF);
2331 else if (!strcmp(arg, "--no-color"))
2332 DIFF_OPT_CLR(options, COLOR_DIFF);
2333 else if (!strcmp(arg, "--color-words"))
2334 options->flags |= DIFF_OPT_COLOR_DIFF | DIFF_OPT_COLOR_DIFF_WORDS;
2335 else if (!strcmp(arg, "--exit-code"))
2336 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2337 else if (!strcmp(arg, "--quiet"))
2338 DIFF_OPT_SET(options, QUIET);
2339 else if (!strcmp(arg, "--ext-diff"))
2340 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
2341 else if (!strcmp(arg, "--no-ext-diff"))
2342 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
2344 /* misc options */
2345 else if (!strcmp(arg, "-z"))
2346 options->line_termination = 0;
2347 else if (!prefixcmp(arg, "-l"))
2348 options->rename_limit = strtoul(arg+2, NULL, 10);
2349 else if (!prefixcmp(arg, "-S"))
2350 options->pickaxe = arg + 2;
2351 else if (!strcmp(arg, "--pickaxe-all"))
2352 options->pickaxe_opts = DIFF_PICKAXE_ALL;
2353 else if (!strcmp(arg, "--pickaxe-regex"))
2354 options->pickaxe_opts = DIFF_PICKAXE_REGEX;
2355 else if (!prefixcmp(arg, "-O"))
2356 options->orderfile = arg + 2;
2357 else if (!prefixcmp(arg, "--diff-filter="))
2358 options->filter = arg + 14;
2359 else if (!strcmp(arg, "--abbrev"))
2360 options->abbrev = DEFAULT_ABBREV;
2361 else if (!prefixcmp(arg, "--abbrev=")) {
2362 options->abbrev = strtoul(arg + 9, NULL, 10);
2363 if (options->abbrev < MINIMUM_ABBREV)
2364 options->abbrev = MINIMUM_ABBREV;
2365 else if (40 < options->abbrev)
2366 options->abbrev = 40;
2367 }
2368 else if (!prefixcmp(arg, "--src-prefix="))
2369 options->a_prefix = arg + 13;
2370 else if (!prefixcmp(arg, "--dst-prefix="))
2371 options->b_prefix = arg + 13;
2372 else if (!strcmp(arg, "--no-prefix"))
2373 options->a_prefix = options->b_prefix = "";
2374 else
2375 return 0;
2376 return 1;
2377 }
2379 static int parse_num(const char **cp_p)
2380 {
2381 unsigned long num, scale;
2382 int ch, dot;
2383 const char *cp = *cp_p;
2385 num = 0;
2386 scale = 1;
2387 dot = 0;
2388 for(;;) {
2389 ch = *cp;
2390 if ( !dot && ch == '.' ) {
2391 scale = 1;
2392 dot = 1;
2393 } else if ( ch == '%' ) {
2394 scale = dot ? scale*100 : 100;
2395 cp++; /* % is always at the end */
2396 break;
2397 } else if ( ch >= '0' && ch <= '9' ) {
2398 if ( scale < 100000 ) {
2399 scale *= 10;
2400 num = (num*10) + (ch-'0');
2401 }
2402 } else {
2403 break;
2404 }
2405 cp++;
2406 }
2407 *cp_p = cp;
2409 /* user says num divided by scale and we say internally that
2410 * is MAX_SCORE * num / scale.
2411 */
2412 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
2413 }
2415 static int diff_scoreopt_parse(const char *opt)
2416 {
2417 int opt1, opt2, cmd;
2419 if (*opt++ != '-')
2420 return -1;
2421 cmd = *opt++;
2422 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
2423 return -1; /* that is not a -M, -C nor -B option */
2425 opt1 = parse_num(&opt);
2426 if (cmd != 'B')
2427 opt2 = 0;
2428 else {
2429 if (*opt == 0)
2430 opt2 = 0;
2431 else if (*opt != '/')
2432 return -1; /* we expect -B80/99 or -B80 */
2433 else {
2434 opt++;
2435 opt2 = parse_num(&opt);
2436 }
2437 }
2438 if (*opt != 0)
2439 return -1;
2440 return opt1 | (opt2 << 16);
2441 }
2443 struct diff_queue_struct diff_queued_diff;
2445 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
2446 {
2447 if (queue->alloc <= queue->nr) {
2448 queue->alloc = alloc_nr(queue->alloc);
2449 queue->queue = xrealloc(queue->queue,
2450 sizeof(dp) * queue->alloc);
2451 }
2452 queue->queue[queue->nr++] = dp;
2453 }
2455 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
2456 struct diff_filespec *one,
2457 struct diff_filespec *two)
2458 {
2459 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
2460 dp->one = one;
2461 dp->two = two;
2462 if (queue)
2463 diff_q(queue, dp);
2464 return dp;
2465 }
2467 void diff_free_filepair(struct diff_filepair *p)
2468 {
2469 free_filespec(p->one);
2470 free_filespec(p->two);
2471 free(p);
2472 }
2474 /* This is different from find_unique_abbrev() in that
2475 * it stuffs the result with dots for alignment.
2476 */
2477 const char *diff_unique_abbrev(const unsigned char *sha1, int len)
2478 {
2479 int abblen;
2480 const char *abbrev;
2481 if (len == 40)
2482 return sha1_to_hex(sha1);
2484 abbrev = find_unique_abbrev(sha1, len);
2485 if (!abbrev)
2486 return sha1_to_hex(sha1);
2487 abblen = strlen(abbrev);
2488 if (abblen < 37) {
2489 static char hex[41];
2490 if (len < abblen && abblen <= len + 2)
2491 sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
2492 else
2493 sprintf(hex, "%s...", abbrev);
2494 return hex;
2495 }
2496 return sha1_to_hex(sha1);
2497 }
2499 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
2500 {
2501 int line_termination = opt->line_termination;
2502 int inter_name_termination = line_termination ? '\t' : '\0';
2504 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
2505 printf(":%06o %06o %s ", p->one->mode, p->two->mode,
2506 diff_unique_abbrev(p->one->sha1, opt->abbrev));
2507 printf("%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
2508 }
2509 if (p->score) {
2510 printf("%c%03d%c", p->status, similarity_index(p),
2511 inter_name_termination);
2512 } else {
2513 printf("%c%c", p->status, inter_name_termination);
2514 }
2516 if (p->status == DIFF_STATUS_COPIED ||
2517 p->status == DIFF_STATUS_RENAMED) {
2518 const char *name_a, *name_b;
2519 name_a = p->one->path;
2520 name_b = p->two->path;
2521 strip_prefix(opt->prefix_length, &name_a, &name_b);
2522 write_name_quoted(name_a, stdout, inter_name_termination);
2523 write_name_quoted(name_b, stdout, line_termination);
2524 } else {
2525 const char *name_a, *name_b;
2526 name_a = p->one->mode ? p->one->path : p->two->path;
2527 name_b = NULL;
2528 strip_prefix(opt->prefix_length, &name_a, &name_b);
2529 write_name_quoted(name_a, stdout, line_termination);
2530 }
2531 }
2533 int diff_unmodified_pair(struct diff_filepair *p)
2534 {
2535 /* This function is written stricter than necessary to support
2536 * the currently implemented transformers, but the idea is to
2537 * let transformers to produce diff_filepairs any way they want,
2538 * and filter and clean them up here before producing the output.
2539 */
2540 struct diff_filespec *one = p->one, *two = p->two;
2542 if (DIFF_PAIR_UNMERGED(p))
2543 return 0; /* unmerged is interesting */
2545 /* deletion, addition, mode or type change
2546 * and rename are all interesting.
2547 */
2548 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
2549 DIFF_PAIR_MODE_CHANGED(p) ||
2550 strcmp(one->path, two->path))
2551 return 0;
2553 /* both are valid and point at the same path. that is, we are
2554 * dealing with a change.
2555 */
2556 if (one->sha1_valid && two->sha1_valid &&
2557 !hashcmp(one->sha1, two->sha1))
2558 return 1; /* no change */
2559 if (!one->sha1_valid && !two->sha1_valid)
2560 return 1; /* both look at the same file on the filesystem. */
2561 return 0;
2562 }
2564 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
2565 {
2566 if (diff_unmodified_pair(p))
2567 return;
2569 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2570 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2571 return; /* no tree diffs in patch format */
2573 run_diff(p, o);
2574 }
2576 static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
2577 struct diffstat_t *diffstat)
2578 {
2579 if (diff_unmodified_pair(p))
2580 return;
2582 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2583 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2584 return; /* no tree diffs in patch format */
2586 run_diffstat(p, o, diffstat);
2587 }
2589 static void diff_flush_checkdiff(struct diff_filepair *p,
2590 struct diff_options *o)
2591 {
2592 if (diff_unmodified_pair(p))
2593 return;
2595 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2596 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2597 return; /* no tree diffs in patch format */
2599 run_checkdiff(p, o);
2600 }
2602 int diff_queue_is_empty(void)
2603 {
2604 struct diff_queue_struct *q = &diff_queued_diff;
2605 int i;
2606 for (i = 0; i < q->nr; i++)
2607 if (!diff_unmodified_pair(q->queue[i]))
2608 return 0;
2609 return 1;
2610 }
2612 #if DIFF_DEBUG
2613 void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
2614 {
2615 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
2616 x, one ? one : "",
2617 s->path,
2618 DIFF_FILE_VALID(s) ? "valid" : "invalid",
2619 s->mode,
2620 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
2621 fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
2622 x, one ? one : "",
2623 s->size, s->xfrm_flags);
2624 }
2626 void diff_debug_filepair(const struct diff_filepair *p, int i)
2627 {
2628 diff_debug_filespec(p->one, i, "one");
2629 diff_debug_filespec(p->two, i, "two");
2630 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
2631 p->score, p->status ? p->status : '?',
2632 p->one->rename_used, p->broken_pair);
2633 }
2635 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
2636 {
2637 int i;
2638 if (msg)
2639 fprintf(stderr, "%s\n", msg);
2640 fprintf(stderr, "q->nr = %d\n", q->nr);
2641 for (i = 0; i < q->nr; i++) {
2642 struct diff_filepair *p = q->queue[i];
2643 diff_debug_filepair(p, i);
2644 }
2645 }
2646 #endif
2648 static void diff_resolve_rename_copy(void)
2649 {
2650 int i;
2651 struct diff_filepair *p;
2652 struct diff_queue_struct *q = &diff_queued_diff;
2654 diff_debug_queue("resolve-rename-copy", q);
2656 for (i = 0; i < q->nr; i++) {
2657 p = q->queue[i];
2658 p->status = 0; /* undecided */
2659 if (DIFF_PAIR_UNMERGED(p))
2660 p->status = DIFF_STATUS_UNMERGED;
2661 else if (!DIFF_FILE_VALID(p->one))
2662 p->status = DIFF_STATUS_ADDED;
2663 else if (!DIFF_FILE_VALID(p->two))
2664 p->status = DIFF_STATUS_DELETED;
2665 else if (DIFF_PAIR_TYPE_CHANGED(p))
2666 p->status = DIFF_STATUS_TYPE_CHANGED;
2668 /* from this point on, we are dealing with a pair
2669 * whose both sides are valid and of the same type, i.e.
2670 * either in-place edit or rename/copy edit.
2671 */
2672 else if (DIFF_PAIR_RENAME(p)) {
2673 /*
2674 * A rename might have re-connected a broken
2675 * pair up, causing the pathnames to be the
2676 * same again. If so, that's not a rename at
2677 * all, just a modification..
2678 *
2679 * Otherwise, see if this source was used for
2680 * multiple renames, in which case we decrement
2681 * the count, and call it a copy.
2682 */
2683 if (!strcmp(p->one->path, p->two->path))
2684 p->status = DIFF_STATUS_MODIFIED;
2685 else if (--p->one->rename_used > 0)
2686 p->status = DIFF_STATUS_COPIED;
2687 else
2688 p->status = DIFF_STATUS_RENAMED;
2689 }
2690 else if (hashcmp(p->one->sha1, p->two->sha1) ||
2691 p->one->mode != p->two->mode ||
2692 is_null_sha1(p->one->sha1))
2693 p->status = DIFF_STATUS_MODIFIED;
2694 else {
2695 /* This is a "no-change" entry and should not
2696 * happen anymore, but prepare for broken callers.
2697 */
2698 error("feeding unmodified %s to diffcore",
2699 p->one->path);
2700 p->status = DIFF_STATUS_UNKNOWN;
2701 }
2702 }
2703 diff_debug_queue("resolve-rename-copy done", q);
2704 }
2706 static int check_pair_status(struct diff_filepair *p)
2707 {
2708 switch (p->status) {
2709 case DIFF_STATUS_UNKNOWN:
2710 return 0;
2711 case 0:
2712 die("internal error in diff-resolve-rename-copy");
2713 default:
2714 return 1;
2715 }
2716 }
2718 static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
2719 {
2720 int fmt = opt->output_format;
2722 if (fmt & DIFF_FORMAT_CHECKDIFF)
2723 diff_flush_checkdiff(p, opt);
2724 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
2725 diff_flush_raw(p, opt);
2726 else if (fmt & DIFF_FORMAT_NAME) {
2727 const char *name_a, *name_b;
2728 name_a = p->two->path;
2729 name_b = NULL;
2730 strip_prefix(opt->prefix_length, &name_a, &name_b);
2731 write_name_quoted(name_a, stdout, opt->line_termination);
2732 }
2733 }
2735 static void show_file_mode_name(const char *newdelete, struct diff_filespec *fs)
2736 {
2737 if (fs->mode)
2738 printf(" %s mode %06o ", newdelete, fs->mode);
2739 else
2740 printf(" %s ", newdelete);
2741 write_name_quoted(fs->path, stdout, '\n');
2742 }
2745 static void show_mode_change(struct diff_filepair *p, int show_name)
2746 {
2747 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
2748 printf(" mode change %06o => %06o%c", p->one->mode, p->two->mode,
2749 show_name ? ' ' : '\n');
2750 if (show_name) {
2751 write_name_quoted(p->two->path, stdout, '\n');
2752 }
2753 }
2754 }
2756 static void show_rename_copy(const char *renamecopy, struct diff_filepair *p)
2757 {
2758 char *names = pprint_rename(p->one->path, p->two->path);
2760 printf(" %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
2761 free(names);
2762 show_mode_change(p, 0);
2763 }
2765 static void diff_summary(struct diff_filepair *p)
2766 {
2767 switch(p->status) {
2768 case DIFF_STATUS_DELETED:
2769 show_file_mode_name("delete", p->one);
2770 break;
2771 case DIFF_STATUS_ADDED:
2772 show_file_mode_name("create", p->two);
2773 break;
2774 case DIFF_STATUS_COPIED:
2775 show_rename_copy("copy", p);
2776 break;
2777 case DIFF_STATUS_RENAMED:
2778 show_rename_copy("rename", p);
2779 break;
2780 default:
2781 if (p->score) {
2782 fputs(" rewrite ", stdout);
2783 write_name_quoted(p->two->path, stdout, ' ');
2784 printf("(%d%%)\n", similarity_index(p));
2785 }
2786 show_mode_change(p, !p->score);
2787 break;
2788 }
2789 }
2791 struct patch_id_t {
2792 struct xdiff_emit_state xm;
2793 SHA_CTX *ctx;
2794 int patchlen;
2795 };
2797 static int remove_space(char *line, int len)
2798 {
2799 int i;
2800 char *dst = line;
2801 unsigned char c;
2803 for (i = 0; i < len; i++)
2804 if (!isspace((c = line[i])))
2805 *dst++ = c;
2807 return dst - line;
2808 }
2810 static void patch_id_consume(void *priv, char *line, unsigned long len)
2811 {
2812 struct patch_id_t *data = priv;
2813 int new_len;
2815 /* Ignore line numbers when computing the SHA1 of the patch */
2816 if (!prefixcmp(line, "@@ -"))
2817 return;
2819 new_len = remove_space(line, len);
2821 SHA1_Update(data->ctx, line, new_len);
2822 data->patchlen += new_len;
2823 }
2825 /* returns 0 upon success, and writes result into sha1 */
2826 static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
2827 {
2828 struct diff_queue_struct *q = &diff_queued_diff;
2829 int i;
2830 SHA_CTX ctx;
2831 struct patch_id_t data;
2832 char buffer[PATH_MAX * 4 + 20];
2834 SHA1_Init(&ctx);
2835 memset(&data, 0, sizeof(struct patch_id_t));
2836 data.ctx = &ctx;
2837 data.xm.consume = patch_id_consume;
2839 for (i = 0; i < q->nr; i++) {
2840 xpparam_t xpp;
2841 xdemitconf_t xecfg;
2842 xdemitcb_t ecb;
2843 mmfile_t mf1, mf2;
2844 struct diff_filepair *p = q->queue[i];
2845 int len1, len2;
2847 memset(&xecfg, 0, sizeof(xecfg));
2848 if (p->status == 0)
2849 return error("internal diff status error");
2850 if (p->status == DIFF_STATUS_UNKNOWN)
2851 continue;
2852 if (diff_unmodified_pair(p))
2853 continue;
2854 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2855 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2856 continue;
2857 if (DIFF_PAIR_UNMERGED(p))
2858 continue;
2860 diff_fill_sha1_info(p->one);
2861 diff_fill_sha1_info(p->two);
2862 if (fill_mmfile(&mf1, p->one) < 0 ||
2863 fill_mmfile(&mf2, p->two) < 0)
2864 return error("unable to read files to diff");
2866 len1 = remove_space(p->one->path, strlen(p->one->path));
2867 len2 = remove_space(p->two->path, strlen(p->two->path));
2868 if (p->one->mode == 0)
2869 len1 = snprintf(buffer, sizeof(buffer),
2870 "diff--gita/%.*sb/%.*s"
2871 "newfilemode%06o"
2872 "---/dev/null"
2873 "+++b/%.*s",
2874 len1, p->one->path,
2875 len2, p->two->path,
2876 p->two->mode,
2877 len2, p->two->path);
2878 else if (p->two->mode == 0)
2879 len1 = snprintf(buffer, sizeof(buffer),
2880 "diff--gita/%.*sb/%.*s"
2881 "deletedfilemode%06o"
2882 "---a/%.*s"
2883 "+++/dev/null",
2884 len1, p->one->path,
2885 len2, p->two->path,
2886 p->one->mode,
2887 len1, p->one->path);
2888 else
2889 len1 = snprintf(buffer, sizeof(buffer),
2890 "diff--gita/%.*sb/%.*s"
2891 "---a/%.*s"
2892 "+++b/%.*s",
2893 len1, p->one->path,
2894 len2, p->two->path,
2895 len1, p->one->path,
2896 len2, p->two->path);
2897 SHA1_Update(&ctx, buffer, len1);
2899 xpp.flags = XDF_NEED_MINIMAL;
2900 xecfg.ctxlen = 3;
2901 xecfg.flags = XDL_EMIT_FUNCNAMES;
2902 ecb.outf = xdiff_outf;
2903 ecb.priv = &data;
2904 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
2905 }
2907 SHA1_Final(sha1, &ctx);
2908 return 0;
2909 }
2911 int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
2912 {
2913 struct diff_queue_struct *q = &diff_queued_diff;
2914 int i;
2915 int result = diff_get_patch_id(options, sha1);
2917 for (i = 0; i < q->nr; i++)
2918 diff_free_filepair(q->queue[i]);
2920 free(q->queue);
2921 q->queue = NULL;
2922 q->nr = q->alloc = 0;
2924 return result;
2925 }
2927 static int is_summary_empty(const struct diff_queue_struct *q)
2928 {
2929 int i;
2931 for (i = 0; i < q->nr; i++) {
2932 const struct diff_filepair *p = q->queue[i];
2934 switch (p->status) {
2935 case DIFF_STATUS_DELETED:
2936 case DIFF_STATUS_ADDED:
2937 case DIFF_STATUS_COPIED:
2938 case DIFF_STATUS_RENAMED:
2939 return 0;
2940 default:
2941 if (p->score)
2942 return 0;
2943 if (p->one->mode && p->two->mode &&
2944 p->one->mode != p->two->mode)
2945 return 0;
2946 break;
2947 }
2948 }
2949 return 1;
2950 }
2952 void diff_flush(struct diff_options *options)
2953 {
2954 struct diff_queue_struct *q = &diff_queued_diff;
2955 int i, output_format = options->output_format;
2956 int separator = 0;
2958 /*
2959 * Order: raw, stat, summary, patch
2960 * or: name/name-status/checkdiff (other bits clear)
2961 */
2962 if (!q->nr)
2963 goto free_queue;
2965 if (output_format & (DIFF_FORMAT_RAW |
2966 DIFF_FORMAT_NAME |
2967 DIFF_FORMAT_NAME_STATUS |
2968 DIFF_FORMAT_CHECKDIFF)) {
2969 for (i = 0; i < q->nr; i++) {
2970 struct diff_filepair *p = q->queue[i];
2971 if (check_pair_status(p))
2972 flush_one_pair(p, options);
2973 }
2974 separator++;
2975 }
2977 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) {
2978 struct diffstat_t diffstat;
2980 memset(&diffstat, 0, sizeof(struct diffstat_t));
2981 diffstat.xm.consume = diffstat_consume;
2982 for (i = 0; i < q->nr; i++) {
2983 struct diff_filepair *p = q->queue[i];
2984 if (check_pair_status(p))
2985 diff_flush_stat(p, options, &diffstat);
2986 }
2987 if (output_format & DIFF_FORMAT_NUMSTAT)
2988 show_numstat(&diffstat, options);
2989 if (output_format & DIFF_FORMAT_DIFFSTAT)
2990 show_stats(&diffstat, options);
2991 if (output_format & DIFF_FORMAT_SHORTSTAT)
2992 show_shortstats(&diffstat);
2993 free_diffstat_info(&diffstat);
2994 separator++;
2995 }
2997 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
2998 for (i = 0; i < q->nr; i++)
2999 diff_summary(q->queue[i]);
3000 separator++;
3001 }
3003 if (output_format & DIFF_FORMAT_PATCH) {
3004 if (separator) {
3005 if (options->stat_sep) {
3006 /* attach patch instead of inline */
3007 fputs(options->stat_sep, stdout);
3008 } else {
3009 putchar(options->line_termination);
3010 }
3011 }
3013 for (i = 0; i < q->nr; i++) {
3014 struct diff_filepair *p = q->queue[i];
3015 if (check_pair_status(p))
3016 diff_flush_patch(p, options);
3017 }
3018 }
3020 if (output_format & DIFF_FORMAT_CALLBACK)
3021 options->format_callback(q, options, options->format_callback_data);
3023 for (i = 0; i < q->nr; i++)
3024 diff_free_filepair(q->queue[i]);
3025 free_queue:
3026 free(q->queue);
3027 q->queue = NULL;
3028 q->nr = q->alloc = 0;
3029 }
3031 static void diffcore_apply_filter(const char *filter)
3032 {
3033 int i;
3034 struct diff_queue_struct *q = &diff_queued_diff;
3035 struct diff_queue_struct outq;
3036 outq.queue = NULL;
3037 outq.nr = outq.alloc = 0;
3039 if (!filter)
3040 return;
3042 if (strchr(filter, DIFF_STATUS_FILTER_AON)) {
3043 int found;
3044 for (i = found = 0; !found && i < q->nr; i++) {
3045 struct diff_filepair *p = q->queue[i];
3046 if (((p->status == DIFF_STATUS_MODIFIED) &&
3047 ((p->score &&
3048 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3049 (!p->score &&
3050 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3051 ((p->status != DIFF_STATUS_MODIFIED) &&
3052 strchr(filter, p->status)))
3053 found++;
3054 }
3055 if (found)
3056 return;
3058 /* otherwise we will clear the whole queue
3059 * by copying the empty outq at the end of this
3060 * function, but first clear the current entries
3061 * in the queue.
3062 */
3063 for (i = 0; i < q->nr; i++)
3064 diff_free_filepair(q->queue[i]);
3065 }
3066 else {
3067 /* Only the matching ones */
3068 for (i = 0; i < q->nr; i++) {
3069 struct diff_filepair *p = q->queue[i];
3071 if (((p->status == DIFF_STATUS_MODIFIED) &&
3072 ((p->score &&
3073 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3074 (!p->score &&
3075 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3076 ((p->status != DIFF_STATUS_MODIFIED) &&
3077 strchr(filter, p->status)))
3078 diff_q(&outq, p);
3079 else
3080 diff_free_filepair(p);
3081 }
3082 }
3083 free(q->queue);
3084 *q = outq;
3085 }
3087 /* Check whether two filespecs with the same mode and size are identical */
3088 static int diff_filespec_is_identical(struct diff_filespec *one,
3089 struct diff_filespec *two)
3090 {
3091 if (S_ISGITLINK(one->mode)) {
3092 diff_fill_sha1_info(one);
3093 diff_fill_sha1_info(two);
3094 return !hashcmp(one->sha1, two->sha1);
3095 }
3096 if (diff_populate_filespec(one, 0))
3097 return 0;
3098 if (diff_populate_filespec(two, 0))
3099 return 0;
3100 return !memcmp(one->data, two->data, one->size);
3101 }
3103 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3104 {
3105 int i;
3106 struct diff_queue_struct *q = &diff_queued_diff;
3107 struct diff_queue_struct outq;
3108 outq.queue = NULL;
3109 outq.nr = outq.alloc = 0;
3111 for (i = 0; i < q->nr; i++) {
3112 struct diff_filepair *p = q->queue[i];
3114 /*
3115 * 1. Entries that come from stat info dirtyness
3116 * always have both sides (iow, not create/delete),
3117 * one side of the object name is unknown, with
3118 * the same mode and size. Keep the ones that
3119 * do not match these criteria. They have real
3120 * differences.
3121 *
3122 * 2. At this point, the file is known to be modified,
3123 * with the same mode and size, and the object
3124 * name of one side is unknown. Need to inspect
3125 * the identical contents.
3126 */
3127 if (!DIFF_FILE_VALID(p->one) || /* (1) */
3128 !DIFF_FILE_VALID(p->two) ||
3129 (p->one->sha1_valid && p->two->sha1_valid) ||
3130 (p->one->mode != p->two->mode) ||
3131 diff_populate_filespec(p->one, 1) ||
3132 diff_populate_filespec(p->two, 1) ||
3133 (p->one->size != p->two->size) ||
3134 !diff_filespec_is_identical(p->one, p->two)) /* (2) */
3135 diff_q(&outq, p);
3136 else {
3137 /*
3138 * The caller can subtract 1 from skip_stat_unmatch
3139 * to determine how many paths were dirty only
3140 * due to stat info mismatch.
3141 */
3142 if (!DIFF_OPT_TST(diffopt, NO_INDEX))
3143 diffopt->skip_stat_unmatch++;
3144 diff_free_filepair(p);
3145 }
3146 }
3147 free(q->queue);
3148 *q = outq;
3149 }
3151 void diffcore_std(struct diff_options *options)
3152 {
3153 if (DIFF_OPT_TST(options, QUIET))
3154 return;
3156 if (options->skip_stat_unmatch && !DIFF_OPT_TST(options, FIND_COPIES_HARDER))
3157 diffcore_skip_stat_unmatch(options);
3158 if (options->break_opt != -1)
3159 diffcore_break(options->break_opt);
3160 if (options->detect_rename)
3161 diffcore_rename(options);
3162 if (options->break_opt != -1)
3163 diffcore_merge_broken();
3164 if (options->pickaxe)
3165 diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
3166 if (options->orderfile)
3167 diffcore_order(options->orderfile);
3168 diff_resolve_rename_copy();
3169 diffcore_apply_filter(options->filter);
3171 if (diff_queued_diff.nr)
3172 DIFF_OPT_SET(options, HAS_CHANGES);
3173 else
3174 DIFF_OPT_CLR(options, HAS_CHANGES);
3175 }
3177 int diff_result_code(struct diff_options *opt, int status)
3178 {
3179 int result = 0;
3180 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3181 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
3182 return status;
3183 if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3184 DIFF_OPT_TST(opt, HAS_CHANGES))
3185 result |= 01;
3186 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
3187 DIFF_OPT_TST(opt, CHECK_FAILED))
3188 result |= 02;
3189 return result;
3190 }
3192 void diff_addremove(struct diff_options *options,
3193 int addremove, unsigned mode,
3194 const unsigned char *sha1,
3195 const char *base, const char *path)
3196 {
3197 char concatpath[PATH_MAX];
3198 struct diff_filespec *one, *two;
3200 /* This may look odd, but it is a preparation for
3201 * feeding "there are unchanged files which should
3202 * not produce diffs, but when you are doing copy
3203 * detection you would need them, so here they are"
3204 * entries to the diff-core. They will be prefixed
3205 * with something like '=' or '*' (I haven't decided
3206 * which but should not make any difference).
3207 * Feeding the same new and old to diff_change()
3208 * also has the same effect.
3209 * Before the final output happens, they are pruned after
3210 * merged into rename/copy pairs as appropriate.
3211 */
3212 if (DIFF_OPT_TST(options, REVERSE_DIFF))
3213 addremove = (addremove == '+' ? '-' :
3214 addremove == '-' ? '+' : addremove);
3216 if (!path) path = "";
3217 sprintf(concatpath, "%s%s", base, path);
3219 if (options->prefix &&
3220 strncmp(concatpath, options->prefix, options->prefix_length))
3221 return;
3223 one = alloc_filespec(concatpath);
3224 two = alloc_filespec(concatpath);
3226 if (addremove != '+')
3227 fill_filespec(one, sha1, mode);
3228 if (addremove != '-')
3229 fill_filespec(two, sha1, mode);
3231 diff_queue(&diff_queued_diff, one, two);
3232 DIFF_OPT_SET(options, HAS_CHANGES);
3233 }
3235 void diff_change(struct diff_options *options,
3236 unsigned old_mode, unsigned new_mode,
3237 const unsigned char *old_sha1,
3238 const unsigned char *new_sha1,
3239 const char *base, const char *path)
3240 {
3241 char concatpath[PATH_MAX];
3242 struct diff_filespec *one, *two;
3244 if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
3245 unsigned tmp;
3246 const unsigned char *tmp_c;
3247 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
3248 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
3249 }
3250 if (!path) path = "";
3251 sprintf(concatpath, "%s%s", base, path);
3253 if (options->prefix &&
3254 strncmp(concatpath, options->prefix, options->prefix_length))
3255 return;
3257 one = alloc_filespec(concatpath);
3258 two = alloc_filespec(concatpath);
3259 fill_filespec(one, old_sha1, old_mode);
3260 fill_filespec(two, new_sha1, new_mode);
3262 diff_queue(&diff_queued_diff, one, two);
3263 DIFF_OPT_SET(options, HAS_CHANGES);
3264 }
3266 void diff_unmerge(struct diff_options *options,
3267 const char *path,
3268 unsigned mode, const unsigned char *sha1)
3269 {
3270 struct diff_filespec *one, *two;
3272 if (options->prefix &&
3273 strncmp(path, options->prefix, options->prefix_length))
3274 return;
3276 one = alloc_filespec(path);
3277 two = alloc_filespec(path);
3278 fill_filespec(one, sha1, mode);
3279 diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;
3280 }