]>
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" |
883e248b | 15 | #include "fsmonitor.h" |
427dcb4b | 16 | |
b46f0b6d | 17 | /* |
6973dcae | 18 | * diff-files |
b46f0b6d | 19 | */ |
f0c6b2a2 | 20 | |
948dd346 | 21 | /* |
1392a377 JH |
22 | * Has the work tree entity been removed? |
23 | * | |
24 | * Return 1 if it was removed from the work tree, 0 if an entity to be | |
25 | * compared with the cache entry ce still exists (the latter includes | |
26 | * the case where a directory that is not a submodule repository | |
27 | * exists for ce that is a submodule -- it is a submodule that is not | |
28 | * checked out). Return negative for an error. | |
948dd346 | 29 | */ |
c40641b7 | 30 | static int check_removed(const struct cache_entry *ce, struct stat *st) |
948dd346 JH |
31 | { |
32 | if (lstat(ce->name, st) < 0) { | |
c7054209 | 33 | if (!is_missing_file_error(errno)) |
948dd346 JH |
34 | return -1; |
35 | return 1; | |
36 | } | |
57199892 | 37 | if (has_symlink_leading_path(ce->name, ce_namelen(ce))) |
948dd346 JH |
38 | return 1; |
39 | if (S_ISDIR(st->st_mode)) { | |
1053fe82 | 40 | struct object_id sub; |
1392a377 JH |
41 | |
42 | /* | |
43 | * If ce is already a gitlink, we can have a plain | |
44 | * directory (i.e. the submodule is not checked out), | |
45 | * or a checked out submodule. Either case this is not | |
46 | * a case where something was removed from the work tree, | |
47 | * so we will return 0. | |
48 | * | |
49 | * Otherwise, if the directory is not a submodule | |
50 | * repository, that means ce which was a blob turned into | |
51 | * a directory --- the blob was removed! | |
52 | */ | |
53 | if (!S_ISGITLINK(ce->ce_mode) && | |
a98e6101 | 54 | resolve_gitlink_ref(ce->name, "HEAD", &sub)) |
948dd346 JH |
55 | return 1; |
56 | } | |
57 | return 0; | |
58 | } | |
d516c2d1 | 59 | |
ae6d5c1b JL |
60 | /* |
61 | * Has a file changed or has a submodule new commits or a dirty work tree? | |
62 | * | |
63 | * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES | |
64 | * option is set, the caller does not only want to know if a submodule is | |
65 | * modified at all but wants to know all the conditions that are met (new | |
66 | * commits, untracked content and/or modified content). | |
67 | */ | |
68 | static int match_stat_with_submodule(struct diff_options *diffopt, | |
eb9ae4b5 RS |
69 | const struct cache_entry *ce, |
70 | struct stat *st, unsigned ce_option, | |
71 | unsigned *dirty_submodule) | |
ae6d5c1b | 72 | { |
5adbb403 | 73 | int changed = ie_match_stat(diffopt->repo->index, ce, st, ce_option); |
aee9c7d6 | 74 | if (S_ISGITLINK(ce->ce_mode)) { |
02f2f56b | 75 | struct diff_flags orig_flags = diffopt->flags; |
0d1e0e78 | 76 | if (!diffopt->flags.override_submodule_config) |
aee9c7d6 | 77 | set_diffopt_flags_from_submodule_config(diffopt, ce->name); |
0d1e0e78 | 78 | if (diffopt->flags.ignore_submodules) |
aee9c7d6 | 79 | changed = 0; |
0d1e0e78 BW |
80 | else if (!diffopt->flags.ignore_dirty_submodules && |
81 | (!changed || diffopt->flags.dirty_submodules)) | |
3b69daed | 82 | *dirty_submodule = is_submodule_modified(ce->name, |
0d1e0e78 | 83 | diffopt->flags.ignore_untracked_in_submodules); |
aee9c7d6 | 84 | diffopt->flags = orig_flags; |
ae6d5c1b JL |
85 | } |
86 | return changed; | |
87 | } | |
88 | ||
4bd5b7da | 89 | int run_diff_files(struct rev_info *revs, unsigned int option) |
f0c6b2a2 | 90 | { |
6973dcae JH |
91 | int entries, i; |
92 | int diff_unmerged_stage = revs->max_count; | |
fb63d7f8 JH |
93 | unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED) |
94 | ? CE_MATCH_RACY_IS_DIRTY : 0); | |
ca54d9ba | 95 | uint64_t start = getnanotime(); |
5adbb403 | 96 | struct index_state *istate = revs->diffopt.repo->index; |
f0c6b2a2 | 97 | |
a5a818ee JH |
98 | diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/"); |
99 | ||
6973dcae JH |
100 | if (diff_unmerged_stage < 0) |
101 | diff_unmerged_stage = 2; | |
5adbb403 | 102 | entries = istate->cache_nr; |
6973dcae | 103 | for (i = 0; i < entries; i++) { |
6973dcae | 104 | unsigned int oldmode, newmode; |
5adbb403 | 105 | struct cache_entry *ce = istate->cache[i]; |
6973dcae | 106 | int changed; |
e3d42c47 | 107 | unsigned dirty_submodule = 0; |
55497b8c | 108 | const struct object_id *old_oid, *new_oid; |
8676eb43 | 109 | |
28b9264d | 110 | if (diff_can_quit_early(&revs->diffopt)) |
822cac01 JH |
111 | break; |
112 | ||
5adbb403 | 113 | if (!ce_path_match(istate, ce, &revs->prune_data, NULL)) |
8676eb43 | 114 | continue; |
be3cfa85 | 115 | |
6973dcae | 116 | if (ce_stage(ce)) { |
b4b15503 | 117 | struct combine_diff_path *dpath; |
095ce953 JH |
118 | struct diff_filepair *pair; |
119 | unsigned int wt_mode = 0; | |
6973dcae | 120 | int num_compare_stages = 0; |
b4b15503 | 121 | size_t path_len; |
53048100 | 122 | struct stat st; |
6973dcae | 123 | |
b4b15503 FF |
124 | path_len = ce_namelen(ce); |
125 | ||
4fc970c4 | 126 | dpath = xmalloc(combine_diff_path_size(5, path_len)); |
b4b15503 FF |
127 | dpath->path = (char *) &(dpath->parent[5]); |
128 | ||
129 | dpath->next = NULL; | |
b4b15503 FF |
130 | memcpy(dpath->path, ce->name, path_len); |
131 | dpath->path[path_len] = '\0'; | |
1ff57c13 | 132 | oidclr(&dpath->oid); |
b4b15503 | 133 | memset(&(dpath->parent[0]), 0, |
4fc970c4 JH |
134 | sizeof(struct combine_diff_parent)*5); |
135 | ||
c40641b7 | 136 | changed = check_removed(ce, &st); |
f58dbf23 | 137 | if (!changed) |
095ce953 | 138 | wt_mode = ce_mode_from_stat(ce, st.st_mode); |
f58dbf23 JH |
139 | else { |
140 | if (changed < 0) { | |
4fc970c4 JH |
141 | perror(ce->name); |
142 | continue; | |
143 | } | |
095ce953 | 144 | wt_mode = 0; |
4fc970c4 | 145 | } |
095ce953 | 146 | dpath->mode = wt_mode; |
6973dcae JH |
147 | |
148 | while (i < entries) { | |
5adbb403 | 149 | struct cache_entry *nce = istate->cache[i]; |
6973dcae JH |
150 | int stage; |
151 | ||
152 | if (strcmp(ce->name, nce->name)) | |
153 | break; | |
154 | ||
155 | /* Stage #2 (ours) is the first parent, | |
156 | * stage #3 (theirs) is the second. | |
157 | */ | |
158 | stage = ce_stage(nce); | |
159 | if (2 <= stage) { | |
7a51ed66 | 160 | int mode = nce->ce_mode; |
6973dcae | 161 | num_compare_stages++; |
99d1a986 | 162 | oidcpy(&dpath->parent[stage - 2].oid, |
163 | &nce->oid); | |
7a51ed66 | 164 | dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode); |
b4b15503 | 165 | dpath->parent[stage-2].status = |
6973dcae JH |
166 | DIFF_STATUS_MODIFIED; |
167 | } | |
168 | ||
169 | /* diff against the proper unmerged stage */ | |
170 | if (stage == diff_unmerged_stage) | |
171 | ce = nce; | |
172 | i++; | |
173 | } | |
174 | /* | |
175 | * Compensate for loop update | |
f0c6b2a2 | 176 | */ |
6973dcae | 177 | i--; |
6b5ee137 | 178 | |
6973dcae | 179 | if (revs->combine_merges && num_compare_stages == 2) { |
d01141de | 180 | show_combined_diff(dpath, 2, revs); |
b4b15503 | 181 | free(dpath); |
6973dcae | 182 | continue; |
1b1480ff | 183 | } |
6a83d902 | 184 | FREE_AND_NULL(dpath); |
0e3994fa | 185 | |
6973dcae JH |
186 | /* |
187 | * Show the diff for the 'ce' if we found the one | |
188 | * from the desired stage. | |
189 | */ | |
095ce953 JH |
190 | pair = diff_unmerge(&revs->diffopt, ce->name); |
191 | if (wt_mode) | |
192 | pair->two->mode = wt_mode; | |
6973dcae JH |
193 | if (ce_stage(ce) != diff_unmerged_stage) |
194 | continue; | |
eeaa4603 | 195 | } |
6b14d7fa | 196 | |
125fd984 | 197 | if (ce_uptodate(ce) || ce_skip_worktree(ce)) |
d1f2d7e8 | 198 | continue; |
f58dbf23 | 199 | |
540e694b | 200 | /* If CE_VALID is set, don't look at workdir for file removal */ |
53048100 JK |
201 | if (ce->ce_flags & CE_VALID) { |
202 | changed = 0; | |
203 | newmode = ce->ce_mode; | |
204 | } else { | |
205 | struct stat st; | |
206 | ||
207 | changed = check_removed(ce, &st); | |
208 | if (changed) { | |
209 | if (changed < 0) { | |
210 | perror(ce->name); | |
211 | continue; | |
212 | } | |
213 | diff_addremove(&revs->diffopt, '-', ce->ce_mode, | |
c26022ea | 214 | &ce->oid, |
99d1a986 | 215 | !is_null_oid(&ce->oid), |
53048100 | 216 | ce->name, 0); |
15d061b4 | 217 | continue; |
425a28e0 NTND |
218 | } else if (revs->diffopt.ita_invisible_in_index && |
219 | ce_intent_to_add(ce)) { | |
cb0dd22b RP |
220 | newmode = ce_mode_from_stat(ce, st.st_mode); |
221 | diff_addremove(&revs->diffopt, '+', newmode, | |
85953a31 | 222 | &null_oid, 0, ce->name, 0); |
425a28e0 | 223 | continue; |
15d061b4 | 224 | } |
53048100 JK |
225 | |
226 | changed = match_stat_with_submodule(&revs->diffopt, ce, &st, | |
227 | ce_option, &dirty_submodule); | |
228 | newmode = ce_mode_from_stat(ce, st.st_mode); | |
f2ce9fde | 229 | } |
53048100 | 230 | |
85adbf2f | 231 | if (!changed && !dirty_submodule) { |
8fa29602 | 232 | ce_mark_uptodate(ce); |
b5a81697 | 233 | mark_fsmonitor_valid(istate, ce); |
0d1e0e78 | 234 | if (!revs->diffopt.flags.find_copies_harder) |
8fa29602 JH |
235 | continue; |
236 | } | |
7a51ed66 | 237 | oldmode = ce->ce_mode; |
55497b8c BW |
238 | old_oid = &ce->oid; |
239 | new_oid = changed ? &null_oid : &ce->oid; | |
6973dcae | 240 | diff_change(&revs->diffopt, oldmode, newmode, |
94a0097a | 241 | old_oid, new_oid, |
55497b8c BW |
242 | !is_null_oid(old_oid), |
243 | !is_null_oid(new_oid), | |
e3d42c47 | 244 | ce->name, 0, dirty_submodule); |
77eb2720 | 245 | |
7ca45252 | 246 | } |
6973dcae JH |
247 | diffcore_std(&revs->diffopt); |
248 | diff_flush(&revs->diffopt); | |
ca54d9ba | 249 | trace_performance_since(start, "diff-files"); |
6973dcae | 250 | return 0; |
77eb2720 | 251 | } |
be3cfa85 | 252 | |
e09ad6e1 JH |
253 | /* |
254 | * diff-index | |
255 | */ | |
256 | ||
257 | /* A file entry went away or appeared */ | |
258 | static void diff_index_show_file(struct rev_info *revs, | |
259 | const char *prefix, | |
eb9ae4b5 | 260 | const struct cache_entry *ce, |
fcf2cfb5 | 261 | const struct object_id *oid, int oid_valid, |
e5450100 | 262 | unsigned int mode, |
e3d42c47 | 263 | unsigned dirty_submodule) |
e09ad6e1 | 264 | { |
7a51ed66 | 265 | diff_addremove(&revs->diffopt, prefix[0], mode, |
c26022ea | 266 | oid, oid_valid, ce->name, dirty_submodule); |
e09ad6e1 JH |
267 | } |
268 | ||
eb9ae4b5 | 269 | static int get_stat_data(const struct cache_entry *ce, |
362d7659 | 270 | const struct object_id **oidp, |
e09ad6e1 | 271 | unsigned int *modep, |
e3d42c47 | 272 | int cached, int match_missing, |
4d34477f | 273 | unsigned *dirty_submodule, struct diff_options *diffopt) |
e09ad6e1 | 274 | { |
362d7659 | 275 | const struct object_id *oid = &ce->oid; |
e09ad6e1 JH |
276 | unsigned int mode = ce->ce_mode; |
277 | ||
658dd48c | 278 | if (!cached && !ce_uptodate(ce)) { |
e09ad6e1 JH |
279 | int changed; |
280 | struct stat st; | |
c40641b7 | 281 | changed = check_removed(ce, &st); |
948dd346 JH |
282 | if (changed < 0) |
283 | return -1; | |
284 | else if (changed) { | |
285 | if (match_missing) { | |
362d7659 | 286 | *oidp = oid; |
e09ad6e1 JH |
287 | *modep = mode; |
288 | return 0; | |
289 | } | |
290 | return -1; | |
291 | } | |
ae6d5c1b JL |
292 | changed = match_stat_with_submodule(diffopt, ce, &st, |
293 | 0, dirty_submodule); | |
e09ad6e1 | 294 | if (changed) { |
185c975f | 295 | mode = ce_mode_from_stat(ce, st.st_mode); |
362d7659 | 296 | oid = &null_oid; |
e09ad6e1 JH |
297 | } |
298 | } | |
299 | ||
362d7659 | 300 | *oidp = oid; |
e09ad6e1 JH |
301 | *modep = mode; |
302 | return 0; | |
303 | } | |
304 | ||
ff7e6aad | 305 | static void show_new_file(struct rev_info *revs, |
e36ede2e | 306 | const struct cache_entry *new_file, |
e09ad6e1 JH |
307 | int cached, int match_missing) |
308 | { | |
362d7659 | 309 | const struct object_id *oid; |
e09ad6e1 | 310 | unsigned int mode; |
e3d42c47 | 311 | unsigned dirty_submodule = 0; |
e09ad6e1 | 312 | |
948dd346 JH |
313 | /* |
314 | * New file in the index: it might actually be different in | |
f7d650c0 | 315 | * the working tree. |
e09ad6e1 | 316 | */ |
e36ede2e | 317 | if (get_stat_data(new_file, &oid, &mode, cached, match_missing, |
4d34477f | 318 | &dirty_submodule, &revs->diffopt) < 0) |
e09ad6e1 JH |
319 | return; |
320 | ||
e36ede2e | 321 | diff_index_show_file(revs, "+", new_file, oid, !is_null_oid(oid), mode, dirty_submodule); |
e09ad6e1 JH |
322 | } |
323 | ||
ff7e6aad | 324 | static int show_modified(struct rev_info *revs, |
e36ede2e BW |
325 | const struct cache_entry *old_entry, |
326 | const struct cache_entry *new_entry, | |
e09ad6e1 JH |
327 | int report_missing, |
328 | int cached, int match_missing) | |
329 | { | |
330 | unsigned int mode, oldmode; | |
362d7659 | 331 | const struct object_id *oid; |
e3d42c47 | 332 | unsigned dirty_submodule = 0; |
e09ad6e1 | 333 | |
e36ede2e | 334 | if (get_stat_data(new_entry, &oid, &mode, cached, match_missing, |
4d34477f | 335 | &dirty_submodule, &revs->diffopt) < 0) { |
e09ad6e1 | 336 | if (report_missing) |
e36ede2e BW |
337 | diff_index_show_file(revs, "-", old_entry, |
338 | &old_entry->oid, 1, old_entry->ce_mode, | |
99d1a986 | 339 | 0); |
e09ad6e1 JH |
340 | return -1; |
341 | } | |
342 | ||
cb2b9f5e | 343 | if (revs->combine_merges && !cached && |
9001dc2a | 344 | (!oideq(oid, &old_entry->oid) || !oideq(&old_entry->oid, &new_entry->oid))) { |
cb2b9f5e | 345 | struct combine_diff_path *p; |
e36ede2e | 346 | int pathlen = ce_namelen(new_entry); |
cb2b9f5e PM |
347 | |
348 | p = xmalloc(combine_diff_path_size(2, pathlen)); | |
349 | p->path = (char *) &p->parent[2]; | |
350 | p->next = NULL; | |
e36ede2e | 351 | memcpy(p->path, new_entry->name, pathlen); |
cb2b9f5e | 352 | p->path[pathlen] = 0; |
7a51ed66 | 353 | p->mode = mode; |
1ff57c13 | 354 | oidclr(&p->oid); |
cb2b9f5e PM |
355 | memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent)); |
356 | p->parent[0].status = DIFF_STATUS_MODIFIED; | |
e36ede2e BW |
357 | p->parent[0].mode = new_entry->ce_mode; |
358 | oidcpy(&p->parent[0].oid, &new_entry->oid); | |
cb2b9f5e | 359 | p->parent[1].status = DIFF_STATUS_MODIFIED; |
e36ede2e BW |
360 | p->parent[1].mode = old_entry->ce_mode; |
361 | oidcpy(&p->parent[1].oid, &old_entry->oid); | |
d01141de | 362 | show_combined_diff(p, 2, revs); |
cb2b9f5e PM |
363 | free(p); |
364 | return 0; | |
365 | } | |
366 | ||
e36ede2e | 367 | oldmode = old_entry->ce_mode; |
4a7e27e9 | 368 | if (mode == oldmode && oideq(oid, &old_entry->oid) && !dirty_submodule && |
0d1e0e78 | 369 | !revs->diffopt.flags.find_copies_harder) |
e09ad6e1 JH |
370 | return 0; |
371 | ||
e09ad6e1 | 372 | diff_change(&revs->diffopt, oldmode, mode, |
e36ede2e BW |
373 | &old_entry->oid, oid, 1, !is_null_oid(oid), |
374 | old_entry->name, 0, dirty_submodule); | |
e09ad6e1 JH |
375 | return 0; |
376 | } | |
377 | ||
d1f2d7e8 LT |
378 | /* |
379 | * This gets a mix of an existing index and a tree, one pathname entry | |
380 | * at a time. The index entry may be a single stage-0 one, but it could | |
381 | * also be multiple unmerged entries (in which case idx_pos/idx_nr will | |
382 | * give you the position and number of entries in the index). | |
383 | */ | |
384 | static void do_oneway_diff(struct unpack_trees_options *o, | |
eb9ae4b5 RS |
385 | const struct cache_entry *idx, |
386 | const struct cache_entry *tree) | |
e09ad6e1 | 387 | { |
ff7e6aad | 388 | struct rev_info *revs = o->unpack_data; |
d1f2d7e8 | 389 | int match_missing, cached; |
5c21ac0e | 390 | |
ba4e3561 NTND |
391 | /* |
392 | * i-t-a entries do not actually exist in the index (if we're | |
393 | * looking at its content) | |
394 | */ | |
395 | if (o->index_only && | |
396 | revs->diffopt.ita_invisible_in_index && | |
425a28e0 NTND |
397 | idx && ce_intent_to_add(idx)) { |
398 | idx = NULL; | |
399 | if (!tree) | |
400 | return; /* nothing to diff.. */ | |
401 | } | |
402 | ||
540e694b | 403 | /* if the entry is not checked out, don't examine work tree */ |
b4d1690d NTND |
404 | cached = o->index_only || |
405 | (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx))); | |
572fc9aa SO |
406 | |
407 | match_missing = revs->match_missing; | |
d1f2d7e8 LT |
408 | |
409 | if (cached && idx && ce_stage(idx)) { | |
fa7b2908 JH |
410 | struct diff_filepair *pair; |
411 | pair = diff_unmerge(&revs->diffopt, idx->name); | |
ff00b682 | 412 | if (tree) |
f9704c2d | 413 | fill_filespec(pair->one, &tree->oid, 1, |
99d1a986 | 414 | tree->ce_mode); |
d1f2d7e8 LT |
415 | return; |
416 | } | |
417 | ||
418 | /* | |
419 | * Something added to the tree? | |
420 | */ | |
421 | if (!tree) { | |
ff7e6aad | 422 | show_new_file(revs, idx, cached, match_missing); |
d1f2d7e8 LT |
423 | return; |
424 | } | |
425 | ||
426 | /* | |
427 | * Something removed from the tree? | |
5c21ac0e | 428 | */ |
d1f2d7e8 | 429 | if (!idx) { |
fcf2cfb5 | 430 | diff_index_show_file(revs, "-", tree, &tree->oid, 1, |
99d1a986 | 431 | tree->ce_mode, 0); |
d1f2d7e8 LT |
432 | return; |
433 | } | |
434 | ||
435 | /* Show difference between old and new */ | |
ff7e6aad | 436 | show_modified(revs, tree, idx, 1, cached, match_missing); |
d1f2d7e8 LT |
437 | } |
438 | ||
d1f2d7e8 LT |
439 | /* |
440 | * The unpack_trees() interface is designed for merging, so | |
441 | * the different source entries are designed primarily for | |
442 | * the source trees, with the old index being really mainly | |
443 | * used for being replaced by the result. | |
444 | * | |
445 | * For diffing, the index is more important, and we only have a | |
446 | * single tree. | |
447 | * | |
da8ba5e7 | 448 | * We're supposed to advance o->pos to skip what we have already processed. |
d1f2d7e8 LT |
449 | * |
450 | * This wrapper makes it all more readable, and takes care of all | |
451 | * the fairly complex unpack_trees() semantic requirements, including | |
452 | * the skipping, the path matching, the type conflict cases etc. | |
453 | */ | |
5828e835 RS |
454 | static int oneway_diff(const struct cache_entry * const *src, |
455 | struct unpack_trees_options *o) | |
d1f2d7e8 | 456 | { |
eb9ae4b5 RS |
457 | const struct cache_entry *idx = src[0]; |
458 | const struct cache_entry *tree = src[1]; | |
ff7e6aad | 459 | struct rev_info *revs = o->unpack_data; |
d1f2d7e8 | 460 | |
d1f2d7e8 LT |
461 | /* |
462 | * Unpack-trees generates a DF/conflict entry if | |
463 | * there was a directory in the index and a tree | |
464 | * in the tree. From a diff standpoint, that's a | |
465 | * delete of the tree and a create of the file. | |
466 | */ | |
467 | if (tree == o->df_conflict_entry) | |
468 | tree = NULL; | |
469 | ||
5adbb403 NTND |
470 | if (ce_path_match(revs->diffopt.repo->index, |
471 | idx ? idx : tree, | |
472 | &revs->prune_data, NULL)) { | |
34110cd4 | 473 | do_oneway_diff(o, idx, tree); |
b4194828 JH |
474 | if (diff_can_quit_early(&revs->diffopt)) { |
475 | o->exiting_early = 1; | |
476 | return -1; | |
477 | } | |
478 | } | |
d1f2d7e8 | 479 | |
34110cd4 | 480 | return 0; |
d1f2d7e8 LT |
481 | } |
482 | ||
bf979c07 | 483 | static int diff_cache(struct rev_info *revs, |
944cffbd | 484 | const struct object_id *tree_oid, |
bf979c07 JH |
485 | const char *tree_name, |
486 | int cached) | |
d1f2d7e8 | 487 | { |
d1f2d7e8 | 488 | struct tree *tree; |
d1f2d7e8 | 489 | struct tree_desc t; |
bf979c07 | 490 | struct unpack_trees_options opts; |
e09ad6e1 | 491 | |
a9dbc179 | 492 | tree = parse_tree_indirect(tree_oid); |
e09ad6e1 | 493 | if (!tree) |
bf979c07 | 494 | return error("bad tree object %s", |
944cffbd | 495 | tree_name ? tree_name : oid_to_hex(tree_oid)); |
d1f2d7e8 LT |
496 | memset(&opts, 0, sizeof(opts)); |
497 | opts.head_idx = 1; | |
498 | opts.index_only = cached; | |
a0919ced | 499 | opts.diff_index_cached = (cached && |
0d1e0e78 | 500 | !revs->diffopt.flags.find_copies_harder); |
d1f2d7e8 LT |
501 | opts.merge = 1; |
502 | opts.fn = oneway_diff; | |
ff7e6aad | 503 | opts.unpack_data = revs; |
5adbb403 | 504 | opts.src_index = revs->diffopt.repo->index; |
34110cd4 | 505 | opts.dst_index = NULL; |
2f88c197 | 506 | opts.pathspec = &revs->diffopt.pathspec; |
4838237c | 507 | opts.pathspec->recursive = 1; |
d1f2d7e8 LT |
508 | |
509 | init_tree_desc(&t, tree->buffer, tree->size); | |
bf979c07 JH |
510 | return unpack_trees(1, &t, &opts); |
511 | } | |
512 | ||
513 | int run_diff_index(struct rev_info *revs, int cached) | |
514 | { | |
515 | struct object_array_entry *ent; | |
516 | ||
3506dc94 JK |
517 | if (revs->pending.nr != 1) |
518 | BUG("run_diff_index must be passed exactly one tree"); | |
519 | ||
c46c406a | 520 | trace_performance_enter(); |
bf979c07 | 521 | ent = revs->pending.objects; |
944cffbd | 522 | if (diff_cache(revs, &ent->item->oid, ent->name, cached)) |
203a2fe1 | 523 | exit(128); |
d1f2d7e8 | 524 | |
a5a818ee | 525 | diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/"); |
784c0dae | 526 | diffcore_fix_diff_index(); |
e09ad6e1 JH |
527 | diffcore_std(&revs->diffopt); |
528 | diff_flush(&revs->diffopt); | |
c46c406a | 529 | trace_performance_leave("diff-index"); |
d1f2d7e8 | 530 | return 0; |
e09ad6e1 | 531 | } |
1cfe7733 | 532 | |
944cffbd | 533 | int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt) |
1cfe7733 | 534 | { |
1cfe7733 | 535 | struct rev_info revs; |
1cfe7733 | 536 | |
ffc00a48 | 537 | repo_init_revisions(opt->repo, &revs, NULL); |
9a087274 | 538 | copy_pathspec(&revs.prune_data, &opt->pathspec); |
bf979c07 | 539 | revs.diffopt = *opt; |
204ce979 | 540 | |
944cffbd | 541 | if (diff_cache(&revs, tree_oid, NULL, 1)) |
203a2fe1 | 542 | exit(128); |
204ce979 | 543 | return 0; |
1cfe7733 | 544 | } |
75f3ff2e | 545 | |
ffc00a48 NTND |
546 | int index_differs_from(struct repository *r, |
547 | const char *def, const struct diff_flags *flags, | |
018ec3c8 | 548 | int ita_invisible_in_index) |
75f3ff2e SB |
549 | { |
550 | struct rev_info rev; | |
32962c9b | 551 | struct setup_revision_opt opt; |
75f3ff2e | 552 | |
ffc00a48 | 553 | repo_init_revisions(r, &rev, NULL); |
32962c9b JH |
554 | memset(&opt, 0, sizeof(opt)); |
555 | opt.def = def; | |
556 | setup_revisions(0, NULL, &rev, &opt); | |
0d1e0e78 BW |
557 | rev.diffopt.flags.quick = 1; |
558 | rev.diffopt.flags.exit_with_status = 1; | |
02f2f56b BW |
559 | if (flags) |
560 | diff_flags_or(&rev.diffopt.flags, flags); | |
018ec3c8 | 561 | rev.diffopt.ita_invisible_in_index = ita_invisible_in_index; |
75f3ff2e | 562 | run_diff_index(&rev, 1); |
dcb572ab | 563 | object_array_clear(&rev.pending); |
0d1e0e78 | 564 | return (rev.diffopt.flags.has_changes != 0); |
75f3ff2e | 565 | } |
cdffbdc2 ES |
566 | |
567 | static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data) | |
568 | { | |
569 | return data; | |
570 | } | |
571 | ||
72a72390 ES |
572 | void show_interdiff(const struct object_id *oid1, const struct object_id *oid2, |
573 | int indent, struct diff_options *diffopt) | |
cdffbdc2 ES |
574 | { |
575 | struct diff_options opts; | |
576 | struct strbuf prefix = STRBUF_INIT; | |
577 | ||
72a72390 | 578 | memcpy(&opts, diffopt, sizeof(opts)); |
cdffbdc2 ES |
579 | opts.output_format = DIFF_FORMAT_PATCH; |
580 | opts.output_prefix = idiff_prefix_cb; | |
581 | strbuf_addchars(&prefix, ' ', indent); | |
582 | opts.output_prefix_data = &prefix; | |
583 | diff_setup_done(&opts); | |
584 | ||
72a72390 | 585 | diff_tree_oid(oid1, oid2, "", &opts); |
cdffbdc2 ES |
586 | diffcore_std(&opts); |
587 | diff_flush(&opts); | |
588 | ||
589 | strbuf_release(&prefix); | |
590 | } |