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