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