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