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