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