]>
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" |
427dcb4b | 14 | |
b46f0b6d | 15 | /* |
6973dcae | 16 | * diff-files |
b46f0b6d | 17 | */ |
f0c6b2a2 | 18 | |
948dd346 | 19 | /* |
1392a377 JH |
20 | * Has the work tree entity been removed? |
21 | * | |
22 | * Return 1 if it was removed from the work tree, 0 if an entity to be | |
23 | * compared with the cache entry ce still exists (the latter includes | |
24 | * the case where a directory that is not a submodule repository | |
25 | * exists for ce that is a submodule -- it is a submodule that is not | |
26 | * checked out). Return negative for an error. | |
948dd346 | 27 | */ |
c40641b7 | 28 | static int check_removed(const struct cache_entry *ce, struct stat *st) |
948dd346 JH |
29 | { |
30 | if (lstat(ce->name, st) < 0) { | |
31 | if (errno != ENOENT && errno != ENOTDIR) | |
32 | return -1; | |
33 | return 1; | |
34 | } | |
57199892 | 35 | if (has_symlink_leading_path(ce->name, ce_namelen(ce))) |
948dd346 JH |
36 | return 1; |
37 | if (S_ISDIR(st->st_mode)) { | |
38 | unsigned char sub[20]; | |
1392a377 JH |
39 | |
40 | /* | |
41 | * If ce is already a gitlink, we can have a plain | |
42 | * directory (i.e. the submodule is not checked out), | |
43 | * or a checked out submodule. Either case this is not | |
44 | * a case where something was removed from the work tree, | |
45 | * so we will return 0. | |
46 | * | |
47 | * Otherwise, if the directory is not a submodule | |
48 | * repository, that means ce which was a blob turned into | |
49 | * a directory --- the blob was removed! | |
50 | */ | |
51 | if (!S_ISGITLINK(ce->ce_mode) && | |
52 | resolve_gitlink_ref(ce->name, "HEAD", sub)) | |
948dd346 JH |
53 | return 1; |
54 | } | |
55 | return 0; | |
56 | } | |
d516c2d1 | 57 | |
ae6d5c1b JL |
58 | /* |
59 | * Has a file changed or has a submodule new commits or a dirty work tree? | |
60 | * | |
61 | * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES | |
62 | * option is set, the caller does not only want to know if a submodule is | |
63 | * modified at all but wants to know all the conditions that are met (new | |
64 | * commits, untracked content and/or modified content). | |
65 | */ | |
66 | static int match_stat_with_submodule(struct diff_options *diffopt, | |
67 | struct cache_entry *ce, struct stat *st, | |
68 | unsigned ce_option, unsigned *dirty_submodule) | |
69 | { | |
70 | int changed = ce_match_stat(ce, st, ce_option); | |
aee9c7d6 JL |
71 | if (S_ISGITLINK(ce->ce_mode)) { |
72 | unsigned orig_flags = diffopt->flags; | |
73 | if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG)) | |
74 | set_diffopt_flags_from_submodule_config(diffopt, ce->name); | |
75 | if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES)) | |
76 | changed = 0; | |
77 | else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES) | |
78 | && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES))) | |
79 | *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES)); | |
80 | diffopt->flags = orig_flags; | |
ae6d5c1b JL |
81 | } |
82 | return changed; | |
83 | } | |
84 | ||
4bd5b7da | 85 | int run_diff_files(struct rev_info *revs, unsigned int option) |
f0c6b2a2 | 86 | { |
6973dcae JH |
87 | int entries, i; |
88 | int diff_unmerged_stage = revs->max_count; | |
4bd5b7da | 89 | int silent_on_removed = option & DIFF_SILENT_ON_REMOVED; |
fb63d7f8 JH |
90 | unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED) |
91 | ? CE_MATCH_RACY_IS_DIRTY : 0); | |
f0c6b2a2 | 92 | |
a5a818ee JH |
93 | diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/"); |
94 | ||
6973dcae JH |
95 | if (diff_unmerged_stage < 0) |
96 | diff_unmerged_stage = 2; | |
b4e1e4a7 | 97 | entries = active_nr; |
6973dcae | 98 | for (i = 0; i < entries; i++) { |
be3cfa85 | 99 | struct stat st; |
6973dcae JH |
100 | unsigned int oldmode, newmode; |
101 | struct cache_entry *ce = active_cache[i]; | |
102 | int changed; | |
e3d42c47 | 103 | unsigned dirty_submodule = 0; |
8676eb43 | 104 | |
90b19941 | 105 | if (DIFF_OPT_TST(&revs->diffopt, QUICK) && |
2cfe8a68 JH |
106 | !revs->diffopt.filter && |
107 | DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES)) | |
822cac01 JH |
108 | break; |
109 | ||
eb9cb55b | 110 | if (!ce_path_match(ce, &revs->prune_data)) |
8676eb43 | 111 | continue; |
be3cfa85 | 112 | |
6973dcae | 113 | if (ce_stage(ce)) { |
b4b15503 | 114 | struct combine_diff_path *dpath; |
095ce953 JH |
115 | struct diff_filepair *pair; |
116 | unsigned int wt_mode = 0; | |
6973dcae | 117 | int num_compare_stages = 0; |
b4b15503 | 118 | size_t path_len; |
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; | |
126 | dpath->len = path_len; | |
127 | memcpy(dpath->path, ce->name, path_len); | |
128 | dpath->path[path_len] = '\0'; | |
a8e0d16d | 129 | hashclr(dpath->sha1); |
b4b15503 | 130 | memset(&(dpath->parent[0]), 0, |
4fc970c4 JH |
131 | sizeof(struct combine_diff_parent)*5); |
132 | ||
c40641b7 | 133 | changed = check_removed(ce, &st); |
f58dbf23 | 134 | if (!changed) |
095ce953 | 135 | wt_mode = ce_mode_from_stat(ce, st.st_mode); |
f58dbf23 JH |
136 | else { |
137 | if (changed < 0) { | |
4fc970c4 JH |
138 | perror(ce->name); |
139 | continue; | |
140 | } | |
141 | if (silent_on_removed) | |
142 | continue; | |
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 | } | |
6973dcae JH |
208 | if (silent_on_removed) |
209 | continue; | |
7a51ed66 | 210 | diff_addremove(&revs->diffopt, '-', ce->ce_mode, |
e3d42c47 | 211 | ce->sha1, ce->name, 0); |
6973dcae | 212 | continue; |
f2ce9fde | 213 | } |
ae6d5c1b JL |
214 | changed = match_stat_with_submodule(&revs->diffopt, ce, &st, |
215 | ce_option, &dirty_submodule); | |
85adbf2f | 216 | if (!changed && !dirty_submodule) { |
8fa29602 JH |
217 | ce_mark_uptodate(ce); |
218 | if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER)) | |
219 | continue; | |
220 | } | |
7a51ed66 LT |
221 | oldmode = ce->ce_mode; |
222 | newmode = ce_mode_from_stat(ce, st.st_mode); | |
6973dcae JH |
223 | diff_change(&revs->diffopt, oldmode, newmode, |
224 | ce->sha1, (changed ? 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, | |
240 | struct cache_entry *ce, | |
e3d42c47 JL |
241 | const unsigned char *sha1, unsigned int mode, |
242 | unsigned dirty_submodule) | |
e09ad6e1 | 243 | { |
7a51ed66 | 244 | diff_addremove(&revs->diffopt, prefix[0], mode, |
e3d42c47 | 245 | sha1, ce->name, dirty_submodule); |
e09ad6e1 JH |
246 | } |
247 | ||
248 | static int get_stat_data(struct cache_entry *ce, | |
c8c16f28 | 249 | const unsigned char **sha1p, |
e09ad6e1 | 250 | unsigned int *modep, |
e3d42c47 | 251 | int cached, int match_missing, |
4d34477f | 252 | unsigned *dirty_submodule, struct diff_options *diffopt) |
e09ad6e1 | 253 | { |
c8c16f28 | 254 | const unsigned char *sha1 = ce->sha1; |
e09ad6e1 JH |
255 | unsigned int mode = ce->ce_mode; |
256 | ||
658dd48c | 257 | if (!cached && !ce_uptodate(ce)) { |
e09ad6e1 JH |
258 | int changed; |
259 | struct stat st; | |
c40641b7 | 260 | changed = check_removed(ce, &st); |
948dd346 JH |
261 | if (changed < 0) |
262 | return -1; | |
263 | else if (changed) { | |
264 | if (match_missing) { | |
e09ad6e1 JH |
265 | *sha1p = sha1; |
266 | *modep = mode; | |
267 | return 0; | |
268 | } | |
269 | return -1; | |
270 | } | |
ae6d5c1b JL |
271 | changed = match_stat_with_submodule(diffopt, ce, &st, |
272 | 0, dirty_submodule); | |
e3d42c47 | 273 | if (changed) { |
185c975f | 274 | mode = ce_mode_from_stat(ce, st.st_mode); |
c8c16f28 | 275 | sha1 = null_sha1; |
e09ad6e1 JH |
276 | } |
277 | } | |
278 | ||
279 | *sha1p = sha1; | |
280 | *modep = mode; | |
281 | return 0; | |
282 | } | |
283 | ||
ff7e6aad | 284 | static void show_new_file(struct rev_info *revs, |
e09ad6e1 JH |
285 | struct cache_entry *new, |
286 | int cached, int match_missing) | |
287 | { | |
c8c16f28 | 288 | const unsigned char *sha1; |
e09ad6e1 | 289 | unsigned int mode; |
e3d42c47 | 290 | unsigned dirty_submodule = 0; |
e09ad6e1 | 291 | |
948dd346 JH |
292 | /* |
293 | * New file in the index: it might actually be different in | |
e09ad6e1 JH |
294 | * the working copy. |
295 | */ | |
e3d42c47 | 296 | if (get_stat_data(new, &sha1, &mode, cached, match_missing, |
4d34477f | 297 | &dirty_submodule, &revs->diffopt) < 0) |
e09ad6e1 JH |
298 | return; |
299 | ||
e3d42c47 | 300 | diff_index_show_file(revs, "+", new, sha1, mode, dirty_submodule); |
e09ad6e1 JH |
301 | } |
302 | ||
ff7e6aad | 303 | static int show_modified(struct rev_info *revs, |
e09ad6e1 JH |
304 | struct cache_entry *old, |
305 | struct cache_entry *new, | |
306 | int report_missing, | |
307 | int cached, int match_missing) | |
308 | { | |
309 | unsigned int mode, oldmode; | |
c8c16f28 | 310 | const unsigned char *sha1; |
e3d42c47 | 311 | unsigned dirty_submodule = 0; |
e09ad6e1 | 312 | |
e3d42c47 | 313 | if (get_stat_data(new, &sha1, &mode, cached, match_missing, |
4d34477f | 314 | &dirty_submodule, &revs->diffopt) < 0) { |
e09ad6e1 JH |
315 | if (report_missing) |
316 | diff_index_show_file(revs, "-", old, | |
e3d42c47 | 317 | old->sha1, old->ce_mode, 0); |
e09ad6e1 JH |
318 | return -1; |
319 | } | |
320 | ||
cb2b9f5e PM |
321 | if (revs->combine_merges && !cached && |
322 | (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) { | |
323 | struct combine_diff_path *p; | |
324 | int pathlen = ce_namelen(new); | |
325 | ||
326 | p = xmalloc(combine_diff_path_size(2, pathlen)); | |
327 | p->path = (char *) &p->parent[2]; | |
328 | p->next = NULL; | |
329 | p->len = pathlen; | |
330 | memcpy(p->path, new->name, pathlen); | |
331 | p->path[pathlen] = 0; | |
7a51ed66 | 332 | p->mode = mode; |
cb2b9f5e PM |
333 | hashclr(p->sha1); |
334 | memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent)); | |
335 | p->parent[0].status = DIFF_STATUS_MODIFIED; | |
7a51ed66 | 336 | p->parent[0].mode = new->ce_mode; |
cb2b9f5e PM |
337 | hashcpy(p->parent[0].sha1, new->sha1); |
338 | p->parent[1].status = DIFF_STATUS_MODIFIED; | |
7a51ed66 | 339 | p->parent[1].mode = old->ce_mode; |
cb2b9f5e PM |
340 | hashcpy(p->parent[1].sha1, old->sha1); |
341 | show_combined_diff(p, 2, revs->dense_combined_merges, revs); | |
342 | free(p); | |
343 | return 0; | |
344 | } | |
345 | ||
e09ad6e1 | 346 | oldmode = old->ce_mode; |
85adbf2f | 347 | if (mode == oldmode && !hashcmp(sha1, old->sha1) && !dirty_submodule && |
8f67f8ae | 348 | !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER)) |
e09ad6e1 JH |
349 | return 0; |
350 | ||
e09ad6e1 | 351 | diff_change(&revs->diffopt, oldmode, mode, |
e3d42c47 | 352 | old->sha1, sha1, old->name, 0, dirty_submodule); |
e09ad6e1 JH |
353 | return 0; |
354 | } | |
355 | ||
d1f2d7e8 LT |
356 | /* |
357 | * This gets a mix of an existing index and a tree, one pathname entry | |
358 | * at a time. The index entry may be a single stage-0 one, but it could | |
359 | * also be multiple unmerged entries (in which case idx_pos/idx_nr will | |
360 | * give you the position and number of entries in the index). | |
361 | */ | |
362 | static void do_oneway_diff(struct unpack_trees_options *o, | |
363 | struct cache_entry *idx, | |
34110cd4 | 364 | struct cache_entry *tree) |
e09ad6e1 | 365 | { |
ff7e6aad | 366 | struct rev_info *revs = o->unpack_data; |
d1f2d7e8 | 367 | int match_missing, cached; |
5c21ac0e | 368 | |
540e694b | 369 | /* if the entry is not checked out, don't examine work tree */ |
b4d1690d NTND |
370 | cached = o->index_only || |
371 | (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx))); | |
a6080a0a | 372 | /* |
5c21ac0e | 373 | * Backward compatibility wart - "diff-index -m" does |
d1f2d7e8 LT |
374 | * not mean "do not ignore merges", but "match_missing". |
375 | * | |
376 | * But with the revision flag parsing, that's found in | |
377 | * "!revs->ignore_merges". | |
378 | */ | |
d1f2d7e8 LT |
379 | match_missing = !revs->ignore_merges; |
380 | ||
381 | if (cached && idx && ce_stage(idx)) { | |
fa7b2908 JH |
382 | struct diff_filepair *pair; |
383 | pair = diff_unmerge(&revs->diffopt, idx->name); | |
384 | fill_filespec(pair->one, idx->sha1, idx->ce_mode); | |
d1f2d7e8 LT |
385 | return; |
386 | } | |
387 | ||
388 | /* | |
389 | * Something added to the tree? | |
390 | */ | |
391 | if (!tree) { | |
ff7e6aad | 392 | show_new_file(revs, idx, cached, match_missing); |
d1f2d7e8 LT |
393 | return; |
394 | } | |
395 | ||
396 | /* | |
397 | * Something removed from the tree? | |
5c21ac0e | 398 | */ |
d1f2d7e8 | 399 | if (!idx) { |
e3d42c47 | 400 | diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode, 0); |
d1f2d7e8 LT |
401 | return; |
402 | } | |
403 | ||
404 | /* Show difference between old and new */ | |
ff7e6aad | 405 | show_modified(revs, tree, idx, 1, cached, match_missing); |
d1f2d7e8 LT |
406 | } |
407 | ||
d1f2d7e8 LT |
408 | /* |
409 | * The unpack_trees() interface is designed for merging, so | |
410 | * the different source entries are designed primarily for | |
411 | * the source trees, with the old index being really mainly | |
412 | * used for being replaced by the result. | |
413 | * | |
414 | * For diffing, the index is more important, and we only have a | |
415 | * single tree. | |
416 | * | |
da8ba5e7 | 417 | * We're supposed to advance o->pos to skip what we have already processed. |
d1f2d7e8 LT |
418 | * |
419 | * This wrapper makes it all more readable, and takes care of all | |
420 | * the fairly complex unpack_trees() semantic requirements, including | |
421 | * the skipping, the path matching, the type conflict cases etc. | |
422 | */ | |
34110cd4 | 423 | static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o) |
d1f2d7e8 | 424 | { |
d1f2d7e8 LT |
425 | struct cache_entry *idx = src[0]; |
426 | struct cache_entry *tree = src[1]; | |
ff7e6aad | 427 | struct rev_info *revs = o->unpack_data; |
d1f2d7e8 | 428 | |
d1f2d7e8 LT |
429 | /* |
430 | * Unpack-trees generates a DF/conflict entry if | |
431 | * there was a directory in the index and a tree | |
432 | * in the tree. From a diff standpoint, that's a | |
433 | * delete of the tree and a create of the file. | |
434 | */ | |
435 | if (tree == o->df_conflict_entry) | |
436 | tree = NULL; | |
437 | ||
eb9cb55b | 438 | if (ce_path_match(idx ? idx : tree, &revs->prune_data)) |
34110cd4 | 439 | do_oneway_diff(o, idx, tree); |
d1f2d7e8 | 440 | |
34110cd4 | 441 | return 0; |
d1f2d7e8 LT |
442 | } |
443 | ||
444 | int run_diff_index(struct rev_info *revs, int cached) | |
445 | { | |
446 | struct object *ent; | |
447 | struct tree *tree; | |
448 | const char *tree_name; | |
449 | struct unpack_trees_options opts; | |
450 | struct tree_desc t; | |
e09ad6e1 | 451 | |
1f1e895f LT |
452 | ent = revs->pending.objects[0].item; |
453 | tree_name = revs->pending.objects[0].name; | |
e09ad6e1 JH |
454 | tree = parse_tree_indirect(ent->sha1); |
455 | if (!tree) | |
456 | return error("bad tree object %s", tree_name); | |
d1f2d7e8 LT |
457 | |
458 | memset(&opts, 0, sizeof(opts)); | |
459 | opts.head_idx = 1; | |
460 | opts.index_only = cached; | |
a0919ced JH |
461 | opts.diff_index_cached = (cached && |
462 | !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER)); | |
d1f2d7e8 LT |
463 | opts.merge = 1; |
464 | opts.fn = oneway_diff; | |
ff7e6aad | 465 | opts.unpack_data = revs; |
34110cd4 LT |
466 | opts.src_index = &the_index; |
467 | opts.dst_index = NULL; | |
d1f2d7e8 LT |
468 | |
469 | init_tree_desc(&t, tree->buffer, tree->size); | |
203a2fe1 DB |
470 | if (unpack_trees(1, &t, &opts)) |
471 | exit(128); | |
d1f2d7e8 | 472 | |
a5a818ee | 473 | diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/"); |
730f7284 | 474 | diffcore_fix_diff_index(&revs->diffopt); |
e09ad6e1 JH |
475 | diffcore_std(&revs->diffopt); |
476 | diff_flush(&revs->diffopt); | |
d1f2d7e8 | 477 | return 0; |
e09ad6e1 | 478 | } |
1cfe7733 JH |
479 | |
480 | int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt) | |
481 | { | |
482 | struct tree *tree; | |
483 | struct rev_info revs; | |
484 | int i; | |
485 | struct cache_entry **dst; | |
486 | struct cache_entry *last = NULL; | |
204ce979 JS |
487 | struct unpack_trees_options opts; |
488 | struct tree_desc t; | |
1cfe7733 JH |
489 | |
490 | /* | |
491 | * This is used by git-blame to run diff-cache internally; | |
492 | * it potentially needs to repeatedly run this, so we will | |
493 | * start by removing the higher order entries the last round | |
494 | * left behind. | |
495 | */ | |
496 | dst = active_cache; | |
497 | for (i = 0; i < active_nr; i++) { | |
498 | struct cache_entry *ce = active_cache[i]; | |
499 | if (ce_stage(ce)) { | |
500 | if (last && !strcmp(ce->name, last->name)) | |
501 | continue; | |
502 | cache_tree_invalidate_path(active_cache_tree, | |
503 | ce->name); | |
504 | last = ce; | |
7a51ed66 | 505 | ce->ce_flags |= CE_REMOVE; |
1cfe7733 JH |
506 | } |
507 | *dst++ = ce; | |
508 | } | |
509 | active_nr = dst - active_cache; | |
510 | ||
511 | init_revisions(&revs, NULL); | |
afe069d1 | 512 | init_pathspec(&revs.prune_data, opt->pathspec.raw); |
1cfe7733 JH |
513 | tree = parse_tree_indirect(tree_sha1); |
514 | if (!tree) | |
515 | die("bad tree object %s", sha1_to_hex(tree_sha1)); | |
204ce979 JS |
516 | |
517 | memset(&opts, 0, sizeof(opts)); | |
518 | opts.head_idx = 1; | |
519 | opts.index_only = 1; | |
a0919ced | 520 | opts.diff_index_cached = !DIFF_OPT_TST(opt, FIND_COPIES_HARDER); |
204ce979 JS |
521 | opts.merge = 1; |
522 | opts.fn = oneway_diff; | |
ff7e6aad | 523 | opts.unpack_data = &revs; |
34110cd4 LT |
524 | opts.src_index = &the_index; |
525 | opts.dst_index = &the_index; | |
204ce979 JS |
526 | |
527 | init_tree_desc(&t, tree->buffer, tree->size); | |
203a2fe1 DB |
528 | if (unpack_trees(1, &t, &opts)) |
529 | exit(128); | |
204ce979 | 530 | return 0; |
1cfe7733 | 531 | } |
75f3ff2e SB |
532 | |
533 | int index_differs_from(const char *def, int diff_flags) | |
534 | { | |
535 | struct rev_info rev; | |
32962c9b | 536 | struct setup_revision_opt opt; |
75f3ff2e SB |
537 | |
538 | init_revisions(&rev, NULL); | |
32962c9b JH |
539 | memset(&opt, 0, sizeof(opt)); |
540 | opt.def = def; | |
541 | setup_revisions(0, NULL, &rev, &opt); | |
90b19941 | 542 | DIFF_OPT_SET(&rev.diffopt, QUICK); |
75f3ff2e SB |
543 | DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS); |
544 | rev.diffopt.flags |= diff_flags; | |
545 | run_diff_index(&rev, 1); | |
546 | if (rev.pending.alloc) | |
547 | free(rev.pending.objects); | |
548 | return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0); | |
549 | } |