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