88e59b5794236e8ca3162c8dd823ea1a64b4683b
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(xstrdup(e->d_name), list);
28 closedir(dir);
30 return 0;
31}
32static int queue_diff(struct diff_options *o,
34 const char *name1, const char *name2)
35{
36 struct stat st;
37 int mode1 = 0, mode2 = 0;
38 if (name1) {
40 if (stat(name1, &st))
41 return error("Could not access '%s'", name1);
42 mode1 = st.st_mode;
43 }
44 if (name2) {
45 if (stat(name2, &st))
46 return error("Could not access '%s'", name2);
47 mode2 = st.st_mode;
48 }
49 if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
51 return error("file/directory conflict: %s, %s", name1, name2);
52 if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
54 char buffer1[PATH_MAX], buffer2[PATH_MAX];
55 struct path_list p1 = {NULL, 0, 0, 1}, p2 = {NULL, 0, 0, 1};
56 int len1 = 0, len2 = 0, i1, i2, ret = 0;
57 if (name1 && read_directory(name1, &p1))
59 return -1;
60 if (name2 && read_directory(name2, &p2)) {
61 path_list_clear(&p1, 0);
62 return -1;
63 }
64 if (name1) {
66 len1 = strlen(name1);
67 if (len1 > 0 && name1[len1 - 1] == '/')
68 len1--;
69 memcpy(buffer1, name1, len1);
70 buffer1[len1++] = '/';
71 }
72 if (name2) {
74 len2 = strlen(name2);
75 if (len2 > 0 && name2[len2 - 1] == '/')
76 len2--;
77 memcpy(buffer2, name2, len2);
78 buffer2[len2++] = '/';
79 }
80 for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
82 const char *n1, *n2;
83 int comp;
84 if (i1 == p1.nr)
86 comp = 1;
87 else if (i2 == p2.nr)
88 comp = -1;
89 else
90 comp = strcmp(p1.items[i1].path,
91 p2.items[i2].path);
92 if (comp > 0)
94 n1 = NULL;
95 else {
96 n1 = buffer1;
97 strncpy(buffer1 + len1, p1.items[i1++].path,
98 PATH_MAX - len1);
99 }
100 if (comp < 0)
102 n2 = NULL;
103 else {
104 n2 = buffer2;
105 strncpy(buffer2 + len2, p2.items[i2++].path,
106 PATH_MAX - len2);
107 }
108 ret = queue_diff(o, n1, n2);
110 }
111 path_list_clear(&p1, 0);
112 path_list_clear(&p2, 0);
113 return ret;
115 } else {
116 struct diff_filespec *d1, *d2;
117 if (o->reverse_diff) {
119 unsigned tmp;
120 const char *tmp_c;
121 tmp = mode1; mode1 = mode2; mode2 = tmp;
122 tmp_c = name1; name1 = name2; name2 = tmp_c;
123 }
124 if (!name1)
126 name1 = "/dev/null";
127 if (!name2)
128 name2 = "/dev/null";
129 d1 = alloc_filespec(name1);
130 d2 = alloc_filespec(name2);
131 fill_filespec(d1, null_sha1, mode1);
132 fill_filespec(d2, null_sha1, mode2);
133 diff_queue(&diff_queued_diff, d1, d2);
135 return 0;
136 }
137}
138static int is_in_index(const char *path)
140{
141 int len = strlen(path);
142 int pos = cache_name_pos(path, len);
143 char c;
144 if (pos < 0)
146 return 0;
147 if (strncmp(active_cache[pos]->name, path, len))
148 return 0;
149 c = active_cache[pos]->name[len];
150 return c == '\0' || c == '/';
151}
152static int handle_diff_files_args(struct rev_info *revs,
154 int argc, const char **argv, int *silent)
155{
156 *silent = 0;
157 /* revs->max_count == -2 means --no-index */
159 while (1 < argc && argv[1][0] == '-') {
160 if (!strcmp(argv[1], "--base"))
161 revs->max_count = 1;
162 else if (!strcmp(argv[1], "--ours"))
163 revs->max_count = 2;
164 else if (!strcmp(argv[1], "--theirs"))
165 revs->max_count = 3;
166 else if (!strcmp(argv[1], "-n") ||
167 !strcmp(argv[1], "--no-index"))
168 revs->max_count = -2;
169 else if (!strcmp(argv[1], "-q"))
170 *silent = 1;
171 else
172 return error("invalid option: %s", argv[1]);
173 argv++; argc--;
174 }
175 if (revs->max_count == -1 && revs->diffopt.nr_paths == 2) {
177 /*
178 * If two files are specified, and at least one is untracked,
179 * default to no-index.
180 */
181 read_cache();
182 if (!is_in_index(revs->diffopt.paths[0]) ||
183 !is_in_index(revs->diffopt.paths[1]))
184 revs->max_count = -2;
185 }
186 /*
188 * Make sure there are NO revision (i.e. pending object) parameter,
189 * rev.max_count is reasonable (0 <= n <= 3),
190 * there is no other revision filtering parameters.
191 */
192 if (revs->pending.nr || revs->max_count > 3 ||
193 revs->min_age != -1 || revs->max_age != -1)
194 return error("no revision allowed with diff-files");
195 if (revs->max_count == -1 &&
197 (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
198 revs->combine_merges = revs->dense_combined_merges = 1;
199 return 0;
201}
202static int is_outside_repo(const char *path, int nongit, const char *prefix)
204{
205 int i;
206 if (nongit || !strcmp(path, "-") || path[0] == '/')
207 return 1;
208 if (prefixcmp(path, "../"))
209 return 0;
210 if (!prefix)
211 return 1;
212 for (i = strlen(prefix); !prefixcmp(path, "../"); ) {
213 while (i > 0 && prefix[i - 1] != '/')
214 i--;
215 if (--i < 0)
216 return 1;
217 path += 3;
218 }
219 return 0;
220}
221int setup_diff_no_index(struct rev_info *revs,
223 int argc, const char ** argv, int nongit, const char *prefix)
224{
225 int i;
226 for (i = 1; i < argc; i++)
227 if (argv[i][0] != '-')
228 break;
229 else if (!strcmp(argv[i], "--")) {
230 i++;
231 break;
232 } else if (i < argc - 3 && !strcmp(argv[i], "--no-index")) {
233 i = argc - 3;
234 break;
235 }
236 if (argc != i + 2 || (!is_outside_repo(argv[i + 1], nongit, prefix) &&
237 !is_outside_repo(argv[i], nongit, prefix)))
238 return -1;
239 diff_setup(&revs->diffopt);
241 for (i = 1; i < argc - 2; )
242 if (!strcmp(argv[i], "--no-index"))
243 i++;
244 else {
245 int j = diff_opt_parse(&revs->diffopt,
246 argv + i, argc - i);
247 if (!j)
248 die("invalid diff option/value: %s", argv[i]);
249 i += j;
250 }
251 if (prefix) {
253 int len = strlen(prefix);
254 revs->diffopt.paths = xcalloc(2, sizeof(char*));
256 for (i = 0; i < 2; i++) {
257 const char *p;
258 p = prefix_filename(prefix, len, argv[argc - 2 + i]);
259 revs->diffopt.paths[i] = xstrdup(p);
260 }
261 }
262 else
263 revs->diffopt.paths = argv + argc - 2;
264 revs->diffopt.nr_paths = 2;
265 revs->max_count = -2;
266 return 0;
267}
268int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv)
270{
271 int silent_on_removed;
272 if (handle_diff_files_args(revs, argc, argv, &silent_on_removed))
274 return -1;
275 if (revs->max_count == -2) {
277 if (revs->diffopt.nr_paths != 2)
278 return error("need two files/directories with --no-index");
279 if (queue_diff(&revs->diffopt, revs->diffopt.paths[0],
280 revs->diffopt.paths[1]))
281 return -1;
282 diffcore_std(&revs->diffopt);
283 diff_flush(&revs->diffopt);
284 /*
285 * The return code for --no-index imitates diff(1):
286 * 0 = no changes, 1 = changes, else error
287 */
288 return revs->diffopt.found_changes;
289 }
290 if (read_cache() < 0) {
292 perror("read_cache");
293 return -1;
294 }
295 return run_diff_files(revs, silent_on_removed);
296}
297int run_diff_files(struct rev_info *revs, int silent_on_removed)
299{
300 int entries, i;
301 int diff_unmerged_stage = revs->max_count;
302 if (diff_unmerged_stage < 0)
304 diff_unmerged_stage = 2;
305 entries = active_nr;
306 for (i = 0; i < entries; i++) {
307 struct stat st;
308 unsigned int oldmode, newmode;
309 struct cache_entry *ce = active_cache[i];
310 int changed;
311 if (!ce_path_match(ce, revs->prune_data))
313 continue;
314 if (ce_stage(ce)) {
316 struct combine_diff_path *dpath;
317 int num_compare_stages = 0;
318 size_t path_len;
319 path_len = ce_namelen(ce);
321 dpath = xmalloc(combine_diff_path_size(5, path_len));
323 dpath->path = (char *) &(dpath->parent[5]);
324 dpath->next = NULL;
326 dpath->len = path_len;
327 memcpy(dpath->path, ce->name, path_len);
328 dpath->path[path_len] = '\0';
329 hashclr(dpath->sha1);
330 memset(&(dpath->parent[0]), 0,
331 sizeof(struct combine_diff_parent)*5);
332 if (lstat(ce->name, &st) < 0) {
334 if (errno != ENOENT && errno != ENOTDIR) {
335 perror(ce->name);
336 continue;
337 }
338 if (silent_on_removed)
339 continue;
340 }
341 else
342 dpath->mode = canon_mode(st.st_mode);
343 while (i < entries) {
345 struct cache_entry *nce = active_cache[i];
346 int stage;
347 if (strcmp(ce->name, nce->name))
349 break;
350 /* Stage #2 (ours) is the first parent,
352 * stage #3 (theirs) is the second.
353 */
354 stage = ce_stage(nce);
355 if (2 <= stage) {
356 int mode = ntohl(nce->ce_mode);
357 num_compare_stages++;
358 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
359 dpath->parent[stage-2].mode =
360 canon_mode(mode);
361 dpath->parent[stage-2].status =
362 DIFF_STATUS_MODIFIED;
363 }
364 /* diff against the proper unmerged stage */
366 if (stage == diff_unmerged_stage)
367 ce = nce;
368 i++;
369 }
370 /*
371 * Compensate for loop update
372 */
373 i--;
374 if (revs->combine_merges && num_compare_stages == 2) {
376 show_combined_diff(dpath, 2,
377 revs->dense_combined_merges,
378 revs);
379 free(dpath);
380 continue;
381 }
382 free(dpath);
383 dpath = NULL;
384 /*
386 * Show the diff for the 'ce' if we found the one
387 * from the desired stage.
388 */
389 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
390 if (ce_stage(ce) != diff_unmerged_stage)
391 continue;
392 }
393 if (lstat(ce->name, &st) < 0) {
395 if (errno != ENOENT && errno != ENOTDIR) {
396 perror(ce->name);
397 continue;
398 }
399 if (silent_on_removed)
400 continue;
401 diff_addremove(&revs->diffopt, '-', ntohl(ce->ce_mode),
402 ce->sha1, ce->name, NULL);
403 continue;
404 }
405 changed = ce_match_stat(ce, &st, 0);
406 if (!changed && !revs->diffopt.find_copies_harder)
407 continue;
408 oldmode = ntohl(ce->ce_mode);
409 newmode = canon_mode(st.st_mode);
411 if (!trust_executable_bit &&
412 S_ISREG(newmode) && S_ISREG(oldmode) &&
413 ((newmode ^ oldmode) == 0111))
414 newmode = oldmode;
415 diff_change(&revs->diffopt, oldmode, newmode,
416 ce->sha1, (changed ? null_sha1 : ce->sha1),
417 ce->name, NULL);
418 }
420 diffcore_std(&revs->diffopt);
421 diff_flush(&revs->diffopt);
422 return 0;
423}
424/*
426 * diff-index
427 */
428/* A file entry went away or appeared */
430static void diff_index_show_file(struct rev_info *revs,
431 const char *prefix,
432 struct cache_entry *ce,
433 unsigned char *sha1, unsigned int mode)
434{
435 diff_addremove(&revs->diffopt, prefix[0], ntohl(mode),
436 sha1, ce->name, NULL);
437}
438static int get_stat_data(struct cache_entry *ce,
440 unsigned char **sha1p,
441 unsigned int *modep,
442 int cached, int match_missing)
443{
444 unsigned char *sha1 = ce->sha1;
445 unsigned int mode = ce->ce_mode;
446 if (!cached) {
448 static unsigned char no_sha1[20];
449 int changed;
450 struct stat st;
451 if (lstat(ce->name, &st) < 0) {
452 if (errno == ENOENT && match_missing) {
453 *sha1p = sha1;
454 *modep = mode;
455 return 0;
456 }
457 return -1;
458 }
459 changed = ce_match_stat(ce, &st, 0);
460 if (changed) {
461 mode = ce_mode_from_stat(ce, st.st_mode);
462 sha1 = no_sha1;
463 }
464 }
465 *sha1p = sha1;
467 *modep = mode;
468 return 0;
469}
470static void show_new_file(struct rev_info *revs,
472 struct cache_entry *new,
473 int cached, int match_missing)
474{
475 unsigned char *sha1;
476 unsigned int mode;
477 /* New file in the index: it might actually be different in
479 * the working copy.
480 */
481 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0)
482 return;
483 diff_index_show_file(revs, "+", new, sha1, mode);
485}
486static int show_modified(struct rev_info *revs,
488 struct cache_entry *old,
489 struct cache_entry *new,
490 int report_missing,
491 int cached, int match_missing)
492{
493 unsigned int mode, oldmode;
494 unsigned char *sha1;
495 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0) {
497 if (report_missing)
498 diff_index_show_file(revs, "-", old,
499 old->sha1, old->ce_mode);
500 return -1;
501 }
502 if (revs->combine_merges && !cached &&
504 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
505 struct combine_diff_path *p;
506 int pathlen = ce_namelen(new);
507 p = xmalloc(combine_diff_path_size(2, pathlen));
509 p->path = (char *) &p->parent[2];
510 p->next = NULL;
511 p->len = pathlen;
512 memcpy(p->path, new->name, pathlen);
513 p->path[pathlen] = 0;
514 p->mode = ntohl(mode);
515 hashclr(p->sha1);
516 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
517 p->parent[0].status = DIFF_STATUS_MODIFIED;
518 p->parent[0].mode = ntohl(new->ce_mode);
519 hashcpy(p->parent[0].sha1, new->sha1);
520 p->parent[1].status = DIFF_STATUS_MODIFIED;
521 p->parent[1].mode = ntohl(old->ce_mode);
522 hashcpy(p->parent[1].sha1, old->sha1);
523 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
524 free(p);
525 return 0;
526 }
527 oldmode = old->ce_mode;
529 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
530 !revs->diffopt.find_copies_harder)
531 return 0;
532 mode = ntohl(mode);
534 oldmode = ntohl(oldmode);
535 diff_change(&revs->diffopt, oldmode, mode,
537 old->sha1, sha1, old->name, NULL);
538 return 0;
539}
540static int diff_cache(struct rev_info *revs,
542 struct cache_entry **ac, int entries,
543 const char **pathspec,
544 int cached, int match_missing)
545{
546 while (entries) {
547 struct cache_entry *ce = *ac;
548 int same = (entries > 1) && ce_same_name(ce, ac[1]);
549 if (!ce_path_match(ce, pathspec))
551 goto skip_entry;
552 switch (ce_stage(ce)) {
554 case 0:
555 /* No stage 1 entry? That means it's a new file */
556 if (!same) {
557 show_new_file(revs, ce, cached, match_missing);
558 break;
559 }
560 /* Show difference between old and new */
561 show_modified(revs, ac[1], ce, 1,
562 cached, match_missing);
563 break;
564 case 1:
565 /* No stage 3 (merge) entry?
566 * That means it's been deleted.
567 */
568 if (!same) {
569 diff_index_show_file(revs, "-", ce,
570 ce->sha1, ce->ce_mode);
571 break;
572 }
573 /* We come here with ce pointing at stage 1
574 * (original tree) and ac[1] pointing at stage
575 * 3 (unmerged). show-modified with
576 * report-missing set to false does not say the
577 * file is deleted but reports true if work
578 * tree does not have it, in which case we
579 * fall through to report the unmerged state.
580 * Otherwise, we show the differences between
581 * the original tree and the work tree.
582 */
583 if (!cached &&
584 !show_modified(revs, ce, ac[1], 0,
585 cached, match_missing))
586 break;
587 diff_unmerge(&revs->diffopt, ce->name,
588 ntohl(ce->ce_mode), ce->sha1);
589 break;
590 case 3:
591 diff_unmerge(&revs->diffopt, ce->name,
592 0, null_sha1);
593 break;
594 default:
596 die("impossible cache entry stage");
597 }
598skip_entry:
600 /*
601 * Ignore all the different stages for this file,
602 * we've handled the relevant cases now.
603 */
604 do {
605 ac++;
606 entries--;
607 } while (entries && ce_same_name(ce, ac[0]));
608 }
609 return 0;
610}
611/*
613 * This turns all merge entries into "stage 3". That guarantees that
614 * when we read in the new tree (into "stage 1"), we won't lose sight
615 * of the fact that we had unmerged entries.
616 */
617static void mark_merge_entries(void)
618{
619 int i;
620 for (i = 0; i < active_nr; i++) {
621 struct cache_entry *ce = active_cache[i];
622 if (!ce_stage(ce))
623 continue;
624 ce->ce_flags |= htons(CE_STAGEMASK);
625 }
626}
627int run_diff_index(struct rev_info *revs, int cached)
629{
630 int ret;
631 struct object *ent;
632 struct tree *tree;
633 const char *tree_name;
634 int match_missing = 0;
635 /*
637 * Backward compatibility wart - "diff-index -m" does
638 * not mean "do not ignore merges", but totally different.
639 */
640 if (!revs->ignore_merges)
641 match_missing = 1;
642 mark_merge_entries();
644 ent = revs->pending.objects[0].item;
646 tree_name = revs->pending.objects[0].name;
647 tree = parse_tree_indirect(ent->sha1);
648 if (!tree)
649 return error("bad tree object %s", tree_name);
650 if (read_tree(tree, 1, revs->prune_data))
651 return error("unable to read tree object %s", tree_name);
652 ret = diff_cache(revs, active_cache, active_nr, revs->prune_data,
653 cached, match_missing);
654 diffcore_std(&revs->diffopt);
655 diff_flush(&revs->diffopt);
656 return ret;
657}
658int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
660{
661 struct tree *tree;
662 struct rev_info revs;
663 int i;
664 struct cache_entry **dst;
665 struct cache_entry *last = NULL;
666 /*
668 * This is used by git-blame to run diff-cache internally;
669 * it potentially needs to repeatedly run this, so we will
670 * start by removing the higher order entries the last round
671 * left behind.
672 */
673 dst = active_cache;
674 for (i = 0; i < active_nr; i++) {
675 struct cache_entry *ce = active_cache[i];
676 if (ce_stage(ce)) {
677 if (last && !strcmp(ce->name, last->name))
678 continue;
679 cache_tree_invalidate_path(active_cache_tree,
680 ce->name);
681 last = ce;
682 ce->ce_mode = 0;
683 ce->ce_flags &= ~htons(CE_STAGEMASK);
684 }
685 *dst++ = ce;
686 }
687 active_nr = dst - active_cache;
688 init_revisions(&revs, NULL);
690 revs.prune_data = opt->paths;
691 tree = parse_tree_indirect(tree_sha1);
692 if (!tree)
693 die("bad tree object %s", sha1_to_hex(tree_sha1));
694 if (read_tree(tree, 1, opt->paths))
695 return error("unable to read tree %s", sha1_to_hex(tree_sha1));
696 return diff_cache(&revs, active_cache, active_nr, revs.prune_data,
697 1, 0);
698}