Gotweb

Blob

Date:: Sun Jan 13 11:56:35 2019 UTC
Message:: fix more bugs in the update walk and add more tests
Actions:: History | Blame | Raw File
1 /*
2  * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
3  *
4  * Permission to use, copy, modify, and distribute this software for any
5  * purpose with or without fee is hereby granted, provided that the above
6  * copyright notice and this permission notice appear in all copies.
7  *
8  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15  */
16 
17 #include <sys/stat.h>
18 #include <sys/limits.h>
19 #include <sys/queue.h>
20 #include <sys/tree.h>
21 
22 #include <stddef.h>
23 #include <string.h>
24 #include <stdio.h>
25 #include <stdlib.h>
26 #include <fcntl.h>
27 #include <errno.h>
28 #include <unistd.h>
29 #include <sha1.h>
30 #include <zlib.h>
31 #include <fnmatch.h>
32 #include <libgen.h>
33 
34 #include "got_error.h"
35 #include "got_repository.h"
36 #include "got_reference.h"
37 #include "got_object.h"
38 #include "got_worktree.h"
39 #include "got_opentemp.h"
40 
41 #include "got_lib_worktree.h"
42 #include "got_lib_path.h"
43 #include "got_lib_sha1.h"
44 #include "got_lib_fileindex.h"
45 #include "got_lib_inflate.h"
46 #include "got_lib_delta.h"
47 #include "got_lib_object.h"
48 
49 #ifndef MIN
50 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
51 #endif
52 
53 static const struct got_error *
54 create_meta_file(const char *path_got, const char *name, const char *content)
55 {
56 	const struct got_error *err = NULL;
57 	char *path;
58 	int fd = -1;
59 
60 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
61 		err = got_error_from_errno();
62 		path = NULL;
63 		goto done;
64 	}
65 
66 	fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
67 	    GOT_DEFAULT_FILE_MODE);
68 	if (fd == -1) {
69 		err = got_error_from_errno();
70 		goto done;
71 	}
72 
73 	if (content) {
74 		int len = dprintf(fd, "%s\n", content);
75 		if (len != strlen(content) + 1) {
76 			err = got_error_from_errno();
77 			goto done;
78 		}
79 	}
80 
81 done:
82 	if (fd != -1 && close(fd) == -1 && err == NULL)
83 		err = got_error_from_errno();
84 	free(path);
85 	return err;
86 }
87 
88 static const struct got_error *
89 update_meta_file(const char *path_got, const char *name, const char *content)
90 {
91 	const struct got_error *err = NULL;
92 	FILE *tmpfile = NULL;
93 	char *tmppath = NULL;
94 	char *path = NULL;
95 
96 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
97 		err = got_error_from_errno();
98 		path = NULL;
99 		goto done;
100 	}
101 
102 	err = got_opentemp_named(&tmppath, &tmpfile, path);
103 	if (err)
104 		goto done;
105 
106 	if (content) {
107 		int len = fprintf(tmpfile, "%s\n", content);
108 		if (len != strlen(content) + 1) {
109 			err = got_error_from_errno();
110 			goto done;
111 		}
112 	}
113 
114 	if (rename(tmppath, path) != 0) {
115 		err = got_error_from_errno();
116 		goto done;
117 	}
118 
119 done:
120 	free(tmppath);
121 	fclose(tmpfile);
122 	return err;
123 }
124 
125 static const struct got_error *
126 read_meta_file(char **content, const char *path_got, const char *name)
127 {
128 	const struct got_error *err = NULL;
129 	char *path;
130 	int fd = -1;
131 	ssize_t n;
132 	struct stat sb;
133 
134 	*content = NULL;
135 
136 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
137 		err = got_error_from_errno();
138 		path = NULL;
139 		goto done;
140 	}
141 
142 	fd = open(path, O_RDONLY | O_NOFOLLOW);
143 	if (fd == -1) {
144 		err = got_error_from_errno();
145 		goto done;
146 	}
147 	if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
148 		err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
149 		    : got_error_from_errno());
150 		goto done;
151 	}
152 
153 	stat(path, &sb);
154 	*content = calloc(1, sb.st_size);
155 	if (*content == NULL) {
156 		err = got_error_from_errno();
157 		goto done;
158 	}
159 
160 	n = read(fd, *content, sb.st_size);
161 	if (n != sb.st_size) {
162 		err = (n == -1 ? got_error_from_errno() :
163 		    got_error(GOT_ERR_WORKTREE_META));
164 		goto done;
165 	}
166 	if ((*content)[sb.st_size - 1] != '\n') {
167 		err = got_error(GOT_ERR_WORKTREE_META);
168 		goto done;
169 	}
170 	(*content)[sb.st_size - 1] = '\0';
171 
172 done:
173 	if (fd != -1 && close(fd) == -1 && err == NULL)
174 		err = got_error_from_errno();
175 	free(path);
176 	if (err) {
177 		free(*content);
178 		*content = NULL;
179 	}
180 	return err;
181 }
182 
183 const struct got_error *
184 got_worktree_init(const char *path, struct got_reference *head_ref,
185     const char *prefix, struct got_repository *repo)
186 {
187 	const struct got_error *err = NULL;
188 	struct got_object_id *commit_id = NULL;
189 	int obj_type;
190 	char *path_got = NULL;
191 	char *refstr = NULL;
192 	char *formatstr = NULL;
193 	char *absprefix = NULL;
194 	char *basestr = NULL;
195 
196 	err = got_ref_resolve(&commit_id, repo, head_ref);
197 	if (err)
198 		return err;
199 	err = got_object_get_type(&obj_type, repo, commit_id);
200 	if (err)
201 		return err;
202 	if (obj_type != GOT_OBJ_TYPE_COMMIT)
203 		return got_error(GOT_ERR_OBJ_TYPE);
204 
205 	if (!got_path_is_absolute(prefix)) {
206 		if (asprintf(&absprefix, "/%s", prefix) == -1)
207 			return got_error_from_errno();
208 	}
209 
210 	/* Create top-level directory (may already exist). */
211 	if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
212 		err = got_error_from_errno();
213 		goto done;
214 	}
215 
216 	/* Create .got directory (may already exist). */
217 	if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
218 		err = got_error_from_errno();
219 		goto done;
220 	}
221 	if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
222 		err = got_error_from_errno();
223 		goto done;
224 	}
225 
226 	/* Create an empty lock file. */
227 	err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
228 	if (err)
229 		goto done;
230 
231 	/* Create an empty file index. */
232 	err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
233 	if (err)
234 		goto done;
235 
236 	/* Write the HEAD reference. */
237 	refstr = got_ref_to_str(head_ref);
238 	if (refstr == NULL) {
239 		err = got_error_from_errno();
240 		goto done;
241 	}
242 	err = create_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
243 	if (err)
244 		goto done;
245 
246 	/* Record our base commit. */
247 	err = got_object_id_str(&basestr, commit_id);
248 	if (err)
249 		goto done;
250 	err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
251 	if (err)
252 		goto done;
253 
254 	/* Store path to repository. */
255 	err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
256 	    got_repo_get_path(repo));
257 	if (err)
258 		goto done;
259 
260 	/* Store in-repository path prefix. */
261 	err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
262 	    absprefix ? absprefix : prefix);
263 	if (err)
264 		goto done;
265 
266 	/* Stamp work tree with format file. */
267 	if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
268 		err = got_error_from_errno();
269 		goto done;
270 	}
271 	err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
272 	if (err)
273 		goto done;
274 
275 done:
276 	free(commit_id);
277 	free(path_got);
278 	free(formatstr);
279 	free(refstr);
280 	free(absprefix);
281 	free(basestr);
282 	return err;
283 }
284 
285 const struct got_error *
286 got_worktree_open(struct got_worktree **worktree, const char *path)
287 {
288 	const struct got_error *err = NULL;
289 	char *path_got;
290 	char *formatstr = NULL;
291 	char *path_lock = NULL;
292 	char *base_commit_id_str = NULL;
293 	char *head_ref_str = NULL;
294 	int version, fd = -1;
295 	const char *errstr;
296 	struct got_repository *repo = NULL;
297 
298 	*worktree = NULL;
299 
300 	if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
301 		err = got_error_from_errno();
302 		path_got = NULL;
303 		goto done;
304 	}
305 
306 	if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
307 		err = got_error_from_errno();
308 		path_lock = NULL;
309 		goto done;
310 	}
311 
312 	fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
313 	if (fd == -1) {
314 		err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
315 		    : got_error_from_errno());
316 		goto done;
317 	}
318 
319 	err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
320 	if (err)
321 		goto done;
322 
323 	version = strtonum(formatstr, 1, INT_MAX, &errstr);
324 	if (errstr) {
325 		err = got_error(GOT_ERR_WORKTREE_META);
326 		goto done;
327 	}
328 	if (version != GOT_WORKTREE_FORMAT_VERSION) {
329 		err = got_error(GOT_ERR_WORKTREE_VERS);
330 		goto done;
331 	}
332 
333 	*worktree = calloc(1, sizeof(**worktree));
334 	if (*worktree == NULL) {
335 		err = got_error_from_errno();
336 		goto done;
337 	}
338 	(*worktree)->lockfd = -1;
339 
340 	(*worktree)->root_path = strdup(path);
341 	if ((*worktree)->root_path == NULL) {
342 		err = got_error_from_errno();
343 		goto done;
344 	}
345 	err = read_meta_file(&(*worktree)->repo_path, path_got,
346 	    GOT_WORKTREE_REPOSITORY);
347 	if (err)
348 		goto done;
349 
350 	err = read_meta_file(&(*worktree)->path_prefix, path_got,
351 	    GOT_WORKTREE_PATH_PREFIX);
352 	if (err)
353 		goto done;
354 
355 	err = read_meta_file(&base_commit_id_str, path_got,
356 	    GOT_WORKTREE_BASE_COMMIT);
357 	if (err)
358 		goto done;
359 
360 	err = got_repo_open(&repo, (*worktree)->repo_path);
361 	if (err)
362 		goto done;
363 
364 	err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
365 	    base_commit_id_str);
366 	if (err)
367 		goto done;
368 
369 	err = read_meta_file(&head_ref_str, path_got, GOT_WORKTREE_HEAD_REF);
370 	if (err)
371 		goto done;
372 
373 	err = got_ref_open(&(*worktree)->head_ref, repo, head_ref_str);
374 done:
375 	if (repo)
376 		got_repo_close(repo);
377 	free(path_got);
378 	free(path_lock);
379 	free(head_ref_str);
380 	free(base_commit_id_str);
381 	if (err) {
382 		if (fd != -1)
383 			close(fd);
384 		if (*worktree != NULL)
385 			got_worktree_close(*worktree);
386 		*worktree = NULL;
387 	} else
388 		(*worktree)->lockfd = fd;
389 
390 	return err;
391 }
392 
393 void
394 got_worktree_close(struct got_worktree *worktree)
395 {
396 	free(worktree->root_path);
397 	free(worktree->repo_path);
398 	free(worktree->path_prefix);
399 	free(worktree->base_commit_id);
400 	if (worktree->head_ref)
401 		got_ref_close(worktree->head_ref);
402 	if (worktree->lockfd != -1)
403 		close(worktree->lockfd);
404 	free(worktree);
405 }
406 
407 const char *
408 got_worktree_get_repo_path(struct got_worktree *worktree)
409 {
410 	return worktree->repo_path;
411 }
412 
413 const char *
414 got_worktree_get_path_prefix(struct got_worktree *worktree)
415 {
416 	return worktree->path_prefix;
417 }
418 
419 const struct got_error *
420 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
421     const char *path_prefix)
422 {
423 	char *absprefix = NULL;
424 
425 	if (!got_path_is_absolute(path_prefix)) {
426 		if (asprintf(&absprefix, "/%s", path_prefix) == -1)
427 			return got_error_from_errno();
428 	}
429 	*match = (strcmp(absprefix ? absprefix : path_prefix,
430 	    worktree->path_prefix) == 0);
431 	free(absprefix);
432 	return NULL;
433 }
434 
435 char *
436 got_worktree_get_head_ref_name(struct got_worktree *worktree)
437 {
438 	return got_ref_to_str(worktree->head_ref);
439 }
440 
441 struct got_reference *
442 got_worktree_get_head_ref(struct got_worktree *worktree)
443 {
444 	return got_ref_dup(worktree->head_ref);
445 }
446 
447 const struct got_object_id *
448 got_worktree_get_base_commit_id(struct got_worktree *worktree)
449 {
450 	return worktree->base_commit_id;
451 }
452 
453 const struct got_error *
454 got_worktree_set_base_commit_id(struct got_worktree *worktree,
455     struct got_repository *repo, struct got_object_id *commit_id)
456 {
457 	const struct got_error *err;
458 	struct got_object *obj = NULL;
459 	char *id_str = NULL;
460 	char *path_got = NULL;
461 
462 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
463 	    GOT_WORKTREE_GOT_DIR) == -1) {
464 		err = got_error_from_errno();
465 		path_got = NULL;
466 		goto done;
467 	}
468 
469 	err = got_object_open(&obj, repo, commit_id);
470 	if (err)
471 		return err;
472 
473 	if (obj->type != GOT_OBJ_TYPE_COMMIT) {
474 		err = got_error(GOT_ERR_OBJ_TYPE);
475 		goto done;
476 	}
477 
478 	/* Record our base commit. */
479 	err = got_object_id_str(&id_str, commit_id);
480 	if (err)
481 		goto done;
482 	err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
483 	if (err)
484 		goto done;
485 
486 	free(worktree->base_commit_id);
487 	worktree->base_commit_id = got_object_id_dup(commit_id);
488 	if (worktree->base_commit_id == NULL) {
489 		err = got_error_from_errno();
490 		goto done;
491 	}
492 done:
493 	if (obj)
494 		got_object_close(obj);
495 	free(id_str);
496 	free(path_got);
497 	return err;
498 }
499 
500 static const struct got_error *
501 lock_worktree(struct got_worktree *worktree, int operation)
502 {
503 	if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
504 		return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
505 		    : got_error_from_errno());
506 	return NULL;
507 }
508 
509 static const struct got_error *
510 add_dir_on_disk(struct got_worktree *worktree, const char *path)
511 {
512 	const struct got_error *err = NULL;
513 	char *abspath;
514 
515 	if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
516 		return got_error_from_errno();
517 
518 	/* XXX queue work rather than editing disk directly? */
519 	if (mkdir(abspath, GOT_DEFAULT_DIR_MODE) == -1) {
520 		struct stat sb;
521 
522 		if (errno != EEXIST) {
523 			err = got_error_from_errno();
524 			goto done;
525 		}
526 
527 		if (lstat(abspath, &sb) == -1) {
528 			err = got_error_from_errno();
529 			goto done;
530 		}
531 
532 		if (!S_ISDIR(sb.st_mode)) {
533 			/* TODO directory is obstructed; do something */
534 			return got_error(GOT_ERR_FILE_OBSTRUCTED);
535 		}
536 	}
537 
538 done:
539 	free(abspath);
540 	return err;
541 }
542 
543 static const struct got_error *
544 install_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
545    struct got_fileindex_entry *entry, const char *path,
546    struct got_blob_object *blob,
547    struct got_repository *repo, got_worktree_checkout_cb progress_cb,
548    void *progress_arg)
549 {
550 	const struct got_error *err = NULL;
551 	char *ondisk_path;
552 	int fd = -1;
553 	size_t len, hdrlen;
554 	int update = 0;
555 	char *tmppath = NULL;
556 
557 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
558 		return got_error_from_errno();
559 
560 	fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
561 	    GOT_DEFAULT_FILE_MODE);
562 	if (fd == -1) {
563 		if (errno == EEXIST) {
564 			struct stat sb;
565 			if (lstat(ondisk_path, &sb) == -1) {
566 				err = got_error_from_errno();
567 				goto done;
568 			} else if (!S_ISREG(sb.st_mode)) {
569 				/* TODO file is obstructed; do something */
570 				err = got_error(GOT_ERR_FILE_OBSTRUCTED);
571 				goto done;
572 			} else {
573 				err = got_opentemp_named_fd(&tmppath, &fd,
574 				    ondisk_path);
575 				if (err)
576 					goto done;
577 				update = 1;
578 			}
579 		} else
580 			return got_error_from_errno();
581 	}
582 
583 	(*progress_cb)(progress_arg,
584 	    update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
585 
586 	hdrlen = got_object_blob_get_hdrlen(blob);
587 	do {
588 		const uint8_t *buf = got_object_blob_get_read_buf(blob);
589 		err = got_object_blob_read_block(&len, blob);
590 		if (err)
591 			break;
592 		if (len > 0) {
593 			/* Skip blob object header first time around. */
594 			ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
595 			if (outlen == -1) {
596 				err = got_error_from_errno();
597 				goto done;
598 			} else if (outlen != len - hdrlen) {
599 				err = got_error(GOT_ERR_IO);
600 				goto done;
601 			}
602 			hdrlen = 0;
603 		}
604 	} while (len != 0);
605 
606 	fsync(fd);
607 
608 	if (update) {
609 		if (rename(tmppath, ondisk_path) != 0) {
610 			err = got_error_from_errno();
611 			goto done;
612 		}
613 	}
614 
615 	if (entry == NULL)
616 		entry = got_fileindex_entry_get(fileindex, path);
617 	if (entry)
618 		err = got_fileindex_entry_update(entry, ondisk_path,
619 		    blob->id.sha1, worktree->base_commit_id->sha1);
620 	else {
621 		err = got_fileindex_entry_alloc(&entry, ondisk_path,
622 		    path, blob->id.sha1, worktree->base_commit_id->sha1);
623 		if (err)
624 			goto done;
625 		err = got_fileindex_entry_add(fileindex, entry);
626 	}
627 	if (err)
628 		goto done;
629 done:
630 	if (fd != -1)
631 		close(fd);
632 	free(ondisk_path);
633 	free(tmppath);
634 	return err;
635 }
636 
637 static const struct got_error *
638 update_blob(struct got_worktree *worktree,
639     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
640     struct got_tree_entry *te, const char *path,
641     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
642     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
643 {
644 	const struct got_error *err = NULL;
645 	struct got_blob_object *blob = NULL;
646 
647 	if (ie) {
648 		if (memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
649 		    SHA1_DIGEST_LENGTH) == 0) {
650 			(*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
651 			    path);
652 			return NULL;
653 		}
654 		if (memcmp(ie->blob_sha1,
655 		    te->id->sha1, SHA1_DIGEST_LENGTH) == 0)
656 			return NULL;
657 	}
658 
659 	err = got_object_open_as_blob(&blob, repo, te->id, 8192);
660 	if (err)
661 		return err;
662 
663 	err = install_blob(worktree, fileindex, ie, path, blob, repo,
664 	    progress_cb, progress_arg);
665 	got_object_blob_close(blob);
666 	return err;
667 }
668 
669 static const struct got_error *
670 remove_ondisk_file(const char *root_path, const char *path)
671 {
672 	const struct got_error *err = NULL;
673 	char *ondisk_path = NULL;
674 
675 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
676 		return got_error_from_errno();
677 
678 	if (unlink(ondisk_path) == -1) {
679 		if (errno != ENOENT)
680 			err = got_error_from_errno();
681 	} else {
682 		char *parent = dirname(ondisk_path);
683 		while (parent && strcmp(parent, root_path) != 0) {
684 			if (rmdir(parent) == -1) {
685 				if (errno != ENOTEMPTY)
686 					err = got_error_from_errno();
687 				break;
688 			}
689 			parent = dirname(parent);
690 		}
691 	}
692 	free(ondisk_path);
693 	return err;
694 }
695 
696 struct diff_cb_arg {
697     struct got_fileindex *fileindex;
698     struct got_worktree *worktree;
699     struct got_repository *repo;
700     got_worktree_checkout_cb progress_cb;
701     void *progress_arg;
702     got_worktree_cancel_cb cancel_cb;
703     void *cancel_arg;
704 };
705 
706 static const struct got_error *
707 diff_old_new(void *arg, struct got_fileindex_entry *ie,
708     struct got_tree_entry *te, const char *parent_path)
709 {
710 	struct diff_cb_arg *a = arg;
711 
712 	return update_blob(a->worktree, a->fileindex, ie, te,
713 	    ie->path, a->repo, a->progress_cb, a->progress_arg,
714 	    a->cancel_cb, a->cancel_arg);
715 }
716 
717 static const struct got_error *
718 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
719 {
720 	const struct got_error *err;
721 	struct diff_cb_arg *a = arg;
722 
723 	(*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE, ie->path);
724 
725 	err = remove_ondisk_file(a->worktree->root_path, ie->path);
726 	if (err)
727 		return err;
728 	got_fileindex_entry_remove(a->fileindex, ie);
729 	return NULL;
730 }
731 
732 static const struct got_error *
733 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
734 {
735 	struct diff_cb_arg *a = arg;
736 	const struct got_error *err;
737 	char *path;
738 
739 	if (asprintf(&path, "%s%s%s", parent_path,
740 	    parent_path[0] ? "/" : "", te->name)
741 	    == -1)
742 		return got_error_from_errno();
743 
744 	if (S_ISDIR(te->mode))
745 		err = add_dir_on_disk(a->worktree, path);
746 	else
747 		err = update_blob(a->worktree, a->fileindex, NULL, te, path,
748 		    a->repo, a->progress_cb, a->progress_arg,
749 		    a->cancel_cb, a->cancel_arg);
750 
751 	free(path);
752 	return err;
753 }
754 
755 const struct got_error *
756 got_worktree_checkout_files(struct got_worktree *worktree,
757     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
758     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
759 {
760 	const struct got_error *err = NULL, *unlockerr, *checkout_err = NULL;
761 	struct got_commit_object *commit = NULL;
762 	struct got_object_id *tree_id = NULL;
763 	struct got_tree_object *tree = NULL;
764 	char *fileindex_path = NULL, *new_fileindex_path = NULL;
765 	struct got_fileindex *fileindex = NULL;
766 	FILE *index = NULL, *new_index = NULL;
767 	struct got_fileindex_diff_cb diff_cb;
768 	struct diff_cb_arg arg;
769 
770 	err = lock_worktree(worktree, LOCK_EX);
771 	if (err)
772 		return err;
773 
774 	fileindex = got_fileindex_alloc();
775 	if (fileindex == NULL) {
776 		err = got_error_from_errno();
777 		goto done;
778 	}
779 
780 	if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
781 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
782 		err = got_error_from_errno();
783 		fileindex_path = NULL;
784 		goto done;
785 	}
786 
787 	/*
788 	 * Read the file index.
789 	 * Checking out files is supposed to be an idempotent operation.
790 	 * If the on-disk file index is incomplete we will try to complete it.
791 	 */
792 	index = fopen(fileindex_path, "rb");
793 	if (index == NULL) {
794 		if (errno != ENOENT) {
795 			err = got_error_from_errno();
796 			goto done;
797 		}
798 	} else {
799 		err = got_fileindex_read(fileindex, index);
800 		fclose(index);
801 		if (err)
802 			goto done;
803 	}
804 
805 	err = got_opentemp_named(&new_fileindex_path, &new_index,
806 	    fileindex_path);
807 	if (err)
808 		goto done;
809 
810 	err = got_object_open_as_commit(&commit, repo,
811 	   worktree->base_commit_id);
812 	if (err)
813 		goto done;
814 
815 	err = got_object_id_by_path(&tree_id, repo,
816 	    worktree->base_commit_id, worktree->path_prefix);
817 	if (err)
818 		goto done;
819 
820 	err = got_object_open_as_tree(&tree, repo, tree_id);
821 	if (err)
822 		goto done;
823 
824 	diff_cb.diff_old_new = diff_old_new;
825 	diff_cb.diff_old = diff_old;
826 	diff_cb.diff_new = diff_new;
827 	arg.fileindex = fileindex;
828 	arg.worktree = worktree;
829 	arg.repo = repo;
830 	arg.progress_cb = progress_cb;
831 	arg.progress_arg = progress_arg;
832 	arg.cancel_cb = cancel_cb;
833 	arg.cancel_arg = cancel_arg;
834 	checkout_err = got_fileindex_diff_tree(fileindex, tree, repo,
835 	    &diff_cb, &arg);
836 
837 	/* Try to sync the fileindex back to disk in any case. */
838 	err = got_fileindex_write(fileindex, new_index);
839 	if (err)
840 		goto done;
841 
842 	if (rename(new_fileindex_path, fileindex_path) != 0) {
843 		err = got_error_from_errno();
844 		goto done;
845 	}
846 
847 	free(new_fileindex_path);
848 	new_fileindex_path = NULL;
849 
850 done:
851 	if (tree)
852 		got_object_tree_close(tree);
853 	if (commit)
854 		got_object_commit_close(commit);
855 	if (new_fileindex_path)
856 		unlink(new_fileindex_path);
857 	if (new_index)
858 		fclose(new_index);
859 	free(new_fileindex_path);
860 	free(fileindex_path);
861 	got_fileindex_free(fileindex);
862 	if (checkout_err)
863 		err = checkout_err;
864 	unlockerr = lock_worktree(worktree, LOCK_SH);
865 	if (unlockerr && err == NULL)
866 		err = unlockerr;
867 	return err;
868 }