]>
Commit | Line | Data |
---|---|---|
16da134b | 1 | #include "cache.h" |
dbbcd44f | 2 | #include "strvec.h" |
33028713 | 3 | #include "repository.h" |
b2141fc1 | 4 | #include "config.h" |
f8a9d428 | 5 | #include "dir.h" |
16da134b JS |
6 | #include "tree.h" |
7 | #include "tree-walk.h" | |
076b0adc | 8 | #include "cache-tree.h" |
16da134b | 9 | #include "unpack-trees.h" |
96a02f8f | 10 | #include "progress.h" |
0cf73755 | 11 | #include "refs.h" |
06f33c17 | 12 | #include "attr.h" |
5fc2fc8f | 13 | #include "split-index.h" |
a7bc845a SB |
14 | #include "submodule.h" |
15 | #include "submodule-config.h" | |
883e248b | 16 | #include "fsmonitor.h" |
cbd53a21 | 17 | #include "object-store.h" |
b14ed5ad | 18 | #include "promisor-remote.h" |
16da134b | 19 | |
8ccba008 JH |
20 | /* |
21 | * Error messages expected by scripts out of plumbing commands such as | |
22 | * read-tree. Non-scripted Porcelain is not required to use these messages | |
23 | * and in fact are encouraged to reword them to better suit their particular | |
23cbf11b | 24 | * situation better. See how "git checkout" and "git merge" replaces |
dc1166e6 | 25 | * them using setup_unpack_trees_porcelain(), for example. |
8ccba008 | 26 | */ |
6271d77c | 27 | static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = { |
08353ebb | 28 | /* ERROR_WOULD_OVERWRITE */ |
8ccba008 JH |
29 | "Entry '%s' would be overwritten by merge. Cannot merge.", |
30 | ||
08353ebb | 31 | /* ERROR_NOT_UPTODATE_FILE */ |
8ccba008 JH |
32 | "Entry '%s' not uptodate. Cannot merge.", |
33 | ||
08353ebb | 34 | /* ERROR_NOT_UPTODATE_DIR */ |
8ccba008 JH |
35 | "Updating '%s' would lose untracked files in it", |
36 | ||
08402b04 MM |
37 | /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ |
38 | "Untracked working tree file '%s' would be overwritten by merge.", | |
8ccba008 | 39 | |
08402b04 MM |
40 | /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ |
41 | "Untracked working tree file '%s' would be removed by merge.", | |
8ccba008 | 42 | |
08353ebb | 43 | /* ERROR_BIND_OVERLAP */ |
8ccba008 | 44 | "Entry '%s' overlaps with '%s'. Cannot bind.", |
e800ec9d | 45 | |
cd002c15 EN |
46 | /* ERROR_WOULD_LOSE_SUBMODULE */ |
47 | "Submodule '%s' cannot checkout new HEAD.", | |
e800ec9d | 48 | |
6271d77c EN |
49 | /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */ |
50 | "", | |
08402b04 | 51 | |
1ac83f42 | 52 | /* WARNING_SPARSE_NOT_UPTODATE_FILE */ |
22ab0b37 | 53 | "Path '%s' not uptodate; will not remove from working tree.", |
a7bc845a | 54 | |
ebb568b9 EN |
55 | /* WARNING_SPARSE_UNMERGED_FILE */ |
56 | "Path '%s' unmerged; will not remove from working tree.", | |
57 | ||
1ac83f42 | 58 | /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */ |
22ab0b37 | 59 | "Path '%s' already present; will not overwrite with sparse update.", |
8ccba008 JH |
60 | }; |
61 | ||
08353ebb MM |
62 | #define ERRORMSG(o,type) \ |
63 | ( ((o) && (o)->msgs[(type)]) \ | |
64 | ? ((o)->msgs[(type)]) \ | |
65 | : (unpack_plumbing_errors[(type)]) ) | |
8ccba008 | 66 | |
3d415425 SB |
67 | static const char *super_prefixed(const char *path) |
68 | { | |
69 | /* | |
70 | * It is necessary and sufficient to have two static buffers | |
71 | * here, as the return value of this function is fed to | |
72 | * error() using the unpack_*_errors[] templates we see above. | |
73 | */ | |
74 | static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT}; | |
75 | static int super_prefix_len = -1; | |
76 | static unsigned idx = ARRAY_SIZE(buf) - 1; | |
77 | ||
78 | if (super_prefix_len < 0) { | |
79 | const char *super_prefix = get_super_prefix(); | |
80 | if (!super_prefix) { | |
81 | super_prefix_len = 0; | |
82 | } else { | |
83 | int i; | |
84 | for (i = 0; i < ARRAY_SIZE(buf); i++) | |
85 | strbuf_addstr(&buf[i], super_prefix); | |
86 | super_prefix_len = buf[0].len; | |
87 | } | |
88 | } | |
89 | ||
90 | if (!super_prefix_len) | |
91 | return path; | |
92 | ||
93 | if (++idx >= ARRAY_SIZE(buf)) | |
94 | idx = 0; | |
95 | ||
96 | strbuf_setlen(&buf[idx], super_prefix_len); | |
97 | strbuf_addstr(&buf[idx], path); | |
98 | ||
99 | return buf[idx].buf; | |
100 | } | |
101 | ||
e294030f MM |
102 | void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, |
103 | const char *cmd) | |
dc1166e6 | 104 | { |
7980872d | 105 | int i; |
e294030f | 106 | const char **msgs = opts->msgs; |
dc1166e6 | 107 | const char *msg; |
fa3f60b7 | 108 | |
c972bf4c | 109 | strvec_init(&opts->msgs_to_free); |
1c41d280 | 110 | |
2e3926b9 VA |
111 | if (!strcmp(cmd, "checkout")) |
112 | msg = advice_commit_before_merge | |
113 | ? _("Your local changes to the following files would be overwritten by checkout:\n%%s" | |
c2691e2a | 114 | "Please commit your changes or stash them before you switch branches.") |
2e3926b9 VA |
115 | : _("Your local changes to the following files would be overwritten by checkout:\n%%s"); |
116 | else if (!strcmp(cmd, "merge")) | |
117 | msg = advice_commit_before_merge | |
118 | ? _("Your local changes to the following files would be overwritten by merge:\n%%s" | |
c2691e2a | 119 | "Please commit your changes or stash them before you merge.") |
2e3926b9 | 120 | : _("Your local changes to the following files would be overwritten by merge:\n%%s"); |
dc1166e6 | 121 | else |
2e3926b9 VA |
122 | msg = advice_commit_before_merge |
123 | ? _("Your local changes to the following files would be overwritten by %s:\n%%s" | |
c2691e2a | 124 | "Please commit your changes or stash them before you %s.") |
2e3926b9 | 125 | : _("Your local changes to the following files would be overwritten by %s:\n%%s"); |
fa3f60b7 | 126 | msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = |
c972bf4c | 127 | strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); |
dc1166e6 MM |
128 | |
129 | msgs[ERROR_NOT_UPTODATE_DIR] = | |
584f99c8 | 130 | _("Updating the following directories would lose untracked files in them:\n%s"); |
dc1166e6 | 131 | |
2e3926b9 VA |
132 | if (!strcmp(cmd, "checkout")) |
133 | msg = advice_commit_before_merge | |
134 | ? _("The following untracked working tree files would be removed by checkout:\n%%s" | |
c2691e2a | 135 | "Please move or remove them before you switch branches.") |
2e3926b9 VA |
136 | : _("The following untracked working tree files would be removed by checkout:\n%%s"); |
137 | else if (!strcmp(cmd, "merge")) | |
138 | msg = advice_commit_before_merge | |
139 | ? _("The following untracked working tree files would be removed by merge:\n%%s" | |
c2691e2a | 140 | "Please move or remove them before you merge.") |
2e3926b9 | 141 | : _("The following untracked working tree files would be removed by merge:\n%%s"); |
dc1166e6 | 142 | else |
2e3926b9 VA |
143 | msg = advice_commit_before_merge |
144 | ? _("The following untracked working tree files would be removed by %s:\n%%s" | |
c2691e2a | 145 | "Please move or remove them before you %s.") |
2e3926b9 | 146 | : _("The following untracked working tree files would be removed by %s:\n%%s"); |
1c41d280 | 147 | msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = |
c972bf4c | 148 | strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); |
2e3926b9 VA |
149 | |
150 | if (!strcmp(cmd, "checkout")) | |
151 | msg = advice_commit_before_merge | |
152 | ? _("The following untracked working tree files would be overwritten by checkout:\n%%s" | |
c2691e2a | 153 | "Please move or remove them before you switch branches.") |
2e3926b9 VA |
154 | : _("The following untracked working tree files would be overwritten by checkout:\n%%s"); |
155 | else if (!strcmp(cmd, "merge")) | |
156 | msg = advice_commit_before_merge | |
157 | ? _("The following untracked working tree files would be overwritten by merge:\n%%s" | |
c2691e2a | 158 | "Please move or remove them before you merge.") |
2e3926b9 VA |
159 | : _("The following untracked working tree files would be overwritten by merge:\n%%s"); |
160 | else | |
161 | msg = advice_commit_before_merge | |
162 | ? _("The following untracked working tree files would be overwritten by %s:\n%%s" | |
c2691e2a | 163 | "Please move or remove them before you %s.") |
2e3926b9 | 164 | : _("The following untracked working tree files would be overwritten by %s:\n%%s"); |
1c41d280 | 165 | msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = |
c972bf4c | 166 | strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); |
dc1166e6 MM |
167 | |
168 | /* | |
169 | * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we | |
170 | * cannot easily display it as a list. | |
171 | */ | |
ed47fdf7 | 172 | msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind."); |
dc1166e6 | 173 | |
a7bc845a | 174 | msgs[ERROR_WOULD_LOSE_SUBMODULE] = |
6362ed0b | 175 | _("Cannot update submodule:\n%s"); |
5e65ee35 | 176 | |
1ac83f42 | 177 | msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] = |
22ab0b37 | 178 | _("The following paths are not up to date and were left despite sparse patterns:\n%s"); |
ebb568b9 EN |
179 | msgs[WARNING_SPARSE_UNMERGED_FILE] = |
180 | _("The following paths are unmerged and were left despite sparse patterns:\n%s"); | |
1ac83f42 | 181 | msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] = |
22ab0b37 | 182 | _("The following paths were already present and thus not updated despite sparse patterns:\n%s"); |
5e65ee35 MM |
183 | |
184 | opts->show_all_errors = 1; | |
7980872d CB |
185 | /* rejected paths may not have a static buffer */ |
186 | for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++) | |
187 | opts->unpack_rejects[i].strdup_strings = 1; | |
dc1166e6 MM |
188 | } |
189 | ||
1c41d280 MÅ |
190 | void clear_unpack_trees_porcelain(struct unpack_trees_options *opts) |
191 | { | |
c972bf4c | 192 | strvec_clear(&opts->msgs_to_free); |
1c41d280 MÅ |
193 | memset(opts->msgs, 0, sizeof(opts->msgs)); |
194 | } | |
195 | ||
46169180 | 196 | static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce, |
6ff264ee | 197 | unsigned int set, unsigned int clear) |
b48d5a05 | 198 | { |
419a597f | 199 | clear |= CE_HASHED; |
34110cd4 | 200 | |
700e66d6 NTND |
201 | if (set & CE_REMOVE) |
202 | set |= CE_WT_REMOVE; | |
203 | ||
6ff264ee | 204 | ce->ce_flags = (ce->ce_flags & ~clear) | set; |
46169180 JK |
205 | return add_index_entry(&o->result, ce, |
206 | ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); | |
6ff264ee RS |
207 | } |
208 | ||
a33bd4d3 RS |
209 | static void add_entry(struct unpack_trees_options *o, |
210 | const struct cache_entry *ce, | |
211 | unsigned int set, unsigned int clear) | |
212 | { | |
8e72d675 | 213 | do_add_entry(o, dup_cache_entry(ce, &o->result), set, clear); |
b48d5a05 LT |
214 | } |
215 | ||
e6c111b4 MM |
216 | /* |
217 | * add error messages on path <path> | |
218 | * corresponding to the type <e> with the message <msg> | |
219 | * indicating if it should be display in porcelain or not | |
220 | */ | |
221 | static int add_rejected_path(struct unpack_trees_options *o, | |
222 | enum unpack_trees_error_types e, | |
223 | const char *path) | |
224 | { | |
b165fac8 | 225 | if (o->quiet) |
191e9d2c NTND |
226 | return -1; |
227 | ||
e6c111b4 | 228 | if (!o->show_all_errors) |
3d415425 | 229 | return error(ERRORMSG(o, e), super_prefixed(path)); |
e6c111b4 MM |
230 | |
231 | /* | |
232 | * Otherwise, insert in a list for future display by | |
6271d77c | 233 | * display_(error|warning)_msgs() |
e6c111b4 | 234 | */ |
7980872d | 235 | string_list_append(&o->unpack_rejects[e], path); |
e6c111b4 MM |
236 | return -1; |
237 | } | |
238 | ||
e6c111b4 MM |
239 | /* |
240 | * display all the error messages stored in a nice way | |
241 | */ | |
242 | static void display_error_msgs(struct unpack_trees_options *o) | |
243 | { | |
6271d77c EN |
244 | int e; |
245 | unsigned error_displayed = 0; | |
e6c111b4 | 246 | for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { |
7980872d | 247 | struct string_list *rejects = &o->unpack_rejects[e]; |
6271d77c | 248 | |
7980872d | 249 | if (rejects->nr > 0) { |
6271d77c | 250 | int i; |
e6c111b4 | 251 | struct strbuf path = STRBUF_INIT; |
6271d77c EN |
252 | |
253 | error_displayed = 1; | |
7980872d CB |
254 | for (i = 0; i < rejects->nr; i++) |
255 | strbuf_addf(&path, "\t%s\n", rejects->items[i].string); | |
3d415425 | 256 | error(ERRORMSG(o, e), super_prefixed(path.buf)); |
e6c111b4 | 257 | strbuf_release(&path); |
e6c111b4 | 258 | } |
7980872d | 259 | string_list_clear(rejects, 0); |
e6c111b4 | 260 | } |
6271d77c | 261 | if (error_displayed) |
ed47fdf7 | 262 | fprintf(stderr, _("Aborting\n")); |
e6c111b4 MM |
263 | } |
264 | ||
6271d77c EN |
265 | /* |
266 | * display all the warning messages stored in a nice way | |
267 | */ | |
268 | static void display_warning_msgs(struct unpack_trees_options *o) | |
269 | { | |
270 | int e; | |
271 | unsigned warning_displayed = 0; | |
272 | for (e = NB_UNPACK_TREES_ERROR_TYPES + 1; | |
273 | e < NB_UNPACK_TREES_WARNING_TYPES; e++) { | |
274 | struct string_list *rejects = &o->unpack_rejects[e]; | |
275 | ||
276 | if (rejects->nr > 0) { | |
277 | int i; | |
278 | struct strbuf path = STRBUF_INIT; | |
279 | ||
280 | warning_displayed = 1; | |
281 | for (i = 0; i < rejects->nr; i++) | |
282 | strbuf_addf(&path, "\t%s\n", rejects->items[i].string); | |
283 | warning(ERRORMSG(o, e), super_prefixed(path.buf)); | |
284 | strbuf_release(&path); | |
285 | } | |
286 | string_list_clear(rejects, 0); | |
287 | } | |
288 | if (warning_displayed) | |
289 | fprintf(stderr, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n")); | |
290 | } | |
a7bc845a SB |
291 | static int check_submodule_move_head(const struct cache_entry *ce, |
292 | const char *old_id, | |
293 | const char *new_id, | |
294 | struct unpack_trees_options *o) | |
295 | { | |
cd279e2e | 296 | unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN; |
a7bc845a | 297 | const struct submodule *sub = submodule_from_ce(ce); |
7463e2ec | 298 | |
a7bc845a SB |
299 | if (!sub) |
300 | return 0; | |
301 | ||
cd279e2e SB |
302 | if (o->reset) |
303 | flags |= SUBMODULE_MOVE_HEAD_FORCE; | |
304 | ||
7463e2ec | 305 | if (submodule_move_head(ce->name, old_id, new_id, flags)) |
191e9d2c | 306 | return add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name); |
7463e2ec | 307 | return 0; |
a7bc845a SB |
308 | } |
309 | ||
33028713 | 310 | /* |
15beaaa3 | 311 | * Perform the loading of the repository's gitmodules file. This function is |
33028713 | 312 | * used by 'check_update()' to perform loading of the gitmodules file in two |
15beaaa3 | 313 | * different situations: |
33028713 BW |
314 | * (1) before removing entries from the working tree if the gitmodules file has |
315 | * been marked for removal. This situation is specified by 'state' == NULL. | |
316 | * (2) before checking out entries to the working tree if the gitmodules file | |
317 | * has been marked for update. This situation is specified by 'state' != NULL. | |
318 | */ | |
319 | static void load_gitmodules_file(struct index_state *index, | |
320 | struct checkout *state) | |
a7bc845a | 321 | { |
33028713 BW |
322 | int pos = index_name_pos(index, GITMODULES_FILE, strlen(GITMODULES_FILE)); |
323 | ||
324 | if (pos >= 0) { | |
325 | struct cache_entry *ce = index->cache[pos]; | |
326 | if (!state && ce->ce_flags & CE_WT_REMOVE) { | |
d7992421 | 327 | repo_read_gitmodules(the_repository, 0); |
33028713 | 328 | } else if (state && (ce->ce_flags & CE_UPDATE)) { |
f793b895 | 329 | submodule_free(the_repository); |
0f086e6d | 330 | checkout_entry(ce, state, NULL, NULL); |
d7992421 | 331 | repo_read_gitmodules(the_repository, 0); |
a7bc845a SB |
332 | } |
333 | } | |
334 | } | |
335 | ||
6c34239d EN |
336 | static struct progress *get_progress(struct unpack_trees_options *o, |
337 | struct index_state *index) | |
16da134b | 338 | { |
96a02f8f | 339 | unsigned cnt = 0, total = 0; |
384f1a16 SB |
340 | |
341 | if (!o->update || !o->verbose_update) | |
342 | return NULL; | |
343 | ||
344 | for (; cnt < index->cache_nr; cnt++) { | |
345 | const struct cache_entry *ce = index->cache[cnt]; | |
346 | if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) | |
347 | total++; | |
348 | } | |
349 | ||
328c6cb8 | 350 | return start_delayed_progress(_("Updating files"), total); |
384f1a16 SB |
351 | } |
352 | ||
b878579a NTND |
353 | static void setup_collided_checkout_detection(struct checkout *state, |
354 | struct index_state *index) | |
355 | { | |
356 | int i; | |
357 | ||
358 | state->clone = 1; | |
359 | for (i = 0; i < index->cache_nr; i++) | |
360 | index->cache[i]->ce_flags &= ~CE_MATCHED; | |
361 | } | |
362 | ||
363 | static void report_collided_checkout(struct index_state *index) | |
364 | { | |
365 | struct string_list list = STRING_LIST_INIT_NODUP; | |
366 | int i; | |
367 | ||
368 | for (i = 0; i < index->cache_nr; i++) { | |
369 | struct cache_entry *ce = index->cache[i]; | |
370 | ||
371 | if (!(ce->ce_flags & CE_MATCHED)) | |
372 | continue; | |
373 | ||
374 | string_list_append(&list, ce->name); | |
375 | ce->ce_flags &= ~CE_MATCHED; | |
376 | } | |
377 | ||
378 | list.cmp = fspathcmp; | |
379 | string_list_sort(&list); | |
380 | ||
381 | if (list.nr) { | |
382 | warning(_("the following paths have collided (e.g. case-sensitive paths\n" | |
383 | "on a case-insensitive filesystem) and only one from the same\n" | |
384 | "colliding group is in the working tree:\n")); | |
385 | ||
386 | for (i = 0; i < list.nr; i++) | |
387 | fprintf(stderr, " '%s'\n", list.items[i].string); | |
388 | } | |
389 | ||
390 | string_list_clear(&list, 0); | |
391 | } | |
392 | ||
b0a5a12a EN |
393 | static int check_updates(struct unpack_trees_options *o, |
394 | struct index_state *index) | |
384f1a16 SB |
395 | { |
396 | unsigned cnt = 0; | |
30ac275b | 397 | int errs = 0; |
07f967ad | 398 | struct progress *progress; |
30ac275b | 399 | struct checkout state = CHECKOUT_INIT; |
33ecf7eb | 400 | int i; |
16da134b | 401 | |
0d1ed596 | 402 | trace_performance_enter(); |
30ac275b SB |
403 | state.force = 1; |
404 | state.quiet = 1; | |
405 | state.refresh_cache = 1; | |
406 | state.istate = index; | |
13e7ed6a | 407 | clone_checkout_metadata(&state.meta, &o->meta, NULL); |
16da134b | 408 | |
26f924d5 EN |
409 | if (!o->update || o->dry_run) { |
410 | remove_marked_cache_entries(index, 0); | |
411 | trace_performance_leave("check_updates"); | |
412 | return 0; | |
413 | } | |
414 | ||
b878579a NTND |
415 | if (o->clone) |
416 | setup_collided_checkout_detection(&state, index); | |
417 | ||
6c34239d | 418 | progress = get_progress(o, index); |
16da134b | 419 | |
22539ec3 MT |
420 | /* Start with clean cache to avoid using any possibly outdated info. */ |
421 | invalidate_lstat_cache(); | |
422 | ||
26f924d5 | 423 | git_attr_set_direction(GIT_ATTR_CHECKOUT); |
33028713 | 424 | |
26f924d5 | 425 | if (should_update_submodules()) |
33028713 BW |
426 | load_gitmodules_file(index, NULL); |
427 | ||
34110cd4 | 428 | for (i = 0; i < index->cache_nr; i++) { |
9c5e6c80 | 429 | const struct cache_entry *ce = index->cache[i]; |
16da134b | 430 | |
e663db2f NTND |
431 | if (ce->ce_flags & CE_WT_REMOVE) { |
432 | display_progress(progress, ++cnt); | |
26f924d5 | 433 | unlink_entry(ce); |
e663db2f | 434 | } |
1fa6ead4 | 435 | } |
26f924d5 | 436 | |
6fdc2057 | 437 | remove_marked_cache_entries(index, 0); |
78478927 | 438 | remove_scheduled_dirs(); |
1fa6ead4 | 439 | |
26f924d5 | 440 | if (should_update_submodules()) |
33028713 | 441 | load_gitmodules_file(index, &state); |
a7bc845a | 442 | |
2841e8f8 | 443 | enable_delayed_checkout(&state); |
26f924d5 | 444 | if (has_promisor_remote()) { |
c0c578b3 JT |
445 | /* |
446 | * Prefetch the objects that are to be checked out in the loop | |
447 | * below. | |
448 | */ | |
449 | struct oid_array to_fetch = OID_ARRAY_INIT; | |
c0c578b3 JT |
450 | for (i = 0; i < index->cache_nr; i++) { |
451 | struct cache_entry *ce = index->cache[i]; | |
0f4a4fb1 JT |
452 | |
453 | if (!(ce->ce_flags & CE_UPDATE) || | |
454 | S_ISGITLINK(ce->ce_mode)) | |
455 | continue; | |
456 | if (!oid_object_info_extended(the_repository, &ce->oid, | |
457 | NULL, | |
458 | OBJECT_INFO_FOR_PREFETCH)) | |
459 | continue; | |
460 | oid_array_append(&to_fetch, &ce->oid); | |
c0c578b3 | 461 | } |
db7ed741 JT |
462 | promisor_remote_get_direct(the_repository, |
463 | to_fetch.oid, to_fetch.nr); | |
9f242a13 | 464 | oid_array_clear(&to_fetch); |
c0c578b3 | 465 | } |
1fa6ead4 LT |
466 | for (i = 0; i < index->cache_nr; i++) { |
467 | struct cache_entry *ce = index->cache[i]; | |
468 | ||
7a51ed66 | 469 | if (ce->ce_flags & CE_UPDATE) { |
7d782416 | 470 | if (ce->ce_flags & CE_WT_REMOVE) |
033abf97 | 471 | BUG("both update and delete flags are set on %s", |
7d782416 | 472 | ce->name); |
1fa6ead4 | 473 | display_progress(progress, ++cnt); |
7a51ed66 | 474 | ce->ce_flags &= ~CE_UPDATE; |
26f924d5 | 475 | errs |= checkout_entry(ce, &state, NULL, NULL); |
16da134b JS |
476 | } |
477 | } | |
4d4fcc54 | 478 | stop_progress(&progress); |
0f086e6d | 479 | errs |= finish_delayed_checkout(&state, NULL); |
26f924d5 | 480 | git_attr_set_direction(GIT_ATTR_CHECKIN); |
b878579a NTND |
481 | |
482 | if (o->clone) | |
483 | report_collided_checkout(index); | |
484 | ||
0d1ed596 | 485 | trace_performance_leave("check_updates"); |
c4758d3c | 486 | return errs != 0; |
16da134b JS |
487 | } |
488 | ||
eb9ae4b5 RS |
489 | static int verify_uptodate_sparse(const struct cache_entry *ce, |
490 | struct unpack_trees_options *o); | |
491 | static int verify_absent_sparse(const struct cache_entry *ce, | |
492 | enum unpack_trees_error_types, | |
493 | struct unpack_trees_options *o); | |
e800ec9d | 494 | |
a5c446f1 NTND |
495 | static int apply_sparse_checkout(struct index_state *istate, |
496 | struct cache_entry *ce, | |
497 | struct unpack_trees_options *o) | |
e800ec9d NTND |
498 | { |
499 | int was_skip_worktree = ce_skip_worktree(ce); | |
500 | ||
2431afbf | 501 | if (ce->ce_flags & CE_NEW_SKIP_WORKTREE) |
e800ec9d NTND |
502 | ce->ce_flags |= CE_SKIP_WORKTREE; |
503 | else | |
504 | ce->ce_flags &= ~CE_SKIP_WORKTREE; | |
078a58e8 NTND |
505 | if (was_skip_worktree != ce_skip_worktree(ce)) { |
506 | ce->ce_flags |= CE_UPDATE_IN_BASE; | |
883e248b | 507 | mark_fsmonitor_invalid(istate, ce); |
a5c446f1 | 508 | istate->cache_changed |= CE_ENTRY_CHANGED; |
078a58e8 | 509 | } |
e800ec9d NTND |
510 | |
511 | /* | |
eec3fc03 NTND |
512 | * if (!was_skip_worktree && !ce_skip_worktree()) { |
513 | * This is perfectly normal. Move on; | |
514 | * } | |
e800ec9d | 515 | */ |
eec3fc03 NTND |
516 | |
517 | /* | |
518 | * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout | |
519 | * area as a result of ce_skip_worktree() shortcuts in | |
700e66d6 NTND |
520 | * verify_absent() and verify_uptodate(). |
521 | * Make sure they don't modify worktree if they are already | |
522 | * outside checkout area | |
eec3fc03 | 523 | */ |
700e66d6 NTND |
524 | if (was_skip_worktree && ce_skip_worktree(ce)) { |
525 | ce->ce_flags &= ~CE_UPDATE; | |
526 | ||
527 | /* | |
528 | * By default, when CE_REMOVE is on, CE_WT_REMOVE is also | |
529 | * on to get that file removed from both index and worktree. | |
530 | * If that file is already outside worktree area, don't | |
531 | * bother remove it. | |
532 | */ | |
533 | if (ce->ce_flags & CE_REMOVE) | |
534 | ce->ce_flags &= ~CE_WT_REMOVE; | |
535 | } | |
e800ec9d NTND |
536 | |
537 | if (!was_skip_worktree && ce_skip_worktree(ce)) { | |
538 | /* | |
539 | * If CE_UPDATE is set, verify_uptodate() must be called already | |
540 | * also stat info may have lost after merged_entry() so calling | |
541 | * verify_uptodate() again may fail | |
542 | */ | |
3cc7c504 EN |
543 | if (!(ce->ce_flags & CE_UPDATE) && |
544 | verify_uptodate_sparse(ce, o)) { | |
545 | ce->ce_flags &= ~CE_SKIP_WORKTREE; | |
e800ec9d | 546 | return -1; |
3cc7c504 | 547 | } |
e800ec9d | 548 | ce->ce_flags |= CE_WT_REMOVE; |
7d782416 | 549 | ce->ce_flags &= ~CE_UPDATE; |
e800ec9d NTND |
550 | } |
551 | if (was_skip_worktree && !ce_skip_worktree(ce)) { | |
1ac83f42 | 552 | if (verify_absent_sparse(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) |
e800ec9d NTND |
553 | return -1; |
554 | ce->ce_flags |= CE_UPDATE; | |
555 | } | |
556 | return 0; | |
557 | } | |
558 | ||
ebb568b9 EN |
559 | static int warn_conflicted_path(struct index_state *istate, |
560 | int i, | |
561 | struct unpack_trees_options *o) | |
562 | { | |
563 | char *conflicting_path = istate->cache[i]->name; | |
564 | int count = 0; | |
565 | ||
566 | add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path); | |
567 | ||
0eeb3be4 DS |
568 | /* Find out how many higher stage entries are at same path */ |
569 | while ((++count) + i < istate->cache_nr && | |
570 | !strcmp(conflicting_path, istate->cache[count + i]->name)) | |
571 | ; /* do nothing */ | |
572 | ||
ebb568b9 EN |
573 | return count; |
574 | } | |
575 | ||
5828e835 RS |
576 | static inline int call_unpack_fn(const struct cache_entry * const *src, |
577 | struct unpack_trees_options *o) | |
01904572 | 578 | { |
34110cd4 LT |
579 | int ret = o->fn(src, o); |
580 | if (ret > 0) | |
01904572 | 581 | ret = 0; |
01904572 LT |
582 | return ret; |
583 | } | |
584 | ||
da165f47 JH |
585 | static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o) |
586 | { | |
587 | ce->ce_flags |= CE_UNPACKED; | |
588 | ||
589 | if (o->cache_bottom < o->src_index->cache_nr && | |
590 | o->src_index->cache[o->cache_bottom] == ce) { | |
591 | int bottom = o->cache_bottom; | |
592 | while (bottom < o->src_index->cache_nr && | |
593 | o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) | |
594 | bottom++; | |
595 | o->cache_bottom = bottom; | |
596 | } | |
597 | } | |
598 | ||
599 | static void mark_all_ce_unused(struct index_state *index) | |
600 | { | |
601 | int i; | |
602 | for (i = 0; i < index->cache_nr; i++) | |
2431afbf | 603 | index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); |
da165f47 JH |
604 | } |
605 | ||
eb9ae4b5 | 606 | static int locate_in_src_index(const struct cache_entry *ce, |
da165f47 JH |
607 | struct unpack_trees_options *o) |
608 | { | |
609 | struct index_state *index = o->src_index; | |
610 | int len = ce_namelen(ce); | |
611 | int pos = index_name_pos(index, ce->name, len); | |
612 | if (pos < 0) | |
613 | pos = -1 - pos; | |
614 | return pos; | |
615 | } | |
616 | ||
617 | /* | |
618 | * We call unpack_index_entry() with an unmerged cache entry | |
619 | * only in diff-index, and it wants a single callback. Skip | |
620 | * the other unmerged entry with the same name. | |
621 | */ | |
622 | static void mark_ce_used_same_name(struct cache_entry *ce, | |
623 | struct unpack_trees_options *o) | |
624 | { | |
625 | struct index_state *index = o->src_index; | |
626 | int len = ce_namelen(ce); | |
627 | int pos; | |
628 | ||
629 | for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { | |
630 | struct cache_entry *next = index->cache[pos]; | |
631 | if (len != ce_namelen(next) || | |
632 | memcmp(ce->name, next->name, len)) | |
633 | break; | |
634 | mark_ce_used(next, o); | |
635 | } | |
636 | } | |
637 | ||
638 | static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) | |
639 | { | |
640 | const struct index_state *index = o->src_index; | |
641 | int pos = o->cache_bottom; | |
642 | ||
643 | while (pos < index->cache_nr) { | |
644 | struct cache_entry *ce = index->cache[pos]; | |
645 | if (!(ce->ce_flags & CE_UNPACKED)) | |
646 | return ce; | |
647 | pos++; | |
648 | } | |
649 | return NULL; | |
650 | } | |
651 | ||
9c5e6c80 | 652 | static void add_same_unmerged(const struct cache_entry *ce, |
da165f47 JH |
653 | struct unpack_trees_options *o) |
654 | { | |
655 | struct index_state *index = o->src_index; | |
656 | int len = ce_namelen(ce); | |
657 | int pos = index_name_pos(index, ce->name, len); | |
658 | ||
659 | if (0 <= pos) | |
660 | die("programming error in a caller of mark_ce_used_same_name"); | |
661 | for (pos = -pos - 1; pos < index->cache_nr; pos++) { | |
662 | struct cache_entry *next = index->cache[pos]; | |
663 | if (len != ce_namelen(next) || | |
664 | memcmp(ce->name, next->name, len)) | |
665 | break; | |
666 | add_entry(o, next, 0, 0); | |
667 | mark_ce_used(next, o); | |
668 | } | |
669 | } | |
670 | ||
671 | static int unpack_index_entry(struct cache_entry *ce, | |
672 | struct unpack_trees_options *o) | |
01904572 | 673 | { |
5828e835 | 674 | const struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
da165f47 | 675 | int ret; |
34110cd4 | 676 | |
66dbfd55 GV |
677 | src[0] = ce; |
678 | ||
da165f47 | 679 | mark_ce_used(ce, o); |
01904572 LT |
680 | if (ce_stage(ce)) { |
681 | if (o->skip_unmerged) { | |
34110cd4 LT |
682 | add_entry(o, ce, 0, 0); |
683 | return 0; | |
01904572 | 684 | } |
01904572 | 685 | } |
da165f47 JH |
686 | ret = call_unpack_fn(src, o); |
687 | if (ce_stage(ce)) | |
688 | mark_ce_used_same_name(ce, o); | |
689 | return ret; | |
01904572 LT |
690 | } |
691 | ||
90553847 | 692 | static int find_cache_pos(struct traverse_info *, const char *p, size_t len); |
730f7284 JH |
693 | |
694 | static void restore_cache_bottom(struct traverse_info *info, int bottom) | |
695 | { | |
696 | struct unpack_trees_options *o = info->data; | |
697 | ||
698 | if (o->diff_index_cached) | |
699 | return; | |
700 | o->cache_bottom = bottom; | |
701 | } | |
702 | ||
703 | static int switch_cache_bottom(struct traverse_info *info) | |
704 | { | |
705 | struct unpack_trees_options *o = info->data; | |
706 | int ret, pos; | |
707 | ||
708 | if (o->diff_index_cached) | |
709 | return 0; | |
710 | ret = o->cache_bottom; | |
90553847 | 711 | pos = find_cache_pos(info->prev, info->name, info->namelen); |
730f7284 JH |
712 | |
713 | if (pos < -1) | |
714 | o->cache_bottom = -2 - pos; | |
715 | else if (pos < 0) | |
716 | o->cache_bottom = o->src_index->cache_nr; | |
717 | return ret; | |
01904572 LT |
718 | } |
719 | ||
d12a8cf0 JH |
720 | static inline int are_same_oid(struct name_entry *name_j, struct name_entry *name_k) |
721 | { | |
ea82b2a0 | 722 | return !is_null_oid(&name_j->oid) && !is_null_oid(&name_k->oid) && oideq(&name_j->oid, &name_k->oid); |
d12a8cf0 JH |
723 | } |
724 | ||
b4da3738 NTND |
725 | static int all_trees_same_as_cache_tree(int n, unsigned long dirmask, |
726 | struct name_entry *names, | |
727 | struct traverse_info *info) | |
728 | { | |
729 | struct unpack_trees_options *o = info->data; | |
730 | int i; | |
731 | ||
732 | if (!o->merge || dirmask != ((1 << n) - 1)) | |
733 | return 0; | |
734 | ||
735 | for (i = 1; i < n; i++) | |
736 | if (!are_same_oid(names, names + i)) | |
737 | return 0; | |
738 | ||
739 | return cache_tree_matches_traversal(o->src_index->cache_tree, names, info); | |
740 | } | |
741 | ||
742 | static int index_pos_by_traverse_info(struct name_entry *names, | |
743 | struct traverse_info *info) | |
744 | { | |
745 | struct unpack_trees_options *o = info->data; | |
c43ab062 | 746 | struct strbuf name = STRBUF_INIT; |
b4da3738 NTND |
747 | int pos; |
748 | ||
c43ab062 JK |
749 | strbuf_make_traverse_path(&name, info, names->path, names->pathlen); |
750 | strbuf_addch(&name, '/'); | |
751 | pos = index_name_pos(o->src_index, name.buf, name.len); | |
b4da3738 NTND |
752 | if (pos >= 0) |
753 | BUG("This is a directory and should not exist in index"); | |
754 | pos = -pos - 1; | |
573117df ES |
755 | if (pos >= o->src_index->cache_nr || |
756 | !starts_with(o->src_index->cache[pos]->name, name.buf) || | |
c43ab062 | 757 | (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf))) |
573117df ES |
758 | BUG("pos %d doesn't point to the first entry of %s in index", |
759 | pos, name.buf); | |
c43ab062 | 760 | strbuf_release(&name); |
b4da3738 NTND |
761 | return pos; |
762 | } | |
763 | ||
764 | /* | |
765 | * Fast path if we detect that all trees are the same as cache-tree at this | |
5f4436a7 NTND |
766 | * path. We'll walk these trees in an iterative loop using cache-tree/index |
767 | * instead of ODB since we already know what these trees contain. | |
b4da3738 NTND |
768 | */ |
769 | static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names, | |
b4da3738 NTND |
770 | struct traverse_info *info) |
771 | { | |
772 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; | |
773 | struct unpack_trees_options *o = info->data; | |
f1e11c65 NTND |
774 | struct cache_entry *tree_ce = NULL; |
775 | int ce_len = 0; | |
b4da3738 NTND |
776 | int i, d; |
777 | ||
778 | if (!o->merge) | |
779 | BUG("We need cache-tree to do this optimization"); | |
780 | ||
781 | /* | |
782 | * Do what unpack_callback() and unpack_nondirectories() normally | |
783 | * do. But we walk all paths in an iterative loop instead. | |
784 | * | |
785 | * D/F conflicts and higher stage entries are not a concern | |
786 | * because cache-tree would be invalidated and we would never | |
787 | * get here in the first place. | |
788 | */ | |
789 | for (i = 0; i < nr_entries; i++) { | |
f1e11c65 | 790 | int new_ce_len, len, rc; |
b4da3738 NTND |
791 | |
792 | src[0] = o->src_index->cache[pos + i]; | |
793 | ||
794 | len = ce_namelen(src[0]); | |
f1e11c65 NTND |
795 | new_ce_len = cache_entry_size(len); |
796 | ||
797 | if (new_ce_len > ce_len) { | |
798 | new_ce_len <<= 1; | |
799 | tree_ce = xrealloc(tree_ce, new_ce_len); | |
800 | memset(tree_ce, 0, new_ce_len); | |
801 | ce_len = new_ce_len; | |
802 | ||
803 | tree_ce->ce_flags = create_ce_flags(0); | |
804 | ||
805 | for (d = 1; d <= nr_names; d++) | |
806 | src[d] = tree_ce; | |
807 | } | |
b4da3738 NTND |
808 | |
809 | tree_ce->ce_mode = src[0]->ce_mode; | |
b4da3738 NTND |
810 | tree_ce->ce_namelen = len; |
811 | oidcpy(&tree_ce->oid, &src[0]->oid); | |
812 | memcpy(tree_ce->name, src[0]->name, len + 1); | |
813 | ||
b4da3738 | 814 | rc = call_unpack_fn((const struct cache_entry * const *)src, o); |
f1e11c65 NTND |
815 | if (rc < 0) { |
816 | free(tree_ce); | |
b4da3738 | 817 | return rc; |
f1e11c65 | 818 | } |
b4da3738 NTND |
819 | |
820 | mark_ce_used(src[0], o); | |
821 | } | |
f1e11c65 | 822 | free(tree_ce); |
b4da3738 NTND |
823 | if (o->debug_unpack) |
824 | printf("Unpacked %d entries from %s to %s using cache-tree\n", | |
825 | nr_entries, | |
826 | o->src_index->cache[pos]->name, | |
827 | o->src_index->cache[pos + nr_entries - 1]->name); | |
828 | return 0; | |
829 | } | |
830 | ||
84563a62 JH |
831 | static int traverse_trees_recursive(int n, unsigned long dirmask, |
832 | unsigned long df_conflicts, | |
833 | struct name_entry *names, | |
834 | struct traverse_info *info) | |
16da134b | 835 | { |
67022e02 | 836 | struct unpack_trees_options *o = info->data; |
730f7284 | 837 | int i, ret, bottom; |
d12a8cf0 | 838 | int nr_buf = 0; |
ca885a4f | 839 | struct tree_desc t[MAX_UNPACK_TREES]; |
1ce584b0 | 840 | void *buf[MAX_UNPACK_TREES]; |
01904572 LT |
841 | struct traverse_info newinfo; |
842 | struct name_entry *p; | |
b4da3738 NTND |
843 | int nr_entries; |
844 | ||
845 | nr_entries = all_trees_same_as_cache_tree(n, dirmask, names, info); | |
846 | if (nr_entries > 0) { | |
b4da3738 NTND |
847 | int pos = index_pos_by_traverse_info(names, info); |
848 | ||
849 | if (!o->merge || df_conflicts) | |
850 | BUG("Wrong condition to get here buddy"); | |
851 | ||
852 | /* | |
853 | * All entries up to 'pos' must have been processed | |
854 | * (i.e. marked CE_UNPACKED) at this point. But to be safe, | |
855 | * save and restore cache_bottom anyway to not miss | |
856 | * unprocessed entries before 'pos'. | |
857 | */ | |
858 | bottom = o->cache_bottom; | |
66429698 | 859 | ret = traverse_by_cache_tree(pos, nr_entries, n, info); |
b4da3738 NTND |
860 | o->cache_bottom = bottom; |
861 | return ret; | |
862 | } | |
01904572 LT |
863 | |
864 | p = names; | |
865 | while (!p->mode) | |
866 | p++; | |
867 | ||
868 | newinfo = *info; | |
869 | newinfo.prev = info; | |
40e37256 | 870 | newinfo.pathspec = info->pathspec; |
90553847 JK |
871 | newinfo.name = p->path; |
872 | newinfo.namelen = p->pathlen; | |
873 | newinfo.mode = p->mode; | |
37806080 | 874 | newinfo.pathlen = st_add3(newinfo.pathlen, tree_entry_len(p), 1); |
603d2498 | 875 | newinfo.df_conflicts |= df_conflicts; |
01904572 | 876 | |
d12a8cf0 JH |
877 | /* |
878 | * Fetch the tree from the ODB for each peer directory in the | |
879 | * n commits. | |
880 | * | |
881 | * For 2- and 3-way traversals, we try to avoid hitting the | |
882 | * ODB twice for the same OID. This should yield a nice speed | |
883 | * up in checkouts and merges when the commits are similar. | |
884 | * | |
885 | * We don't bother doing the full O(n^2) search for larger n, | |
886 | * because wider traversals don't happen that often and we | |
887 | * avoid the search setup. | |
888 | * | |
889 | * When 2 peer OIDs are the same, we just copy the tree | |
890 | * descriptor data. This implicitly borrows the buffer | |
891 | * data from the earlier cell. | |
892 | */ | |
01904572 | 893 | for (i = 0; i < n; i++, dirmask >>= 1) { |
d12a8cf0 JH |
894 | if (i > 0 && are_same_oid(&names[i], &names[i - 1])) |
895 | t[i] = t[i - 1]; | |
896 | else if (i > 1 && are_same_oid(&names[i], &names[i - 2])) | |
897 | t[i] = t[i - 2]; | |
898 | else { | |
5c377d3d | 899 | const struct object_id *oid = NULL; |
d12a8cf0 | 900 | if (dirmask & 1) |
ea82b2a0 | 901 | oid = &names[i].oid; |
5e575807 | 902 | buf[nr_buf++] = fill_tree_descriptor(the_repository, t + i, oid); |
d12a8cf0 | 903 | } |
01904572 | 904 | } |
730f7284 JH |
905 | |
906 | bottom = switch_cache_bottom(&newinfo); | |
67022e02 | 907 | ret = traverse_trees(o->src_index, n, t, &newinfo); |
730f7284 | 908 | restore_cache_bottom(&newinfo, bottom); |
1ce584b0 | 909 | |
d12a8cf0 | 910 | for (i = 0; i < nr_buf; i++) |
1ce584b0 JN |
911 | free(buf[i]); |
912 | ||
730f7284 | 913 | return ret; |
01904572 LT |
914 | } |
915 | ||
916 | /* | |
917 | * Compare the traverse-path to the cache entry without actually | |
918 | * having to generate the textual representation of the traverse | |
919 | * path. | |
920 | * | |
921 | * NOTE! This *only* compares up to the size of the traverse path | |
922 | * itself - the caller needs to do the final check for the cache | |
923 | * entry having more data at the end! | |
924 | */ | |
90553847 JK |
925 | static int do_compare_entry_piecewise(const struct cache_entry *ce, |
926 | const struct traverse_info *info, | |
927 | const char *name, size_t namelen, | |
928 | unsigned mode) | |
01904572 | 929 | { |
90553847 | 930 | int pathlen, ce_len; |
01904572 LT |
931 | const char *ce_name; |
932 | ||
933 | if (info->prev) { | |
d9c2bd56 | 934 | int cmp = do_compare_entry_piecewise(ce, info->prev, |
90553847 JK |
935 | info->name, info->namelen, |
936 | info->mode); | |
01904572 LT |
937 | if (cmp) |
938 | return cmp; | |
939 | } | |
940 | pathlen = info->pathlen; | |
941 | ce_len = ce_namelen(ce); | |
942 | ||
943 | /* If ce_len < pathlen then we must have previously hit "name == directory" entry */ | |
944 | if (ce_len < pathlen) | |
945 | return -1; | |
946 | ||
947 | ce_len -= pathlen; | |
948 | ce_name = ce->name + pathlen; | |
949 | ||
90553847 | 950 | return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); |
01904572 LT |
951 | } |
952 | ||
d9c2bd56 DT |
953 | static int do_compare_entry(const struct cache_entry *ce, |
954 | const struct traverse_info *info, | |
90553847 JK |
955 | const char *name, size_t namelen, |
956 | unsigned mode) | |
d9c2bd56 | 957 | { |
90553847 | 958 | int pathlen, ce_len; |
d9c2bd56 DT |
959 | const char *ce_name; |
960 | int cmp; | |
961 | ||
962 | /* | |
963 | * If we have not precomputed the traverse path, it is quicker | |
964 | * to avoid doing so. But if we have precomputed it, | |
965 | * it is quicker to use the precomputed version. | |
966 | */ | |
967 | if (!info->traverse_path) | |
90553847 | 968 | return do_compare_entry_piecewise(ce, info, name, namelen, mode); |
d9c2bd56 DT |
969 | |
970 | cmp = strncmp(ce->name, info->traverse_path, info->pathlen); | |
971 | if (cmp) | |
972 | return cmp; | |
973 | ||
974 | pathlen = info->pathlen; | |
975 | ce_len = ce_namelen(ce); | |
976 | ||
977 | if (ce_len < pathlen) | |
978 | return -1; | |
979 | ||
980 | ce_len -= pathlen; | |
981 | ce_name = ce->name + pathlen; | |
982 | ||
90553847 | 983 | return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); |
d9c2bd56 DT |
984 | } |
985 | ||
01904572 LT |
986 | static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) |
987 | { | |
90553847 | 988 | int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode); |
01904572 LT |
989 | if (cmp) |
990 | return cmp; | |
991 | ||
992 | /* | |
993 | * Even if the beginning compared identically, the ce should | |
994 | * compare as bigger than a directory leading up to it! | |
995 | */ | |
b3b3cbcb | 996 | return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n)); |
01904572 LT |
997 | } |
998 | ||
da165f47 JH |
999 | static int ce_in_traverse_path(const struct cache_entry *ce, |
1000 | const struct traverse_info *info) | |
1001 | { | |
1002 | if (!info->prev) | |
1003 | return 1; | |
90553847 JK |
1004 | if (do_compare_entry(ce, info->prev, |
1005 | info->name, info->namelen, info->mode)) | |
da165f47 JH |
1006 | return 0; |
1007 | /* | |
1008 | * If ce (blob) is the same name as the path (which is a tree | |
1009 | * we will be descending into), it won't be inside it. | |
1010 | */ | |
1011 | return (info->pathlen < ce_namelen(ce)); | |
1012 | } | |
1013 | ||
a849735b JM |
1014 | static struct cache_entry *create_ce_entry(const struct traverse_info *info, |
1015 | const struct name_entry *n, | |
1016 | int stage, | |
1017 | struct index_state *istate, | |
1018 | int is_transient) | |
01904572 | 1019 | { |
b3b3cbcb | 1020 | size_t len = traverse_path_len(info, tree_entry_len(n)); |
a849735b JM |
1021 | struct cache_entry *ce = |
1022 | is_transient ? | |
1023 | make_empty_transient_cache_entry(len) : | |
1024 | make_empty_cache_entry(istate, len); | |
01904572 LT |
1025 | |
1026 | ce->ce_mode = create_ce_mode(n->mode); | |
b60e188c TG |
1027 | ce->ce_flags = create_ce_flags(stage); |
1028 | ce->ce_namelen = len; | |
ea82b2a0 | 1029 | oidcpy(&ce->oid, &n->oid); |
5aa02f98 JK |
1030 | /* len+1 because the cache_entry allocates space for NUL */ |
1031 | make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen); | |
01904572 LT |
1032 | |
1033 | return ce; | |
1034 | } | |
1035 | ||
b4da3738 NTND |
1036 | /* |
1037 | * Note that traverse_by_cache_tree() duplicates some logic in this function | |
1038 | * without actually calling it. If you change the logic here you may need to | |
1039 | * check and change there as well. | |
1040 | */ | |
c7cddc1a RS |
1041 | static int unpack_nondirectories(int n, unsigned long mask, |
1042 | unsigned long dirmask, | |
1043 | struct cache_entry **src, | |
1044 | const struct name_entry *names, | |
1045 | const struct traverse_info *info) | |
01904572 LT |
1046 | { |
1047 | int i; | |
1048 | struct unpack_trees_options *o = info->data; | |
603d2498 | 1049 | unsigned long conflicts = info->df_conflicts | dirmask; |
01904572 LT |
1050 | |
1051 | /* Do we have *only* directories? Nothing to do */ | |
1052 | if (mask == dirmask && !src[0]) | |
1053 | return 0; | |
1054 | ||
01904572 LT |
1055 | /* |
1056 | * Ok, we've filled in up to any potential index entry in src[0], | |
1057 | * now do the rest. | |
1058 | */ | |
1059 | for (i = 0; i < n; i++) { | |
1060 | int stage; | |
1061 | unsigned int bit = 1ul << i; | |
1062 | if (conflicts & bit) { | |
1063 | src[i + o->merge] = o->df_conflict_entry; | |
1064 | continue; | |
1065 | } | |
1066 | if (!(mask & bit)) | |
1067 | continue; | |
1068 | if (!o->merge) | |
1069 | stage = 0; | |
1070 | else if (i + 1 < o->head_idx) | |
1071 | stage = 1; | |
1072 | else if (i + 1 > o->head_idx) | |
1073 | stage = 3; | |
1074 | else | |
1075 | stage = 2; | |
a849735b JM |
1076 | |
1077 | /* | |
1078 | * If the merge bit is set, then the cache entries are | |
1079 | * discarded in the following block. In this case, | |
1080 | * construct "transient" cache_entries, as they are | |
1081 | * not stored in the index. otherwise construct the | |
1082 | * cache entry from the index aware logic. | |
1083 | */ | |
1084 | src[i + o->merge] = create_ce_entry(info, names + i, stage, &o->result, o->merge); | |
01904572 LT |
1085 | } |
1086 | ||
5d80ef5a RS |
1087 | if (o->merge) { |
1088 | int rc = call_unpack_fn((const struct cache_entry * const *)src, | |
1089 | o); | |
1090 | for (i = 0; i < n; i++) { | |
1091 | struct cache_entry *ce = src[i + o->merge]; | |
1092 | if (ce != o->df_conflict_entry) | |
a849735b | 1093 | discard_cache_entry(ce); |
5d80ef5a RS |
1094 | } |
1095 | return rc; | |
1096 | } | |
01904572 | 1097 | |
01904572 | 1098 | for (i = 0; i < n; i++) |
aab3b9a1 | 1099 | if (src[i] && src[i] != o->df_conflict_entry) |
46169180 JK |
1100 | if (do_add_entry(o, src[i], 0, 0)) |
1101 | return -1; | |
1102 | ||
01904572 LT |
1103 | return 0; |
1104 | } | |
1105 | ||
353c5eeb JH |
1106 | static int unpack_failed(struct unpack_trees_options *o, const char *message) |
1107 | { | |
1108 | discard_index(&o->result); | |
b165fac8 | 1109 | if (!o->quiet && !o->exiting_early) { |
353c5eeb JH |
1110 | if (message) |
1111 | return error("%s", message); | |
1112 | return -1; | |
1113 | } | |
1114 | return -1; | |
1115 | } | |
1116 | ||
730f7284 JH |
1117 | /* |
1118 | * The tree traversal is looking at name p. If we have a matching entry, | |
1119 | * return it. If name p is a directory in the index, do not return | |
1120 | * anything, as we will want to match it when the traversal descends into | |
1121 | * the directory. | |
1122 | */ | |
1123 | static int find_cache_pos(struct traverse_info *info, | |
90553847 | 1124 | const char *p, size_t p_len) |
730f7284 JH |
1125 | { |
1126 | int pos; | |
1127 | struct unpack_trees_options *o = info->data; | |
1128 | struct index_state *index = o->src_index; | |
1129 | int pfxlen = info->pathlen; | |
730f7284 JH |
1130 | |
1131 | for (pos = o->cache_bottom; pos < index->cache_nr; pos++) { | |
9c5e6c80 | 1132 | const struct cache_entry *ce = index->cache[pos]; |
730f7284 JH |
1133 | const char *ce_name, *ce_slash; |
1134 | int cmp, ce_len; | |
1135 | ||
e53e6b44 BD |
1136 | if (ce->ce_flags & CE_UNPACKED) { |
1137 | /* | |
1138 | * cache_bottom entry is already unpacked, so | |
1139 | * we can never match it; don't check it | |
1140 | * again. | |
1141 | */ | |
1142 | if (pos == o->cache_bottom) | |
1143 | ++o->cache_bottom; | |
730f7284 | 1144 | continue; |
e53e6b44 | 1145 | } |
a6720955 DT |
1146 | if (!ce_in_traverse_path(ce, info)) { |
1147 | /* | |
1148 | * Check if we can skip future cache checks | |
1149 | * (because we're already past all possible | |
1150 | * entries in the traverse path). | |
1151 | */ | |
1152 | if (info->traverse_path) { | |
1153 | if (strncmp(ce->name, info->traverse_path, | |
1154 | info->pathlen) > 0) | |
1155 | break; | |
1156 | } | |
730f7284 | 1157 | continue; |
a6720955 | 1158 | } |
730f7284 JH |
1159 | ce_name = ce->name + pfxlen; |
1160 | ce_slash = strchr(ce_name, '/'); | |
1161 | if (ce_slash) | |
1162 | ce_len = ce_slash - ce_name; | |
1163 | else | |
1164 | ce_len = ce_namelen(ce) - pfxlen; | |
90553847 | 1165 | cmp = name_compare(p, p_len, ce_name, ce_len); |
730f7284 JH |
1166 | /* |
1167 | * Exact match; if we have a directory we need to | |
1168 | * delay returning it. | |
1169 | */ | |
1170 | if (!cmp) | |
1171 | return ce_slash ? -2 - pos : pos; | |
1172 | if (0 < cmp) | |
1173 | continue; /* keep looking */ | |
1174 | /* | |
1175 | * ce_name sorts after p->path; could it be that we | |
1176 | * have files under p->path directory in the index? | |
1177 | * E.g. ce_name == "t-i", and p->path == "t"; we may | |
1178 | * have "t/a" in the index. | |
1179 | */ | |
90553847 | 1180 | if (p_len < ce_len && !memcmp(ce_name, p, p_len) && |
730f7284 JH |
1181 | ce_name[p_len] < '/') |
1182 | continue; /* keep looking */ | |
1183 | break; | |
1184 | } | |
1185 | return -1; | |
1186 | } | |
1187 | ||
1188 | static struct cache_entry *find_cache_entry(struct traverse_info *info, | |
1189 | const struct name_entry *p) | |
1190 | { | |
90553847 | 1191 | int pos = find_cache_pos(info, p->path, p->pathlen); |
730f7284 JH |
1192 | struct unpack_trees_options *o = info->data; |
1193 | ||
1194 | if (0 <= pos) | |
1195 | return o->src_index->cache[pos]; | |
1196 | else | |
1197 | return NULL; | |
1198 | } | |
1199 | ||
ba655da5 JH |
1200 | static void debug_path(struct traverse_info *info) |
1201 | { | |
1202 | if (info->prev) { | |
1203 | debug_path(info->prev); | |
90553847 | 1204 | if (*info->prev->name) |
ba655da5 JH |
1205 | putchar('/'); |
1206 | } | |
90553847 | 1207 | printf("%s", info->name); |
ba655da5 JH |
1208 | } |
1209 | ||
1210 | static void debug_name_entry(int i, struct name_entry *n) | |
1211 | { | |
1212 | printf("ent#%d %06o %s\n", i, | |
1213 | n->path ? n->mode : 0, | |
1214 | n->path ? n->path : "(missing)"); | |
1215 | } | |
1216 | ||
1217 | static void debug_unpack_callback(int n, | |
1218 | unsigned long mask, | |
1219 | unsigned long dirmask, | |
1220 | struct name_entry *names, | |
1221 | struct traverse_info *info) | |
1222 | { | |
1223 | int i; | |
1224 | printf("* unpack mask %lu, dirmask %lu, cnt %d ", | |
1225 | mask, dirmask, n); | |
1226 | debug_path(info); | |
1227 | putchar('\n'); | |
1228 | for (i = 0; i < n; i++) | |
1229 | debug_name_entry(i, names + i); | |
1230 | } | |
1231 | ||
b4da3738 NTND |
1232 | /* |
1233 | * Note that traverse_by_cache_tree() duplicates some logic in this function | |
1234 | * without actually calling it. If you change the logic here you may need to | |
1235 | * check and change there as well. | |
1236 | */ | |
01904572 LT |
1237 | static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info) |
1238 | { | |
c7cddc1a | 1239 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
01904572 | 1240 | struct unpack_trees_options *o = info->data; |
01904572 LT |
1241 | const struct name_entry *p = names; |
1242 | ||
1243 | /* Find first entry with a real name (we could use "mask" too) */ | |
1244 | while (!p->mode) | |
1245 | p++; | |
1246 | ||
ba655da5 JH |
1247 | if (o->debug_unpack) |
1248 | debug_unpack_callback(n, mask, dirmask, names, info); | |
1249 | ||
01904572 LT |
1250 | /* Are we supposed to look at the index too? */ |
1251 | if (o->merge) { | |
da165f47 | 1252 | while (1) { |
da165f47 | 1253 | int cmp; |
730f7284 JH |
1254 | struct cache_entry *ce; |
1255 | ||
1256 | if (o->diff_index_cached) | |
1257 | ce = next_cache_entry(o); | |
1258 | else | |
1259 | ce = find_cache_entry(info, p); | |
1260 | ||
da165f47 JH |
1261 | if (!ce) |
1262 | break; | |
1263 | cmp = compare_entry(ce, info, p); | |
01904572 LT |
1264 | if (cmp < 0) { |
1265 | if (unpack_index_entry(ce, o) < 0) | |
353c5eeb | 1266 | return unpack_failed(o, NULL); |
01904572 LT |
1267 | continue; |
1268 | } | |
1269 | if (!cmp) { | |
1270 | if (ce_stage(ce)) { | |
1271 | /* | |
da165f47 JH |
1272 | * If we skip unmerged index |
1273 | * entries, we'll skip this | |
1274 | * entry *and* the tree | |
1275 | * entries associated with it! | |
01904572 | 1276 | */ |
34110cd4 | 1277 | if (o->skip_unmerged) { |
da165f47 | 1278 | add_same_unmerged(ce, o); |
01904572 | 1279 | return mask; |
34110cd4 | 1280 | } |
01904572 LT |
1281 | } |
1282 | src[0] = ce; | |
01904572 LT |
1283 | } |
1284 | break; | |
1285 | } | |
1286 | } | |
1287 | ||
34110cd4 | 1288 | if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0) |
01904572 LT |
1289 | return -1; |
1290 | ||
97e5954b | 1291 | if (o->merge && src[0]) { |
da165f47 JH |
1292 | if (ce_stage(src[0])) |
1293 | mark_ce_used_same_name(src[0], o); | |
1294 | else | |
1295 | mark_ce_used(src[0], o); | |
1296 | } | |
1297 | ||
01904572 LT |
1298 | /* Now handle any directories.. */ |
1299 | if (dirmask) { | |
b65982b6 JH |
1300 | /* special case: "diff-index --cached" looking at a tree */ |
1301 | if (o->diff_index_cached && | |
1302 | n == 1 && dirmask == 1 && S_ISDIR(names->mode)) { | |
1303 | int matches; | |
1304 | matches = cache_tree_matches_traversal(o->src_index->cache_tree, | |
1305 | names, info); | |
1306 | /* | |
da165f47 JH |
1307 | * Everything under the name matches; skip the |
1308 | * entire hierarchy. diff_index_cached codepath | |
1309 | * special cases D/F conflicts in such a way that | |
1310 | * it does not do any look-ahead, so this is safe. | |
b65982b6 JH |
1311 | */ |
1312 | if (matches) { | |
da165f47 | 1313 | o->cache_bottom += matches; |
b65982b6 JH |
1314 | return mask; |
1315 | } | |
1316 | } | |
1317 | ||
603d2498 | 1318 | if (traverse_trees_recursive(n, dirmask, mask & ~dirmask, |
542c264b JH |
1319 | names, info) < 0) |
1320 | return -1; | |
01904572 LT |
1321 | return mask; |
1322 | } | |
1323 | ||
1324 | return mask; | |
1325 | } | |
1326 | ||
27c82fb3 NTND |
1327 | static int clear_ce_flags_1(struct index_state *istate, |
1328 | struct cache_entry **cache, int nr, | |
fc2b6214 | 1329 | struct strbuf *prefix, |
28911091 | 1330 | int select_mask, int clear_mask, |
468ce99b | 1331 | struct pattern_list *pl, |
4dcd4def DS |
1332 | enum pattern_match_result default_match, |
1333 | int progress_nr); | |
28911091 | 1334 | |
9037026d | 1335 | /* Whole directory matching */ |
27c82fb3 NTND |
1336 | static int clear_ce_flags_dir(struct index_state *istate, |
1337 | struct cache_entry **cache, int nr, | |
fc2b6214 | 1338 | struct strbuf *prefix, |
9037026d NTND |
1339 | char *basename, |
1340 | int select_mask, int clear_mask, | |
468ce99b | 1341 | struct pattern_list *pl, |
4dcd4def DS |
1342 | enum pattern_match_result default_match, |
1343 | int progress_nr) | |
9037026d | 1344 | { |
28911091 | 1345 | struct cache_entry **cache_end; |
9037026d | 1346 | int dtype = DT_DIR; |
fc2b6214 | 1347 | int rc; |
eb42feca DS |
1348 | enum pattern_match_result ret, orig_ret; |
1349 | orig_ret = path_matches_pattern_list(prefix->buf, prefix->len, | |
1350 | basename, &dtype, pl, istate); | |
9037026d | 1351 | |
fc2b6214 | 1352 | strbuf_addch(prefix, '/'); |
9037026d | 1353 | |
28911091 | 1354 | /* If undecided, use matching result of parent dir in defval */ |
eb42feca | 1355 | if (orig_ret == UNDECIDED) |
468ce99b | 1356 | ret = default_match; |
eb42feca DS |
1357 | else |
1358 | ret = orig_ret; | |
9037026d | 1359 | |
28911091 NTND |
1360 | for (cache_end = cache; cache_end != cache + nr; cache_end++) { |
1361 | struct cache_entry *ce = *cache_end; | |
fc2b6214 | 1362 | if (strncmp(ce->name, prefix->buf, prefix->len)) |
28911091 | 1363 | break; |
9037026d NTND |
1364 | } |
1365 | ||
eb42feca DS |
1366 | if (pl->use_cone_patterns && orig_ret == MATCHED_RECURSIVE) { |
1367 | struct cache_entry **ce = cache; | |
4c6c7971 | 1368 | rc = cache_end - cache; |
eb42feca DS |
1369 | |
1370 | while (ce < cache_end) { | |
1371 | (*ce)->ce_flags &= ~clear_mask; | |
1372 | ce++; | |
1373 | } | |
1374 | } else if (pl->use_cone_patterns && orig_ret == NOT_MATCHED) { | |
4c6c7971 | 1375 | rc = cache_end - cache; |
eb42feca DS |
1376 | } else { |
1377 | rc = clear_ce_flags_1(istate, cache, cache_end - cache, | |
1378 | prefix, | |
1379 | select_mask, clear_mask, | |
4dcd4def DS |
1380 | pl, ret, |
1381 | progress_nr); | |
eb42feca DS |
1382 | } |
1383 | ||
fc2b6214 AP |
1384 | strbuf_setlen(prefix, prefix->len - 1); |
1385 | return rc; | |
9037026d NTND |
1386 | } |
1387 | ||
1388 | /* | |
1389 | * Traverse the index, find every entry that matches according to | |
caa3d554 | 1390 | * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the |
9037026d NTND |
1391 | * number of traversed entries. |
1392 | * | |
1393 | * If select_mask is non-zero, only entries whose ce_flags has on of | |
1394 | * those bits enabled are traversed. | |
1395 | * | |
1396 | * cache : pointer to an index entry | |
1397 | * prefix_len : an offset to its path | |
1398 | * | |
1399 | * The current path ("prefix") including the trailing '/' is | |
1400 | * cache[0]->name[0..(prefix_len-1)] | |
1401 | * Top level path has prefix_len zero. | |
1402 | */ | |
27c82fb3 NTND |
1403 | static int clear_ce_flags_1(struct index_state *istate, |
1404 | struct cache_entry **cache, int nr, | |
fc2b6214 | 1405 | struct strbuf *prefix, |
9037026d | 1406 | int select_mask, int clear_mask, |
468ce99b | 1407 | struct pattern_list *pl, |
4dcd4def DS |
1408 | enum pattern_match_result default_match, |
1409 | int progress_nr) | |
9037026d | 1410 | { |
d20bc01a | 1411 | struct cache_entry **cache_end = nr ? cache + nr : cache; |
9037026d NTND |
1412 | |
1413 | /* | |
1414 | * Process all entries that have the given prefix and meet | |
1415 | * select_mask condition | |
1416 | */ | |
1417 | while(cache != cache_end) { | |
1418 | struct cache_entry *ce = *cache; | |
1419 | const char *name, *slash; | |
468ce99b DS |
1420 | int len, dtype; |
1421 | enum pattern_match_result ret; | |
9037026d | 1422 | |
4dcd4def DS |
1423 | display_progress(istate->progress, progress_nr); |
1424 | ||
9037026d NTND |
1425 | if (select_mask && !(ce->ce_flags & select_mask)) { |
1426 | cache++; | |
4dcd4def | 1427 | progress_nr++; |
9037026d NTND |
1428 | continue; |
1429 | } | |
1430 | ||
fc2b6214 | 1431 | if (prefix->len && strncmp(ce->name, prefix->buf, prefix->len)) |
9037026d NTND |
1432 | break; |
1433 | ||
fc2b6214 | 1434 | name = ce->name + prefix->len; |
9037026d NTND |
1435 | slash = strchr(name, '/'); |
1436 | ||
1437 | /* If it's a directory, try whole directory match first */ | |
1438 | if (slash) { | |
1439 | int processed; | |
1440 | ||
1441 | len = slash - name; | |
fc2b6214 | 1442 | strbuf_add(prefix, name, len); |
9037026d | 1443 | |
27c82fb3 | 1444 | processed = clear_ce_flags_dir(istate, cache, cache_end - cache, |
fc2b6214 AP |
1445 | prefix, |
1446 | prefix->buf + prefix->len - len, | |
9037026d | 1447 | select_mask, clear_mask, |
4dcd4def DS |
1448 | pl, default_match, |
1449 | progress_nr); | |
9037026d NTND |
1450 | |
1451 | /* clear_c_f_dir eats a whole dir already? */ | |
1452 | if (processed) { | |
1453 | cache += processed; | |
4dcd4def | 1454 | progress_nr += processed; |
fc2b6214 | 1455 | strbuf_setlen(prefix, prefix->len - len); |
9037026d NTND |
1456 | continue; |
1457 | } | |
1458 | ||
fc2b6214 | 1459 | strbuf_addch(prefix, '/'); |
4dcd4def DS |
1460 | processed = clear_ce_flags_1(istate, cache, cache_end - cache, |
1461 | prefix, | |
1462 | select_mask, clear_mask, pl, | |
1463 | default_match, progress_nr); | |
1464 | ||
1465 | cache += processed; | |
1466 | progress_nr += processed; | |
1467 | ||
fc2b6214 | 1468 | strbuf_setlen(prefix, prefix->len - len - 1); |
9037026d NTND |
1469 | continue; |
1470 | } | |
1471 | ||
1472 | /* Non-directory */ | |
1473 | dtype = ce_to_dtype(ce); | |
468ce99b DS |
1474 | ret = path_matches_pattern_list(ce->name, |
1475 | ce_namelen(ce), | |
1476 | name, &dtype, pl, istate); | |
1477 | if (ret == UNDECIDED) | |
1478 | ret = default_match; | |
f998a3f1 | 1479 | if (ret == MATCHED || ret == MATCHED_RECURSIVE) |
9037026d NTND |
1480 | ce->ce_flags &= ~clear_mask; |
1481 | cache++; | |
4dcd4def | 1482 | progress_nr++; |
9037026d | 1483 | } |
4dcd4def DS |
1484 | |
1485 | display_progress(istate->progress, progress_nr); | |
9037026d NTND |
1486 | return nr - (cache_end - cache); |
1487 | } | |
1488 | ||
27c82fb3 NTND |
1489 | static int clear_ce_flags(struct index_state *istate, |
1490 | int select_mask, int clear_mask, | |
4dcd4def DS |
1491 | struct pattern_list *pl, |
1492 | int show_progress) | |
9037026d | 1493 | { |
fc2b6214 | 1494 | static struct strbuf prefix = STRBUF_INIT; |
e6152e35 JH |
1495 | char label[100]; |
1496 | int rval; | |
fc2b6214 AP |
1497 | |
1498 | strbuf_reset(&prefix); | |
4dcd4def DS |
1499 | if (show_progress) |
1500 | istate->progress = start_delayed_progress( | |
1501 | _("Updating index flags"), | |
1502 | istate->cache_nr); | |
fc2b6214 | 1503 | |
e6152e35 JH |
1504 | xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)", |
1505 | (unsigned long)select_mask, (unsigned long)clear_mask); | |
1506 | trace2_region_enter("unpack_trees", label, the_repository); | |
1507 | rval = clear_ce_flags_1(istate, | |
27c82fb3 NTND |
1508 | istate->cache, |
1509 | istate->cache_nr, | |
fc2b6214 | 1510 | &prefix, |
9037026d | 1511 | select_mask, clear_mask, |
4dcd4def | 1512 | pl, 0, 0); |
e6152e35 JH |
1513 | trace2_region_leave("unpack_trees", label, the_repository); |
1514 | ||
4dcd4def | 1515 | stop_progress(&istate->progress); |
e6152e35 | 1516 | return rval; |
9037026d NTND |
1517 | } |
1518 | ||
2431afbf NTND |
1519 | /* |
1520 | * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout | |
1521 | */ | |
caa3d554 | 1522 | static void mark_new_skip_worktree(struct pattern_list *pl, |
86016ec3 | 1523 | struct index_state *istate, |
4dcd4def DS |
1524 | int select_flag, int skip_wt_flag, |
1525 | int show_progress) | |
2431afbf NTND |
1526 | { |
1527 | int i; | |
1528 | ||
9037026d NTND |
1529 | /* |
1530 | * 1. Pretend the narrowest worktree: only unmerged entries | |
1531 | * are checked out | |
1532 | */ | |
86016ec3 NTND |
1533 | for (i = 0; i < istate->cache_nr; i++) { |
1534 | struct cache_entry *ce = istate->cache[i]; | |
2431afbf NTND |
1535 | |
1536 | if (select_flag && !(ce->ce_flags & select_flag)) | |
1537 | continue; | |
1538 | ||
b33fdfc3 | 1539 | if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED)) |
2431afbf NTND |
1540 | ce->ce_flags |= skip_wt_flag; |
1541 | else | |
1542 | ce->ce_flags &= ~skip_wt_flag; | |
1543 | } | |
9037026d NTND |
1544 | |
1545 | /* | |
1546 | * 2. Widen worktree according to sparse-checkout file. | |
1547 | * Matched entries will have skip_wt_flag cleared (i.e. "in") | |
1548 | */ | |
4dcd4def | 1549 | clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress); |
2431afbf NTND |
1550 | } |
1551 | ||
30e89c12 EN |
1552 | static void populate_from_existing_patterns(struct unpack_trees_options *o, |
1553 | struct pattern_list *pl) | |
1554 | { | |
1555 | char *sparse = git_pathdup("info/sparse-checkout"); | |
1556 | ||
1557 | pl->use_cone_patterns = core_sparse_checkout_cone; | |
1558 | if (add_patterns_from_file_to_list(sparse, "", 0, pl, NULL) < 0) | |
1559 | o->skip_sparse_checkout = 1; | |
1560 | else | |
1561 | o->pl = pl; | |
1562 | free(sparse); | |
1563 | } | |
1564 | ||
1565 | ||
eb9ae4b5 RS |
1566 | static int verify_absent(const struct cache_entry *, |
1567 | enum unpack_trees_error_types, | |
1568 | struct unpack_trees_options *); | |
2e2b887d JH |
1569 | /* |
1570 | * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the | |
1571 | * resulting index, -2 on failure to reflect the changes to the work tree. | |
2431afbf NTND |
1572 | * |
1573 | * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally | |
2e2b887d | 1574 | */ |
01904572 LT |
1575 | int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o) |
1576 | { | |
e800ec9d | 1577 | int i, ret; |
0fb1eaa8 | 1578 | static struct cache_entry *dfc; |
caa3d554 | 1579 | struct pattern_list pl; |
fa0bde45 | 1580 | int free_pattern_list = 0; |
16da134b | 1581 | |
ca885a4f JH |
1582 | if (len > MAX_UNPACK_TREES) |
1583 | die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES); | |
16da134b | 1584 | |
0d1ed596 | 1585 | trace_performance_enter(); |
08aefc9e NTND |
1586 | if (!core_apply_sparse_checkout || !o->update) |
1587 | o->skip_sparse_checkout = 1; | |
e091228e | 1588 | if (!o->skip_sparse_checkout && !o->pl) { |
30e89c12 | 1589 | memset(&pl, 0, sizeof(pl)); |
fa0bde45 | 1590 | free_pattern_list = 1; |
30e89c12 | 1591 | populate_from_existing_patterns(o, &pl); |
08aefc9e NTND |
1592 | } |
1593 | ||
34110cd4 | 1594 | memset(&o->result, 0, sizeof(o->result)); |
913e0e99 | 1595 | o->result.initialized = 1; |
da165f47 JH |
1596 | o->result.timestamp.sec = o->src_index->timestamp.sec; |
1597 | o->result.timestamp.nsec = o->src_index->timestamp.nsec; | |
9170c7ab | 1598 | o->result.version = o->src_index->version; |
7db11830 EN |
1599 | if (!o->src_index->split_index) { |
1600 | o->result.split_index = NULL; | |
1601 | } else if (o->src_index == o->dst_index) { | |
1602 | /* | |
1603 | * o->dst_index (and thus o->src_index) will be discarded | |
1604 | * and overwritten with o->result at the end of this function, | |
1605 | * so just use src_index's split_index to avoid having to | |
1606 | * create a new one. | |
1607 | */ | |
1608 | o->result.split_index = o->src_index->split_index; | |
5fc2fc8f | 1609 | o->result.split_index->refcount++; |
7db11830 EN |
1610 | } else { |
1611 | o->result.split_index = init_split_index(&o->result); | |
1612 | } | |
75691ea3 | 1613 | oidcpy(&o->result.oid, &o->src_index->oid); |
16da134b | 1614 | o->merge_size = len; |
da165f47 | 1615 | mark_all_ce_unused(o->src_index); |
0fb1eaa8 | 1616 | |
679f2f9f US |
1617 | if (o->src_index->fsmonitor_last_update) |
1618 | o->result.fsmonitor_last_update = o->src_index->fsmonitor_last_update; | |
1619 | ||
2431afbf NTND |
1620 | /* |
1621 | * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries | |
1622 | */ | |
1623 | if (!o->skip_sparse_checkout) | |
4dcd4def DS |
1624 | mark_new_skip_worktree(o->pl, o->src_index, 0, |
1625 | CE_NEW_SKIP_WORKTREE, o->verbose_update); | |
2431afbf | 1626 | |
0fb1eaa8 | 1627 | if (!dfc) |
13494ed1 | 1628 | dfc = xcalloc(1, cache_entry_size(0)); |
0fb1eaa8 | 1629 | o->df_conflict_entry = dfc; |
16da134b JS |
1630 | |
1631 | if (len) { | |
01904572 LT |
1632 | const char *prefix = o->prefix ? o->prefix : ""; |
1633 | struct traverse_info info; | |
1634 | ||
1635 | setup_traverse_info(&info, prefix); | |
1636 | info.fn = unpack_callback; | |
1637 | info.data = o; | |
e6c111b4 | 1638 | info.show_all_errors = o->show_all_errors; |
40e37256 | 1639 | info.pathspec = o->pathspec; |
01904572 | 1640 | |
da165f47 JH |
1641 | if (o->prefix) { |
1642 | /* | |
1643 | * Unpack existing index entries that sort before the | |
1644 | * prefix the tree is spliced into. Note that o->merge | |
1645 | * is always true in this case. | |
1646 | */ | |
1647 | while (1) { | |
1648 | struct cache_entry *ce = next_cache_entry(o); | |
1649 | if (!ce) | |
1650 | break; | |
1651 | if (ce_in_traverse_path(ce, &info)) | |
1652 | break; | |
1653 | if (unpack_index_entry(ce, o) < 0) | |
1654 | goto return_failed; | |
1655 | } | |
08aefc9e | 1656 | } |
da165f47 | 1657 | |
0d1ed596 | 1658 | trace_performance_enter(); |
67022e02 | 1659 | ret = traverse_trees(o->src_index, len, t, &info); |
0d1ed596 NTND |
1660 | trace_performance_leave("traverse_trees"); |
1661 | if (ret < 0) | |
da165f47 | 1662 | goto return_failed; |
16da134b JS |
1663 | } |
1664 | ||
01904572 LT |
1665 | /* Any left-over entries in the index? */ |
1666 | if (o->merge) { | |
da165f47 JH |
1667 | while (1) { |
1668 | struct cache_entry *ce = next_cache_entry(o); | |
1669 | if (!ce) | |
1670 | break; | |
01904572 | 1671 | if (unpack_index_entry(ce, o) < 0) |
da165f47 | 1672 | goto return_failed; |
17e46426 | 1673 | } |
17e46426 | 1674 | } |
da165f47 | 1675 | mark_all_ce_unused(o->src_index); |
16da134b | 1676 | |
08aefc9e NTND |
1677 | if (o->trivial_merges_only && o->nontrivial_merge) { |
1678 | ret = unpack_failed(o, "Merge requires file-level merging"); | |
1679 | goto done; | |
1680 | } | |
01904572 | 1681 | |
e800ec9d | 1682 | if (!o->skip_sparse_checkout) { |
2431afbf NTND |
1683 | /* |
1684 | * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1 | |
031ba55b | 1685 | * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE |
2431afbf NTND |
1686 | * so apply_sparse_checkout() won't attempt to remove it from worktree |
1687 | */ | |
4dcd4def DS |
1688 | mark_new_skip_worktree(o->pl, &o->result, |
1689 | CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE, | |
1690 | o->verbose_update); | |
2431afbf | 1691 | |
17d26a4d | 1692 | ret = 0; |
2431afbf | 1693 | for (i = 0; i < o->result.cache_nr; i++) { |
e800ec9d NTND |
1694 | struct cache_entry *ce = o->result.cache[i]; |
1695 | ||
2431afbf NTND |
1696 | /* |
1697 | * Entries marked with CE_ADDED in merged_entry() do not have | |
1698 | * verify_absent() check (the check is effectively disabled | |
1699 | * because CE_NEW_SKIP_WORKTREE is set unconditionally). | |
1700 | * | |
1701 | * Do the real check now because we have had | |
1702 | * correct CE_NEW_SKIP_WORKTREE | |
1703 | */ | |
1704 | if (ce->ce_flags & CE_ADDED && | |
681c637b EN |
1705 | verify_absent(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) |
1706 | ret = 1; | |
1707 | ||
1708 | if (apply_sparse_checkout(&o->result, ce, o)) | |
1709 | ret = 1; | |
9e1afb16 | 1710 | } |
681c637b EN |
1711 | if (ret == 1) { |
1712 | /* | |
1713 | * Inability to sparsify or de-sparsify individual | |
1714 | * paths is not an error, but just a warning. | |
1715 | */ | |
1716 | if (o->show_all_errors) | |
1717 | display_warning_msgs(o); | |
1718 | ret = 0; | |
1719 | } | |
e800ec9d | 1720 | } |
01904572 | 1721 | |
b0a5a12a | 1722 | ret = check_updates(o, &o->result) ? (-2) : 0; |
e28f7641 | 1723 | if (o->dst_index) { |
836ef2b6 | 1724 | move_index_extensions(&o->result, o->src_index); |
52fca218 | 1725 | if (!ret) { |
4592e608 | 1726 | if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0)) |
c207e9e1 | 1727 | cache_tree_verify(the_repository, &o->result); |
52fca218 BD |
1728 | if (!o->result.cache_tree) |
1729 | o->result.cache_tree = cache_tree(); | |
1730 | if (!cache_tree_fully_valid(o->result.cache_tree)) | |
1731 | cache_tree_update(&o->result, | |
1732 | WRITE_TREE_SILENT | | |
1733 | WRITE_TREE_REPAIR); | |
1734 | } | |
1956ecd0 BP |
1735 | |
1736 | o->result.updated_workdir = 1; | |
e28f7641 | 1737 | discard_index(o->dst_index); |
34110cd4 | 1738 | *o->dst_index = o->result; |
a16cc8b2 JH |
1739 | } else { |
1740 | discard_index(&o->result); | |
e28f7641 | 1741 | } |
7db11830 | 1742 | o->src_index = NULL; |
08aefc9e NTND |
1743 | |
1744 | done: | |
fa0bde45 | 1745 | if (free_pattern_list) |
e091228e | 1746 | clear_pattern_list(&pl); |
fa0bde45 | 1747 | trace_performance_leave("unpack_trees"); |
2e2b887d | 1748 | return ret; |
da165f47 JH |
1749 | |
1750 | return_failed: | |
e6c111b4 MM |
1751 | if (o->show_all_errors) |
1752 | display_error_msgs(o); | |
da165f47 | 1753 | mark_all_ce_unused(o->src_index); |
026680f8 | 1754 | ret = unpack_failed(o, NULL); |
b4194828 JH |
1755 | if (o->exiting_early) |
1756 | ret = 0; | |
026680f8 | 1757 | goto done; |
16da134b | 1758 | } |
076b0adc | 1759 | |
7af7a258 EN |
1760 | /* |
1761 | * Update SKIP_WORKTREE bits according to sparsity patterns, and update | |
1762 | * working directory to match. | |
1763 | * | |
1764 | * CE_NEW_SKIP_WORKTREE is used internally. | |
1765 | */ | |
1766 | enum update_sparsity_result update_sparsity(struct unpack_trees_options *o) | |
1767 | { | |
1768 | enum update_sparsity_result ret = UPDATE_SPARSITY_SUCCESS; | |
1769 | struct pattern_list pl; | |
ace224ac | 1770 | int i; |
7af7a258 EN |
1771 | unsigned old_show_all_errors; |
1772 | int free_pattern_list = 0; | |
1773 | ||
1774 | old_show_all_errors = o->show_all_errors; | |
1775 | o->show_all_errors = 1; | |
1776 | ||
1777 | /* Sanity checks */ | |
1778 | if (!o->update || o->index_only || o->skip_sparse_checkout) | |
1779 | BUG("update_sparsity() is for reflecting sparsity patterns in working directory"); | |
1780 | if (o->src_index != o->dst_index || o->fn) | |
1781 | BUG("update_sparsity() called wrong"); | |
1782 | ||
1783 | trace_performance_enter(); | |
1784 | ||
1785 | /* If we weren't given patterns, use the recorded ones */ | |
1786 | if (!o->pl) { | |
1787 | memset(&pl, 0, sizeof(pl)); | |
1788 | free_pattern_list = 1; | |
1789 | populate_from_existing_patterns(o, &pl); | |
1790 | if (o->skip_sparse_checkout) | |
1791 | goto skip_sparse_checkout; | |
1792 | } | |
1793 | ||
1794 | /* Set NEW_SKIP_WORKTREE on existing entries. */ | |
1795 | mark_all_ce_unused(o->src_index); | |
1796 | mark_new_skip_worktree(o->pl, o->src_index, 0, | |
1797 | CE_NEW_SKIP_WORKTREE, o->verbose_update); | |
1798 | ||
1799 | /* Then loop over entries and update/remove as needed */ | |
1800 | ret = UPDATE_SPARSITY_SUCCESS; | |
7af7a258 EN |
1801 | for (i = 0; i < o->src_index->cache_nr; i++) { |
1802 | struct cache_entry *ce = o->src_index->cache[i]; | |
1803 | ||
ebb568b9 EN |
1804 | |
1805 | if (ce_stage(ce)) { | |
1806 | /* -1 because for loop will increment by 1 */ | |
1807 | i += warn_conflicted_path(o->src_index, i, o) - 1; | |
1808 | ret = UPDATE_SPARSITY_WARNINGS; | |
1809 | continue; | |
1810 | } | |
1811 | ||
7af7a258 EN |
1812 | if (apply_sparse_checkout(o->src_index, ce, o)) |
1813 | ret = UPDATE_SPARSITY_WARNINGS; | |
7af7a258 EN |
1814 | } |
1815 | ||
1816 | skip_sparse_checkout: | |
1817 | if (check_updates(o, o->src_index)) | |
1818 | ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES; | |
1819 | ||
6271d77c | 1820 | display_warning_msgs(o); |
7af7a258 EN |
1821 | o->show_all_errors = old_show_all_errors; |
1822 | if (free_pattern_list) | |
1823 | clear_pattern_list(&pl); | |
1824 | trace_performance_leave("update_sparsity"); | |
1825 | return ret; | |
1826 | } | |
1827 | ||
076b0adc JS |
1828 | /* Here come the merge functions */ |
1829 | ||
eb9ae4b5 RS |
1830 | static int reject_merge(const struct cache_entry *ce, |
1831 | struct unpack_trees_options *o) | |
076b0adc | 1832 | { |
191e9d2c | 1833 | return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name); |
076b0adc JS |
1834 | } |
1835 | ||
eb9ae4b5 | 1836 | static int same(const struct cache_entry *a, const struct cache_entry *b) |
076b0adc JS |
1837 | { |
1838 | if (!!a != !!b) | |
1839 | return 0; | |
1840 | if (!a && !b) | |
1841 | return 1; | |
e11d7b59 JH |
1842 | if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED) |
1843 | return 0; | |
076b0adc | 1844 | return a->ce_mode == b->ce_mode && |
4a7e27e9 | 1845 | oideq(&a->oid, &b->oid); |
076b0adc JS |
1846 | } |
1847 | ||
1848 | ||
1849 | /* | |
1850 | * When a CE gets turned into an unmerged entry, we | |
1851 | * want it to be up-to-date | |
1852 | */ | |
eb9ae4b5 RS |
1853 | static int verify_uptodate_1(const struct cache_entry *ce, |
1854 | struct unpack_trees_options *o, | |
1855 | enum unpack_trees_error_types error_type) | |
076b0adc JS |
1856 | { |
1857 | struct stat st; | |
1858 | ||
d5b66299 NTND |
1859 | if (o->index_only) |
1860 | return 0; | |
1861 | ||
1862 | /* | |
1863 | * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again | |
1864 | * if this entry is truly up-to-date because this file may be | |
1865 | * overwritten. | |
1866 | */ | |
1867 | if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) | |
1868 | ; /* keep checking */ | |
1869 | else if (o->reset || ce_uptodate(ce)) | |
203a2fe1 | 1870 | return 0; |
076b0adc JS |
1871 | |
1872 | if (!lstat(ce->name, &st)) { | |
d5b66299 NTND |
1873 | int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE; |
1874 | unsigned changed = ie_match_stat(o->src_index, ce, &st, flags); | |
a7bc845a SB |
1875 | |
1876 | if (submodule_from_ce(ce)) { | |
1877 | int r = check_submodule_move_head(ce, | |
1878 | "HEAD", oid_to_hex(&ce->oid), o); | |
1879 | if (r) | |
191e9d2c | 1880 | return add_rejected_path(o, error_type, ce->name); |
a7bc845a SB |
1881 | return 0; |
1882 | } | |
1883 | ||
076b0adc | 1884 | if (!changed) |
203a2fe1 | 1885 | return 0; |
936492d3 | 1886 | /* |
a7bc845a SB |
1887 | * Historic default policy was to allow submodule to be out |
1888 | * of sync wrt the superproject index. If the submodule was | |
1889 | * not considered interesting above, we don't care here. | |
936492d3 | 1890 | */ |
7a51ed66 | 1891 | if (S_ISGITLINK(ce->ce_mode)) |
203a2fe1 | 1892 | return 0; |
a7bc845a | 1893 | |
076b0adc JS |
1894 | errno = 0; |
1895 | } | |
076b0adc | 1896 | if (errno == ENOENT) |
203a2fe1 | 1897 | return 0; |
191e9d2c | 1898 | return add_rejected_path(o, error_type, ce->name); |
35a5aa79 NTND |
1899 | } |
1900 | ||
64b1abe9 EN |
1901 | int verify_uptodate(const struct cache_entry *ce, |
1902 | struct unpack_trees_options *o) | |
35a5aa79 | 1903 | { |
2431afbf | 1904 | if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) |
f1f523ea | 1905 | return 0; |
08402b04 | 1906 | return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE); |
076b0adc JS |
1907 | } |
1908 | ||
eb9ae4b5 | 1909 | static int verify_uptodate_sparse(const struct cache_entry *ce, |
e800ec9d NTND |
1910 | struct unpack_trees_options *o) |
1911 | { | |
1ac83f42 | 1912 | return verify_uptodate_1(ce, o, WARNING_SPARSE_NOT_UPTODATE_FILE); |
076b0adc JS |
1913 | } |
1914 | ||
383480ba NTND |
1915 | /* |
1916 | * TODO: We should actually invalidate o->result, not src_index [1]. | |
1917 | * But since cache tree and untracked cache both are not copied to | |
1918 | * o->result until unpacking is complete, we invalidate them on | |
1919 | * src_index instead with the assumption that they will be copied to | |
1920 | * dst_index at the end. | |
1921 | * | |
1922 | * [1] src_index->cache_tree is also used in unpack_callback() so if | |
1923 | * we invalidate o->result, we need to update it to use | |
1924 | * o->result.cache_tree as well. | |
1925 | */ | |
eb9ae4b5 RS |
1926 | static void invalidate_ce_path(const struct cache_entry *ce, |
1927 | struct unpack_trees_options *o) | |
076b0adc | 1928 | { |
e931371a NTND |
1929 | if (!ce) |
1930 | return; | |
1931 | cache_tree_invalidate_path(o->src_index, ce->name); | |
0cacebf0 | 1932 | untracked_cache_invalidate_path(o->src_index, ce->name, 1); |
076b0adc JS |
1933 | } |
1934 | ||
0cf73755 SV |
1935 | /* |
1936 | * Check that checking out ce->sha1 in subdir ce->name is not | |
1937 | * going to overwrite any working files. | |
0cf73755 | 1938 | */ |
d6b12300 SB |
1939 | static int verify_clean_submodule(const char *old_sha1, |
1940 | const struct cache_entry *ce, | |
eb9ae4b5 | 1941 | struct unpack_trees_options *o) |
0cf73755 | 1942 | { |
a7bc845a SB |
1943 | if (!submodule_from_ce(ce)) |
1944 | return 0; | |
1945 | ||
1946 | return check_submodule_move_head(ce, old_sha1, | |
1947 | oid_to_hex(&ce->oid), o); | |
0cf73755 SV |
1948 | } |
1949 | ||
eb9ae4b5 | 1950 | static int verify_clean_subdirectory(const struct cache_entry *ce, |
eb9ae4b5 | 1951 | struct unpack_trees_options *o) |
c8193534 JH |
1952 | { |
1953 | /* | |
0cf73755 | 1954 | * we are about to extract "ce->name"; we would not want to lose |
c8193534 JH |
1955 | * anything in the existing directory there. |
1956 | */ | |
1957 | int namelen; | |
7b9e3ce0 | 1958 | int i; |
c8193534 JH |
1959 | struct dir_struct d; |
1960 | char *pathbuf; | |
1961 | int cnt = 0; | |
0cf73755 | 1962 | |
d6b12300 | 1963 | if (S_ISGITLINK(ce->ce_mode)) { |
1053fe82 | 1964 | struct object_id oid; |
a98e6101 | 1965 | int sub_head = resolve_gitlink_ref(ce->name, "HEAD", &oid); |
d6b12300 SB |
1966 | /* |
1967 | * If we are not going to update the submodule, then | |
0cf73755 SV |
1968 | * we don't care. |
1969 | */ | |
4a7e27e9 | 1970 | if (!sub_head && oideq(&oid, &ce->oid)) |
0cf73755 | 1971 | return 0; |
1053fe82 | 1972 | return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid), |
df351c6e | 1973 | ce, o); |
0cf73755 | 1974 | } |
c8193534 JH |
1975 | |
1976 | /* | |
1977 | * First let's make sure we do not have a local modification | |
1978 | * in that directory. | |
1979 | */ | |
68c4f6a5 | 1980 | namelen = ce_namelen(ce); |
da165f47 JH |
1981 | for (i = locate_in_src_index(ce, o); |
1982 | i < o->src_index->cache_nr; | |
1983 | i++) { | |
837e5fe9 CB |
1984 | struct cache_entry *ce2 = o->src_index->cache[i]; |
1985 | int len = ce_namelen(ce2); | |
c8193534 | 1986 | if (len < namelen || |
837e5fe9 CB |
1987 | strncmp(ce->name, ce2->name, namelen) || |
1988 | ce2->name[namelen] != '/') | |
c8193534 JH |
1989 | break; |
1990 | /* | |
da165f47 JH |
1991 | * ce2->name is an entry in the subdirectory to be |
1992 | * removed. | |
c8193534 | 1993 | */ |
837e5fe9 CB |
1994 | if (!ce_stage(ce2)) { |
1995 | if (verify_uptodate(ce2, o)) | |
203a2fe1 | 1996 | return -1; |
837e5fe9 | 1997 | add_entry(o, ce2, CE_REMOVE, 0); |
5697ca9a | 1998 | invalidate_ce_path(ce, o); |
da165f47 | 1999 | mark_ce_used(ce2, o); |
c8193534 JH |
2000 | } |
2001 | cnt++; | |
2002 | } | |
2003 | ||
2004 | /* | |
2005 | * Then we need to make sure that we do not lose a locally | |
2006 | * present file that is not ignored. | |
2007 | */ | |
75faa45a | 2008 | pathbuf = xstrfmt("%.*s/", namelen, ce->name); |
c8193534 JH |
2009 | |
2010 | memset(&d, 0, sizeof(d)); | |
2011 | if (o->dir) | |
2012 | d.exclude_per_dir = o->dir->exclude_per_dir; | |
c7f3259d | 2013 | i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL); |
c8193534 | 2014 | if (i) |
191e9d2c | 2015 | return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name); |
c8193534 JH |
2016 | free(pathbuf); |
2017 | return cnt; | |
2018 | } | |
2019 | ||
32260ad5 LT |
2020 | /* |
2021 | * This gets called when there was no index entry for the tree entry 'dst', | |
2022 | * but we found a file in the working tree that 'lstat()' said was fine, | |
2023 | * and we're on a case-insensitive filesystem. | |
2024 | * | |
2025 | * See if we can find a case-insensitive match in the index that also | |
2026 | * matches the stat information, and assume it's that other file! | |
2027 | */ | |
a9307f5a | 2028 | static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st) |
32260ad5 | 2029 | { |
9c5e6c80 | 2030 | const struct cache_entry *src; |
32260ad5 | 2031 | |
ebbd7439 | 2032 | src = index_file_exists(o->src_index, name, len, 1); |
56cac48c | 2033 | return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); |
32260ad5 LT |
2034 | } |
2035 | ||
a9307f5a | 2036 | static int check_ok_to_remove(const char *name, int len, int dtype, |
eb9ae4b5 | 2037 | const struct cache_entry *ce, struct stat *st, |
a9307f5a CB |
2038 | enum unpack_trees_error_types error_type, |
2039 | struct unpack_trees_options *o) | |
2040 | { | |
9c5e6c80 | 2041 | const struct cache_entry *result; |
a9307f5a CB |
2042 | |
2043 | /* | |
2044 | * It may be that the 'lstat()' succeeded even though | |
2045 | * target 'ce' was absent, because there is an old | |
2046 | * entry that is different only in case.. | |
2047 | * | |
2048 | * Ignore that lstat() if it matches. | |
2049 | */ | |
2050 | if (ignore_case && icase_exists(o, name, len, st)) | |
2051 | return 0; | |
2052 | ||
589570db | 2053 | if (o->dir && |
c7f3259d | 2054 | is_excluded(o->dir, o->src_index, name, &dtype)) |
a9307f5a CB |
2055 | /* |
2056 | * ce->name is explicitly excluded, so it is Ok to | |
2057 | * overwrite it. | |
2058 | */ | |
2059 | return 0; | |
2060 | if (S_ISDIR(st->st_mode)) { | |
2061 | /* | |
2062 | * We are checking out path "foo" and | |
2063 | * found "foo/." in the working tree. | |
2064 | * This is tricky -- if we have modified | |
2065 | * files that are in "foo/" we would lose | |
2066 | * them. | |
2067 | */ | |
df351c6e | 2068 | if (verify_clean_subdirectory(ce, o) < 0) |
a9307f5a CB |
2069 | return -1; |
2070 | return 0; | |
2071 | } | |
2072 | ||
2073 | /* | |
2074 | * The previous round may already have decided to | |
2075 | * delete this path, which is in a subdirectory that | |
2076 | * is being replaced with a blob. | |
2077 | */ | |
ebbd7439 | 2078 | result = index_file_exists(&o->result, name, len, 0); |
a9307f5a CB |
2079 | if (result) { |
2080 | if (result->ce_flags & CE_REMOVE) | |
2081 | return 0; | |
2082 | } | |
2083 | ||
191e9d2c | 2084 | return add_rejected_path(o, error_type, name); |
a9307f5a CB |
2085 | } |
2086 | ||
076b0adc JS |
2087 | /* |
2088 | * We do not want to remove or overwrite a working tree file that | |
f8a9d428 | 2089 | * is not tracked, unless it is ignored. |
076b0adc | 2090 | */ |
eb9ae4b5 RS |
2091 | static int verify_absent_1(const struct cache_entry *ce, |
2092 | enum unpack_trees_error_types error_type, | |
2093 | struct unpack_trees_options *o) | |
076b0adc | 2094 | { |
f66caaf9 | 2095 | int len; |
076b0adc JS |
2096 | struct stat st; |
2097 | ||
2098 | if (o->index_only || o->reset || !o->update) | |
203a2fe1 | 2099 | return 0; |
c8193534 | 2100 | |
f66caaf9 CB |
2101 | len = check_leading_path(ce->name, ce_namelen(ce)); |
2102 | if (!len) | |
203a2fe1 | 2103 | return 0; |
f66caaf9 | 2104 | else if (len > 0) { |
f514ef97 JK |
2105 | char *path; |
2106 | int ret; | |
2107 | ||
2108 | path = xmemdupz(ce->name, len); | |
a93e5301 | 2109 | if (lstat(path, &st)) |
43c728e2 | 2110 | ret = error_errno("cannot stat '%s'", path); |
a7bc845a SB |
2111 | else { |
2112 | if (submodule_from_ce(ce)) | |
2113 | ret = check_submodule_move_head(ce, | |
2114 | oid_to_hex(&ce->oid), | |
2115 | NULL, o); | |
2116 | else | |
2117 | ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL, | |
2118 | &st, error_type, o); | |
2119 | } | |
f514ef97 JK |
2120 | free(path); |
2121 | return ret; | |
92fda79e JN |
2122 | } else if (lstat(ce->name, &st)) { |
2123 | if (errno != ENOENT) | |
43c728e2 | 2124 | return error_errno("cannot stat '%s'", ce->name); |
92fda79e JN |
2125 | return 0; |
2126 | } else { | |
a7bc845a SB |
2127 | if (submodule_from_ce(ce)) |
2128 | return check_submodule_move_head(ce, oid_to_hex(&ce->oid), | |
2129 | NULL, o); | |
2130 | ||
a9307f5a | 2131 | return check_ok_to_remove(ce->name, ce_namelen(ce), |
92fda79e JN |
2132 | ce_to_dtype(ce), ce, &st, |
2133 | error_type, o); | |
2134 | } | |
076b0adc | 2135 | } |
a9307f5a | 2136 | |
eb9ae4b5 | 2137 | static int verify_absent(const struct cache_entry *ce, |
08402b04 | 2138 | enum unpack_trees_error_types error_type, |
35a5aa79 NTND |
2139 | struct unpack_trees_options *o) |
2140 | { | |
2431afbf | 2141 | if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) |
f1f523ea | 2142 | return 0; |
08402b04 | 2143 | return verify_absent_1(ce, error_type, o); |
35a5aa79 | 2144 | } |
076b0adc | 2145 | |
eb9ae4b5 RS |
2146 | static int verify_absent_sparse(const struct cache_entry *ce, |
2147 | enum unpack_trees_error_types error_type, | |
2148 | struct unpack_trees_options *o) | |
e800ec9d | 2149 | { |
d61633ae | 2150 | return verify_absent_1(ce, error_type, o); |
e800ec9d | 2151 | } |
076b0adc | 2152 | |
f2fa3542 | 2153 | static int merged_entry(const struct cache_entry *ce, |
eb9ae4b5 | 2154 | const struct cache_entry *old, |
f2fa3542 | 2155 | struct unpack_trees_options *o) |
076b0adc | 2156 | { |
7f8ab8dc | 2157 | int update = CE_UPDATE; |
8e72d675 | 2158 | struct cache_entry *merge = dup_cache_entry(ce, &o->result); |
7f8ab8dc | 2159 | |
e11d7b59 | 2160 | if (!old) { |
2431afbf NTND |
2161 | /* |
2162 | * New index entries. In sparse checkout, the following | |
2163 | * verify_absent() will be delayed until after | |
2164 | * traverse_trees() finishes in unpack_trees(), then: | |
2165 | * | |
2166 | * - CE_NEW_SKIP_WORKTREE will be computed correctly | |
2167 | * - verify_absent() be called again, this time with | |
2168 | * correct CE_NEW_SKIP_WORKTREE | |
2169 | * | |
2170 | * verify_absent() call here does nothing in sparse | |
2171 | * checkout (i.e. o->skip_sparse_checkout == 0) | |
2172 | */ | |
2173 | update |= CE_ADDED; | |
2174 | merge->ce_flags |= CE_NEW_SKIP_WORKTREE; | |
2175 | ||
f2fa3542 RS |
2176 | if (verify_absent(merge, |
2177 | ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) { | |
a849735b | 2178 | discard_cache_entry(merge); |
e11d7b59 | 2179 | return -1; |
f2fa3542 | 2180 | } |
e11d7b59 | 2181 | invalidate_ce_path(merge, o); |
a7bc845a | 2182 | |
e84704f1 | 2183 | if (submodule_from_ce(ce) && file_exists(ce->name)) { |
a7bc845a SB |
2184 | int ret = check_submodule_move_head(ce, NULL, |
2185 | oid_to_hex(&ce->oid), | |
2186 | o); | |
2187 | if (ret) | |
2188 | return ret; | |
2189 | } | |
2190 | ||
e11d7b59 | 2191 | } else if (!(old->ce_flags & CE_CONFLICTED)) { |
076b0adc JS |
2192 | /* |
2193 | * See if we can re-use the old CE directly? | |
2194 | * That way we get the uptodate stat info. | |
2195 | * | |
7f8ab8dc LT |
2196 | * This also removes the UPDATE flag on a match; otherwise |
2197 | * we will end up overwriting local changes in the work tree. | |
076b0adc JS |
2198 | */ |
2199 | if (same(old, merge)) { | |
eb7a2f1d | 2200 | copy_cache_entry(merge, old); |
7f8ab8dc | 2201 | update = 0; |
076b0adc | 2202 | } else { |
f2fa3542 | 2203 | if (verify_uptodate(old, o)) { |
a849735b | 2204 | discard_cache_entry(merge); |
203a2fe1 | 2205 | return -1; |
f2fa3542 | 2206 | } |
2431afbf NTND |
2207 | /* Migrate old flags over */ |
2208 | update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); | |
bc052d7f | 2209 | invalidate_ce_path(old, o); |
076b0adc | 2210 | } |
a7bc845a | 2211 | |
e84704f1 | 2212 | if (submodule_from_ce(ce) && file_exists(ce->name)) { |
a7bc845a SB |
2213 | int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid), |
2214 | oid_to_hex(&ce->oid), | |
2215 | o); | |
2216 | if (ret) | |
2217 | return ret; | |
2218 | } | |
e11d7b59 JH |
2219 | } else { |
2220 | /* | |
2221 | * Previously unmerged entry left as an existence | |
2222 | * marker by read_index_unmerged(); | |
2223 | */ | |
2224 | invalidate_ce_path(old, o); | |
076b0adc JS |
2225 | } |
2226 | ||
cc756edd JS |
2227 | if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0) |
2228 | return -1; | |
076b0adc JS |
2229 | return 1; |
2230 | } | |
2231 | ||
eb9ae4b5 RS |
2232 | static int deleted_entry(const struct cache_entry *ce, |
2233 | const struct cache_entry *old, | |
2234 | struct unpack_trees_options *o) | |
076b0adc | 2235 | { |
34110cd4 LT |
2236 | /* Did it exist in the index? */ |
2237 | if (!old) { | |
08402b04 | 2238 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
203a2fe1 | 2239 | return -1; |
34110cd4 LT |
2240 | return 0; |
2241 | } | |
e11d7b59 | 2242 | if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o)) |
34110cd4 LT |
2243 | return -1; |
2244 | add_entry(o, ce, CE_REMOVE, 0); | |
bc052d7f | 2245 | invalidate_ce_path(ce, o); |
076b0adc JS |
2246 | return 1; |
2247 | } | |
2248 | ||
eb9ae4b5 RS |
2249 | static int keep_entry(const struct cache_entry *ce, |
2250 | struct unpack_trees_options *o) | |
076b0adc | 2251 | { |
34110cd4 | 2252 | add_entry(o, ce, 0, 0); |
5697ca9a NTND |
2253 | if (ce_stage(ce)) |
2254 | invalidate_ce_path(ce, o); | |
076b0adc JS |
2255 | return 1; |
2256 | } | |
2257 | ||
2258 | #if DBRT_DEBUG | |
2259 | static void show_stage_entry(FILE *o, | |
2260 | const char *label, const struct cache_entry *ce) | |
2261 | { | |
2262 | if (!ce) | |
2263 | fprintf(o, "%s (missing)\n", label); | |
2264 | else | |
2265 | fprintf(o, "%s%06o %s %d\t%s\n", | |
2266 | label, | |
7a51ed66 | 2267 | ce->ce_mode, |
99d1a986 | 2268 | oid_to_hex(&ce->oid), |
076b0adc JS |
2269 | ce_stage(ce), |
2270 | ce->name); | |
2271 | } | |
2272 | #endif | |
2273 | ||
5828e835 RS |
2274 | int threeway_merge(const struct cache_entry * const *stages, |
2275 | struct unpack_trees_options *o) | |
076b0adc | 2276 | { |
eb9ae4b5 RS |
2277 | const struct cache_entry *index; |
2278 | const struct cache_entry *head; | |
2279 | const struct cache_entry *remote = stages[o->head_idx + 1]; | |
076b0adc JS |
2280 | int count; |
2281 | int head_match = 0; | |
2282 | int remote_match = 0; | |
076b0adc JS |
2283 | |
2284 | int df_conflict_head = 0; | |
2285 | int df_conflict_remote = 0; | |
2286 | ||
2287 | int any_anc_missing = 0; | |
2288 | int no_anc_exists = 1; | |
2289 | int i; | |
2290 | ||
2291 | for (i = 1; i < o->head_idx; i++) { | |
4c4caafc | 2292 | if (!stages[i] || stages[i] == o->df_conflict_entry) |
076b0adc | 2293 | any_anc_missing = 1; |
4c4caafc | 2294 | else |
076b0adc | 2295 | no_anc_exists = 0; |
076b0adc JS |
2296 | } |
2297 | ||
2298 | index = stages[0]; | |
2299 | head = stages[o->head_idx]; | |
2300 | ||
2301 | if (head == o->df_conflict_entry) { | |
2302 | df_conflict_head = 1; | |
2303 | head = NULL; | |
2304 | } | |
2305 | ||
2306 | if (remote == o->df_conflict_entry) { | |
2307 | df_conflict_remote = 1; | |
2308 | remote = NULL; | |
2309 | } | |
2310 | ||
cee2d6ae JH |
2311 | /* |
2312 | * First, if there's a #16 situation, note that to prevent #13 | |
076b0adc JS |
2313 | * and #14. |
2314 | */ | |
2315 | if (!same(remote, head)) { | |
2316 | for (i = 1; i < o->head_idx; i++) { | |
2317 | if (same(stages[i], head)) { | |
2318 | head_match = i; | |
2319 | } | |
2320 | if (same(stages[i], remote)) { | |
2321 | remote_match = i; | |
2322 | } | |
2323 | } | |
2324 | } | |
2325 | ||
cee2d6ae JH |
2326 | /* |
2327 | * We start with cases where the index is allowed to match | |
076b0adc JS |
2328 | * something other than the head: #14(ALT) and #2ALT, where it |
2329 | * is permitted to match the result instead. | |
2330 | */ | |
2331 | /* #14, #14ALT, #2ALT */ | |
2332 | if (remote && !df_conflict_head && head_match && !remote_match) { | |
2333 | if (index && !same(index, remote) && !same(index, head)) | |
6a143aa2 | 2334 | return reject_merge(index, o); |
076b0adc JS |
2335 | return merged_entry(remote, index, o); |
2336 | } | |
2337 | /* | |
2338 | * If we have an entry in the index cache, then we want to | |
2339 | * make sure that it matches head. | |
2340 | */ | |
4e7c4571 | 2341 | if (index && !same(index, head)) |
6a143aa2 | 2342 | return reject_merge(index, o); |
076b0adc JS |
2343 | |
2344 | if (head) { | |
2345 | /* #5ALT, #15 */ | |
2346 | if (same(head, remote)) | |
2347 | return merged_entry(head, index, o); | |
2348 | /* #13, #3ALT */ | |
2349 | if (!df_conflict_remote && remote_match && !head_match) | |
2350 | return merged_entry(head, index, o); | |
2351 | } | |
2352 | ||
2353 | /* #1 */ | |
34110cd4 | 2354 | if (!head && !remote && any_anc_missing) |
076b0adc JS |
2355 | return 0; |
2356 | ||
cee2d6ae JH |
2357 | /* |
2358 | * Under the "aggressive" rule, we resolve mostly trivial | |
076b0adc JS |
2359 | * cases that we historically had git-merge-one-file resolve. |
2360 | */ | |
2361 | if (o->aggressive) { | |
cee2d6ae JH |
2362 | int head_deleted = !head; |
2363 | int remote_deleted = !remote; | |
eb9ae4b5 | 2364 | const struct cache_entry *ce = NULL; |
4c4caafc JH |
2365 | |
2366 | if (index) | |
0cf73755 | 2367 | ce = index; |
4c4caafc | 2368 | else if (head) |
0cf73755 | 2369 | ce = head; |
4c4caafc | 2370 | else if (remote) |
0cf73755 | 2371 | ce = remote; |
4c4caafc JH |
2372 | else { |
2373 | for (i = 1; i < o->head_idx; i++) { | |
2374 | if (stages[i] && stages[i] != o->df_conflict_entry) { | |
0cf73755 | 2375 | ce = stages[i]; |
4c4caafc JH |
2376 | break; |
2377 | } | |
2378 | } | |
2379 | } | |
2380 | ||
076b0adc JS |
2381 | /* |
2382 | * Deleted in both. | |
2383 | * Deleted in one and unchanged in the other. | |
2384 | */ | |
2385 | if ((head_deleted && remote_deleted) || | |
2386 | (head_deleted && remote && remote_match) || | |
2387 | (remote_deleted && head && head_match)) { | |
2388 | if (index) | |
2389 | return deleted_entry(index, index, o); | |
34110cd4 | 2390 | if (ce && !head_deleted) { |
08402b04 | 2391 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
203a2fe1 DB |
2392 | return -1; |
2393 | } | |
076b0adc JS |
2394 | return 0; |
2395 | } | |
2396 | /* | |
2397 | * Added in both, identically. | |
2398 | */ | |
2399 | if (no_anc_exists && head && remote && same(head, remote)) | |
2400 | return merged_entry(head, index, o); | |
2401 | ||
2402 | } | |
2403 | ||
2404 | /* Below are "no merge" cases, which require that the index be | |
2405 | * up-to-date to avoid the files getting overwritten with | |
2406 | * conflict resolution files. | |
2407 | */ | |
2408 | if (index) { | |
203a2fe1 DB |
2409 | if (verify_uptodate(index, o)) |
2410 | return -1; | |
076b0adc | 2411 | } |
076b0adc JS |
2412 | |
2413 | o->nontrivial_merge = 1; | |
2414 | ||
ea4b52a8 | 2415 | /* #2, #3, #4, #6, #7, #9, #10, #11. */ |
076b0adc JS |
2416 | count = 0; |
2417 | if (!head_match || !remote_match) { | |
2418 | for (i = 1; i < o->head_idx; i++) { | |
4c4caafc | 2419 | if (stages[i] && stages[i] != o->df_conflict_entry) { |
7f7932ab | 2420 | keep_entry(stages[i], o); |
076b0adc JS |
2421 | count++; |
2422 | break; | |
2423 | } | |
2424 | } | |
2425 | } | |
2426 | #if DBRT_DEBUG | |
2427 | else { | |
2428 | fprintf(stderr, "read-tree: warning #16 detected\n"); | |
2429 | show_stage_entry(stderr, "head ", stages[head_match]); | |
2430 | show_stage_entry(stderr, "remote ", stages[remote_match]); | |
2431 | } | |
2432 | #endif | |
7f7932ab JH |
2433 | if (head) { count += keep_entry(head, o); } |
2434 | if (remote) { count += keep_entry(remote, o); } | |
076b0adc JS |
2435 | return count; |
2436 | } | |
2437 | ||
2438 | /* | |
2439 | * Two-way merge. | |
2440 | * | |
2441 | * The rule is to "carry forward" what is in the index without losing | |
a75d7b54 | 2442 | * information across a "fast-forward", favoring a successful merge |
076b0adc JS |
2443 | * over a merge failure when it makes sense. For details of the |
2444 | * "carry forward" rule, please see <Documentation/git-read-tree.txt>. | |
2445 | * | |
2446 | */ | |
5828e835 RS |
2447 | int twoway_merge(const struct cache_entry * const *src, |
2448 | struct unpack_trees_options *o) | |
076b0adc | 2449 | { |
eb9ae4b5 RS |
2450 | const struct cache_entry *current = src[0]; |
2451 | const struct cache_entry *oldtree = src[1]; | |
2452 | const struct cache_entry *newtree = src[2]; | |
076b0adc JS |
2453 | |
2454 | if (o->merge_size != 2) | |
2455 | return error("Cannot do a twoway merge of %d trees", | |
2456 | o->merge_size); | |
2457 | ||
b8ba1535 JH |
2458 | if (oldtree == o->df_conflict_entry) |
2459 | oldtree = NULL; | |
2460 | if (newtree == o->df_conflict_entry) | |
2461 | newtree = NULL; | |
2462 | ||
076b0adc | 2463 | if (current) { |
b018ff60 JK |
2464 | if (current->ce_flags & CE_CONFLICTED) { |
2465 | if (same(oldtree, newtree) || o->reset) { | |
2466 | if (!newtree) | |
2467 | return deleted_entry(current, current, o); | |
2468 | else | |
2469 | return merged_entry(newtree, current, o); | |
2470 | } | |
6a143aa2 | 2471 | return reject_merge(current, o); |
6c1db1b3 | 2472 | } else if ((!oldtree && !newtree) || /* 4 and 5 */ |
b018ff60 JK |
2473 | (!oldtree && newtree && |
2474 | same(current, newtree)) || /* 6 and 7 */ | |
2475 | (oldtree && newtree && | |
2476 | same(oldtree, newtree)) || /* 14 and 15 */ | |
2477 | (oldtree && newtree && | |
2478 | !same(oldtree, newtree) && /* 18 and 19 */ | |
2479 | same(current, newtree))) { | |
7f7932ab | 2480 | return keep_entry(current, o); |
6c1db1b3 | 2481 | } else if (oldtree && !newtree && same(current, oldtree)) { |
076b0adc JS |
2482 | /* 10 or 11 */ |
2483 | return deleted_entry(oldtree, current, o); | |
6c1db1b3 | 2484 | } else if (oldtree && newtree && |
076b0adc JS |
2485 | same(current, oldtree) && !same(current, newtree)) { |
2486 | /* 20 or 21 */ | |
2487 | return merged_entry(newtree, current, o); | |
6c1db1b3 | 2488 | } else |
6a143aa2 | 2489 | return reject_merge(current, o); |
076b0adc | 2490 | } |
55218834 JH |
2491 | else if (newtree) { |
2492 | if (oldtree && !o->initial_checkout) { | |
2493 | /* | |
2494 | * deletion of the path was staged; | |
2495 | */ | |
2496 | if (same(oldtree, newtree)) | |
2497 | return 1; | |
2498 | return reject_merge(oldtree, o); | |
2499 | } | |
076b0adc | 2500 | return merged_entry(newtree, current, o); |
55218834 | 2501 | } |
d699676d | 2502 | return deleted_entry(oldtree, current, o); |
076b0adc JS |
2503 | } |
2504 | ||
2505 | /* | |
2506 | * Bind merge. | |
2507 | * | |
2508 | * Keep the index entries at stage0, collapse stage1 but make sure | |
2509 | * stage0 does not have anything there. | |
2510 | */ | |
5828e835 RS |
2511 | int bind_merge(const struct cache_entry * const *src, |
2512 | struct unpack_trees_options *o) | |
076b0adc | 2513 | { |
eb9ae4b5 RS |
2514 | const struct cache_entry *old = src[0]; |
2515 | const struct cache_entry *a = src[1]; | |
076b0adc JS |
2516 | |
2517 | if (o->merge_size != 1) | |
82247e9b | 2518 | return error("Cannot do a bind merge of %d trees", |
076b0adc JS |
2519 | o->merge_size); |
2520 | if (a && old) | |
b165fac8 | 2521 | return o->quiet ? -1 : |
3d415425 SB |
2522 | error(ERRORMSG(o, ERROR_BIND_OVERLAP), |
2523 | super_prefixed(a->name), | |
2524 | super_prefixed(old->name)); | |
076b0adc | 2525 | if (!a) |
7f7932ab | 2526 | return keep_entry(old, o); |
076b0adc JS |
2527 | else |
2528 | return merged_entry(a, NULL, o); | |
2529 | } | |
2530 | ||
2531 | /* | |
2532 | * One-way merge. | |
2533 | * | |
2534 | * The rule is: | |
2535 | * - take the stat information from stage0, take the data from stage1 | |
2536 | */ | |
5828e835 RS |
2537 | int oneway_merge(const struct cache_entry * const *src, |
2538 | struct unpack_trees_options *o) | |
076b0adc | 2539 | { |
eb9ae4b5 RS |
2540 | const struct cache_entry *old = src[0]; |
2541 | const struct cache_entry *a = src[1]; | |
076b0adc JS |
2542 | |
2543 | if (o->merge_size != 1) | |
2544 | return error("Cannot do a oneway merge of %d trees", | |
2545 | o->merge_size); | |
2546 | ||
78d3b06e | 2547 | if (!a || a == o->df_conflict_entry) |
076b0adc | 2548 | return deleted_entry(old, old, o); |
34110cd4 | 2549 | |
076b0adc | 2550 | if (old && same(old, a)) { |
34110cd4 | 2551 | int update = 0; |
679f2f9f US |
2552 | if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old) && |
2553 | !(old->ce_flags & CE_FSMONITOR_VALID)) { | |
076b0adc JS |
2554 | struct stat st; |
2555 | if (lstat(old->name, &st) || | |
56cac48c | 2556 | ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) |
34110cd4 | 2557 | update |= CE_UPDATE; |
076b0adc | 2558 | } |
ad17312e SB |
2559 | if (o->update && S_ISGITLINK(old->ce_mode) && |
2560 | should_update_submodules() && !verify_uptodate(old, o)) | |
2561 | update |= CE_UPDATE; | |
ab5af825 | 2562 | add_entry(o, old, update, CE_STAGEMASK); |
34110cd4 | 2563 | return 0; |
076b0adc JS |
2564 | } |
2565 | return merged_entry(a, old, o); | |
2566 | } |