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