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