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