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