]> git.ipfire.org Git - thirdparty/git.git/blame - entry.c
update-index: add a new --force-write-index option
[thirdparty/git.git] / entry.c
CommitLineData
12dccc16 1#include "cache.h"
8e440259 2#include "blob.h"
8ca12c0d 3#include "dir.h"
dd8e9121 4#include "streaming.h"
6d14eac3 5#include "submodule.h"
52f1d62e 6#include "progress.h"
12dccc16 7
81a9aa60
KB
8static void create_directories(const char *path, int path_len,
9 const struct checkout *state)
12dccc16 10{
3733e694 11 char *buf = xmallocz(path_len);
81a9aa60
KB
12 int len = 0;
13
14 while (len < path_len) {
15 do {
16 buf[len] = path[len];
17 len++;
18 } while (len < path_len && path[len] != '/');
19 if (len >= path_len)
20 break;
12dccc16 21 buf[len] = 0;
fa2e71c9 22
bad4a54f
KB
23 /*
24 * For 'checkout-index --prefix=<dir>', <dir> is
25 * allowed to be a symlink to an existing directory,
26 * and we set 'state->base_dir_len' below, such that
27 * we test the path components of the prefix with the
28 * stat() function instead of the lstat() function.
29 */
57199892 30 if (has_dirs_only_path(buf, len, state->base_dir_len))
fa2e71c9
JH
31 continue; /* ok, it is already a directory. */
32
33 /*
bad4a54f
KB
34 * If this mkdir() would fail, it could be that there
35 * is already a symlink or something else exists
36 * there, therefore we then try to unlink it and try
37 * one more time to create the directory.
fa2e71c9 38 */
f312de01 39 if (mkdir(buf, 0777)) {
fa2e71c9 40 if (errno == EEXIST && state->force &&
691f1a28 41 !unlink_or_warn(buf) && !mkdir(buf, 0777))
fa2e71c9 42 continue;
0721c314 43 die_errno("cannot create directory at '%s'", buf);
12dccc16
LT
44 }
45 }
46 free(buf);
47}
48
2f29e0c6 49static void remove_subtree(struct strbuf *path)
12dccc16 50{
2f29e0c6 51 DIR *dir = opendir(path->buf);
12dccc16 52 struct dirent *de;
2f29e0c6 53 int origlen = path->len;
a6080a0a 54
12dccc16 55 if (!dir)
2f29e0c6 56 die_errno("cannot opendir '%s'", path->buf);
12dccc16
LT
57 while ((de = readdir(dir)) != NULL) {
58 struct stat st;
2f29e0c6 59
8ca12c0d 60 if (is_dot_or_dotdot(de->d_name))
12dccc16 61 continue;
2f29e0c6
MH
62
63 strbuf_addch(path, '/');
64 strbuf_addstr(path, de->d_name);
65 if (lstat(path->buf, &st))
66 die_errno("cannot lstat '%s'", path->buf);
12dccc16 67 if (S_ISDIR(st.st_mode))
2f29e0c6
MH
68 remove_subtree(path);
69 else if (unlink(path->buf))
70 die_errno("cannot unlink '%s'", path->buf);
71 strbuf_setlen(path, origlen);
12dccc16
LT
72 }
73 closedir(dir);
2f29e0c6
MH
74 if (rmdir(path->buf))
75 die_errno("cannot rmdir '%s'", path->buf);
12dccc16
LT
76}
77
d48a72f3 78static int create_file(const char *path, unsigned int mode)
12dccc16 79{
12dccc16 80 mode = (mode & 0100) ? 0777 : 0666;
781411ed 81 return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
12dccc16
LT
82}
83
9c5e6c80 84static void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
f0807e62
LT
85{
86 enum object_type type;
99d1a986 87 void *new = read_sha1_file(ce->oid.hash, &type, size);
f0807e62
LT
88
89 if (new) {
90 if (type == OBJ_BLOB)
91 return new;
92 free(new);
93 }
94 return NULL;
95}
96
9c5e6c80 97static int open_output_fd(char *path, const struct cache_entry *ce, int to_tempfile)
fd5db55d
JH
98{
99 int symlink = (ce->ce_mode & S_IFMT) != S_IFREG;
100 if (to_tempfile) {
330c8e26
JK
101 xsnprintf(path, TEMPORARY_FILENAME_LENGTH, "%s",
102 symlink ? ".merge_link_XXXXXX" : ".merge_file_XXXXXX");
fd5db55d
JH
103 return mkstemp(path);
104 } else {
105 return create_file(path, !symlink ? ce->ce_mode : 0666);
106 }
107}
108
109static int fstat_output(int fd, const struct checkout *state, struct stat *st)
110{
111 /* use fstat() only when path == ce->name */
112 if (fstat_is_reliable() &&
113 state->refresh_cache && !state->base_dir_len) {
114 fstat(fd, st);
115 return 1;
116 }
117 return 0;
118}
119
9c5e6c80 120static int streaming_write_entry(const struct cache_entry *ce, char *path,
b6691092 121 struct stream_filter *filter,
dd8e9121
JH
122 const struct checkout *state, int to_tempfile,
123 int *fstat_done, struct stat *statbuf)
124{
d9c31e14 125 int result = 0;
47a02ff2 126 int fd;
dd8e9121
JH
127
128 fd = open_output_fd(path, ce, to_tempfile);
d9c31e14
JK
129 if (fd < 0)
130 return -1;
131
7eda0e4f 132 result |= stream_blob_to_fd(fd, &ce->oid, filter, 1);
d9c31e14
JK
133 *fstat_done = fstat_output(fd, state, statbuf);
134 result |= close(fd);
135
136 if (result)
dd8e9121
JH
137 unlink(path);
138 return result;
139}
140
2841e8f8
LS
141void enable_delayed_checkout(struct checkout *state)
142{
143 if (!state->delayed_checkout) {
144 state->delayed_checkout = xmalloc(sizeof(*state->delayed_checkout));
145 state->delayed_checkout->state = CE_CAN_DELAY;
146 string_list_init(&state->delayed_checkout->filters, 0);
147 string_list_init(&state->delayed_checkout->paths, 0);
148 }
149}
150
151static int remove_available_paths(struct string_list_item *item, void *cb_data)
152{
153 struct string_list *available_paths = cb_data;
154 struct string_list_item *available;
155
156 available = string_list_lookup(available_paths, item->string);
157 if (available)
158 available->util = (void *)item->string;
159 return !available;
160}
161
162int finish_delayed_checkout(struct checkout *state)
163{
164 int errs = 0;
52f1d62e
LS
165 unsigned delayed_object_count;
166 off_t filtered_bytes = 0;
2841e8f8 167 struct string_list_item *filter, *path;
52f1d62e 168 struct progress *progress;
2841e8f8
LS
169 struct delayed_checkout *dco = state->delayed_checkout;
170
171 if (!state->delayed_checkout)
172 return errs;
173
174 dco->state = CE_RETRY;
52f1d62e 175 delayed_object_count = dco->paths.nr;
7fbbd3ec 176 progress = start_delayed_progress(_("Filtering content"), delayed_object_count);
2841e8f8
LS
177 while (dco->filters.nr > 0) {
178 for_each_string_list_item(filter, &dco->filters) {
179 struct string_list available_paths = STRING_LIST_INIT_NODUP;
52f1d62e 180 display_progress(progress, delayed_object_count - dco->paths.nr);
2841e8f8
LS
181
182 if (!async_query_available_blobs(filter->string, &available_paths)) {
183 /* Filter reported an error */
184 errs = 1;
185 filter->string = "";
186 continue;
187 }
188 if (available_paths.nr <= 0) {
189 /*
190 * Filter responded with no entries. That means
191 * the filter is done and we can remove the
192 * filter from the list (see
193 * "string_list_remove_empty_items" call below).
194 */
195 filter->string = "";
196 continue;
197 }
198
199 /*
200 * In dco->paths we store a list of all delayed paths.
201 * The filter just send us a list of available paths.
202 * Remove them from the list.
203 */
204 filter_string_list(&dco->paths, 0,
205 &remove_available_paths, &available_paths);
206
207 for_each_string_list_item(path, &available_paths) {
208 struct cache_entry* ce;
209
210 if (!path->util) {
211 error("external filter '%s' signaled that '%s' "
212 "is now available although it has not been "
213 "delayed earlier",
214 filter->string, path->string);
215 errs |= 1;
216
217 /*
218 * Do not ask the filter for available blobs,
219 * again, as the filter is likely buggy.
220 */
221 filter->string = "";
222 continue;
223 }
224 ce = index_file_exists(state->istate, path->string,
225 strlen(path->string), 0);
52f1d62e
LS
226 if (ce) {
227 errs |= checkout_entry(ce, state, NULL);
228 filtered_bytes += ce->ce_stat_data.sd_size;
229 display_throughput(progress, filtered_bytes);
230 } else
231 errs = 1;
2841e8f8
LS
232 }
233 }
234 string_list_remove_empty_items(&dco->filters, 0);
235 }
52f1d62e 236 stop_progress(&progress);
2841e8f8
LS
237 string_list_clear(&dco->filters, 0);
238
239 /* At this point we should not have any delayed paths anymore. */
240 errs |= dco->paths.nr;
241 for_each_string_list_item(path, &dco->paths) {
242 error("'%s' was not filtered properly", path->string);
243 }
244 string_list_clear(&dco->paths, 0);
245
246 free(dco);
247 state->delayed_checkout = NULL;
248
249 return errs;
250}
251
9c5e6c80
NTND
252static int write_entry(struct cache_entry *ce,
253 char *path, const struct checkout *state, int to_tempfile)
12dccc16 254{
4857c761 255 unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT;
e4c72923 256 int fd, ret, fstat_done = 0;
4857c761
KB
257 char *new;
258 struct strbuf buf = STRBUF_INIT;
259 unsigned long size;
260 size_t wrote, newsize = 0;
e4c72923 261 struct stat st;
6d14eac3 262 const struct submodule *sub;
4857c761 263
b6691092 264 if (ce_mode_s_ifmt == S_IFREG) {
99d1a986 265 struct stream_filter *filter = get_stream_filter(ce->name,
266 ce->oid.hash);
b6691092
JH
267 if (filter &&
268 !streaming_write_entry(ce, path, filter,
269 state, to_tempfile,
270 &fstat_done, &st))
271 goto finish;
272 }
dd8e9121 273
4857c761 274 switch (ce_mode_s_ifmt) {
12dccc16 275 case S_IFREG:
4857c761
KB
276 case S_IFLNK:
277 new = read_blob_entry(ce, &size);
f0807e62 278 if (!new)
d43e9073 279 return error("unable to read sha1 file of %s (%s)",
99d1a986 280 path, oid_to_hex(&ce->oid));
1a9d7e9b 281
4857c761
KB
282 if (ce_mode_s_ifmt == S_IFLNK && has_symlinks && !to_tempfile) {
283 ret = symlink(new, path);
284 free(new);
285 if (ret)
e1ebb3c2
NTND
286 return error_errno("unable to create symlink %s",
287 path);
4857c761
KB
288 break;
289 }
290
1a9d7e9b
JH
291 /*
292 * Convert from git internal format to working tree format
293 */
2841e8f8
LS
294 if (ce_mode_s_ifmt == S_IFREG) {
295 struct delayed_checkout *dco = state->delayed_checkout;
296 if (dco && dco->state != CE_NO_DELAY) {
297 /* Do not send the blob in case of a retry. */
298 if (dco->state == CE_RETRY) {
299 new = NULL;
300 size = 0;
301 }
302 ret = async_convert_to_working_tree(
303 ce->name, new, size, &buf, dco);
304 if (ret && string_list_has_string(&dco->paths, ce->name)) {
305 free(new);
306 goto finish;
307 }
308 } else
309 ret = convert_to_working_tree(
310 ce->name, new, size, &buf);
311
312 if (ret) {
313 free(new);
314 new = strbuf_detach(&buf, &newsize);
315 size = newsize;
316 }
317 /*
318 * No "else" here as errors from convert are OK at this
319 * point. If the error would have been fatal (e.g.
320 * filter is required), then we would have died already.
321 */
1a9d7e9b
JH
322 }
323
fd5db55d 324 fd = open_output_fd(path, ce, to_tempfile);
12dccc16
LT
325 if (fd < 0) {
326 free(new);
e1ebb3c2 327 return error_errno("unable to create file %s", path);
12dccc16 328 }
6c510bee 329
93822c22 330 wrote = write_in_full(fd, new, size);
fd5db55d
JH
331 if (!to_tempfile)
332 fstat_done = fstat_output(fd, state, &st);
12dccc16
LT
333 close(fd);
334 free(new);
335 if (wrote != size)
d43e9073 336 return error("unable to write file %s", path);
12dccc16 337 break;
302b9282 338 case S_IFGITLINK:
f0807e62 339 if (to_tempfile)
42063f95 340 return error("cannot create temporary submodule %s", path);
f0807e62 341 if (mkdir(path, 0777) < 0)
42063f95 342 return error("cannot create submodule directory %s", path);
6d14eac3
SB
343 sub = submodule_from_ce(ce);
344 if (sub)
345 return submodule_move_head(ce->name,
cd279e2e
SB
346 NULL, oid_to_hex(&ce->oid),
347 state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0);
f0807e62 348 break;
12dccc16 349 default:
d43e9073 350 return error("unknown file mode for %s in index", path);
12dccc16
LT
351 }
352
dd8e9121 353finish:
6ee67f26 354 if (state->refresh_cache) {
d4a2024a 355 assert(state->istate);
e4c72923
KB
356 if (!fstat_done)
357 lstat(ce->name, &st);
12dccc16 358 fill_stat_cache_info(ce, &st);
078a58e8 359 ce->ce_flags |= CE_UPDATE_IN_BASE;
d4a2024a 360 state->istate->cache_changed |= CE_ENTRY_CHANGED;
12dccc16
LT
361 }
362 return 0;
363}
364
b6986d8a
LT
365/*
366 * This is like 'lstat()', except it refuses to follow symlinks
da02ca50 367 * in the path, after skipping "skiplen".
b6986d8a 368 */
61b97df7 369static int check_path(const char *path, int len, struct stat *st, int skiplen)
b6986d8a 370{
da02ca50
JH
371 const char *slash = path + len;
372
373 while (path < slash && *slash != '/')
374 slash--;
375 if (!has_dirs_only_path(path, slash - path, skiplen)) {
b6986d8a
LT
376 errno = ENOENT;
377 return -1;
378 }
379 return lstat(path, st);
380}
381
af2a651d
JH
382/*
383 * Write the contents from ce out to the working tree.
384 *
385 * When topath[] is not NULL, instead of writing to the working tree
386 * file named by ce, a temporary file is created by this function and
387 * its name is returned in topath[], which must be able to hold at
388 * least TEMPORARY_FILENAME_LENGTH bytes long.
389 */
9c5e6c80
NTND
390int checkout_entry(struct cache_entry *ce,
391 const struct checkout *state, char *topath)
12dccc16 392{
f63272a3 393 static struct strbuf path = STRBUF_INIT;
de84f99c 394 struct stat st;
12dccc16 395
de84f99c
SP
396 if (topath)
397 return write_entry(ce, topath, state, 1);
398
f63272a3
MH
399 strbuf_reset(&path);
400 strbuf_add(&path, state->base_dir, state->base_dir_len);
401 strbuf_add(&path, ce->name, ce_namelen(ce));
12dccc16 402
f63272a3 403 if (!check_path(path.buf, path.len, &st, state->base_dir_len)) {
6d14eac3 404 const struct submodule *sub;
56cac48c 405 unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
6d14eac3
SB
406 /*
407 * Needs to be checked before !changed returns early,
408 * as the possibly empty directory was not changed
409 */
410 sub = submodule_from_ce(ce);
411 if (sub) {
412 int err;
413 if (!is_submodule_populated_gently(ce->name, &err)) {
414 struct stat sb;
415 if (lstat(ce->name, &sb))
416 die(_("could not stat file '%s'"), ce->name);
417 if (!(st.st_mode & S_IFDIR))
418 unlink_or_warn(ce->name);
419
420 return submodule_move_head(ce->name,
cd279e2e 421 NULL, oid_to_hex(&ce->oid), 0);
6d14eac3
SB
422 } else
423 return submodule_move_head(ce->name,
424 "HEAD", oid_to_hex(&ce->oid),
cd279e2e 425 state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0);
6d14eac3
SB
426 }
427
12dccc16
LT
428 if (!changed)
429 return 0;
430 if (!state->force) {
431 if (!state->quiet)
f63272a3
MH
432 fprintf(stderr,
433 "%s already exists, no checkout\n",
434 path.buf);
4b12dae6 435 return -1;
12dccc16
LT
436 }
437
438 /*
439 * We unlink the old file, to get the new one with the
440 * right permissions (including umask, which is nasty
441 * to emulate by hand - much easier to let the system
442 * just do the right thing)
443 */
d48a72f3 444 if (S_ISDIR(st.st_mode)) {
f0807e62 445 /* If it is a gitlink, leave it alone! */
7a51ed66 446 if (S_ISGITLINK(ce->ce_mode))
f0807e62 447 return 0;
d48a72f3 448 if (!state->force)
f63272a3 449 return error("%s is a directory", path.buf);
2f29e0c6 450 remove_subtree(&path);
f63272a3 451 } else if (unlink(path.buf))
e1ebb3c2 452 return error_errno("unable to unlink old '%s'", path.buf);
de84f99c 453 } else if (state->not_new)
12dccc16 454 return 0;
f63272a3
MH
455
456 create_directories(path.buf, path.len, state);
457 return write_entry(ce, path.buf, state, 0);
12dccc16 458}