1 /*
2  * Copyright (c) 2018, 2019, 2020 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/queue.h>
19 #include <sys/tree.h>
20 
21 #include <dirent.h>
22 #include <limits.h>
23 #include <stddef.h>
24 #include <string.h>
25 #include <stdio.h>
26 #include <stdlib.h>
27 #include <time.h>
28 #include <fcntl.h>
29 #include <errno.h>
30 #include <unistd.h>
31 #include <sha1.h>
32 #include <zlib.h>
33 #include <fnmatch.h>
34 #include <libgen.h>
35 #include <uuid.h>
36 #include <util.h>
37 
38 #include "got_error.h"
39 #include "got_repository.h"
40 #include "got_reference.h"
41 #include "got_object.h"
42 #include "got_path.h"
43 #include "got_cancel.h"
44 #include "got_worktree.h"
45 #include "got_opentemp.h"
46 #include "got_diff.h"
47 
48 #include "got_lib_worktree.h"
49 #include "got_lib_sha1.h"
50 #include "got_lib_fileindex.h"
51 #include "got_lib_inflate.h"
52 #include "got_lib_delta.h"
53 #include "got_lib_object.h"
54 #include "got_lib_object_parse.h"
55 #include "got_lib_object_create.h"
56 #include "got_lib_object_idset.h"
57 #include "got_lib_diff.h"
58 #include "got_lib_gotconfig.h"
59 
60 #ifndef MIN
61 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
62 #endif
63 
64 #define GOT_MERGE_LABEL_MERGED	"merged change"
65 #define GOT_MERGE_LABEL_BASE	"3-way merge base"
66 
67 static const struct got_error *
68 create_meta_file(const char *path_got, const char *name, const char *content)
69 {
70 	const struct got_error *err = NULL;
71 	char *path;
72 
73 	if (asprintf(&path, "%s/%s", path_got, name) == -1)
74 		return got_error_from_errno("asprintf");
75 
76 	err = got_path_create_file(path, content);
77 	free(path);
78 	return err;
79 }
80 
81 static const struct got_error *
82 update_meta_file(const char *path_got, const char *name, const char *content)
83 {
84 	const struct got_error *err = NULL;
85 	FILE *tmpfile = NULL;
86 	char *tmppath = NULL;
87 	char *path = NULL;
88 
89 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
90 		err = got_error_from_errno("asprintf");
91 		path = NULL;
92 		goto done;
93 	}
94 
95 	err = got_opentemp_named(&tmppath, &tmpfile, path);
96 	if (err)
97 		goto done;
98 
99 	if (content) {
100 		int len = fprintf(tmpfile, "%s\n", content);
101 		if (len != strlen(content) + 1) {
102 			err = got_error_from_errno2("fprintf", tmppath);
103 			goto done;
104 		}
105 	}
106 
107 	if (rename(tmppath, path) != 0) {
108 		err = got_error_from_errno3("rename", tmppath, path);
109 		unlink(tmppath);
110 		goto done;
111 	}
112 
113 done:
114 	if (fclose(tmpfile) != 0 && err == NULL)
115 		err = got_error_from_errno2("fclose", tmppath);
116 	free(tmppath);
117 	return err;
118 }
119 
120 static const struct got_error *
121 read_meta_file(char **content, const char *path_got, const char *name)
122 {
123 	const struct got_error *err = NULL;
124 	char *path;
125 	int fd = -1;
126 	ssize_t n;
127 	struct stat sb;
128 
129 	*content = NULL;
130 
131 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
132 		err = got_error_from_errno("asprintf");
133 		path = NULL;
134 		goto done;
135 	}
136 
137 	fd = open(path, O_RDONLY | O_NOFOLLOW);
138 	if (fd == -1) {
139 		if (errno == ENOENT)
140 			err = got_error_path(path, GOT_ERR_WORKTREE_META);
141 		else
142 			err = got_error_from_errno2("open", path);
143 		goto done;
144 	}
145 	if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
146 		err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
147 		    : got_error_from_errno2("flock", path));
148 		goto done;
149 	}
150 
151 	if (fstat(fd, &sb) != 0) {
152 		err = got_error_from_errno2("fstat", path);
153 		goto done;
154 	}
155 	*content = calloc(1, sb.st_size);
156 	if (*content == NULL) {
157 		err = got_error_from_errno("calloc");
158 		goto done;
159 	}
160 
161 	n = read(fd, *content, sb.st_size);
162 	if (n != sb.st_size) {
163 		err = (n == -1 ? got_error_from_errno2("read", path) :
164 		    got_error_path(path, GOT_ERR_WORKTREE_META));
165 		goto done;
166 	}
167 	if ((*content)[sb.st_size - 1] != '\n') {
168 		err = got_error_path(path, GOT_ERR_WORKTREE_META);
169 		goto done;
170 	}
171 	(*content)[sb.st_size - 1] = '\0';
172 
173 done:
174 	if (fd != -1 && close(fd) == -1 && err == NULL)
175 		err = got_error_from_errno2("close", path_got);
176 	free(path);
177 	if (err) {
178 		free(*content);
179 		*content = NULL;
180 	}
181 	return err;
182 }
183 
184 static const struct got_error *
185 write_head_ref(const char *path_got, struct got_reference *head_ref)
186 {
187 	const struct got_error *err = NULL;
188 	char *refstr = NULL;
189 
190 	if (got_ref_is_symbolic(head_ref)) {
191 		refstr = got_ref_to_str(head_ref);
192 		if (refstr == NULL)
193 			return got_error_from_errno("got_ref_to_str");
194 	} else {
195 		refstr = strdup(got_ref_get_name(head_ref));
196 		if (refstr == NULL)
197 			return got_error_from_errno("strdup");
198 	}
199 	err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
200 	free(refstr);
201 	return err;
202 }
203 
204 const struct got_error *
205 got_worktree_init(const char *path, struct got_reference *head_ref,
206     const char *prefix, struct got_repository *repo)
207 {
208 	const struct got_error *err = NULL;
209 	struct got_object_id *commit_id = NULL;
210 	uuid_t uuid;
211 	uint32_t uuid_status;
212 	int obj_type;
213 	char *path_got = NULL;
214 	char *formatstr = NULL;
215 	char *absprefix = NULL;
216 	char *basestr = NULL;
217 	char *uuidstr = NULL;
218 
219 	if (strcmp(path, got_repo_get_path(repo)) == 0) {
220 		err = got_error(GOT_ERR_WORKTREE_REPO);
221 		goto done;
222 	}
223 
224 	err = got_ref_resolve(&commit_id, repo, head_ref);
225 	if (err)
226 		return err;
227 	err = got_object_get_type(&obj_type, repo, commit_id);
228 	if (err)
229 		return err;
230 	if (obj_type != GOT_OBJ_TYPE_COMMIT)
231 		return got_error(GOT_ERR_OBJ_TYPE);
232 
233 	if (!got_path_is_absolute(prefix)) {
234 		if (asprintf(&absprefix, "/%s", prefix) == -1)
235 			return got_error_from_errno("asprintf");
236 	}
237 
238 	/* Create top-level directory (may already exist). */
239 	if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
240 		err = got_error_from_errno2("mkdir", path);
241 		goto done;
242 	}
243 
244 	/* Create .got directory (may already exist). */
245 	if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
246 		err = got_error_from_errno("asprintf");
247 		goto done;
248 	}
249 	if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
250 		err = got_error_from_errno2("mkdir", path_got);
251 		goto done;
252 	}
253 
254 	/* Create an empty lock file. */
255 	err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
256 	if (err)
257 		goto done;
258 
259 	/* Create an empty file index. */
260 	err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
261 	if (err)
262 		goto done;
263 
264 	/* Write the HEAD reference. */
265 	err = write_head_ref(path_got, head_ref);
266 	if (err)
267 		goto done;
268 
269 	/* Record our base commit. */
270 	err = got_object_id_str(&basestr, commit_id);
271 	if (err)
272 		goto done;
273 	err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
274 	if (err)
275 		goto done;
276 
277 	/* Store path to repository. */
278 	err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
279 	    got_repo_get_path(repo));
280 	if (err)
281 		goto done;
282 
283 	/* Store in-repository path prefix. */
284 	err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
285 	    absprefix ? absprefix : prefix);
286 	if (err)
287 		goto done;
288 
289 	/* Generate UUID. */
290 	uuid_create(&uuid, &uuid_status);
291 	if (uuid_status != uuid_s_ok) {
292 		err = got_error_uuid(uuid_status, "uuid_create");
293 		goto done;
294 	}
295 	uuid_to_string(&uuid, &uuidstr, &uuid_status);
296 	if (uuid_status != uuid_s_ok) {
297 		err = got_error_uuid(uuid_status, "uuid_to_string");
298 		goto done;
299 	}
300 	err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
301 	if (err)
302 		goto done;
303 
304 	/* Stamp work tree with format file. */
305 	if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
306 		err = got_error_from_errno("asprintf");
307 		goto done;
308 	}
309 	err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
310 	if (err)
311 		goto done;
312 
313 done:
314 	free(commit_id);
315 	free(path_got);
316 	free(formatstr);
317 	free(absprefix);
318 	free(basestr);
319 	free(uuidstr);
320 	return err;
321 }
322 
323 static const struct got_error *
324 open_worktree(struct got_worktree **worktree, const char *path)
325 {
326 	const struct got_error *err = NULL;
327 	char *path_got;
328 	char *formatstr = NULL;
329 	char *uuidstr = NULL;
330 	char *path_lock = NULL;
331 	char *base_commit_id_str = NULL;
332 	int version, fd = -1;
333 	const char *errstr;
334 	struct got_repository *repo = NULL;
335 	uint32_t uuid_status;
336 
337 	*worktree = NULL;
338 
339 	if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
340 		err = got_error_from_errno("asprintf");
341 		path_got = NULL;
342 		goto done;
343 	}
344 
345 	if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
346 		err = got_error_from_errno("asprintf");
347 		path_lock = NULL;
348 		goto done;
349 	}
350 
351 	fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
352 	if (fd == -1) {
353 		err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
354 		    : got_error_from_errno2("open", path_lock));
355 		goto done;
356 	}
357 
358 	err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
359 	if (err)
360 		goto done;
361 
362 	version = strtonum(formatstr, 1, INT_MAX, &errstr);
363 	if (errstr) {
364 		err = got_error_msg(GOT_ERR_WORKTREE_META,
365 		    "could not parse work tree format version number");
366 		goto done;
367 	}
368 	if (version != GOT_WORKTREE_FORMAT_VERSION) {
369 		err = got_error(GOT_ERR_WORKTREE_VERS);
370 		goto done;
371 	}
372 
373 	*worktree = calloc(1, sizeof(**worktree));
374 	if (*worktree == NULL) {
375 		err = got_error_from_errno("calloc");
376 		goto done;
377 	}
378 	(*worktree)->lockfd = -1;
379 
380 	(*worktree)->root_path = realpath(path, NULL);
381 	if ((*worktree)->root_path == NULL) {
382 		err = got_error_from_errno2("realpath", path);
383 		goto done;
384 	}
385 	err = read_meta_file(&(*worktree)->repo_path, path_got,
386 	    GOT_WORKTREE_REPOSITORY);
387 	if (err)
388 		goto done;
389 
390 	err = read_meta_file(&(*worktree)->path_prefix, path_got,
391 	    GOT_WORKTREE_PATH_PREFIX);
392 	if (err)
393 		goto done;
394 
395 	err = read_meta_file(&base_commit_id_str, path_got,
396 	    GOT_WORKTREE_BASE_COMMIT);
397 	if (err)
398 		goto done;
399 
400 	err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
401 	if (err)
402 		goto done;
403 	uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
404 	if (uuid_status != uuid_s_ok) {
405 		err = got_error_uuid(uuid_status, "uuid_from_string");
406 		goto done;
407 	}
408 
409 	err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
410 	if (err)
411 		goto done;
412 
413 	err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
414 	    base_commit_id_str);
415 	if (err)
416 		goto done;
417 
418 	err = read_meta_file(&(*worktree)->head_ref_name, path_got,
419 	    GOT_WORKTREE_HEAD_REF);
420 	if (err)
421 		goto done;
422 
423 	if (asprintf(&(*worktree)->gotconfig_path, "%s/%s/%s",
424 	    (*worktree)->root_path,
425 	    GOT_WORKTREE_GOT_DIR, GOT_GOTCONFIG_FILENAME) == -1) {
426 		err = got_error_from_errno("asprintf");
427 		goto done;
428 	}
429 
430 	err = got_gotconfig_read(&(*worktree)->gotconfig,
431 	    (*worktree)->gotconfig_path);
432 done:
433 	if (repo)
434 		got_repo_close(repo);
435 	free(path_got);
436 	free(path_lock);
437 	free(base_commit_id_str);
438 	free(uuidstr);
439 	free(formatstr);
440 	if (err) {
441 		if (fd != -1)
442 			close(fd);
443 		if (*worktree != NULL)
444 			got_worktree_close(*worktree);
445 		*worktree = NULL;
446 	} else
447 		(*worktree)->lockfd = fd;
448 
449 	return err;
450 }
451 
452 const struct got_error *
453 got_worktree_open(struct got_worktree **worktree, const char *path)
454 {
455 	const struct got_error *err = NULL;
456 	char *worktree_path;
457 
458 	worktree_path = strdup(path);
459 	if (worktree_path == NULL)
460 		return got_error_from_errno("strdup");
461 
462 	for (;;) {
463 		char *parent_path;
464 
465 		err = open_worktree(worktree, worktree_path);
466 		if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT)) {
467 			free(worktree_path);
468 			return err;
469 		}
470 		if (*worktree) {
471 			free(worktree_path);
472 			return NULL;
473 		}
474 		if (worktree_path[0] == '/' && worktree_path[1] == '\0')
475 			break;
476 		err = got_path_dirname(&parent_path, worktree_path);
477 		if (err) {
478 			if (err->code != GOT_ERR_BAD_PATH) {
479 				free(worktree_path);
480 				return err;
481 			}
482 			break;
483 		}
484 		free(worktree_path);
485 		worktree_path = parent_path;
486 	}
487 
488 	free(worktree_path);
489 	return got_error(GOT_ERR_NOT_WORKTREE);
490 }
491 
492 const struct got_error *
493 got_worktree_close(struct got_worktree *worktree)
494 {
495 	const struct got_error *err = NULL;
496 	free(worktree->repo_path);
497 	free(worktree->path_prefix);
498 	free(worktree->base_commit_id);
499 	free(worktree->head_ref_name);
500 	if (worktree->lockfd != -1)
501 		if (close(worktree->lockfd) != 0)
502 			err = got_error_from_errno2("close",
503 			    got_worktree_get_root_path(worktree));
504 	free(worktree->root_path);
505 	free(worktree->gotconfig_path);
506 	got_gotconfig_free(worktree->gotconfig);
507 	free(worktree);
508 	return err;
509 }
510 
511 const char *
512 got_worktree_get_root_path(struct got_worktree *worktree)
513 {
514 	return worktree->root_path;
515 }
516 
517 const char *
518 got_worktree_get_repo_path(struct got_worktree *worktree)
519 {
520 	return worktree->repo_path;
521 }
522 const char *
523 got_worktree_get_path_prefix(struct got_worktree *worktree)
524 {
525 	return worktree->path_prefix;
526 }
527 
528 const struct got_error *
529 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
530     const char *path_prefix)
531 {
532 	char *absprefix = NULL;
533 
534 	if (!got_path_is_absolute(path_prefix)) {
535 		if (asprintf(&absprefix, "/%s", path_prefix) == -1)
536 			return got_error_from_errno("asprintf");
537 	}
538 	*match = (strcmp(absprefix ? absprefix : path_prefix,
539 	    worktree->path_prefix) == 0);
540 	free(absprefix);
541 	return NULL;
542 }
543 
544 const char *
545 got_worktree_get_head_ref_name(struct got_worktree *worktree)
546 {
547 	return worktree->head_ref_name;
548 }
549 
550 const struct got_error *
551 got_worktree_set_head_ref(struct got_worktree *worktree,
552     struct got_reference *head_ref)
553 {
554 	const struct got_error *err = NULL;
555 	char *path_got = NULL, *head_ref_name = NULL;
556 
557 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
558 	    GOT_WORKTREE_GOT_DIR) == -1) {
559 		err = got_error_from_errno("asprintf");
560 		path_got = NULL;
561 		goto done;
562 	}
563 
564 	head_ref_name = strdup(got_ref_get_name(head_ref));
565 	if (head_ref_name == NULL) {
566 		err = got_error_from_errno("strdup");
567 		goto done;
568 	}
569 
570 	err = write_head_ref(path_got, head_ref);
571 	if (err)
572 		goto done;
573 
574 	free(worktree->head_ref_name);
575 	worktree->head_ref_name = head_ref_name;
576 done:
577 	free(path_got);
578 	if (err)
579 		free(head_ref_name);
580 	return err;
581 }
582 
583 struct got_object_id *
584 got_worktree_get_base_commit_id(struct got_worktree *worktree)
585 {
586 	return worktree->base_commit_id;
587 }
588 
589 const struct got_error *
590 got_worktree_set_base_commit_id(struct got_worktree *worktree,
591     struct got_repository *repo, struct got_object_id *commit_id)
592 {
593 	const struct got_error *err;
594 	struct got_object *obj = NULL;
595 	char *id_str = NULL;
596 	char *path_got = NULL;
597 
598 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
599 	    GOT_WORKTREE_GOT_DIR) == -1) {
600 		err = got_error_from_errno("asprintf");
601 		path_got = NULL;
602 		goto done;
603 	}
604 
605 	err = got_object_open(&obj, repo, commit_id);
606 	if (err)
607 		return err;
608 
609 	if (obj->type != GOT_OBJ_TYPE_COMMIT) {
610 		err = got_error(GOT_ERR_OBJ_TYPE);
611 		goto done;
612 	}
613 
614 	/* Record our base commit. */
615 	err = got_object_id_str(&id_str, commit_id);
616 	if (err)
617 		goto done;
618 	err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
619 	if (err)
620 		goto done;
621 
622 	free(worktree->base_commit_id);
623 	worktree->base_commit_id = got_object_id_dup(commit_id);
624 	if (worktree->base_commit_id == NULL) {
625 		err = got_error_from_errno("got_object_id_dup");
626 		goto done;
627 	}
628 done:
629 	if (obj)
630 		got_object_close(obj);
631 	free(id_str);
632 	free(path_got);
633 	return err;
634 }
635 
636 const struct got_gotconfig *
637 got_worktree_get_gotconfig(struct got_worktree *worktree)
638 {
639 	return worktree->gotconfig;
640 }
641 
642 static const struct got_error *
643 lock_worktree(struct got_worktree *worktree, int operation)
644 {
645 	if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
646 		return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
647 		    : got_error_from_errno2("flock",
648 		    got_worktree_get_root_path(worktree)));
649 	return NULL;
650 }
651 
652 static const struct got_error *
653 add_dir_on_disk(struct got_worktree *worktree, const char *path)
654 {
655 	const struct got_error *err = NULL;
656 	char *abspath;
657 
658 	if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
659 		return got_error_from_errno("asprintf");
660 
661 	err = got_path_mkdir(abspath);
662 	if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
663 		struct stat sb;
664 		err = NULL;
665 		if (lstat(abspath, &sb) == -1) {
666 			err = got_error_from_errno2("lstat", abspath);
667 		} else if (!S_ISDIR(sb.st_mode)) {
668 			/* TODO directory is obstructed; do something */
669 			err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
670 		}
671 	}
672 	free(abspath);
673 	return err;
674 }
675 
676 static const struct got_error *
677 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
678 {
679 	const struct got_error *err = NULL;
680 	uint8_t fbuf1[8192];
681 	uint8_t fbuf2[8192];
682 	size_t flen1 = 0, flen2 = 0;
683 
684 	*same = 1;
685 
686 	for (;;) {
687 		flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
688 		if (flen1 == 0 && ferror(f1)) {
689 			err = got_error_from_errno("fread");
690 			break;
691 		}
692 		flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
693 		if (flen2 == 0 && ferror(f2)) {
694 			err = got_error_from_errno("fread");
695 			break;
696 		}
697 		if (flen1 == 0) {
698 			if (flen2 != 0)
699 				*same = 0;
700 			break;
701 		} else if (flen2 == 0) {
702 			if (flen1 != 0)
703 				*same = 0;
704 			break;
705 		} else if (flen1 == flen2) {
706 			if (memcmp(fbuf1, fbuf2, flen2) != 0) {
707 				*same = 0;
708 				break;
709 			}
710 		} else {
711 			*same = 0;
712 			break;
713 		}
714 	}
715 
716 	return err;
717 }
718 
719 static const struct got_error *
720 check_files_equal(int *same, const char *f1_path, const char *f2_path)
721 {
722 	const struct got_error *err = NULL;
723 	struct stat sb;
724 	size_t size1, size2;
725 	FILE *f1 = NULL, *f2 = NULL;
726 
727 	*same = 1;
728 
729 	if (lstat(f1_path, &sb) != 0) {
730 		err = got_error_from_errno2("lstat", f1_path);
731 		goto done;
732 	}
733 	size1 = sb.st_size;
734 
735 	if (lstat(f2_path, &sb) != 0) {
736 		err = got_error_from_errno2("lstat", f2_path);
737 		goto done;
738 	}
739 	size2 = sb.st_size;
740 
741 	if (size1 != size2) {
742 		*same = 0;
743 		return NULL;
744 	}
745 
746 	f1 = fopen(f1_path, "r");
747 	if (f1 == NULL)
748 		return got_error_from_errno2("fopen", f1_path);
749 
750 	f2 = fopen(f2_path, "r");
751 	if (f2 == NULL) {
752 		err = got_error_from_errno2("fopen", f2_path);
753 		goto done;
754 	}
755 
756 	err = check_file_contents_equal(same, f1, f2);
757 done:
758 	if (f1 && fclose(f1) != 0 && err == NULL)
759 		err = got_error_from_errno("fclose");
760 	if (f2 && fclose(f2) != 0 && err == NULL)
761 		err = got_error_from_errno("fclose");
762 
763 	return err;
764 }
765 
766 /*
767  * Perform a 3-way merge where blob_orig acts as the common ancestor,
768  * the file at deriv_path acts as the first derived version, and the
769  * file on disk acts as the second derived version.
770  */
771 static const struct got_error *
772 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
773     struct got_blob_object *blob_orig, const char *ondisk_path,
774     const char *path, uint16_t st_mode, const char *deriv_path,
775     const char *label_orig, const char *label_deriv,
776     struct got_repository *repo,
777     got_worktree_checkout_cb progress_cb, void *progress_arg)
778 {
779 	const struct got_error *err = NULL;
780 	int merged_fd = -1;
781 	FILE *f_orig = NULL;
782 	char *blob_orig_path = NULL;
783 	char *merged_path = NULL, *base_path = NULL;
784 	int overlapcnt = 0;
785 	char *parent = NULL;
786 	char *symlink_path = NULL;
787 	FILE *symlinkf = NULL;
788 
789 	*local_changes_subsumed = 0;
790 
791 	err = got_path_dirname(&parent, ondisk_path);
792 	if (err)
793 		return err;
794 
795 	if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
796 		err = got_error_from_errno("asprintf");
797 		goto done;
798 	}
799 
800 	err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
801 	if (err)
802 		goto done;
803 
804 	free(base_path);
805 	if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
806 		err = got_error_from_errno("asprintf");
807 		base_path = NULL;
808 		goto done;
809 	}
810 
811 	err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
812 	if (err)
813 		goto done;
814 	if (blob_orig) {
815 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
816 		    blob_orig);
817 		if (err)
818 			goto done;
819 	} else {
820 		/*
821 		 * If the file has no blob, this is an "add vs add" conflict,
822 		 * and we simply use an empty ancestor file to make both files
823 		 * appear in the merged result in their entirety.
824 		 */
825 	}
826 
827 	/* 
828 	 * In order the run a 3-way merge with a symlink we copy the symlink's
829 	 * target path into a temporary file and use that file with diff3.
830 	 */
831 	if (S_ISLNK(st_mode)) {
832 		char target_path[PATH_MAX];
833 		ssize_t target_len;
834 		size_t n;
835 
836 		free(base_path);
837 		if (asprintf(&base_path, "%s/got-symlink-merge",
838 		    parent) == -1) {
839 			err = got_error_from_errno("asprintf");
840 			base_path = NULL;
841 			goto done;
842 		}
843 		err = got_opentemp_named(&symlink_path, &symlinkf, base_path);
844 		if (err)
845 			goto done;
846 		target_len = readlink(ondisk_path, target_path,
847 		    sizeof(target_path));
848 		if (target_len == -1) {
849 			err = got_error_from_errno2("readlink", ondisk_path);
850 			goto done;
851 		}
852 		n = fwrite(target_path, 1, target_len, symlinkf);
853 		if (n != target_len) {
854 			err = got_ferror(symlinkf, GOT_ERR_IO);
855 			goto done;
856 		}
857 		if (fflush(symlinkf) == EOF) {
858 			err = got_error_from_errno2("fflush", symlink_path);
859 			goto done;
860 		}
861 	}
862 
863 	err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
864 	    blob_orig_path, symlink_path ? symlink_path : ondisk_path,
865 	    label_deriv, label_orig, NULL);
866 	if (err)
867 		goto done;
868 
869 	err = (*progress_cb)(progress_arg,
870 	    overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
871 	if (err)
872 		goto done;
873 
874 	if (fsync(merged_fd) != 0) {
875 		err = got_error_from_errno("fsync");
876 		goto done;
877 	}
878 
879 	/* Check if a clean merge has subsumed all local changes. */
880 	if (overlapcnt == 0) {
881 		err = check_files_equal(local_changes_subsumed, deriv_path,
882 		    merged_path);
883 		if (err)
884 			goto done;
885 	}
886 
887 	if (fchmod(merged_fd, st_mode) != 0) {
888 		err = got_error_from_errno2("fchmod", merged_path);
889 		goto done;
890 	}
891 
892 	if (rename(merged_path, ondisk_path) != 0) {
893 		err = got_error_from_errno3("rename", merged_path,
894 		    ondisk_path);
895 		goto done;
896 	}
897 done:
898 	if (err) {
899 		if (merged_path)
900 			unlink(merged_path);
901 	}
902 	if (symlink_path) {
903 		if (unlink(symlink_path) == -1 && err == NULL)
904 			err = got_error_from_errno2("unlink", symlink_path);
905 	}
906 	if (symlinkf && fclose(symlinkf) == EOF && err == NULL)
907 		err = got_error_from_errno2("fclose", symlink_path);
908 	free(symlink_path);
909 	if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
910 		err = got_error_from_errno("close");
911 	if (f_orig && fclose(f_orig) != 0 && err == NULL)
912 		err = got_error_from_errno("fclose");
913 	free(merged_path);
914 	free(base_path);
915 	if (blob_orig_path) {
916 		unlink(blob_orig_path);
917 		free(blob_orig_path);
918 	}
919 	free(parent);
920 	return err;
921 }
922 
923 static const struct got_error *
924 update_symlink(const char *ondisk_path, const char *target_path,
925     size_t target_len)
926 {
927 	/* This is not atomic but matches what 'ln -sf' does. */
928 	if (unlink(ondisk_path) == -1)
929 		return got_error_from_errno2("unlink", ondisk_path);
930 	if (symlink(target_path, ondisk_path) == -1)
931 		return got_error_from_errno3("symlink", target_path,
932 		    ondisk_path);
933 	return NULL;
934 }
935 
936 /*
937  * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
938  * in the work tree with a file that contains conflict markers and the
939  * conflicting target paths of the original version, a "derived version"
940  * of a symlink from an incoming change, and a local version of the symlink.
941  *
942  * The original versions's target path can be NULL if it is not available,
943  * such as if both derived versions added a new symlink at the same path.
944  *
945  * The incoming derived symlink target is NULL in case the incoming change
946  * has deleted this symlink.
947  */
948 static const struct got_error *
949 install_symlink_conflict(const char *deriv_target,
950     struct got_object_id *deriv_base_commit_id, const char *orig_target,
951     const char *label_orig, const char *local_target, const char *ondisk_path)
952 {
953 	const struct got_error *err;
954 	char *id_str = NULL, *label_deriv = NULL, *path = NULL;
955 	FILE *f = NULL;
956 
957 	err = got_object_id_str(&id_str, deriv_base_commit_id);
958 	if (err)
959 		return got_error_from_errno("asprintf");
960 
961 	if (asprintf(&label_deriv, "%s: commit %s",
962 	    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
963 		err = got_error_from_errno("asprintf");
964 		goto done;
965 	}
966 
967 	err = got_opentemp_named(&path, &f, "got-symlink-conflict");
968 	if (err)
969 		goto done;
970 
971 	if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
972 	    GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
973 	    deriv_target ? deriv_target : "(symlink was deleted)",
974 	    orig_target ? label_orig : "",
975 	    orig_target ? "\n" : "",
976 	    orig_target ? orig_target : "",
977 	    orig_target ? "\n" : "",
978 	    GOT_DIFF_CONFLICT_MARKER_SEP,
979 	    local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
980 		err = got_error_from_errno2("fprintf", path);
981 		goto done;
982 	}
983 
984 	if (unlink(ondisk_path) == -1) {
985 		err = got_error_from_errno2("unlink", ondisk_path);
986 		goto done;
987 	}
988 	if (rename(path, ondisk_path) == -1) {
989 		err = got_error_from_errno3("rename", path, ondisk_path);
990 		goto done;
991 	}
992 	if (chmod(ondisk_path, GOT_DEFAULT_FILE_MODE) == -1) {
993 		err = got_error_from_errno2("chmod", ondisk_path);
994 		goto done;
995 	}
996 done:
997 	if (f != NULL && fclose(f) == EOF && err == NULL)
998 		err = got_error_from_errno2("fclose", path);
999 	free(path);
1000 	free(id_str);
1001 	free(label_deriv);
1002 	return err;
1003 }
1004 
1005 /* forward declaration */
1006 static const struct got_error *
1007 merge_blob(int *, struct got_worktree *, struct got_blob_object *,
1008     const char *, const char *, uint16_t, const char *,
1009     struct got_blob_object *, struct got_object_id *,
1010     struct got_repository *, got_worktree_checkout_cb, void *);
1011 
1012 /*
1013  * Merge a symlink into the work tree, where blob_orig acts as the common
1014  * ancestor, deriv_target is the link target of the first derived version,
1015  * and the symlink on disk acts as the second derived version.
1016  * Assume that contents of both blobs represent symlinks.
1017  */
1018 static const struct got_error *
1019 merge_symlink(struct got_worktree *worktree,
1020     struct got_blob_object *blob_orig, const char *ondisk_path,
1021     const char *path, const char *label_orig, const char *deriv_target,
1022     struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1023     got_worktree_checkout_cb progress_cb, void *progress_arg)
1024 {
1025 	const struct got_error *err = NULL;
1026 	char *ancestor_target = NULL;
1027 	struct stat sb;
1028 	ssize_t ondisk_len, deriv_len;
1029 	char ondisk_target[PATH_MAX];
1030 	int have_local_change = 0;
1031 	int have_incoming_change = 0;
1032 
1033 	if (lstat(ondisk_path, &sb) == -1)
1034 		return got_error_from_errno2("lstat", ondisk_path);
1035 
1036 	ondisk_len = readlink(ondisk_path, ondisk_target,
1037 	    sizeof(ondisk_target));
1038 	if (ondisk_len == -1) {
1039 		err = got_error_from_errno2("readlink",
1040 		    ondisk_path);
1041 		goto done;
1042 	}
1043 	ondisk_target[ondisk_len] = '\0';
1044 
1045 	if (blob_orig) {
1046 		err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
1047 		if (err)
1048 			goto done;
1049 	}
1050 
1051 	if (ancestor_target == NULL ||
1052 	    (ondisk_len != strlen(ancestor_target) ||
1053 	    memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
1054 		have_local_change = 1;
1055 
1056 	deriv_len = strlen(deriv_target);
1057 	if (ancestor_target == NULL ||
1058 	    (deriv_len != strlen(ancestor_target) ||
1059 	    memcmp(deriv_target, ancestor_target, deriv_len) != 0))
1060 		have_incoming_change = 1;
1061 
1062 	if (!have_local_change && !have_incoming_change) {
1063 		if (ancestor_target) {
1064 			/* Both sides made the same change. */
1065 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1066 			    path);
1067 		} else if (deriv_len == ondisk_len &&
1068 		    memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
1069 			/* Both sides added the same symlink. */
1070 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1071 			    path);
1072 		} else {
1073 			/* Both sides added symlinks which don't match. */
1074 			err = install_symlink_conflict(deriv_target,
1075 			    deriv_base_commit_id, ancestor_target,
1076 			    label_orig, ondisk_target, ondisk_path);
1077 			if (err)
1078 				goto done;
1079 			err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1080 			    path);
1081 		}
1082 	} else if (!have_local_change && have_incoming_change) {
1083 		/* Apply the incoming change. */
1084 		err = update_symlink(ondisk_path, deriv_target,
1085 		    strlen(deriv_target));
1086 		if (err)
1087 			goto done;
1088 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1089 	} else if (have_local_change && have_incoming_change) {
1090 		if (deriv_len == ondisk_len &&
1091 		    memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
1092 			/* Both sides made the same change. */
1093 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1094 			    path);
1095 		} else {
1096 			err = install_symlink_conflict(deriv_target,
1097 			    deriv_base_commit_id, ancestor_target, label_orig,
1098 			    ondisk_target, ondisk_path);
1099 			if (err)
1100 				goto done;
1101 			err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1102 			    path);
1103 		}
1104 	}
1105 
1106 done:
1107 	free(ancestor_target);
1108 	return err;
1109 }
1110 
1111 /*
1112  * Perform a 3-way merge where blob_orig acts as the common ancestor,
1113  * blob_deriv acts as the first derived version, and the file on disk
1114  * acts as the second derived version.
1115  */
1116 static const struct got_error *
1117 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
1118     struct got_blob_object *blob_orig, const char *ondisk_path,
1119     const char *path, uint16_t st_mode, const char *label_orig,
1120     struct got_blob_object *blob_deriv,
1121     struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1122     got_worktree_checkout_cb progress_cb, void *progress_arg)
1123 {
1124 	const struct got_error *err = NULL;
1125 	FILE *f_deriv = NULL;
1126 	char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
1127 	char *label_deriv = NULL, *parent = NULL;
1128 
1129 	*local_changes_subsumed = 0;
1130 
1131 	err = got_path_dirname(&parent, ondisk_path);
1132 	if (err)
1133 		return err;
1134 
1135 	free(base_path);
1136 	if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1137 		err = got_error_from_errno("asprintf");
1138 		base_path = NULL;
1139 		goto done;
1140 	}
1141 
1142 	err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1143 	if (err)
1144 		goto done;
1145 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1146 	    blob_deriv);
1147 	if (err)
1148 		goto done;
1149 
1150 	err = got_object_id_str(&id_str, deriv_base_commit_id);
1151 	if (err)
1152 		goto done;
1153 	if (asprintf(&label_deriv, "%s: commit %s",
1154 	    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1155 		err = got_error_from_errno("asprintf");
1156 		goto done;
1157 	}
1158 
1159 	err = merge_file(local_changes_subsumed, worktree, blob_orig,
1160 	    ondisk_path, path, st_mode, blob_deriv_path, label_orig,
1161 	    label_deriv, repo, progress_cb, progress_arg);
1162 done:
1163 	if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
1164 		err = got_error_from_errno("fclose");
1165 	free(base_path);
1166 	if (blob_deriv_path) {
1167 		unlink(blob_deriv_path);
1168 		free(blob_deriv_path);
1169 	}
1170 	free(id_str);
1171 	free(label_deriv);
1172 	free(parent);
1173 	return err;
1174 }
1175 
1176 static const struct got_error *
1177 create_fileindex_entry(struct got_fileindex_entry **new_iep,
1178     struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1179     const char *ondisk_path, const char *path, struct got_object_id *blob_id)
1180 {
1181 	const struct got_error *err = NULL;
1182 	struct got_fileindex_entry *new_ie;
1183 
1184 	*new_iep = NULL;
1185 
1186 	err = got_fileindex_entry_alloc(&new_ie, path);
1187 	if (err)
1188 		return err;
1189 
1190 	err = got_fileindex_entry_update(new_ie, ondisk_path,
1191 	    blob_id->sha1, base_commit_id->sha1, 1);
1192 	if (err)
1193 		goto done;
1194 
1195 	err = got_fileindex_entry_add(fileindex, new_ie);
1196 done:
1197 	if (err)
1198 		got_fileindex_entry_free(new_ie);
1199 	else
1200 		*new_iep = new_ie;
1201 	return err;
1202 }
1203 
1204 static mode_t
1205 get_ondisk_perms(int executable, mode_t st_mode)
1206 {
1207 	mode_t xbits = S_IXUSR;
1208 
1209 	if (executable) {
1210 		/* Map read bits to execute bits. */
1211 		if (st_mode & S_IRGRP)
1212 			xbits |= S_IXGRP;
1213 		if (st_mode & S_IROTH)
1214 			xbits |= S_IXOTH;
1215 		return st_mode | xbits;
1216 	}
1217 
1218 	return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1219 }
1220 
1221 /* forward declaration */
1222 static const struct got_error *
1223 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1224     const char *path, mode_t te_mode, mode_t st_mode,
1225     struct got_blob_object *blob, int restoring_missing_file,
1226     int reverting_versioned_file, int installing_bad_symlink,
1227     int path_is_unversioned, struct got_repository *repo,
1228     got_worktree_checkout_cb progress_cb, void *progress_arg);
1229 
1230 /*
1231  * This function assumes that the provided symlink target points at a
1232  * safe location in the work tree!
1233  */
1234 static const struct got_error *
1235 replace_existing_symlink(const char *ondisk_path, const char *target_path,
1236     size_t target_len)
1237 {
1238 	const struct got_error *err = NULL;
1239 	ssize_t elen;
1240 	char etarget[PATH_MAX];
1241 	int fd;
1242 
1243 	/*
1244 	 * "Bad" symlinks (those pointing outside the work tree or into the
1245 	 * .got directory) are installed in the work tree as a regular file
1246 	 * which contains the bad symlink target path.
1247 	 * The new symlink target has already been checked for safety by our
1248 	 * caller. If we can successfully open a regular file then we simply
1249 	 * replace this file with a symlink below.
1250 	 */
1251 	fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
1252 	if (fd == -1) {
1253 		if (errno != ELOOP)
1254 			return got_error_from_errno2("open", ondisk_path);
1255 
1256 		/* We are updating an existing on-disk symlink. */
1257 		elen = readlink(ondisk_path, etarget, sizeof(etarget));
1258 		if (elen == -1)
1259 			return got_error_from_errno2("readlink", ondisk_path);
1260 
1261 		if (elen == target_len &&
1262 		    memcmp(etarget, target_path, target_len) == 0)
1263 			return NULL; /* nothing to do */
1264 	}
1265 
1266 	err = update_symlink(ondisk_path, target_path, target_len);
1267 	if (fd != -1 && close(fd) == -1 && err == NULL)
1268 		err = got_error_from_errno2("close", ondisk_path);
1269 	return err;
1270 }
1271 
1272 static const struct got_error *
1273 is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1274     size_t target_len, const char *ondisk_path, const char *wtroot_path)
1275 {
1276 	const struct got_error *err = NULL;
1277 	char canonpath[PATH_MAX];
1278 	char *path_got = NULL;
1279 
1280 	*is_bad_symlink = 0;
1281 
1282 	if (target_len >= sizeof(canonpath)) {
1283 		*is_bad_symlink = 1;
1284 		return NULL;
1285 	}
1286 
1287 	/*
1288 	 * We do not use realpath(3) to resolve the symlink's target
1289 	 * path because we don't want to resolve symlinks recursively.
1290 	 * Instead we make the path absolute and then canonicalize it.
1291 	 * Relative symlink target lookup should begin at the directory
1292 	 * in which the blob object is being installed.
1293 	 */
1294 	if (!got_path_is_absolute(target_path)) {
1295 		char *abspath, *parent;
1296 		err = got_path_dirname(&parent, ondisk_path);
1297 		if (err)
1298 			return err;
1299 		if (asprintf(&abspath, "%s/%s",  parent, target_path) == -1) {
1300 			free(parent);
1301 			return got_error_from_errno("asprintf");
1302 		}
1303 		free(parent);
1304 		if (strlen(abspath) >= sizeof(canonpath)) {
1305 			err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1306 			free(abspath);
1307 			return err;
1308 		}
1309 		err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1310 		free(abspath);
1311 		if (err)
1312 			return err;
1313 	} else {
1314 		err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1315 		if (err)
1316 			return err;
1317 	}
1318 
1319 	/* Only allow symlinks pointing at paths within the work tree. */
1320 	if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1321 		*is_bad_symlink = 1;
1322 		return NULL;
1323 	}
1324 
1325 	/* Do not allow symlinks pointing into the .got directory. */
1326 	if (asprintf(&path_got, "%s/%s", wtroot_path,
1327 	    GOT_WORKTREE_GOT_DIR) == -1)
1328 		return got_error_from_errno("asprintf");
1329 	if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1330 		*is_bad_symlink = 1;
1331 
1332 	free(path_got);
1333 	return NULL;
1334 }
1335 
1336 static const struct got_error *
1337 install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1338     const char *ondisk_path, const char *path, struct got_blob_object *blob,
1339     int restoring_missing_file, int reverting_versioned_file,
1340     int path_is_unversioned, struct got_repository *repo,
1341     got_worktree_checkout_cb progress_cb, void *progress_arg)
1342 {
1343 	const struct got_error *err = NULL;
1344 	char target_path[PATH_MAX];
1345 	size_t len, target_len = 0;
1346 	char *path_got = NULL;
1347 	const uint8_t *buf = got_object_blob_get_read_buf(blob);
1348 	size_t hdrlen = got_object_blob_get_hdrlen(blob);
1349 
1350 	*is_bad_symlink = 0;
1351 
1352 	/* 
1353 	 * Blob object content specifies the target path of the link.
1354 	 * If a symbolic link cannot be installed we instead create
1355 	 * a regular file which contains the link target path stored
1356 	 * in the blob object.
1357 	 */
1358 	do {
1359 		err = got_object_blob_read_block(&len, blob);
1360 		if (len + target_len >= sizeof(target_path)) {
1361 			/* Path too long; install as a regular file. */
1362 			*is_bad_symlink = 1;
1363 			got_object_blob_rewind(blob);
1364 			return install_blob(worktree, ondisk_path, path,
1365 			    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1366 			    restoring_missing_file, reverting_versioned_file,
1367 			    1, path_is_unversioned, repo, progress_cb,
1368 			    progress_arg);
1369 		}
1370 		if (len > 0) {
1371 			/* Skip blob object header first time around. */
1372 			memcpy(target_path + target_len, buf + hdrlen,
1373 			    len - hdrlen);
1374 			target_len += len - hdrlen;
1375 			hdrlen = 0;
1376 		}
1377 	} while (len != 0);
1378 	target_path[target_len] = '\0';
1379 
1380 	err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1381 	    ondisk_path, worktree->root_path);
1382 	if (err)
1383 		return err;
1384 
1385 	if (*is_bad_symlink) {
1386 		/* install as a regular file */
1387 		*is_bad_symlink = 1;
1388 		got_object_blob_rewind(blob);
1389 		err = install_blob(worktree, ondisk_path, path,
1390 		    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1391 		    restoring_missing_file, reverting_versioned_file, 1,
1392 		    path_is_unversioned, repo, progress_cb, progress_arg);
1393 		goto done;
1394 	}
1395 
1396 	if (symlink(target_path, ondisk_path) == -1) {
1397 		if (errno == EEXIST) {
1398 			if (path_is_unversioned) {
1399 				err = (*progress_cb)(progress_arg,
1400 				    GOT_STATUS_UNVERSIONED, path);
1401 				goto done;
1402 			}
1403 			err = replace_existing_symlink(ondisk_path,
1404 			    target_path, target_len);
1405 			if (err)
1406 				goto done;
1407 			if (progress_cb) {
1408 				err = (*progress_cb)(progress_arg,
1409 				    reverting_versioned_file ?
1410 				    GOT_STATUS_REVERT : GOT_STATUS_UPDATE,
1411 				    path);
1412 			}
1413 			goto done; /* Nothing else to do. */
1414 		}
1415 
1416 		if (errno == ENOENT) {
1417 			char *parent;
1418 			err = got_path_dirname(&parent, ondisk_path);
1419 			if (err)
1420 				goto done;
1421 			err = add_dir_on_disk(worktree, parent);
1422 			free(parent);
1423 			if (err)
1424 				goto done;
1425 			/*
1426 			 * Retry, and fall through to error handling
1427 			 * below if this second attempt fails.
1428 			 */
1429 			if (symlink(target_path, ondisk_path) != -1) {
1430 				err = NULL; /* success */
1431 				goto done;
1432 			}
1433 		}
1434 
1435 		/* Handle errors from first or second creation attempt. */
1436 		if (errno == ENAMETOOLONG) {
1437 			/* bad target path; install as a regular file */
1438 			*is_bad_symlink = 1;
1439 			got_object_blob_rewind(blob);
1440 			err = install_blob(worktree, ondisk_path, path,
1441 			    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1442 			    restoring_missing_file, reverting_versioned_file, 1,
1443 			    path_is_unversioned, repo,
1444 			    progress_cb, progress_arg);
1445 		} else if (errno == ENOTDIR) {
1446 			err = got_error_path(ondisk_path,
1447 			    GOT_ERR_FILE_OBSTRUCTED);
1448 		} else {
1449 			err = got_error_from_errno3("symlink",
1450 			    target_path, ondisk_path);
1451 		}
1452 	} else if (progress_cb)
1453 		err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1454 		    GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1455 done:
1456 	free(path_got);
1457 	return err;
1458 }
1459 
1460 static const struct got_error *
1461 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1462     const char *path, mode_t te_mode, mode_t st_mode,
1463     struct got_blob_object *blob, int restoring_missing_file,
1464     int reverting_versioned_file, int installing_bad_symlink,
1465     int path_is_unversioned, struct got_repository *repo,
1466     got_worktree_checkout_cb progress_cb, void *progress_arg)
1467 {
1468 	const struct got_error *err = NULL;
1469 	int fd = -1;
1470 	size_t len, hdrlen;
1471 	int update = 0;
1472 	char *tmppath = NULL;
1473 
1474 	fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1475 	    GOT_DEFAULT_FILE_MODE);
1476 	if (fd == -1) {
1477 		if (errno == ENOENT) {
1478 			char *parent;
1479 			err = got_path_dirname(&parent, path);
1480 			if (err)
1481 				return err;
1482 			err = add_dir_on_disk(worktree, parent);
1483 			free(parent);
1484 			if (err)
1485 				return err;
1486 			fd = open(ondisk_path,
1487 			    O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1488 			    GOT_DEFAULT_FILE_MODE);
1489 			if (fd == -1)
1490 				return got_error_from_errno2("open",
1491 				    ondisk_path);
1492 		} else if (errno == EEXIST) {
1493 			if (path_is_unversioned) {
1494 				err = (*progress_cb)(progress_arg,
1495 				    GOT_STATUS_UNVERSIONED, path);
1496 				goto done;
1497 			}
1498 			if (!S_ISREG(st_mode) && !installing_bad_symlink) {
1499 				/* TODO file is obstructed; do something */
1500 				err = got_error_path(ondisk_path,
1501 				    GOT_ERR_FILE_OBSTRUCTED);
1502 				goto done;
1503 			} else {
1504 				err = got_opentemp_named_fd(&tmppath, &fd,
1505 				    ondisk_path);
1506 				if (err)
1507 					goto done;
1508 				update = 1;
1509 			}
1510 		} else
1511 			return got_error_from_errno2("open", ondisk_path);
1512 	}
1513 
1514 	if (progress_cb) {
1515 		if (restoring_missing_file)
1516 			err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1517 			    path);
1518 		else if (reverting_versioned_file)
1519 			err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1520 			    path);
1521 		else
1522 			err = (*progress_cb)(progress_arg,
1523 			    update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1524 		if (err)
1525 			goto done;
1526 	}
1527 
1528 	hdrlen = got_object_blob_get_hdrlen(blob);
1529 	do {
1530 		const uint8_t *buf = got_object_blob_get_read_buf(blob);
1531 		err = got_object_blob_read_block(&len, blob);
1532 		if (err)
1533 			break;
1534 		if (len > 0) {
1535 			/* Skip blob object header first time around. */
1536 			ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1537 			if (outlen == -1) {
1538 				err = got_error_from_errno("write");
1539 				goto done;
1540 			} else if (outlen != len - hdrlen) {
1541 				err = got_error(GOT_ERR_IO);
1542 				goto done;
1543 			}
1544 			hdrlen = 0;
1545 		}
1546 	} while (len != 0);
1547 
1548 	if (fsync(fd) != 0) {
1549 		err = got_error_from_errno("fsync");
1550 		goto done;
1551 	}
1552 
1553 	if (update) {
1554 		if (rename(tmppath, ondisk_path) != 0) {
1555 			err = got_error_from_errno3("rename", tmppath,
1556 			    ondisk_path);
1557 			unlink(tmppath);
1558 			goto done;
1559 		}
1560 	}
1561 
1562 	if (chmod(ondisk_path,
1563 	    get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1564 		err = got_error_from_errno2("chmod", ondisk_path);
1565 		goto done;
1566 	}
1567 
1568 done:
1569 	if (fd != -1 && close(fd) != 0 && err == NULL)
1570 		err = got_error_from_errno("close");
1571 	free(tmppath);
1572 	return err;
1573 }
1574 
1575 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1576 static const struct got_error *
1577 get_modified_file_content_status(unsigned char *status, FILE *f)
1578 {
1579 	const struct got_error *err = NULL;
1580 	const char *markers[3] = {
1581 		GOT_DIFF_CONFLICT_MARKER_BEGIN,
1582 		GOT_DIFF_CONFLICT_MARKER_SEP,
1583 		GOT_DIFF_CONFLICT_MARKER_END
1584 	};
1585 	int i = 0;
1586 	char *line;
1587 	size_t len;
1588 	const char delim[3] = {'\0', '\0', '\0'};
1589 
1590 	while (*status == GOT_STATUS_MODIFY) {
1591 		line = fparseln(f, &len, NULL, delim, 0);
1592 		if (line == NULL) {
1593 			if (feof(f))
1594 				break;
1595 			err = got_ferror(f, GOT_ERR_IO);
1596 			break;
1597 		}
1598 
1599 		if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1600 			if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1601 			    == 0)
1602 				*status = GOT_STATUS_CONFLICT;
1603 			else
1604 				i++;
1605 		}
1606 	}
1607 
1608 	return err;
1609 }
1610 
1611 static int
1612 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1613 {
1614 	mode_t ie_mode = got_fileindex_perms_to_st(ie);
1615 	return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1616 }
1617 
1618 static int
1619 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1620 {
1621 	return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1622 	    ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1623 	    ie->mtime_sec == sb->st_mtim.tv_sec &&
1624 	    ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1625 	    ie->size == (sb->st_size & 0xffffffff) &&
1626 	    !xbit_differs(ie, sb->st_mode));
1627 }
1628 
1629 static unsigned char
1630 get_staged_status(struct got_fileindex_entry *ie)
1631 {
1632 	switch (got_fileindex_entry_stage_get(ie)) {
1633 	case GOT_FILEIDX_STAGE_ADD:
1634 		return GOT_STATUS_ADD;
1635 	case GOT_FILEIDX_STAGE_DELETE:
1636 		return GOT_STATUS_DELETE;
1637 	case GOT_FILEIDX_STAGE_MODIFY:
1638 		return GOT_STATUS_MODIFY;
1639 	default:
1640 		return GOT_STATUS_NO_CHANGE;
1641 	}
1642 }
1643 
1644 static const struct got_error *
1645 get_symlink_modification_status(unsigned char *status,
1646     struct got_fileindex_entry *ie, const char *abspath,
1647     int dirfd, const char *de_name, struct got_blob_object *blob)
1648 {
1649 	const struct got_error *err = NULL;
1650 	char target_path[PATH_MAX];
1651 	char etarget[PATH_MAX];
1652 	ssize_t elen;
1653 	size_t len, target_len = 0;
1654 	const uint8_t *buf = got_object_blob_get_read_buf(blob);
1655 	size_t hdrlen = got_object_blob_get_hdrlen(blob);
1656 
1657 	*status = GOT_STATUS_NO_CHANGE;
1658 
1659 	/* Blob object content specifies the target path of the link. */
1660 	do {
1661 		err = got_object_blob_read_block(&len, blob);
1662 		if (err)
1663 			return err;
1664 		if (len + target_len >= sizeof(target_path)) {
1665 			/*
1666 			 * Should not happen. The blob contents were OK
1667 			 * when this symlink was installed.
1668 			 */
1669 			return got_error(GOT_ERR_NO_SPACE);
1670 		}
1671 		if (len > 0) {
1672 			/* Skip blob object header first time around. */
1673 			memcpy(target_path + target_len, buf + hdrlen,
1674 			    len - hdrlen);
1675 			target_len += len - hdrlen;
1676 			hdrlen = 0;
1677 		}
1678 	} while (len != 0);
1679 	target_path[target_len] = '\0';
1680 
1681 	if (dirfd != -1) {
1682 		elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1683 		if (elen == -1)
1684 			return got_error_from_errno2("readlinkat", abspath);
1685 	} else {
1686 		elen = readlink(abspath, etarget, sizeof(etarget));
1687 		if (elen == -1)
1688 			return got_error_from_errno2("readlink", abspath);
1689 	}
1690 
1691 	if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1692 		*status = GOT_STATUS_MODIFY;
1693 
1694 	return NULL;
1695 }
1696 
1697 static const struct got_error *
1698 get_file_status(unsigned char *status, struct stat *sb,
1699     struct got_fileindex_entry *ie, const char *abspath,
1700     int dirfd, const char *de_name, struct got_repository *repo)
1701 {
1702 	const struct got_error *err = NULL;
1703 	struct got_object_id id;
1704 	size_t hdrlen;
1705 	int fd = -1;
1706 	FILE *f = NULL;
1707 	uint8_t fbuf[8192];
1708 	struct got_blob_object *blob = NULL;
1709 	size_t flen, blen;
1710 	unsigned char staged_status = get_staged_status(ie);
1711 
1712 	*status = GOT_STATUS_NO_CHANGE;
1713 
1714 	/*
1715 	 * Whenever the caller provides a directory descriptor and a
1716 	 * directory entry name for the file, use them! This prevents
1717 	 * race conditions if filesystem paths change beneath our feet.
1718 	 */
1719 	if (dirfd != -1) {
1720 		if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1721 			if (errno == ENOENT) {
1722 				if (got_fileindex_entry_has_file_on_disk(ie))
1723 					*status = GOT_STATUS_MISSING;
1724 				else
1725 					*status = GOT_STATUS_DELETE;
1726 				goto done;
1727 			}
1728 			err = got_error_from_errno2("fstatat", abspath);
1729 			goto done;
1730 		}
1731 	} else {
1732 		fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1733 		if (fd == -1 && errno != ENOENT && errno != ELOOP)
1734 			return got_error_from_errno2("open", abspath);
1735 		else if (fd == -1 && errno == ELOOP) {
1736 			if (lstat(abspath, sb) == -1)
1737 				return got_error_from_errno2("lstat", abspath);
1738 		} else if (fd == -1 || fstat(fd, sb) == -1) {
1739 			if (errno == ENOENT) {
1740 				if (got_fileindex_entry_has_file_on_disk(ie))
1741 					*status = GOT_STATUS_MISSING;
1742 				else
1743 					*status = GOT_STATUS_DELETE;
1744 				goto done;
1745 			}
1746 			err = got_error_from_errno2("fstat", abspath);
1747 			goto done;
1748 		}
1749 	}
1750 
1751 	if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1752 		*status = GOT_STATUS_OBSTRUCTED;
1753 		goto done;
1754 	}
1755 
1756 	if (!got_fileindex_entry_has_file_on_disk(ie)) {
1757 		*status = GOT_STATUS_DELETE;
1758 		goto done;
1759 	} else if (!got_fileindex_entry_has_blob(ie) &&
1760 	    staged_status != GOT_STATUS_ADD) {
1761 		*status = GOT_STATUS_ADD;
1762 		goto done;
1763 	}
1764 
1765 	if (!stat_info_differs(ie, sb))
1766 		goto done;
1767 
1768 	if (S_ISLNK(sb->st_mode) &&
1769 	    got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1770 		*status = GOT_STATUS_MODIFY;
1771 		goto done;
1772 	}
1773 
1774 	if (staged_status == GOT_STATUS_MODIFY ||
1775 	    staged_status == GOT_STATUS_ADD)
1776 		memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1777 	else
1778 		memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1779 
1780 	err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1781 	if (err)
1782 		goto done;
1783 
1784 	if (S_ISLNK(sb->st_mode)) {
1785 		err = get_symlink_modification_status(status, ie,
1786 		    abspath, dirfd, de_name, blob);
1787 		goto done;
1788 	}
1789 
1790 	if (dirfd != -1) {
1791 		fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1792 		if (fd == -1) {
1793 			err = got_error_from_errno2("openat", abspath);
1794 			goto done;
1795 		}
1796 	}
1797 
1798 	f = fdopen(fd, "r");
1799 	if (f == NULL) {
1800 		err = got_error_from_errno2("fdopen", abspath);
1801 		goto done;
1802 	}
1803 	fd = -1;
1804 	hdrlen = got_object_blob_get_hdrlen(blob);
1805 	for (;;) {
1806 		const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1807 		err = got_object_blob_read_block(&blen, blob);
1808 		if (err)
1809 			goto done;
1810 		/* Skip length of blob object header first time around. */
1811 		flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1812 		if (flen == 0 && ferror(f)) {
1813 			err = got_error_from_errno("fread");
1814 			goto done;
1815 		}
1816 		if (blen - hdrlen == 0) {
1817 			if (flen != 0)
1818 				*status = GOT_STATUS_MODIFY;
1819 			break;
1820 		} else if (flen == 0) {
1821 			if (blen - hdrlen != 0)
1822 				*status = GOT_STATUS_MODIFY;
1823 			break;
1824 		} else if (blen - hdrlen == flen) {
1825 			/* Skip blob object header first time around. */
1826 			if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1827 				*status = GOT_STATUS_MODIFY;
1828 				break;
1829 			}
1830 		} else {
1831 			*status = GOT_STATUS_MODIFY;
1832 			break;
1833 		}
1834 		hdrlen = 0;
1835 	}
1836 
1837 	if (*status == GOT_STATUS_MODIFY) {
1838 		rewind(f);
1839 		err = get_modified_file_content_status(status, f);
1840 	} else if (xbit_differs(ie, sb->st_mode))
1841 		*status = GOT_STATUS_MODE_CHANGE;
1842 done:
1843 	if (blob)
1844 		got_object_blob_close(blob);
1845 	if (f != NULL && fclose(f) == EOF && err == NULL)
1846 		err = got_error_from_errno2("fclose", abspath);
1847 	if (fd != -1 && close(fd) == -1 && err == NULL)
1848 		err = got_error_from_errno2("close", abspath);
1849 	return err;
1850 }
1851 
1852 /*
1853  * Update timestamps in the file index if a file is unmodified and
1854  * we had to run a full content comparison to find out.
1855  */
1856 static const struct got_error *
1857 sync_timestamps(char *ondisk_path, unsigned char status,
1858     struct got_fileindex_entry *ie, struct stat *sb)
1859 {
1860 	if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1861 		return got_fileindex_entry_update(ie, ondisk_path,
1862 		    ie->blob_sha1, ie->commit_sha1, 1);
1863 
1864 	return NULL;
1865 }
1866 
1867 static const struct got_error *
1868 update_blob(struct got_worktree *worktree,
1869     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1870     struct got_tree_entry *te, const char *path,
1871     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1872     void *progress_arg)
1873 {
1874 	const struct got_error *err = NULL;
1875 	struct got_blob_object *blob = NULL;
1876 	char *ondisk_path;
1877 	unsigned char status = GOT_STATUS_NO_CHANGE;
1878 	struct stat sb;
1879 
1880 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1881 		return got_error_from_errno("asprintf");
1882 
1883 	if (ie) {
1884 		if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1885 			err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1886 			goto done;
1887 		}
1888 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1889 		    repo);
1890 		if (err)
1891 			goto done;
1892 		if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1893 			sb.st_mode = got_fileindex_perms_to_st(ie);
1894 	} else {
1895 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
1896 		status = GOT_STATUS_UNVERSIONED;
1897 	}
1898 
1899 	if (status == GOT_STATUS_OBSTRUCTED) {
1900 		err = (*progress_cb)(progress_arg, status, path);
1901 		goto done;
1902 	}
1903 	if (status == GOT_STATUS_CONFLICT) {
1904 		err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1905 		    path);
1906 		goto done;
1907 	}
1908 
1909 	if (ie && status != GOT_STATUS_MISSING &&
1910 	    (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1911 		if (got_fileindex_entry_has_commit(ie) &&
1912 		    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1913 		    SHA1_DIGEST_LENGTH) == 0) {
1914 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1915 			if (err)
1916 				goto done;
1917 			err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1918 			    path);
1919 			goto done;
1920 		}
1921 		if (got_fileindex_entry_has_blob(ie) &&
1922 		    memcmp(ie->blob_sha1, te->id.sha1,
1923 		    SHA1_DIGEST_LENGTH) == 0) {
1924 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1925 			goto done;
1926 		}
1927 	}
1928 
1929 	err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1930 	if (err)
1931 		goto done;
1932 
1933 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1934 		int update_timestamps;
1935 		struct got_blob_object *blob2 = NULL;
1936 		char *label_orig = NULL;
1937 		if (got_fileindex_entry_has_blob(ie)) {
1938 			struct got_object_id id2;
1939 			memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1940 			err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1941 			if (err)
1942 				goto done;
1943 		}
1944 		if (got_fileindex_entry_has_commit(ie)) {
1945 			char id_str[SHA1_DIGEST_STRING_LENGTH];
1946 			if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1947 			    sizeof(id_str)) == NULL) {
1948 				err = got_error_path(id_str,
1949 				    GOT_ERR_BAD_OBJ_ID_STR);
1950 				goto done;
1951 			}
1952 			if (asprintf(&label_orig, "%s: commit %s",
1953 			    GOT_MERGE_LABEL_BASE, id_str) == -1) {
1954 				err = got_error_from_errno("asprintf");
1955 				goto done;
1956 			}
1957 		}
1958 		if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1959 			char *link_target;
1960 			err = got_object_blob_read_to_str(&link_target, blob);
1961 			if (err)
1962 				goto done;
1963 			err = merge_symlink(worktree, blob2, ondisk_path, path,
1964 			    label_orig, link_target, worktree->base_commit_id,
1965 			    repo, progress_cb, progress_arg);
1966 			free(link_target);
1967 		} else {
1968 			err = merge_blob(&update_timestamps, worktree, blob2,
1969 			    ondisk_path, path, sb.st_mode, label_orig, blob,
1970 			    worktree->base_commit_id, repo,
1971 			    progress_cb, progress_arg);
1972 		}
1973 		free(label_orig);
1974 		if (blob2)
1975 			got_object_blob_close(blob2);
1976 		if (err)
1977 			goto done;
1978 		/*
1979 		 * Do not update timestamps of files with local changes.
1980 		 * Otherwise, a future status walk would treat them as
1981 		 * unmodified files again.
1982 		 */
1983 		err = got_fileindex_entry_update(ie, ondisk_path,
1984 		    blob->id.sha1, worktree->base_commit_id->sha1,
1985 		    update_timestamps);
1986 	} else if (status == GOT_STATUS_MODE_CHANGE) {
1987 		err = got_fileindex_entry_update(ie, ondisk_path,
1988 		    blob->id.sha1, worktree->base_commit_id->sha1, 0);
1989 	} else if (status == GOT_STATUS_DELETE) {
1990 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1991 		if (err)
1992 			goto done;
1993 		err = got_fileindex_entry_update(ie, ondisk_path,
1994 		    blob->id.sha1, worktree->base_commit_id->sha1, 0);
1995 		if (err)
1996 			goto done;
1997 	} else {
1998 		int is_bad_symlink = 0;
1999 		if (S_ISLNK(te->mode)) {
2000 			err = install_symlink(&is_bad_symlink, worktree,
2001 			    ondisk_path, path, blob,
2002 			    status == GOT_STATUS_MISSING, 0,
2003 			    status == GOT_STATUS_UNVERSIONED, repo,
2004 			    progress_cb, progress_arg);
2005 		} else {
2006 			err = install_blob(worktree, ondisk_path, path,
2007 			    te->mode, sb.st_mode, blob,
2008 			    status == GOT_STATUS_MISSING, 0, 0,
2009 			    status == GOT_STATUS_UNVERSIONED, repo,
2010 			    progress_cb, progress_arg);
2011 		}
2012 		if (err)
2013 			goto done;
2014 
2015 		if (ie) {
2016 			err = got_fileindex_entry_update(ie, ondisk_path,
2017 			    blob->id.sha1, worktree->base_commit_id->sha1, 1);
2018 		} else {
2019 			err = create_fileindex_entry(&ie, fileindex,
2020 			    worktree->base_commit_id, ondisk_path, path,
2021 			    &blob->id);
2022 		}
2023 		if (err)
2024 			goto done;
2025 
2026 		if (is_bad_symlink) {
2027 			got_fileindex_entry_filetype_set(ie,
2028 			    GOT_FILEIDX_MODE_BAD_SYMLINK);
2029 		}
2030 	}
2031 	got_object_blob_close(blob);
2032 done:
2033 	free(ondisk_path);
2034 	return err;
2035 }
2036 
2037 static const struct got_error *
2038 remove_ondisk_file(const char *root_path, const char *path)
2039 {
2040 	const struct got_error *err = NULL;
2041 	char *ondisk_path = NULL;
2042 
2043 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2044 		return got_error_from_errno("asprintf");
2045 
2046 	if (unlink(ondisk_path) == -1) {
2047 		if (errno != ENOENT)
2048 			err = got_error_from_errno2("unlink", ondisk_path);
2049 	} else {
2050 		size_t root_len = strlen(root_path);
2051 		do {
2052 			char *parent;
2053 			err = got_path_dirname(&parent, ondisk_path);
2054 			if (err)
2055 				return err;
2056 			free(ondisk_path);
2057 			ondisk_path = parent;
2058 			if (rmdir(ondisk_path) == -1) {
2059 				if (errno != ENOTEMPTY)
2060 					err = got_error_from_errno2("rmdir",
2061 					    ondisk_path);
2062 				break;
2063 			}
2064 		} while (got_path_cmp(ondisk_path, root_path,
2065 		    strlen(ondisk_path), root_len) != 0);
2066 	}
2067 	free(ondisk_path);
2068 	return err;
2069 }
2070 
2071 static const struct got_error *
2072 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2073     struct got_fileindex_entry *ie, struct got_repository *repo,
2074     got_worktree_checkout_cb progress_cb, void *progress_arg)
2075 {
2076 	const struct got_error *err = NULL;
2077 	unsigned char status;
2078 	struct stat sb;
2079 	char *ondisk_path;
2080 
2081 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2082 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2083 
2084 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2085 	    == -1)
2086 		return got_error_from_errno("asprintf");
2087 
2088 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2089 	if (err)
2090 		goto done;
2091 
2092 	if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2093 		char ondisk_target[PATH_MAX];
2094 		ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2095 		    sizeof(ondisk_target));
2096 		if (ondisk_len == -1) {
2097 			err = got_error_from_errno2("readlink", ondisk_path);
2098 			goto done;
2099 		}
2100 		ondisk_target[ondisk_len] = '\0';
2101 		err = install_symlink_conflict(NULL, worktree->base_commit_id,
2102 		    NULL, NULL, /* XXX pass common ancestor info? */
2103 		    ondisk_target, ondisk_path);
2104 		if (err)
2105 			goto done;
2106 		err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2107 		    ie->path);
2108 		goto done;
2109 	}
2110 
2111 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2112 	    status == GOT_STATUS_ADD) {
2113 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2114 		if (err)
2115 			goto done;
2116 		/*
2117 		 * Preserve the working file and change the deleted blob's
2118 		 * entry into a schedule-add entry.
2119 		 */
2120 		err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
2121 		    0);
2122 	} else {
2123 		err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2124 		if (err)
2125 			goto done;
2126 		if (status == GOT_STATUS_NO_CHANGE) {
2127 			err = remove_ondisk_file(worktree->root_path, ie->path);
2128 			if (err)
2129 				goto done;
2130 		}
2131 		got_fileindex_entry_remove(fileindex, ie);
2132 	}
2133 done:
2134 	free(ondisk_path);
2135 	return err;
2136 }
2137 
2138 struct diff_cb_arg {
2139     struct got_fileindex *fileindex;
2140     struct got_worktree *worktree;
2141     struct got_repository *repo;
2142     got_worktree_checkout_cb progress_cb;
2143     void *progress_arg;
2144     got_cancel_cb cancel_cb;
2145     void *cancel_arg;
2146 };
2147 
2148 static const struct got_error *
2149 diff_old_new(void *arg, struct got_fileindex_entry *ie,
2150     struct got_tree_entry *te, const char *parent_path)
2151 {
2152 	struct diff_cb_arg *a = arg;
2153 
2154 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2155 		return got_error(GOT_ERR_CANCELLED);
2156 
2157 	return update_blob(a->worktree, a->fileindex, ie, te,
2158 	    ie->path, a->repo, a->progress_cb, a->progress_arg);
2159 }
2160 
2161 static const struct got_error *
2162 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2163 {
2164 	struct diff_cb_arg *a = arg;
2165 
2166 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2167 		return got_error(GOT_ERR_CANCELLED);
2168 
2169 	return delete_blob(a->worktree, a->fileindex, ie,
2170 	    a->repo, a->progress_cb, a->progress_arg);
2171 }
2172 
2173 static const struct got_error *
2174 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2175 {
2176 	struct diff_cb_arg *a = arg;
2177 	const struct got_error *err;
2178 	char *path;
2179 
2180 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2181 		return got_error(GOT_ERR_CANCELLED);
2182 
2183 	if (got_object_tree_entry_is_submodule(te))
2184 		return NULL;
2185 
2186 	if (asprintf(&path, "%s%s%s", parent_path,
2187 	    parent_path[0] ? "/" : "", te->name)
2188 	    == -1)
2189 		return got_error_from_errno("asprintf");
2190 
2191 	if (S_ISDIR(te->mode))
2192 		err = add_dir_on_disk(a->worktree, path);
2193 	else
2194 		err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2195 		    a->repo, a->progress_cb, a->progress_arg);
2196 
2197 	free(path);
2198 	return err;
2199 }
2200 
2201 const struct got_error *
2202 got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2203 {
2204 	uint32_t uuid_status;
2205 
2206 	uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2207 	if (uuid_status != uuid_s_ok) {
2208 		*uuidstr = NULL;
2209 		return got_error_uuid(uuid_status, "uuid_to_string");
2210 	}
2211 
2212 	return NULL;
2213 }
2214 
2215 static const struct got_error *
2216 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2217 {
2218 	const struct got_error *err = NULL;
2219 	char *uuidstr = NULL;
2220 
2221 	*refname = NULL;
2222 
2223 	err = got_worktree_get_uuid(&uuidstr, worktree);
2224 	if (err)
2225 		return err;
2226 
2227 	if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2228 		err = got_error_from_errno("asprintf");
2229 		*refname = NULL;
2230 	}
2231 	free(uuidstr);
2232 	return err;
2233 }
2234 
2235 const struct got_error *
2236 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2237 {
2238 	return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2239 }
2240 
2241 static const struct got_error *
2242 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2243 {
2244 	return get_ref_name(refname, worktree,
2245 	    GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2246 }
2247 
2248 static const struct got_error *
2249 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2250 {
2251 	return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2252 }
2253 
2254 static const struct got_error *
2255 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2256 {
2257 	return get_ref_name(refname, worktree,
2258 	    GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2259 }
2260 
2261 static const struct got_error *
2262 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2263 {
2264 	return get_ref_name(refname, worktree,
2265 	    GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2266 }
2267 
2268 static const struct got_error *
2269 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2270 {
2271 	return get_ref_name(refname, worktree,
2272 	    GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2273 }
2274 
2275 static const struct got_error *
2276 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2277 {
2278 	return get_ref_name(refname, worktree,
2279 	    GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2280 }
2281 
2282 static const struct got_error *
2283 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2284 {
2285 	return get_ref_name(refname, worktree,
2286 	    GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2287 }
2288 
2289 static const struct got_error *
2290 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2291 {
2292 	return get_ref_name(refname, worktree,
2293 	    GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2294 }
2295 
2296 const struct got_error *
2297 got_worktree_get_histedit_script_path(char **path,
2298     struct got_worktree *worktree)
2299 {
2300 	if (asprintf(path, "%s/%s/%s", worktree->root_path,
2301 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2302 		*path = NULL;
2303 		return got_error_from_errno("asprintf");
2304 	}
2305 	return NULL;
2306 }
2307 
2308 /*
2309  * Prevent Git's garbage collector from deleting our base commit by
2310  * setting a reference to our base commit's ID.
2311  */
2312 static const struct got_error *
2313 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2314 {
2315 	const struct got_error *err = NULL;
2316 	struct got_reference *ref = NULL;
2317 	char *refname;
2318 
2319 	err = got_worktree_get_base_ref_name(&refname, worktree);
2320 	if (err)
2321 		return err;
2322 
2323 	err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2324 	if (err)
2325 		goto done;
2326 
2327 	err = got_ref_write(ref, repo);
2328 done:
2329 	free(refname);
2330 	if (ref)
2331 		got_ref_close(ref);
2332 	return err;
2333 }
2334 
2335 static const struct got_error *
2336 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2337 {
2338 	const struct got_error *err = NULL;
2339 
2340 	if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2341 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2342 		err = got_error_from_errno("asprintf");
2343 		*fileindex_path = NULL;
2344 	}
2345 	return err;
2346 }
2347 
2348 
2349 static const struct got_error *
2350 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2351     struct got_worktree *worktree)
2352 {
2353 	const struct got_error *err = NULL;
2354 	FILE *index = NULL;
2355 
2356 	*fileindex_path = NULL;
2357 	*fileindex = got_fileindex_alloc();
2358 	if (*fileindex == NULL)
2359 		return got_error_from_errno("got_fileindex_alloc");
2360 
2361 	err = get_fileindex_path(fileindex_path, worktree);
2362 	if (err)
2363 		goto done;
2364 
2365 	index = fopen(*fileindex_path, "rb");
2366 	if (index == NULL) {
2367 		if (errno != ENOENT)
2368 			err = got_error_from_errno2("fopen", *fileindex_path);
2369 	} else {
2370 		err = got_fileindex_read(*fileindex, index);
2371 		if (fclose(index) != 0 && err == NULL)
2372 			err = got_error_from_errno("fclose");
2373 	}
2374 done:
2375 	if (err) {
2376 		free(*fileindex_path);
2377 		*fileindex_path = NULL;
2378 		got_fileindex_free(*fileindex);
2379 		*fileindex = NULL;
2380 	}
2381 	return err;
2382 }
2383 
2384 struct bump_base_commit_id_arg {
2385 	struct got_object_id *base_commit_id;
2386 	const char *path;
2387 	size_t path_len;
2388 	const char *entry_name;
2389 	got_worktree_checkout_cb progress_cb;
2390 	void *progress_arg;
2391 };
2392 
2393 /* Bump base commit ID of all files within an updated part of the work tree. */
2394 static const struct got_error *
2395 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2396 {
2397 	const struct got_error *err;
2398 	struct bump_base_commit_id_arg *a = arg;
2399 
2400 	if (a->entry_name) {
2401 		if (strcmp(ie->path, a->path) != 0)
2402 			return NULL;
2403 	} else if (!got_path_is_child(ie->path, a->path, a->path_len))
2404 		return NULL;
2405 
2406 	if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2407 	    SHA1_DIGEST_LENGTH) == 0)
2408 		return NULL;
2409 
2410 	if (a->progress_cb) {
2411 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2412 		    ie->path);
2413 		if (err)
2414 			return err;
2415 	}
2416 	memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2417 	return NULL;
2418 }
2419 
2420 static const struct got_error *
2421 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2422 {
2423 	const struct got_error *err = NULL;
2424 	char *new_fileindex_path = NULL;
2425 	FILE *new_index = NULL;
2426 	struct timespec timeout;
2427 
2428 	err = got_opentemp_named(&new_fileindex_path, &new_index,
2429 	    fileindex_path);
2430 	if (err)
2431 		goto done;
2432 
2433 	err = got_fileindex_write(fileindex, new_index);
2434 	if (err)
2435 		goto done;
2436 
2437 	if (rename(new_fileindex_path, fileindex_path) != 0) {
2438 		err = got_error_from_errno3("rename", new_fileindex_path,
2439 		    fileindex_path);
2440 		unlink(new_fileindex_path);
2441 	}
2442 
2443 	/*
2444 	 * Sleep for a short amount of time to ensure that files modified after
2445 	 * this program exits have a different time stamp from the one which
2446 	 * was recorded in the file index.
2447 	 */
2448 	 timeout.tv_sec = 0;
2449 	 timeout.tv_nsec = 1;
2450 	 nanosleep(&timeout,  NULL);
2451 done:
2452 	if (new_index)
2453 		fclose(new_index);
2454 	free(new_fileindex_path);
2455 	return err;
2456 }
2457 
2458 static const struct got_error *
2459 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2460     struct got_object_id **tree_id, const char *wt_relpath,
2461     struct got_worktree *worktree, struct got_repository *repo)
2462 {
2463 	const struct got_error *err = NULL;
2464 	struct got_object_id *id = NULL;
2465 	char *in_repo_path = NULL;
2466 	int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2467 
2468 	*entry_type = GOT_OBJ_TYPE_ANY;
2469 	*tree_relpath = NULL;
2470 	*tree_id = NULL;
2471 
2472 	if (wt_relpath[0] == '\0') {
2473 		/* Check out all files within the work tree. */
2474 		*entry_type = GOT_OBJ_TYPE_TREE;
2475 		*tree_relpath = strdup("");
2476 		if (*tree_relpath == NULL) {
2477 			err = got_error_from_errno("strdup");
2478 			goto done;
2479 		}
2480 		err = got_object_id_by_path(tree_id, repo,
2481 		    worktree->base_commit_id, worktree->path_prefix);
2482 		if (err)
2483 			goto done;
2484 		return NULL;
2485 	}
2486 
2487 	/* Check out a subset of files in the work tree. */
2488 
2489 	if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2490 	    is_root_wt ? "" : "/", wt_relpath) == -1) {
2491 		err = got_error_from_errno("asprintf");
2492 		goto done;
2493 	}
2494 
2495 	err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2496 	    in_repo_path);
2497 	if (err)
2498 		goto done;
2499 
2500 	free(in_repo_path);
2501 	in_repo_path = NULL;
2502 
2503 	err = got_object_get_type(entry_type, repo, id);
2504 	if (err)
2505 		goto done;
2506 
2507 	if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2508 		/* Check out a single file. */
2509 		if (strchr(wt_relpath, '/')  == NULL) {
2510 			/* Check out a single file in work tree's root dir. */
2511 			in_repo_path = strdup(worktree->path_prefix);
2512 			if (in_repo_path == NULL) {
2513 				err = got_error_from_errno("strdup");
2514 				goto done;
2515 			}
2516 			*tree_relpath = strdup("");
2517 			if (*tree_relpath == NULL) {
2518 				err = got_error_from_errno("strdup");
2519 				goto done;
2520 			}
2521 		} else {
2522 			/* Check out a single file in a subdirectory. */
2523 			err = got_path_dirname(tree_relpath, wt_relpath);
2524 			if (err)
2525 				return err;
2526 			if (asprintf(&in_repo_path, "%s%s%s",
2527 			    worktree->path_prefix, is_root_wt ? "" : "/",
2528 			    *tree_relpath) == -1) {
2529 				err = got_error_from_errno("asprintf");
2530 				goto done;
2531 			}
2532 		}
2533 		err = got_object_id_by_path(tree_id, repo,
2534 		    worktree->base_commit_id, in_repo_path);
2535 	} else {
2536 		/* Check out all files within a subdirectory. */
2537 		*tree_id = got_object_id_dup(id);
2538 		if (*tree_id == NULL) {
2539 			err = got_error_from_errno("got_object_id_dup");
2540 			goto done;
2541 		}
2542 		*tree_relpath = strdup(wt_relpath);
2543 		if (*tree_relpath == NULL) {
2544 			err = got_error_from_errno("strdup");
2545 			goto done;
2546 		}
2547 	}
2548 done:
2549 	free(id);
2550 	free(in_repo_path);
2551 	if (err) {
2552 		*entry_type = GOT_OBJ_TYPE_ANY;
2553 		free(*tree_relpath);
2554 		*tree_relpath = NULL;
2555 		free(*tree_id);
2556 		*tree_id = NULL;
2557 	}
2558 	return err;
2559 }
2560 
2561 static const struct got_error *
2562 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2563     const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2564     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2565     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2566 {
2567 	const struct got_error *err = NULL;
2568 	struct got_commit_object *commit = NULL;
2569 	struct got_tree_object *tree = NULL;
2570 	struct got_fileindex_diff_tree_cb diff_cb;
2571 	struct diff_cb_arg arg;
2572 
2573 	err = ref_base_commit(worktree, repo);
2574 	if (err) {
2575 		if (!(err->code == GOT_ERR_ERRNO &&
2576 		    (errno == EACCES || errno == EROFS)))
2577 			goto done;
2578 		err = (*progress_cb)(progress_arg,
2579 		    GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2580 		if (err)
2581 			return err;
2582 	}
2583 
2584 	err = got_object_open_as_commit(&commit, repo,
2585 	   worktree->base_commit_id);
2586 	if (err)
2587 		goto done;
2588 
2589 	err = got_object_open_as_tree(&tree, repo, tree_id);
2590 	if (err)
2591 		goto done;
2592 
2593 	if (entry_name &&
2594 	    got_object_tree_find_entry(tree, entry_name) == NULL) {
2595 		err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2596 		goto done;
2597 	}
2598 
2599 	diff_cb.diff_old_new = diff_old_new;
2600 	diff_cb.diff_old = diff_old;
2601 	diff_cb.diff_new = diff_new;
2602 	arg.fileindex = fileindex;
2603 	arg.worktree = worktree;
2604 	arg.repo = repo;
2605 	arg.progress_cb = progress_cb;
2606 	arg.progress_arg = progress_arg;
2607 	arg.cancel_cb = cancel_cb;
2608 	arg.cancel_arg = cancel_arg;
2609 	err = got_fileindex_diff_tree(fileindex, tree, relpath,
2610 	    entry_name, repo, &diff_cb, &arg);
2611 done:
2612 	if (tree)
2613 		got_object_tree_close(tree);
2614 	if (commit)
2615 		got_object_commit_close(commit);
2616 	return err;
2617 }
2618 
2619 const struct got_error *
2620 got_worktree_checkout_files(struct got_worktree *worktree,
2621     struct got_pathlist_head *paths, struct got_repository *repo,
2622     got_worktree_checkout_cb progress_cb, void *progress_arg,
2623     got_cancel_cb cancel_cb, void *cancel_arg)
2624 {
2625 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2626 	struct got_commit_object *commit = NULL;
2627 	struct got_tree_object *tree = NULL;
2628 	struct got_fileindex *fileindex = NULL;
2629 	char *fileindex_path = NULL;
2630 	struct got_pathlist_entry *pe;
2631 	struct tree_path_data {
2632 		SIMPLEQ_ENTRY(tree_path_data) entry;
2633 		struct got_object_id *tree_id;
2634 		int entry_type;
2635 		char *relpath;
2636 		char *entry_name;
2637 	} *tpd = NULL;
2638 	SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2639 
2640 	SIMPLEQ_INIT(&tree_paths);
2641 
2642 	err = lock_worktree(worktree, LOCK_EX);
2643 	if (err)
2644 		return err;
2645 
2646 	/* Map all specified paths to in-repository trees. */
2647 	TAILQ_FOREACH(pe, paths, entry) {
2648 		tpd = malloc(sizeof(*tpd));
2649 		if (tpd == NULL) {
2650 			err = got_error_from_errno("malloc");
2651 			goto done;
2652 		}
2653 
2654 		err = find_tree_entry_for_checkout(&tpd->entry_type,
2655 		    &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2656 		if (err) {
2657 			free(tpd);
2658 			goto done;
2659 		}
2660 
2661 		if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2662 			err = got_path_basename(&tpd->entry_name, pe->path);
2663 			if (err) {
2664 				free(tpd->relpath);
2665 				free(tpd->tree_id);
2666 				free(tpd);
2667 				goto done;
2668 			}
2669 		} else
2670 			tpd->entry_name = NULL;
2671 
2672 		SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2673 	}
2674 
2675 	/*
2676 	 * Read the file index.
2677 	 * Checking out files is supposed to be an idempotent operation.
2678 	 * If the on-disk file index is incomplete we will try to complete it.
2679 	 */
2680 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2681 	if (err)
2682 		goto done;
2683 
2684 	tpd = SIMPLEQ_FIRST(&tree_paths);
2685 	TAILQ_FOREACH(pe, paths, entry) {
2686 		struct bump_base_commit_id_arg bbc_arg;
2687 
2688 		err = checkout_files(worktree, fileindex, tpd->relpath,
2689 		    tpd->tree_id, tpd->entry_name, repo,
2690 		    progress_cb, progress_arg, cancel_cb, cancel_arg);
2691 		if (err)
2692 			break;
2693 
2694 		bbc_arg.base_commit_id = worktree->base_commit_id;
2695 		bbc_arg.entry_name = tpd->entry_name;
2696 		bbc_arg.path = pe->path;
2697 		bbc_arg.path_len = pe->path_len;
2698 		bbc_arg.progress_cb = progress_cb;
2699 		bbc_arg.progress_arg = progress_arg;
2700 		err = got_fileindex_for_each_entry_safe(fileindex,
2701 		    bump_base_commit_id, &bbc_arg);
2702 		if (err)
2703 			break;
2704 
2705 		tpd = SIMPLEQ_NEXT(tpd, entry);
2706 	}
2707 	sync_err = sync_fileindex(fileindex, fileindex_path);
2708 	if (sync_err && err == NULL)
2709 		err = sync_err;
2710 done:
2711 	free(fileindex_path);
2712 	if (tree)
2713 		got_object_tree_close(tree);
2714 	if (commit)
2715 		got_object_commit_close(commit);
2716 	if (fileindex)
2717 		got_fileindex_free(fileindex);
2718 	while (!SIMPLEQ_EMPTY(&tree_paths)) {
2719 		tpd = SIMPLEQ_FIRST(&tree_paths);
2720 		SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2721 		free(tpd->relpath);
2722 		free(tpd->tree_id);
2723 		free(tpd);
2724 	}
2725 	unlockerr = lock_worktree(worktree, LOCK_SH);
2726 	if (unlockerr && err == NULL)
2727 		err = unlockerr;
2728 	return err;
2729 }
2730 
2731 struct merge_file_cb_arg {
2732     struct got_worktree *worktree;
2733     struct got_fileindex *fileindex;
2734     got_worktree_checkout_cb progress_cb;
2735     void *progress_arg;
2736     got_cancel_cb cancel_cb;
2737     void *cancel_arg;
2738     const char *label_orig;
2739     struct got_object_id *commit_id2;
2740 };
2741 
2742 static const struct got_error *
2743 merge_file_cb(void *arg, struct got_blob_object *blob1,
2744     struct got_blob_object *blob2, struct got_object_id *id1,
2745     struct got_object_id *id2, const char *path1, const char *path2,
2746     mode_t mode1, mode_t mode2, struct got_repository *repo)
2747 {
2748 	static const struct got_error *err = NULL;
2749 	struct merge_file_cb_arg *a = arg;
2750 	struct got_fileindex_entry *ie;
2751 	char *ondisk_path = NULL;
2752 	struct stat sb;
2753 	unsigned char status;
2754 	int local_changes_subsumed;
2755 
2756 	if (blob1 && blob2) {
2757 		ie = got_fileindex_entry_get(a->fileindex, path2,
2758 		    strlen(path2));
2759 		if (ie == NULL)
2760 			return (*a->progress_cb)(a->progress_arg,
2761 			    GOT_STATUS_MISSING, path2);
2762 
2763 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2764 		    path2) == -1)
2765 			return got_error_from_errno("asprintf");
2766 
2767 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2768 		    repo);
2769 		if (err)
2770 			goto done;
2771 
2772 		if (status == GOT_STATUS_DELETE) {
2773 			err = (*a->progress_cb)(a->progress_arg,
2774 			    GOT_STATUS_MERGE, path2);
2775 			goto done;
2776 		}
2777 		if (status != GOT_STATUS_NO_CHANGE &&
2778 		    status != GOT_STATUS_MODIFY &&
2779 		    status != GOT_STATUS_CONFLICT &&
2780 		    status != GOT_STATUS_ADD) {
2781 			err = (*a->progress_cb)(a->progress_arg, status, path2);
2782 			goto done;
2783 		}
2784 
2785 		if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2786 			char *link_target2;
2787 			err = got_object_blob_read_to_str(&link_target2, blob2);
2788 			if (err)
2789 				goto done;
2790 			err = merge_symlink(a->worktree, blob1, ondisk_path,
2791 			    path2, a->label_orig, link_target2, a->commit_id2,
2792 			    repo, a->progress_cb, a->progress_arg);
2793 			free(link_target2);
2794 		} else {
2795 			err = merge_blob(&local_changes_subsumed, a->worktree,
2796 			    blob1, ondisk_path, path2, sb.st_mode,
2797 			    a->label_orig, blob2, a->commit_id2, repo,
2798 			    a->progress_cb, a->progress_arg);
2799 		}
2800 	} else if (blob1) {
2801 		ie = got_fileindex_entry_get(a->fileindex, path1,
2802 		    strlen(path1));
2803 		if (ie == NULL)
2804 			return (*a->progress_cb)(a->progress_arg,
2805 			    GOT_STATUS_MISSING, path1);
2806 
2807 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2808 		    path1) == -1)
2809 			return got_error_from_errno("asprintf");
2810 
2811 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2812 		    repo);
2813 		if (err)
2814 			goto done;
2815 
2816 		switch (status) {
2817 		case GOT_STATUS_NO_CHANGE:
2818 			err = (*a->progress_cb)(a->progress_arg,
2819 			    GOT_STATUS_DELETE, path1);
2820 			if (err)
2821 				goto done;
2822 			err = remove_ondisk_file(a->worktree->root_path, path1);
2823 			if (err)
2824 				goto done;
2825 			if (ie)
2826 				got_fileindex_entry_mark_deleted_from_disk(ie);
2827 			break;
2828 		case GOT_STATUS_DELETE:
2829 		case GOT_STATUS_MISSING:
2830 			err = (*a->progress_cb)(a->progress_arg,
2831 			    GOT_STATUS_DELETE, path1);
2832 			if (err)
2833 				goto done;
2834 			if (ie)
2835 				got_fileindex_entry_mark_deleted_from_disk(ie);
2836 			break;
2837 		case GOT_STATUS_ADD: {
2838 			struct got_object_id *id;
2839 			FILE *blob1_f;
2840 			/*
2841 			 * Delete the added file only if its content already
2842 			 * exists in the repository.
2843 			 */
2844 			err = got_object_blob_file_create(&id, &blob1_f, path1);
2845 			if (err)
2846 				goto done;
2847 			if (got_object_id_cmp(id, id1) == 0) {
2848 				err = (*a->progress_cb)(a->progress_arg,
2849 				    GOT_STATUS_DELETE, path1);
2850 				if (err)
2851 					goto done;
2852 				err = remove_ondisk_file(a->worktree->root_path,
2853 				    path1);
2854 				if (err)
2855 					goto done;
2856 				if (ie)
2857 					got_fileindex_entry_remove(a->fileindex,
2858 					    ie);
2859 			} else {
2860 				err = (*a->progress_cb)(a->progress_arg,
2861 				    GOT_STATUS_CANNOT_DELETE, path1);
2862 			}
2863 			if (fclose(blob1_f) == EOF && err == NULL)
2864 				err = got_error_from_errno("fclose");
2865 			free(id);
2866 			if (err)
2867 				goto done;
2868 			break;
2869 		}
2870 		case GOT_STATUS_MODIFY:
2871 		case GOT_STATUS_CONFLICT:
2872 			err = (*a->progress_cb)(a->progress_arg,
2873 			    GOT_STATUS_CANNOT_DELETE, path1);
2874 			if (err)
2875 				goto done;
2876 			break;
2877 		case GOT_STATUS_OBSTRUCTED:
2878 			err = (*a->progress_cb)(a->progress_arg, status, path1);
2879 			if (err)
2880 				goto done;
2881 			break;
2882 		default:
2883 			break;
2884 		}
2885 	} else if (blob2) {
2886 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2887 		    path2) == -1)
2888 			return got_error_from_errno("asprintf");
2889 		ie = got_fileindex_entry_get(a->fileindex, path2,
2890 		    strlen(path2));
2891 		if (ie) {
2892 			err = get_file_status(&status, &sb, ie, ondisk_path,
2893 			    -1, NULL, repo);
2894 			if (err)
2895 				goto done;
2896 			if (status != GOT_STATUS_NO_CHANGE &&
2897 			    status != GOT_STATUS_MODIFY &&
2898 			    status != GOT_STATUS_CONFLICT &&
2899 			    status != GOT_STATUS_ADD) {
2900 				err = (*a->progress_cb)(a->progress_arg,
2901 				    status, path2);
2902 				goto done;
2903 			}
2904 			if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2905 				char *link_target2;
2906 				err = got_object_blob_read_to_str(&link_target2,
2907 				    blob2);
2908 				if (err)
2909 					goto done;
2910 				err = merge_symlink(a->worktree, NULL,
2911 				    ondisk_path, path2, a->label_orig,
2912 				    link_target2, a->commit_id2, repo,
2913 				    a->progress_cb, a->progress_arg);
2914 				free(link_target2);
2915 			} else if (S_ISREG(sb.st_mode)) {
2916 				err = merge_blob(&local_changes_subsumed,
2917 				    a->worktree, NULL, ondisk_path, path2,
2918 				    sb.st_mode, a->label_orig, blob2,
2919 				    a->commit_id2, repo, a->progress_cb,
2920 				    a->progress_arg);
2921 			} else {
2922 				err = got_error_path(ondisk_path,
2923 				    GOT_ERR_FILE_OBSTRUCTED);
2924 			}
2925 			if (err)
2926 				goto done;
2927 			if (status == GOT_STATUS_DELETE) {
2928 				err = got_fileindex_entry_update(ie,
2929 				    ondisk_path, blob2->id.sha1,
2930 				    a->worktree->base_commit_id->sha1, 0);
2931 				if (err)
2932 					goto done;
2933 			}
2934 		} else {
2935 			int is_bad_symlink = 0;
2936 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
2937 			if (S_ISLNK(mode2)) {
2938 				err = install_symlink(&is_bad_symlink,
2939 				    a->worktree, ondisk_path, path2, blob2, 0,
2940 				    0, 1, repo, a->progress_cb, a->progress_arg);
2941 			} else {
2942 				err = install_blob(a->worktree, ondisk_path, path2,
2943 				    mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2944 				    a->progress_cb, a->progress_arg);
2945 			}
2946 			if (err)
2947 				goto done;
2948 			err = got_fileindex_entry_alloc(&ie, path2);
2949 			if (err)
2950 				goto done;
2951 			err = got_fileindex_entry_update(ie, ondisk_path,
2952 			    NULL, NULL, 1);
2953 			if (err) {
2954 				got_fileindex_entry_free(ie);
2955 				goto done;
2956 			}
2957 			err = got_fileindex_entry_add(a->fileindex, ie);
2958 			if (err) {
2959 				got_fileindex_entry_free(ie);
2960 				goto done;
2961 			}
2962 			if (is_bad_symlink) {
2963 				got_fileindex_entry_filetype_set(ie,
2964 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
2965 			}
2966 		}
2967 	}
2968 done:
2969 	free(ondisk_path);
2970 	return err;
2971 }
2972 
2973 struct check_merge_ok_arg {
2974 	struct got_worktree *worktree;
2975 	struct got_repository *repo;
2976 };
2977 
2978 static const struct got_error *
2979 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2980 {
2981 	const struct got_error *err = NULL;
2982 	struct check_merge_ok_arg *a = arg;
2983 	unsigned char status;
2984 	struct stat sb;
2985 	char *ondisk_path;
2986 
2987 	/* Reject merges into a work tree with mixed base commits. */
2988 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2989 	    SHA1_DIGEST_LENGTH))
2990 		return got_error(GOT_ERR_MIXED_COMMITS);
2991 
2992 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2993 	    == -1)
2994 		return got_error_from_errno("asprintf");
2995 
2996 	/* Reject merges into a work tree with conflicted files. */
2997 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2998 	if (err)
2999 		return err;
3000 	if (status == GOT_STATUS_CONFLICT)
3001 		return got_error(GOT_ERR_CONFLICTS);
3002 
3003 	return NULL;
3004 }
3005 
3006 static const struct got_error *
3007 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3008     const char *fileindex_path, struct got_object_id *commit_id1,
3009     struct got_object_id *commit_id2, struct got_repository *repo,
3010     got_worktree_checkout_cb progress_cb, void *progress_arg,
3011     got_cancel_cb cancel_cb, void *cancel_arg)
3012 {
3013 	const struct got_error *err = NULL, *sync_err;
3014 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3015 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3016 	struct merge_file_cb_arg arg;
3017 	char *label_orig = NULL;
3018 
3019 	if (commit_id1) {
3020 		err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3021 		    worktree->path_prefix);
3022 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3023 			goto done;
3024 	}
3025 	if (tree_id1) {
3026 		char *id_str;
3027 
3028 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3029 		if (err)
3030 			goto done;
3031 
3032 		err = got_object_id_str(&id_str, commit_id1);
3033 		if (err)
3034 			goto done;
3035 
3036 		if (asprintf(&label_orig, "%s: commit %s",
3037 		    GOT_MERGE_LABEL_BASE, id_str) == -1) {
3038 			err = got_error_from_errno("asprintf");
3039 			free(id_str);
3040 			goto done;
3041 		}
3042 		free(id_str);
3043 	}
3044 
3045 	err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3046 	    worktree->path_prefix);
3047 	if (err)
3048 		goto done;
3049 
3050 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3051 	if (err)
3052 		goto done;
3053 
3054 	arg.worktree = worktree;
3055 	arg.fileindex = fileindex;
3056 	arg.progress_cb = progress_cb;
3057 	arg.progress_arg = progress_arg;
3058 	arg.cancel_cb = cancel_cb;
3059 	arg.cancel_arg = cancel_arg;
3060 	arg.label_orig = label_orig;
3061 	arg.commit_id2 = commit_id2;
3062 	err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3063 	sync_err = sync_fileindex(fileindex, fileindex_path);
3064 	if (sync_err && err == NULL)
3065 		err = sync_err;
3066 done:
3067 	if (tree1)
3068 		got_object_tree_close(tree1);
3069 	if (tree2)
3070 		got_object_tree_close(tree2);
3071 	free(label_orig);
3072 	return err;
3073 }
3074 
3075 const struct got_error *
3076 got_worktree_merge_files(struct got_worktree *worktree,
3077     struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3078     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3079     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3080 {
3081 	const struct got_error *err, *unlockerr;
3082 	char *fileindex_path = NULL;
3083 	struct got_fileindex *fileindex = NULL;
3084 	struct check_merge_ok_arg mok_arg;
3085 
3086 	err = lock_worktree(worktree, LOCK_EX);
3087 	if (err)
3088 		return err;
3089 
3090 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3091 	if (err)
3092 		goto done;
3093 
3094 	mok_arg.worktree = worktree;
3095 	mok_arg.repo = repo;
3096 	err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3097 	    &mok_arg);
3098 	if (err)
3099 		goto done;
3100 
3101 	err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3102 	    commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3103 done:
3104 	if (fileindex)
3105 		got_fileindex_free(fileindex);
3106 	free(fileindex_path);
3107 	unlockerr = lock_worktree(worktree, LOCK_SH);
3108 	if (unlockerr && err == NULL)
3109 		err = unlockerr;
3110 	return err;
3111 }
3112 
3113 struct diff_dir_cb_arg {
3114     struct got_fileindex *fileindex;
3115     struct got_worktree *worktree;
3116     const char *status_path;
3117     size_t status_path_len;
3118     struct got_repository *repo;
3119     got_worktree_status_cb status_cb;
3120     void *status_arg;
3121     got_cancel_cb cancel_cb;
3122     void *cancel_arg;
3123     /* A pathlist containing per-directory pathlists of ignore patterns. */
3124     struct got_pathlist_head ignores;
3125     int report_unchanged;
3126     int no_ignores;
3127 };
3128 
3129 static const struct got_error *
3130 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3131     int dirfd, const char *de_name,
3132     got_worktree_status_cb status_cb, void *status_arg,
3133     struct got_repository *repo, int report_unchanged)
3134 {
3135 	const struct got_error *err = NULL;
3136 	unsigned char status = GOT_STATUS_NO_CHANGE;
3137 	unsigned char staged_status = get_staged_status(ie);
3138 	struct stat sb;
3139 	struct got_object_id blob_id, commit_id, staged_blob_id;
3140 	struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3141 	struct got_object_id *staged_blob_idp = NULL;
3142 
3143 	err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3144 	if (err)
3145 		return err;
3146 
3147 	if (status == GOT_STATUS_NO_CHANGE &&
3148 	    staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3149 		return NULL;
3150 
3151 	if (got_fileindex_entry_has_blob(ie)) {
3152 		memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3153 		blob_idp = &blob_id;
3154 	}
3155 	if (got_fileindex_entry_has_commit(ie)) {
3156 		memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3157 		commit_idp = &commit_id;
3158 	}
3159 	if (staged_status == GOT_STATUS_ADD ||
3160 	    staged_status == GOT_STATUS_MODIFY) {
3161 		memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3162 		    SHA1_DIGEST_LENGTH);
3163 		staged_blob_idp = &staged_blob_id;
3164 	}
3165 
3166 	return (*status_cb)(status_arg, status, staged_status,
3167 	    ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3168 }
3169 
3170 static const struct got_error *
3171 status_old_new(void *arg, struct got_fileindex_entry *ie,
3172     struct dirent *de, const char *parent_path, int dirfd)
3173 {
3174 	const struct got_error *err = NULL;
3175 	struct diff_dir_cb_arg *a = arg;
3176 	char *abspath;
3177 
3178 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3179 		return got_error(GOT_ERR_CANCELLED);
3180 
3181 	if (got_path_cmp(parent_path, a->status_path,
3182 	    strlen(parent_path), a->status_path_len) != 0 &&
3183 	    !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3184 		return NULL;
3185 
3186 	if (parent_path[0]) {
3187 		if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3188 		    parent_path, de->d_name) == -1)
3189 			return got_error_from_errno("asprintf");
3190 	} else {
3191 		if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3192 		    de->d_name) == -1)
3193 			return got_error_from_errno("asprintf");
3194 	}
3195 
3196 	err = report_file_status(ie, abspath, dirfd, de->d_name,
3197 	    a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3198 	free(abspath);
3199 	return err;
3200 }
3201 
3202 static const struct got_error *
3203 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3204 {
3205 	struct diff_dir_cb_arg *a = arg;
3206 	struct got_object_id blob_id, commit_id;
3207 	unsigned char status;
3208 
3209 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3210 		return got_error(GOT_ERR_CANCELLED);
3211 
3212 	if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3213 		return NULL;
3214 
3215 	memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3216 	memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3217 	if (got_fileindex_entry_has_file_on_disk(ie))
3218 		status = GOT_STATUS_MISSING;
3219 	else
3220 		status = GOT_STATUS_DELETE;
3221 	return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3222 	    ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3223 }
3224 
3225 void
3226 free_ignorelist(struct got_pathlist_head *ignorelist)
3227 {
3228 	struct got_pathlist_entry *pe;
3229 
3230 	TAILQ_FOREACH(pe, ignorelist, entry)
3231 		free((char *)pe->path);
3232 	got_pathlist_free(ignorelist);
3233 }
3234 
3235 void
3236 free_ignores(struct got_pathlist_head *ignores)
3237 {
3238 	struct got_pathlist_entry *pe;
3239 
3240 	TAILQ_FOREACH(pe, ignores, entry) {
3241 		struct got_pathlist_head *ignorelist = pe->data;
3242 		free_ignorelist(ignorelist);
3243 		free((char *)pe->path);
3244 	}
3245 	got_pathlist_free(ignores);
3246 }
3247 
3248 static const struct got_error *
3249 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3250 {
3251 	const struct got_error *err = NULL;
3252 	struct got_pathlist_entry *pe = NULL;
3253 	struct got_pathlist_head *ignorelist;
3254 	char *line = NULL, *pattern, *dirpath = NULL;
3255 	size_t linesize = 0;
3256 	ssize_t linelen;
3257 
3258 	ignorelist = calloc(1, sizeof(*ignorelist));
3259 	if (ignorelist == NULL)
3260 		return got_error_from_errno("calloc");
3261 	TAILQ_INIT(ignorelist);
3262 
3263 	while ((linelen = getline(&line, &linesize, f)) != -1) {
3264 		if (linelen > 0 && line[linelen - 1] == '\n')
3265 			line[linelen - 1] = '\0';
3266 
3267 		/* Git's ignores may contain comments. */
3268 		if (line[0] == '#')
3269 			continue;
3270 
3271 		/* Git's negated patterns are not (yet?) supported. */
3272 		if (line[0] == '!')
3273 			continue;
3274 
3275 		if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3276 		    line) == -1) {
3277 			err = got_error_from_errno("asprintf");
3278 			goto done;
3279 		}
3280 		err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3281 		if (err)
3282 			goto done;
3283 	}
3284 	if (ferror(f)) {
3285 		err = got_error_from_errno("getline");
3286 		goto done;
3287 	}
3288 
3289 	dirpath = strdup(path);
3290 	if (dirpath == NULL) {
3291 		err = got_error_from_errno("strdup");
3292 		goto done;
3293 	}
3294 	err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3295 done:
3296 	free(line);
3297 	if (err || pe == NULL) {
3298 		free(dirpath);
3299 		free_ignorelist(ignorelist);
3300 	}
3301 	return err;
3302 }
3303 
3304 int
3305 match_ignores(struct got_pathlist_head *ignores, const char *path)
3306 {
3307 	struct got_pathlist_entry *pe;
3308 
3309 	/* Handle patterns which match in all directories. */
3310 	TAILQ_FOREACH(pe, ignores, entry) {
3311 		struct got_pathlist_head *ignorelist = pe->data;
3312 		struct got_pathlist_entry *pi;
3313 
3314 		TAILQ_FOREACH(pi, ignorelist, entry) {
3315 			const char *p, *pattern = pi->path;
3316 
3317 			if (strncmp(pattern, "**/", 3) != 0)
3318 				continue;
3319 			pattern += 3;
3320 			p = path;
3321 			while (*p) {
3322 				if (fnmatch(pattern, p,
3323 				    FNM_PATHNAME | FNM_LEADING_DIR)) {
3324 					/* Retry in next directory. */
3325 					while (*p && *p != '/')
3326 						p++;
3327 					while (*p == '/')
3328 						p++;
3329 					continue;
3330 				}
3331 				return 1;
3332 			}
3333 		}
3334 	}
3335 
3336 	/*
3337 	 * The ignores pathlist contains ignore lists from children before
3338 	 * parents, so we can find the most specific ignorelist by walking
3339 	 * ignores backwards.
3340 	 */
3341 	pe = TAILQ_LAST(ignores, got_pathlist_head);
3342 	while (pe) {
3343 		if (got_path_is_child(path, pe->path, pe->path_len)) {
3344 			struct got_pathlist_head *ignorelist = pe->data;
3345 			struct got_pathlist_entry *pi;
3346 			TAILQ_FOREACH(pi, ignorelist, entry) {
3347 				const char *pattern = pi->path;
3348 				int flags = FNM_LEADING_DIR;
3349 				if (strstr(pattern, "/**/") == NULL)
3350 					flags |= FNM_PATHNAME;
3351 				if (fnmatch(pattern, path, flags))
3352 					continue;
3353 				return 1;
3354 			}
3355 		}
3356 		pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3357 	}
3358 
3359 	return 0;
3360 }
3361 
3362 static const struct got_error *
3363 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3364     const char *path, int dirfd, const char *ignores_filename)
3365 {
3366 	const struct got_error *err = NULL;
3367 	char *ignorespath;
3368 	int fd = -1;
3369 	FILE *ignoresfile = NULL;
3370 
3371 	if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3372 	    path[0] ? "/" : "", ignores_filename) == -1)
3373 		return got_error_from_errno("asprintf");
3374 
3375 	if (dirfd != -1) {
3376 		fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3377 		if (fd == -1) {
3378 			if (errno != ENOENT && errno != EACCES)
3379 				err = got_error_from_errno2("openat",
3380 				    ignorespath);
3381 		} else {
3382 			ignoresfile = fdopen(fd, "r");
3383 			if (ignoresfile == NULL) 
3384 				err = got_error_from_errno2("fdopen",
3385 				    ignorespath);
3386 			else {
3387 				fd = -1;
3388 				err = read_ignores(ignores, path, ignoresfile);
3389 			}
3390 		}
3391 	} else {
3392 		ignoresfile = fopen(ignorespath, "r");
3393 		if (ignoresfile == NULL) {
3394 			if (errno != ENOENT && errno != EACCES)
3395 				err = got_error_from_errno2("fopen",
3396 				    ignorespath);
3397 		} else
3398 			err = read_ignores(ignores, path, ignoresfile);
3399 	}
3400 
3401 	if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3402 		err = got_error_from_errno2("fclose", path);
3403 	if (fd != -1 && close(fd) == -1 && err == NULL)
3404 		err = got_error_from_errno2("close", path);
3405 	free(ignorespath);
3406 	return err;
3407 }
3408 
3409 static const struct got_error *
3410 status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3411 {
3412 	const struct got_error *err = NULL;
3413 	struct diff_dir_cb_arg *a = arg;
3414 	char *path = NULL;
3415 
3416 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3417 		return got_error(GOT_ERR_CANCELLED);
3418 
3419 	if (parent_path[0]) {
3420 		if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3421 			return got_error_from_errno("asprintf");
3422 	} else {
3423 		path = de->d_name;
3424 	}
3425 
3426 	if (de->d_type != DT_DIR &&
3427 	    got_path_is_child(path, a->status_path, a->status_path_len)
3428 	    && !match_ignores(&a->ignores, path))
3429 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3430 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3431 	if (parent_path[0])
3432 		free(path);
3433 	return err;
3434 }
3435 
3436 static const struct got_error *
3437 status_traverse(void *arg, const char *path, int dirfd)
3438 {
3439 	const struct got_error *err = NULL;
3440 	struct diff_dir_cb_arg *a = arg;
3441 
3442 	if (a->no_ignores)
3443 		return NULL;
3444 
3445 	err = add_ignores(&a->ignores, a->worktree->root_path,
3446 	    path, dirfd, ".cvsignore");
3447 	if (err)
3448 		return err;
3449 
3450 	err = add_ignores(&a->ignores, a->worktree->root_path, path,
3451 	    dirfd, ".gitignore");
3452 
3453 	return err;
3454 }
3455 
3456 static const struct got_error *
3457 report_single_file_status(const char *path, const char *ondisk_path,
3458 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3459 void *status_arg, struct got_repository *repo, int report_unchanged)
3460 {
3461 	struct got_fileindex_entry *ie;
3462 	struct stat sb;
3463 
3464 	ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3465 	if (ie)
3466 		return report_file_status(ie, ondisk_path, -1, NULL,
3467 		    status_cb, status_arg, repo, report_unchanged);
3468 
3469 	if (lstat(ondisk_path, &sb) == -1) {
3470 		if (errno != ENOENT)
3471 			return got_error_from_errno2("lstat", ondisk_path);
3472 		return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3473 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3474 		return NULL;
3475 	}
3476 
3477 	if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3478 		return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3479 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3480 
3481 	return NULL;
3482 }
3483 
3484 static const struct got_error *
3485 add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3486     const char *root_path, const char *path)
3487 {
3488 	const struct got_error *err;
3489 	char *parent_path, *next_parent_path = NULL;
3490 
3491 	err = add_ignores(ignores, root_path, "", -1,
3492 	    ".cvsignore");
3493 	if (err)
3494 		return err;
3495 
3496 	err = add_ignores(ignores, root_path, "", -1,
3497 	    ".gitignore");
3498 	if (err)
3499 		return err;
3500 
3501 	err = got_path_dirname(&parent_path, path);
3502 	if (err) {
3503 		if (err->code == GOT_ERR_BAD_PATH)
3504 			return NULL; /* cannot traverse parent */
3505 		return err;
3506 	}
3507 	for (;;) {
3508 		err = add_ignores(ignores, root_path, parent_path, -1,
3509 		    ".cvsignore");
3510 		if (err)
3511 			break;
3512 		err = add_ignores(ignores, root_path, parent_path, -1,
3513 		    ".gitignore");
3514 		if (err)
3515 			break;
3516 		err = got_path_dirname(&next_parent_path, parent_path);
3517 		if (err) {
3518 			if (err->code == GOT_ERR_BAD_PATH)
3519 				err = NULL; /* traversed everything */
3520 			break;
3521 		}
3522 		free(parent_path);
3523 		parent_path = next_parent_path;
3524 		next_parent_path = NULL;
3525 	}
3526 
3527 	free(parent_path);
3528 	free(next_parent_path);
3529 	return err;
3530 }
3531 
3532 static const struct got_error *
3533 worktree_status(struct got_worktree *worktree, const char *path,
3534     struct got_fileindex *fileindex, struct got_repository *repo,
3535     got_worktree_status_cb status_cb, void *status_arg,
3536     got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3537     int report_unchanged)
3538 {
3539 	const struct got_error *err = NULL;
3540 	int fd = -1;
3541 	struct got_fileindex_diff_dir_cb fdiff_cb;
3542 	struct diff_dir_cb_arg arg;
3543 	char *ondisk_path = NULL;
3544 
3545 	TAILQ_INIT(&arg.ignores);
3546 
3547 	if (asprintf(&ondisk_path, "%s%s%s",
3548 	    worktree->root_path, path[0] ? "/" : "", path) == -1)
3549 		return got_error_from_errno("asprintf");
3550 
3551 	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3552 	if (fd == -1) {
3553 		if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3554 		    errno != ELOOP)
3555 			err = got_error_from_errno2("open", ondisk_path);
3556 		else
3557 			err = report_single_file_status(path, ondisk_path,
3558 			    fileindex, status_cb, status_arg, repo,
3559 			    report_unchanged);
3560 	} else {
3561 		fdiff_cb.diff_old_new = status_old_new;
3562 		fdiff_cb.diff_old = status_old;
3563 		fdiff_cb.diff_new = status_new;
3564 		fdiff_cb.diff_traverse = status_traverse;
3565 		arg.fileindex = fileindex;
3566 		arg.worktree = worktree;
3567 		arg.status_path = path;
3568 		arg.status_path_len = strlen(path);
3569 		arg.repo = repo;
3570 		arg.status_cb = status_cb;
3571 		arg.status_arg = status_arg;
3572 		arg.cancel_cb = cancel_cb;
3573 		arg.cancel_arg = cancel_arg;
3574 		arg.report_unchanged = report_unchanged;
3575 		arg.no_ignores = no_ignores;
3576 		if (!no_ignores) {
3577 			err = add_ignores_from_parent_paths(&arg.ignores,
3578 			    worktree->root_path, path);
3579 			if (err)
3580 				goto done;
3581 		}
3582 		err = got_fileindex_diff_dir(fileindex, fd,
3583 		    worktree->root_path, path, repo, &fdiff_cb, &arg);
3584 	}
3585 done:
3586 	free_ignores(&arg.ignores);
3587 	if (fd != -1 && close(fd) != 0 && err == NULL)
3588 		err = got_error_from_errno("close");
3589 	free(ondisk_path);
3590 	return err;
3591 }
3592 
3593 const struct got_error *
3594 got_worktree_status(struct got_worktree *worktree,
3595     struct got_pathlist_head *paths, struct got_repository *repo,
3596     got_worktree_status_cb status_cb, void *status_arg,
3597     got_cancel_cb cancel_cb, void *cancel_arg)
3598 {
3599 	const struct got_error *err = NULL;
3600 	char *fileindex_path = NULL;
3601 	struct got_fileindex *fileindex = NULL;
3602 	struct got_pathlist_entry *pe;
3603 
3604 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3605 	if (err)
3606 		return err;
3607 
3608 	TAILQ_FOREACH(pe, paths, entry) {
3609 		err = worktree_status(worktree, pe->path, fileindex, repo,
3610 			status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3611 		if (err)
3612 			break;
3613 	}
3614 	free(fileindex_path);
3615 	got_fileindex_free(fileindex);
3616 	return err;
3617 }
3618 
3619 const struct got_error *
3620 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3621     const char *arg)
3622 {
3623 	const struct got_error *err = NULL;
3624 	char *resolved = NULL, *cwd = NULL, *path = NULL;
3625 	size_t len;
3626 	struct stat sb;
3627 
3628 	*wt_path = NULL;
3629 
3630 	cwd = getcwd(NULL, 0);
3631 	if (cwd == NULL)
3632 		return got_error_from_errno("getcwd");
3633 
3634 	if (lstat(arg, &sb) == -1) {
3635 		if (errno != ENOENT) {
3636 			err = got_error_from_errno2("lstat", arg);
3637 			goto done;
3638 		}
3639 	}
3640 	if (S_ISLNK(sb.st_mode)) {
3641 		/*
3642 		 * We cannot use realpath(3) with symlinks since we want to
3643 		 * operate on the symlink itself.
3644 		 * But we can make the path absolute, assuming it is relative
3645 		 * to the current working directory, and then canonicalize it.
3646 		 */
3647 		char *abspath = NULL;
3648 		char canonpath[PATH_MAX];
3649 		if (!got_path_is_absolute(arg)) {
3650 			if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3651 				err = got_error_from_errno("asprintf");
3652 				goto done;
3653 			}
3654 
3655 		}
3656 		err = got_canonpath(abspath ? abspath : arg, canonpath,
3657 		    sizeof(canonpath));
3658 		if (err)
3659 			goto done;
3660 		resolved = strdup(canonpath);
3661 		if (resolved == NULL) {
3662 			err = got_error_from_errno("strdup");
3663 			goto done;
3664 		}
3665 	} else {
3666 		resolved = realpath(arg, NULL);
3667 		if (resolved == NULL) {
3668 			if (errno != ENOENT) {
3669 				err = got_error_from_errno2("realpath", arg);
3670 				goto done;
3671 			}
3672 			if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
3673 				err = got_error_from_errno("asprintf");
3674 				goto done;
3675 			}
3676 		}
3677 	}
3678 
3679 	if (strncmp(got_worktree_get_root_path(worktree), resolved,
3680 	    strlen(got_worktree_get_root_path(worktree)))) {
3681 		err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3682 		goto done;
3683 	}
3684 
3685 	if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3686 		err = got_path_skip_common_ancestor(&path,
3687 		    got_worktree_get_root_path(worktree), resolved);
3688 		if (err)
3689 			goto done;
3690 	} else {
3691 		path = strdup("");
3692 		if (path == NULL) {
3693 			err = got_error_from_errno("strdup");
3694 			goto done;
3695 		}
3696 	}
3697 
3698 	/* XXX status walk can't deal with trailing slash! */
3699 	len = strlen(path);
3700 	while (len > 0 && path[len - 1] == '/') {
3701 		path[len - 1] = '\0';
3702 		len--;
3703 	}
3704 done:
3705 	free(resolved);
3706 	free(cwd);
3707 	if (err == NULL)
3708 		*wt_path = path;
3709 	else
3710 		free(path);
3711 	return err;
3712 }
3713 
3714 struct schedule_addition_args {
3715 	struct got_worktree *worktree;
3716 	struct got_fileindex *fileindex;
3717 	got_worktree_checkout_cb progress_cb;
3718 	void *progress_arg;
3719 	struct got_repository *repo;
3720 };
3721 
3722 static const struct got_error *
3723 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3724     const char *relpath, struct got_object_id *blob_id,
3725     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3726     int dirfd, const char *de_name)
3727 {
3728 	struct schedule_addition_args *a = arg;
3729 	const struct got_error *err = NULL;
3730 	struct got_fileindex_entry *ie;
3731 	struct stat sb;
3732 	char *ondisk_path;
3733 
3734 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3735 	    relpath) == -1)
3736 		return got_error_from_errno("asprintf");
3737 
3738 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3739 	if (ie) {
3740 		err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3741 		    de_name, a->repo);
3742 		if (err)
3743 			goto done;
3744 		/* Re-adding an existing entry is a no-op. */
3745 		if (status == GOT_STATUS_ADD)
3746 			goto done;
3747 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3748 		if (err)
3749 			goto done;
3750 	}
3751 
3752 	if (status != GOT_STATUS_UNVERSIONED) {
3753 		err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3754 		goto done;
3755 	}
3756 
3757 	err = got_fileindex_entry_alloc(&ie, relpath);
3758 	if (err)
3759 		goto done;
3760 	err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
3761 	if (err) {
3762 		got_fileindex_entry_free(ie);
3763 		goto done;
3764 	}
3765 	err = got_fileindex_entry_add(a->fileindex, ie);
3766 	if (err) {
3767 		got_fileindex_entry_free(ie);
3768 		goto done;
3769 	}
3770 done:
3771 	free(ondisk_path);
3772 	if (err)
3773 		return err;
3774 	if (status == GOT_STATUS_ADD)
3775 		return NULL;
3776 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3777 }
3778 
3779 const struct got_error *
3780 got_worktree_schedule_add(struct got_worktree *worktree,
3781     struct got_pathlist_head *paths,
3782     got_worktree_checkout_cb progress_cb, void *progress_arg,
3783     struct got_repository *repo, int no_ignores)
3784 {
3785 	struct got_fileindex *fileindex = NULL;
3786 	char *fileindex_path = NULL;
3787 	const struct got_error *err = NULL, *sync_err, *unlockerr;
3788 	struct got_pathlist_entry *pe;
3789 	struct schedule_addition_args saa;
3790 
3791 	err = lock_worktree(worktree, LOCK_EX);
3792 	if (err)
3793 		return err;
3794 
3795 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3796 	if (err)
3797 		goto done;
3798 
3799 	saa.worktree = worktree;
3800 	saa.fileindex = fileindex;
3801 	saa.progress_cb = progress_cb;
3802 	saa.progress_arg = progress_arg;
3803 	saa.repo = repo;
3804 
3805 	TAILQ_FOREACH(pe, paths, entry) {
3806 		err = worktree_status(worktree, pe->path, fileindex, repo,
3807 			schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3808 		if (err)
3809 			break;
3810 	}
3811 	sync_err = sync_fileindex(fileindex, fileindex_path);
3812 	if (sync_err && err == NULL)
3813 		err = sync_err;
3814 done:
3815 	free(fileindex_path);
3816 	if (fileindex)
3817 		got_fileindex_free(fileindex);
3818 	unlockerr = lock_worktree(worktree, LOCK_SH);
3819 	if (unlockerr && err == NULL)
3820 		err = unlockerr;
3821 	return err;
3822 }
3823 
3824 struct schedule_deletion_args {
3825 	struct got_worktree *worktree;
3826 	struct got_fileindex *fileindex;
3827 	got_worktree_delete_cb progress_cb;
3828 	void *progress_arg;
3829 	struct got_repository *repo;
3830 	int delete_local_mods;
3831 	int keep_on_disk;
3832 	const char *status_codes;
3833 };
3834 
3835 static const struct got_error *
3836 schedule_for_deletion(void *arg, unsigned char status,
3837     unsigned char staged_status, const char *relpath,
3838     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3839     struct got_object_id *commit_id, int dirfd, const char *de_name)
3840 {
3841 	struct schedule_deletion_args *a = arg;
3842 	const struct got_error *err = NULL;
3843 	struct got_fileindex_entry *ie = NULL;
3844 	struct stat sb;
3845 	char *ondisk_path, *parent = NULL;
3846 
3847 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3848 	if (ie == NULL)
3849 		return got_error_path(relpath, GOT_ERR_BAD_PATH);
3850 
3851 	staged_status = get_staged_status(ie);
3852 	if (staged_status != GOT_STATUS_NO_CHANGE) {
3853 		if (staged_status == GOT_STATUS_DELETE)
3854 			return NULL;
3855 		return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3856 	}
3857 
3858 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3859 	    relpath) == -1)
3860 		return got_error_from_errno("asprintf");
3861 
3862 	err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3863 	    a->repo);
3864 	if (err)
3865 		goto done;
3866 
3867 	if (a->status_codes) {
3868 		size_t ncodes = strlen(a->status_codes);
3869 		int i;
3870 		for (i = 0; i < ncodes ; i++) {
3871 			if (status == a->status_codes[i])
3872 				break;
3873 		}
3874 		if (i == ncodes) { 
3875 			/* Do not delete files in non-matching status. */
3876 			free(ondisk_path);
3877 			return NULL;
3878 		}
3879 		if (a->status_codes[i] != GOT_STATUS_MODIFY &&
3880 		    a->status_codes[i] != GOT_STATUS_MISSING) {
3881 			static char msg[64];
3882 			snprintf(msg, sizeof(msg),
3883 			    "invalid status code '%c'", a->status_codes[i]);
3884 			err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
3885 			goto done;
3886 		}
3887 	}
3888 
3889 	if (status != GOT_STATUS_NO_CHANGE) {
3890 		if (status == GOT_STATUS_DELETE)
3891 			goto done;
3892 		if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3893 			err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3894 			goto done;
3895 		}
3896 		if (status != GOT_STATUS_MODIFY &&
3897 		    status != GOT_STATUS_MISSING) {
3898 			err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3899 			goto done;
3900 		}
3901 	}
3902 
3903 	if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3904 		if (dirfd != -1) {
3905 			if (unlinkat(dirfd, de_name, 0) != 0) {
3906 				err = got_error_from_errno2("unlinkat",
3907 				    ondisk_path);
3908 				goto done;
3909 			}
3910 		} else if (unlink(ondisk_path) != 0) {
3911 			err = got_error_from_errno2("unlink", ondisk_path);
3912 			goto done;
3913 		}
3914 
3915 		parent = dirname(ondisk_path);
3916 
3917 		if (parent == NULL) {
3918 			err = got_error_from_errno2("dirname", ondisk_path);
3919 			goto done;
3920 		}
3921 		while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3922 			if (rmdir(parent) == -1) {
3923 				if (errno != ENOTEMPTY)
3924 					err = got_error_from_errno2("rmdir",
3925 					    parent);
3926 				break;
3927 			}
3928 			parent = dirname(parent);
3929 			if (parent == NULL) {
3930 				err = got_error_from_errno2("dirname", parent);
3931 				goto done;
3932 			}
3933 		}
3934 	}
3935 
3936 	got_fileindex_entry_mark_deleted_from_disk(ie);
3937 done:
3938 	free(ondisk_path);
3939 	if (err)
3940 		return err;
3941 	if (status == GOT_STATUS_DELETE)
3942 		return NULL;
3943 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3944 	    staged_status, relpath);
3945 }
3946 
3947 const struct got_error *
3948 got_worktree_schedule_delete(struct got_worktree *worktree,
3949     struct got_pathlist_head *paths, int delete_local_mods,
3950     const char *status_codes,
3951     got_worktree_delete_cb progress_cb, void *progress_arg,
3952     struct got_repository *repo, int keep_on_disk)
3953 {
3954 	struct got_fileindex *fileindex = NULL;
3955 	char *fileindex_path = NULL;
3956 	const struct got_error *err = NULL, *sync_err, *unlockerr;
3957 	struct got_pathlist_entry *pe;
3958 	struct schedule_deletion_args sda;
3959 
3960 	err = lock_worktree(worktree, LOCK_EX);
3961 	if (err)
3962 		return err;
3963 
3964 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3965 	if (err)
3966 		goto done;
3967 
3968 	sda.worktree = worktree;
3969 	sda.fileindex = fileindex;
3970 	sda.progress_cb = progress_cb;
3971 	sda.progress_arg = progress_arg;
3972 	sda.repo = repo;
3973 	sda.delete_local_mods = delete_local_mods;
3974 	sda.keep_on_disk = keep_on_disk;
3975 	sda.status_codes = status_codes;
3976 
3977 	TAILQ_FOREACH(pe, paths, entry) {
3978 		err = worktree_status(worktree, pe->path, fileindex, repo,
3979 			schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3980 		if (err)
3981 			break;
3982 	}
3983 	sync_err = sync_fileindex(fileindex, fileindex_path);
3984 	if (sync_err && err == NULL)
3985 		err = sync_err;
3986 done:
3987 	free(fileindex_path);
3988 	if (fileindex)
3989 		got_fileindex_free(fileindex);
3990 	unlockerr = lock_worktree(worktree, LOCK_SH);
3991 	if (unlockerr && err == NULL)
3992 		err = unlockerr;
3993 	return err;
3994 }
3995 
3996 static const struct got_error *
3997 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3998 {
3999 	const struct got_error *err = NULL;
4000 	char *line = NULL;
4001 	size_t linesize = 0, n;
4002 	ssize_t linelen;
4003 
4004 	linelen = getline(&line, &linesize, infile);
4005 	if (linelen == -1) {
4006 		if (ferror(infile)) {
4007 			err = got_error_from_errno("getline");
4008 			goto done;
4009 		}
4010 		return NULL;
4011 	}
4012 	if (outfile) {
4013 		n = fwrite(line, 1, linelen, outfile);
4014 		if (n != linelen) {
4015 			err = got_ferror(outfile, GOT_ERR_IO);
4016 			goto done;
4017 		}
4018 	}
4019 	if (rejectfile) {
4020 		n = fwrite(line, 1, linelen, rejectfile);
4021 		if (n != linelen)
4022 			err = got_ferror(outfile, GOT_ERR_IO);
4023 	}
4024 done:
4025 	free(line);
4026 	return err;
4027 }
4028 
4029 static const struct got_error *
4030 skip_one_line(FILE *f)
4031 {
4032 	char *line = NULL;
4033 	size_t linesize = 0;
4034 	ssize_t linelen;
4035 
4036 	linelen = getline(&line, &linesize, f);
4037 	if (linelen == -1) {
4038 		if (ferror(f))
4039 			return got_error_from_errno("getline");
4040 		return NULL;
4041 	}
4042 	free(line);
4043 	return NULL;
4044 }
4045 
4046 static const struct got_error *
4047 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4048     int start_old, int end_old, int start_new, int end_new,
4049     FILE *outfile, FILE *rejectfile)
4050  {
4051 	const struct got_error *err;
4052 
4053 	/* Copy old file's lines leading up to patch. */
4054 	while (!feof(f1) && *line_cur1 < start_old) {
4055 		err = copy_one_line(f1, outfile, NULL);
4056 		if (err)
4057 			return err;
4058 		(*line_cur1)++;
4059 	}
4060 	/* Skip new file's lines leading up to patch. */
4061 	while (!feof(f2) && *line_cur2 < start_new) {
4062 		if (rejectfile)
4063 			err = copy_one_line(f2, NULL, rejectfile);
4064 		else
4065 			err = skip_one_line(f2);
4066 		if (err)
4067 			return err;
4068 		(*line_cur2)++;
4069 	}
4070 	/* Copy patched lines. */
4071 	while (!feof(f2) && *line_cur2 <= end_new) {
4072 		err = copy_one_line(f2, outfile, NULL);
4073 		if (err)
4074 			return err;
4075 		(*line_cur2)++;
4076 	}
4077 	/* Skip over old file's replaced lines. */
4078 	while (!feof(f1) && *line_cur1 <= end_old) {
4079 		if (rejectfile)
4080 			err = copy_one_line(f1, NULL, rejectfile);
4081 		else
4082 			err = skip_one_line(f1);
4083 		if (err)
4084 			return err;
4085 		(*line_cur1)++;
4086 	}
4087 
4088 	return NULL;
4089 }
4090 
4091 static const struct got_error *
4092 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4093     FILE *outfile, FILE *rejectfile)
4094 {
4095 	const struct got_error *err;
4096 
4097 	if (outfile) {
4098 		/* Copy old file's lines until EOF. */
4099 		while (!feof(f1)) {
4100 			err = copy_one_line(f1, outfile, NULL);
4101 			if (err)
4102 				return err;
4103 			(*line_cur1)++;
4104 		}
4105 	}
4106 	if (rejectfile) {
4107 		/* Copy new file's lines until EOF. */
4108 		while (!feof(f2)) {
4109 			err = copy_one_line(f2, NULL, rejectfile);
4110 			if (err)
4111 				return err;
4112 			(*line_cur2)++;
4113 		}
4114 	}
4115 
4116 	return NULL;
4117 }
4118 
4119 static const struct got_error *
4120 apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
4121     int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
4122     int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
4123     int *line_cur2, FILE *outfile, FILE *rejectfile,
4124     got_worktree_patch_cb patch_cb, void *patch_arg)
4125 {
4126 	const struct got_error *err = NULL;
4127 	int start_old = change->cv.a;
4128 	int end_old = change->cv.b;
4129 	int start_new = change->cv.c;
4130 	int end_new = change->cv.d;
4131 	long pos1, pos2;
4132 	FILE *hunkfile;
4133 
4134 	*choice = GOT_PATCH_CHOICE_NONE;
4135 
4136 	hunkfile = got_opentemp();
4137 	if (hunkfile == NULL)
4138 		return got_error_from_errno("got_opentemp");
4139 
4140 	pos1 = ftell(f1);
4141 	pos2 = ftell(f2);
4142 
4143 	/* XXX TODO needs error checking */
4144 	got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
4145 
4146 	if (fseek(f1, pos1, SEEK_SET) == -1) {
4147 		err = got_ferror(f1, GOT_ERR_IO);
4148 		goto done;
4149 	}
4150 	if (fseek(f2, pos2, SEEK_SET) == -1) {
4151 		err = got_ferror(f1, GOT_ERR_IO);
4152 		goto done;
4153 	}
4154 	if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4155 		err = got_ferror(hunkfile, GOT_ERR_IO);
4156 		goto done;
4157 	}
4158 
4159 	err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4160 	    hunkfile, n, nchanges);
4161 	if (err)
4162 		goto done;
4163 
4164 	switch (*choice) {
4165 	case GOT_PATCH_CHOICE_YES:
4166 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4167 		    end_old, start_new, end_new, outfile, rejectfile);
4168 		break;
4169 	case GOT_PATCH_CHOICE_NO:
4170 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4171 		    end_old, start_new, end_new, rejectfile, outfile);
4172 		break;
4173 	case GOT_PATCH_CHOICE_QUIT:
4174 		break;
4175 	default:
4176 		err = got_error(GOT_ERR_PATCH_CHOICE);
4177 		break;
4178 	}
4179 done:
4180 	if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4181 		err = got_error_from_errno("fclose");
4182 	return err;
4183 }
4184 
4185 struct revert_file_args {
4186 	struct got_worktree *worktree;
4187 	struct got_fileindex *fileindex;
4188 	got_worktree_checkout_cb progress_cb;
4189 	void *progress_arg;
4190 	got_worktree_patch_cb patch_cb;
4191 	void *patch_arg;
4192 	struct got_repository *repo;
4193 };
4194 
4195 static const struct got_error *
4196 create_patched_content(char **path_outfile, int reverse_patch,
4197     struct got_object_id *blob_id, const char *path2,
4198     int dirfd2, const char *de_name2,
4199     const char *relpath, struct got_repository *repo,
4200     got_worktree_patch_cb patch_cb, void *patch_arg)
4201 {
4202 	const struct got_error *err;
4203 	struct got_blob_object *blob = NULL;
4204 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4205 	int fd2 = -1;
4206 	char link_target[PATH_MAX];
4207 	ssize_t link_len = 0;
4208 	char *path1 = NULL, *id_str = NULL;
4209 	struct stat sb1, sb2;
4210 	struct got_diff_changes *changes = NULL;
4211 	struct got_diff_state *ds = NULL;
4212 	struct got_diff_args *args = NULL;
4213 	struct got_diff_change *change;
4214 	int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
4215 	int n = 0;
4216 
4217 	*path_outfile = NULL;
4218 
4219 	err = got_object_id_str(&id_str, blob_id);
4220 	if (err)
4221 		return err;
4222 
4223 	if (dirfd2 != -1) {
4224 		fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4225 		if (fd2 == -1) {
4226 			if (errno != ELOOP) {
4227 				err = got_error_from_errno2("openat", path2);
4228 				goto done;
4229 			}
4230 			link_len = readlinkat(dirfd2, de_name2,
4231 			    link_target, sizeof(link_target));
4232 			if (link_len == -1)
4233 				return got_error_from_errno2("readlinkat", path2);
4234 			sb2.st_mode = S_IFLNK;
4235 			sb2.st_size = link_len;
4236 		}
4237 	} else {
4238 		fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4239 		if (fd2 == -1) {
4240 			if (errno != ELOOP) {
4241 				err = got_error_from_errno2("open", path2);
4242 				goto done;
4243 			}
4244 			link_len = readlink(path2, link_target,
4245 			    sizeof(link_target));
4246 			if (link_len == -1)
4247 				return got_error_from_errno2("readlink", path2);
4248 			sb2.st_mode = S_IFLNK;
4249 			sb2.st_size = link_len;
4250 		}
4251 	}
4252 	if (fd2 != -1) {
4253 		if (fstat(fd2, &sb2) == -1) {
4254 			err = got_error_from_errno2("fstat", path2);
4255 			goto done;
4256 		}
4257 
4258 		f2 = fdopen(fd2, "r");
4259 		if (f2 == NULL) {
4260 			err = got_error_from_errno2("fdopen", path2);
4261 			goto done;
4262 		}
4263 		fd2 = -1;
4264 	} else {
4265 		size_t n;
4266 		f2 = got_opentemp();
4267 		if (f2 == NULL) {
4268 			err = got_error_from_errno2("got_opentemp", path2);
4269 			goto done;
4270 		}
4271 		n = fwrite(link_target, 1, link_len, f2);
4272 		if (n != link_len) {
4273 			err = got_ferror(f2, GOT_ERR_IO);
4274 			goto done;
4275 		}
4276 		if (fflush(f2) == EOF) {
4277 			err = got_error_from_errno("fflush");
4278 			goto done;
4279 		}
4280 		rewind(f2);
4281 	}
4282 
4283 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4284 	if (err)
4285 		goto done;
4286 
4287 	err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4288 	if (err)
4289 		goto done;
4290 
4291 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4292 	if (err)
4293 		goto done;
4294 
4295 	if (stat(path1, &sb1) == -1) {
4296 		err = got_error_from_errno2("stat", path1);
4297 		goto done;
4298 	}
4299 
4300 	err = got_diff_files(&changes, &ds, &args, &diff_flags,
4301 	    f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
4302 	if (err)
4303 		goto done;
4304 
4305 	err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4306 	if (err)
4307 		goto done;
4308 
4309 	if (fseek(f1, 0L, SEEK_SET) == -1)
4310 		return got_ferror(f1, GOT_ERR_IO);
4311 	if (fseek(f2, 0L, SEEK_SET) == -1)
4312 		return got_ferror(f2, GOT_ERR_IO);
4313 	SIMPLEQ_FOREACH(change, &changes->entries, entry) {
4314 		int choice;
4315 		err = apply_or_reject_change(&choice, change, ++n,
4316 		    changes->nchanges, ds, args, diff_flags, relpath,
4317 		    f1, f2, &line_cur1, &line_cur2,
4318 		    reverse_patch ? NULL : outfile,
4319 		    reverse_patch ? outfile : NULL,
4320 		    patch_cb, patch_arg);
4321 		if (err)
4322 			goto done;
4323 		if (choice == GOT_PATCH_CHOICE_YES)
4324 			have_content = 1;
4325 		else if (choice == GOT_PATCH_CHOICE_QUIT)
4326 			break;
4327 	}
4328 	if (have_content) {
4329 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4330 		    reverse_patch ? NULL : outfile,
4331 		    reverse_patch ? outfile : NULL);
4332 		if (err)
4333 			goto done;
4334 
4335 		if (!S_ISLNK(sb2.st_mode)) {
4336 			if (chmod(*path_outfile, sb2.st_mode) == -1) {
4337 				err = got_error_from_errno2("chmod", path2);
4338 				goto done;
4339 			}
4340 		}
4341 	}
4342 done:
4343 	free(id_str);
4344 	if (blob)
4345 		got_object_blob_close(blob);
4346 	if (f1 && fclose(f1) == EOF && err == NULL)
4347 		err = got_error_from_errno2("fclose", path1);
4348 	if (f2 && fclose(f2) == EOF && err == NULL)
4349 		err = got_error_from_errno2("fclose", path2);
4350 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4351 		err = got_error_from_errno2("close", path2);
4352 	if (outfile && fclose(outfile) == EOF && err == NULL)
4353 		err = got_error_from_errno2("fclose", *path_outfile);
4354 	if (path1 && unlink(path1) == -1 && err == NULL)
4355 		err = got_error_from_errno2("unlink", path1);
4356 	if (err || !have_content) {
4357 		if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4358 			err = got_error_from_errno2("unlink", *path_outfile);
4359 		free(*path_outfile);
4360 		*path_outfile = NULL;
4361 	}
4362 	free(args);
4363 	if (ds) {
4364 		got_diff_state_free(ds);
4365 		free(ds);
4366 	}
4367 	if (changes)
4368 		got_diff_free_changes(changes);
4369 	free(path1);
4370 	return err;
4371 }
4372 
4373 static const struct got_error *
4374 revert_file(void *arg, unsigned char status, unsigned char staged_status,
4375     const char *relpath, struct got_object_id *blob_id,
4376     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4377     int dirfd, const char *de_name)
4378 {
4379 	struct revert_file_args *a = arg;
4380 	const struct got_error *err = NULL;
4381 	char *parent_path = NULL;
4382 	struct got_fileindex_entry *ie;
4383 	struct got_tree_object *tree = NULL;
4384 	struct got_object_id *tree_id = NULL;
4385 	const struct got_tree_entry *te = NULL;
4386 	char *tree_path = NULL, *te_name;
4387 	char *ondisk_path = NULL, *path_content = NULL;
4388 	struct got_blob_object *blob = NULL;
4389 
4390 	/* Reverting a staged deletion is a no-op. */
4391 	if (status == GOT_STATUS_DELETE &&
4392 	    staged_status != GOT_STATUS_NO_CHANGE)
4393 		return NULL;
4394 
4395 	if (status == GOT_STATUS_UNVERSIONED)
4396 		return (*a->progress_cb)(a->progress_arg,
4397 		    GOT_STATUS_UNVERSIONED, relpath);
4398 
4399 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4400 	if (ie == NULL)
4401 		return got_error_path(relpath, GOT_ERR_BAD_PATH);
4402 
4403 	/* Construct in-repository path of tree which contains this blob. */
4404 	err = got_path_dirname(&parent_path, ie->path);
4405 	if (err) {
4406 		if (err->code != GOT_ERR_BAD_PATH)
4407 			goto done;
4408 		parent_path = strdup("/");
4409 		if (parent_path == NULL) {
4410 			err = got_error_from_errno("strdup");
4411 			goto done;
4412 		}
4413 	}
4414 	if (got_path_is_root_dir(a->worktree->path_prefix)) {
4415 		tree_path = strdup(parent_path);
4416 		if (tree_path == NULL) {
4417 			err = got_error_from_errno("strdup");
4418 			goto done;
4419 		}
4420 	} else {
4421 		if (got_path_is_root_dir(parent_path)) {
4422 			tree_path = strdup(a->worktree->path_prefix);
4423 			if (tree_path == NULL) {
4424 				err = got_error_from_errno("strdup");
4425 				goto done;
4426 			}
4427 		} else {
4428 			if (asprintf(&tree_path, "%s/%s",
4429 			    a->worktree->path_prefix, parent_path) == -1) {
4430 				err = got_error_from_errno("asprintf");
4431 				goto done;
4432 			}
4433 		}
4434 	}
4435 
4436 	err = got_object_id_by_path(&tree_id, a->repo,
4437 	    a->worktree->base_commit_id, tree_path);
4438 	if (err) {
4439 		if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4440 		    (status == GOT_STATUS_ADD ||
4441 		    staged_status == GOT_STATUS_ADD)))
4442 			goto done;
4443 	} else {
4444 		err = got_object_open_as_tree(&tree, a->repo, tree_id);
4445 		if (err)
4446 			goto done;
4447 
4448 		err = got_path_basename(&te_name, ie->path);
4449 		if (err)
4450 			goto done;
4451 
4452 		te = got_object_tree_find_entry(tree, te_name);
4453 		free(te_name);
4454 		if (te == NULL && status != GOT_STATUS_ADD &&
4455 		    staged_status != GOT_STATUS_ADD) {
4456 			err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4457 			goto done;
4458 		}
4459 	}
4460 
4461 	switch (status) {
4462 	case GOT_STATUS_ADD:
4463 		if (a->patch_cb) {
4464 			int choice = GOT_PATCH_CHOICE_NONE;
4465 			err = (*a->patch_cb)(&choice, a->patch_arg,
4466 			    status, ie->path, NULL, 1, 1);
4467 			if (err)
4468 				goto done;
4469 			if (choice != GOT_PATCH_CHOICE_YES)
4470 				break;
4471 		}
4472 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4473 		    ie->path);
4474 		if (err)
4475 			goto done;
4476 		got_fileindex_entry_remove(a->fileindex, ie);
4477 		break;
4478 	case GOT_STATUS_DELETE:
4479 		if (a->patch_cb) {
4480 			int choice = GOT_PATCH_CHOICE_NONE;
4481 			err = (*a->patch_cb)(&choice, a->patch_arg,
4482 			    status, ie->path, NULL, 1, 1);
4483 			if (err)
4484 				goto done;
4485 			if (choice != GOT_PATCH_CHOICE_YES)
4486 				break;
4487 		}
4488 		/* fall through */
4489 	case GOT_STATUS_MODIFY:
4490 	case GOT_STATUS_MODE_CHANGE:
4491 	case GOT_STATUS_CONFLICT:
4492 	case GOT_STATUS_MISSING: {
4493 		struct got_object_id id;
4494 		if (staged_status == GOT_STATUS_ADD ||
4495 		    staged_status == GOT_STATUS_MODIFY) {
4496 			memcpy(id.sha1, ie->staged_blob_sha1,
4497 			    SHA1_DIGEST_LENGTH);
4498 		} else
4499 			memcpy(id.sha1, ie->blob_sha1,
4500 			    SHA1_DIGEST_LENGTH);
4501 		err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4502 		if (err)
4503 			goto done;
4504 
4505 		if (asprintf(&ondisk_path, "%s/%s",
4506 		    got_worktree_get_root_path(a->worktree), relpath) == -1) {
4507 			err = got_error_from_errno("asprintf");
4508 			goto done;
4509 		}
4510 
4511 		if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4512 		    status == GOT_STATUS_CONFLICT)) {
4513 			int is_bad_symlink = 0;
4514 			err = create_patched_content(&path_content, 1, &id,
4515 			    ondisk_path, dirfd, de_name, ie->path, a->repo,
4516 			    a->patch_cb, a->patch_arg);
4517 			if (err || path_content == NULL)
4518 				break;
4519 			if (te && S_ISLNK(te->mode)) {
4520 				if (unlink(path_content) == -1) {
4521 					err = got_error_from_errno2("unlink",
4522 					    path_content);
4523 					break;
4524 				}
4525 				err = install_symlink(&is_bad_symlink,
4526 				    a->worktree, ondisk_path, ie->path,
4527 				    blob, 0, 1, 0, a->repo,
4528 				    a->progress_cb, a->progress_arg);
4529 			} else {
4530 				if (rename(path_content, ondisk_path) == -1) {
4531 					err = got_error_from_errno3("rename",
4532 					    path_content, ondisk_path);
4533 					goto done;
4534 				}
4535 			}
4536 		} else {
4537 			int is_bad_symlink = 0;
4538 			if (te && S_ISLNK(te->mode)) {
4539 				err = install_symlink(&is_bad_symlink,
4540 				    a->worktree, ondisk_path, ie->path,
4541 				    blob, 0, 1, 0, a->repo,
4542 				    a->progress_cb, a->progress_arg);
4543 			} else {
4544 				err = install_blob(a->worktree, ondisk_path,
4545 				    ie->path,
4546 				    te ? te->mode : GOT_DEFAULT_FILE_MODE,
4547 				    got_fileindex_perms_to_st(ie), blob,
4548 				    0, 1, 0, 0, a->repo,
4549 				    a->progress_cb, a->progress_arg);
4550 			}
4551 			if (err)
4552 				goto done;
4553 			if (status == GOT_STATUS_DELETE ||
4554 			    status == GOT_STATUS_MODE_CHANGE) {
4555 				err = got_fileindex_entry_update(ie,
4556 				    ondisk_path, blob->id.sha1,
4557 				    a->worktree->base_commit_id->sha1, 1);
4558 				if (err)
4559 					goto done;
4560 			}
4561 			if (is_bad_symlink) {
4562 				got_fileindex_entry_filetype_set(ie,
4563 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
4564 			}
4565 		}
4566 		break;
4567 	}
4568 	default:
4569 		break;
4570 	}
4571 done:
4572 	free(ondisk_path);
4573 	free(path_content);
4574 	free(parent_path);
4575 	free(tree_path);
4576 	if (blob)
4577 		got_object_blob_close(blob);
4578 	if (tree)
4579 		got_object_tree_close(tree);
4580 	free(tree_id);
4581 	return err;
4582 }
4583 
4584 const struct got_error *
4585 got_worktree_revert(struct got_worktree *worktree,
4586     struct got_pathlist_head *paths,
4587     got_worktree_checkout_cb progress_cb, void *progress_arg,
4588     got_worktree_patch_cb patch_cb, void *patch_arg,
4589     struct got_repository *repo)
4590 {
4591 	struct got_fileindex *fileindex = NULL;
4592 	char *fileindex_path = NULL;
4593 	const struct got_error *err = NULL, *unlockerr = NULL;
4594 	const struct got_error *sync_err = NULL;
4595 	struct got_pathlist_entry *pe;
4596 	struct revert_file_args rfa;
4597 
4598 	err = lock_worktree(worktree, LOCK_EX);
4599 	if (err)
4600 		return err;
4601 
4602 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4603 	if (err)
4604 		goto done;
4605 
4606 	rfa.worktree = worktree;
4607 	rfa.fileindex = fileindex;
4608 	rfa.progress_cb = progress_cb;
4609 	rfa.progress_arg = progress_arg;
4610 	rfa.patch_cb = patch_cb;
4611 	rfa.patch_arg = patch_arg;
4612 	rfa.repo = repo;
4613 	TAILQ_FOREACH(pe, paths, entry) {
4614 		err = worktree_status(worktree, pe->path, fileindex, repo,
4615 		    revert_file, &rfa, NULL, NULL, 0, 0);
4616 		if (err)
4617 			break;
4618 	}
4619 	sync_err = sync_fileindex(fileindex, fileindex_path);
4620 	if (sync_err && err == NULL)
4621 		err = sync_err;
4622 done:
4623 	free(fileindex_path);
4624 	if (fileindex)
4625 		got_fileindex_free(fileindex);
4626 	unlockerr = lock_worktree(worktree, LOCK_SH);
4627 	if (unlockerr && err == NULL)
4628 		err = unlockerr;
4629 	return err;
4630 }
4631 
4632 static void
4633 free_commitable(struct got_commitable *ct)
4634 {
4635 	free(ct->path);
4636 	free(ct->in_repo_path);
4637 	free(ct->ondisk_path);
4638 	free(ct->blob_id);
4639 	free(ct->base_blob_id);
4640 	free(ct->staged_blob_id);
4641 	free(ct->base_commit_id);
4642 	free(ct);
4643 }
4644 
4645 struct collect_commitables_arg {
4646 	struct got_pathlist_head *commitable_paths;
4647 	struct got_repository *repo;
4648 	struct got_worktree *worktree;
4649 	struct got_fileindex *fileindex;
4650 	int have_staged_files;
4651 	int allow_bad_symlinks;
4652 };
4653 
4654 static const struct got_error *
4655 collect_commitables(void *arg, unsigned char status,
4656     unsigned char staged_status, const char *relpath,
4657     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4658     struct got_object_id *commit_id, int dirfd, const char *de_name)
4659 {
4660 	struct collect_commitables_arg *a = arg;
4661 	const struct got_error *err = NULL;
4662 	struct got_commitable *ct = NULL;
4663 	struct got_pathlist_entry *new = NULL;
4664 	char *parent_path = NULL, *path = NULL;
4665 	struct stat sb;
4666 
4667 	if (a->have_staged_files) {
4668 		if (staged_status != GOT_STATUS_MODIFY &&
4669 		    staged_status != GOT_STATUS_ADD &&
4670 		    staged_status != GOT_STATUS_DELETE)
4671 			return NULL;
4672 	} else {
4673 		if (status == GOT_STATUS_CONFLICT)
4674 			return got_error(GOT_ERR_COMMIT_CONFLICT);
4675 
4676 		if (status != GOT_STATUS_MODIFY &&
4677 		    status != GOT_STATUS_MODE_CHANGE &&
4678 		    status != GOT_STATUS_ADD &&
4679 		    status != GOT_STATUS_DELETE)
4680 			return NULL;
4681 	}
4682 
4683 	if (asprintf(&path, "/%s", relpath) == -1) {
4684 		err = got_error_from_errno("asprintf");
4685 		goto done;
4686 	}
4687 	if (strcmp(path, "/") == 0) {
4688 		parent_path = strdup("");
4689 		if (parent_path == NULL)
4690 			return got_error_from_errno("strdup");
4691 	} else {
4692 		err = got_path_dirname(&parent_path, path);
4693 		if (err)
4694 			return err;
4695 	}
4696 
4697 	ct = calloc(1, sizeof(*ct));
4698 	if (ct == NULL) {
4699 		err = got_error_from_errno("calloc");
4700 		goto done;
4701 	}
4702 
4703 	if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4704 	    relpath) == -1) {
4705 		err = got_error_from_errno("asprintf");
4706 		goto done;
4707 	}
4708 
4709 	if (staged_status == GOT_STATUS_ADD ||
4710 	    staged_status == GOT_STATUS_MODIFY) {
4711 		struct got_fileindex_entry *ie;
4712 		ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4713 		switch (got_fileindex_entry_staged_filetype_get(ie)) {
4714 		case GOT_FILEIDX_MODE_REGULAR_FILE:
4715 		case GOT_FILEIDX_MODE_BAD_SYMLINK:
4716 			ct->mode = S_IFREG;
4717 			break;
4718 		case GOT_FILEIDX_MODE_SYMLINK:
4719 			ct->mode = S_IFLNK;
4720 			break;
4721 		default:
4722 			err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4723 			goto done;
4724 		}
4725 		ct->mode |= got_fileindex_entry_perms_get(ie);
4726 	} else if (status != GOT_STATUS_DELETE &&
4727 	    staged_status != GOT_STATUS_DELETE) {
4728 		if (dirfd != -1) {
4729 			if (fstatat(dirfd, de_name, &sb,
4730 			    AT_SYMLINK_NOFOLLOW) == -1) {
4731 				err = got_error_from_errno2("fstatat",
4732 				    ct->ondisk_path);
4733 				goto done;
4734 			}
4735 		} else if (lstat(ct->ondisk_path, &sb) == -1) {
4736 			err = got_error_from_errno2("lstat", ct->ondisk_path);
4737 			goto done;
4738 		}
4739 		ct->mode = sb.st_mode;
4740 	}
4741 
4742 	if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4743 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4744 	    relpath) == -1) {
4745 		err = got_error_from_errno("asprintf");
4746 		goto done;
4747 	}
4748 
4749 	if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4750 	    status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4751 		int is_bad_symlink;
4752 		char target_path[PATH_MAX];
4753 		ssize_t target_len;
4754 		target_len = readlink(ct->ondisk_path, target_path,
4755 		    sizeof(target_path));
4756 		if (target_len == -1) {
4757 			err = got_error_from_errno2("readlink",
4758 			    ct->ondisk_path);
4759 			goto done;
4760 		}
4761 		err = is_bad_symlink_target(&is_bad_symlink, target_path,
4762 		    target_len, ct->ondisk_path, a->worktree->root_path);
4763 		if (err)
4764 			goto done;
4765 		if (is_bad_symlink) {
4766 			err = got_error_path(ct->ondisk_path,
4767 			    GOT_ERR_BAD_SYMLINK);
4768 			goto done;
4769 		}
4770 	}
4771 
4772 
4773 	ct->status = status;
4774 	ct->staged_status = staged_status;
4775 	ct->blob_id = NULL; /* will be filled in when blob gets created */
4776 	if (ct->status != GOT_STATUS_ADD &&
4777 	    ct->staged_status != GOT_STATUS_ADD) {
4778 		ct->base_blob_id = got_object_id_dup(blob_id);
4779 		if (ct->base_blob_id == NULL) {
4780 			err = got_error_from_errno("got_object_id_dup");
4781 			goto done;
4782 		}
4783 		ct->base_commit_id = got_object_id_dup(commit_id);
4784 		if (ct->base_commit_id == NULL) {
4785 			err = got_error_from_errno("got_object_id_dup");
4786 			goto done;
4787 		}
4788 	}
4789 	if (ct->staged_status == GOT_STATUS_ADD ||
4790 	    ct->staged_status == GOT_STATUS_MODIFY) {
4791 		ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4792 		if (ct->staged_blob_id == NULL) {
4793 			err = got_error_from_errno("got_object_id_dup");
4794 			goto done;
4795 		}
4796 	}
4797 	ct->path = strdup(path);
4798 	if (ct->path == NULL) {
4799 		err = got_error_from_errno("strdup");
4800 		goto done;
4801 	}
4802 	err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4803 done:
4804 	if (ct && (err || new == NULL))
4805 		free_commitable(ct);
4806 	free(parent_path);
4807 	free(path);
4808 	return err;
4809 }
4810 
4811 static const struct got_error *write_tree(struct got_object_id **, int *,
4812     struct got_tree_object *, const char *, struct got_pathlist_head *,
4813     got_worktree_status_cb status_cb, void *status_arg,
4814     struct got_repository *);
4815 
4816 static const struct got_error *
4817 write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4818     struct got_tree_entry *te, const char *parent_path,
4819     struct got_pathlist_head *commitable_paths,
4820     got_worktree_status_cb status_cb, void *status_arg,
4821     struct got_repository *repo)
4822 {
4823 	const struct got_error *err = NULL;
4824 	struct got_tree_object *subtree;
4825 	char *subpath;
4826 
4827 	if (asprintf(&subpath, "%s%s%s", parent_path,
4828 	    got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4829 		return got_error_from_errno("asprintf");
4830 
4831 	err = got_object_open_as_tree(&subtree, repo, &te->id);
4832 	if (err)
4833 		return err;
4834 
4835 	err = write_tree(new_subtree_id, nentries, subtree, subpath,
4836 	    commitable_paths, status_cb, status_arg, repo);
4837 	got_object_tree_close(subtree);
4838 	free(subpath);
4839 	return err;
4840 }
4841 
4842 static const struct got_error *
4843 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4844 {
4845 	const struct got_error *err = NULL;
4846 	char *ct_parent_path = NULL;
4847 
4848 	*match = 0;
4849 
4850 	if (strchr(ct->in_repo_path, '/') == NULL) {
4851 		*match = got_path_is_root_dir(path);
4852 		return NULL;
4853 	}
4854 
4855 	err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
4856 	if (err)
4857 		return err;
4858 	*match = (strcmp(path, ct_parent_path) == 0);
4859 	free(ct_parent_path);
4860 	return err;
4861 }
4862 
4863 static mode_t
4864 get_ct_file_mode(struct got_commitable *ct)
4865 {
4866 	if (S_ISLNK(ct->mode))
4867 		return S_IFLNK;
4868 
4869 	return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
4870 }
4871 
4872 static const struct got_error *
4873 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
4874     struct got_tree_entry *te, struct got_commitable *ct)
4875 {
4876 	const struct got_error *err = NULL;
4877 
4878 	*new_te = NULL;
4879 
4880 	err = got_object_tree_entry_dup(new_te, te);
4881 	if (err)
4882 		goto done;
4883 
4884 	(*new_te)->mode = get_ct_file_mode(ct);
4885 
4886 	if (ct->staged_status == GOT_STATUS_MODIFY)
4887 		memcpy(&(*new_te)->id, ct->staged_blob_id,
4888 		    sizeof((*new_te)->id));
4889 	else
4890 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4891 done:
4892 	if (err && *new_te) {
4893 		free(*new_te);
4894 		*new_te = NULL;
4895 	}
4896 	return err;
4897 }
4898 
4899 static const struct got_error *
4900 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
4901     struct got_commitable *ct)
4902 {
4903 	const struct got_error *err = NULL;
4904 	char *ct_name = NULL;
4905 
4906 	 *new_te = NULL;
4907 
4908 	*new_te = calloc(1, sizeof(**new_te));
4909 	if (*new_te == NULL)
4910 		return got_error_from_errno("calloc");
4911 
4912 	err = got_path_basename(&ct_name, ct->path);
4913 	if (err)
4914 		goto done;
4915 	if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
4916 	    sizeof((*new_te)->name)) {
4917 		err = got_error(GOT_ERR_NO_SPACE);
4918 		goto done;
4919 	}
4920 
4921 	(*new_te)->mode = get_ct_file_mode(ct);
4922 
4923 	if (ct->staged_status == GOT_STATUS_ADD)
4924 		memcpy(&(*new_te)->id, ct->staged_blob_id,
4925 		    sizeof((*new_te)->id));
4926 	else
4927 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4928 done:
4929 	free(ct_name);
4930 	if (err && *new_te) {
4931 		free(*new_te);
4932 		*new_te = NULL;
4933 	}
4934 	return err;
4935 }
4936 
4937 static const struct got_error *
4938 insert_tree_entry(struct got_tree_entry *new_te,
4939     struct got_pathlist_head *paths)
4940 {
4941 	const struct got_error *err = NULL;
4942 	struct got_pathlist_entry *new_pe;
4943 
4944 	err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
4945 	if (err)
4946 		return err;
4947 	if (new_pe == NULL)
4948 		return got_error(GOT_ERR_TREE_DUP_ENTRY);
4949 	return NULL;
4950 }
4951 
4952 static const struct got_error *
4953 report_ct_status(struct got_commitable *ct,
4954     got_worktree_status_cb status_cb, void *status_arg)
4955 {
4956 	const char *ct_path = ct->path;
4957 	unsigned char status;
4958 
4959 	while (ct_path[0] == '/')
4960 		ct_path++;
4961 
4962 	if (ct->staged_status != GOT_STATUS_NO_CHANGE)
4963 		status = ct->staged_status;
4964 	else
4965 		status = ct->status;
4966 
4967 	return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
4968 	    ct_path, ct->blob_id, NULL, NULL, -1, NULL);
4969 }
4970 
4971 static const struct got_error *
4972 match_modified_subtree(int *modified, struct got_tree_entry *te,
4973     const char *base_tree_path, struct got_pathlist_head *commitable_paths)
4974 {
4975 	const struct got_error *err = NULL;
4976 	struct got_pathlist_entry *pe;
4977 	char *te_path;
4978 
4979 	*modified = 0;
4980 
4981 	if (asprintf(&te_path, "%s%s%s", base_tree_path,
4982 	    got_path_is_root_dir(base_tree_path) ? "" : "/",
4983 	    te->name) == -1)
4984 		return got_error_from_errno("asprintf");
4985 
4986 	TAILQ_FOREACH(pe, commitable_paths, entry) {
4987 		struct got_commitable *ct = pe->data;
4988 		*modified = got_path_is_child(ct->in_repo_path, te_path,
4989 		    strlen(te_path));
4990 		 if (*modified)
4991 			break;
4992 	}
4993 
4994 	free(te_path);
4995 	return err;
4996 }
4997 
4998 static const struct got_error *
4999 match_deleted_or_modified_ct(struct got_commitable **ctp,
5000     struct got_tree_entry *te, const char *base_tree_path,
5001     struct got_pathlist_head *commitable_paths)
5002 {
5003 	const struct got_error *err = NULL;
5004 	struct got_pathlist_entry *pe;
5005 
5006 	*ctp = NULL;
5007 
5008 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5009 		struct got_commitable *ct = pe->data;
5010 		char *ct_name = NULL;
5011 		int path_matches;
5012 
5013 		if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5014 			if (ct->status != GOT_STATUS_MODIFY &&
5015 			    ct->status != GOT_STATUS_MODE_CHANGE &&
5016 			    ct->status != GOT_STATUS_DELETE)
5017 				continue;
5018 		} else {
5019 			if (ct->staged_status != GOT_STATUS_MODIFY &&
5020 			    ct->staged_status != GOT_STATUS_DELETE)
5021 				continue;
5022 		}
5023 
5024 		if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5025 			continue;
5026 
5027 		 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5028 		 if (err)
5029 			return err;
5030 		if (!path_matches)
5031 			continue;
5032 
5033 		err = got_path_basename(&ct_name, pe->path);
5034 		if (err)
5035 			return err;
5036 
5037 		if (strcmp(te->name, ct_name) != 0) {
5038 			free(ct_name);
5039 			continue;
5040 		}
5041 		free(ct_name);
5042 
5043 		*ctp = ct;
5044 		break;
5045 	}
5046 
5047 	return err;
5048 }
5049 
5050 static const struct got_error *
5051 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5052     const char *child_path, const char *path_base_tree,
5053     struct got_pathlist_head *commitable_paths,
5054     got_worktree_status_cb status_cb, void *status_arg,
5055     struct got_repository *repo)
5056 {
5057 	const struct got_error *err = NULL;
5058 	struct got_tree_entry *new_te;
5059 	char *subtree_path;
5060 	struct got_object_id *id = NULL;
5061 	int nentries;
5062 
5063 	*new_tep = NULL;
5064 
5065 	if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5066 	    got_path_is_root_dir(path_base_tree) ? "" : "/",
5067 	    child_path) == -1)
5068 		return got_error_from_errno("asprintf");
5069 
5070 	new_te = calloc(1, sizeof(*new_te));
5071 	if (new_te == NULL)
5072 		return got_error_from_errno("calloc");
5073 	new_te->mode = S_IFDIR;
5074 
5075 	if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5076 	    sizeof(new_te->name)) {
5077 		err = got_error(GOT_ERR_NO_SPACE);
5078 		goto done;
5079 	}
5080 	err = write_tree(&id, &nentries, NULL, subtree_path,
5081 	    commitable_paths, status_cb, status_arg, repo);
5082 	if (err) {
5083 		free(new_te);
5084 		goto done;
5085 	}
5086 	memcpy(&new_te->id, id, sizeof(new_te->id));
5087 done:
5088 	free(id);
5089 	free(subtree_path);
5090 	if (err == NULL)
5091 		*new_tep = new_te;
5092 	return err;
5093 }
5094 
5095 static const struct got_error *
5096 write_tree(struct got_object_id **new_tree_id, int *nentries,
5097     struct got_tree_object *base_tree, const char *path_base_tree,
5098     struct got_pathlist_head *commitable_paths,
5099     got_worktree_status_cb status_cb, void *status_arg,
5100     struct got_repository *repo)
5101 {
5102 	const struct got_error *err = NULL;
5103 	struct got_pathlist_head paths;
5104 	struct got_tree_entry *te, *new_te = NULL;
5105 	struct got_pathlist_entry *pe;
5106 
5107 	TAILQ_INIT(&paths);
5108 	*nentries = 0;
5109 
5110 	/* Insert, and recurse into, newly added entries first. */
5111 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5112 		struct got_commitable *ct = pe->data;
5113 		char *child_path = NULL, *slash;
5114 
5115 		if ((ct->status != GOT_STATUS_ADD &&
5116 		    ct->staged_status != GOT_STATUS_ADD) ||
5117 		    (ct->flags & GOT_COMMITABLE_ADDED))
5118 			continue;
5119 
5120 		 if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5121 		     strlen(path_base_tree)))
5122 			continue;
5123 
5124 		err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5125 		    ct->in_repo_path);
5126 		if (err)
5127 			goto done;
5128 
5129 		slash = strchr(child_path, '/');
5130 		if (slash == NULL) {
5131 			err = alloc_added_blob_tree_entry(&new_te, ct);
5132 			if (err)
5133 				goto done;
5134 			err = report_ct_status(ct, status_cb, status_arg);
5135 			if (err)
5136 				goto done;
5137 			ct->flags |= GOT_COMMITABLE_ADDED;
5138 			err = insert_tree_entry(new_te, &paths);
5139 			if (err)
5140 				goto done;
5141 			(*nentries)++;
5142 		} else {
5143 			*slash = '\0'; /* trim trailing path components */
5144 			if (base_tree == NULL ||
5145 			    got_object_tree_find_entry(base_tree, child_path)
5146 			    == NULL) {
5147 				err = make_subtree_for_added_blob(&new_te,
5148 				    child_path, path_base_tree,
5149 				    commitable_paths, status_cb, status_arg,
5150 				    repo);
5151 				if (err)
5152 					goto done;
5153 				err = insert_tree_entry(new_te, &paths);
5154 				if (err)
5155 					goto done;
5156 				(*nentries)++;
5157 			}
5158 		}
5159 	}
5160 
5161 	if (base_tree) {
5162 		int i, nbase_entries;
5163 		/* Handle modified and deleted entries. */
5164 		nbase_entries = got_object_tree_get_nentries(base_tree);
5165 		for (i = 0; i < nbase_entries; i++) {
5166 			struct got_commitable *ct = NULL;
5167 
5168 			te = got_object_tree_get_entry(base_tree, i);
5169 			if (got_object_tree_entry_is_submodule(te)) {
5170 				/* Entry is a submodule; just copy it. */
5171 				err = got_object_tree_entry_dup(&new_te, te);
5172 				if (err)
5173 					goto done;
5174 				err = insert_tree_entry(new_te, &paths);
5175 				if (err)
5176 					goto done;
5177 				(*nentries)++;
5178 				continue;
5179 			}
5180 
5181 			if (S_ISDIR(te->mode)) {
5182 				int modified;
5183 				err = got_object_tree_entry_dup(&new_te, te);
5184 				if (err)
5185 					goto done;
5186 				err = match_modified_subtree(&modified, te,
5187 				    path_base_tree, commitable_paths);
5188 				if (err)
5189 					goto done;
5190 				/* Avoid recursion into unmodified subtrees. */
5191 				if (modified) {
5192 					struct got_object_id *new_id;
5193 					int nsubentries;
5194 					err = write_subtree(&new_id,
5195 					    &nsubentries, te,
5196 					    path_base_tree, commitable_paths,
5197 					    status_cb, status_arg, repo);
5198 					if (err)
5199 						goto done;
5200 					if (nsubentries == 0) {
5201 						/* All entries were deleted. */
5202 						free(new_id);
5203 						continue;
5204 					}
5205 					memcpy(&new_te->id, new_id,
5206 					    sizeof(new_te->id));
5207 					free(new_id);
5208 				}
5209 				err = insert_tree_entry(new_te, &paths);
5210 				if (err)
5211 					goto done;
5212 				(*nentries)++;
5213 				continue;
5214 			}
5215 
5216 			err = match_deleted_or_modified_ct(&ct, te,
5217 			    path_base_tree, commitable_paths);
5218 			if (err)
5219 				goto done;
5220 			if (ct) {
5221 				/* NB: Deleted entries get dropped here. */
5222 				if (ct->status == GOT_STATUS_MODIFY ||
5223 				    ct->status == GOT_STATUS_MODE_CHANGE ||
5224 				    ct->staged_status == GOT_STATUS_MODIFY) {
5225 					err = alloc_modified_blob_tree_entry(
5226 					    &new_te, te, ct);
5227 					if (err)
5228 						goto done;
5229 					err = insert_tree_entry(new_te, &paths);
5230 					if (err)
5231 						goto done;
5232 					(*nentries)++;
5233 				}
5234 				err = report_ct_status(ct, status_cb,
5235 				    status_arg);
5236 				if (err)
5237 					goto done;
5238 			} else {
5239 				/* Entry is unchanged; just copy it. */
5240 				err = got_object_tree_entry_dup(&new_te, te);
5241 				if (err)
5242 					goto done;
5243 				err = insert_tree_entry(new_te, &paths);
5244 				if (err)
5245 					goto done;
5246 				(*nentries)++;
5247 			}
5248 		}
5249 	}
5250 
5251 	/* Write new list of entries; deleted entries have been dropped. */
5252 	err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5253 done:
5254 	got_pathlist_free(&paths);
5255 	return err;
5256 }
5257 
5258 static const struct got_error *
5259 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
5260     struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
5261     int have_staged_files)
5262 {
5263 	const struct got_error *err = NULL;
5264 	struct got_pathlist_entry *pe;
5265 
5266 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5267 		struct got_fileindex_entry *ie;
5268 		struct got_commitable *ct = pe->data;
5269 
5270 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5271 		if (ie) {
5272 			if (ct->status == GOT_STATUS_DELETE ||
5273 			    ct->staged_status == GOT_STATUS_DELETE) {
5274 				got_fileindex_entry_remove(fileindex, ie);
5275 			} else if (ct->staged_status == GOT_STATUS_ADD ||
5276 			    ct->staged_status == GOT_STATUS_MODIFY) {
5277 				got_fileindex_entry_stage_set(ie,
5278 				    GOT_FILEIDX_STAGE_NONE);
5279 				err = got_fileindex_entry_update(ie,
5280 				    ct->ondisk_path, ct->staged_blob_id->sha1,
5281 				    new_base_commit_id->sha1,
5282 				    !have_staged_files);
5283 			} else
5284 				err = got_fileindex_entry_update(ie,
5285 				    ct->ondisk_path, ct->blob_id->sha1,
5286 				    new_base_commit_id->sha1,
5287 				    !have_staged_files);
5288 		} else {
5289 			err = got_fileindex_entry_alloc(&ie, pe->path);
5290 			if (err)
5291 				break;
5292 			err = got_fileindex_entry_update(ie, ct->ondisk_path,
5293 			    ct->blob_id->sha1, new_base_commit_id->sha1, 1);
5294 			if (err) {
5295 				got_fileindex_entry_free(ie);
5296 				break;
5297 			}
5298 			err = got_fileindex_entry_add(fileindex, ie);
5299 			if (err) {
5300 				got_fileindex_entry_free(ie);
5301 				break;
5302 			}
5303 		}
5304 	}
5305 	return err;
5306 }
5307 
5308 
5309 static const struct got_error *
5310 check_out_of_date(const char *in_repo_path, unsigned char status,
5311     unsigned char staged_status, struct got_object_id *base_blob_id,
5312     struct got_object_id *base_commit_id,
5313     struct got_object_id *head_commit_id, struct got_repository *repo,
5314     int ood_errcode)
5315 {
5316 	const struct got_error *err = NULL;
5317 	struct got_object_id *id = NULL;
5318 
5319 	if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5320 		/* Trivial case: base commit == head commit */
5321 		if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5322 			return NULL;
5323 		/*
5324 		 * Ensure file content which local changes were based
5325 		 * on matches file content in the branch head.
5326 		 */
5327 		err = got_object_id_by_path(&id, repo, head_commit_id,
5328 		    in_repo_path);
5329 		if (err) {
5330 			if (err->code == GOT_ERR_NO_TREE_ENTRY)
5331 				err = got_error(ood_errcode);
5332 			goto done;
5333 		} else if (got_object_id_cmp(id, base_blob_id) != 0)
5334 			err = got_error(ood_errcode);
5335 	} else {
5336 		/* Require that added files don't exist in the branch head. */
5337 		err = got_object_id_by_path(&id, repo, head_commit_id,
5338 		    in_repo_path);
5339 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5340 			goto done;
5341 		err = id ? got_error(ood_errcode) : NULL;
5342 	}
5343 done:
5344 	free(id);
5345 	return err;
5346 }
5347 
5348 const struct got_error *
5349 commit_worktree(struct got_object_id **new_commit_id,
5350     struct got_pathlist_head *commitable_paths,
5351     struct got_object_id *head_commit_id, struct got_worktree *worktree,
5352     const char *author, const char *committer,
5353     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5354     got_worktree_status_cb status_cb, void *status_arg,
5355     struct got_repository *repo)
5356 {
5357 	const struct got_error *err = NULL, *unlockerr = NULL;
5358 	struct got_pathlist_entry *pe;
5359 	const char *head_ref_name = NULL;
5360 	struct got_commit_object *head_commit = NULL;
5361 	struct got_reference *head_ref2 = NULL;
5362 	struct got_object_id *head_commit_id2 = NULL;
5363 	struct got_tree_object *head_tree = NULL;
5364 	struct got_object_id *new_tree_id = NULL;
5365 	int nentries;
5366 	struct got_object_id_queue parent_ids;
5367 	struct got_object_qid *pid = NULL;
5368 	char *logmsg = NULL;
5369 
5370 	*new_commit_id = NULL;
5371 
5372 	SIMPLEQ_INIT(&parent_ids);
5373 
5374 	err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5375 	if (err)
5376 		goto done;
5377 
5378 	err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5379 	if (err)
5380 		goto done;
5381 
5382 	if (commit_msg_cb != NULL) {
5383 		err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5384 		if (err)
5385 			goto done;
5386 	}
5387 
5388 	if (logmsg == NULL || strlen(logmsg) == 0) {
5389 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5390 		goto done;
5391 	}
5392 
5393 	/* Create blobs from added and modified files and record their IDs. */
5394 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5395 		struct got_commitable *ct = pe->data;
5396 		char *ondisk_path;
5397 
5398 		/* Blobs for staged files already exist. */
5399 		if (ct->staged_status == GOT_STATUS_ADD ||
5400 		    ct->staged_status == GOT_STATUS_MODIFY)
5401 			continue;
5402 
5403 		if (ct->status != GOT_STATUS_ADD &&
5404 		    ct->status != GOT_STATUS_MODIFY &&
5405 		    ct->status != GOT_STATUS_MODE_CHANGE)
5406 			continue;
5407 
5408 		if (asprintf(&ondisk_path, "%s/%s",
5409 		    worktree->root_path, pe->path) == -1) {
5410 			err = got_error_from_errno("asprintf");
5411 			goto done;
5412 		}
5413 		err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5414 		free(ondisk_path);
5415 		if (err)
5416 			goto done;
5417 	}
5418 
5419 	/* Recursively write new tree objects. */
5420 	err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5421 	    commitable_paths, status_cb, status_arg, repo);
5422 	if (err)
5423 		goto done;
5424 
5425 	err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5426 	if (err)
5427 		goto done;
5428 	SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
5429 	err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5430 	    1, author, time(NULL), committer, time(NULL), logmsg, repo);
5431 	got_object_qid_free(pid);
5432 	if (logmsg != NULL)
5433 		free(logmsg);
5434 	if (err)
5435 		goto done;
5436 
5437 	/* Check if a concurrent commit to our branch has occurred. */
5438 	head_ref_name = got_worktree_get_head_ref_name(worktree);
5439 	if (head_ref_name == NULL) {
5440 		err = got_error_from_errno("got_worktree_get_head_ref_name");
5441 		goto done;
5442 	}
5443 	/* Lock the reference here to prevent concurrent modification. */
5444 	err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5445 	if (err)
5446 		goto done;
5447 	err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5448 	if (err)
5449 		goto done;
5450 	if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5451 		err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5452 		goto done;
5453 	}
5454 	/* Update branch head in repository. */
5455 	err = got_ref_change_ref(head_ref2, *new_commit_id);
5456 	if (err)
5457 		goto done;
5458 	err = got_ref_write(head_ref2, repo);
5459 	if (err)
5460 		goto done;
5461 
5462 	err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5463 	if (err)
5464 		goto done;
5465 
5466 	err = ref_base_commit(worktree, repo);
5467 	if (err)
5468 		goto done;
5469 done:
5470 	if (head_tree)
5471 		got_object_tree_close(head_tree);
5472 	if (head_commit)
5473 		got_object_commit_close(head_commit);
5474 	free(head_commit_id2);
5475 	if (head_ref2) {
5476 		unlockerr = got_ref_unlock(head_ref2);
5477 		if (unlockerr && err == NULL)
5478 			err = unlockerr;
5479 		got_ref_close(head_ref2);
5480 	}
5481 	return err;
5482 }
5483 
5484 static const struct got_error *
5485 check_path_is_commitable(const char *path,
5486     struct got_pathlist_head *commitable_paths)
5487 {
5488 	struct got_pathlist_entry *cpe = NULL;
5489 	size_t path_len = strlen(path);
5490 
5491 	TAILQ_FOREACH(cpe, commitable_paths, entry) {
5492 		struct got_commitable *ct = cpe->data;
5493 		const char *ct_path = ct->path;
5494 
5495 		while (ct_path[0] == '/')
5496 			ct_path++;
5497 
5498 		if (strcmp(path, ct_path) == 0 ||
5499 		    got_path_is_child(ct_path, path, path_len))
5500 			break;
5501 	}
5502 
5503 	if (cpe == NULL)
5504 		return got_error_path(path, GOT_ERR_BAD_PATH);
5505 
5506 	return NULL;
5507 }
5508 
5509 static const struct got_error *
5510 check_staged_file(void *arg, struct got_fileindex_entry *ie)
5511 {
5512 	int *have_staged_files = arg;
5513 
5514 	if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5515 		*have_staged_files = 1;
5516 		return got_error(GOT_ERR_CANCELLED);
5517 	}
5518 
5519 	return NULL;
5520 }
5521 
5522 static const struct got_error *
5523 check_non_staged_files(struct got_fileindex *fileindex,
5524     struct got_pathlist_head *paths)
5525 {
5526 	struct got_pathlist_entry *pe;
5527 	struct got_fileindex_entry *ie;
5528 
5529 	TAILQ_FOREACH(pe, paths, entry) {
5530 		if (pe->path[0] == '\0')
5531 			continue;
5532 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5533 		if (ie == NULL)
5534 			return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5535 		if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5536 			return got_error_path(pe->path,
5537 			    GOT_ERR_FILE_NOT_STAGED);
5538 	}
5539 
5540 	return NULL;
5541 }
5542 
5543 const struct got_error *
5544 got_worktree_commit(struct got_object_id **new_commit_id,
5545     struct got_worktree *worktree, struct got_pathlist_head *paths,
5546     const char *author, const char *committer, int allow_bad_symlinks,
5547     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5548     got_worktree_status_cb status_cb, void *status_arg,
5549     struct got_repository *repo)
5550 {
5551 	const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5552 	struct got_fileindex *fileindex = NULL;
5553 	char *fileindex_path = NULL;
5554 	struct got_pathlist_head commitable_paths;
5555 	struct collect_commitables_arg cc_arg;
5556 	struct got_pathlist_entry *pe;
5557 	struct got_reference *head_ref = NULL;
5558 	struct got_object_id *head_commit_id = NULL;
5559 	int have_staged_files = 0;
5560 
5561 	*new_commit_id = NULL;
5562 
5563 	TAILQ_INIT(&commitable_paths);
5564 
5565 	err = lock_worktree(worktree, LOCK_EX);
5566 	if (err)
5567 		goto done;
5568 
5569 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5570 	if (err)
5571 		goto done;
5572 
5573 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
5574 	if (err)
5575 		goto done;
5576 
5577 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
5578 	if (err)
5579 		goto done;
5580 
5581 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5582 	    &have_staged_files);
5583 	if (err && err->code != GOT_ERR_CANCELLED)
5584 		goto done;
5585 	if (have_staged_files) {
5586 		err = check_non_staged_files(fileindex, paths);
5587 		if (err)
5588 			goto done;
5589 	}
5590 
5591 	cc_arg.commitable_paths = &commitable_paths;
5592 	cc_arg.worktree = worktree;
5593 	cc_arg.fileindex = fileindex;
5594 	cc_arg.repo = repo;
5595 	cc_arg.have_staged_files = have_staged_files;
5596 	cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5597 	TAILQ_FOREACH(pe, paths, entry) {
5598 		err = worktree_status(worktree, pe->path, fileindex, repo,
5599 		    collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5600 		if (err)
5601 			goto done;
5602 	}
5603 
5604 	if (TAILQ_EMPTY(&commitable_paths)) {
5605 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5606 		goto done;
5607 	}
5608 
5609 	TAILQ_FOREACH(pe, paths, entry) {
5610 		err = check_path_is_commitable(pe->path, &commitable_paths);
5611 		if (err)
5612 			goto done;
5613 	}
5614 
5615 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
5616 		struct got_commitable *ct = pe->data;
5617 		const char *ct_path = ct->in_repo_path;
5618 
5619 		while (ct_path[0] == '/')
5620 			ct_path++;
5621 		err = check_out_of_date(ct_path, ct->status,
5622 		    ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5623 		    head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5624 		if (err)
5625 			goto done;
5626 
5627 	}
5628 
5629 	err = commit_worktree(new_commit_id, &commitable_paths,
5630 	    head_commit_id, worktree, author, committer,
5631 	    commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5632 	if (err)
5633 		goto done;
5634 
5635 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5636 	    fileindex, have_staged_files);
5637 	sync_err = sync_fileindex(fileindex, fileindex_path);
5638 	if (sync_err && err == NULL)
5639 		err = sync_err;
5640 done:
5641 	if (fileindex)
5642 		got_fileindex_free(fileindex);
5643 	free(fileindex_path);
5644 	unlockerr = lock_worktree(worktree, LOCK_SH);
5645 	if (unlockerr && err == NULL)
5646 		err = unlockerr;
5647 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
5648 		struct got_commitable *ct = pe->data;
5649 		free_commitable(ct);
5650 	}
5651 	got_pathlist_free(&commitable_paths);
5652 	return err;
5653 }
5654 
5655 const char *
5656 got_commitable_get_path(struct got_commitable *ct)
5657 {
5658 	return ct->path;
5659 }
5660 
5661 unsigned int
5662 got_commitable_get_status(struct got_commitable *ct)
5663 {
5664 	return ct->status;
5665 }
5666 
5667 struct check_rebase_ok_arg {
5668 	struct got_worktree *worktree;
5669 	struct got_repository *repo;
5670 };
5671 
5672 static const struct got_error *
5673 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5674 {
5675 	const struct got_error *err = NULL;
5676 	struct check_rebase_ok_arg *a = arg;
5677 	unsigned char status;
5678 	struct stat sb;
5679 	char *ondisk_path;
5680 
5681 	/* Reject rebase of a work tree with mixed base commits. */
5682 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5683 	    SHA1_DIGEST_LENGTH))
5684 		return got_error(GOT_ERR_MIXED_COMMITS);
5685 
5686 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5687 	    == -1)
5688 		return got_error_from_errno("asprintf");
5689 
5690 	/* Reject rebase of a work tree with modified or staged files. */
5691 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5692 	free(ondisk_path);
5693 	if (err)
5694 		return err;
5695 
5696 	if (status != GOT_STATUS_NO_CHANGE)
5697 		return got_error(GOT_ERR_MODIFIED);
5698 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5699 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5700 
5701 	return NULL;
5702 }
5703 
5704 const struct got_error *
5705 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5706     struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5707     struct got_worktree *worktree, struct got_reference *branch,
5708     struct got_repository *repo)
5709 {
5710 	const struct got_error *err = NULL;
5711 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5712 	char *branch_ref_name = NULL;
5713 	char *fileindex_path = NULL;
5714 	struct check_rebase_ok_arg ok_arg;
5715 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5716 	struct got_object_id *wt_branch_tip = NULL;
5717 
5718 	*new_base_branch_ref = NULL;
5719 	*tmp_branch = NULL;
5720 	*fileindex = NULL;
5721 
5722 	err = lock_worktree(worktree, LOCK_EX);
5723 	if (err)
5724 		return err;
5725 
5726 	err = open_fileindex(fileindex, &fileindex_path, worktree);
5727 	if (err)
5728 		goto done;
5729 
5730 	ok_arg.worktree = worktree;
5731 	ok_arg.repo = repo;
5732 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5733 	    &ok_arg);
5734 	if (err)
5735 		goto done;
5736 
5737 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5738 	if (err)
5739 		goto done;
5740 
5741 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5742 	if (err)
5743 		goto done;
5744 
5745 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5746 	if (err)
5747 		goto done;
5748 
5749 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5750 	    0);
5751 	if (err)
5752 		goto done;
5753 
5754 	err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5755 	if (err)
5756 		goto done;
5757 	if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5758 		err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5759 		goto done;
5760 	}
5761 
5762 	err = got_ref_alloc_symref(new_base_branch_ref,
5763 	    new_base_branch_ref_name, wt_branch);
5764 	if (err)
5765 		goto done;
5766 	err = got_ref_write(*new_base_branch_ref, repo);
5767 	if (err)
5768 		goto done;
5769 
5770 	/* TODO Lock original branch's ref while rebasing? */
5771 
5772 	err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5773 	if (err)
5774 		goto done;
5775 
5776 	err = got_ref_write(branch_ref, repo);
5777 	if (err)
5778 		goto done;
5779 
5780 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
5781 	    worktree->base_commit_id);
5782 	if (err)
5783 		goto done;
5784 	err = got_ref_write(*tmp_branch, repo);
5785 	if (err)
5786 		goto done;
5787 
5788 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
5789 	if (err)
5790 		goto done;
5791 done:
5792 	free(fileindex_path);
5793 	free(tmp_branch_name);
5794 	free(new_base_branch_ref_name);
5795 	free(branch_ref_name);
5796 	if (branch_ref)
5797 		got_ref_close(branch_ref);
5798 	if (wt_branch)
5799 		got_ref_close(wt_branch);
5800 	free(wt_branch_tip);
5801 	if (err) {
5802 		if (*new_base_branch_ref) {
5803 			got_ref_close(*new_base_branch_ref);
5804 			*new_base_branch_ref = NULL;
5805 		}
5806 		if (*tmp_branch) {
5807 			got_ref_close(*tmp_branch);
5808 			*tmp_branch = NULL;
5809 		}
5810 		if (*fileindex) {
5811 			got_fileindex_free(*fileindex);
5812 			*fileindex = NULL;
5813 		}
5814 		lock_worktree(worktree, LOCK_SH);
5815 	}
5816 	return err;
5817 }
5818 
5819 const struct got_error *
5820 got_worktree_rebase_continue(struct got_object_id **commit_id,
5821     struct got_reference **new_base_branch, struct got_reference **tmp_branch,
5822     struct got_reference **branch, struct got_fileindex **fileindex,
5823     struct got_worktree *worktree, struct got_repository *repo)
5824 {
5825 	const struct got_error *err;
5826 	char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
5827 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5828 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
5829 	char *fileindex_path = NULL;
5830 	int have_staged_files = 0;
5831 
5832 	*commit_id = NULL;
5833 	*new_base_branch = NULL;
5834 	*tmp_branch = NULL;
5835 	*branch = NULL;
5836 	*fileindex = NULL;
5837 
5838 	err = lock_worktree(worktree, LOCK_EX);
5839 	if (err)
5840 		return err;
5841 
5842 	err = open_fileindex(fileindex, &fileindex_path, worktree);
5843 	if (err)
5844 		goto done;
5845 
5846 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5847 	    &have_staged_files);
5848 	if (err && err->code != GOT_ERR_CANCELLED)
5849 		goto done;
5850 	if (have_staged_files) {
5851 		err = got_error(GOT_ERR_STAGED_PATHS);
5852 		goto done;
5853 	}
5854 
5855 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5856 	if (err)
5857 		goto done;
5858 
5859 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5860 	if (err)
5861 		goto done;
5862 
5863 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5864 	if (err)
5865 		goto done;
5866 
5867 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5868 	if (err)
5869 		goto done;
5870 
5871 	err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
5872 	if (err)
5873 		goto done;
5874 
5875 	err = got_ref_open(branch, repo,
5876 	    got_ref_get_symref_target(branch_ref), 0);
5877 	if (err)
5878 		goto done;
5879 
5880 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5881 	if (err)
5882 		goto done;
5883 
5884 	err = got_ref_resolve(commit_id, repo, commit_ref);
5885 	if (err)
5886 		goto done;
5887 
5888 	err = got_ref_open(new_base_branch, repo,
5889 	    new_base_branch_ref_name, 0);
5890 	if (err)
5891 		goto done;
5892 
5893 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5894 	if (err)
5895 		goto done;
5896 done:
5897 	free(commit_ref_name);
5898 	free(branch_ref_name);
5899 	free(fileindex_path);
5900 	if (commit_ref)
5901 		got_ref_close(commit_ref);
5902 	if (branch_ref)
5903 		got_ref_close(branch_ref);
5904 	if (err) {
5905 		free(*commit_id);
5906 		*commit_id = NULL;
5907 		if (*tmp_branch) {
5908 			got_ref_close(*tmp_branch);
5909 			*tmp_branch = NULL;
5910 		}
5911 		if (*new_base_branch) {
5912 			got_ref_close(*new_base_branch);
5913 			*new_base_branch = NULL;
5914 		}
5915 		if (*branch) {
5916 			got_ref_close(*branch);
5917 			*branch = NULL;
5918 		}
5919 		if (*fileindex) {
5920 			got_fileindex_free(*fileindex);
5921 			*fileindex = NULL;
5922 		}
5923 		lock_worktree(worktree, LOCK_SH);
5924 	}
5925 	return err;
5926 }
5927 
5928 const struct got_error *
5929 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
5930 {
5931 	const struct got_error *err;
5932 	char *tmp_branch_name = NULL;
5933 
5934 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5935 	if (err)
5936 		return err;
5937 
5938 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5939 	free(tmp_branch_name);
5940 	return NULL;
5941 }
5942 
5943 static const struct got_error *
5944 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
5945     char **logmsg, void *arg)
5946 {
5947 	*logmsg = arg;
5948 	return NULL;
5949 }
5950 
5951 static const struct got_error *
5952 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
5953     const char *path, struct got_object_id *blob_id,
5954     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5955     int dirfd, const char *de_name)
5956 {
5957 	return NULL;
5958 }
5959 
5960 struct collect_merged_paths_arg {
5961 	got_worktree_checkout_cb progress_cb;
5962 	void *progress_arg;
5963 	struct got_pathlist_head *merged_paths;
5964 };
5965 
5966 static const struct got_error *
5967 collect_merged_paths(void *arg, unsigned char status, const char *path)
5968 {
5969 	const struct got_error *err;
5970 	struct collect_merged_paths_arg *a = arg;
5971 	char *p;
5972 	struct got_pathlist_entry *new;
5973 
5974 	err = (*a->progress_cb)(a->progress_arg, status, path);
5975 	if (err)
5976 		return err;
5977 
5978 	if (status != GOT_STATUS_MERGE &&
5979 	    status != GOT_STATUS_ADD &&
5980 	    status != GOT_STATUS_DELETE &&
5981 	    status != GOT_STATUS_CONFLICT)
5982 		return NULL;
5983 
5984 	p = strdup(path);
5985 	if (p == NULL)
5986 		return got_error_from_errno("strdup");
5987 
5988 	err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
5989 	if (err || new == NULL)
5990 		free(p);
5991 	return err;
5992 }
5993 
5994 void
5995 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
5996 {
5997 	struct got_pathlist_entry *pe;
5998 
5999 	TAILQ_FOREACH(pe, merged_paths, entry)
6000 		free((char *)pe->path);
6001 
6002 	got_pathlist_free(merged_paths);
6003 }
6004 
6005 static const struct got_error *
6006 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6007     int is_rebase, struct got_repository *repo)
6008 {
6009 	const struct got_error *err;
6010 	struct got_reference *commit_ref = NULL;
6011 
6012 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6013 	if (err) {
6014 		if (err->code != GOT_ERR_NOT_REF)
6015 			goto done;
6016 		err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6017 		if (err)
6018 			goto done;
6019 		err = got_ref_write(commit_ref, repo);
6020 		if (err)
6021 			goto done;
6022 	} else if (is_rebase) {
6023 		struct got_object_id *stored_id;
6024 		int cmp;
6025 
6026 		err = got_ref_resolve(&stored_id, repo, commit_ref);
6027 		if (err)
6028 			goto done;
6029 		cmp = got_object_id_cmp(commit_id, stored_id);
6030 		free(stored_id);
6031 		if (cmp != 0) {
6032 			err = got_error(GOT_ERR_REBASE_COMMITID);
6033 			goto done;
6034 		}
6035 	}
6036 done:
6037 	if (commit_ref)
6038 		got_ref_close(commit_ref);
6039 	return err;
6040 }
6041 
6042 static const struct got_error *
6043 rebase_merge_files(struct got_pathlist_head *merged_paths,
6044     const char *commit_ref_name, struct got_worktree *worktree,
6045     struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6046     struct got_object_id *commit_id, struct got_repository *repo,
6047     got_worktree_checkout_cb progress_cb, void *progress_arg,
6048     got_cancel_cb cancel_cb, void *cancel_arg)
6049 {
6050 	const struct got_error *err;
6051 	struct got_reference *commit_ref = NULL;
6052 	struct collect_merged_paths_arg cmp_arg;
6053 	char *fileindex_path;
6054 
6055 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
6056 
6057 	err = get_fileindex_path(&fileindex_path, worktree);
6058 	if (err)
6059 		return err;
6060 
6061 	cmp_arg.progress_cb = progress_cb;
6062 	cmp_arg.progress_arg = progress_arg;
6063 	cmp_arg.merged_paths = merged_paths;
6064 	err = merge_files(worktree, fileindex, fileindex_path,
6065 	    parent_commit_id, commit_id, repo, collect_merged_paths,
6066 	    &cmp_arg, cancel_cb, cancel_arg);
6067 	if (commit_ref)
6068 		got_ref_close(commit_ref);
6069 	return err;
6070 }
6071 
6072 const struct got_error *
6073 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6074     struct got_worktree *worktree, struct got_fileindex *fileindex,
6075     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6076     struct got_repository *repo,
6077     got_worktree_checkout_cb progress_cb, void *progress_arg,
6078     got_cancel_cb cancel_cb, void *cancel_arg)
6079 {
6080 	const struct got_error *err;
6081 	char *commit_ref_name;
6082 
6083 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6084 	if (err)
6085 		return err;
6086 
6087 	err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6088 	if (err)
6089 		goto done;
6090 
6091 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6092 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
6093 	    progress_arg, cancel_cb, cancel_arg);
6094 done:
6095 	free(commit_ref_name);
6096 	return err;
6097 }
6098 
6099 const struct got_error *
6100 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6101     struct got_worktree *worktree, struct got_fileindex *fileindex,
6102     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6103     struct got_repository *repo,
6104     got_worktree_checkout_cb progress_cb, void *progress_arg,
6105     got_cancel_cb cancel_cb, void *cancel_arg)
6106 {
6107 	const struct got_error *err;
6108 	char *commit_ref_name;
6109 
6110 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6111 	if (err)
6112 		return err;
6113 
6114 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6115 	if (err)
6116 		goto done;
6117 
6118 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6119 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
6120 	    progress_arg, cancel_cb, cancel_arg);
6121 done:
6122 	free(commit_ref_name);
6123 	return err;
6124 }
6125 
6126 static const struct got_error *
6127 rebase_commit(struct got_object_id **new_commit_id,
6128     struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6129     struct got_worktree *worktree, struct got_fileindex *fileindex,
6130     struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6131     const char *new_logmsg, struct got_repository *repo)
6132 {
6133 	const struct got_error *err, *sync_err;
6134 	struct got_pathlist_head commitable_paths;
6135 	struct collect_commitables_arg cc_arg;
6136 	char *fileindex_path = NULL;
6137 	struct got_reference *head_ref = NULL;
6138 	struct got_object_id *head_commit_id = NULL;
6139 	char *logmsg = NULL;
6140 
6141 	TAILQ_INIT(&commitable_paths);
6142 	*new_commit_id = NULL;
6143 
6144 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
6145 
6146 	err = get_fileindex_path(&fileindex_path, worktree);
6147 	if (err)
6148 		return err;
6149 
6150 	cc_arg.commitable_paths = &commitable_paths;
6151 	cc_arg.worktree = worktree;
6152 	cc_arg.repo = repo;
6153 	cc_arg.have_staged_files = 0;
6154 	/*
6155 	 * If possible get the status of individual files directly to
6156 	 * avoid crawling the entire work tree once per rebased commit.
6157 	 * TODO: Ideally, merged_paths would contain a list of commitables
6158 	 * we could use so we could skip worktree_status() entirely.
6159 	 */
6160 	if (merged_paths) {
6161 		struct got_pathlist_entry *pe;
6162 		TAILQ_FOREACH(pe, merged_paths, entry) {
6163 			err = worktree_status(worktree, pe->path, fileindex,
6164 			    repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6165 			    0);
6166 			if (err)
6167 				goto done;
6168 		}
6169 	} else {
6170 		err = worktree_status(worktree, "", fileindex, repo,
6171 		    collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6172 		if (err)
6173 			goto done;
6174 	}
6175 
6176 	if (TAILQ_EMPTY(&commitable_paths)) {
6177 		/* No-op change; commit will be elided. */
6178 		err = got_ref_delete(commit_ref, repo);
6179 		if (err)
6180 			goto done;
6181 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6182 		goto done;
6183 	}
6184 
6185 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6186 	if (err)
6187 		goto done;
6188 
6189 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
6190 	if (err)
6191 		goto done;
6192 
6193 	if (new_logmsg) {
6194 		logmsg = strdup(new_logmsg);
6195 		if (logmsg == NULL) {
6196 			err = got_error_from_errno("strdup");
6197 			goto done;
6198 		}
6199 	} else {
6200 		err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6201 		if (err)
6202 			goto done;
6203 	}
6204 
6205 	/* NB: commit_worktree will call free(logmsg) */
6206 	err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6207 	    worktree, got_object_commit_get_author(orig_commit),
6208 	    got_object_commit_get_committer(orig_commit),
6209 	    collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6210 	if (err)
6211 		goto done;
6212 
6213 	err = got_ref_change_ref(tmp_branch, *new_commit_id);
6214 	if (err)
6215 		goto done;
6216 
6217 	err = got_ref_delete(commit_ref, repo);
6218 	if (err)
6219 		goto done;
6220 
6221 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
6222 	    fileindex, 0);
6223 	sync_err = sync_fileindex(fileindex, fileindex_path);
6224 	if (sync_err && err == NULL)
6225 		err = sync_err;
6226 done:
6227 	free(fileindex_path);
6228 	free(head_commit_id);
6229 	if (head_ref)
6230 		got_ref_close(head_ref);
6231 	if (err) {
6232 		free(*new_commit_id);
6233 		*new_commit_id = NULL;
6234 	}
6235 	return err;
6236 }
6237 
6238 const struct got_error *
6239 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6240     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6241     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6242     struct got_commit_object *orig_commit,
6243     struct got_object_id *orig_commit_id, struct got_repository *repo)
6244 {
6245 	const struct got_error *err;
6246 	char *commit_ref_name;
6247 	struct got_reference *commit_ref = NULL;
6248 	struct got_object_id *commit_id = NULL;
6249 
6250 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6251 	if (err)
6252 		return err;
6253 
6254 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6255 	if (err)
6256 		goto done;
6257 	err = got_ref_resolve(&commit_id, repo, commit_ref);
6258 	if (err)
6259 		goto done;
6260 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6261 		err = got_error(GOT_ERR_REBASE_COMMITID);
6262 		goto done;
6263 	}
6264 
6265 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6266 	    worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6267 done:
6268 	if (commit_ref)
6269 		got_ref_close(commit_ref);
6270 	free(commit_ref_name);
6271 	free(commit_id);
6272 	return err;
6273 }
6274 
6275 const struct got_error *
6276 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6277     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6278     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6279     struct got_commit_object *orig_commit,
6280     struct got_object_id *orig_commit_id, const char *new_logmsg,
6281     struct got_repository *repo)
6282 {
6283 	const struct got_error *err;
6284 	char *commit_ref_name;
6285 	struct got_reference *commit_ref = NULL;
6286 
6287 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6288 	if (err)
6289 		return err;
6290 
6291 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6292 	if (err)
6293 		goto done;
6294 
6295 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6296 	    worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6297 done:
6298 	if (commit_ref)
6299 		got_ref_close(commit_ref);
6300 	free(commit_ref_name);
6301 	return err;
6302 }
6303 
6304 const struct got_error *
6305 got_worktree_rebase_postpone(struct got_worktree *worktree,
6306     struct got_fileindex *fileindex)
6307 {
6308 	if (fileindex)
6309 		got_fileindex_free(fileindex);
6310 	return lock_worktree(worktree, LOCK_SH);
6311 }
6312 
6313 static const struct got_error *
6314 delete_ref(const char *name, struct got_repository *repo)
6315 {
6316 	const struct got_error *err;
6317 	struct got_reference *ref;
6318 
6319 	err = got_ref_open(&ref, repo, name, 0);
6320 	if (err) {
6321 		if (err->code == GOT_ERR_NOT_REF)
6322 			return NULL;
6323 		return err;
6324 	}
6325 
6326 	err = got_ref_delete(ref, repo);
6327 	got_ref_close(ref);
6328 	return err;
6329 }
6330 
6331 static const struct got_error *
6332 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6333 {
6334 	const struct got_error *err;
6335 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6336 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
6337 
6338 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6339 	if (err)
6340 		goto done;
6341 	err = delete_ref(tmp_branch_name, repo);
6342 	if (err)
6343 		goto done;
6344 
6345 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6346 	if (err)
6347 		goto done;
6348 	err = delete_ref(new_base_branch_ref_name, repo);
6349 	if (err)
6350 		goto done;
6351 
6352 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6353 	if (err)
6354 		goto done;
6355 	err = delete_ref(branch_ref_name, repo);
6356 	if (err)
6357 		goto done;
6358 
6359 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6360 	if (err)
6361 		goto done;
6362 	err = delete_ref(commit_ref_name, repo);
6363 	if (err)
6364 		goto done;
6365 
6366 done:
6367 	free(tmp_branch_name);
6368 	free(new_base_branch_ref_name);
6369 	free(branch_ref_name);
6370 	free(commit_ref_name);
6371 	return err;
6372 }
6373 
6374 const struct got_error *
6375 got_worktree_rebase_complete(struct got_worktree *worktree,
6376     struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6377     struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6378     struct got_repository *repo)
6379 {
6380 	const struct got_error *err, *unlockerr;
6381 	struct got_object_id *new_head_commit_id = NULL;
6382 
6383 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6384 	if (err)
6385 		return err;
6386 
6387 	err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6388 	if (err)
6389 		goto done;
6390 
6391 	err = got_ref_write(rebased_branch, repo);
6392 	if (err)
6393 		goto done;
6394 
6395 	err = got_worktree_set_head_ref(worktree, rebased_branch);
6396 	if (err)
6397 		goto done;
6398 
6399 	err = delete_rebase_refs(worktree, repo);
6400 done:
6401 	if (fileindex)
6402 		got_fileindex_free(fileindex);
6403 	free(new_head_commit_id);
6404 	unlockerr = lock_worktree(worktree, LOCK_SH);
6405 	if (unlockerr && err == NULL)
6406 		err = unlockerr;
6407 	return err;
6408 }
6409 
6410 const struct got_error *
6411 got_worktree_rebase_abort(struct got_worktree *worktree,
6412     struct got_fileindex *fileindex, struct got_repository *repo,
6413     struct got_reference *new_base_branch,
6414      got_worktree_checkout_cb progress_cb, void *progress_arg)
6415 {
6416 	const struct got_error *err, *unlockerr, *sync_err;
6417 	struct got_reference *resolved = NULL;
6418 	struct got_object_id *commit_id = NULL;
6419 	char *fileindex_path = NULL;
6420 	struct revert_file_args rfa;
6421 	struct got_object_id *tree_id = NULL;
6422 
6423 	err = lock_worktree(worktree, LOCK_EX);
6424 	if (err)
6425 		return err;
6426 
6427 	err = got_ref_open(&resolved, repo,
6428 	    got_ref_get_symref_target(new_base_branch), 0);
6429 	if (err)
6430 		goto done;
6431 
6432 	err = got_worktree_set_head_ref(worktree, resolved);
6433 	if (err)
6434 		goto done;
6435 
6436 	/*
6437 	 * XXX commits to the base branch could have happened while
6438 	 * we were busy rebasing; should we store the original commit ID
6439 	 * when rebase begins and read it back here?
6440 	 */
6441 	err = got_ref_resolve(&commit_id, repo, resolved);
6442 	if (err)
6443 		goto done;
6444 
6445 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6446 	if (err)
6447 		goto done;
6448 
6449 	err = got_object_id_by_path(&tree_id, repo,
6450 	    worktree->base_commit_id, worktree->path_prefix);
6451 	if (err)
6452 		goto done;
6453 
6454 	err = delete_rebase_refs(worktree, repo);
6455 	if (err)
6456 		goto done;
6457 
6458 	err = get_fileindex_path(&fileindex_path, worktree);
6459 	if (err)
6460 		goto done;
6461 
6462 	rfa.worktree = worktree;
6463 	rfa.fileindex = fileindex;
6464 	rfa.progress_cb = progress_cb;
6465 	rfa.progress_arg = progress_arg;
6466 	rfa.patch_cb = NULL;
6467 	rfa.patch_arg = NULL;
6468 	rfa.repo = repo;
6469 	err = worktree_status(worktree, "", fileindex, repo,
6470 	    revert_file, &rfa, NULL, NULL, 0, 0);
6471 	if (err)
6472 		goto sync;
6473 
6474 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6475 	    repo, progress_cb, progress_arg, NULL, NULL);
6476 sync:
6477 	sync_err = sync_fileindex(fileindex, fileindex_path);
6478 	if (sync_err && err == NULL)
6479 		err = sync_err;
6480 done:
6481 	got_ref_close(resolved);
6482 	free(tree_id);
6483 	free(commit_id);
6484 	if (fileindex)
6485 		got_fileindex_free(fileindex);
6486 	free(fileindex_path);
6487 
6488 	unlockerr = lock_worktree(worktree, LOCK_SH);
6489 	if (unlockerr && err == NULL)
6490 		err = unlockerr;
6491 	return err;
6492 }
6493 
6494 const struct got_error *
6495 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6496     struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6497     struct got_fileindex **fileindex, struct got_worktree *worktree,
6498     struct got_repository *repo)
6499 {
6500 	const struct got_error *err = NULL;
6501 	char *tmp_branch_name = NULL;
6502 	char *branch_ref_name = NULL;
6503 	char *base_commit_ref_name = NULL;
6504 	char *fileindex_path = NULL;
6505 	struct check_rebase_ok_arg ok_arg;
6506 	struct got_reference *wt_branch = NULL;
6507 	struct got_reference *base_commit_ref = NULL;
6508 
6509 	*tmp_branch = NULL;
6510 	*branch_ref = NULL;
6511 	*base_commit_id = NULL;
6512 	*fileindex = NULL;
6513 
6514 	err = lock_worktree(worktree, LOCK_EX);
6515 	if (err)
6516 		return err;
6517 
6518 	err = open_fileindex(fileindex, &fileindex_path, worktree);
6519 	if (err)
6520 		goto done;
6521 
6522 	ok_arg.worktree = worktree;
6523 	ok_arg.repo = repo;
6524 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6525 	    &ok_arg);
6526 	if (err)
6527 		goto done;
6528 
6529 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6530 	if (err)
6531 		goto done;
6532 
6533 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6534 	if (err)
6535 		goto done;
6536 
6537 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6538 	    worktree);
6539 	if (err)
6540 		goto done;
6541 
6542 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6543 	    0);
6544 	if (err)
6545 		goto done;
6546 
6547 	err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6548 	if (err)
6549 		goto done;
6550 
6551 	err = got_ref_write(*branch_ref, repo);
6552 	if (err)
6553 		goto done;
6554 
6555 	err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6556 	    worktree->base_commit_id);
6557 	if (err)
6558 		goto done;
6559 	err = got_ref_write(base_commit_ref, repo);
6560 	if (err)
6561 		goto done;
6562 	*base_commit_id = got_object_id_dup(worktree->base_commit_id);
6563 	if (*base_commit_id == NULL) {
6564 		err = got_error_from_errno("got_object_id_dup");
6565 		goto done;
6566 	}
6567 
6568 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
6569 	    worktree->base_commit_id);
6570 	if (err)
6571 		goto done;
6572 	err = got_ref_write(*tmp_branch, repo);
6573 	if (err)
6574 		goto done;
6575 
6576 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
6577 	if (err)
6578 		goto done;
6579 done:
6580 	free(fileindex_path);
6581 	free(tmp_branch_name);
6582 	free(branch_ref_name);
6583 	free(base_commit_ref_name);
6584 	if (wt_branch)
6585 		got_ref_close(wt_branch);
6586 	if (err) {
6587 		if (*branch_ref) {
6588 			got_ref_close(*branch_ref);
6589 			*branch_ref = NULL;
6590 		}
6591 		if (*tmp_branch) {
6592 			got_ref_close(*tmp_branch);
6593 			*tmp_branch = NULL;
6594 		}
6595 		free(*base_commit_id);
6596 		if (*fileindex) {
6597 			got_fileindex_free(*fileindex);
6598 			*fileindex = NULL;
6599 		}
6600 		lock_worktree(worktree, LOCK_SH);
6601 	}
6602 	return err;
6603 }
6604 
6605 const struct got_error *
6606 got_worktree_histedit_postpone(struct got_worktree *worktree,
6607     struct got_fileindex *fileindex)
6608 {
6609 	if (fileindex)
6610 		got_fileindex_free(fileindex);
6611 	return lock_worktree(worktree, LOCK_SH);
6612 }
6613 
6614 const struct got_error *
6615 got_worktree_histedit_in_progress(int *in_progress,
6616     struct got_worktree *worktree)
6617 {
6618 	const struct got_error *err;
6619 	char *tmp_branch_name = NULL;
6620 
6621 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6622 	if (err)
6623 		return err;
6624 
6625 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6626 	free(tmp_branch_name);
6627 	return NULL;
6628 }
6629 
6630 const struct got_error *
6631 got_worktree_histedit_continue(struct got_object_id **commit_id,
6632     struct got_reference **tmp_branch, struct got_reference **branch_ref,
6633     struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6634     struct got_worktree *worktree, struct got_repository *repo)
6635 {
6636 	const struct got_error *err;
6637 	char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6638 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6639 	struct got_reference *commit_ref = NULL;
6640 	struct got_reference *base_commit_ref = NULL;
6641 	char *fileindex_path = NULL;
6642 	int have_staged_files = 0;
6643 
6644 	*commit_id = NULL;
6645 	*tmp_branch = NULL;
6646 	*base_commit_id = NULL;
6647 	*fileindex = NULL;
6648 
6649 	err = lock_worktree(worktree, LOCK_EX);
6650 	if (err)
6651 		return err;
6652 
6653 	err = open_fileindex(fileindex, &fileindex_path, worktree);
6654 	if (err)
6655 		goto done;
6656 
6657 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6658 	    &have_staged_files);
6659 	if (err && err->code != GOT_ERR_CANCELLED)
6660 		goto done;
6661 	if (have_staged_files) {
6662 		err = got_error(GOT_ERR_STAGED_PATHS);
6663 		goto done;
6664 	}
6665 
6666 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6667 	if (err)
6668 		goto done;
6669 
6670 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6671 	if (err)
6672 		goto done;
6673 
6674 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6675 	if (err)
6676 		goto done;
6677 
6678 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6679 	    worktree);
6680 	if (err)
6681 		goto done;
6682 
6683 	err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6684 	if (err)
6685 		goto done;
6686 
6687 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6688 	if (err)
6689 		goto done;
6690 	err = got_ref_resolve(commit_id, repo, commit_ref);
6691 	if (err)
6692 		goto done;
6693 
6694 	err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6695 	if (err)
6696 		goto done;
6697 	err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6698 	if (err)
6699 		goto done;
6700 
6701 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6702 	if (err)
6703 		goto done;
6704 done:
6705 	free(commit_ref_name);
6706 	free(branch_ref_name);
6707 	free(fileindex_path);
6708 	if (commit_ref)
6709 		got_ref_close(commit_ref);
6710 	if (base_commit_ref)
6711 		got_ref_close(base_commit_ref);
6712 	if (err) {
6713 		free(*commit_id);
6714 		*commit_id = NULL;
6715 		free(*base_commit_id);
6716 		*base_commit_id = NULL;
6717 		if (*tmp_branch) {
6718 			got_ref_close(*tmp_branch);
6719 			*tmp_branch = NULL;
6720 		}
6721 		if (*fileindex) {
6722 			got_fileindex_free(*fileindex);
6723 			*fileindex = NULL;
6724 		}
6725 		lock_worktree(worktree, LOCK_EX);
6726 	}
6727 	return err;
6728 }
6729 
6730 static const struct got_error *
6731 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6732 {
6733 	const struct got_error *err;
6734 	char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6735 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
6736 
6737 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6738 	if (err)
6739 		goto done;
6740 	err = delete_ref(tmp_branch_name, repo);
6741 	if (err)
6742 		goto done;
6743 
6744 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6745 	    worktree);
6746 	if (err)
6747 		goto done;
6748 	err = delete_ref(base_commit_ref_name, repo);
6749 	if (err)
6750 		goto done;
6751 
6752 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6753 	if (err)
6754 		goto done;
6755 	err = delete_ref(branch_ref_name, repo);
6756 	if (err)
6757 		goto done;
6758 
6759 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6760 	if (err)
6761 		goto done;
6762 	err = delete_ref(commit_ref_name, repo);
6763 	if (err)
6764 		goto done;
6765 done:
6766 	free(tmp_branch_name);
6767 	free(base_commit_ref_name);
6768 	free(branch_ref_name);
6769 	free(commit_ref_name);
6770 	return err;
6771 }
6772 
6773 const struct got_error *
6774 got_worktree_histedit_abort(struct got_worktree *worktree,
6775     struct got_fileindex *fileindex, struct got_repository *repo,
6776     struct got_reference *branch, struct got_object_id *base_commit_id,
6777     got_worktree_checkout_cb progress_cb, void *progress_arg)
6778 {
6779 	const struct got_error *err, *unlockerr, *sync_err;
6780 	struct got_reference *resolved = NULL;
6781 	char *fileindex_path = NULL;
6782 	struct got_object_id *tree_id = NULL;
6783 	struct revert_file_args rfa;
6784 
6785 	err = lock_worktree(worktree, LOCK_EX);
6786 	if (err)
6787 		return err;
6788 
6789 	err = got_ref_open(&resolved, repo,
6790 	    got_ref_get_symref_target(branch), 0);
6791 	if (err)
6792 		goto done;
6793 
6794 	err = got_worktree_set_head_ref(worktree, resolved);
6795 	if (err)
6796 		goto done;
6797 
6798 	err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
6799 	if (err)
6800 		goto done;
6801 
6802 	err = got_object_id_by_path(&tree_id, repo, base_commit_id,
6803 	    worktree->path_prefix);
6804 	if (err)
6805 		goto done;
6806 
6807 	err = delete_histedit_refs(worktree, repo);
6808 	if (err)
6809 		goto done;
6810 
6811 	err = get_fileindex_path(&fileindex_path, worktree);
6812 	if (err)
6813 		goto done;
6814 
6815 	rfa.worktree = worktree;
6816 	rfa.fileindex = fileindex;
6817 	rfa.progress_cb = progress_cb;
6818 	rfa.progress_arg = progress_arg;
6819 	rfa.patch_cb = NULL;
6820 	rfa.patch_arg = NULL;
6821 	rfa.repo = repo;
6822 	err = worktree_status(worktree, "", fileindex, repo,
6823 	    revert_file, &rfa, NULL, NULL, 0, 0);
6824 	if (err)
6825 		goto sync;
6826 
6827 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6828 	    repo, progress_cb, progress_arg, NULL, NULL);
6829 sync:
6830 	sync_err = sync_fileindex(fileindex, fileindex_path);
6831 	if (sync_err && err == NULL)
6832 		err = sync_err;
6833 done:
6834 	got_ref_close(resolved);
6835 	free(tree_id);
6836 	free(fileindex_path);
6837 
6838 	unlockerr = lock_worktree(worktree, LOCK_SH);
6839 	if (unlockerr && err == NULL)
6840 		err = unlockerr;
6841 	return err;
6842 }
6843 
6844 const struct got_error *
6845 got_worktree_histedit_complete(struct got_worktree *worktree,
6846     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6847     struct got_reference *edited_branch, struct got_repository *repo)
6848 {
6849 	const struct got_error *err, *unlockerr;
6850 	struct got_object_id *new_head_commit_id = NULL;
6851 	struct got_reference *resolved = NULL;
6852 
6853 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6854 	if (err)
6855 		return err;
6856 
6857 	err = got_ref_open(&resolved, repo,
6858 	    got_ref_get_symref_target(edited_branch), 0);
6859 	if (err)
6860 		goto done;
6861 
6862 	err = got_ref_change_ref(resolved, new_head_commit_id);
6863 	if (err)
6864 		goto done;
6865 
6866 	err = got_ref_write(resolved, repo);
6867 	if (err)
6868 		goto done;
6869 
6870 	err = got_worktree_set_head_ref(worktree, resolved);
6871 	if (err)
6872 		goto done;
6873 
6874 	err = delete_histedit_refs(worktree, repo);
6875 done:
6876 	if (fileindex)
6877 		got_fileindex_free(fileindex);
6878 	free(new_head_commit_id);
6879 	unlockerr = lock_worktree(worktree, LOCK_SH);
6880 	if (unlockerr && err == NULL)
6881 		err = unlockerr;
6882 	return err;
6883 }
6884 
6885 const struct got_error *
6886 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
6887     struct got_object_id *commit_id, struct got_repository *repo)
6888 {
6889 	const struct got_error *err;
6890 	char *commit_ref_name;
6891 
6892 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6893 	if (err)
6894 		return err;
6895 
6896 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6897 	if (err)
6898 		goto done;
6899 
6900 	err = delete_ref(commit_ref_name, repo);
6901 done:
6902 	free(commit_ref_name);
6903 	return err;
6904 }
6905 
6906 const struct got_error *
6907 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
6908     struct got_reference **branch_ref, struct got_reference **base_branch_ref,
6909     struct got_worktree *worktree, const char *refname,
6910     struct got_repository *repo)
6911 {
6912 	const struct got_error *err = NULL;
6913 	char *fileindex_path = NULL;
6914 	struct check_rebase_ok_arg ok_arg;
6915 
6916 	*fileindex = NULL;
6917 	*branch_ref = NULL;
6918 	*base_branch_ref = NULL;
6919 
6920 	err = lock_worktree(worktree, LOCK_EX);
6921 	if (err)
6922 		return err;
6923 
6924 	if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
6925 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
6926 		    "cannot integrate a branch into itself; "
6927 		    "update -b or different branch name required");
6928 		goto done;
6929 	}
6930 
6931 	err = open_fileindex(fileindex, &fileindex_path, worktree);
6932 	if (err)
6933 		goto done;
6934 
6935 	/* Preconditions are the same as for rebase. */
6936 	ok_arg.worktree = worktree;
6937 	ok_arg.repo = repo;
6938 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6939 	    &ok_arg);
6940 	if (err)
6941 		goto done;
6942 
6943 	err = got_ref_open(branch_ref, repo, refname, 1);
6944 	if (err)
6945 		goto done;
6946 
6947 	err = got_ref_open(base_branch_ref, repo,
6948 	    got_worktree_get_head_ref_name(worktree), 1);
6949 done:
6950 	if (err) {
6951 		if (*branch_ref) {
6952 			got_ref_close(*branch_ref);
6953 			*branch_ref = NULL;
6954 		}
6955 		if (*base_branch_ref) {
6956 			got_ref_close(*base_branch_ref);
6957 			*base_branch_ref = NULL;
6958 		}
6959 		if (*fileindex) {
6960 			got_fileindex_free(*fileindex);
6961 			*fileindex = NULL;
6962 		}
6963 		lock_worktree(worktree, LOCK_SH);
6964 	}
6965 	return err;
6966 }
6967 
6968 const struct got_error *
6969 got_worktree_integrate_continue(struct got_worktree *worktree,
6970     struct got_fileindex *fileindex, struct got_repository *repo,
6971     struct got_reference *branch_ref, struct got_reference *base_branch_ref,
6972     got_worktree_checkout_cb progress_cb, void *progress_arg,
6973     got_cancel_cb cancel_cb, void *cancel_arg)
6974 {
6975 	const struct got_error *err = NULL, *sync_err, *unlockerr;
6976 	char *fileindex_path = NULL;
6977 	struct got_object_id *tree_id = NULL, *commit_id = NULL;
6978 
6979 	err = get_fileindex_path(&fileindex_path, worktree);
6980 	if (err)
6981 		goto done;
6982 
6983 	err = got_ref_resolve(&commit_id, repo, branch_ref);
6984 	if (err)
6985 		goto done;
6986 
6987 	err = got_object_id_by_path(&tree_id, repo, commit_id,
6988 	    worktree->path_prefix);
6989 	if (err)
6990 		goto done;
6991 
6992 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6993 	if (err)
6994 		goto done;
6995 
6996 	err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
6997 	    progress_cb, progress_arg, cancel_cb, cancel_arg);
6998 	if (err)
6999 		goto sync;
7000 
7001 	err = got_ref_change_ref(base_branch_ref, commit_id);
7002 	if (err)
7003 		goto sync;
7004 
7005 	err = got_ref_write(base_branch_ref, repo);
7006 sync:
7007 	sync_err = sync_fileindex(fileindex, fileindex_path);
7008 	if (sync_err && err == NULL)
7009 		err = sync_err;
7010 
7011 done:
7012 	unlockerr = got_ref_unlock(branch_ref);
7013 	if (unlockerr && err == NULL)
7014 		err = unlockerr;
7015 	got_ref_close(branch_ref);
7016 
7017 	unlockerr = got_ref_unlock(base_branch_ref);
7018 	if (unlockerr && err == NULL)
7019 		err = unlockerr;
7020 	got_ref_close(base_branch_ref);
7021 
7022 	got_fileindex_free(fileindex);
7023 	free(fileindex_path);
7024 	free(tree_id);
7025 
7026 	unlockerr = lock_worktree(worktree, LOCK_SH);
7027 	if (unlockerr && err == NULL)
7028 		err = unlockerr;
7029 	return err;
7030 }
7031 
7032 const struct got_error *
7033 got_worktree_integrate_abort(struct got_worktree *worktree,
7034     struct got_fileindex *fileindex, struct got_repository *repo,
7035     struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7036 {
7037 	const struct got_error *err = NULL, *unlockerr = NULL;
7038 
7039 	got_fileindex_free(fileindex);
7040 
7041 	err = lock_worktree(worktree, LOCK_SH);
7042 
7043 	unlockerr = got_ref_unlock(branch_ref);
7044 	if (unlockerr && err == NULL)
7045 		err = unlockerr;
7046 	got_ref_close(branch_ref);
7047 
7048 	unlockerr = got_ref_unlock(base_branch_ref);
7049 	if (unlockerr && err == NULL)
7050 		err = unlockerr;
7051 	got_ref_close(base_branch_ref);
7052 
7053 	return err;
7054 }
7055 
7056 struct check_stage_ok_arg {
7057 	struct got_object_id *head_commit_id;
7058 	struct got_worktree *worktree;
7059 	struct got_fileindex *fileindex;
7060 	struct got_repository *repo;
7061 	int have_changes;
7062 };
7063 
7064 const struct got_error *
7065 check_stage_ok(void *arg, unsigned char status,
7066     unsigned char staged_status, const char *relpath,
7067     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7068     struct got_object_id *commit_id, int dirfd, const char *de_name)
7069 {
7070 	struct check_stage_ok_arg *a = arg;
7071 	const struct got_error *err = NULL;
7072 	struct got_fileindex_entry *ie;
7073 	struct got_object_id base_commit_id;
7074 	struct got_object_id *base_commit_idp = NULL;
7075 	char *in_repo_path = NULL, *p;
7076 
7077 	if (status == GOT_STATUS_UNVERSIONED ||
7078 	    status == GOT_STATUS_NO_CHANGE)
7079 		return NULL;
7080 	if (status == GOT_STATUS_NONEXISTENT)
7081 		return got_error_set_errno(ENOENT, relpath);
7082 
7083 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7084 	if (ie == NULL)
7085 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7086 
7087 	if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7088 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7089 	    relpath) == -1)
7090 		return got_error_from_errno("asprintf");
7091 
7092 	if (got_fileindex_entry_has_commit(ie)) {
7093 		memcpy(base_commit_id.sha1, ie->commit_sha1,
7094 		    SHA1_DIGEST_LENGTH);
7095 		base_commit_idp = &base_commit_id;
7096 	}
7097 
7098 	if (status == GOT_STATUS_CONFLICT) {
7099 		err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7100 		goto done;
7101 	} else if (status != GOT_STATUS_ADD &&
7102 	    status != GOT_STATUS_MODIFY &&
7103 	    status != GOT_STATUS_DELETE) {
7104 		err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7105 		goto done;
7106 	}
7107 
7108 	a->have_changes = 1;
7109 
7110 	p = in_repo_path;
7111 	while (p[0] == '/')
7112 		p++;
7113 	err = check_out_of_date(p, status, staged_status,
7114 	    blob_id, base_commit_idp, a->head_commit_id, a->repo,
7115 	    GOT_ERR_STAGE_OUT_OF_DATE);
7116 done:
7117 	free(in_repo_path);
7118 	return err;
7119 }
7120 
7121 struct stage_path_arg {
7122 	struct got_worktree *worktree;
7123 	struct got_fileindex *fileindex;
7124 	struct got_repository *repo;
7125 	got_worktree_status_cb status_cb;
7126 	void *status_arg;
7127 	got_worktree_patch_cb patch_cb;
7128 	void *patch_arg;
7129 	int staged_something;
7130 	int allow_bad_symlinks;
7131 };
7132 
7133 static const struct got_error *
7134 stage_path(void *arg, unsigned char status,
7135     unsigned char staged_status, const char *relpath,
7136     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7137     struct got_object_id *commit_id, int dirfd, const char *de_name)
7138 {
7139 	struct stage_path_arg *a = arg;
7140 	const struct got_error *err = NULL;
7141 	struct got_fileindex_entry *ie;
7142 	char *ondisk_path = NULL, *path_content = NULL;
7143 	uint32_t stage;
7144 	struct got_object_id *new_staged_blob_id = NULL;
7145 	struct stat sb;
7146 
7147 	if (status == GOT_STATUS_UNVERSIONED)
7148 		return NULL;
7149 
7150 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7151 	if (ie == NULL)
7152 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7153 
7154 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7155 	    relpath)== -1)
7156 		return got_error_from_errno("asprintf");
7157 
7158 	switch (status) {
7159 	case GOT_STATUS_ADD:
7160 	case GOT_STATUS_MODIFY:
7161 		/* XXX could sb.st_mode be passed in by our caller? */
7162 		if (lstat(ondisk_path, &sb) == -1) {
7163 			err = got_error_from_errno2("lstat", ondisk_path);
7164 			break;
7165 		}
7166 		if (a->patch_cb) {
7167 			if (status == GOT_STATUS_ADD) {
7168 				int choice = GOT_PATCH_CHOICE_NONE;
7169 				err = (*a->patch_cb)(&choice, a->patch_arg,
7170 				    status, ie->path, NULL, 1, 1);
7171 				if (err)
7172 					break;
7173 				if (choice != GOT_PATCH_CHOICE_YES)
7174 					break;
7175 			} else {
7176 				err = create_patched_content(&path_content, 0,
7177 				    staged_blob_id ? staged_blob_id : blob_id,
7178 				    ondisk_path, dirfd, de_name, ie->path,
7179 				    a->repo, a->patch_cb, a->patch_arg);
7180 				if (err || path_content == NULL)
7181 					break;
7182 			}
7183 		}
7184 		err = got_object_blob_create(&new_staged_blob_id,
7185 		    path_content ? path_content : ondisk_path, a->repo);
7186 		if (err)
7187 			break;
7188 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7189 		    SHA1_DIGEST_LENGTH);
7190 		if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7191 			stage = GOT_FILEIDX_STAGE_ADD;
7192 		else
7193 			stage = GOT_FILEIDX_STAGE_MODIFY;
7194 		got_fileindex_entry_stage_set(ie, stage);
7195 		if (S_ISLNK(sb.st_mode)) {
7196 			int is_bad_symlink = 0;
7197 			if (!a->allow_bad_symlinks) {
7198 				char target_path[PATH_MAX];
7199 				ssize_t target_len;
7200 				target_len = readlink(ondisk_path, target_path,
7201 				    sizeof(target_path));
7202 				if (target_len == -1) {
7203 					err = got_error_from_errno2("readlink",
7204 					    ondisk_path);
7205 					break;
7206 				}
7207 				err = is_bad_symlink_target(&is_bad_symlink,
7208 				    target_path, target_len, ondisk_path,
7209 				    a->worktree->root_path);
7210 				if (err)
7211 					break;
7212 				if (is_bad_symlink) {
7213 					err = got_error_path(ondisk_path,
7214 					    GOT_ERR_BAD_SYMLINK);
7215 					break;
7216 				}
7217 			}
7218 			if (is_bad_symlink)
7219 				got_fileindex_entry_staged_filetype_set(ie,
7220 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
7221 			else
7222 				got_fileindex_entry_staged_filetype_set(ie,
7223 				    GOT_FILEIDX_MODE_SYMLINK);
7224 		} else {
7225 			got_fileindex_entry_staged_filetype_set(ie,
7226 			    GOT_FILEIDX_MODE_REGULAR_FILE);
7227 		}
7228 		a->staged_something = 1;
7229 		if (a->status_cb == NULL)
7230 			break;
7231 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7232 		    get_staged_status(ie), relpath, blob_id,
7233 		    new_staged_blob_id, NULL, dirfd, de_name);
7234 		break;
7235 	case GOT_STATUS_DELETE:
7236 		if (staged_status == GOT_STATUS_DELETE)
7237 			break;
7238 		if (a->patch_cb) {
7239 			int choice = GOT_PATCH_CHOICE_NONE;
7240 			err = (*a->patch_cb)(&choice, a->patch_arg, status,
7241 			    ie->path, NULL, 1, 1);
7242 			if (err)
7243 				break;
7244 			if (choice == GOT_PATCH_CHOICE_NO)
7245 				break;
7246 			if (choice != GOT_PATCH_CHOICE_YES) {
7247 				err = got_error(GOT_ERR_PATCH_CHOICE);
7248 				break;
7249 			}
7250 		}
7251 		stage = GOT_FILEIDX_STAGE_DELETE;
7252 		got_fileindex_entry_stage_set(ie, stage);
7253 		a->staged_something = 1;
7254 		if (a->status_cb == NULL)
7255 			break;
7256 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7257 		    get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7258 		    de_name);
7259 		break;
7260 	case GOT_STATUS_NO_CHANGE:
7261 		break;
7262 	case GOT_STATUS_CONFLICT:
7263 		err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7264 		break;
7265 	case GOT_STATUS_NONEXISTENT:
7266 		err = got_error_set_errno(ENOENT, relpath);
7267 		break;
7268 	default:
7269 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7270 		break;
7271 	}
7272 
7273 	if (path_content && unlink(path_content) == -1 && err == NULL)
7274 		err = got_error_from_errno2("unlink", path_content);
7275 	free(path_content);
7276 	free(ondisk_path);
7277 	free(new_staged_blob_id);
7278 	return err;
7279 }
7280 
7281 const struct got_error *
7282 got_worktree_stage(struct got_worktree *worktree,
7283     struct got_pathlist_head *paths,
7284     got_worktree_status_cb status_cb, void *status_arg,
7285     got_worktree_patch_cb patch_cb, void *patch_arg,
7286     int allow_bad_symlinks, struct got_repository *repo)
7287 {
7288 	const struct got_error *err = NULL, *sync_err, *unlockerr;
7289 	struct got_pathlist_entry *pe;
7290 	struct got_fileindex *fileindex = NULL;
7291 	char *fileindex_path = NULL;
7292 	struct got_reference *head_ref = NULL;
7293 	struct got_object_id *head_commit_id = NULL;
7294 	struct check_stage_ok_arg oka;
7295 	struct stage_path_arg spa;
7296 
7297 	err = lock_worktree(worktree, LOCK_EX);
7298 	if (err)
7299 		return err;
7300 
7301 	err = got_ref_open(&head_ref, repo,
7302 	    got_worktree_get_head_ref_name(worktree), 0);
7303 	if (err)
7304 		goto done;
7305 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
7306 	if (err)
7307 		goto done;
7308 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
7309 	if (err)
7310 		goto done;
7311 
7312 	/* Check pre-conditions before staging anything. */
7313 	oka.head_commit_id = head_commit_id;
7314 	oka.worktree = worktree;
7315 	oka.fileindex = fileindex;
7316 	oka.repo = repo;
7317 	oka.have_changes = 0;
7318 	TAILQ_FOREACH(pe, paths, entry) {
7319 		err = worktree_status(worktree, pe->path, fileindex, repo,
7320 		    check_stage_ok, &oka, NULL, NULL, 0, 0);
7321 		if (err)
7322 			goto done;
7323 	}
7324 	if (!oka.have_changes) {
7325 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7326 		goto done;
7327 	}
7328 
7329 	spa.worktree = worktree;
7330 	spa.fileindex = fileindex;
7331 	spa.repo = repo;
7332 	spa.patch_cb = patch_cb;
7333 	spa.patch_arg = patch_arg;
7334 	spa.status_cb = status_cb;
7335 	spa.status_arg = status_arg;
7336 	spa.staged_something = 0;
7337 	spa.allow_bad_symlinks = allow_bad_symlinks;
7338 	TAILQ_FOREACH(pe, paths, entry) {
7339 		err = worktree_status(worktree, pe->path, fileindex, repo,
7340 		    stage_path, &spa, NULL, NULL, 0, 0);
7341 		if (err)
7342 			goto done;
7343 	}
7344 	if (!spa.staged_something) {
7345 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7346 		goto done;
7347 	}
7348 
7349 	sync_err = sync_fileindex(fileindex, fileindex_path);
7350 	if (sync_err && err == NULL)
7351 		err = sync_err;
7352 done:
7353 	if (head_ref)
7354 		got_ref_close(head_ref);
7355 	free(head_commit_id);
7356 	free(fileindex_path);
7357 	if (fileindex)
7358 		got_fileindex_free(fileindex);
7359 	unlockerr = lock_worktree(worktree, LOCK_SH);
7360 	if (unlockerr && err == NULL)
7361 		err = unlockerr;
7362 	return err;
7363 }
7364 
7365 struct unstage_path_arg {
7366 	struct got_worktree *worktree;
7367 	struct got_fileindex *fileindex;
7368 	struct got_repository *repo;
7369 	got_worktree_checkout_cb progress_cb;
7370 	void *progress_arg;
7371 	got_worktree_patch_cb patch_cb;
7372 	void *patch_arg;
7373 };
7374 
7375 static const struct got_error *
7376 create_unstaged_content(char **path_unstaged_content,
7377     char **path_new_staged_content, struct got_object_id *blob_id,
7378     struct got_object_id *staged_blob_id, const char *relpath,
7379     struct got_repository *repo,
7380     got_worktree_patch_cb patch_cb, void *patch_arg)
7381 {
7382 	const struct got_error *err;
7383 	struct got_blob_object *blob = NULL, *staged_blob = NULL;
7384 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7385 	char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7386 	struct stat sb1, sb2;
7387 	struct got_diff_changes *changes = NULL;
7388 	struct got_diff_state *ds = NULL;
7389 	struct got_diff_args *args = NULL;
7390 	struct got_diff_change *change;
7391 	int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
7392 	int have_content = 0, have_rejected_content = 0;
7393 
7394 	*path_unstaged_content = NULL;
7395 	*path_new_staged_content = NULL;
7396 
7397 	err = got_object_id_str(&label1, blob_id);
7398 	if (err)
7399 		return err;
7400 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7401 	if (err)
7402 		goto done;
7403 
7404 	err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7405 	if (err)
7406 		goto done;
7407 
7408 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7409 	if (err)
7410 		goto done;
7411 
7412 	err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7413 	if (err)
7414 		goto done;
7415 
7416 	err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7417 	if (err)
7418 		goto done;
7419 
7420 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7421 	if (err)
7422 		goto done;
7423 
7424 	if (stat(path1, &sb1) == -1) {
7425 		err = got_error_from_errno2("stat", path1);
7426 		goto done;
7427 	}
7428 
7429 	if (stat(path2, &sb2) == -1) {
7430 		err = got_error_from_errno2("stat", path2);
7431 		goto done;
7432 	}
7433 
7434 	err = got_diff_files(&changes, &ds, &args, &diff_flags,
7435 	    f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
7436 	if (err)
7437 		goto done;
7438 
7439 	err = got_opentemp_named(path_unstaged_content, &outfile,
7440 	    "got-unstaged-content");
7441 	if (err)
7442 		goto done;
7443 	err = got_opentemp_named(path_new_staged_content, &rejectfile,
7444 	    "got-new-staged-content");
7445 	if (err)
7446 		goto done;
7447 
7448 	if (fseek(f1, 0L, SEEK_SET) == -1) {
7449 		err = got_ferror(f1, GOT_ERR_IO);
7450 		goto done;
7451 	}
7452 	if (fseek(f2, 0L, SEEK_SET) == -1) {
7453 		err = got_ferror(f2, GOT_ERR_IO);
7454 		goto done;
7455 	}
7456 	SIMPLEQ_FOREACH(change, &changes->entries, entry) {
7457 		int choice;
7458 		err = apply_or_reject_change(&choice, change, ++n,
7459 		    changes->nchanges, ds, args, diff_flags, relpath,
7460 		    f1, f2, &line_cur1, &line_cur2,
7461 		    outfile, rejectfile, patch_cb, patch_arg);
7462 		if (err)
7463 			goto done;
7464 		if (choice == GOT_PATCH_CHOICE_YES)
7465 			have_content = 1;
7466 		else
7467 			have_rejected_content = 1;
7468 		if (choice == GOT_PATCH_CHOICE_QUIT)
7469 			break;
7470 	}
7471 	if (have_content || have_rejected_content)
7472 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7473 		    outfile, rejectfile);
7474 done:
7475 	free(label1);
7476 	if (blob)
7477 		got_object_blob_close(blob);
7478 	if (staged_blob)
7479 		got_object_blob_close(staged_blob);
7480 	if (f1 && fclose(f1) == EOF && err == NULL)
7481 		err = got_error_from_errno2("fclose", path1);
7482 	if (f2 && fclose(f2) == EOF && err == NULL)
7483 		err = got_error_from_errno2("fclose", path2);
7484 	if (outfile && fclose(outfile) == EOF && err == NULL)
7485 		err = got_error_from_errno2("fclose", *path_unstaged_content);
7486 	if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7487 		err = got_error_from_errno2("fclose", *path_new_staged_content);
7488 	if (path1 && unlink(path1) == -1 && err == NULL)
7489 		err = got_error_from_errno2("unlink", path1);
7490 	if (path2 && unlink(path2) == -1 && err == NULL)
7491 		err = got_error_from_errno2("unlink", path2);
7492 	if (err || !have_content) {
7493 		if (*path_unstaged_content &&
7494 		    unlink(*path_unstaged_content) == -1 && err == NULL)
7495 			err = got_error_from_errno2("unlink",
7496 			    *path_unstaged_content);
7497 		free(*path_unstaged_content);
7498 		*path_unstaged_content = NULL;
7499 	}
7500 	if (err || !have_content || !have_rejected_content) {
7501 		if (*path_new_staged_content &&
7502 		    unlink(*path_new_staged_content) == -1 && err == NULL)
7503 			err = got_error_from_errno2("unlink",
7504 			    *path_new_staged_content);
7505 		free(*path_new_staged_content);
7506 		*path_new_staged_content = NULL;
7507 	}
7508 	free(args);
7509 	if (ds) {
7510 		got_diff_state_free(ds);
7511 		free(ds);
7512 	}
7513 	if (changes)
7514 		got_diff_free_changes(changes);
7515 	free(path1);
7516 	free(path2);
7517 	return err;
7518 }
7519 
7520 static const struct got_error *
7521 unstage_hunks(struct got_object_id *staged_blob_id,
7522     struct got_blob_object *blob_base,
7523     struct got_object_id *blob_id, struct got_fileindex_entry *ie,
7524     const char *ondisk_path, const char *label_orig,
7525     struct got_worktree *worktree, struct got_repository *repo,
7526     got_worktree_patch_cb patch_cb, void *patch_arg,
7527     got_worktree_checkout_cb progress_cb, void *progress_arg)
7528 {
7529 	const struct got_error *err = NULL;
7530 	char *path_unstaged_content = NULL;
7531 	char *path_new_staged_content = NULL;
7532 	struct got_object_id *new_staged_blob_id = NULL;
7533 	FILE *f = NULL;
7534 	struct stat sb;
7535 
7536 	err = create_unstaged_content(&path_unstaged_content,
7537 	    &path_new_staged_content, blob_id, staged_blob_id,
7538 	    ie->path, repo, patch_cb, patch_arg);
7539 	if (err)
7540 		return err;
7541 
7542 	if (path_unstaged_content == NULL)
7543 		return NULL;
7544 
7545 	if (path_new_staged_content) {
7546 		err = got_object_blob_create(&new_staged_blob_id,
7547 		    path_new_staged_content, repo);
7548 		if (err)
7549 			goto done;
7550 	}
7551 
7552 	f = fopen(path_unstaged_content, "r");
7553 	if (f == NULL) {
7554 		err = got_error_from_errno2("fopen",
7555 		    path_unstaged_content);
7556 		goto done;
7557 	}
7558 	if (fstat(fileno(f), &sb) == -1) {
7559 		err = got_error_from_errno2("fstat", path_unstaged_content);
7560 		goto done;
7561 	}
7562 	if (got_fileindex_entry_staged_filetype_get(ie) ==
7563 	    GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
7564 		char link_target[PATH_MAX];
7565 		size_t r;
7566 		r = fread(link_target, 1, sizeof(link_target), f);
7567 		if (r == 0 && ferror(f)) {
7568 			err = got_error_from_errno("fread");
7569 			goto done;
7570 		}
7571 		if (r >= sizeof(link_target)) { /* should not happen */
7572 			err = got_error(GOT_ERR_NO_SPACE);
7573 			goto done;
7574 		}
7575 		link_target[r] = '\0';
7576 		err = merge_symlink(worktree, blob_base,
7577 		    ondisk_path, ie->path, label_orig, link_target,
7578 		    worktree->base_commit_id, repo, progress_cb,
7579 		    progress_arg);
7580 	} else {
7581 		int local_changes_subsumed;
7582 		err = merge_file(&local_changes_subsumed, worktree,
7583 		    blob_base, ondisk_path, ie->path,
7584 		    got_fileindex_perms_to_st(ie),
7585 		    path_unstaged_content, label_orig, "unstaged",
7586 		    repo, progress_cb, progress_arg);
7587 	}
7588 	if (err)
7589 		goto done;
7590 
7591 	if (new_staged_blob_id) {
7592 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7593 		    SHA1_DIGEST_LENGTH);
7594 	} else
7595 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7596 done:
7597 	free(new_staged_blob_id);
7598 	if (path_unstaged_content &&
7599 	    unlink(path_unstaged_content) == -1 && err == NULL)
7600 		err = got_error_from_errno2("unlink", path_unstaged_content);
7601 	if (path_new_staged_content &&
7602 	    unlink(path_new_staged_content) == -1 && err == NULL)
7603 		err = got_error_from_errno2("unlink", path_new_staged_content);
7604 	if (f && fclose(f) != 0 && err == NULL)
7605 		err = got_error_from_errno2("fclose", path_unstaged_content);
7606 	free(path_unstaged_content);
7607 	free(path_new_staged_content);
7608 	return err;
7609 }
7610 
7611 static const struct got_error *
7612 unstage_path(void *arg, unsigned char status,
7613     unsigned char staged_status, const char *relpath,
7614     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7615     struct got_object_id *commit_id, int dirfd, const char *de_name)
7616 {
7617 	const struct got_error *err = NULL;
7618 	struct unstage_path_arg *a = arg;
7619 	struct got_fileindex_entry *ie;
7620 	struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7621 	char *ondisk_path = NULL;
7622 	char *id_str = NULL, *label_orig = NULL;
7623 	int local_changes_subsumed;
7624 	struct stat sb;
7625 
7626 	if (staged_status != GOT_STATUS_ADD &&
7627 	    staged_status != GOT_STATUS_MODIFY &&
7628 	    staged_status != GOT_STATUS_DELETE)
7629 		return NULL;
7630 
7631 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7632 	if (ie == NULL)
7633 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7634 
7635 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7636 	    == -1)
7637 		return got_error_from_errno("asprintf");
7638 
7639 	err = got_object_id_str(&id_str,
7640 	    commit_id ? commit_id : a->worktree->base_commit_id);
7641 	if (err)
7642 		goto done;
7643 	if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7644 	    id_str) == -1) {
7645 		err = got_error_from_errno("asprintf");
7646 		goto done;
7647 	}
7648 
7649 	switch (staged_status) {
7650 	case GOT_STATUS_MODIFY:
7651 		err = got_object_open_as_blob(&blob_base, a->repo,
7652 		    blob_id, 8192);
7653 		if (err)
7654 			break;
7655 		/* fall through */
7656 	case GOT_STATUS_ADD:
7657 		if (a->patch_cb) {
7658 			if (staged_status == GOT_STATUS_ADD) {
7659 				int choice = GOT_PATCH_CHOICE_NONE;
7660 				err = (*a->patch_cb)(&choice, a->patch_arg,
7661 				    staged_status, ie->path, NULL, 1, 1);
7662 				if (err)
7663 					break;
7664 				if (choice != GOT_PATCH_CHOICE_YES)
7665 					break;
7666 			} else {
7667 				err = unstage_hunks(staged_blob_id,
7668 				    blob_base, blob_id, ie, ondisk_path,
7669 				    label_orig, a->worktree, a->repo,
7670 				    a->patch_cb, a->patch_arg,
7671 				    a->progress_cb, a->progress_arg);
7672 				break; /* Done with this file. */
7673 			}
7674 		}
7675 		err = got_object_open_as_blob(&blob_staged, a->repo,
7676 		    staged_blob_id, 8192);
7677 		if (err)
7678 			break;
7679 		switch (got_fileindex_entry_staged_filetype_get(ie)) {
7680 		case GOT_FILEIDX_MODE_BAD_SYMLINK:
7681 		case GOT_FILEIDX_MODE_REGULAR_FILE:
7682 			err = merge_blob(&local_changes_subsumed, a->worktree,
7683 			    blob_base, ondisk_path, relpath,
7684 			    got_fileindex_perms_to_st(ie), label_orig,
7685 			    blob_staged, commit_id ? commit_id :
7686 			    a->worktree->base_commit_id, a->repo,
7687 			    a->progress_cb, a->progress_arg);
7688 			break;
7689 		case GOT_FILEIDX_MODE_SYMLINK:
7690 			if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
7691 				char *staged_target;
7692 				err = got_object_blob_read_to_str(
7693 				    &staged_target, blob_staged);
7694 				if (err)
7695 					goto done;
7696 				err = merge_symlink(a->worktree, blob_base,
7697 				    ondisk_path, relpath, label_orig,
7698 				    staged_target, commit_id ? commit_id :
7699 				    a->worktree->base_commit_id,
7700 				    a->repo, a->progress_cb, a->progress_arg);
7701 				free(staged_target);
7702 			} else {
7703 				err = merge_blob(&local_changes_subsumed,
7704 				    a->worktree, blob_base, ondisk_path,
7705 				    relpath, got_fileindex_perms_to_st(ie),
7706 				    label_orig, blob_staged,
7707 				    commit_id ? commit_id :
7708 				    a->worktree->base_commit_id, a->repo,
7709 				    a->progress_cb, a->progress_arg);
7710 			}
7711 			break;
7712 		default:
7713 			err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
7714 			break;
7715 		}
7716 		if (err == NULL)
7717 			got_fileindex_entry_stage_set(ie,
7718 			    GOT_FILEIDX_STAGE_NONE);
7719 		break;
7720 	case GOT_STATUS_DELETE:
7721 		if (a->patch_cb) {
7722 			int choice = GOT_PATCH_CHOICE_NONE;
7723 			err = (*a->patch_cb)(&choice, a->patch_arg,
7724 			    staged_status, ie->path, NULL, 1, 1);
7725 			if (err)
7726 				break;
7727 			if (choice == GOT_PATCH_CHOICE_NO)
7728 				break;
7729 			if (choice != GOT_PATCH_CHOICE_YES) {
7730 				err = got_error(GOT_ERR_PATCH_CHOICE);
7731 				break;
7732 			}
7733 		}
7734 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7735 		err = get_file_status(&status, &sb, ie, ondisk_path,
7736 		    dirfd, de_name, a->repo);
7737 		if (err)
7738 			break;
7739 		err = (*a->progress_cb)(a->progress_arg, status, relpath);
7740 		break;
7741 	}
7742 done:
7743 	free(ondisk_path);
7744 	if (blob_base)
7745 		got_object_blob_close(blob_base);
7746 	if (blob_staged)
7747 		got_object_blob_close(blob_staged);
7748 	free(id_str);
7749 	free(label_orig);
7750 	return err;
7751 }
7752 
7753 const struct got_error *
7754 got_worktree_unstage(struct got_worktree *worktree,
7755     struct got_pathlist_head *paths,
7756     got_worktree_checkout_cb progress_cb, void *progress_arg,
7757     got_worktree_patch_cb patch_cb, void *patch_arg,
7758     struct got_repository *repo)
7759 {
7760 	const struct got_error *err = NULL, *sync_err, *unlockerr;
7761 	struct got_pathlist_entry *pe;
7762 	struct got_fileindex *fileindex = NULL;
7763 	char *fileindex_path = NULL;
7764 	struct unstage_path_arg upa;
7765 
7766 	err = lock_worktree(worktree, LOCK_EX);
7767 	if (err)
7768 		return err;
7769 
7770 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
7771 	if (err)
7772 		goto done;
7773 
7774 	upa.worktree = worktree;
7775 	upa.fileindex = fileindex;
7776 	upa.repo = repo;
7777 	upa.progress_cb = progress_cb;
7778 	upa.progress_arg = progress_arg;
7779 	upa.patch_cb = patch_cb;
7780 	upa.patch_arg = patch_arg;
7781 	TAILQ_FOREACH(pe, paths, entry) {
7782 		err = worktree_status(worktree, pe->path, fileindex, repo,
7783 		    unstage_path, &upa, NULL, NULL, 0, 0);
7784 		if (err)
7785 			goto done;
7786 	}
7787 
7788 	sync_err = sync_fileindex(fileindex, fileindex_path);
7789 	if (sync_err && err == NULL)
7790 		err = sync_err;
7791 done:
7792 	free(fileindex_path);
7793 	if (fileindex)
7794 		got_fileindex_free(fileindex);
7795 	unlockerr = lock_worktree(worktree, LOCK_SH);
7796 	if (unlockerr && err == NULL)
7797 		err = unlockerr;
7798 	return err;
7799 }
7800 
7801 struct report_file_info_arg {
7802 	struct got_worktree *worktree;
7803 	got_worktree_path_info_cb info_cb;
7804 	void *info_arg;
7805 	struct got_pathlist_head *paths;
7806 	got_cancel_cb cancel_cb;
7807 	void *cancel_arg;
7808 };
7809 
7810 static const struct got_error *
7811 report_file_info(void *arg, struct got_fileindex_entry *ie)
7812 {
7813 	struct report_file_info_arg *a = arg;
7814 	struct got_pathlist_entry *pe;
7815 	struct got_object_id blob_id, staged_blob_id, commit_id;
7816 	struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
7817 	struct got_object_id *commit_idp = NULL;
7818 	int stage;
7819 
7820 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
7821 		return got_error(GOT_ERR_CANCELLED);
7822 
7823 	TAILQ_FOREACH(pe, a->paths, entry) {
7824 		if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
7825 		    got_path_is_child(ie->path, pe->path, pe->path_len))
7826 			break;
7827 	}
7828 	if (pe == NULL) /* not found */
7829 		return NULL;
7830 
7831 	if (got_fileindex_entry_has_blob(ie)) {
7832 		memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
7833 		blob_idp = &blob_id;
7834 	}
7835 	stage = got_fileindex_entry_stage_get(ie);
7836 	if (stage == GOT_FILEIDX_STAGE_MODIFY ||
7837 	    stage == GOT_FILEIDX_STAGE_ADD) {
7838 		memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
7839 		    SHA1_DIGEST_LENGTH);
7840 		staged_blob_idp = &staged_blob_id;
7841 	}
7842 
7843 	if (got_fileindex_entry_has_commit(ie)) {
7844 		memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
7845 		commit_idp = &commit_id;
7846 	}
7847 
7848 	return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
7849 	    (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
7850 }
7851 
7852 const struct got_error *
7853 got_worktree_path_info(struct got_worktree *worktree,
7854     struct got_pathlist_head *paths,
7855     got_worktree_path_info_cb info_cb, void *info_arg,
7856     got_cancel_cb cancel_cb, void *cancel_arg)
7857 
7858 {
7859 	const struct got_error *err = NULL, *unlockerr;
7860 	struct got_fileindex *fileindex = NULL;
7861 	char *fileindex_path = NULL;
7862 	struct report_file_info_arg arg;
7863 
7864 	err = lock_worktree(worktree, LOCK_SH);
7865 	if (err)
7866 		return err;
7867 
7868 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
7869 	if (err)
7870 		goto done;
7871 
7872 	arg.worktree = worktree;
7873 	arg.info_cb = info_cb;
7874 	arg.info_arg = info_arg;
7875 	arg.paths = paths;
7876 	arg.cancel_cb = cancel_cb;
7877 	arg.cancel_arg = cancel_arg;
7878 	err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
7879 	    &arg);
7880 done:
7881 	free(fileindex_path);
7882 	if (fileindex)
7883 		got_fileindex_free(fileindex);
7884 	unlockerr = lock_worktree(worktree, LOCK_UN);
7885 	if (unlockerr && err == NULL)
7886 		err = unlockerr;
7887 	return err;
7888 }