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 <sha2.h>
33 #include <zlib.h>
34 #include <fnmatch.h>
35 #include <libgen.h>
36 #include <uuid.h>
37 #include <util.h>
38 
39 #include "got_error.h"
40 #include "got_repository.h"
41 #include "got_reference.h"
42 #include "got_object.h"
43 #include "got_path.h"
44 #include "got_cancel.h"
45 #include "got_worktree.h"
46 #include "got_opentemp.h"
47 #include "got_diff.h"
48 
49 #include "got_lib_worktree.h"
50 #include "got_lib_hash.h"
51 #include "got_lib_fileindex.h"
52 #include "got_lib_inflate.h"
53 #include "got_lib_delta.h"
54 #include "got_lib_object.h"
55 #include "got_lib_object_parse.h"
56 #include "got_lib_object_create.h"
57 #include "got_lib_object_idset.h"
58 #include "got_lib_diff.h"
59 #include "got_lib_gotconfig.h"
60 
61 #ifndef MIN
62 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
63 #endif
64 
65 #define GOT_MERGE_LABEL_MERGED	"merged change"
66 #define GOT_MERGE_LABEL_BASE	"3-way merge base"
67 
68 static mode_t
69 apply_umask(mode_t mode)
70 {
71 	mode_t um;
72 
73 	um = umask(000);
74 	umask(um);
75 	return mode & ~um;
76 }
77 
78 static const struct got_error *
79 create_meta_file(const char *path_got, const char *name, const char *content)
80 {
81 	const struct got_error *err = NULL;
82 	char *path;
83 
84 	if (asprintf(&path, "%s/%s", path_got, name) == -1)
85 		return got_error_from_errno("asprintf");
86 
87 	err = got_path_create_file(path, content);
88 	free(path);
89 	return err;
90 }
91 
92 static const struct got_error *
93 update_meta_file(const char *path_got, const char *name, const char *content)
94 {
95 	const struct got_error *err = NULL;
96 	FILE *tmpfile = NULL;
97 	char *tmppath = NULL;
98 	char *path = NULL;
99 
100 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
101 		err = got_error_from_errno("asprintf");
102 		path = NULL;
103 		goto done;
104 	}
105 
106 	err = got_opentemp_named(&tmppath, &tmpfile, path, "");
107 	if (err)
108 		goto done;
109 
110 	if (content) {
111 		int len = fprintf(tmpfile, "%s\n", content);
112 		if (len != strlen(content) + 1) {
113 			err = got_error_from_errno2("fprintf", tmppath);
114 			goto done;
115 		}
116 	}
117 
118 	if (rename(tmppath, path) != 0) {
119 		err = got_error_from_errno3("rename", tmppath, path);
120 		unlink(tmppath);
121 		goto done;
122 	}
123 
124 done:
125 	if (fclose(tmpfile) == EOF && err == NULL)
126 		err = got_error_from_errno2("fclose", tmppath);
127 	free(tmppath);
128 	return err;
129 }
130 
131 static const struct got_error *
132 write_head_ref(const char *path_got, struct got_reference *head_ref)
133 {
134 	const struct got_error *err = NULL;
135 	char *refstr = NULL;
136 
137 	if (got_ref_is_symbolic(head_ref)) {
138 		refstr = got_ref_to_str(head_ref);
139 		if (refstr == NULL)
140 			return got_error_from_errno("got_ref_to_str");
141 	} else {
142 		refstr = strdup(got_ref_get_name(head_ref));
143 		if (refstr == NULL)
144 			return got_error_from_errno("strdup");
145 	}
146 	err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
147 	free(refstr);
148 	return err;
149 }
150 
151 const struct got_error *
152 got_worktree_init(const char *path, struct got_reference *head_ref,
153     const char *prefix, const char *meta_dir, struct got_repository *repo)
154 {
155 	const struct got_error *err = NULL;
156 	struct got_object_id *commit_id = NULL;
157 	uuid_t uuid;
158 	uint32_t uuid_status;
159 	int obj_type;
160 	char *path_got = NULL;
161 	char *formatstr = NULL;
162 	char *absprefix = NULL;
163 	char *basestr = NULL;
164 	char *uuidstr = NULL;
165 
166 	if (strcmp(path, got_repo_get_path(repo)) == 0) {
167 		err = got_error(GOT_ERR_WORKTREE_REPO);
168 		goto done;
169 	}
170 
171 	err = got_ref_resolve(&commit_id, repo, head_ref);
172 	if (err)
173 		return err;
174 	err = got_object_get_type(&obj_type, repo, commit_id);
175 	if (err)
176 		return err;
177 	if (obj_type != GOT_OBJ_TYPE_COMMIT)
178 		return got_error(GOT_ERR_OBJ_TYPE);
179 
180 	if (!got_path_is_absolute(prefix)) {
181 		if (asprintf(&absprefix, "/%s", prefix) == -1)
182 			return got_error_from_errno("asprintf");
183 	}
184 
185 	/* Create top-level directory (may already exist). */
186 	if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
187 		err = got_error_from_errno2("mkdir", path);
188 		goto done;
189 	}
190 
191 	/* Create .got/.cvg directory (may already exist). */
192 	if (asprintf(&path_got, "%s/%s", path, meta_dir) == -1) {
193 		err = got_error_from_errno("asprintf");
194 		goto done;
195 	}
196 	if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
197 		err = got_error_from_errno2("mkdir", path_got);
198 		goto done;
199 	}
200 
201 	/* Create an empty lock file. */
202 	err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
203 	if (err)
204 		goto done;
205 
206 	/* Create an empty file index. */
207 	err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
208 	if (err)
209 		goto done;
210 
211 	/* Write the HEAD reference. */
212 	err = write_head_ref(path_got, head_ref);
213 	if (err)
214 		goto done;
215 
216 	/* Record our base commit. */
217 	err = got_object_id_str(&basestr, commit_id);
218 	if (err)
219 		goto done;
220 	err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
221 	if (err)
222 		goto done;
223 
224 	/* Store path to repository. */
225 	err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
226 	    got_repo_get_path(repo));
227 	if (err)
228 		goto done;
229 
230 	/* Store in-repository path prefix. */
231 	err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
232 	    absprefix ? absprefix : prefix);
233 	if (err)
234 		goto done;
235 
236 	/* Generate UUID. */
237 	uuid_create(&uuid, &uuid_status);
238 	if (uuid_status != uuid_s_ok) {
239 		err = got_error_uuid(uuid_status, "uuid_create");
240 		goto done;
241 	}
242 	uuid_to_string(&uuid, &uuidstr, &uuid_status);
243 	if (uuid_status != uuid_s_ok) {
244 		err = got_error_uuid(uuid_status, "uuid_to_string");
245 		goto done;
246 	}
247 	err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
248 	if (err)
249 		goto done;
250 
251 	/* Stamp work tree with format file. */
252 	if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
253 		err = got_error_from_errno("asprintf");
254 		goto done;
255 	}
256 	err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
257 	if (err)
258 		goto done;
259 
260 done:
261 	free(commit_id);
262 	free(path_got);
263 	free(formatstr);
264 	free(absprefix);
265 	free(basestr);
266 	free(uuidstr);
267 	return err;
268 }
269 
270 const struct got_error *
271 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
272     const char *path_prefix)
273 {
274 	char *absprefix = NULL;
275 
276 	if (!got_path_is_absolute(path_prefix)) {
277 		if (asprintf(&absprefix, "/%s", path_prefix) == -1)
278 			return got_error_from_errno("asprintf");
279 	}
280 	*match = (strcmp(absprefix ? absprefix : path_prefix,
281 	    worktree->path_prefix) == 0);
282 	free(absprefix);
283 	return NULL;
284 }
285 
286 const char *
287 got_worktree_get_head_ref_name(struct got_worktree *worktree)
288 {
289 	return worktree->head_ref_name;
290 }
291 
292 const struct got_error *
293 got_worktree_set_head_ref(struct got_worktree *worktree,
294     struct got_reference *head_ref)
295 {
296 	const struct got_error *err = NULL;
297 	char *path_got = NULL, *head_ref_name = NULL;
298 
299 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
300 	    worktree->meta_dir) == -1) {
301 		err = got_error_from_errno("asprintf");
302 		path_got = NULL;
303 		goto done;
304 	}
305 
306 	head_ref_name = strdup(got_ref_get_name(head_ref));
307 	if (head_ref_name == NULL) {
308 		err = got_error_from_errno("strdup");
309 		goto done;
310 	}
311 
312 	err = write_head_ref(path_got, head_ref);
313 	if (err)
314 		goto done;
315 
316 	free(worktree->head_ref_name);
317 	worktree->head_ref_name = head_ref_name;
318 done:
319 	free(path_got);
320 	if (err)
321 		free(head_ref_name);
322 	return err;
323 }
324 
325 struct got_object_id *
326 got_worktree_get_base_commit_id(struct got_worktree *worktree)
327 {
328 	return worktree->base_commit_id;
329 }
330 
331 const struct got_error *
332 got_worktree_set_base_commit_id(struct got_worktree *worktree,
333     struct got_repository *repo, struct got_object_id *commit_id)
334 {
335 	const struct got_error *err;
336 	struct got_object *obj = NULL;
337 	char *id_str = NULL;
338 	char *path_got = NULL;
339 
340 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
341 	    worktree->meta_dir) == -1) {
342 		err = got_error_from_errno("asprintf");
343 		path_got = NULL;
344 		goto done;
345 	}
346 
347 	err = got_object_open(&obj, repo, commit_id);
348 	if (err)
349 		return err;
350 
351 	if (obj->type != GOT_OBJ_TYPE_COMMIT) {
352 		err = got_error(GOT_ERR_OBJ_TYPE);
353 		goto done;
354 	}
355 
356 	/* Record our base commit. */
357 	err = got_object_id_str(&id_str, commit_id);
358 	if (err)
359 		goto done;
360 	err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
361 	if (err)
362 		goto done;
363 
364 	free(worktree->base_commit_id);
365 	worktree->base_commit_id = got_object_id_dup(commit_id);
366 	if (worktree->base_commit_id == NULL) {
367 		err = got_error_from_errno("got_object_id_dup");
368 		goto done;
369 	}
370 done:
371 	if (obj)
372 		got_object_close(obj);
373 	free(id_str);
374 	free(path_got);
375 	return err;
376 }
377 
378 const struct got_gotconfig *
379 got_worktree_get_gotconfig(struct got_worktree *worktree)
380 {
381 	return worktree->gotconfig;
382 }
383 
384 static const struct got_error *
385 lock_worktree(struct got_worktree *worktree, int operation)
386 {
387 	if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
388 		return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
389 		    : got_error_from_errno2("flock",
390 		    got_worktree_get_root_path(worktree)));
391 	return NULL;
392 }
393 
394 static const struct got_error *
395 add_dir_on_disk(struct got_worktree *worktree, const char *path)
396 {
397 	const struct got_error *err = NULL;
398 	char *abspath;
399 
400 	/* We only accept worktree-relative paths here. */
401 	if (got_path_is_absolute(path)) {
402 		return got_error_fmt(GOT_ERR_BAD_PATH,
403 		    "%s does not accept absolute paths: %s",
404 		    __func__, path);
405 	}
406 
407 	if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
408 		return got_error_from_errno("asprintf");
409 
410 	err = got_path_mkdir(abspath);
411 	if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
412 		struct stat sb;
413 		err = NULL;
414 		if (lstat(abspath, &sb) == -1) {
415 			err = got_error_from_errno2("lstat", abspath);
416 		} else if (!S_ISDIR(sb.st_mode)) {
417 			/* TODO directory is obstructed; do something */
418 			err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
419 		}
420 	}
421 	free(abspath);
422 	return err;
423 }
424 
425 static const struct got_error *
426 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
427 {
428 	const struct got_error *err = NULL;
429 	uint8_t fbuf1[8192];
430 	uint8_t fbuf2[8192];
431 	size_t flen1 = 0, flen2 = 0;
432 
433 	*same = 1;
434 
435 	for (;;) {
436 		flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
437 		if (flen1 == 0 && ferror(f1)) {
438 			err = got_error_from_errno("fread");
439 			break;
440 		}
441 		flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
442 		if (flen2 == 0 && ferror(f2)) {
443 			err = got_error_from_errno("fread");
444 			break;
445 		}
446 		if (flen1 == 0) {
447 			if (flen2 != 0)
448 				*same = 0;
449 			break;
450 		} else if (flen2 == 0) {
451 			if (flen1 != 0)
452 				*same = 0;
453 			break;
454 		} else if (flen1 == flen2) {
455 			if (memcmp(fbuf1, fbuf2, flen2) != 0) {
456 				*same = 0;
457 				break;
458 			}
459 		} else {
460 			*same = 0;
461 			break;
462 		}
463 	}
464 
465 	return err;
466 }
467 
468 static const struct got_error *
469 check_files_equal(int *same, FILE *f1, FILE *f2)
470 {
471 	struct stat sb;
472 	size_t size1, size2;
473 
474 	*same = 1;
475 
476 	if (fstat(fileno(f1), &sb) != 0)
477 		return got_error_from_errno("fstat");
478 	size1 = sb.st_size;
479 
480 	if (fstat(fileno(f2), &sb) != 0)
481 		return got_error_from_errno("fstat");
482 	size2 = sb.st_size;
483 
484 	if (size1 != size2) {
485 		*same = 0;
486 		return NULL;
487 	}
488 
489 	if (fseek(f1, 0L, SEEK_SET) == -1)
490 		return got_ferror(f1, GOT_ERR_IO);
491 	if (fseek(f2, 0L, SEEK_SET) == -1)
492 		return got_ferror(f2, GOT_ERR_IO);
493 
494 	return check_file_contents_equal(same, f1, f2);
495 }
496 
497 static const struct got_error *
498 copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
499 {
500 	uint8_t fbuf[65536];
501 	size_t flen;
502 	ssize_t outlen;
503 
504 	*outsize = 0;
505 
506 	if (fseek(f, 0L, SEEK_SET) == -1)
507 		return got_ferror(f, GOT_ERR_IO);
508 
509 	for (;;) {
510 		flen = fread(fbuf, 1, sizeof(fbuf), f);
511 		if (flen == 0) {
512 			if (ferror(f))
513 				return got_error_from_errno("fread");
514 			if (feof(f))
515 				break;
516 		}
517 		outlen = write(outfd, fbuf, flen);
518 		if (outlen == -1)
519 			return got_error_from_errno("write");
520 		if (outlen != flen)
521 			return got_error(GOT_ERR_IO);
522 		*outsize += outlen;
523 	}
524 
525 	return NULL;
526 }
527 
528 static const struct got_error *
529 merge_binary_file(int *overlapcnt, int merged_fd,
530     FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
531     const char *label_deriv, const char *label_orig, const char *label_deriv2,
532     const char *ondisk_path)
533 {
534 	const struct got_error *err = NULL;
535 	int same_content, changed_deriv, changed_deriv2;
536 	int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
537 	off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
538 	char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
539 	char *base_path_orig = NULL, *base_path_deriv = NULL;
540 	char *base_path_deriv2 = NULL;
541 
542 	*overlapcnt = 0;
543 
544 	err = check_files_equal(&same_content, f_deriv, f_deriv2);
545 	if (err)
546 		return err;
547 
548 	if (same_content)
549 		return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
550 
551 	err = check_files_equal(&same_content, f_deriv, f_orig);
552 	if (err)
553 		return err;
554 	changed_deriv = !same_content;
555 	err = check_files_equal(&same_content, f_deriv2, f_orig);
556 	if (err)
557 		return err;
558 	changed_deriv2 = !same_content;
559 
560 	if (changed_deriv && changed_deriv2) {
561 		*overlapcnt = 1;
562 		if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
563 			err = got_error_from_errno("asprintf");
564 			goto done;
565 		}
566 		if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
567 			err = got_error_from_errno("asprintf");
568 			goto done;
569 		}
570 		if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
571 			err = got_error_from_errno("asprintf");
572 			goto done;
573 		}
574 		err = got_opentemp_named_fd(&path_orig, &fd_orig,
575 		    base_path_orig, "");
576 		if (err)
577 			goto done;
578 		err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
579 		    base_path_deriv, "");
580 		if (err)
581 			goto done;
582 		err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
583 		    base_path_deriv2, "");
584 		if (err)
585 			goto done;
586 		err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
587 		if (err)
588 			goto done;
589 		err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
590 		if (err)
591 			goto done;
592 		err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
593 		if (err)
594 			goto done;
595 		if (dprintf(merged_fd, "Binary files differ and cannot be "
596 		    "merged automatically:\n") < 0) {
597 			err = got_error_from_errno("dprintf");
598 			goto done;
599 		}
600 		if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
601 		    GOT_DIFF_CONFLICT_MARKER_BEGIN,
602 		    label_deriv ? " " : "",
603 		    label_deriv ? label_deriv : "",
604 		    path_deriv) < 0) {
605 			err = got_error_from_errno("dprintf");
606 			goto done;
607 		}
608 		if (size_orig > 0) {
609 			if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
610 			    GOT_DIFF_CONFLICT_MARKER_ORIG,
611 			    label_orig ? " " : "",
612 			    label_orig ? label_orig : "",
613 			    path_orig) < 0) {
614 				err = got_error_from_errno("dprintf");
615 				goto done;
616 			}
617 		}
618 		if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
619 		    GOT_DIFF_CONFLICT_MARKER_SEP,
620 		    path_deriv2,
621 		    GOT_DIFF_CONFLICT_MARKER_END,
622 		    label_deriv2 ?  " " : "",
623 		    label_deriv2 ? label_deriv2 : "") < 0) {
624 			err = got_error_from_errno("dprintf");
625 			goto done;
626 		}
627 	} else if (changed_deriv)
628 		err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
629 	else if (changed_deriv2)
630 		err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
631 done:
632 	if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
633 	    err == NULL)
634 		err = got_error_from_errno2("unlink", path_orig);
635 	if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
636 		err = got_error_from_errno2("close", path_orig);
637 	if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
638 		err = got_error_from_errno2("close", path_deriv);
639 	if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
640 		err = got_error_from_errno2("close", path_deriv2);
641 	free(path_orig);
642 	free(path_deriv);
643 	free(path_deriv2);
644 	free(base_path_orig);
645 	free(base_path_deriv);
646 	free(base_path_deriv2);
647 	return err;
648 }
649 
650 /*
651  * Perform a 3-way merge where the file f_orig acts as the common
652  * ancestor, the file f_deriv acts as the first derived version,
653  * and the file f_deriv2 acts as the second derived version.
654  * The merge result will be written to a new file at ondisk_path; any
655  * existing file at this path will be replaced.
656  */
657 static const struct got_error *
658 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
659     FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
660     const char *path, uint16_t st_mode,
661     const char *label_orig, const char *label_deriv, const char *label_deriv2,
662     enum got_diff_algorithm diff_algo, struct got_repository *repo,
663     got_worktree_checkout_cb progress_cb, void *progress_arg)
664 {
665 	const struct got_error *err = NULL;
666 	int merged_fd = -1;
667 	FILE *f_merged = NULL;
668 	char *merged_path = NULL, *base_path = NULL;
669 	int overlapcnt = 0;
670 	char *parent = NULL;
671 
672 	*local_changes_subsumed = 0;
673 
674 	err = got_path_dirname(&parent, ondisk_path);
675 	if (err)
676 		return err;
677 
678 	if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
679 		err = got_error_from_errno("asprintf");
680 		goto done;
681 	}
682 
683 	err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path, "");
684 	if (err)
685 		goto done;
686 
687 	err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
688 	    f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
689 	if (err) {
690 		if (err->code != GOT_ERR_FILE_BINARY)
691 			goto done;
692 		err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
693 		    f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
694 		    ondisk_path);
695 		if (err)
696 			goto done;
697 	}
698 
699 	err = (*progress_cb)(progress_arg,
700 	    overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
701 	if (err)
702 		goto done;
703 
704 	if (fsync(merged_fd) != 0) {
705 		err = got_error_from_errno("fsync");
706 		goto done;
707 	}
708 
709 	f_merged = fdopen(merged_fd, "r");
710 	if (f_merged == NULL) {
711 		err = got_error_from_errno("fdopen");
712 		goto done;
713 	}
714 	merged_fd = -1;
715 
716 	/* Check if a clean merge has subsumed all local changes. */
717 	if (overlapcnt == 0) {
718 		err = check_files_equal(local_changes_subsumed, f_deriv,
719 		    f_merged);
720 		if (err)
721 			goto done;
722 	}
723 
724 	if (fchmod(fileno(f_merged), apply_umask(st_mode)) != 0) {
725 		err = got_error_from_errno2("fchmod", merged_path);
726 		goto done;
727 	}
728 
729 	if (rename(merged_path, ondisk_path) != 0) {
730 		err = got_error_from_errno3("rename", merged_path,
731 		    ondisk_path);
732 		goto done;
733 	}
734 done:
735 	if (err) {
736 		if (merged_path)
737 			unlink(merged_path);
738 	}
739 	if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
740 		err = got_error_from_errno("close");
741 	if (f_merged && fclose(f_merged) == EOF && err == NULL)
742 		err = got_error_from_errno("fclose");
743 	free(merged_path);
744 	free(base_path);
745 	free(parent);
746 	return err;
747 }
748 
749 static const struct got_error *
750 update_symlink(const char *ondisk_path, const char *target_path,
751     size_t target_len)
752 {
753 	/* This is not atomic but matches what 'ln -sf' does. */
754 	if (unlink(ondisk_path) == -1)
755 		return got_error_from_errno2("unlink", ondisk_path);
756 	if (symlink(target_path, ondisk_path) == -1)
757 		return got_error_from_errno3("symlink", target_path,
758 		    ondisk_path);
759 	return NULL;
760 }
761 
762 /*
763  * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
764  * in the work tree with a file that contains conflict markers and the
765  * conflicting target paths of the original version, a "derived version"
766  * of a symlink from an incoming change, and a local version of the symlink.
767  *
768  * The original versions's target path can be NULL if it is not available,
769  * such as if both derived versions added a new symlink at the same path.
770  *
771  * The incoming derived symlink target is NULL in case the incoming change
772  * has deleted this symlink.
773  */
774 static const struct got_error *
775 install_symlink_conflict(const char *deriv_target,
776     struct got_object_id *deriv_base_commit_id, const char *orig_target,
777     const char *label_orig, const char *local_target, const char *ondisk_path)
778 {
779 	const struct got_error *err;
780 	char *id_str = NULL, *label_deriv = NULL, *path = NULL;
781 	FILE *f = NULL;
782 
783 	err = got_object_id_str(&id_str, deriv_base_commit_id);
784 	if (err)
785 		return got_error_from_errno("asprintf");
786 
787 	if (asprintf(&label_deriv, "%s: commit %s",
788 	    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
789 		err = got_error_from_errno("asprintf");
790 		goto done;
791 	}
792 
793 	err = got_opentemp_named(&path, &f, "got-symlink-conflict", "");
794 	if (err)
795 		goto done;
796 
797 	if (fchmod(fileno(f), apply_umask(GOT_DEFAULT_FILE_MODE)) == -1) {
798 		err = got_error_from_errno2("fchmod", path);
799 		goto done;
800 	}
801 
802 	if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
803 	    GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
804 	    deriv_target ? deriv_target : "(symlink was deleted)",
805 	    orig_target ? label_orig : "",
806 	    orig_target ? "\n" : "",
807 	    orig_target ? orig_target : "",
808 	    orig_target ? "\n" : "",
809 	    GOT_DIFF_CONFLICT_MARKER_SEP,
810 	    local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
811 		err = got_error_from_errno2("fprintf", path);
812 		goto done;
813 	}
814 
815 	if (unlink(ondisk_path) == -1) {
816 		err = got_error_from_errno2("unlink", ondisk_path);
817 		goto done;
818 	}
819 	if (rename(path, ondisk_path) == -1) {
820 		err = got_error_from_errno3("rename", path, ondisk_path);
821 		goto done;
822 	}
823 done:
824 	if (f != NULL && fclose(f) == EOF && err == NULL)
825 		err = got_error_from_errno2("fclose", path);
826 	free(path);
827 	free(id_str);
828 	free(label_deriv);
829 	return err;
830 }
831 
832 /* forward declaration */
833 static const struct got_error *
834 merge_blob(int *, struct got_worktree *, struct got_blob_object *,
835     const char *, const char *, uint16_t, const char *,
836     struct got_blob_object *, struct got_object_id *,
837     struct got_repository *, got_worktree_checkout_cb, void *);
838 
839 /*
840  * Merge a symlink into the work tree, where blob_orig acts as the common
841  * ancestor, deriv_target is the link target of the first derived version,
842  * and the symlink on disk acts as the second derived version.
843  * Assume that contents of both blobs represent symlinks.
844  */
845 static const struct got_error *
846 merge_symlink(struct got_worktree *worktree,
847     struct got_blob_object *blob_orig, const char *ondisk_path,
848     const char *path, const char *label_orig, const char *deriv_target,
849     struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
850     got_worktree_checkout_cb progress_cb, void *progress_arg)
851 {
852 	const struct got_error *err = NULL;
853 	char *ancestor_target = NULL;
854 	struct stat sb;
855 	ssize_t ondisk_len, deriv_len;
856 	char ondisk_target[PATH_MAX];
857 	int have_local_change = 0;
858 	int have_incoming_change = 0;
859 
860 	if (lstat(ondisk_path, &sb) == -1)
861 		return got_error_from_errno2("lstat", ondisk_path);
862 
863 	ondisk_len = readlink(ondisk_path, ondisk_target,
864 	    sizeof(ondisk_target));
865 	if (ondisk_len == -1) {
866 		err = got_error_from_errno2("readlink",
867 		    ondisk_path);
868 		goto done;
869 	}
870 	ondisk_target[ondisk_len] = '\0';
871 
872 	if (blob_orig) {
873 		err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
874 		if (err)
875 			goto done;
876 	}
877 
878 	if (ancestor_target == NULL ||
879 	    (ondisk_len != strlen(ancestor_target) ||
880 	    memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
881 		have_local_change = 1;
882 
883 	deriv_len = strlen(deriv_target);
884 	if (ancestor_target == NULL ||
885 	    (deriv_len != strlen(ancestor_target) ||
886 	    memcmp(deriv_target, ancestor_target, deriv_len) != 0))
887 		have_incoming_change = 1;
888 
889 	if (!have_local_change && !have_incoming_change) {
890 		if (ancestor_target) {
891 			/* Both sides made the same change. */
892 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
893 			    path);
894 		} else if (deriv_len == ondisk_len &&
895 		    memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
896 			/* Both sides added the same symlink. */
897 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
898 			    path);
899 		} else {
900 			/* Both sides added symlinks which don't match. */
901 			err = install_symlink_conflict(deriv_target,
902 			    deriv_base_commit_id, ancestor_target,
903 			    label_orig, ondisk_target, ondisk_path);
904 			if (err)
905 				goto done;
906 			err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
907 			    path);
908 		}
909 	} else if (!have_local_change && have_incoming_change) {
910 		/* Apply the incoming change. */
911 		err = update_symlink(ondisk_path, deriv_target,
912 		    strlen(deriv_target));
913 		if (err)
914 			goto done;
915 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
916 	} else if (have_local_change && have_incoming_change) {
917 		if (deriv_len == ondisk_len &&
918 		    memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
919 			/* Both sides made the same change. */
920 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
921 			    path);
922 		} else {
923 			err = install_symlink_conflict(deriv_target,
924 			    deriv_base_commit_id, ancestor_target, label_orig,
925 			    ondisk_target, ondisk_path);
926 			if (err)
927 				goto done;
928 			err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
929 			    path);
930 		}
931 	}
932 
933 done:
934 	free(ancestor_target);
935 	return err;
936 }
937 
938 static const struct got_error *
939 dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
940 {
941 	const struct got_error *err = NULL;
942 	char target_path[PATH_MAX];
943 	ssize_t target_len;
944 	size_t n;
945 	FILE *f;
946 
947 	*outfile = NULL;
948 
949 	f = got_opentemp();
950 	if (f == NULL)
951 		return got_error_from_errno("got_opentemp");
952 	target_len = readlink(ondisk_path, target_path, sizeof(target_path));
953 	if (target_len == -1) {
954 		err = got_error_from_errno2("readlink", ondisk_path);
955 		goto done;
956 	}
957 	n = fwrite(target_path, 1, target_len, f);
958 	if (n != target_len) {
959 		err = got_ferror(f, GOT_ERR_IO);
960 		goto done;
961 	}
962 	if (fflush(f) == EOF) {
963 		err = got_error_from_errno("fflush");
964 		goto done;
965 	}
966 	if (fseek(f, 0L, SEEK_SET) == -1) {
967 		err = got_ferror(f, GOT_ERR_IO);
968 		goto done;
969 	}
970 done:
971 	if (err)
972 		fclose(f);
973 	else
974 		*outfile = f;
975 	return err;
976 }
977 
978 /*
979  * Perform a 3-way merge where blob_orig acts as the common ancestor,
980  * blob_deriv acts as the first derived version, and the file on disk
981  * acts as the second derived version.
982  */
983 static const struct got_error *
984 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
985     struct got_blob_object *blob_orig, const char *ondisk_path,
986     const char *path, uint16_t st_mode, const char *label_orig,
987     struct got_blob_object *blob_deriv,
988     struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
989     got_worktree_checkout_cb progress_cb, void *progress_arg)
990 {
991 	const struct got_error *err = NULL;
992 	FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
993 	char *blob_orig_path = NULL;
994 	char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
995 	char *label_deriv = NULL, *parent = NULL;
996 
997 	*local_changes_subsumed = 0;
998 
999 	err = got_path_dirname(&parent, ondisk_path);
1000 	if (err)
1001 		return err;
1002 
1003 	if (blob_orig) {
1004 		if (asprintf(&base_path, "%s/got-merge-blob-orig",
1005 		    parent) == -1) {
1006 			err = got_error_from_errno("asprintf");
1007 			base_path = NULL;
1008 			goto done;
1009 		}
1010 
1011 		err = got_opentemp_named(&blob_orig_path, &f_orig,
1012 		    base_path, "");
1013 		if (err)
1014 			goto done;
1015 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
1016 		    blob_orig);
1017 		if (err)
1018 			goto done;
1019 		free(base_path);
1020 	} else {
1021 		/*
1022 		 * No common ancestor exists. This is an "add vs add" conflict
1023 		 * and we simply use an empty ancestor file to make both files
1024 		 * appear in the merged result in their entirety.
1025 		 */
1026 		f_orig = got_opentemp();
1027 		if (f_orig == NULL) {
1028 			err = got_error_from_errno("got_opentemp");
1029 			goto done;
1030 		}
1031 	}
1032 
1033 	if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1034 		err = got_error_from_errno("asprintf");
1035 		base_path = NULL;
1036 		goto done;
1037 	}
1038 
1039 	err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path, "");
1040 	if (err)
1041 		goto done;
1042 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1043 	    blob_deriv);
1044 	if (err)
1045 		goto done;
1046 
1047 	err = got_object_id_str(&id_str, deriv_base_commit_id);
1048 	if (err)
1049 		goto done;
1050 	if (asprintf(&label_deriv, "%s: commit %s",
1051 	    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1052 		err = got_error_from_errno("asprintf");
1053 		goto done;
1054 	}
1055 
1056 	/*
1057 	 * In order the run a 3-way merge with a symlink we copy the symlink's
1058 	 * target path into a temporary file and use that file with diff3.
1059 	 */
1060 	if (S_ISLNK(st_mode)) {
1061 		err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1062 		if (err)
1063 			goto done;
1064 	} else {
1065 		int fd;
1066 		fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1067 		if (fd == -1) {
1068 			err = got_error_from_errno2("open", ondisk_path);
1069 			goto done;
1070 		}
1071 		f_deriv2 = fdopen(fd, "r");
1072 		if (f_deriv2 == NULL) {
1073 			err = got_error_from_errno2("fdopen", ondisk_path);
1074 			close(fd);
1075 			goto done;
1076 		}
1077 	}
1078 
1079 	err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1080 	    f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1081 	    NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1082 done:
1083 	if (f_orig && fclose(f_orig) == EOF && err == NULL)
1084 		err = got_error_from_errno("fclose");
1085 	if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1086 		err = got_error_from_errno("fclose");
1087 	if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1088 		err = got_error_from_errno("fclose");
1089 	free(base_path);
1090 	if (blob_orig_path) {
1091 		unlink(blob_orig_path);
1092 		free(blob_orig_path);
1093 	}
1094 	if (blob_deriv_path) {
1095 		unlink(blob_deriv_path);
1096 		free(blob_deriv_path);
1097 	}
1098 	free(id_str);
1099 	free(label_deriv);
1100 	free(parent);
1101 	return err;
1102 }
1103 
1104 static const struct got_error *
1105 create_fileindex_entry(struct got_fileindex_entry **new_iep,
1106     struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1107     int wt_fd, const char *path, struct got_object_id *blob_id)
1108 {
1109 	const struct got_error *err = NULL;
1110 	struct got_fileindex_entry *new_ie;
1111 
1112 	*new_iep = NULL;
1113 
1114 	err = got_fileindex_entry_alloc(&new_ie, path);
1115 	if (err)
1116 		return err;
1117 
1118 	err = got_fileindex_entry_update(new_ie, wt_fd, path,
1119 	    blob_id->sha1, base_commit_id->sha1, 1);
1120 	if (err)
1121 		goto done;
1122 
1123 	err = got_fileindex_entry_add(fileindex, new_ie);
1124 done:
1125 	if (err)
1126 		got_fileindex_entry_free(new_ie);
1127 	else
1128 		*new_iep = new_ie;
1129 	return err;
1130 }
1131 
1132 static mode_t
1133 get_ondisk_perms(int executable, mode_t st_mode)
1134 {
1135 	mode_t xbits = S_IXUSR;
1136 
1137 	if (executable) {
1138 		/* Map read bits to execute bits. */
1139 		if (st_mode & S_IRGRP)
1140 			xbits |= S_IXGRP;
1141 		if (st_mode & S_IROTH)
1142 			xbits |= S_IXOTH;
1143 		return st_mode | xbits;
1144 	}
1145 
1146 	return st_mode;
1147 }
1148 
1149 /* forward declaration */
1150 static const struct got_error *
1151 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1152     const char *path, mode_t te_mode, mode_t st_mode,
1153     struct got_blob_object *blob, int restoring_missing_file,
1154     int reverting_versioned_file, int installing_bad_symlink,
1155     int path_is_unversioned, struct got_repository *repo,
1156     got_worktree_checkout_cb progress_cb, void *progress_arg);
1157 
1158 /*
1159  * This function assumes that the provided symlink target points at a
1160  * safe location in the work tree!
1161  */
1162 static const struct got_error *
1163 replace_existing_symlink(int *did_something, const char *ondisk_path,
1164     const char *target_path, size_t target_len)
1165 {
1166 	const struct got_error *err = NULL;
1167 	ssize_t elen;
1168 	char etarget[PATH_MAX];
1169 	int fd;
1170 
1171 	*did_something = 0;
1172 
1173 	/*
1174 	 * "Bad" symlinks (those pointing outside the work tree or into the
1175 	 * .got directory) are installed in the work tree as a regular file
1176 	 * which contains the bad symlink target path.
1177 	 * The new symlink target has already been checked for safety by our
1178 	 * caller. If we can successfully open a regular file then we simply
1179 	 * replace this file with a symlink below.
1180 	 */
1181 	fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1182 	if (fd == -1) {
1183 		if (!got_err_open_nofollow_on_symlink())
1184 			return got_error_from_errno2("open", ondisk_path);
1185 
1186 		/* We are updating an existing on-disk symlink. */
1187 		elen = readlink(ondisk_path, etarget, sizeof(etarget));
1188 		if (elen == -1)
1189 			return got_error_from_errno2("readlink", ondisk_path);
1190 
1191 		if (elen == target_len &&
1192 		    memcmp(etarget, target_path, target_len) == 0)
1193 			return NULL; /* nothing to do */
1194 	}
1195 
1196 	*did_something = 1;
1197 	err = update_symlink(ondisk_path, target_path, target_len);
1198 	if (fd != -1 && close(fd) == -1 && err == NULL)
1199 		err = got_error_from_errno2("close", ondisk_path);
1200 	return err;
1201 }
1202 
1203 static const struct got_error *
1204 is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1205     size_t target_len, const char *ondisk_path, const char *wtroot_path,
1206     const char *meta_dir)
1207 {
1208 	const struct got_error *err = NULL;
1209 	char canonpath[PATH_MAX];
1210 	char *path_got = NULL;
1211 
1212 	*is_bad_symlink = 0;
1213 
1214 	if (target_len >= sizeof(canonpath)) {
1215 		*is_bad_symlink = 1;
1216 		return NULL;
1217 	}
1218 
1219 	/*
1220 	 * We do not use realpath(3) to resolve the symlink's target
1221 	 * path because we don't want to resolve symlinks recursively.
1222 	 * Instead we make the path absolute and then canonicalize it.
1223 	 * Relative symlink target lookup should begin at the directory
1224 	 * in which the blob object is being installed.
1225 	 */
1226 	if (!got_path_is_absolute(target_path)) {
1227 		char *abspath, *parent;
1228 		err = got_path_dirname(&parent, ondisk_path);
1229 		if (err)
1230 			return err;
1231 		if (asprintf(&abspath, "%s/%s",  parent, target_path) == -1) {
1232 			free(parent);
1233 			return got_error_from_errno("asprintf");
1234 		}
1235 		free(parent);
1236 		if (strlen(abspath) >= sizeof(canonpath)) {
1237 			err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1238 			free(abspath);
1239 			return err;
1240 		}
1241 		err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1242 		free(abspath);
1243 		if (err)
1244 			return err;
1245 	} else {
1246 		err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1247 		if (err)
1248 			return err;
1249 	}
1250 
1251 	/* Only allow symlinks pointing at paths within the work tree. */
1252 	if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1253 		*is_bad_symlink = 1;
1254 		return NULL;
1255 	}
1256 
1257 	/* Do not allow symlinks pointing into the meta directory. */
1258 	if (asprintf(&path_got, "%s/%s", wtroot_path, meta_dir) == -1)
1259 		return got_error_from_errno("asprintf");
1260 	if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1261 		*is_bad_symlink = 1;
1262 
1263 	free(path_got);
1264 	return NULL;
1265 }
1266 
1267 static const struct got_error *
1268 install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1269     const char *ondisk_path, const char *path, struct got_blob_object *blob,
1270     int restoring_missing_file, int reverting_versioned_file,
1271     int path_is_unversioned, int allow_bad_symlinks,
1272     struct got_repository *repo,
1273     got_worktree_checkout_cb progress_cb, void *progress_arg)
1274 {
1275 	const struct got_error *err = NULL;
1276 	char target_path[PATH_MAX];
1277 	size_t len, target_len = 0;
1278 	const uint8_t *buf = got_object_blob_get_read_buf(blob);
1279 	size_t hdrlen = got_object_blob_get_hdrlen(blob);
1280 
1281 	*is_bad_symlink = 0;
1282 
1283 	/*
1284 	 * Blob object content specifies the target path of the link.
1285 	 * If a symbolic link cannot be installed we instead create
1286 	 * a regular file which contains the link target path stored
1287 	 * in the blob object.
1288 	 */
1289 	do {
1290 		err = got_object_blob_read_block(&len, blob);
1291 		if (err)
1292 			return err;
1293 
1294 		if (len + target_len >= sizeof(target_path)) {
1295 			/* Path too long; install as a regular file. */
1296 			*is_bad_symlink = 1;
1297 			got_object_blob_rewind(blob);
1298 			return install_blob(worktree, ondisk_path, path,
1299 			    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1300 			    restoring_missing_file, reverting_versioned_file,
1301 			    1, path_is_unversioned, repo, progress_cb,
1302 			    progress_arg);
1303 		}
1304 		if (len > 0) {
1305 			/* Skip blob object header first time around. */
1306 			memcpy(target_path + target_len, buf + hdrlen,
1307 			    len - hdrlen);
1308 			target_len += len - hdrlen;
1309 			hdrlen = 0;
1310 		}
1311 	} while (len != 0);
1312 	target_path[target_len] = '\0';
1313 
1314 	err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1315 	    ondisk_path, worktree->root_path, worktree->meta_dir);
1316 	if (err)
1317 		return err;
1318 
1319 	if (*is_bad_symlink && !allow_bad_symlinks) {
1320 		/* install as a regular file */
1321 		got_object_blob_rewind(blob);
1322 		err = install_blob(worktree, ondisk_path, path,
1323 		    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1324 		    restoring_missing_file, reverting_versioned_file, 1,
1325 		    path_is_unversioned, repo, progress_cb, progress_arg);
1326 		return err;
1327 	}
1328 
1329 	if (symlink(target_path, ondisk_path) == -1) {
1330 		if (errno == EEXIST) {
1331 			int symlink_replaced;
1332 			if (path_is_unversioned) {
1333 				err = (*progress_cb)(progress_arg,
1334 				    GOT_STATUS_UNVERSIONED, path);
1335 				return err;
1336 			}
1337 			err = replace_existing_symlink(&symlink_replaced,
1338 			    ondisk_path, target_path, target_len);
1339 			if (err)
1340 				return err;
1341 			if (progress_cb) {
1342 				if (symlink_replaced) {
1343 					err = (*progress_cb)(progress_arg,
1344 					    reverting_versioned_file ?
1345 					    GOT_STATUS_REVERT :
1346 					    GOT_STATUS_UPDATE, path);
1347 				} else {
1348 					err = (*progress_cb)(progress_arg,
1349 					    GOT_STATUS_EXISTS, path);
1350 				}
1351 			}
1352 			return err; /* Nothing else to do. */
1353 		}
1354 
1355 		if (errno == ENOENT) {
1356 			char *parent;
1357 			err = got_path_dirname(&parent, ondisk_path);
1358 			if (err)
1359 				return err;
1360 			err = got_path_mkdir(parent);
1361 			free(parent);
1362 			if (err)
1363 				return err;
1364 			/*
1365 			 * Retry, and fall through to error handling
1366 			 * below if this second attempt fails.
1367 			 */
1368 			if (symlink(target_path, ondisk_path) != -1) {
1369 				err = NULL; /* success */
1370 				if (progress_cb) {
1371 					err = (*progress_cb)(progress_arg,
1372 					    reverting_versioned_file ?
1373 					    GOT_STATUS_REVERT : GOT_STATUS_ADD,
1374 					    path);
1375 				}
1376 				return err;
1377 			}
1378 		}
1379 
1380 		/* Handle errors from first or second creation attempt. */
1381 		if (errno == ENAMETOOLONG) {
1382 			/* bad target path; install as a regular file */
1383 			*is_bad_symlink = 1;
1384 			got_object_blob_rewind(blob);
1385 			err = install_blob(worktree, ondisk_path, path,
1386 			    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1387 			    restoring_missing_file, reverting_versioned_file, 1,
1388 			    path_is_unversioned, repo,
1389 			    progress_cb, progress_arg);
1390 		} else if (errno == ENOTDIR) {
1391 			err = got_error_path(ondisk_path,
1392 			    GOT_ERR_FILE_OBSTRUCTED);
1393 		} else {
1394 			err = got_error_from_errno3("symlink",
1395 			    target_path, ondisk_path);
1396 		}
1397 	} else if (progress_cb)
1398 		err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1399 		    GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1400 	return err;
1401 }
1402 
1403 static const struct got_error *
1404 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1405     const char *path, mode_t te_mode, mode_t st_mode,
1406     struct got_blob_object *blob, int restoring_missing_file,
1407     int reverting_versioned_file, int installing_bad_symlink,
1408     int path_is_unversioned, struct got_repository *repo,
1409     got_worktree_checkout_cb progress_cb, void *progress_arg)
1410 {
1411 	const struct got_error *err = NULL;
1412 	int fd = -1;
1413 	size_t len, hdrlen;
1414 	int update = 0;
1415 	char *tmppath = NULL;
1416 	mode_t mode;
1417 
1418 	mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1419 	fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1420 	    O_CLOEXEC, mode);
1421 	if (fd == -1) {
1422 		if (errno == ENOENT || errno == ENOTDIR) {
1423 			char *parent;
1424 			err = got_path_dirname(&parent, path);
1425 			if (err)
1426 				return err;
1427 			err = add_dir_on_disk(worktree, parent);
1428 			if (err && err->code == GOT_ERR_FILE_OBSTRUCTED)
1429 				err = got_error_path(path, err->code);
1430 			free(parent);
1431 			if (err)
1432 				return err;
1433 			fd = open(ondisk_path,
1434 			    O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1435 			    mode);
1436 			if (fd == -1)
1437 				return got_error_from_errno2("open",
1438 				    ondisk_path);
1439 		} else if (errno == EEXIST) {
1440 			if (path_is_unversioned) {
1441 				err = (*progress_cb)(progress_arg,
1442 				    GOT_STATUS_UNVERSIONED, path);
1443 				goto done;
1444 			}
1445 			if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1446 			    !S_ISREG(st_mode) && !installing_bad_symlink) {
1447 				/* TODO file is obstructed; do something */
1448 				err = got_error_path(ondisk_path,
1449 				    GOT_ERR_FILE_OBSTRUCTED);
1450 				goto done;
1451 			} else {
1452 				err = got_opentemp_named_fd(&tmppath, &fd,
1453 				    ondisk_path, "");
1454 				if (err)
1455 					goto done;
1456 				update = 1;
1457 
1458 				if (fchmod(fd, apply_umask(mode)) == -1) {
1459 					err = got_error_from_errno2("fchmod",
1460 					    tmppath);
1461 					goto done;
1462 				}
1463 			}
1464 		} else
1465 			return got_error_from_errno2("open", ondisk_path);
1466 	}
1467 
1468 	if (progress_cb) {
1469 		if (restoring_missing_file)
1470 			err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1471 			    path);
1472 		else if (reverting_versioned_file)
1473 			err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1474 			    path);
1475 		else
1476 			err = (*progress_cb)(progress_arg,
1477 			    update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1478 		if (err)
1479 			goto done;
1480 	}
1481 
1482 	hdrlen = got_object_blob_get_hdrlen(blob);
1483 	do {
1484 		const uint8_t *buf = got_object_blob_get_read_buf(blob);
1485 		err = got_object_blob_read_block(&len, blob);
1486 		if (err)
1487 			break;
1488 		if (len > 0) {
1489 			/* Skip blob object header first time around. */
1490 			ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1491 			if (outlen == -1) {
1492 				err = got_error_from_errno("write");
1493 				goto done;
1494 			} else if (outlen != len - hdrlen) {
1495 				err = got_error(GOT_ERR_IO);
1496 				goto done;
1497 			}
1498 			hdrlen = 0;
1499 		}
1500 	} while (len != 0);
1501 
1502 	if (fsync(fd) != 0) {
1503 		err = got_error_from_errno("fsync");
1504 		goto done;
1505 	}
1506 
1507 	if (update) {
1508 		if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1509 			err = got_error_from_errno2("unlink", ondisk_path);
1510 			goto done;
1511 		}
1512 		if (rename(tmppath, ondisk_path) != 0) {
1513 			err = got_error_from_errno3("rename", tmppath,
1514 			    ondisk_path);
1515 			goto done;
1516 		}
1517 		free(tmppath);
1518 		tmppath = NULL;
1519 	}
1520 
1521 done:
1522 	if (fd != -1 && close(fd) == -1 && err == NULL)
1523 		err = got_error_from_errno("close");
1524 	if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1525 		err = got_error_from_errno2("unlink", tmppath);
1526 	free(tmppath);
1527 	return err;
1528 }
1529 
1530 /*
1531  * Upgrade STATUS_MODIFY to STATUS_CONFLICT if a
1532  * conflict marker is found in newly added lines only.
1533  */
1534 static const struct got_error *
1535 get_modified_file_content_status(unsigned char *status,
1536     struct got_blob_object *blob, const char *path, struct stat *sb,
1537     FILE *ondisk_file)
1538 {
1539 	const struct got_error *err, *free_err;
1540 	const char *markers[3] = {
1541 		GOT_DIFF_CONFLICT_MARKER_BEGIN,
1542 		GOT_DIFF_CONFLICT_MARKER_SEP,
1543 		GOT_DIFF_CONFLICT_MARKER_END
1544 	};
1545 	FILE *f1 = NULL;
1546 	struct got_diffreg_result *diffreg_result = NULL;
1547 	struct diff_result *r;
1548 	int nchunks_parsed, n, i = 0, ln = 0;
1549 	char *line = NULL;
1550 	size_t linesize = 0;
1551 	ssize_t linelen;
1552 
1553 	if (*status != GOT_STATUS_MODIFY)
1554 		return NULL;
1555 
1556 	f1 = got_opentemp();
1557 	if (f1 == NULL)
1558 		return got_error_from_errno("got_opentemp");
1559 
1560 	if (blob) {
1561 		got_object_blob_rewind(blob);
1562 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
1563 		if (err)
1564 			goto done;
1565 	}
1566 
1567 	err = got_diff_files(&diffreg_result, f1, 1, NULL, ondisk_file,
1568 	    1, NULL, 0, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
1569 	if (err)
1570 		goto done;
1571 
1572 	r = diffreg_result->result;
1573 
1574 	for (n = 0; n < r->chunks.len; n += nchunks_parsed) {
1575 		struct diff_chunk *c;
1576 		struct diff_chunk_context cc = {};
1577 		off_t pos;
1578 
1579 		/*
1580 		 * We can optimise a little by advancing straight
1581 		 * to the next chunk if this one has no added lines.
1582 		 */
1583 		c = diff_chunk_get(r, n);
1584 
1585 		if (diff_chunk_type(c) != CHUNK_PLUS) {
1586 			nchunks_parsed = 1;
1587 			continue;  /* removed or unchanged lines */
1588 		}
1589 
1590 		pos = diff_chunk_get_right_start_pos(c);
1591 		if (fseek(ondisk_file, pos, SEEK_SET) == -1) {
1592 			err = got_ferror(ondisk_file, GOT_ERR_IO);
1593 			goto done;
1594 		}
1595 
1596 		diff_chunk_context_load_change(&cc, &nchunks_parsed, r, n, 0);
1597 		ln = cc.right.start;
1598 
1599 		while (ln < cc.right.end) {
1600 			linelen = getline(&line, &linesize, ondisk_file);
1601 			if (linelen == -1) {
1602 				if (feof(ondisk_file))
1603 					break;
1604 				err = got_ferror(ondisk_file, GOT_ERR_IO);
1605 				break;
1606 			}
1607 
1608 			if (line && strncmp(line, markers[i],
1609 			    strlen(markers[i])) == 0) {
1610 				if (strcmp(markers[i],
1611 				    GOT_DIFF_CONFLICT_MARKER_END) == 0) {
1612 					*status = GOT_STATUS_CONFLICT;
1613 					goto done;
1614 				} else
1615 					i++;
1616 			}
1617 			++ln;
1618 		}
1619 	}
1620 
1621 done:
1622 	free(line);
1623 	if (f1 != NULL && fclose(f1) == EOF && err == NULL)
1624 		err = got_error_from_errno("fclose");
1625 	free_err = got_diffreg_result_free(diffreg_result);
1626 	if (err == NULL)
1627 		err = free_err;
1628 
1629 	return err;
1630 }
1631 
1632 static int
1633 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1634 {
1635 	mode_t ie_mode = got_fileindex_perms_to_st(ie);
1636 	return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1637 }
1638 
1639 static int
1640 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1641 {
1642 	return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1643 	    ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1644 	    ie->mtime_sec == sb->st_mtim.tv_sec &&
1645 	    ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1646 	    ie->size == (sb->st_size & 0xffffffff) &&
1647 	    !xbit_differs(ie, sb->st_mode));
1648 }
1649 
1650 static unsigned char
1651 get_staged_status(struct got_fileindex_entry *ie)
1652 {
1653 	switch (got_fileindex_entry_stage_get(ie)) {
1654 	case GOT_FILEIDX_STAGE_ADD:
1655 		return GOT_STATUS_ADD;
1656 	case GOT_FILEIDX_STAGE_DELETE:
1657 		return GOT_STATUS_DELETE;
1658 	case GOT_FILEIDX_STAGE_MODIFY:
1659 		return GOT_STATUS_MODIFY;
1660 	default:
1661 		return GOT_STATUS_NO_CHANGE;
1662 	}
1663 }
1664 
1665 static const struct got_error *
1666 get_symlink_modification_status(unsigned char *status,
1667     struct got_fileindex_entry *ie, const char *abspath,
1668     int dirfd, const char *de_name, struct got_blob_object *blob)
1669 {
1670 	const struct got_error *err = NULL;
1671 	char target_path[PATH_MAX];
1672 	char etarget[PATH_MAX];
1673 	ssize_t elen;
1674 	size_t len, target_len = 0;
1675 	const uint8_t *buf = got_object_blob_get_read_buf(blob);
1676 	size_t hdrlen = got_object_blob_get_hdrlen(blob);
1677 
1678 	*status = GOT_STATUS_NO_CHANGE;
1679 
1680 	/* Blob object content specifies the target path of the link. */
1681 	do {
1682 		err = got_object_blob_read_block(&len, blob);
1683 		if (err)
1684 			return err;
1685 		if (len + target_len >= sizeof(target_path)) {
1686 			/*
1687 			 * Should not happen. The blob contents were OK
1688 			 * when this symlink was installed.
1689 			 */
1690 			return got_error(GOT_ERR_NO_SPACE);
1691 		}
1692 		if (len > 0) {
1693 			/* Skip blob object header first time around. */
1694 			memcpy(target_path + target_len, buf + hdrlen,
1695 			    len - hdrlen);
1696 			target_len += len - hdrlen;
1697 			hdrlen = 0;
1698 		}
1699 	} while (len != 0);
1700 	target_path[target_len] = '\0';
1701 
1702 	if (dirfd != -1) {
1703 		elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1704 		if (elen == -1)
1705 			return got_error_from_errno2("readlinkat", abspath);
1706 	} else {
1707 		elen = readlink(abspath, etarget, sizeof(etarget));
1708 		if (elen == -1)
1709 			return got_error_from_errno2("readlink", abspath);
1710 	}
1711 
1712 	if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1713 		*status = GOT_STATUS_MODIFY;
1714 
1715 	return NULL;
1716 }
1717 
1718 static const struct got_error *
1719 get_file_status(unsigned char *status, struct stat *sb,
1720     struct got_fileindex_entry *ie, const char *abspath,
1721     int dirfd, const char *de_name, struct got_repository *repo)
1722 {
1723 	const struct got_error *err = NULL;
1724 	struct got_object_id id;
1725 	size_t hdrlen;
1726 	int fd = -1, fd1 = -1;
1727 	FILE *f = NULL;
1728 	uint8_t fbuf[8192];
1729 	struct got_blob_object *blob = NULL;
1730 	size_t flen, blen;
1731 	unsigned char staged_status;
1732 
1733 	staged_status = get_staged_status(ie);
1734 	*status = GOT_STATUS_NO_CHANGE;
1735 	memset(sb, 0, sizeof(*sb));
1736 
1737 	/*
1738 	 * Whenever the caller provides a directory descriptor and a
1739 	 * directory entry name for the file, use them! This prevents
1740 	 * race conditions if filesystem paths change beneath our feet.
1741 	 */
1742 	if (dirfd != -1) {
1743 		if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1744 			if (errno == ENOENT) {
1745 				if (got_fileindex_entry_has_file_on_disk(ie))
1746 					*status = GOT_STATUS_MISSING;
1747 				else
1748 					*status = GOT_STATUS_DELETE;
1749 				goto done;
1750 			}
1751 			err = got_error_from_errno2("fstatat", abspath);
1752 			goto done;
1753 		}
1754 	} else {
1755 		fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1756 		if (fd == -1 && errno != ENOENT &&
1757 		    !got_err_open_nofollow_on_symlink())
1758 			return got_error_from_errno2("open", abspath);
1759 		else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1760 			if (lstat(abspath, sb) == -1)
1761 				return got_error_from_errno2("lstat", abspath);
1762 		} else if (fd == -1 || fstat(fd, sb) == -1) {
1763 			if (errno == ENOENT) {
1764 				if (got_fileindex_entry_has_file_on_disk(ie))
1765 					*status = GOT_STATUS_MISSING;
1766 				else
1767 					*status = GOT_STATUS_DELETE;
1768 				goto done;
1769 			}
1770 			err = got_error_from_errno2("fstat", abspath);
1771 			goto done;
1772 		}
1773 	}
1774 
1775 	if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1776 		*status = GOT_STATUS_OBSTRUCTED;
1777 		goto done;
1778 	}
1779 
1780 	if (!got_fileindex_entry_has_file_on_disk(ie)) {
1781 		*status = GOT_STATUS_DELETE;
1782 		goto done;
1783 	} else if (!got_fileindex_entry_has_blob(ie) &&
1784 	    staged_status != GOT_STATUS_ADD) {
1785 		*status = GOT_STATUS_ADD;
1786 		goto done;
1787 	}
1788 
1789 	if (!stat_info_differs(ie, sb))
1790 		goto done;
1791 
1792 	if (S_ISLNK(sb->st_mode) &&
1793 	    got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1794 		*status = GOT_STATUS_MODIFY;
1795 		goto done;
1796 	}
1797 
1798 	if (staged_status == GOT_STATUS_MODIFY ||
1799 	    staged_status == GOT_STATUS_ADD)
1800 		got_fileindex_entry_get_staged_blob_id(&id, ie);
1801 	else
1802 		got_fileindex_entry_get_blob_id(&id, ie);
1803 
1804 	fd1 = got_opentempfd();
1805 	if (fd1 == -1) {
1806 		err = got_error_from_errno("got_opentempfd");
1807 		goto done;
1808 	}
1809 	err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1810 	if (err)
1811 		goto done;
1812 
1813 	if (S_ISLNK(sb->st_mode)) {
1814 		err = get_symlink_modification_status(status, ie,
1815 		    abspath, dirfd, de_name, blob);
1816 		goto done;
1817 	}
1818 
1819 	if (dirfd != -1) {
1820 		fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1821 		if (fd == -1) {
1822 			err = got_error_from_errno2("openat", abspath);
1823 			goto done;
1824 		}
1825 	}
1826 
1827 	f = fdopen(fd, "r");
1828 	if (f == NULL) {
1829 		err = got_error_from_errno2("fdopen", abspath);
1830 		goto done;
1831 	}
1832 	fd = -1;
1833 	hdrlen = got_object_blob_get_hdrlen(blob);
1834 	for (;;) {
1835 		const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1836 		err = got_object_blob_read_block(&blen, blob);
1837 		if (err)
1838 			goto done;
1839 		/* Skip length of blob object header first time around. */
1840 		flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1841 		if (flen == 0 && ferror(f)) {
1842 			err = got_error_from_errno("fread");
1843 			goto done;
1844 		}
1845 		if (blen - hdrlen == 0) {
1846 			if (flen != 0)
1847 				*status = GOT_STATUS_MODIFY;
1848 			break;
1849 		} else if (flen == 0) {
1850 			if (blen - hdrlen != 0)
1851 				*status = GOT_STATUS_MODIFY;
1852 			break;
1853 		} else if (blen - hdrlen == flen) {
1854 			/* Skip blob object header first time around. */
1855 			if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1856 				*status = GOT_STATUS_MODIFY;
1857 				break;
1858 			}
1859 		} else {
1860 			*status = GOT_STATUS_MODIFY;
1861 			break;
1862 		}
1863 		hdrlen = 0;
1864 	}
1865 
1866 	if (*status == GOT_STATUS_MODIFY) {
1867 		rewind(f);
1868 		err = get_modified_file_content_status(status, blob, ie->path,
1869 		    sb, f);
1870 	} else if (xbit_differs(ie, sb->st_mode))
1871 		*status = GOT_STATUS_MODE_CHANGE;
1872 done:
1873 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1874 		err = got_error_from_errno("close");
1875 	if (blob)
1876 		got_object_blob_close(blob);
1877 	if (f != NULL && fclose(f) == EOF && err == NULL)
1878 		err = got_error_from_errno2("fclose", abspath);
1879 	if (fd != -1 && close(fd) == -1 && err == NULL)
1880 		err = got_error_from_errno2("close", abspath);
1881 	return err;
1882 }
1883 
1884 /*
1885  * Update timestamps in the file index if a file is unmodified and
1886  * we had to run a full content comparison to find out.
1887  */
1888 static const struct got_error *
1889 sync_timestamps(int wt_fd, const char *path, unsigned char status,
1890     struct got_fileindex_entry *ie, struct stat *sb)
1891 {
1892 	if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1893 		return got_fileindex_entry_update(ie, wt_fd, path,
1894 		    ie->blob_sha1, ie->commit_sha1, 1);
1895 
1896 	return NULL;
1897 }
1898 
1899 static const struct got_error *remove_ondisk_file(const char *, const char *);
1900 
1901 static const struct got_error *
1902 update_blob(struct got_worktree *worktree,
1903     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1904     struct got_tree_entry *te, const char *path,
1905     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1906     void *progress_arg)
1907 {
1908 	const struct got_error *err = NULL;
1909 	struct got_blob_object *blob = NULL;
1910 	char *ondisk_path = NULL;
1911 	unsigned char status = GOT_STATUS_NO_CHANGE;
1912 	struct stat sb;
1913 	int fd1 = -1, fd2 = -1;
1914 
1915 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1916 		return got_error_from_errno("asprintf");
1917 
1918 	if (ie) {
1919 		if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1920 			err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1921 			goto done;
1922 		}
1923 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1924 		    repo);
1925 		if (err)
1926 			goto done;
1927 		if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1928 			sb.st_mode = got_fileindex_perms_to_st(ie);
1929 	} else {
1930 		if (stat(ondisk_path, &sb) == -1) {
1931 			if (errno != ENOENT && errno != ENOTDIR) {
1932 				err = got_error_from_errno2("stat",
1933 				    ondisk_path);
1934 				goto done;
1935 			}
1936 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
1937 			status = GOT_STATUS_UNVERSIONED;
1938 		} else {
1939 			if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1940 				status = GOT_STATUS_UNVERSIONED;
1941 			else
1942 				status = GOT_STATUS_OBSTRUCTED;
1943 		}
1944 	}
1945 
1946 	if (status == GOT_STATUS_OBSTRUCTED) {
1947 		if (ie)
1948 			got_fileindex_entry_mark_skipped(ie);
1949 		err = (*progress_cb)(progress_arg, status, path);
1950 		goto done;
1951 	}
1952 	if (status == GOT_STATUS_CONFLICT) {
1953 		if (ie)
1954 			got_fileindex_entry_mark_skipped(ie);
1955 		err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1956 		    path);
1957 		goto done;
1958 	}
1959 
1960 	if (S_ISDIR(te->mode)) { /* file changing into a directory */
1961 		if (status == GOT_STATUS_UNVERSIONED) {
1962 			err = (*progress_cb)(progress_arg, status, path);
1963 		} else if (status != GOT_STATUS_NO_CHANGE &&
1964 		    status != GOT_STATUS_DELETE &&
1965 		    status != GOT_STATUS_NONEXISTENT &&
1966 		    status != GOT_STATUS_MISSING) {
1967 			err = (*progress_cb)(progress_arg,
1968 			    GOT_STATUS_CANNOT_DELETE, path);
1969 		} else if (ie) {
1970 			if (status != GOT_STATUS_DELETE &&
1971 			    status != GOT_STATUS_NONEXISTENT &&
1972 			    status != GOT_STATUS_MISSING) {
1973 				err = remove_ondisk_file(worktree->root_path,
1974 				    ie->path);
1975 				if (err && !(err->code == GOT_ERR_ERRNO &&
1976 				    errno == ENOENT))
1977 					goto done;
1978 			}
1979 			got_fileindex_entry_remove(fileindex, ie);
1980 			err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE,
1981 			    ie->path);
1982 		}
1983 		goto done; /* nothing else to do */
1984 	}
1985 
1986 	if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1987 	    (S_ISLNK(te->mode) ||
1988 	    (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1989 		/*
1990 		 * This is a regular file or an installed bad symlink.
1991 		 * If the file index indicates that this file is already
1992 		 * up-to-date with respect to the repository we can skip
1993 		 * updating contents of this file.
1994 		 */
1995 		if (got_fileindex_entry_has_commit(ie) &&
1996 		    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1997 		    SHA1_DIGEST_LENGTH) == 0) {
1998 			/* Same commit. */
1999 			err = sync_timestamps(worktree->root_fd,
2000 			    path, status, ie, &sb);
2001 			if (err)
2002 				goto done;
2003 			err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
2004 			    path);
2005 			goto done;
2006 		}
2007 		if (got_fileindex_entry_has_blob(ie) &&
2008 		    memcmp(ie->blob_sha1, te->id.sha1,
2009 		    SHA1_DIGEST_LENGTH) == 0) {
2010 			/* Different commit but the same blob. */
2011 			if (got_fileindex_entry_has_commit(ie)) {
2012 				/* Update the base commit ID of this file. */
2013 				memcpy(ie->commit_sha1,
2014 				    worktree->base_commit_id->sha1,
2015 				    sizeof(ie->commit_sha1));
2016 			}
2017 			err = sync_timestamps(worktree->root_fd,
2018 			    path, status, ie, &sb);
2019 			if (err)
2020 				goto done;
2021 			err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
2022 			    path);
2023 			goto done;
2024 		}
2025 	}
2026 
2027 	fd1 = got_opentempfd();
2028 	if (fd1 == -1) {
2029 		err = got_error_from_errno("got_opentempfd");
2030 		goto done;
2031 	}
2032 	err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
2033 	if (err)
2034 		goto done;
2035 
2036 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
2037 		int update_timestamps;
2038 		struct got_blob_object *blob2 = NULL;
2039 		char *label_orig = NULL;
2040 		if (got_fileindex_entry_has_blob(ie)) {
2041 			fd2 = got_opentempfd();
2042 			if (fd2 == -1) {
2043 				err = got_error_from_errno("got_opentempfd");
2044 				goto done;
2045 			}
2046 			struct got_object_id id2;
2047 			got_fileindex_entry_get_blob_id(&id2, ie);
2048 			err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
2049 			    fd2);
2050 			if (err)
2051 				goto done;
2052 		}
2053 		if (got_fileindex_entry_has_commit(ie)) {
2054 			char id_str[SHA1_DIGEST_STRING_LENGTH];
2055 			if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
2056 			    sizeof(id_str)) == NULL) {
2057 				err = got_error_path(id_str,
2058 				    GOT_ERR_BAD_OBJ_ID_STR);
2059 				goto done;
2060 			}
2061 			if (asprintf(&label_orig, "%s: commit %s",
2062 			    GOT_MERGE_LABEL_BASE, id_str) == -1) {
2063 				err = got_error_from_errno("asprintf");
2064 				goto done;
2065 			}
2066 		}
2067 		if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
2068 			char *link_target;
2069 			err = got_object_blob_read_to_str(&link_target, blob);
2070 			if (err)
2071 				goto done;
2072 			err = merge_symlink(worktree, blob2, ondisk_path, path,
2073 			    label_orig, link_target, worktree->base_commit_id,
2074 			    repo, progress_cb, progress_arg);
2075 			free(link_target);
2076 		} else {
2077 			err = merge_blob(&update_timestamps, worktree, blob2,
2078 			    ondisk_path, path, sb.st_mode, label_orig, blob,
2079 			    worktree->base_commit_id, repo,
2080 			    progress_cb, progress_arg);
2081 		}
2082 		free(label_orig);
2083 		if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
2084 			err = got_error_from_errno("close");
2085 			goto done;
2086 		}
2087 		if (blob2)
2088 			got_object_blob_close(blob2);
2089 		if (err)
2090 			goto done;
2091 		/*
2092 		 * Do not update timestamps of files with local changes.
2093 		 * Otherwise, a future status walk would treat them as
2094 		 * unmodified files again.
2095 		 */
2096 		err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2097 		    blob->id.sha1, worktree->base_commit_id->sha1,
2098 		    update_timestamps);
2099 	} else if (status == GOT_STATUS_MODE_CHANGE) {
2100 		err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2101 		    blob->id.sha1, worktree->base_commit_id->sha1, 0);
2102 	} else if (status == GOT_STATUS_DELETE) {
2103 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
2104 		if (err)
2105 			goto done;
2106 		err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2107 		    blob->id.sha1, worktree->base_commit_id->sha1, 0);
2108 		if (err)
2109 			goto done;
2110 	} else {
2111 		int is_bad_symlink = 0;
2112 		if (S_ISLNK(te->mode)) {
2113 			err = install_symlink(&is_bad_symlink, worktree,
2114 			    ondisk_path, path, blob,
2115 			    status == GOT_STATUS_MISSING, 0,
2116 			    status == GOT_STATUS_UNVERSIONED, 0,
2117 			    repo, progress_cb, progress_arg);
2118 		} else {
2119 			err = install_blob(worktree, ondisk_path, path,
2120 			    te->mode, sb.st_mode, blob,
2121 			    status == GOT_STATUS_MISSING, 0, 0,
2122 			    status == GOT_STATUS_UNVERSIONED, repo,
2123 			    progress_cb, progress_arg);
2124 		}
2125 		if (err)
2126 			goto done;
2127 
2128 		if (ie) {
2129 			err = got_fileindex_entry_update(ie,
2130 			    worktree->root_fd, path, blob->id.sha1,
2131 			    worktree->base_commit_id->sha1, 1);
2132 		} else {
2133 			err = create_fileindex_entry(&ie, fileindex,
2134 			    worktree->base_commit_id, worktree->root_fd, path,
2135 			    &blob->id);
2136 		}
2137 		if (err)
2138 			goto done;
2139 
2140 		if (is_bad_symlink) {
2141 			got_fileindex_entry_filetype_set(ie,
2142 			    GOT_FILEIDX_MODE_BAD_SYMLINK);
2143 		}
2144 	}
2145 
2146 	if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2147 		err = got_error_from_errno("close");
2148 		goto done;
2149 	}
2150 	got_object_blob_close(blob);
2151 done:
2152 	free(ondisk_path);
2153 	return err;
2154 }
2155 
2156 static const struct got_error *
2157 remove_ondisk_file(const char *root_path, const char *path)
2158 {
2159 	const struct got_error *err = NULL;
2160 	char *ondisk_path = NULL, *parent = NULL;
2161 
2162 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2163 		return got_error_from_errno("asprintf");
2164 
2165 	if (unlink(ondisk_path) == -1) {
2166 		if (errno != ENOENT)
2167 			err = got_error_from_errno2("unlink", ondisk_path);
2168 	} else {
2169 		size_t root_len = strlen(root_path);
2170 		err = got_path_dirname(&parent, ondisk_path);
2171 		if (err)
2172 			goto done;
2173 		while (got_path_cmp(parent, root_path,
2174 		    strlen(parent), root_len) != 0) {
2175 			free(ondisk_path);
2176 			ondisk_path = parent;
2177 			parent = NULL;
2178 			if (rmdir(ondisk_path) == -1) {
2179 				if (errno != ENOTEMPTY)
2180 					err = got_error_from_errno2("rmdir",
2181 					    ondisk_path);
2182 				break;
2183 			}
2184 			err = got_path_dirname(&parent, ondisk_path);
2185 			if (err)
2186 				break;
2187 		}
2188 	}
2189 done:
2190 	free(ondisk_path);
2191 	free(parent);
2192 	return err;
2193 }
2194 
2195 static const struct got_error *
2196 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2197     struct got_fileindex_entry *ie, struct got_repository *repo,
2198     got_worktree_checkout_cb progress_cb, void *progress_arg)
2199 {
2200 	const struct got_error *err = NULL;
2201 	unsigned char status;
2202 	struct stat sb;
2203 	char *ondisk_path;
2204 
2205 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2206 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2207 
2208 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2209 	    == -1)
2210 		return got_error_from_errno("asprintf");
2211 
2212 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2213 	if (err)
2214 		goto done;
2215 
2216 	if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2217 		char ondisk_target[PATH_MAX];
2218 		ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2219 		    sizeof(ondisk_target));
2220 		if (ondisk_len == -1) {
2221 			err = got_error_from_errno2("readlink", ondisk_path);
2222 			goto done;
2223 		}
2224 		ondisk_target[ondisk_len] = '\0';
2225 		err = install_symlink_conflict(NULL, worktree->base_commit_id,
2226 		    NULL, NULL, /* XXX pass common ancestor info? */
2227 		    ondisk_target, ondisk_path);
2228 		if (err)
2229 			goto done;
2230 		err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2231 		    ie->path);
2232 		goto done;
2233 	}
2234 
2235 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2236 	    status == GOT_STATUS_ADD) {
2237 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2238 		if (err)
2239 			goto done;
2240 		/*
2241 		 * Preserve the working file and change the deleted blob's
2242 		 * entry into a schedule-add entry.
2243 		 */
2244 		err = got_fileindex_entry_update(ie, worktree->root_fd,
2245 		    ie->path, NULL, NULL, 0);
2246 	} else {
2247 		err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2248 		if (err)
2249 			goto done;
2250 		if (status == GOT_STATUS_NO_CHANGE) {
2251 			err = remove_ondisk_file(worktree->root_path, ie->path);
2252 			if (err)
2253 				goto done;
2254 		}
2255 		got_fileindex_entry_remove(fileindex, ie);
2256 	}
2257 done:
2258 	free(ondisk_path);
2259 	return err;
2260 }
2261 
2262 struct diff_cb_arg {
2263     struct got_fileindex *fileindex;
2264     struct got_worktree *worktree;
2265     struct got_repository *repo;
2266     got_worktree_checkout_cb progress_cb;
2267     void *progress_arg;
2268     got_cancel_cb cancel_cb;
2269     void *cancel_arg;
2270 };
2271 
2272 static const struct got_error *
2273 diff_old_new(void *arg, struct got_fileindex_entry *ie,
2274     struct got_tree_entry *te, const char *parent_path)
2275 {
2276 	struct diff_cb_arg *a = arg;
2277 
2278 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2279 		return got_error(GOT_ERR_CANCELLED);
2280 
2281 	return update_blob(a->worktree, a->fileindex, ie, te,
2282 	    ie->path, a->repo, a->progress_cb, a->progress_arg);
2283 }
2284 
2285 static const struct got_error *
2286 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2287 {
2288 	struct diff_cb_arg *a = arg;
2289 
2290 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2291 		return got_error(GOT_ERR_CANCELLED);
2292 
2293 	return delete_blob(a->worktree, a->fileindex, ie,
2294 	    a->repo, a->progress_cb, a->progress_arg);
2295 }
2296 
2297 static const struct got_error *
2298 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2299 {
2300 	struct diff_cb_arg *a = arg;
2301 	const struct got_error *err;
2302 	char *path;
2303 
2304 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2305 		return got_error(GOT_ERR_CANCELLED);
2306 
2307 	if (got_object_tree_entry_is_submodule(te))
2308 		return NULL;
2309 
2310 	if (!S_ISREG(te->mode) && !S_ISLNK(te->mode))
2311 		return NULL;
2312 
2313 	if (asprintf(&path, "%s%s%s", parent_path,
2314 	    parent_path[0] ? "/" : "", te->name)
2315 	    == -1)
2316 		return got_error_from_errno("asprintf");
2317 
2318 	err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2319 	    a->repo, a->progress_cb, a->progress_arg);
2320 
2321 	free(path);
2322 	return err;
2323 }
2324 
2325 const struct got_error *
2326 got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2327 {
2328 	uint32_t uuid_status;
2329 
2330 	uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2331 	if (uuid_status != uuid_s_ok) {
2332 		*uuidstr = NULL;
2333 		return got_error_uuid(uuid_status, "uuid_to_string");
2334 	}
2335 
2336 	return NULL;
2337 }
2338 
2339 static const struct got_error *
2340 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2341 {
2342 	const struct got_error *err = NULL;
2343 	char *uuidstr = NULL;
2344 
2345 	*refname = NULL;
2346 
2347 	err = got_worktree_get_uuid(&uuidstr, worktree);
2348 	if (err)
2349 		return err;
2350 
2351 	if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2352 		err = got_error_from_errno("asprintf");
2353 		*refname = NULL;
2354 	}
2355 	free(uuidstr);
2356 	return err;
2357 }
2358 
2359 const struct got_error *
2360 got_worktree_get_logmsg_ref_name(char **refname, struct got_worktree *worktree,
2361     const char *prefix)
2362 {
2363 	return get_ref_name(refname, worktree, prefix);
2364 }
2365 
2366 static const struct got_error *
2367 get_base_ref_name(char **refname, struct got_worktree *worktree)
2368 {
2369 	return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2370 }
2371 
2372 static const struct got_error *
2373 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2374 {
2375 	return get_ref_name(refname, worktree,
2376 	    GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2377 }
2378 
2379 static const struct got_error *
2380 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2381 {
2382 	return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2383 }
2384 
2385 static const struct got_error *
2386 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2387 {
2388 	return get_ref_name(refname, worktree,
2389 	    GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2390 }
2391 
2392 static const struct got_error *
2393 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2394 {
2395 	return get_ref_name(refname, worktree,
2396 	    GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2397 }
2398 
2399 static const struct got_error *
2400 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2401 {
2402 	return get_ref_name(refname, worktree,
2403 	    GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2404 }
2405 
2406 static const struct got_error *
2407 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2408 {
2409 	return get_ref_name(refname, worktree,
2410 	    GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2411 }
2412 
2413 static const struct got_error *
2414 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2415 {
2416 	return get_ref_name(refname, worktree,
2417 	    GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2418 }
2419 
2420 static const struct got_error *
2421 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2422 {
2423 	return get_ref_name(refname, worktree,
2424 	    GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2425 }
2426 
2427 const struct got_error *
2428 got_worktree_get_histedit_script_path(char **path,
2429     struct got_worktree *worktree)
2430 {
2431 	if (asprintf(path, "%s/%s/%s", worktree->root_path,
2432 	    worktree->meta_dir, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2433 		*path = NULL;
2434 		return got_error_from_errno("asprintf");
2435 	}
2436 	return NULL;
2437 }
2438 
2439 static const struct got_error *
2440 get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2441 {
2442 	return get_ref_name(refname, worktree,
2443 	    GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2444 }
2445 
2446 static const struct got_error *
2447 get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2448 {
2449 	return get_ref_name(refname, worktree,
2450 	    GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2451 }
2452 
2453 /*
2454  * Prevent Git's garbage collector from deleting our base commit by
2455  * setting a reference to our base commit's ID.
2456  */
2457 static const struct got_error *
2458 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2459 {
2460 	const struct got_error *err = NULL;
2461 	struct got_reference *ref = NULL;
2462 	char *refname;
2463 
2464 	err = get_base_ref_name(&refname, worktree);
2465 	if (err)
2466 		return err;
2467 
2468 	err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2469 	if (err)
2470 		goto done;
2471 
2472 	err = got_ref_write(ref, repo);
2473 done:
2474 	free(refname);
2475 	if (ref)
2476 		got_ref_close(ref);
2477 	return err;
2478 }
2479 
2480 static const struct got_error *
2481 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2482 {
2483 	const struct got_error *err = NULL;
2484 
2485 	if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2486 	    worktree->meta_dir, GOT_WORKTREE_FILE_INDEX) == -1) {
2487 		err = got_error_from_errno("asprintf");
2488 		*fileindex_path = NULL;
2489 	}
2490 	return err;
2491 }
2492 
2493 
2494 static const struct got_error *
2495 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2496     struct got_worktree *worktree)
2497 {
2498 	const struct got_error *err = NULL;
2499 	FILE *index = NULL;
2500 
2501 	*fileindex_path = NULL;
2502 	*fileindex = got_fileindex_alloc();
2503 	if (*fileindex == NULL)
2504 		return got_error_from_errno("got_fileindex_alloc");
2505 
2506 	err = get_fileindex_path(fileindex_path, worktree);
2507 	if (err)
2508 		goto done;
2509 
2510 	index = fopen(*fileindex_path, "rbe");
2511 	if (index == NULL) {
2512 		if (errno != ENOENT)
2513 			err = got_error_from_errno2("fopen", *fileindex_path);
2514 	} else {
2515 		err = got_fileindex_read(*fileindex, index);
2516 		if (fclose(index) == EOF && err == NULL)
2517 			err = got_error_from_errno("fclose");
2518 	}
2519 done:
2520 	if (err) {
2521 		free(*fileindex_path);
2522 		*fileindex_path = NULL;
2523 		got_fileindex_free(*fileindex);
2524 		*fileindex = NULL;
2525 	}
2526 	return err;
2527 }
2528 
2529 struct bump_base_commit_id_arg {
2530 	struct got_object_id *base_commit_id;
2531 	const char *path;
2532 	size_t path_len;
2533 	const char *entry_name;
2534 	got_worktree_checkout_cb progress_cb;
2535 	void *progress_arg;
2536 };
2537 
2538 static const struct got_error *
2539 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2540 {
2541 	const struct got_error *err;
2542 	struct bump_base_commit_id_arg *a = arg;
2543 
2544 	if (a->entry_name) {
2545 		if (strcmp(ie->path, a->path) != 0)
2546 			return NULL;
2547 	} else if (!got_path_is_child(ie->path, a->path, a->path_len))
2548 		return NULL;
2549 
2550 	if (got_fileindex_entry_was_skipped(ie))
2551 		return NULL;
2552 
2553 	if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2554 	    SHA1_DIGEST_LENGTH) == 0)
2555 		return NULL;
2556 
2557 	if (a->progress_cb) {
2558 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2559 		    ie->path);
2560 		if (err)
2561 			return err;
2562 	}
2563 	memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2564 	return NULL;
2565 }
2566 
2567 /* Bump base commit ID of all files within an updated part of the work tree. */
2568 static const struct got_error *
2569 bump_base_commit_id_everywhere(struct got_worktree *worktree,
2570     struct got_fileindex *fileindex,
2571     got_worktree_checkout_cb progress_cb, void *progress_arg)
2572 {
2573 	struct bump_base_commit_id_arg bbc_arg;
2574 
2575 	bbc_arg.base_commit_id = worktree->base_commit_id;
2576 	bbc_arg.entry_name = NULL;
2577 	bbc_arg.path = "";
2578 	bbc_arg.path_len = 0;
2579 	bbc_arg.progress_cb = progress_cb;
2580 	bbc_arg.progress_arg = progress_arg;
2581 
2582 	return got_fileindex_for_each_entry_safe(fileindex,
2583 	    bump_base_commit_id, &bbc_arg);
2584 }
2585 
2586 static const struct got_error *
2587 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2588 {
2589 	const struct got_error *err = NULL;
2590 	char *new_fileindex_path = NULL;
2591 	FILE *new_index = NULL;
2592 	struct timespec timeout;
2593 
2594 	err = got_opentemp_named(&new_fileindex_path, &new_index,
2595 	    fileindex_path, "");
2596 	if (err)
2597 		goto done;
2598 
2599 	err = got_fileindex_write(fileindex, new_index);
2600 	if (err)
2601 		goto done;
2602 
2603 	if (rename(new_fileindex_path, fileindex_path) != 0) {
2604 		err = got_error_from_errno3("rename", new_fileindex_path,
2605 		    fileindex_path);
2606 		unlink(new_fileindex_path);
2607 	}
2608 
2609 	/*
2610 	 * Sleep for a short amount of time to ensure that files modified after
2611 	 * this program exits have a different time stamp from the one which
2612 	 * was recorded in the file index.
2613 	 */
2614 	timeout.tv_sec = 0;
2615 	timeout.tv_nsec = 1;
2616 	nanosleep(&timeout,  NULL);
2617 done:
2618 	if (new_index)
2619 		fclose(new_index);
2620 	free(new_fileindex_path);
2621 	return err;
2622 }
2623 
2624 static const struct got_error *
2625 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2626     struct got_object_id **tree_id, const char *wt_relpath,
2627     struct got_commit_object *base_commit, struct got_worktree *worktree,
2628     struct got_repository *repo)
2629 {
2630 	const struct got_error *err = NULL;
2631 	struct got_object_id *id = NULL;
2632 	char *in_repo_path = NULL;
2633 	int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2634 
2635 	*entry_type = GOT_OBJ_TYPE_ANY;
2636 	*tree_relpath = NULL;
2637 	*tree_id = NULL;
2638 
2639 	if (wt_relpath[0] == '\0') {
2640 		/* Check out all files within the work tree. */
2641 		*entry_type = GOT_OBJ_TYPE_TREE;
2642 		*tree_relpath = strdup("");
2643 		if (*tree_relpath == NULL) {
2644 			err = got_error_from_errno("strdup");
2645 			goto done;
2646 		}
2647 		err = got_object_id_by_path(tree_id, repo, base_commit,
2648 		    worktree->path_prefix);
2649 		if (err)
2650 			goto done;
2651 		return NULL;
2652 	}
2653 
2654 	/* Check out a subset of files in the work tree. */
2655 
2656 	if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2657 	    is_root_wt ? "" : "/", wt_relpath) == -1) {
2658 		err = got_error_from_errno("asprintf");
2659 		goto done;
2660 	}
2661 
2662 	err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2663 	if (err)
2664 		goto done;
2665 
2666 	free(in_repo_path);
2667 	in_repo_path = NULL;
2668 
2669 	err = got_object_get_type(entry_type, repo, id);
2670 	if (err)
2671 		goto done;
2672 
2673 	if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2674 		/* Check out a single file. */
2675 		if (strchr(wt_relpath, '/')  == NULL) {
2676 			/* Check out a single file in work tree's root dir. */
2677 			in_repo_path = strdup(worktree->path_prefix);
2678 			if (in_repo_path == NULL) {
2679 				err = got_error_from_errno("strdup");
2680 				goto done;
2681 			}
2682 			*tree_relpath = strdup("");
2683 			if (*tree_relpath == NULL) {
2684 				err = got_error_from_errno("strdup");
2685 				goto done;
2686 			}
2687 		} else {
2688 			/* Check out a single file in a subdirectory. */
2689 			err = got_path_dirname(tree_relpath, wt_relpath);
2690 			if (err)
2691 				return err;
2692 			if (asprintf(&in_repo_path, "%s%s%s",
2693 			    worktree->path_prefix, is_root_wt ? "" : "/",
2694 			    *tree_relpath) == -1) {
2695 				err = got_error_from_errno("asprintf");
2696 				goto done;
2697 			}
2698 		}
2699 		err = got_object_id_by_path(tree_id, repo,
2700 		    base_commit, in_repo_path);
2701 	} else {
2702 		/* Check out all files within a subdirectory. */
2703 		*tree_id = got_object_id_dup(id);
2704 		if (*tree_id == NULL) {
2705 			err = got_error_from_errno("got_object_id_dup");
2706 			goto done;
2707 		}
2708 		*tree_relpath = strdup(wt_relpath);
2709 		if (*tree_relpath == NULL) {
2710 			err = got_error_from_errno("strdup");
2711 			goto done;
2712 		}
2713 	}
2714 done:
2715 	free(id);
2716 	free(in_repo_path);
2717 	if (err) {
2718 		*entry_type = GOT_OBJ_TYPE_ANY;
2719 		free(*tree_relpath);
2720 		*tree_relpath = NULL;
2721 		free(*tree_id);
2722 		*tree_id = NULL;
2723 	}
2724 	return err;
2725 }
2726 
2727 static const struct got_error *
2728 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2729     const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2730     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2731     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2732 {
2733 	const struct got_error *err = NULL;
2734 	struct got_commit_object *commit = NULL;
2735 	struct got_tree_object *tree = NULL;
2736 	struct got_fileindex_diff_tree_cb diff_cb;
2737 	struct diff_cb_arg arg;
2738 
2739 	err = ref_base_commit(worktree, repo);
2740 	if (err) {
2741 		if (!(err->code == GOT_ERR_ERRNO &&
2742 		    (errno == EACCES || errno == EROFS)))
2743 			goto done;
2744 		err = (*progress_cb)(progress_arg,
2745 		    GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2746 		if (err)
2747 			return err;
2748 	}
2749 
2750 	err = got_object_open_as_commit(&commit, repo,
2751 	    worktree->base_commit_id);
2752 	if (err)
2753 		goto done;
2754 
2755 	err = got_object_open_as_tree(&tree, repo, tree_id);
2756 	if (err)
2757 		goto done;
2758 
2759 	if (entry_name &&
2760 	    got_object_tree_find_entry(tree, entry_name) == NULL) {
2761 		err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2762 		goto done;
2763 	}
2764 
2765 	diff_cb.diff_old_new = diff_old_new;
2766 	diff_cb.diff_old = diff_old;
2767 	diff_cb.diff_new = diff_new;
2768 	arg.fileindex = fileindex;
2769 	arg.worktree = worktree;
2770 	arg.repo = repo;
2771 	arg.progress_cb = progress_cb;
2772 	arg.progress_arg = progress_arg;
2773 	arg.cancel_cb = cancel_cb;
2774 	arg.cancel_arg = cancel_arg;
2775 	err = got_fileindex_diff_tree(fileindex, tree, relpath,
2776 	    entry_name, repo, &diff_cb, &arg);
2777 done:
2778 	if (tree)
2779 		got_object_tree_close(tree);
2780 	if (commit)
2781 		got_object_commit_close(commit);
2782 	return err;
2783 }
2784 
2785 const struct got_error *
2786 got_worktree_checkout_files(struct got_worktree *worktree,
2787     struct got_pathlist_head *paths, struct got_repository *repo,
2788     got_worktree_checkout_cb progress_cb, void *progress_arg,
2789     got_cancel_cb cancel_cb, void *cancel_arg)
2790 {
2791 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2792 	struct got_commit_object *commit = NULL;
2793 	struct got_tree_object *tree = NULL;
2794 	struct got_fileindex *fileindex = NULL;
2795 	char *fileindex_path = NULL;
2796 	struct got_pathlist_entry *pe;
2797 	struct tree_path_data {
2798 		STAILQ_ENTRY(tree_path_data) entry;
2799 		struct got_object_id *tree_id;
2800 		int entry_type;
2801 		char *relpath;
2802 		char *entry_name;
2803 	} *tpd = NULL;
2804 	STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2805 
2806 	STAILQ_INIT(&tree_paths);
2807 
2808 	err = lock_worktree(worktree, LOCK_EX);
2809 	if (err)
2810 		return err;
2811 
2812 	err = got_object_open_as_commit(&commit, repo,
2813 	    worktree->base_commit_id);
2814 	if (err)
2815 		goto done;
2816 
2817 	/* Map all specified paths to in-repository trees. */
2818 	TAILQ_FOREACH(pe, paths, entry) {
2819 		tpd = malloc(sizeof(*tpd));
2820 		if (tpd == NULL) {
2821 			err = got_error_from_errno("malloc");
2822 			goto done;
2823 		}
2824 
2825 		err = find_tree_entry_for_checkout(&tpd->entry_type,
2826 		    &tpd->relpath, &tpd->tree_id, pe->path, commit,
2827 		    worktree, repo);
2828 		if (err) {
2829 			free(tpd);
2830 			goto done;
2831 		}
2832 
2833 		if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2834 			err = got_path_basename(&tpd->entry_name, pe->path);
2835 			if (err) {
2836 				free(tpd->relpath);
2837 				free(tpd->tree_id);
2838 				free(tpd);
2839 				goto done;
2840 			}
2841 		} else
2842 			tpd->entry_name = NULL;
2843 
2844 		STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2845 	}
2846 
2847 	/*
2848 	 * Read the file index.
2849 	 * Checking out files is supposed to be an idempotent operation.
2850 	 * If the on-disk file index is incomplete we will try to complete it.
2851 	 */
2852 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2853 	if (err)
2854 		goto done;
2855 
2856 	tpd = STAILQ_FIRST(&tree_paths);
2857 	TAILQ_FOREACH(pe, paths, entry) {
2858 		struct bump_base_commit_id_arg bbc_arg;
2859 
2860 		err = checkout_files(worktree, fileindex, tpd->relpath,
2861 		    tpd->tree_id, tpd->entry_name, repo,
2862 		    progress_cb, progress_arg, cancel_cb, cancel_arg);
2863 		if (err)
2864 			break;
2865 
2866 		bbc_arg.base_commit_id = worktree->base_commit_id;
2867 		bbc_arg.entry_name = tpd->entry_name;
2868 		bbc_arg.path = pe->path;
2869 		bbc_arg.path_len = pe->path_len;
2870 		bbc_arg.progress_cb = progress_cb;
2871 		bbc_arg.progress_arg = progress_arg;
2872 		err = got_fileindex_for_each_entry_safe(fileindex,
2873 		    bump_base_commit_id, &bbc_arg);
2874 		if (err)
2875 			break;
2876 
2877 		tpd = STAILQ_NEXT(tpd, entry);
2878 	}
2879 	sync_err = sync_fileindex(fileindex, fileindex_path);
2880 	if (sync_err && err == NULL)
2881 		err = sync_err;
2882 done:
2883 	free(fileindex_path);
2884 	if (tree)
2885 		got_object_tree_close(tree);
2886 	if (commit)
2887 		got_object_commit_close(commit);
2888 	if (fileindex)
2889 		got_fileindex_free(fileindex);
2890 	while (!STAILQ_EMPTY(&tree_paths)) {
2891 		tpd = STAILQ_FIRST(&tree_paths);
2892 		STAILQ_REMOVE_HEAD(&tree_paths, entry);
2893 		free(tpd->relpath);
2894 		free(tpd->tree_id);
2895 		free(tpd);
2896 	}
2897 	unlockerr = lock_worktree(worktree, LOCK_SH);
2898 	if (unlockerr && err == NULL)
2899 		err = unlockerr;
2900 	return err;
2901 }
2902 
2903 static const struct got_error *
2904 add_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2905     struct got_fileindex_entry *ie, const char *ondisk_path,
2906     const char *path2, struct got_blob_object *blob2, mode_t mode2,
2907     int restoring_missing_file, int reverting_versioned_file,
2908     int path_is_unversioned, int allow_bad_symlinks,
2909     struct got_repository *repo,
2910     got_worktree_checkout_cb progress_cb, void *progress_arg)
2911 {
2912 	const struct got_error *err = NULL;
2913 	int is_bad_symlink = 0;
2914 
2915 	if (S_ISLNK(mode2)) {
2916 		err = install_symlink(&is_bad_symlink,
2917 		    worktree, ondisk_path, path2, blob2,
2918 		    restoring_missing_file,
2919 		    reverting_versioned_file,
2920 		    path_is_unversioned, allow_bad_symlinks,
2921 		    repo, progress_cb, progress_arg);
2922 	} else {
2923 		err = install_blob(worktree, ondisk_path, path2,
2924 		    mode2, GOT_DEFAULT_FILE_MODE, blob2,
2925 		    restoring_missing_file, reverting_versioned_file, 0,
2926 		    path_is_unversioned, repo, progress_cb, progress_arg);
2927 	}
2928 	if (err)
2929 		return err;
2930 	if (ie == NULL) {
2931 		/* Adding an unversioned file. */
2932 		err = got_fileindex_entry_alloc(&ie, path2);
2933 		if (err)
2934 			return err;
2935 		err = got_fileindex_entry_update(ie,
2936 		    worktree->root_fd, path2, NULL, NULL, 1);
2937 		if (err) {
2938 			got_fileindex_entry_free(ie);
2939 			return err;
2940 		}
2941 		err = got_fileindex_entry_add(fileindex, ie);
2942 		if (err) {
2943 			got_fileindex_entry_free(ie);
2944 			return err;
2945 		}
2946 	} else {
2947 		/* Re-adding a locally deleted file. */
2948 		err = got_fileindex_entry_update(ie,
2949 		    worktree->root_fd, path2, ie->blob_sha1,
2950 		    worktree->base_commit_id->sha1, 0);
2951 		if (err)
2952 			return err;
2953 	}
2954 
2955 	if (is_bad_symlink) {
2956 		got_fileindex_entry_filetype_set(ie,
2957 		    GOT_FILEIDX_MODE_BAD_SYMLINK);
2958 	}
2959 
2960 	return NULL;
2961 }
2962 
2963 struct merge_file_cb_arg {
2964     struct got_worktree *worktree;
2965     struct got_fileindex *fileindex;
2966     got_worktree_checkout_cb progress_cb;
2967     void *progress_arg;
2968     got_cancel_cb cancel_cb;
2969     void *cancel_arg;
2970     const char *label_orig;
2971     struct got_object_id *commit_id2;
2972     int allow_bad_symlinks;
2973 };
2974 
2975 static const struct got_error *
2976 merge_file_cb(void *arg, struct got_blob_object *blob1,
2977     struct got_blob_object *blob2, FILE *f1, FILE *f2,
2978     struct got_object_id *id1, struct got_object_id *id2,
2979     const char *path1, const char *path2,
2980     mode_t mode1, mode_t mode2, struct got_repository *repo)
2981 {
2982 	static const struct got_error *err = NULL;
2983 	struct merge_file_cb_arg *a = arg;
2984 	struct got_fileindex_entry *ie;
2985 	char *ondisk_path = NULL;
2986 	struct stat sb;
2987 	unsigned char status;
2988 	int local_changes_subsumed;
2989 	FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2990 	char *id_str = NULL, *label_deriv2 = NULL;
2991 
2992 	if (blob1 && blob2) {
2993 		ie = got_fileindex_entry_get(a->fileindex, path2,
2994 		    strlen(path2));
2995 		if (ie == NULL)
2996 			return (*a->progress_cb)(a->progress_arg,
2997 			    GOT_STATUS_MISSING, path2);
2998 
2999 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3000 		    path2) == -1)
3001 			return got_error_from_errno("asprintf");
3002 
3003 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
3004 		    repo);
3005 		if (err)
3006 			goto done;
3007 
3008 		if (status == GOT_STATUS_DELETE) {
3009 			err = (*a->progress_cb)(a->progress_arg,
3010 			    GOT_STATUS_MERGE, path2);
3011 			goto done;
3012 		}
3013 		if (status != GOT_STATUS_NO_CHANGE &&
3014 		    status != GOT_STATUS_MODIFY &&
3015 		    status != GOT_STATUS_CONFLICT &&
3016 		    status != GOT_STATUS_ADD) {
3017 			err = (*a->progress_cb)(a->progress_arg, status, path2);
3018 			goto done;
3019 		}
3020 
3021 		if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
3022 			char *link_target2;
3023 			err = got_object_blob_read_to_str(&link_target2, blob2);
3024 			if (err)
3025 				goto done;
3026 			err = merge_symlink(a->worktree, blob1, ondisk_path,
3027 			    path2, a->label_orig, link_target2, a->commit_id2,
3028 			    repo, a->progress_cb, a->progress_arg);
3029 			free(link_target2);
3030 		} else {
3031 			int fd;
3032 
3033 			f_orig = got_opentemp();
3034 			if (f_orig == NULL) {
3035 				err = got_error_from_errno("got_opentemp");
3036 				goto done;
3037 			}
3038 			err = got_object_blob_dump_to_file(NULL, NULL, NULL,
3039 			    f_orig, blob1);
3040 			if (err)
3041 				goto done;
3042 
3043 			f_deriv2 = got_opentemp();
3044 			if (f_deriv2 == NULL)
3045 				goto done;
3046 			err = got_object_blob_dump_to_file(NULL, NULL, NULL,
3047 			    f_deriv2, blob2);
3048 			if (err)
3049 				goto done;
3050 
3051 			fd = open(ondisk_path,
3052 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3053 			if (fd == -1) {
3054 				err = got_error_from_errno2("open",
3055 				    ondisk_path);
3056 				goto done;
3057 			}
3058 			f_deriv = fdopen(fd, "r");
3059 			if (f_deriv == NULL) {
3060 				err = got_error_from_errno2("fdopen",
3061 				    ondisk_path);
3062 				close(fd);
3063 				goto done;
3064 			}
3065 			err = got_object_id_str(&id_str, a->commit_id2);
3066 			if (err)
3067 				goto done;
3068 			if (asprintf(&label_deriv2, "%s: commit %s",
3069 			    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
3070 				err = got_error_from_errno("asprintf");
3071 				goto done;
3072 			}
3073 			err = merge_file(&local_changes_subsumed, a->worktree,
3074 			    f_orig, f_deriv, f_deriv2, ondisk_path, path2,
3075 			    mode2, a->label_orig, NULL, label_deriv2,
3076 			    GOT_DIFF_ALGORITHM_PATIENCE, repo,
3077 			    a->progress_cb, a->progress_arg);
3078 		}
3079 	} else if (blob1) {
3080 		ie = got_fileindex_entry_get(a->fileindex, path1,
3081 		    strlen(path1));
3082 		if (ie == NULL)
3083 			return (*a->progress_cb)(a->progress_arg,
3084 			    GOT_STATUS_MISSING, path1);
3085 
3086 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3087 		    path1) == -1)
3088 			return got_error_from_errno("asprintf");
3089 
3090 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
3091 		    repo);
3092 		if (err)
3093 			goto done;
3094 
3095 		switch (status) {
3096 		case GOT_STATUS_NO_CHANGE:
3097 			err = (*a->progress_cb)(a->progress_arg,
3098 			    GOT_STATUS_DELETE, path1);
3099 			if (err)
3100 				goto done;
3101 			err = remove_ondisk_file(a->worktree->root_path, path1);
3102 			if (err)
3103 				goto done;
3104 			if (ie)
3105 				got_fileindex_entry_mark_deleted_from_disk(ie);
3106 			break;
3107 		case GOT_STATUS_DELETE:
3108 		case GOT_STATUS_MISSING:
3109 			err = (*a->progress_cb)(a->progress_arg,
3110 			    GOT_STATUS_DELETE, path1);
3111 			if (err)
3112 				goto done;
3113 			if (ie)
3114 				got_fileindex_entry_mark_deleted_from_disk(ie);
3115 			break;
3116 		case GOT_STATUS_ADD: {
3117 			struct got_object_id *id;
3118 			FILE *blob1_f;
3119 			off_t blob1_size;
3120 			/*
3121 			 * Delete the added file only if its content already
3122 			 * exists in the repository.
3123 			 */
3124 			err = got_object_blob_file_create(&id, &blob1_f,
3125 			    &blob1_size, path1);
3126 			if (err)
3127 				goto done;
3128 			if (got_object_id_cmp(id, id1) == 0) {
3129 				err = (*a->progress_cb)(a->progress_arg,
3130 				    GOT_STATUS_DELETE, path1);
3131 				if (err)
3132 					goto done;
3133 				err = remove_ondisk_file(a->worktree->root_path,
3134 				    path1);
3135 				if (err)
3136 					goto done;
3137 				if (ie)
3138 					got_fileindex_entry_remove(a->fileindex,
3139 					    ie);
3140 			} else {
3141 				err = (*a->progress_cb)(a->progress_arg,
3142 				    GOT_STATUS_CANNOT_DELETE, path1);
3143 			}
3144 			if (fclose(blob1_f) == EOF && err == NULL)
3145 				err = got_error_from_errno("fclose");
3146 			free(id);
3147 			if (err)
3148 				goto done;
3149 			break;
3150 		}
3151 		case GOT_STATUS_MODIFY:
3152 		case GOT_STATUS_CONFLICT:
3153 			err = (*a->progress_cb)(a->progress_arg,
3154 			    GOT_STATUS_CANNOT_DELETE, path1);
3155 			if (err)
3156 				goto done;
3157 			break;
3158 		case GOT_STATUS_OBSTRUCTED:
3159 			err = (*a->progress_cb)(a->progress_arg, status, path1);
3160 			if (err)
3161 				goto done;
3162 			break;
3163 		default:
3164 			break;
3165 		}
3166 	} else if (blob2) {
3167 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3168 		    path2) == -1)
3169 			return got_error_from_errno("asprintf");
3170 		ie = got_fileindex_entry_get(a->fileindex, path2,
3171 		    strlen(path2));
3172 		if (ie) {
3173 			err = get_file_status(&status, &sb, ie, ondisk_path,
3174 			    -1, NULL, repo);
3175 			if (err)
3176 				goto done;
3177 			if (status != GOT_STATUS_NO_CHANGE &&
3178 			    status != GOT_STATUS_MODIFY &&
3179 			    status != GOT_STATUS_CONFLICT &&
3180 			    status != GOT_STATUS_ADD &&
3181 			    status != GOT_STATUS_DELETE) {
3182 				err = (*a->progress_cb)(a->progress_arg,
3183 				    status, path2);
3184 				goto done;
3185 			}
3186 			if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3187 				char *link_target2;
3188 				err = got_object_blob_read_to_str(&link_target2,
3189 				    blob2);
3190 				if (err)
3191 					goto done;
3192 				err = merge_symlink(a->worktree, NULL,
3193 				    ondisk_path, path2, a->label_orig,
3194 				    link_target2, a->commit_id2, repo,
3195 				    a->progress_cb, a->progress_arg);
3196 				free(link_target2);
3197 			} else if (S_ISREG(sb.st_mode)) {
3198 				err = merge_blob(&local_changes_subsumed,
3199 				    a->worktree, NULL, ondisk_path, path2,
3200 				    sb.st_mode, a->label_orig, blob2,
3201 				    a->commit_id2, repo, a->progress_cb,
3202 				    a->progress_arg);
3203 			} else if (status != GOT_STATUS_DELETE) {
3204 				err = got_error_path(ondisk_path,
3205 				    GOT_ERR_FILE_OBSTRUCTED);
3206 			}
3207 			if (err)
3208 				goto done;
3209 			if (status == GOT_STATUS_DELETE) {
3210 				/* Re-add file with content from new blob. */
3211 				err = add_file(a->worktree, a->fileindex, ie,
3212 				    ondisk_path, path2, blob2, mode2,
3213 				    0, 0, 0, a->allow_bad_symlinks,
3214 				    repo, a->progress_cb, a->progress_arg);
3215 				if (err)
3216 					goto done;
3217 			}
3218 		} else {
3219 			err = add_file(a->worktree, a->fileindex, NULL,
3220 			     ondisk_path, path2, blob2, mode2,
3221 			     0, 0, 1, a->allow_bad_symlinks,
3222 			    repo, a->progress_cb, a->progress_arg);
3223 			if (err)
3224 				goto done;
3225 		}
3226 	}
3227 done:
3228 	if (f_orig && fclose(f_orig) == EOF && err == NULL)
3229 		err = got_error_from_errno("fclose");
3230 	if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3231 		err = got_error_from_errno("fclose");
3232 	if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3233 		err = got_error_from_errno("fclose");
3234 	free(id_str);
3235 	free(label_deriv2);
3236 	free(ondisk_path);
3237 	return err;
3238 }
3239 
3240 static const struct got_error *
3241 check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3242 {
3243 	struct got_worktree *worktree = arg;
3244 
3245 	/* Reject merges into a work tree with mixed base commits. */
3246 	if (got_fileindex_entry_has_commit(ie) &&
3247 	    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3248 	    SHA1_DIGEST_LENGTH) != 0)
3249 		return got_error(GOT_ERR_MIXED_COMMITS);
3250 
3251 	return NULL;
3252 }
3253 
3254 struct check_merge_conflicts_arg {
3255 	struct got_worktree *worktree;
3256 	struct got_fileindex *fileindex;
3257 	struct got_repository *repo;
3258 };
3259 
3260 static const struct got_error *
3261 check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3262     struct got_blob_object *blob2, FILE *f1, FILE *f2,
3263     struct got_object_id *id1, struct got_object_id *id2,
3264     const char *path1, const char *path2,
3265     mode_t mode1, mode_t mode2, struct got_repository *repo)
3266 {
3267 	const struct got_error *err = NULL;
3268 	struct check_merge_conflicts_arg *a = arg;
3269 	unsigned char status;
3270 	struct stat sb;
3271 	struct got_fileindex_entry *ie;
3272 	const char *path = path2 ? path2 : path1;
3273 	struct got_object_id *id = id2 ? id2 : id1;
3274 	char *ondisk_path;
3275 
3276 	if (id == NULL)
3277 		return NULL;
3278 
3279 	ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3280 	if (ie == NULL)
3281 		return NULL;
3282 
3283 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3284 	    == -1)
3285 		return got_error_from_errno("asprintf");
3286 
3287 	/* Reject merges into a work tree with conflicted files. */
3288 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3289 	free(ondisk_path);
3290 	if (err)
3291 		return err;
3292 	if (status == GOT_STATUS_CONFLICT)
3293 		return got_error(GOT_ERR_CONFLICTS);
3294 
3295 	return NULL;
3296 }
3297 
3298 static const struct got_error *
3299 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3300     const char *fileindex_path, struct got_object_id *commit_id1,
3301     struct got_object_id *commit_id2, struct got_repository *repo,
3302     got_worktree_checkout_cb progress_cb, void *progress_arg,
3303     got_cancel_cb cancel_cb, void *cancel_arg)
3304 {
3305 	const struct got_error *err = NULL, *sync_err;
3306 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3307 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3308 	struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3309 	struct check_merge_conflicts_arg cmc_arg;
3310 	struct merge_file_cb_arg arg;
3311 	char *label_orig = NULL;
3312 	FILE *f1 = NULL, *f2 = NULL;
3313 	int fd1 = -1, fd2 = -1;
3314 
3315 	if (commit_id1) {
3316 		err = got_object_open_as_commit(&commit1, repo, commit_id1);
3317 		if (err)
3318 			goto done;
3319 		err = got_object_id_by_path(&tree_id1, repo, commit1,
3320 		    worktree->path_prefix);
3321 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3322 			goto done;
3323 	}
3324 	if (tree_id1) {
3325 		char *id_str;
3326 
3327 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3328 		if (err)
3329 			goto done;
3330 
3331 		err = got_object_id_str(&id_str, commit_id1);
3332 		if (err)
3333 			goto done;
3334 
3335 		if (asprintf(&label_orig, "%s: commit %s",
3336 		    GOT_MERGE_LABEL_BASE, id_str) == -1) {
3337 			err = got_error_from_errno("asprintf");
3338 			free(id_str);
3339 			goto done;
3340 		}
3341 		free(id_str);
3342 
3343 		f1 = got_opentemp();
3344 		if (f1 == NULL) {
3345 			err = got_error_from_errno("got_opentemp");
3346 			goto done;
3347 		}
3348 	}
3349 
3350 	err = got_object_open_as_commit(&commit2, repo, commit_id2);
3351 	if (err)
3352 		goto done;
3353 
3354 	err = got_object_id_by_path(&tree_id2, repo, commit2,
3355 	    worktree->path_prefix);
3356 	if (err)
3357 		goto done;
3358 
3359 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3360 	if (err)
3361 		goto done;
3362 
3363 	f2 = got_opentemp();
3364 	if (f2 == NULL) {
3365 		err = got_error_from_errno("got_opentemp");
3366 		goto done;
3367 	}
3368 
3369 	fd1 = got_opentempfd();
3370 	if (fd1 == -1) {
3371 		err = got_error_from_errno("got_opentempfd");
3372 		goto done;
3373 	}
3374 
3375 	fd2 = got_opentempfd();
3376 	if (fd2 == -1) {
3377 		err = got_error_from_errno("got_opentempfd");
3378 		goto done;
3379 	}
3380 
3381 	cmc_arg.worktree = worktree;
3382 	cmc_arg.fileindex = fileindex;
3383 	cmc_arg.repo = repo;
3384 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3385 	    check_merge_conflicts, &cmc_arg, 0);
3386 	if (err)
3387 		goto done;
3388 
3389 	arg.worktree = worktree;
3390 	arg.fileindex = fileindex;
3391 	arg.progress_cb = progress_cb;
3392 	arg.progress_arg = progress_arg;
3393 	arg.cancel_cb = cancel_cb;
3394 	arg.cancel_arg = cancel_arg;
3395 	arg.label_orig = label_orig;
3396 	arg.commit_id2 = commit_id2;
3397 	arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3398 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3399 	    merge_file_cb, &arg, 1);
3400 	sync_err = sync_fileindex(fileindex, fileindex_path);
3401 	if (sync_err && err == NULL)
3402 		err = sync_err;
3403 done:
3404 	if (commit1)
3405 		got_object_commit_close(commit1);
3406 	if (commit2)
3407 		got_object_commit_close(commit2);
3408 	if (tree1)
3409 		got_object_tree_close(tree1);
3410 	if (tree2)
3411 		got_object_tree_close(tree2);
3412 	if (f1 && fclose(f1) == EOF && err == NULL)
3413 		err = got_error_from_errno("fclose");
3414 	if (f2 && fclose(f2) == EOF && err == NULL)
3415 		err = got_error_from_errno("fclose");
3416 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3417 		err = got_error_from_errno("close");
3418 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3419 		err = got_error_from_errno("close");
3420 	free(label_orig);
3421 	return err;
3422 }
3423 
3424 const struct got_error *
3425 got_worktree_merge_files(struct got_worktree *worktree,
3426     struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3427     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3428     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3429 {
3430 	const struct got_error *err, *unlockerr;
3431 	char *fileindex_path = NULL;
3432 	struct got_fileindex *fileindex = NULL;
3433 
3434 	err = lock_worktree(worktree, LOCK_EX);
3435 	if (err)
3436 		return err;
3437 
3438 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3439 	if (err)
3440 		goto done;
3441 
3442 	err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3443 	    worktree);
3444 	if (err)
3445 		goto done;
3446 
3447 	err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3448 	    commit_id2, repo, progress_cb, progress_arg,
3449 	    cancel_cb, cancel_arg);
3450 done:
3451 	if (fileindex)
3452 		got_fileindex_free(fileindex);
3453 	free(fileindex_path);
3454 	unlockerr = lock_worktree(worktree, LOCK_SH);
3455 	if (unlockerr && err == NULL)
3456 		err = unlockerr;
3457 	return err;
3458 }
3459 
3460 struct diff_dir_cb_arg {
3461     struct got_fileindex *fileindex;
3462     struct got_worktree *worktree;
3463     const char *status_path;
3464     size_t status_path_len;
3465     struct got_repository *repo;
3466     got_worktree_status_cb status_cb;
3467     void *status_arg;
3468     got_cancel_cb cancel_cb;
3469     void *cancel_arg;
3470     /* A pathlist containing per-directory pathlists of ignore patterns. */
3471     struct got_pathlist_head *ignores;
3472     int report_unchanged;
3473     int no_ignores;
3474 };
3475 
3476 static const struct got_error *
3477 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3478     int dirfd, const char *de_name,
3479     got_worktree_status_cb status_cb, void *status_arg,
3480     struct got_repository *repo, int report_unchanged)
3481 {
3482 	const struct got_error *err = NULL;
3483 	unsigned char status = GOT_STATUS_NO_CHANGE;
3484 	unsigned char staged_status;
3485 	struct stat sb;
3486 	struct got_object_id blob_id, commit_id, staged_blob_id;
3487 	struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3488 	struct got_object_id *staged_blob_idp = NULL;
3489 
3490 	staged_status = get_staged_status(ie);
3491 	err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3492 	if (err)
3493 		return err;
3494 
3495 	if (status == GOT_STATUS_NO_CHANGE &&
3496 	    staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3497 		return NULL;
3498 
3499 	if (got_fileindex_entry_has_blob(ie))
3500 		blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
3501 	if (got_fileindex_entry_has_commit(ie))
3502 		commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
3503 	if (staged_status == GOT_STATUS_ADD ||
3504 	    staged_status == GOT_STATUS_MODIFY) {
3505 		staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
3506 		    &staged_blob_id, ie);
3507 	}
3508 
3509 	return (*status_cb)(status_arg, status, staged_status,
3510 	    ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3511 }
3512 
3513 static const struct got_error *
3514 status_old_new(void *arg, struct got_fileindex_entry *ie,
3515     struct dirent *de, const char *parent_path, int dirfd)
3516 {
3517 	const struct got_error *err = NULL;
3518 	struct diff_dir_cb_arg *a = arg;
3519 	char *abspath;
3520 
3521 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3522 		return got_error(GOT_ERR_CANCELLED);
3523 
3524 	if (got_path_cmp(parent_path, a->status_path,
3525 	    strlen(parent_path), a->status_path_len) != 0 &&
3526 	    !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3527 		return NULL;
3528 
3529 	if (parent_path[0]) {
3530 		if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3531 		    parent_path, de->d_name) == -1)
3532 			return got_error_from_errno("asprintf");
3533 	} else {
3534 		if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3535 		    de->d_name) == -1)
3536 			return got_error_from_errno("asprintf");
3537 	}
3538 
3539 	err = report_file_status(ie, abspath, dirfd, de->d_name,
3540 	    a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3541 	free(abspath);
3542 	return err;
3543 }
3544 
3545 static const struct got_error *
3546 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3547 {
3548 	struct diff_dir_cb_arg *a = arg;
3549 	struct got_object_id blob_id, commit_id;
3550 	unsigned char status;
3551 
3552 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3553 		return got_error(GOT_ERR_CANCELLED);
3554 
3555 	if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3556 		return NULL;
3557 
3558 	got_fileindex_entry_get_blob_id(&blob_id, ie);
3559 	got_fileindex_entry_get_commit_id(&commit_id, ie);
3560 	if (got_fileindex_entry_has_file_on_disk(ie))
3561 		status = GOT_STATUS_MISSING;
3562 	else
3563 		status = GOT_STATUS_DELETE;
3564 	return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3565 	    ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3566 }
3567 
3568 static void
3569 free_ignores(struct got_pathlist_head *ignores)
3570 {
3571 	struct got_pathlist_entry *pe;
3572 
3573 	TAILQ_FOREACH(pe, ignores, entry) {
3574 		struct got_pathlist_head *ignorelist = pe->data;
3575 
3576 		got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3577 	}
3578 	got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
3579 }
3580 
3581 static const struct got_error *
3582 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3583 {
3584 	const struct got_error *err = NULL;
3585 	struct got_pathlist_entry *pe = NULL;
3586 	struct got_pathlist_head *ignorelist;
3587 	char *line = NULL, *pattern, *dirpath = NULL;
3588 	size_t linesize = 0;
3589 	ssize_t linelen;
3590 
3591 	ignorelist = calloc(1, sizeof(*ignorelist));
3592 	if (ignorelist == NULL)
3593 		return got_error_from_errno("calloc");
3594 	TAILQ_INIT(ignorelist);
3595 
3596 	while ((linelen = getline(&line, &linesize, f)) != -1) {
3597 		if (linelen > 0 && line[linelen - 1] == '\n')
3598 			line[linelen - 1] = '\0';
3599 
3600 		/* Git's ignores may contain comments. */
3601 		if (line[0] == '#')
3602 			continue;
3603 
3604 		/* Git's negated patterns are not (yet?) supported. */
3605 		if (line[0] == '!')
3606 			continue;
3607 
3608 		if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3609 		    line) == -1) {
3610 			err = got_error_from_errno("asprintf");
3611 			goto done;
3612 		}
3613 		err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3614 		if (err)
3615 			goto done;
3616 	}
3617 	if (ferror(f)) {
3618 		err = got_error_from_errno("getline");
3619 		goto done;
3620 	}
3621 
3622 	dirpath = strdup(path);
3623 	if (dirpath == NULL) {
3624 		err = got_error_from_errno("strdup");
3625 		goto done;
3626 	}
3627 	err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3628 done:
3629 	free(line);
3630 	if (err || pe == NULL) {
3631 		free(dirpath);
3632 		got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3633 	}
3634 	return err;
3635 }
3636 
3637 static int
3638 match_path(const char *pattern, size_t pattern_len, const char *path,
3639     int flags)
3640 {
3641 	char buf[PATH_MAX];
3642 
3643 	/*
3644 	 * Trailing slashes signify directories.
3645 	 * Append a * to make such patterns conform to fnmatch rules.
3646 	 */
3647 	if (pattern_len > 0 && pattern[pattern_len - 1] == '/') {
3648 		if (snprintf(buf, sizeof(buf), "%s*", pattern) >= sizeof(buf))
3649 			return FNM_NOMATCH; /* XXX */
3650 
3651 		return fnmatch(buf, path, flags);
3652 	}
3653 
3654 	return fnmatch(pattern, path, flags);
3655 }
3656 
3657 static int
3658 match_ignores(struct got_pathlist_head *ignores, const char *path)
3659 {
3660 	struct got_pathlist_entry *pe;
3661 
3662 	/* Handle patterns which match in all directories. */
3663 	TAILQ_FOREACH(pe, ignores, entry) {
3664 		struct got_pathlist_head *ignorelist = pe->data;
3665 		struct got_pathlist_entry *pi;
3666 
3667 		TAILQ_FOREACH(pi, ignorelist, entry) {
3668 			const char *p;
3669 
3670 			if (pi->path_len < 3 ||
3671 			    strncmp(pi->path, "**/", 3) != 0)
3672 				continue;
3673 			p = path;
3674 			while (*p) {
3675 				if (match_path(pi->path + 3,
3676 				    pi->path_len - 3, p,
3677 				    FNM_PATHNAME | FNM_LEADING_DIR)) {
3678 					/* Retry in next directory. */
3679 					while (*p && *p != '/')
3680 						p++;
3681 					while (*p == '/')
3682 						p++;
3683 					continue;
3684 				}
3685 				return 1;
3686 			}
3687 		}
3688 	}
3689 
3690 	/*
3691 	 * The ignores pathlist contains ignore lists from children before
3692 	 * parents, so we can find the most specific ignorelist by walking
3693 	 * ignores backwards.
3694 	 */
3695 	pe = TAILQ_LAST(ignores, got_pathlist_head);
3696 	while (pe) {
3697 		if (got_path_is_child(path, pe->path, pe->path_len)) {
3698 			struct got_pathlist_head *ignorelist = pe->data;
3699 			struct got_pathlist_entry *pi;
3700 			TAILQ_FOREACH(pi, ignorelist, entry) {
3701 				int flags = FNM_LEADING_DIR;
3702 				if (strstr(pi->path, "/**/") == NULL)
3703 					flags |= FNM_PATHNAME;
3704 				if (match_path(pi->path, pi->path_len,
3705 				    path, flags))
3706 					continue;
3707 				return 1;
3708 			}
3709 		}
3710 		pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3711 	}
3712 
3713 	return 0;
3714 }
3715 
3716 static const struct got_error *
3717 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3718     const char *path, int dirfd, const char *ignores_filename)
3719 {
3720 	const struct got_error *err = NULL;
3721 	char *ignorespath;
3722 	int fd = -1;
3723 	FILE *ignoresfile = NULL;
3724 
3725 	if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3726 	    path[0] ? "/" : "", ignores_filename) == -1)
3727 		return got_error_from_errno("asprintf");
3728 
3729 	if (dirfd != -1) {
3730 		fd = openat(dirfd, ignores_filename,
3731 		    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3732 		if (fd == -1) {
3733 			if (errno != ENOENT && errno != EACCES)
3734 				err = got_error_from_errno2("openat",
3735 				    ignorespath);
3736 		} else {
3737 			ignoresfile = fdopen(fd, "r");
3738 			if (ignoresfile == NULL)
3739 				err = got_error_from_errno2("fdopen",
3740 				    ignorespath);
3741 			else {
3742 				fd = -1;
3743 				err = read_ignores(ignores, path, ignoresfile);
3744 			}
3745 		}
3746 	} else {
3747 		ignoresfile = fopen(ignorespath, "re");
3748 		if (ignoresfile == NULL) {
3749 			if (errno != ENOENT && errno != EACCES)
3750 				err = got_error_from_errno2("fopen",
3751 				    ignorespath);
3752 		} else
3753 			err = read_ignores(ignores, path, ignoresfile);
3754 	}
3755 
3756 	if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3757 		err = got_error_from_errno2("fclose", path);
3758 	if (fd != -1 && close(fd) == -1 && err == NULL)
3759 		err = got_error_from_errno2("close", path);
3760 	free(ignorespath);
3761 	return err;
3762 }
3763 
3764 static const struct got_error *
3765 status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3766     int dirfd)
3767 {
3768 	const struct got_error *err = NULL;
3769 	struct diff_dir_cb_arg *a = arg;
3770 	char *path = NULL;
3771 
3772 	if (ignore != NULL)
3773 		*ignore = 0;
3774 
3775 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3776 		return got_error(GOT_ERR_CANCELLED);
3777 
3778 	if (parent_path[0]) {
3779 		if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3780 			return got_error_from_errno("asprintf");
3781 	} else {
3782 		path = de->d_name;
3783 	}
3784 
3785 	if (de->d_type == DT_DIR) {
3786 		if (!a->no_ignores && ignore != NULL &&
3787 		    match_ignores(a->ignores, path))
3788 			*ignore = 1;
3789 	} else if (!match_ignores(a->ignores, path) &&
3790 	    got_path_is_child(path, a->status_path, a->status_path_len))
3791 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3792 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3793 	if (parent_path[0])
3794 		free(path);
3795 	return err;
3796 }
3797 
3798 static const struct got_error *
3799 status_traverse(void *arg, const char *path, int dirfd)
3800 {
3801 	const struct got_error *err = NULL;
3802 	struct diff_dir_cb_arg *a = arg;
3803 
3804 	if (a->no_ignores)
3805 		return NULL;
3806 
3807 	err = add_ignores(a->ignores, a->worktree->root_path,
3808 	    path, dirfd, ".cvsignore");
3809 	if (err)
3810 		return err;
3811 
3812 	err = add_ignores(a->ignores, a->worktree->root_path, path,
3813 	    dirfd, ".gitignore");
3814 
3815 	return err;
3816 }
3817 
3818 static const struct got_error *
3819 report_single_file_status(const char *path, const char *ondisk_path,
3820     struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3821     void *status_arg, struct got_repository *repo, int report_unchanged,
3822     struct got_pathlist_head *ignores, int no_ignores)
3823 {
3824 	struct got_fileindex_entry *ie;
3825 	struct stat sb;
3826 
3827 	ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3828 	if (ie)
3829 		return report_file_status(ie, ondisk_path, -1, NULL,
3830 		    status_cb, status_arg, repo, report_unchanged);
3831 
3832 	if (lstat(ondisk_path, &sb) == -1) {
3833 		if (errno != ENOENT)
3834 			return got_error_from_errno2("lstat", ondisk_path);
3835 		return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3836 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3837 	}
3838 
3839 	if (!no_ignores && match_ignores(ignores, path))
3840 		return NULL;
3841 
3842 	if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3843 		return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3844 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3845 
3846 	return NULL;
3847 }
3848 
3849 static const struct got_error *
3850 add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3851     const char *root_path, const char *path)
3852 {
3853 	const struct got_error *err;
3854 	char *parent_path, *next_parent_path = NULL;
3855 
3856 	err = add_ignores(ignores, root_path, "", -1,
3857 	    ".cvsignore");
3858 	if (err)
3859 		return err;
3860 
3861 	err = add_ignores(ignores, root_path, "", -1,
3862 	    ".gitignore");
3863 	if (err)
3864 		return err;
3865 
3866 	err = got_path_dirname(&parent_path, path);
3867 	if (err) {
3868 		if (err->code == GOT_ERR_BAD_PATH)
3869 			return NULL; /* cannot traverse parent */
3870 		return err;
3871 	}
3872 	for (;;) {
3873 		err = add_ignores(ignores, root_path, parent_path, -1,
3874 		    ".cvsignore");
3875 		if (err)
3876 			break;
3877 		err = add_ignores(ignores, root_path, parent_path, -1,
3878 		    ".gitignore");
3879 		if (err)
3880 			break;
3881 		err = got_path_dirname(&next_parent_path, parent_path);
3882 		if (err) {
3883 			if (err->code == GOT_ERR_BAD_PATH)
3884 				err = NULL; /* traversed everything */
3885 			break;
3886 		}
3887 		if (got_path_is_root_dir(parent_path))
3888 			break;
3889 		free(parent_path);
3890 		parent_path = next_parent_path;
3891 		next_parent_path = NULL;
3892 	}
3893 
3894 	free(parent_path);
3895 	free(next_parent_path);
3896 	return err;
3897 }
3898 
3899 struct find_missing_children_args {
3900 	const char *parent_path;
3901 	size_t parent_len;
3902 	struct got_pathlist_head *children;
3903 	got_cancel_cb cancel_cb;
3904 	void *cancel_arg;
3905 };
3906 
3907 static const struct got_error *
3908 find_missing_children(void *arg, struct got_fileindex_entry *ie)
3909 {
3910 	const struct got_error *err = NULL;
3911 	struct find_missing_children_args *a = arg;
3912 
3913 	if (a->cancel_cb) {
3914 		err = a->cancel_cb(a->cancel_arg);
3915 		if (err)
3916 			return err;
3917 	}
3918 
3919 	if (got_path_is_child(ie->path, a->parent_path, a->parent_len))
3920 		err = got_pathlist_append(a->children, ie->path, NULL);
3921 
3922 	return err;
3923 }
3924 
3925 static const struct got_error *
3926 report_children(struct got_pathlist_head *children,
3927     struct got_worktree *worktree, struct got_fileindex *fileindex,
3928     struct got_repository *repo, int is_root_dir, int report_unchanged,
3929     struct got_pathlist_head *ignores, int no_ignores, 
3930     got_worktree_status_cb status_cb, void *status_arg,
3931     got_cancel_cb cancel_cb, void *cancel_arg)
3932 {
3933 	const struct got_error *err = NULL;
3934 	struct got_pathlist_entry *pe;
3935 	char *ondisk_path = NULL;
3936 
3937 	TAILQ_FOREACH(pe, children, entry) {
3938 		if (cancel_cb) {
3939 			err = cancel_cb(cancel_arg);
3940 			if (err)
3941 				break;
3942 		}
3943 
3944 		if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
3945 		    !is_root_dir ? "/" : "", pe->path) == -1) {
3946 			err = got_error_from_errno("asprintf");
3947 			ondisk_path = NULL;
3948 			break;
3949 		}
3950 
3951 		err = report_single_file_status(pe->path, ondisk_path,
3952 		    fileindex, status_cb, status_arg, repo, report_unchanged,
3953 		    ignores, no_ignores);
3954 		if (err)
3955 			break;
3956 
3957 		free(ondisk_path);
3958 		ondisk_path = NULL;
3959 	}
3960 
3961 	free(ondisk_path);
3962 	return err;
3963 }
3964 
3965 static const struct got_error *
3966 worktree_status(struct got_worktree *worktree, const char *path,
3967     struct got_fileindex *fileindex, struct got_repository *repo,
3968     got_worktree_status_cb status_cb, void *status_arg,
3969     got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3970     int report_unchanged)
3971 {
3972 	const struct got_error *err = NULL;
3973 	int fd = -1;
3974 	struct got_fileindex_diff_dir_cb fdiff_cb;
3975 	struct diff_dir_cb_arg arg;
3976 	char *ondisk_path = NULL;
3977 	struct got_pathlist_head ignores, missing_children;
3978 	struct got_fileindex_entry *ie;
3979 
3980 	TAILQ_INIT(&ignores);
3981 	TAILQ_INIT(&missing_children);
3982 
3983 	if (asprintf(&ondisk_path, "%s%s%s",
3984 	    worktree->root_path, path[0] ? "/" : "", path) == -1)
3985 		return got_error_from_errno("asprintf");
3986 
3987 	ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3988 	if (ie) {
3989 		err = report_single_file_status(path, ondisk_path,
3990 		    fileindex, status_cb, status_arg, repo,
3991 		    report_unchanged, &ignores, no_ignores);
3992 		goto done;
3993 	} else {
3994 		struct find_missing_children_args fmca;
3995 		fmca.parent_path = path;
3996 		fmca.parent_len = strlen(path);
3997 		fmca.children = &missing_children;
3998 		fmca.cancel_cb = cancel_cb;
3999 		fmca.cancel_arg = cancel_arg;
4000 		err = got_fileindex_for_each_entry_safe(fileindex,
4001 		    find_missing_children, &fmca);
4002 		if (err)
4003 			goto done;
4004 	}
4005 
4006 	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
4007 	if (fd == -1) {
4008 		if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
4009 		    !got_err_open_nofollow_on_symlink())
4010 			err = got_error_from_errno2("open", ondisk_path);
4011 		else {
4012 			if (!no_ignores) {
4013 				err = add_ignores_from_parent_paths(&ignores,
4014 				    worktree->root_path, ondisk_path);
4015 				if (err)
4016 					goto done;
4017 			}
4018 			if (TAILQ_EMPTY(&missing_children)) {
4019 				err = report_single_file_status(path,
4020 				    ondisk_path, fileindex,
4021 				    status_cb, status_arg, repo,
4022 				    report_unchanged, &ignores, no_ignores);
4023 				if (err)
4024 					goto done;
4025 			} else {
4026 				err = report_children(&missing_children,
4027 				    worktree, fileindex, repo,
4028 				    (path[0] == '\0'), report_unchanged,
4029 				    &ignores, no_ignores,
4030 				    status_cb, status_arg,
4031 				    cancel_cb, cancel_arg);
4032 				if (err)
4033 					goto done;
4034 			}
4035 		}
4036 	} else {
4037 		fdiff_cb.diff_old_new = status_old_new;
4038 		fdiff_cb.diff_old = status_old;
4039 		fdiff_cb.diff_new = status_new;
4040 		fdiff_cb.diff_traverse = status_traverse;
4041 		arg.fileindex = fileindex;
4042 		arg.worktree = worktree;
4043 		arg.status_path = path;
4044 		arg.status_path_len = strlen(path);
4045 		arg.repo = repo;
4046 		arg.status_cb = status_cb;
4047 		arg.status_arg = status_arg;
4048 		arg.cancel_cb = cancel_cb;
4049 		arg.cancel_arg = cancel_arg;
4050 		arg.report_unchanged = report_unchanged;
4051 		arg.no_ignores = no_ignores;
4052 		if (!no_ignores) {
4053 			err = add_ignores_from_parent_paths(&ignores,
4054 			    worktree->root_path, path);
4055 			if (err)
4056 				goto done;
4057 		}
4058 		arg.ignores = &ignores;
4059 		err = got_fileindex_diff_dir(fileindex, fd,
4060 		    worktree->root_path, path, repo, &fdiff_cb, &arg);
4061 	}
4062 done:
4063 	free_ignores(&ignores);
4064 	if (fd != -1 && close(fd) == -1 && err == NULL)
4065 		err = got_error_from_errno("close");
4066 	free(ondisk_path);
4067 	return err;
4068 }
4069 
4070 const struct got_error *
4071 got_worktree_status(struct got_worktree *worktree,
4072     struct got_pathlist_head *paths, struct got_repository *repo,
4073     int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
4074     got_cancel_cb cancel_cb, void *cancel_arg)
4075 {
4076 	const struct got_error *err = NULL;
4077 	char *fileindex_path = NULL;
4078 	struct got_fileindex *fileindex = NULL;
4079 	struct got_pathlist_entry *pe;
4080 
4081 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4082 	if (err)
4083 		return err;
4084 
4085 	TAILQ_FOREACH(pe, paths, entry) {
4086 		err = worktree_status(worktree, pe->path, fileindex, repo,
4087 			status_cb, status_arg, cancel_cb, cancel_arg,
4088 			no_ignores, 0);
4089 		if (err)
4090 			break;
4091 	}
4092 	free(fileindex_path);
4093 	got_fileindex_free(fileindex);
4094 	return err;
4095 }
4096 
4097 const struct got_error *
4098 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
4099     const char *arg)
4100 {
4101 	const struct got_error *err = NULL;
4102 	char *resolved = NULL, *cwd = NULL, *path = NULL;
4103 	size_t len;
4104 	struct stat sb;
4105 	char *abspath = NULL;
4106 	char canonpath[PATH_MAX];
4107 
4108 	*wt_path = NULL;
4109 
4110 	cwd = getcwd(NULL, 0);
4111 	if (cwd == NULL)
4112 		return got_error_from_errno("getcwd");
4113 
4114 	if (lstat(arg, &sb) == -1) {
4115 		if (errno != ENOENT) {
4116 			err = got_error_from_errno2("lstat", arg);
4117 			goto done;
4118 		}
4119 		sb.st_mode = 0;
4120 	}
4121 	if (S_ISLNK(sb.st_mode)) {
4122 		/*
4123 		 * We cannot use realpath(3) with symlinks since we want to
4124 		 * operate on the symlink itself.
4125 		 * But we can make the path absolute, assuming it is relative
4126 		 * to the current working directory, and then canonicalize it.
4127 		 */
4128 		if (!got_path_is_absolute(arg)) {
4129 			if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
4130 				err = got_error_from_errno("asprintf");
4131 				goto done;
4132 			}
4133 
4134 		}
4135 		err = got_canonpath(abspath ? abspath : arg, canonpath,
4136 		    sizeof(canonpath));
4137 		if (err)
4138 			goto done;
4139 		resolved = strdup(canonpath);
4140 		if (resolved == NULL) {
4141 			err = got_error_from_errno("strdup");
4142 			goto done;
4143 		}
4144 	} else {
4145 		resolved = realpath(arg, NULL);
4146 		if (resolved == NULL) {
4147 			if (errno != ENOENT) {
4148 				err = got_error_from_errno2("realpath", arg);
4149 				goto done;
4150 			}
4151 			if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
4152 				err = got_error_from_errno("asprintf");
4153 				goto done;
4154 			}
4155 			err = got_canonpath(abspath, canonpath,
4156 			    sizeof(canonpath));
4157 			if (err)
4158 				goto done;
4159 			resolved = strdup(canonpath);
4160 			if (resolved == NULL) {
4161 				err = got_error_from_errno("strdup");
4162 				goto done;
4163 			}
4164 		}
4165 	}
4166 
4167 	if (strncmp(got_worktree_get_root_path(worktree), resolved,
4168 	    strlen(got_worktree_get_root_path(worktree)))) {
4169 		err = got_error_path(resolved, GOT_ERR_BAD_PATH);
4170 		goto done;
4171 	}
4172 
4173 	if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
4174 		err = got_path_skip_common_ancestor(&path,
4175 		    got_worktree_get_root_path(worktree), resolved);
4176 		if (err)
4177 			goto done;
4178 	} else {
4179 		path = strdup("");
4180 		if (path == NULL) {
4181 			err = got_error_from_errno("strdup");
4182 			goto done;
4183 		}
4184 	}
4185 
4186 	/* XXX status walk can't deal with trailing slash! */
4187 	len = strlen(path);
4188 	while (len > 0 && path[len - 1] == '/') {
4189 		path[len - 1] = '\0';
4190 		len--;
4191 	}
4192 done:
4193 	free(abspath);
4194 	free(resolved);
4195 	free(cwd);
4196 	if (err == NULL)
4197 		*wt_path = path;
4198 	else
4199 		free(path);
4200 	return err;
4201 }
4202 
4203 struct schedule_addition_args {
4204 	struct got_worktree *worktree;
4205 	struct got_fileindex *fileindex;
4206 	got_worktree_checkout_cb progress_cb;
4207 	void *progress_arg;
4208 	struct got_repository *repo;
4209 };
4210 
4211 static int
4212 add_noop_status(unsigned char status)
4213 {
4214 	return (status == GOT_STATUS_ADD ||
4215 	    status == GOT_STATUS_MODIFY ||
4216 	    status == GOT_STATUS_CONFLICT ||
4217 	    status == GOT_STATUS_MODE_CHANGE ||
4218 	    status == GOT_STATUS_NO_CHANGE);
4219 }
4220 
4221 static const struct got_error *
4222 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
4223     const char *relpath, struct got_object_id *blob_id,
4224     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4225     int dirfd, const char *de_name)
4226 {
4227 	struct schedule_addition_args *a = arg;
4228 	const struct got_error *err = NULL;
4229 	struct got_fileindex_entry *ie;
4230 	struct stat sb;
4231 	char *ondisk_path;
4232 
4233 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4234 	    relpath) == -1)
4235 		return got_error_from_errno("asprintf");
4236 
4237 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4238 	if (ie) {
4239 		err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
4240 		    de_name, a->repo);
4241 		if (err)
4242 			goto done;
4243 		/* Re-adding an existing entry is a no-op. */
4244 		if (staged_status == GOT_STATUS_NO_CHANGE &&
4245 		    add_noop_status(status))
4246 			goto done;
4247 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4248 		if (err)
4249 			goto done;
4250 	}
4251 
4252 	if (status != GOT_STATUS_UNVERSIONED) {
4253 		if (status == GOT_STATUS_NONEXISTENT)
4254 			err = got_error_set_errno(ENOENT, ondisk_path);
4255 		else
4256 			err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
4257 		goto done;
4258 	}
4259 
4260 	err = got_fileindex_entry_alloc(&ie, relpath);
4261 	if (err)
4262 		goto done;
4263 	err = got_fileindex_entry_update(ie, a->worktree->root_fd,
4264 	    relpath, NULL, NULL, 1);
4265 	if (err) {
4266 		got_fileindex_entry_free(ie);
4267 		goto done;
4268 	}
4269 	err = got_fileindex_entry_add(a->fileindex, ie);
4270 	if (err) {
4271 		got_fileindex_entry_free(ie);
4272 		goto done;
4273 	}
4274 done:
4275 	free(ondisk_path);
4276 	if (err)
4277 		return err;
4278 	if (staged_status == GOT_STATUS_NO_CHANGE && add_noop_status(status))
4279 		return NULL;
4280 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4281 }
4282 
4283 const struct got_error *
4284 got_worktree_schedule_add(struct got_worktree *worktree,
4285     struct got_pathlist_head *paths,
4286     got_worktree_checkout_cb progress_cb, void *progress_arg,
4287     struct got_repository *repo, int no_ignores)
4288 {
4289 	struct got_fileindex *fileindex = NULL;
4290 	char *fileindex_path = NULL;
4291 	const struct got_error *err = NULL, *sync_err, *unlockerr;
4292 	struct got_pathlist_entry *pe;
4293 	struct schedule_addition_args saa;
4294 
4295 	err = lock_worktree(worktree, LOCK_EX);
4296 	if (err)
4297 		return err;
4298 
4299 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4300 	if (err)
4301 		goto done;
4302 
4303 	saa.worktree = worktree;
4304 	saa.fileindex = fileindex;
4305 	saa.progress_cb = progress_cb;
4306 	saa.progress_arg = progress_arg;
4307 	saa.repo = repo;
4308 
4309 	TAILQ_FOREACH(pe, paths, entry) {
4310 		err = worktree_status(worktree, pe->path, fileindex, repo,
4311 			schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4312 		if (err)
4313 			break;
4314 	}
4315 	sync_err = sync_fileindex(fileindex, fileindex_path);
4316 	if (sync_err && err == NULL)
4317 		err = sync_err;
4318 done:
4319 	free(fileindex_path);
4320 	if (fileindex)
4321 		got_fileindex_free(fileindex);
4322 	unlockerr = lock_worktree(worktree, LOCK_SH);
4323 	if (unlockerr && err == NULL)
4324 		err = unlockerr;
4325 	return err;
4326 }
4327 
4328 struct schedule_deletion_args {
4329 	struct got_worktree *worktree;
4330 	struct got_fileindex *fileindex;
4331 	got_worktree_delete_cb progress_cb;
4332 	void *progress_arg;
4333 	struct got_repository *repo;
4334 	int delete_local_mods;
4335 	int keep_on_disk;
4336 	int ignore_missing_paths;
4337 	const char *status_path;
4338 	size_t status_path_len;
4339 	const char *status_codes;
4340 };
4341 
4342 static const struct got_error *
4343 schedule_for_deletion(void *arg, unsigned char status,
4344     unsigned char staged_status, const char *relpath,
4345     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4346     struct got_object_id *commit_id, int dirfd, const char *de_name)
4347 {
4348 	struct schedule_deletion_args *a = arg;
4349 	const struct got_error *err = NULL;
4350 	struct got_fileindex_entry *ie = NULL;
4351 	struct stat sb;
4352 	char *ondisk_path;
4353 
4354 	if (status == GOT_STATUS_NONEXISTENT) {
4355 		if (a->ignore_missing_paths)
4356 			return NULL;
4357 		return got_error_set_errno(ENOENT, relpath);
4358 	}
4359 
4360 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4361 	if (ie == NULL)
4362 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4363 
4364 	staged_status = get_staged_status(ie);
4365 	if (staged_status != GOT_STATUS_NO_CHANGE) {
4366 		if (staged_status == GOT_STATUS_DELETE)
4367 			return NULL;
4368 		return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4369 	}
4370 
4371 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4372 	    relpath) == -1)
4373 		return got_error_from_errno("asprintf");
4374 
4375 	err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4376 	    a->repo);
4377 	if (err)
4378 		goto done;
4379 
4380 	if (a->status_codes) {
4381 		size_t ncodes = strlen(a->status_codes);
4382 		int i;
4383 		for (i = 0; i < ncodes ; i++) {
4384 			if (status == a->status_codes[i])
4385 				break;
4386 		}
4387 		if (i == ncodes) {
4388 			/* Do not delete files in non-matching status. */
4389 			free(ondisk_path);
4390 			return NULL;
4391 		}
4392 		if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4393 		    a->status_codes[i] != GOT_STATUS_MISSING) {
4394 			static char msg[64];
4395 			snprintf(msg, sizeof(msg),
4396 			    "invalid status code '%c'", a->status_codes[i]);
4397 			err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4398 			goto done;
4399 		}
4400 	}
4401 
4402 	if (status != GOT_STATUS_NO_CHANGE) {
4403 		if (status == GOT_STATUS_DELETE)
4404 			goto done;
4405 		if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4406 			err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4407 			goto done;
4408 		}
4409 		if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4410 			err = got_error_set_errno(ENOENT, relpath);
4411 			goto done;
4412 		}
4413 		if (status != GOT_STATUS_MODIFY &&
4414 		    status != GOT_STATUS_MISSING) {
4415 			err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4416 			goto done;
4417 		}
4418 	}
4419 
4420 	if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4421 		size_t root_len;
4422 
4423 		if (dirfd != -1) {
4424 			if (unlinkat(dirfd, de_name, 0) == -1) {
4425 				err = got_error_from_errno2("unlinkat",
4426 				    ondisk_path);
4427 				goto done;
4428 			}
4429 		} else if (unlink(ondisk_path) == -1) {
4430 			err = got_error_from_errno2("unlink", ondisk_path);
4431 			goto done;
4432 		}
4433 
4434 		root_len = strlen(a->worktree->root_path);
4435 		do {
4436 			char *parent;
4437 
4438 			err = got_path_dirname(&parent, ondisk_path);
4439 			if (err)
4440 				goto done;
4441 			free(ondisk_path);
4442 			ondisk_path = parent;
4443 			if (got_path_cmp(ondisk_path, a->status_path,
4444 			    strlen(ondisk_path), a->status_path_len) != 0 &&
4445 			    !got_path_is_child(ondisk_path, a->status_path,
4446 			    a->status_path_len))
4447 				break;
4448 			if (rmdir(ondisk_path) == -1) {
4449 				if (errno != ENOTEMPTY)
4450 					err = got_error_from_errno2("rmdir",
4451 					    ondisk_path);
4452 				break;
4453 			}
4454 		} while (got_path_cmp(ondisk_path, a->worktree->root_path,
4455 		    strlen(ondisk_path), root_len) != 0);
4456 	}
4457 
4458 	got_fileindex_entry_mark_deleted_from_disk(ie);
4459 done:
4460 	free(ondisk_path);
4461 	if (err)
4462 		return err;
4463 	if (status == GOT_STATUS_DELETE)
4464 		return NULL;
4465 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4466 	    staged_status, relpath);
4467 }
4468 
4469 const struct got_error *
4470 got_worktree_schedule_delete(struct got_worktree *worktree,
4471     struct got_pathlist_head *paths, int delete_local_mods,
4472     const char *status_codes,
4473     got_worktree_delete_cb progress_cb, void *progress_arg,
4474     struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4475 {
4476 	struct got_fileindex *fileindex = NULL;
4477 	char *fileindex_path = NULL;
4478 	const struct got_error *err = NULL, *sync_err, *unlockerr;
4479 	struct got_pathlist_entry *pe;
4480 	struct schedule_deletion_args sda;
4481 
4482 	err = lock_worktree(worktree, LOCK_EX);
4483 	if (err)
4484 		return err;
4485 
4486 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4487 	if (err)
4488 		goto done;
4489 
4490 	sda.worktree = worktree;
4491 	sda.fileindex = fileindex;
4492 	sda.progress_cb = progress_cb;
4493 	sda.progress_arg = progress_arg;
4494 	sda.repo = repo;
4495 	sda.delete_local_mods = delete_local_mods;
4496 	sda.keep_on_disk = keep_on_disk;
4497 	sda.ignore_missing_paths = ignore_missing_paths;
4498 	sda.status_codes = status_codes;
4499 
4500 	TAILQ_FOREACH(pe, paths, entry) {
4501 		char *ondisk_status_path;
4502 
4503 		if (asprintf(&ondisk_status_path, "%s%s%s",
4504 		    got_worktree_get_root_path(worktree),
4505 		    pe->path[0] == '\0' ? "" : "/", pe->path) == -1) {
4506 			err = got_error_from_errno("asprintf");
4507 			goto done;
4508 		}
4509 		sda.status_path = ondisk_status_path;
4510 		sda.status_path_len = strlen(ondisk_status_path);
4511 		err = worktree_status(worktree, pe->path, fileindex, repo,
4512 			schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4513 		free(ondisk_status_path);
4514 		if (err)
4515 			break;
4516 	}
4517 	sync_err = sync_fileindex(fileindex, fileindex_path);
4518 	if (sync_err && err == NULL)
4519 		err = sync_err;
4520 done:
4521 	free(fileindex_path);
4522 	if (fileindex)
4523 		got_fileindex_free(fileindex);
4524 	unlockerr = lock_worktree(worktree, LOCK_SH);
4525 	if (unlockerr && err == NULL)
4526 		err = unlockerr;
4527 	return err;
4528 }
4529 
4530 static const struct got_error *
4531 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4532 {
4533 	const struct got_error *err = NULL;
4534 	char *line = NULL;
4535 	size_t linesize = 0, n;
4536 	ssize_t linelen;
4537 
4538 	linelen = getline(&line, &linesize, infile);
4539 	if (linelen == -1) {
4540 		if (ferror(infile)) {
4541 			err = got_error_from_errno("getline");
4542 			goto done;
4543 		}
4544 		return NULL;
4545 	}
4546 	if (outfile) {
4547 		n = fwrite(line, 1, linelen, outfile);
4548 		if (n != linelen) {
4549 			err = got_ferror(outfile, GOT_ERR_IO);
4550 			goto done;
4551 		}
4552 	}
4553 	if (rejectfile) {
4554 		n = fwrite(line, 1, linelen, rejectfile);
4555 		if (n != linelen)
4556 			err = got_ferror(rejectfile, GOT_ERR_IO);
4557 	}
4558 done:
4559 	free(line);
4560 	return err;
4561 }
4562 
4563 static const struct got_error *
4564 skip_one_line(FILE *f)
4565 {
4566 	char *line = NULL;
4567 	size_t linesize = 0;
4568 	ssize_t linelen;
4569 
4570 	linelen = getline(&line, &linesize, f);
4571 	if (linelen == -1) {
4572 		if (ferror(f))
4573 			return got_error_from_errno("getline");
4574 		return NULL;
4575 	}
4576 	free(line);
4577 	return NULL;
4578 }
4579 
4580 static const struct got_error *
4581 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4582     int start_old, int end_old, int start_new, int end_new,
4583     FILE *outfile, FILE *rejectfile)
4584 {
4585 	const struct got_error *err;
4586 
4587 	/* Copy old file's lines leading up to patch. */
4588 	while (!feof(f1) && *line_cur1 < start_old) {
4589 		err = copy_one_line(f1, outfile, NULL);
4590 		if (err)
4591 			return err;
4592 		(*line_cur1)++;
4593 	}
4594 	/* Skip new file's lines leading up to patch. */
4595 	while (!feof(f2) && *line_cur2 < start_new) {
4596 		if (rejectfile)
4597 			err = copy_one_line(f2, NULL, rejectfile);
4598 		else
4599 			err = skip_one_line(f2);
4600 		if (err)
4601 			return err;
4602 		(*line_cur2)++;
4603 	}
4604 	/* Copy patched lines. */
4605 	while (!feof(f2) && *line_cur2 <= end_new) {
4606 		err = copy_one_line(f2, outfile, NULL);
4607 		if (err)
4608 			return err;
4609 		(*line_cur2)++;
4610 	}
4611 	/* Skip over old file's replaced lines. */
4612 	while (!feof(f1) && *line_cur1 <= end_old) {
4613 		if (rejectfile)
4614 			err = copy_one_line(f1, NULL, rejectfile);
4615 		else
4616 			err = skip_one_line(f1);
4617 		if (err)
4618 			return err;
4619 		(*line_cur1)++;
4620 	}
4621 
4622 	return NULL;
4623 }
4624 
4625 static const struct got_error *
4626 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4627     FILE *outfile, FILE *rejectfile)
4628 {
4629 	const struct got_error *err;
4630 
4631 	if (outfile) {
4632 		/* Copy old file's lines until EOF. */
4633 		while (!feof(f1)) {
4634 			err = copy_one_line(f1, outfile, NULL);
4635 			if (err)
4636 				return err;
4637 			(*line_cur1)++;
4638 		}
4639 	}
4640 	if (rejectfile) {
4641 		/* Copy new file's lines until EOF. */
4642 		while (!feof(f2)) {
4643 			err = copy_one_line(f2, NULL, rejectfile);
4644 			if (err)
4645 				return err;
4646 			(*line_cur2)++;
4647 		}
4648 	}
4649 
4650 	return NULL;
4651 }
4652 
4653 static const struct got_error *
4654 apply_or_reject_change(int *choice, int *nchunks_used,
4655     struct diff_result *diff_result, int n,
4656     const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4657     FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4658     got_worktree_patch_cb patch_cb, void *patch_arg)
4659 {
4660 	const struct got_error *err = NULL;
4661 	struct diff_chunk_context cc = {};
4662 	int start_old, end_old, start_new, end_new;
4663 	FILE *hunkfile;
4664 	struct diff_output_unidiff_state *diff_state;
4665 	struct diff_input_info diff_info;
4666 	int rc;
4667 
4668 	*choice = GOT_PATCH_CHOICE_NONE;
4669 
4670 	/* Get changed line numbers without context lines for copy_change(). */
4671 	diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4672 	start_old = cc.left.start;
4673 	end_old = cc.left.end;
4674 	start_new = cc.right.start;
4675 	end_new = cc.right.end;
4676 
4677 	/* Get the same change with context lines for display. */
4678 	memset(&cc, 0, sizeof(cc));
4679 	diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4680 
4681 	memset(&diff_info, 0, sizeof(diff_info));
4682 	diff_info.left_path = relpath;
4683 	diff_info.right_path = relpath;
4684 
4685 	diff_state = diff_output_unidiff_state_alloc();
4686 	if (diff_state == NULL)
4687 		return got_error_set_errno(ENOMEM,
4688 		    "diff_output_unidiff_state_alloc");
4689 
4690 	hunkfile = got_opentemp();
4691 	if (hunkfile == NULL) {
4692 		err = got_error_from_errno("got_opentemp");
4693 		goto done;
4694 	}
4695 
4696 	rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4697 	    diff_result, &cc);
4698 	if (rc != DIFF_RC_OK) {
4699 		err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4700 		goto done;
4701 	}
4702 
4703 	if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4704 		err = got_ferror(hunkfile, GOT_ERR_IO);
4705 		goto done;
4706 	}
4707 
4708 	err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4709 	    hunkfile, changeno, nchanges);
4710 	if (err)
4711 		goto done;
4712 
4713 	switch (*choice) {
4714 	case GOT_PATCH_CHOICE_YES:
4715 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4716 		    end_old, start_new, end_new, outfile, rejectfile);
4717 		break;
4718 	case GOT_PATCH_CHOICE_NO:
4719 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4720 		    end_old, start_new, end_new, rejectfile, outfile);
4721 		break;
4722 	case GOT_PATCH_CHOICE_QUIT:
4723 		break;
4724 	default:
4725 		err = got_error(GOT_ERR_PATCH_CHOICE);
4726 		break;
4727 	}
4728 done:
4729 	diff_output_unidiff_state_free(diff_state);
4730 	if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4731 		err = got_error_from_errno("fclose");
4732 	return err;
4733 }
4734 
4735 struct revert_file_args {
4736 	struct got_worktree *worktree;
4737 	struct got_fileindex *fileindex;
4738 	got_worktree_checkout_cb progress_cb;
4739 	void *progress_arg;
4740 	got_worktree_patch_cb patch_cb;
4741 	void *patch_arg;
4742 	struct got_repository *repo;
4743 	int unlink_added_files;
4744 	struct got_pathlist_head *added_files_to_unlink;
4745 };
4746 
4747 static const struct got_error *
4748 create_patched_content(char **path_outfile, int reverse_patch,
4749     struct got_object_id *blob_id, const char *path2,
4750     int dirfd2, const char *de_name2,
4751     const char *relpath, struct got_repository *repo,
4752     got_worktree_patch_cb patch_cb, void *patch_arg)
4753 {
4754 	const struct got_error *err, *free_err;
4755 	struct got_blob_object *blob = NULL;
4756 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4757 	int fd = -1, fd2 = -1;
4758 	char link_target[PATH_MAX];
4759 	ssize_t link_len = 0;
4760 	char *path1 = NULL, *id_str = NULL;
4761 	struct stat sb2;
4762 	struct got_diffreg_result *diffreg_result = NULL;
4763 	int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4764 	int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4765 
4766 	*path_outfile = NULL;
4767 
4768 	err = got_object_id_str(&id_str, blob_id);
4769 	if (err)
4770 		return err;
4771 
4772 	if (dirfd2 != -1) {
4773 		fd2 = openat(dirfd2, de_name2,
4774 		    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4775 		if (fd2 == -1) {
4776 			if (!got_err_open_nofollow_on_symlink()) {
4777 				err = got_error_from_errno2("openat", path2);
4778 				goto done;
4779 			}
4780 			link_len = readlinkat(dirfd2, de_name2,
4781 			    link_target, sizeof(link_target));
4782 			if (link_len == -1) {
4783 				return got_error_from_errno2("readlinkat",
4784 				    path2);
4785 			}
4786 			sb2.st_mode = S_IFLNK;
4787 			sb2.st_size = link_len;
4788 		}
4789 	} else {
4790 		fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4791 		if (fd2 == -1) {
4792 			if (!got_err_open_nofollow_on_symlink()) {
4793 				err = got_error_from_errno2("open", path2);
4794 				goto done;
4795 			}
4796 			link_len = readlink(path2, link_target,
4797 			    sizeof(link_target));
4798 			if (link_len == -1)
4799 				return got_error_from_errno2("readlink", path2);
4800 			sb2.st_mode = S_IFLNK;
4801 			sb2.st_size = link_len;
4802 		}
4803 	}
4804 	if (fd2 != -1) {
4805 		if (fstat(fd2, &sb2) == -1) {
4806 			err = got_error_from_errno2("fstat", path2);
4807 			goto done;
4808 		}
4809 
4810 		f2 = fdopen(fd2, "r");
4811 		if (f2 == NULL) {
4812 			err = got_error_from_errno2("fdopen", path2);
4813 			goto done;
4814 		}
4815 		fd2 = -1;
4816 	} else {
4817 		size_t n;
4818 		f2 = got_opentemp();
4819 		if (f2 == NULL) {
4820 			err = got_error_from_errno2("got_opentemp", path2);
4821 			goto done;
4822 		}
4823 		n = fwrite(link_target, 1, link_len, f2);
4824 		if (n != link_len) {
4825 			err = got_ferror(f2, GOT_ERR_IO);
4826 			goto done;
4827 		}
4828 		if (fflush(f2) == EOF) {
4829 			err = got_error_from_errno("fflush");
4830 			goto done;
4831 		}
4832 		rewind(f2);
4833 	}
4834 
4835 	fd = got_opentempfd();
4836 	if (fd == -1) {
4837 		err = got_error_from_errno("got_opentempfd");
4838 		goto done;
4839 	}
4840 
4841 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4842 	if (err)
4843 		goto done;
4844 
4845 	err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4846 	if (err)
4847 		goto done;
4848 
4849 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4850 	if (err)
4851 		goto done;
4852 
4853 	err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4854 	    3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4855 	if (err)
4856 		goto done;
4857 
4858 	err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4859 	    "");
4860 	if (err)
4861 		goto done;
4862 
4863 	if (fseek(f1, 0L, SEEK_SET) == -1)
4864 		return got_ferror(f1, GOT_ERR_IO);
4865 	if (fseek(f2, 0L, SEEK_SET) == -1)
4866 		return got_ferror(f2, GOT_ERR_IO);
4867 
4868 	/* Count the number of actual changes in the diff result. */
4869 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4870 		struct diff_chunk_context cc = {};
4871 		diff_chunk_context_load_change(&cc, &nchunks_used,
4872 		    diffreg_result->result, n, 0);
4873 		nchanges++;
4874 	}
4875 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4876 		int choice;
4877 		err = apply_or_reject_change(&choice, &nchunks_used,
4878 		    diffreg_result->result, n, relpath, f1, f2,
4879 		    &line_cur1, &line_cur2,
4880 		    reverse_patch ? NULL : outfile,
4881 		    reverse_patch ? outfile : NULL,
4882 		    ++i, nchanges, patch_cb, patch_arg);
4883 		if (err)
4884 			goto done;
4885 		if (choice == GOT_PATCH_CHOICE_YES)
4886 			have_content = 1;
4887 		else if (choice == GOT_PATCH_CHOICE_QUIT)
4888 			break;
4889 	}
4890 	if (have_content) {
4891 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4892 		    reverse_patch ? NULL : outfile,
4893 		    reverse_patch ? outfile : NULL);
4894 		if (err)
4895 			goto done;
4896 
4897 		if (!S_ISLNK(sb2.st_mode)) {
4898 			mode_t mode;
4899 
4900 			mode = apply_umask(sb2.st_mode);
4901 			if (fchmod(fileno(outfile), mode) == -1) {
4902 				err = got_error_from_errno2("fchmod", path2);
4903 				goto done;
4904 			}
4905 		}
4906 	}
4907 done:
4908 	free(id_str);
4909 	if (fd != -1 && close(fd) == -1 && err == NULL)
4910 		err = got_error_from_errno("close");
4911 	if (blob)
4912 		got_object_blob_close(blob);
4913 	free_err = got_diffreg_result_free(diffreg_result);
4914 	if (err == NULL)
4915 		err = free_err;
4916 	if (f1 && fclose(f1) == EOF && err == NULL)
4917 		err = got_error_from_errno2("fclose", path1);
4918 	if (f2 && fclose(f2) == EOF && err == NULL)
4919 		err = got_error_from_errno2("fclose", path2);
4920 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4921 		err = got_error_from_errno2("close", path2);
4922 	if (outfile && fclose(outfile) == EOF && err == NULL)
4923 		err = got_error_from_errno2("fclose", *path_outfile);
4924 	if (path1 && unlink(path1) == -1 && err == NULL)
4925 		err = got_error_from_errno2("unlink", path1);
4926 	if (err || !have_content) {
4927 		if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4928 			err = got_error_from_errno2("unlink", *path_outfile);
4929 		free(*path_outfile);
4930 		*path_outfile = NULL;
4931 	}
4932 	free(path1);
4933 	return err;
4934 }
4935 
4936 static const struct got_error *
4937 revert_file(void *arg, unsigned char status, unsigned char staged_status,
4938     const char *relpath, struct got_object_id *blob_id,
4939     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4940     int dirfd, const char *de_name)
4941 {
4942 	struct revert_file_args *a = arg;
4943 	const struct got_error *err = NULL;
4944 	char *parent_path = NULL;
4945 	struct got_fileindex_entry *ie;
4946 	struct got_commit_object *base_commit = NULL;
4947 	struct got_tree_object *tree = NULL;
4948 	struct got_object_id *tree_id = NULL;
4949 	const struct got_tree_entry *te = NULL;
4950 	char *tree_path = NULL, *te_name;
4951 	char *ondisk_path = NULL, *path_content = NULL;
4952 	struct got_blob_object *blob = NULL;
4953 	int fd = -1;
4954 
4955 	/* Reverting a staged deletion is a no-op. */
4956 	if (status == GOT_STATUS_DELETE &&
4957 	    staged_status != GOT_STATUS_NO_CHANGE)
4958 		return NULL;
4959 
4960 	if (status == GOT_STATUS_UNVERSIONED)
4961 		return (*a->progress_cb)(a->progress_arg,
4962 		    GOT_STATUS_UNVERSIONED, relpath);
4963 
4964 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4965 	if (ie == NULL)
4966 		return got_error_path(relpath, GOT_ERR_BAD_PATH);
4967 
4968 	/* Construct in-repository path of tree which contains this blob. */
4969 	err = got_path_dirname(&parent_path, ie->path);
4970 	if (err) {
4971 		if (err->code != GOT_ERR_BAD_PATH)
4972 			goto done;
4973 		parent_path = strdup("/");
4974 		if (parent_path == NULL) {
4975 			err = got_error_from_errno("strdup");
4976 			goto done;
4977 		}
4978 	}
4979 	if (got_path_is_root_dir(a->worktree->path_prefix)) {
4980 		tree_path = strdup(parent_path);
4981 		if (tree_path == NULL) {
4982 			err = got_error_from_errno("strdup");
4983 			goto done;
4984 		}
4985 	} else {
4986 		if (got_path_is_root_dir(parent_path)) {
4987 			tree_path = strdup(a->worktree->path_prefix);
4988 			if (tree_path == NULL) {
4989 				err = got_error_from_errno("strdup");
4990 				goto done;
4991 			}
4992 		} else {
4993 			if (asprintf(&tree_path, "%s/%s",
4994 			    a->worktree->path_prefix, parent_path) == -1) {
4995 				err = got_error_from_errno("asprintf");
4996 				goto done;
4997 			}
4998 		}
4999 	}
5000 
5001 	err = got_object_open_as_commit(&base_commit, a->repo,
5002 	    a->worktree->base_commit_id);
5003 	if (err)
5004 		goto done;
5005 
5006 	err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
5007 	if (err) {
5008 		if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
5009 		    (status == GOT_STATUS_ADD ||
5010 		    staged_status == GOT_STATUS_ADD)))
5011 			goto done;
5012 	} else {
5013 		err = got_object_open_as_tree(&tree, a->repo, tree_id);
5014 		if (err)
5015 			goto done;
5016 
5017 		err = got_path_basename(&te_name, ie->path);
5018 		if (err)
5019 			goto done;
5020 
5021 		te = got_object_tree_find_entry(tree, te_name);
5022 		free(te_name);
5023 		if (te == NULL && status != GOT_STATUS_ADD &&
5024 		    staged_status != GOT_STATUS_ADD) {
5025 			err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
5026 			goto done;
5027 		}
5028 	}
5029 
5030 	switch (status) {
5031 	case GOT_STATUS_ADD:
5032 		if (a->patch_cb) {
5033 			int choice = GOT_PATCH_CHOICE_NONE;
5034 			err = (*a->patch_cb)(&choice, a->patch_arg,
5035 			    status, ie->path, NULL, 1, 1);
5036 			if (err)
5037 				goto done;
5038 			if (choice != GOT_PATCH_CHOICE_YES)
5039 				break;
5040 		}
5041 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
5042 		    ie->path);
5043 		if (err)
5044 			goto done;
5045 		got_fileindex_entry_remove(a->fileindex, ie);
5046 		if (a->unlink_added_files) {
5047 			int do_unlink = a->added_files_to_unlink ? 0 : 1;
5048 
5049 			if (a->added_files_to_unlink) {
5050 				struct got_pathlist_entry *pe;
5051 
5052 				TAILQ_FOREACH(pe, a->added_files_to_unlink,
5053 				    entry) {
5054 					if (got_path_cmp(pe->path, relpath,
5055 					    pe->path_len, strlen(relpath)))
5056 						continue;
5057 					do_unlink = 1;
5058 					break;
5059 				}
5060 			}
5061 
5062 			if (do_unlink) {
5063 				if (asprintf(&ondisk_path, "%s/%s",
5064 				    got_worktree_get_root_path(a->worktree),
5065 				    relpath) == -1) {
5066 					err = got_error_from_errno("asprintf");
5067 					goto done;
5068 				}
5069 				if (unlink(ondisk_path) == -1) {
5070 					err = got_error_from_errno2("unlink",
5071 					    ondisk_path);
5072 					break;
5073 				}
5074 			}
5075 		}
5076 		break;
5077 	case GOT_STATUS_DELETE:
5078 		if (a->patch_cb) {
5079 			int choice = GOT_PATCH_CHOICE_NONE;
5080 			err = (*a->patch_cb)(&choice, a->patch_arg,
5081 			    status, ie->path, NULL, 1, 1);
5082 			if (err)
5083 				goto done;
5084 			if (choice != GOT_PATCH_CHOICE_YES)
5085 				break;
5086 		}
5087 		/* fall through */
5088 	case GOT_STATUS_MODIFY:
5089 	case GOT_STATUS_MODE_CHANGE:
5090 	case GOT_STATUS_CONFLICT:
5091 	case GOT_STATUS_MISSING: {
5092 		struct got_object_id id;
5093 		if (staged_status == GOT_STATUS_ADD ||
5094 		    staged_status == GOT_STATUS_MODIFY)
5095 			got_fileindex_entry_get_staged_blob_id(&id, ie);
5096 		else
5097 			got_fileindex_entry_get_blob_id(&id, ie);
5098 		fd = got_opentempfd();
5099 		if (fd == -1) {
5100 			err = got_error_from_errno("got_opentempfd");
5101 			goto done;
5102 		}
5103 
5104 		err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
5105 		if (err)
5106 			goto done;
5107 
5108 		if (asprintf(&ondisk_path, "%s/%s",
5109 		    got_worktree_get_root_path(a->worktree), relpath) == -1) {
5110 			err = got_error_from_errno("asprintf");
5111 			goto done;
5112 		}
5113 
5114 		if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
5115 		    status == GOT_STATUS_CONFLICT)) {
5116 			int is_bad_symlink = 0;
5117 			err = create_patched_content(&path_content, 1, &id,
5118 			    ondisk_path, dirfd, de_name, ie->path, a->repo,
5119 			    a->patch_cb, a->patch_arg);
5120 			if (err || path_content == NULL)
5121 				break;
5122 			if (te && S_ISLNK(te->mode)) {
5123 				if (unlink(path_content) == -1) {
5124 					err = got_error_from_errno2("unlink",
5125 					    path_content);
5126 					break;
5127 				}
5128 				err = install_symlink(&is_bad_symlink,
5129 				    a->worktree, ondisk_path, ie->path,
5130 				    blob, 0, 1, 0, 0, a->repo,
5131 				    a->progress_cb, a->progress_arg);
5132 			} else {
5133 				if (rename(path_content, ondisk_path) == -1) {
5134 					err = got_error_from_errno3("rename",
5135 					    path_content, ondisk_path);
5136 					goto done;
5137 				}
5138 			}
5139 		} else {
5140 			int is_bad_symlink = 0;
5141 			if (te && S_ISLNK(te->mode)) {
5142 				err = install_symlink(&is_bad_symlink,
5143 				    a->worktree, ondisk_path, ie->path,
5144 				    blob, 0, 1, 0, 0, a->repo,
5145 				    a->progress_cb, a->progress_arg);
5146 			} else {
5147 				err = install_blob(a->worktree, ondisk_path,
5148 				    ie->path,
5149 				    te ? te->mode : GOT_DEFAULT_FILE_MODE,
5150 				    got_fileindex_perms_to_st(ie), blob,
5151 				    0, 1, 0, 0, a->repo,
5152 				    a->progress_cb, a->progress_arg);
5153 			}
5154 			if (err)
5155 				goto done;
5156 			if (status == GOT_STATUS_DELETE ||
5157 			    status == GOT_STATUS_MODE_CHANGE) {
5158 				err = got_fileindex_entry_update(ie,
5159 				    a->worktree->root_fd, relpath,
5160 				    blob->id.sha1,
5161 				    a->worktree->base_commit_id->sha1, 1);
5162 				if (err)
5163 					goto done;
5164 			}
5165 			if (is_bad_symlink) {
5166 				got_fileindex_entry_filetype_set(ie,
5167 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
5168 			}
5169 		}
5170 		break;
5171 	}
5172 	default:
5173 		break;
5174 	}
5175 done:
5176 	free(ondisk_path);
5177 	free(path_content);
5178 	free(parent_path);
5179 	free(tree_path);
5180 	if (fd != -1 && close(fd) == -1 && err == NULL)
5181 		err = got_error_from_errno("close");
5182 	if (blob)
5183 		got_object_blob_close(blob);
5184 	if (tree)
5185 		got_object_tree_close(tree);
5186 	free(tree_id);
5187 	if (base_commit)
5188 		got_object_commit_close(base_commit);
5189 	return err;
5190 }
5191 
5192 const struct got_error *
5193 got_worktree_revert(struct got_worktree *worktree,
5194     struct got_pathlist_head *paths,
5195     got_worktree_checkout_cb progress_cb, void *progress_arg,
5196     got_worktree_patch_cb patch_cb, void *patch_arg,
5197     struct got_repository *repo)
5198 {
5199 	struct got_fileindex *fileindex = NULL;
5200 	char *fileindex_path = NULL;
5201 	const struct got_error *err = NULL, *unlockerr = NULL;
5202 	const struct got_error *sync_err = NULL;
5203 	struct got_pathlist_entry *pe;
5204 	struct revert_file_args rfa;
5205 
5206 	err = lock_worktree(worktree, LOCK_EX);
5207 	if (err)
5208 		return err;
5209 
5210 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
5211 	if (err)
5212 		goto done;
5213 
5214 	rfa.worktree = worktree;
5215 	rfa.fileindex = fileindex;
5216 	rfa.progress_cb = progress_cb;
5217 	rfa.progress_arg = progress_arg;
5218 	rfa.patch_cb = patch_cb;
5219 	rfa.patch_arg = patch_arg;
5220 	rfa.repo = repo;
5221 	rfa.unlink_added_files = 0;
5222 	TAILQ_FOREACH(pe, paths, entry) {
5223 		err = worktree_status(worktree, pe->path, fileindex, repo,
5224 		    revert_file, &rfa, NULL, NULL, 1, 0);
5225 		if (err)
5226 			break;
5227 	}
5228 	sync_err = sync_fileindex(fileindex, fileindex_path);
5229 	if (sync_err && err == NULL)
5230 		err = sync_err;
5231 done:
5232 	free(fileindex_path);
5233 	if (fileindex)
5234 		got_fileindex_free(fileindex);
5235 	unlockerr = lock_worktree(worktree, LOCK_SH);
5236 	if (unlockerr && err == NULL)
5237 		err = unlockerr;
5238 	return err;
5239 }
5240 
5241 static void
5242 free_commitable(struct got_commitable *ct)
5243 {
5244 	free(ct->path);
5245 	free(ct->in_repo_path);
5246 	free(ct->ondisk_path);
5247 	free(ct->blob_id);
5248 	free(ct->base_blob_id);
5249 	free(ct->staged_blob_id);
5250 	free(ct->base_commit_id);
5251 	free(ct);
5252 }
5253 
5254 struct collect_commitables_arg {
5255 	struct got_pathlist_head *commitable_paths;
5256 	struct got_repository *repo;
5257 	struct got_worktree *worktree;
5258 	struct got_fileindex *fileindex;
5259 	int have_staged_files;
5260 	int allow_bad_symlinks;
5261 	int diff_header_shown;
5262 	int commit_conflicts;
5263 	FILE *diff_outfile;
5264 	FILE *f1;
5265 	FILE *f2;
5266 };
5267 
5268 /*
5269  * Create a file which contains the target path of a symlink so we can feed
5270  * it as content to the diff engine.
5271  */
5272 static const struct got_error *
5273 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
5274     const char *abspath)
5275 {
5276 	const struct got_error *err = NULL;
5277 	char target_path[PATH_MAX];
5278 	ssize_t target_len, outlen;
5279 
5280 	*fd = -1;
5281 
5282 	if (dirfd != -1) {
5283 		target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
5284 		if (target_len == -1)
5285 			return got_error_from_errno2("readlinkat", abspath);
5286 	} else {
5287 		target_len = readlink(abspath, target_path, PATH_MAX);
5288 		if (target_len == -1)
5289 			return got_error_from_errno2("readlink", abspath);
5290 	}
5291 
5292 	*fd = got_opentempfd();
5293 	if (*fd == -1)
5294 		return got_error_from_errno("got_opentempfd");
5295 
5296 	outlen = write(*fd, target_path, target_len);
5297 	if (outlen == -1) {
5298 		err = got_error_from_errno("got_opentempfd");
5299 		goto done;
5300 	}
5301 
5302 	if (lseek(*fd, 0, SEEK_SET) == -1) {
5303 		err = got_error_from_errno2("lseek", abspath);
5304 		goto done;
5305 	}
5306 done:
5307 	if (err) {
5308 		close(*fd);
5309 		*fd = -1;
5310 	}
5311 	return err;
5312 }
5313 
5314 static const struct got_error *
5315 append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5316     FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5317     int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5318 {
5319 	const struct got_error *err = NULL;
5320 	struct got_blob_object *blob1 = NULL;
5321 	int fd = -1, fd1 = -1, fd2 = -1;
5322 	FILE *ondisk_file = NULL;
5323 	char *label1 = NULL;
5324 	struct stat sb;
5325 	off_t size1 = 0;
5326 	int f2_exists = 0;
5327 	char *id_str = NULL;
5328 
5329 	memset(&sb, 0, sizeof(sb));
5330 
5331 	if (diff_staged) {
5332 		if (ct->staged_status != GOT_STATUS_MODIFY &&
5333 		    ct->staged_status != GOT_STATUS_ADD &&
5334 		    ct->staged_status != GOT_STATUS_DELETE)
5335 			return NULL;
5336 	} else {
5337 		if (ct->status != GOT_STATUS_MODIFY &&
5338 		    ct->status != GOT_STATUS_ADD &&
5339 		    ct->status != GOT_STATUS_DELETE &&
5340 		    ct->status != GOT_STATUS_CONFLICT)
5341 			return NULL;
5342 	}
5343 
5344 	err = got_opentemp_truncate(f1);
5345 	if (err)
5346 		return got_error_from_errno("got_opentemp_truncate");
5347 	err = got_opentemp_truncate(f2);
5348 	if (err)
5349 		return got_error_from_errno("got_opentemp_truncate");
5350 
5351 	if (!*diff_header_shown) {
5352 		err = got_object_id_str(&id_str, worktree->base_commit_id);
5353 		if (err)
5354 			return err;
5355 		fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5356 		    got_worktree_get_root_path(worktree));
5357 		fprintf(diff_outfile, "commit - %s\n", id_str);
5358 		fprintf(diff_outfile, "path + %s%s\n",
5359 		    got_worktree_get_root_path(worktree),
5360 		    diff_staged ? " (staged changes)" : "");
5361 		*diff_header_shown = 1;
5362 	}
5363 
5364 	if (diff_staged) {
5365 		const char *label1 = NULL, *label2 = NULL;
5366 		switch (ct->staged_status) {
5367 		case GOT_STATUS_MODIFY:
5368 			label1 = ct->path;
5369 			label2 = ct->path;
5370 			break;
5371 		case GOT_STATUS_ADD:
5372 			label2 = ct->path;
5373 			break;
5374 		case GOT_STATUS_DELETE:
5375 			label1 = ct->path;
5376 			break;
5377 		default:
5378 			return got_error(GOT_ERR_FILE_STATUS);
5379 		}
5380 		fd1 = got_opentempfd();
5381 		if (fd1 == -1) {
5382 			err = got_error_from_errno("got_opentempfd");
5383 			goto done;
5384 		}
5385 		fd2 = got_opentempfd();
5386 		if (fd2 == -1) {
5387 			err = got_error_from_errno("got_opentempfd");
5388 			goto done;
5389 		}
5390 		err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5391 		    fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5392 		    label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5393 		    NULL, repo, diff_outfile);
5394 		goto done;
5395 	}
5396 
5397 	fd1 = got_opentempfd();
5398 	if (fd1 == -1) {
5399 		err = got_error_from_errno("got_opentempfd");
5400 		goto done;
5401 	}
5402 
5403 	if (ct->status != GOT_STATUS_ADD) {
5404 		err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5405 		    8192, fd1);
5406 		if (err)
5407 			goto done;
5408 	}
5409 
5410 	if (ct->status != GOT_STATUS_DELETE) {
5411 		if (dirfd != -1) {
5412 			fd = openat(dirfd, de_name,
5413 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5414 			if (fd == -1) {
5415 				if (!got_err_open_nofollow_on_symlink()) {
5416 					err = got_error_from_errno2("openat",
5417 					    ct->ondisk_path);
5418 					goto done;
5419 				}
5420 				err = get_symlink_target_file(&fd, dirfd,
5421 				    de_name, ct->ondisk_path);
5422 				if (err)
5423 					goto done;
5424 			}
5425 		} else {
5426 			fd = open(ct->ondisk_path,
5427 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5428 			if (fd == -1) {
5429 				if (!got_err_open_nofollow_on_symlink()) {
5430 					err = got_error_from_errno2("open",
5431 					    ct->ondisk_path);
5432 					goto done;
5433 				}
5434 				err = get_symlink_target_file(&fd, dirfd,
5435 				    de_name, ct->ondisk_path);
5436 				if (err)
5437 					goto done;
5438 			}
5439 		}
5440 		if (fstatat(fd, ct->ondisk_path, &sb,
5441 		    AT_SYMLINK_NOFOLLOW) == -1) {
5442 			err = got_error_from_errno2("fstatat", ct->ondisk_path);
5443 			goto done;
5444 		}
5445 		ondisk_file = fdopen(fd, "r");
5446 		if (ondisk_file == NULL) {
5447 			err = got_error_from_errno2("fdopen", ct->ondisk_path);
5448 			goto done;
5449 		}
5450 		fd = -1;
5451 		f2_exists = 1;
5452 	}
5453 
5454 	if (blob1) {
5455 		err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5456 		    f1, blob1);
5457 		if (err)
5458 			goto done;
5459 	}
5460 
5461 	err = got_diff_blob_file(blob1, f1, size1, label1,
5462 	    ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5463 	    GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
5464 done:
5465 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5466 		err = got_error_from_errno("close");
5467 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5468 		err = got_error_from_errno("close");
5469 	if (blob1)
5470 		got_object_blob_close(blob1);
5471 	if (fd != -1 && close(fd) == -1 && err == NULL)
5472 		err = got_error_from_errno("close");
5473 	if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5474 		err = got_error_from_errno("fclose");
5475 	return err;
5476 }
5477 
5478 static const struct got_error *
5479 collect_commitables(void *arg, unsigned char status,
5480     unsigned char staged_status, const char *relpath,
5481     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5482     struct got_object_id *commit_id, int dirfd, const char *de_name)
5483 {
5484 	struct collect_commitables_arg *a = arg;
5485 	const struct got_error *err = NULL;
5486 	struct got_commitable *ct = NULL;
5487 	struct got_pathlist_entry *new = NULL;
5488 	char *parent_path = NULL, *path = NULL;
5489 	struct stat sb;
5490 
5491 	if (a->have_staged_files) {
5492 		if (staged_status != GOT_STATUS_MODIFY &&
5493 		    staged_status != GOT_STATUS_ADD &&
5494 		    staged_status != GOT_STATUS_DELETE)
5495 			return NULL;
5496 	} else {
5497 		if (status == GOT_STATUS_CONFLICT && !a->commit_conflicts) {
5498 			printf("C  %s\n", relpath);
5499 			return got_error(GOT_ERR_COMMIT_CONFLICT);
5500 		}
5501 
5502 		if (status != GOT_STATUS_MODIFY &&
5503 		    status != GOT_STATUS_MODE_CHANGE &&
5504 		    status != GOT_STATUS_ADD &&
5505 		    status != GOT_STATUS_DELETE &&
5506 		    status != GOT_STATUS_CONFLICT)
5507 			return NULL;
5508 	}
5509 
5510 	if (asprintf(&path, "/%s", relpath) == -1) {
5511 		err = got_error_from_errno("asprintf");
5512 		goto done;
5513 	}
5514 	if (strcmp(path, "/") == 0) {
5515 		parent_path = strdup("");
5516 		if (parent_path == NULL)
5517 			return got_error_from_errno("strdup");
5518 	} else {
5519 		err = got_path_dirname(&parent_path, path);
5520 		if (err)
5521 			return err;
5522 	}
5523 
5524 	ct = calloc(1, sizeof(*ct));
5525 	if (ct == NULL) {
5526 		err = got_error_from_errno("calloc");
5527 		goto done;
5528 	}
5529 
5530 	if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5531 	    relpath) == -1) {
5532 		err = got_error_from_errno("asprintf");
5533 		goto done;
5534 	}
5535 
5536 	if (staged_status == GOT_STATUS_ADD ||
5537 	    staged_status == GOT_STATUS_MODIFY) {
5538 		struct got_fileindex_entry *ie;
5539 		ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5540 		switch (got_fileindex_entry_staged_filetype_get(ie)) {
5541 		case GOT_FILEIDX_MODE_REGULAR_FILE:
5542 		case GOT_FILEIDX_MODE_BAD_SYMLINK:
5543 			ct->mode = S_IFREG;
5544 			break;
5545 		case GOT_FILEIDX_MODE_SYMLINK:
5546 			ct->mode = S_IFLNK;
5547 			break;
5548 		default:
5549 			err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5550 			goto done;
5551 		}
5552 		ct->mode |= got_fileindex_entry_perms_get(ie);
5553 	} else if (status != GOT_STATUS_DELETE &&
5554 	    staged_status != GOT_STATUS_DELETE) {
5555 		if (dirfd != -1) {
5556 			if (fstatat(dirfd, de_name, &sb,
5557 			    AT_SYMLINK_NOFOLLOW) == -1) {
5558 				err = got_error_from_errno2("fstatat",
5559 				    ct->ondisk_path);
5560 				goto done;
5561 			}
5562 		} else if (lstat(ct->ondisk_path, &sb) == -1) {
5563 			err = got_error_from_errno2("lstat", ct->ondisk_path);
5564 			goto done;
5565 		}
5566 		ct->mode = sb.st_mode;
5567 	}
5568 
5569 	if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5570 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5571 	    relpath) == -1) {
5572 		err = got_error_from_errno("asprintf");
5573 		goto done;
5574 	}
5575 
5576 	if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5577 	    status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5578 		int is_bad_symlink;
5579 		char target_path[PATH_MAX];
5580 		ssize_t target_len;
5581 		target_len = readlink(ct->ondisk_path, target_path,
5582 		    sizeof(target_path));
5583 		if (target_len == -1) {
5584 			err = got_error_from_errno2("readlink",
5585 			    ct->ondisk_path);
5586 			goto done;
5587 		}
5588 		err = is_bad_symlink_target(&is_bad_symlink, target_path,
5589 		    target_len, ct->ondisk_path, a->worktree->root_path,
5590 		    a->worktree->meta_dir);
5591 		if (err)
5592 			goto done;
5593 		if (is_bad_symlink) {
5594 			err = got_error_path(ct->ondisk_path,
5595 			    GOT_ERR_BAD_SYMLINK);
5596 			goto done;
5597 		}
5598 	}
5599 
5600 
5601 	ct->status = status;
5602 	ct->staged_status = staged_status;
5603 	ct->blob_id = NULL; /* will be filled in when blob gets created */
5604 	if (ct->status != GOT_STATUS_ADD &&
5605 	    ct->staged_status != GOT_STATUS_ADD) {
5606 		ct->base_blob_id = got_object_id_dup(blob_id);
5607 		if (ct->base_blob_id == NULL) {
5608 			err = got_error_from_errno("got_object_id_dup");
5609 			goto done;
5610 		}
5611 		ct->base_commit_id = got_object_id_dup(commit_id);
5612 		if (ct->base_commit_id == NULL) {
5613 			err = got_error_from_errno("got_object_id_dup");
5614 			goto done;
5615 		}
5616 	}
5617 	if (ct->staged_status == GOT_STATUS_ADD ||
5618 	    ct->staged_status == GOT_STATUS_MODIFY) {
5619 		ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5620 		if (ct->staged_blob_id == NULL) {
5621 			err = got_error_from_errno("got_object_id_dup");
5622 			goto done;
5623 		}
5624 	}
5625 	ct->path = strdup(path);
5626 	if (ct->path == NULL) {
5627 		err = got_error_from_errno("strdup");
5628 		goto done;
5629 	}
5630 	err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5631 	if (err)
5632 		goto done;
5633 
5634 	if (a->diff_outfile && ct && new != NULL) {
5635 		err = append_ct_diff(ct, &a->diff_header_shown,
5636 		    a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5637 		    a->have_staged_files, a->repo, a->worktree);
5638 		if (err)
5639 			goto done;
5640 	}
5641 done:
5642 	if (ct && (err || new == NULL))
5643 		free_commitable(ct);
5644 	free(parent_path);
5645 	free(path);
5646 	return err;
5647 }
5648 
5649 static const struct got_error *write_tree(struct got_object_id **, int *,
5650     struct got_tree_object *, const char *, struct got_pathlist_head *,
5651     got_worktree_status_cb status_cb, void *status_arg,
5652     struct got_repository *);
5653 
5654 static const struct got_error *
5655 write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5656     struct got_tree_entry *te, const char *parent_path,
5657     struct got_pathlist_head *commitable_paths,
5658     got_worktree_status_cb status_cb, void *status_arg,
5659     struct got_repository *repo)
5660 {
5661 	const struct got_error *err = NULL;
5662 	struct got_tree_object *subtree;
5663 	char *subpath;
5664 
5665 	if (asprintf(&subpath, "%s%s%s", parent_path,
5666 	    got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5667 		return got_error_from_errno("asprintf");
5668 
5669 	err = got_object_open_as_tree(&subtree, repo, &te->id);
5670 	if (err)
5671 		return err;
5672 
5673 	err = write_tree(new_subtree_id, nentries, subtree, subpath,
5674 	    commitable_paths, status_cb, status_arg, repo);
5675 	got_object_tree_close(subtree);
5676 	free(subpath);
5677 	return err;
5678 }
5679 
5680 static const struct got_error *
5681 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5682 {
5683 	const struct got_error *err = NULL;
5684 	char *ct_parent_path = NULL;
5685 
5686 	*match = 0;
5687 
5688 	if (strchr(ct->in_repo_path, '/') == NULL) {
5689 		*match = got_path_is_root_dir(path);
5690 		return NULL;
5691 	}
5692 
5693 	err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5694 	if (err)
5695 		return err;
5696 	*match = (strcmp(path, ct_parent_path) == 0);
5697 	free(ct_parent_path);
5698 	return err;
5699 }
5700 
5701 static mode_t
5702 get_ct_file_mode(struct got_commitable *ct)
5703 {
5704 	if (S_ISLNK(ct->mode))
5705 		return S_IFLNK;
5706 
5707 	return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5708 }
5709 
5710 static const struct got_error *
5711 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5712     struct got_tree_entry *te, struct got_commitable *ct)
5713 {
5714 	const struct got_error *err = NULL;
5715 
5716 	*new_te = NULL;
5717 
5718 	err = got_object_tree_entry_dup(new_te, te);
5719 	if (err)
5720 		goto done;
5721 
5722 	(*new_te)->mode = get_ct_file_mode(ct);
5723 
5724 	if (ct->staged_status == GOT_STATUS_MODIFY)
5725 		memcpy(&(*new_te)->id, ct->staged_blob_id,
5726 		    sizeof((*new_te)->id));
5727 	else
5728 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5729 done:
5730 	if (err && *new_te) {
5731 		free(*new_te);
5732 		*new_te = NULL;
5733 	}
5734 	return err;
5735 }
5736 
5737 static const struct got_error *
5738 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5739     struct got_commitable *ct)
5740 {
5741 	const struct got_error *err = NULL;
5742 	char *ct_name = NULL;
5743 
5744 	 *new_te = NULL;
5745 
5746 	*new_te = calloc(1, sizeof(**new_te));
5747 	if (*new_te == NULL)
5748 		return got_error_from_errno("calloc");
5749 
5750 	err = got_path_basename(&ct_name, ct->path);
5751 	if (err)
5752 		goto done;
5753 	if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5754 	    sizeof((*new_te)->name)) {
5755 		err = got_error(GOT_ERR_NO_SPACE);
5756 		goto done;
5757 	}
5758 
5759 	(*new_te)->mode = get_ct_file_mode(ct);
5760 
5761 	if (ct->staged_status == GOT_STATUS_ADD)
5762 		memcpy(&(*new_te)->id, ct->staged_blob_id,
5763 		    sizeof((*new_te)->id));
5764 	else
5765 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5766 done:
5767 	free(ct_name);
5768 	if (err && *new_te) {
5769 		free(*new_te);
5770 		*new_te = NULL;
5771 	}
5772 	return err;
5773 }
5774 
5775 static const struct got_error *
5776 insert_tree_entry(struct got_tree_entry *new_te,
5777     struct got_pathlist_head *paths)
5778 {
5779 	const struct got_error *err = NULL;
5780 	struct got_pathlist_entry *new_pe;
5781 
5782 	err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5783 	if (err)
5784 		return err;
5785 	if (new_pe == NULL)
5786 		return got_error(GOT_ERR_TREE_DUP_ENTRY);
5787 	return NULL;
5788 }
5789 
5790 static const struct got_error *
5791 report_ct_status(struct got_commitable *ct,
5792     got_worktree_status_cb status_cb, void *status_arg)
5793 {
5794 	const char *ct_path = ct->path;
5795 	unsigned char status;
5796 
5797 	if (status_cb == NULL) /* no commit progress output desired */
5798 		return NULL;
5799 
5800 	while (ct_path[0] == '/')
5801 		ct_path++;
5802 
5803 	if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5804 		status = ct->staged_status;
5805 	else
5806 		status = ct->status;
5807 
5808 	return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5809 	    ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5810 }
5811 
5812 static const struct got_error *
5813 match_modified_subtree(int *modified, struct got_tree_entry *te,
5814     const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5815 {
5816 	const struct got_error *err = NULL;
5817 	struct got_pathlist_entry *pe;
5818 	char *te_path;
5819 
5820 	*modified = 0;
5821 
5822 	if (asprintf(&te_path, "%s%s%s", base_tree_path,
5823 	    got_path_is_root_dir(base_tree_path) ? "" : "/",
5824 	    te->name) == -1)
5825 		return got_error_from_errno("asprintf");
5826 
5827 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5828 		struct got_commitable *ct = pe->data;
5829 		*modified = got_path_is_child(ct->in_repo_path, te_path,
5830 		    strlen(te_path));
5831 		if (*modified)
5832 			break;
5833 	}
5834 
5835 	free(te_path);
5836 	return err;
5837 }
5838 
5839 static const struct got_error *
5840 match_deleted_or_modified_ct(struct got_commitable **ctp,
5841     struct got_tree_entry *te, const char *base_tree_path,
5842     struct got_pathlist_head *commitable_paths)
5843 {
5844 	const struct got_error *err = NULL;
5845 	struct got_pathlist_entry *pe;
5846 
5847 	*ctp = NULL;
5848 
5849 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5850 		struct got_commitable *ct = pe->data;
5851 		char *ct_name = NULL;
5852 		int path_matches;
5853 
5854 		if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5855 			if (ct->status != GOT_STATUS_MODIFY &&
5856 			    ct->status != GOT_STATUS_MODE_CHANGE &&
5857 			    ct->status != GOT_STATUS_DELETE &&
5858 			    ct->status != GOT_STATUS_CONFLICT)
5859 				continue;
5860 		} else {
5861 			if (ct->staged_status != GOT_STATUS_MODIFY &&
5862 			    ct->staged_status != GOT_STATUS_DELETE)
5863 				continue;
5864 		}
5865 
5866 		if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5867 			continue;
5868 
5869 		err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5870 		if (err)
5871 			return err;
5872 		if (!path_matches)
5873 			continue;
5874 
5875 		err = got_path_basename(&ct_name, pe->path);
5876 		if (err)
5877 			return err;
5878 
5879 		if (strcmp(te->name, ct_name) != 0) {
5880 			free(ct_name);
5881 			continue;
5882 		}
5883 		free(ct_name);
5884 
5885 		*ctp = ct;
5886 		break;
5887 	}
5888 
5889 	return err;
5890 }
5891 
5892 static const struct got_error *
5893 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5894     const char *child_path, const char *path_base_tree,
5895     struct got_pathlist_head *commitable_paths,
5896     got_worktree_status_cb status_cb, void *status_arg,
5897     struct got_repository *repo)
5898 {
5899 	const struct got_error *err = NULL;
5900 	struct got_tree_entry *new_te;
5901 	char *subtree_path;
5902 	struct got_object_id *id = NULL;
5903 	int nentries;
5904 
5905 	*new_tep = NULL;
5906 
5907 	if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5908 	    got_path_is_root_dir(path_base_tree) ? "" : "/",
5909 	    child_path) == -1)
5910 		return got_error_from_errno("asprintf");
5911 
5912 	new_te = calloc(1, sizeof(*new_te));
5913 	if (new_te == NULL)
5914 		return got_error_from_errno("calloc");
5915 	new_te->mode = S_IFDIR;
5916 
5917 	if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5918 	    sizeof(new_te->name)) {
5919 		err = got_error(GOT_ERR_NO_SPACE);
5920 		goto done;
5921 	}
5922 	err = write_tree(&id, &nentries, NULL, subtree_path,
5923 	    commitable_paths, status_cb, status_arg, repo);
5924 	if (err) {
5925 		free(new_te);
5926 		goto done;
5927 	}
5928 	memcpy(&new_te->id, id, sizeof(new_te->id));
5929 done:
5930 	free(id);
5931 	free(subtree_path);
5932 	if (err == NULL)
5933 		*new_tep = new_te;
5934 	return err;
5935 }
5936 
5937 static const struct got_error *
5938 write_tree(struct got_object_id **new_tree_id, int *nentries,
5939     struct got_tree_object *base_tree, const char *path_base_tree,
5940     struct got_pathlist_head *commitable_paths,
5941     got_worktree_status_cb status_cb, void *status_arg,
5942     struct got_repository *repo)
5943 {
5944 	const struct got_error *err = NULL;
5945 	struct got_pathlist_head paths;
5946 	struct got_tree_entry *te, *new_te = NULL;
5947 	struct got_pathlist_entry *pe;
5948 
5949 	TAILQ_INIT(&paths);
5950 	*nentries = 0;
5951 
5952 	/* Insert, and recurse into, newly added entries first. */
5953 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5954 		struct got_commitable *ct = pe->data;
5955 		char *child_path = NULL, *slash;
5956 
5957 		if ((ct->status != GOT_STATUS_ADD &&
5958 		    ct->staged_status != GOT_STATUS_ADD) ||
5959 		    (ct->flags & GOT_COMMITABLE_ADDED))
5960 			continue;
5961 
5962 		if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5963 		    strlen(path_base_tree)))
5964 			continue;
5965 
5966 		err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5967 		    ct->in_repo_path);
5968 		if (err)
5969 			goto done;
5970 
5971 		slash = strchr(child_path, '/');
5972 		if (slash == NULL) {
5973 			err = alloc_added_blob_tree_entry(&new_te, ct);
5974 			if (err)
5975 				goto done;
5976 			err = report_ct_status(ct, status_cb, status_arg);
5977 			if (err)
5978 				goto done;
5979 			ct->flags |= GOT_COMMITABLE_ADDED;
5980 			err = insert_tree_entry(new_te, &paths);
5981 			if (err)
5982 				goto done;
5983 			(*nentries)++;
5984 		} else {
5985 			*slash = '\0'; /* trim trailing path components */
5986 			if (base_tree == NULL ||
5987 			    got_object_tree_find_entry(base_tree, child_path)
5988 			    == NULL) {
5989 				err = make_subtree_for_added_blob(&new_te,
5990 				    child_path, path_base_tree,
5991 				    commitable_paths, status_cb, status_arg,
5992 				    repo);
5993 				if (err)
5994 					goto done;
5995 				err = insert_tree_entry(new_te, &paths);
5996 				if (err)
5997 					goto done;
5998 				(*nentries)++;
5999 			}
6000 		}
6001 	}
6002 
6003 	if (base_tree) {
6004 		int i, nbase_entries;
6005 		/* Handle modified and deleted entries. */
6006 		nbase_entries = got_object_tree_get_nentries(base_tree);
6007 		for (i = 0; i < nbase_entries; i++) {
6008 			struct got_commitable *ct = NULL;
6009 
6010 			te = got_object_tree_get_entry(base_tree, i);
6011 			if (got_object_tree_entry_is_submodule(te)) {
6012 				/* Entry is a submodule; just copy it. */
6013 				err = got_object_tree_entry_dup(&new_te, te);
6014 				if (err)
6015 					goto done;
6016 				err = insert_tree_entry(new_te, &paths);
6017 				if (err)
6018 					goto done;
6019 				(*nentries)++;
6020 				continue;
6021 			}
6022 
6023 			if (S_ISDIR(te->mode)) {
6024 				int modified;
6025 				err = got_object_tree_entry_dup(&new_te, te);
6026 				if (err)
6027 					goto done;
6028 				err = match_modified_subtree(&modified, te,
6029 				    path_base_tree, commitable_paths);
6030 				if (err)
6031 					goto done;
6032 				/* Avoid recursion into unmodified subtrees. */
6033 				if (modified) {
6034 					struct got_object_id *new_id;
6035 					int nsubentries;
6036 					err = write_subtree(&new_id,
6037 					    &nsubentries, te,
6038 					    path_base_tree, commitable_paths,
6039 					    status_cb, status_arg, repo);
6040 					if (err)
6041 						goto done;
6042 					if (nsubentries == 0) {
6043 						/* All entries were deleted. */
6044 						free(new_id);
6045 						continue;
6046 					}
6047 					memcpy(&new_te->id, new_id,
6048 					    sizeof(new_te->id));
6049 					free(new_id);
6050 				}
6051 				err = insert_tree_entry(new_te, &paths);
6052 				if (err)
6053 					goto done;
6054 				(*nentries)++;
6055 				continue;
6056 			}
6057 
6058 			err = match_deleted_or_modified_ct(&ct, te,
6059 			    path_base_tree, commitable_paths);
6060 			if (err)
6061 				goto done;
6062 			if (ct) {
6063 				/* NB: Deleted entries get dropped here. */
6064 				if (ct->status == GOT_STATUS_MODIFY ||
6065 				    ct->status == GOT_STATUS_MODE_CHANGE ||
6066 				    ct->status == GOT_STATUS_CONFLICT ||
6067 				    ct->staged_status == GOT_STATUS_MODIFY) {
6068 					err = alloc_modified_blob_tree_entry(
6069 					    &new_te, te, ct);
6070 					if (err)
6071 						goto done;
6072 					err = insert_tree_entry(new_te, &paths);
6073 					if (err)
6074 						goto done;
6075 					(*nentries)++;
6076 				}
6077 				err = report_ct_status(ct, status_cb,
6078 				    status_arg);
6079 				if (err)
6080 					goto done;
6081 			} else {
6082 				/* Entry is unchanged; just copy it. */
6083 				err = got_object_tree_entry_dup(&new_te, te);
6084 				if (err)
6085 					goto done;
6086 				err = insert_tree_entry(new_te, &paths);
6087 				if (err)
6088 					goto done;
6089 				(*nentries)++;
6090 			}
6091 		}
6092 	}
6093 
6094 	/* Write new list of entries; deleted entries have been dropped. */
6095 	err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
6096 done:
6097 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
6098 	return err;
6099 }
6100 
6101 static const struct got_error *
6102 update_fileindex_after_commit(struct got_worktree *worktree,
6103     struct got_pathlist_head *commitable_paths,
6104     struct got_object_id *new_base_commit_id,
6105     struct got_fileindex *fileindex, int have_staged_files)
6106 {
6107 	const struct got_error *err = NULL;
6108 	struct got_pathlist_entry *pe;
6109 	char *relpath = NULL;
6110 
6111 	TAILQ_FOREACH(pe, commitable_paths, entry) {
6112 		struct got_fileindex_entry *ie;
6113 		struct got_commitable *ct = pe->data;
6114 
6115 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6116 
6117 		err = got_path_skip_common_ancestor(&relpath,
6118 		    worktree->root_path, ct->ondisk_path);
6119 		if (err)
6120 			goto done;
6121 
6122 		if (ie) {
6123 			if (ct->status == GOT_STATUS_DELETE ||
6124 			    ct->staged_status == GOT_STATUS_DELETE) {
6125 				got_fileindex_entry_remove(fileindex, ie);
6126 			} else if (ct->staged_status == GOT_STATUS_ADD ||
6127 			    ct->staged_status == GOT_STATUS_MODIFY) {
6128 				got_fileindex_entry_stage_set(ie,
6129 				    GOT_FILEIDX_STAGE_NONE);
6130 				got_fileindex_entry_staged_filetype_set(ie, 0);
6131 
6132 				err = got_fileindex_entry_update(ie,
6133 				    worktree->root_fd, relpath,
6134 				    ct->staged_blob_id->sha1,
6135 				    new_base_commit_id->sha1,
6136 				    !have_staged_files);
6137 			} else
6138 				err = got_fileindex_entry_update(ie,
6139 				    worktree->root_fd, relpath,
6140 				    ct->blob_id->sha1,
6141 				    new_base_commit_id->sha1,
6142 				    !have_staged_files);
6143 		} else {
6144 			err = got_fileindex_entry_alloc(&ie, pe->path);
6145 			if (err)
6146 				goto done;
6147 			err = got_fileindex_entry_update(ie,
6148 			    worktree->root_fd, relpath, ct->blob_id->sha1,
6149 			    new_base_commit_id->sha1, 1);
6150 			if (err) {
6151 				got_fileindex_entry_free(ie);
6152 				goto done;
6153 			}
6154 			err = got_fileindex_entry_add(fileindex, ie);
6155 			if (err) {
6156 				got_fileindex_entry_free(ie);
6157 				goto done;
6158 			}
6159 		}
6160 		free(relpath);
6161 		relpath = NULL;
6162 	}
6163 done:
6164 	free(relpath);
6165 	return err;
6166 }
6167 
6168 
6169 static const struct got_error *
6170 check_out_of_date(const char *in_repo_path, unsigned char status,
6171     unsigned char staged_status, struct got_object_id *base_blob_id,
6172     struct got_object_id *base_commit_id,
6173     struct got_object_id *head_commit_id, struct got_repository *repo,
6174     int ood_errcode)
6175 {
6176 	const struct got_error *err = NULL;
6177 	struct got_commit_object *commit = NULL;
6178 	struct got_object_id *id = NULL;
6179 
6180 	if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
6181 		/* Trivial case: base commit == head commit */
6182 		if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
6183 			return NULL;
6184 		/*
6185 		 * Ensure file content which local changes were based
6186 		 * on matches file content in the branch head.
6187 		 */
6188 		err = got_object_open_as_commit(&commit, repo, head_commit_id);
6189 		if (err)
6190 			goto done;
6191 		err = got_object_id_by_path(&id, repo, commit, in_repo_path);
6192 		if (err) {
6193 			if (err->code == GOT_ERR_NO_TREE_ENTRY)
6194 				err = got_error(ood_errcode);
6195 			goto done;
6196 		} else if (got_object_id_cmp(id, base_blob_id) != 0)
6197 			err = got_error(ood_errcode);
6198 	} else {
6199 		/* Require that added files don't exist in the branch head. */
6200 		err = got_object_open_as_commit(&commit, repo, head_commit_id);
6201 		if (err)
6202 			goto done;
6203 		err = got_object_id_by_path(&id, repo, commit, in_repo_path);
6204 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
6205 			goto done;
6206 		err = id ? got_error(ood_errcode) : NULL;
6207 	}
6208 done:
6209 	free(id);
6210 	if (commit)
6211 		got_object_commit_close(commit);
6212 	return err;
6213 }
6214 
6215 static const struct got_error *
6216 commit_worktree(struct got_object_id **new_commit_id,
6217     struct got_pathlist_head *commitable_paths,
6218     struct got_object_id *head_commit_id,
6219     struct got_object_id *parent_id2,
6220     struct got_worktree *worktree,
6221     const char *author, const char *committer, char *diff_path,
6222     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6223     got_worktree_status_cb status_cb, void *status_arg,
6224     struct got_repository *repo)
6225 {
6226 	const struct got_error *err = NULL, *unlockerr = NULL;
6227 	struct got_pathlist_entry *pe;
6228 	const char *head_ref_name = NULL;
6229 	struct got_commit_object *head_commit = NULL;
6230 	struct got_reference *head_ref2 = NULL;
6231 	struct got_object_id *head_commit_id2 = NULL;
6232 	struct got_tree_object *head_tree = NULL;
6233 	struct got_object_id *new_tree_id = NULL;
6234 	int nentries, nparents = 0;
6235 	struct got_object_id_queue parent_ids;
6236 	struct got_object_qid *pid = NULL;
6237 	char *logmsg = NULL;
6238 	time_t timestamp;
6239 
6240 	*new_commit_id = NULL;
6241 
6242 	STAILQ_INIT(&parent_ids);
6243 
6244 	err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
6245 	if (err)
6246 		goto done;
6247 
6248 	err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
6249 	if (err)
6250 		goto done;
6251 
6252 	if (commit_msg_cb != NULL) {
6253 		err = commit_msg_cb(commitable_paths, diff_path,
6254 		    &logmsg, commit_arg);
6255 		if (err)
6256 			goto done;
6257 	}
6258 
6259 	if (logmsg == NULL || strlen(logmsg) == 0) {
6260 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
6261 		goto done;
6262 	}
6263 
6264 	/* Create blobs from added and modified files and record their IDs. */
6265 	TAILQ_FOREACH(pe, commitable_paths, entry) {
6266 		struct got_commitable *ct = pe->data;
6267 		char *ondisk_path;
6268 
6269 		/* Blobs for staged files already exist. */
6270 		if (ct->staged_status == GOT_STATUS_ADD ||
6271 		    ct->staged_status == GOT_STATUS_MODIFY)
6272 			continue;
6273 
6274 		if (ct->status != GOT_STATUS_ADD &&
6275 		    ct->status != GOT_STATUS_MODIFY &&
6276 		    ct->status != GOT_STATUS_MODE_CHANGE &&
6277 		    ct->status != GOT_STATUS_CONFLICT)
6278 			continue;
6279 
6280 		if (asprintf(&ondisk_path, "%s/%s",
6281 		    worktree->root_path, pe->path) == -1) {
6282 			err = got_error_from_errno("asprintf");
6283 			goto done;
6284 		}
6285 		err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
6286 		free(ondisk_path);
6287 		if (err)
6288 			goto done;
6289 	}
6290 
6291 	/* Recursively write new tree objects. */
6292 	err = write_tree(&new_tree_id, &nentries, head_tree, "/",
6293 	    commitable_paths, status_cb, status_arg, repo);
6294 	if (err)
6295 		goto done;
6296 
6297 	err = got_object_qid_alloc(&pid, head_commit_id);
6298 	if (err)
6299 		goto done;
6300 	STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
6301 	nparents++;
6302 	if (parent_id2) {
6303 		err = got_object_qid_alloc(&pid, parent_id2);
6304 		if (err)
6305 			goto done;
6306 		STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
6307 		nparents++;
6308 	}
6309 	timestamp = time(NULL);
6310 	err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
6311 	    nparents, author, timestamp, committer, timestamp, logmsg, repo);
6312 	if (logmsg != NULL)
6313 		free(logmsg);
6314 	if (err)
6315 		goto done;
6316 
6317 	/* Check if a concurrent commit to our branch has occurred. */
6318 	head_ref_name = got_worktree_get_head_ref_name(worktree);
6319 	if (head_ref_name == NULL) {
6320 		err = got_error_from_errno("got_worktree_get_head_ref_name");
6321 		goto done;
6322 	}
6323 	/* Lock the reference here to prevent concurrent modification. */
6324 	err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6325 	if (err)
6326 		goto done;
6327 	err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6328 	if (err)
6329 		goto done;
6330 	if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6331 		err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6332 		goto done;
6333 	}
6334 	/* Update branch head in repository. */
6335 	err = got_ref_change_ref(head_ref2, *new_commit_id);
6336 	if (err)
6337 		goto done;
6338 	err = got_ref_write(head_ref2, repo);
6339 	if (err)
6340 		goto done;
6341 
6342 	err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6343 	if (err)
6344 		goto done;
6345 
6346 	err = ref_base_commit(worktree, repo);
6347 	if (err)
6348 		goto done;
6349 done:
6350 	got_object_id_queue_free(&parent_ids);
6351 	if (head_tree)
6352 		got_object_tree_close(head_tree);
6353 	if (head_commit)
6354 		got_object_commit_close(head_commit);
6355 	free(head_commit_id2);
6356 	if (head_ref2) {
6357 		unlockerr = got_ref_unlock(head_ref2);
6358 		if (unlockerr && err == NULL)
6359 			err = unlockerr;
6360 		got_ref_close(head_ref2);
6361 	}
6362 	return err;
6363 }
6364 
6365 static const struct got_error *
6366 check_path_is_commitable(const char *path,
6367     struct got_pathlist_head *commitable_paths)
6368 {
6369 	struct got_pathlist_entry *cpe = NULL;
6370 	size_t path_len = strlen(path);
6371 
6372 	TAILQ_FOREACH(cpe, commitable_paths, entry) {
6373 		struct got_commitable *ct = cpe->data;
6374 		const char *ct_path = ct->path;
6375 
6376 		while (ct_path[0] == '/')
6377 			ct_path++;
6378 
6379 		if (strcmp(path, ct_path) == 0 ||
6380 		    got_path_is_child(ct_path, path, path_len))
6381 			break;
6382 	}
6383 
6384 	if (cpe == NULL)
6385 		return got_error_path(path, GOT_ERR_BAD_PATH);
6386 
6387 	return NULL;
6388 }
6389 
6390 static const struct got_error *
6391 check_staged_file(void *arg, struct got_fileindex_entry *ie)
6392 {
6393 	int *have_staged_files = arg;
6394 
6395 	if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6396 		*have_staged_files = 1;
6397 		return got_error(GOT_ERR_CANCELLED);
6398 	}
6399 
6400 	return NULL;
6401 }
6402 
6403 static const struct got_error *
6404 check_non_staged_files(struct got_fileindex *fileindex,
6405     struct got_pathlist_head *paths)
6406 {
6407 	struct got_pathlist_entry *pe;
6408 	struct got_fileindex_entry *ie;
6409 
6410 	TAILQ_FOREACH(pe, paths, entry) {
6411 		if (pe->path[0] == '\0')
6412 			continue;
6413 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6414 		if (ie == NULL)
6415 			return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6416 		if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6417 			return got_error_path(pe->path,
6418 			    GOT_ERR_FILE_NOT_STAGED);
6419 	}
6420 
6421 	return NULL;
6422 }
6423 
6424 const struct got_error *
6425 got_worktree_commit(struct got_object_id **new_commit_id,
6426     struct got_worktree *worktree, struct got_pathlist_head *paths,
6427     const char *author, const char *committer, int allow_bad_symlinks,
6428     int show_diff, int commit_conflicts,
6429     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6430     got_worktree_status_cb status_cb, void *status_arg,
6431     struct got_repository *repo)
6432 {
6433 	const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6434 	struct got_fileindex *fileindex = NULL;
6435 	char *fileindex_path = NULL;
6436 	struct got_pathlist_head commitable_paths;
6437 	struct collect_commitables_arg cc_arg;
6438 	struct got_pathlist_entry *pe;
6439 	struct got_reference *head_ref = NULL;
6440 	struct got_object_id *head_commit_id = NULL;
6441 	char *diff_path = NULL;
6442 	int have_staged_files = 0;
6443 
6444 	*new_commit_id = NULL;
6445 
6446 	memset(&cc_arg, 0, sizeof(cc_arg));
6447 	TAILQ_INIT(&commitable_paths);
6448 
6449 	err = lock_worktree(worktree, LOCK_EX);
6450 	if (err)
6451 		goto done;
6452 
6453 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6454 	if (err)
6455 		goto done;
6456 
6457 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
6458 	if (err)
6459 		goto done;
6460 
6461 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
6462 	if (err)
6463 		goto done;
6464 
6465 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6466 	    &have_staged_files);
6467 	if (err && err->code != GOT_ERR_CANCELLED)
6468 		goto done;
6469 	if (have_staged_files) {
6470 		err = check_non_staged_files(fileindex, paths);
6471 		if (err)
6472 			goto done;
6473 	}
6474 
6475 	cc_arg.commitable_paths = &commitable_paths;
6476 	cc_arg.worktree = worktree;
6477 	cc_arg.fileindex = fileindex;
6478 	cc_arg.repo = repo;
6479 	cc_arg.have_staged_files = have_staged_files;
6480 	cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6481 	cc_arg.diff_header_shown = 0;
6482 	cc_arg.commit_conflicts = commit_conflicts;
6483 	if (show_diff) {
6484 		err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6485 		    GOT_TMPDIR_STR "/got", ".diff");
6486 		if (err)
6487 			goto done;
6488 		cc_arg.f1 = got_opentemp();
6489 		if (cc_arg.f1 == NULL) {
6490 			err = got_error_from_errno("got_opentemp");
6491 			goto done;
6492 		}
6493 		cc_arg.f2 = got_opentemp();
6494 		if (cc_arg.f2 == NULL) {
6495 			err = got_error_from_errno("got_opentemp");
6496 			goto done;
6497 		}
6498 	}
6499 
6500 	TAILQ_FOREACH(pe, paths, entry) {
6501 		err = worktree_status(worktree, pe->path, fileindex, repo,
6502 		    collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6503 		if (err)
6504 			goto done;
6505 	}
6506 
6507 	if (show_diff) {
6508 		if (fflush(cc_arg.diff_outfile) == EOF) {
6509 			err = got_error_from_errno("fflush");
6510 			goto done;
6511 		}
6512 	}
6513 
6514 	if (TAILQ_EMPTY(&commitable_paths)) {
6515 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6516 		goto done;
6517 	}
6518 
6519 	TAILQ_FOREACH(pe, paths, entry) {
6520 		err = check_path_is_commitable(pe->path, &commitable_paths);
6521 		if (err)
6522 			goto done;
6523 	}
6524 
6525 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
6526 		struct got_commitable *ct = pe->data;
6527 		const char *ct_path = ct->in_repo_path;
6528 
6529 		while (ct_path[0] == '/')
6530 			ct_path++;
6531 		err = check_out_of_date(ct_path, ct->status,
6532 		    ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6533 		    head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6534 		if (err)
6535 			goto done;
6536 
6537 	}
6538 
6539 	err = commit_worktree(new_commit_id, &commitable_paths,
6540 	    head_commit_id, NULL, worktree, author, committer,
6541 	    (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6542 	    commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6543 	if (err)
6544 		goto done;
6545 
6546 	err = update_fileindex_after_commit(worktree, &commitable_paths,
6547 	    *new_commit_id, fileindex, have_staged_files);
6548 	sync_err = sync_fileindex(fileindex, fileindex_path);
6549 	if (sync_err && err == NULL)
6550 		err = sync_err;
6551 done:
6552 	if (fileindex)
6553 		got_fileindex_free(fileindex);
6554 	free(fileindex_path);
6555 	unlockerr = lock_worktree(worktree, LOCK_SH);
6556 	if (unlockerr && err == NULL)
6557 		err = unlockerr;
6558 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
6559 		struct got_commitable *ct = pe->data;
6560 
6561 		free_commitable(ct);
6562 	}
6563 	got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6564 	if (diff_path && unlink(diff_path) == -1 && err == NULL)
6565 		err = got_error_from_errno2("unlink", diff_path);
6566 	free(diff_path);
6567 	if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6568 	    err == NULL)
6569 		err = got_error_from_errno("fclose");
6570 	return err;
6571 }
6572 
6573 const char *
6574 got_commitable_get_path(struct got_commitable *ct)
6575 {
6576 	return ct->path;
6577 }
6578 
6579 unsigned int
6580 got_commitable_get_status(struct got_commitable *ct)
6581 {
6582 	return ct->status;
6583 }
6584 
6585 struct check_rebase_ok_arg {
6586 	struct got_worktree *worktree;
6587 	struct got_repository *repo;
6588 };
6589 
6590 static const struct got_error *
6591 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6592 {
6593 	const struct got_error *err = NULL;
6594 	struct check_rebase_ok_arg *a = arg;
6595 	unsigned char status;
6596 	struct stat sb;
6597 	char *ondisk_path;
6598 
6599 	/* Reject rebase of a work tree with mixed base commits. */
6600 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6601 	    SHA1_DIGEST_LENGTH))
6602 		return got_error(GOT_ERR_MIXED_COMMITS);
6603 
6604 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6605 	    == -1)
6606 		return got_error_from_errno("asprintf");
6607 
6608 	/* Reject rebase of a work tree with modified or staged files. */
6609 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6610 	free(ondisk_path);
6611 	if (err)
6612 		return err;
6613 
6614 	if (status != GOT_STATUS_NO_CHANGE)
6615 		return got_error(GOT_ERR_MODIFIED);
6616 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6617 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6618 
6619 	return NULL;
6620 }
6621 
6622 const struct got_error *
6623 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6624     struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6625     struct got_worktree *worktree, struct got_reference *branch,
6626     struct got_repository *repo)
6627 {
6628 	const struct got_error *err = NULL;
6629 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6630 	char *branch_ref_name = NULL;
6631 	char *fileindex_path = NULL;
6632 	struct check_rebase_ok_arg ok_arg;
6633 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6634 	struct got_object_id *wt_branch_tip = NULL;
6635 
6636 	*new_base_branch_ref = NULL;
6637 	*tmp_branch = NULL;
6638 	*fileindex = NULL;
6639 
6640 	err = lock_worktree(worktree, LOCK_EX);
6641 	if (err)
6642 		return err;
6643 
6644 	err = open_fileindex(fileindex, &fileindex_path, worktree);
6645 	if (err)
6646 		goto done;
6647 
6648 	ok_arg.worktree = worktree;
6649 	ok_arg.repo = repo;
6650 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6651 	    &ok_arg);
6652 	if (err)
6653 		goto done;
6654 
6655 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6656 	if (err)
6657 		goto done;
6658 
6659 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6660 	if (err)
6661 		goto done;
6662 
6663 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6664 	if (err)
6665 		goto done;
6666 
6667 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6668 	    0);
6669 	if (err)
6670 		goto done;
6671 
6672 	err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6673 	if (err)
6674 		goto done;
6675 	if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6676 		err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6677 		goto done;
6678 	}
6679 
6680 	err = got_ref_alloc_symref(new_base_branch_ref,
6681 	    new_base_branch_ref_name, wt_branch);
6682 	if (err)
6683 		goto done;
6684 	err = got_ref_write(*new_base_branch_ref, repo);
6685 	if (err)
6686 		goto done;
6687 
6688 	/* TODO Lock original branch's ref while rebasing? */
6689 
6690 	err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6691 	if (err)
6692 		goto done;
6693 
6694 	err = got_ref_write(branch_ref, repo);
6695 	if (err)
6696 		goto done;
6697 
6698 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
6699 	    worktree->base_commit_id);
6700 	if (err)
6701 		goto done;
6702 	err = got_ref_write(*tmp_branch, repo);
6703 	if (err)
6704 		goto done;
6705 
6706 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
6707 	if (err)
6708 		goto done;
6709 done:
6710 	free(fileindex_path);
6711 	free(tmp_branch_name);
6712 	free(new_base_branch_ref_name);
6713 	free(branch_ref_name);
6714 	if (branch_ref)
6715 		got_ref_close(branch_ref);
6716 	if (wt_branch)
6717 		got_ref_close(wt_branch);
6718 	free(wt_branch_tip);
6719 	if (err) {
6720 		if (*new_base_branch_ref) {
6721 			got_ref_close(*new_base_branch_ref);
6722 			*new_base_branch_ref = NULL;
6723 		}
6724 		if (*tmp_branch) {
6725 			got_ref_close(*tmp_branch);
6726 			*tmp_branch = NULL;
6727 		}
6728 		if (*fileindex) {
6729 			got_fileindex_free(*fileindex);
6730 			*fileindex = NULL;
6731 		}
6732 		lock_worktree(worktree, LOCK_SH);
6733 	}
6734 	return err;
6735 }
6736 
6737 const struct got_error *
6738 got_worktree_rebase_continue(struct got_object_id **commit_id,
6739     struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6740     struct got_reference **branch, struct got_fileindex **fileindex,
6741     struct got_worktree *worktree, struct got_repository *repo)
6742 {
6743 	const struct got_error *err;
6744 	char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6745 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6746 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6747 	char *fileindex_path = NULL;
6748 	int have_staged_files = 0;
6749 
6750 	*commit_id = NULL;
6751 	*new_base_branch = NULL;
6752 	*tmp_branch = NULL;
6753 	*branch = NULL;
6754 	*fileindex = NULL;
6755 
6756 	err = lock_worktree(worktree, LOCK_EX);
6757 	if (err)
6758 		return err;
6759 
6760 	err = open_fileindex(fileindex, &fileindex_path, worktree);
6761 	if (err)
6762 		goto done;
6763 
6764 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6765 	    &have_staged_files);
6766 	if (err && err->code != GOT_ERR_CANCELLED)
6767 		goto done;
6768 	if (have_staged_files) {
6769 		err = got_error(GOT_ERR_STAGED_PATHS);
6770 		goto done;
6771 	}
6772 
6773 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6774 	if (err)
6775 		goto done;
6776 
6777 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6778 	if (err)
6779 		goto done;
6780 
6781 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6782 	if (err)
6783 		goto done;
6784 
6785 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6786 	if (err)
6787 		goto done;
6788 
6789 	err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6790 	if (err)
6791 		goto done;
6792 
6793 	err = got_ref_open(branch, repo,
6794 	    got_ref_get_symref_target(branch_ref), 0);
6795 	if (err)
6796 		goto done;
6797 
6798 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6799 	if (err)
6800 		goto done;
6801 
6802 	err = got_ref_resolve(commit_id, repo, commit_ref);
6803 	if (err)
6804 		goto done;
6805 
6806 	err = got_ref_open(new_base_branch, repo,
6807 	    new_base_branch_ref_name, 0);
6808 	if (err)
6809 		goto done;
6810 
6811 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6812 	if (err)
6813 		goto done;
6814 done:
6815 	free(commit_ref_name);
6816 	free(branch_ref_name);
6817 	free(fileindex_path);
6818 	if (commit_ref)
6819 		got_ref_close(commit_ref);
6820 	if (branch_ref)
6821 		got_ref_close(branch_ref);
6822 	if (err) {
6823 		free(*commit_id);
6824 		*commit_id = NULL;
6825 		if (*tmp_branch) {
6826 			got_ref_close(*tmp_branch);
6827 			*tmp_branch = NULL;
6828 		}
6829 		if (*new_base_branch) {
6830 			got_ref_close(*new_base_branch);
6831 			*new_base_branch = NULL;
6832 		}
6833 		if (*branch) {
6834 			got_ref_close(*branch);
6835 			*branch = NULL;
6836 		}
6837 		if (*fileindex) {
6838 			got_fileindex_free(*fileindex);
6839 			*fileindex = NULL;
6840 		}
6841 		lock_worktree(worktree, LOCK_SH);
6842 	}
6843 	return err;
6844 }
6845 
6846 const struct got_error *
6847 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6848 {
6849 	const struct got_error *err;
6850 	char *tmp_branch_name = NULL;
6851 
6852 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6853 	if (err)
6854 		return err;
6855 
6856 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6857 	free(tmp_branch_name);
6858 	return NULL;
6859 }
6860 
6861 static const struct got_error *
6862 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6863     const char *diff_path, char **logmsg, void *arg)
6864 {
6865 	*logmsg = arg;
6866 	return NULL;
6867 }
6868 
6869 static const struct got_error *
6870 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6871     const char *path, struct got_object_id *blob_id,
6872     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6873     int dirfd, const char *de_name)
6874 {
6875 	return NULL;
6876 }
6877 
6878 struct collect_merged_paths_arg {
6879 	got_worktree_checkout_cb progress_cb;
6880 	void *progress_arg;
6881 	struct got_pathlist_head *merged_paths;
6882 };
6883 
6884 static const struct got_error *
6885 collect_merged_paths(void *arg, unsigned char status, const char *path)
6886 {
6887 	const struct got_error *err;
6888 	struct collect_merged_paths_arg *a = arg;
6889 	char *p;
6890 	struct got_pathlist_entry *new;
6891 
6892 	err = (*a->progress_cb)(a->progress_arg, status, path);
6893 	if (err)
6894 		return err;
6895 
6896 	if (status != GOT_STATUS_MERGE &&
6897 	    status != GOT_STATUS_ADD &&
6898 	    status != GOT_STATUS_DELETE &&
6899 	    status != GOT_STATUS_CONFLICT)
6900 		return NULL;
6901 
6902 	p = strdup(path);
6903 	if (p == NULL)
6904 		return got_error_from_errno("strdup");
6905 
6906 	err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6907 	if (err || new == NULL)
6908 		free(p);
6909 	return err;
6910 }
6911 
6912 static const struct got_error *
6913 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6914     int is_rebase, struct got_repository *repo)
6915 {
6916 	const struct got_error *err;
6917 	struct got_reference *commit_ref = NULL;
6918 
6919 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6920 	if (err) {
6921 		if (err->code != GOT_ERR_NOT_REF)
6922 			goto done;
6923 		err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6924 		if (err)
6925 			goto done;
6926 		err = got_ref_write(commit_ref, repo);
6927 		if (err)
6928 			goto done;
6929 	} else if (is_rebase) {
6930 		struct got_object_id *stored_id;
6931 		int cmp;
6932 
6933 		err = got_ref_resolve(&stored_id, repo, commit_ref);
6934 		if (err)
6935 			goto done;
6936 		cmp = got_object_id_cmp(commit_id, stored_id);
6937 		free(stored_id);
6938 		if (cmp != 0) {
6939 			err = got_error(GOT_ERR_REBASE_COMMITID);
6940 			goto done;
6941 		}
6942 	}
6943 done:
6944 	if (commit_ref)
6945 		got_ref_close(commit_ref);
6946 	return err;
6947 }
6948 
6949 static const struct got_error *
6950 rebase_merge_files(struct got_pathlist_head *merged_paths,
6951     const char *commit_ref_name, struct got_worktree *worktree,
6952     struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6953     struct got_object_id *commit_id, struct got_repository *repo,
6954     got_worktree_checkout_cb progress_cb, void *progress_arg,
6955     got_cancel_cb cancel_cb, void *cancel_arg)
6956 {
6957 	const struct got_error *err;
6958 	struct got_reference *commit_ref = NULL;
6959 	struct collect_merged_paths_arg cmp_arg;
6960 	char *fileindex_path;
6961 
6962 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
6963 
6964 	err = get_fileindex_path(&fileindex_path, worktree);
6965 	if (err)
6966 		return err;
6967 
6968 	cmp_arg.progress_cb = progress_cb;
6969 	cmp_arg.progress_arg = progress_arg;
6970 	cmp_arg.merged_paths = merged_paths;
6971 	err = merge_files(worktree, fileindex, fileindex_path,
6972 	    parent_commit_id, commit_id, repo, collect_merged_paths,
6973 	    &cmp_arg, cancel_cb, cancel_arg);
6974 	if (commit_ref)
6975 		got_ref_close(commit_ref);
6976 	return err;
6977 }
6978 
6979 const struct got_error *
6980 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6981     struct got_worktree *worktree, struct got_fileindex *fileindex,
6982     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6983     struct got_repository *repo,
6984     got_worktree_checkout_cb progress_cb, void *progress_arg,
6985     got_cancel_cb cancel_cb, void *cancel_arg)
6986 {
6987 	const struct got_error *err;
6988 	char *commit_ref_name;
6989 
6990 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6991 	if (err)
6992 		return err;
6993 
6994 	err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6995 	if (err)
6996 		goto done;
6997 
6998 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6999 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
7000 	    progress_arg, cancel_cb, cancel_arg);
7001 done:
7002 	free(commit_ref_name);
7003 	return err;
7004 }
7005 
7006 const struct got_error *
7007 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
7008     struct got_worktree *worktree, struct got_fileindex *fileindex,
7009     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
7010     struct got_repository *repo,
7011     got_worktree_checkout_cb progress_cb, void *progress_arg,
7012     got_cancel_cb cancel_cb, void *cancel_arg)
7013 {
7014 	const struct got_error *err;
7015 	char *commit_ref_name;
7016 
7017 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7018 	if (err)
7019 		return err;
7020 
7021 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7022 	if (err)
7023 		goto done;
7024 
7025 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
7026 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
7027 	    progress_arg, cancel_cb, cancel_arg);
7028 done:
7029 	free(commit_ref_name);
7030 	return err;
7031 }
7032 
7033 static const struct got_error *
7034 rebase_commit(struct got_object_id **new_commit_id,
7035     struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
7036     struct got_worktree *worktree, struct got_fileindex *fileindex,
7037     struct got_reference *tmp_branch, const char *committer,
7038     struct got_commit_object *orig_commit, const char *new_logmsg,
7039     int allow_conflict, struct got_repository *repo)
7040 {
7041 	const struct got_error *err, *sync_err;
7042 	struct got_pathlist_head commitable_paths;
7043 	struct collect_commitables_arg cc_arg;
7044 	char *fileindex_path = NULL;
7045 	struct got_reference *head_ref = NULL;
7046 	struct got_object_id *head_commit_id = NULL;
7047 	char *logmsg = NULL;
7048 
7049 	memset(&cc_arg, 0, sizeof(cc_arg));
7050 	TAILQ_INIT(&commitable_paths);
7051 	*new_commit_id = NULL;
7052 
7053 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
7054 
7055 	err = get_fileindex_path(&fileindex_path, worktree);
7056 	if (err)
7057 		return err;
7058 
7059 	cc_arg.commitable_paths = &commitable_paths;
7060 	cc_arg.worktree = worktree;
7061 	cc_arg.repo = repo;
7062 	cc_arg.have_staged_files = 0;
7063 	cc_arg.commit_conflicts = allow_conflict;
7064 	/*
7065 	 * If possible get the status of individual files directly to
7066 	 * avoid crawling the entire work tree once per rebased commit.
7067 	 *
7068 	 * Ideally, merged_paths would contain a list of commitables
7069 	 * we could use so we could skip worktree_status() entirely.
7070 	 * However, we would then need carefully keep track of cumulative
7071 	 * effects of operations such as file additions and deletions
7072 	 * in 'got histedit -f' (folding multiple commits into one),
7073 	 * and this extra complexity is not really worth it.
7074 	 */
7075 	if (merged_paths) {
7076 		struct got_pathlist_entry *pe;
7077 		TAILQ_FOREACH(pe, merged_paths, entry) {
7078 			err = worktree_status(worktree, pe->path, fileindex,
7079 			    repo, collect_commitables, &cc_arg, NULL, NULL, 1,
7080 			    0);
7081 			if (err)
7082 				goto done;
7083 		}
7084 	} else {
7085 		err = worktree_status(worktree, "", fileindex, repo,
7086 		    collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7087 		if (err)
7088 			goto done;
7089 	}
7090 
7091 	if (TAILQ_EMPTY(&commitable_paths)) {
7092 		/* No-op change; commit will be elided. */
7093 		err = got_ref_delete(commit_ref, repo);
7094 		if (err)
7095 			goto done;
7096 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
7097 		goto done;
7098 	}
7099 
7100 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7101 	if (err)
7102 		goto done;
7103 
7104 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
7105 	if (err)
7106 		goto done;
7107 
7108 	if (new_logmsg) {
7109 		logmsg = strdup(new_logmsg);
7110 		if (logmsg == NULL) {
7111 			err = got_error_from_errno("strdup");
7112 			goto done;
7113 		}
7114 	} else {
7115 		err = got_object_commit_get_logmsg(&logmsg, orig_commit);
7116 		if (err)
7117 			goto done;
7118 	}
7119 
7120 	/* NB: commit_worktree will call free(logmsg) */
7121 	err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
7122 	    NULL, worktree, got_object_commit_get_author(orig_commit),
7123 	    committer ? committer :
7124 	    got_object_commit_get_committer(orig_commit), NULL,
7125 	    collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
7126 	if (err)
7127 		goto done;
7128 
7129 	err = got_ref_change_ref(tmp_branch, *new_commit_id);
7130 	if (err)
7131 		goto done;
7132 
7133 	err = got_ref_delete(commit_ref, repo);
7134 	if (err)
7135 		goto done;
7136 
7137 	err = update_fileindex_after_commit(worktree, &commitable_paths,
7138 	    *new_commit_id, fileindex, 0);
7139 	sync_err = sync_fileindex(fileindex, fileindex_path);
7140 	if (sync_err && err == NULL)
7141 		err = sync_err;
7142 done:
7143 	free(fileindex_path);
7144 	free(head_commit_id);
7145 	if (head_ref)
7146 		got_ref_close(head_ref);
7147 	if (err) {
7148 		free(*new_commit_id);
7149 		*new_commit_id = NULL;
7150 	}
7151 	return err;
7152 }
7153 
7154 const struct got_error *
7155 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
7156     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
7157     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7158     const char *committer, struct got_commit_object *orig_commit,
7159     struct got_object_id *orig_commit_id, int allow_conflict,
7160     struct got_repository *repo)
7161 {
7162 	const struct got_error *err;
7163 	char *commit_ref_name;
7164 	struct got_reference *commit_ref = NULL;
7165 	struct got_object_id *commit_id = NULL;
7166 
7167 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
7168 	if (err)
7169 		return err;
7170 
7171 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7172 	if (err)
7173 		goto done;
7174 	err = got_ref_resolve(&commit_id, repo, commit_ref);
7175 	if (err)
7176 		goto done;
7177 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
7178 		err = got_error(GOT_ERR_REBASE_COMMITID);
7179 		goto done;
7180 	}
7181 
7182 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
7183 	    worktree, fileindex, tmp_branch, committer, orig_commit,
7184 	    NULL, allow_conflict, repo);
7185 done:
7186 	if (commit_ref)
7187 		got_ref_close(commit_ref);
7188 	free(commit_ref_name);
7189 	free(commit_id);
7190 	return err;
7191 }
7192 
7193 const struct got_error *
7194 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
7195     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
7196     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7197     const char *committer, struct got_commit_object *orig_commit,
7198     struct got_object_id *orig_commit_id, const char *new_logmsg,
7199     int allow_conflict, struct got_repository *repo)
7200 {
7201 	const struct got_error *err;
7202 	char *commit_ref_name;
7203 	struct got_reference *commit_ref = NULL;
7204 
7205 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7206 	if (err)
7207 		return err;
7208 
7209 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7210 	if (err)
7211 		goto done;
7212 
7213 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
7214 	    worktree, fileindex, tmp_branch, committer, orig_commit,
7215 	    new_logmsg, allow_conflict, repo);
7216 done:
7217 	if (commit_ref)
7218 		got_ref_close(commit_ref);
7219 	free(commit_ref_name);
7220 	return err;
7221 }
7222 
7223 const struct got_error *
7224 got_worktree_rebase_postpone(struct got_worktree *worktree,
7225     struct got_fileindex *fileindex)
7226 {
7227 	if (fileindex)
7228 		got_fileindex_free(fileindex);
7229 	return lock_worktree(worktree, LOCK_SH);
7230 }
7231 
7232 static const struct got_error *
7233 delete_ref(const char *name, struct got_repository *repo)
7234 {
7235 	const struct got_error *err;
7236 	struct got_reference *ref;
7237 
7238 	err = got_ref_open(&ref, repo, name, 0);
7239 	if (err) {
7240 		if (err->code == GOT_ERR_NOT_REF)
7241 			return NULL;
7242 		return err;
7243 	}
7244 
7245 	err = got_ref_delete(ref, repo);
7246 	got_ref_close(ref);
7247 	return err;
7248 }
7249 
7250 static const struct got_error *
7251 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
7252 {
7253 	const struct got_error *err;
7254 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
7255 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
7256 
7257 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
7258 	if (err)
7259 		goto done;
7260 	err = delete_ref(tmp_branch_name, repo);
7261 	if (err)
7262 		goto done;
7263 
7264 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
7265 	if (err)
7266 		goto done;
7267 	err = delete_ref(new_base_branch_ref_name, repo);
7268 	if (err)
7269 		goto done;
7270 
7271 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
7272 	if (err)
7273 		goto done;
7274 	err = delete_ref(branch_ref_name, repo);
7275 	if (err)
7276 		goto done;
7277 
7278 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
7279 	if (err)
7280 		goto done;
7281 	err = delete_ref(commit_ref_name, repo);
7282 	if (err)
7283 		goto done;
7284 
7285 done:
7286 	free(tmp_branch_name);
7287 	free(new_base_branch_ref_name);
7288 	free(branch_ref_name);
7289 	free(commit_ref_name);
7290 	return err;
7291 }
7292 
7293 static const struct got_error *
7294 create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
7295     struct got_object_id *new_commit_id, struct got_repository *repo)
7296 {
7297 	const struct got_error *err;
7298 	struct got_reference *ref = NULL;
7299 	struct got_object_id *old_commit_id = NULL;
7300 	const char *branch_name = NULL;
7301 	char *new_id_str = NULL;
7302 	char *refname = NULL;
7303 
7304 	branch_name = got_ref_get_name(branch);
7305 	if (strncmp(branch_name, "refs/heads/", 11) != 0)
7306 		return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
7307 	branch_name += 11;
7308 
7309 	err = got_object_id_str(&new_id_str, new_commit_id);
7310 	if (err)
7311 		return err;
7312 
7313 	if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
7314 	    new_id_str) == -1) {
7315 		err = got_error_from_errno("asprintf");
7316 		goto done;
7317 	}
7318 
7319 	err = got_ref_resolve(&old_commit_id, repo, branch);
7320 	if (err)
7321 		goto done;
7322 
7323 	err = got_ref_alloc(&ref, refname, old_commit_id);
7324 	if (err)
7325 		goto done;
7326 
7327 	err = got_ref_write(ref, repo);
7328 done:
7329 	free(new_id_str);
7330 	free(refname);
7331 	free(old_commit_id);
7332 	if (ref)
7333 		got_ref_close(ref);
7334 	return err;
7335 }
7336 
7337 const struct got_error *
7338 got_worktree_rebase_complete(struct got_worktree *worktree,
7339     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7340     struct got_reference *rebased_branch, struct got_repository *repo,
7341     int create_backup)
7342 {
7343 	const struct got_error *err, *unlockerr, *sync_err;
7344 	struct got_object_id *new_head_commit_id = NULL;
7345 	char *fileindex_path = NULL;
7346 
7347 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7348 	if (err)
7349 		return err;
7350 
7351 	if (create_backup) {
7352 		err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7353 		    rebased_branch, new_head_commit_id, repo);
7354 		if (err)
7355 			goto done;
7356 	}
7357 
7358 	err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7359 	if (err)
7360 		goto done;
7361 
7362 	err = got_ref_write(rebased_branch, repo);
7363 	if (err)
7364 		goto done;
7365 
7366 	err = got_worktree_set_head_ref(worktree, rebased_branch);
7367 	if (err)
7368 		goto done;
7369 
7370 	err = delete_rebase_refs(worktree, repo);
7371 	if (err)
7372 		goto done;
7373 
7374 	err = get_fileindex_path(&fileindex_path, worktree);
7375 	if (err)
7376 		goto done;
7377 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7378 	sync_err = sync_fileindex(fileindex, fileindex_path);
7379 	if (sync_err && err == NULL)
7380 		err = sync_err;
7381 done:
7382 	got_fileindex_free(fileindex);
7383 	free(fileindex_path);
7384 	free(new_head_commit_id);
7385 	unlockerr = lock_worktree(worktree, LOCK_SH);
7386 	if (unlockerr && err == NULL)
7387 		err = unlockerr;
7388 	return err;
7389 }
7390 
7391 static const struct got_error *
7392 get_paths_changed_between_commits(struct got_pathlist_head *paths,
7393     struct got_object_id *id1, struct got_object_id *id2,
7394     struct got_repository *repo)
7395 {
7396 	const struct got_error		*err;
7397 	struct got_commit_object	*commit1 = NULL, *commit2 = NULL;
7398 	struct got_tree_object		*tree1 = NULL, *tree2 = NULL;
7399 
7400 	if (id1) {
7401 		err = got_object_open_as_commit(&commit1, repo, id1);
7402 		if (err)
7403 			goto done;
7404 
7405 		err = got_object_open_as_tree(&tree1, repo,
7406 		    got_object_commit_get_tree_id(commit1));
7407 		if (err)
7408 			goto done;
7409 	}
7410 
7411 	if (id2) {
7412 		err = got_object_open_as_commit(&commit2, repo, id2);
7413 		if (err)
7414 			goto done;
7415 
7416 		err = got_object_open_as_tree(&tree2, repo,
7417 		    got_object_commit_get_tree_id(commit2));
7418 		if (err)
7419 			goto done;
7420 	}
7421 
7422 	err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
7423 	    got_diff_tree_collect_changed_paths, paths, 0);
7424 	if (err)
7425 		goto done;
7426 done:
7427 	if (commit1)
7428 		got_object_commit_close(commit1);
7429 	if (commit2)
7430 		got_object_commit_close(commit2);
7431 	if (tree1)
7432 		got_object_tree_close(tree1);
7433 	if (tree2)
7434 		got_object_tree_close(tree2);
7435 	return err;
7436 }
7437 
7438 static const struct got_error *
7439 get_paths_added_between_commits(struct got_pathlist_head *added_paths,
7440     struct got_object_id *id1, struct got_object_id *id2,
7441     const char *path_prefix, struct got_repository *repo)
7442 {
7443 	const struct got_error *err;
7444 	struct got_pathlist_head merged_paths;
7445 	struct got_pathlist_entry *pe;
7446 	char *abspath = NULL, *wt_path = NULL;
7447 
7448 	TAILQ_INIT(&merged_paths);
7449 
7450 	err = get_paths_changed_between_commits(&merged_paths, id1, id2, repo);
7451 	if (err)
7452 		goto done;
7453 
7454 	TAILQ_FOREACH(pe, &merged_paths, entry) {
7455 		struct got_diff_changed_path *change = pe->data;
7456 
7457 		if (change->status != GOT_STATUS_ADD)
7458 			continue;
7459 
7460 		if (got_path_is_root_dir(path_prefix)) {
7461 			wt_path = strdup(pe->path);
7462 			if (wt_path == NULL) {
7463 				err = got_error_from_errno("strdup");
7464 				goto done;
7465 			}
7466 		} else {
7467 			if (asprintf(&abspath, "/%s", pe->path) == -1) {
7468 				err = got_error_from_errno("asprintf");
7469 				goto done;
7470 			}
7471 
7472 			err = got_path_skip_common_ancestor(&wt_path,
7473 			    path_prefix, abspath);
7474 			if (err)
7475 				goto done;
7476 			free(abspath);
7477 			abspath = NULL;
7478 		}
7479 
7480 		err = got_pathlist_append(added_paths, wt_path, NULL);
7481 		if (err)
7482 			goto done;
7483 		wt_path = NULL;
7484 	}
7485 
7486 done:
7487 	got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_ALL);
7488 	free(abspath);
7489 	free(wt_path);
7490 	return err;
7491 }
7492 
7493 static const struct got_error *
7494 get_paths_added_in_commit(struct got_pathlist_head *added_paths,
7495     struct got_object_id *id, const char *path_prefix,
7496     struct got_repository *repo)
7497 {
7498 	const struct got_error		*err;
7499 	struct got_commit_object	*commit = NULL;
7500 	struct got_object_qid		*pid;
7501 
7502 	err = got_object_open_as_commit(&commit, repo, id);
7503 	if (err)
7504 		goto done;
7505 
7506 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7507 
7508 	err = get_paths_added_between_commits(added_paths,
7509 	    pid ? &pid->id : NULL, id, path_prefix, repo);
7510 	if (err)
7511 		goto done;
7512 done:
7513 	if (commit)
7514 		got_object_commit_close(commit);
7515 	return err;
7516 }
7517 
7518 const struct got_error *
7519 got_worktree_rebase_abort(struct got_worktree *worktree,
7520     struct got_fileindex *fileindex, struct got_repository *repo,
7521     struct got_reference *new_base_branch,
7522     got_worktree_checkout_cb progress_cb, void *progress_arg)
7523 {
7524 	const struct got_error *err, *unlockerr, *sync_err;
7525 	struct got_reference *resolved = NULL;
7526 	struct got_object_id *commit_id = NULL;
7527 	struct got_object_id *merged_commit_id = NULL;
7528 	struct got_commit_object *commit = NULL;
7529 	char *fileindex_path = NULL;
7530 	char *commit_ref_name = NULL;
7531 	struct got_reference *commit_ref = NULL;
7532 	struct revert_file_args rfa;
7533 	struct got_object_id *tree_id = NULL;
7534 	struct got_pathlist_head added_paths;
7535 
7536 	TAILQ_INIT(&added_paths);
7537 
7538 	err = lock_worktree(worktree, LOCK_EX);
7539 	if (err)
7540 		return err;
7541 
7542 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
7543 	if (err)
7544 		goto done;
7545 
7546 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7547 	if (err)
7548 		goto done;
7549 
7550 	err = got_ref_resolve(&merged_commit_id, repo, commit_ref);
7551 	if (err)
7552 		goto done;
7553 
7554 	/*
7555 	 * Determine which files in added status can be safely removed
7556 	 * from disk while reverting changes in the work tree.
7557 	 * We want to avoid deleting unrelated files which were added by
7558 	 * the user for conflict resolution purposes.
7559 	 */
7560 	err = get_paths_added_in_commit(&added_paths, merged_commit_id,
7561 	    got_worktree_get_path_prefix(worktree), repo);
7562 	if (err)
7563 		goto done;
7564 
7565 	err = got_ref_open(&resolved, repo,
7566 	    got_ref_get_symref_target(new_base_branch), 0);
7567 	if (err)
7568 		goto done;
7569 
7570 	err = got_worktree_set_head_ref(worktree, resolved);
7571 	if (err)
7572 		goto done;
7573 
7574 	/*
7575 	 * XXX commits to the base branch could have happened while
7576 	 * we were busy rebasing; should we store the original commit ID
7577 	 * when rebase begins and read it back here?
7578 	 */
7579 	err = got_ref_resolve(&commit_id, repo, resolved);
7580 	if (err)
7581 		goto done;
7582 
7583 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7584 	if (err)
7585 		goto done;
7586 
7587 	err = got_object_open_as_commit(&commit, repo,
7588 	    worktree->base_commit_id);
7589 	if (err)
7590 		goto done;
7591 
7592 	err = got_object_id_by_path(&tree_id, repo, commit,
7593 	    worktree->path_prefix);
7594 	if (err)
7595 		goto done;
7596 
7597 	err = delete_rebase_refs(worktree, repo);
7598 	if (err)
7599 		goto done;
7600 
7601 	err = get_fileindex_path(&fileindex_path, worktree);
7602 	if (err)
7603 		goto done;
7604 
7605 	rfa.worktree = worktree;
7606 	rfa.fileindex = fileindex;
7607 	rfa.progress_cb = progress_cb;
7608 	rfa.progress_arg = progress_arg;
7609 	rfa.patch_cb = NULL;
7610 	rfa.patch_arg = NULL;
7611 	rfa.repo = repo;
7612 	rfa.unlink_added_files = 1;
7613 	rfa.added_files_to_unlink = &added_paths;
7614 	err = worktree_status(worktree, "", fileindex, repo,
7615 	    revert_file, &rfa, NULL, NULL, 1, 0);
7616 	if (err)
7617 		goto sync;
7618 
7619 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7620 	    repo, progress_cb, progress_arg, NULL, NULL);
7621 sync:
7622 	sync_err = sync_fileindex(fileindex, fileindex_path);
7623 	if (sync_err && err == NULL)
7624 		err = sync_err;
7625 done:
7626 	got_pathlist_free(&added_paths, GOT_PATHLIST_FREE_PATH);
7627 	got_ref_close(resolved);
7628 	free(tree_id);
7629 	free(commit_id);
7630 	free(merged_commit_id);
7631 	if (commit)
7632 		got_object_commit_close(commit);
7633 	if (fileindex)
7634 		got_fileindex_free(fileindex);
7635 	free(fileindex_path);
7636 	free(commit_ref_name);
7637 	if (commit_ref)
7638 		got_ref_close(commit_ref);
7639 
7640 	unlockerr = lock_worktree(worktree, LOCK_SH);
7641 	if (unlockerr && err == NULL)
7642 		err = unlockerr;
7643 	return err;
7644 }
7645 
7646 const struct got_error *
7647 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7648     struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7649     struct got_fileindex **fileindex, struct got_worktree *worktree,
7650     struct got_repository *repo)
7651 {
7652 	const struct got_error *err = NULL;
7653 	char *tmp_branch_name = NULL;
7654 	char *branch_ref_name = NULL;
7655 	char *base_commit_ref_name = NULL;
7656 	char *fileindex_path = NULL;
7657 	struct check_rebase_ok_arg ok_arg;
7658 	struct got_reference *wt_branch = NULL;
7659 	struct got_reference *base_commit_ref = NULL;
7660 
7661 	*tmp_branch = NULL;
7662 	*branch_ref = NULL;
7663 	*base_commit_id = NULL;
7664 	*fileindex = NULL;
7665 
7666 	err = lock_worktree(worktree, LOCK_EX);
7667 	if (err)
7668 		return err;
7669 
7670 	err = open_fileindex(fileindex, &fileindex_path, worktree);
7671 	if (err)
7672 		goto done;
7673 
7674 	ok_arg.worktree = worktree;
7675 	ok_arg.repo = repo;
7676 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7677 	    &ok_arg);
7678 	if (err)
7679 		goto done;
7680 
7681 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7682 	if (err)
7683 		goto done;
7684 
7685 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7686 	if (err)
7687 		goto done;
7688 
7689 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7690 	    worktree);
7691 	if (err)
7692 		goto done;
7693 
7694 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7695 	    0);
7696 	if (err)
7697 		goto done;
7698 
7699 	err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7700 	if (err)
7701 		goto done;
7702 
7703 	err = got_ref_write(*branch_ref, repo);
7704 	if (err)
7705 		goto done;
7706 
7707 	err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7708 	    worktree->base_commit_id);
7709 	if (err)
7710 		goto done;
7711 	err = got_ref_write(base_commit_ref, repo);
7712 	if (err)
7713 		goto done;
7714 	*base_commit_id = got_object_id_dup(worktree->base_commit_id);
7715 	if (*base_commit_id == NULL) {
7716 		err = got_error_from_errno("got_object_id_dup");
7717 		goto done;
7718 	}
7719 
7720 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
7721 	    worktree->base_commit_id);
7722 	if (err)
7723 		goto done;
7724 	err = got_ref_write(*tmp_branch, repo);
7725 	if (err)
7726 		goto done;
7727 
7728 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
7729 	if (err)
7730 		goto done;
7731 done:
7732 	free(fileindex_path);
7733 	free(tmp_branch_name);
7734 	free(branch_ref_name);
7735 	free(base_commit_ref_name);
7736 	if (wt_branch)
7737 		got_ref_close(wt_branch);
7738 	if (err) {
7739 		if (*branch_ref) {
7740 			got_ref_close(*branch_ref);
7741 			*branch_ref = NULL;
7742 		}
7743 		if (*tmp_branch) {
7744 			got_ref_close(*tmp_branch);
7745 			*tmp_branch = NULL;
7746 		}
7747 		free(*base_commit_id);
7748 		if (*fileindex) {
7749 			got_fileindex_free(*fileindex);
7750 			*fileindex = NULL;
7751 		}
7752 		lock_worktree(worktree, LOCK_SH);
7753 	}
7754 	return err;
7755 }
7756 
7757 const struct got_error *
7758 got_worktree_histedit_postpone(struct got_worktree *worktree,
7759     struct got_fileindex *fileindex)
7760 {
7761 	if (fileindex)
7762 		got_fileindex_free(fileindex);
7763 	return lock_worktree(worktree, LOCK_SH);
7764 }
7765 
7766 const struct got_error *
7767 got_worktree_histedit_in_progress(int *in_progress,
7768     struct got_worktree *worktree)
7769 {
7770 	const struct got_error *err;
7771 	char *tmp_branch_name = NULL;
7772 
7773 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7774 	if (err)
7775 		return err;
7776 
7777 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7778 	free(tmp_branch_name);
7779 	return NULL;
7780 }
7781 
7782 const struct got_error *
7783 got_worktree_histedit_continue(struct got_object_id **commit_id,
7784     struct got_reference **tmp_branch, struct got_reference **branch_ref,
7785     struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7786     struct got_worktree *worktree, struct got_repository *repo)
7787 {
7788 	const struct got_error *err;
7789 	char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7790 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7791 	struct got_reference *commit_ref = NULL;
7792 	struct got_reference *base_commit_ref = NULL;
7793 	char *fileindex_path = NULL;
7794 	int have_staged_files = 0;
7795 
7796 	*commit_id = NULL;
7797 	*tmp_branch = NULL;
7798 	*base_commit_id = NULL;
7799 	*fileindex = NULL;
7800 
7801 	err = lock_worktree(worktree, LOCK_EX);
7802 	if (err)
7803 		return err;
7804 
7805 	err = open_fileindex(fileindex, &fileindex_path, worktree);
7806 	if (err)
7807 		goto done;
7808 
7809 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7810 	    &have_staged_files);
7811 	if (err && err->code != GOT_ERR_CANCELLED)
7812 		goto done;
7813 	if (have_staged_files) {
7814 		err = got_error(GOT_ERR_STAGED_PATHS);
7815 		goto done;
7816 	}
7817 
7818 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7819 	if (err)
7820 		goto done;
7821 
7822 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7823 	if (err)
7824 		goto done;
7825 
7826 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7827 	if (err)
7828 		goto done;
7829 
7830 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7831 	    worktree);
7832 	if (err)
7833 		goto done;
7834 
7835 	err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7836 	if (err)
7837 		goto done;
7838 
7839 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7840 	if (err)
7841 		goto done;
7842 	err = got_ref_resolve(commit_id, repo, commit_ref);
7843 	if (err)
7844 		goto done;
7845 
7846 	err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7847 	if (err)
7848 		goto done;
7849 	err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7850 	if (err)
7851 		goto done;
7852 
7853 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7854 	if (err)
7855 		goto done;
7856 done:
7857 	free(commit_ref_name);
7858 	free(branch_ref_name);
7859 	free(fileindex_path);
7860 	if (commit_ref)
7861 		got_ref_close(commit_ref);
7862 	if (base_commit_ref)
7863 		got_ref_close(base_commit_ref);
7864 	if (err) {
7865 		free(*commit_id);
7866 		*commit_id = NULL;
7867 		free(*base_commit_id);
7868 		*base_commit_id = NULL;
7869 		if (*tmp_branch) {
7870 			got_ref_close(*tmp_branch);
7871 			*tmp_branch = NULL;
7872 		}
7873 		if (*fileindex) {
7874 			got_fileindex_free(*fileindex);
7875 			*fileindex = NULL;
7876 		}
7877 		lock_worktree(worktree, LOCK_EX);
7878 	}
7879 	return err;
7880 }
7881 
7882 static const struct got_error *
7883 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7884 {
7885 	const struct got_error *err;
7886 	char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7887 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
7888 
7889 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7890 	if (err)
7891 		goto done;
7892 	err = delete_ref(tmp_branch_name, repo);
7893 	if (err)
7894 		goto done;
7895 
7896 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7897 	    worktree);
7898 	if (err)
7899 		goto done;
7900 	err = delete_ref(base_commit_ref_name, repo);
7901 	if (err)
7902 		goto done;
7903 
7904 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7905 	if (err)
7906 		goto done;
7907 	err = delete_ref(branch_ref_name, repo);
7908 	if (err)
7909 		goto done;
7910 
7911 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7912 	if (err)
7913 		goto done;
7914 	err = delete_ref(commit_ref_name, repo);
7915 	if (err)
7916 		goto done;
7917 done:
7918 	free(tmp_branch_name);
7919 	free(base_commit_ref_name);
7920 	free(branch_ref_name);
7921 	free(commit_ref_name);
7922 	return err;
7923 }
7924 
7925 const struct got_error *
7926 got_worktree_histedit_abort(struct got_worktree *worktree,
7927     struct got_fileindex *fileindex, struct got_repository *repo,
7928     struct got_reference *branch, struct got_object_id *base_commit_id,
7929     got_worktree_checkout_cb progress_cb, void *progress_arg)
7930 {
7931 	const struct got_error *err, *unlockerr, *sync_err;
7932 	struct got_reference *resolved = NULL;
7933 	char *fileindex_path = NULL;
7934 	struct got_object_id *merged_commit_id = NULL;
7935 	struct got_commit_object *commit = NULL;
7936 	char *commit_ref_name = NULL;
7937 	struct got_reference *commit_ref = NULL;
7938 	struct got_object_id *tree_id = NULL;
7939 	struct revert_file_args rfa;
7940 	struct got_pathlist_head added_paths;
7941 
7942 	TAILQ_INIT(&added_paths);
7943 
7944 	err = lock_worktree(worktree, LOCK_EX);
7945 	if (err)
7946 		return err;
7947 
7948 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7949 	if (err)
7950 		goto done;
7951 
7952 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7953 	if (err) {
7954 		if (err->code != GOT_ERR_NOT_REF)
7955 			goto done;
7956 		/* Can happen on early abort due to invalid histedit script. */
7957 		commit_ref = NULL;
7958 	}
7959 
7960 	if (commit_ref) {
7961 		err = got_ref_resolve(&merged_commit_id, repo, commit_ref);
7962 		if (err)
7963 			goto done;
7964 
7965 		/*
7966 		 * Determine which files in added status can be safely removed
7967 		 * from disk while reverting changes in the work tree.
7968 		 * We want to avoid deleting unrelated files added by the
7969 		 * user during conflict resolution or during histedit -e.
7970 		 */
7971 		err = get_paths_added_in_commit(&added_paths, merged_commit_id,
7972 		    got_worktree_get_path_prefix(worktree), repo);
7973 		if (err)
7974 			goto done;
7975 	}
7976 
7977 	err = got_ref_open(&resolved, repo,
7978 	    got_ref_get_symref_target(branch), 0);
7979 	if (err)
7980 		goto done;
7981 
7982 	err = got_worktree_set_head_ref(worktree, resolved);
7983 	if (err)
7984 		goto done;
7985 
7986 	err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7987 	if (err)
7988 		goto done;
7989 
7990 	err = got_object_open_as_commit(&commit, repo,
7991 	    worktree->base_commit_id);
7992 	if (err)
7993 		goto done;
7994 
7995 	err = got_object_id_by_path(&tree_id, repo, commit,
7996 	    worktree->path_prefix);
7997 	if (err)
7998 		goto done;
7999 
8000 	err = delete_histedit_refs(worktree, repo);
8001 	if (err)
8002 		goto done;
8003 
8004 	err = get_fileindex_path(&fileindex_path, worktree);
8005 	if (err)
8006 		goto done;
8007 
8008 	rfa.worktree = worktree;
8009 	rfa.fileindex = fileindex;
8010 	rfa.progress_cb = progress_cb;
8011 	rfa.progress_arg = progress_arg;
8012 	rfa.patch_cb = NULL;
8013 	rfa.patch_arg = NULL;
8014 	rfa.repo = repo;
8015 	rfa.unlink_added_files = 1;
8016 	rfa.added_files_to_unlink = &added_paths;
8017 	err = worktree_status(worktree, "", fileindex, repo,
8018 	    revert_file, &rfa, NULL, NULL, 1, 0);
8019 	if (err)
8020 		goto sync;
8021 
8022 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8023 	    repo, progress_cb, progress_arg, NULL, NULL);
8024 sync:
8025 	sync_err = sync_fileindex(fileindex, fileindex_path);
8026 	if (sync_err && err == NULL)
8027 		err = sync_err;
8028 done:
8029 	if (resolved)
8030 		got_ref_close(resolved);
8031 	if (commit_ref)
8032 		got_ref_close(commit_ref);
8033 	free(merged_commit_id);
8034 	free(tree_id);
8035 	free(fileindex_path);
8036 	free(commit_ref_name);
8037 
8038 	unlockerr = lock_worktree(worktree, LOCK_SH);
8039 	if (unlockerr && err == NULL)
8040 		err = unlockerr;
8041 	return err;
8042 }
8043 
8044 const struct got_error *
8045 got_worktree_histedit_complete(struct got_worktree *worktree,
8046     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8047     struct got_reference *edited_branch, struct got_repository *repo)
8048 {
8049 	const struct got_error *err, *unlockerr, *sync_err;
8050 	struct got_object_id *new_head_commit_id = NULL;
8051 	struct got_reference *resolved = NULL;
8052 	char *fileindex_path = NULL;
8053 
8054 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
8055 	if (err)
8056 		return err;
8057 
8058 	err = got_ref_open(&resolved, repo,
8059 	    got_ref_get_symref_target(edited_branch), 0);
8060 	if (err)
8061 		goto done;
8062 
8063 	err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
8064 	    resolved, new_head_commit_id, repo);
8065 	if (err)
8066 		goto done;
8067 
8068 	err = got_ref_change_ref(resolved, new_head_commit_id);
8069 	if (err)
8070 		goto done;
8071 
8072 	err = got_ref_write(resolved, repo);
8073 	if (err)
8074 		goto done;
8075 
8076 	err = got_worktree_set_head_ref(worktree, resolved);
8077 	if (err)
8078 		goto done;
8079 
8080 	err = delete_histedit_refs(worktree, repo);
8081 	if (err)
8082 		goto done;
8083 
8084 	err = get_fileindex_path(&fileindex_path, worktree);
8085 	if (err)
8086 		goto done;
8087 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
8088 	sync_err = sync_fileindex(fileindex, fileindex_path);
8089 	if (sync_err && err == NULL)
8090 		err = sync_err;
8091 done:
8092 	got_fileindex_free(fileindex);
8093 	free(fileindex_path);
8094 	free(new_head_commit_id);
8095 	unlockerr = lock_worktree(worktree, LOCK_SH);
8096 	if (unlockerr && err == NULL)
8097 		err = unlockerr;
8098 	return err;
8099 }
8100 
8101 const struct got_error *
8102 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
8103     struct got_object_id *commit_id, struct got_repository *repo)
8104 {
8105 	const struct got_error *err;
8106 	char *commit_ref_name;
8107 
8108 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
8109 	if (err)
8110 		return err;
8111 
8112 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
8113 	if (err)
8114 		goto done;
8115 
8116 	err = delete_ref(commit_ref_name, repo);
8117 done:
8118 	free(commit_ref_name);
8119 	return err;
8120 }
8121 
8122 const struct got_error *
8123 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
8124     struct got_reference **branch_ref, struct got_reference **base_branch_ref,
8125     struct got_worktree *worktree, const char *refname,
8126     struct got_repository *repo)
8127 {
8128 	const struct got_error *err = NULL;
8129 	char *fileindex_path = NULL;
8130 	struct check_rebase_ok_arg ok_arg;
8131 
8132 	*fileindex = NULL;
8133 	*branch_ref = NULL;
8134 	*base_branch_ref = NULL;
8135 
8136 	err = lock_worktree(worktree, LOCK_EX);
8137 	if (err)
8138 		return err;
8139 
8140 	if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
8141 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
8142 		    "cannot integrate a branch into itself; "
8143 		    "update -b or different branch name required");
8144 		goto done;
8145 	}
8146 
8147 	err = open_fileindex(fileindex, &fileindex_path, worktree);
8148 	if (err)
8149 		goto done;
8150 
8151 	/* Preconditions are the same as for rebase. */
8152 	ok_arg.worktree = worktree;
8153 	ok_arg.repo = repo;
8154 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8155 	    &ok_arg);
8156 	if (err)
8157 		goto done;
8158 
8159 	err = got_ref_open(branch_ref, repo, refname, 1);
8160 	if (err)
8161 		goto done;
8162 
8163 	err = got_ref_open(base_branch_ref, repo,
8164 	    got_worktree_get_head_ref_name(worktree), 1);
8165 done:
8166 	if (err) {
8167 		if (*branch_ref) {
8168 			got_ref_close(*branch_ref);
8169 			*branch_ref = NULL;
8170 		}
8171 		if (*base_branch_ref) {
8172 			got_ref_close(*base_branch_ref);
8173 			*base_branch_ref = NULL;
8174 		}
8175 		if (*fileindex) {
8176 			got_fileindex_free(*fileindex);
8177 			*fileindex = NULL;
8178 		}
8179 		lock_worktree(worktree, LOCK_SH);
8180 	}
8181 	return err;
8182 }
8183 
8184 const struct got_error *
8185 got_worktree_integrate_continue(struct got_worktree *worktree,
8186     struct got_fileindex *fileindex, struct got_repository *repo,
8187     struct got_reference *branch_ref, struct got_reference *base_branch_ref,
8188     got_worktree_checkout_cb progress_cb, void *progress_arg,
8189     got_cancel_cb cancel_cb, void *cancel_arg)
8190 {
8191 	const struct got_error *err = NULL, *sync_err, *unlockerr;
8192 	char *fileindex_path = NULL;
8193 	struct got_object_id *tree_id = NULL, *commit_id = NULL;
8194 	struct got_commit_object *commit =  NULL;
8195 
8196 	err = get_fileindex_path(&fileindex_path, worktree);
8197 	if (err)
8198 		goto done;
8199 
8200 	err = got_ref_resolve(&commit_id, repo, branch_ref);
8201 	if (err)
8202 		goto done;
8203 
8204 	err = got_object_open_as_commit(&commit, repo, commit_id);
8205 	if (err)
8206 		goto done;
8207 
8208 	err = got_object_id_by_path(&tree_id, repo, commit,
8209 	    worktree->path_prefix);
8210 	if (err)
8211 		goto done;
8212 
8213 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
8214 	if (err)
8215 		goto done;
8216 
8217 	err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
8218 	    progress_cb, progress_arg, cancel_cb, cancel_arg);
8219 	if (err)
8220 		goto sync;
8221 
8222 	err = got_ref_change_ref(base_branch_ref, commit_id);
8223 	if (err)
8224 		goto sync;
8225 
8226 	err = got_ref_write(base_branch_ref, repo);
8227 	if (err)
8228 		goto sync;
8229 
8230 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
8231 sync:
8232 	sync_err = sync_fileindex(fileindex, fileindex_path);
8233 	if (sync_err && err == NULL)
8234 		err = sync_err;
8235 
8236 done:
8237 	unlockerr = got_ref_unlock(branch_ref);
8238 	if (unlockerr && err == NULL)
8239 		err = unlockerr;
8240 	got_ref_close(branch_ref);
8241 
8242 	unlockerr = got_ref_unlock(base_branch_ref);
8243 	if (unlockerr && err == NULL)
8244 		err = unlockerr;
8245 	got_ref_close(base_branch_ref);
8246 
8247 	got_fileindex_free(fileindex);
8248 	free(fileindex_path);
8249 	free(tree_id);
8250 	if (commit)
8251 		got_object_commit_close(commit);
8252 
8253 	unlockerr = lock_worktree(worktree, LOCK_SH);
8254 	if (unlockerr && err == NULL)
8255 		err = unlockerr;
8256 	return err;
8257 }
8258 
8259 const struct got_error *
8260 got_worktree_integrate_abort(struct got_worktree *worktree,
8261     struct got_fileindex *fileindex, struct got_repository *repo,
8262     struct got_reference *branch_ref, struct got_reference *base_branch_ref)
8263 {
8264 	const struct got_error *err = NULL, *unlockerr = NULL;
8265 
8266 	got_fileindex_free(fileindex);
8267 
8268 	err = lock_worktree(worktree, LOCK_SH);
8269 
8270 	unlockerr = got_ref_unlock(branch_ref);
8271 	if (unlockerr && err == NULL)
8272 		err = unlockerr;
8273 	got_ref_close(branch_ref);
8274 
8275 	unlockerr = got_ref_unlock(base_branch_ref);
8276 	if (unlockerr && err == NULL)
8277 		err = unlockerr;
8278 	got_ref_close(base_branch_ref);
8279 
8280 	return err;
8281 }
8282 
8283 const struct got_error *
8284 got_worktree_merge_postpone(struct got_worktree *worktree,
8285     struct got_fileindex *fileindex)
8286 {
8287 	const struct got_error *err, *sync_err;
8288 	char *fileindex_path = NULL;
8289 
8290 	err = get_fileindex_path(&fileindex_path, worktree);
8291 	if (err)
8292 		goto done;
8293 
8294 	sync_err = sync_fileindex(fileindex, fileindex_path);
8295 
8296 	err = lock_worktree(worktree, LOCK_SH);
8297 	if (sync_err && err == NULL)
8298 		err = sync_err;
8299 done:
8300 	got_fileindex_free(fileindex);
8301 	free(fileindex_path);
8302 	return err;
8303 }
8304 
8305 static const struct got_error *
8306 delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
8307 {
8308 	const struct got_error *err;
8309 	char *branch_refname = NULL, *commit_refname = NULL;
8310 
8311 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8312 	if (err)
8313 		goto done;
8314 	err = delete_ref(branch_refname, repo);
8315 	if (err)
8316 		goto done;
8317 
8318 	err = get_merge_commit_ref_name(&commit_refname, worktree);
8319 	if (err)
8320 		goto done;
8321 	err = delete_ref(commit_refname, repo);
8322 	if (err)
8323 		goto done;
8324 
8325 done:
8326 	free(branch_refname);
8327 	free(commit_refname);
8328 	return err;
8329 }
8330 
8331 struct merge_commit_msg_arg {
8332 	struct got_worktree *worktree;
8333 	const char *branch_name;
8334 };
8335 
8336 static const struct got_error *
8337 merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
8338     const char *diff_path, char **logmsg, void *arg)
8339 {
8340 	struct merge_commit_msg_arg *a = arg;
8341 
8342 	if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
8343 	    got_worktree_get_head_ref_name(a->worktree)) == -1)
8344 		return got_error_from_errno("asprintf");
8345 
8346 	return NULL;
8347 }
8348 
8349 
8350 const struct got_error *
8351 got_worktree_merge_branch(struct got_worktree *worktree,
8352     struct got_fileindex *fileindex,
8353     struct got_object_id *yca_commit_id,
8354     struct got_object_id *branch_tip,
8355     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
8356     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
8357 {
8358 	const struct got_error *err;
8359 	char *fileindex_path = NULL;
8360 
8361 	err = get_fileindex_path(&fileindex_path, worktree);
8362 	if (err)
8363 		goto done;
8364 
8365 	err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
8366 	    worktree);
8367 	if (err)
8368 		goto done;
8369 
8370 	err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
8371 	    branch_tip, repo, progress_cb, progress_arg,
8372 	    cancel_cb, cancel_arg);
8373 done:
8374 	free(fileindex_path);
8375 	return err;
8376 }
8377 
8378 const struct got_error *
8379 got_worktree_merge_commit(struct got_object_id **new_commit_id,
8380     struct got_worktree *worktree, struct got_fileindex *fileindex,
8381     const char *author, const char *committer, int allow_bad_symlinks,
8382     struct got_object_id *branch_tip, const char *branch_name,
8383     int allow_conflict, struct got_repository *repo,
8384     got_worktree_status_cb status_cb, void *status_arg)
8385 
8386 {
8387 	const struct got_error *err = NULL, *sync_err;
8388 	struct got_pathlist_head commitable_paths;
8389 	struct collect_commitables_arg cc_arg;
8390 	struct got_pathlist_entry *pe;
8391 	struct got_reference *head_ref = NULL;
8392 	struct got_object_id *head_commit_id = NULL;
8393 	int have_staged_files = 0;
8394 	struct merge_commit_msg_arg mcm_arg;
8395 	char *fileindex_path = NULL;
8396 
8397 	memset(&cc_arg, 0, sizeof(cc_arg));
8398 	*new_commit_id = NULL;
8399 
8400 	TAILQ_INIT(&commitable_paths);
8401 
8402 	err = get_fileindex_path(&fileindex_path, worktree);
8403 	if (err)
8404 		goto done;
8405 
8406 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
8407 	if (err)
8408 		goto done;
8409 
8410 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
8411 	if (err)
8412 		goto done;
8413 
8414 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
8415 	    &have_staged_files);
8416 	if (err && err->code != GOT_ERR_CANCELLED)
8417 		goto done;
8418 	if (have_staged_files) {
8419 		err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
8420 		goto done;
8421 	}
8422 
8423 	cc_arg.commitable_paths = &commitable_paths;
8424 	cc_arg.worktree = worktree;
8425 	cc_arg.fileindex = fileindex;
8426 	cc_arg.repo = repo;
8427 	cc_arg.have_staged_files = have_staged_files;
8428 	cc_arg.allow_bad_symlinks = allow_bad_symlinks;
8429 	cc_arg.commit_conflicts = allow_conflict;
8430 	err = worktree_status(worktree, "", fileindex, repo,
8431 	    collect_commitables, &cc_arg, NULL, NULL, 1, 0);
8432 	if (err)
8433 		goto done;
8434 
8435 	mcm_arg.worktree = worktree;
8436 	mcm_arg.branch_name = branch_name;
8437 	err = commit_worktree(new_commit_id, &commitable_paths,
8438 	    head_commit_id, branch_tip, worktree, author, committer, NULL,
8439 	    merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
8440 	if (err)
8441 		goto done;
8442 
8443 	err = update_fileindex_after_commit(worktree, &commitable_paths,
8444 	    *new_commit_id, fileindex, have_staged_files);
8445 	sync_err = sync_fileindex(fileindex, fileindex_path);
8446 	if (sync_err && err == NULL)
8447 		err = sync_err;
8448 done:
8449 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
8450 		struct got_commitable *ct = pe->data;
8451 
8452 		free_commitable(ct);
8453 	}
8454 	got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
8455 	free(fileindex_path);
8456 	return err;
8457 }
8458 
8459 const struct got_error *
8460 got_worktree_merge_complete(struct got_worktree *worktree,
8461     struct got_fileindex *fileindex, struct got_repository *repo)
8462 {
8463 	const struct got_error *err, *unlockerr, *sync_err;
8464 	char *fileindex_path = NULL;
8465 
8466 	err = delete_merge_refs(worktree, repo);
8467 	if (err)
8468 		goto done;
8469 
8470 	err = get_fileindex_path(&fileindex_path, worktree);
8471 	if (err)
8472 		goto done;
8473 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
8474 	sync_err = sync_fileindex(fileindex, fileindex_path);
8475 	if (sync_err && err == NULL)
8476 		err = sync_err;
8477 done:
8478 	got_fileindex_free(fileindex);
8479 	free(fileindex_path);
8480 	unlockerr = lock_worktree(worktree, LOCK_SH);
8481 	if (unlockerr && err == NULL)
8482 		err = unlockerr;
8483 	return err;
8484 }
8485 
8486 const struct got_error *
8487 got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
8488     struct got_repository *repo)
8489 {
8490 	const struct got_error *err;
8491 	char *branch_refname = NULL;
8492 	struct got_reference *branch_ref = NULL;
8493 
8494 	*in_progress = 0;
8495 
8496 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8497 	if (err)
8498 		return err;
8499 	err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8500 	free(branch_refname);
8501 	if (err) {
8502 		if (err->code != GOT_ERR_NOT_REF)
8503 			return err;
8504 	} else
8505 		*in_progress = 1;
8506 
8507 	return NULL;
8508 }
8509 
8510 const struct got_error *got_worktree_merge_prepare(
8511     struct got_fileindex **fileindex, struct got_worktree *worktree,
8512     struct got_repository *repo)
8513 {
8514 	const struct got_error *err = NULL;
8515 	char *fileindex_path = NULL;
8516 	struct got_reference *wt_branch = NULL;
8517 	struct got_object_id *wt_branch_tip = NULL;
8518 	struct check_rebase_ok_arg ok_arg;
8519 
8520 	*fileindex = NULL;
8521 
8522 	err = lock_worktree(worktree, LOCK_EX);
8523 	if (err)
8524 		return err;
8525 
8526 	err = open_fileindex(fileindex, &fileindex_path, worktree);
8527 	if (err)
8528 		goto done;
8529 
8530 	/* Preconditions are the same as for rebase. */
8531 	ok_arg.worktree = worktree;
8532 	ok_arg.repo = repo;
8533 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8534 	    &ok_arg);
8535 	if (err)
8536 		goto done;
8537 
8538 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8539 	    0);
8540 	if (err)
8541 		goto done;
8542 
8543 	err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8544 	if (err)
8545 		goto done;
8546 
8547 	if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8548 		err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8549 		goto done;
8550 	}
8551 
8552 done:
8553 	free(fileindex_path);
8554 	if (wt_branch)
8555 		got_ref_close(wt_branch);
8556 	free(wt_branch_tip);
8557 	if (err) {
8558 		if (*fileindex) {
8559 			got_fileindex_free(*fileindex);
8560 			*fileindex = NULL;
8561 		}
8562 		lock_worktree(worktree, LOCK_SH);
8563 	}
8564 	return err;
8565 }
8566 
8567 const struct got_error *got_worktree_merge_write_refs(
8568     struct got_worktree *worktree, struct got_reference *branch,
8569     struct got_repository *repo)
8570 {
8571 	const struct got_error *err = NULL;
8572 	char *branch_refname = NULL, *commit_refname = NULL;
8573 	struct got_reference *branch_ref = NULL, *commit_ref = NULL;
8574 	struct got_object_id *branch_tip = NULL;
8575 
8576 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8577 	if (err)
8578 		return err;
8579 
8580 	err = get_merge_commit_ref_name(&commit_refname, worktree);
8581 	if (err)
8582 		return err;
8583 
8584 	err = got_ref_resolve(&branch_tip, repo, branch);
8585 	if (err)
8586 		goto done;
8587 
8588 	err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8589 	if (err)
8590 		goto done;
8591 	err = got_ref_write(branch_ref, repo);
8592 	if (err)
8593 		goto done;
8594 
8595 	err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8596 	if (err)
8597 		goto done;
8598 	err = got_ref_write(commit_ref, repo);
8599 	if (err)
8600 		goto done;
8601 
8602 done:
8603 	free(branch_refname);
8604 	free(commit_refname);
8605 	if (branch_ref)
8606 		got_ref_close(branch_ref);
8607 	if (commit_ref)
8608 		got_ref_close(commit_ref);
8609 	free(branch_tip);
8610 	return err;
8611 }
8612 
8613 const struct got_error *
8614 got_worktree_merge_continue(char **branch_name,
8615     struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8616     struct got_worktree *worktree, struct got_repository *repo)
8617 {
8618 	const struct got_error *err;
8619 	char *commit_refname = NULL, *branch_refname = NULL;
8620 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8621 	char *fileindex_path = NULL;
8622 	int have_staged_files = 0;
8623 
8624 	*branch_name = NULL;
8625 	*branch_tip = NULL;
8626 	*fileindex = NULL;
8627 
8628 	err = lock_worktree(worktree, LOCK_EX);
8629 	if (err)
8630 		return err;
8631 
8632 	err = open_fileindex(fileindex, &fileindex_path, worktree);
8633 	if (err)
8634 		goto done;
8635 
8636 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8637 	    &have_staged_files);
8638 	if (err && err->code != GOT_ERR_CANCELLED)
8639 		goto done;
8640 	if (have_staged_files) {
8641 		err = got_error(GOT_ERR_STAGED_PATHS);
8642 		goto done;
8643 	}
8644 
8645 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8646 	if (err)
8647 		goto done;
8648 
8649 	err = get_merge_commit_ref_name(&commit_refname, worktree);
8650 	if (err)
8651 		goto done;
8652 
8653 	err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8654 	if (err)
8655 		goto done;
8656 
8657 	if (!got_ref_is_symbolic(branch_ref)) {
8658 		err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8659 		    "%s is not a symbolic reference",
8660 		    got_ref_get_name(branch_ref));
8661 		goto done;
8662 	}
8663 	*branch_name = strdup(got_ref_get_symref_target(branch_ref));
8664 	if (*branch_name == NULL) {
8665 		err = got_error_from_errno("strdup");
8666 		goto done;
8667 	}
8668 
8669 	err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8670 	if (err)
8671 		goto done;
8672 
8673 	err = got_ref_resolve(branch_tip, repo, commit_ref);
8674 	if (err)
8675 		goto done;
8676 done:
8677 	free(commit_refname);
8678 	free(branch_refname);
8679 	free(fileindex_path);
8680 	if (commit_ref)
8681 		got_ref_close(commit_ref);
8682 	if (branch_ref)
8683 		got_ref_close(branch_ref);
8684 	if (err) {
8685 		if (*branch_name) {
8686 			free(*branch_name);
8687 			*branch_name = NULL;
8688 		}
8689 		free(*branch_tip);
8690 		*branch_tip = NULL;
8691 		if (*fileindex) {
8692 			got_fileindex_free(*fileindex);
8693 			*fileindex = NULL;
8694 		}
8695 		lock_worktree(worktree, LOCK_SH);
8696 	}
8697 	return err;
8698 }
8699 
8700 const struct got_error *
8701 got_worktree_merge_abort(struct got_worktree *worktree,
8702     struct got_fileindex *fileindex, struct got_repository *repo,
8703     got_worktree_checkout_cb progress_cb, void *progress_arg)
8704 {
8705 	const struct got_error *err, *unlockerr, *sync_err;
8706 	struct got_commit_object *commit = NULL;
8707 	char *fileindex_path = NULL;
8708 	struct revert_file_args rfa;
8709 	char *commit_ref_name = NULL;
8710 	struct got_reference *commit_ref = NULL;
8711 	struct got_object_id *merged_commit_id = NULL;
8712 	struct got_object_id *tree_id = NULL;
8713 	struct got_pathlist_head added_paths;
8714 
8715 	TAILQ_INIT(&added_paths);
8716 
8717 	err = get_merge_commit_ref_name(&commit_ref_name, worktree);
8718 	if (err)
8719 		goto done;
8720 
8721 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
8722 	if (err)
8723 		goto done;
8724 
8725 	err = got_ref_resolve(&merged_commit_id, repo, commit_ref);
8726 	if (err)
8727 		goto done;
8728 
8729 	/*
8730 	 * Determine which files in added status can be safely removed
8731 	 * from disk while reverting changes in the work tree.
8732 	 * We want to avoid deleting unrelated files which were added by
8733 	 * the user for conflict resolution purposes.
8734 	 */
8735 	err = get_paths_added_between_commits(&added_paths,
8736 	    got_worktree_get_base_commit_id(worktree), merged_commit_id,
8737 	    got_worktree_get_path_prefix(worktree), repo);
8738 	if (err)
8739 		goto done;
8740 
8741 
8742 	err = got_object_open_as_commit(&commit, repo,
8743 	    worktree->base_commit_id);
8744 	if (err)
8745 		goto done;
8746 
8747 	err = got_object_id_by_path(&tree_id, repo, commit,
8748 	    worktree->path_prefix);
8749 	if (err)
8750 		goto done;
8751 
8752 	err = delete_merge_refs(worktree, repo);
8753 	if (err)
8754 		goto done;
8755 
8756 	err = get_fileindex_path(&fileindex_path, worktree);
8757 	if (err)
8758 		goto done;
8759 
8760 	rfa.worktree = worktree;
8761 	rfa.fileindex = fileindex;
8762 	rfa.progress_cb = progress_cb;
8763 	rfa.progress_arg = progress_arg;
8764 	rfa.patch_cb = NULL;
8765 	rfa.patch_arg = NULL;
8766 	rfa.repo = repo;
8767 	rfa.unlink_added_files = 1;
8768 	rfa.added_files_to_unlink = &added_paths;
8769 	err = worktree_status(worktree, "", fileindex, repo,
8770 	    revert_file, &rfa, NULL, NULL, 1, 0);
8771 	if (err)
8772 		goto sync;
8773 
8774 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8775 	    repo, progress_cb, progress_arg, NULL, NULL);
8776 sync:
8777 	sync_err = sync_fileindex(fileindex, fileindex_path);
8778 	if (sync_err && err == NULL)
8779 		err = sync_err;
8780 done:
8781 	free(tree_id);
8782 	free(merged_commit_id);
8783 	if (commit)
8784 		got_object_commit_close(commit);
8785 	if (fileindex)
8786 		got_fileindex_free(fileindex);
8787 	free(fileindex_path);
8788 	if (commit_ref)
8789 		got_ref_close(commit_ref);
8790 	free(commit_ref_name);
8791 
8792 	unlockerr = lock_worktree(worktree, LOCK_SH);
8793 	if (unlockerr && err == NULL)
8794 		err = unlockerr;
8795 	return err;
8796 }
8797 
8798 struct check_stage_ok_arg {
8799 	struct got_object_id *head_commit_id;
8800 	struct got_worktree *worktree;
8801 	struct got_fileindex *fileindex;
8802 	struct got_repository *repo;
8803 	int have_changes;
8804 };
8805 
8806 static const struct got_error *
8807 check_stage_ok(void *arg, unsigned char status,
8808     unsigned char staged_status, const char *relpath,
8809     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8810     struct got_object_id *commit_id, int dirfd, const char *de_name)
8811 {
8812 	struct check_stage_ok_arg *a = arg;
8813 	const struct got_error *err = NULL;
8814 	struct got_fileindex_entry *ie;
8815 	struct got_object_id base_commit_id;
8816 	struct got_object_id *base_commit_idp = NULL;
8817 	char *in_repo_path = NULL, *p;
8818 
8819 	if (status == GOT_STATUS_UNVERSIONED ||
8820 	    status == GOT_STATUS_NO_CHANGE)
8821 		return NULL;
8822 	if (status == GOT_STATUS_NONEXISTENT)
8823 		return got_error_set_errno(ENOENT, relpath);
8824 
8825 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8826 	if (ie == NULL)
8827 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8828 
8829 	if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8830 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8831 	    relpath) == -1)
8832 		return got_error_from_errno("asprintf");
8833 
8834 	if (got_fileindex_entry_has_commit(ie)) {
8835 		base_commit_idp = got_fileindex_entry_get_commit_id(
8836 		    &base_commit_id, ie);
8837 	}
8838 
8839 	if (status == GOT_STATUS_CONFLICT) {
8840 		err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8841 		goto done;
8842 	} else if (status != GOT_STATUS_ADD &&
8843 	    status != GOT_STATUS_MODIFY &&
8844 	    status != GOT_STATUS_DELETE) {
8845 		err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8846 		goto done;
8847 	}
8848 
8849 	a->have_changes = 1;
8850 
8851 	p = in_repo_path;
8852 	while (p[0] == '/')
8853 		p++;
8854 	err = check_out_of_date(p, status, staged_status,
8855 	    blob_id, base_commit_idp, a->head_commit_id, a->repo,
8856 	    GOT_ERR_STAGE_OUT_OF_DATE);
8857 done:
8858 	free(in_repo_path);
8859 	return err;
8860 }
8861 
8862 struct stage_path_arg {
8863 	struct got_worktree *worktree;
8864 	struct got_fileindex *fileindex;
8865 	struct got_repository *repo;
8866 	got_worktree_status_cb status_cb;
8867 	void *status_arg;
8868 	got_worktree_patch_cb patch_cb;
8869 	void *patch_arg;
8870 	int staged_something;
8871 	int allow_bad_symlinks;
8872 };
8873 
8874 static const struct got_error *
8875 stage_path(void *arg, unsigned char status,
8876     unsigned char staged_status, const char *relpath,
8877     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8878     struct got_object_id *commit_id, int dirfd, const char *de_name)
8879 {
8880 	struct stage_path_arg *a = arg;
8881 	const struct got_error *err = NULL;
8882 	struct got_fileindex_entry *ie;
8883 	char *ondisk_path = NULL, *path_content = NULL;
8884 	uint32_t stage;
8885 	struct got_object_id *new_staged_blob_id = NULL;
8886 	struct stat sb;
8887 
8888 	if (status == GOT_STATUS_UNVERSIONED)
8889 		return NULL;
8890 
8891 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8892 	if (ie == NULL)
8893 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8894 
8895 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8896 	    relpath)== -1)
8897 		return got_error_from_errno("asprintf");
8898 
8899 	switch (status) {
8900 	case GOT_STATUS_ADD:
8901 	case GOT_STATUS_MODIFY:
8902 		/* XXX could sb.st_mode be passed in by our caller? */
8903 		if (lstat(ondisk_path, &sb) == -1) {
8904 			err = got_error_from_errno2("lstat", ondisk_path);
8905 			break;
8906 		}
8907 		if (a->patch_cb) {
8908 			if (status == GOT_STATUS_ADD) {
8909 				int choice = GOT_PATCH_CHOICE_NONE;
8910 				err = (*a->patch_cb)(&choice, a->patch_arg,
8911 				    status, ie->path, NULL, 1, 1);
8912 				if (err)
8913 					break;
8914 				if (choice != GOT_PATCH_CHOICE_YES)
8915 					break;
8916 			} else {
8917 				err = create_patched_content(&path_content, 0,
8918 				    staged_blob_id ? staged_blob_id : blob_id,
8919 				    ondisk_path, dirfd, de_name, ie->path,
8920 				    a->repo, a->patch_cb, a->patch_arg);
8921 				if (err || path_content == NULL)
8922 					break;
8923 			}
8924 		}
8925 		err = got_object_blob_create(&new_staged_blob_id,
8926 		    path_content ? path_content : ondisk_path, a->repo);
8927 		if (err)
8928 			break;
8929 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8930 		    SHA1_DIGEST_LENGTH);
8931 		if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8932 			stage = GOT_FILEIDX_STAGE_ADD;
8933 		else
8934 			stage = GOT_FILEIDX_STAGE_MODIFY;
8935 		got_fileindex_entry_stage_set(ie, stage);
8936 		if (S_ISLNK(sb.st_mode)) {
8937 			int is_bad_symlink = 0;
8938 			if (!a->allow_bad_symlinks) {
8939 				char target_path[PATH_MAX];
8940 				ssize_t target_len;
8941 				target_len = readlink(ondisk_path, target_path,
8942 				    sizeof(target_path));
8943 				if (target_len == -1) {
8944 					err = got_error_from_errno2("readlink",
8945 					    ondisk_path);
8946 					break;
8947 				}
8948 				err = is_bad_symlink_target(&is_bad_symlink,
8949 				    target_path, target_len, ondisk_path,
8950 				    a->worktree->root_path,
8951 				    a->worktree->meta_dir);
8952 				if (err)
8953 					break;
8954 				if (is_bad_symlink) {
8955 					err = got_error_path(ondisk_path,
8956 					    GOT_ERR_BAD_SYMLINK);
8957 					break;
8958 				}
8959 			}
8960 			if (is_bad_symlink)
8961 				got_fileindex_entry_staged_filetype_set(ie,
8962 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
8963 			else
8964 				got_fileindex_entry_staged_filetype_set(ie,
8965 				    GOT_FILEIDX_MODE_SYMLINK);
8966 		} else {
8967 			got_fileindex_entry_staged_filetype_set(ie,
8968 			    GOT_FILEIDX_MODE_REGULAR_FILE);
8969 		}
8970 		a->staged_something = 1;
8971 		if (a->status_cb == NULL)
8972 			break;
8973 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8974 		    get_staged_status(ie), relpath, blob_id,
8975 		    new_staged_blob_id, NULL, dirfd, de_name);
8976 		if (err)
8977 			break;
8978 		/*
8979 		 * When staging the reverse of the staged diff,
8980 		 * implicitly unstage the file.
8981 		 */
8982 		if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8983 		    sizeof(ie->blob_sha1)) == 0) {
8984 			got_fileindex_entry_stage_set(ie,
8985 			    GOT_FILEIDX_STAGE_NONE);
8986 		}
8987 		break;
8988 	case GOT_STATUS_DELETE:
8989 		if (staged_status == GOT_STATUS_DELETE)
8990 			break;
8991 		if (a->patch_cb) {
8992 			int choice = GOT_PATCH_CHOICE_NONE;
8993 			err = (*a->patch_cb)(&choice, a->patch_arg, status,
8994 			    ie->path, NULL, 1, 1);
8995 			if (err)
8996 				break;
8997 			if (choice == GOT_PATCH_CHOICE_NO)
8998 				break;
8999 			if (choice != GOT_PATCH_CHOICE_YES) {
9000 				err = got_error(GOT_ERR_PATCH_CHOICE);
9001 				break;
9002 			}
9003 		}
9004 		stage = GOT_FILEIDX_STAGE_DELETE;
9005 		got_fileindex_entry_stage_set(ie, stage);
9006 		a->staged_something = 1;
9007 		if (a->status_cb == NULL)
9008 			break;
9009 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
9010 		    get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
9011 		    de_name);
9012 		break;
9013 	case GOT_STATUS_NO_CHANGE:
9014 		break;
9015 	case GOT_STATUS_CONFLICT:
9016 		err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
9017 		break;
9018 	case GOT_STATUS_NONEXISTENT:
9019 		err = got_error_set_errno(ENOENT, relpath);
9020 		break;
9021 	default:
9022 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
9023 		break;
9024 	}
9025 
9026 	if (path_content && unlink(path_content) == -1 && err == NULL)
9027 		err = got_error_from_errno2("unlink", path_content);
9028 	free(path_content);
9029 	free(ondisk_path);
9030 	free(new_staged_blob_id);
9031 	return err;
9032 }
9033 
9034 const struct got_error *
9035 got_worktree_stage(struct got_worktree *worktree,
9036     struct got_pathlist_head *paths,
9037     got_worktree_status_cb status_cb, void *status_arg,
9038     got_worktree_patch_cb patch_cb, void *patch_arg,
9039     int allow_bad_symlinks, struct got_repository *repo)
9040 {
9041 	const struct got_error *err = NULL, *sync_err, *unlockerr;
9042 	struct got_pathlist_entry *pe;
9043 	struct got_fileindex *fileindex = NULL;
9044 	char *fileindex_path = NULL;
9045 	struct got_reference *head_ref = NULL;
9046 	struct got_object_id *head_commit_id = NULL;
9047 	struct check_stage_ok_arg oka;
9048 	struct stage_path_arg spa;
9049 
9050 	err = lock_worktree(worktree, LOCK_EX);
9051 	if (err)
9052 		return err;
9053 
9054 	err = got_ref_open(&head_ref, repo,
9055 	    got_worktree_get_head_ref_name(worktree), 0);
9056 	if (err)
9057 		goto done;
9058 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
9059 	if (err)
9060 		goto done;
9061 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
9062 	if (err)
9063 		goto done;
9064 
9065 	/* Check pre-conditions before staging anything. */
9066 	oka.head_commit_id = head_commit_id;
9067 	oka.worktree = worktree;
9068 	oka.fileindex = fileindex;
9069 	oka.repo = repo;
9070 	oka.have_changes = 0;
9071 	TAILQ_FOREACH(pe, paths, entry) {
9072 		err = worktree_status(worktree, pe->path, fileindex, repo,
9073 		    check_stage_ok, &oka, NULL, NULL, 1, 0);
9074 		if (err)
9075 			goto done;
9076 	}
9077 	if (!oka.have_changes) {
9078 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
9079 		goto done;
9080 	}
9081 
9082 	spa.worktree = worktree;
9083 	spa.fileindex = fileindex;
9084 	spa.repo = repo;
9085 	spa.patch_cb = patch_cb;
9086 	spa.patch_arg = patch_arg;
9087 	spa.status_cb = status_cb;
9088 	spa.status_arg = status_arg;
9089 	spa.staged_something = 0;
9090 	spa.allow_bad_symlinks = allow_bad_symlinks;
9091 	TAILQ_FOREACH(pe, paths, entry) {
9092 		err = worktree_status(worktree, pe->path, fileindex, repo,
9093 		    stage_path, &spa, NULL, NULL, 1, 0);
9094 		if (err)
9095 			goto done;
9096 	}
9097 	if (!spa.staged_something) {
9098 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
9099 		goto done;
9100 	}
9101 
9102 	sync_err = sync_fileindex(fileindex, fileindex_path);
9103 	if (sync_err && err == NULL)
9104 		err = sync_err;
9105 done:
9106 	if (head_ref)
9107 		got_ref_close(head_ref);
9108 	free(head_commit_id);
9109 	free(fileindex_path);
9110 	if (fileindex)
9111 		got_fileindex_free(fileindex);
9112 	unlockerr = lock_worktree(worktree, LOCK_SH);
9113 	if (unlockerr && err == NULL)
9114 		err = unlockerr;
9115 	return err;
9116 }
9117 
9118 struct unstage_path_arg {
9119 	struct got_worktree *worktree;
9120 	struct got_fileindex *fileindex;
9121 	struct got_repository *repo;
9122 	got_worktree_checkout_cb progress_cb;
9123 	void *progress_arg;
9124 	got_worktree_patch_cb patch_cb;
9125 	void *patch_arg;
9126 };
9127 
9128 static const struct got_error *
9129 create_unstaged_content(char **path_unstaged_content,
9130     char **path_new_staged_content, struct got_object_id *blob_id,
9131     struct got_object_id *staged_blob_id, const char *relpath,
9132     struct got_repository *repo,
9133     got_worktree_patch_cb patch_cb, void *patch_arg)
9134 {
9135 	const struct got_error *err, *free_err;
9136 	struct got_blob_object *blob = NULL, *staged_blob = NULL;
9137 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
9138 	char *path1 = NULL, *path2 = NULL, *label1 = NULL;
9139 	struct got_diffreg_result *diffreg_result = NULL;
9140 	int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
9141 	int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
9142 	int fd1 = -1, fd2 = -1;
9143 
9144 	*path_unstaged_content = NULL;
9145 	*path_new_staged_content = NULL;
9146 
9147 	err = got_object_id_str(&label1, blob_id);
9148 	if (err)
9149 		return err;
9150 
9151 	fd1 = got_opentempfd();
9152 	if (fd1 == -1) {
9153 		err = got_error_from_errno("got_opentempfd");
9154 		goto done;
9155 	}
9156 	fd2 = got_opentempfd();
9157 	if (fd2 == -1) {
9158 		err = got_error_from_errno("got_opentempfd");
9159 		goto done;
9160 	}
9161 
9162 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
9163 	if (err)
9164 		goto done;
9165 
9166 	err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
9167 	if (err)
9168 		goto done;
9169 
9170 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
9171 	if (err)
9172 		goto done;
9173 
9174 	err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
9175 	    fd2);
9176 	if (err)
9177 		goto done;
9178 
9179 	err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
9180 	if (err)
9181 		goto done;
9182 
9183 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
9184 	if (err)
9185 		goto done;
9186 
9187 	err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
9188 	    path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
9189 	if (err)
9190 		goto done;
9191 
9192 	err = got_opentemp_named(path_unstaged_content, &outfile,
9193 	    "got-unstaged-content", "");
9194 	if (err)
9195 		goto done;
9196 	err = got_opentemp_named(path_new_staged_content, &rejectfile,
9197 	    "got-new-staged-content", "");
9198 	if (err)
9199 		goto done;
9200 
9201 	if (fseek(f1, 0L, SEEK_SET) == -1) {
9202 		err = got_ferror(f1, GOT_ERR_IO);
9203 		goto done;
9204 	}
9205 	if (fseek(f2, 0L, SEEK_SET) == -1) {
9206 		err = got_ferror(f2, GOT_ERR_IO);
9207 		goto done;
9208 	}
9209 	/* Count the number of actual changes in the diff result. */
9210 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
9211 		struct diff_chunk_context cc = {};
9212 		diff_chunk_context_load_change(&cc, &nchunks_used,
9213 		    diffreg_result->result, n, 0);
9214 		nchanges++;
9215 	}
9216 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
9217 		int choice;
9218 		err = apply_or_reject_change(&choice, &nchunks_used,
9219 		    diffreg_result->result, n, relpath, f1, f2,
9220 		    &line_cur1, &line_cur2,
9221 		    outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
9222 		if (err)
9223 			goto done;
9224 		if (choice == GOT_PATCH_CHOICE_YES)
9225 			have_content = 1;
9226 		else
9227 			have_rejected_content = 1;
9228 		if (choice == GOT_PATCH_CHOICE_QUIT)
9229 			break;
9230 	}
9231 	if (have_content || have_rejected_content)
9232 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
9233 		    outfile, rejectfile);
9234 done:
9235 	free(label1);
9236 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9237 		err = got_error_from_errno("close");
9238 	if (blob)
9239 		got_object_blob_close(blob);
9240 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9241 		err = got_error_from_errno("close");
9242 	if (staged_blob)
9243 		got_object_blob_close(staged_blob);
9244 	free_err = got_diffreg_result_free(diffreg_result);
9245 	if (free_err && err == NULL)
9246 		err = free_err;
9247 	if (f1 && fclose(f1) == EOF && err == NULL)
9248 		err = got_error_from_errno2("fclose", path1);
9249 	if (f2 && fclose(f2) == EOF && err == NULL)
9250 		err = got_error_from_errno2("fclose", path2);
9251 	if (outfile && fclose(outfile) == EOF && err == NULL)
9252 		err = got_error_from_errno2("fclose", *path_unstaged_content);
9253 	if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
9254 		err = got_error_from_errno2("fclose", *path_new_staged_content);
9255 	if (path1 && unlink(path1) == -1 && err == NULL)
9256 		err = got_error_from_errno2("unlink", path1);
9257 	if (path2 && unlink(path2) == -1 && err == NULL)
9258 		err = got_error_from_errno2("unlink", path2);
9259 	if (err || !have_content) {
9260 		if (*path_unstaged_content &&
9261 		    unlink(*path_unstaged_content) == -1 && err == NULL)
9262 			err = got_error_from_errno2("unlink",
9263 			    *path_unstaged_content);
9264 		free(*path_unstaged_content);
9265 		*path_unstaged_content = NULL;
9266 	}
9267 	if (err || !have_content || !have_rejected_content) {
9268 		if (*path_new_staged_content &&
9269 		    unlink(*path_new_staged_content) == -1 && err == NULL)
9270 			err = got_error_from_errno2("unlink",
9271 			    *path_new_staged_content);
9272 		free(*path_new_staged_content);
9273 		*path_new_staged_content = NULL;
9274 	}
9275 	free(path1);
9276 	free(path2);
9277 	return err;
9278 }
9279 
9280 static const struct got_error *
9281 unstage_hunks(struct got_object_id *staged_blob_id,
9282     struct got_blob_object *blob_base,
9283     struct got_object_id *blob_id, struct got_fileindex_entry *ie,
9284     const char *ondisk_path, const char *label_orig,
9285     struct got_worktree *worktree, struct got_repository *repo,
9286     got_worktree_patch_cb patch_cb, void *patch_arg,
9287     got_worktree_checkout_cb progress_cb, void *progress_arg)
9288 {
9289 	const struct got_error *err = NULL;
9290 	char *path_unstaged_content = NULL;
9291 	char *path_new_staged_content = NULL;
9292 	char *parent = NULL, *base_path = NULL;
9293 	char *blob_base_path = NULL;
9294 	struct got_object_id *new_staged_blob_id = NULL;
9295 	FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
9296 	struct stat sb;
9297 
9298 	err = create_unstaged_content(&path_unstaged_content,
9299 	    &path_new_staged_content, blob_id, staged_blob_id,
9300 	    ie->path, repo, patch_cb, patch_arg);
9301 	if (err)
9302 		return err;
9303 
9304 	if (path_unstaged_content == NULL)
9305 		return NULL;
9306 
9307 	if (path_new_staged_content) {
9308 		err = got_object_blob_create(&new_staged_blob_id,
9309 		    path_new_staged_content, repo);
9310 		if (err)
9311 			goto done;
9312 	}
9313 
9314 	f = fopen(path_unstaged_content, "re");
9315 	if (f == NULL) {
9316 		err = got_error_from_errno2("fopen",
9317 		    path_unstaged_content);
9318 		goto done;
9319 	}
9320 	if (fstat(fileno(f), &sb) == -1) {
9321 		err = got_error_from_errno2("fstat", path_unstaged_content);
9322 		goto done;
9323 	}
9324 	if (got_fileindex_entry_staged_filetype_get(ie) ==
9325 	    GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
9326 		char link_target[PATH_MAX];
9327 		size_t r;
9328 		r = fread(link_target, 1, sizeof(link_target), f);
9329 		if (r == 0 && ferror(f)) {
9330 			err = got_error_from_errno("fread");
9331 			goto done;
9332 		}
9333 		if (r >= sizeof(link_target)) { /* should not happen */
9334 			err = got_error(GOT_ERR_NO_SPACE);
9335 			goto done;
9336 		}
9337 		link_target[r] = '\0';
9338 		err = merge_symlink(worktree, blob_base,
9339 		    ondisk_path, ie->path, label_orig, link_target,
9340 		    worktree->base_commit_id, repo, progress_cb,
9341 		    progress_arg);
9342 	} else {
9343 		int local_changes_subsumed;
9344 
9345 		err = got_path_dirname(&parent, ondisk_path);
9346 		if (err)
9347 			return err;
9348 
9349 		if (asprintf(&base_path, "%s/got-unstage-blob-orig",
9350 		    parent) == -1) {
9351 			err = got_error_from_errno("asprintf");
9352 			base_path = NULL;
9353 			goto done;
9354 		}
9355 
9356 		err = got_opentemp_named(&blob_base_path, &f_base,
9357 		    base_path, "");
9358 		if (err)
9359 			goto done;
9360 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
9361 		    blob_base);
9362 		if (err)
9363 			goto done;
9364 
9365 		/*
9366 		 * In order the run a 3-way merge with a symlink we copy the symlink's
9367 		 * target path into a temporary file and use that file with diff3.
9368 		 */
9369 		if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
9370 			err = dump_symlink_target_path_to_file(&f_deriv2,
9371 			    ondisk_path);
9372 			if (err)
9373 				goto done;
9374 		} else {
9375 			int fd;
9376 			fd = open(ondisk_path,
9377 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
9378 			if (fd == -1) {
9379 				err = got_error_from_errno2("open", ondisk_path);
9380 				goto done;
9381 			}
9382 			f_deriv2 = fdopen(fd, "r");
9383 			if (f_deriv2 == NULL) {
9384 				err = got_error_from_errno2("fdopen", ondisk_path);
9385 				close(fd);
9386 				goto done;
9387 			}
9388 		}
9389 
9390 		err = merge_file(&local_changes_subsumed, worktree,
9391 		    f_base, f, f_deriv2, ondisk_path, ie->path,
9392 		    got_fileindex_perms_to_st(ie),
9393 		    label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
9394 		    repo, progress_cb, progress_arg);
9395 	}
9396 	if (err)
9397 		goto done;
9398 
9399 	if (new_staged_blob_id) {
9400 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
9401 		    SHA1_DIGEST_LENGTH);
9402 	} else {
9403 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9404 		got_fileindex_entry_staged_filetype_set(ie, 0);
9405 	}
9406 done:
9407 	free(new_staged_blob_id);
9408 	if (path_unstaged_content &&
9409 	    unlink(path_unstaged_content) == -1 && err == NULL)
9410 		err = got_error_from_errno2("unlink", path_unstaged_content);
9411 	if (path_new_staged_content &&
9412 	    unlink(path_new_staged_content) == -1 && err == NULL)
9413 		err = got_error_from_errno2("unlink", path_new_staged_content);
9414 	if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
9415 		err = got_error_from_errno2("unlink", blob_base_path);
9416 	if (f_base && fclose(f_base) == EOF && err == NULL)
9417 		err = got_error_from_errno2("fclose", path_unstaged_content);
9418 	if (f && fclose(f) == EOF && err == NULL)
9419 		err = got_error_from_errno2("fclose", path_unstaged_content);
9420 	if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
9421 		err = got_error_from_errno2("fclose", ondisk_path);
9422 	free(path_unstaged_content);
9423 	free(path_new_staged_content);
9424 	free(blob_base_path);
9425 	free(parent);
9426 	free(base_path);
9427 	return err;
9428 }
9429 
9430 static const struct got_error *
9431 unstage_path(void *arg, unsigned char status,
9432     unsigned char staged_status, const char *relpath,
9433     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9434     struct got_object_id *commit_id, int dirfd, const char *de_name)
9435 {
9436 	const struct got_error *err = NULL;
9437 	struct unstage_path_arg *a = arg;
9438 	struct got_fileindex_entry *ie;
9439 	struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
9440 	char *ondisk_path = NULL;
9441 	char *id_str = NULL, *label_orig = NULL;
9442 	int local_changes_subsumed;
9443 	struct stat sb;
9444 	int fd1 = -1, fd2 = -1;
9445 
9446 	if (staged_status != GOT_STATUS_ADD &&
9447 	    staged_status != GOT_STATUS_MODIFY &&
9448 	    staged_status != GOT_STATUS_DELETE)
9449 		return NULL;
9450 
9451 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
9452 	if (ie == NULL)
9453 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
9454 
9455 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
9456 	    == -1)
9457 		return got_error_from_errno("asprintf");
9458 
9459 	err = got_object_id_str(&id_str,
9460 	    commit_id ? commit_id : a->worktree->base_commit_id);
9461 	if (err)
9462 		goto done;
9463 	if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
9464 	    id_str) == -1) {
9465 		err = got_error_from_errno("asprintf");
9466 		goto done;
9467 	}
9468 
9469 	fd1 = got_opentempfd();
9470 	if (fd1 == -1) {
9471 		err = got_error_from_errno("got_opentempfd");
9472 		goto done;
9473 	}
9474 	fd2 = got_opentempfd();
9475 	if (fd2 == -1) {
9476 		err = got_error_from_errno("got_opentempfd");
9477 		goto done;
9478 	}
9479 
9480 	switch (staged_status) {
9481 	case GOT_STATUS_MODIFY:
9482 		err = got_object_open_as_blob(&blob_base, a->repo,
9483 		    blob_id, 8192, fd1);
9484 		if (err)
9485 			break;
9486 		/* fall through */
9487 	case GOT_STATUS_ADD:
9488 		if (a->patch_cb) {
9489 			if (staged_status == GOT_STATUS_ADD) {
9490 				int choice = GOT_PATCH_CHOICE_NONE;
9491 				err = (*a->patch_cb)(&choice, a->patch_arg,
9492 				    staged_status, ie->path, NULL, 1, 1);
9493 				if (err)
9494 					break;
9495 				if (choice != GOT_PATCH_CHOICE_YES)
9496 					break;
9497 			} else {
9498 				err = unstage_hunks(staged_blob_id,
9499 				    blob_base, blob_id, ie, ondisk_path,
9500 				    label_orig, a->worktree, a->repo,
9501 				    a->patch_cb, a->patch_arg,
9502 				    a->progress_cb, a->progress_arg);
9503 				break; /* Done with this file. */
9504 			}
9505 		}
9506 		err = got_object_open_as_blob(&blob_staged, a->repo,
9507 		    staged_blob_id, 8192, fd2);
9508 		if (err)
9509 			break;
9510 		switch (got_fileindex_entry_staged_filetype_get(ie)) {
9511 		case GOT_FILEIDX_MODE_BAD_SYMLINK:
9512 		case GOT_FILEIDX_MODE_REGULAR_FILE:
9513 			err = merge_blob(&local_changes_subsumed, a->worktree,
9514 			    blob_base, ondisk_path, relpath,
9515 			    got_fileindex_perms_to_st(ie), label_orig,
9516 			    blob_staged, commit_id ? commit_id :
9517 			    a->worktree->base_commit_id, a->repo,
9518 			    a->progress_cb, a->progress_arg);
9519 			break;
9520 		case GOT_FILEIDX_MODE_SYMLINK:
9521 			if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
9522 				char *staged_target;
9523 				err = got_object_blob_read_to_str(
9524 				    &staged_target, blob_staged);
9525 				if (err)
9526 					goto done;
9527 				err = merge_symlink(a->worktree, blob_base,
9528 				    ondisk_path, relpath, label_orig,
9529 				    staged_target, commit_id ? commit_id :
9530 				    a->worktree->base_commit_id,
9531 				    a->repo, a->progress_cb, a->progress_arg);
9532 				free(staged_target);
9533 			} else {
9534 				err = merge_blob(&local_changes_subsumed,
9535 				    a->worktree, blob_base, ondisk_path,
9536 				    relpath, got_fileindex_perms_to_st(ie),
9537 				    label_orig, blob_staged,
9538 				    commit_id ? commit_id :
9539 				    a->worktree->base_commit_id, a->repo,
9540 				    a->progress_cb, a->progress_arg);
9541 			}
9542 			break;
9543 		default:
9544 			err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
9545 			break;
9546 		}
9547 		if (err == NULL) {
9548 			got_fileindex_entry_stage_set(ie,
9549 			    GOT_FILEIDX_STAGE_NONE);
9550 			got_fileindex_entry_staged_filetype_set(ie, 0);
9551 		}
9552 		break;
9553 	case GOT_STATUS_DELETE:
9554 		if (a->patch_cb) {
9555 			int choice = GOT_PATCH_CHOICE_NONE;
9556 			err = (*a->patch_cb)(&choice, a->patch_arg,
9557 			    staged_status, ie->path, NULL, 1, 1);
9558 			if (err)
9559 				break;
9560 			if (choice == GOT_PATCH_CHOICE_NO)
9561 				break;
9562 			if (choice != GOT_PATCH_CHOICE_YES) {
9563 				err = got_error(GOT_ERR_PATCH_CHOICE);
9564 				break;
9565 			}
9566 		}
9567 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9568 		got_fileindex_entry_staged_filetype_set(ie, 0);
9569 		err = get_file_status(&status, &sb, ie, ondisk_path,
9570 		    dirfd, de_name, a->repo);
9571 		if (err)
9572 			break;
9573 		err = (*a->progress_cb)(a->progress_arg, status, relpath);
9574 		break;
9575 	}
9576 done:
9577 	free(ondisk_path);
9578 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9579 		err = got_error_from_errno("close");
9580 	if (blob_base)
9581 		got_object_blob_close(blob_base);
9582 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9583 		err = got_error_from_errno("close");
9584 	if (blob_staged)
9585 		got_object_blob_close(blob_staged);
9586 	free(id_str);
9587 	free(label_orig);
9588 	return err;
9589 }
9590 
9591 const struct got_error *
9592 got_worktree_unstage(struct got_worktree *worktree,
9593     struct got_pathlist_head *paths,
9594     got_worktree_checkout_cb progress_cb, void *progress_arg,
9595     got_worktree_patch_cb patch_cb, void *patch_arg,
9596     struct got_repository *repo)
9597 {
9598 	const struct got_error *err = NULL, *sync_err, *unlockerr;
9599 	struct got_pathlist_entry *pe;
9600 	struct got_fileindex *fileindex = NULL;
9601 	char *fileindex_path = NULL;
9602 	struct unstage_path_arg upa;
9603 
9604 	err = lock_worktree(worktree, LOCK_EX);
9605 	if (err)
9606 		return err;
9607 
9608 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
9609 	if (err)
9610 		goto done;
9611 
9612 	upa.worktree = worktree;
9613 	upa.fileindex = fileindex;
9614 	upa.repo = repo;
9615 	upa.progress_cb = progress_cb;
9616 	upa.progress_arg = progress_arg;
9617 	upa.patch_cb = patch_cb;
9618 	upa.patch_arg = patch_arg;
9619 	TAILQ_FOREACH(pe, paths, entry) {
9620 		err = worktree_status(worktree, pe->path, fileindex, repo,
9621 		    unstage_path, &upa, NULL, NULL, 1, 0);
9622 		if (err)
9623 			goto done;
9624 	}
9625 
9626 	sync_err = sync_fileindex(fileindex, fileindex_path);
9627 	if (sync_err && err == NULL)
9628 		err = sync_err;
9629 done:
9630 	free(fileindex_path);
9631 	if (fileindex)
9632 		got_fileindex_free(fileindex);
9633 	unlockerr = lock_worktree(worktree, LOCK_SH);
9634 	if (unlockerr && err == NULL)
9635 		err = unlockerr;
9636 	return err;
9637 }
9638 
9639 struct report_file_info_arg {
9640 	struct got_worktree *worktree;
9641 	got_worktree_path_info_cb info_cb;
9642 	void *info_arg;
9643 	struct got_pathlist_head *paths;
9644 	got_cancel_cb cancel_cb;
9645 	void *cancel_arg;
9646 };
9647 
9648 static const struct got_error *
9649 report_file_info(void *arg, struct got_fileindex_entry *ie)
9650 {
9651 	struct report_file_info_arg *a = arg;
9652 	struct got_pathlist_entry *pe;
9653 	struct got_object_id blob_id, staged_blob_id, commit_id;
9654 	struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9655 	struct got_object_id *commit_idp = NULL;
9656 	int stage;
9657 
9658 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9659 		return got_error(GOT_ERR_CANCELLED);
9660 
9661 	TAILQ_FOREACH(pe, a->paths, entry) {
9662 		if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9663 		    got_path_is_child(ie->path, pe->path, pe->path_len))
9664 			break;
9665 	}
9666 	if (pe == NULL) /* not found */
9667 		return NULL;
9668 
9669 	if (got_fileindex_entry_has_blob(ie))
9670 		blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
9671 	stage = got_fileindex_entry_stage_get(ie);
9672 	if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9673 	    stage == GOT_FILEIDX_STAGE_ADD) {
9674 		staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
9675 		    &staged_blob_id, ie);
9676 	}
9677 
9678 	if (got_fileindex_entry_has_commit(ie))
9679 		commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
9680 
9681 	return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9682 	    (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9683 }
9684 
9685 const struct got_error *
9686 got_worktree_path_info(struct got_worktree *worktree,
9687     struct got_pathlist_head *paths,
9688     got_worktree_path_info_cb info_cb, void *info_arg,
9689     got_cancel_cb cancel_cb, void *cancel_arg)
9690 
9691 {
9692 	const struct got_error *err = NULL, *unlockerr;
9693 	struct got_fileindex *fileindex = NULL;
9694 	char *fileindex_path = NULL;
9695 	struct report_file_info_arg arg;
9696 
9697 	err = lock_worktree(worktree, LOCK_SH);
9698 	if (err)
9699 		return err;
9700 
9701 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
9702 	if (err)
9703 		goto done;
9704 
9705 	arg.worktree = worktree;
9706 	arg.info_cb = info_cb;
9707 	arg.info_arg = info_arg;
9708 	arg.paths = paths;
9709 	arg.cancel_cb = cancel_cb;
9710 	arg.cancel_arg = cancel_arg;
9711 	err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9712 	    &arg);
9713 done:
9714 	free(fileindex_path);
9715 	if (fileindex)
9716 		got_fileindex_free(fileindex);
9717 	unlockerr = lock_worktree(worktree, LOCK_UN);
9718 	if (unlockerr && err == NULL)
9719 		err = unlockerr;
9720 	return err;
9721 }
9722 
9723 static const struct got_error *
9724 patch_check_path(const char *p, char **path, unsigned char *status,
9725     unsigned char *staged_status, struct got_fileindex *fileindex,
9726     struct got_worktree *worktree, struct got_repository *repo)
9727 {
9728 	const struct got_error *err;
9729 	struct got_fileindex_entry *ie;
9730 	struct stat sb;
9731 	char *ondisk_path = NULL;
9732 
9733 	err = got_worktree_resolve_path(path, worktree, p);
9734 	if (err)
9735 		return err;
9736 
9737 	if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9738 	    *path[0] ? "/" : "", *path) == -1)
9739 		return got_error_from_errno("asprintf");
9740 
9741 	ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9742 	if (ie) {
9743 		*staged_status = get_staged_status(ie);
9744 		err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9745 		    repo);
9746 		if (err)
9747 			goto done;
9748 	} else {
9749 		*staged_status = GOT_STATUS_NO_CHANGE;
9750 		*status = GOT_STATUS_UNVERSIONED;
9751 		if (lstat(ondisk_path, &sb) == -1) {
9752 			if (errno != ENOENT) {
9753 				err = got_error_from_errno2("lstat",
9754 				    ondisk_path);
9755 				goto done;
9756 			}
9757 			*status = GOT_STATUS_NONEXISTENT;
9758 		}
9759 	}
9760 
9761 done:
9762 	free(ondisk_path);
9763 	return err;
9764 }
9765 
9766 static const struct got_error *
9767 patch_can_rm(const char *path, unsigned char status,
9768     unsigned char staged_status)
9769 {
9770 	if (status == GOT_STATUS_NONEXISTENT)
9771 		return got_error_set_errno(ENOENT, path);
9772 	if (status != GOT_STATUS_NO_CHANGE &&
9773 	    status != GOT_STATUS_ADD &&
9774 	    status != GOT_STATUS_MODIFY &&
9775 	    status != GOT_STATUS_MODE_CHANGE)
9776 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9777 	if (staged_status == GOT_STATUS_DELETE)
9778 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9779 	return NULL;
9780 }
9781 
9782 static const struct got_error *
9783 patch_can_add(const char *path, unsigned char status)
9784 {
9785 	if (status != GOT_STATUS_NONEXISTENT)
9786 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9787 	return NULL;
9788 }
9789 
9790 static const struct got_error *
9791 patch_can_edit(const char *path, unsigned char status,
9792     unsigned char staged_status)
9793 {
9794 	if (status == GOT_STATUS_NONEXISTENT)
9795 		return got_error_set_errno(ENOENT, path);
9796 	if (status != GOT_STATUS_NO_CHANGE &&
9797 	    status != GOT_STATUS_ADD &&
9798 	    status != GOT_STATUS_MODIFY)
9799 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9800 	if (staged_status == GOT_STATUS_DELETE)
9801 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9802 	return NULL;
9803 }
9804 
9805 const struct got_error *
9806 got_worktree_patch_prepare(struct got_fileindex **fileindex,
9807     char **fileindex_path, struct got_worktree *worktree)
9808 {
9809 	return open_fileindex(fileindex, fileindex_path, worktree);
9810 }
9811 
9812 const struct got_error *
9813 got_worktree_patch_check_path(const char *old, const char *new,
9814     char **oldpath, char **newpath, struct got_worktree *worktree,
9815     struct got_repository *repo, struct got_fileindex *fileindex)
9816 {
9817 	const struct got_error *err = NULL;
9818 	int file_renamed = 0;
9819 	unsigned char status_old, staged_status_old;
9820 	unsigned char status_new, staged_status_new;
9821 
9822 	*oldpath = NULL;
9823 	*newpath = NULL;
9824 
9825 	err = patch_check_path(old != NULL ? old : new, oldpath,
9826 	    &status_old, &staged_status_old, fileindex, worktree, repo);
9827 	if (err)
9828 		goto done;
9829 
9830 	err = patch_check_path(new != NULL ? new : old, newpath,
9831 	    &status_new, &staged_status_new, fileindex, worktree, repo);
9832 	if (err)
9833 		goto done;
9834 
9835 	if (old != NULL && new != NULL && strcmp(old, new) != 0)
9836 		file_renamed = 1;
9837 
9838 	if (old != NULL && new == NULL)
9839 		err = patch_can_rm(*oldpath, status_old, staged_status_old);
9840 	else if (file_renamed) {
9841 		err = patch_can_rm(*oldpath, status_old, staged_status_old);
9842 		if (err == NULL)
9843 			err = patch_can_add(*newpath, status_new);
9844 	} else if (old == NULL)
9845 		err = patch_can_add(*newpath, status_new);
9846 	else
9847 		err = patch_can_edit(*newpath, status_new, staged_status_new);
9848 
9849 done:
9850 	if (err) {
9851 		free(*oldpath);
9852 		*oldpath = NULL;
9853 		free(*newpath);
9854 		*newpath = NULL;
9855 	}
9856 	return err;
9857 }
9858 
9859 const struct got_error *
9860 got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9861     struct got_worktree *worktree, struct got_fileindex *fileindex,
9862     got_worktree_checkout_cb progress_cb, void *progress_arg)
9863 {
9864 	struct schedule_addition_args saa;
9865 
9866 	memset(&saa, 0, sizeof(saa));
9867 	saa.worktree = worktree;
9868 	saa.fileindex = fileindex;
9869 	saa.progress_cb = progress_cb;
9870 	saa.progress_arg = progress_arg;
9871 	saa.repo = repo;
9872 
9873 	return worktree_status(worktree, path, fileindex, repo,
9874 	    schedule_addition, &saa, NULL, NULL, 1, 0);
9875 }
9876 
9877 const struct got_error *
9878 got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9879     struct got_worktree *worktree, struct got_fileindex *fileindex,
9880     got_worktree_delete_cb progress_cb, void *progress_arg)
9881 {
9882 	const struct got_error *err;
9883 	struct schedule_deletion_args sda;
9884 	char *ondisk_status_path;
9885 
9886 	memset(&sda, 0, sizeof(sda));
9887 	sda.worktree = worktree;
9888 	sda.fileindex = fileindex;
9889 	sda.progress_cb = progress_cb;
9890 	sda.progress_arg = progress_arg;
9891 	sda.repo = repo;
9892 	sda.delete_local_mods = 0;
9893 	sda.keep_on_disk = 0;
9894 	sda.ignore_missing_paths = 0;
9895 	sda.status_codes = NULL;
9896 	if (asprintf(&ondisk_status_path, "%s/%s",
9897 	    got_worktree_get_root_path(worktree), path) == -1)
9898 		return got_error_from_errno("asprintf");
9899 	sda.status_path = ondisk_status_path;
9900 	sda.status_path_len = strlen(ondisk_status_path);
9901 
9902 	err = worktree_status(worktree, path, fileindex, repo,
9903 	    schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9904 	free(ondisk_status_path);
9905 	return err;
9906 }
9907 
9908 const struct got_error *
9909 got_worktree_patch_complete(struct got_fileindex *fileindex,
9910     const char *fileindex_path)
9911 {
9912 	const struct got_error *err = NULL;
9913 
9914 	err = sync_fileindex(fileindex, fileindex_path);
9915 	got_fileindex_free(fileindex);
9916 
9917 	return err;
9918 }