Teach git-diff-files the new option `--no-index`
[git/git.git] / diff-lib.c
CommitLineData
be3cfa85
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
86436c28 4#include "cache.h"
6fb737be 5#include "quote.h"
6973dcae 6#include "commit.h"
86436c28 7#include "diff.h"
427dcb4b 8#include "diffcore.h"
6973dcae 9#include "revision.h"
1cfe7733 10#include "cache-tree.h"
d516c2d1 11#include "path-list.h"
427dcb4b 12
b46f0b6d 13/*
6973dcae 14 * diff-files
b46f0b6d 15 */
f0c6b2a2 16
d516c2d1
JS
17static int read_directory(const char *path, struct path_list *list)
18{
19 DIR *dir;
20 struct dirent *e;
21
22 if (!(dir = opendir(path)))
23 return error("Could not open directory %s", path);
24
25 while ((e = readdir(dir)))
26 if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
27 path_list_insert(xstrdup(e->d_name), list);
28
29 closedir(dir);
30 return 0;
31}
32
33static 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
39 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'", name1);
47 mode2 = st.st_mode;
48 }
49
50 if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
51 return error("file/directory conflict: %s, %s", name1, name2);
52
53 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
58 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
65 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
73 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
81 for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
82 const char *n1, *n2;
83 int comp;
84
85 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
93 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
101 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
109 ret = queue_diff(o, n1, n2);
110 }
111 path_list_clear(&p1, 0);
112 path_list_clear(&p2, 0);
113
114 return ret;
115 } else {
116 struct diff_filespec *d1, *d2;
117
118 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
125 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
134 diff_queue(&diff_queued_diff, d1, d2);
135 return 0;
136 }
137}
138
139static 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
145 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}
152
153static int handle_diff_files_args(struct rev_info *revs,
154 int argc, const char **argv, int *silent)
155{
156 *silent = 0;
157
158 /* 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
176 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
187 /*
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
196 if (revs->max_count == -1 &&
197 (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
198 revs->combine_merges = revs->dense_combined_merges = 1;
199
200 return 0;
201}
202
203int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv)
204{
205 int silent_on_removed;
206
207 if (handle_diff_files_args(revs, argc, argv, &silent_on_removed))
208 return -1;
209
210 if (revs->max_count == -2) {
211 if (revs->diffopt.nr_paths != 2)
212 return error("need two files/directories with --no-index");
213 queue_diff(&revs->diffopt, revs->diffopt.paths[0],
214 revs->diffopt.paths[1]);
215 diffcore_std(&revs->diffopt);
216 diff_flush(&revs->diffopt);
217 return 0;
218 }
219
220 return run_diff_files(revs, silent_on_removed);
221}
222
6973dcae 223int run_diff_files(struct rev_info *revs, int silent_on_removed)
f0c6b2a2 224{
6973dcae
JH
225 int entries, i;
226 int diff_unmerged_stage = revs->max_count;
f0c6b2a2 227
6973dcae
JH
228 if (diff_unmerged_stage < 0)
229 diff_unmerged_stage = 2;
230 entries = read_cache();
231 if (entries < 0) {
232 perror("read_cache");
427dcb4b 233 return -1;
427dcb4b 234 }
6973dcae 235 for (i = 0; i < entries; i++) {
be3cfa85 236 struct stat st;
6973dcae
JH
237 unsigned int oldmode, newmode;
238 struct cache_entry *ce = active_cache[i];
239 int changed;
8676eb43 240
6973dcae 241 if (!ce_path_match(ce, revs->prune_data))
8676eb43 242 continue;
be3cfa85 243
6973dcae 244 if (ce_stage(ce)) {
b4b15503 245 struct combine_diff_path *dpath;
6973dcae 246 int num_compare_stages = 0;
b4b15503 247 size_t path_len;
6973dcae 248
b4b15503
FF
249 path_len = ce_namelen(ce);
250
251 dpath = xmalloc (combine_diff_path_size (5, path_len));
252 dpath->path = (char *) &(dpath->parent[5]);
253
254 dpath->next = NULL;
255 dpath->len = path_len;
256 memcpy(dpath->path, ce->name, path_len);
257 dpath->path[path_len] = '\0';
258 dpath->mode = 0;
a8e0d16d 259 hashclr(dpath->sha1);
b4b15503
FF
260 memset(&(dpath->parent[0]), 0,
261 sizeof(struct combine_diff_parent)*5);
6973dcae
JH
262
263 while (i < entries) {
264 struct cache_entry *nce = active_cache[i];
265 int stage;
266
267 if (strcmp(ce->name, nce->name))
268 break;
269
270 /* Stage #2 (ours) is the first parent,
271 * stage #3 (theirs) is the second.
272 */
273 stage = ce_stage(nce);
274 if (2 <= stage) {
275 int mode = ntohl(nce->ce_mode);
276 num_compare_stages++;
e702496e 277 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
b4b15503 278 dpath->parent[stage-2].mode =
6973dcae 279 canon_mode(mode);
b4b15503 280 dpath->parent[stage-2].status =
6973dcae
JH
281 DIFF_STATUS_MODIFIED;
282 }
283
284 /* diff against the proper unmerged stage */
285 if (stage == diff_unmerged_stage)
286 ce = nce;
287 i++;
288 }
289 /*
290 * Compensate for loop update
f0c6b2a2 291 */
6973dcae 292 i--;
6b5ee137 293
6973dcae 294 if (revs->combine_merges && num_compare_stages == 2) {
b4b15503 295 show_combined_diff(dpath, 2,
6973dcae
JH
296 revs->dense_combined_merges,
297 revs);
b4b15503 298 free(dpath);
6973dcae 299 continue;
1b1480ff 300 }
b4b15503
FF
301 free(dpath);
302 dpath = NULL;
0e3994fa 303
6973dcae
JH
304 /*
305 * Show the diff for the 'ce' if we found the one
306 * from the desired stage.
307 */
e9c84099 308 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
6973dcae
JH
309 if (ce_stage(ce) != diff_unmerged_stage)
310 continue;
eeaa4603 311 }
6b14d7fa 312
6973dcae
JH
313 if (lstat(ce->name, &st) < 0) {
314 if (errno != ENOENT && errno != ENOTDIR) {
315 perror(ce->name);
15d061b4
JH
316 continue;
317 }
6973dcae
JH
318 if (silent_on_removed)
319 continue;
320 diff_addremove(&revs->diffopt, '-', ntohl(ce->ce_mode),
321 ce->sha1, ce->name, NULL);
322 continue;
f2ce9fde 323 }
6973dcae
JH
324 changed = ce_match_stat(ce, &st, 0);
325 if (!changed && !revs->diffopt.find_copies_harder)
326 continue;
327 oldmode = ntohl(ce->ce_mode);
be3cfa85 328
6973dcae
JH
329 newmode = canon_mode(st.st_mode);
330 if (!trust_executable_bit &&
331 S_ISREG(newmode) && S_ISREG(oldmode) &&
332 ((newmode ^ oldmode) == 0111))
333 newmode = oldmode;
334 diff_change(&revs->diffopt, oldmode, newmode,
335 ce->sha1, (changed ? null_sha1 : ce->sha1),
336 ce->name, NULL);
77eb2720 337
7ca45252 338 }
6973dcae
JH
339 diffcore_std(&revs->diffopt);
340 diff_flush(&revs->diffopt);
341 return 0;
77eb2720 342}
be3cfa85 343
e09ad6e1
JH
344/*
345 * diff-index
346 */
347
348/* A file entry went away or appeared */
349static void diff_index_show_file(struct rev_info *revs,
350 const char *prefix,
351 struct cache_entry *ce,
352 unsigned char *sha1, unsigned int mode)
353{
354 diff_addremove(&revs->diffopt, prefix[0], ntohl(mode),
355 sha1, ce->name, NULL);
356}
357
358static int get_stat_data(struct cache_entry *ce,
359 unsigned char **sha1p,
360 unsigned int *modep,
361 int cached, int match_missing)
362{
363 unsigned char *sha1 = ce->sha1;
364 unsigned int mode = ce->ce_mode;
365
366 if (!cached) {
367 static unsigned char no_sha1[20];
368 int changed;
369 struct stat st;
370 if (lstat(ce->name, &st) < 0) {
371 if (errno == ENOENT && match_missing) {
372 *sha1p = sha1;
373 *modep = mode;
374 return 0;
375 }
376 return -1;
377 }
378 changed = ce_match_stat(ce, &st, 0);
379 if (changed) {
185c975f 380 mode = ce_mode_from_stat(ce, st.st_mode);
e09ad6e1
JH
381 sha1 = no_sha1;
382 }
383 }
384
385 *sha1p = sha1;
386 *modep = mode;
387 return 0;
388}
389
390static void show_new_file(struct rev_info *revs,
391 struct cache_entry *new,
392 int cached, int match_missing)
393{
394 unsigned char *sha1;
395 unsigned int mode;
396
397 /* New file in the index: it might actually be different in
398 * the working copy.
399 */
400 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0)
401 return;
402
403 diff_index_show_file(revs, "+", new, sha1, mode);
404}
405
406static int show_modified(struct rev_info *revs,
407 struct cache_entry *old,
408 struct cache_entry *new,
409 int report_missing,
410 int cached, int match_missing)
411{
412 unsigned int mode, oldmode;
413 unsigned char *sha1;
414
415 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0) {
416 if (report_missing)
417 diff_index_show_file(revs, "-", old,
418 old->sha1, old->ce_mode);
419 return -1;
420 }
421
cb2b9f5e
PM
422 if (revs->combine_merges && !cached &&
423 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
424 struct combine_diff_path *p;
425 int pathlen = ce_namelen(new);
426
427 p = xmalloc(combine_diff_path_size(2, pathlen));
428 p->path = (char *) &p->parent[2];
429 p->next = NULL;
430 p->len = pathlen;
431 memcpy(p->path, new->name, pathlen);
432 p->path[pathlen] = 0;
433 p->mode = ntohl(mode);
434 hashclr(p->sha1);
435 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
436 p->parent[0].status = DIFF_STATUS_MODIFIED;
437 p->parent[0].mode = ntohl(new->ce_mode);
438 hashcpy(p->parent[0].sha1, new->sha1);
439 p->parent[1].status = DIFF_STATUS_MODIFIED;
440 p->parent[1].mode = ntohl(old->ce_mode);
441 hashcpy(p->parent[1].sha1, old->sha1);
442 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
443 free(p);
444 return 0;
445 }
446
e09ad6e1 447 oldmode = old->ce_mode;
a89fccd2 448 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
e09ad6e1
JH
449 !revs->diffopt.find_copies_harder)
450 return 0;
451
452 mode = ntohl(mode);
453 oldmode = ntohl(oldmode);
454
455 diff_change(&revs->diffopt, oldmode, mode,
456 old->sha1, sha1, old->name, NULL);
457 return 0;
458}
459
460static int diff_cache(struct rev_info *revs,
461 struct cache_entry **ac, int entries,
462 const char **pathspec,
463 int cached, int match_missing)
464{
465 while (entries) {
466 struct cache_entry *ce = *ac;
467 int same = (entries > 1) && ce_same_name(ce, ac[1]);
468
469 if (!ce_path_match(ce, pathspec))
470 goto skip_entry;
471
472 switch (ce_stage(ce)) {
473 case 0:
474 /* No stage 1 entry? That means it's a new file */
475 if (!same) {
476 show_new_file(revs, ce, cached, match_missing);
477 break;
478 }
479 /* Show difference between old and new */
1cfe7733 480 show_modified(revs, ac[1], ce, 1,
e09ad6e1
JH
481 cached, match_missing);
482 break;
483 case 1:
484 /* No stage 3 (merge) entry?
485 * That means it's been deleted.
486 */
487 if (!same) {
488 diff_index_show_file(revs, "-", ce,
489 ce->sha1, ce->ce_mode);
490 break;
491 }
492 /* We come here with ce pointing at stage 1
493 * (original tree) and ac[1] pointing at stage
494 * 3 (unmerged). show-modified with
495 * report-missing set to false does not say the
496 * file is deleted but reports true if work
497 * tree does not have it, in which case we
498 * fall through to report the unmerged state.
499 * Otherwise, we show the differences between
500 * the original tree and the work tree.
501 */
502 if (!cached &&
503 !show_modified(revs, ce, ac[1], 0,
504 cached, match_missing))
505 break;
e9c84099
JH
506 diff_unmerge(&revs->diffopt, ce->name,
507 ntohl(ce->ce_mode), ce->sha1);
508 break;
e09ad6e1 509 case 3:
e9c84099
JH
510 diff_unmerge(&revs->diffopt, ce->name,
511 0, null_sha1);
e09ad6e1
JH
512 break;
513
514 default:
515 die("impossible cache entry stage");
516 }
517
518skip_entry:
519 /*
520 * Ignore all the different stages for this file,
521 * we've handled the relevant cases now.
522 */
523 do {
524 ac++;
525 entries--;
526 } while (entries && ce_same_name(ce, ac[0]));
527 }
528 return 0;
529}
530
531/*
532 * This turns all merge entries into "stage 3". That guarantees that
533 * when we read in the new tree (into "stage 1"), we won't lose sight
534 * of the fact that we had unmerged entries.
535 */
536static void mark_merge_entries(void)
537{
538 int i;
539 for (i = 0; i < active_nr; i++) {
540 struct cache_entry *ce = active_cache[i];
541 if (!ce_stage(ce))
542 continue;
543 ce->ce_flags |= htons(CE_STAGEMASK);
544 }
545}
546
5c21ac0e 547int run_diff_index(struct rev_info *revs, int cached)
e09ad6e1
JH
548{
549 int ret;
550 struct object *ent;
551 struct tree *tree;
552 const char *tree_name;
5c21ac0e
JH
553 int match_missing = 0;
554
555 /*
556 * Backward compatibility wart - "diff-index -m" does
557 * not mean "do not ignore merges", but totally different.
558 */
559 if (!revs->ignore_merges)
560 match_missing = 1;
e09ad6e1
JH
561
562 if (read_cache() < 0) {
563 perror("read_cache");
564 return -1;
565 }
566 mark_merge_entries();
567
1f1e895f
LT
568 ent = revs->pending.objects[0].item;
569 tree_name = revs->pending.objects[0].name;
e09ad6e1
JH
570 tree = parse_tree_indirect(ent->sha1);
571 if (!tree)
572 return error("bad tree object %s", tree_name);
573 if (read_tree(tree, 1, revs->prune_data))
574 return error("unable to read tree object %s", tree_name);
575 ret = diff_cache(revs, active_cache, active_nr, revs->prune_data,
576 cached, match_missing);
577 diffcore_std(&revs->diffopt);
578 diff_flush(&revs->diffopt);
579 return ret;
580}
1cfe7733
JH
581
582int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
583{
584 struct tree *tree;
585 struct rev_info revs;
586 int i;
587 struct cache_entry **dst;
588 struct cache_entry *last = NULL;
589
590 /*
591 * This is used by git-blame to run diff-cache internally;
592 * it potentially needs to repeatedly run this, so we will
593 * start by removing the higher order entries the last round
594 * left behind.
595 */
596 dst = active_cache;
597 for (i = 0; i < active_nr; i++) {
598 struct cache_entry *ce = active_cache[i];
599 if (ce_stage(ce)) {
600 if (last && !strcmp(ce->name, last->name))
601 continue;
602 cache_tree_invalidate_path(active_cache_tree,
603 ce->name);
604 last = ce;
605 ce->ce_mode = 0;
606 ce->ce_flags &= ~htons(CE_STAGEMASK);
607 }
608 *dst++ = ce;
609 }
610 active_nr = dst - active_cache;
611
612 init_revisions(&revs, NULL);
613 revs.prune_data = opt->paths;
614 tree = parse_tree_indirect(tree_sha1);
615 if (!tree)
616 die("bad tree object %s", sha1_to_hex(tree_sha1));
617 if (read_tree(tree, 1, opt->paths))
618 return error("unable to read tree %s", sha1_to_hex(tree_sha1));
619 return diff_cache(&revs, active_cache, active_nr, revs.prune_data,
620 1, 0);
621}