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