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