]>
Commit | Line | Data |
---|---|---|
12dccc16 | 1 | #include "cache.h" |
8e440259 | 2 | #include "blob.h" |
cbd53a21 | 3 | #include "object-store.h" |
8ca12c0d | 4 | #include "dir.h" |
dd8e9121 | 5 | #include "streaming.h" |
6d14eac3 | 6 | #include "submodule.h" |
52f1d62e | 7 | #include "progress.h" |
883e248b | 8 | #include "fsmonitor.h" |
d052cc03 | 9 | #include "entry.h" |
04155bda | 10 | #include "parallel-checkout.h" |
12dccc16 | 11 | |
81a9aa60 KB |
12 | static void create_directories(const char *path, int path_len, |
13 | const struct checkout *state) | |
12dccc16 | 14 | { |
3733e694 | 15 | char *buf = xmallocz(path_len); |
81a9aa60 KB |
16 | int len = 0; |
17 | ||
18 | while (len < path_len) { | |
19 | do { | |
20 | buf[len] = path[len]; | |
21 | len++; | |
22 | } while (len < path_len && path[len] != '/'); | |
23 | if (len >= path_len) | |
24 | break; | |
12dccc16 | 25 | buf[len] = 0; |
fa2e71c9 | 26 | |
bad4a54f KB |
27 | /* |
28 | * For 'checkout-index --prefix=<dir>', <dir> is | |
29 | * allowed to be a symlink to an existing directory, | |
30 | * and we set 'state->base_dir_len' below, such that | |
31 | * we test the path components of the prefix with the | |
32 | * stat() function instead of the lstat() function. | |
33 | */ | |
57199892 | 34 | if (has_dirs_only_path(buf, len, state->base_dir_len)) |
fa2e71c9 JH |
35 | continue; /* ok, it is already a directory. */ |
36 | ||
37 | /* | |
bad4a54f KB |
38 | * If this mkdir() would fail, it could be that there |
39 | * is already a symlink or something else exists | |
40 | * there, therefore we then try to unlink it and try | |
41 | * one more time to create the directory. | |
fa2e71c9 | 42 | */ |
f312de01 | 43 | if (mkdir(buf, 0777)) { |
fa2e71c9 | 44 | if (errno == EEXIST && state->force && |
691f1a28 | 45 | !unlink_or_warn(buf) && !mkdir(buf, 0777)) |
fa2e71c9 | 46 | continue; |
0721c314 | 47 | die_errno("cannot create directory at '%s'", buf); |
12dccc16 LT |
48 | } |
49 | } | |
50 | free(buf); | |
51 | } | |
52 | ||
2f29e0c6 | 53 | static void remove_subtree(struct strbuf *path) |
12dccc16 | 54 | { |
2f29e0c6 | 55 | DIR *dir = opendir(path->buf); |
12dccc16 | 56 | struct dirent *de; |
2f29e0c6 | 57 | int origlen = path->len; |
a6080a0a | 58 | |
12dccc16 | 59 | if (!dir) |
2f29e0c6 | 60 | die_errno("cannot opendir '%s'", path->buf); |
b548f0f1 | 61 | while ((de = readdir_skip_dot_and_dotdot(dir)) != NULL) { |
12dccc16 | 62 | struct stat st; |
2f29e0c6 | 63 | |
2f29e0c6 MH |
64 | strbuf_addch(path, '/'); |
65 | strbuf_addstr(path, de->d_name); | |
66 | if (lstat(path->buf, &st)) | |
67 | die_errno("cannot lstat '%s'", path->buf); | |
12dccc16 | 68 | if (S_ISDIR(st.st_mode)) |
2f29e0c6 MH |
69 | remove_subtree(path); |
70 | else if (unlink(path->buf)) | |
71 | die_errno("cannot unlink '%s'", path->buf); | |
72 | strbuf_setlen(path, origlen); | |
12dccc16 LT |
73 | } |
74 | closedir(dir); | |
2f29e0c6 MH |
75 | if (rmdir(path->buf)) |
76 | die_errno("cannot rmdir '%s'", path->buf); | |
12dccc16 LT |
77 | } |
78 | ||
d48a72f3 | 79 | static int create_file(const char *path, unsigned int mode) |
12dccc16 | 80 | { |
12dccc16 | 81 | mode = (mode & 0100) ? 0777 : 0666; |
781411ed | 82 | return open(path, O_WRONLY | O_CREAT | O_EXCL, mode); |
12dccc16 LT |
83 | } |
84 | ||
e9aa762c | 85 | void *read_blob_entry(const struct cache_entry *ce, size_t *size) |
f0807e62 LT |
86 | { |
87 | enum object_type type; | |
e9aa762c MC |
88 | unsigned long ul; |
89 | void *blob_data = read_object_file(&ce->oid, &type, &ul); | |
f0807e62 | 90 | |
e9aa762c | 91 | *size = ul; |
d8f71807 | 92 | if (blob_data) { |
f0807e62 | 93 | if (type == OBJ_BLOB) |
d8f71807 BW |
94 | return blob_data; |
95 | free(blob_data); | |
f0807e62 LT |
96 | } |
97 | return NULL; | |
98 | } | |
99 | ||
9c5e6c80 | 100 | static int open_output_fd(char *path, const struct cache_entry *ce, int to_tempfile) |
fd5db55d JH |
101 | { |
102 | int symlink = (ce->ce_mode & S_IFMT) != S_IFREG; | |
103 | if (to_tempfile) { | |
330c8e26 JK |
104 | xsnprintf(path, TEMPORARY_FILENAME_LENGTH, "%s", |
105 | symlink ? ".merge_link_XXXXXX" : ".merge_file_XXXXXX"); | |
fd5db55d JH |
106 | return mkstemp(path); |
107 | } else { | |
108 | return create_file(path, !symlink ? ce->ce_mode : 0666); | |
109 | } | |
110 | } | |
111 | ||
49cfd903 | 112 | int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st) |
fd5db55d JH |
113 | { |
114 | /* use fstat() only when path == ce->name */ | |
115 | if (fstat_is_reliable() && | |
116 | state->refresh_cache && !state->base_dir_len) { | |
35e6e212 | 117 | return !fstat(fd, st); |
fd5db55d JH |
118 | } |
119 | return 0; | |
120 | } | |
121 | ||
9c5e6c80 | 122 | static int streaming_write_entry(const struct cache_entry *ce, char *path, |
b6691092 | 123 | struct stream_filter *filter, |
dd8e9121 JH |
124 | const struct checkout *state, int to_tempfile, |
125 | int *fstat_done, struct stat *statbuf) | |
126 | { | |
d9c31e14 | 127 | int result = 0; |
47a02ff2 | 128 | int fd; |
dd8e9121 JH |
129 | |
130 | fd = open_output_fd(path, ce, to_tempfile); | |
d9c31e14 JK |
131 | if (fd < 0) |
132 | return -1; | |
133 | ||
7eda0e4f | 134 | result |= stream_blob_to_fd(fd, &ce->oid, filter, 1); |
49cfd903 | 135 | *fstat_done = fstat_checkout_output(fd, state, statbuf); |
d9c31e14 JK |
136 | result |= close(fd); |
137 | ||
138 | if (result) | |
dd8e9121 JH |
139 | unlink(path); |
140 | return result; | |
141 | } | |
142 | ||
2841e8f8 LS |
143 | void enable_delayed_checkout(struct checkout *state) |
144 | { | |
145 | if (!state->delayed_checkout) { | |
146 | state->delayed_checkout = xmalloc(sizeof(*state->delayed_checkout)); | |
147 | state->delayed_checkout->state = CE_CAN_DELAY; | |
bc40dfb1 ÆAB |
148 | string_list_init_nodup(&state->delayed_checkout->filters); |
149 | string_list_init_nodup(&state->delayed_checkout->paths); | |
2841e8f8 LS |
150 | } |
151 | } | |
152 | ||
153 | static int remove_available_paths(struct string_list_item *item, void *cb_data) | |
154 | { | |
155 | struct string_list *available_paths = cb_data; | |
156 | struct string_list_item *available; | |
157 | ||
158 | available = string_list_lookup(available_paths, item->string); | |
159 | if (available) | |
160 | available->util = (void *)item->string; | |
161 | return !available; | |
162 | } | |
163 | ||
7a132c62 MT |
164 | int finish_delayed_checkout(struct checkout *state, int *nr_checkouts, |
165 | int show_progress) | |
2841e8f8 LS |
166 | { |
167 | int errs = 0; | |
bf6d819b | 168 | unsigned processed_paths = 0; |
52f1d62e | 169 | off_t filtered_bytes = 0; |
2841e8f8 | 170 | struct string_list_item *filter, *path; |
bf6d819b | 171 | struct progress *progress = NULL; |
2841e8f8 LS |
172 | struct delayed_checkout *dco = state->delayed_checkout; |
173 | ||
174 | if (!state->delayed_checkout) | |
175 | return errs; | |
176 | ||
177 | dco->state = CE_RETRY; | |
bf6d819b SG |
178 | if (show_progress) |
179 | progress = start_delayed_progress(_("Filtering content"), dco->paths.nr); | |
2841e8f8 LS |
180 | while (dco->filters.nr > 0) { |
181 | for_each_string_list_item(filter, &dco->filters) { | |
182 | struct string_list available_paths = STRING_LIST_INIT_NODUP; | |
183 | ||
184 | if (!async_query_available_blobs(filter->string, &available_paths)) { | |
185 | /* Filter reported an error */ | |
186 | errs = 1; | |
187 | filter->string = ""; | |
188 | continue; | |
189 | } | |
190 | if (available_paths.nr <= 0) { | |
191 | /* | |
192 | * Filter responded with no entries. That means | |
193 | * the filter is done and we can remove the | |
194 | * filter from the list (see | |
195 | * "string_list_remove_empty_items" call below). | |
196 | */ | |
197 | filter->string = ""; | |
198 | continue; | |
199 | } | |
200 | ||
201 | /* | |
202 | * In dco->paths we store a list of all delayed paths. | |
203 | * The filter just send us a list of available paths. | |
204 | * Remove them from the list. | |
205 | */ | |
206 | filter_string_list(&dco->paths, 0, | |
207 | &remove_available_paths, &available_paths); | |
208 | ||
209 | for_each_string_list_item(path, &available_paths) { | |
210 | struct cache_entry* ce; | |
211 | ||
212 | if (!path->util) { | |
213 | error("external filter '%s' signaled that '%s' " | |
214 | "is now available although it has not been " | |
215 | "delayed earlier", | |
216 | filter->string, path->string); | |
217 | errs |= 1; | |
218 | ||
219 | /* | |
220 | * Do not ask the filter for available blobs, | |
221 | * again, as the filter is likely buggy. | |
222 | */ | |
223 | filter->string = ""; | |
224 | continue; | |
225 | } | |
226 | ce = index_file_exists(state->istate, path->string, | |
227 | strlen(path->string), 0); | |
52f1d62e | 228 | if (ce) { |
bf6d819b | 229 | display_progress(progress, ++processed_paths); |
0f086e6d | 230 | errs |= checkout_entry(ce, state, NULL, nr_checkouts); |
52f1d62e LS |
231 | filtered_bytes += ce->ce_stat_data.sd_size; |
232 | display_throughput(progress, filtered_bytes); | |
233 | } else | |
234 | errs = 1; | |
2841e8f8 LS |
235 | } |
236 | } | |
237 | string_list_remove_empty_items(&dco->filters, 0); | |
238 | } | |
52f1d62e | 239 | stop_progress(&progress); |
2841e8f8 LS |
240 | string_list_clear(&dco->filters, 0); |
241 | ||
242 | /* At this point we should not have any delayed paths anymore. */ | |
243 | errs |= dco->paths.nr; | |
244 | for_each_string_list_item(path, &dco->paths) { | |
245 | error("'%s' was not filtered properly", path->string); | |
246 | } | |
247 | string_list_clear(&dco->paths, 0); | |
248 | ||
249 | free(dco); | |
250 | state->delayed_checkout = NULL; | |
251 | ||
252 | return errs; | |
253 | } | |
254 | ||
584a0d13 MT |
255 | void update_ce_after_write(const struct checkout *state, struct cache_entry *ce, |
256 | struct stat *st) | |
257 | { | |
258 | if (state->refresh_cache) { | |
259 | assert(state->istate); | |
260 | fill_stat_cache_info(state->istate, ce, st); | |
261 | ce->ce_flags |= CE_UPDATE_IN_BASE; | |
262 | mark_fsmonitor_invalid(state->istate, ce); | |
263 | state->istate->cache_changed |= CE_ENTRY_CHANGED; | |
264 | } | |
265 | } | |
266 | ||
30419e7e MT |
267 | /* Note: ca is used (and required) iff the entry refers to a regular file. */ |
268 | static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca, | |
269 | const struct checkout *state, int to_tempfile) | |
12dccc16 | 270 | { |
4857c761 | 271 | unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT; |
c602d3a9 | 272 | struct delayed_checkout *dco = state->delayed_checkout; |
e4c72923 | 273 | int fd, ret, fstat_done = 0; |
d8f71807 | 274 | char *new_blob; |
4857c761 | 275 | struct strbuf buf = STRBUF_INIT; |
e9aa762c | 276 | size_t size; |
564bde9a JK |
277 | ssize_t wrote; |
278 | size_t newsize = 0; | |
e4c72923 | 279 | struct stat st; |
6d14eac3 | 280 | const struct submodule *sub; |
c397aac0 | 281 | struct checkout_metadata meta; |
282 | ||
283 | clone_checkout_metadata(&meta, &state->meta, &ce->oid); | |
4857c761 | 284 | |
b6691092 | 285 | if (ce_mode_s_ifmt == S_IFREG) { |
30419e7e | 286 | struct stream_filter *filter = get_stream_filter_ca(ca, &ce->oid); |
b6691092 JH |
287 | if (filter && |
288 | !streaming_write_entry(ce, path, filter, | |
289 | state, to_tempfile, | |
290 | &fstat_done, &st)) | |
291 | goto finish; | |
292 | } | |
dd8e9121 | 293 | |
4857c761 | 294 | switch (ce_mode_s_ifmt) { |
4857c761 | 295 | case S_IFLNK: |
d8f71807 BW |
296 | new_blob = read_blob_entry(ce, &size); |
297 | if (!new_blob) | |
d43e9073 | 298 | return error("unable to read sha1 file of %s (%s)", |
9334ea8e | 299 | ce->name, oid_to_hex(&ce->oid)); |
1a9d7e9b | 300 | |
7cbbf9d6 JK |
301 | /* |
302 | * We can't make a real symlink; write out a regular file entry | |
303 | * with the symlink destination as its contents. | |
304 | */ | |
305 | if (!has_symlinks || to_tempfile) | |
306 | goto write_file_entry; | |
307 | ||
d8f71807 BW |
308 | ret = symlink(new_blob, path); |
309 | free(new_blob); | |
7cbbf9d6 JK |
310 | if (ret) |
311 | return error_errno("unable to create symlink %s", path); | |
312 | break; | |
313 | ||
314 | case S_IFREG: | |
c602d3a9 JK |
315 | /* |
316 | * We do not send the blob in case of a retry, so do not | |
317 | * bother reading it at all. | |
318 | */ | |
7cbbf9d6 | 319 | if (dco && dco->state == CE_RETRY) { |
d8f71807 | 320 | new_blob = NULL; |
c602d3a9 JK |
321 | size = 0; |
322 | } else { | |
d8f71807 BW |
323 | new_blob = read_blob_entry(ce, &size); |
324 | if (!new_blob) | |
c602d3a9 | 325 | return error("unable to read sha1 file of %s (%s)", |
9334ea8e | 326 | ce->name, oid_to_hex(&ce->oid)); |
4857c761 KB |
327 | } |
328 | ||
1a9d7e9b JH |
329 | /* |
330 | * Convert from git internal format to working tree format | |
331 | */ | |
7cbbf9d6 | 332 | if (dco && dco->state != CE_NO_DELAY) { |
30419e7e MT |
333 | ret = async_convert_to_working_tree_ca(ca, ce->name, |
334 | new_blob, size, | |
335 | &buf, &meta, dco); | |
7cbbf9d6 | 336 | if (ret && string_list_has_string(&dco->paths, ce->name)) { |
d8f71807 | 337 | free(new_blob); |
7cbbf9d6 | 338 | goto delayed; |
2841e8f8 | 339 | } |
30419e7e MT |
340 | } else { |
341 | ret = convert_to_working_tree_ca(ca, ce->name, new_blob, | |
342 | size, &buf, &meta); | |
343 | } | |
7cbbf9d6 JK |
344 | |
345 | if (ret) { | |
d8f71807 BW |
346 | free(new_blob); |
347 | new_blob = strbuf_detach(&buf, &newsize); | |
7cbbf9d6 | 348 | size = newsize; |
1a9d7e9b | 349 | } |
7cbbf9d6 JK |
350 | /* |
351 | * No "else" here as errors from convert are OK at this | |
352 | * point. If the error would have been fatal (e.g. | |
353 | * filter is required), then we would have died already. | |
354 | */ | |
1a9d7e9b | 355 | |
7cbbf9d6 | 356 | write_file_entry: |
fd5db55d | 357 | fd = open_output_fd(path, ce, to_tempfile); |
12dccc16 | 358 | if (fd < 0) { |
d8f71807 | 359 | free(new_blob); |
e1ebb3c2 | 360 | return error_errno("unable to create file %s", path); |
12dccc16 | 361 | } |
6c510bee | 362 | |
d8f71807 | 363 | wrote = write_in_full(fd, new_blob, size); |
fd5db55d | 364 | if (!to_tempfile) |
49cfd903 | 365 | fstat_done = fstat_checkout_output(fd, state, &st); |
12dccc16 | 366 | close(fd); |
d8f71807 | 367 | free(new_blob); |
564bde9a | 368 | if (wrote < 0) |
d43e9073 | 369 | return error("unable to write file %s", path); |
12dccc16 | 370 | break; |
7cbbf9d6 | 371 | |
302b9282 | 372 | case S_IFGITLINK: |
f0807e62 | 373 | if (to_tempfile) |
9334ea8e | 374 | return error("cannot create temporary submodule %s", ce->name); |
f0807e62 | 375 | if (mkdir(path, 0777) < 0) |
42063f95 | 376 | return error("cannot create submodule directory %s", path); |
6d14eac3 SB |
377 | sub = submodule_from_ce(ce); |
378 | if (sub) | |
379 | return submodule_move_head(ce->name, | |
cd279e2e SB |
380 | NULL, oid_to_hex(&ce->oid), |
381 | state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0); | |
f0807e62 | 382 | break; |
7cbbf9d6 | 383 | |
12dccc16 | 384 | default: |
9334ea8e | 385 | return error("unknown file mode for %s in index", ce->name); |
12dccc16 LT |
386 | } |
387 | ||
dd8e9121 | 388 | finish: |
6ee67f26 | 389 | if (state->refresh_cache) { |
584a0d13 MT |
390 | if (!fstat_done && lstat(ce->name, &st) < 0) |
391 | return error_errno("unable to stat just-written file %s", | |
392 | ce->name); | |
393 | update_ce_after_write(state, ce , &st); | |
12dccc16 | 394 | } |
03b95333 | 395 | delayed: |
12dccc16 LT |
396 | return 0; |
397 | } | |
398 | ||
b6986d8a LT |
399 | /* |
400 | * This is like 'lstat()', except it refuses to follow symlinks | |
da02ca50 | 401 | * in the path, after skipping "skiplen". |
b6986d8a | 402 | */ |
61b97df7 | 403 | static int check_path(const char *path, int len, struct stat *st, int skiplen) |
b6986d8a | 404 | { |
da02ca50 JH |
405 | const char *slash = path + len; |
406 | ||
407 | while (path < slash && *slash != '/') | |
408 | slash--; | |
409 | if (!has_dirs_only_path(path, slash - path, skiplen)) { | |
b6986d8a LT |
410 | errno = ENOENT; |
411 | return -1; | |
412 | } | |
413 | return lstat(path, st); | |
414 | } | |
415 | ||
b878579a NTND |
416 | static void mark_colliding_entries(const struct checkout *state, |
417 | struct cache_entry *ce, struct stat *st) | |
418 | { | |
419 | int i, trust_ino = check_stat; | |
420 | ||
e66ceca9 | 421 | #if defined(GIT_WINDOWS_NATIVE) || defined(__CYGWIN__) |
b878579a NTND |
422 | trust_ino = 0; |
423 | #endif | |
424 | ||
425 | ce->ce_flags |= CE_MATCHED; | |
426 | ||
3450a304 DS |
427 | /* TODO: audit for interaction with sparse-index. */ |
428 | ensure_full_index(state->istate); | |
b878579a NTND |
429 | for (i = 0; i < state->istate->cache_nr; i++) { |
430 | struct cache_entry *dup = state->istate->cache[i]; | |
431 | ||
04155bda MT |
432 | if (dup == ce) { |
433 | /* | |
434 | * Parallel checkout doesn't create the files in index | |
435 | * order. So the other side of the collision may appear | |
436 | * after the given cache_entry in the array. | |
437 | */ | |
438 | if (parallel_checkout_status() == PC_RUNNING) | |
439 | continue; | |
440 | else | |
441 | break; | |
442 | } | |
b878579a NTND |
443 | |
444 | if (dup->ce_flags & (CE_MATCHED | CE_VALID | CE_SKIP_WORKTREE)) | |
445 | continue; | |
446 | ||
e66ceca9 | 447 | if ((trust_ino && !match_stat_data(&dup->ce_stat_data, st)) || |
b878579a NTND |
448 | (!trust_ino && !fspathcmp(ce->name, dup->name))) { |
449 | dup->ce_flags |= CE_MATCHED; | |
450 | break; | |
451 | } | |
452 | } | |
453 | } | |
454 | ||
ae22751f MT |
455 | int checkout_entry_ca(struct cache_entry *ce, struct conv_attrs *ca, |
456 | const struct checkout *state, char *topath, | |
457 | int *nr_checkouts) | |
12dccc16 | 458 | { |
f63272a3 | 459 | static struct strbuf path = STRBUF_INIT; |
de84f99c | 460 | struct stat st; |
ae22751f | 461 | struct conv_attrs ca_buf; |
12dccc16 | 462 | |
536ec183 TG |
463 | if (ce->ce_flags & CE_WT_REMOVE) { |
464 | if (topath) | |
465 | /* | |
466 | * No content and thus no path to create, so we have | |
467 | * no pathname to return. | |
468 | */ | |
469 | BUG("Can't remove entry to a path"); | |
470 | unlink_entry(ce); | |
471 | return 0; | |
472 | } | |
473 | ||
30419e7e | 474 | if (topath) { |
ae22751f | 475 | if (S_ISREG(ce->ce_mode) && !ca) { |
30419e7e MT |
476 | convert_attrs(state->istate, &ca_buf, ce->name); |
477 | ca = &ca_buf; | |
478 | } | |
479 | return write_entry(ce, topath, ca, state, 1); | |
480 | } | |
de84f99c | 481 | |
f63272a3 MH |
482 | strbuf_reset(&path); |
483 | strbuf_add(&path, state->base_dir, state->base_dir_len); | |
484 | strbuf_add(&path, ce->name, ce_namelen(ce)); | |
12dccc16 | 485 | |
f63272a3 | 486 | if (!check_path(path.buf, path.len, &st, state->base_dir_len)) { |
6d14eac3 | 487 | const struct submodule *sub; |
74cfc0ee NTND |
488 | unsigned changed = ie_match_stat(state->istate, ce, &st, |
489 | CE_MATCH_IGNORE_VALID | CE_MATCH_IGNORE_SKIP_WORKTREE); | |
6d14eac3 SB |
490 | /* |
491 | * Needs to be checked before !changed returns early, | |
492 | * as the possibly empty directory was not changed | |
493 | */ | |
494 | sub = submodule_from_ce(ce); | |
495 | if (sub) { | |
496 | int err; | |
497 | if (!is_submodule_populated_gently(ce->name, &err)) { | |
498 | struct stat sb; | |
499 | if (lstat(ce->name, &sb)) | |
500 | die(_("could not stat file '%s'"), ce->name); | |
501 | if (!(st.st_mode & S_IFDIR)) | |
502 | unlink_or_warn(ce->name); | |
503 | ||
504 | return submodule_move_head(ce->name, | |
cd279e2e | 505 | NULL, oid_to_hex(&ce->oid), 0); |
6d14eac3 SB |
506 | } else |
507 | return submodule_move_head(ce->name, | |
508 | "HEAD", oid_to_hex(&ce->oid), | |
cd279e2e | 509 | state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0); |
6d14eac3 SB |
510 | } |
511 | ||
12dccc16 LT |
512 | if (!changed) |
513 | return 0; | |
514 | if (!state->force) { | |
515 | if (!state->quiet) | |
f63272a3 MH |
516 | fprintf(stderr, |
517 | "%s already exists, no checkout\n", | |
518 | path.buf); | |
4b12dae6 | 519 | return -1; |
12dccc16 LT |
520 | } |
521 | ||
b878579a NTND |
522 | if (state->clone) |
523 | mark_colliding_entries(state, ce, &st); | |
524 | ||
12dccc16 LT |
525 | /* |
526 | * We unlink the old file, to get the new one with the | |
527 | * right permissions (including umask, which is nasty | |
528 | * to emulate by hand - much easier to let the system | |
529 | * just do the right thing) | |
530 | */ | |
d48a72f3 | 531 | if (S_ISDIR(st.st_mode)) { |
f0807e62 | 532 | /* If it is a gitlink, leave it alone! */ |
7a51ed66 | 533 | if (S_ISGITLINK(ce->ce_mode)) |
f0807e62 | 534 | return 0; |
2f29e0c6 | 535 | remove_subtree(&path); |
f63272a3 | 536 | } else if (unlink(path.buf)) |
e1ebb3c2 | 537 | return error_errno("unable to unlink old '%s'", path.buf); |
de84f99c | 538 | } else if (state->not_new) |
12dccc16 | 539 | return 0; |
f63272a3 MH |
540 | |
541 | create_directories(path.buf, path.len, state); | |
30419e7e | 542 | |
0f086e6d NTND |
543 | if (nr_checkouts) |
544 | (*nr_checkouts)++; | |
30419e7e | 545 | |
ae22751f | 546 | if (S_ISREG(ce->ce_mode) && !ca) { |
30419e7e MT |
547 | convert_attrs(state->istate, &ca_buf, ce->name); |
548 | ca = &ca_buf; | |
549 | } | |
550 | ||
04155bda MT |
551 | if (!enqueue_checkout(ce, ca)) |
552 | return 0; | |
553 | ||
30419e7e | 554 | return write_entry(ce, path.buf, ca, state, 0); |
12dccc16 | 555 | } |
b702dd12 TG |
556 | |
557 | void unlink_entry(const struct cache_entry *ce) | |
558 | { | |
559 | const struct submodule *sub = submodule_from_ce(ce); | |
560 | if (sub) { | |
561 | /* state.force is set at the caller. */ | |
562 | submodule_move_head(ce->name, "HEAD", NULL, | |
563 | SUBMODULE_MOVE_HEAD_FORCE); | |
564 | } | |
fab78a0c | 565 | if (check_leading_path(ce->name, ce_namelen(ce), 1) >= 0) |
b702dd12 TG |
566 | return; |
567 | if (remove_or_warn(ce->ce_mode, ce->name)) | |
568 | return; | |
569 | schedule_dir_for_removal(ce->name, ce_namelen(ce)); | |
570 | } |