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