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