git-apply: more consistency checks on gitdiff filenames
[git/git.git] / diff.c
CommitLineData
be3cfa85
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4#include <sys/types.h>
5#include <sys/wait.h>
532149d7 6#include <signal.h>
86436c28
JH
7#include "cache.h"
8#include "diff.h"
427dcb4b 9#include "diffcore.h"
86436c28 10
d19938ab 11static const char *diff_opts = "-pu";
5c97558c 12static unsigned char null_sha1[20] = { 0, };
427dcb4b 13
427dcb4b 14static int reverse_diff;
86436c28 15
be3cfa85 16static const char *external_diff(void)
86436c28 17{
d19938ab 18 static const char *external_diff_cmd = NULL;
be3cfa85
JH
19 static int done_preparing = 0;
20
21 if (done_preparing)
22 return external_diff_cmd;
23
86436c28
JH
24 /*
25 * Default values above are meant to match the
26 * Linux kernel development style. Examples of
27 * alternative styles you can specify via environment
28 * variables are:
29 *
86436c28
JH
30 * GIT_DIFF_OPTS="-c";
31 */
d19938ab
JH
32 if (gitenv("GIT_EXTERNAL_DIFF"))
33 external_diff_cmd = gitenv("GIT_EXTERNAL_DIFF");
be3cfa85
JH
34
35 /* In case external diff fails... */
d19938ab 36 diff_opts = gitenv("GIT_DIFF_OPTS") ? : diff_opts;
be3cfa85
JH
37
38 done_preparing = 1;
39 return external_diff_cmd;
86436c28
JH
40}
41
42/* Help to copy the thing properly quoted for the shell safety.
43 * any single quote is replaced with '\'', and the caller is
44 * expected to enclose the result within a single quote pair.
45 *
46 * E.g.
47 * original sq_expand result
48 * name ==> name ==> 'name'
49 * a b ==> a b ==> 'a b'
50 * a'b ==> a'\''b ==> 'a'\''b'
51 */
52static char *sq_expand(const char *src)
53{
54 static char *buf = NULL;
55 int cnt, c;
56 const char *cp;
57 char *bp;
58
57fe64a4 59 /* count bytes needed to store the quoted string. */
86436c28
JH
60 for (cnt = 1, cp = src; *cp; cnt++, cp++)
61 if (*cp == '\'')
62 cnt += 3;
63
812666c8 64 buf = xmalloc(cnt);
86436c28
JH
65 bp = buf;
66 while ((c = *src++)) {
67 if (c != '\'')
68 *bp++ = c;
69 else {
70 bp = strcpy(bp, "'\\''");
71 bp += 4;
72 }
73 }
74 *bp = 0;
75 return buf;
76}
77
be3cfa85 78static struct diff_tempfile {
427dcb4b 79 const char *name; /* filename external diff should read from */
be3cfa85
JH
80 char hex[41];
81 char mode[10];
82 char tmp_path[50];
83} diff_temp[2];
84
915838c3
JH
85static void builtin_diff(const char *name_a,
86 const char *name_b,
57fe64a4 87 struct diff_tempfile *temp,
427dcb4b 88 const char *xfrm_msg)
86436c28 89{
9669e17a 90 int i, next_at, cmd_size;
c983370e 91 const char *diff_cmd = "diff -L'%s%s' -L'%s%s'";
6fa28064 92 const char *diff_arg = "'%s' '%s'||:"; /* "||:" is to return 0 */
2f978138
JH
93 const char *input_name_sq[2];
94 const char *path0[2];
95 const char *path1[2];
915838c3 96 const char *name_sq[2];
2f978138 97 char *cmd;
915838c3
JH
98
99 name_sq[0] = sq_expand(name_a);
100 name_sq[1] = sq_expand(name_b);
101
c983370e
JH
102 /* diff_cmd and diff_arg have 6 %s in total which makes
103 * the sum of these strings 12 bytes larger than required.
be3cfa85 104 * we use 2 spaces around diff-opts, and we need to count
c983370e 105 * terminating NUL, so we subtract 9 here.
be3cfa85 106 */
9669e17a 107 cmd_size = (strlen(diff_cmd) + strlen(diff_opts) +
c983370e 108 strlen(diff_arg) - 9);
2f978138
JH
109 for (i = 0; i < 2; i++) {
110 input_name_sq[i] = sq_expand(temp[i].name);
111 if (!strcmp(temp[i].name, "/dev/null")) {
112 path0[i] = "/dev/null";
113 path1[i] = "";
2f978138 114 } else {
0980d9b3 115 path0[i] = i ? "b/" : "a/";
915838c3 116 path1[i] = name_sq[i];
2f978138
JH
117 }
118 cmd_size += (strlen(path0[i]) + strlen(path1[i]) +
c983370e 119 strlen(input_name_sq[i]));
2f978138 120 }
be3cfa85 121
2f978138
JH
122 cmd = xmalloc(cmd_size);
123
124 next_at = 0;
be3cfa85 125 next_at += snprintf(cmd+next_at, cmd_size-next_at,
2f978138 126 diff_cmd,
c983370e 127 path0[0], path1[0], path0[1], path1[1]);
be3cfa85
JH
128 next_at += snprintf(cmd+next_at, cmd_size-next_at,
129 " %s ", diff_opts);
130 next_at += snprintf(cmd+next_at, cmd_size-next_at,
2f978138
JH
131 diff_arg, input_name_sq[0], input_name_sq[1]);
132
915838c3 133 printf("diff --git a/%s b/%s\n", name_a, name_b);
c983370e 134 if (!path1[0][0])
b58f23b3 135 printf("new file mode %s\n", temp[1].mode);
c983370e 136 else if (!path1[1][0])
b58f23b3 137 printf("deleted file mode %s\n", temp[0].mode);
273b9834 138 else {
b58f23b3
JH
139 if (strcmp(temp[0].mode, temp[1].mode)) {
140 printf("old mode %s\n", temp[0].mode);
141 printf("new mode %s\n", temp[1].mode);
142 }
427dcb4b
JH
143 if (xfrm_msg && xfrm_msg[0])
144 fputs(xfrm_msg, stdout);
145
273b9834
JH
146 if (strncmp(temp[0].mode, temp[1].mode, 3))
147 /* we do not run diff between different kind
148 * of objects.
149 */
b28858bf
JH
150 exit(0);
151 }
c983370e 152 fflush(NULL);
be3cfa85 153 execlp("/bin/sh","sh", "-c", cmd, NULL);
86436c28
JH
154}
155
427dcb4b
JH
156struct diff_filespec *alloc_filespec(const char *path)
157{
158 int namelen = strlen(path);
159 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
160 spec->path = (char *)(spec + 1);
161 strcpy(spec->path, path);
81e50eab 162 spec->should_free = spec->should_munmap = 0;
427dcb4b
JH
163 spec->xfrm_flags = 0;
164 spec->size = 0;
09d74b3b 165 spec->data = NULL;
81e50eab
JH
166 spec->mode = 0;
167 memset(spec->sha1, 0, 20);
427dcb4b
JH
168 return spec;
169}
170
171void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
172 unsigned short mode)
173{
81e50eab
JH
174 if (mode) { /* just playing defensive */
175 spec->mode = mode;
176 memcpy(spec->sha1, sha1, 20);
177 spec->sha1_valid = !!memcmp(sha1, null_sha1, 20);
178 }
427dcb4b
JH
179}
180
b46f0b6d
JH
181/*
182 * Given a name and sha1 pair, if the dircache tells us the file in
183 * the work tree has that object contents, return true, so that
184 * prepare_temp_file() does not have to inflate and extract.
185 */
186static int work_tree_matches(const char *name, const unsigned char *sha1)
187{
188 struct cache_entry *ce;
189 struct stat st;
190 int pos, len;
5c97558c 191
b46f0b6d
JH
192 /* We do not read the cache ourselves here, because the
193 * benchmark with my previous version that always reads cache
194 * shows that it makes things worse for diff-tree comparing
195 * two linux-2.6 kernel trees in an already checked out work
915838c3 196 * tree. This is because most diff-tree comparisons deal with
b46f0b6d
JH
197 * only a small number of files, while reading the cache is
198 * expensive for a large project, and its cost outweighs the
199 * savings we get by not inflating the object to a temporary
200 * file. Practically, this code only helps when we are used
201 * by diff-cache --cached, which does read the cache before
202 * calling us.
57fe64a4 203 */
b46f0b6d
JH
204 if (!active_cache)
205 return 0;
206
207 len = strlen(name);
208 pos = cache_name_pos(name, len);
209 if (pos < 0)
210 return 0;
211 ce = active_cache[pos];
b28858bf 212 if ((lstat(name, &st) < 0) ||
427dcb4b 213 !S_ISREG(st.st_mode) || /* careful! */
5d728c84 214 ce_match_stat(ce, &st) ||
b46f0b6d
JH
215 memcmp(sha1, ce->sha1, 20))
216 return 0;
427dcb4b
JH
217 /* we return 1 only when we can stat, it is a regular file,
218 * stat information matches, and sha1 recorded in the cache
219 * matches. I.e. we know the file in the work tree really is
220 * the same as the <name, sha1> pair.
221 */
b46f0b6d
JH
222 return 1;
223}
224
427dcb4b
JH
225/*
226 * While doing rename detection and pickaxe operation, we may need to
227 * grab the data for the blob (or file) for our own in-core comparison.
228 * diff_filespec has data and size fields for this purpose.
229 */
230int diff_populate_filespec(struct diff_filespec *s)
231{
232 int err = 0;
81e50eab 233 if (!DIFF_FILE_VALID(s))
427dcb4b
JH
234 die("internal error: asking to populate invalid file.");
235 if (S_ISDIR(s->mode))
236 return -1;
237
238 if (s->data)
239 return err;
240 if (!s->sha1_valid ||
241 work_tree_matches(s->path, s->sha1)) {
242 struct stat st;
243 int fd;
244 if (lstat(s->path, &st) < 0) {
245 if (errno == ENOENT) {
246 err_empty:
247 err = -1;
248 empty:
249 s->data = "";
250 s->size = 0;
251 return err;
252 }
253 }
254 s->size = st.st_size;
255 if (!s->size)
256 goto empty;
257 if (S_ISLNK(st.st_mode)) {
258 int ret;
259 s->data = xmalloc(s->size);
260 s->should_free = 1;
261 ret = readlink(s->path, s->data, s->size);
262 if (ret < 0) {
263 free(s->data);
264 goto err_empty;
265 }
266 return 0;
267 }
268 fd = open(s->path, O_RDONLY);
269 if (fd < 0)
270 goto err_empty;
271 s->data = mmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
272 s->should_munmap = 1;
273 close(fd);
274 }
275 else {
276 char type[20];
277 s->data = read_sha1_file(s->sha1, type, &s->size);
278 s->should_free = 1;
279 }
280 return 0;
281}
282
283void diff_free_filespec_data(struct diff_filespec *s)
284{
285 if (s->should_free)
286 free(s->data);
287 else if (s->should_munmap)
288 munmap(s->data, s->size);
289 s->should_free = s->should_munmap = 0;
09d74b3b 290 s->data = NULL;
427dcb4b
JH
291}
292
b28858bf
JH
293static void prep_temp_blob(struct diff_tempfile *temp,
294 void *blob,
295 unsigned long size,
296 unsigned char *sha1,
297 int mode)
298{
299 int fd;
300
301 strcpy(temp->tmp_path, ".diff_XXXXXX");
302 fd = mkstemp(temp->tmp_path);
303 if (fd < 0)
304 die("unable to create temp-file");
305 if (write(fd, blob, size) != size)
306 die("unable to write temp-file");
307 close(fd);
308 temp->name = temp->tmp_path;
309 strcpy(temp->hex, sha1_to_hex(sha1));
310 temp->hex[40] = 0;
311 sprintf(temp->mode, "%06o", mode);
312}
313
be3cfa85
JH
314static void prepare_temp_file(const char *name,
315 struct diff_tempfile *temp,
427dcb4b 316 struct diff_filespec *one)
86436c28 317{
81e50eab 318 if (!DIFF_FILE_VALID(one)) {
be3cfa85 319 not_a_valid_file:
532149d7
JH
320 /* A '-' entry produces this for file-2, and
321 * a '+' entry produces this for file-1.
322 */
be3cfa85
JH
323 temp->name = "/dev/null";
324 strcpy(temp->hex, ".");
325 strcpy(temp->mode, ".");
86436c28
JH
326 return;
327 }
be3cfa85 328
5c97558c 329 if (!one->sha1_valid ||
427dcb4b 330 work_tree_matches(name, one->sha1)) {
be3cfa85 331 struct stat st;
427dcb4b 332 if (lstat(name, &st) < 0) {
be3cfa85
JH
333 if (errno == ENOENT)
334 goto not_a_valid_file;
427dcb4b 335 die("stat(%s): %s", name, strerror(errno));
be3cfa85 336 }
b28858bf
JH
337 if (S_ISLNK(st.st_mode)) {
338 int ret;
339 char *buf, buf_[1024];
340 buf = ((sizeof(buf_) < st.st_size) ?
341 xmalloc(st.st_size) : buf_);
342 ret = readlink(name, buf, st.st_size);
343 if (ret < 0)
344 die("readlink(%s)", name);
345 prep_temp_blob(temp, buf, st.st_size,
346 (one->sha1_valid ?
427dcb4b 347 one->sha1 : null_sha1),
b28858bf
JH
348 (one->sha1_valid ?
349 one->mode : S_IFLNK));
350 }
351 else {
427dcb4b
JH
352 /* we can borrow from the file in the work tree */
353 temp->name = name;
b28858bf
JH
354 if (!one->sha1_valid)
355 strcpy(temp->hex, sha1_to_hex(null_sha1));
356 else
427dcb4b 357 strcpy(temp->hex, sha1_to_hex(one->sha1));
b28858bf
JH
358 sprintf(temp->mode, "%06o",
359 S_IFREG |ce_permissions(st.st_mode));
360 }
361 return;
be3cfa85
JH
362 }
363 else {
427dcb4b
JH
364 if (diff_populate_filespec(one))
365 die("cannot read data blob for %s", one->path);
366 prep_temp_blob(temp, one->data, one->size,
367 one->sha1, one->mode);
be3cfa85
JH
368 }
369}
370
371static void remove_tempfile(void)
372{
373 int i;
374
375 for (i = 0; i < 2; i++)
376 if (diff_temp[i].name == diff_temp[i].tmp_path) {
377 unlink(diff_temp[i].name);
378 diff_temp[i].name = NULL;
379 }
380}
381
532149d7
JH
382static void remove_tempfile_on_signal(int signo)
383{
384 remove_tempfile();
385}
386
be3cfa85
JH
387/* An external diff command takes:
388 *
389 * diff-cmd name infile1 infile1-sha1 infile1-mode \
5c97558c 390 * infile2 infile2-sha1 infile2-mode [ rename-to ]
be3cfa85
JH
391 *
392 */
5c97558c
JH
393static void run_external_diff(const char *name,
394 const char *other,
427dcb4b
JH
395 struct diff_filespec *one,
396 struct diff_filespec *two,
397 const char *xfrm_msg)
be3cfa85
JH
398{
399 struct diff_tempfile *temp = diff_temp;
532149d7
JH
400 pid_t pid;
401 int status;
be3cfa85
JH
402 static int atexit_asked = 0;
403
77eb2720
JH
404 if (one && two) {
405 prepare_temp_file(name, &temp[0], one);
915838c3 406 prepare_temp_file(other ? : name, &temp[1], two);
77eb2720
JH
407 if (! atexit_asked &&
408 (temp[0].name == temp[0].tmp_path ||
409 temp[1].name == temp[1].tmp_path)) {
410 atexit_asked = 1;
411 atexit(remove_tempfile);
412 }
532149d7 413 signal(SIGINT, remove_tempfile_on_signal);
be3cfa85
JH
414 }
415
416 fflush(NULL);
417 pid = fork();
418 if (pid < 0)
419 die("unable to fork");
420 if (!pid) {
421 const char *pgm = external_diff();
5c97558c
JH
422 if (pgm) {
423 if (one && two) {
427dcb4b 424 const char *exec_arg[10];
5c97558c
JH
425 const char **arg = &exec_arg[0];
426 *arg++ = pgm;
427 *arg++ = name;
428 *arg++ = temp[0].name;
429 *arg++ = temp[0].hex;
430 *arg++ = temp[0].mode;
431 *arg++ = temp[1].name;
432 *arg++ = temp[1].hex;
433 *arg++ = temp[1].mode;
427dcb4b 434 if (other) {
5c97558c 435 *arg++ = other;
427dcb4b
JH
436 *arg++ = xfrm_msg;
437 }
09d74b3b 438 *arg = NULL;
5c97558c
JH
439 execvp(pgm, (char *const*) exec_arg);
440 }
77eb2720
JH
441 else
442 execlp(pgm, pgm, name, NULL);
443 }
be3cfa85
JH
444 /*
445 * otherwise we use the built-in one.
446 */
77eb2720 447 if (one && two)
427dcb4b 448 builtin_diff(name, other ? : name, temp, xfrm_msg);
77eb2720
JH
449 else
450 printf("* Unmerged path %s\n", name);
be3cfa85
JH
451 exit(0);
452 }
6fa28064
JH
453 if (waitpid(pid, &status, 0) < 0 ||
454 !WIFEXITED(status) || WEXITSTATUS(status)) {
455 /* Earlier we did not check the exit status because
532149d7 456 * diff exits non-zero if files are different, and
6fa28064
JH
457 * we are not interested in knowing that. It was a
458 * mistake which made it harder to quit a diff-*
459 * session that uses the git-apply-patch-script as
460 * the GIT_EXTERNAL_DIFF. A custom GIT_EXTERNAL_DIFF
461 * should also exit non-zero only when it wants to
462 * abort the entire diff-* session.
532149d7
JH
463 */
464 remove_tempfile();
6fa28064
JH
465 fprintf(stderr, "external diff died, stopping at %s.\n", name);
466 exit(1);
532149d7 467 }
be3cfa85
JH
468 remove_tempfile();
469}
470
6b14d7fa 471void diff_setup(int reverse_diff_)
5c97558c 472{
6b14d7fa 473 reverse_diff = reverse_diff_;
5c97558c
JH
474}
475
6b14d7fa
JH
476struct diff_queue_struct diff_queued_diff;
477
478void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
5c97558c 479{
6b14d7fa
JH
480 if (queue->alloc <= queue->nr) {
481 queue->alloc = alloc_nr(queue->alloc);
482 queue->queue = xrealloc(queue->queue,
483 sizeof(dp) * queue->alloc);
81e50eab 484 }
6b14d7fa 485 queue->queue[queue->nr++] = dp;
5c97558c
JH
486}
487
52e95789 488struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
6b14d7fa
JH
489 struct diff_filespec *one,
490 struct diff_filespec *two)
5c97558c 491{
52e95789 492 struct diff_filepair *dp = xmalloc(sizeof(*dp));
427dcb4b
JH
493 dp->one = one;
494 dp->two = two;
f7c1512a 495 dp->score = 0;
427dcb4b 496 dp->orig_order = queue->nr;
f7c1512a 497 dp->rename_rank = 0;
6b14d7fa 498 diff_q(queue, dp);
427dcb4b 499 return dp;
5c97558c
JH
500}
501
bceafe75
JH
502static void diff_flush_raw(struct diff_filepair *p,
503 int line_termination,
504 int inter_name_termination)
5c97558c 505{
b6d8f309
JH
506 int two_paths;
507 char status[10];
508 switch (p->status) {
509 case 'C': case 'R':
510 two_paths = 1;
511 sprintf(status, "%c%1d", p->status, p->score);
512 break;
513 default:
514 two_paths = 0;
515 status[0] = p->status;
516 status[1] = 0;
517 break;
6b14d7fa 518 }
81e50eab
JH
519 printf(":%06o %06o %s ",
520 p->one->mode, p->two->mode, sha1_to_hex(p->one->sha1));
b6d8f309
JH
521 printf("%s %s%c%s",
522 sha1_to_hex(p->two->sha1),
523 status,
524 inter_name_termination,
525 p->one->path);
526 if (two_paths)
527 printf("%c%s", inter_name_termination, p->two->path);
528 putchar(line_termination);
5c97558c
JH
529}
530
f7c1512a 531int diff_unmodified_pair(struct diff_filepair *p)
5c97558c 532{
427dcb4b
JH
533 /* This function is written stricter than necessary to support
534 * the currently implemented transformers, but the idea is to
52e95789 535 * let transformers to produce diff_filepairs any way they want,
427dcb4b 536 * and filter and clean them up here before producing the output.
5c97558c 537 */
6b14d7fa
JH
538 struct diff_filespec *one, *two;
539
540 if (DIFF_PAIR_UNMERGED(p))
541 return 0; /* unmerged is interesting */
5c97558c 542
6b14d7fa
JH
543 one = p->one;
544 two = p->two;
5c97558c 545
427dcb4b 546 /* deletion, addition, mode change and renames are all interesting. */
81e50eab
JH
547 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
548 (one->mode != two->mode) ||
427dcb4b
JH
549 strcmp(one->path, two->path))
550 return 0;
57fe64a4 551
427dcb4b
JH
552 /* both are valid and point at the same path. that is, we are
553 * dealing with a change.
57fe64a4 554 */
427dcb4b
JH
555 if (one->sha1_valid && two->sha1_valid &&
556 !memcmp(one->sha1, two->sha1, sizeof(one->sha1)))
557 return 1; /* no change */
558 if (!one->sha1_valid && !two->sha1_valid)
559 return 1; /* both look at the same file on the filesystem. */
560 return 0;
57fe64a4
JH
561}
562
b6d8f309 563static void diff_flush_patch(struct diff_filepair *p)
f7c1512a
JH
564{
565 const char *name, *other;
b6d8f309 566 char msg_[PATH_MAX*2+200], *msg;
f7c1512a 567
f7c1512a
JH
568 if (diff_unmodified_pair(p))
569 return;
570
571 name = p->one->path;
572 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
573 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
574 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
575 return; /* no tree diffs in patch format */
576
b6d8f309
JH
577 switch (p->status) {
578 case 'C':
579 sprintf(msg_,
580 "similarity index %d%%\n"
581 "copy from %s\n"
582 "copy to %s\n",
bceafe75 583 (int)(0.5 + p->score * 100.0/MAX_SCORE),
b6d8f309
JH
584 p->one->path, p->two->path);
585 msg = msg_;
586 break;
587 case 'R':
588 sprintf(msg_,
589 "similarity index %d%%\n"
590 "rename old %s\n"
591 "rename new %s\n",
bceafe75 592 (int)(0.5 + p->score * 100.0/MAX_SCORE),
b6d8f309
JH
593 p->one->path, p->two->path);
594 msg = msg_;
595 break;
596 default:
597 msg = NULL;
598 }
599
f7c1512a
JH
600 if (DIFF_PAIR_UNMERGED(p))
601 run_external_diff(name, NULL, NULL, NULL, NULL);
602 else
603 run_external_diff(name, other, p->one, p->two, msg);
604}
605
606int diff_needs_to_stay(struct diff_queue_struct *q, int i,
607 struct diff_filespec *it)
608{
609 /* If it will be used in later entry (either stay or used
610 * as the source of rename/copy), we need to copy, not rename.
611 */
612 while (i < q->nr) {
613 struct diff_filepair *p = q->queue[i++];
614 if (!DIFF_FILE_VALID(p->two))
615 continue; /* removed is fine */
616 if (strcmp(p->one->path, it->path))
617 continue; /* not relevant */
618
619 /* p has its src set to *it and it is not a delete;
620 * it will be used for in-place change, rename/copy,
621 * or just stays there. We cannot rename it out.
622 */
623 return 1;
624 }
625 return 0;
626}
627
bceafe75 628int diff_queue_is_empty(void)
f7c1512a 629{
bceafe75
JH
630 struct diff_queue_struct *q = &diff_queued_diff;
631 return q->nr == 0;
f7c1512a
JH
632}
633
bceafe75 634static void diff_resolve_rename_copy(void)
6b14d7fa 635{
6b14d7fa 636 int i;
bceafe75 637 struct diff_queue_struct *q = &diff_queued_diff;
6b14d7fa
JH
638 for (i = 0; i < q->nr; i++) {
639 struct diff_filepair *p = q->queue[i];
bceafe75
JH
640 p->status = 0;
641 if (DIFF_PAIR_UNMERGED(p))
642 p->status = 'U';
643 else if (!DIFF_FILE_VALID((p)->one))
644 p->status = 'N';
645 else if (!DIFF_FILE_VALID((p)->two)) {
646 /* maybe earlier one said 'R', meaning
647 * it will take it, in which case we do
648 * not need to keep 'D'.
649 */
650 int j;
651 for (j = 0; j < i; j++) {
652 struct diff_filepair *pp = q->queue[j];
653 if (pp->status == 'R' &&
654 !strcmp(pp->one->path, p->one->path))
655 break;
656 }
657 if (j < i)
658 continue;
659 p->status = 'D';
660 }
661 else if (strcmp(p->one->path, p->two->path)) {
662 /* This is rename or copy. Which one is it? */
663 if (diff_needs_to_stay(q, i+1, p->one))
664 p->status = 'C';
665 else
666 p->status = 'R';
667 }
668 else if (memcmp(p->one->sha1, p->two->sha1, 20))
669 p->status = 'M';
670 else {
671 /* we do not need this one */
672 p->status = 0;
673 }
6b14d7fa 674 }
38c6f780
JH
675}
676
b6d8f309 677void diff_flush(int diff_output_style, int resolve_rename_copy)
38c6f780
JH
678{
679 struct diff_queue_struct *q = &diff_queued_diff;
680 int i;
bceafe75
JH
681 int line_termination = '\n';
682 int inter_name_termination = '\t';
38c6f780 683
bceafe75 684 if (diff_output_style == DIFF_FORMAT_MACHINE)
6b14d7fa 685 line_termination = inter_name_termination = 0;
bceafe75
JH
686 if (resolve_rename_copy)
687 diff_resolve_rename_copy();
688
f7c1512a 689 for (i = 0; i < q->nr; i++) {
f7c1512a 690 struct diff_filepair *p = q->queue[i];
bceafe75
JH
691 if (p->status == 0)
692 continue;
693 switch (diff_output_style) {
694 case DIFF_FORMAT_PATCH:
b6d8f309 695 diff_flush_patch(p);
bceafe75
JH
696 break;
697 case DIFF_FORMAT_HUMAN:
698 case DIFF_FORMAT_MACHINE:
699 diff_flush_raw(p, line_termination,
700 inter_name_termination);
701 break;
702 }
f7c1512a 703 }
427dcb4b 704 for (i = 0; i < q->nr; i++) {
52e95789 705 struct diff_filepair *p = q->queue[i];
427dcb4b
JH
706 diff_free_filespec_data(p->one);
707 diff_free_filespec_data(p->two);
427dcb4b
JH
708 free(p);
709 }
710 free(q->queue);
711 q->queue = NULL;
712 q->nr = q->alloc = 0;
5c97558c
JH
713}
714
77eb2720
JH
715void diff_addremove(int addremove, unsigned mode,
716 const unsigned char *sha1,
717 const char *base, const char *path)
be3cfa85 718{
77eb2720 719 char concatpath[PATH_MAX];
427dcb4b
JH
720 struct diff_filespec *one, *two;
721
722 /* This may look odd, but it is a preparation for
723 * feeding "there are unchanged files which should
724 * not produce diffs, but when you are doing copy
725 * detection you would need them, so here they are"
726 * entries to the diff-core. They will be prefixed
727 * with something like '=' or '*' (I haven't decided
728 * which but should not make any difference).
f7c1512a 729 * Feeding the same new and old to diff_change()
bceafe75
JH
730 * also has the same effect.
731 * Before the final output happens, they are pruned after
732 * merged into rename/copy pairs as appropriate.
427dcb4b 733 */
7ca45252 734 if (reverse_diff)
427dcb4b
JH
735 addremove = (addremove == '+' ? '-' :
736 addremove == '-' ? '+' : addremove);
7ca45252 737
427dcb4b
JH
738 if (!path) path = "";
739 sprintf(concatpath, "%s%s", base, path);
740 one = alloc_filespec(concatpath);
741 two = alloc_filespec(concatpath);
be3cfa85 742
427dcb4b
JH
743 if (addremove != '+')
744 fill_filespec(one, sha1, mode);
745 if (addremove != '-')
746 fill_filespec(two, sha1, mode);
5c97558c 747
38c6f780 748 diff_queue(&diff_queued_diff, one, two);
be3cfa85
JH
749}
750
b6d8f309
JH
751void diff_helper_input(unsigned old_mode,
752 unsigned new_mode,
753 const unsigned char *old_sha1,
754 const unsigned char *new_sha1,
755 const char *old_path,
756 int status,
757 int score,
758 const char *new_path)
81e50eab
JH
759{
760 struct diff_filespec *one, *two;
b6d8f309 761 struct diff_filepair *dp;
81e50eab 762
81e50eab
JH
763 one = alloc_filespec(old_path);
764 two = alloc_filespec(new_path);
765 if (old_mode)
766 fill_filespec(one, old_sha1, old_mode);
767 if (new_mode)
768 fill_filespec(two, new_sha1, new_mode);
b6d8f309
JH
769 dp = diff_queue(&diff_queued_diff, one, two);
770 dp->score = score;
771 dp->status = status;
81e50eab
JH
772}
773
77eb2720
JH
774void diff_change(unsigned old_mode, unsigned new_mode,
775 const unsigned char *old_sha1,
776 const unsigned char *new_sha1,
81e50eab
JH
777 const char *base, const char *path)
778{
77eb2720 779 char concatpath[PATH_MAX];
427dcb4b 780 struct diff_filespec *one, *two;
77eb2720 781
7ca45252
JH
782 if (reverse_diff) {
783 unsigned tmp;
784 const unsigned char *tmp_c;
785 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
786 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
787 }
427dcb4b
JH
788 if (!path) path = "";
789 sprintf(concatpath, "%s%s", base, path);
790 one = alloc_filespec(concatpath);
791 two = alloc_filespec(concatpath);
792 fill_filespec(one, old_sha1, old_mode);
793 fill_filespec(two, new_sha1, new_mode);
794
38c6f780 795 diff_queue(&diff_queued_diff, one, two);
77eb2720 796}
be3cfa85 797
77eb2720
JH
798void diff_unmerge(const char *path)
799{
6b14d7fa
JH
800 struct diff_filespec *one, *two;
801 one = alloc_filespec(path);
802 two = alloc_filespec(path);
803 diff_queue(&diff_queued_diff, one, two);
86436c28 804}