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