Merge branch 'master' into js/diff-ni
[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))
646b3299 46 return error("Could not access '%s'", name2);
d516c2d1
JS
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
efdfd6c8
JH
220 if (read_cache() < 0) {
221 perror("read_cache");
222 return -1;
223 }
d516c2d1
JS
224 return run_diff_files(revs, silent_on_removed);
225}
226
6973dcae 227int run_diff_files(struct rev_info *revs, int silent_on_removed)
f0c6b2a2 228{
6973dcae
JH
229 int entries, i;
230 int diff_unmerged_stage = revs->max_count;
f0c6b2a2 231
6973dcae
JH
232 if (diff_unmerged_stage < 0)
233 diff_unmerged_stage = 2;
b4e1e4a7 234 entries = active_nr;
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
4fc970c4 251 dpath = xmalloc(combine_diff_path_size(5, path_len));
b4b15503
FF
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';
a8e0d16d 258 hashclr(dpath->sha1);
b4b15503 259 memset(&(dpath->parent[0]), 0,
4fc970c4
JH
260 sizeof(struct combine_diff_parent)*5);
261
262 if (lstat(ce->name, &st) < 0) {
263 if (errno != ENOENT && errno != ENOTDIR) {
264 perror(ce->name);
265 continue;
266 }
267 if (silent_on_removed)
268 continue;
269 }
270 else
271 dpath->mode = canon_mode(st.st_mode);
6973dcae
JH
272
273 while (i < entries) {
274 struct cache_entry *nce = active_cache[i];
275 int stage;
276
277 if (strcmp(ce->name, nce->name))
278 break;
279
280 /* Stage #2 (ours) is the first parent,
281 * stage #3 (theirs) is the second.
282 */
283 stage = ce_stage(nce);
284 if (2 <= stage) {
285 int mode = ntohl(nce->ce_mode);
286 num_compare_stages++;
e702496e 287 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
b4b15503 288 dpath->parent[stage-2].mode =
6973dcae 289 canon_mode(mode);
b4b15503 290 dpath->parent[stage-2].status =
6973dcae
JH
291 DIFF_STATUS_MODIFIED;
292 }
293
294 /* diff against the proper unmerged stage */
295 if (stage == diff_unmerged_stage)
296 ce = nce;
297 i++;
298 }
299 /*
300 * Compensate for loop update
f0c6b2a2 301 */
6973dcae 302 i--;
6b5ee137 303
6973dcae 304 if (revs->combine_merges && num_compare_stages == 2) {
b4b15503 305 show_combined_diff(dpath, 2,
6973dcae
JH
306 revs->dense_combined_merges,
307 revs);
b4b15503 308 free(dpath);
6973dcae 309 continue;
1b1480ff 310 }
b4b15503
FF
311 free(dpath);
312 dpath = NULL;
0e3994fa 313
6973dcae
JH
314 /*
315 * Show the diff for the 'ce' if we found the one
316 * from the desired stage.
317 */
e9c84099 318 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
6973dcae
JH
319 if (ce_stage(ce) != diff_unmerged_stage)
320 continue;
eeaa4603 321 }
6b14d7fa 322
6973dcae
JH
323 if (lstat(ce->name, &st) < 0) {
324 if (errno != ENOENT && errno != ENOTDIR) {
325 perror(ce->name);
15d061b4
JH
326 continue;
327 }
6973dcae
JH
328 if (silent_on_removed)
329 continue;
330 diff_addremove(&revs->diffopt, '-', ntohl(ce->ce_mode),
331 ce->sha1, ce->name, NULL);
332 continue;
f2ce9fde 333 }
6973dcae
JH
334 changed = ce_match_stat(ce, &st, 0);
335 if (!changed && !revs->diffopt.find_copies_harder)
336 continue;
337 oldmode = ntohl(ce->ce_mode);
be3cfa85 338
6973dcae
JH
339 newmode = canon_mode(st.st_mode);
340 if (!trust_executable_bit &&
341 S_ISREG(newmode) && S_ISREG(oldmode) &&
342 ((newmode ^ oldmode) == 0111))
343 newmode = oldmode;
344 diff_change(&revs->diffopt, oldmode, newmode,
345 ce->sha1, (changed ? null_sha1 : ce->sha1),
346 ce->name, NULL);
77eb2720 347
7ca45252 348 }
6973dcae
JH
349 diffcore_std(&revs->diffopt);
350 diff_flush(&revs->diffopt);
351 return 0;
77eb2720 352}
be3cfa85 353
e09ad6e1
JH
354/*
355 * diff-index
356 */
357
358/* A file entry went away or appeared */
359static void diff_index_show_file(struct rev_info *revs,
360 const char *prefix,
361 struct cache_entry *ce,
362 unsigned char *sha1, unsigned int mode)
363{
364 diff_addremove(&revs->diffopt, prefix[0], ntohl(mode),
365 sha1, ce->name, NULL);
366}
367
368static int get_stat_data(struct cache_entry *ce,
369 unsigned char **sha1p,
370 unsigned int *modep,
371 int cached, int match_missing)
372{
373 unsigned char *sha1 = ce->sha1;
374 unsigned int mode = ce->ce_mode;
375
376 if (!cached) {
377 static unsigned char no_sha1[20];
378 int changed;
379 struct stat st;
380 if (lstat(ce->name, &st) < 0) {
381 if (errno == ENOENT && match_missing) {
382 *sha1p = sha1;
383 *modep = mode;
384 return 0;
385 }
386 return -1;
387 }
388 changed = ce_match_stat(ce, &st, 0);
389 if (changed) {
185c975f 390 mode = ce_mode_from_stat(ce, st.st_mode);
e09ad6e1
JH
391 sha1 = no_sha1;
392 }
393 }
394
395 *sha1p = sha1;
396 *modep = mode;
397 return 0;
398}
399
400static void show_new_file(struct rev_info *revs,
401 struct cache_entry *new,
402 int cached, int match_missing)
403{
404 unsigned char *sha1;
405 unsigned int mode;
406
407 /* New file in the index: it might actually be different in
408 * the working copy.
409 */
410 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0)
411 return;
412
413 diff_index_show_file(revs, "+", new, sha1, mode);
414}
415
416static int show_modified(struct rev_info *revs,
417 struct cache_entry *old,
418 struct cache_entry *new,
419 int report_missing,
420 int cached, int match_missing)
421{
422 unsigned int mode, oldmode;
423 unsigned char *sha1;
424
425 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0) {
426 if (report_missing)
427 diff_index_show_file(revs, "-", old,
428 old->sha1, old->ce_mode);
429 return -1;
430 }
431
cb2b9f5e
PM
432 if (revs->combine_merges && !cached &&
433 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
434 struct combine_diff_path *p;
435 int pathlen = ce_namelen(new);
436
437 p = xmalloc(combine_diff_path_size(2, pathlen));
438 p->path = (char *) &p->parent[2];
439 p->next = NULL;
440 p->len = pathlen;
441 memcpy(p->path, new->name, pathlen);
442 p->path[pathlen] = 0;
443 p->mode = ntohl(mode);
444 hashclr(p->sha1);
445 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
446 p->parent[0].status = DIFF_STATUS_MODIFIED;
447 p->parent[0].mode = ntohl(new->ce_mode);
448 hashcpy(p->parent[0].sha1, new->sha1);
449 p->parent[1].status = DIFF_STATUS_MODIFIED;
450 p->parent[1].mode = ntohl(old->ce_mode);
451 hashcpy(p->parent[1].sha1, old->sha1);
452 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
453 free(p);
454 return 0;
455 }
456
e09ad6e1 457 oldmode = old->ce_mode;
a89fccd2 458 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
e09ad6e1
JH
459 !revs->diffopt.find_copies_harder)
460 return 0;
461
462 mode = ntohl(mode);
463 oldmode = ntohl(oldmode);
464
465 diff_change(&revs->diffopt, oldmode, mode,
466 old->sha1, sha1, old->name, NULL);
467 return 0;
468}
469
470static int diff_cache(struct rev_info *revs,
471 struct cache_entry **ac, int entries,
472 const char **pathspec,
473 int cached, int match_missing)
474{
475 while (entries) {
476 struct cache_entry *ce = *ac;
477 int same = (entries > 1) && ce_same_name(ce, ac[1]);
478
479 if (!ce_path_match(ce, pathspec))
480 goto skip_entry;
481
482 switch (ce_stage(ce)) {
483 case 0:
484 /* No stage 1 entry? That means it's a new file */
485 if (!same) {
486 show_new_file(revs, ce, cached, match_missing);
487 break;
488 }
489 /* Show difference between old and new */
1cfe7733 490 show_modified(revs, ac[1], ce, 1,
e09ad6e1
JH
491 cached, match_missing);
492 break;
493 case 1:
494 /* No stage 3 (merge) entry?
495 * That means it's been deleted.
496 */
497 if (!same) {
498 diff_index_show_file(revs, "-", ce,
499 ce->sha1, ce->ce_mode);
500 break;
501 }
502 /* We come here with ce pointing at stage 1
503 * (original tree) and ac[1] pointing at stage
504 * 3 (unmerged). show-modified with
505 * report-missing set to false does not say the
506 * file is deleted but reports true if work
507 * tree does not have it, in which case we
508 * fall through to report the unmerged state.
509 * Otherwise, we show the differences between
510 * the original tree and the work tree.
511 */
512 if (!cached &&
513 !show_modified(revs, ce, ac[1], 0,
514 cached, match_missing))
515 break;
e9c84099
JH
516 diff_unmerge(&revs->diffopt, ce->name,
517 ntohl(ce->ce_mode), ce->sha1);
518 break;
e09ad6e1 519 case 3:
e9c84099
JH
520 diff_unmerge(&revs->diffopt, ce->name,
521 0, null_sha1);
e09ad6e1
JH
522 break;
523
524 default:
525 die("impossible cache entry stage");
526 }
527
528skip_entry:
529 /*
530 * Ignore all the different stages for this file,
531 * we've handled the relevant cases now.
532 */
533 do {
534 ac++;
535 entries--;
536 } while (entries && ce_same_name(ce, ac[0]));
537 }
538 return 0;
539}
540
541/*
542 * This turns all merge entries into "stage 3". That guarantees that
543 * when we read in the new tree (into "stage 1"), we won't lose sight
544 * of the fact that we had unmerged entries.
545 */
546static void mark_merge_entries(void)
547{
548 int i;
549 for (i = 0; i < active_nr; i++) {
550 struct cache_entry *ce = active_cache[i];
551 if (!ce_stage(ce))
552 continue;
553 ce->ce_flags |= htons(CE_STAGEMASK);
554 }
555}
556
5c21ac0e 557int run_diff_index(struct rev_info *revs, int cached)
e09ad6e1
JH
558{
559 int ret;
560 struct object *ent;
561 struct tree *tree;
562 const char *tree_name;
5c21ac0e
JH
563 int match_missing = 0;
564
565 /*
566 * Backward compatibility wart - "diff-index -m" does
567 * not mean "do not ignore merges", but totally different.
568 */
569 if (!revs->ignore_merges)
570 match_missing = 1;
e09ad6e1 571
e09ad6e1
JH
572 mark_merge_entries();
573
1f1e895f
LT
574 ent = revs->pending.objects[0].item;
575 tree_name = revs->pending.objects[0].name;
e09ad6e1
JH
576 tree = parse_tree_indirect(ent->sha1);
577 if (!tree)
578 return error("bad tree object %s", tree_name);
579 if (read_tree(tree, 1, revs->prune_data))
580 return error("unable to read tree object %s", tree_name);
581 ret = diff_cache(revs, active_cache, active_nr, revs->prune_data,
582 cached, match_missing);
583 diffcore_std(&revs->diffopt);
584 diff_flush(&revs->diffopt);
585 return ret;
586}
1cfe7733
JH
587
588int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
589{
590 struct tree *tree;
591 struct rev_info revs;
592 int i;
593 struct cache_entry **dst;
594 struct cache_entry *last = NULL;
595
596 /*
597 * This is used by git-blame to run diff-cache internally;
598 * it potentially needs to repeatedly run this, so we will
599 * start by removing the higher order entries the last round
600 * left behind.
601 */
602 dst = active_cache;
603 for (i = 0; i < active_nr; i++) {
604 struct cache_entry *ce = active_cache[i];
605 if (ce_stage(ce)) {
606 if (last && !strcmp(ce->name, last->name))
607 continue;
608 cache_tree_invalidate_path(active_cache_tree,
609 ce->name);
610 last = ce;
611 ce->ce_mode = 0;
612 ce->ce_flags &= ~htons(CE_STAGEMASK);
613 }
614 *dst++ = ce;
615 }
616 active_nr = dst - active_cache;
617
618 init_revisions(&revs, NULL);
619 revs.prune_data = opt->paths;
620 tree = parse_tree_indirect(tree_sha1);
621 if (!tree)
622 die("bad tree object %s", sha1_to_hex(tree_sha1));
623 if (read_tree(tree, 1, opt->paths))
624 return error("unable to read tree %s", sha1_to_hex(tree_sha1));
625 return diff_cache(&revs, active_cache, active_nr, revs.prune_data,
626 1, 0);
627}