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