Introduce "skip-worktree" bit in index, teach Git to get/set this bit
[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"
d1f2d7e8 11#include "unpack-trees.h"
948dd346 12#include "refs.h"
427dcb4b 13
b46f0b6d 14/*
6973dcae 15 * diff-files
b46f0b6d 16 */
f0c6b2a2 17
948dd346 18/*
1392a377
JH
19 * Has the work tree entity been removed?
20 *
21 * Return 1 if it was removed from the work tree, 0 if an entity to be
22 * compared with the cache entry ce still exists (the latter includes
23 * the case where a directory that is not a submodule repository
24 * exists for ce that is a submodule -- it is a submodule that is not
25 * checked out). Return negative for an error.
948dd346 26 */
c40641b7 27static int check_removed(const struct cache_entry *ce, struct stat *st)
948dd346
JH
28{
29 if (lstat(ce->name, st) < 0) {
30 if (errno != ENOENT && errno != ENOTDIR)
31 return -1;
32 return 1;
33 }
57199892 34 if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
948dd346
JH
35 return 1;
36 if (S_ISDIR(st->st_mode)) {
37 unsigned char sub[20];
1392a377
JH
38
39 /*
40 * If ce is already a gitlink, we can have a plain
41 * directory (i.e. the submodule is not checked out),
42 * or a checked out submodule. Either case this is not
43 * a case where something was removed from the work tree,
44 * so we will return 0.
45 *
46 * Otherwise, if the directory is not a submodule
47 * repository, that means ce which was a blob turned into
48 * a directory --- the blob was removed!
49 */
50 if (!S_ISGITLINK(ce->ce_mode) &&
51 resolve_gitlink_ref(ce->name, "HEAD", sub))
948dd346
JH
52 return 1;
53 }
54 return 0;
55}
d516c2d1 56
4bd5b7da 57int run_diff_files(struct rev_info *revs, unsigned int option)
f0c6b2a2 58{
6973dcae
JH
59 int entries, i;
60 int diff_unmerged_stage = revs->max_count;
4bd5b7da 61 int silent_on_removed = option & DIFF_SILENT_ON_REMOVED;
fb63d7f8
JH
62 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
63 ? CE_MATCH_RACY_IS_DIRTY : 0);
f0c6b2a2 64
a5a818ee
JH
65 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
66
6973dcae
JH
67 if (diff_unmerged_stage < 0)
68 diff_unmerged_stage = 2;
b4e1e4a7 69 entries = active_nr;
6973dcae 70 for (i = 0; i < entries; i++) {
be3cfa85 71 struct stat st;
6973dcae
JH
72 unsigned int oldmode, newmode;
73 struct cache_entry *ce = active_cache[i];
74 int changed;
8676eb43 75
8f67f8ae
PH
76 if (DIFF_OPT_TST(&revs->diffopt, QUIET) &&
77 DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
822cac01
JH
78 break;
79
6973dcae 80 if (!ce_path_match(ce, revs->prune_data))
8676eb43 81 continue;
be3cfa85 82
6973dcae 83 if (ce_stage(ce)) {
b4b15503 84 struct combine_diff_path *dpath;
6973dcae 85 int num_compare_stages = 0;
b4b15503 86 size_t path_len;
6973dcae 87
b4b15503
FF
88 path_len = ce_namelen(ce);
89
4fc970c4 90 dpath = xmalloc(combine_diff_path_size(5, path_len));
b4b15503
FF
91 dpath->path = (char *) &(dpath->parent[5]);
92
93 dpath->next = NULL;
94 dpath->len = path_len;
95 memcpy(dpath->path, ce->name, path_len);
96 dpath->path[path_len] = '\0';
a8e0d16d 97 hashclr(dpath->sha1);
b4b15503 98 memset(&(dpath->parent[0]), 0,
4fc970c4
JH
99 sizeof(struct combine_diff_parent)*5);
100
c40641b7 101 changed = check_removed(ce, &st);
f58dbf23
JH
102 if (!changed)
103 dpath->mode = ce_mode_from_stat(ce, st.st_mode);
104 else {
105 if (changed < 0) {
4fc970c4
JH
106 perror(ce->name);
107 continue;
108 }
109 if (silent_on_removed)
110 continue;
111 }
6973dcae
JH
112
113 while (i < entries) {
114 struct cache_entry *nce = active_cache[i];
115 int stage;
116
117 if (strcmp(ce->name, nce->name))
118 break;
119
120 /* Stage #2 (ours) is the first parent,
121 * stage #3 (theirs) is the second.
122 */
123 stage = ce_stage(nce);
124 if (2 <= stage) {
7a51ed66 125 int mode = nce->ce_mode;
6973dcae 126 num_compare_stages++;
e702496e 127 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
7a51ed66 128 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
b4b15503 129 dpath->parent[stage-2].status =
6973dcae
JH
130 DIFF_STATUS_MODIFIED;
131 }
132
133 /* diff against the proper unmerged stage */
134 if (stage == diff_unmerged_stage)
135 ce = nce;
136 i++;
137 }
138 /*
139 * Compensate for loop update
f0c6b2a2 140 */
6973dcae 141 i--;
6b5ee137 142
6973dcae 143 if (revs->combine_merges && num_compare_stages == 2) {
b4b15503 144 show_combined_diff(dpath, 2,
6973dcae
JH
145 revs->dense_combined_merges,
146 revs);
b4b15503 147 free(dpath);
6973dcae 148 continue;
1b1480ff 149 }
b4b15503
FF
150 free(dpath);
151 dpath = NULL;
0e3994fa 152
6973dcae
JH
153 /*
154 * Show the diff for the 'ce' if we found the one
155 * from the desired stage.
156 */
e9c84099 157 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
6973dcae
JH
158 if (ce_stage(ce) != diff_unmerged_stage)
159 continue;
eeaa4603 160 }
6b14d7fa 161
d1f2d7e8
LT
162 if (ce_uptodate(ce))
163 continue;
f58dbf23 164
540e694b
NTND
165 /* If CE_VALID is set, don't look at workdir for file removal */
166 changed = (ce->ce_flags & CE_VALID) ? 0 : check_removed(ce, &st);
f58dbf23
JH
167 if (changed) {
168 if (changed < 0) {
6973dcae 169 perror(ce->name);
15d061b4
JH
170 continue;
171 }
6973dcae
JH
172 if (silent_on_removed)
173 continue;
7a51ed66 174 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
fd55a19e 175 ce->sha1, ce->name);
6973dcae 176 continue;
f2ce9fde 177 }
fb63d7f8 178 changed = ce_match_stat(ce, &st, ce_option);
8fa29602
JH
179 if (!changed) {
180 ce_mark_uptodate(ce);
181 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
182 continue;
183 }
7a51ed66
LT
184 oldmode = ce->ce_mode;
185 newmode = ce_mode_from_stat(ce, st.st_mode);
6973dcae
JH
186 diff_change(&revs->diffopt, oldmode, newmode,
187 ce->sha1, (changed ? null_sha1 : ce->sha1),
fd55a19e 188 ce->name);
77eb2720 189
7ca45252 190 }
6973dcae
JH
191 diffcore_std(&revs->diffopt);
192 diff_flush(&revs->diffopt);
193 return 0;
77eb2720 194}
be3cfa85 195
e09ad6e1
JH
196/*
197 * diff-index
198 */
199
200/* A file entry went away or appeared */
201static void diff_index_show_file(struct rev_info *revs,
202 const char *prefix,
203 struct cache_entry *ce,
c8c16f28 204 const unsigned char *sha1, unsigned int mode)
e09ad6e1 205{
7a51ed66 206 diff_addremove(&revs->diffopt, prefix[0], mode,
fd55a19e 207 sha1, ce->name);
e09ad6e1
JH
208}
209
210static int get_stat_data(struct cache_entry *ce,
c8c16f28 211 const unsigned char **sha1p,
e09ad6e1 212 unsigned int *modep,
ff7e6aad 213 int cached, int match_missing)
e09ad6e1 214{
c8c16f28 215 const unsigned char *sha1 = ce->sha1;
e09ad6e1
JH
216 unsigned int mode = ce->ce_mode;
217
658dd48c 218 if (!cached && !ce_uptodate(ce)) {
e09ad6e1
JH
219 int changed;
220 struct stat st;
c40641b7 221 changed = check_removed(ce, &st);
948dd346
JH
222 if (changed < 0)
223 return -1;
224 else if (changed) {
225 if (match_missing) {
e09ad6e1
JH
226 *sha1p = sha1;
227 *modep = mode;
228 return 0;
229 }
230 return -1;
231 }
232 changed = ce_match_stat(ce, &st, 0);
233 if (changed) {
185c975f 234 mode = ce_mode_from_stat(ce, st.st_mode);
c8c16f28 235 sha1 = null_sha1;
e09ad6e1
JH
236 }
237 }
238
239 *sha1p = sha1;
240 *modep = mode;
241 return 0;
242}
243
ff7e6aad 244static void show_new_file(struct rev_info *revs,
e09ad6e1
JH
245 struct cache_entry *new,
246 int cached, int match_missing)
247{
c8c16f28 248 const unsigned char *sha1;
e09ad6e1
JH
249 unsigned int mode;
250
948dd346
JH
251 /*
252 * New file in the index: it might actually be different in
e09ad6e1
JH
253 * the working copy.
254 */
ff7e6aad 255 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0)
e09ad6e1
JH
256 return;
257
258 diff_index_show_file(revs, "+", new, sha1, mode);
259}
260
ff7e6aad 261static int show_modified(struct rev_info *revs,
e09ad6e1
JH
262 struct cache_entry *old,
263 struct cache_entry *new,
264 int report_missing,
265 int cached, int match_missing)
266{
267 unsigned int mode, oldmode;
c8c16f28 268 const unsigned char *sha1;
e09ad6e1 269
ff7e6aad 270 if (get_stat_data(new, &sha1, &mode, cached, match_missing) < 0) {
e09ad6e1
JH
271 if (report_missing)
272 diff_index_show_file(revs, "-", old,
273 old->sha1, old->ce_mode);
274 return -1;
275 }
276
cb2b9f5e
PM
277 if (revs->combine_merges && !cached &&
278 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
279 struct combine_diff_path *p;
280 int pathlen = ce_namelen(new);
281
282 p = xmalloc(combine_diff_path_size(2, pathlen));
283 p->path = (char *) &p->parent[2];
284 p->next = NULL;
285 p->len = pathlen;
286 memcpy(p->path, new->name, pathlen);
287 p->path[pathlen] = 0;
7a51ed66 288 p->mode = mode;
cb2b9f5e
PM
289 hashclr(p->sha1);
290 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
291 p->parent[0].status = DIFF_STATUS_MODIFIED;
7a51ed66 292 p->parent[0].mode = new->ce_mode;
cb2b9f5e
PM
293 hashcpy(p->parent[0].sha1, new->sha1);
294 p->parent[1].status = DIFF_STATUS_MODIFIED;
7a51ed66 295 p->parent[1].mode = old->ce_mode;
cb2b9f5e
PM
296 hashcpy(p->parent[1].sha1, old->sha1);
297 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
298 free(p);
299 return 0;
300 }
301
e09ad6e1 302 oldmode = old->ce_mode;
a89fccd2 303 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
8f67f8ae 304 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
e09ad6e1
JH
305 return 0;
306
e09ad6e1 307 diff_change(&revs->diffopt, oldmode, mode,
fd55a19e 308 old->sha1, sha1, old->name);
e09ad6e1
JH
309 return 0;
310}
311
e09ad6e1
JH
312/*
313 * This turns all merge entries into "stage 3". That guarantees that
314 * when we read in the new tree (into "stage 1"), we won't lose sight
315 * of the fact that we had unmerged entries.
316 */
317static void mark_merge_entries(void)
318{
319 int i;
320 for (i = 0; i < active_nr; i++) {
321 struct cache_entry *ce = active_cache[i];
322 if (!ce_stage(ce))
323 continue;
7a51ed66 324 ce->ce_flags |= CE_STAGEMASK;
e09ad6e1
JH
325 }
326}
327
d1f2d7e8
LT
328/*
329 * This gets a mix of an existing index and a tree, one pathname entry
330 * at a time. The index entry may be a single stage-0 one, but it could
331 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
332 * give you the position and number of entries in the index).
333 */
334static void do_oneway_diff(struct unpack_trees_options *o,
335 struct cache_entry *idx,
34110cd4 336 struct cache_entry *tree)
e09ad6e1 337{
ff7e6aad 338 struct rev_info *revs = o->unpack_data;
d1f2d7e8 339 int match_missing, cached;
5c21ac0e 340
540e694b
NTND
341 /* if the entry is not checked out, don't examine work tree */
342 cached = o->index_only || (idx && (idx->ce_flags & CE_VALID));
a6080a0a 343 /*
5c21ac0e 344 * Backward compatibility wart - "diff-index -m" does
d1f2d7e8
LT
345 * not mean "do not ignore merges", but "match_missing".
346 *
347 * But with the revision flag parsing, that's found in
348 * "!revs->ignore_merges".
349 */
d1f2d7e8
LT
350 match_missing = !revs->ignore_merges;
351
352 if (cached && idx && ce_stage(idx)) {
353 if (tree)
354 diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode, idx->sha1);
355 return;
356 }
357
358 /*
359 * Something added to the tree?
360 */
361 if (!tree) {
ff7e6aad 362 show_new_file(revs, idx, cached, match_missing);
d1f2d7e8
LT
363 return;
364 }
365
366 /*
367 * Something removed from the tree?
5c21ac0e 368 */
d1f2d7e8
LT
369 if (!idx) {
370 diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode);
371 return;
372 }
373
374 /* Show difference between old and new */
ff7e6aad 375 show_modified(revs, tree, idx, 1, cached, match_missing);
d1f2d7e8
LT
376}
377
20a16eb3
LT
378static inline void skip_same_name(struct cache_entry *ce, struct unpack_trees_options *o)
379{
380 int len = ce_namelen(ce);
381 const struct index_state *index = o->src_index;
382
383 while (o->pos < index->cache_nr) {
384 struct cache_entry *next = index->cache[o->pos];
385 if (len != ce_namelen(next))
386 break;
387 if (memcmp(ce->name, next->name, len))
388 break;
389 o->pos++;
390 }
391}
392
d1f2d7e8
LT
393/*
394 * The unpack_trees() interface is designed for merging, so
395 * the different source entries are designed primarily for
396 * the source trees, with the old index being really mainly
397 * used for being replaced by the result.
398 *
399 * For diffing, the index is more important, and we only have a
400 * single tree.
401 *
402 * We're supposed to return how many index entries we want to skip.
403 *
404 * This wrapper makes it all more readable, and takes care of all
405 * the fairly complex unpack_trees() semantic requirements, including
406 * the skipping, the path matching, the type conflict cases etc.
407 */
34110cd4 408static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
d1f2d7e8 409{
d1f2d7e8
LT
410 struct cache_entry *idx = src[0];
411 struct cache_entry *tree = src[1];
ff7e6aad 412 struct rev_info *revs = o->unpack_data;
d1f2d7e8 413
20a16eb3
LT
414 if (idx && ce_stage(idx))
415 skip_same_name(idx, o);
416
d1f2d7e8
LT
417 /*
418 * Unpack-trees generates a DF/conflict entry if
419 * there was a directory in the index and a tree
420 * in the tree. From a diff standpoint, that's a
421 * delete of the tree and a create of the file.
422 */
423 if (tree == o->df_conflict_entry)
424 tree = NULL;
425
426 if (ce_path_match(idx ? idx : tree, revs->prune_data))
34110cd4 427 do_oneway_diff(o, idx, tree);
d1f2d7e8 428
34110cd4 429 return 0;
d1f2d7e8
LT
430}
431
432int run_diff_index(struct rev_info *revs, int cached)
433{
434 struct object *ent;
435 struct tree *tree;
436 const char *tree_name;
437 struct unpack_trees_options opts;
438 struct tree_desc t;
e09ad6e1 439
e09ad6e1
JH
440 mark_merge_entries();
441
1f1e895f
LT
442 ent = revs->pending.objects[0].item;
443 tree_name = revs->pending.objects[0].name;
e09ad6e1
JH
444 tree = parse_tree_indirect(ent->sha1);
445 if (!tree)
446 return error("bad tree object %s", tree_name);
d1f2d7e8
LT
447
448 memset(&opts, 0, sizeof(opts));
449 opts.head_idx = 1;
450 opts.index_only = cached;
a0919ced
JH
451 opts.diff_index_cached = (cached &&
452 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
d1f2d7e8
LT
453 opts.merge = 1;
454 opts.fn = oneway_diff;
ff7e6aad 455 opts.unpack_data = revs;
34110cd4
LT
456 opts.src_index = &the_index;
457 opts.dst_index = NULL;
d1f2d7e8
LT
458
459 init_tree_desc(&t, tree->buffer, tree->size);
203a2fe1
DB
460 if (unpack_trees(1, &t, &opts))
461 exit(128);
d1f2d7e8 462
a5a818ee 463 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
e09ad6e1
JH
464 diffcore_std(&revs->diffopt);
465 diff_flush(&revs->diffopt);
d1f2d7e8 466 return 0;
e09ad6e1 467}
1cfe7733
JH
468
469int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
470{
471 struct tree *tree;
472 struct rev_info revs;
473 int i;
474 struct cache_entry **dst;
475 struct cache_entry *last = NULL;
204ce979
JS
476 struct unpack_trees_options opts;
477 struct tree_desc t;
1cfe7733
JH
478
479 /*
480 * This is used by git-blame to run diff-cache internally;
481 * it potentially needs to repeatedly run this, so we will
482 * start by removing the higher order entries the last round
483 * left behind.
484 */
485 dst = active_cache;
486 for (i = 0; i < active_nr; i++) {
487 struct cache_entry *ce = active_cache[i];
488 if (ce_stage(ce)) {
489 if (last && !strcmp(ce->name, last->name))
490 continue;
491 cache_tree_invalidate_path(active_cache_tree,
492 ce->name);
493 last = ce;
7a51ed66 494 ce->ce_flags |= CE_REMOVE;
1cfe7733
JH
495 }
496 *dst++ = ce;
497 }
498 active_nr = dst - active_cache;
499
500 init_revisions(&revs, NULL);
501 revs.prune_data = opt->paths;
502 tree = parse_tree_indirect(tree_sha1);
503 if (!tree)
504 die("bad tree object %s", sha1_to_hex(tree_sha1));
204ce979
JS
505
506 memset(&opts, 0, sizeof(opts));
507 opts.head_idx = 1;
508 opts.index_only = 1;
a0919ced 509 opts.diff_index_cached = !DIFF_OPT_TST(opt, FIND_COPIES_HARDER);
204ce979
JS
510 opts.merge = 1;
511 opts.fn = oneway_diff;
ff7e6aad 512 opts.unpack_data = &revs;
34110cd4
LT
513 opts.src_index = &the_index;
514 opts.dst_index = &the_index;
204ce979
JS
515
516 init_tree_desc(&t, tree->buffer, tree->size);
203a2fe1
DB
517 if (unpack_trees(1, &t, &opts))
518 exit(128);
204ce979 519 return 0;
1cfe7733 520}
75f3ff2e
SB
521
522int index_differs_from(const char *def, int diff_flags)
523{
524 struct rev_info rev;
525
526 init_revisions(&rev, NULL);
527 setup_revisions(0, NULL, &rev, def);
528 DIFF_OPT_SET(&rev.diffopt, QUIET);
529 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
530 rev.diffopt.flags |= diff_flags;
531 run_diff_index(&rev, 1);
532 if (rev.pending.alloc)
533 free(rev.pending.objects);
534 return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
535}