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