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 (fchmod(fileno(f), GOT_DEFAULT_FILE_MODE) == -1) {
972 		err = got_error_from_errno2("fchmod", path);
973 		goto done;
974 	}
975 
976 	if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
977 	    GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
978 	    deriv_target ? deriv_target : "(symlink was deleted)",
979 	    orig_target ? label_orig : "",
980 	    orig_target ? "\n" : "",
981 	    orig_target ? orig_target : "",
982 	    orig_target ? "\n" : "",
983 	    GOT_DIFF_CONFLICT_MARKER_SEP,
984 	    local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
985 		err = got_error_from_errno2("fprintf", path);
986 		goto done;
987 	}
988 
989 	if (unlink(ondisk_path) == -1) {
990 		err = got_error_from_errno2("unlink", ondisk_path);
991 		goto done;
992 	}
993 	if (rename(path, ondisk_path) == -1) {
994 		err = got_error_from_errno3("rename", path, ondisk_path);
995 		goto done;
996 	}
997 done:
998 	if (f != NULL && fclose(f) == EOF && err == NULL)
999 		err = got_error_from_errno2("fclose", path);
1000 	free(path);
1001 	free(id_str);
1002 	free(label_deriv);
1003 	return err;
1004 }
1005 
1006 /* forward declaration */
1007 static const struct got_error *
1008 merge_blob(int *, struct got_worktree *, struct got_blob_object *,
1009     const char *, const char *, uint16_t, const char *,
1010     struct got_blob_object *, struct got_object_id *,
1011     struct got_repository *, got_worktree_checkout_cb, void *);
1012 
1013 /*
1014  * Merge a symlink into the work tree, where blob_orig acts as the common
1015  * ancestor, deriv_target is the link target of the first derived version,
1016  * and the symlink on disk acts as the second derived version.
1017  * Assume that contents of both blobs represent symlinks.
1018  */
1019 static const struct got_error *
1020 merge_symlink(struct got_worktree *worktree,
1021     struct got_blob_object *blob_orig, const char *ondisk_path,
1022     const char *path, const char *label_orig, const char *deriv_target,
1023     struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1024     got_worktree_checkout_cb progress_cb, void *progress_arg)
1025 {
1026 	const struct got_error *err = NULL;
1027 	char *ancestor_target = NULL;
1028 	struct stat sb;
1029 	ssize_t ondisk_len, deriv_len;
1030 	char ondisk_target[PATH_MAX];
1031 	int have_local_change = 0;
1032 	int have_incoming_change = 0;
1033 
1034 	if (lstat(ondisk_path, &sb) == -1)
1035 		return got_error_from_errno2("lstat", ondisk_path);
1036 
1037 	ondisk_len = readlink(ondisk_path, ondisk_target,
1038 	    sizeof(ondisk_target));
1039 	if (ondisk_len == -1) {
1040 		err = got_error_from_errno2("readlink",
1041 		    ondisk_path);
1042 		goto done;
1043 	}
1044 	ondisk_target[ondisk_len] = '\0';
1045 
1046 	if (blob_orig) {
1047 		err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
1048 		if (err)
1049 			goto done;
1050 	}
1051 
1052 	if (ancestor_target == NULL ||
1053 	    (ondisk_len != strlen(ancestor_target) ||
1054 	    memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
1055 		have_local_change = 1;
1056 
1057 	deriv_len = strlen(deriv_target);
1058 	if (ancestor_target == NULL ||
1059 	    (deriv_len != strlen(ancestor_target) ||
1060 	    memcmp(deriv_target, ancestor_target, deriv_len) != 0))
1061 		have_incoming_change = 1;
1062 
1063 	if (!have_local_change && !have_incoming_change) {
1064 		if (ancestor_target) {
1065 			/* Both sides made the same change. */
1066 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1067 			    path);
1068 		} else if (deriv_len == ondisk_len &&
1069 		    memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
1070 			/* Both sides added the same symlink. */
1071 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1072 			    path);
1073 		} else {
1074 			/* Both sides added symlinks which don't match. */
1075 			err = install_symlink_conflict(deriv_target,
1076 			    deriv_base_commit_id, ancestor_target,
1077 			    label_orig, ondisk_target, ondisk_path);
1078 			if (err)
1079 				goto done;
1080 			err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1081 			    path);
1082 		}
1083 	} else if (!have_local_change && have_incoming_change) {
1084 		/* Apply the incoming change. */
1085 		err = update_symlink(ondisk_path, deriv_target,
1086 		    strlen(deriv_target));
1087 		if (err)
1088 			goto done;
1089 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1090 	} else if (have_local_change && have_incoming_change) {
1091 		if (deriv_len == ondisk_len &&
1092 		    memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
1093 			/* Both sides made the same change. */
1094 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1095 			    path);
1096 		} else {
1097 			err = install_symlink_conflict(deriv_target,
1098 			    deriv_base_commit_id, ancestor_target, label_orig,
1099 			    ondisk_target, ondisk_path);
1100 			if (err)
1101 				goto done;
1102 			err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1103 			    path);
1104 		}
1105 	}
1106 
1107 done:
1108 	free(ancestor_target);
1109 	return err;
1110 }
1111 
1112 /*
1113  * Perform a 3-way merge where blob_orig acts as the common ancestor,
1114  * blob_deriv acts as the first derived version, and the file on disk
1115  * acts as the second derived version.
1116  */
1117 static const struct got_error *
1118 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
1119     struct got_blob_object *blob_orig, const char *ondisk_path,
1120     const char *path, uint16_t st_mode, const char *label_orig,
1121     struct got_blob_object *blob_deriv,
1122     struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1123     got_worktree_checkout_cb progress_cb, void *progress_arg)
1124 {
1125 	const struct got_error *err = NULL;
1126 	FILE *f_deriv = NULL;
1127 	char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
1128 	char *label_deriv = NULL, *parent = NULL;
1129 
1130 	*local_changes_subsumed = 0;
1131 
1132 	err = got_path_dirname(&parent, ondisk_path);
1133 	if (err)
1134 		return err;
1135 
1136 	free(base_path);
1137 	if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1138 		err = got_error_from_errno("asprintf");
1139 		base_path = NULL;
1140 		goto done;
1141 	}
1142 
1143 	err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1144 	if (err)
1145 		goto done;
1146 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1147 	    blob_deriv);
1148 	if (err)
1149 		goto done;
1150 
1151 	err = got_object_id_str(&id_str, deriv_base_commit_id);
1152 	if (err)
1153 		goto done;
1154 	if (asprintf(&label_deriv, "%s: commit %s",
1155 	    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1156 		err = got_error_from_errno("asprintf");
1157 		goto done;
1158 	}
1159 
1160 	err = merge_file(local_changes_subsumed, worktree, blob_orig,
1161 	    ondisk_path, path, st_mode, blob_deriv_path, label_orig,
1162 	    label_deriv, repo, progress_cb, progress_arg);
1163 done:
1164 	if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
1165 		err = got_error_from_errno("fclose");
1166 	free(base_path);
1167 	if (blob_deriv_path) {
1168 		unlink(blob_deriv_path);
1169 		free(blob_deriv_path);
1170 	}
1171 	free(id_str);
1172 	free(label_deriv);
1173 	free(parent);
1174 	return err;
1175 }
1176 
1177 static const struct got_error *
1178 create_fileindex_entry(struct got_fileindex_entry **new_iep,
1179     struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1180     const char *ondisk_path, const char *path, struct got_object_id *blob_id)
1181 {
1182 	const struct got_error *err = NULL;
1183 	struct got_fileindex_entry *new_ie;
1184 
1185 	*new_iep = NULL;
1186 
1187 	err = got_fileindex_entry_alloc(&new_ie, path);
1188 	if (err)
1189 		return err;
1190 
1191 	err = got_fileindex_entry_update(new_ie, ondisk_path,
1192 	    blob_id->sha1, base_commit_id->sha1, 1);
1193 	if (err)
1194 		goto done;
1195 
1196 	err = got_fileindex_entry_add(fileindex, new_ie);
1197 done:
1198 	if (err)
1199 		got_fileindex_entry_free(new_ie);
1200 	else
1201 		*new_iep = new_ie;
1202 	return err;
1203 }
1204 
1205 static mode_t
1206 get_ondisk_perms(int executable, mode_t st_mode)
1207 {
1208 	mode_t xbits = S_IXUSR;
1209 
1210 	if (executable) {
1211 		/* Map read bits to execute bits. */
1212 		if (st_mode & S_IRGRP)
1213 			xbits |= S_IXGRP;
1214 		if (st_mode & S_IROTH)
1215 			xbits |= S_IXOTH;
1216 		return st_mode | xbits;
1217 	}
1218 
1219 	return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1220 }
1221 
1222 /* forward declaration */
1223 static const struct got_error *
1224 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1225     const char *path, mode_t te_mode, mode_t st_mode,
1226     struct got_blob_object *blob, int restoring_missing_file,
1227     int reverting_versioned_file, int installing_bad_symlink,
1228     int path_is_unversioned, struct got_repository *repo,
1229     got_worktree_checkout_cb progress_cb, void *progress_arg);
1230 
1231 /*
1232  * This function assumes that the provided symlink target points at a
1233  * safe location in the work tree!
1234  */
1235 static const struct got_error *
1236 replace_existing_symlink(const char *ondisk_path, const char *target_path,
1237     size_t target_len)
1238 {
1239 	const struct got_error *err = NULL;
1240 	ssize_t elen;
1241 	char etarget[PATH_MAX];
1242 	int fd;
1243 
1244 	/*
1245 	 * "Bad" symlinks (those pointing outside the work tree or into the
1246 	 * .got directory) are installed in the work tree as a regular file
1247 	 * which contains the bad symlink target path.
1248 	 * The new symlink target has already been checked for safety by our
1249 	 * caller. If we can successfully open a regular file then we simply
1250 	 * replace this file with a symlink below.
1251 	 */
1252 	fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
1253 	if (fd == -1) {
1254 		if (errno != ELOOP)
1255 			return got_error_from_errno2("open", ondisk_path);
1256 
1257 		/* We are updating an existing on-disk symlink. */
1258 		elen = readlink(ondisk_path, etarget, sizeof(etarget));
1259 		if (elen == -1)
1260 			return got_error_from_errno2("readlink", ondisk_path);
1261 
1262 		if (elen == target_len &&
1263 		    memcmp(etarget, target_path, target_len) == 0)
1264 			return NULL; /* nothing to do */
1265 	}
1266 
1267 	err = update_symlink(ondisk_path, target_path, target_len);
1268 	if (fd != -1 && close(fd) == -1 && err == NULL)
1269 		err = got_error_from_errno2("close", ondisk_path);
1270 	return err;
1271 }
1272 
1273 static const struct got_error *
1274 is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1275     size_t target_len, const char *ondisk_path, const char *wtroot_path)
1276 {
1277 	const struct got_error *err = NULL;
1278 	char canonpath[PATH_MAX];
1279 	char *path_got = NULL;
1280 
1281 	*is_bad_symlink = 0;
1282 
1283 	if (target_len >= sizeof(canonpath)) {
1284 		*is_bad_symlink = 1;
1285 		return NULL;
1286 	}
1287 
1288 	/*
1289 	 * We do not use realpath(3) to resolve the symlink's target
1290 	 * path because we don't want to resolve symlinks recursively.
1291 	 * Instead we make the path absolute and then canonicalize it.
1292 	 * Relative symlink target lookup should begin at the directory
1293 	 * in which the blob object is being installed.
1294 	 */
1295 	if (!got_path_is_absolute(target_path)) {
1296 		char *abspath, *parent;
1297 		err = got_path_dirname(&parent, ondisk_path);
1298 		if (err)
1299 			return err;
1300 		if (asprintf(&abspath, "%s/%s",  parent, target_path) == -1) {
1301 			free(parent);
1302 			return got_error_from_errno("asprintf");
1303 		}
1304 		free(parent);
1305 		if (strlen(abspath) >= sizeof(canonpath)) {
1306 			err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1307 			free(abspath);
1308 			return err;
1309 		}
1310 		err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1311 		free(abspath);
1312 		if (err)
1313 			return err;
1314 	} else {
1315 		err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1316 		if (err)
1317 			return err;
1318 	}
1319 
1320 	/* Only allow symlinks pointing at paths within the work tree. */
1321 	if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1322 		*is_bad_symlink = 1;
1323 		return NULL;
1324 	}
1325 
1326 	/* Do not allow symlinks pointing into the .got directory. */
1327 	if (asprintf(&path_got, "%s/%s", wtroot_path,
1328 	    GOT_WORKTREE_GOT_DIR) == -1)
1329 		return got_error_from_errno("asprintf");
1330 	if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1331 		*is_bad_symlink = 1;
1332 
1333 	free(path_got);
1334 	return NULL;
1335 }
1336 
1337 static const struct got_error *
1338 install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1339     const char *ondisk_path, const char *path, struct got_blob_object *blob,
1340     int restoring_missing_file, int reverting_versioned_file,
1341     int path_is_unversioned, struct got_repository *repo,
1342     got_worktree_checkout_cb progress_cb, void *progress_arg)
1343 {
1344 	const struct got_error *err = NULL;
1345 	char target_path[PATH_MAX];
1346 	size_t len, target_len = 0;
1347 	char *path_got = NULL;
1348 	const uint8_t *buf = got_object_blob_get_read_buf(blob);
1349 	size_t hdrlen = got_object_blob_get_hdrlen(blob);
1350 
1351 	*is_bad_symlink = 0;
1352 
1353 	/* 
1354 	 * Blob object content specifies the target path of the link.
1355 	 * If a symbolic link cannot be installed we instead create
1356 	 * a regular file which contains the link target path stored
1357 	 * in the blob object.
1358 	 */
1359 	do {
1360 		err = got_object_blob_read_block(&len, blob);
1361 		if (len + target_len >= sizeof(target_path)) {
1362 			/* Path too long; install as a regular file. */
1363 			*is_bad_symlink = 1;
1364 			got_object_blob_rewind(blob);
1365 			return install_blob(worktree, ondisk_path, path,
1366 			    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1367 			    restoring_missing_file, reverting_versioned_file,
1368 			    1, path_is_unversioned, repo, progress_cb,
1369 			    progress_arg);
1370 		}
1371 		if (len > 0) {
1372 			/* Skip blob object header first time around. */
1373 			memcpy(target_path + target_len, buf + hdrlen,
1374 			    len - hdrlen);
1375 			target_len += len - hdrlen;
1376 			hdrlen = 0;
1377 		}
1378 	} while (len != 0);
1379 	target_path[target_len] = '\0';
1380 
1381 	err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1382 	    ondisk_path, worktree->root_path);
1383 	if (err)
1384 		return err;
1385 
1386 	if (*is_bad_symlink) {
1387 		/* install as a regular file */
1388 		*is_bad_symlink = 1;
1389 		got_object_blob_rewind(blob);
1390 		err = install_blob(worktree, ondisk_path, path,
1391 		    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1392 		    restoring_missing_file, reverting_versioned_file, 1,
1393 		    path_is_unversioned, repo, progress_cb, progress_arg);
1394 		goto done;
1395 	}
1396 
1397 	if (symlink(target_path, ondisk_path) == -1) {
1398 		if (errno == EEXIST) {
1399 			if (path_is_unversioned) {
1400 				err = (*progress_cb)(progress_arg,
1401 				    GOT_STATUS_UNVERSIONED, path);
1402 				goto done;
1403 			}
1404 			err = replace_existing_symlink(ondisk_path,
1405 			    target_path, target_len);
1406 			if (err)
1407 				goto done;
1408 			if (progress_cb) {
1409 				err = (*progress_cb)(progress_arg,
1410 				    reverting_versioned_file ?
1411 				    GOT_STATUS_REVERT : GOT_STATUS_UPDATE,
1412 				    path);
1413 			}
1414 			goto done; /* Nothing else to do. */
1415 		}
1416 
1417 		if (errno == ENOENT) {
1418 			char *parent;
1419 			err = got_path_dirname(&parent, ondisk_path);
1420 			if (err)
1421 				goto done;
1422 			err = add_dir_on_disk(worktree, parent);
1423 			free(parent);
1424 			if (err)
1425 				goto done;
1426 			/*
1427 			 * Retry, and fall through to error handling
1428 			 * below if this second attempt fails.
1429 			 */
1430 			if (symlink(target_path, ondisk_path) != -1) {
1431 				err = NULL; /* success */
1432 				goto done;
1433 			}
1434 		}
1435 
1436 		/* Handle errors from first or second creation attempt. */
1437 		if (errno == ENAMETOOLONG) {
1438 			/* bad target path; install as a regular file */
1439 			*is_bad_symlink = 1;
1440 			got_object_blob_rewind(blob);
1441 			err = install_blob(worktree, ondisk_path, path,
1442 			    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1443 			    restoring_missing_file, reverting_versioned_file, 1,
1444 			    path_is_unversioned, repo,
1445 			    progress_cb, progress_arg);
1446 		} else if (errno == ENOTDIR) {
1447 			err = got_error_path(ondisk_path,
1448 			    GOT_ERR_FILE_OBSTRUCTED);
1449 		} else {
1450 			err = got_error_from_errno3("symlink",
1451 			    target_path, ondisk_path);
1452 		}
1453 	} else if (progress_cb)
1454 		err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1455 		    GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1456 done:
1457 	free(path_got);
1458 	return err;
1459 }
1460 
1461 static const struct got_error *
1462 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1463     const char *path, mode_t te_mode, mode_t st_mode,
1464     struct got_blob_object *blob, int restoring_missing_file,
1465     int reverting_versioned_file, int installing_bad_symlink,
1466     int path_is_unversioned, struct got_repository *repo,
1467     got_worktree_checkout_cb progress_cb, void *progress_arg)
1468 {
1469 	const struct got_error *err = NULL;
1470 	int fd = -1;
1471 	size_t len, hdrlen;
1472 	int update = 0;
1473 	char *tmppath = NULL;
1474 
1475 	fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1476 	    GOT_DEFAULT_FILE_MODE);
1477 	if (fd == -1) {
1478 		if (errno == ENOENT) {
1479 			char *parent;
1480 			err = got_path_dirname(&parent, path);
1481 			if (err)
1482 				return err;
1483 			err = add_dir_on_disk(worktree, parent);
1484 			free(parent);
1485 			if (err)
1486 				return err;
1487 			fd = open(ondisk_path,
1488 			    O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1489 			    GOT_DEFAULT_FILE_MODE);
1490 			if (fd == -1)
1491 				return got_error_from_errno2("open",
1492 				    ondisk_path);
1493 		} else if (errno == EEXIST) {
1494 			if (path_is_unversioned) {
1495 				err = (*progress_cb)(progress_arg,
1496 				    GOT_STATUS_UNVERSIONED, path);
1497 				goto done;
1498 			}
1499 			if (!S_ISREG(st_mode) && !installing_bad_symlink) {
1500 				/* TODO file is obstructed; do something */
1501 				err = got_error_path(ondisk_path,
1502 				    GOT_ERR_FILE_OBSTRUCTED);
1503 				goto done;
1504 			} else {
1505 				err = got_opentemp_named_fd(&tmppath, &fd,
1506 				    ondisk_path);
1507 				if (err)
1508 					goto done;
1509 				update = 1;
1510 			}
1511 		} else
1512 			return got_error_from_errno2("open", ondisk_path);
1513 	}
1514 
1515 	if (fchmod(fd, get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1516 		err = got_error_from_errno2("fchmod",
1517 		    update ? tmppath : ondisk_path);
1518 		goto done;
1519 	}
1520 
1521 	if (progress_cb) {
1522 		if (restoring_missing_file)
1523 			err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1524 			    path);
1525 		else if (reverting_versioned_file)
1526 			err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1527 			    path);
1528 		else
1529 			err = (*progress_cb)(progress_arg,
1530 			    update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1531 		if (err)
1532 			goto done;
1533 	}
1534 
1535 	hdrlen = got_object_blob_get_hdrlen(blob);
1536 	do {
1537 		const uint8_t *buf = got_object_blob_get_read_buf(blob);
1538 		err = got_object_blob_read_block(&len, blob);
1539 		if (err)
1540 			break;
1541 		if (len > 0) {
1542 			/* Skip blob object header first time around. */
1543 			ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1544 			if (outlen == -1) {
1545 				err = got_error_from_errno("write");
1546 				goto done;
1547 			} else if (outlen != len - hdrlen) {
1548 				err = got_error(GOT_ERR_IO);
1549 				goto done;
1550 			}
1551 			hdrlen = 0;
1552 		}
1553 	} while (len != 0);
1554 
1555 	if (fsync(fd) != 0) {
1556 		err = got_error_from_errno("fsync");
1557 		goto done;
1558 	}
1559 
1560 	if (update) {
1561 		if (rename(tmppath, ondisk_path) != 0) {
1562 			err = got_error_from_errno3("rename", tmppath,
1563 			    ondisk_path);
1564 			unlink(tmppath);
1565 			goto done;
1566 		}
1567 	}
1568 
1569 done:
1570 	if (fd != -1 && close(fd) != 0 && err == NULL)
1571 		err = got_error_from_errno("close");
1572 	free(tmppath);
1573 	return err;
1574 }
1575 
1576 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1577 static const struct got_error *
1578 get_modified_file_content_status(unsigned char *status, FILE *f)
1579 {
1580 	const struct got_error *err = NULL;
1581 	const char *markers[3] = {
1582 		GOT_DIFF_CONFLICT_MARKER_BEGIN,
1583 		GOT_DIFF_CONFLICT_MARKER_SEP,
1584 		GOT_DIFF_CONFLICT_MARKER_END
1585 	};
1586 	int i = 0;
1587 	char *line;
1588 	size_t len;
1589 	const char delim[3] = {'\0', '\0', '\0'};
1590 
1591 	while (*status == GOT_STATUS_MODIFY) {
1592 		line = fparseln(f, &len, NULL, delim, 0);
1593 		if (line == NULL) {
1594 			if (feof(f))
1595 				break;
1596 			err = got_ferror(f, GOT_ERR_IO);
1597 			break;
1598 		}
1599 
1600 		if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1601 			if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1602 			    == 0)
1603 				*status = GOT_STATUS_CONFLICT;
1604 			else
1605 				i++;
1606 		}
1607 	}
1608 
1609 	return err;
1610 }
1611 
1612 static int
1613 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1614 {
1615 	mode_t ie_mode = got_fileindex_perms_to_st(ie);
1616 	return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1617 }
1618 
1619 static int
1620 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1621 {
1622 	return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1623 	    ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1624 	    ie->mtime_sec == sb->st_mtim.tv_sec &&
1625 	    ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1626 	    ie->size == (sb->st_size & 0xffffffff) &&
1627 	    !xbit_differs(ie, sb->st_mode));
1628 }
1629 
1630 static unsigned char
1631 get_staged_status(struct got_fileindex_entry *ie)
1632 {
1633 	switch (got_fileindex_entry_stage_get(ie)) {
1634 	case GOT_FILEIDX_STAGE_ADD:
1635 		return GOT_STATUS_ADD;
1636 	case GOT_FILEIDX_STAGE_DELETE:
1637 		return GOT_STATUS_DELETE;
1638 	case GOT_FILEIDX_STAGE_MODIFY:
1639 		return GOT_STATUS_MODIFY;
1640 	default:
1641 		return GOT_STATUS_NO_CHANGE;
1642 	}
1643 }
1644 
1645 static const struct got_error *
1646 get_symlink_modification_status(unsigned char *status,
1647     struct got_fileindex_entry *ie, const char *abspath,
1648     int dirfd, const char *de_name, struct got_blob_object *blob)
1649 {
1650 	const struct got_error *err = NULL;
1651 	char target_path[PATH_MAX];
1652 	char etarget[PATH_MAX];
1653 	ssize_t elen;
1654 	size_t len, target_len = 0;
1655 	const uint8_t *buf = got_object_blob_get_read_buf(blob);
1656 	size_t hdrlen = got_object_blob_get_hdrlen(blob);
1657 
1658 	*status = GOT_STATUS_NO_CHANGE;
1659 
1660 	/* Blob object content specifies the target path of the link. */
1661 	do {
1662 		err = got_object_blob_read_block(&len, blob);
1663 		if (err)
1664 			return err;
1665 		if (len + target_len >= sizeof(target_path)) {
1666 			/*
1667 			 * Should not happen. The blob contents were OK
1668 			 * when this symlink was installed.
1669 			 */
1670 			return got_error(GOT_ERR_NO_SPACE);
1671 		}
1672 		if (len > 0) {
1673 			/* Skip blob object header first time around. */
1674 			memcpy(target_path + target_len, buf + hdrlen,
1675 			    len - hdrlen);
1676 			target_len += len - hdrlen;
1677 			hdrlen = 0;
1678 		}
1679 	} while (len != 0);
1680 	target_path[target_len] = '\0';
1681 
1682 	if (dirfd != -1) {
1683 		elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1684 		if (elen == -1)
1685 			return got_error_from_errno2("readlinkat", abspath);
1686 	} else {
1687 		elen = readlink(abspath, etarget, sizeof(etarget));
1688 		if (elen == -1)
1689 			return got_error_from_errno2("readlink", abspath);
1690 	}
1691 
1692 	if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1693 		*status = GOT_STATUS_MODIFY;
1694 
1695 	return NULL;
1696 }
1697 
1698 static const struct got_error *
1699 get_file_status(unsigned char *status, struct stat *sb,
1700     struct got_fileindex_entry *ie, const char *abspath,
1701     int dirfd, const char *de_name, struct got_repository *repo)
1702 {
1703 	const struct got_error *err = NULL;
1704 	struct got_object_id id;
1705 	size_t hdrlen;
1706 	int fd = -1;
1707 	FILE *f = NULL;
1708 	uint8_t fbuf[8192];
1709 	struct got_blob_object *blob = NULL;
1710 	size_t flen, blen;
1711 	unsigned char staged_status = get_staged_status(ie);
1712 
1713 	*status = GOT_STATUS_NO_CHANGE;
1714 
1715 	/*
1716 	 * Whenever the caller provides a directory descriptor and a
1717 	 * directory entry name for the file, use them! This prevents
1718 	 * race conditions if filesystem paths change beneath our feet.
1719 	 */
1720 	if (dirfd != -1) {
1721 		if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1722 			if (errno == ENOENT) {
1723 				if (got_fileindex_entry_has_file_on_disk(ie))
1724 					*status = GOT_STATUS_MISSING;
1725 				else
1726 					*status = GOT_STATUS_DELETE;
1727 				goto done;
1728 			}
1729 			err = got_error_from_errno2("fstatat", abspath);
1730 			goto done;
1731 		}
1732 	} else {
1733 		fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1734 		if (fd == -1 && errno != ENOENT && errno != ELOOP)
1735 			return got_error_from_errno2("open", abspath);
1736 		else if (fd == -1 && errno == ELOOP) {
1737 			if (lstat(abspath, sb) == -1)
1738 				return got_error_from_errno2("lstat", abspath);
1739 		} else if (fd == -1 || fstat(fd, sb) == -1) {
1740 			if (errno == ENOENT) {
1741 				if (got_fileindex_entry_has_file_on_disk(ie))
1742 					*status = GOT_STATUS_MISSING;
1743 				else
1744 					*status = GOT_STATUS_DELETE;
1745 				goto done;
1746 			}
1747 			err = got_error_from_errno2("fstat", abspath);
1748 			goto done;
1749 		}
1750 	}
1751 
1752 	if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1753 		*status = GOT_STATUS_OBSTRUCTED;
1754 		goto done;
1755 	}
1756 
1757 	if (!got_fileindex_entry_has_file_on_disk(ie)) {
1758 		*status = GOT_STATUS_DELETE;
1759 		goto done;
1760 	} else if (!got_fileindex_entry_has_blob(ie) &&
1761 	    staged_status != GOT_STATUS_ADD) {
1762 		*status = GOT_STATUS_ADD;
1763 		goto done;
1764 	}
1765 
1766 	if (!stat_info_differs(ie, sb))
1767 		goto done;
1768 
1769 	if (S_ISLNK(sb->st_mode) &&
1770 	    got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1771 		*status = GOT_STATUS_MODIFY;
1772 		goto done;
1773 	}
1774 
1775 	if (staged_status == GOT_STATUS_MODIFY ||
1776 	    staged_status == GOT_STATUS_ADD)
1777 		memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1778 	else
1779 		memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1780 
1781 	err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1782 	if (err)
1783 		goto done;
1784 
1785 	if (S_ISLNK(sb->st_mode)) {
1786 		err = get_symlink_modification_status(status, ie,
1787 		    abspath, dirfd, de_name, blob);
1788 		goto done;
1789 	}
1790 
1791 	if (dirfd != -1) {
1792 		fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1793 		if (fd == -1) {
1794 			err = got_error_from_errno2("openat", abspath);
1795 			goto done;
1796 		}
1797 	}
1798 
1799 	f = fdopen(fd, "r");
1800 	if (f == NULL) {
1801 		err = got_error_from_errno2("fdopen", abspath);
1802 		goto done;
1803 	}
1804 	fd = -1;
1805 	hdrlen = got_object_blob_get_hdrlen(blob);
1806 	for (;;) {
1807 		const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1808 		err = got_object_blob_read_block(&blen, blob);
1809 		if (err)
1810 			goto done;
1811 		/* Skip length of blob object header first time around. */
1812 		flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1813 		if (flen == 0 && ferror(f)) {
1814 			err = got_error_from_errno("fread");
1815 			goto done;
1816 		}
1817 		if (blen - hdrlen == 0) {
1818 			if (flen != 0)
1819 				*status = GOT_STATUS_MODIFY;
1820 			break;
1821 		} else if (flen == 0) {
1822 			if (blen - hdrlen != 0)
1823 				*status = GOT_STATUS_MODIFY;
1824 			break;
1825 		} else if (blen - hdrlen == flen) {
1826 			/* Skip blob object header first time around. */
1827 			if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1828 				*status = GOT_STATUS_MODIFY;
1829 				break;
1830 			}
1831 		} else {
1832 			*status = GOT_STATUS_MODIFY;
1833 			break;
1834 		}
1835 		hdrlen = 0;
1836 	}
1837 
1838 	if (*status == GOT_STATUS_MODIFY) {
1839 		rewind(f);
1840 		err = get_modified_file_content_status(status, f);
1841 	} else if (xbit_differs(ie, sb->st_mode))
1842 		*status = GOT_STATUS_MODE_CHANGE;
1843 done:
1844 	if (blob)
1845 		got_object_blob_close(blob);
1846 	if (f != NULL && fclose(f) == EOF && err == NULL)
1847 		err = got_error_from_errno2("fclose", abspath);
1848 	if (fd != -1 && close(fd) == -1 && err == NULL)
1849 		err = got_error_from_errno2("close", abspath);
1850 	return err;
1851 }
1852 
1853 /*
1854  * Update timestamps in the file index if a file is unmodified and
1855  * we had to run a full content comparison to find out.
1856  */
1857 static const struct got_error *
1858 sync_timestamps(char *ondisk_path, unsigned char status,
1859     struct got_fileindex_entry *ie, struct stat *sb)
1860 {
1861 	if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1862 		return got_fileindex_entry_update(ie, ondisk_path,
1863 		    ie->blob_sha1, ie->commit_sha1, 1);
1864 
1865 	return NULL;
1866 }
1867 
1868 static const struct got_error *
1869 update_blob(struct got_worktree *worktree,
1870     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1871     struct got_tree_entry *te, const char *path,
1872     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1873     void *progress_arg)
1874 {
1875 	const struct got_error *err = NULL;
1876 	struct got_blob_object *blob = NULL;
1877 	char *ondisk_path;
1878 	unsigned char status = GOT_STATUS_NO_CHANGE;
1879 	struct stat sb;
1880 
1881 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1882 		return got_error_from_errno("asprintf");
1883 
1884 	if (ie) {
1885 		if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1886 			err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1887 			goto done;
1888 		}
1889 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1890 		    repo);
1891 		if (err)
1892 			goto done;
1893 		if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1894 			sb.st_mode = got_fileindex_perms_to_st(ie);
1895 	} else {
1896 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
1897 		status = GOT_STATUS_UNVERSIONED;
1898 	}
1899 
1900 	if (status == GOT_STATUS_OBSTRUCTED) {
1901 		err = (*progress_cb)(progress_arg, status, path);
1902 		goto done;
1903 	}
1904 	if (status == GOT_STATUS_CONFLICT) {
1905 		err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1906 		    path);
1907 		goto done;
1908 	}
1909 
1910 	if (ie && status != GOT_STATUS_MISSING &&
1911 	    (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1912 		if (got_fileindex_entry_has_commit(ie) &&
1913 		    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1914 		    SHA1_DIGEST_LENGTH) == 0) {
1915 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1916 			if (err)
1917 				goto done;
1918 			err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1919 			    path);
1920 			goto done;
1921 		}
1922 		if (got_fileindex_entry_has_blob(ie) &&
1923 		    memcmp(ie->blob_sha1, te->id.sha1,
1924 		    SHA1_DIGEST_LENGTH) == 0) {
1925 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1926 			goto done;
1927 		}
1928 	}
1929 
1930 	err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1931 	if (err)
1932 		goto done;
1933 
1934 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1935 		int update_timestamps;
1936 		struct got_blob_object *blob2 = NULL;
1937 		char *label_orig = NULL;
1938 		if (got_fileindex_entry_has_blob(ie)) {
1939 			struct got_object_id id2;
1940 			memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1941 			err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1942 			if (err)
1943 				goto done;
1944 		}
1945 		if (got_fileindex_entry_has_commit(ie)) {
1946 			char id_str[SHA1_DIGEST_STRING_LENGTH];
1947 			if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1948 			    sizeof(id_str)) == NULL) {
1949 				err = got_error_path(id_str,
1950 				    GOT_ERR_BAD_OBJ_ID_STR);
1951 				goto done;
1952 			}
1953 			if (asprintf(&label_orig, "%s: commit %s",
1954 			    GOT_MERGE_LABEL_BASE, id_str) == -1) {
1955 				err = got_error_from_errno("asprintf");
1956 				goto done;
1957 			}
1958 		}
1959 		if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1960 			char *link_target;
1961 			err = got_object_blob_read_to_str(&link_target, blob);
1962 			if (err)
1963 				goto done;
1964 			err = merge_symlink(worktree, blob2, ondisk_path, path,
1965 			    label_orig, link_target, worktree->base_commit_id,
1966 			    repo, progress_cb, progress_arg);
1967 			free(link_target);
1968 		} else {
1969 			err = merge_blob(&update_timestamps, worktree, blob2,
1970 			    ondisk_path, path, sb.st_mode, label_orig, blob,
1971 			    worktree->base_commit_id, repo,
1972 			    progress_cb, progress_arg);
1973 		}
1974 		free(label_orig);
1975 		if (blob2)
1976 			got_object_blob_close(blob2);
1977 		if (err)
1978 			goto done;
1979 		/*
1980 		 * Do not update timestamps of files with local changes.
1981 		 * Otherwise, a future status walk would treat them as
1982 		 * unmodified files again.
1983 		 */
1984 		err = got_fileindex_entry_update(ie, ondisk_path,
1985 		    blob->id.sha1, worktree->base_commit_id->sha1,
1986 		    update_timestamps);
1987 	} else if (status == GOT_STATUS_MODE_CHANGE) {
1988 		err = got_fileindex_entry_update(ie, ondisk_path,
1989 		    blob->id.sha1, worktree->base_commit_id->sha1, 0);
1990 	} else if (status == GOT_STATUS_DELETE) {
1991 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1992 		if (err)
1993 			goto done;
1994 		err = got_fileindex_entry_update(ie, ondisk_path,
1995 		    blob->id.sha1, worktree->base_commit_id->sha1, 0);
1996 		if (err)
1997 			goto done;
1998 	} else {
1999 		int is_bad_symlink = 0;
2000 		if (S_ISLNK(te->mode)) {
2001 			err = install_symlink(&is_bad_symlink, worktree,
2002 			    ondisk_path, path, blob,
2003 			    status == GOT_STATUS_MISSING, 0,
2004 			    status == GOT_STATUS_UNVERSIONED, repo,
2005 			    progress_cb, progress_arg);
2006 		} else {
2007 			err = install_blob(worktree, ondisk_path, path,
2008 			    te->mode, sb.st_mode, blob,
2009 			    status == GOT_STATUS_MISSING, 0, 0,
2010 			    status == GOT_STATUS_UNVERSIONED, repo,
2011 			    progress_cb, progress_arg);
2012 		}
2013 		if (err)
2014 			goto done;
2015 
2016 		if (ie) {
2017 			err = got_fileindex_entry_update(ie, ondisk_path,
2018 			    blob->id.sha1, worktree->base_commit_id->sha1, 1);
2019 		} else {
2020 			err = create_fileindex_entry(&ie, fileindex,
2021 			    worktree->base_commit_id, ondisk_path, path,
2022 			    &blob->id);
2023 		}
2024 		if (err)
2025 			goto done;
2026 
2027 		if (is_bad_symlink) {
2028 			got_fileindex_entry_filetype_set(ie,
2029 			    GOT_FILEIDX_MODE_BAD_SYMLINK);
2030 		}
2031 	}
2032 	got_object_blob_close(blob);
2033 done:
2034 	free(ondisk_path);
2035 	return err;
2036 }
2037 
2038 static const struct got_error *
2039 remove_ondisk_file(const char *root_path, const char *path)
2040 {
2041 	const struct got_error *err = NULL;
2042 	char *ondisk_path = NULL;
2043 
2044 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2045 		return got_error_from_errno("asprintf");
2046 
2047 	if (unlink(ondisk_path) == -1) {
2048 		if (errno != ENOENT)
2049 			err = got_error_from_errno2("unlink", ondisk_path);
2050 	} else {
2051 		size_t root_len = strlen(root_path);
2052 		do {
2053 			char *parent;
2054 			err = got_path_dirname(&parent, ondisk_path);
2055 			if (err)
2056 				break;
2057 			free(ondisk_path);
2058 			ondisk_path = parent;
2059 			if (rmdir(ondisk_path) == -1) {
2060 				if (errno != ENOTEMPTY)
2061 					err = got_error_from_errno2("rmdir",
2062 					    ondisk_path);
2063 				break;
2064 			}
2065 		} while (got_path_cmp(ondisk_path, root_path,
2066 		    strlen(ondisk_path), root_len) != 0);
2067 	}
2068 	free(ondisk_path);
2069 	return err;
2070 }
2071 
2072 static const struct got_error *
2073 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2074     struct got_fileindex_entry *ie, struct got_repository *repo,
2075     got_worktree_checkout_cb progress_cb, void *progress_arg)
2076 {
2077 	const struct got_error *err = NULL;
2078 	unsigned char status;
2079 	struct stat sb;
2080 	char *ondisk_path;
2081 
2082 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2083 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2084 
2085 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2086 	    == -1)
2087 		return got_error_from_errno("asprintf");
2088 
2089 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2090 	if (err)
2091 		goto done;
2092 
2093 	if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2094 		char ondisk_target[PATH_MAX];
2095 		ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2096 		    sizeof(ondisk_target));
2097 		if (ondisk_len == -1) {
2098 			err = got_error_from_errno2("readlink", ondisk_path);
2099 			goto done;
2100 		}
2101 		ondisk_target[ondisk_len] = '\0';
2102 		err = install_symlink_conflict(NULL, worktree->base_commit_id,
2103 		    NULL, NULL, /* XXX pass common ancestor info? */
2104 		    ondisk_target, ondisk_path);
2105 		if (err)
2106 			goto done;
2107 		err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2108 		    ie->path);
2109 		goto done;
2110 	}
2111 
2112 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2113 	    status == GOT_STATUS_ADD) {
2114 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2115 		if (err)
2116 			goto done;
2117 		/*
2118 		 * Preserve the working file and change the deleted blob's
2119 		 * entry into a schedule-add entry.
2120 		 */
2121 		err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
2122 		    0);
2123 	} else {
2124 		err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2125 		if (err)
2126 			goto done;
2127 		if (status == GOT_STATUS_NO_CHANGE) {
2128 			err = remove_ondisk_file(worktree->root_path, ie->path);
2129 			if (err)
2130 				goto done;
2131 		}
2132 		got_fileindex_entry_remove(fileindex, ie);
2133 	}
2134 done:
2135 	free(ondisk_path);
2136 	return err;
2137 }
2138 
2139 struct diff_cb_arg {
2140     struct got_fileindex *fileindex;
2141     struct got_worktree *worktree;
2142     struct got_repository *repo;
2143     got_worktree_checkout_cb progress_cb;
2144     void *progress_arg;
2145     got_cancel_cb cancel_cb;
2146     void *cancel_arg;
2147 };
2148 
2149 static const struct got_error *
2150 diff_old_new(void *arg, struct got_fileindex_entry *ie,
2151     struct got_tree_entry *te, const char *parent_path)
2152 {
2153 	struct diff_cb_arg *a = arg;
2154 
2155 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2156 		return got_error(GOT_ERR_CANCELLED);
2157 
2158 	return update_blob(a->worktree, a->fileindex, ie, te,
2159 	    ie->path, a->repo, a->progress_cb, a->progress_arg);
2160 }
2161 
2162 static const struct got_error *
2163 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2164 {
2165 	struct diff_cb_arg *a = arg;
2166 
2167 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2168 		return got_error(GOT_ERR_CANCELLED);
2169 
2170 	return delete_blob(a->worktree, a->fileindex, ie,
2171 	    a->repo, a->progress_cb, a->progress_arg);
2172 }
2173 
2174 static const struct got_error *
2175 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2176 {
2177 	struct diff_cb_arg *a = arg;
2178 	const struct got_error *err;
2179 	char *path;
2180 
2181 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2182 		return got_error(GOT_ERR_CANCELLED);
2183 
2184 	if (got_object_tree_entry_is_submodule(te))
2185 		return NULL;
2186 
2187 	if (asprintf(&path, "%s%s%s", parent_path,
2188 	    parent_path[0] ? "/" : "", te->name)
2189 	    == -1)
2190 		return got_error_from_errno("asprintf");
2191 
2192 	if (S_ISDIR(te->mode))
2193 		err = add_dir_on_disk(a->worktree, path);
2194 	else
2195 		err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2196 		    a->repo, a->progress_cb, a->progress_arg);
2197 
2198 	free(path);
2199 	return err;
2200 }
2201 
2202 const struct got_error *
2203 got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2204 {
2205 	uint32_t uuid_status;
2206 
2207 	uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2208 	if (uuid_status != uuid_s_ok) {
2209 		*uuidstr = NULL;
2210 		return got_error_uuid(uuid_status, "uuid_to_string");
2211 	}
2212 
2213 	return NULL;
2214 }
2215 
2216 static const struct got_error *
2217 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2218 {
2219 	const struct got_error *err = NULL;
2220 	char *uuidstr = NULL;
2221 
2222 	*refname = NULL;
2223 
2224 	err = got_worktree_get_uuid(&uuidstr, worktree);
2225 	if (err)
2226 		return err;
2227 
2228 	if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2229 		err = got_error_from_errno("asprintf");
2230 		*refname = NULL;
2231 	}
2232 	free(uuidstr);
2233 	return err;
2234 }
2235 
2236 const struct got_error *
2237 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2238 {
2239 	return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2240 }
2241 
2242 static const struct got_error *
2243 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2244 {
2245 	return get_ref_name(refname, worktree,
2246 	    GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2247 }
2248 
2249 static const struct got_error *
2250 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2251 {
2252 	return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2253 }
2254 
2255 static const struct got_error *
2256 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2257 {
2258 	return get_ref_name(refname, worktree,
2259 	    GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2260 }
2261 
2262 static const struct got_error *
2263 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2264 {
2265 	return get_ref_name(refname, worktree,
2266 	    GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2267 }
2268 
2269 static const struct got_error *
2270 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2271 {
2272 	return get_ref_name(refname, worktree,
2273 	    GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2274 }
2275 
2276 static const struct got_error *
2277 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2278 {
2279 	return get_ref_name(refname, worktree,
2280 	    GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2281 }
2282 
2283 static const struct got_error *
2284 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2285 {
2286 	return get_ref_name(refname, worktree,
2287 	    GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2288 }
2289 
2290 static const struct got_error *
2291 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2292 {
2293 	return get_ref_name(refname, worktree,
2294 	    GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2295 }
2296 
2297 const struct got_error *
2298 got_worktree_get_histedit_script_path(char **path,
2299     struct got_worktree *worktree)
2300 {
2301 	if (asprintf(path, "%s/%s/%s", worktree->root_path,
2302 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2303 		*path = NULL;
2304 		return got_error_from_errno("asprintf");
2305 	}
2306 	return NULL;
2307 }
2308 
2309 /*
2310  * Prevent Git's garbage collector from deleting our base commit by
2311  * setting a reference to our base commit's ID.
2312  */
2313 static const struct got_error *
2314 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2315 {
2316 	const struct got_error *err = NULL;
2317 	struct got_reference *ref = NULL;
2318 	char *refname;
2319 
2320 	err = got_worktree_get_base_ref_name(&refname, worktree);
2321 	if (err)
2322 		return err;
2323 
2324 	err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2325 	if (err)
2326 		goto done;
2327 
2328 	err = got_ref_write(ref, repo);
2329 done:
2330 	free(refname);
2331 	if (ref)
2332 		got_ref_close(ref);
2333 	return err;
2334 }
2335 
2336 static const struct got_error *
2337 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2338 {
2339 	const struct got_error *err = NULL;
2340 
2341 	if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2342 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2343 		err = got_error_from_errno("asprintf");
2344 		*fileindex_path = NULL;
2345 	}
2346 	return err;
2347 }
2348 
2349 
2350 static const struct got_error *
2351 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2352     struct got_worktree *worktree)
2353 {
2354 	const struct got_error *err = NULL;
2355 	FILE *index = NULL;
2356 
2357 	*fileindex_path = NULL;
2358 	*fileindex = got_fileindex_alloc();
2359 	if (*fileindex == NULL)
2360 		return got_error_from_errno("got_fileindex_alloc");
2361 
2362 	err = get_fileindex_path(fileindex_path, worktree);
2363 	if (err)
2364 		goto done;
2365 
2366 	index = fopen(*fileindex_path, "rb");
2367 	if (index == NULL) {
2368 		if (errno != ENOENT)
2369 			err = got_error_from_errno2("fopen", *fileindex_path);
2370 	} else {
2371 		err = got_fileindex_read(*fileindex, index);
2372 		if (fclose(index) != 0 && err == NULL)
2373 			err = got_error_from_errno("fclose");
2374 	}
2375 done:
2376 	if (err) {
2377 		free(*fileindex_path);
2378 		*fileindex_path = NULL;
2379 		got_fileindex_free(*fileindex);
2380 		*fileindex = NULL;
2381 	}
2382 	return err;
2383 }
2384 
2385 struct bump_base_commit_id_arg {
2386 	struct got_object_id *base_commit_id;
2387 	const char *path;
2388 	size_t path_len;
2389 	const char *entry_name;
2390 	got_worktree_checkout_cb progress_cb;
2391 	void *progress_arg;
2392 };
2393 
2394 /* Bump base commit ID of all files within an updated part of the work tree. */
2395 static const struct got_error *
2396 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2397 {
2398 	const struct got_error *err;
2399 	struct bump_base_commit_id_arg *a = arg;
2400 
2401 	if (a->entry_name) {
2402 		if (strcmp(ie->path, a->path) != 0)
2403 			return NULL;
2404 	} else if (!got_path_is_child(ie->path, a->path, a->path_len))
2405 		return NULL;
2406 
2407 	if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2408 	    SHA1_DIGEST_LENGTH) == 0)
2409 		return NULL;
2410 
2411 	if (a->progress_cb) {
2412 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2413 		    ie->path);
2414 		if (err)
2415 			return err;
2416 	}
2417 	memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2418 	return NULL;
2419 }
2420 
2421 static const struct got_error *
2422 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2423 {
2424 	const struct got_error *err = NULL;
2425 	char *new_fileindex_path = NULL;
2426 	FILE *new_index = NULL;
2427 	struct timespec timeout;
2428 
2429 	err = got_opentemp_named(&new_fileindex_path, &new_index,
2430 	    fileindex_path);
2431 	if (err)
2432 		goto done;
2433 
2434 	err = got_fileindex_write(fileindex, new_index);
2435 	if (err)
2436 		goto done;
2437 
2438 	if (rename(new_fileindex_path, fileindex_path) != 0) {
2439 		err = got_error_from_errno3("rename", new_fileindex_path,
2440 		    fileindex_path);
2441 		unlink(new_fileindex_path);
2442 	}
2443 
2444 	/*
2445 	 * Sleep for a short amount of time to ensure that files modified after
2446 	 * this program exits have a different time stamp from the one which
2447 	 * was recorded in the file index.
2448 	 */
2449 	timeout.tv_sec = 0;
2450 	timeout.tv_nsec = 1;
2451 	nanosleep(&timeout,  NULL);
2452 done:
2453 	if (new_index)
2454 		fclose(new_index);
2455 	free(new_fileindex_path);
2456 	return err;
2457 }
2458 
2459 static const struct got_error *
2460 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2461     struct got_object_id **tree_id, const char *wt_relpath,
2462     struct got_worktree *worktree, struct got_repository *repo)
2463 {
2464 	const struct got_error *err = NULL;
2465 	struct got_object_id *id = NULL;
2466 	char *in_repo_path = NULL;
2467 	int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2468 
2469 	*entry_type = GOT_OBJ_TYPE_ANY;
2470 	*tree_relpath = NULL;
2471 	*tree_id = NULL;
2472 
2473 	if (wt_relpath[0] == '\0') {
2474 		/* Check out all files within the work tree. */
2475 		*entry_type = GOT_OBJ_TYPE_TREE;
2476 		*tree_relpath = strdup("");
2477 		if (*tree_relpath == NULL) {
2478 			err = got_error_from_errno("strdup");
2479 			goto done;
2480 		}
2481 		err = got_object_id_by_path(tree_id, repo,
2482 		    worktree->base_commit_id, worktree->path_prefix);
2483 		if (err)
2484 			goto done;
2485 		return NULL;
2486 	}
2487 
2488 	/* Check out a subset of files in the work tree. */
2489 
2490 	if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2491 	    is_root_wt ? "" : "/", wt_relpath) == -1) {
2492 		err = got_error_from_errno("asprintf");
2493 		goto done;
2494 	}
2495 
2496 	err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2497 	    in_repo_path);
2498 	if (err)
2499 		goto done;
2500 
2501 	free(in_repo_path);
2502 	in_repo_path = NULL;
2503 
2504 	err = got_object_get_type(entry_type, repo, id);
2505 	if (err)
2506 		goto done;
2507 
2508 	if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2509 		/* Check out a single file. */
2510 		if (strchr(wt_relpath, '/')  == NULL) {
2511 			/* Check out a single file in work tree's root dir. */
2512 			in_repo_path = strdup(worktree->path_prefix);
2513 			if (in_repo_path == NULL) {
2514 				err = got_error_from_errno("strdup");
2515 				goto done;
2516 			}
2517 			*tree_relpath = strdup("");
2518 			if (*tree_relpath == NULL) {
2519 				err = got_error_from_errno("strdup");
2520 				goto done;
2521 			}
2522 		} else {
2523 			/* Check out a single file in a subdirectory. */
2524 			err = got_path_dirname(tree_relpath, wt_relpath);
2525 			if (err)
2526 				return err;
2527 			if (asprintf(&in_repo_path, "%s%s%s",
2528 			    worktree->path_prefix, is_root_wt ? "" : "/",
2529 			    *tree_relpath) == -1) {
2530 				err = got_error_from_errno("asprintf");
2531 				goto done;
2532 			}
2533 		}
2534 		err = got_object_id_by_path(tree_id, repo,
2535 		    worktree->base_commit_id, in_repo_path);
2536 	} else {
2537 		/* Check out all files within a subdirectory. */
2538 		*tree_id = got_object_id_dup(id);
2539 		if (*tree_id == NULL) {
2540 			err = got_error_from_errno("got_object_id_dup");
2541 			goto done;
2542 		}
2543 		*tree_relpath = strdup(wt_relpath);
2544 		if (*tree_relpath == NULL) {
2545 			err = got_error_from_errno("strdup");
2546 			goto done;
2547 		}
2548 	}
2549 done:
2550 	free(id);
2551 	free(in_repo_path);
2552 	if (err) {
2553 		*entry_type = GOT_OBJ_TYPE_ANY;
2554 		free(*tree_relpath);
2555 		*tree_relpath = NULL;
2556 		free(*tree_id);
2557 		*tree_id = NULL;
2558 	}
2559 	return err;
2560 }
2561 
2562 static const struct got_error *
2563 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2564     const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2565     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2566     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2567 {
2568 	const struct got_error *err = NULL;
2569 	struct got_commit_object *commit = NULL;
2570 	struct got_tree_object *tree = NULL;
2571 	struct got_fileindex_diff_tree_cb diff_cb;
2572 	struct diff_cb_arg arg;
2573 
2574 	err = ref_base_commit(worktree, repo);
2575 	if (err) {
2576 		if (!(err->code == GOT_ERR_ERRNO &&
2577 		    (errno == EACCES || errno == EROFS)))
2578 			goto done;
2579 		err = (*progress_cb)(progress_arg,
2580 		    GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2581 		if (err)
2582 			return err;
2583 	}
2584 
2585 	err = got_object_open_as_commit(&commit, repo,
2586 	    worktree->base_commit_id);
2587 	if (err)
2588 		goto done;
2589 
2590 	err = got_object_open_as_tree(&tree, repo, tree_id);
2591 	if (err)
2592 		goto done;
2593 
2594 	if (entry_name &&
2595 	    got_object_tree_find_entry(tree, entry_name) == NULL) {
2596 		err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2597 		goto done;
2598 	}
2599 
2600 	diff_cb.diff_old_new = diff_old_new;
2601 	diff_cb.diff_old = diff_old;
2602 	diff_cb.diff_new = diff_new;
2603 	arg.fileindex = fileindex;
2604 	arg.worktree = worktree;
2605 	arg.repo = repo;
2606 	arg.progress_cb = progress_cb;
2607 	arg.progress_arg = progress_arg;
2608 	arg.cancel_cb = cancel_cb;
2609 	arg.cancel_arg = cancel_arg;
2610 	err = got_fileindex_diff_tree(fileindex, tree, relpath,
2611 	    entry_name, repo, &diff_cb, &arg);
2612 done:
2613 	if (tree)
2614 		got_object_tree_close(tree);
2615 	if (commit)
2616 		got_object_commit_close(commit);
2617 	return err;
2618 }
2619 
2620 const struct got_error *
2621 got_worktree_checkout_files(struct got_worktree *worktree,
2622     struct got_pathlist_head *paths, struct got_repository *repo,
2623     got_worktree_checkout_cb progress_cb, void *progress_arg,
2624     got_cancel_cb cancel_cb, void *cancel_arg)
2625 {
2626 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2627 	struct got_commit_object *commit = NULL;
2628 	struct got_tree_object *tree = NULL;
2629 	struct got_fileindex *fileindex = NULL;
2630 	char *fileindex_path = NULL;
2631 	struct got_pathlist_entry *pe;
2632 	struct tree_path_data {
2633 		SIMPLEQ_ENTRY(tree_path_data) entry;
2634 		struct got_object_id *tree_id;
2635 		int entry_type;
2636 		char *relpath;
2637 		char *entry_name;
2638 	} *tpd = NULL;
2639 	SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2640 
2641 	SIMPLEQ_INIT(&tree_paths);
2642 
2643 	err = lock_worktree(worktree, LOCK_EX);
2644 	if (err)
2645 		return err;
2646 
2647 	/* Map all specified paths to in-repository trees. */
2648 	TAILQ_FOREACH(pe, paths, entry) {
2649 		tpd = malloc(sizeof(*tpd));
2650 		if (tpd == NULL) {
2651 			err = got_error_from_errno("malloc");
2652 			goto done;
2653 		}
2654 
2655 		err = find_tree_entry_for_checkout(&tpd->entry_type,
2656 		    &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2657 		if (err) {
2658 			free(tpd);
2659 			goto done;
2660 		}
2661 
2662 		if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2663 			err = got_path_basename(&tpd->entry_name, pe->path);
2664 			if (err) {
2665 				free(tpd->relpath);
2666 				free(tpd->tree_id);
2667 				free(tpd);
2668 				goto done;
2669 			}
2670 		} else
2671 			tpd->entry_name = NULL;
2672 
2673 		SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2674 	}
2675 
2676 	/*
2677 	 * Read the file index.
2678 	 * Checking out files is supposed to be an idempotent operation.
2679 	 * If the on-disk file index is incomplete we will try to complete it.
2680 	 */
2681 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2682 	if (err)
2683 		goto done;
2684 
2685 	tpd = SIMPLEQ_FIRST(&tree_paths);
2686 	TAILQ_FOREACH(pe, paths, entry) {
2687 		struct bump_base_commit_id_arg bbc_arg;
2688 
2689 		err = checkout_files(worktree, fileindex, tpd->relpath,
2690 		    tpd->tree_id, tpd->entry_name, repo,
2691 		    progress_cb, progress_arg, cancel_cb, cancel_arg);
2692 		if (err)
2693 			break;
2694 
2695 		bbc_arg.base_commit_id = worktree->base_commit_id;
2696 		bbc_arg.entry_name = tpd->entry_name;
2697 		bbc_arg.path = pe->path;
2698 		bbc_arg.path_len = pe->path_len;
2699 		bbc_arg.progress_cb = progress_cb;
2700 		bbc_arg.progress_arg = progress_arg;
2701 		err = got_fileindex_for_each_entry_safe(fileindex,
2702 		    bump_base_commit_id, &bbc_arg);
2703 		if (err)
2704 			break;
2705 
2706 		tpd = SIMPLEQ_NEXT(tpd, entry);
2707 	}
2708 	sync_err = sync_fileindex(fileindex, fileindex_path);
2709 	if (sync_err && err == NULL)
2710 		err = sync_err;
2711 done:
2712 	free(fileindex_path);
2713 	if (tree)
2714 		got_object_tree_close(tree);
2715 	if (commit)
2716 		got_object_commit_close(commit);
2717 	if (fileindex)
2718 		got_fileindex_free(fileindex);
2719 	while (!SIMPLEQ_EMPTY(&tree_paths)) {
2720 		tpd = SIMPLEQ_FIRST(&tree_paths);
2721 		SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2722 		free(tpd->relpath);
2723 		free(tpd->tree_id);
2724 		free(tpd);
2725 	}
2726 	unlockerr = lock_worktree(worktree, LOCK_SH);
2727 	if (unlockerr && err == NULL)
2728 		err = unlockerr;
2729 	return err;
2730 }
2731 
2732 struct merge_file_cb_arg {
2733     struct got_worktree *worktree;
2734     struct got_fileindex *fileindex;
2735     got_worktree_checkout_cb progress_cb;
2736     void *progress_arg;
2737     got_cancel_cb cancel_cb;
2738     void *cancel_arg;
2739     const char *label_orig;
2740     struct got_object_id *commit_id2;
2741 };
2742 
2743 static const struct got_error *
2744 merge_file_cb(void *arg, struct got_blob_object *blob1,
2745     struct got_blob_object *blob2, struct got_object_id *id1,
2746     struct got_object_id *id2, const char *path1, const char *path2,
2747     mode_t mode1, mode_t mode2, struct got_repository *repo)
2748 {
2749 	static const struct got_error *err = NULL;
2750 	struct merge_file_cb_arg *a = arg;
2751 	struct got_fileindex_entry *ie;
2752 	char *ondisk_path = NULL;
2753 	struct stat sb;
2754 	unsigned char status;
2755 	int local_changes_subsumed;
2756 
2757 	if (blob1 && blob2) {
2758 		ie = got_fileindex_entry_get(a->fileindex, path2,
2759 		    strlen(path2));
2760 		if (ie == NULL)
2761 			return (*a->progress_cb)(a->progress_arg,
2762 			    GOT_STATUS_MISSING, path2);
2763 
2764 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2765 		    path2) == -1)
2766 			return got_error_from_errno("asprintf");
2767 
2768 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2769 		    repo);
2770 		if (err)
2771 			goto done;
2772 
2773 		if (status == GOT_STATUS_DELETE) {
2774 			err = (*a->progress_cb)(a->progress_arg,
2775 			    GOT_STATUS_MERGE, path2);
2776 			goto done;
2777 		}
2778 		if (status != GOT_STATUS_NO_CHANGE &&
2779 		    status != GOT_STATUS_MODIFY &&
2780 		    status != GOT_STATUS_CONFLICT &&
2781 		    status != GOT_STATUS_ADD) {
2782 			err = (*a->progress_cb)(a->progress_arg, status, path2);
2783 			goto done;
2784 		}
2785 
2786 		if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2787 			char *link_target2;
2788 			err = got_object_blob_read_to_str(&link_target2, blob2);
2789 			if (err)
2790 				goto done;
2791 			err = merge_symlink(a->worktree, blob1, ondisk_path,
2792 			    path2, a->label_orig, link_target2, a->commit_id2,
2793 			    repo, a->progress_cb, a->progress_arg);
2794 			free(link_target2);
2795 		} else {
2796 			err = merge_blob(&local_changes_subsumed, a->worktree,
2797 			    blob1, ondisk_path, path2, sb.st_mode,
2798 			    a->label_orig, blob2, a->commit_id2, repo,
2799 			    a->progress_cb, a->progress_arg);
2800 		}
2801 	} else if (blob1) {
2802 		ie = got_fileindex_entry_get(a->fileindex, path1,
2803 		    strlen(path1));
2804 		if (ie == NULL)
2805 			return (*a->progress_cb)(a->progress_arg,
2806 			    GOT_STATUS_MISSING, path1);
2807 
2808 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2809 		    path1) == -1)
2810 			return got_error_from_errno("asprintf");
2811 
2812 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2813 		    repo);
2814 		if (err)
2815 			goto done;
2816 
2817 		switch (status) {
2818 		case GOT_STATUS_NO_CHANGE:
2819 			err = (*a->progress_cb)(a->progress_arg,
2820 			    GOT_STATUS_DELETE, path1);
2821 			if (err)
2822 				goto done;
2823 			err = remove_ondisk_file(a->worktree->root_path, path1);
2824 			if (err)
2825 				goto done;
2826 			if (ie)
2827 				got_fileindex_entry_mark_deleted_from_disk(ie);
2828 			break;
2829 		case GOT_STATUS_DELETE:
2830 		case GOT_STATUS_MISSING:
2831 			err = (*a->progress_cb)(a->progress_arg,
2832 			    GOT_STATUS_DELETE, path1);
2833 			if (err)
2834 				goto done;
2835 			if (ie)
2836 				got_fileindex_entry_mark_deleted_from_disk(ie);
2837 			break;
2838 		case GOT_STATUS_ADD: {
2839 			struct got_object_id *id;
2840 			FILE *blob1_f;
2841 			/*
2842 			 * Delete the added file only if its content already
2843 			 * exists in the repository.
2844 			 */
2845 			err = got_object_blob_file_create(&id, &blob1_f, path1);
2846 			if (err)
2847 				goto done;
2848 			if (got_object_id_cmp(id, id1) == 0) {
2849 				err = (*a->progress_cb)(a->progress_arg,
2850 				    GOT_STATUS_DELETE, path1);
2851 				if (err)
2852 					goto done;
2853 				err = remove_ondisk_file(a->worktree->root_path,
2854 				    path1);
2855 				if (err)
2856 					goto done;
2857 				if (ie)
2858 					got_fileindex_entry_remove(a->fileindex,
2859 					    ie);
2860 			} else {
2861 				err = (*a->progress_cb)(a->progress_arg,
2862 				    GOT_STATUS_CANNOT_DELETE, path1);
2863 			}
2864 			if (fclose(blob1_f) == EOF && err == NULL)
2865 				err = got_error_from_errno("fclose");
2866 			free(id);
2867 			if (err)
2868 				goto done;
2869 			break;
2870 		}
2871 		case GOT_STATUS_MODIFY:
2872 		case GOT_STATUS_CONFLICT:
2873 			err = (*a->progress_cb)(a->progress_arg,
2874 			    GOT_STATUS_CANNOT_DELETE, path1);
2875 			if (err)
2876 				goto done;
2877 			break;
2878 		case GOT_STATUS_OBSTRUCTED:
2879 			err = (*a->progress_cb)(a->progress_arg, status, path1);
2880 			if (err)
2881 				goto done;
2882 			break;
2883 		default:
2884 			break;
2885 		}
2886 	} else if (blob2) {
2887 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2888 		    path2) == -1)
2889 			return got_error_from_errno("asprintf");
2890 		ie = got_fileindex_entry_get(a->fileindex, path2,
2891 		    strlen(path2));
2892 		if (ie) {
2893 			err = get_file_status(&status, &sb, ie, ondisk_path,
2894 			    -1, NULL, repo);
2895 			if (err)
2896 				goto done;
2897 			if (status != GOT_STATUS_NO_CHANGE &&
2898 			    status != GOT_STATUS_MODIFY &&
2899 			    status != GOT_STATUS_CONFLICT &&
2900 			    status != GOT_STATUS_ADD) {
2901 				err = (*a->progress_cb)(a->progress_arg,
2902 				    status, path2);
2903 				goto done;
2904 			}
2905 			if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2906 				char *link_target2;
2907 				err = got_object_blob_read_to_str(&link_target2,
2908 				    blob2);
2909 				if (err)
2910 					goto done;
2911 				err = merge_symlink(a->worktree, NULL,
2912 				    ondisk_path, path2, a->label_orig,
2913 				    link_target2, a->commit_id2, repo,
2914 				    a->progress_cb, a->progress_arg);
2915 				free(link_target2);
2916 			} else if (S_ISREG(sb.st_mode)) {
2917 				err = merge_blob(&local_changes_subsumed,
2918 				    a->worktree, NULL, ondisk_path, path2,
2919 				    sb.st_mode, a->label_orig, blob2,
2920 				    a->commit_id2, repo, a->progress_cb,
2921 				    a->progress_arg);
2922 			} else {
2923 				err = got_error_path(ondisk_path,
2924 				    GOT_ERR_FILE_OBSTRUCTED);
2925 			}
2926 			if (err)
2927 				goto done;
2928 			if (status == GOT_STATUS_DELETE) {
2929 				err = got_fileindex_entry_update(ie,
2930 				    ondisk_path, blob2->id.sha1,
2931 				    a->worktree->base_commit_id->sha1, 0);
2932 				if (err)
2933 					goto done;
2934 			}
2935 		} else {
2936 			int is_bad_symlink = 0;
2937 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
2938 			if (S_ISLNK(mode2)) {
2939 				err = install_symlink(&is_bad_symlink,
2940 				    a->worktree, ondisk_path, path2, blob2, 0,
2941 				    0, 1, repo, a->progress_cb, a->progress_arg);
2942 			} else {
2943 				err = install_blob(a->worktree, ondisk_path, path2,
2944 				    mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2945 				    a->progress_cb, a->progress_arg);
2946 			}
2947 			if (err)
2948 				goto done;
2949 			err = got_fileindex_entry_alloc(&ie, path2);
2950 			if (err)
2951 				goto done;
2952 			err = got_fileindex_entry_update(ie, ondisk_path,
2953 			    NULL, NULL, 1);
2954 			if (err) {
2955 				got_fileindex_entry_free(ie);
2956 				goto done;
2957 			}
2958 			err = got_fileindex_entry_add(a->fileindex, ie);
2959 			if (err) {
2960 				got_fileindex_entry_free(ie);
2961 				goto done;
2962 			}
2963 			if (is_bad_symlink) {
2964 				got_fileindex_entry_filetype_set(ie,
2965 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
2966 			}
2967 		}
2968 	}
2969 done:
2970 	free(ondisk_path);
2971 	return err;
2972 }
2973 
2974 struct check_merge_ok_arg {
2975 	struct got_worktree *worktree;
2976 	struct got_repository *repo;
2977 };
2978 
2979 static const struct got_error *
2980 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2981 {
2982 	const struct got_error *err = NULL;
2983 	struct check_merge_ok_arg *a = arg;
2984 	unsigned char status;
2985 	struct stat sb;
2986 	char *ondisk_path;
2987 
2988 	/* Reject merges into a work tree with mixed base commits. */
2989 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2990 	    SHA1_DIGEST_LENGTH))
2991 		return got_error(GOT_ERR_MIXED_COMMITS);
2992 
2993 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2994 	    == -1)
2995 		return got_error_from_errno("asprintf");
2996 
2997 	/* Reject merges into a work tree with conflicted files. */
2998 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2999 	if (err)
3000 		return err;
3001 	if (status == GOT_STATUS_CONFLICT)
3002 		return got_error(GOT_ERR_CONFLICTS);
3003 
3004 	return NULL;
3005 }
3006 
3007 static const struct got_error *
3008 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3009     const char *fileindex_path, struct got_object_id *commit_id1,
3010     struct got_object_id *commit_id2, struct got_repository *repo,
3011     got_worktree_checkout_cb progress_cb, void *progress_arg,
3012     got_cancel_cb cancel_cb, void *cancel_arg)
3013 {
3014 	const struct got_error *err = NULL, *sync_err;
3015 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3016 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3017 	struct merge_file_cb_arg arg;
3018 	char *label_orig = NULL;
3019 
3020 	if (commit_id1) {
3021 		err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3022 		    worktree->path_prefix);
3023 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3024 			goto done;
3025 	}
3026 	if (tree_id1) {
3027 		char *id_str;
3028 
3029 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3030 		if (err)
3031 			goto done;
3032 
3033 		err = got_object_id_str(&id_str, commit_id1);
3034 		if (err)
3035 			goto done;
3036 
3037 		if (asprintf(&label_orig, "%s: commit %s",
3038 		    GOT_MERGE_LABEL_BASE, id_str) == -1) {
3039 			err = got_error_from_errno("asprintf");
3040 			free(id_str);
3041 			goto done;
3042 		}
3043 		free(id_str);
3044 	}
3045 
3046 	err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3047 	    worktree->path_prefix);
3048 	if (err)
3049 		goto done;
3050 
3051 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3052 	if (err)
3053 		goto done;
3054 
3055 	arg.worktree = worktree;
3056 	arg.fileindex = fileindex;
3057 	arg.progress_cb = progress_cb;
3058 	arg.progress_arg = progress_arg;
3059 	arg.cancel_cb = cancel_cb;
3060 	arg.cancel_arg = cancel_arg;
3061 	arg.label_orig = label_orig;
3062 	arg.commit_id2 = commit_id2;
3063 	err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3064 	sync_err = sync_fileindex(fileindex, fileindex_path);
3065 	if (sync_err && err == NULL)
3066 		err = sync_err;
3067 done:
3068 	if (tree1)
3069 		got_object_tree_close(tree1);
3070 	if (tree2)
3071 		got_object_tree_close(tree2);
3072 	free(label_orig);
3073 	return err;
3074 }
3075 
3076 const struct got_error *
3077 got_worktree_merge_files(struct got_worktree *worktree,
3078     struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3079     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3080     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3081 {
3082 	const struct got_error *err, *unlockerr;
3083 	char *fileindex_path = NULL;
3084 	struct got_fileindex *fileindex = NULL;
3085 	struct check_merge_ok_arg mok_arg;
3086 
3087 	err = lock_worktree(worktree, LOCK_EX);
3088 	if (err)
3089 		return err;
3090 
3091 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3092 	if (err)
3093 		goto done;
3094 
3095 	mok_arg.worktree = worktree;
3096 	mok_arg.repo = repo;
3097 	err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3098 	    &mok_arg);
3099 	if (err)
3100 		goto done;
3101 
3102 	err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3103 	    commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3104 done:
3105 	if (fileindex)
3106 		got_fileindex_free(fileindex);
3107 	free(fileindex_path);
3108 	unlockerr = lock_worktree(worktree, LOCK_SH);
3109 	if (unlockerr && err == NULL)
3110 		err = unlockerr;
3111 	return err;
3112 }
3113 
3114 struct diff_dir_cb_arg {
3115     struct got_fileindex *fileindex;
3116     struct got_worktree *worktree;
3117     const char *status_path;
3118     size_t status_path_len;
3119     struct got_repository *repo;
3120     got_worktree_status_cb status_cb;
3121     void *status_arg;
3122     got_cancel_cb cancel_cb;
3123     void *cancel_arg;
3124     /* A pathlist containing per-directory pathlists of ignore patterns. */
3125     struct got_pathlist_head ignores;
3126     int report_unchanged;
3127     int no_ignores;
3128 };
3129 
3130 static const struct got_error *
3131 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3132     int dirfd, const char *de_name,
3133     got_worktree_status_cb status_cb, void *status_arg,
3134     struct got_repository *repo, int report_unchanged)
3135 {
3136 	const struct got_error *err = NULL;
3137 	unsigned char status = GOT_STATUS_NO_CHANGE;
3138 	unsigned char staged_status = get_staged_status(ie);
3139 	struct stat sb;
3140 	struct got_object_id blob_id, commit_id, staged_blob_id;
3141 	struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3142 	struct got_object_id *staged_blob_idp = NULL;
3143 
3144 	err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3145 	if (err)
3146 		return err;
3147 
3148 	if (status == GOT_STATUS_NO_CHANGE &&
3149 	    staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3150 		return NULL;
3151 
3152 	if (got_fileindex_entry_has_blob(ie)) {
3153 		memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3154 		blob_idp = &blob_id;
3155 	}
3156 	if (got_fileindex_entry_has_commit(ie)) {
3157 		memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3158 		commit_idp = &commit_id;
3159 	}
3160 	if (staged_status == GOT_STATUS_ADD ||
3161 	    staged_status == GOT_STATUS_MODIFY) {
3162 		memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3163 		    SHA1_DIGEST_LENGTH);
3164 		staged_blob_idp = &staged_blob_id;
3165 	}
3166 
3167 	return (*status_cb)(status_arg, status, staged_status,
3168 	    ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3169 }
3170 
3171 static const struct got_error *
3172 status_old_new(void *arg, struct got_fileindex_entry *ie,
3173     struct dirent *de, const char *parent_path, int dirfd)
3174 {
3175 	const struct got_error *err = NULL;
3176 	struct diff_dir_cb_arg *a = arg;
3177 	char *abspath;
3178 
3179 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3180 		return got_error(GOT_ERR_CANCELLED);
3181 
3182 	if (got_path_cmp(parent_path, a->status_path,
3183 	    strlen(parent_path), a->status_path_len) != 0 &&
3184 	    !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3185 		return NULL;
3186 
3187 	if (parent_path[0]) {
3188 		if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3189 		    parent_path, de->d_name) == -1)
3190 			return got_error_from_errno("asprintf");
3191 	} else {
3192 		if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3193 		    de->d_name) == -1)
3194 			return got_error_from_errno("asprintf");
3195 	}
3196 
3197 	err = report_file_status(ie, abspath, dirfd, de->d_name,
3198 	    a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3199 	free(abspath);
3200 	return err;
3201 }
3202 
3203 static const struct got_error *
3204 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3205 {
3206 	struct diff_dir_cb_arg *a = arg;
3207 	struct got_object_id blob_id, commit_id;
3208 	unsigned char status;
3209 
3210 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3211 		return got_error(GOT_ERR_CANCELLED);
3212 
3213 	if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3214 		return NULL;
3215 
3216 	memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3217 	memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3218 	if (got_fileindex_entry_has_file_on_disk(ie))
3219 		status = GOT_STATUS_MISSING;
3220 	else
3221 		status = GOT_STATUS_DELETE;
3222 	return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3223 	    ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3224 }
3225 
3226 void
3227 free_ignorelist(struct got_pathlist_head *ignorelist)
3228 {
3229 	struct got_pathlist_entry *pe;
3230 
3231 	TAILQ_FOREACH(pe, ignorelist, entry)
3232 		free((char *)pe->path);
3233 	got_pathlist_free(ignorelist);
3234 }
3235 
3236 void
3237 free_ignores(struct got_pathlist_head *ignores)
3238 {
3239 	struct got_pathlist_entry *pe;
3240 
3241 	TAILQ_FOREACH(pe, ignores, entry) {
3242 		struct got_pathlist_head *ignorelist = pe->data;
3243 		free_ignorelist(ignorelist);
3244 		free((char *)pe->path);
3245 	}
3246 	got_pathlist_free(ignores);
3247 }
3248 
3249 static const struct got_error *
3250 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3251 {
3252 	const struct got_error *err = NULL;
3253 	struct got_pathlist_entry *pe = NULL;
3254 	struct got_pathlist_head *ignorelist;
3255 	char *line = NULL, *pattern, *dirpath = NULL;
3256 	size_t linesize = 0;
3257 	ssize_t linelen;
3258 
3259 	ignorelist = calloc(1, sizeof(*ignorelist));
3260 	if (ignorelist == NULL)
3261 		return got_error_from_errno("calloc");
3262 	TAILQ_INIT(ignorelist);
3263 
3264 	while ((linelen = getline(&line, &linesize, f)) != -1) {
3265 		if (linelen > 0 && line[linelen - 1] == '\n')
3266 			line[linelen - 1] = '\0';
3267 
3268 		/* Git's ignores may contain comments. */
3269 		if (line[0] == '#')
3270 			continue;
3271 
3272 		/* Git's negated patterns are not (yet?) supported. */
3273 		if (line[0] == '!')
3274 			continue;
3275 
3276 		if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3277 		    line) == -1) {
3278 			err = got_error_from_errno("asprintf");
3279 			goto done;
3280 		}
3281 		err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3282 		if (err)
3283 			goto done;
3284 	}
3285 	if (ferror(f)) {
3286 		err = got_error_from_errno("getline");
3287 		goto done;
3288 	}
3289 
3290 	dirpath = strdup(path);
3291 	if (dirpath == NULL) {
3292 		err = got_error_from_errno("strdup");
3293 		goto done;
3294 	}
3295 	err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3296 done:
3297 	free(line);
3298 	if (err || pe == NULL) {
3299 		free(dirpath);
3300 		free_ignorelist(ignorelist);
3301 	}
3302 	return err;
3303 }
3304 
3305 int
3306 match_ignores(struct got_pathlist_head *ignores, const char *path)
3307 {
3308 	struct got_pathlist_entry *pe;
3309 
3310 	/* Handle patterns which match in all directories. */
3311 	TAILQ_FOREACH(pe, ignores, entry) {
3312 		struct got_pathlist_head *ignorelist = pe->data;
3313 		struct got_pathlist_entry *pi;
3314 
3315 		TAILQ_FOREACH(pi, ignorelist, entry) {
3316 			const char *p, *pattern = pi->path;
3317 
3318 			if (strncmp(pattern, "**/", 3) != 0)
3319 				continue;
3320 			pattern += 3;
3321 			p = path;
3322 			while (*p) {
3323 				if (fnmatch(pattern, p,
3324 				    FNM_PATHNAME | FNM_LEADING_DIR)) {
3325 					/* Retry in next directory. */
3326 					while (*p && *p != '/')
3327 						p++;
3328 					while (*p == '/')
3329 						p++;
3330 					continue;
3331 				}
3332 				return 1;
3333 			}
3334 		}
3335 	}
3336 
3337 	/*
3338 	 * The ignores pathlist contains ignore lists from children before
3339 	 * parents, so we can find the most specific ignorelist by walking
3340 	 * ignores backwards.
3341 	 */
3342 	pe = TAILQ_LAST(ignores, got_pathlist_head);
3343 	while (pe) {
3344 		if (got_path_is_child(path, pe->path, pe->path_len)) {
3345 			struct got_pathlist_head *ignorelist = pe->data;
3346 			struct got_pathlist_entry *pi;
3347 			TAILQ_FOREACH(pi, ignorelist, entry) {
3348 				const char *pattern = pi->path;
3349 				int flags = FNM_LEADING_DIR;
3350 				if (strstr(pattern, "/**/") == NULL)
3351 					flags |= FNM_PATHNAME;
3352 				if (fnmatch(pattern, path, flags))
3353 					continue;
3354 				return 1;
3355 			}
3356 		}
3357 		pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3358 	}
3359 
3360 	return 0;
3361 }
3362 
3363 static const struct got_error *
3364 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3365     const char *path, int dirfd, const char *ignores_filename)
3366 {
3367 	const struct got_error *err = NULL;
3368 	char *ignorespath;
3369 	int fd = -1;
3370 	FILE *ignoresfile = NULL;
3371 
3372 	if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3373 	    path[0] ? "/" : "", ignores_filename) == -1)
3374 		return got_error_from_errno("asprintf");
3375 
3376 	if (dirfd != -1) {
3377 		fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3378 		if (fd == -1) {
3379 			if (errno != ENOENT && errno != EACCES)
3380 				err = got_error_from_errno2("openat",
3381 				    ignorespath);
3382 		} else {
3383 			ignoresfile = fdopen(fd, "r");
3384 			if (ignoresfile == NULL) 
3385 				err = got_error_from_errno2("fdopen",
3386 				    ignorespath);
3387 			else {
3388 				fd = -1;
3389 				err = read_ignores(ignores, path, ignoresfile);
3390 			}
3391 		}
3392 	} else {
3393 		ignoresfile = fopen(ignorespath, "r");
3394 		if (ignoresfile == NULL) {
3395 			if (errno != ENOENT && errno != EACCES)
3396 				err = got_error_from_errno2("fopen",
3397 				    ignorespath);
3398 		} else
3399 			err = read_ignores(ignores, path, ignoresfile);
3400 	}
3401 
3402 	if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3403 		err = got_error_from_errno2("fclose", path);
3404 	if (fd != -1 && close(fd) == -1 && err == NULL)
3405 		err = got_error_from_errno2("close", path);
3406 	free(ignorespath);
3407 	return err;
3408 }
3409 
3410 static const struct got_error *
3411 status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3412 {
3413 	const struct got_error *err = NULL;
3414 	struct diff_dir_cb_arg *a = arg;
3415 	char *path = NULL;
3416 
3417 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3418 		return got_error(GOT_ERR_CANCELLED);
3419 
3420 	if (parent_path[0]) {
3421 		if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3422 			return got_error_from_errno("asprintf");
3423 	} else {
3424 		path = de->d_name;
3425 	}
3426 
3427 	if (de->d_type != DT_DIR &&
3428 	    got_path_is_child(path, a->status_path, a->status_path_len)
3429 	    && !match_ignores(&a->ignores, path))
3430 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3431 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3432 	if (parent_path[0])
3433 		free(path);
3434 	return err;
3435 }
3436 
3437 static const struct got_error *
3438 status_traverse(void *arg, const char *path, int dirfd)
3439 {
3440 	const struct got_error *err = NULL;
3441 	struct diff_dir_cb_arg *a = arg;
3442 
3443 	if (a->no_ignores)
3444 		return NULL;
3445 
3446 	err = add_ignores(&a->ignores, a->worktree->root_path,
3447 	    path, dirfd, ".cvsignore");
3448 	if (err)
3449 		return err;
3450 
3451 	err = add_ignores(&a->ignores, a->worktree->root_path, path,
3452 	    dirfd, ".gitignore");
3453 
3454 	return err;
3455 }
3456 
3457 static const struct got_error *
3458 report_single_file_status(const char *path, const char *ondisk_path,
3459 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3460 void *status_arg, struct got_repository *repo, int report_unchanged)
3461 {
3462 	struct got_fileindex_entry *ie;
3463 	struct stat sb;
3464 
3465 	ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3466 	if (ie)
3467 		return report_file_status(ie, ondisk_path, -1, NULL,
3468 		    status_cb, status_arg, repo, report_unchanged);
3469 
3470 	if (lstat(ondisk_path, &sb) == -1) {
3471 		if (errno != ENOENT)
3472 			return got_error_from_errno2("lstat", ondisk_path);
3473 		return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3474 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3475 		return NULL;
3476 	}
3477 
3478 	if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3479 		return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3480 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3481 
3482 	return NULL;
3483 }
3484 
3485 static const struct got_error *
3486 add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3487     const char *root_path, const char *path)
3488 {
3489 	const struct got_error *err;
3490 	char *parent_path, *next_parent_path = NULL;
3491 
3492 	err = add_ignores(ignores, root_path, "", -1,
3493 	    ".cvsignore");
3494 	if (err)
3495 		return err;
3496 
3497 	err = add_ignores(ignores, root_path, "", -1,
3498 	    ".gitignore");
3499 	if (err)
3500 		return err;
3501 
3502 	err = got_path_dirname(&parent_path, path);
3503 	if (err) {
3504 		if (err->code == GOT_ERR_BAD_PATH)
3505 			return NULL; /* cannot traverse parent */
3506 		return err;
3507 	}
3508 	for (;;) {
3509 		err = add_ignores(ignores, root_path, parent_path, -1,
3510 		    ".cvsignore");
3511 		if (err)
3512 			break;
3513 		err = add_ignores(ignores, root_path, parent_path, -1,
3514 		    ".gitignore");
3515 		if (err)
3516 			break;
3517 		err = got_path_dirname(&next_parent_path, parent_path);
3518 		if (err) {
3519 			if (err->code == GOT_ERR_BAD_PATH)
3520 				err = NULL; /* traversed everything */
3521 			break;
3522 		}
3523 		free(parent_path);
3524 		parent_path = next_parent_path;
3525 		next_parent_path = NULL;
3526 	}
3527 
3528 	free(parent_path);
3529 	free(next_parent_path);
3530 	return err;
3531 }
3532 
3533 static const struct got_error *
3534 worktree_status(struct got_worktree *worktree, const char *path,
3535     struct got_fileindex *fileindex, struct got_repository *repo,
3536     got_worktree_status_cb status_cb, void *status_arg,
3537     got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3538     int report_unchanged)
3539 {
3540 	const struct got_error *err = NULL;
3541 	int fd = -1;
3542 	struct got_fileindex_diff_dir_cb fdiff_cb;
3543 	struct diff_dir_cb_arg arg;
3544 	char *ondisk_path = NULL;
3545 
3546 	TAILQ_INIT(&arg.ignores);
3547 
3548 	if (asprintf(&ondisk_path, "%s%s%s",
3549 	    worktree->root_path, path[0] ? "/" : "", path) == -1)
3550 		return got_error_from_errno("asprintf");
3551 
3552 	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3553 	if (fd == -1) {
3554 		if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3555 		    errno != ELOOP)
3556 			err = got_error_from_errno2("open", ondisk_path);
3557 		else
3558 			err = report_single_file_status(path, ondisk_path,
3559 			    fileindex, status_cb, status_arg, repo,
3560 			    report_unchanged);
3561 	} else {
3562 		fdiff_cb.diff_old_new = status_old_new;
3563 		fdiff_cb.diff_old = status_old;
3564 		fdiff_cb.diff_new = status_new;
3565 		fdiff_cb.diff_traverse = status_traverse;
3566 		arg.fileindex = fileindex;
3567 		arg.worktree = worktree;
3568 		arg.status_path = path;
3569 		arg.status_path_len = strlen(path);
3570 		arg.repo = repo;
3571 		arg.status_cb = status_cb;
3572 		arg.status_arg = status_arg;
3573 		arg.cancel_cb = cancel_cb;
3574 		arg.cancel_arg = cancel_arg;
3575 		arg.report_unchanged = report_unchanged;
3576 		arg.no_ignores = no_ignores;
3577 		if (!no_ignores) {
3578 			err = add_ignores_from_parent_paths(&arg.ignores,
3579 			    worktree->root_path, path);
3580 			if (err)
3581 				goto done;
3582 		}
3583 		err = got_fileindex_diff_dir(fileindex, fd,
3584 		    worktree->root_path, path, repo, &fdiff_cb, &arg);
3585 	}
3586 done:
3587 	free_ignores(&arg.ignores);
3588 	if (fd != -1 && close(fd) != 0 && err == NULL)
3589 		err = got_error_from_errno("close");
3590 	free(ondisk_path);
3591 	return err;
3592 }
3593 
3594 const struct got_error *
3595 got_worktree_status(struct got_worktree *worktree,
3596     struct got_pathlist_head *paths, struct got_repository *repo,
3597     got_worktree_status_cb status_cb, void *status_arg,
3598     got_cancel_cb cancel_cb, void *cancel_arg)
3599 {
3600 	const struct got_error *err = NULL;
3601 	char *fileindex_path = NULL;
3602 	struct got_fileindex *fileindex = NULL;
3603 	struct got_pathlist_entry *pe;
3604 
3605 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3606 	if (err)
3607 		return err;
3608 
3609 	TAILQ_FOREACH(pe, paths, entry) {
3610 		err = worktree_status(worktree, pe->path, fileindex, repo,
3611 			status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3612 		if (err)
3613 			break;
3614 	}
3615 	free(fileindex_path);
3616 	got_fileindex_free(fileindex);
3617 	return err;
3618 }
3619 
3620 const struct got_error *
3621 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3622     const char *arg)
3623 {
3624 	const struct got_error *err = NULL;
3625 	char *resolved = NULL, *cwd = NULL, *path = NULL;
3626 	size_t len;
3627 	struct stat sb;
3628 
3629 	*wt_path = NULL;
3630 
3631 	cwd = getcwd(NULL, 0);
3632 	if (cwd == NULL)
3633 		return got_error_from_errno("getcwd");
3634 
3635 	if (lstat(arg, &sb) == -1) {
3636 		if (errno != ENOENT) {
3637 			err = got_error_from_errno2("lstat", arg);
3638 			goto done;
3639 		}
3640 	}
3641 	if (S_ISLNK(sb.st_mode)) {
3642 		/*
3643 		 * We cannot use realpath(3) with symlinks since we want to
3644 		 * operate on the symlink itself.
3645 		 * But we can make the path absolute, assuming it is relative
3646 		 * to the current working directory, and then canonicalize it.
3647 		 */
3648 		char *abspath = NULL;
3649 		char canonpath[PATH_MAX];
3650 		if (!got_path_is_absolute(arg)) {
3651 			if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3652 				err = got_error_from_errno("asprintf");
3653 				goto done;
3654 			}
3655 
3656 		}
3657 		err = got_canonpath(abspath ? abspath : arg, canonpath,
3658 		    sizeof(canonpath));
3659 		if (err)
3660 			goto done;
3661 		resolved = strdup(canonpath);
3662 		if (resolved == NULL) {
3663 			err = got_error_from_errno("strdup");
3664 			goto done;
3665 		}
3666 	} else {
3667 		resolved = realpath(arg, NULL);
3668 		if (resolved == NULL) {
3669 			if (errno != ENOENT) {
3670 				err = got_error_from_errno2("realpath", arg);
3671 				goto done;
3672 			}
3673 			if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
3674 				err = got_error_from_errno("asprintf");
3675 				goto done;
3676 			}
3677 		}
3678 	}
3679 
3680 	if (strncmp(got_worktree_get_root_path(worktree), resolved,
3681 	    strlen(got_worktree_get_root_path(worktree)))) {
3682 		err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3683 		goto done;
3684 	}
3685 
3686 	if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3687 		err = got_path_skip_common_ancestor(&path,
3688 		    got_worktree_get_root_path(worktree), resolved);
3689 		if (err)
3690 			goto done;
3691 	} else {
3692 		path = strdup("");
3693 		if (path == NULL) {
3694 			err = got_error_from_errno("strdup");
3695 			goto done;
3696 		}
3697 	}
3698 
3699 	/* XXX status walk can't deal with trailing slash! */
3700 	len = strlen(path);
3701 	while (len > 0 && path[len - 1] == '/') {
3702 		path[len - 1] = '\0';
3703 		len--;
3704 	}
3705 done:
3706 	free(resolved);
3707 	free(cwd);
3708 	if (err == NULL)
3709 		*wt_path = path;
3710 	else
3711 		free(path);
3712 	return err;
3713 }
3714 
3715 struct schedule_addition_args {
3716 	struct got_worktree *worktree;
3717 	struct got_fileindex *fileindex;
3718 	got_worktree_checkout_cb progress_cb;
3719 	void *progress_arg;
3720 	struct got_repository *repo;
3721 };
3722 
3723 static const struct got_error *
3724 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3725     const char *relpath, struct got_object_id *blob_id,
3726     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3727     int dirfd, const char *de_name)
3728 {
3729 	struct schedule_addition_args *a = arg;
3730 	const struct got_error *err = NULL;
3731 	struct got_fileindex_entry *ie;
3732 	struct stat sb;
3733 	char *ondisk_path;
3734 
3735 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3736 	    relpath) == -1)
3737 		return got_error_from_errno("asprintf");
3738 
3739 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3740 	if (ie) {
3741 		err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3742 		    de_name, a->repo);
3743 		if (err)
3744 			goto done;
3745 		/* Re-adding an existing entry is a no-op. */
3746 		if (status == GOT_STATUS_ADD)
3747 			goto done;
3748 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3749 		if (err)
3750 			goto done;
3751 	}
3752 
3753 	if (status != GOT_STATUS_UNVERSIONED) {
3754 		err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3755 		goto done;
3756 	}
3757 
3758 	err = got_fileindex_entry_alloc(&ie, relpath);
3759 	if (err)
3760 		goto done;
3761 	err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
3762 	if (err) {
3763 		got_fileindex_entry_free(ie);
3764 		goto done;
3765 	}
3766 	err = got_fileindex_entry_add(a->fileindex, ie);
3767 	if (err) {
3768 		got_fileindex_entry_free(ie);
3769 		goto done;
3770 	}
3771 done:
3772 	free(ondisk_path);
3773 	if (err)
3774 		return err;
3775 	if (status == GOT_STATUS_ADD)
3776 		return NULL;
3777 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3778 }
3779 
3780 const struct got_error *
3781 got_worktree_schedule_add(struct got_worktree *worktree,
3782     struct got_pathlist_head *paths,
3783     got_worktree_checkout_cb progress_cb, void *progress_arg,
3784     struct got_repository *repo, int no_ignores)
3785 {
3786 	struct got_fileindex *fileindex = NULL;
3787 	char *fileindex_path = NULL;
3788 	const struct got_error *err = NULL, *sync_err, *unlockerr;
3789 	struct got_pathlist_entry *pe;
3790 	struct schedule_addition_args saa;
3791 
3792 	err = lock_worktree(worktree, LOCK_EX);
3793 	if (err)
3794 		return err;
3795 
3796 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3797 	if (err)
3798 		goto done;
3799 
3800 	saa.worktree = worktree;
3801 	saa.fileindex = fileindex;
3802 	saa.progress_cb = progress_cb;
3803 	saa.progress_arg = progress_arg;
3804 	saa.repo = repo;
3805 
3806 	TAILQ_FOREACH(pe, paths, entry) {
3807 		err = worktree_status(worktree, pe->path, fileindex, repo,
3808 			schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3809 		if (err)
3810 			break;
3811 	}
3812 	sync_err = sync_fileindex(fileindex, fileindex_path);
3813 	if (sync_err && err == NULL)
3814 		err = sync_err;
3815 done:
3816 	free(fileindex_path);
3817 	if (fileindex)
3818 		got_fileindex_free(fileindex);
3819 	unlockerr = lock_worktree(worktree, LOCK_SH);
3820 	if (unlockerr && err == NULL)
3821 		err = unlockerr;
3822 	return err;
3823 }
3824 
3825 struct schedule_deletion_args {
3826 	struct got_worktree *worktree;
3827 	struct got_fileindex *fileindex;
3828 	got_worktree_delete_cb progress_cb;
3829 	void *progress_arg;
3830 	struct got_repository *repo;
3831 	int delete_local_mods;
3832 	int keep_on_disk;
3833 	const char *status_codes;
3834 };
3835 
3836 static const struct got_error *
3837 schedule_for_deletion(void *arg, unsigned char status,
3838     unsigned char staged_status, const char *relpath,
3839     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3840     struct got_object_id *commit_id, int dirfd, const char *de_name)
3841 {
3842 	struct schedule_deletion_args *a = arg;
3843 	const struct got_error *err = NULL;
3844 	struct got_fileindex_entry *ie = NULL;
3845 	struct stat sb;
3846 	char *ondisk_path;
3847 
3848 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3849 	if (ie == NULL)
3850 		return got_error_path(relpath, GOT_ERR_BAD_PATH);
3851 
3852 	staged_status = get_staged_status(ie);
3853 	if (staged_status != GOT_STATUS_NO_CHANGE) {
3854 		if (staged_status == GOT_STATUS_DELETE)
3855 			return NULL;
3856 		return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3857 	}
3858 
3859 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3860 	    relpath) == -1)
3861 		return got_error_from_errno("asprintf");
3862 
3863 	err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3864 	    a->repo);
3865 	if (err)
3866 		goto done;
3867 
3868 	if (a->status_codes) {
3869 		size_t ncodes = strlen(a->status_codes);
3870 		int i;
3871 		for (i = 0; i < ncodes ; i++) {
3872 			if (status == a->status_codes[i])
3873 				break;
3874 		}
3875 		if (i == ncodes) { 
3876 			/* Do not delete files in non-matching status. */
3877 			free(ondisk_path);
3878 			return NULL;
3879 		}
3880 		if (a->status_codes[i] != GOT_STATUS_MODIFY &&
3881 		    a->status_codes[i] != GOT_STATUS_MISSING) {
3882 			static char msg[64];
3883 			snprintf(msg, sizeof(msg),
3884 			    "invalid status code '%c'", a->status_codes[i]);
3885 			err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
3886 			goto done;
3887 		}
3888 	}
3889 
3890 	if (status != GOT_STATUS_NO_CHANGE) {
3891 		if (status == GOT_STATUS_DELETE)
3892 			goto done;
3893 		if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3894 			err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3895 			goto done;
3896 		}
3897 		if (status != GOT_STATUS_MODIFY &&
3898 		    status != GOT_STATUS_MISSING) {
3899 			err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3900 			goto done;
3901 		}
3902 	}
3903 
3904 	if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3905 		size_t root_len;
3906 
3907 		if (dirfd != -1) {
3908 			if (unlinkat(dirfd, de_name, 0) != 0) {
3909 				err = got_error_from_errno2("unlinkat",
3910 				    ondisk_path);
3911 				goto done;
3912 			}
3913 		} else if (unlink(ondisk_path) != 0) {
3914 			err = got_error_from_errno2("unlink", ondisk_path);
3915 			goto done;
3916 		}
3917 
3918 		root_len = strlen(a->worktree->root_path);
3919 		do {
3920 			char *parent;
3921 			err = got_path_dirname(&parent, ondisk_path);
3922 			if (err)
3923 				goto done;
3924 			free(ondisk_path);
3925 			ondisk_path = parent;
3926 			if (rmdir(ondisk_path) == -1) {
3927 				if (errno != ENOTEMPTY)
3928 					err = got_error_from_errno2("rmdir",
3929 					    ondisk_path);
3930 				break;
3931 			}
3932 		} while (got_path_cmp(ondisk_path, a->worktree->root_path,
3933 		    strlen(ondisk_path), root_len) != 0);
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 (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4337 				err = got_error_from_errno2("fchmod", 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 }