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