]>
Commit | Line | Data |
---|---|---|
bc052d7f | 1 | #define NO_THE_INDEX_COMPATIBILITY_MACROS |
16da134b | 2 | #include "cache.h" |
f8a9d428 | 3 | #include "dir.h" |
16da134b JS |
4 | #include "tree.h" |
5 | #include "tree-walk.h" | |
076b0adc | 6 | #include "cache-tree.h" |
16da134b | 7 | #include "unpack-trees.h" |
96a02f8f | 8 | #include "progress.h" |
0cf73755 | 9 | #include "refs.h" |
06f33c17 | 10 | #include "attr.h" |
16da134b | 11 | |
8ccba008 JH |
12 | /* |
13 | * Error messages expected by scripts out of plumbing commands such as | |
14 | * read-tree. Non-scripted Porcelain is not required to use these messages | |
15 | * and in fact are encouraged to reword them to better suit their particular | |
23cbf11b | 16 | * situation better. See how "git checkout" and "git merge" replaces |
dc1166e6 | 17 | * them using setup_unpack_trees_porcelain(), for example. |
8ccba008 | 18 | */ |
c2e86add | 19 | static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { |
08353ebb | 20 | /* ERROR_WOULD_OVERWRITE */ |
8ccba008 JH |
21 | "Entry '%s' would be overwritten by merge. Cannot merge.", |
22 | ||
08353ebb | 23 | /* ERROR_NOT_UPTODATE_FILE */ |
8ccba008 JH |
24 | "Entry '%s' not uptodate. Cannot merge.", |
25 | ||
08353ebb | 26 | /* ERROR_NOT_UPTODATE_DIR */ |
8ccba008 JH |
27 | "Updating '%s' would lose untracked files in it", |
28 | ||
08402b04 MM |
29 | /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ |
30 | "Untracked working tree file '%s' would be overwritten by merge.", | |
8ccba008 | 31 | |
08402b04 MM |
32 | /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ |
33 | "Untracked working tree file '%s' would be removed by merge.", | |
8ccba008 | 34 | |
08353ebb | 35 | /* ERROR_BIND_OVERLAP */ |
8ccba008 | 36 | "Entry '%s' overlaps with '%s'. Cannot bind.", |
e800ec9d | 37 | |
08353ebb | 38 | /* ERROR_SPARSE_NOT_UPTODATE_FILE */ |
e800ec9d NTND |
39 | "Entry '%s' not uptodate. Cannot update sparse checkout.", |
40 | ||
08402b04 MM |
41 | /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ |
42 | "Working tree file '%s' would be overwritten by sparse checkout update.", | |
43 | ||
44 | /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ | |
45 | "Working tree file '%s' would be removed by sparse checkout update.", | |
8ccba008 JH |
46 | }; |
47 | ||
08353ebb MM |
48 | #define ERRORMSG(o,type) \ |
49 | ( ((o) && (o)->msgs[(type)]) \ | |
50 | ? ((o)->msgs[(type)]) \ | |
51 | : (unpack_plumbing_errors[(type)]) ) | |
8ccba008 | 52 | |
e294030f MM |
53 | void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, |
54 | const char *cmd) | |
dc1166e6 | 55 | { |
7980872d | 56 | int i; |
e294030f | 57 | const char **msgs = opts->msgs; |
dc1166e6 MM |
58 | const char *msg; |
59 | char *tmp; | |
60 | const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches"; | |
61 | if (advice_commit_before_merge) | |
62 | msg = "Your local changes to the following files would be overwritten by %s:\n%%s" | |
63 | "Please, commit your changes or stash them before you can %s."; | |
64 | else | |
65 | msg = "Your local changes to the following files would be overwritten by %s:\n%%s"; | |
66 | tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 2); | |
67 | sprintf(tmp, msg, cmd, cmd2); | |
68 | msgs[ERROR_WOULD_OVERWRITE] = tmp; | |
69 | msgs[ERROR_NOT_UPTODATE_FILE] = tmp; | |
70 | ||
71 | msgs[ERROR_NOT_UPTODATE_DIR] = | |
72 | "Updating the following directories would lose untracked files in it:\n%s"; | |
73 | ||
74 | if (advice_commit_before_merge) | |
75 | msg = "The following untracked working tree files would be %s by %s:\n%%s" | |
76 | "Please move or remove them before you can %s."; | |
77 | else | |
78 | msg = "The following untracked working tree files would be %s by %s:\n%%s"; | |
79 | tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("removed") + strlen(cmd2) - 4); | |
80 | sprintf(tmp, msg, "removed", cmd, cmd2); | |
81 | msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp; | |
82 | tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4); | |
83 | sprintf(tmp, msg, "overwritten", cmd, cmd2); | |
84 | msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = tmp; | |
85 | ||
86 | /* | |
87 | * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we | |
88 | * cannot easily display it as a list. | |
89 | */ | |
90 | msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind."; | |
91 | ||
92 | msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = | |
93 | "Cannot update sparse checkout: the following entries are not up-to-date:\n%s"; | |
94 | msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = | |
95 | "The following Working tree files would be overwritten by sparse checkout update:\n%s"; | |
96 | msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = | |
97 | "The following Working tree files would be removed by sparse checkout update:\n%s"; | |
5e65ee35 MM |
98 | |
99 | opts->show_all_errors = 1; | |
7980872d CB |
100 | /* rejected paths may not have a static buffer */ |
101 | for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++) | |
102 | opts->unpack_rejects[i].strdup_strings = 1; | |
dc1166e6 MM |
103 | } |
104 | ||
6ff264ee RS |
105 | static void do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce, |
106 | unsigned int set, unsigned int clear) | |
b48d5a05 | 107 | { |
34110cd4 LT |
108 | clear |= CE_HASHED | CE_UNHASHED; |
109 | ||
700e66d6 NTND |
110 | if (set & CE_REMOVE) |
111 | set |= CE_WT_REMOVE; | |
112 | ||
6ff264ee RS |
113 | ce->next = NULL; |
114 | ce->ce_flags = (ce->ce_flags & ~clear) | set; | |
115 | add_index_entry(&o->result, ce, | |
116 | ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); | |
117 | } | |
118 | ||
a33bd4d3 | 119 | static struct cache_entry *dup_entry(const struct cache_entry *ce) |
6ff264ee RS |
120 | { |
121 | unsigned int size = ce_size(ce); | |
122 | struct cache_entry *new = xmalloc(size); | |
123 | ||
34110cd4 | 124 | memcpy(new, ce, size); |
a33bd4d3 RS |
125 | return new; |
126 | } | |
127 | ||
128 | static void add_entry(struct unpack_trees_options *o, | |
129 | const struct cache_entry *ce, | |
130 | unsigned int set, unsigned int clear) | |
131 | { | |
132 | do_add_entry(o, dup_entry(ce), set, clear); | |
b48d5a05 LT |
133 | } |
134 | ||
e6c111b4 MM |
135 | /* |
136 | * add error messages on path <path> | |
137 | * corresponding to the type <e> with the message <msg> | |
138 | * indicating if it should be display in porcelain or not | |
139 | */ | |
140 | static int add_rejected_path(struct unpack_trees_options *o, | |
141 | enum unpack_trees_error_types e, | |
142 | const char *path) | |
143 | { | |
e6c111b4 MM |
144 | if (!o->show_all_errors) |
145 | return error(ERRORMSG(o, e), path); | |
146 | ||
147 | /* | |
148 | * Otherwise, insert in a list for future display by | |
149 | * display_error_msgs() | |
150 | */ | |
7980872d | 151 | string_list_append(&o->unpack_rejects[e], path); |
e6c111b4 MM |
152 | return -1; |
153 | } | |
154 | ||
e6c111b4 MM |
155 | /* |
156 | * display all the error messages stored in a nice way | |
157 | */ | |
158 | static void display_error_msgs(struct unpack_trees_options *o) | |
159 | { | |
7980872d | 160 | int e, i; |
e6c111b4 MM |
161 | int something_displayed = 0; |
162 | for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { | |
7980872d CB |
163 | struct string_list *rejects = &o->unpack_rejects[e]; |
164 | if (rejects->nr > 0) { | |
e6c111b4 MM |
165 | struct strbuf path = STRBUF_INIT; |
166 | something_displayed = 1; | |
7980872d CB |
167 | for (i = 0; i < rejects->nr; i++) |
168 | strbuf_addf(&path, "\t%s\n", rejects->items[i].string); | |
e6c111b4 MM |
169 | error(ERRORMSG(o, e), path.buf); |
170 | strbuf_release(&path); | |
e6c111b4 | 171 | } |
7980872d | 172 | string_list_clear(rejects, 0); |
e6c111b4 MM |
173 | } |
174 | if (something_displayed) | |
6f90969b | 175 | fprintf(stderr, "Aborting\n"); |
e6c111b4 MM |
176 | } |
177 | ||
78478927 KB |
178 | /* |
179 | * Unlink the last component and schedule the leading directories for | |
180 | * removal, such that empty directories get removed. | |
16da134b | 181 | */ |
9c5e6c80 | 182 | static void unlink_entry(const struct cache_entry *ce) |
16da134b | 183 | { |
f66caaf9 | 184 | if (!check_leading_path(ce->name, ce_namelen(ce))) |
16a4c617 | 185 | return; |
80d706af PC |
186 | if (remove_or_warn(ce->ce_mode, ce->name)) |
187 | return; | |
78478927 | 188 | schedule_dir_for_removal(ce->name, ce_namelen(ce)); |
16da134b JS |
189 | } |
190 | ||
16da134b | 191 | static struct checkout state; |
c4758d3c | 192 | static int check_updates(struct unpack_trees_options *o) |
16da134b | 193 | { |
96a02f8f | 194 | unsigned cnt = 0, total = 0; |
dc6a0757 | 195 | struct progress *progress = NULL; |
34110cd4 | 196 | struct index_state *index = &o->result; |
33ecf7eb | 197 | int i; |
c4758d3c | 198 | int errs = 0; |
16da134b JS |
199 | |
200 | if (o->update && o->verbose_update) { | |
34110cd4 | 201 | for (total = cnt = 0; cnt < index->cache_nr; cnt++) { |
9c5e6c80 | 202 | const struct cache_entry *ce = index->cache[cnt]; |
700e66d6 | 203 | if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) |
16da134b JS |
204 | total++; |
205 | } | |
206 | ||
dc6a0757 | 207 | progress = start_progress_delay("Checking out files", |
e8548645 | 208 | total, 50, 1); |
16da134b JS |
209 | cnt = 0; |
210 | } | |
211 | ||
66985e66 JH |
212 | if (o->update) |
213 | git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result); | |
34110cd4 | 214 | for (i = 0; i < index->cache_nr; i++) { |
9c5e6c80 | 215 | const struct cache_entry *ce = index->cache[i]; |
16da134b | 216 | |
e663db2f NTND |
217 | if (ce->ce_flags & CE_WT_REMOVE) { |
218 | display_progress(progress, ++cnt); | |
2c9078d0 | 219 | if (o->update && !o->dry_run) |
e663db2f NTND |
220 | unlink_entry(ce); |
221 | continue; | |
222 | } | |
1fa6ead4 | 223 | } |
36419c8e | 224 | remove_marked_cache_entries(&o->result); |
78478927 | 225 | remove_scheduled_dirs(); |
1fa6ead4 LT |
226 | |
227 | for (i = 0; i < index->cache_nr; i++) { | |
228 | struct cache_entry *ce = index->cache[i]; | |
229 | ||
7a51ed66 | 230 | if (ce->ce_flags & CE_UPDATE) { |
1fa6ead4 | 231 | display_progress(progress, ++cnt); |
7a51ed66 | 232 | ce->ce_flags &= ~CE_UPDATE; |
2c9078d0 | 233 | if (o->update && !o->dry_run) { |
c4758d3c | 234 | errs |= checkout_entry(ce, &state, NULL); |
16a4c617 | 235 | } |
16da134b JS |
236 | } |
237 | } | |
4d4fcc54 | 238 | stop_progress(&progress); |
66985e66 JH |
239 | if (o->update) |
240 | git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); | |
c4758d3c | 241 | return errs != 0; |
16da134b JS |
242 | } |
243 | ||
eb9ae4b5 RS |
244 | static int verify_uptodate_sparse(const struct cache_entry *ce, |
245 | struct unpack_trees_options *o); | |
246 | static int verify_absent_sparse(const struct cache_entry *ce, | |
247 | enum unpack_trees_error_types, | |
248 | struct unpack_trees_options *o); | |
e800ec9d | 249 | |
e800ec9d NTND |
250 | static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_options *o) |
251 | { | |
252 | int was_skip_worktree = ce_skip_worktree(ce); | |
253 | ||
2431afbf | 254 | if (ce->ce_flags & CE_NEW_SKIP_WORKTREE) |
e800ec9d NTND |
255 | ce->ce_flags |= CE_SKIP_WORKTREE; |
256 | else | |
257 | ce->ce_flags &= ~CE_SKIP_WORKTREE; | |
258 | ||
259 | /* | |
eec3fc03 NTND |
260 | * if (!was_skip_worktree && !ce_skip_worktree()) { |
261 | * This is perfectly normal. Move on; | |
262 | * } | |
e800ec9d | 263 | */ |
eec3fc03 NTND |
264 | |
265 | /* | |
266 | * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout | |
267 | * area as a result of ce_skip_worktree() shortcuts in | |
700e66d6 NTND |
268 | * verify_absent() and verify_uptodate(). |
269 | * Make sure they don't modify worktree if they are already | |
270 | * outside checkout area | |
eec3fc03 | 271 | */ |
700e66d6 NTND |
272 | if (was_skip_worktree && ce_skip_worktree(ce)) { |
273 | ce->ce_flags &= ~CE_UPDATE; | |
274 | ||
275 | /* | |
276 | * By default, when CE_REMOVE is on, CE_WT_REMOVE is also | |
277 | * on to get that file removed from both index and worktree. | |
278 | * If that file is already outside worktree area, don't | |
279 | * bother remove it. | |
280 | */ | |
281 | if (ce->ce_flags & CE_REMOVE) | |
282 | ce->ce_flags &= ~CE_WT_REMOVE; | |
283 | } | |
e800ec9d NTND |
284 | |
285 | if (!was_skip_worktree && ce_skip_worktree(ce)) { | |
286 | /* | |
287 | * If CE_UPDATE is set, verify_uptodate() must be called already | |
288 | * also stat info may have lost after merged_entry() so calling | |
289 | * verify_uptodate() again may fail | |
290 | */ | |
291 | if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o)) | |
292 | return -1; | |
293 | ce->ce_flags |= CE_WT_REMOVE; | |
294 | } | |
295 | if (was_skip_worktree && !ce_skip_worktree(ce)) { | |
08402b04 | 296 | if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) |
e800ec9d NTND |
297 | return -1; |
298 | ce->ce_flags |= CE_UPDATE; | |
299 | } | |
300 | return 0; | |
301 | } | |
302 | ||
5828e835 RS |
303 | static inline int call_unpack_fn(const struct cache_entry * const *src, |
304 | struct unpack_trees_options *o) | |
01904572 | 305 | { |
34110cd4 LT |
306 | int ret = o->fn(src, o); |
307 | if (ret > 0) | |
01904572 | 308 | ret = 0; |
01904572 LT |
309 | return ret; |
310 | } | |
311 | ||
da165f47 JH |
312 | static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o) |
313 | { | |
314 | ce->ce_flags |= CE_UNPACKED; | |
315 | ||
316 | if (o->cache_bottom < o->src_index->cache_nr && | |
317 | o->src_index->cache[o->cache_bottom] == ce) { | |
318 | int bottom = o->cache_bottom; | |
319 | while (bottom < o->src_index->cache_nr && | |
320 | o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) | |
321 | bottom++; | |
322 | o->cache_bottom = bottom; | |
323 | } | |
324 | } | |
325 | ||
326 | static void mark_all_ce_unused(struct index_state *index) | |
327 | { | |
328 | int i; | |
329 | for (i = 0; i < index->cache_nr; i++) | |
2431afbf | 330 | index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); |
da165f47 JH |
331 | } |
332 | ||
eb9ae4b5 | 333 | static int locate_in_src_index(const struct cache_entry *ce, |
da165f47 JH |
334 | struct unpack_trees_options *o) |
335 | { | |
336 | struct index_state *index = o->src_index; | |
337 | int len = ce_namelen(ce); | |
338 | int pos = index_name_pos(index, ce->name, len); | |
339 | if (pos < 0) | |
340 | pos = -1 - pos; | |
341 | return pos; | |
342 | } | |
343 | ||
344 | /* | |
345 | * We call unpack_index_entry() with an unmerged cache entry | |
346 | * only in diff-index, and it wants a single callback. Skip | |
347 | * the other unmerged entry with the same name. | |
348 | */ | |
349 | static void mark_ce_used_same_name(struct cache_entry *ce, | |
350 | struct unpack_trees_options *o) | |
351 | { | |
352 | struct index_state *index = o->src_index; | |
353 | int len = ce_namelen(ce); | |
354 | int pos; | |
355 | ||
356 | for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { | |
357 | struct cache_entry *next = index->cache[pos]; | |
358 | if (len != ce_namelen(next) || | |
359 | memcmp(ce->name, next->name, len)) | |
360 | break; | |
361 | mark_ce_used(next, o); | |
362 | } | |
363 | } | |
364 | ||
365 | static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) | |
366 | { | |
367 | const struct index_state *index = o->src_index; | |
368 | int pos = o->cache_bottom; | |
369 | ||
370 | while (pos < index->cache_nr) { | |
371 | struct cache_entry *ce = index->cache[pos]; | |
372 | if (!(ce->ce_flags & CE_UNPACKED)) | |
373 | return ce; | |
374 | pos++; | |
375 | } | |
376 | return NULL; | |
377 | } | |
378 | ||
9c5e6c80 | 379 | static void add_same_unmerged(const struct cache_entry *ce, |
da165f47 JH |
380 | struct unpack_trees_options *o) |
381 | { | |
382 | struct index_state *index = o->src_index; | |
383 | int len = ce_namelen(ce); | |
384 | int pos = index_name_pos(index, ce->name, len); | |
385 | ||
386 | if (0 <= pos) | |
387 | die("programming error in a caller of mark_ce_used_same_name"); | |
388 | for (pos = -pos - 1; pos < index->cache_nr; pos++) { | |
389 | struct cache_entry *next = index->cache[pos]; | |
390 | if (len != ce_namelen(next) || | |
391 | memcmp(ce->name, next->name, len)) | |
392 | break; | |
393 | add_entry(o, next, 0, 0); | |
394 | mark_ce_used(next, o); | |
395 | } | |
396 | } | |
397 | ||
398 | static int unpack_index_entry(struct cache_entry *ce, | |
399 | struct unpack_trees_options *o) | |
01904572 | 400 | { |
5828e835 | 401 | const struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
da165f47 | 402 | int ret; |
34110cd4 | 403 | |
66dbfd55 GV |
404 | src[0] = ce; |
405 | ||
da165f47 | 406 | mark_ce_used(ce, o); |
01904572 LT |
407 | if (ce_stage(ce)) { |
408 | if (o->skip_unmerged) { | |
34110cd4 LT |
409 | add_entry(o, ce, 0, 0); |
410 | return 0; | |
01904572 | 411 | } |
01904572 | 412 | } |
da165f47 JH |
413 | ret = call_unpack_fn(src, o); |
414 | if (ce_stage(ce)) | |
415 | mark_ce_used_same_name(ce, o); | |
416 | return ret; | |
01904572 LT |
417 | } |
418 | ||
730f7284 JH |
419 | static int find_cache_pos(struct traverse_info *, const struct name_entry *); |
420 | ||
421 | static void restore_cache_bottom(struct traverse_info *info, int bottom) | |
422 | { | |
423 | struct unpack_trees_options *o = info->data; | |
424 | ||
425 | if (o->diff_index_cached) | |
426 | return; | |
427 | o->cache_bottom = bottom; | |
428 | } | |
429 | ||
430 | static int switch_cache_bottom(struct traverse_info *info) | |
431 | { | |
432 | struct unpack_trees_options *o = info->data; | |
433 | int ret, pos; | |
434 | ||
435 | if (o->diff_index_cached) | |
436 | return 0; | |
437 | ret = o->cache_bottom; | |
438 | pos = find_cache_pos(info->prev, &info->name); | |
439 | ||
440 | if (pos < -1) | |
441 | o->cache_bottom = -2 - pos; | |
442 | else if (pos < 0) | |
443 | o->cache_bottom = o->src_index->cache_nr; | |
444 | return ret; | |
01904572 LT |
445 | } |
446 | ||
84563a62 JH |
447 | static int traverse_trees_recursive(int n, unsigned long dirmask, |
448 | unsigned long df_conflicts, | |
449 | struct name_entry *names, | |
450 | struct traverse_info *info) | |
16da134b | 451 | { |
730f7284 | 452 | int i, ret, bottom; |
ca885a4f | 453 | struct tree_desc t[MAX_UNPACK_TREES]; |
1ce584b0 | 454 | void *buf[MAX_UNPACK_TREES]; |
01904572 LT |
455 | struct traverse_info newinfo; |
456 | struct name_entry *p; | |
457 | ||
458 | p = names; | |
459 | while (!p->mode) | |
460 | p++; | |
461 | ||
462 | newinfo = *info; | |
463 | newinfo.prev = info; | |
40e37256 | 464 | newinfo.pathspec = info->pathspec; |
01904572 | 465 | newinfo.name = *p; |
0de16337 | 466 | newinfo.pathlen += tree_entry_len(p) + 1; |
603d2498 | 467 | newinfo.df_conflicts |= df_conflicts; |
01904572 LT |
468 | |
469 | for (i = 0; i < n; i++, dirmask >>= 1) { | |
470 | const unsigned char *sha1 = NULL; | |
471 | if (dirmask & 1) | |
472 | sha1 = names[i].sha1; | |
1ce584b0 | 473 | buf[i] = fill_tree_descriptor(t+i, sha1); |
01904572 | 474 | } |
730f7284 JH |
475 | |
476 | bottom = switch_cache_bottom(&newinfo); | |
477 | ret = traverse_trees(n, t, &newinfo); | |
478 | restore_cache_bottom(&newinfo, bottom); | |
1ce584b0 JN |
479 | |
480 | for (i = 0; i < n; i++) | |
481 | free(buf[i]); | |
482 | ||
730f7284 | 483 | return ret; |
01904572 LT |
484 | } |
485 | ||
486 | /* | |
487 | * Compare the traverse-path to the cache entry without actually | |
488 | * having to generate the textual representation of the traverse | |
489 | * path. | |
490 | * | |
491 | * NOTE! This *only* compares up to the size of the traverse path | |
492 | * itself - the caller needs to do the final check for the cache | |
493 | * entry having more data at the end! | |
494 | */ | |
495 | static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) | |
496 | { | |
497 | int len, pathlen, ce_len; | |
498 | const char *ce_name; | |
499 | ||
500 | if (info->prev) { | |
501 | int cmp = do_compare_entry(ce, info->prev, &info->name); | |
502 | if (cmp) | |
503 | return cmp; | |
504 | } | |
505 | pathlen = info->pathlen; | |
506 | ce_len = ce_namelen(ce); | |
507 | ||
508 | /* If ce_len < pathlen then we must have previously hit "name == directory" entry */ | |
509 | if (ce_len < pathlen) | |
510 | return -1; | |
511 | ||
512 | ce_len -= pathlen; | |
513 | ce_name = ce->name + pathlen; | |
514 | ||
0de16337 | 515 | len = tree_entry_len(n); |
01904572 LT |
516 | return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); |
517 | } | |
518 | ||
519 | static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) | |
520 | { | |
521 | int cmp = do_compare_entry(ce, info, n); | |
522 | if (cmp) | |
523 | return cmp; | |
524 | ||
525 | /* | |
526 | * Even if the beginning compared identically, the ce should | |
527 | * compare as bigger than a directory leading up to it! | |
528 | */ | |
529 | return ce_namelen(ce) > traverse_path_len(info, n); | |
530 | } | |
531 | ||
da165f47 JH |
532 | static int ce_in_traverse_path(const struct cache_entry *ce, |
533 | const struct traverse_info *info) | |
534 | { | |
535 | if (!info->prev) | |
536 | return 1; | |
537 | if (do_compare_entry(ce, info->prev, &info->name)) | |
538 | return 0; | |
539 | /* | |
540 | * If ce (blob) is the same name as the path (which is a tree | |
541 | * we will be descending into), it won't be inside it. | |
542 | */ | |
543 | return (info->pathlen < ce_namelen(ce)); | |
544 | } | |
545 | ||
01904572 LT |
546 | static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage) |
547 | { | |
548 | int len = traverse_path_len(info, n); | |
549 | struct cache_entry *ce = xcalloc(1, cache_entry_size(len)); | |
550 | ||
551 | ce->ce_mode = create_ce_mode(n->mode); | |
b60e188c TG |
552 | ce->ce_flags = create_ce_flags(stage); |
553 | ce->ce_namelen = len; | |
01904572 LT |
554 | hashcpy(ce->sha1, n->sha1); |
555 | make_traverse_path(ce->name, info, n); | |
556 | ||
557 | return ce; | |
558 | } | |
559 | ||
c7cddc1a RS |
560 | static int unpack_nondirectories(int n, unsigned long mask, |
561 | unsigned long dirmask, | |
562 | struct cache_entry **src, | |
563 | const struct name_entry *names, | |
564 | const struct traverse_info *info) | |
01904572 LT |
565 | { |
566 | int i; | |
567 | struct unpack_trees_options *o = info->data; | |
603d2498 | 568 | unsigned long conflicts = info->df_conflicts | dirmask; |
01904572 LT |
569 | |
570 | /* Do we have *only* directories? Nothing to do */ | |
571 | if (mask == dirmask && !src[0]) | |
572 | return 0; | |
573 | ||
01904572 LT |
574 | /* |
575 | * Ok, we've filled in up to any potential index entry in src[0], | |
576 | * now do the rest. | |
577 | */ | |
578 | for (i = 0; i < n; i++) { | |
579 | int stage; | |
580 | unsigned int bit = 1ul << i; | |
581 | if (conflicts & bit) { | |
582 | src[i + o->merge] = o->df_conflict_entry; | |
583 | continue; | |
584 | } | |
585 | if (!(mask & bit)) | |
586 | continue; | |
587 | if (!o->merge) | |
588 | stage = 0; | |
589 | else if (i + 1 < o->head_idx) | |
590 | stage = 1; | |
591 | else if (i + 1 > o->head_idx) | |
592 | stage = 3; | |
593 | else | |
594 | stage = 2; | |
595 | src[i + o->merge] = create_ce_entry(info, names + i, stage); | |
596 | } | |
597 | ||
5d80ef5a RS |
598 | if (o->merge) { |
599 | int rc = call_unpack_fn((const struct cache_entry * const *)src, | |
600 | o); | |
601 | for (i = 0; i < n; i++) { | |
602 | struct cache_entry *ce = src[i + o->merge]; | |
603 | if (ce != o->df_conflict_entry) | |
604 | free(ce); | |
605 | } | |
606 | return rc; | |
607 | } | |
01904572 | 608 | |
01904572 | 609 | for (i = 0; i < n; i++) |
aab3b9a1 | 610 | if (src[i] && src[i] != o->df_conflict_entry) |
6ff264ee | 611 | do_add_entry(o, src[i], 0, 0); |
01904572 LT |
612 | return 0; |
613 | } | |
614 | ||
353c5eeb JH |
615 | static int unpack_failed(struct unpack_trees_options *o, const char *message) |
616 | { | |
617 | discard_index(&o->result); | |
b4194828 | 618 | if (!o->gently && !o->exiting_early) { |
353c5eeb JH |
619 | if (message) |
620 | return error("%s", message); | |
621 | return -1; | |
622 | } | |
623 | return -1; | |
624 | } | |
625 | ||
730f7284 JH |
626 | /* NEEDSWORK: give this a better name and share with tree-walk.c */ |
627 | static int name_compare(const char *a, int a_len, | |
628 | const char *b, int b_len) | |
629 | { | |
630 | int len = (a_len < b_len) ? a_len : b_len; | |
631 | int cmp = memcmp(a, b, len); | |
632 | if (cmp) | |
633 | return cmp; | |
634 | return (a_len - b_len); | |
635 | } | |
636 | ||
637 | /* | |
638 | * The tree traversal is looking at name p. If we have a matching entry, | |
639 | * return it. If name p is a directory in the index, do not return | |
640 | * anything, as we will want to match it when the traversal descends into | |
641 | * the directory. | |
642 | */ | |
643 | static int find_cache_pos(struct traverse_info *info, | |
644 | const struct name_entry *p) | |
645 | { | |
646 | int pos; | |
647 | struct unpack_trees_options *o = info->data; | |
648 | struct index_state *index = o->src_index; | |
649 | int pfxlen = info->pathlen; | |
0de16337 | 650 | int p_len = tree_entry_len(p); |
730f7284 JH |
651 | |
652 | for (pos = o->cache_bottom; pos < index->cache_nr; pos++) { | |
9c5e6c80 | 653 | const struct cache_entry *ce = index->cache[pos]; |
730f7284 JH |
654 | const char *ce_name, *ce_slash; |
655 | int cmp, ce_len; | |
656 | ||
e53e6b44 BD |
657 | if (ce->ce_flags & CE_UNPACKED) { |
658 | /* | |
659 | * cache_bottom entry is already unpacked, so | |
660 | * we can never match it; don't check it | |
661 | * again. | |
662 | */ | |
663 | if (pos == o->cache_bottom) | |
664 | ++o->cache_bottom; | |
730f7284 | 665 | continue; |
e53e6b44 BD |
666 | } |
667 | if (!ce_in_traverse_path(ce, info)) | |
730f7284 JH |
668 | continue; |
669 | ce_name = ce->name + pfxlen; | |
670 | ce_slash = strchr(ce_name, '/'); | |
671 | if (ce_slash) | |
672 | ce_len = ce_slash - ce_name; | |
673 | else | |
674 | ce_len = ce_namelen(ce) - pfxlen; | |
675 | cmp = name_compare(p->path, p_len, ce_name, ce_len); | |
676 | /* | |
677 | * Exact match; if we have a directory we need to | |
678 | * delay returning it. | |
679 | */ | |
680 | if (!cmp) | |
681 | return ce_slash ? -2 - pos : pos; | |
682 | if (0 < cmp) | |
683 | continue; /* keep looking */ | |
684 | /* | |
685 | * ce_name sorts after p->path; could it be that we | |
686 | * have files under p->path directory in the index? | |
687 | * E.g. ce_name == "t-i", and p->path == "t"; we may | |
688 | * have "t/a" in the index. | |
689 | */ | |
690 | if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) && | |
691 | ce_name[p_len] < '/') | |
692 | continue; /* keep looking */ | |
693 | break; | |
694 | } | |
695 | return -1; | |
696 | } | |
697 | ||
698 | static struct cache_entry *find_cache_entry(struct traverse_info *info, | |
699 | const struct name_entry *p) | |
700 | { | |
701 | int pos = find_cache_pos(info, p); | |
702 | struct unpack_trees_options *o = info->data; | |
703 | ||
704 | if (0 <= pos) | |
705 | return o->src_index->cache[pos]; | |
706 | else | |
707 | return NULL; | |
708 | } | |
709 | ||
ba655da5 JH |
710 | static void debug_path(struct traverse_info *info) |
711 | { | |
712 | if (info->prev) { | |
713 | debug_path(info->prev); | |
714 | if (*info->prev->name.path) | |
715 | putchar('/'); | |
716 | } | |
717 | printf("%s", info->name.path); | |
718 | } | |
719 | ||
720 | static void debug_name_entry(int i, struct name_entry *n) | |
721 | { | |
722 | printf("ent#%d %06o %s\n", i, | |
723 | n->path ? n->mode : 0, | |
724 | n->path ? n->path : "(missing)"); | |
725 | } | |
726 | ||
727 | static void debug_unpack_callback(int n, | |
728 | unsigned long mask, | |
729 | unsigned long dirmask, | |
730 | struct name_entry *names, | |
731 | struct traverse_info *info) | |
732 | { | |
733 | int i; | |
734 | printf("* unpack mask %lu, dirmask %lu, cnt %d ", | |
735 | mask, dirmask, n); | |
736 | debug_path(info); | |
737 | putchar('\n'); | |
738 | for (i = 0; i < n; i++) | |
739 | debug_name_entry(i, names + i); | |
740 | } | |
741 | ||
01904572 LT |
742 | static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info) |
743 | { | |
c7cddc1a | 744 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
01904572 | 745 | struct unpack_trees_options *o = info->data; |
01904572 LT |
746 | const struct name_entry *p = names; |
747 | ||
748 | /* Find first entry with a real name (we could use "mask" too) */ | |
749 | while (!p->mode) | |
750 | p++; | |
751 | ||
ba655da5 JH |
752 | if (o->debug_unpack) |
753 | debug_unpack_callback(n, mask, dirmask, names, info); | |
754 | ||
01904572 LT |
755 | /* Are we supposed to look at the index too? */ |
756 | if (o->merge) { | |
da165f47 | 757 | while (1) { |
da165f47 | 758 | int cmp; |
730f7284 JH |
759 | struct cache_entry *ce; |
760 | ||
761 | if (o->diff_index_cached) | |
762 | ce = next_cache_entry(o); | |
763 | else | |
764 | ce = find_cache_entry(info, p); | |
765 | ||
da165f47 JH |
766 | if (!ce) |
767 | break; | |
768 | cmp = compare_entry(ce, info, p); | |
01904572 LT |
769 | if (cmp < 0) { |
770 | if (unpack_index_entry(ce, o) < 0) | |
353c5eeb | 771 | return unpack_failed(o, NULL); |
01904572 LT |
772 | continue; |
773 | } | |
774 | if (!cmp) { | |
775 | if (ce_stage(ce)) { | |
776 | /* | |
da165f47 JH |
777 | * If we skip unmerged index |
778 | * entries, we'll skip this | |
779 | * entry *and* the tree | |
780 | * entries associated with it! | |
01904572 | 781 | */ |
34110cd4 | 782 | if (o->skip_unmerged) { |
da165f47 | 783 | add_same_unmerged(ce, o); |
01904572 | 784 | return mask; |
34110cd4 | 785 | } |
01904572 LT |
786 | } |
787 | src[0] = ce; | |
01904572 LT |
788 | } |
789 | break; | |
790 | } | |
791 | } | |
792 | ||
34110cd4 | 793 | if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0) |
01904572 LT |
794 | return -1; |
795 | ||
97e5954b | 796 | if (o->merge && src[0]) { |
da165f47 JH |
797 | if (ce_stage(src[0])) |
798 | mark_ce_used_same_name(src[0], o); | |
799 | else | |
800 | mark_ce_used(src[0], o); | |
801 | } | |
802 | ||
01904572 LT |
803 | /* Now handle any directories.. */ |
804 | if (dirmask) { | |
b65982b6 JH |
805 | /* special case: "diff-index --cached" looking at a tree */ |
806 | if (o->diff_index_cached && | |
807 | n == 1 && dirmask == 1 && S_ISDIR(names->mode)) { | |
808 | int matches; | |
809 | matches = cache_tree_matches_traversal(o->src_index->cache_tree, | |
810 | names, info); | |
811 | /* | |
da165f47 JH |
812 | * Everything under the name matches; skip the |
813 | * entire hierarchy. diff_index_cached codepath | |
814 | * special cases D/F conflicts in such a way that | |
815 | * it does not do any look-ahead, so this is safe. | |
b65982b6 JH |
816 | */ |
817 | if (matches) { | |
da165f47 | 818 | o->cache_bottom += matches; |
b65982b6 JH |
819 | return mask; |
820 | } | |
821 | } | |
822 | ||
603d2498 | 823 | if (traverse_trees_recursive(n, dirmask, mask & ~dirmask, |
542c264b JH |
824 | names, info) < 0) |
825 | return -1; | |
01904572 LT |
826 | return mask; |
827 | } | |
828 | ||
829 | return mask; | |
830 | } | |
831 | ||
28911091 NTND |
832 | static int clear_ce_flags_1(struct cache_entry **cache, int nr, |
833 | char *prefix, int prefix_len, | |
834 | int select_mask, int clear_mask, | |
835 | struct exclude_list *el, int defval); | |
836 | ||
9037026d NTND |
837 | /* Whole directory matching */ |
838 | static int clear_ce_flags_dir(struct cache_entry **cache, int nr, | |
839 | char *prefix, int prefix_len, | |
840 | char *basename, | |
841 | int select_mask, int clear_mask, | |
28911091 | 842 | struct exclude_list *el, int defval) |
9037026d | 843 | { |
28911091 | 844 | struct cache_entry **cache_end; |
9037026d | 845 | int dtype = DT_DIR; |
07958050 AS |
846 | int ret = is_excluded_from_list(prefix, prefix_len, |
847 | basename, &dtype, el); | |
9037026d NTND |
848 | |
849 | prefix[prefix_len++] = '/'; | |
850 | ||
28911091 NTND |
851 | /* If undecided, use matching result of parent dir in defval */ |
852 | if (ret < 0) | |
853 | ret = defval; | |
9037026d | 854 | |
28911091 NTND |
855 | for (cache_end = cache; cache_end != cache + nr; cache_end++) { |
856 | struct cache_entry *ce = *cache_end; | |
857 | if (strncmp(ce->name, prefix, prefix_len)) | |
858 | break; | |
9037026d NTND |
859 | } |
860 | ||
28911091 NTND |
861 | /* |
862 | * TODO: check el, if there are no patterns that may conflict | |
863 | * with ret (iow, we know in advance the incl/excl | |
864 | * decision for the entire directory), clear flag here without | |
865 | * calling clear_ce_flags_1(). That function will call | |
07958050 | 866 | * the expensive is_excluded_from_list() on every entry. |
28911091 NTND |
867 | */ |
868 | return clear_ce_flags_1(cache, cache_end - cache, | |
869 | prefix, prefix_len, | |
870 | select_mask, clear_mask, | |
871 | el, ret); | |
9037026d NTND |
872 | } |
873 | ||
874 | /* | |
875 | * Traverse the index, find every entry that matches according to | |
876 | * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the | |
877 | * number of traversed entries. | |
878 | * | |
879 | * If select_mask is non-zero, only entries whose ce_flags has on of | |
880 | * those bits enabled are traversed. | |
881 | * | |
882 | * cache : pointer to an index entry | |
883 | * prefix_len : an offset to its path | |
884 | * | |
885 | * The current path ("prefix") including the trailing '/' is | |
886 | * cache[0]->name[0..(prefix_len-1)] | |
887 | * Top level path has prefix_len zero. | |
888 | */ | |
889 | static int clear_ce_flags_1(struct cache_entry **cache, int nr, | |
890 | char *prefix, int prefix_len, | |
891 | int select_mask, int clear_mask, | |
28911091 | 892 | struct exclude_list *el, int defval) |
9037026d NTND |
893 | { |
894 | struct cache_entry **cache_end = cache + nr; | |
895 | ||
896 | /* | |
897 | * Process all entries that have the given prefix and meet | |
898 | * select_mask condition | |
899 | */ | |
900 | while(cache != cache_end) { | |
901 | struct cache_entry *ce = *cache; | |
902 | const char *name, *slash; | |
28911091 | 903 | int len, dtype, ret; |
9037026d NTND |
904 | |
905 | if (select_mask && !(ce->ce_flags & select_mask)) { | |
906 | cache++; | |
907 | continue; | |
908 | } | |
909 | ||
910 | if (prefix_len && strncmp(ce->name, prefix, prefix_len)) | |
911 | break; | |
912 | ||
913 | name = ce->name + prefix_len; | |
914 | slash = strchr(name, '/'); | |
915 | ||
916 | /* If it's a directory, try whole directory match first */ | |
917 | if (slash) { | |
918 | int processed; | |
919 | ||
920 | len = slash - name; | |
921 | memcpy(prefix + prefix_len, name, len); | |
922 | ||
923 | /* | |
924 | * terminate the string (no trailing slash), | |
925 | * clear_c_f_dir needs it | |
926 | */ | |
927 | prefix[prefix_len + len] = '\0'; | |
928 | processed = clear_ce_flags_dir(cache, cache_end - cache, | |
929 | prefix, prefix_len + len, | |
930 | prefix + prefix_len, | |
931 | select_mask, clear_mask, | |
28911091 | 932 | el, defval); |
9037026d NTND |
933 | |
934 | /* clear_c_f_dir eats a whole dir already? */ | |
935 | if (processed) { | |
936 | cache += processed; | |
937 | continue; | |
938 | } | |
939 | ||
940 | prefix[prefix_len + len++] = '/'; | |
941 | cache += clear_ce_flags_1(cache, cache_end - cache, | |
942 | prefix, prefix_len + len, | |
28911091 | 943 | select_mask, clear_mask, el, defval); |
9037026d NTND |
944 | continue; |
945 | } | |
946 | ||
947 | /* Non-directory */ | |
948 | dtype = ce_to_dtype(ce); | |
07958050 AS |
949 | ret = is_excluded_from_list(ce->name, ce_namelen(ce), |
950 | name, &dtype, el); | |
28911091 NTND |
951 | if (ret < 0) |
952 | ret = defval; | |
953 | if (ret > 0) | |
9037026d NTND |
954 | ce->ce_flags &= ~clear_mask; |
955 | cache++; | |
956 | } | |
957 | return nr - (cache_end - cache); | |
958 | } | |
959 | ||
960 | static int clear_ce_flags(struct cache_entry **cache, int nr, | |
961 | int select_mask, int clear_mask, | |
962 | struct exclude_list *el) | |
963 | { | |
964 | char prefix[PATH_MAX]; | |
965 | return clear_ce_flags_1(cache, nr, | |
966 | prefix, 0, | |
967 | select_mask, clear_mask, | |
28911091 | 968 | el, 0); |
9037026d NTND |
969 | } |
970 | ||
2431afbf NTND |
971 | /* |
972 | * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout | |
973 | */ | |
974 | static void mark_new_skip_worktree(struct exclude_list *el, | |
975 | struct index_state *the_index, | |
976 | int select_flag, int skip_wt_flag) | |
977 | { | |
978 | int i; | |
979 | ||
9037026d NTND |
980 | /* |
981 | * 1. Pretend the narrowest worktree: only unmerged entries | |
982 | * are checked out | |
983 | */ | |
2431afbf NTND |
984 | for (i = 0; i < the_index->cache_nr; i++) { |
985 | struct cache_entry *ce = the_index->cache[i]; | |
986 | ||
987 | if (select_flag && !(ce->ce_flags & select_flag)) | |
988 | continue; | |
989 | ||
9037026d | 990 | if (!ce_stage(ce)) |
2431afbf NTND |
991 | ce->ce_flags |= skip_wt_flag; |
992 | else | |
993 | ce->ce_flags &= ~skip_wt_flag; | |
994 | } | |
9037026d NTND |
995 | |
996 | /* | |
997 | * 2. Widen worktree according to sparse-checkout file. | |
998 | * Matched entries will have skip_wt_flag cleared (i.e. "in") | |
999 | */ | |
1000 | clear_ce_flags(the_index->cache, the_index->cache_nr, | |
1001 | select_flag, skip_wt_flag, el); | |
2431afbf NTND |
1002 | } |
1003 | ||
eb9ae4b5 RS |
1004 | static int verify_absent(const struct cache_entry *, |
1005 | enum unpack_trees_error_types, | |
1006 | struct unpack_trees_options *); | |
2e2b887d JH |
1007 | /* |
1008 | * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the | |
1009 | * resulting index, -2 on failure to reflect the changes to the work tree. | |
2431afbf NTND |
1010 | * |
1011 | * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally | |
2e2b887d | 1012 | */ |
01904572 LT |
1013 | int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o) |
1014 | { | |
e800ec9d | 1015 | int i, ret; |
0fb1eaa8 | 1016 | static struct cache_entry *dfc; |
08aefc9e | 1017 | struct exclude_list el; |
16da134b | 1018 | |
ca885a4f JH |
1019 | if (len > MAX_UNPACK_TREES) |
1020 | die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES); | |
076b0adc | 1021 | memset(&state, 0, sizeof(state)); |
16da134b JS |
1022 | state.base_dir = ""; |
1023 | state.force = 1; | |
1024 | state.quiet = 1; | |
1025 | state.refresh_cache = 1; | |
1026 | ||
08aefc9e NTND |
1027 | memset(&el, 0, sizeof(el)); |
1028 | if (!core_apply_sparse_checkout || !o->update) | |
1029 | o->skip_sparse_checkout = 1; | |
1030 | if (!o->skip_sparse_checkout) { | |
c082df24 | 1031 | if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, &el, 0) < 0) |
08aefc9e NTND |
1032 | o->skip_sparse_checkout = 1; |
1033 | else | |
1034 | o->el = ⪙ | |
1035 | } | |
1036 | ||
34110cd4 | 1037 | memset(&o->result, 0, sizeof(o->result)); |
913e0e99 | 1038 | o->result.initialized = 1; |
da165f47 JH |
1039 | o->result.timestamp.sec = o->src_index->timestamp.sec; |
1040 | o->result.timestamp.nsec = o->src_index->timestamp.nsec; | |
9170c7ab | 1041 | o->result.version = o->src_index->version; |
16da134b | 1042 | o->merge_size = len; |
da165f47 | 1043 | mark_all_ce_unused(o->src_index); |
0fb1eaa8 | 1044 | |
2431afbf NTND |
1045 | /* |
1046 | * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries | |
1047 | */ | |
1048 | if (!o->skip_sparse_checkout) | |
1049 | mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE); | |
1050 | ||
0fb1eaa8 | 1051 | if (!dfc) |
13494ed1 | 1052 | dfc = xcalloc(1, cache_entry_size(0)); |
0fb1eaa8 | 1053 | o->df_conflict_entry = dfc; |
16da134b JS |
1054 | |
1055 | if (len) { | |
01904572 LT |
1056 | const char *prefix = o->prefix ? o->prefix : ""; |
1057 | struct traverse_info info; | |
1058 | ||
1059 | setup_traverse_info(&info, prefix); | |
1060 | info.fn = unpack_callback; | |
1061 | info.data = o; | |
e6c111b4 | 1062 | info.show_all_errors = o->show_all_errors; |
40e37256 | 1063 | info.pathspec = o->pathspec; |
01904572 | 1064 | |
da165f47 JH |
1065 | if (o->prefix) { |
1066 | /* | |
1067 | * Unpack existing index entries that sort before the | |
1068 | * prefix the tree is spliced into. Note that o->merge | |
1069 | * is always true in this case. | |
1070 | */ | |
1071 | while (1) { | |
1072 | struct cache_entry *ce = next_cache_entry(o); | |
1073 | if (!ce) | |
1074 | break; | |
1075 | if (ce_in_traverse_path(ce, &info)) | |
1076 | break; | |
1077 | if (unpack_index_entry(ce, o) < 0) | |
1078 | goto return_failed; | |
1079 | } | |
08aefc9e | 1080 | } |
da165f47 | 1081 | |
01904572 | 1082 | if (traverse_trees(len, t, &info) < 0) |
da165f47 | 1083 | goto return_failed; |
16da134b JS |
1084 | } |
1085 | ||
01904572 LT |
1086 | /* Any left-over entries in the index? */ |
1087 | if (o->merge) { | |
da165f47 JH |
1088 | while (1) { |
1089 | struct cache_entry *ce = next_cache_entry(o); | |
1090 | if (!ce) | |
1091 | break; | |
01904572 | 1092 | if (unpack_index_entry(ce, o) < 0) |
da165f47 | 1093 | goto return_failed; |
17e46426 | 1094 | } |
17e46426 | 1095 | } |
da165f47 | 1096 | mark_all_ce_unused(o->src_index); |
16da134b | 1097 | |
08aefc9e NTND |
1098 | if (o->trivial_merges_only && o->nontrivial_merge) { |
1099 | ret = unpack_failed(o, "Merge requires file-level merging"); | |
1100 | goto done; | |
1101 | } | |
01904572 | 1102 | |
e800ec9d | 1103 | if (!o->skip_sparse_checkout) { |
9e1afb16 | 1104 | int empty_worktree = 1; |
2431afbf NTND |
1105 | |
1106 | /* | |
1107 | * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1 | |
1108 | * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE | |
1109 | * so apply_sparse_checkout() won't attempt to remove it from worktree | |
1110 | */ | |
1111 | mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); | |
1112 | ||
17d26a4d | 1113 | ret = 0; |
2431afbf | 1114 | for (i = 0; i < o->result.cache_nr; i++) { |
e800ec9d NTND |
1115 | struct cache_entry *ce = o->result.cache[i]; |
1116 | ||
2431afbf NTND |
1117 | /* |
1118 | * Entries marked with CE_ADDED in merged_entry() do not have | |
1119 | * verify_absent() check (the check is effectively disabled | |
1120 | * because CE_NEW_SKIP_WORKTREE is set unconditionally). | |
1121 | * | |
1122 | * Do the real check now because we have had | |
1123 | * correct CE_NEW_SKIP_WORKTREE | |
1124 | */ | |
1125 | if (ce->ce_flags & CE_ADDED && | |
17d26a4d NTND |
1126 | verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) { |
1127 | if (!o->show_all_errors) | |
1128 | goto return_failed; | |
1129 | ret = -1; | |
1130 | } | |
2431afbf | 1131 | |
e800ec9d | 1132 | if (apply_sparse_checkout(ce, o)) { |
17d26a4d NTND |
1133 | if (!o->show_all_errors) |
1134 | goto return_failed; | |
e800ec9d | 1135 | ret = -1; |
e800ec9d | 1136 | } |
eec3fc03 | 1137 | if (!ce_skip_worktree(ce)) |
9e1afb16 | 1138 | empty_worktree = 0; |
f1f523ea | 1139 | |
e800ec9d | 1140 | } |
17d26a4d NTND |
1141 | if (ret < 0) |
1142 | goto return_failed; | |
a7bc906f NTND |
1143 | /* |
1144 | * Sparse checkout is meant to narrow down checkout area | |
1145 | * but it does not make sense to narrow down to empty working | |
1146 | * tree. This is usually a mistake in sparse checkout rules. | |
1147 | * Do not allow users to do that. | |
1148 | */ | |
9e1afb16 NTND |
1149 | if (o->result.cache_nr && empty_worktree) { |
1150 | ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory"); | |
1151 | goto done; | |
1152 | } | |
e800ec9d | 1153 | } |
01904572 | 1154 | |
34110cd4 | 1155 | o->src_index = NULL; |
2e2b887d | 1156 | ret = check_updates(o) ? (-2) : 0; |
34110cd4 LT |
1157 | if (o->dst_index) |
1158 | *o->dst_index = o->result; | |
08aefc9e NTND |
1159 | |
1160 | done: | |
f6198812 | 1161 | clear_exclude_list(&el); |
2e2b887d | 1162 | return ret; |
da165f47 JH |
1163 | |
1164 | return_failed: | |
e6c111b4 MM |
1165 | if (o->show_all_errors) |
1166 | display_error_msgs(o); | |
da165f47 | 1167 | mark_all_ce_unused(o->src_index); |
026680f8 | 1168 | ret = unpack_failed(o, NULL); |
b4194828 JH |
1169 | if (o->exiting_early) |
1170 | ret = 0; | |
026680f8 | 1171 | goto done; |
16da134b | 1172 | } |
076b0adc JS |
1173 | |
1174 | /* Here come the merge functions */ | |
1175 | ||
eb9ae4b5 RS |
1176 | static int reject_merge(const struct cache_entry *ce, |
1177 | struct unpack_trees_options *o) | |
076b0adc | 1178 | { |
e6c111b4 | 1179 | return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name); |
076b0adc JS |
1180 | } |
1181 | ||
eb9ae4b5 | 1182 | static int same(const struct cache_entry *a, const struct cache_entry *b) |
076b0adc JS |
1183 | { |
1184 | if (!!a != !!b) | |
1185 | return 0; | |
1186 | if (!a && !b) | |
1187 | return 1; | |
e11d7b59 JH |
1188 | if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED) |
1189 | return 0; | |
076b0adc | 1190 | return a->ce_mode == b->ce_mode && |
a89fccd2 | 1191 | !hashcmp(a->sha1, b->sha1); |
076b0adc JS |
1192 | } |
1193 | ||
1194 | ||
1195 | /* | |
1196 | * When a CE gets turned into an unmerged entry, we | |
1197 | * want it to be up-to-date | |
1198 | */ | |
eb9ae4b5 RS |
1199 | static int verify_uptodate_1(const struct cache_entry *ce, |
1200 | struct unpack_trees_options *o, | |
1201 | enum unpack_trees_error_types error_type) | |
076b0adc JS |
1202 | { |
1203 | struct stat st; | |
1204 | ||
d5b66299 NTND |
1205 | if (o->index_only) |
1206 | return 0; | |
1207 | ||
1208 | /* | |
1209 | * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again | |
1210 | * if this entry is truly up-to-date because this file may be | |
1211 | * overwritten. | |
1212 | */ | |
1213 | if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) | |
1214 | ; /* keep checking */ | |
1215 | else if (o->reset || ce_uptodate(ce)) | |
203a2fe1 | 1216 | return 0; |
076b0adc JS |
1217 | |
1218 | if (!lstat(ce->name, &st)) { | |
d5b66299 NTND |
1219 | int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE; |
1220 | unsigned changed = ie_match_stat(o->src_index, ce, &st, flags); | |
076b0adc | 1221 | if (!changed) |
203a2fe1 | 1222 | return 0; |
936492d3 JH |
1223 | /* |
1224 | * NEEDSWORK: the current default policy is to allow | |
cb8ad289 | 1225 | * submodule to be out of sync wrt the superproject |
936492d3 JH |
1226 | * index. This needs to be tightened later for |
1227 | * submodules that are marked to be automatically | |
1228 | * checked out. | |
1229 | */ | |
7a51ed66 | 1230 | if (S_ISGITLINK(ce->ce_mode)) |
203a2fe1 | 1231 | return 0; |
076b0adc JS |
1232 | errno = 0; |
1233 | } | |
076b0adc | 1234 | if (errno == ENOENT) |
203a2fe1 | 1235 | return 0; |
17e46426 | 1236 | return o->gently ? -1 : |
e6c111b4 | 1237 | add_rejected_path(o, error_type, ce->name); |
35a5aa79 NTND |
1238 | } |
1239 | ||
eb9ae4b5 | 1240 | static int verify_uptodate(const struct cache_entry *ce, |
35a5aa79 NTND |
1241 | struct unpack_trees_options *o) |
1242 | { | |
2431afbf | 1243 | if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) |
f1f523ea | 1244 | return 0; |
08402b04 | 1245 | return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE); |
076b0adc JS |
1246 | } |
1247 | ||
eb9ae4b5 | 1248 | static int verify_uptodate_sparse(const struct cache_entry *ce, |
e800ec9d NTND |
1249 | struct unpack_trees_options *o) |
1250 | { | |
08402b04 | 1251 | return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE); |
076b0adc JS |
1252 | } |
1253 | ||
eb9ae4b5 RS |
1254 | static void invalidate_ce_path(const struct cache_entry *ce, |
1255 | struct unpack_trees_options *o) | |
076b0adc JS |
1256 | { |
1257 | if (ce) | |
34110cd4 | 1258 | cache_tree_invalidate_path(o->src_index->cache_tree, ce->name); |
076b0adc JS |
1259 | } |
1260 | ||
0cf73755 SV |
1261 | /* |
1262 | * Check that checking out ce->sha1 in subdir ce->name is not | |
1263 | * going to overwrite any working files. | |
1264 | * | |
1265 | * Currently, git does not checkout subprojects during a superproject | |
1266 | * checkout, so it is not going to overwrite anything. | |
1267 | */ | |
eb9ae4b5 RS |
1268 | static int verify_clean_submodule(const struct cache_entry *ce, |
1269 | enum unpack_trees_error_types error_type, | |
1270 | struct unpack_trees_options *o) | |
0cf73755 SV |
1271 | { |
1272 | return 0; | |
1273 | } | |
1274 | ||
eb9ae4b5 RS |
1275 | static int verify_clean_subdirectory(const struct cache_entry *ce, |
1276 | enum unpack_trees_error_types error_type, | |
1277 | struct unpack_trees_options *o) | |
c8193534 JH |
1278 | { |
1279 | /* | |
0cf73755 | 1280 | * we are about to extract "ce->name"; we would not want to lose |
c8193534 JH |
1281 | * anything in the existing directory there. |
1282 | */ | |
1283 | int namelen; | |
7b9e3ce0 | 1284 | int i; |
c8193534 JH |
1285 | struct dir_struct d; |
1286 | char *pathbuf; | |
1287 | int cnt = 0; | |
0cf73755 SV |
1288 | unsigned char sha1[20]; |
1289 | ||
7a51ed66 | 1290 | if (S_ISGITLINK(ce->ce_mode) && |
0cf73755 SV |
1291 | resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) { |
1292 | /* If we are not going to update the submodule, then | |
1293 | * we don't care. | |
1294 | */ | |
1295 | if (!hashcmp(sha1, ce->sha1)) | |
1296 | return 0; | |
08402b04 | 1297 | return verify_clean_submodule(ce, error_type, o); |
0cf73755 | 1298 | } |
c8193534 JH |
1299 | |
1300 | /* | |
1301 | * First let's make sure we do not have a local modification | |
1302 | * in that directory. | |
1303 | */ | |
68c4f6a5 | 1304 | namelen = ce_namelen(ce); |
da165f47 JH |
1305 | for (i = locate_in_src_index(ce, o); |
1306 | i < o->src_index->cache_nr; | |
1307 | i++) { | |
837e5fe9 CB |
1308 | struct cache_entry *ce2 = o->src_index->cache[i]; |
1309 | int len = ce_namelen(ce2); | |
c8193534 | 1310 | if (len < namelen || |
837e5fe9 CB |
1311 | strncmp(ce->name, ce2->name, namelen) || |
1312 | ce2->name[namelen] != '/') | |
c8193534 JH |
1313 | break; |
1314 | /* | |
da165f47 JH |
1315 | * ce2->name is an entry in the subdirectory to be |
1316 | * removed. | |
c8193534 | 1317 | */ |
837e5fe9 CB |
1318 | if (!ce_stage(ce2)) { |
1319 | if (verify_uptodate(ce2, o)) | |
203a2fe1 | 1320 | return -1; |
837e5fe9 | 1321 | add_entry(o, ce2, CE_REMOVE, 0); |
da165f47 | 1322 | mark_ce_used(ce2, o); |
c8193534 JH |
1323 | } |
1324 | cnt++; | |
1325 | } | |
1326 | ||
1327 | /* | |
1328 | * Then we need to make sure that we do not lose a locally | |
1329 | * present file that is not ignored. | |
1330 | */ | |
1331 | pathbuf = xmalloc(namelen + 2); | |
0cf73755 | 1332 | memcpy(pathbuf, ce->name, namelen); |
c8193534 JH |
1333 | strcpy(pathbuf+namelen, "/"); |
1334 | ||
1335 | memset(&d, 0, sizeof(d)); | |
1336 | if (o->dir) | |
1337 | d.exclude_per_dir = o->dir->exclude_per_dir; | |
dba2e203 | 1338 | i = read_directory(&d, pathbuf, namelen+1, NULL); |
c8193534 | 1339 | if (i) |
17e46426 | 1340 | return o->gently ? -1 : |
e6c111b4 | 1341 | add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name); |
c8193534 JH |
1342 | free(pathbuf); |
1343 | return cnt; | |
1344 | } | |
1345 | ||
32260ad5 LT |
1346 | /* |
1347 | * This gets called when there was no index entry for the tree entry 'dst', | |
1348 | * but we found a file in the working tree that 'lstat()' said was fine, | |
1349 | * and we're on a case-insensitive filesystem. | |
1350 | * | |
1351 | * See if we can find a case-insensitive match in the index that also | |
1352 | * matches the stat information, and assume it's that other file! | |
1353 | */ | |
a9307f5a | 1354 | static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st) |
32260ad5 | 1355 | { |
9c5e6c80 | 1356 | const struct cache_entry *src; |
32260ad5 | 1357 | |
a9307f5a | 1358 | src = index_name_exists(o->src_index, name, len, 1); |
56cac48c | 1359 | return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); |
32260ad5 LT |
1360 | } |
1361 | ||
a9307f5a | 1362 | static int check_ok_to_remove(const char *name, int len, int dtype, |
eb9ae4b5 | 1363 | const struct cache_entry *ce, struct stat *st, |
a9307f5a CB |
1364 | enum unpack_trees_error_types error_type, |
1365 | struct unpack_trees_options *o) | |
1366 | { | |
9c5e6c80 | 1367 | const struct cache_entry *result; |
a9307f5a CB |
1368 | |
1369 | /* | |
1370 | * It may be that the 'lstat()' succeeded even though | |
1371 | * target 'ce' was absent, because there is an old | |
1372 | * entry that is different only in case.. | |
1373 | * | |
1374 | * Ignore that lstat() if it matches. | |
1375 | */ | |
1376 | if (ignore_case && icase_exists(o, name, len, st)) | |
1377 | return 0; | |
1378 | ||
589570db | 1379 | if (o->dir && |
b07bc8c8 | 1380 | is_excluded(o->dir, name, &dtype)) |
a9307f5a CB |
1381 | /* |
1382 | * ce->name is explicitly excluded, so it is Ok to | |
1383 | * overwrite it. | |
1384 | */ | |
1385 | return 0; | |
1386 | if (S_ISDIR(st->st_mode)) { | |
1387 | /* | |
1388 | * We are checking out path "foo" and | |
1389 | * found "foo/." in the working tree. | |
1390 | * This is tricky -- if we have modified | |
1391 | * files that are in "foo/" we would lose | |
1392 | * them. | |
1393 | */ | |
1394 | if (verify_clean_subdirectory(ce, error_type, o) < 0) | |
1395 | return -1; | |
1396 | return 0; | |
1397 | } | |
1398 | ||
1399 | /* | |
1400 | * The previous round may already have decided to | |
1401 | * delete this path, which is in a subdirectory that | |
1402 | * is being replaced with a blob. | |
1403 | */ | |
1404 | result = index_name_exists(&o->result, name, len, 0); | |
1405 | if (result) { | |
1406 | if (result->ce_flags & CE_REMOVE) | |
1407 | return 0; | |
1408 | } | |
1409 | ||
1410 | return o->gently ? -1 : | |
1411 | add_rejected_path(o, error_type, name); | |
1412 | } | |
1413 | ||
076b0adc JS |
1414 | /* |
1415 | * We do not want to remove or overwrite a working tree file that | |
f8a9d428 | 1416 | * is not tracked, unless it is ignored. |
076b0adc | 1417 | */ |
eb9ae4b5 RS |
1418 | static int verify_absent_1(const struct cache_entry *ce, |
1419 | enum unpack_trees_error_types error_type, | |
1420 | struct unpack_trees_options *o) | |
076b0adc | 1421 | { |
f66caaf9 | 1422 | int len; |
076b0adc JS |
1423 | struct stat st; |
1424 | ||
1425 | if (o->index_only || o->reset || !o->update) | |
203a2fe1 | 1426 | return 0; |
c8193534 | 1427 | |
f66caaf9 CB |
1428 | len = check_leading_path(ce->name, ce_namelen(ce)); |
1429 | if (!len) | |
203a2fe1 | 1430 | return 0; |
f66caaf9 CB |
1431 | else if (len > 0) { |
1432 | char path[PATH_MAX + 1]; | |
1433 | memcpy(path, ce->name, len); | |
1434 | path[len] = 0; | |
a93e5301 JN |
1435 | if (lstat(path, &st)) |
1436 | return error("cannot stat '%s': %s", path, | |
1437 | strerror(errno)); | |
ec0603e1 | 1438 | |
f66caaf9 CB |
1439 | return check_ok_to_remove(path, len, DT_UNKNOWN, NULL, &st, |
1440 | error_type, o); | |
92fda79e JN |
1441 | } else if (lstat(ce->name, &st)) { |
1442 | if (errno != ENOENT) | |
1443 | return error("cannot stat '%s': %s", ce->name, | |
1444 | strerror(errno)); | |
1445 | return 0; | |
1446 | } else { | |
a9307f5a | 1447 | return check_ok_to_remove(ce->name, ce_namelen(ce), |
92fda79e JN |
1448 | ce_to_dtype(ce), ce, &st, |
1449 | error_type, o); | |
1450 | } | |
076b0adc | 1451 | } |
a9307f5a | 1452 | |
eb9ae4b5 | 1453 | static int verify_absent(const struct cache_entry *ce, |
08402b04 | 1454 | enum unpack_trees_error_types error_type, |
35a5aa79 NTND |
1455 | struct unpack_trees_options *o) |
1456 | { | |
2431afbf | 1457 | if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) |
f1f523ea | 1458 | return 0; |
08402b04 | 1459 | return verify_absent_1(ce, error_type, o); |
35a5aa79 | 1460 | } |
076b0adc | 1461 | |
eb9ae4b5 RS |
1462 | static int verify_absent_sparse(const struct cache_entry *ce, |
1463 | enum unpack_trees_error_types error_type, | |
1464 | struct unpack_trees_options *o) | |
e800ec9d | 1465 | { |
08402b04 MM |
1466 | enum unpack_trees_error_types orphaned_error = error_type; |
1467 | if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN) | |
1468 | orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN; | |
1469 | ||
1470 | return verify_absent_1(ce, orphaned_error, o); | |
e800ec9d | 1471 | } |
076b0adc | 1472 | |
f2fa3542 | 1473 | static int merged_entry(const struct cache_entry *ce, |
eb9ae4b5 | 1474 | const struct cache_entry *old, |
f2fa3542 | 1475 | struct unpack_trees_options *o) |
076b0adc | 1476 | { |
7f8ab8dc | 1477 | int update = CE_UPDATE; |
f2fa3542 | 1478 | struct cache_entry *merge = dup_entry(ce); |
7f8ab8dc | 1479 | |
e11d7b59 | 1480 | if (!old) { |
2431afbf NTND |
1481 | /* |
1482 | * New index entries. In sparse checkout, the following | |
1483 | * verify_absent() will be delayed until after | |
1484 | * traverse_trees() finishes in unpack_trees(), then: | |
1485 | * | |
1486 | * - CE_NEW_SKIP_WORKTREE will be computed correctly | |
1487 | * - verify_absent() be called again, this time with | |
1488 | * correct CE_NEW_SKIP_WORKTREE | |
1489 | * | |
1490 | * verify_absent() call here does nothing in sparse | |
1491 | * checkout (i.e. o->skip_sparse_checkout == 0) | |
1492 | */ | |
1493 | update |= CE_ADDED; | |
1494 | merge->ce_flags |= CE_NEW_SKIP_WORKTREE; | |
1495 | ||
f2fa3542 RS |
1496 | if (verify_absent(merge, |
1497 | ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) { | |
1498 | free(merge); | |
e11d7b59 | 1499 | return -1; |
f2fa3542 | 1500 | } |
e11d7b59 JH |
1501 | invalidate_ce_path(merge, o); |
1502 | } else if (!(old->ce_flags & CE_CONFLICTED)) { | |
076b0adc JS |
1503 | /* |
1504 | * See if we can re-use the old CE directly? | |
1505 | * That way we get the uptodate stat info. | |
1506 | * | |
7f8ab8dc LT |
1507 | * This also removes the UPDATE flag on a match; otherwise |
1508 | * we will end up overwriting local changes in the work tree. | |
076b0adc JS |
1509 | */ |
1510 | if (same(old, merge)) { | |
eb7a2f1d | 1511 | copy_cache_entry(merge, old); |
7f8ab8dc | 1512 | update = 0; |
076b0adc | 1513 | } else { |
f2fa3542 RS |
1514 | if (verify_uptodate(old, o)) { |
1515 | free(merge); | |
203a2fe1 | 1516 | return -1; |
f2fa3542 | 1517 | } |
2431afbf NTND |
1518 | /* Migrate old flags over */ |
1519 | update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); | |
bc052d7f | 1520 | invalidate_ce_path(old, o); |
076b0adc | 1521 | } |
e11d7b59 JH |
1522 | } else { |
1523 | /* | |
1524 | * Previously unmerged entry left as an existence | |
1525 | * marker by read_index_unmerged(); | |
1526 | */ | |
1527 | invalidate_ce_path(old, o); | |
076b0adc JS |
1528 | } |
1529 | ||
f2fa3542 | 1530 | do_add_entry(o, merge, update, CE_STAGEMASK); |
076b0adc JS |
1531 | return 1; |
1532 | } | |
1533 | ||
eb9ae4b5 RS |
1534 | static int deleted_entry(const struct cache_entry *ce, |
1535 | const struct cache_entry *old, | |
1536 | struct unpack_trees_options *o) | |
076b0adc | 1537 | { |
34110cd4 LT |
1538 | /* Did it exist in the index? */ |
1539 | if (!old) { | |
08402b04 | 1540 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
203a2fe1 | 1541 | return -1; |
34110cd4 LT |
1542 | return 0; |
1543 | } | |
e11d7b59 | 1544 | if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o)) |
34110cd4 LT |
1545 | return -1; |
1546 | add_entry(o, ce, CE_REMOVE, 0); | |
bc052d7f | 1547 | invalidate_ce_path(ce, o); |
076b0adc JS |
1548 | return 1; |
1549 | } | |
1550 | ||
eb9ae4b5 RS |
1551 | static int keep_entry(const struct cache_entry *ce, |
1552 | struct unpack_trees_options *o) | |
076b0adc | 1553 | { |
34110cd4 | 1554 | add_entry(o, ce, 0, 0); |
076b0adc JS |
1555 | return 1; |
1556 | } | |
1557 | ||
1558 | #if DBRT_DEBUG | |
1559 | static void show_stage_entry(FILE *o, | |
1560 | const char *label, const struct cache_entry *ce) | |
1561 | { | |
1562 | if (!ce) | |
1563 | fprintf(o, "%s (missing)\n", label); | |
1564 | else | |
1565 | fprintf(o, "%s%06o %s %d\t%s\n", | |
1566 | label, | |
7a51ed66 | 1567 | ce->ce_mode, |
076b0adc JS |
1568 | sha1_to_hex(ce->sha1), |
1569 | ce_stage(ce), | |
1570 | ce->name); | |
1571 | } | |
1572 | #endif | |
1573 | ||
5828e835 RS |
1574 | int threeway_merge(const struct cache_entry * const *stages, |
1575 | struct unpack_trees_options *o) | |
076b0adc | 1576 | { |
eb9ae4b5 RS |
1577 | const struct cache_entry *index; |
1578 | const struct cache_entry *head; | |
1579 | const struct cache_entry *remote = stages[o->head_idx + 1]; | |
076b0adc JS |
1580 | int count; |
1581 | int head_match = 0; | |
1582 | int remote_match = 0; | |
076b0adc JS |
1583 | |
1584 | int df_conflict_head = 0; | |
1585 | int df_conflict_remote = 0; | |
1586 | ||
1587 | int any_anc_missing = 0; | |
1588 | int no_anc_exists = 1; | |
1589 | int i; | |
1590 | ||
1591 | for (i = 1; i < o->head_idx; i++) { | |
4c4caafc | 1592 | if (!stages[i] || stages[i] == o->df_conflict_entry) |
076b0adc | 1593 | any_anc_missing = 1; |
4c4caafc | 1594 | else |
076b0adc | 1595 | no_anc_exists = 0; |
076b0adc JS |
1596 | } |
1597 | ||
1598 | index = stages[0]; | |
1599 | head = stages[o->head_idx]; | |
1600 | ||
1601 | if (head == o->df_conflict_entry) { | |
1602 | df_conflict_head = 1; | |
1603 | head = NULL; | |
1604 | } | |
1605 | ||
1606 | if (remote == o->df_conflict_entry) { | |
1607 | df_conflict_remote = 1; | |
1608 | remote = NULL; | |
1609 | } | |
1610 | ||
cee2d6ae JH |
1611 | /* |
1612 | * First, if there's a #16 situation, note that to prevent #13 | |
076b0adc JS |
1613 | * and #14. |
1614 | */ | |
1615 | if (!same(remote, head)) { | |
1616 | for (i = 1; i < o->head_idx; i++) { | |
1617 | if (same(stages[i], head)) { | |
1618 | head_match = i; | |
1619 | } | |
1620 | if (same(stages[i], remote)) { | |
1621 | remote_match = i; | |
1622 | } | |
1623 | } | |
1624 | } | |
1625 | ||
cee2d6ae JH |
1626 | /* |
1627 | * We start with cases where the index is allowed to match | |
076b0adc JS |
1628 | * something other than the head: #14(ALT) and #2ALT, where it |
1629 | * is permitted to match the result instead. | |
1630 | */ | |
1631 | /* #14, #14ALT, #2ALT */ | |
1632 | if (remote && !df_conflict_head && head_match && !remote_match) { | |
1633 | if (index && !same(index, remote) && !same(index, head)) | |
8ccba008 | 1634 | return o->gently ? -1 : reject_merge(index, o); |
076b0adc JS |
1635 | return merged_entry(remote, index, o); |
1636 | } | |
1637 | /* | |
1638 | * If we have an entry in the index cache, then we want to | |
1639 | * make sure that it matches head. | |
1640 | */ | |
4e7c4571 | 1641 | if (index && !same(index, head)) |
8ccba008 | 1642 | return o->gently ? -1 : reject_merge(index, o); |
076b0adc JS |
1643 | |
1644 | if (head) { | |
1645 | /* #5ALT, #15 */ | |
1646 | if (same(head, remote)) | |
1647 | return merged_entry(head, index, o); | |
1648 | /* #13, #3ALT */ | |
1649 | if (!df_conflict_remote && remote_match && !head_match) | |
1650 | return merged_entry(head, index, o); | |
1651 | } | |
1652 | ||
1653 | /* #1 */ | |
34110cd4 | 1654 | if (!head && !remote && any_anc_missing) |
076b0adc JS |
1655 | return 0; |
1656 | ||
cee2d6ae JH |
1657 | /* |
1658 | * Under the "aggressive" rule, we resolve mostly trivial | |
076b0adc JS |
1659 | * cases that we historically had git-merge-one-file resolve. |
1660 | */ | |
1661 | if (o->aggressive) { | |
cee2d6ae JH |
1662 | int head_deleted = !head; |
1663 | int remote_deleted = !remote; | |
eb9ae4b5 | 1664 | const struct cache_entry *ce = NULL; |
4c4caafc JH |
1665 | |
1666 | if (index) | |
0cf73755 | 1667 | ce = index; |
4c4caafc | 1668 | else if (head) |
0cf73755 | 1669 | ce = head; |
4c4caafc | 1670 | else if (remote) |
0cf73755 | 1671 | ce = remote; |
4c4caafc JH |
1672 | else { |
1673 | for (i = 1; i < o->head_idx; i++) { | |
1674 | if (stages[i] && stages[i] != o->df_conflict_entry) { | |
0cf73755 | 1675 | ce = stages[i]; |
4c4caafc JH |
1676 | break; |
1677 | } | |
1678 | } | |
1679 | } | |
1680 | ||
076b0adc JS |
1681 | /* |
1682 | * Deleted in both. | |
1683 | * Deleted in one and unchanged in the other. | |
1684 | */ | |
1685 | if ((head_deleted && remote_deleted) || | |
1686 | (head_deleted && remote && remote_match) || | |
1687 | (remote_deleted && head && head_match)) { | |
1688 | if (index) | |
1689 | return deleted_entry(index, index, o); | |
34110cd4 | 1690 | if (ce && !head_deleted) { |
08402b04 | 1691 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
203a2fe1 DB |
1692 | return -1; |
1693 | } | |
076b0adc JS |
1694 | return 0; |
1695 | } | |
1696 | /* | |
1697 | * Added in both, identically. | |
1698 | */ | |
1699 | if (no_anc_exists && head && remote && same(head, remote)) | |
1700 | return merged_entry(head, index, o); | |
1701 | ||
1702 | } | |
1703 | ||
1704 | /* Below are "no merge" cases, which require that the index be | |
1705 | * up-to-date to avoid the files getting overwritten with | |
1706 | * conflict resolution files. | |
1707 | */ | |
1708 | if (index) { | |
203a2fe1 DB |
1709 | if (verify_uptodate(index, o)) |
1710 | return -1; | |
076b0adc | 1711 | } |
076b0adc JS |
1712 | |
1713 | o->nontrivial_merge = 1; | |
1714 | ||
ea4b52a8 | 1715 | /* #2, #3, #4, #6, #7, #9, #10, #11. */ |
076b0adc JS |
1716 | count = 0; |
1717 | if (!head_match || !remote_match) { | |
1718 | for (i = 1; i < o->head_idx; i++) { | |
4c4caafc | 1719 | if (stages[i] && stages[i] != o->df_conflict_entry) { |
7f7932ab | 1720 | keep_entry(stages[i], o); |
076b0adc JS |
1721 | count++; |
1722 | break; | |
1723 | } | |
1724 | } | |
1725 | } | |
1726 | #if DBRT_DEBUG | |
1727 | else { | |
1728 | fprintf(stderr, "read-tree: warning #16 detected\n"); | |
1729 | show_stage_entry(stderr, "head ", stages[head_match]); | |
1730 | show_stage_entry(stderr, "remote ", stages[remote_match]); | |
1731 | } | |
1732 | #endif | |
7f7932ab JH |
1733 | if (head) { count += keep_entry(head, o); } |
1734 | if (remote) { count += keep_entry(remote, o); } | |
076b0adc JS |
1735 | return count; |
1736 | } | |
1737 | ||
1738 | /* | |
1739 | * Two-way merge. | |
1740 | * | |
1741 | * The rule is to "carry forward" what is in the index without losing | |
a75d7b54 | 1742 | * information across a "fast-forward", favoring a successful merge |
076b0adc JS |
1743 | * over a merge failure when it makes sense. For details of the |
1744 | * "carry forward" rule, please see <Documentation/git-read-tree.txt>. | |
1745 | * | |
1746 | */ | |
5828e835 RS |
1747 | int twoway_merge(const struct cache_entry * const *src, |
1748 | struct unpack_trees_options *o) | |
076b0adc | 1749 | { |
eb9ae4b5 RS |
1750 | const struct cache_entry *current = src[0]; |
1751 | const struct cache_entry *oldtree = src[1]; | |
1752 | const struct cache_entry *newtree = src[2]; | |
076b0adc JS |
1753 | |
1754 | if (o->merge_size != 2) | |
1755 | return error("Cannot do a twoway merge of %d trees", | |
1756 | o->merge_size); | |
1757 | ||
b8ba1535 JH |
1758 | if (oldtree == o->df_conflict_entry) |
1759 | oldtree = NULL; | |
1760 | if (newtree == o->df_conflict_entry) | |
1761 | newtree = NULL; | |
1762 | ||
076b0adc JS |
1763 | if (current) { |
1764 | if ((!oldtree && !newtree) || /* 4 and 5 */ | |
1765 | (!oldtree && newtree && | |
1766 | same(current, newtree)) || /* 6 and 7 */ | |
1767 | (oldtree && newtree && | |
1768 | same(oldtree, newtree)) || /* 14 and 15 */ | |
1769 | (oldtree && newtree && | |
b8ba1535 | 1770 | !same(oldtree, newtree) && /* 18 and 19 */ |
076b0adc | 1771 | same(current, newtree))) { |
7f7932ab | 1772 | return keep_entry(current, o); |
076b0adc JS |
1773 | } |
1774 | else if (oldtree && !newtree && same(current, oldtree)) { | |
1775 | /* 10 or 11 */ | |
1776 | return deleted_entry(oldtree, current, o); | |
1777 | } | |
1778 | else if (oldtree && newtree && | |
1779 | same(current, oldtree) && !same(current, newtree)) { | |
1780 | /* 20 or 21 */ | |
1781 | return merged_entry(newtree, current, o); | |
1782 | } | |
1783 | else { | |
1784 | /* all other failures */ | |
1785 | if (oldtree) | |
8ccba008 | 1786 | return o->gently ? -1 : reject_merge(oldtree, o); |
076b0adc | 1787 | if (current) |
8ccba008 | 1788 | return o->gently ? -1 : reject_merge(current, o); |
076b0adc | 1789 | if (newtree) |
8ccba008 | 1790 | return o->gently ? -1 : reject_merge(newtree, o); |
076b0adc JS |
1791 | return -1; |
1792 | } | |
1793 | } | |
55218834 JH |
1794 | else if (newtree) { |
1795 | if (oldtree && !o->initial_checkout) { | |
1796 | /* | |
1797 | * deletion of the path was staged; | |
1798 | */ | |
1799 | if (same(oldtree, newtree)) | |
1800 | return 1; | |
1801 | return reject_merge(oldtree, o); | |
1802 | } | |
076b0adc | 1803 | return merged_entry(newtree, current, o); |
55218834 | 1804 | } |
d699676d | 1805 | return deleted_entry(oldtree, current, o); |
076b0adc JS |
1806 | } |
1807 | ||
1808 | /* | |
1809 | * Bind merge. | |
1810 | * | |
1811 | * Keep the index entries at stage0, collapse stage1 but make sure | |
1812 | * stage0 does not have anything there. | |
1813 | */ | |
5828e835 RS |
1814 | int bind_merge(const struct cache_entry * const *src, |
1815 | struct unpack_trees_options *o) | |
076b0adc | 1816 | { |
eb9ae4b5 RS |
1817 | const struct cache_entry *old = src[0]; |
1818 | const struct cache_entry *a = src[1]; | |
076b0adc JS |
1819 | |
1820 | if (o->merge_size != 1) | |
82247e9b | 1821 | return error("Cannot do a bind merge of %d trees", |
076b0adc JS |
1822 | o->merge_size); |
1823 | if (a && old) | |
17e46426 | 1824 | return o->gently ? -1 : |
08353ebb | 1825 | error(ERRORMSG(o, ERROR_BIND_OVERLAP), a->name, old->name); |
076b0adc | 1826 | if (!a) |
7f7932ab | 1827 | return keep_entry(old, o); |
076b0adc JS |
1828 | else |
1829 | return merged_entry(a, NULL, o); | |
1830 | } | |
1831 | ||
1832 | /* | |
1833 | * One-way merge. | |
1834 | * | |
1835 | * The rule is: | |
1836 | * - take the stat information from stage0, take the data from stage1 | |
1837 | */ | |
5828e835 RS |
1838 | int oneway_merge(const struct cache_entry * const *src, |
1839 | struct unpack_trees_options *o) | |
076b0adc | 1840 | { |
eb9ae4b5 RS |
1841 | const struct cache_entry *old = src[0]; |
1842 | const struct cache_entry *a = src[1]; | |
076b0adc JS |
1843 | |
1844 | if (o->merge_size != 1) | |
1845 | return error("Cannot do a oneway merge of %d trees", | |
1846 | o->merge_size); | |
1847 | ||
78d3b06e | 1848 | if (!a || a == o->df_conflict_entry) |
076b0adc | 1849 | return deleted_entry(old, old, o); |
34110cd4 | 1850 | |
076b0adc | 1851 | if (old && same(old, a)) { |
34110cd4 | 1852 | int update = 0; |
686b2de0 | 1853 | if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) { |
076b0adc JS |
1854 | struct stat st; |
1855 | if (lstat(old->name, &st) || | |
56cac48c | 1856 | ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) |
34110cd4 | 1857 | update |= CE_UPDATE; |
076b0adc | 1858 | } |
34110cd4 LT |
1859 | add_entry(o, old, update, 0); |
1860 | return 0; | |
076b0adc JS |
1861 | } |
1862 | return merged_entry(a, old, o); | |
1863 | } |