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