fsmonitor: teach git to optionally utilize a file system monitor to speed up detectin...
[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)) {
40 unsigned char sub[20];
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) &&
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
JL
74 if (S_ISGITLINK(ce->ce_mode)) {
75 unsigned orig_flags = diffopt->flags;
76 if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG))
77 set_diffopt_flags_from_submodule_config(diffopt, ce->name);
78 if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES))
79 changed = 0;
80 else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES)
81 && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES)))
82 *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
83 diffopt->flags = orig_flags;
ae6d5c1b
JL
84 }
85 return changed;
86}
87
4bd5b7da 88int run_diff_files(struct rev_info *revs, unsigned int option)
f0c6b2a2 89{
6973dcae
JH
90 int entries, i;
91 int diff_unmerged_stage = revs->max_count;
fb63d7f8
JH
92 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
93 ? CE_MATCH_RACY_IS_DIRTY : 0);
f0c6b2a2 94
a5a818ee
JH
95 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
96
6973dcae
JH
97 if (diff_unmerged_stage < 0)
98 diff_unmerged_stage = 2;
b4e1e4a7 99 entries = active_nr;
6973dcae 100 for (i = 0; i < entries; i++) {
6973dcae
JH
101 unsigned int oldmode, newmode;
102 struct cache_entry *ce = active_cache[i];
103 int changed;
e3d42c47 104 unsigned dirty_submodule = 0;
55497b8c 105 const struct object_id *old_oid, *new_oid;
8676eb43 106
28b9264d 107 if (diff_can_quit_early(&revs->diffopt))
822cac01
JH
108 break;
109
429bb40a 110 if (!ce_path_match(ce, &revs->prune_data, NULL))
8676eb43 111 continue;
be3cfa85 112
6973dcae 113 if (ce_stage(ce)) {
b4b15503 114 struct combine_diff_path *dpath;
095ce953
JH
115 struct diff_filepair *pair;
116 unsigned int wt_mode = 0;
6973dcae 117 int num_compare_stages = 0;
b4b15503 118 size_t path_len;
53048100 119 struct stat st;
6973dcae 120
b4b15503
FF
121 path_len = ce_namelen(ce);
122
4fc970c4 123 dpath = xmalloc(combine_diff_path_size(5, path_len));
b4b15503
FF
124 dpath->path = (char *) &(dpath->parent[5]);
125
126 dpath->next = NULL;
b4b15503
FF
127 memcpy(dpath->path, ce->name, path_len);
128 dpath->path[path_len] = '\0';
1ff57c13 129 oidclr(&dpath->oid);
b4b15503 130 memset(&(dpath->parent[0]), 0,
4fc970c4
JH
131 sizeof(struct combine_diff_parent)*5);
132
c40641b7 133 changed = check_removed(ce, &st);
f58dbf23 134 if (!changed)
095ce953 135 wt_mode = ce_mode_from_stat(ce, st.st_mode);
f58dbf23
JH
136 else {
137 if (changed < 0) {
4fc970c4
JH
138 perror(ce->name);
139 continue;
140 }
095ce953 141 wt_mode = 0;
4fc970c4 142 }
095ce953 143 dpath->mode = wt_mode;
6973dcae
JH
144
145 while (i < entries) {
146 struct cache_entry *nce = active_cache[i];
147 int stage;
148
149 if (strcmp(ce->name, nce->name))
150 break;
151
152 /* Stage #2 (ours) is the first parent,
153 * stage #3 (theirs) is the second.
154 */
155 stage = ce_stage(nce);
156 if (2 <= stage) {
7a51ed66 157 int mode = nce->ce_mode;
6973dcae 158 num_compare_stages++;
99d1a986 159 oidcpy(&dpath->parent[stage - 2].oid,
160 &nce->oid);
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 }
6a83d902 183 FREE_AND_NULL(dpath);
0e3994fa 184
6973dcae
JH
185 /*
186 * Show the diff for the 'ce' if we found the one
187 * from the desired stage.
188 */
095ce953
JH
189 pair = diff_unmerge(&revs->diffopt, ce->name);
190 if (wt_mode)
191 pair->two->mode = wt_mode;
6973dcae
JH
192 if (ce_stage(ce) != diff_unmerged_stage)
193 continue;
eeaa4603 194 }
6b14d7fa 195
125fd984 196 if (ce_uptodate(ce) || ce_skip_worktree(ce))
d1f2d7e8 197 continue;
f58dbf23 198
540e694b 199 /* If CE_VALID is set, don't look at workdir for file removal */
53048100
JK
200 if (ce->ce_flags & CE_VALID) {
201 changed = 0;
202 newmode = ce->ce_mode;
203 } else {
204 struct stat st;
205
206 changed = check_removed(ce, &st);
207 if (changed) {
208 if (changed < 0) {
209 perror(ce->name);
210 continue;
211 }
212 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
c26022ea 213 &ce->oid,
99d1a986 214 !is_null_oid(&ce->oid),
53048100 215 ce->name, 0);
15d061b4 216 continue;
425a28e0
NTND
217 } else if (revs->diffopt.ita_invisible_in_index &&
218 ce_intent_to_add(ce)) {
219 diff_addremove(&revs->diffopt, '+', ce->ce_mode,
c26022ea 220 &empty_tree_oid, 0,
425a28e0
NTND
221 ce->name, 0);
222 continue;
15d061b4 223 }
53048100
JK
224
225 changed = match_stat_with_submodule(&revs->diffopt, ce, &st,
226 ce_option, &dirty_submodule);
227 newmode = ce_mode_from_stat(ce, st.st_mode);
f2ce9fde 228 }
53048100 229
85adbf2f 230 if (!changed && !dirty_submodule) {
8fa29602 231 ce_mark_uptodate(ce);
883e248b 232 mark_fsmonitor_valid(ce);
8fa29602
JH
233 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
234 continue;
235 }
7a51ed66 236 oldmode = ce->ce_mode;
55497b8c
BW
237 old_oid = &ce->oid;
238 new_oid = changed ? &null_oid : &ce->oid;
6973dcae 239 diff_change(&revs->diffopt, oldmode, newmode,
94a0097a 240 old_oid, new_oid,
55497b8c
BW
241 !is_null_oid(old_oid),
242 !is_null_oid(new_oid),
e3d42c47 243 ce->name, 0, dirty_submodule);
77eb2720 244
7ca45252 245 }
6973dcae
JH
246 diffcore_std(&revs->diffopt);
247 diff_flush(&revs->diffopt);
248 return 0;
77eb2720 249}
be3cfa85 250
e09ad6e1
JH
251/*
252 * diff-index
253 */
254
255/* A file entry went away or appeared */
256static void diff_index_show_file(struct rev_info *revs,
257 const char *prefix,
eb9ae4b5 258 const struct cache_entry *ce,
fcf2cfb5 259 const struct object_id *oid, int oid_valid,
e5450100 260 unsigned int mode,
e3d42c47 261 unsigned dirty_submodule)
e09ad6e1 262{
7a51ed66 263 diff_addremove(&revs->diffopt, prefix[0], mode,
c26022ea 264 oid, oid_valid, ce->name, dirty_submodule);
e09ad6e1
JH
265}
266
eb9ae4b5 267static int get_stat_data(const struct cache_entry *ce,
362d7659 268 const struct object_id **oidp,
e09ad6e1 269 unsigned int *modep,
e3d42c47 270 int cached, int match_missing,
4d34477f 271 unsigned *dirty_submodule, struct diff_options *diffopt)
e09ad6e1 272{
362d7659 273 const struct object_id *oid = &ce->oid;
e09ad6e1
JH
274 unsigned int mode = ce->ce_mode;
275
658dd48c 276 if (!cached && !ce_uptodate(ce)) {
e09ad6e1
JH
277 int changed;
278 struct stat st;
c40641b7 279 changed = check_removed(ce, &st);
948dd346
JH
280 if (changed < 0)
281 return -1;
282 else if (changed) {
283 if (match_missing) {
362d7659 284 *oidp = oid;
e09ad6e1
JH
285 *modep = mode;
286 return 0;
287 }
288 return -1;
289 }
ae6d5c1b
JL
290 changed = match_stat_with_submodule(diffopt, ce, &st,
291 0, dirty_submodule);
e09ad6e1 292 if (changed) {
185c975f 293 mode = ce_mode_from_stat(ce, st.st_mode);
362d7659 294 oid = &null_oid;
e09ad6e1
JH
295 }
296 }
297
362d7659 298 *oidp = oid;
e09ad6e1
JH
299 *modep = mode;
300 return 0;
301}
302
ff7e6aad 303static void show_new_file(struct rev_info *revs,
eb9ae4b5 304 const struct cache_entry *new,
e09ad6e1
JH
305 int cached, int match_missing)
306{
362d7659 307 const struct object_id *oid;
e09ad6e1 308 unsigned int mode;
e3d42c47 309 unsigned dirty_submodule = 0;
e09ad6e1 310
948dd346
JH
311 /*
312 * New file in the index: it might actually be different in
f7d650c0 313 * the working tree.
e09ad6e1 314 */
362d7659 315 if (get_stat_data(new, &oid, &mode, cached, match_missing,
4d34477f 316 &dirty_submodule, &revs->diffopt) < 0)
e09ad6e1
JH
317 return;
318
fcf2cfb5 319 diff_index_show_file(revs, "+", new, oid, !is_null_oid(oid), mode, dirty_submodule);
e09ad6e1
JH
320}
321
ff7e6aad 322static int show_modified(struct rev_info *revs,
eb9ae4b5
RS
323 const struct cache_entry *old,
324 const struct cache_entry *new,
e09ad6e1
JH
325 int report_missing,
326 int cached, int match_missing)
327{
328 unsigned int mode, oldmode;
362d7659 329 const struct object_id *oid;
e3d42c47 330 unsigned dirty_submodule = 0;
e09ad6e1 331
362d7659 332 if (get_stat_data(new, &oid, &mode, cached, match_missing,
4d34477f 333 &dirty_submodule, &revs->diffopt) < 0) {
e09ad6e1
JH
334 if (report_missing)
335 diff_index_show_file(revs, "-", old,
fcf2cfb5 336 &old->oid, 1, old->ce_mode,
99d1a986 337 0);
e09ad6e1
JH
338 return -1;
339 }
340
cb2b9f5e 341 if (revs->combine_merges && !cached &&
362d7659 342 (oidcmp(oid, &old->oid) || oidcmp(&old->oid, &new->oid))) {
cb2b9f5e
PM
343 struct combine_diff_path *p;
344 int pathlen = ce_namelen(new);
345
346 p = xmalloc(combine_diff_path_size(2, pathlen));
347 p->path = (char *) &p->parent[2];
348 p->next = NULL;
cb2b9f5e
PM
349 memcpy(p->path, new->name, pathlen);
350 p->path[pathlen] = 0;
7a51ed66 351 p->mode = mode;
1ff57c13 352 oidclr(&p->oid);
cb2b9f5e
PM
353 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
354 p->parent[0].status = DIFF_STATUS_MODIFIED;
7a51ed66 355 p->parent[0].mode = new->ce_mode;
99d1a986 356 oidcpy(&p->parent[0].oid, &new->oid);
cb2b9f5e 357 p->parent[1].status = DIFF_STATUS_MODIFIED;
7a51ed66 358 p->parent[1].mode = old->ce_mode;
99d1a986 359 oidcpy(&p->parent[1].oid, &old->oid);
cb2b9f5e
PM
360 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
361 free(p);
362 return 0;
363 }
364
e09ad6e1 365 oldmode = old->ce_mode;
362d7659 366 if (mode == oldmode && !oidcmp(oid, &old->oid) && !dirty_submodule &&
8f67f8ae 367 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
e09ad6e1
JH
368 return 0;
369
e09ad6e1 370 diff_change(&revs->diffopt, oldmode, mode,
94a0097a 371 &old->oid, oid, 1, !is_null_oid(oid),
e5450100 372 old->name, 0, dirty_submodule);
e09ad6e1
JH
373 return 0;
374}
375
d1f2d7e8
LT
376/*
377 * This gets a mix of an existing index and a tree, one pathname entry
378 * at a time. The index entry may be a single stage-0 one, but it could
379 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
380 * give you the position and number of entries in the index).
381 */
382static void do_oneway_diff(struct unpack_trees_options *o,
eb9ae4b5
RS
383 const struct cache_entry *idx,
384 const struct cache_entry *tree)
e09ad6e1 385{
ff7e6aad 386 struct rev_info *revs = o->unpack_data;
d1f2d7e8 387 int match_missing, cached;
5c21ac0e 388
425a28e0
NTND
389 /* i-t-a entries do not actually exist in the index */
390 if (revs->diffopt.ita_invisible_in_index &&
391 idx && ce_intent_to_add(idx)) {
392 idx = NULL;
393 if (!tree)
394 return; /* nothing to diff.. */
395 }
396
540e694b 397 /* if the entry is not checked out, don't examine work tree */
b4d1690d
NTND
398 cached = o->index_only ||
399 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
a6080a0a 400 /*
5c21ac0e 401 * Backward compatibility wart - "diff-index -m" does
d1f2d7e8
LT
402 * not mean "do not ignore merges", but "match_missing".
403 *
404 * But with the revision flag parsing, that's found in
405 * "!revs->ignore_merges".
406 */
d1f2d7e8
LT
407 match_missing = !revs->ignore_merges;
408
409 if (cached && idx && ce_stage(idx)) {
fa7b2908
JH
410 struct diff_filepair *pair;
411 pair = diff_unmerge(&revs->diffopt, idx->name);
ff00b682 412 if (tree)
f9704c2d 413 fill_filespec(pair->one, &tree->oid, 1,
99d1a986 414 tree->ce_mode);
d1f2d7e8
LT
415 return;
416 }
417
418 /*
419 * Something added to the tree?
420 */
421 if (!tree) {
ff7e6aad 422 show_new_file(revs, idx, cached, match_missing);
d1f2d7e8
LT
423 return;
424 }
425
426 /*
427 * Something removed from the tree?
5c21ac0e 428 */
d1f2d7e8 429 if (!idx) {
fcf2cfb5 430 diff_index_show_file(revs, "-", tree, &tree->oid, 1,
99d1a986 431 tree->ce_mode, 0);
d1f2d7e8
LT
432 return;
433 }
434
435 /* Show difference between old and new */
ff7e6aad 436 show_modified(revs, tree, idx, 1, cached, match_missing);
d1f2d7e8
LT
437}
438
d1f2d7e8
LT
439/*
440 * The unpack_trees() interface is designed for merging, so
441 * the different source entries are designed primarily for
442 * the source trees, with the old index being really mainly
443 * used for being replaced by the result.
444 *
445 * For diffing, the index is more important, and we only have a
446 * single tree.
447 *
da8ba5e7 448 * We're supposed to advance o->pos to skip what we have already processed.
d1f2d7e8
LT
449 *
450 * This wrapper makes it all more readable, and takes care of all
451 * the fairly complex unpack_trees() semantic requirements, including
452 * the skipping, the path matching, the type conflict cases etc.
453 */
5828e835
RS
454static int oneway_diff(const struct cache_entry * const *src,
455 struct unpack_trees_options *o)
d1f2d7e8 456{
eb9ae4b5
RS
457 const struct cache_entry *idx = src[0];
458 const struct cache_entry *tree = src[1];
ff7e6aad 459 struct rev_info *revs = o->unpack_data;
d1f2d7e8 460
d1f2d7e8
LT
461 /*
462 * Unpack-trees generates a DF/conflict entry if
463 * there was a directory in the index and a tree
464 * in the tree. From a diff standpoint, that's a
465 * delete of the tree and a create of the file.
466 */
467 if (tree == o->df_conflict_entry)
468 tree = NULL;
469
429bb40a 470 if (ce_path_match(idx ? idx : tree, &revs->prune_data, NULL)) {
34110cd4 471 do_oneway_diff(o, idx, tree);
b4194828
JH
472 if (diff_can_quit_early(&revs->diffopt)) {
473 o->exiting_early = 1;
474 return -1;
475 }
476 }
d1f2d7e8 477
34110cd4 478 return 0;
d1f2d7e8
LT
479}
480
bf979c07 481static int diff_cache(struct rev_info *revs,
944cffbd 482 const struct object_id *tree_oid,
bf979c07
JH
483 const char *tree_name,
484 int cached)
d1f2d7e8 485{
d1f2d7e8 486 struct tree *tree;
d1f2d7e8 487 struct tree_desc t;
bf979c07 488 struct unpack_trees_options opts;
e09ad6e1 489
a9dbc179 490 tree = parse_tree_indirect(tree_oid);
e09ad6e1 491 if (!tree)
bf979c07 492 return error("bad tree object %s",
944cffbd 493 tree_name ? tree_name : oid_to_hex(tree_oid));
d1f2d7e8
LT
494 memset(&opts, 0, sizeof(opts));
495 opts.head_idx = 1;
496 opts.index_only = cached;
a0919ced
JH
497 opts.diff_index_cached = (cached &&
498 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
d1f2d7e8
LT
499 opts.merge = 1;
500 opts.fn = oneway_diff;
ff7e6aad 501 opts.unpack_data = revs;
34110cd4
LT
502 opts.src_index = &the_index;
503 opts.dst_index = NULL;
2f88c197 504 opts.pathspec = &revs->diffopt.pathspec;
4838237c 505 opts.pathspec->recursive = 1;
d1f2d7e8
LT
506
507 init_tree_desc(&t, tree->buffer, tree->size);
bf979c07
JH
508 return unpack_trees(1, &t, &opts);
509}
510
511int run_diff_index(struct rev_info *revs, int cached)
512{
513 struct object_array_entry *ent;
514
515 ent = revs->pending.objects;
944cffbd 516 if (diff_cache(revs, &ent->item->oid, ent->name, cached))
203a2fe1 517 exit(128);
d1f2d7e8 518
a5a818ee 519 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
730f7284 520 diffcore_fix_diff_index(&revs->diffopt);
e09ad6e1
JH
521 diffcore_std(&revs->diffopt);
522 diff_flush(&revs->diffopt);
d1f2d7e8 523 return 0;
e09ad6e1 524}
1cfe7733 525
944cffbd 526int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)
1cfe7733 527{
1cfe7733 528 struct rev_info revs;
1cfe7733
JH
529
530 init_revisions(&revs, NULL);
9a087274 531 copy_pathspec(&revs.prune_data, &opt->pathspec);
bf979c07 532 revs.diffopt = *opt;
204ce979 533
944cffbd 534 if (diff_cache(&revs, tree_oid, NULL, 1))
203a2fe1 535 exit(128);
204ce979 536 return 0;
1cfe7733 537}
75f3ff2e 538
018ec3c8
NTND
539int index_differs_from(const char *def, int diff_flags,
540 int ita_invisible_in_index)
75f3ff2e
SB
541{
542 struct rev_info rev;
32962c9b 543 struct setup_revision_opt opt;
75f3ff2e
SB
544
545 init_revisions(&rev, NULL);
32962c9b
JH
546 memset(&opt, 0, sizeof(opt));
547 opt.def = def;
548 setup_revisions(0, NULL, &rev, &opt);
90b19941 549 DIFF_OPT_SET(&rev.diffopt, QUICK);
75f3ff2e
SB
550 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
551 rev.diffopt.flags |= diff_flags;
018ec3c8 552 rev.diffopt.ita_invisible_in_index = ita_invisible_in_index;
75f3ff2e
SB
553 run_diff_index(&rev, 1);
554 if (rev.pending.alloc)
555 free(rev.pending.objects);
556 return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
557}