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