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