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