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