Git 1.8.5.5
[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
ae6d5c1b
JL
58/*
59 * Has a file changed or has a submodule new commits or a dirty work tree?
60 *
61 * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES
62 * option is set, the caller does not only want to know if a submodule is
63 * modified at all but wants to know all the conditions that are met (new
64 * commits, untracked content and/or modified content).
65 */
66static int match_stat_with_submodule(struct diff_options *diffopt,
eb9ae4b5
RS
67 const struct cache_entry *ce,
68 struct stat *st, unsigned ce_option,
69 unsigned *dirty_submodule)
ae6d5c1b
JL
70{
71 int changed = ce_match_stat(ce, st, ce_option);
aee9c7d6
JL
72 if (S_ISGITLINK(ce->ce_mode)) {
73 unsigned orig_flags = diffopt->flags;
74 if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG))
75 set_diffopt_flags_from_submodule_config(diffopt, ce->name);
76 if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES))
77 changed = 0;
78 else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES)
79 && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES)))
80 *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
81 diffopt->flags = orig_flags;
ae6d5c1b
JL
82 }
83 return changed;
84}
85
4bd5b7da 86int run_diff_files(struct rev_info *revs, unsigned int option)
f0c6b2a2 87{
6973dcae
JH
88 int entries, i;
89 int diff_unmerged_stage = revs->max_count;
fb63d7f8
JH
90 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
91 ? CE_MATCH_RACY_IS_DIRTY : 0);
f0c6b2a2 92
95a7c546
JH
93 if (option & DIFF_SILENT_ON_REMOVED)
94 handle_deprecated_show_diff_q(&revs->diffopt);
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++) {
be3cfa85 102 struct stat st;
6973dcae
JH
103 unsigned int oldmode, newmode;
104 struct cache_entry *ce = active_cache[i];
105 int changed;
e3d42c47 106 unsigned dirty_submodule = 0;
8676eb43 107
28b9264d 108 if (diff_can_quit_early(&revs->diffopt))
822cac01
JH
109 break;
110
eb9cb55b 111 if (!ce_path_match(ce, &revs->prune_data))
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;
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;
127 dpath->len = path_len;
128 memcpy(dpath->path, ce->name, path_len);
129 dpath->path[path_len] = '\0';
a8e0d16d 130 hashclr(dpath->sha1);
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++;
e702496e 160 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
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 }
b4b15503
FF
183 free(dpath);
184 dpath = NULL;
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
NTND
200 /* If CE_VALID is set, don't look at workdir for file removal */
201 changed = (ce->ce_flags & CE_VALID) ? 0 : check_removed(ce, &st);
f58dbf23
JH
202 if (changed) {
203 if (changed < 0) {
6973dcae 204 perror(ce->name);
15d061b4
JH
205 continue;
206 }
7a51ed66 207 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
e5450100
JK
208 ce->sha1, !is_null_sha1(ce->sha1),
209 ce->name, 0);
6973dcae 210 continue;
f2ce9fde 211 }
ae6d5c1b
JL
212 changed = match_stat_with_submodule(&revs->diffopt, ce, &st,
213 ce_option, &dirty_submodule);
85adbf2f 214 if (!changed && !dirty_submodule) {
8fa29602
JH
215 ce_mark_uptodate(ce);
216 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
217 continue;
218 }
7a51ed66
LT
219 oldmode = ce->ce_mode;
220 newmode = ce_mode_from_stat(ce, st.st_mode);
6973dcae
JH
221 diff_change(&revs->diffopt, oldmode, newmode,
222 ce->sha1, (changed ? null_sha1 : ce->sha1),
e5450100 223 !is_null_sha1(ce->sha1), (changed ? 0 : !is_null_sha1(ce->sha1)),
e3d42c47 224 ce->name, 0, dirty_submodule);
77eb2720 225
7ca45252 226 }
6973dcae
JH
227 diffcore_std(&revs->diffopt);
228 diff_flush(&revs->diffopt);
229 return 0;
77eb2720 230}
be3cfa85 231
e09ad6e1
JH
232/*
233 * diff-index
234 */
235
236/* A file entry went away or appeared */
237static void diff_index_show_file(struct rev_info *revs,
238 const char *prefix,
eb9ae4b5 239 const struct cache_entry *ce,
e5450100
JK
240 const unsigned char *sha1, int sha1_valid,
241 unsigned int mode,
e3d42c47 242 unsigned dirty_submodule)
e09ad6e1 243{
7a51ed66 244 diff_addremove(&revs->diffopt, prefix[0], mode,
e5450100 245 sha1, sha1_valid, ce->name, dirty_submodule);
e09ad6e1
JH
246}
247
eb9ae4b5 248static int get_stat_data(const struct cache_entry *ce,
c8c16f28 249 const unsigned char **sha1p,
e09ad6e1 250 unsigned int *modep,
e3d42c47 251 int cached, int match_missing,
4d34477f 252 unsigned *dirty_submodule, struct diff_options *diffopt)
e09ad6e1 253{
c8c16f28 254 const unsigned char *sha1 = ce->sha1;
e09ad6e1
JH
255 unsigned int mode = ce->ce_mode;
256
658dd48c 257 if (!cached && !ce_uptodate(ce)) {
e09ad6e1
JH
258 int changed;
259 struct stat st;
c40641b7 260 changed = check_removed(ce, &st);
948dd346
JH
261 if (changed < 0)
262 return -1;
263 else if (changed) {
264 if (match_missing) {
e09ad6e1
JH
265 *sha1p = sha1;
266 *modep = mode;
267 return 0;
268 }
269 return -1;
270 }
ae6d5c1b
JL
271 changed = match_stat_with_submodule(diffopt, ce, &st,
272 0, dirty_submodule);
e09ad6e1 273 if (changed) {
185c975f 274 mode = ce_mode_from_stat(ce, st.st_mode);
c8c16f28 275 sha1 = null_sha1;
e09ad6e1
JH
276 }
277 }
278
279 *sha1p = sha1;
280 *modep = mode;
281 return 0;
282}
283
ff7e6aad 284static void show_new_file(struct rev_info *revs,
eb9ae4b5 285 const struct cache_entry *new,
e09ad6e1
JH
286 int cached, int match_missing)
287{
c8c16f28 288 const unsigned char *sha1;
e09ad6e1 289 unsigned int mode;
e3d42c47 290 unsigned dirty_submodule = 0;
e09ad6e1 291
948dd346
JH
292 /*
293 * New file in the index: it might actually be different in
f7d650c0 294 * the working tree.
e09ad6e1 295 */
e3d42c47 296 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
4d34477f 297 &dirty_submodule, &revs->diffopt) < 0)
e09ad6e1
JH
298 return;
299
e5450100 300 diff_index_show_file(revs, "+", new, sha1, !is_null_sha1(sha1), mode, dirty_submodule);
e09ad6e1
JH
301}
302
ff7e6aad 303static int show_modified(struct rev_info *revs,
eb9ae4b5
RS
304 const struct cache_entry *old,
305 const struct cache_entry *new,
e09ad6e1
JH
306 int report_missing,
307 int cached, int match_missing)
308{
309 unsigned int mode, oldmode;
c8c16f28 310 const unsigned char *sha1;
e3d42c47 311 unsigned dirty_submodule = 0;
e09ad6e1 312
e3d42c47 313 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
4d34477f 314 &dirty_submodule, &revs->diffopt) < 0) {
e09ad6e1
JH
315 if (report_missing)
316 diff_index_show_file(revs, "-", old,
e5450100 317 old->sha1, 1, old->ce_mode, 0);
e09ad6e1
JH
318 return -1;
319 }
320
cb2b9f5e
PM
321 if (revs->combine_merges && !cached &&
322 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
323 struct combine_diff_path *p;
324 int pathlen = ce_namelen(new);
325
326 p = xmalloc(combine_diff_path_size(2, pathlen));
327 p->path = (char *) &p->parent[2];
328 p->next = NULL;
329 p->len = pathlen;
330 memcpy(p->path, new->name, pathlen);
331 p->path[pathlen] = 0;
7a51ed66 332 p->mode = mode;
cb2b9f5e
PM
333 hashclr(p->sha1);
334 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
335 p->parent[0].status = DIFF_STATUS_MODIFIED;
7a51ed66 336 p->parent[0].mode = new->ce_mode;
cb2b9f5e
PM
337 hashcpy(p->parent[0].sha1, new->sha1);
338 p->parent[1].status = DIFF_STATUS_MODIFIED;
7a51ed66 339 p->parent[1].mode = old->ce_mode;
cb2b9f5e
PM
340 hashcpy(p->parent[1].sha1, old->sha1);
341 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
342 free(p);
343 return 0;
344 }
345
e09ad6e1 346 oldmode = old->ce_mode;
85adbf2f 347 if (mode == oldmode && !hashcmp(sha1, old->sha1) && !dirty_submodule &&
8f67f8ae 348 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
e09ad6e1
JH
349 return 0;
350
e09ad6e1 351 diff_change(&revs->diffopt, oldmode, mode,
e5450100
JK
352 old->sha1, sha1, 1, !is_null_sha1(sha1),
353 old->name, 0, dirty_submodule);
e09ad6e1
JH
354 return 0;
355}
356
d1f2d7e8
LT
357/*
358 * This gets a mix of an existing index and a tree, one pathname entry
359 * at a time. The index entry may be a single stage-0 one, but it could
360 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
361 * give you the position and number of entries in the index).
362 */
363static void do_oneway_diff(struct unpack_trees_options *o,
eb9ae4b5
RS
364 const struct cache_entry *idx,
365 const struct cache_entry *tree)
e09ad6e1 366{
ff7e6aad 367 struct rev_info *revs = o->unpack_data;
d1f2d7e8 368 int match_missing, cached;
5c21ac0e 369
540e694b 370 /* if the entry is not checked out, don't examine work tree */
b4d1690d
NTND
371 cached = o->index_only ||
372 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
a6080a0a 373 /*
5c21ac0e 374 * Backward compatibility wart - "diff-index -m" does
d1f2d7e8
LT
375 * not mean "do not ignore merges", but "match_missing".
376 *
377 * But with the revision flag parsing, that's found in
378 * "!revs->ignore_merges".
379 */
d1f2d7e8
LT
380 match_missing = !revs->ignore_merges;
381
382 if (cached && idx && ce_stage(idx)) {
fa7b2908
JH
383 struct diff_filepair *pair;
384 pair = diff_unmerge(&revs->diffopt, idx->name);
ff00b682 385 if (tree)
e5450100 386 fill_filespec(pair->one, tree->sha1, 1, tree->ce_mode);
d1f2d7e8
LT
387 return;
388 }
389
390 /*
391 * Something added to the tree?
392 */
393 if (!tree) {
ff7e6aad 394 show_new_file(revs, idx, cached, match_missing);
d1f2d7e8
LT
395 return;
396 }
397
398 /*
399 * Something removed from the tree?
5c21ac0e 400 */
d1f2d7e8 401 if (!idx) {
e5450100 402 diff_index_show_file(revs, "-", tree, tree->sha1, 1, tree->ce_mode, 0);
d1f2d7e8
LT
403 return;
404 }
405
406 /* Show difference between old and new */
ff7e6aad 407 show_modified(revs, tree, idx, 1, cached, match_missing);
d1f2d7e8
LT
408}
409
d1f2d7e8
LT
410/*
411 * The unpack_trees() interface is designed for merging, so
412 * the different source entries are designed primarily for
413 * the source trees, with the old index being really mainly
414 * used for being replaced by the result.
415 *
416 * For diffing, the index is more important, and we only have a
417 * single tree.
418 *
da8ba5e7 419 * We're supposed to advance o->pos to skip what we have already processed.
d1f2d7e8
LT
420 *
421 * This wrapper makes it all more readable, and takes care of all
422 * the fairly complex unpack_trees() semantic requirements, including
423 * the skipping, the path matching, the type conflict cases etc.
424 */
5828e835
RS
425static int oneway_diff(const struct cache_entry * const *src,
426 struct unpack_trees_options *o)
d1f2d7e8 427{
eb9ae4b5
RS
428 const struct cache_entry *idx = src[0];
429 const struct cache_entry *tree = src[1];
ff7e6aad 430 struct rev_info *revs = o->unpack_data;
d1f2d7e8 431
d1f2d7e8
LT
432 /*
433 * Unpack-trees generates a DF/conflict entry if
434 * there was a directory in the index and a tree
435 * in the tree. From a diff standpoint, that's a
436 * delete of the tree and a create of the file.
437 */
438 if (tree == o->df_conflict_entry)
439 tree = NULL;
440
b4194828 441 if (ce_path_match(idx ? idx : tree, &revs->prune_data)) {
34110cd4 442 do_oneway_diff(o, idx, tree);
b4194828
JH
443 if (diff_can_quit_early(&revs->diffopt)) {
444 o->exiting_early = 1;
445 return -1;
446 }
447 }
d1f2d7e8 448
34110cd4 449 return 0;
d1f2d7e8
LT
450}
451
bf979c07
JH
452static int diff_cache(struct rev_info *revs,
453 const unsigned char *tree_sha1,
454 const char *tree_name,
455 int cached)
d1f2d7e8 456{
d1f2d7e8 457 struct tree *tree;
d1f2d7e8 458 struct tree_desc t;
bf979c07 459 struct unpack_trees_options opts;
e09ad6e1 460
bf979c07 461 tree = parse_tree_indirect(tree_sha1);
e09ad6e1 462 if (!tree)
bf979c07
JH
463 return error("bad tree object %s",
464 tree_name ? tree_name : sha1_to_hex(tree_sha1));
d1f2d7e8
LT
465 memset(&opts, 0, sizeof(opts));
466 opts.head_idx = 1;
467 opts.index_only = cached;
a0919ced
JH
468 opts.diff_index_cached = (cached &&
469 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
d1f2d7e8
LT
470 opts.merge = 1;
471 opts.fn = oneway_diff;
ff7e6aad 472 opts.unpack_data = revs;
34110cd4
LT
473 opts.src_index = &the_index;
474 opts.dst_index = NULL;
2f88c197 475 opts.pathspec = &revs->diffopt.pathspec;
4838237c 476 opts.pathspec->recursive = 1;
d1f2d7e8
LT
477
478 init_tree_desc(&t, tree->buffer, tree->size);
bf979c07
JH
479 return unpack_trees(1, &t, &opts);
480}
481
482int run_diff_index(struct rev_info *revs, int cached)
483{
484 struct object_array_entry *ent;
485
486 ent = revs->pending.objects;
487 if (diff_cache(revs, ent->item->sha1, ent->name, cached))
203a2fe1 488 exit(128);
d1f2d7e8 489
a5a818ee 490 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
730f7284 491 diffcore_fix_diff_index(&revs->diffopt);
e09ad6e1
JH
492 diffcore_std(&revs->diffopt);
493 diff_flush(&revs->diffopt);
d1f2d7e8 494 return 0;
e09ad6e1 495}
1cfe7733
JH
496
497int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
498{
1cfe7733 499 struct rev_info revs;
1cfe7733
JH
500
501 init_revisions(&revs, NULL);
9a087274 502 copy_pathspec(&revs.prune_data, &opt->pathspec);
bf979c07 503 revs.diffopt = *opt;
204ce979 504
bf979c07 505 if (diff_cache(&revs, tree_sha1, NULL, 1))
203a2fe1 506 exit(128);
204ce979 507 return 0;
1cfe7733 508}
75f3ff2e
SB
509
510int index_differs_from(const char *def, int diff_flags)
511{
512 struct rev_info rev;
32962c9b 513 struct setup_revision_opt opt;
75f3ff2e
SB
514
515 init_revisions(&rev, NULL);
32962c9b
JH
516 memset(&opt, 0, sizeof(opt));
517 opt.def = def;
518 setup_revisions(0, NULL, &rev, &opt);
90b19941 519 DIFF_OPT_SET(&rev.diffopt, QUICK);
75f3ff2e
SB
520 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
521 rev.diffopt.flags |= diff_flags;
522 run_diff_index(&rev, 1);
523 if (rev.pending.alloc)
524 free(rev.pending.objects);
525 return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
526}