1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4#include "cache.h"
5#include "quote.h"
6#include "commit.h"
7#include "diff.h"
8#include "diffcore.h"
9#include "revision.h"
10#include "cache-tree.h"
11#include "path-list.h"
12/*
14 * diff-files
15 */
16static int read_directory(const char *path, struct path_list *list)
18{
19 DIR *dir;
20 struct dirent *e;
21 if (!(dir = opendir(path)))
23 return error("Could not open directory %s", path);
24 while ((e = readdir(dir)))
26 if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
27 path_list_insert(e->d_name, list);
28 closedir(dir);
30 return 0;
31}
32static int get_mode(const char *path, int *mode)
34{
35 struct stat st;
36 if (!path || !strcmp(path, "/dev/null"))
38 *mode = 0;
39 else if (!strcmp(path, "-"))
40 *mode = ntohl(create_ce_mode(0666));
41 else if (stat(path, &st))
42 return error("Could not access '%s'", path);
43 else
44 *mode = st.st_mode;
45 return 0;
46}
47static int queue_diff(struct diff_options *o,
49 const char *name1, const char *name2)
50{
51 int mode1 = 0, mode2 = 0;
52 if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
54 return -1;
55 if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
57 return error("file/directory conflict: %s, %s", name1, name2);
58 if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
60 char buffer1[PATH_MAX], buffer2[PATH_MAX];
61 struct path_list p1 = {NULL, 0, 0, 1}, p2 = {NULL, 0, 0, 1};
62 int len1 = 0, len2 = 0, i1, i2, ret = 0;
63 if (name1 && read_directory(name1, &p1))
65 return -1;
66 if (name2 && read_directory(name2, &p2)) {
67 path_list_clear(&p1, 0);
68 return -1;
69 }
70 if (name1) {
72 len1 = strlen(name1);
73 if (len1 > 0 && name1[len1 - 1] == '/')
74 len1--;
75 memcpy(buffer1, name1, len1);
76 buffer1[len1++] = '/';
77 }
78 if (name2) {
80 len2 = strlen(name2);
81 if (len2 > 0 && name2[len2 - 1] == '/')
82 len2--;
83 memcpy(buffer2, name2, len2);
84 buffer2[len2++] = '/';
85 }
86 for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
88 const char *n1, *n2;
89 int comp;
90 if (i1 == p1.nr)
92 comp = 1;
93 else if (i2 == p2.nr)
94 comp = -1;
95 else
96 comp = strcmp(p1.items[i1].path,
97 p2.items[i2].path);
98 if (comp > 0)
100 n1 = NULL;
101 else {
102 n1 = buffer1;
103 strncpy(buffer1 + len1, p1.items[i1++].path,
104 PATH_MAX - len1);
105 }
106 if (comp < 0)
108 n2 = NULL;
109 else {
110 n2 = buffer2;
111 strncpy(buffer2 + len2, p2.items[i2++].path,
112 PATH_MAX - len2);
113 }
114 ret = queue_diff(o, n1, n2);
116 }
117 path_list_clear(&p1, 0);
118 path_list_clear(&p2, 0);
119 return ret;
121 } else {
122 struct diff_filespec *d1, *d2;
123 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
125 unsigned tmp;
126 const char *tmp_c;
127 tmp = mode1; mode1 = mode2; mode2 = tmp;
128 tmp_c = name1; name1 = name2; name2 = tmp_c;
129 }
130 if (!name1)
132 name1 = "/dev/null";
133 if (!name2)
134 name2 = "/dev/null";
135 d1 = alloc_filespec(name1);
136 d2 = alloc_filespec(name2);
137 fill_filespec(d1, null_sha1, mode1);
138 fill_filespec(d2, null_sha1, mode2);
139 diff_queue(&diff_queued_diff, d1, d2);
141 return 0;
142 }
143}
144/*
146 * Does the path name a blob in the working tree, or a directory
147 * in the working tree?
148 */
149static int is_in_index(const char *path)
150{
151 int len, pos;
152 struct cache_entry *ce;
153 len = strlen(path);
155 while (path[len-1] == '/')
156 len--;
157 if (!len)
158 return 1; /* "." */
159 pos = cache_name_pos(path, len);
160 if (0 <= pos)
161 return 1;
162 pos = -1 - pos;
163 while (pos < active_nr) {
164 ce = active_cache[pos++];
165 if (ce_namelen(ce) <= len ||
166 strncmp(ce->name, path, len) ||
167 (ce->name[len] > '/'))
168 break; /* path cannot be a prefix */
169 if (ce->name[len] == '/')
170 return 1;
171 }
172 return 0;
173}
174static int handle_diff_files_args(struct rev_info *revs,
176 int argc, const char **argv, int *silent)
177{
178 *silent = 0;
179 /* revs->max_count == -2 means --no-index */
181 while (1 < argc && argv[1][0] == '-') {
182 if (!strcmp(argv[1], "--base"))
183 revs->max_count = 1;
184 else if (!strcmp(argv[1], "--ours"))
185 revs->max_count = 2;
186 else if (!strcmp(argv[1], "--theirs"))
187 revs->max_count = 3;
188 else if (!strcmp(argv[1], "-n") ||
189 !strcmp(argv[1], "--no-index")) {
190 revs->max_count = -2;
191 DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
192 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
193 }
194 else if (!strcmp(argv[1], "-q"))
195 *silent = 1;
196 else
197 return error("invalid option: %s", argv[1]);
198 argv++; argc--;
199 }
200 if (revs->max_count == -1 && revs->diffopt.nr_paths == 2) {
202 /*
203 * If two files are specified, and at least one is untracked,
204 * default to no-index.
205 */
206 read_cache();
207 if (!is_in_index(revs->diffopt.paths[0]) ||
208 !is_in_index(revs->diffopt.paths[1])) {
209 revs->max_count = -2;
210 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
211 }
212 }
213 /*
215 * Make sure there are NO revision (i.e. pending object) parameter,
216 * rev.max_count is reasonable (0 <= n <= 3),
217 * there is no other revision filtering parameters.
218 */
219 if (revs->pending.nr || revs->max_count > 3 ||
220 revs->min_age != -1 || revs->max_age != -1)
221 return error("no revision allowed with diff-files");
222 if (revs->max_count == -1 &&
224 (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
225 revs->combine_merges = revs->dense_combined_merges = 1;
226 return 0;
228}
229static int is_outside_repo(const char *path, int nongit, const char *prefix)
231{
232 int i;
233 if (nongit || !strcmp(path, "-") || path[0] == '/')
234 return 1;
235 if (prefixcmp(path, "../"))
236 return 0;
237 if (!prefix)
238 return 1;
239 for (i = strlen(prefix); !prefixcmp(path, "../"); ) {
240 while (i > 0 && prefix[i - 1] != '/')
241 i--;
242 if (--i < 0)
243 return 1;
244 path += 3;
245 }
246 return 0;
247}
248int setup_diff_no_index(struct rev_info *revs,
250 int argc, const char ** argv, int nongit, const char *prefix)
251{
252 int i;
253 for (i = 1; i < argc; i++)
254 if (argv[i][0] != '-' || argv[i][1] == '\0')
255 break;
256 else if (!strcmp(argv[i], "--")) {
257 i++;
258 break;
259 } else if (i < argc - 3 && !strcmp(argv[i], "--no-index")) {
260 i = argc - 3;
261 DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
262 break;
263 }
264 if (argc != i + 2 || (!is_outside_repo(argv[i + 1], nongit, prefix) &&
265 !is_outside_repo(argv[i], nongit, prefix)))
266 return -1;
267 diff_setup(&revs->diffopt);
269 for (i = 1; i < argc - 2; )
270 if (!strcmp(argv[i], "--no-index"))
271 i++;
272 else {
273 int j = diff_opt_parse(&revs->diffopt,
274 argv + i, argc - i);
275 if (!j)
276 die("invalid diff option/value: %s", argv[i]);
277 i += j;
278 }
279 if (prefix) {
281 int len = strlen(prefix);
282 revs->diffopt.paths = xcalloc(2, sizeof(char*));
284 for (i = 0; i < 2; i++) {
285 const char *p = argv[argc - 2 + i];
286 /*
287 * stdin should be spelled as '-'; if you have
288 * path that is '-', spell it as ./-.
289 */
290 p = (strcmp(p, "-")
291 ? xstrdup(prefix_filename(prefix, len, p))
292 : p);
293 revs->diffopt.paths[i] = p;
294 }
295 }
296 else
297 revs->diffopt.paths = argv + argc - 2;
298 revs->diffopt.nr_paths = 2;
299 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
300 revs->max_count = -2;
301 if (diff_setup_done(&revs->diffopt) < 0)
302 die("diff_setup_done failed");
303 return 0;
304}
305int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv)
307{
308 int silent_on_removed;
309 if (handle_diff_files_args(revs, argc, argv, &silent_on_removed))
311 return -1;
312 if (DIFF_OPT_TST(&revs->diffopt, NO_INDEX)) {
314 if (revs->diffopt.nr_paths != 2)
315 return error("need two files/directories with --no-index");
316 if (queue_diff(&revs->diffopt, revs->diffopt.paths[0],
317 revs->diffopt.paths[1]))
318 return -1;
319 diffcore_std(&revs->diffopt);
320 diff_flush(&revs->diffopt);
321 /*
322 * The return code for --no-index imitates diff(1):
323 * 0 = no changes, 1 = changes, else error
324 */
325 return revs->diffopt.found_changes;
326 }
327 if (read_cache() < 0) {
329 perror("read_cache");
330 return -1;
331 }
332 return run_diff_files(revs, silent_on_removed);
333}
334int run_diff_files(struct rev_info *revs, int silent_on_removed)
336{
337 int entries, i;
338 int diff_unmerged_stage = revs->max_count;
339 if (diff_unmerged_stage < 0)
341 diff_unmerged_stage = 2;
342 entries = active_nr;
343 for (i = 0; i < entries; i++) {
344 struct stat st;
345 unsigned int oldmode, newmode;
346 struct cache_entry *ce = active_cache[i];
347 int changed;
348 if (DIFF_OPT_TST(&revs->diffopt, QUIET) &&
350 DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
351 break;
352 if (!ce_path_match(ce, revs->prune_data))
354 continue;
355 if (ce_stage(ce)) {
357 struct combine_diff_path *dpath;
358 int num_compare_stages = 0;
359 size_t path_len;
360 path_len = ce_namelen(ce);
362 dpath = xmalloc(combine_diff_path_size(5, path_len));
364 dpath->path = (char *) &(dpath->parent[5]);
365 dpath->next = NULL;
367 dpath->len = path_len;
368 memcpy(dpath->path, ce->name, path_len);
369 dpath->path[path_len] = '\0';
370 hashclr(dpath->sha1);
371 memset(&(dpath->parent[0]), 0,
372 sizeof(struct combine_diff_parent)*5);
373 if (lstat(ce->name, &st) < 0) {
375 if (errno != ENOENT && errno != ENOTDIR) {
376 perror(ce->name);
377 continue;
378 }
379 if (silent_on_removed)
380 continue;
381 }
382 else
383 dpath->mode = ntohl(ce_mode_from_stat(ce, st.st_mode));
384 while (i < entries) {
386 struct cache_entry *nce = active_cache[i];
387 int stage;
388 if (strcmp(ce->name, nce->name))
390 break;
391 /* Stage #2 (ours) is the first parent,
393 * stage #3 (theirs) is the second.
394 */
395 stage = ce_stage(nce);
396 if (2 <= stage) {
397 int mode = ntohl(nce->ce_mode);
398 num_compare_stages++;
399 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
400 dpath->parent[stage-2].mode = ntohl(ce_mode_from_stat(nce, mode));
401 dpath->parent[stage-2].status =
402 DIFF_STATUS_MODIFIED;
403 }
404 /* diff against the proper unmerged stage */
406 if (stage == diff_unmerged_stage)
407 ce = nce;
408 i++;
409 }
410 /*
411 * Compensate for loop update
412 */
413 i--;
414 if (revs->combine_merges && num_compare_stages == 2) {
416 show_combined_diff(dpath, 2,
417 revs->dense_combined_merges,
418 revs);
419 free(dpath);
420 continue;
421 }
422 free(dpath);
423 dpath = NULL;
424 /*
426 * Show the diff for the 'ce' if we found the one
427 * from the desired stage.
428 */
429 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
430 if (ce_stage(ce) != diff_unmerged_stage)
431 continue;
432 }
433 if (lstat(ce->name, &st) < 0) {
435 if (errno != ENOENT && errno != ENOTDIR) {
436 perror(ce->name);
437 continue;
438 }
439 if (silent_on_removed)
440 continue;
441 diff_addremove(&revs->diffopt, '-', ntohl(ce->ce_mode),
442 ce->sha1, ce->name, NULL);
443 continue;
444 }
445 changed = ce_match_stat(ce, &st, 0);
446 if (!changed && !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
447 continue;
448 oldmode = ntohl(ce->ce_mode);
449 newmode = ntohl(ce_mode_from_stat(ce, st.st_mode));
450 diff_change(&revs->diffopt, oldmode, newmode,
451 ce->sha1, (changed ? null_sha1 : ce->sha1),
452 ce->name, NULL);
453 }
455 diffcore_std(&revs->diffopt);
456 diff_flush(&revs->diffopt);
457 return 0;
458}
459/*
461 * diff-index
462 */
463/* A file entry went away or appeared */
465static void diff_index_show_file(struct rev_info *revs,
466 const char *prefix,
467 struct cache_entry *ce,
468 unsigned char *sha1, unsigned int mode)
469{
470 diff_addremove(&revs->diffopt, prefix[0], ntohl(mode),
471 sha1, ce->name, NULL);
472}
473static int get_stat_data(struct cache_entry *ce,
475 unsigned char **sha1p,
476 unsigned int *modep,
477 int cached, int match_missing)
478{
479 unsigned char *sha1 = ce->sha1;
480 unsigned int mode = ce->ce_mode;
481 if (!cached) {
483 static unsigned char no_sha1[20];
484 int changed;
485 struct stat st;
486 if (lstat(ce->name, &st) < 0) {
487 if (errno == ENOENT && match_missing) {
488 *sha1p = sha1;
489 *modep = mode;
490 return 0;
491 }
492 return -1;
493 }
494 changed = ce_match_stat(ce, &st, 0);
495 if (changed) {
496 mode = ce_mode_from_stat(ce, st.st_mode);
497 sha1 = no_sha1;
498 }
499 }
500 *sha1p = sha1;
502 *modep = mode;
503 return 0;
504}
505static void show_new_file(struct rev_info *revs,
507 struct cache_entry *new,
508 int cached, int match_missing)
509{
510 unsigned char *sha1;
511 unsigned int mode;
512 /* New file in the index: it might actually be different in
514 * the working copy.
515 */
516 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0)
517 return;
518 diff_index_show_file(revs, "+", new, sha1, mode);
520}
521static int show_modified(struct rev_info *revs,
523 struct cache_entry *old,
524 struct cache_entry *new,
525 int report_missing,
526 int cached, int match_missing)
527{
528 unsigned int mode, oldmode;
529 unsigned char *sha1;
530 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0) {
532 if (report_missing)
533 diff_index_show_file(revs, "-", old,
534 old->sha1, old->ce_mode);
535 return -1;
536 }
537 if (revs->combine_merges && !cached &&
539 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
540 struct combine_diff_path *p;
541 int pathlen = ce_namelen(new);
542 p = xmalloc(combine_diff_path_size(2, pathlen));
544 p->path = (char *) &p->parent[2];
545 p->next = NULL;
546 p->len = pathlen;
547 memcpy(p->path, new->name, pathlen);
548 p->path[pathlen] = 0;
549 p->mode = ntohl(mode);
550 hashclr(p->sha1);
551 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
552 p->parent[0].status = DIFF_STATUS_MODIFIED;
553 p->parent[0].mode = ntohl(new->ce_mode);
554 hashcpy(p->parent[0].sha1, new->sha1);
555 p->parent[1].status = DIFF_STATUS_MODIFIED;
556 p->parent[1].mode = ntohl(old->ce_mode);
557 hashcpy(p->parent[1].sha1, old->sha1);
558 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
559 free(p);
560 return 0;
561 }
562 oldmode = old->ce_mode;
564 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
565 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
566 return 0;
567 mode = ntohl(mode);
569 oldmode = ntohl(oldmode);
570 diff_change(&revs->diffopt, oldmode, mode,
572 old->sha1, sha1, old->name, NULL);
573 return 0;
574}
575static int diff_cache(struct rev_info *revs,
577 struct cache_entry **ac, int entries,
578 const char **pathspec,
579 int cached, int match_missing)
580{
581 while (entries) {
582 struct cache_entry *ce = *ac;
583 int same = (entries > 1) && ce_same_name(ce, ac[1]);
584 if (DIFF_OPT_TST(&revs->diffopt, QUIET) &&
586 DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
587 break;
588 if (!ce_path_match(ce, pathspec))
590 goto skip_entry;
591 switch (ce_stage(ce)) {
593 case 0:
594 /* No stage 1 entry? That means it's a new file */
595 if (!same) {
596 show_new_file(revs, ce, cached, match_missing);
597 break;
598 }
599 /* Show difference between old and new */
600 show_modified(revs, ac[1], ce, 1,
601 cached, match_missing);
602 break;
603 case 1:
604 /* No stage 3 (merge) entry?
605 * That means it's been deleted.
606 */
607 if (!same) {
608 diff_index_show_file(revs, "-", ce,
609 ce->sha1, ce->ce_mode);
610 break;
611 }
612 /* We come here with ce pointing at stage 1
613 * (original tree) and ac[1] pointing at stage
614 * 3 (unmerged). show-modified with
615 * report-missing set to false does not say the
616 * file is deleted but reports true if work
617 * tree does not have it, in which case we
618 * fall through to report the unmerged state.
619 * Otherwise, we show the differences between
620 * the original tree and the work tree.
621 */
622 if (!cached &&
623 !show_modified(revs, ce, ac[1], 0,
624 cached, match_missing))
625 break;
626 diff_unmerge(&revs->diffopt, ce->name,
627 ntohl(ce->ce_mode), ce->sha1);
628 break;
629 case 3:
630 diff_unmerge(&revs->diffopt, ce->name,
631 0, null_sha1);
632 break;
633 default:
635 die("impossible cache entry stage");
636 }
637skip_entry:
639 /*
640 * Ignore all the different stages for this file,
641 * we've handled the relevant cases now.
642 */
643 do {
644 ac++;
645 entries--;
646 } while (entries && ce_same_name(ce, ac[0]));
647 }
648 return 0;
649}
650/*
652 * This turns all merge entries into "stage 3". That guarantees that
653 * when we read in the new tree (into "stage 1"), we won't lose sight
654 * of the fact that we had unmerged entries.
655 */
656static void mark_merge_entries(void)
657{
658 int i;
659 for (i = 0; i < active_nr; i++) {
660 struct cache_entry *ce = active_cache[i];
661 if (!ce_stage(ce))
662 continue;
663 ce->ce_flags |= htons(CE_STAGEMASK);
664 }
665}
666int run_diff_index(struct rev_info *revs, int cached)
668{
669 int ret;
670 struct object *ent;
671 struct tree *tree;
672 const char *tree_name;
673 int match_missing = 0;
674 /*
676 * Backward compatibility wart - "diff-index -m" does
677 * not mean "do not ignore merges", but totally different.
678 */
679 if (!revs->ignore_merges)
680 match_missing = 1;
681 mark_merge_entries();
683 ent = revs->pending.objects[0].item;
685 tree_name = revs->pending.objects[0].name;
686 tree = parse_tree_indirect(ent->sha1);
687 if (!tree)
688 return error("bad tree object %s", tree_name);
689 if (read_tree(tree, 1, revs->prune_data))
690 return error("unable to read tree object %s", tree_name);
691 ret = diff_cache(revs, active_cache, active_nr, revs->prune_data,
692 cached, match_missing);
693 diffcore_std(&revs->diffopt);
694 diff_flush(&revs->diffopt);
695 return ret;
696}
697int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
699{
700 struct tree *tree;
701 struct rev_info revs;
702 int i;
703 struct cache_entry **dst;
704 struct cache_entry *last = NULL;
705 /*
707 * This is used by git-blame to run diff-cache internally;
708 * it potentially needs to repeatedly run this, so we will
709 * start by removing the higher order entries the last round
710 * left behind.
711 */
712 dst = active_cache;
713 for (i = 0; i < active_nr; i++) {
714 struct cache_entry *ce = active_cache[i];
715 if (ce_stage(ce)) {
716 if (last && !strcmp(ce->name, last->name))
717 continue;
718 cache_tree_invalidate_path(active_cache_tree,
719 ce->name);
720 last = ce;
721 ce->ce_mode = 0;
722 ce->ce_flags &= ~htons(CE_STAGEMASK);
723 }
724 *dst++ = ce;
725 }
726 active_nr = dst - active_cache;
727 init_revisions(&revs, NULL);
729 revs.prune_data = opt->paths;
730 tree = parse_tree_indirect(tree_sha1);
731 if (!tree)
732 die("bad tree object %s", sha1_to_hex(tree_sha1));
733 if (read_tree(tree, 1, opt->paths))
734 return error("unable to read tree %s", sha1_to_hex(tree_sha1));
735 return diff_cache(&revs, active_cache, active_nr, revs.prune_data,
736 1, 0);
737}