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