2 * Copyright (C) 2005 Junio C Hamano
10 #include "cache-tree.h"
11 #include "path-list.h"
12 #include "unpack-trees.h"
19 static int read_directory(const char *path, struct path_list *list)
24 if (!(dir = opendir(path)))
25 return error("Could not open directory %s", path);
27 while ((e = readdir(dir)))
28 if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
29 path_list_insert(e->d_name, list);
35 static int get_mode(const char *path, int *mode)
39 if (!path || !strcmp(path, "/dev/null"))
41 else if (!strcmp(path, "-"))
42 *mode = create_ce_mode(0666);
43 else if (stat(path, &st))
44 return error("Could not access '%s'", path);
50 static int queue_diff(struct diff_options *o,
51 const char *name1, const char *name2)
53 int mode1 = 0, mode2 = 0;
55 if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
58 if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
59 return error("file/directory conflict: %s, %s", name1, name2);
61 if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
62 char buffer1[PATH_MAX], buffer2[PATH_MAX];
63 struct path_list p1 = {NULL, 0, 0, 1}, p2 = {NULL, 0, 0, 1};
64 int len1 = 0, len2 = 0, i1, i2, ret = 0;
66 if (name1 && read_directory(name1, &p1))
68 if (name2 && read_directory(name2, &p2)) {
69 path_list_clear(&p1, 0);
75 if (len1 > 0 && name1[len1 - 1] == '/')
77 memcpy(buffer1, name1, len1);
78 buffer1[len1++] = '/';
83 if (len2 > 0 && name2[len2 - 1] == '/')
85 memcpy(buffer2, name2, len2);
86 buffer2[len2++] = '/';
89 for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
98 comp = strcmp(p1.items[i1].path,
105 strncpy(buffer1 + len1, p1.items[i1++].path,
113 strncpy(buffer2 + len2, p2.items[i2++].path,
117 ret = queue_diff(o, n1, n2);
119 path_list_clear(&p1, 0);
120 path_list_clear(&p2, 0);
124 struct diff_filespec *d1, *d2;
126 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
129 tmp = mode1; mode1 = mode2; mode2 = tmp;
130 tmp_c = name1; name1 = name2; name2 = tmp_c;
137 d1 = alloc_filespec(name1);
138 d2 = alloc_filespec(name2);
139 fill_filespec(d1, null_sha1, mode1);
140 fill_filespec(d2, null_sha1, mode2);
142 diff_queue(&diff_queued_diff, d1, d2);
148 * Does the path name a blob in the working tree, or a directory
149 * in the working tree?
151 static int is_in_index(const char *path)
154 struct cache_entry *ce;
157 while (path[len-1] == '/')
161 pos = cache_name_pos(path, len);
165 while (pos < active_nr) {
166 ce = active_cache[pos++];
167 if (ce_namelen(ce) <= len ||
168 strncmp(ce->name, path, len) ||
169 (ce->name[len] > '/'))
170 break; /* path cannot be a prefix */
171 if (ce->name[len] == '/')
177 static int handle_diff_files_args(struct rev_info *revs,
178 int argc, const char **argv,
179 unsigned int *options)
183 /* revs->max_count == -2 means --no-index */
184 while (1 < argc && argv[1][0] == '-') {
185 if (!strcmp(argv[1], "--base"))
187 else if (!strcmp(argv[1], "--ours"))
189 else if (!strcmp(argv[1], "--theirs"))
191 else if (!strcmp(argv[1], "-n") ||
192 !strcmp(argv[1], "--no-index")) {
193 revs->max_count = -2;
194 DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
195 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
197 else if (!strcmp(argv[1], "-q"))
198 *options |= DIFF_SILENT_ON_REMOVED;
200 return error("invalid option: %s", argv[1]);
204 if (revs->max_count == -1 && revs->diffopt.nr_paths == 2) {
206 * If two files are specified, and at least one is untracked,
207 * default to no-index.
210 if (!is_in_index(revs->diffopt.paths[0]) ||
211 !is_in_index(revs->diffopt.paths[1])) {
212 revs->max_count = -2;
213 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
218 * Make sure there are NO revision (i.e. pending object) parameter,
219 * rev.max_count is reasonable (0 <= n <= 3),
220 * there is no other revision filtering parameters.
222 if (revs->pending.nr || revs->max_count > 3 ||
223 revs->min_age != -1 || revs->max_age != -1)
224 return error("no revision allowed with diff-files");
226 if (revs->max_count == -1 &&
227 (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
228 revs->combine_merges = revs->dense_combined_merges = 1;
233 static int is_outside_repo(const char *path, int nongit, const char *prefix)
236 if (nongit || !strcmp(path, "-") || is_absolute_path(path))
238 if (prefixcmp(path, "../"))
242 for (i = strlen(prefix); !prefixcmp(path, "../"); ) {
243 while (i > 0 && prefix[i - 1] != '/')
252 int setup_diff_no_index(struct rev_info *revs,
253 int argc, const char ** argv, int nongit, const char *prefix)
256 for (i = 1; i < argc; i++)
257 if (argv[i][0] != '-' || argv[i][1] == '\0')
259 else if (!strcmp(argv[i], "--")) {
262 } else if (i < argc - 3 && !strcmp(argv[i], "--no-index")) {
264 DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
267 if (nongit && argc != i + 2)
268 die("git diff [--no-index] takes two paths");
270 if (argc != i + 2 || (!is_outside_repo(argv[i + 1], nongit, prefix) &&
271 !is_outside_repo(argv[i], nongit, prefix)))
274 diff_setup(&revs->diffopt);
275 for (i = 1; i < argc - 2; )
276 if (!strcmp(argv[i], "--no-index"))
279 int j = diff_opt_parse(&revs->diffopt,
282 die("invalid diff option/value: %s", argv[i]);
287 int len = strlen(prefix);
289 revs->diffopt.paths = xcalloc(2, sizeof(char*));
290 for (i = 0; i < 2; i++) {
291 const char *p = argv[argc - 2 + i];
293 * stdin should be spelled as '-'; if you have
294 * path that is '-', spell it as ./-.
297 ? xstrdup(prefix_filename(prefix, len, p))
299 revs->diffopt.paths[i] = p;
303 revs->diffopt.paths = argv + argc - 2;
304 revs->diffopt.nr_paths = 2;
305 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
306 revs->max_count = -2;
307 if (diff_setup_done(&revs->diffopt) < 0)
308 die("diff_setup_done failed");
312 int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv)
314 unsigned int options;
316 if (handle_diff_files_args(revs, argc, argv, &options))
319 if (DIFF_OPT_TST(&revs->diffopt, NO_INDEX)) {
320 if (revs->diffopt.nr_paths != 2)
321 return error("need two files/directories with --no-index");
322 if (queue_diff(&revs->diffopt, revs->diffopt.paths[0],
323 revs->diffopt.paths[1]))
325 diffcore_std(&revs->diffopt);
326 diff_flush(&revs->diffopt);
328 * The return code for --no-index imitates diff(1):
329 * 0 = no changes, 1 = changes, else error
331 return revs->diffopt.found_changes;
334 if (read_cache() < 0) {
335 perror("read_cache");
338 return run_diff_files(revs, options);
342 * Has the work tree entity been removed?
344 * Return 1 if it was removed from the work tree, 0 if an entity to be
345 * compared with the cache entry ce still exists (the latter includes
346 * the case where a directory that is not a submodule repository
347 * exists for ce that is a submodule -- it is a submodule that is not
348 * checked out). Return negative for an error.
350 static int check_removed(const struct cache_entry *ce, struct stat *st)
352 if (lstat(ce->name, st) < 0) {
353 if (errno != ENOENT && errno != ENOTDIR)
357 if (has_symlink_leading_path(ce_namelen(ce), ce->name))
359 if (S_ISDIR(st->st_mode)) {
360 unsigned char sub[20];
363 * If ce is already a gitlink, we can have a plain
364 * directory (i.e. the submodule is not checked out),
365 * or a checked out submodule. Either case this is not
366 * a case where something was removed from the work tree,
367 * so we will return 0.
369 * Otherwise, if the directory is not a submodule
370 * repository, that means ce which was a blob turned into
371 * a directory --- the blob was removed!
373 if (!S_ISGITLINK(ce->ce_mode) &&
374 resolve_gitlink_ref(ce->name, "HEAD", sub))
380 int run_diff_files(struct rev_info *revs, unsigned int option)
383 int diff_unmerged_stage = revs->max_count;
384 int silent_on_removed = option & DIFF_SILENT_ON_REMOVED;
385 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
386 ? CE_MATCH_RACY_IS_DIRTY : 0);
387 char symcache[PATH_MAX];
389 if (diff_unmerged_stage < 0)
390 diff_unmerged_stage = 2;
393 for (i = 0; i < entries; i++) {
395 unsigned int oldmode, newmode;
396 struct cache_entry *ce = active_cache[i];
399 if (DIFF_OPT_TST(&revs->diffopt, QUIET) &&
400 DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
403 if (!ce_path_match(ce, revs->prune_data))
407 struct combine_diff_path *dpath;
408 int num_compare_stages = 0;
411 path_len = ce_namelen(ce);
413 dpath = xmalloc(combine_diff_path_size(5, path_len));
414 dpath->path = (char *) &(dpath->parent[5]);
417 dpath->len = path_len;
418 memcpy(dpath->path, ce->name, path_len);
419 dpath->path[path_len] = '\0';
420 hashclr(dpath->sha1);
421 memset(&(dpath->parent[0]), 0,
422 sizeof(struct combine_diff_parent)*5);
424 changed = check_removed(ce, &st);
426 dpath->mode = ce_mode_from_stat(ce, st.st_mode);
432 if (silent_on_removed)
436 while (i < entries) {
437 struct cache_entry *nce = active_cache[i];
440 if (strcmp(ce->name, nce->name))
443 /* Stage #2 (ours) is the first parent,
444 * stage #3 (theirs) is the second.
446 stage = ce_stage(nce);
448 int mode = nce->ce_mode;
449 num_compare_stages++;
450 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
451 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
452 dpath->parent[stage-2].status =
453 DIFF_STATUS_MODIFIED;
456 /* diff against the proper unmerged stage */
457 if (stage == diff_unmerged_stage)
462 * Compensate for loop update
466 if (revs->combine_merges && num_compare_stages == 2) {
467 show_combined_diff(dpath, 2,
468 revs->dense_combined_merges,
477 * Show the diff for the 'ce' if we found the one
478 * from the desired stage.
480 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
481 if (ce_stage(ce) != diff_unmerged_stage)
488 changed = check_removed(ce, &st);
494 if (silent_on_removed)
496 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
497 ce->sha1, ce->name, NULL);
500 changed = ce_match_stat(ce, &st, ce_option);
502 ce_mark_uptodate(ce);
503 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
506 oldmode = ce->ce_mode;
507 newmode = ce_mode_from_stat(ce, st.st_mode);
508 diff_change(&revs->diffopt, oldmode, newmode,
509 ce->sha1, (changed ? null_sha1 : ce->sha1),
513 diffcore_std(&revs->diffopt);
514 diff_flush(&revs->diffopt);
522 struct oneway_unpack_data {
523 struct rev_info *revs;
524 char symcache[PATH_MAX];
527 /* A file entry went away or appeared */
528 static void diff_index_show_file(struct rev_info *revs,
530 struct cache_entry *ce,
531 const unsigned char *sha1, unsigned int mode)
533 diff_addremove(&revs->diffopt, prefix[0], mode,
534 sha1, ce->name, NULL);
537 static int get_stat_data(struct cache_entry *ce,
538 const unsigned char **sha1p,
540 int cached, int match_missing,
541 struct oneway_unpack_data *cbdata)
543 const unsigned char *sha1 = ce->sha1;
544 unsigned int mode = ce->ce_mode;
549 changed = check_removed(ce, &st);
560 changed = ce_match_stat(ce, &st, 0);
562 mode = ce_mode_from_stat(ce, st.st_mode);
572 static void show_new_file(struct oneway_unpack_data *cbdata,
573 struct cache_entry *new,
574 int cached, int match_missing)
576 const unsigned char *sha1;
578 struct rev_info *revs = cbdata->revs;
581 * New file in the index: it might actually be different in
584 if (get_stat_data(new, &sha1, &mode, cached, match_missing, cbdata) < 0)
587 diff_index_show_file(revs, "+", new, sha1, mode);
590 static int show_modified(struct oneway_unpack_data *cbdata,
591 struct cache_entry *old,
592 struct cache_entry *new,
594 int cached, int match_missing)
596 unsigned int mode, oldmode;
597 const unsigned char *sha1;
598 struct rev_info *revs = cbdata->revs;
600 if (get_stat_data(new, &sha1, &mode, cached, match_missing, cbdata) < 0) {
602 diff_index_show_file(revs, "-", old,
603 old->sha1, old->ce_mode);
607 if (revs->combine_merges && !cached &&
608 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
609 struct combine_diff_path *p;
610 int pathlen = ce_namelen(new);
612 p = xmalloc(combine_diff_path_size(2, pathlen));
613 p->path = (char *) &p->parent[2];
616 memcpy(p->path, new->name, pathlen);
617 p->path[pathlen] = 0;
620 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
621 p->parent[0].status = DIFF_STATUS_MODIFIED;
622 p->parent[0].mode = new->ce_mode;
623 hashcpy(p->parent[0].sha1, new->sha1);
624 p->parent[1].status = DIFF_STATUS_MODIFIED;
625 p->parent[1].mode = old->ce_mode;
626 hashcpy(p->parent[1].sha1, old->sha1);
627 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
632 oldmode = old->ce_mode;
633 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
634 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
637 diff_change(&revs->diffopt, oldmode, mode,
638 old->sha1, sha1, old->name, NULL);
643 * This turns all merge entries into "stage 3". That guarantees that
644 * when we read in the new tree (into "stage 1"), we won't lose sight
645 * of the fact that we had unmerged entries.
647 static void mark_merge_entries(void)
650 for (i = 0; i < active_nr; i++) {
651 struct cache_entry *ce = active_cache[i];
654 ce->ce_flags |= CE_STAGEMASK;
659 * This gets a mix of an existing index and a tree, one pathname entry
660 * at a time. The index entry may be a single stage-0 one, but it could
661 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
662 * give you the position and number of entries in the index).
664 static void do_oneway_diff(struct unpack_trees_options *o,
665 struct cache_entry *idx,
666 struct cache_entry *tree)
668 struct oneway_unpack_data *cbdata = o->unpack_data;
669 struct rev_info *revs = cbdata->revs;
670 int match_missing, cached;
673 * Backward compatibility wart - "diff-index -m" does
674 * not mean "do not ignore merges", but "match_missing".
676 * But with the revision flag parsing, that's found in
677 * "!revs->ignore_merges".
679 cached = o->index_only;
680 match_missing = !revs->ignore_merges;
682 if (cached && idx && ce_stage(idx)) {
684 diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode, idx->sha1);
689 * Something added to the tree?
692 show_new_file(cbdata, idx, cached, match_missing);
697 * Something removed from the tree?
700 diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode);
704 /* Show difference between old and new */
705 show_modified(cbdata, tree, idx, 1, cached, match_missing);
708 static inline void skip_same_name(struct cache_entry *ce, struct unpack_trees_options *o)
710 int len = ce_namelen(ce);
711 const struct index_state *index = o->src_index;
713 while (o->pos < index->cache_nr) {
714 struct cache_entry *next = index->cache[o->pos];
715 if (len != ce_namelen(next))
717 if (memcmp(ce->name, next->name, len))
724 * The unpack_trees() interface is designed for merging, so
725 * the different source entries are designed primarily for
726 * the source trees, with the old index being really mainly
727 * used for being replaced by the result.
729 * For diffing, the index is more important, and we only have a
732 * We're supposed to return how many index entries we want to skip.
734 * This wrapper makes it all more readable, and takes care of all
735 * the fairly complex unpack_trees() semantic requirements, including
736 * the skipping, the path matching, the type conflict cases etc.
738 static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
740 struct cache_entry *idx = src[0];
741 struct cache_entry *tree = src[1];
742 struct oneway_unpack_data *cbdata = o->unpack_data;
743 struct rev_info *revs = cbdata->revs;
745 if (idx && ce_stage(idx))
746 skip_same_name(idx, o);
749 * Unpack-trees generates a DF/conflict entry if
750 * there was a directory in the index and a tree
751 * in the tree. From a diff standpoint, that's a
752 * delete of the tree and a create of the file.
754 if (tree == o->df_conflict_entry)
757 if (ce_path_match(idx ? idx : tree, revs->prune_data))
758 do_oneway_diff(o, idx, tree);
763 int run_diff_index(struct rev_info *revs, int cached)
767 const char *tree_name;
768 struct unpack_trees_options opts;
770 struct oneway_unpack_data unpack_cb;
772 mark_merge_entries();
774 ent = revs->pending.objects[0].item;
775 tree_name = revs->pending.objects[0].name;
776 tree = parse_tree_indirect(ent->sha1);
778 return error("bad tree object %s", tree_name);
780 unpack_cb.revs = revs;
781 unpack_cb.symcache[0] = '\0';
782 memset(&opts, 0, sizeof(opts));
784 opts.index_only = cached;
786 opts.fn = oneway_diff;
787 opts.unpack_data = &unpack_cb;
788 opts.src_index = &the_index;
789 opts.dst_index = NULL;
791 init_tree_desc(&t, tree->buffer, tree->size);
792 if (unpack_trees(1, &t, &opts))
795 diffcore_std(&revs->diffopt);
796 diff_flush(&revs->diffopt);
800 int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
803 struct rev_info revs;
805 struct cache_entry **dst;
806 struct cache_entry *last = NULL;
807 struct unpack_trees_options opts;
809 struct oneway_unpack_data unpack_cb;
812 * This is used by git-blame to run diff-cache internally;
813 * it potentially needs to repeatedly run this, so we will
814 * start by removing the higher order entries the last round
818 for (i = 0; i < active_nr; i++) {
819 struct cache_entry *ce = active_cache[i];
821 if (last && !strcmp(ce->name, last->name))
823 cache_tree_invalidate_path(active_cache_tree,
826 ce->ce_flags |= CE_REMOVE;
830 active_nr = dst - active_cache;
832 init_revisions(&revs, NULL);
833 revs.prune_data = opt->paths;
834 tree = parse_tree_indirect(tree_sha1);
836 die("bad tree object %s", sha1_to_hex(tree_sha1));
838 unpack_cb.revs = &revs;
839 unpack_cb.symcache[0] = '\0';
840 memset(&opts, 0, sizeof(opts));
844 opts.fn = oneway_diff;
845 opts.unpack_data = &unpack_cb;
846 opts.src_index = &the_index;
847 opts.dst_index = &the_index;
849 init_tree_desc(&t, tree->buffer, tree->size);
850 if (unpack_trees(1, &t, &opts))