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 static const struct got_error *
3897 find_missing_children(void *arg, struct got_fileindex_entry *ie)
3898 {
3899 	const struct got_error *err = NULL;
3900 	struct find_missing_children_args *a = arg;
3901 
3902 	if (a->cancel_cb) {
3903 		err = a->cancel_cb(a->cancel_arg);
3904 		if (err)
3905 			return err;
3906 	}
3907 
3908 	if (got_path_is_child(ie->path, a->parent_path, a->parent_len))
3909 		err = got_pathlist_append(a->children, ie->path, NULL);
3910 
3911 	return err;
3912 }
3913 
3914 static const struct got_error *
3915 report_children(struct got_pathlist_head *children,
3916     struct got_worktree *worktree, struct got_fileindex *fileindex,
3917     struct got_repository *repo, int is_root_dir, int report_unchanged,
3918     struct got_pathlist_head *ignores, int no_ignores, 
3919     got_worktree_status_cb status_cb, void *status_arg,
3920     got_cancel_cb cancel_cb, void *cancel_arg)
3921 {
3922 	const struct got_error *err = NULL;
3923 	struct got_pathlist_entry *pe;
3924 	char *ondisk_path = NULL;
3925 
3926 	TAILQ_FOREACH(pe, children, entry) {
3927 		if (cancel_cb) {
3928 			err = cancel_cb(cancel_arg);
3929 			if (err)
3930 				break;
3931 		}
3932 
3933 		if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
3934 		    !is_root_dir ? "/" : "", pe->path) == -1) {
3935 			err = got_error_from_errno("asprintf");
3936 			ondisk_path = NULL;
3937 			break;
3938 		}
3939 
3940 		err = report_single_file_status(pe->path, ondisk_path,
3941 		    fileindex, status_cb, status_arg, repo, report_unchanged,
3942 		    ignores, no_ignores);
3943 		if (err)
3944 			break;
3945 
3946 		free(ondisk_path);
3947 		ondisk_path = NULL;
3948 	}
3949 
3950 	free(ondisk_path);
3951 	return err;
3952 }
3953 
3954 static const struct got_error *
3955 worktree_status(struct got_worktree *worktree, const char *path,
3956     struct got_fileindex *fileindex, struct got_repository *repo,
3957     got_worktree_status_cb status_cb, void *status_arg,
3958     got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3959     int report_unchanged)
3960 {
3961 	const struct got_error *err = NULL;
3962 	int fd = -1;
3963 	struct got_fileindex_diff_dir_cb fdiff_cb;
3964 	struct diff_dir_cb_arg arg;
3965 	char *ondisk_path = NULL;
3966 	struct got_pathlist_head ignores, missing_children;
3967 	struct got_fileindex_entry *ie;
3968 
3969 	TAILQ_INIT(&ignores);
3970 	TAILQ_INIT(&missing_children);
3971 
3972 	if (asprintf(&ondisk_path, "%s%s%s",
3973 	    worktree->root_path, path[0] ? "/" : "", path) == -1)
3974 		return got_error_from_errno("asprintf");
3975 
3976 	ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3977 	if (ie) {
3978 		err = report_single_file_status(path, ondisk_path,
3979 		    fileindex, status_cb, status_arg, repo,
3980 		    report_unchanged, &ignores, no_ignores);
3981 		goto done;
3982 	} else {
3983 		struct find_missing_children_args fmca;
3984 		fmca.parent_path = path;
3985 		fmca.parent_len = strlen(path);
3986 		fmca.children = &missing_children;
3987 		fmca.cancel_cb = cancel_cb;
3988 		fmca.cancel_arg = cancel_arg;
3989 		err = got_fileindex_for_each_entry_safe(fileindex,
3990 		    find_missing_children, &fmca);
3991 		if (err)
3992 			goto done;
3993 	}
3994 
3995 	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3996 	if (fd == -1) {
3997 		if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3998 		    !got_err_open_nofollow_on_symlink())
3999 			err = got_error_from_errno2("open", ondisk_path);
4000 		else {
4001 			if (!no_ignores) {
4002 				err = add_ignores_from_parent_paths(&ignores,
4003 				    worktree->root_path, ondisk_path);
4004 				if (err)
4005 					goto done;
4006 			}
4007 			if (TAILQ_EMPTY(&missing_children)) {
4008 				err = report_single_file_status(path,
4009 				    ondisk_path, fileindex,
4010 				    status_cb, status_arg, repo,
4011 				    report_unchanged, &ignores, no_ignores);
4012 				if (err)
4013 					goto done;
4014 			} else {
4015 				err = report_children(&missing_children,
4016 				    worktree, fileindex, repo,
4017 				    (path[0] == '\0'), report_unchanged,
4018 				    &ignores, no_ignores,
4019 				    status_cb, status_arg,
4020 				    cancel_cb, cancel_arg);
4021 				if (err)
4022 					goto done;
4023 			}
4024 		}
4025 	} else {
4026 		fdiff_cb.diff_old_new = status_old_new;
4027 		fdiff_cb.diff_old = status_old;
4028 		fdiff_cb.diff_new = status_new;
4029 		fdiff_cb.diff_traverse = status_traverse;
4030 		arg.fileindex = fileindex;
4031 		arg.worktree = worktree;
4032 		arg.status_path = path;
4033 		arg.status_path_len = strlen(path);
4034 		arg.repo = repo;
4035 		arg.status_cb = status_cb;
4036 		arg.status_arg = status_arg;
4037 		arg.cancel_cb = cancel_cb;
4038 		arg.cancel_arg = cancel_arg;
4039 		arg.report_unchanged = report_unchanged;
4040 		arg.no_ignores = no_ignores;
4041 		if (!no_ignores) {
4042 			err = add_ignores_from_parent_paths(&ignores,
4043 			    worktree->root_path, path);
4044 			if (err)
4045 				goto done;
4046 		}
4047 		arg.ignores = &ignores;
4048 		err = got_fileindex_diff_dir(fileindex, fd,
4049 		    worktree->root_path, path, repo, &fdiff_cb, &arg);
4050 	}
4051 done:
4052 	free_ignores(&ignores);
4053 	if (fd != -1 && close(fd) == -1 && err == NULL)
4054 		err = got_error_from_errno("close");
4055 	free(ondisk_path);
4056 	return err;
4057 }
4058 
4059 const struct got_error *
4060 got_worktree_status(struct got_worktree *worktree,
4061     struct got_pathlist_head *paths, struct got_repository *repo,
4062     int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
4063     got_cancel_cb cancel_cb, void *cancel_arg)
4064 {
4065 	const struct got_error *err = NULL;
4066 	char *fileindex_path = NULL;
4067 	struct got_fileindex *fileindex = NULL;
4068 	struct got_pathlist_entry *pe;
4069 
4070 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4071 	if (err)
4072 		return err;
4073 
4074 	TAILQ_FOREACH(pe, paths, entry) {
4075 		err = worktree_status(worktree, pe->path, fileindex, repo,
4076 			status_cb, status_arg, cancel_cb, cancel_arg,
4077 			no_ignores, 0);
4078 		if (err)
4079 			break;
4080 	}
4081 	free(fileindex_path);
4082 	got_fileindex_free(fileindex);
4083 	return err;
4084 }
4085 
4086 const struct got_error *
4087 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
4088     const char *arg)
4089 {
4090 	const struct got_error *err = NULL;
4091 	char *resolved = NULL, *cwd = NULL, *path = NULL;
4092 	size_t len;
4093 	struct stat sb;
4094 	char *abspath = NULL;
4095 	char canonpath[PATH_MAX];
4096 
4097 	*wt_path = NULL;
4098 
4099 	cwd = getcwd(NULL, 0);
4100 	if (cwd == NULL)
4101 		return got_error_from_errno("getcwd");
4102 
4103 	if (lstat(arg, &sb) == -1) {
4104 		if (errno != ENOENT) {
4105 			err = got_error_from_errno2("lstat", arg);
4106 			goto done;
4107 		}
4108 		sb.st_mode = 0;
4109 	}
4110 	if (S_ISLNK(sb.st_mode)) {
4111 		/*
4112 		 * We cannot use realpath(3) with symlinks since we want to
4113 		 * operate on the symlink itself.
4114 		 * But we can make the path absolute, assuming it is relative
4115 		 * to the current working directory, and then canonicalize it.
4116 		 */
4117 		if (!got_path_is_absolute(arg)) {
4118 			if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
4119 				err = got_error_from_errno("asprintf");
4120 				goto done;
4121 			}
4122 
4123 		}
4124 		err = got_canonpath(abspath ? abspath : arg, canonpath,
4125 		    sizeof(canonpath));
4126 		if (err)
4127 			goto done;
4128 		resolved = strdup(canonpath);
4129 		if (resolved == NULL) {
4130 			err = got_error_from_errno("strdup");
4131 			goto done;
4132 		}
4133 	} else {
4134 		resolved = realpath(arg, NULL);
4135 		if (resolved == NULL) {
4136 			if (errno != ENOENT) {
4137 				err = got_error_from_errno2("realpath", arg);
4138 				goto done;
4139 			}
4140 			if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
4141 				err = got_error_from_errno("asprintf");
4142 				goto done;
4143 			}
4144 			err = got_canonpath(abspath, canonpath,
4145 			    sizeof(canonpath));
4146 			if (err)
4147 				goto done;
4148 			resolved = strdup(canonpath);
4149 			if (resolved == NULL) {
4150 				err = got_error_from_errno("strdup");
4151 				goto done;
4152 			}
4153 		}
4154 	}
4155 
4156 	if (strncmp(got_worktree_get_root_path(worktree), resolved,
4157 	    strlen(got_worktree_get_root_path(worktree)))) {
4158 		err = got_error_path(resolved, GOT_ERR_BAD_PATH);
4159 		goto done;
4160 	}
4161 
4162 	if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
4163 		err = got_path_skip_common_ancestor(&path,
4164 		    got_worktree_get_root_path(worktree), resolved);
4165 		if (err)
4166 			goto done;
4167 	} else {
4168 		path = strdup("");
4169 		if (path == NULL) {
4170 			err = got_error_from_errno("strdup");
4171 			goto done;
4172 		}
4173 	}
4174 
4175 	/* XXX status walk can't deal with trailing slash! */
4176 	len = strlen(path);
4177 	while (len > 0 && path[len - 1] == '/') {
4178 		path[len - 1] = '\0';
4179 		len--;
4180 	}
4181 done:
4182 	free(abspath);
4183 	free(resolved);
4184 	free(cwd);
4185 	if (err == NULL)
4186 		*wt_path = path;
4187 	else
4188 		free(path);
4189 	return err;
4190 }
4191 
4192 struct schedule_addition_args {
4193 	struct got_worktree *worktree;
4194 	struct got_fileindex *fileindex;
4195 	got_worktree_checkout_cb progress_cb;
4196 	void *progress_arg;
4197 	struct got_repository *repo;
4198 };
4199 
4200 static int
4201 add_noop_status(unsigned char status)
4202 {
4203 	return (status == GOT_STATUS_ADD ||
4204 	    status == GOT_STATUS_MODIFY ||
4205 	    status == GOT_STATUS_CONFLICT ||
4206 	    status == GOT_STATUS_MODE_CHANGE ||
4207 	    status == GOT_STATUS_NO_CHANGE);
4208 }
4209 
4210 static const struct got_error *
4211 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
4212     const char *relpath, struct got_object_id *blob_id,
4213     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4214     int dirfd, const char *de_name)
4215 {
4216 	struct schedule_addition_args *a = arg;
4217 	const struct got_error *err = NULL;
4218 	struct got_fileindex_entry *ie;
4219 	struct stat sb;
4220 	char *ondisk_path;
4221 
4222 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4223 	    relpath) == -1)
4224 		return got_error_from_errno("asprintf");
4225 
4226 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4227 	if (ie) {
4228 		err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
4229 		    de_name, a->repo);
4230 		if (err)
4231 			goto done;
4232 		/* Re-adding an existing entry is a no-op. */
4233 		if (staged_status == GOT_STATUS_NO_CHANGE &&
4234 		    add_noop_status(status))
4235 			goto done;
4236 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4237 		if (err)
4238 			goto done;
4239 	}
4240 
4241 	if (status != GOT_STATUS_UNVERSIONED) {
4242 		if (status == GOT_STATUS_NONEXISTENT)
4243 			err = got_error_set_errno(ENOENT, ondisk_path);
4244 		else
4245 			err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
4246 		goto done;
4247 	}
4248 
4249 	err = got_fileindex_entry_alloc(&ie, relpath);
4250 	if (err)
4251 		goto done;
4252 	err = got_fileindex_entry_update(ie, a->worktree->root_fd,
4253 	    relpath, NULL, NULL, 1);
4254 	if (err) {
4255 		got_fileindex_entry_free(ie);
4256 		goto done;
4257 	}
4258 	err = got_fileindex_entry_add(a->fileindex, ie);
4259 	if (err) {
4260 		got_fileindex_entry_free(ie);
4261 		goto done;
4262 	}
4263 done:
4264 	free(ondisk_path);
4265 	if (err)
4266 		return err;
4267 	if (staged_status == GOT_STATUS_NO_CHANGE && add_noop_status(status))
4268 		return NULL;
4269 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4270 }
4271 
4272 const struct got_error *
4273 got_worktree_schedule_add(struct got_worktree *worktree,
4274     struct got_pathlist_head *paths,
4275     got_worktree_checkout_cb progress_cb, void *progress_arg,
4276     struct got_repository *repo, int no_ignores)
4277 {
4278 	struct got_fileindex *fileindex = NULL;
4279 	char *fileindex_path = NULL;
4280 	const struct got_error *err = NULL, *sync_err, *unlockerr;
4281 	struct got_pathlist_entry *pe;
4282 	struct schedule_addition_args saa;
4283 
4284 	err = lock_worktree(worktree, LOCK_EX);
4285 	if (err)
4286 		return err;
4287 
4288 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4289 	if (err)
4290 		goto done;
4291 
4292 	saa.worktree = worktree;
4293 	saa.fileindex = fileindex;
4294 	saa.progress_cb = progress_cb;
4295 	saa.progress_arg = progress_arg;
4296 	saa.repo = repo;
4297 
4298 	TAILQ_FOREACH(pe, paths, entry) {
4299 		err = worktree_status(worktree, pe->path, fileindex, repo,
4300 			schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4301 		if (err)
4302 			break;
4303 	}
4304 	sync_err = sync_fileindex(fileindex, fileindex_path);
4305 	if (sync_err && err == NULL)
4306 		err = sync_err;
4307 done:
4308 	free(fileindex_path);
4309 	if (fileindex)
4310 		got_fileindex_free(fileindex);
4311 	unlockerr = lock_worktree(worktree, LOCK_SH);
4312 	if (unlockerr && err == NULL)
4313 		err = unlockerr;
4314 	return err;
4315 }
4316 
4317 struct schedule_deletion_args {
4318 	struct got_worktree *worktree;
4319 	struct got_fileindex *fileindex;
4320 	got_worktree_delete_cb progress_cb;
4321 	void *progress_arg;
4322 	struct got_repository *repo;
4323 	int delete_local_mods;
4324 	int keep_on_disk;
4325 	int ignore_missing_paths;
4326 	const char *status_path;
4327 	size_t status_path_len;
4328 	const char *status_codes;
4329 };
4330 
4331 static const struct got_error *
4332 schedule_for_deletion(void *arg, unsigned char status,
4333     unsigned char staged_status, const char *relpath,
4334     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4335     struct got_object_id *commit_id, int dirfd, const char *de_name)
4336 {
4337 	struct schedule_deletion_args *a = arg;
4338 	const struct got_error *err = NULL;
4339 	struct got_fileindex_entry *ie = NULL;
4340 	struct stat sb;
4341 	char *ondisk_path;
4342 
4343 	if (status == GOT_STATUS_NONEXISTENT) {
4344 		if (a->ignore_missing_paths)
4345 			return NULL;
4346 		return got_error_set_errno(ENOENT, relpath);
4347 	}
4348 
4349 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4350 	if (ie == NULL)
4351 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4352 
4353 	staged_status = get_staged_status(ie);
4354 	if (staged_status != GOT_STATUS_NO_CHANGE) {
4355 		if (staged_status == GOT_STATUS_DELETE)
4356 			return NULL;
4357 		return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4358 	}
4359 
4360 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4361 	    relpath) == -1)
4362 		return got_error_from_errno("asprintf");
4363 
4364 	err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4365 	    a->repo);
4366 	if (err)
4367 		goto done;
4368 
4369 	if (a->status_codes) {
4370 		size_t ncodes = strlen(a->status_codes);
4371 		int i;
4372 		for (i = 0; i < ncodes ; i++) {
4373 			if (status == a->status_codes[i])
4374 				break;
4375 		}
4376 		if (i == ncodes) {
4377 			/* Do not delete files in non-matching status. */
4378 			free(ondisk_path);
4379 			return NULL;
4380 		}
4381 		if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4382 		    a->status_codes[i] != GOT_STATUS_MISSING) {
4383 			static char msg[64];
4384 			snprintf(msg, sizeof(msg),
4385 			    "invalid status code '%c'", a->status_codes[i]);
4386 			err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4387 			goto done;
4388 		}
4389 	}
4390 
4391 	if (status != GOT_STATUS_NO_CHANGE) {
4392 		if (status == GOT_STATUS_DELETE)
4393 			goto done;
4394 		if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4395 			err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4396 			goto done;
4397 		}
4398 		if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4399 			err = got_error_set_errno(ENOENT, relpath);
4400 			goto done;
4401 		}
4402 		if (status != GOT_STATUS_MODIFY &&
4403 		    status != GOT_STATUS_MISSING) {
4404 			err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4405 			goto done;
4406 		}
4407 	}
4408 
4409 	if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4410 		size_t root_len;
4411 
4412 		if (dirfd != -1) {
4413 			if (unlinkat(dirfd, de_name, 0) == -1) {
4414 				err = got_error_from_errno2("unlinkat",
4415 				    ondisk_path);
4416 				goto done;
4417 			}
4418 		} else if (unlink(ondisk_path) == -1) {
4419 			err = got_error_from_errno2("unlink", ondisk_path);
4420 			goto done;
4421 		}
4422 
4423 		root_len = strlen(a->worktree->root_path);
4424 		do {
4425 			char *parent;
4426 
4427 			err = got_path_dirname(&parent, ondisk_path);
4428 			if (err)
4429 				goto done;
4430 			free(ondisk_path);
4431 			ondisk_path = parent;
4432 			if (got_path_cmp(ondisk_path, a->status_path,
4433 			    strlen(ondisk_path), a->status_path_len) != 0 &&
4434 			    !got_path_is_child(ondisk_path, a->status_path,
4435 			    a->status_path_len))
4436 				break;
4437 			if (rmdir(ondisk_path) == -1) {
4438 				if (errno != ENOTEMPTY)
4439 					err = got_error_from_errno2("rmdir",
4440 					    ondisk_path);
4441 				break;
4442 			}
4443 		} while (got_path_cmp(ondisk_path, a->worktree->root_path,
4444 		    strlen(ondisk_path), root_len) != 0);
4445 	}
4446 
4447 	got_fileindex_entry_mark_deleted_from_disk(ie);
4448 done:
4449 	free(ondisk_path);
4450 	if (err)
4451 		return err;
4452 	if (status == GOT_STATUS_DELETE)
4453 		return NULL;
4454 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4455 	    staged_status, relpath);
4456 }
4457 
4458 const struct got_error *
4459 got_worktree_schedule_delete(struct got_worktree *worktree,
4460     struct got_pathlist_head *paths, int delete_local_mods,
4461     const char *status_codes,
4462     got_worktree_delete_cb progress_cb, void *progress_arg,
4463     struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4464 {
4465 	struct got_fileindex *fileindex = NULL;
4466 	char *fileindex_path = NULL;
4467 	const struct got_error *err = NULL, *sync_err, *unlockerr;
4468 	struct got_pathlist_entry *pe;
4469 	struct schedule_deletion_args sda;
4470 
4471 	err = lock_worktree(worktree, LOCK_EX);
4472 	if (err)
4473 		return err;
4474 
4475 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4476 	if (err)
4477 		goto done;
4478 
4479 	sda.worktree = worktree;
4480 	sda.fileindex = fileindex;
4481 	sda.progress_cb = progress_cb;
4482 	sda.progress_arg = progress_arg;
4483 	sda.repo = repo;
4484 	sda.delete_local_mods = delete_local_mods;
4485 	sda.keep_on_disk = keep_on_disk;
4486 	sda.ignore_missing_paths = ignore_missing_paths;
4487 	sda.status_codes = status_codes;
4488 
4489 	TAILQ_FOREACH(pe, paths, entry) {
4490 		char *ondisk_status_path;
4491 
4492 		if (asprintf(&ondisk_status_path, "%s%s%s",
4493 		    got_worktree_get_root_path(worktree),
4494 		    pe->path[0] == '\0' ? "" : "/", pe->path) == -1) {
4495 			err = got_error_from_errno("asprintf");
4496 			goto done;
4497 		}
4498 		sda.status_path = ondisk_status_path;
4499 		sda.status_path_len = strlen(ondisk_status_path);
4500 		err = worktree_status(worktree, pe->path, fileindex, repo,
4501 			schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4502 		free(ondisk_status_path);
4503 		if (err)
4504 			break;
4505 	}
4506 	sync_err = sync_fileindex(fileindex, fileindex_path);
4507 	if (sync_err && err == NULL)
4508 		err = sync_err;
4509 done:
4510 	free(fileindex_path);
4511 	if (fileindex)
4512 		got_fileindex_free(fileindex);
4513 	unlockerr = lock_worktree(worktree, LOCK_SH);
4514 	if (unlockerr && err == NULL)
4515 		err = unlockerr;
4516 	return err;
4517 }
4518 
4519 static const struct got_error *
4520 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4521 {
4522 	const struct got_error *err = NULL;
4523 	char *line = NULL;
4524 	size_t linesize = 0, n;
4525 	ssize_t linelen;
4526 
4527 	linelen = getline(&line, &linesize, infile);
4528 	if (linelen == -1) {
4529 		if (ferror(infile)) {
4530 			err = got_error_from_errno("getline");
4531 			goto done;
4532 		}
4533 		return NULL;
4534 	}
4535 	if (outfile) {
4536 		n = fwrite(line, 1, linelen, outfile);
4537 		if (n != linelen) {
4538 			err = got_ferror(outfile, GOT_ERR_IO);
4539 			goto done;
4540 		}
4541 	}
4542 	if (rejectfile) {
4543 		n = fwrite(line, 1, linelen, rejectfile);
4544 		if (n != linelen)
4545 			err = got_ferror(rejectfile, GOT_ERR_IO);
4546 	}
4547 done:
4548 	free(line);
4549 	return err;
4550 }
4551 
4552 static const struct got_error *
4553 skip_one_line(FILE *f)
4554 {
4555 	char *line = NULL;
4556 	size_t linesize = 0;
4557 	ssize_t linelen;
4558 
4559 	linelen = getline(&line, &linesize, f);
4560 	if (linelen == -1) {
4561 		if (ferror(f))
4562 			return got_error_from_errno("getline");
4563 		return NULL;
4564 	}
4565 	free(line);
4566 	return NULL;
4567 }
4568 
4569 static const struct got_error *
4570 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4571     int start_old, int end_old, int start_new, int end_new,
4572     FILE *outfile, FILE *rejectfile)
4573 {
4574 	const struct got_error *err;
4575 
4576 	/* Copy old file's lines leading up to patch. */
4577 	while (!feof(f1) && *line_cur1 < start_old) {
4578 		err = copy_one_line(f1, outfile, NULL);
4579 		if (err)
4580 			return err;
4581 		(*line_cur1)++;
4582 	}
4583 	/* Skip new file's lines leading up to patch. */
4584 	while (!feof(f2) && *line_cur2 < start_new) {
4585 		if (rejectfile)
4586 			err = copy_one_line(f2, NULL, rejectfile);
4587 		else
4588 			err = skip_one_line(f2);
4589 		if (err)
4590 			return err;
4591 		(*line_cur2)++;
4592 	}
4593 	/* Copy patched lines. */
4594 	while (!feof(f2) && *line_cur2 <= end_new) {
4595 		err = copy_one_line(f2, outfile, NULL);
4596 		if (err)
4597 			return err;
4598 		(*line_cur2)++;
4599 	}
4600 	/* Skip over old file's replaced lines. */
4601 	while (!feof(f1) && *line_cur1 <= end_old) {
4602 		if (rejectfile)
4603 			err = copy_one_line(f1, NULL, rejectfile);
4604 		else
4605 			err = skip_one_line(f1);
4606 		if (err)
4607 			return err;
4608 		(*line_cur1)++;
4609 	}
4610 
4611 	return NULL;
4612 }
4613 
4614 static const struct got_error *
4615 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4616     FILE *outfile, FILE *rejectfile)
4617 {
4618 	const struct got_error *err;
4619 
4620 	if (outfile) {
4621 		/* Copy old file's lines until EOF. */
4622 		while (!feof(f1)) {
4623 			err = copy_one_line(f1, outfile, NULL);
4624 			if (err)
4625 				return err;
4626 			(*line_cur1)++;
4627 		}
4628 	}
4629 	if (rejectfile) {
4630 		/* Copy new file's lines until EOF. */
4631 		while (!feof(f2)) {
4632 			err = copy_one_line(f2, NULL, rejectfile);
4633 			if (err)
4634 				return err;
4635 			(*line_cur2)++;
4636 		}
4637 	}
4638 
4639 	return NULL;
4640 }
4641 
4642 static const struct got_error *
4643 apply_or_reject_change(int *choice, int *nchunks_used,
4644     struct diff_result *diff_result, int n,
4645     const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4646     FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4647     got_worktree_patch_cb patch_cb, void *patch_arg)
4648 {
4649 	const struct got_error *err = NULL;
4650 	struct diff_chunk_context cc = {};
4651 	int start_old, end_old, start_new, end_new;
4652 	FILE *hunkfile;
4653 	struct diff_output_unidiff_state *diff_state;
4654 	struct diff_input_info diff_info;
4655 	int rc;
4656 
4657 	*choice = GOT_PATCH_CHOICE_NONE;
4658 
4659 	/* Get changed line numbers without context lines for copy_change(). */
4660 	diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4661 	start_old = cc.left.start;
4662 	end_old = cc.left.end;
4663 	start_new = cc.right.start;
4664 	end_new = cc.right.end;
4665 
4666 	/* Get the same change with context lines for display. */
4667 	memset(&cc, 0, sizeof(cc));
4668 	diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4669 
4670 	memset(&diff_info, 0, sizeof(diff_info));
4671 	diff_info.left_path = relpath;
4672 	diff_info.right_path = relpath;
4673 
4674 	diff_state = diff_output_unidiff_state_alloc();
4675 	if (diff_state == NULL)
4676 		return got_error_set_errno(ENOMEM,
4677 		    "diff_output_unidiff_state_alloc");
4678 
4679 	hunkfile = got_opentemp();
4680 	if (hunkfile == NULL) {
4681 		err = got_error_from_errno("got_opentemp");
4682 		goto done;
4683 	}
4684 
4685 	rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4686 	    diff_result, &cc);
4687 	if (rc != DIFF_RC_OK) {
4688 		err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4689 		goto done;
4690 	}
4691 
4692 	if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4693 		err = got_ferror(hunkfile, GOT_ERR_IO);
4694 		goto done;
4695 	}
4696 
4697 	err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4698 	    hunkfile, changeno, nchanges);
4699 	if (err)
4700 		goto done;
4701 
4702 	switch (*choice) {
4703 	case GOT_PATCH_CHOICE_YES:
4704 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4705 		    end_old, start_new, end_new, outfile, rejectfile);
4706 		break;
4707 	case GOT_PATCH_CHOICE_NO:
4708 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4709 		    end_old, start_new, end_new, rejectfile, outfile);
4710 		break;
4711 	case GOT_PATCH_CHOICE_QUIT:
4712 		break;
4713 	default:
4714 		err = got_error(GOT_ERR_PATCH_CHOICE);
4715 		break;
4716 	}
4717 done:
4718 	diff_output_unidiff_state_free(diff_state);
4719 	if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4720 		err = got_error_from_errno("fclose");
4721 	return err;
4722 }
4723 
4724 struct revert_file_args {
4725 	struct got_worktree *worktree;
4726 	struct got_fileindex *fileindex;
4727 	got_worktree_checkout_cb progress_cb;
4728 	void *progress_arg;
4729 	got_worktree_patch_cb patch_cb;
4730 	void *patch_arg;
4731 	struct got_repository *repo;
4732 	int unlink_added_files;
4733 	struct got_pathlist_head *added_files_to_unlink;
4734 };
4735 
4736 static const struct got_error *
4737 create_patched_content(char **path_outfile, int reverse_patch,
4738     struct got_object_id *blob_id, const char *path2,
4739     int dirfd2, const char *de_name2,
4740     const char *relpath, struct got_repository *repo,
4741     got_worktree_patch_cb patch_cb, void *patch_arg)
4742 {
4743 	const struct got_error *err, *free_err;
4744 	struct got_blob_object *blob = NULL;
4745 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4746 	int fd = -1, fd2 = -1;
4747 	char link_target[PATH_MAX];
4748 	ssize_t link_len = 0;
4749 	char *path1 = NULL, *id_str = NULL;
4750 	struct stat sb2;
4751 	struct got_diffreg_result *diffreg_result = NULL;
4752 	int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4753 	int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4754 
4755 	*path_outfile = NULL;
4756 
4757 	err = got_object_id_str(&id_str, blob_id);
4758 	if (err)
4759 		return err;
4760 
4761 	if (dirfd2 != -1) {
4762 		fd2 = openat(dirfd2, de_name2,
4763 		    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4764 		if (fd2 == -1) {
4765 			if (!got_err_open_nofollow_on_symlink()) {
4766 				err = got_error_from_errno2("openat", path2);
4767 				goto done;
4768 			}
4769 			link_len = readlinkat(dirfd2, de_name2,
4770 			    link_target, sizeof(link_target));
4771 			if (link_len == -1) {
4772 				return got_error_from_errno2("readlinkat",
4773 				    path2);
4774 			}
4775 			sb2.st_mode = S_IFLNK;
4776 			sb2.st_size = link_len;
4777 		}
4778 	} else {
4779 		fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4780 		if (fd2 == -1) {
4781 			if (!got_err_open_nofollow_on_symlink()) {
4782 				err = got_error_from_errno2("open", path2);
4783 				goto done;
4784 			}
4785 			link_len = readlink(path2, link_target,
4786 			    sizeof(link_target));
4787 			if (link_len == -1)
4788 				return got_error_from_errno2("readlink", path2);
4789 			sb2.st_mode = S_IFLNK;
4790 			sb2.st_size = link_len;
4791 		}
4792 	}
4793 	if (fd2 != -1) {
4794 		if (fstat(fd2, &sb2) == -1) {
4795 			err = got_error_from_errno2("fstat", path2);
4796 			goto done;
4797 		}
4798 
4799 		f2 = fdopen(fd2, "r");
4800 		if (f2 == NULL) {
4801 			err = got_error_from_errno2("fdopen", path2);
4802 			goto done;
4803 		}
4804 		fd2 = -1;
4805 	} else {
4806 		size_t n;
4807 		f2 = got_opentemp();
4808 		if (f2 == NULL) {
4809 			err = got_error_from_errno2("got_opentemp", path2);
4810 			goto done;
4811 		}
4812 		n = fwrite(link_target, 1, link_len, f2);
4813 		if (n != link_len) {
4814 			err = got_ferror(f2, GOT_ERR_IO);
4815 			goto done;
4816 		}
4817 		if (fflush(f2) == EOF) {
4818 			err = got_error_from_errno("fflush");
4819 			goto done;
4820 		}
4821 		rewind(f2);
4822 	}
4823 
4824 	fd = got_opentempfd();
4825 	if (fd == -1) {
4826 		err = got_error_from_errno("got_opentempfd");
4827 		goto done;
4828 	}
4829 
4830 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4831 	if (err)
4832 		goto done;
4833 
4834 	err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4835 	if (err)
4836 		goto done;
4837 
4838 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4839 	if (err)
4840 		goto done;
4841 
4842 	err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4843 	    3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4844 	if (err)
4845 		goto done;
4846 
4847 	err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4848 	    "");
4849 	if (err)
4850 		goto done;
4851 
4852 	if (fseek(f1, 0L, SEEK_SET) == -1)
4853 		return got_ferror(f1, GOT_ERR_IO);
4854 	if (fseek(f2, 0L, SEEK_SET) == -1)
4855 		return got_ferror(f2, GOT_ERR_IO);
4856 
4857 	/* Count the number of actual changes in the diff result. */
4858 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4859 		struct diff_chunk_context cc = {};
4860 		diff_chunk_context_load_change(&cc, &nchunks_used,
4861 		    diffreg_result->result, n, 0);
4862 		nchanges++;
4863 	}
4864 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4865 		int choice;
4866 		err = apply_or_reject_change(&choice, &nchunks_used,
4867 		    diffreg_result->result, n, relpath, f1, f2,
4868 		    &line_cur1, &line_cur2,
4869 		    reverse_patch ? NULL : outfile,
4870 		    reverse_patch ? outfile : NULL,
4871 		    ++i, nchanges, patch_cb, patch_arg);
4872 		if (err)
4873 			goto done;
4874 		if (choice == GOT_PATCH_CHOICE_YES)
4875 			have_content = 1;
4876 		else if (choice == GOT_PATCH_CHOICE_QUIT)
4877 			break;
4878 	}
4879 	if (have_content) {
4880 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4881 		    reverse_patch ? NULL : outfile,
4882 		    reverse_patch ? outfile : NULL);
4883 		if (err)
4884 			goto done;
4885 
4886 		if (!S_ISLNK(sb2.st_mode)) {
4887 			mode_t mode;
4888 
4889 			mode = apply_umask(sb2.st_mode);
4890 			if (fchmod(fileno(outfile), mode) == -1) {
4891 				err = got_error_from_errno2("fchmod", path2);
4892 				goto done;
4893 			}
4894 		}
4895 	}
4896 done:
4897 	free(id_str);
4898 	if (fd != -1 && close(fd) == -1 && err == NULL)
4899 		err = got_error_from_errno("close");
4900 	if (blob)
4901 		got_object_blob_close(blob);
4902 	free_err = got_diffreg_result_free(diffreg_result);
4903 	if (err == NULL)
4904 		err = free_err;
4905 	if (f1 && fclose(f1) == EOF && err == NULL)
4906 		err = got_error_from_errno2("fclose", path1);
4907 	if (f2 && fclose(f2) == EOF && err == NULL)
4908 		err = got_error_from_errno2("fclose", path2);
4909 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4910 		err = got_error_from_errno2("close", path2);
4911 	if (outfile && fclose(outfile) == EOF && err == NULL)
4912 		err = got_error_from_errno2("fclose", *path_outfile);
4913 	if (path1 && unlink(path1) == -1 && err == NULL)
4914 		err = got_error_from_errno2("unlink", path1);
4915 	if (err || !have_content) {
4916 		if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4917 			err = got_error_from_errno2("unlink", *path_outfile);
4918 		free(*path_outfile);
4919 		*path_outfile = NULL;
4920 	}
4921 	free(path1);
4922 	return err;
4923 }
4924 
4925 static const struct got_error *
4926 revert_file(void *arg, unsigned char status, unsigned char staged_status,
4927     const char *relpath, struct got_object_id *blob_id,
4928     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4929     int dirfd, const char *de_name)
4930 {
4931 	struct revert_file_args *a = arg;
4932 	const struct got_error *err = NULL;
4933 	char *parent_path = NULL;
4934 	struct got_fileindex_entry *ie;
4935 	struct got_commit_object *base_commit = NULL;
4936 	struct got_tree_object *tree = NULL;
4937 	struct got_object_id *tree_id = NULL;
4938 	const struct got_tree_entry *te = NULL;
4939 	char *tree_path = NULL, *te_name;
4940 	char *ondisk_path = NULL, *path_content = NULL;
4941 	struct got_blob_object *blob = NULL;
4942 	int fd = -1;
4943 
4944 	/* Reverting a staged deletion is a no-op. */
4945 	if (status == GOT_STATUS_DELETE &&
4946 	    staged_status != GOT_STATUS_NO_CHANGE)
4947 		return NULL;
4948 
4949 	if (status == GOT_STATUS_UNVERSIONED)
4950 		return (*a->progress_cb)(a->progress_arg,
4951 		    GOT_STATUS_UNVERSIONED, relpath);
4952 
4953 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4954 	if (ie == NULL)
4955 		return got_error_path(relpath, GOT_ERR_BAD_PATH);
4956 
4957 	/* Construct in-repository path of tree which contains this blob. */
4958 	err = got_path_dirname(&parent_path, ie->path);
4959 	if (err) {
4960 		if (err->code != GOT_ERR_BAD_PATH)
4961 			goto done;
4962 		parent_path = strdup("/");
4963 		if (parent_path == NULL) {
4964 			err = got_error_from_errno("strdup");
4965 			goto done;
4966 		}
4967 	}
4968 	if (got_path_is_root_dir(a->worktree->path_prefix)) {
4969 		tree_path = strdup(parent_path);
4970 		if (tree_path == NULL) {
4971 			err = got_error_from_errno("strdup");
4972 			goto done;
4973 		}
4974 	} else {
4975 		if (got_path_is_root_dir(parent_path)) {
4976 			tree_path = strdup(a->worktree->path_prefix);
4977 			if (tree_path == NULL) {
4978 				err = got_error_from_errno("strdup");
4979 				goto done;
4980 			}
4981 		} else {
4982 			if (asprintf(&tree_path, "%s/%s",
4983 			    a->worktree->path_prefix, parent_path) == -1) {
4984 				err = got_error_from_errno("asprintf");
4985 				goto done;
4986 			}
4987 		}
4988 	}
4989 
4990 	err = got_object_open_as_commit(&base_commit, a->repo,
4991 	    a->worktree->base_commit_id);
4992 	if (err)
4993 		goto done;
4994 
4995 	err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4996 	if (err) {
4997 		if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4998 		    (status == GOT_STATUS_ADD ||
4999 		    staged_status == GOT_STATUS_ADD)))
5000 			goto done;
5001 	} else {
5002 		err = got_object_open_as_tree(&tree, a->repo, tree_id);
5003 		if (err)
5004 			goto done;
5005 
5006 		err = got_path_basename(&te_name, ie->path);
5007 		if (err)
5008 			goto done;
5009 
5010 		te = got_object_tree_find_entry(tree, te_name);
5011 		free(te_name);
5012 		if (te == NULL && status != GOT_STATUS_ADD &&
5013 		    staged_status != GOT_STATUS_ADD) {
5014 			err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
5015 			goto done;
5016 		}
5017 	}
5018 
5019 	switch (status) {
5020 	case GOT_STATUS_ADD:
5021 		if (a->patch_cb) {
5022 			int choice = GOT_PATCH_CHOICE_NONE;
5023 			err = (*a->patch_cb)(&choice, a->patch_arg,
5024 			    status, ie->path, NULL, 1, 1);
5025 			if (err)
5026 				goto done;
5027 			if (choice != GOT_PATCH_CHOICE_YES)
5028 				break;
5029 		}
5030 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
5031 		    ie->path);
5032 		if (err)
5033 			goto done;
5034 		got_fileindex_entry_remove(a->fileindex, ie);
5035 		if (a->unlink_added_files) {
5036 			int do_unlink = a->added_files_to_unlink ? 0 : 1;
5037 
5038 			if (a->added_files_to_unlink) {
5039 				struct got_pathlist_entry *pe;
5040 
5041 				TAILQ_FOREACH(pe, a->added_files_to_unlink,
5042 				    entry) {
5043 					if (got_path_cmp(pe->path, relpath,
5044 					    pe->path_len, strlen(relpath)))
5045 						continue;
5046 					do_unlink = 1;
5047 					break;
5048 				}
5049 			}
5050 
5051 			if (do_unlink) {
5052 				if (asprintf(&ondisk_path, "%s/%s",
5053 				    got_worktree_get_root_path(a->worktree),
5054 				    relpath) == -1) {
5055 					err = got_error_from_errno("asprintf");
5056 					goto done;
5057 				}
5058 				if (unlink(ondisk_path) == -1) {
5059 					err = got_error_from_errno2("unlink",
5060 					    ondisk_path);
5061 					break;
5062 				}
5063 			}
5064 		}
5065 		break;
5066 	case GOT_STATUS_DELETE:
5067 		if (a->patch_cb) {
5068 			int choice = GOT_PATCH_CHOICE_NONE;
5069 			err = (*a->patch_cb)(&choice, a->patch_arg,
5070 			    status, ie->path, NULL, 1, 1);
5071 			if (err)
5072 				goto done;
5073 			if (choice != GOT_PATCH_CHOICE_YES)
5074 				break;
5075 		}
5076 		/* fall through */
5077 	case GOT_STATUS_MODIFY:
5078 	case GOT_STATUS_MODE_CHANGE:
5079 	case GOT_STATUS_CONFLICT:
5080 	case GOT_STATUS_MISSING: {
5081 		struct got_object_id id;
5082 		if (staged_status == GOT_STATUS_ADD ||
5083 		    staged_status == GOT_STATUS_MODIFY)
5084 			got_fileindex_entry_get_staged_blob_id(&id, ie);
5085 		else
5086 			got_fileindex_entry_get_blob_id(&id, ie);
5087 		fd = got_opentempfd();
5088 		if (fd == -1) {
5089 			err = got_error_from_errno("got_opentempfd");
5090 			goto done;
5091 		}
5092 
5093 		err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
5094 		if (err)
5095 			goto done;
5096 
5097 		if (asprintf(&ondisk_path, "%s/%s",
5098 		    got_worktree_get_root_path(a->worktree), relpath) == -1) {
5099 			err = got_error_from_errno("asprintf");
5100 			goto done;
5101 		}
5102 
5103 		if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
5104 		    status == GOT_STATUS_CONFLICT)) {
5105 			int is_bad_symlink = 0;
5106 			err = create_patched_content(&path_content, 1, &id,
5107 			    ondisk_path, dirfd, de_name, ie->path, a->repo,
5108 			    a->patch_cb, a->patch_arg);
5109 			if (err || path_content == NULL)
5110 				break;
5111 			if (te && S_ISLNK(te->mode)) {
5112 				if (unlink(path_content) == -1) {
5113 					err = got_error_from_errno2("unlink",
5114 					    path_content);
5115 					break;
5116 				}
5117 				err = install_symlink(&is_bad_symlink,
5118 				    a->worktree, ondisk_path, ie->path,
5119 				    blob, 0, 1, 0, 0, a->repo,
5120 				    a->progress_cb, a->progress_arg);
5121 			} else {
5122 				if (rename(path_content, ondisk_path) == -1) {
5123 					err = got_error_from_errno3("rename",
5124 					    path_content, ondisk_path);
5125 					goto done;
5126 				}
5127 			}
5128 		} else {
5129 			int is_bad_symlink = 0;
5130 			if (te && S_ISLNK(te->mode)) {
5131 				err = install_symlink(&is_bad_symlink,
5132 				    a->worktree, ondisk_path, ie->path,
5133 				    blob, 0, 1, 0, 0, a->repo,
5134 				    a->progress_cb, a->progress_arg);
5135 			} else {
5136 				err = install_blob(a->worktree, ondisk_path,
5137 				    ie->path,
5138 				    te ? te->mode : GOT_DEFAULT_FILE_MODE,
5139 				    got_fileindex_perms_to_st(ie), blob,
5140 				    0, 1, 0, 0, a->repo,
5141 				    a->progress_cb, a->progress_arg);
5142 			}
5143 			if (err)
5144 				goto done;
5145 			if (status == GOT_STATUS_DELETE ||
5146 			    status == GOT_STATUS_MODE_CHANGE) {
5147 				err = got_fileindex_entry_update(ie,
5148 				    a->worktree->root_fd, relpath,
5149 				    blob->id.sha1,
5150 				    a->worktree->base_commit_id->sha1, 1);
5151 				if (err)
5152 					goto done;
5153 			}
5154 			if (is_bad_symlink) {
5155 				got_fileindex_entry_filetype_set(ie,
5156 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
5157 			}
5158 		}
5159 		break;
5160 	}
5161 	default:
5162 		break;
5163 	}
5164 done:
5165 	free(ondisk_path);
5166 	free(path_content);
5167 	free(parent_path);
5168 	free(tree_path);
5169 	if (fd != -1 && close(fd) == -1 && err == NULL)
5170 		err = got_error_from_errno("close");
5171 	if (blob)
5172 		got_object_blob_close(blob);
5173 	if (tree)
5174 		got_object_tree_close(tree);
5175 	free(tree_id);
5176 	if (base_commit)
5177 		got_object_commit_close(base_commit);
5178 	return err;
5179 }
5180 
5181 const struct got_error *
5182 got_worktree_revert(struct got_worktree *worktree,
5183     struct got_pathlist_head *paths,
5184     got_worktree_checkout_cb progress_cb, void *progress_arg,
5185     got_worktree_patch_cb patch_cb, void *patch_arg,
5186     struct got_repository *repo)
5187 {
5188 	struct got_fileindex *fileindex = NULL;
5189 	char *fileindex_path = NULL;
5190 	const struct got_error *err = NULL, *unlockerr = NULL;
5191 	const struct got_error *sync_err = NULL;
5192 	struct got_pathlist_entry *pe;
5193 	struct revert_file_args rfa;
5194 
5195 	err = lock_worktree(worktree, LOCK_EX);
5196 	if (err)
5197 		return err;
5198 
5199 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
5200 	if (err)
5201 		goto done;
5202 
5203 	rfa.worktree = worktree;
5204 	rfa.fileindex = fileindex;
5205 	rfa.progress_cb = progress_cb;
5206 	rfa.progress_arg = progress_arg;
5207 	rfa.patch_cb = patch_cb;
5208 	rfa.patch_arg = patch_arg;
5209 	rfa.repo = repo;
5210 	rfa.unlink_added_files = 0;
5211 	TAILQ_FOREACH(pe, paths, entry) {
5212 		err = worktree_status(worktree, pe->path, fileindex, repo,
5213 		    revert_file, &rfa, NULL, NULL, 1, 0);
5214 		if (err)
5215 			break;
5216 	}
5217 	sync_err = sync_fileindex(fileindex, fileindex_path);
5218 	if (sync_err && err == NULL)
5219 		err = sync_err;
5220 done:
5221 	free(fileindex_path);
5222 	if (fileindex)
5223 		got_fileindex_free(fileindex);
5224 	unlockerr = lock_worktree(worktree, LOCK_SH);
5225 	if (unlockerr && err == NULL)
5226 		err = unlockerr;
5227 	return err;
5228 }
5229 
5230 static void
5231 free_commitable(struct got_commitable *ct)
5232 {
5233 	free(ct->path);
5234 	free(ct->in_repo_path);
5235 	free(ct->ondisk_path);
5236 	free(ct->blob_id);
5237 	free(ct->base_blob_id);
5238 	free(ct->staged_blob_id);
5239 	free(ct->base_commit_id);
5240 	free(ct);
5241 }
5242 
5243 struct collect_commitables_arg {
5244 	struct got_pathlist_head *commitable_paths;
5245 	struct got_repository *repo;
5246 	struct got_worktree *worktree;
5247 	struct got_fileindex *fileindex;
5248 	int have_staged_files;
5249 	int allow_bad_symlinks;
5250 	int diff_header_shown;
5251 	int commit_conflicts;
5252 	FILE *diff_outfile;
5253 	FILE *f1;
5254 	FILE *f2;
5255 };
5256 
5257 /*
5258  * Create a file which contains the target path of a symlink so we can feed
5259  * it as content to the diff engine.
5260  */
5261 static const struct got_error *
5262 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
5263     const char *abspath)
5264 {
5265 	const struct got_error *err = NULL;
5266 	char target_path[PATH_MAX];
5267 	ssize_t target_len, outlen;
5268 
5269 	*fd = -1;
5270 
5271 	if (dirfd != -1) {
5272 		target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
5273 		if (target_len == -1)
5274 			return got_error_from_errno2("readlinkat", abspath);
5275 	} else {
5276 		target_len = readlink(abspath, target_path, PATH_MAX);
5277 		if (target_len == -1)
5278 			return got_error_from_errno2("readlink", abspath);
5279 	}
5280 
5281 	*fd = got_opentempfd();
5282 	if (*fd == -1)
5283 		return got_error_from_errno("got_opentempfd");
5284 
5285 	outlen = write(*fd, target_path, target_len);
5286 	if (outlen == -1) {
5287 		err = got_error_from_errno("got_opentempfd");
5288 		goto done;
5289 	}
5290 
5291 	if (lseek(*fd, 0, SEEK_SET) == -1) {
5292 		err = got_error_from_errno2("lseek", abspath);
5293 		goto done;
5294 	}
5295 done:
5296 	if (err) {
5297 		close(*fd);
5298 		*fd = -1;
5299 	}
5300 	return err;
5301 }
5302 
5303 static const struct got_error *
5304 append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5305     FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5306     int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5307 {
5308 	const struct got_error *err = NULL;
5309 	struct got_blob_object *blob1 = NULL;
5310 	int fd = -1, fd1 = -1, fd2 = -1;
5311 	FILE *ondisk_file = NULL;
5312 	char *label1 = NULL;
5313 	struct stat sb;
5314 	off_t size1 = 0;
5315 	int f2_exists = 0;
5316 	char *id_str = NULL;
5317 
5318 	memset(&sb, 0, sizeof(sb));
5319 
5320 	if (diff_staged) {
5321 		if (ct->staged_status != GOT_STATUS_MODIFY &&
5322 		    ct->staged_status != GOT_STATUS_ADD &&
5323 		    ct->staged_status != GOT_STATUS_DELETE)
5324 			return NULL;
5325 	} else {
5326 		if (ct->status != GOT_STATUS_MODIFY &&
5327 		    ct->status != GOT_STATUS_ADD &&
5328 		    ct->status != GOT_STATUS_DELETE &&
5329 		    ct->status != GOT_STATUS_CONFLICT)
5330 			return NULL;
5331 	}
5332 
5333 	err = got_opentemp_truncate(f1);
5334 	if (err)
5335 		return got_error_from_errno("got_opentemp_truncate");
5336 	err = got_opentemp_truncate(f2);
5337 	if (err)
5338 		return got_error_from_errno("got_opentemp_truncate");
5339 
5340 	if (!*diff_header_shown) {
5341 		err = got_object_id_str(&id_str, worktree->base_commit_id);
5342 		if (err)
5343 			return err;
5344 		fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5345 		    got_worktree_get_root_path(worktree));
5346 		fprintf(diff_outfile, "commit - %s\n", id_str);
5347 		fprintf(diff_outfile, "path + %s%s\n",
5348 		    got_worktree_get_root_path(worktree),
5349 		    diff_staged ? " (staged changes)" : "");
5350 		*diff_header_shown = 1;
5351 	}
5352 
5353 	if (diff_staged) {
5354 		const char *label1 = NULL, *label2 = NULL;
5355 		switch (ct->staged_status) {
5356 		case GOT_STATUS_MODIFY:
5357 			label1 = ct->path;
5358 			label2 = ct->path;
5359 			break;
5360 		case GOT_STATUS_ADD:
5361 			label2 = ct->path;
5362 			break;
5363 		case GOT_STATUS_DELETE:
5364 			label1 = ct->path;
5365 			break;
5366 		default:
5367 			return got_error(GOT_ERR_FILE_STATUS);
5368 		}
5369 		fd1 = got_opentempfd();
5370 		if (fd1 == -1) {
5371 			err = got_error_from_errno("got_opentempfd");
5372 			goto done;
5373 		}
5374 		fd2 = got_opentempfd();
5375 		if (fd2 == -1) {
5376 			err = got_error_from_errno("got_opentempfd");
5377 			goto done;
5378 		}
5379 		err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5380 		    fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5381 		    label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5382 		    NULL, repo, diff_outfile);
5383 		goto done;
5384 	}
5385 
5386 	fd1 = got_opentempfd();
5387 	if (fd1 == -1) {
5388 		err = got_error_from_errno("got_opentempfd");
5389 		goto done;
5390 	}
5391 
5392 	if (ct->status != GOT_STATUS_ADD) {
5393 		err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5394 		    8192, fd1);
5395 		if (err)
5396 			goto done;
5397 	}
5398 
5399 	if (ct->status != GOT_STATUS_DELETE) {
5400 		if (dirfd != -1) {
5401 			fd = openat(dirfd, de_name,
5402 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5403 			if (fd == -1) {
5404 				if (!got_err_open_nofollow_on_symlink()) {
5405 					err = got_error_from_errno2("openat",
5406 					    ct->ondisk_path);
5407 					goto done;
5408 				}
5409 				err = get_symlink_target_file(&fd, dirfd,
5410 				    de_name, ct->ondisk_path);
5411 				if (err)
5412 					goto done;
5413 			}
5414 		} else {
5415 			fd = open(ct->ondisk_path,
5416 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5417 			if (fd == -1) {
5418 				if (!got_err_open_nofollow_on_symlink()) {
5419 					err = got_error_from_errno2("open",
5420 					    ct->ondisk_path);
5421 					goto done;
5422 				}
5423 				err = get_symlink_target_file(&fd, dirfd,
5424 				    de_name, ct->ondisk_path);
5425 				if (err)
5426 					goto done;
5427 			}
5428 		}
5429 		if (fstatat(fd, ct->ondisk_path, &sb,
5430 		    AT_SYMLINK_NOFOLLOW) == -1) {
5431 			err = got_error_from_errno2("fstatat", ct->ondisk_path);
5432 			goto done;
5433 		}
5434 		ondisk_file = fdopen(fd, "r");
5435 		if (ondisk_file == NULL) {
5436 			err = got_error_from_errno2("fdopen", ct->ondisk_path);
5437 			goto done;
5438 		}
5439 		fd = -1;
5440 		f2_exists = 1;
5441 	}
5442 
5443 	if (blob1) {
5444 		err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5445 		    f1, blob1);
5446 		if (err)
5447 			goto done;
5448 	}
5449 
5450 	err = got_diff_blob_file(blob1, f1, size1, label1,
5451 	    ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5452 	    GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
5453 done:
5454 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5455 		err = got_error_from_errno("close");
5456 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5457 		err = got_error_from_errno("close");
5458 	if (blob1)
5459 		got_object_blob_close(blob1);
5460 	if (fd != -1 && close(fd) == -1 && err == NULL)
5461 		err = got_error_from_errno("close");
5462 	if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5463 		err = got_error_from_errno("fclose");
5464 	return err;
5465 }
5466 
5467 static const struct got_error *
5468 collect_commitables(void *arg, unsigned char status,
5469     unsigned char staged_status, const char *relpath,
5470     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5471     struct got_object_id *commit_id, int dirfd, const char *de_name)
5472 {
5473 	struct collect_commitables_arg *a = arg;
5474 	const struct got_error *err = NULL;
5475 	struct got_commitable *ct = NULL;
5476 	struct got_pathlist_entry *new = NULL;
5477 	char *parent_path = NULL, *path = NULL;
5478 	struct stat sb;
5479 
5480 	if (a->have_staged_files) {
5481 		if (staged_status != GOT_STATUS_MODIFY &&
5482 		    staged_status != GOT_STATUS_ADD &&
5483 		    staged_status != GOT_STATUS_DELETE)
5484 			return NULL;
5485 	} else {
5486 		if (status == GOT_STATUS_CONFLICT && !a->commit_conflicts) {
5487 			printf("C  %s\n", relpath);
5488 			return got_error(GOT_ERR_COMMIT_CONFLICT);
5489 		}
5490 
5491 		if (status != GOT_STATUS_MODIFY &&
5492 		    status != GOT_STATUS_MODE_CHANGE &&
5493 		    status != GOT_STATUS_ADD &&
5494 		    status != GOT_STATUS_DELETE &&
5495 		    status != GOT_STATUS_CONFLICT)
5496 			return NULL;
5497 	}
5498 
5499 	if (asprintf(&path, "/%s", relpath) == -1) {
5500 		err = got_error_from_errno("asprintf");
5501 		goto done;
5502 	}
5503 	if (strcmp(path, "/") == 0) {
5504 		parent_path = strdup("");
5505 		if (parent_path == NULL)
5506 			return got_error_from_errno("strdup");
5507 	} else {
5508 		err = got_path_dirname(&parent_path, path);
5509 		if (err)
5510 			return err;
5511 	}
5512 
5513 	ct = calloc(1, sizeof(*ct));
5514 	if (ct == NULL) {
5515 		err = got_error_from_errno("calloc");
5516 		goto done;
5517 	}
5518 
5519 	if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5520 	    relpath) == -1) {
5521 		err = got_error_from_errno("asprintf");
5522 		goto done;
5523 	}
5524 
5525 	if (staged_status == GOT_STATUS_ADD ||
5526 	    staged_status == GOT_STATUS_MODIFY) {
5527 		struct got_fileindex_entry *ie;
5528 		ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5529 		switch (got_fileindex_entry_staged_filetype_get(ie)) {
5530 		case GOT_FILEIDX_MODE_REGULAR_FILE:
5531 		case GOT_FILEIDX_MODE_BAD_SYMLINK:
5532 			ct->mode = S_IFREG;
5533 			break;
5534 		case GOT_FILEIDX_MODE_SYMLINK:
5535 			ct->mode = S_IFLNK;
5536 			break;
5537 		default:
5538 			err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5539 			goto done;
5540 		}
5541 		ct->mode |= got_fileindex_entry_perms_get(ie);
5542 	} else if (status != GOT_STATUS_DELETE &&
5543 	    staged_status != GOT_STATUS_DELETE) {
5544 		if (dirfd != -1) {
5545 			if (fstatat(dirfd, de_name, &sb,
5546 			    AT_SYMLINK_NOFOLLOW) == -1) {
5547 				err = got_error_from_errno2("fstatat",
5548 				    ct->ondisk_path);
5549 				goto done;
5550 			}
5551 		} else if (lstat(ct->ondisk_path, &sb) == -1) {
5552 			err = got_error_from_errno2("lstat", ct->ondisk_path);
5553 			goto done;
5554 		}
5555 		ct->mode = sb.st_mode;
5556 	}
5557 
5558 	if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5559 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5560 	    relpath) == -1) {
5561 		err = got_error_from_errno("asprintf");
5562 		goto done;
5563 	}
5564 
5565 	if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5566 	    status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5567 		int is_bad_symlink;
5568 		char target_path[PATH_MAX];
5569 		ssize_t target_len;
5570 		target_len = readlink(ct->ondisk_path, target_path,
5571 		    sizeof(target_path));
5572 		if (target_len == -1) {
5573 			err = got_error_from_errno2("readlink",
5574 			    ct->ondisk_path);
5575 			goto done;
5576 		}
5577 		err = is_bad_symlink_target(&is_bad_symlink, target_path,
5578 		    target_len, ct->ondisk_path, a->worktree->root_path);
5579 		if (err)
5580 			goto done;
5581 		if (is_bad_symlink) {
5582 			err = got_error_path(ct->ondisk_path,
5583 			    GOT_ERR_BAD_SYMLINK);
5584 			goto done;
5585 		}
5586 	}
5587 
5588 
5589 	ct->status = status;
5590 	ct->staged_status = staged_status;
5591 	ct->blob_id = NULL; /* will be filled in when blob gets created */
5592 	if (ct->status != GOT_STATUS_ADD &&
5593 	    ct->staged_status != GOT_STATUS_ADD) {
5594 		ct->base_blob_id = got_object_id_dup(blob_id);
5595 		if (ct->base_blob_id == NULL) {
5596 			err = got_error_from_errno("got_object_id_dup");
5597 			goto done;
5598 		}
5599 		ct->base_commit_id = got_object_id_dup(commit_id);
5600 		if (ct->base_commit_id == NULL) {
5601 			err = got_error_from_errno("got_object_id_dup");
5602 			goto done;
5603 		}
5604 	}
5605 	if (ct->staged_status == GOT_STATUS_ADD ||
5606 	    ct->staged_status == GOT_STATUS_MODIFY) {
5607 		ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5608 		if (ct->staged_blob_id == NULL) {
5609 			err = got_error_from_errno("got_object_id_dup");
5610 			goto done;
5611 		}
5612 	}
5613 	ct->path = strdup(path);
5614 	if (ct->path == NULL) {
5615 		err = got_error_from_errno("strdup");
5616 		goto done;
5617 	}
5618 	err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5619 	if (err)
5620 		goto done;
5621 
5622 	if (a->diff_outfile && ct && new != NULL) {
5623 		err = append_ct_diff(ct, &a->diff_header_shown,
5624 		    a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5625 		    a->have_staged_files, a->repo, a->worktree);
5626 		if (err)
5627 			goto done;
5628 	}
5629 done:
5630 	if (ct && (err || new == NULL))
5631 		free_commitable(ct);
5632 	free(parent_path);
5633 	free(path);
5634 	return err;
5635 }
5636 
5637 static const struct got_error *write_tree(struct got_object_id **, int *,
5638     struct got_tree_object *, const char *, struct got_pathlist_head *,
5639     got_worktree_status_cb status_cb, void *status_arg,
5640     struct got_repository *);
5641 
5642 static const struct got_error *
5643 write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5644     struct got_tree_entry *te, const char *parent_path,
5645     struct got_pathlist_head *commitable_paths,
5646     got_worktree_status_cb status_cb, void *status_arg,
5647     struct got_repository *repo)
5648 {
5649 	const struct got_error *err = NULL;
5650 	struct got_tree_object *subtree;
5651 	char *subpath;
5652 
5653 	if (asprintf(&subpath, "%s%s%s", parent_path,
5654 	    got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5655 		return got_error_from_errno("asprintf");
5656 
5657 	err = got_object_open_as_tree(&subtree, repo, &te->id);
5658 	if (err)
5659 		return err;
5660 
5661 	err = write_tree(new_subtree_id, nentries, subtree, subpath,
5662 	    commitable_paths, status_cb, status_arg, repo);
5663 	got_object_tree_close(subtree);
5664 	free(subpath);
5665 	return err;
5666 }
5667 
5668 static const struct got_error *
5669 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5670 {
5671 	const struct got_error *err = NULL;
5672 	char *ct_parent_path = NULL;
5673 
5674 	*match = 0;
5675 
5676 	if (strchr(ct->in_repo_path, '/') == NULL) {
5677 		*match = got_path_is_root_dir(path);
5678 		return NULL;
5679 	}
5680 
5681 	err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5682 	if (err)
5683 		return err;
5684 	*match = (strcmp(path, ct_parent_path) == 0);
5685 	free(ct_parent_path);
5686 	return err;
5687 }
5688 
5689 static mode_t
5690 get_ct_file_mode(struct got_commitable *ct)
5691 {
5692 	if (S_ISLNK(ct->mode))
5693 		return S_IFLNK;
5694 
5695 	return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5696 }
5697 
5698 static const struct got_error *
5699 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5700     struct got_tree_entry *te, struct got_commitable *ct)
5701 {
5702 	const struct got_error *err = NULL;
5703 
5704 	*new_te = NULL;
5705 
5706 	err = got_object_tree_entry_dup(new_te, te);
5707 	if (err)
5708 		goto done;
5709 
5710 	(*new_te)->mode = get_ct_file_mode(ct);
5711 
5712 	if (ct->staged_status == GOT_STATUS_MODIFY)
5713 		memcpy(&(*new_te)->id, ct->staged_blob_id,
5714 		    sizeof((*new_te)->id));
5715 	else
5716 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5717 done:
5718 	if (err && *new_te) {
5719 		free(*new_te);
5720 		*new_te = NULL;
5721 	}
5722 	return err;
5723 }
5724 
5725 static const struct got_error *
5726 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5727     struct got_commitable *ct)
5728 {
5729 	const struct got_error *err = NULL;
5730 	char *ct_name = NULL;
5731 
5732 	 *new_te = NULL;
5733 
5734 	*new_te = calloc(1, sizeof(**new_te));
5735 	if (*new_te == NULL)
5736 		return got_error_from_errno("calloc");
5737 
5738 	err = got_path_basename(&ct_name, ct->path);
5739 	if (err)
5740 		goto done;
5741 	if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5742 	    sizeof((*new_te)->name)) {
5743 		err = got_error(GOT_ERR_NO_SPACE);
5744 		goto done;
5745 	}
5746 
5747 	(*new_te)->mode = get_ct_file_mode(ct);
5748 
5749 	if (ct->staged_status == GOT_STATUS_ADD)
5750 		memcpy(&(*new_te)->id, ct->staged_blob_id,
5751 		    sizeof((*new_te)->id));
5752 	else
5753 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5754 done:
5755 	free(ct_name);
5756 	if (err && *new_te) {
5757 		free(*new_te);
5758 		*new_te = NULL;
5759 	}
5760 	return err;
5761 }
5762 
5763 static const struct got_error *
5764 insert_tree_entry(struct got_tree_entry *new_te,
5765     struct got_pathlist_head *paths)
5766 {
5767 	const struct got_error *err = NULL;
5768 	struct got_pathlist_entry *new_pe;
5769 
5770 	err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5771 	if (err)
5772 		return err;
5773 	if (new_pe == NULL)
5774 		return got_error(GOT_ERR_TREE_DUP_ENTRY);
5775 	return NULL;
5776 }
5777 
5778 static const struct got_error *
5779 report_ct_status(struct got_commitable *ct,
5780     got_worktree_status_cb status_cb, void *status_arg)
5781 {
5782 	const char *ct_path = ct->path;
5783 	unsigned char status;
5784 
5785 	if (status_cb == NULL) /* no commit progress output desired */
5786 		return NULL;
5787 
5788 	while (ct_path[0] == '/')
5789 		ct_path++;
5790 
5791 	if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5792 		status = ct->staged_status;
5793 	else
5794 		status = ct->status;
5795 
5796 	return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5797 	    ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5798 }
5799 
5800 static const struct got_error *
5801 match_modified_subtree(int *modified, struct got_tree_entry *te,
5802     const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5803 {
5804 	const struct got_error *err = NULL;
5805 	struct got_pathlist_entry *pe;
5806 	char *te_path;
5807 
5808 	*modified = 0;
5809 
5810 	if (asprintf(&te_path, "%s%s%s", base_tree_path,
5811 	    got_path_is_root_dir(base_tree_path) ? "" : "/",
5812 	    te->name) == -1)
5813 		return got_error_from_errno("asprintf");
5814 
5815 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5816 		struct got_commitable *ct = pe->data;
5817 		*modified = got_path_is_child(ct->in_repo_path, te_path,
5818 		    strlen(te_path));
5819 		if (*modified)
5820 			break;
5821 	}
5822 
5823 	free(te_path);
5824 	return err;
5825 }
5826 
5827 static const struct got_error *
5828 match_deleted_or_modified_ct(struct got_commitable **ctp,
5829     struct got_tree_entry *te, const char *base_tree_path,
5830     struct got_pathlist_head *commitable_paths)
5831 {
5832 	const struct got_error *err = NULL;
5833 	struct got_pathlist_entry *pe;
5834 
5835 	*ctp = NULL;
5836 
5837 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5838 		struct got_commitable *ct = pe->data;
5839 		char *ct_name = NULL;
5840 		int path_matches;
5841 
5842 		if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5843 			if (ct->status != GOT_STATUS_MODIFY &&
5844 			    ct->status != GOT_STATUS_MODE_CHANGE &&
5845 			    ct->status != GOT_STATUS_DELETE &&
5846 			    ct->status != GOT_STATUS_CONFLICT)
5847 				continue;
5848 		} else {
5849 			if (ct->staged_status != GOT_STATUS_MODIFY &&
5850 			    ct->staged_status != GOT_STATUS_DELETE)
5851 				continue;
5852 		}
5853 
5854 		if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5855 			continue;
5856 
5857 		err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5858 		if (err)
5859 			return err;
5860 		if (!path_matches)
5861 			continue;
5862 
5863 		err = got_path_basename(&ct_name, pe->path);
5864 		if (err)
5865 			return err;
5866 
5867 		if (strcmp(te->name, ct_name) != 0) {
5868 			free(ct_name);
5869 			continue;
5870 		}
5871 		free(ct_name);
5872 
5873 		*ctp = ct;
5874 		break;
5875 	}
5876 
5877 	return err;
5878 }
5879 
5880 static const struct got_error *
5881 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5882     const char *child_path, const char *path_base_tree,
5883     struct got_pathlist_head *commitable_paths,
5884     got_worktree_status_cb status_cb, void *status_arg,
5885     struct got_repository *repo)
5886 {
5887 	const struct got_error *err = NULL;
5888 	struct got_tree_entry *new_te;
5889 	char *subtree_path;
5890 	struct got_object_id *id = NULL;
5891 	int nentries;
5892 
5893 	*new_tep = NULL;
5894 
5895 	if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5896 	    got_path_is_root_dir(path_base_tree) ? "" : "/",
5897 	    child_path) == -1)
5898 		return got_error_from_errno("asprintf");
5899 
5900 	new_te = calloc(1, sizeof(*new_te));
5901 	if (new_te == NULL)
5902 		return got_error_from_errno("calloc");
5903 	new_te->mode = S_IFDIR;
5904 
5905 	if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5906 	    sizeof(new_te->name)) {
5907 		err = got_error(GOT_ERR_NO_SPACE);
5908 		goto done;
5909 	}
5910 	err = write_tree(&id, &nentries, NULL, subtree_path,
5911 	    commitable_paths, status_cb, status_arg, repo);
5912 	if (err) {
5913 		free(new_te);
5914 		goto done;
5915 	}
5916 	memcpy(&new_te->id, id, sizeof(new_te->id));
5917 done:
5918 	free(id);
5919 	free(subtree_path);
5920 	if (err == NULL)
5921 		*new_tep = new_te;
5922 	return err;
5923 }
5924 
5925 static const struct got_error *
5926 write_tree(struct got_object_id **new_tree_id, int *nentries,
5927     struct got_tree_object *base_tree, const char *path_base_tree,
5928     struct got_pathlist_head *commitable_paths,
5929     got_worktree_status_cb status_cb, void *status_arg,
5930     struct got_repository *repo)
5931 {
5932 	const struct got_error *err = NULL;
5933 	struct got_pathlist_head paths;
5934 	struct got_tree_entry *te, *new_te = NULL;
5935 	struct got_pathlist_entry *pe;
5936 
5937 	TAILQ_INIT(&paths);
5938 	*nentries = 0;
5939 
5940 	/* Insert, and recurse into, newly added entries first. */
5941 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5942 		struct got_commitable *ct = pe->data;
5943 		char *child_path = NULL, *slash;
5944 
5945 		if ((ct->status != GOT_STATUS_ADD &&
5946 		    ct->staged_status != GOT_STATUS_ADD) ||
5947 		    (ct->flags & GOT_COMMITABLE_ADDED))
5948 			continue;
5949 
5950 		if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5951 		    strlen(path_base_tree)))
5952 			continue;
5953 
5954 		err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5955 		    ct->in_repo_path);
5956 		if (err)
5957 			goto done;
5958 
5959 		slash = strchr(child_path, '/');
5960 		if (slash == NULL) {
5961 			err = alloc_added_blob_tree_entry(&new_te, ct);
5962 			if (err)
5963 				goto done;
5964 			err = report_ct_status(ct, status_cb, status_arg);
5965 			if (err)
5966 				goto done;
5967 			ct->flags |= GOT_COMMITABLE_ADDED;
5968 			err = insert_tree_entry(new_te, &paths);
5969 			if (err)
5970 				goto done;
5971 			(*nentries)++;
5972 		} else {
5973 			*slash = '\0'; /* trim trailing path components */
5974 			if (base_tree == NULL ||
5975 			    got_object_tree_find_entry(base_tree, child_path)
5976 			    == NULL) {
5977 				err = make_subtree_for_added_blob(&new_te,
5978 				    child_path, path_base_tree,
5979 				    commitable_paths, status_cb, status_arg,
5980 				    repo);
5981 				if (err)
5982 					goto done;
5983 				err = insert_tree_entry(new_te, &paths);
5984 				if (err)
5985 					goto done;
5986 				(*nentries)++;
5987 			}
5988 		}
5989 	}
5990 
5991 	if (base_tree) {
5992 		int i, nbase_entries;
5993 		/* Handle modified and deleted entries. */
5994 		nbase_entries = got_object_tree_get_nentries(base_tree);
5995 		for (i = 0; i < nbase_entries; i++) {
5996 			struct got_commitable *ct = NULL;
5997 
5998 			te = got_object_tree_get_entry(base_tree, i);
5999 			if (got_object_tree_entry_is_submodule(te)) {
6000 				/* Entry is a submodule; just copy it. */
6001 				err = got_object_tree_entry_dup(&new_te, te);
6002 				if (err)
6003 					goto done;
6004 				err = insert_tree_entry(new_te, &paths);
6005 				if (err)
6006 					goto done;
6007 				(*nentries)++;
6008 				continue;
6009 			}
6010 
6011 			if (S_ISDIR(te->mode)) {
6012 				int modified;
6013 				err = got_object_tree_entry_dup(&new_te, te);
6014 				if (err)
6015 					goto done;
6016 				err = match_modified_subtree(&modified, te,
6017 				    path_base_tree, commitable_paths);
6018 				if (err)
6019 					goto done;
6020 				/* Avoid recursion into unmodified subtrees. */
6021 				if (modified) {
6022 					struct got_object_id *new_id;
6023 					int nsubentries;
6024 					err = write_subtree(&new_id,
6025 					    &nsubentries, te,
6026 					    path_base_tree, commitable_paths,
6027 					    status_cb, status_arg, repo);
6028 					if (err)
6029 						goto done;
6030 					if (nsubentries == 0) {
6031 						/* All entries were deleted. */
6032 						free(new_id);
6033 						continue;
6034 					}
6035 					memcpy(&new_te->id, new_id,
6036 					    sizeof(new_te->id));
6037 					free(new_id);
6038 				}
6039 				err = insert_tree_entry(new_te, &paths);
6040 				if (err)
6041 					goto done;
6042 				(*nentries)++;
6043 				continue;
6044 			}
6045 
6046 			err = match_deleted_or_modified_ct(&ct, te,
6047 			    path_base_tree, commitable_paths);
6048 			if (err)
6049 				goto done;
6050 			if (ct) {
6051 				/* NB: Deleted entries get dropped here. */
6052 				if (ct->status == GOT_STATUS_MODIFY ||
6053 				    ct->status == GOT_STATUS_MODE_CHANGE ||
6054 				    ct->status == GOT_STATUS_CONFLICT ||
6055 				    ct->staged_status == GOT_STATUS_MODIFY) {
6056 					err = alloc_modified_blob_tree_entry(
6057 					    &new_te, te, ct);
6058 					if (err)
6059 						goto done;
6060 					err = insert_tree_entry(new_te, &paths);
6061 					if (err)
6062 						goto done;
6063 					(*nentries)++;
6064 				}
6065 				err = report_ct_status(ct, status_cb,
6066 				    status_arg);
6067 				if (err)
6068 					goto done;
6069 			} else {
6070 				/* Entry is unchanged; just copy it. */
6071 				err = got_object_tree_entry_dup(&new_te, te);
6072 				if (err)
6073 					goto done;
6074 				err = insert_tree_entry(new_te, &paths);
6075 				if (err)
6076 					goto done;
6077 				(*nentries)++;
6078 			}
6079 		}
6080 	}
6081 
6082 	/* Write new list of entries; deleted entries have been dropped. */
6083 	err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
6084 done:
6085 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
6086 	return err;
6087 }
6088 
6089 static const struct got_error *
6090 update_fileindex_after_commit(struct got_worktree *worktree,
6091     struct got_pathlist_head *commitable_paths,
6092     struct got_object_id *new_base_commit_id,
6093     struct got_fileindex *fileindex, int have_staged_files)
6094 {
6095 	const struct got_error *err = NULL;
6096 	struct got_pathlist_entry *pe;
6097 	char *relpath = NULL;
6098 
6099 	TAILQ_FOREACH(pe, commitable_paths, entry) {
6100 		struct got_fileindex_entry *ie;
6101 		struct got_commitable *ct = pe->data;
6102 
6103 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6104 
6105 		err = got_path_skip_common_ancestor(&relpath,
6106 		    worktree->root_path, ct->ondisk_path);
6107 		if (err)
6108 			goto done;
6109 
6110 		if (ie) {
6111 			if (ct->status == GOT_STATUS_DELETE ||
6112 			    ct->staged_status == GOT_STATUS_DELETE) {
6113 				got_fileindex_entry_remove(fileindex, ie);
6114 			} else if (ct->staged_status == GOT_STATUS_ADD ||
6115 			    ct->staged_status == GOT_STATUS_MODIFY) {
6116 				got_fileindex_entry_stage_set(ie,
6117 				    GOT_FILEIDX_STAGE_NONE);
6118 				got_fileindex_entry_staged_filetype_set(ie, 0);
6119 
6120 				err = got_fileindex_entry_update(ie,
6121 				    worktree->root_fd, relpath,
6122 				    ct->staged_blob_id->sha1,
6123 				    new_base_commit_id->sha1,
6124 				    !have_staged_files);
6125 			} else
6126 				err = got_fileindex_entry_update(ie,
6127 				    worktree->root_fd, relpath,
6128 				    ct->blob_id->sha1,
6129 				    new_base_commit_id->sha1,
6130 				    !have_staged_files);
6131 		} else {
6132 			err = got_fileindex_entry_alloc(&ie, pe->path);
6133 			if (err)
6134 				goto done;
6135 			err = got_fileindex_entry_update(ie,
6136 			    worktree->root_fd, relpath, ct->blob_id->sha1,
6137 			    new_base_commit_id->sha1, 1);
6138 			if (err) {
6139 				got_fileindex_entry_free(ie);
6140 				goto done;
6141 			}
6142 			err = got_fileindex_entry_add(fileindex, ie);
6143 			if (err) {
6144 				got_fileindex_entry_free(ie);
6145 				goto done;
6146 			}
6147 		}
6148 		free(relpath);
6149 		relpath = NULL;
6150 	}
6151 done:
6152 	free(relpath);
6153 	return err;
6154 }
6155 
6156 
6157 static const struct got_error *
6158 check_out_of_date(const char *in_repo_path, unsigned char status,
6159     unsigned char staged_status, struct got_object_id *base_blob_id,
6160     struct got_object_id *base_commit_id,
6161     struct got_object_id *head_commit_id, struct got_repository *repo,
6162     int ood_errcode)
6163 {
6164 	const struct got_error *err = NULL;
6165 	struct got_commit_object *commit = NULL;
6166 	struct got_object_id *id = NULL;
6167 
6168 	if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
6169 		/* Trivial case: base commit == head commit */
6170 		if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
6171 			return NULL;
6172 		/*
6173 		 * Ensure file content which local changes were based
6174 		 * on matches file content in the branch head.
6175 		 */
6176 		err = got_object_open_as_commit(&commit, repo, head_commit_id);
6177 		if (err)
6178 			goto done;
6179 		err = got_object_id_by_path(&id, repo, commit, in_repo_path);
6180 		if (err) {
6181 			if (err->code == GOT_ERR_NO_TREE_ENTRY)
6182 				err = got_error(ood_errcode);
6183 			goto done;
6184 		} else if (got_object_id_cmp(id, base_blob_id) != 0)
6185 			err = got_error(ood_errcode);
6186 	} else {
6187 		/* Require that added files don't exist in the branch head. */
6188 		err = got_object_open_as_commit(&commit, repo, head_commit_id);
6189 		if (err)
6190 			goto done;
6191 		err = got_object_id_by_path(&id, repo, commit, in_repo_path);
6192 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
6193 			goto done;
6194 		err = id ? got_error(ood_errcode) : NULL;
6195 	}
6196 done:
6197 	free(id);
6198 	if (commit)
6199 		got_object_commit_close(commit);
6200 	return err;
6201 }
6202 
6203 static const struct got_error *
6204 commit_worktree(struct got_object_id **new_commit_id,
6205     struct got_pathlist_head *commitable_paths,
6206     struct got_object_id *head_commit_id,
6207     struct got_object_id *parent_id2,
6208     struct got_worktree *worktree,
6209     const char *author, const char *committer, char *diff_path,
6210     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6211     got_worktree_status_cb status_cb, void *status_arg,
6212     struct got_repository *repo)
6213 {
6214 	const struct got_error *err = NULL, *unlockerr = NULL;
6215 	struct got_pathlist_entry *pe;
6216 	const char *head_ref_name = NULL;
6217 	struct got_commit_object *head_commit = NULL;
6218 	struct got_reference *head_ref2 = NULL;
6219 	struct got_object_id *head_commit_id2 = NULL;
6220 	struct got_tree_object *head_tree = NULL;
6221 	struct got_object_id *new_tree_id = NULL;
6222 	int nentries, nparents = 0;
6223 	struct got_object_id_queue parent_ids;
6224 	struct got_object_qid *pid = NULL;
6225 	char *logmsg = NULL;
6226 	time_t timestamp;
6227 
6228 	*new_commit_id = NULL;
6229 
6230 	STAILQ_INIT(&parent_ids);
6231 
6232 	err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
6233 	if (err)
6234 		goto done;
6235 
6236 	err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
6237 	if (err)
6238 		goto done;
6239 
6240 	if (commit_msg_cb != NULL) {
6241 		err = commit_msg_cb(commitable_paths, diff_path,
6242 		    &logmsg, commit_arg);
6243 		if (err)
6244 			goto done;
6245 	}
6246 
6247 	if (logmsg == NULL || strlen(logmsg) == 0) {
6248 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
6249 		goto done;
6250 	}
6251 
6252 	/* Create blobs from added and modified files and record their IDs. */
6253 	TAILQ_FOREACH(pe, commitable_paths, entry) {
6254 		struct got_commitable *ct = pe->data;
6255 		char *ondisk_path;
6256 
6257 		/* Blobs for staged files already exist. */
6258 		if (ct->staged_status == GOT_STATUS_ADD ||
6259 		    ct->staged_status == GOT_STATUS_MODIFY)
6260 			continue;
6261 
6262 		if (ct->status != GOT_STATUS_ADD &&
6263 		    ct->status != GOT_STATUS_MODIFY &&
6264 		    ct->status != GOT_STATUS_MODE_CHANGE &&
6265 		    ct->status != GOT_STATUS_CONFLICT)
6266 			continue;
6267 
6268 		if (asprintf(&ondisk_path, "%s/%s",
6269 		    worktree->root_path, pe->path) == -1) {
6270 			err = got_error_from_errno("asprintf");
6271 			goto done;
6272 		}
6273 		err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
6274 		free(ondisk_path);
6275 		if (err)
6276 			goto done;
6277 	}
6278 
6279 	/* Recursively write new tree objects. */
6280 	err = write_tree(&new_tree_id, &nentries, head_tree, "/",
6281 	    commitable_paths, status_cb, status_arg, repo);
6282 	if (err)
6283 		goto done;
6284 
6285 	err = got_object_qid_alloc(&pid, head_commit_id);
6286 	if (err)
6287 		goto done;
6288 	STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
6289 	nparents++;
6290 	if (parent_id2) {
6291 		err = got_object_qid_alloc(&pid, parent_id2);
6292 		if (err)
6293 			goto done;
6294 		STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
6295 		nparents++;
6296 	}
6297 	timestamp = time(NULL);
6298 	err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
6299 	    nparents, author, timestamp, committer, timestamp, logmsg, repo);
6300 	if (logmsg != NULL)
6301 		free(logmsg);
6302 	if (err)
6303 		goto done;
6304 
6305 	/* Check if a concurrent commit to our branch has occurred. */
6306 	head_ref_name = got_worktree_get_head_ref_name(worktree);
6307 	if (head_ref_name == NULL) {
6308 		err = got_error_from_errno("got_worktree_get_head_ref_name");
6309 		goto done;
6310 	}
6311 	/* Lock the reference here to prevent concurrent modification. */
6312 	err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6313 	if (err)
6314 		goto done;
6315 	err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6316 	if (err)
6317 		goto done;
6318 	if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6319 		err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6320 		goto done;
6321 	}
6322 	/* Update branch head in repository. */
6323 	err = got_ref_change_ref(head_ref2, *new_commit_id);
6324 	if (err)
6325 		goto done;
6326 	err = got_ref_write(head_ref2, repo);
6327 	if (err)
6328 		goto done;
6329 
6330 	err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6331 	if (err)
6332 		goto done;
6333 
6334 	err = ref_base_commit(worktree, repo);
6335 	if (err)
6336 		goto done;
6337 done:
6338 	got_object_id_queue_free(&parent_ids);
6339 	if (head_tree)
6340 		got_object_tree_close(head_tree);
6341 	if (head_commit)
6342 		got_object_commit_close(head_commit);
6343 	free(head_commit_id2);
6344 	if (head_ref2) {
6345 		unlockerr = got_ref_unlock(head_ref2);
6346 		if (unlockerr && err == NULL)
6347 			err = unlockerr;
6348 		got_ref_close(head_ref2);
6349 	}
6350 	return err;
6351 }
6352 
6353 static const struct got_error *
6354 check_path_is_commitable(const char *path,
6355     struct got_pathlist_head *commitable_paths)
6356 {
6357 	struct got_pathlist_entry *cpe = NULL;
6358 	size_t path_len = strlen(path);
6359 
6360 	TAILQ_FOREACH(cpe, commitable_paths, entry) {
6361 		struct got_commitable *ct = cpe->data;
6362 		const char *ct_path = ct->path;
6363 
6364 		while (ct_path[0] == '/')
6365 			ct_path++;
6366 
6367 		if (strcmp(path, ct_path) == 0 ||
6368 		    got_path_is_child(ct_path, path, path_len))
6369 			break;
6370 	}
6371 
6372 	if (cpe == NULL)
6373 		return got_error_path(path, GOT_ERR_BAD_PATH);
6374 
6375 	return NULL;
6376 }
6377 
6378 static const struct got_error *
6379 check_staged_file(void *arg, struct got_fileindex_entry *ie)
6380 {
6381 	int *have_staged_files = arg;
6382 
6383 	if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6384 		*have_staged_files = 1;
6385 		return got_error(GOT_ERR_CANCELLED);
6386 	}
6387 
6388 	return NULL;
6389 }
6390 
6391 static const struct got_error *
6392 check_non_staged_files(struct got_fileindex *fileindex,
6393     struct got_pathlist_head *paths)
6394 {
6395 	struct got_pathlist_entry *pe;
6396 	struct got_fileindex_entry *ie;
6397 
6398 	TAILQ_FOREACH(pe, paths, entry) {
6399 		if (pe->path[0] == '\0')
6400 			continue;
6401 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6402 		if (ie == NULL)
6403 			return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6404 		if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6405 			return got_error_path(pe->path,
6406 			    GOT_ERR_FILE_NOT_STAGED);
6407 	}
6408 
6409 	return NULL;
6410 }
6411 
6412 const struct got_error *
6413 got_worktree_commit(struct got_object_id **new_commit_id,
6414     struct got_worktree *worktree, struct got_pathlist_head *paths,
6415     const char *author, const char *committer, int allow_bad_symlinks,
6416     int show_diff, int commit_conflicts,
6417     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6418     got_worktree_status_cb status_cb, void *status_arg,
6419     struct got_repository *repo)
6420 {
6421 	const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6422 	struct got_fileindex *fileindex = NULL;
6423 	char *fileindex_path = NULL;
6424 	struct got_pathlist_head commitable_paths;
6425 	struct collect_commitables_arg cc_arg;
6426 	struct got_pathlist_entry *pe;
6427 	struct got_reference *head_ref = NULL;
6428 	struct got_object_id *head_commit_id = NULL;
6429 	char *diff_path = NULL;
6430 	int have_staged_files = 0;
6431 
6432 	*new_commit_id = NULL;
6433 
6434 	memset(&cc_arg, 0, sizeof(cc_arg));
6435 	TAILQ_INIT(&commitable_paths);
6436 
6437 	err = lock_worktree(worktree, LOCK_EX);
6438 	if (err)
6439 		goto done;
6440 
6441 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6442 	if (err)
6443 		goto done;
6444 
6445 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
6446 	if (err)
6447 		goto done;
6448 
6449 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
6450 	if (err)
6451 		goto done;
6452 
6453 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6454 	    &have_staged_files);
6455 	if (err && err->code != GOT_ERR_CANCELLED)
6456 		goto done;
6457 	if (have_staged_files) {
6458 		err = check_non_staged_files(fileindex, paths);
6459 		if (err)
6460 			goto done;
6461 	}
6462 
6463 	cc_arg.commitable_paths = &commitable_paths;
6464 	cc_arg.worktree = worktree;
6465 	cc_arg.fileindex = fileindex;
6466 	cc_arg.repo = repo;
6467 	cc_arg.have_staged_files = have_staged_files;
6468 	cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6469 	cc_arg.diff_header_shown = 0;
6470 	cc_arg.commit_conflicts = commit_conflicts;
6471 	if (show_diff) {
6472 		err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6473 		    GOT_TMPDIR_STR "/got", ".diff");
6474 		if (err)
6475 			goto done;
6476 		cc_arg.f1 = got_opentemp();
6477 		if (cc_arg.f1 == NULL) {
6478 			err = got_error_from_errno("got_opentemp");
6479 			goto done;
6480 		}
6481 		cc_arg.f2 = got_opentemp();
6482 		if (cc_arg.f2 == NULL) {
6483 			err = got_error_from_errno("got_opentemp");
6484 			goto done;
6485 		}
6486 	}
6487 
6488 	TAILQ_FOREACH(pe, paths, entry) {
6489 		err = worktree_status(worktree, pe->path, fileindex, repo,
6490 		    collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6491 		if (err)
6492 			goto done;
6493 	}
6494 
6495 	if (show_diff) {
6496 		if (fflush(cc_arg.diff_outfile) == EOF) {
6497 			err = got_error_from_errno("fflush");
6498 			goto done;
6499 		}
6500 	}
6501 
6502 	if (TAILQ_EMPTY(&commitable_paths)) {
6503 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6504 		goto done;
6505 	}
6506 
6507 	TAILQ_FOREACH(pe, paths, entry) {
6508 		err = check_path_is_commitable(pe->path, &commitable_paths);
6509 		if (err)
6510 			goto done;
6511 	}
6512 
6513 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
6514 		struct got_commitable *ct = pe->data;
6515 		const char *ct_path = ct->in_repo_path;
6516 
6517 		while (ct_path[0] == '/')
6518 			ct_path++;
6519 		err = check_out_of_date(ct_path, ct->status,
6520 		    ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6521 		    head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6522 		if (err)
6523 			goto done;
6524 
6525 	}
6526 
6527 	err = commit_worktree(new_commit_id, &commitable_paths,
6528 	    head_commit_id, NULL, worktree, author, committer,
6529 	    (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6530 	    commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6531 	if (err)
6532 		goto done;
6533 
6534 	err = update_fileindex_after_commit(worktree, &commitable_paths,
6535 	    *new_commit_id, fileindex, have_staged_files);
6536 	sync_err = sync_fileindex(fileindex, fileindex_path);
6537 	if (sync_err && err == NULL)
6538 		err = sync_err;
6539 done:
6540 	if (fileindex)
6541 		got_fileindex_free(fileindex);
6542 	free(fileindex_path);
6543 	unlockerr = lock_worktree(worktree, LOCK_SH);
6544 	if (unlockerr && err == NULL)
6545 		err = unlockerr;
6546 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
6547 		struct got_commitable *ct = pe->data;
6548 
6549 		free_commitable(ct);
6550 	}
6551 	got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6552 	if (diff_path && unlink(diff_path) == -1 && err == NULL)
6553 		err = got_error_from_errno2("unlink", diff_path);
6554 	free(diff_path);
6555 	if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6556 	    err == NULL)
6557 		err = got_error_from_errno("fclose");
6558 	return err;
6559 }
6560 
6561 const char *
6562 got_commitable_get_path(struct got_commitable *ct)
6563 {
6564 	return ct->path;
6565 }
6566 
6567 unsigned int
6568 got_commitable_get_status(struct got_commitable *ct)
6569 {
6570 	return ct->status;
6571 }
6572 
6573 struct check_rebase_ok_arg {
6574 	struct got_worktree *worktree;
6575 	struct got_repository *repo;
6576 };
6577 
6578 static const struct got_error *
6579 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6580 {
6581 	const struct got_error *err = NULL;
6582 	struct check_rebase_ok_arg *a = arg;
6583 	unsigned char status;
6584 	struct stat sb;
6585 	char *ondisk_path;
6586 
6587 	/* Reject rebase of a work tree with mixed base commits. */
6588 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6589 	    SHA1_DIGEST_LENGTH))
6590 		return got_error(GOT_ERR_MIXED_COMMITS);
6591 
6592 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6593 	    == -1)
6594 		return got_error_from_errno("asprintf");
6595 
6596 	/* Reject rebase of a work tree with modified or staged files. */
6597 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6598 	free(ondisk_path);
6599 	if (err)
6600 		return err;
6601 
6602 	if (status != GOT_STATUS_NO_CHANGE)
6603 		return got_error(GOT_ERR_MODIFIED);
6604 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6605 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6606 
6607 	return NULL;
6608 }
6609 
6610 const struct got_error *
6611 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6612     struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6613     struct got_worktree *worktree, struct got_reference *branch,
6614     struct got_repository *repo)
6615 {
6616 	const struct got_error *err = NULL;
6617 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6618 	char *branch_ref_name = NULL;
6619 	char *fileindex_path = NULL;
6620 	struct check_rebase_ok_arg ok_arg;
6621 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6622 	struct got_object_id *wt_branch_tip = NULL;
6623 
6624 	*new_base_branch_ref = NULL;
6625 	*tmp_branch = NULL;
6626 	*fileindex = NULL;
6627 
6628 	err = lock_worktree(worktree, LOCK_EX);
6629 	if (err)
6630 		return err;
6631 
6632 	err = open_fileindex(fileindex, &fileindex_path, worktree);
6633 	if (err)
6634 		goto done;
6635 
6636 	ok_arg.worktree = worktree;
6637 	ok_arg.repo = repo;
6638 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6639 	    &ok_arg);
6640 	if (err)
6641 		goto done;
6642 
6643 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6644 	if (err)
6645 		goto done;
6646 
6647 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6648 	if (err)
6649 		goto done;
6650 
6651 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6652 	if (err)
6653 		goto done;
6654 
6655 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6656 	    0);
6657 	if (err)
6658 		goto done;
6659 
6660 	err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6661 	if (err)
6662 		goto done;
6663 	if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6664 		err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6665 		goto done;
6666 	}
6667 
6668 	err = got_ref_alloc_symref(new_base_branch_ref,
6669 	    new_base_branch_ref_name, wt_branch);
6670 	if (err)
6671 		goto done;
6672 	err = got_ref_write(*new_base_branch_ref, repo);
6673 	if (err)
6674 		goto done;
6675 
6676 	/* TODO Lock original branch's ref while rebasing? */
6677 
6678 	err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6679 	if (err)
6680 		goto done;
6681 
6682 	err = got_ref_write(branch_ref, repo);
6683 	if (err)
6684 		goto done;
6685 
6686 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
6687 	    worktree->base_commit_id);
6688 	if (err)
6689 		goto done;
6690 	err = got_ref_write(*tmp_branch, repo);
6691 	if (err)
6692 		goto done;
6693 
6694 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
6695 	if (err)
6696 		goto done;
6697 done:
6698 	free(fileindex_path);
6699 	free(tmp_branch_name);
6700 	free(new_base_branch_ref_name);
6701 	free(branch_ref_name);
6702 	if (branch_ref)
6703 		got_ref_close(branch_ref);
6704 	if (wt_branch)
6705 		got_ref_close(wt_branch);
6706 	free(wt_branch_tip);
6707 	if (err) {
6708 		if (*new_base_branch_ref) {
6709 			got_ref_close(*new_base_branch_ref);
6710 			*new_base_branch_ref = NULL;
6711 		}
6712 		if (*tmp_branch) {
6713 			got_ref_close(*tmp_branch);
6714 			*tmp_branch = NULL;
6715 		}
6716 		if (*fileindex) {
6717 			got_fileindex_free(*fileindex);
6718 			*fileindex = NULL;
6719 		}
6720 		lock_worktree(worktree, LOCK_SH);
6721 	}
6722 	return err;
6723 }
6724 
6725 const struct got_error *
6726 got_worktree_rebase_continue(struct got_object_id **commit_id,
6727     struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6728     struct got_reference **branch, struct got_fileindex **fileindex,
6729     struct got_worktree *worktree, struct got_repository *repo)
6730 {
6731 	const struct got_error *err;
6732 	char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6733 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6734 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6735 	char *fileindex_path = NULL;
6736 	int have_staged_files = 0;
6737 
6738 	*commit_id = NULL;
6739 	*new_base_branch = NULL;
6740 	*tmp_branch = NULL;
6741 	*branch = NULL;
6742 	*fileindex = NULL;
6743 
6744 	err = lock_worktree(worktree, LOCK_EX);
6745 	if (err)
6746 		return err;
6747 
6748 	err = open_fileindex(fileindex, &fileindex_path, worktree);
6749 	if (err)
6750 		goto done;
6751 
6752 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6753 	    &have_staged_files);
6754 	if (err && err->code != GOT_ERR_CANCELLED)
6755 		goto done;
6756 	if (have_staged_files) {
6757 		err = got_error(GOT_ERR_STAGED_PATHS);
6758 		goto done;
6759 	}
6760 
6761 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6762 	if (err)
6763 		goto done;
6764 
6765 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6766 	if (err)
6767 		goto done;
6768 
6769 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6770 	if (err)
6771 		goto done;
6772 
6773 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6774 	if (err)
6775 		goto done;
6776 
6777 	err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6778 	if (err)
6779 		goto done;
6780 
6781 	err = got_ref_open(branch, repo,
6782 	    got_ref_get_symref_target(branch_ref), 0);
6783 	if (err)
6784 		goto done;
6785 
6786 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6787 	if (err)
6788 		goto done;
6789 
6790 	err = got_ref_resolve(commit_id, repo, commit_ref);
6791 	if (err)
6792 		goto done;
6793 
6794 	err = got_ref_open(new_base_branch, repo,
6795 	    new_base_branch_ref_name, 0);
6796 	if (err)
6797 		goto done;
6798 
6799 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6800 	if (err)
6801 		goto done;
6802 done:
6803 	free(commit_ref_name);
6804 	free(branch_ref_name);
6805 	free(fileindex_path);
6806 	if (commit_ref)
6807 		got_ref_close(commit_ref);
6808 	if (branch_ref)
6809 		got_ref_close(branch_ref);
6810 	if (err) {
6811 		free(*commit_id);
6812 		*commit_id = NULL;
6813 		if (*tmp_branch) {
6814 			got_ref_close(*tmp_branch);
6815 			*tmp_branch = NULL;
6816 		}
6817 		if (*new_base_branch) {
6818 			got_ref_close(*new_base_branch);
6819 			*new_base_branch = NULL;
6820 		}
6821 		if (*branch) {
6822 			got_ref_close(*branch);
6823 			*branch = NULL;
6824 		}
6825 		if (*fileindex) {
6826 			got_fileindex_free(*fileindex);
6827 			*fileindex = NULL;
6828 		}
6829 		lock_worktree(worktree, LOCK_SH);
6830 	}
6831 	return err;
6832 }
6833 
6834 const struct got_error *
6835 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6836 {
6837 	const struct got_error *err;
6838 	char *tmp_branch_name = NULL;
6839 
6840 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6841 	if (err)
6842 		return err;
6843 
6844 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6845 	free(tmp_branch_name);
6846 	return NULL;
6847 }
6848 
6849 static const struct got_error *
6850 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6851     const char *diff_path, char **logmsg, void *arg)
6852 {
6853 	*logmsg = arg;
6854 	return NULL;
6855 }
6856 
6857 static const struct got_error *
6858 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6859     const char *path, struct got_object_id *blob_id,
6860     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6861     int dirfd, const char *de_name)
6862 {
6863 	return NULL;
6864 }
6865 
6866 struct collect_merged_paths_arg {
6867 	got_worktree_checkout_cb progress_cb;
6868 	void *progress_arg;
6869 	struct got_pathlist_head *merged_paths;
6870 };
6871 
6872 static const struct got_error *
6873 collect_merged_paths(void *arg, unsigned char status, const char *path)
6874 {
6875 	const struct got_error *err;
6876 	struct collect_merged_paths_arg *a = arg;
6877 	char *p;
6878 	struct got_pathlist_entry *new;
6879 
6880 	err = (*a->progress_cb)(a->progress_arg, status, path);
6881 	if (err)
6882 		return err;
6883 
6884 	if (status != GOT_STATUS_MERGE &&
6885 	    status != GOT_STATUS_ADD &&
6886 	    status != GOT_STATUS_DELETE &&
6887 	    status != GOT_STATUS_CONFLICT)
6888 		return NULL;
6889 
6890 	p = strdup(path);
6891 	if (p == NULL)
6892 		return got_error_from_errno("strdup");
6893 
6894 	err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6895 	if (err || new == NULL)
6896 		free(p);
6897 	return err;
6898 }
6899 
6900 static const struct got_error *
6901 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6902     int is_rebase, struct got_repository *repo)
6903 {
6904 	const struct got_error *err;
6905 	struct got_reference *commit_ref = NULL;
6906 
6907 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6908 	if (err) {
6909 		if (err->code != GOT_ERR_NOT_REF)
6910 			goto done;
6911 		err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6912 		if (err)
6913 			goto done;
6914 		err = got_ref_write(commit_ref, repo);
6915 		if (err)
6916 			goto done;
6917 	} else if (is_rebase) {
6918 		struct got_object_id *stored_id;
6919 		int cmp;
6920 
6921 		err = got_ref_resolve(&stored_id, repo, commit_ref);
6922 		if (err)
6923 			goto done;
6924 		cmp = got_object_id_cmp(commit_id, stored_id);
6925 		free(stored_id);
6926 		if (cmp != 0) {
6927 			err = got_error(GOT_ERR_REBASE_COMMITID);
6928 			goto done;
6929 		}
6930 	}
6931 done:
6932 	if (commit_ref)
6933 		got_ref_close(commit_ref);
6934 	return err;
6935 }
6936 
6937 static const struct got_error *
6938 rebase_merge_files(struct got_pathlist_head *merged_paths,
6939     const char *commit_ref_name, struct got_worktree *worktree,
6940     struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6941     struct got_object_id *commit_id, struct got_repository *repo,
6942     got_worktree_checkout_cb progress_cb, void *progress_arg,
6943     got_cancel_cb cancel_cb, void *cancel_arg)
6944 {
6945 	const struct got_error *err;
6946 	struct got_reference *commit_ref = NULL;
6947 	struct collect_merged_paths_arg cmp_arg;
6948 	char *fileindex_path;
6949 
6950 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
6951 
6952 	err = get_fileindex_path(&fileindex_path, worktree);
6953 	if (err)
6954 		return err;
6955 
6956 	cmp_arg.progress_cb = progress_cb;
6957 	cmp_arg.progress_arg = progress_arg;
6958 	cmp_arg.merged_paths = merged_paths;
6959 	err = merge_files(worktree, fileindex, fileindex_path,
6960 	    parent_commit_id, commit_id, repo, collect_merged_paths,
6961 	    &cmp_arg, cancel_cb, cancel_arg);
6962 	if (commit_ref)
6963 		got_ref_close(commit_ref);
6964 	return err;
6965 }
6966 
6967 const struct got_error *
6968 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6969     struct got_worktree *worktree, struct got_fileindex *fileindex,
6970     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6971     struct got_repository *repo,
6972     got_worktree_checkout_cb progress_cb, void *progress_arg,
6973     got_cancel_cb cancel_cb, void *cancel_arg)
6974 {
6975 	const struct got_error *err;
6976 	char *commit_ref_name;
6977 
6978 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6979 	if (err)
6980 		return err;
6981 
6982 	err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6983 	if (err)
6984 		goto done;
6985 
6986 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6987 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
6988 	    progress_arg, cancel_cb, cancel_arg);
6989 done:
6990 	free(commit_ref_name);
6991 	return err;
6992 }
6993 
6994 const struct got_error *
6995 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6996     struct got_worktree *worktree, struct got_fileindex *fileindex,
6997     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6998     struct got_repository *repo,
6999     got_worktree_checkout_cb progress_cb, void *progress_arg,
7000     got_cancel_cb cancel_cb, void *cancel_arg)
7001 {
7002 	const struct got_error *err;
7003 	char *commit_ref_name;
7004 
7005 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7006 	if (err)
7007 		return err;
7008 
7009 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7010 	if (err)
7011 		goto done;
7012 
7013 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
7014 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
7015 	    progress_arg, cancel_cb, cancel_arg);
7016 done:
7017 	free(commit_ref_name);
7018 	return err;
7019 }
7020 
7021 static const struct got_error *
7022 rebase_commit(struct got_object_id **new_commit_id,
7023     struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
7024     struct got_worktree *worktree, struct got_fileindex *fileindex,
7025     struct got_reference *tmp_branch, const char *committer,
7026     struct got_commit_object *orig_commit, const char *new_logmsg,
7027     int allow_conflict, struct got_repository *repo)
7028 {
7029 	const struct got_error *err, *sync_err;
7030 	struct got_pathlist_head commitable_paths;
7031 	struct collect_commitables_arg cc_arg;
7032 	char *fileindex_path = NULL;
7033 	struct got_reference *head_ref = NULL;
7034 	struct got_object_id *head_commit_id = NULL;
7035 	char *logmsg = NULL;
7036 
7037 	memset(&cc_arg, 0, sizeof(cc_arg));
7038 	TAILQ_INIT(&commitable_paths);
7039 	*new_commit_id = NULL;
7040 
7041 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
7042 
7043 	err = get_fileindex_path(&fileindex_path, worktree);
7044 	if (err)
7045 		return err;
7046 
7047 	cc_arg.commitable_paths = &commitable_paths;
7048 	cc_arg.worktree = worktree;
7049 	cc_arg.repo = repo;
7050 	cc_arg.have_staged_files = 0;
7051 	cc_arg.commit_conflicts = allow_conflict;
7052 	/*
7053 	 * If possible get the status of individual files directly to
7054 	 * avoid crawling the entire work tree once per rebased commit.
7055 	 *
7056 	 * Ideally, merged_paths would contain a list of commitables
7057 	 * we could use so we could skip worktree_status() entirely.
7058 	 * However, we would then need carefully keep track of cumulative
7059 	 * effects of operations such as file additions and deletions
7060 	 * in 'got histedit -f' (folding multiple commits into one),
7061 	 * and this extra complexity is not really worth it.
7062 	 */
7063 	if (merged_paths) {
7064 		struct got_pathlist_entry *pe;
7065 		TAILQ_FOREACH(pe, merged_paths, entry) {
7066 			err = worktree_status(worktree, pe->path, fileindex,
7067 			    repo, collect_commitables, &cc_arg, NULL, NULL, 1,
7068 			    0);
7069 			if (err)
7070 				goto done;
7071 		}
7072 	} else {
7073 		err = worktree_status(worktree, "", fileindex, repo,
7074 		    collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7075 		if (err)
7076 			goto done;
7077 	}
7078 
7079 	if (TAILQ_EMPTY(&commitable_paths)) {
7080 		/* No-op change; commit will be elided. */
7081 		err = got_ref_delete(commit_ref, repo);
7082 		if (err)
7083 			goto done;
7084 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
7085 		goto done;
7086 	}
7087 
7088 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7089 	if (err)
7090 		goto done;
7091 
7092 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
7093 	if (err)
7094 		goto done;
7095 
7096 	if (new_logmsg) {
7097 		logmsg = strdup(new_logmsg);
7098 		if (logmsg == NULL) {
7099 			err = got_error_from_errno("strdup");
7100 			goto done;
7101 		}
7102 	} else {
7103 		err = got_object_commit_get_logmsg(&logmsg, orig_commit);
7104 		if (err)
7105 			goto done;
7106 	}
7107 
7108 	/* NB: commit_worktree will call free(logmsg) */
7109 	err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
7110 	    NULL, worktree, got_object_commit_get_author(orig_commit),
7111 	    committer ? committer :
7112 	    got_object_commit_get_committer(orig_commit), NULL,
7113 	    collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
7114 	if (err)
7115 		goto done;
7116 
7117 	err = got_ref_change_ref(tmp_branch, *new_commit_id);
7118 	if (err)
7119 		goto done;
7120 
7121 	err = got_ref_delete(commit_ref, repo);
7122 	if (err)
7123 		goto done;
7124 
7125 	err = update_fileindex_after_commit(worktree, &commitable_paths,
7126 	    *new_commit_id, fileindex, 0);
7127 	sync_err = sync_fileindex(fileindex, fileindex_path);
7128 	if (sync_err && err == NULL)
7129 		err = sync_err;
7130 done:
7131 	free(fileindex_path);
7132 	free(head_commit_id);
7133 	if (head_ref)
7134 		got_ref_close(head_ref);
7135 	if (err) {
7136 		free(*new_commit_id);
7137 		*new_commit_id = NULL;
7138 	}
7139 	return err;
7140 }
7141 
7142 const struct got_error *
7143 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
7144     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
7145     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7146     const char *committer, struct got_commit_object *orig_commit,
7147     struct got_object_id *orig_commit_id, int allow_conflict,
7148     struct got_repository *repo)
7149 {
7150 	const struct got_error *err;
7151 	char *commit_ref_name;
7152 	struct got_reference *commit_ref = NULL;
7153 	struct got_object_id *commit_id = NULL;
7154 
7155 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
7156 	if (err)
7157 		return err;
7158 
7159 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7160 	if (err)
7161 		goto done;
7162 	err = got_ref_resolve(&commit_id, repo, commit_ref);
7163 	if (err)
7164 		goto done;
7165 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
7166 		err = got_error(GOT_ERR_REBASE_COMMITID);
7167 		goto done;
7168 	}
7169 
7170 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
7171 	    worktree, fileindex, tmp_branch, committer, orig_commit,
7172 	    NULL, allow_conflict, repo);
7173 done:
7174 	if (commit_ref)
7175 		got_ref_close(commit_ref);
7176 	free(commit_ref_name);
7177 	free(commit_id);
7178 	return err;
7179 }
7180 
7181 const struct got_error *
7182 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
7183     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
7184     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7185     const char *committer, struct got_commit_object *orig_commit,
7186     struct got_object_id *orig_commit_id, const char *new_logmsg,
7187     int allow_conflict, struct got_repository *repo)
7188 {
7189 	const struct got_error *err;
7190 	char *commit_ref_name;
7191 	struct got_reference *commit_ref = NULL;
7192 
7193 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7194 	if (err)
7195 		return err;
7196 
7197 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7198 	if (err)
7199 		goto done;
7200 
7201 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
7202 	    worktree, fileindex, tmp_branch, committer, orig_commit,
7203 	    new_logmsg, allow_conflict, repo);
7204 done:
7205 	if (commit_ref)
7206 		got_ref_close(commit_ref);
7207 	free(commit_ref_name);
7208 	return err;
7209 }
7210 
7211 const struct got_error *
7212 got_worktree_rebase_postpone(struct got_worktree *worktree,
7213     struct got_fileindex *fileindex)
7214 {
7215 	if (fileindex)
7216 		got_fileindex_free(fileindex);
7217 	return lock_worktree(worktree, LOCK_SH);
7218 }
7219 
7220 static const struct got_error *
7221 delete_ref(const char *name, struct got_repository *repo)
7222 {
7223 	const struct got_error *err;
7224 	struct got_reference *ref;
7225 
7226 	err = got_ref_open(&ref, repo, name, 0);
7227 	if (err) {
7228 		if (err->code == GOT_ERR_NOT_REF)
7229 			return NULL;
7230 		return err;
7231 	}
7232 
7233 	err = got_ref_delete(ref, repo);
7234 	got_ref_close(ref);
7235 	return err;
7236 }
7237 
7238 static const struct got_error *
7239 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
7240 {
7241 	const struct got_error *err;
7242 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
7243 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
7244 
7245 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
7246 	if (err)
7247 		goto done;
7248 	err = delete_ref(tmp_branch_name, repo);
7249 	if (err)
7250 		goto done;
7251 
7252 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
7253 	if (err)
7254 		goto done;
7255 	err = delete_ref(new_base_branch_ref_name, repo);
7256 	if (err)
7257 		goto done;
7258 
7259 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
7260 	if (err)
7261 		goto done;
7262 	err = delete_ref(branch_ref_name, repo);
7263 	if (err)
7264 		goto done;
7265 
7266 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
7267 	if (err)
7268 		goto done;
7269 	err = delete_ref(commit_ref_name, repo);
7270 	if (err)
7271 		goto done;
7272 
7273 done:
7274 	free(tmp_branch_name);
7275 	free(new_base_branch_ref_name);
7276 	free(branch_ref_name);
7277 	free(commit_ref_name);
7278 	return err;
7279 }
7280 
7281 static const struct got_error *
7282 create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
7283     struct got_object_id *new_commit_id, struct got_repository *repo)
7284 {
7285 	const struct got_error *err;
7286 	struct got_reference *ref = NULL;
7287 	struct got_object_id *old_commit_id = NULL;
7288 	const char *branch_name = NULL;
7289 	char *new_id_str = NULL;
7290 	char *refname = NULL;
7291 
7292 	branch_name = got_ref_get_name(branch);
7293 	if (strncmp(branch_name, "refs/heads/", 11) != 0)
7294 		return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
7295 	branch_name += 11;
7296 
7297 	err = got_object_id_str(&new_id_str, new_commit_id);
7298 	if (err)
7299 		return err;
7300 
7301 	if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
7302 	    new_id_str) == -1) {
7303 		err = got_error_from_errno("asprintf");
7304 		goto done;
7305 	}
7306 
7307 	err = got_ref_resolve(&old_commit_id, repo, branch);
7308 	if (err)
7309 		goto done;
7310 
7311 	err = got_ref_alloc(&ref, refname, old_commit_id);
7312 	if (err)
7313 		goto done;
7314 
7315 	err = got_ref_write(ref, repo);
7316 done:
7317 	free(new_id_str);
7318 	free(refname);
7319 	free(old_commit_id);
7320 	if (ref)
7321 		got_ref_close(ref);
7322 	return err;
7323 }
7324 
7325 const struct got_error *
7326 got_worktree_rebase_complete(struct got_worktree *worktree,
7327     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7328     struct got_reference *rebased_branch, struct got_repository *repo,
7329     int create_backup)
7330 {
7331 	const struct got_error *err, *unlockerr, *sync_err;
7332 	struct got_object_id *new_head_commit_id = NULL;
7333 	char *fileindex_path = NULL;
7334 
7335 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7336 	if (err)
7337 		return err;
7338 
7339 	if (create_backup) {
7340 		err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7341 		    rebased_branch, new_head_commit_id, repo);
7342 		if (err)
7343 			goto done;
7344 	}
7345 
7346 	err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7347 	if (err)
7348 		goto done;
7349 
7350 	err = got_ref_write(rebased_branch, repo);
7351 	if (err)
7352 		goto done;
7353 
7354 	err = got_worktree_set_head_ref(worktree, rebased_branch);
7355 	if (err)
7356 		goto done;
7357 
7358 	err = delete_rebase_refs(worktree, repo);
7359 	if (err)
7360 		goto done;
7361 
7362 	err = get_fileindex_path(&fileindex_path, worktree);
7363 	if (err)
7364 		goto done;
7365 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7366 	sync_err = sync_fileindex(fileindex, fileindex_path);
7367 	if (sync_err && err == NULL)
7368 		err = sync_err;
7369 done:
7370 	got_fileindex_free(fileindex);
7371 	free(fileindex_path);
7372 	free(new_head_commit_id);
7373 	unlockerr = lock_worktree(worktree, LOCK_SH);
7374 	if (unlockerr && err == NULL)
7375 		err = unlockerr;
7376 	return err;
7377 }
7378 
7379 static const struct got_error *
7380 get_paths_changed_between_commits(struct got_pathlist_head *paths,
7381     struct got_object_id *id1, struct got_object_id *id2,
7382     struct got_repository *repo)
7383 {
7384 	const struct got_error		*err;
7385 	struct got_commit_object	*commit1 = NULL, *commit2 = NULL;
7386 	struct got_tree_object		*tree1 = NULL, *tree2 = NULL;
7387 
7388 	if (id1) {
7389 		err = got_object_open_as_commit(&commit1, repo, id1);
7390 		if (err)
7391 			goto done;
7392 
7393 		err = got_object_open_as_tree(&tree1, repo,
7394 		    got_object_commit_get_tree_id(commit1));
7395 		if (err)
7396 			goto done;
7397 	}
7398 
7399 	if (id2) {
7400 		err = got_object_open_as_commit(&commit2, repo, id2);
7401 		if (err)
7402 			goto done;
7403 
7404 		err = got_object_open_as_tree(&tree2, repo,
7405 		    got_object_commit_get_tree_id(commit2));
7406 		if (err)
7407 			goto done;
7408 	}
7409 
7410 	err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
7411 	    got_diff_tree_collect_changed_paths, paths, 0);
7412 	if (err)
7413 		goto done;
7414 done:
7415 	if (commit1)
7416 		got_object_commit_close(commit1);
7417 	if (commit2)
7418 		got_object_commit_close(commit2);
7419 	if (tree1)
7420 		got_object_tree_close(tree1);
7421 	if (tree2)
7422 		got_object_tree_close(tree2);
7423 	return err;
7424 }
7425 
7426 static const struct got_error *
7427 get_paths_added_between_commits(struct got_pathlist_head *added_paths,
7428     struct got_object_id *id1, struct got_object_id *id2,
7429     const char *path_prefix, struct got_repository *repo)
7430 {
7431 	const struct got_error *err;
7432 	struct got_pathlist_head merged_paths;
7433 	struct got_pathlist_entry *pe;
7434 	char *abspath = NULL, *wt_path = NULL;
7435 
7436 	TAILQ_INIT(&merged_paths);
7437 
7438 	err = get_paths_changed_between_commits(&merged_paths, id1, id2, repo);
7439 	if (err)
7440 		goto done;
7441 
7442 	TAILQ_FOREACH(pe, &merged_paths, entry) {
7443 		struct got_diff_changed_path *change = pe->data;
7444 
7445 		if (change->status != GOT_STATUS_ADD)
7446 			continue;
7447 
7448 		if (got_path_is_root_dir(path_prefix)) {
7449 			wt_path = strdup(pe->path);
7450 			if (wt_path == NULL) {
7451 				err = got_error_from_errno("strdup");
7452 				goto done;
7453 			}
7454 		} else {
7455 			if (asprintf(&abspath, "/%s", pe->path) == -1) {
7456 				err = got_error_from_errno("asprintf");
7457 				goto done;
7458 			}
7459 
7460 			err = got_path_skip_common_ancestor(&wt_path,
7461 			    path_prefix, abspath);
7462 			if (err)
7463 				goto done;
7464 			free(abspath);
7465 			abspath = NULL;
7466 		}
7467 
7468 		err = got_pathlist_append(added_paths, wt_path, NULL);
7469 		if (err)
7470 			goto done;
7471 		wt_path = NULL;
7472 	}
7473 
7474 done:
7475 	got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_ALL);
7476 	free(abspath);
7477 	free(wt_path);
7478 	return err;
7479 }
7480 
7481 static const struct got_error *
7482 get_paths_added_in_commit(struct got_pathlist_head *added_paths,
7483     struct got_object_id *id, const char *path_prefix,
7484     struct got_repository *repo)
7485 {
7486 	const struct got_error		*err;
7487 	struct got_commit_object	*commit = NULL;
7488 	struct got_object_qid		*pid;
7489 
7490 	err = got_object_open_as_commit(&commit, repo, id);
7491 	if (err)
7492 		goto done;
7493 
7494 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7495 
7496 	err = get_paths_added_between_commits(added_paths,
7497 	    pid ? &pid->id : NULL, id, path_prefix, repo);
7498 	if (err)
7499 		goto done;
7500 done:
7501 	if (commit)
7502 		got_object_commit_close(commit);
7503 	return err;
7504 }
7505 
7506 const struct got_error *
7507 got_worktree_rebase_abort(struct got_worktree *worktree,
7508     struct got_fileindex *fileindex, struct got_repository *repo,
7509     struct got_reference *new_base_branch,
7510     got_worktree_checkout_cb progress_cb, void *progress_arg)
7511 {
7512 	const struct got_error *err, *unlockerr, *sync_err;
7513 	struct got_reference *resolved = NULL;
7514 	struct got_object_id *commit_id = NULL;
7515 	struct got_object_id *merged_commit_id = NULL;
7516 	struct got_commit_object *commit = NULL;
7517 	char *fileindex_path = NULL;
7518 	char *commit_ref_name = NULL;
7519 	struct got_reference *commit_ref = NULL;
7520 	struct revert_file_args rfa;
7521 	struct got_object_id *tree_id = NULL;
7522 	struct got_pathlist_head added_paths;
7523 
7524 	TAILQ_INIT(&added_paths);
7525 
7526 	err = lock_worktree(worktree, LOCK_EX);
7527 	if (err)
7528 		return err;
7529 
7530 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
7531 	if (err)
7532 		goto done;
7533 
7534 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7535 	if (err)
7536 		goto done;
7537 
7538 	err = got_ref_resolve(&merged_commit_id, repo, commit_ref);
7539 	if (err)
7540 		goto done;
7541 
7542 	/*
7543 	 * Determine which files in added status can be safely removed
7544 	 * from disk while reverting changes in the work tree.
7545 	 * We want to avoid deleting unrelated files which were added by
7546 	 * the user for conflict resolution purposes.
7547 	 */
7548 	err = get_paths_added_in_commit(&added_paths, merged_commit_id,
7549 	    got_worktree_get_path_prefix(worktree), repo);
7550 	if (err)
7551 		goto done;
7552 
7553 	err = got_ref_open(&resolved, repo,
7554 	    got_ref_get_symref_target(new_base_branch), 0);
7555 	if (err)
7556 		goto done;
7557 
7558 	err = got_worktree_set_head_ref(worktree, resolved);
7559 	if (err)
7560 		goto done;
7561 
7562 	/*
7563 	 * XXX commits to the base branch could have happened while
7564 	 * we were busy rebasing; should we store the original commit ID
7565 	 * when rebase begins and read it back here?
7566 	 */
7567 	err = got_ref_resolve(&commit_id, repo, resolved);
7568 	if (err)
7569 		goto done;
7570 
7571 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7572 	if (err)
7573 		goto done;
7574 
7575 	err = got_object_open_as_commit(&commit, repo,
7576 	    worktree->base_commit_id);
7577 	if (err)
7578 		goto done;
7579 
7580 	err = got_object_id_by_path(&tree_id, repo, commit,
7581 	    worktree->path_prefix);
7582 	if (err)
7583 		goto done;
7584 
7585 	err = delete_rebase_refs(worktree, repo);
7586 	if (err)
7587 		goto done;
7588 
7589 	err = get_fileindex_path(&fileindex_path, worktree);
7590 	if (err)
7591 		goto done;
7592 
7593 	rfa.worktree = worktree;
7594 	rfa.fileindex = fileindex;
7595 	rfa.progress_cb = progress_cb;
7596 	rfa.progress_arg = progress_arg;
7597 	rfa.patch_cb = NULL;
7598 	rfa.patch_arg = NULL;
7599 	rfa.repo = repo;
7600 	rfa.unlink_added_files = 1;
7601 	rfa.added_files_to_unlink = &added_paths;
7602 	err = worktree_status(worktree, "", fileindex, repo,
7603 	    revert_file, &rfa, NULL, NULL, 1, 0);
7604 	if (err)
7605 		goto sync;
7606 
7607 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7608 	    repo, progress_cb, progress_arg, NULL, NULL);
7609 sync:
7610 	sync_err = sync_fileindex(fileindex, fileindex_path);
7611 	if (sync_err && err == NULL)
7612 		err = sync_err;
7613 done:
7614 	got_pathlist_free(&added_paths, GOT_PATHLIST_FREE_PATH);
7615 	got_ref_close(resolved);
7616 	free(tree_id);
7617 	free(commit_id);
7618 	free(merged_commit_id);
7619 	if (commit)
7620 		got_object_commit_close(commit);
7621 	if (fileindex)
7622 		got_fileindex_free(fileindex);
7623 	free(fileindex_path);
7624 	free(commit_ref_name);
7625 	if (commit_ref)
7626 		got_ref_close(commit_ref);
7627 
7628 	unlockerr = lock_worktree(worktree, LOCK_SH);
7629 	if (unlockerr && err == NULL)
7630 		err = unlockerr;
7631 	return err;
7632 }
7633 
7634 const struct got_error *
7635 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7636     struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7637     struct got_fileindex **fileindex, struct got_worktree *worktree,
7638     struct got_repository *repo)
7639 {
7640 	const struct got_error *err = NULL;
7641 	char *tmp_branch_name = NULL;
7642 	char *branch_ref_name = NULL;
7643 	char *base_commit_ref_name = NULL;
7644 	char *fileindex_path = NULL;
7645 	struct check_rebase_ok_arg ok_arg;
7646 	struct got_reference *wt_branch = NULL;
7647 	struct got_reference *base_commit_ref = NULL;
7648 
7649 	*tmp_branch = NULL;
7650 	*branch_ref = NULL;
7651 	*base_commit_id = NULL;
7652 	*fileindex = NULL;
7653 
7654 	err = lock_worktree(worktree, LOCK_EX);
7655 	if (err)
7656 		return err;
7657 
7658 	err = open_fileindex(fileindex, &fileindex_path, worktree);
7659 	if (err)
7660 		goto done;
7661 
7662 	ok_arg.worktree = worktree;
7663 	ok_arg.repo = repo;
7664 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7665 	    &ok_arg);
7666 	if (err)
7667 		goto done;
7668 
7669 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7670 	if (err)
7671 		goto done;
7672 
7673 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7674 	if (err)
7675 		goto done;
7676 
7677 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7678 	    worktree);
7679 	if (err)
7680 		goto done;
7681 
7682 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7683 	    0);
7684 	if (err)
7685 		goto done;
7686 
7687 	err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7688 	if (err)
7689 		goto done;
7690 
7691 	err = got_ref_write(*branch_ref, repo);
7692 	if (err)
7693 		goto done;
7694 
7695 	err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7696 	    worktree->base_commit_id);
7697 	if (err)
7698 		goto done;
7699 	err = got_ref_write(base_commit_ref, repo);
7700 	if (err)
7701 		goto done;
7702 	*base_commit_id = got_object_id_dup(worktree->base_commit_id);
7703 	if (*base_commit_id == NULL) {
7704 		err = got_error_from_errno("got_object_id_dup");
7705 		goto done;
7706 	}
7707 
7708 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
7709 	    worktree->base_commit_id);
7710 	if (err)
7711 		goto done;
7712 	err = got_ref_write(*tmp_branch, repo);
7713 	if (err)
7714 		goto done;
7715 
7716 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
7717 	if (err)
7718 		goto done;
7719 done:
7720 	free(fileindex_path);
7721 	free(tmp_branch_name);
7722 	free(branch_ref_name);
7723 	free(base_commit_ref_name);
7724 	if (wt_branch)
7725 		got_ref_close(wt_branch);
7726 	if (err) {
7727 		if (*branch_ref) {
7728 			got_ref_close(*branch_ref);
7729 			*branch_ref = NULL;
7730 		}
7731 		if (*tmp_branch) {
7732 			got_ref_close(*tmp_branch);
7733 			*tmp_branch = NULL;
7734 		}
7735 		free(*base_commit_id);
7736 		if (*fileindex) {
7737 			got_fileindex_free(*fileindex);
7738 			*fileindex = NULL;
7739 		}
7740 		lock_worktree(worktree, LOCK_SH);
7741 	}
7742 	return err;
7743 }
7744 
7745 const struct got_error *
7746 got_worktree_histedit_postpone(struct got_worktree *worktree,
7747     struct got_fileindex *fileindex)
7748 {
7749 	if (fileindex)
7750 		got_fileindex_free(fileindex);
7751 	return lock_worktree(worktree, LOCK_SH);
7752 }
7753 
7754 const struct got_error *
7755 got_worktree_histedit_in_progress(int *in_progress,
7756     struct got_worktree *worktree)
7757 {
7758 	const struct got_error *err;
7759 	char *tmp_branch_name = NULL;
7760 
7761 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7762 	if (err)
7763 		return err;
7764 
7765 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7766 	free(tmp_branch_name);
7767 	return NULL;
7768 }
7769 
7770 const struct got_error *
7771 got_worktree_histedit_continue(struct got_object_id **commit_id,
7772     struct got_reference **tmp_branch, struct got_reference **branch_ref,
7773     struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7774     struct got_worktree *worktree, struct got_repository *repo)
7775 {
7776 	const struct got_error *err;
7777 	char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7778 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7779 	struct got_reference *commit_ref = NULL;
7780 	struct got_reference *base_commit_ref = NULL;
7781 	char *fileindex_path = NULL;
7782 	int have_staged_files = 0;
7783 
7784 	*commit_id = NULL;
7785 	*tmp_branch = NULL;
7786 	*base_commit_id = NULL;
7787 	*fileindex = NULL;
7788 
7789 	err = lock_worktree(worktree, LOCK_EX);
7790 	if (err)
7791 		return err;
7792 
7793 	err = open_fileindex(fileindex, &fileindex_path, worktree);
7794 	if (err)
7795 		goto done;
7796 
7797 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7798 	    &have_staged_files);
7799 	if (err && err->code != GOT_ERR_CANCELLED)
7800 		goto done;
7801 	if (have_staged_files) {
7802 		err = got_error(GOT_ERR_STAGED_PATHS);
7803 		goto done;
7804 	}
7805 
7806 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7807 	if (err)
7808 		goto done;
7809 
7810 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7811 	if (err)
7812 		goto done;
7813 
7814 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7815 	if (err)
7816 		goto done;
7817 
7818 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7819 	    worktree);
7820 	if (err)
7821 		goto done;
7822 
7823 	err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7824 	if (err)
7825 		goto done;
7826 
7827 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7828 	if (err)
7829 		goto done;
7830 	err = got_ref_resolve(commit_id, repo, commit_ref);
7831 	if (err)
7832 		goto done;
7833 
7834 	err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7835 	if (err)
7836 		goto done;
7837 	err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7838 	if (err)
7839 		goto done;
7840 
7841 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7842 	if (err)
7843 		goto done;
7844 done:
7845 	free(commit_ref_name);
7846 	free(branch_ref_name);
7847 	free(fileindex_path);
7848 	if (commit_ref)
7849 		got_ref_close(commit_ref);
7850 	if (base_commit_ref)
7851 		got_ref_close(base_commit_ref);
7852 	if (err) {
7853 		free(*commit_id);
7854 		*commit_id = NULL;
7855 		free(*base_commit_id);
7856 		*base_commit_id = NULL;
7857 		if (*tmp_branch) {
7858 			got_ref_close(*tmp_branch);
7859 			*tmp_branch = NULL;
7860 		}
7861 		if (*fileindex) {
7862 			got_fileindex_free(*fileindex);
7863 			*fileindex = NULL;
7864 		}
7865 		lock_worktree(worktree, LOCK_EX);
7866 	}
7867 	return err;
7868 }
7869 
7870 static const struct got_error *
7871 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7872 {
7873 	const struct got_error *err;
7874 	char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7875 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
7876 
7877 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7878 	if (err)
7879 		goto done;
7880 	err = delete_ref(tmp_branch_name, repo);
7881 	if (err)
7882 		goto done;
7883 
7884 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7885 	    worktree);
7886 	if (err)
7887 		goto done;
7888 	err = delete_ref(base_commit_ref_name, repo);
7889 	if (err)
7890 		goto done;
7891 
7892 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7893 	if (err)
7894 		goto done;
7895 	err = delete_ref(branch_ref_name, repo);
7896 	if (err)
7897 		goto done;
7898 
7899 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7900 	if (err)
7901 		goto done;
7902 	err = delete_ref(commit_ref_name, repo);
7903 	if (err)
7904 		goto done;
7905 done:
7906 	free(tmp_branch_name);
7907 	free(base_commit_ref_name);
7908 	free(branch_ref_name);
7909 	free(commit_ref_name);
7910 	return err;
7911 }
7912 
7913 const struct got_error *
7914 got_worktree_histedit_abort(struct got_worktree *worktree,
7915     struct got_fileindex *fileindex, struct got_repository *repo,
7916     struct got_reference *branch, struct got_object_id *base_commit_id,
7917     got_worktree_checkout_cb progress_cb, void *progress_arg)
7918 {
7919 	const struct got_error *err, *unlockerr, *sync_err;
7920 	struct got_reference *resolved = NULL;
7921 	char *fileindex_path = NULL;
7922 	struct got_object_id *merged_commit_id = NULL;
7923 	struct got_commit_object *commit = NULL;
7924 	char *commit_ref_name = NULL;
7925 	struct got_reference *commit_ref = NULL;
7926 	struct got_object_id *tree_id = NULL;
7927 	struct revert_file_args rfa;
7928 	struct got_pathlist_head added_paths;
7929 
7930 	TAILQ_INIT(&added_paths);
7931 
7932 	err = lock_worktree(worktree, LOCK_EX);
7933 	if (err)
7934 		return err;
7935 
7936 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7937 	if (err)
7938 		goto done;
7939 
7940 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7941 	if (err) {
7942 		if (err->code != GOT_ERR_NOT_REF)
7943 			goto done;
7944 		/* Can happen on early abort due to invalid histedit script. */
7945 		commit_ref = NULL;
7946 	}
7947 
7948 	if (commit_ref) {
7949 		err = got_ref_resolve(&merged_commit_id, repo, commit_ref);
7950 		if (err)
7951 			goto done;
7952 
7953 		/*
7954 		 * Determine which files in added status can be safely removed
7955 		 * from disk while reverting changes in the work tree.
7956 		 * We want to avoid deleting unrelated files added by the
7957 		 * user during conflict resolution or during histedit -e.
7958 		 */
7959 		err = get_paths_added_in_commit(&added_paths, merged_commit_id,
7960 		    got_worktree_get_path_prefix(worktree), repo);
7961 		if (err)
7962 			goto done;
7963 	}
7964 
7965 	err = got_ref_open(&resolved, repo,
7966 	    got_ref_get_symref_target(branch), 0);
7967 	if (err)
7968 		goto done;
7969 
7970 	err = got_worktree_set_head_ref(worktree, resolved);
7971 	if (err)
7972 		goto done;
7973 
7974 	err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7975 	if (err)
7976 		goto done;
7977 
7978 	err = got_object_open_as_commit(&commit, repo,
7979 	    worktree->base_commit_id);
7980 	if (err)
7981 		goto done;
7982 
7983 	err = got_object_id_by_path(&tree_id, repo, commit,
7984 	    worktree->path_prefix);
7985 	if (err)
7986 		goto done;
7987 
7988 	err = delete_histedit_refs(worktree, repo);
7989 	if (err)
7990 		goto done;
7991 
7992 	err = get_fileindex_path(&fileindex_path, worktree);
7993 	if (err)
7994 		goto done;
7995 
7996 	rfa.worktree = worktree;
7997 	rfa.fileindex = fileindex;
7998 	rfa.progress_cb = progress_cb;
7999 	rfa.progress_arg = progress_arg;
8000 	rfa.patch_cb = NULL;
8001 	rfa.patch_arg = NULL;
8002 	rfa.repo = repo;
8003 	rfa.unlink_added_files = 1;
8004 	rfa.added_files_to_unlink = &added_paths;
8005 	err = worktree_status(worktree, "", fileindex, repo,
8006 	    revert_file, &rfa, NULL, NULL, 1, 0);
8007 	if (err)
8008 		goto sync;
8009 
8010 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8011 	    repo, progress_cb, progress_arg, NULL, NULL);
8012 sync:
8013 	sync_err = sync_fileindex(fileindex, fileindex_path);
8014 	if (sync_err && err == NULL)
8015 		err = sync_err;
8016 done:
8017 	if (resolved)
8018 		got_ref_close(resolved);
8019 	if (commit_ref)
8020 		got_ref_close(commit_ref);
8021 	free(merged_commit_id);
8022 	free(tree_id);
8023 	free(fileindex_path);
8024 	free(commit_ref_name);
8025 
8026 	unlockerr = lock_worktree(worktree, LOCK_SH);
8027 	if (unlockerr && err == NULL)
8028 		err = unlockerr;
8029 	return err;
8030 }
8031 
8032 const struct got_error *
8033 got_worktree_histedit_complete(struct got_worktree *worktree,
8034     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8035     struct got_reference *edited_branch, struct got_repository *repo)
8036 {
8037 	const struct got_error *err, *unlockerr, *sync_err;
8038 	struct got_object_id *new_head_commit_id = NULL;
8039 	struct got_reference *resolved = NULL;
8040 	char *fileindex_path = NULL;
8041 
8042 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
8043 	if (err)
8044 		return err;
8045 
8046 	err = got_ref_open(&resolved, repo,
8047 	    got_ref_get_symref_target(edited_branch), 0);
8048 	if (err)
8049 		goto done;
8050 
8051 	err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
8052 	    resolved, new_head_commit_id, repo);
8053 	if (err)
8054 		goto done;
8055 
8056 	err = got_ref_change_ref(resolved, new_head_commit_id);
8057 	if (err)
8058 		goto done;
8059 
8060 	err = got_ref_write(resolved, repo);
8061 	if (err)
8062 		goto done;
8063 
8064 	err = got_worktree_set_head_ref(worktree, resolved);
8065 	if (err)
8066 		goto done;
8067 
8068 	err = delete_histedit_refs(worktree, repo);
8069 	if (err)
8070 		goto done;
8071 
8072 	err = get_fileindex_path(&fileindex_path, worktree);
8073 	if (err)
8074 		goto done;
8075 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
8076 	sync_err = sync_fileindex(fileindex, fileindex_path);
8077 	if (sync_err && err == NULL)
8078 		err = sync_err;
8079 done:
8080 	got_fileindex_free(fileindex);
8081 	free(fileindex_path);
8082 	free(new_head_commit_id);
8083 	unlockerr = lock_worktree(worktree, LOCK_SH);
8084 	if (unlockerr && err == NULL)
8085 		err = unlockerr;
8086 	return err;
8087 }
8088 
8089 const struct got_error *
8090 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
8091     struct got_object_id *commit_id, struct got_repository *repo)
8092 {
8093 	const struct got_error *err;
8094 	char *commit_ref_name;
8095 
8096 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
8097 	if (err)
8098 		return err;
8099 
8100 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
8101 	if (err)
8102 		goto done;
8103 
8104 	err = delete_ref(commit_ref_name, repo);
8105 done:
8106 	free(commit_ref_name);
8107 	return err;
8108 }
8109 
8110 const struct got_error *
8111 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
8112     struct got_reference **branch_ref, struct got_reference **base_branch_ref,
8113     struct got_worktree *worktree, const char *refname,
8114     struct got_repository *repo)
8115 {
8116 	const struct got_error *err = NULL;
8117 	char *fileindex_path = NULL;
8118 	struct check_rebase_ok_arg ok_arg;
8119 
8120 	*fileindex = NULL;
8121 	*branch_ref = NULL;
8122 	*base_branch_ref = NULL;
8123 
8124 	err = lock_worktree(worktree, LOCK_EX);
8125 	if (err)
8126 		return err;
8127 
8128 	if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
8129 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
8130 		    "cannot integrate a branch into itself; "
8131 		    "update -b or different branch name required");
8132 		goto done;
8133 	}
8134 
8135 	err = open_fileindex(fileindex, &fileindex_path, worktree);
8136 	if (err)
8137 		goto done;
8138 
8139 	/* Preconditions are the same as for rebase. */
8140 	ok_arg.worktree = worktree;
8141 	ok_arg.repo = repo;
8142 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8143 	    &ok_arg);
8144 	if (err)
8145 		goto done;
8146 
8147 	err = got_ref_open(branch_ref, repo, refname, 1);
8148 	if (err)
8149 		goto done;
8150 
8151 	err = got_ref_open(base_branch_ref, repo,
8152 	    got_worktree_get_head_ref_name(worktree), 1);
8153 done:
8154 	if (err) {
8155 		if (*branch_ref) {
8156 			got_ref_close(*branch_ref);
8157 			*branch_ref = NULL;
8158 		}
8159 		if (*base_branch_ref) {
8160 			got_ref_close(*base_branch_ref);
8161 			*base_branch_ref = NULL;
8162 		}
8163 		if (*fileindex) {
8164 			got_fileindex_free(*fileindex);
8165 			*fileindex = NULL;
8166 		}
8167 		lock_worktree(worktree, LOCK_SH);
8168 	}
8169 	return err;
8170 }
8171 
8172 const struct got_error *
8173 got_worktree_integrate_continue(struct got_worktree *worktree,
8174     struct got_fileindex *fileindex, struct got_repository *repo,
8175     struct got_reference *branch_ref, struct got_reference *base_branch_ref,
8176     got_worktree_checkout_cb progress_cb, void *progress_arg,
8177     got_cancel_cb cancel_cb, void *cancel_arg)
8178 {
8179 	const struct got_error *err = NULL, *sync_err, *unlockerr;
8180 	char *fileindex_path = NULL;
8181 	struct got_object_id *tree_id = NULL, *commit_id = NULL;
8182 	struct got_commit_object *commit =  NULL;
8183 
8184 	err = get_fileindex_path(&fileindex_path, worktree);
8185 	if (err)
8186 		goto done;
8187 
8188 	err = got_ref_resolve(&commit_id, repo, branch_ref);
8189 	if (err)
8190 		goto done;
8191 
8192 	err = got_object_open_as_commit(&commit, repo, commit_id);
8193 	if (err)
8194 		goto done;
8195 
8196 	err = got_object_id_by_path(&tree_id, repo, commit,
8197 	    worktree->path_prefix);
8198 	if (err)
8199 		goto done;
8200 
8201 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
8202 	if (err)
8203 		goto done;
8204 
8205 	err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
8206 	    progress_cb, progress_arg, cancel_cb, cancel_arg);
8207 	if (err)
8208 		goto sync;
8209 
8210 	err = got_ref_change_ref(base_branch_ref, commit_id);
8211 	if (err)
8212 		goto sync;
8213 
8214 	err = got_ref_write(base_branch_ref, repo);
8215 	if (err)
8216 		goto sync;
8217 
8218 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
8219 sync:
8220 	sync_err = sync_fileindex(fileindex, fileindex_path);
8221 	if (sync_err && err == NULL)
8222 		err = sync_err;
8223 
8224 done:
8225 	unlockerr = got_ref_unlock(branch_ref);
8226 	if (unlockerr && err == NULL)
8227 		err = unlockerr;
8228 	got_ref_close(branch_ref);
8229 
8230 	unlockerr = got_ref_unlock(base_branch_ref);
8231 	if (unlockerr && err == NULL)
8232 		err = unlockerr;
8233 	got_ref_close(base_branch_ref);
8234 
8235 	got_fileindex_free(fileindex);
8236 	free(fileindex_path);
8237 	free(tree_id);
8238 	if (commit)
8239 		got_object_commit_close(commit);
8240 
8241 	unlockerr = lock_worktree(worktree, LOCK_SH);
8242 	if (unlockerr && err == NULL)
8243 		err = unlockerr;
8244 	return err;
8245 }
8246 
8247 const struct got_error *
8248 got_worktree_integrate_abort(struct got_worktree *worktree,
8249     struct got_fileindex *fileindex, struct got_repository *repo,
8250     struct got_reference *branch_ref, struct got_reference *base_branch_ref)
8251 {
8252 	const struct got_error *err = NULL, *unlockerr = NULL;
8253 
8254 	got_fileindex_free(fileindex);
8255 
8256 	err = lock_worktree(worktree, LOCK_SH);
8257 
8258 	unlockerr = got_ref_unlock(branch_ref);
8259 	if (unlockerr && err == NULL)
8260 		err = unlockerr;
8261 	got_ref_close(branch_ref);
8262 
8263 	unlockerr = got_ref_unlock(base_branch_ref);
8264 	if (unlockerr && err == NULL)
8265 		err = unlockerr;
8266 	got_ref_close(base_branch_ref);
8267 
8268 	return err;
8269 }
8270 
8271 const struct got_error *
8272 got_worktree_merge_postpone(struct got_worktree *worktree,
8273     struct got_fileindex *fileindex)
8274 {
8275 	const struct got_error *err, *sync_err;
8276 	char *fileindex_path = NULL;
8277 
8278 	err = get_fileindex_path(&fileindex_path, worktree);
8279 	if (err)
8280 		goto done;
8281 
8282 	sync_err = sync_fileindex(fileindex, fileindex_path);
8283 
8284 	err = lock_worktree(worktree, LOCK_SH);
8285 	if (sync_err && err == NULL)
8286 		err = sync_err;
8287 done:
8288 	got_fileindex_free(fileindex);
8289 	free(fileindex_path);
8290 	return err;
8291 }
8292 
8293 static const struct got_error *
8294 delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
8295 {
8296 	const struct got_error *err;
8297 	char *branch_refname = NULL, *commit_refname = NULL;
8298 
8299 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8300 	if (err)
8301 		goto done;
8302 	err = delete_ref(branch_refname, repo);
8303 	if (err)
8304 		goto done;
8305 
8306 	err = get_merge_commit_ref_name(&commit_refname, worktree);
8307 	if (err)
8308 		goto done;
8309 	err = delete_ref(commit_refname, repo);
8310 	if (err)
8311 		goto done;
8312 
8313 done:
8314 	free(branch_refname);
8315 	free(commit_refname);
8316 	return err;
8317 }
8318 
8319 struct merge_commit_msg_arg {
8320 	struct got_worktree *worktree;
8321 	const char *branch_name;
8322 };
8323 
8324 static const struct got_error *
8325 merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
8326     const char *diff_path, char **logmsg, void *arg)
8327 {
8328 	struct merge_commit_msg_arg *a = arg;
8329 
8330 	if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
8331 	    got_worktree_get_head_ref_name(a->worktree)) == -1)
8332 		return got_error_from_errno("asprintf");
8333 
8334 	return NULL;
8335 }
8336 
8337 
8338 const struct got_error *
8339 got_worktree_merge_branch(struct got_worktree *worktree,
8340     struct got_fileindex *fileindex,
8341     struct got_object_id *yca_commit_id,
8342     struct got_object_id *branch_tip,
8343     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
8344     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
8345 {
8346 	const struct got_error *err;
8347 	char *fileindex_path = NULL;
8348 
8349 	err = get_fileindex_path(&fileindex_path, worktree);
8350 	if (err)
8351 		goto done;
8352 
8353 	err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
8354 	    worktree);
8355 	if (err)
8356 		goto done;
8357 
8358 	err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
8359 	    branch_tip, repo, progress_cb, progress_arg,
8360 	    cancel_cb, cancel_arg);
8361 done:
8362 	free(fileindex_path);
8363 	return err;
8364 }
8365 
8366 const struct got_error *
8367 got_worktree_merge_commit(struct got_object_id **new_commit_id,
8368     struct got_worktree *worktree, struct got_fileindex *fileindex,
8369     const char *author, const char *committer, int allow_bad_symlinks,
8370     struct got_object_id *branch_tip, const char *branch_name,
8371     int allow_conflict, struct got_repository *repo,
8372     got_worktree_status_cb status_cb, void *status_arg)
8373 
8374 {
8375 	const struct got_error *err = NULL, *sync_err;
8376 	struct got_pathlist_head commitable_paths;
8377 	struct collect_commitables_arg cc_arg;
8378 	struct got_pathlist_entry *pe;
8379 	struct got_reference *head_ref = NULL;
8380 	struct got_object_id *head_commit_id = NULL;
8381 	int have_staged_files = 0;
8382 	struct merge_commit_msg_arg mcm_arg;
8383 	char *fileindex_path = NULL;
8384 
8385 	memset(&cc_arg, 0, sizeof(cc_arg));
8386 	*new_commit_id = NULL;
8387 
8388 	TAILQ_INIT(&commitable_paths);
8389 
8390 	err = get_fileindex_path(&fileindex_path, worktree);
8391 	if (err)
8392 		goto done;
8393 
8394 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
8395 	if (err)
8396 		goto done;
8397 
8398 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
8399 	if (err)
8400 		goto done;
8401 
8402 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
8403 	    &have_staged_files);
8404 	if (err && err->code != GOT_ERR_CANCELLED)
8405 		goto done;
8406 	if (have_staged_files) {
8407 		err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
8408 		goto done;
8409 	}
8410 
8411 	cc_arg.commitable_paths = &commitable_paths;
8412 	cc_arg.worktree = worktree;
8413 	cc_arg.fileindex = fileindex;
8414 	cc_arg.repo = repo;
8415 	cc_arg.have_staged_files = have_staged_files;
8416 	cc_arg.allow_bad_symlinks = allow_bad_symlinks;
8417 	cc_arg.commit_conflicts = allow_conflict;
8418 	err = worktree_status(worktree, "", fileindex, repo,
8419 	    collect_commitables, &cc_arg, NULL, NULL, 1, 0);
8420 	if (err)
8421 		goto done;
8422 
8423 	mcm_arg.worktree = worktree;
8424 	mcm_arg.branch_name = branch_name;
8425 	err = commit_worktree(new_commit_id, &commitable_paths,
8426 	    head_commit_id, branch_tip, worktree, author, committer, NULL,
8427 	    merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
8428 	if (err)
8429 		goto done;
8430 
8431 	err = update_fileindex_after_commit(worktree, &commitable_paths,
8432 	    *new_commit_id, fileindex, have_staged_files);
8433 	sync_err = sync_fileindex(fileindex, fileindex_path);
8434 	if (sync_err && err == NULL)
8435 		err = sync_err;
8436 done:
8437 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
8438 		struct got_commitable *ct = pe->data;
8439 
8440 		free_commitable(ct);
8441 	}
8442 	got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
8443 	free(fileindex_path);
8444 	return err;
8445 }
8446 
8447 const struct got_error *
8448 got_worktree_merge_complete(struct got_worktree *worktree,
8449     struct got_fileindex *fileindex, struct got_repository *repo)
8450 {
8451 	const struct got_error *err, *unlockerr, *sync_err;
8452 	char *fileindex_path = NULL;
8453 
8454 	err = delete_merge_refs(worktree, repo);
8455 	if (err)
8456 		goto done;
8457 
8458 	err = get_fileindex_path(&fileindex_path, worktree);
8459 	if (err)
8460 		goto done;
8461 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
8462 	sync_err = sync_fileindex(fileindex, fileindex_path);
8463 	if (sync_err && err == NULL)
8464 		err = sync_err;
8465 done:
8466 	got_fileindex_free(fileindex);
8467 	free(fileindex_path);
8468 	unlockerr = lock_worktree(worktree, LOCK_SH);
8469 	if (unlockerr && err == NULL)
8470 		err = unlockerr;
8471 	return err;
8472 }
8473 
8474 const struct got_error *
8475 got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
8476     struct got_repository *repo)
8477 {
8478 	const struct got_error *err;
8479 	char *branch_refname = NULL;
8480 	struct got_reference *branch_ref = NULL;
8481 
8482 	*in_progress = 0;
8483 
8484 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8485 	if (err)
8486 		return err;
8487 	err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8488 	free(branch_refname);
8489 	if (err) {
8490 		if (err->code != GOT_ERR_NOT_REF)
8491 			return err;
8492 	} else
8493 		*in_progress = 1;
8494 
8495 	return NULL;
8496 }
8497 
8498 const struct got_error *got_worktree_merge_prepare(
8499     struct got_fileindex **fileindex, struct got_worktree *worktree,
8500     struct got_repository *repo)
8501 {
8502 	const struct got_error *err = NULL;
8503 	char *fileindex_path = NULL;
8504 	struct got_reference *wt_branch = NULL;
8505 	struct got_object_id *wt_branch_tip = NULL;
8506 	struct check_rebase_ok_arg ok_arg;
8507 
8508 	*fileindex = NULL;
8509 
8510 	err = lock_worktree(worktree, LOCK_EX);
8511 	if (err)
8512 		return err;
8513 
8514 	err = open_fileindex(fileindex, &fileindex_path, worktree);
8515 	if (err)
8516 		goto done;
8517 
8518 	/* Preconditions are the same as for rebase. */
8519 	ok_arg.worktree = worktree;
8520 	ok_arg.repo = repo;
8521 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8522 	    &ok_arg);
8523 	if (err)
8524 		goto done;
8525 
8526 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8527 	    0);
8528 	if (err)
8529 		goto done;
8530 
8531 	err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8532 	if (err)
8533 		goto done;
8534 
8535 	if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8536 		err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8537 		goto done;
8538 	}
8539 
8540 done:
8541 	free(fileindex_path);
8542 	if (wt_branch)
8543 		got_ref_close(wt_branch);
8544 	free(wt_branch_tip);
8545 	if (err) {
8546 		if (*fileindex) {
8547 			got_fileindex_free(*fileindex);
8548 			*fileindex = NULL;
8549 		}
8550 		lock_worktree(worktree, LOCK_SH);
8551 	}
8552 	return err;
8553 }
8554 
8555 const struct got_error *got_worktree_merge_write_refs(
8556     struct got_worktree *worktree, struct got_reference *branch,
8557     struct got_repository *repo)
8558 {
8559 	const struct got_error *err = NULL;
8560 	char *branch_refname = NULL, *commit_refname = NULL;
8561 	struct got_reference *branch_ref = NULL, *commit_ref = NULL;
8562 	struct got_object_id *branch_tip = NULL;
8563 
8564 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8565 	if (err)
8566 		return err;
8567 
8568 	err = get_merge_commit_ref_name(&commit_refname, worktree);
8569 	if (err)
8570 		return err;
8571 
8572 	err = got_ref_resolve(&branch_tip, repo, branch);
8573 	if (err)
8574 		goto done;
8575 
8576 	err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8577 	if (err)
8578 		goto done;
8579 	err = got_ref_write(branch_ref, repo);
8580 	if (err)
8581 		goto done;
8582 
8583 	err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8584 	if (err)
8585 		goto done;
8586 	err = got_ref_write(commit_ref, repo);
8587 	if (err)
8588 		goto done;
8589 
8590 done:
8591 	free(branch_refname);
8592 	free(commit_refname);
8593 	if (branch_ref)
8594 		got_ref_close(branch_ref);
8595 	if (commit_ref)
8596 		got_ref_close(commit_ref);
8597 	free(branch_tip);
8598 	return err;
8599 }
8600 
8601 const struct got_error *
8602 got_worktree_merge_continue(char **branch_name,
8603     struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8604     struct got_worktree *worktree, struct got_repository *repo)
8605 {
8606 	const struct got_error *err;
8607 	char *commit_refname = NULL, *branch_refname = NULL;
8608 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8609 	char *fileindex_path = NULL;
8610 	int have_staged_files = 0;
8611 
8612 	*branch_name = NULL;
8613 	*branch_tip = NULL;
8614 	*fileindex = NULL;
8615 
8616 	err = lock_worktree(worktree, LOCK_EX);
8617 	if (err)
8618 		return err;
8619 
8620 	err = open_fileindex(fileindex, &fileindex_path, worktree);
8621 	if (err)
8622 		goto done;
8623 
8624 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8625 	    &have_staged_files);
8626 	if (err && err->code != GOT_ERR_CANCELLED)
8627 		goto done;
8628 	if (have_staged_files) {
8629 		err = got_error(GOT_ERR_STAGED_PATHS);
8630 		goto done;
8631 	}
8632 
8633 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8634 	if (err)
8635 		goto done;
8636 
8637 	err = get_merge_commit_ref_name(&commit_refname, worktree);
8638 	if (err)
8639 		goto done;
8640 
8641 	err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8642 	if (err)
8643 		goto done;
8644 
8645 	if (!got_ref_is_symbolic(branch_ref)) {
8646 		err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8647 		    "%s is not a symbolic reference",
8648 		    got_ref_get_name(branch_ref));
8649 		goto done;
8650 	}
8651 	*branch_name = strdup(got_ref_get_symref_target(branch_ref));
8652 	if (*branch_name == NULL) {
8653 		err = got_error_from_errno("strdup");
8654 		goto done;
8655 	}
8656 
8657 	err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8658 	if (err)
8659 		goto done;
8660 
8661 	err = got_ref_resolve(branch_tip, repo, commit_ref);
8662 	if (err)
8663 		goto done;
8664 done:
8665 	free(commit_refname);
8666 	free(branch_refname);
8667 	free(fileindex_path);
8668 	if (commit_ref)
8669 		got_ref_close(commit_ref);
8670 	if (branch_ref)
8671 		got_ref_close(branch_ref);
8672 	if (err) {
8673 		if (*branch_name) {
8674 			free(*branch_name);
8675 			*branch_name = NULL;
8676 		}
8677 		free(*branch_tip);
8678 		*branch_tip = NULL;
8679 		if (*fileindex) {
8680 			got_fileindex_free(*fileindex);
8681 			*fileindex = NULL;
8682 		}
8683 		lock_worktree(worktree, LOCK_SH);
8684 	}
8685 	return err;
8686 }
8687 
8688 const struct got_error *
8689 got_worktree_merge_abort(struct got_worktree *worktree,
8690     struct got_fileindex *fileindex, struct got_repository *repo,
8691     got_worktree_checkout_cb progress_cb, void *progress_arg)
8692 {
8693 	const struct got_error *err, *unlockerr, *sync_err;
8694 	struct got_commit_object *commit = NULL;
8695 	char *fileindex_path = NULL;
8696 	struct revert_file_args rfa;
8697 	char *commit_ref_name = NULL;
8698 	struct got_reference *commit_ref = NULL;
8699 	struct got_object_id *merged_commit_id = NULL;
8700 	struct got_object_id *tree_id = NULL;
8701 	struct got_pathlist_head added_paths;
8702 
8703 	TAILQ_INIT(&added_paths);
8704 
8705 	err = get_merge_commit_ref_name(&commit_ref_name, worktree);
8706 	if (err)
8707 		goto done;
8708 
8709 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
8710 	if (err)
8711 		goto done;
8712 
8713 	err = got_ref_resolve(&merged_commit_id, repo, commit_ref);
8714 	if (err)
8715 		goto done;
8716 
8717 	/*
8718 	 * Determine which files in added status can be safely removed
8719 	 * from disk while reverting changes in the work tree.
8720 	 * We want to avoid deleting unrelated files which were added by
8721 	 * the user for conflict resolution purposes.
8722 	 */
8723 	err = get_paths_added_between_commits(&added_paths,
8724 	    got_worktree_get_base_commit_id(worktree), merged_commit_id,
8725 	    got_worktree_get_path_prefix(worktree), repo);
8726 	if (err)
8727 		goto done;
8728 
8729 
8730 	err = got_object_open_as_commit(&commit, repo,
8731 	    worktree->base_commit_id);
8732 	if (err)
8733 		goto done;
8734 
8735 	err = got_object_id_by_path(&tree_id, repo, commit,
8736 	    worktree->path_prefix);
8737 	if (err)
8738 		goto done;
8739 
8740 	err = delete_merge_refs(worktree, repo);
8741 	if (err)
8742 		goto done;
8743 
8744 	err = get_fileindex_path(&fileindex_path, worktree);
8745 	if (err)
8746 		goto done;
8747 
8748 	rfa.worktree = worktree;
8749 	rfa.fileindex = fileindex;
8750 	rfa.progress_cb = progress_cb;
8751 	rfa.progress_arg = progress_arg;
8752 	rfa.patch_cb = NULL;
8753 	rfa.patch_arg = NULL;
8754 	rfa.repo = repo;
8755 	rfa.unlink_added_files = 1;
8756 	rfa.added_files_to_unlink = &added_paths;
8757 	err = worktree_status(worktree, "", fileindex, repo,
8758 	    revert_file, &rfa, NULL, NULL, 1, 0);
8759 	if (err)
8760 		goto sync;
8761 
8762 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8763 	    repo, progress_cb, progress_arg, NULL, NULL);
8764 sync:
8765 	sync_err = sync_fileindex(fileindex, fileindex_path);
8766 	if (sync_err && err == NULL)
8767 		err = sync_err;
8768 done:
8769 	free(tree_id);
8770 	free(merged_commit_id);
8771 	if (commit)
8772 		got_object_commit_close(commit);
8773 	if (fileindex)
8774 		got_fileindex_free(fileindex);
8775 	free(fileindex_path);
8776 	if (commit_ref)
8777 		got_ref_close(commit_ref);
8778 	free(commit_ref_name);
8779 
8780 	unlockerr = lock_worktree(worktree, LOCK_SH);
8781 	if (unlockerr && err == NULL)
8782 		err = unlockerr;
8783 	return err;
8784 }
8785 
8786 struct check_stage_ok_arg {
8787 	struct got_object_id *head_commit_id;
8788 	struct got_worktree *worktree;
8789 	struct got_fileindex *fileindex;
8790 	struct got_repository *repo;
8791 	int have_changes;
8792 };
8793 
8794 static const struct got_error *
8795 check_stage_ok(void *arg, unsigned char status,
8796     unsigned char staged_status, const char *relpath,
8797     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8798     struct got_object_id *commit_id, int dirfd, const char *de_name)
8799 {
8800 	struct check_stage_ok_arg *a = arg;
8801 	const struct got_error *err = NULL;
8802 	struct got_fileindex_entry *ie;
8803 	struct got_object_id base_commit_id;
8804 	struct got_object_id *base_commit_idp = NULL;
8805 	char *in_repo_path = NULL, *p;
8806 
8807 	if (status == GOT_STATUS_UNVERSIONED ||
8808 	    status == GOT_STATUS_NO_CHANGE)
8809 		return NULL;
8810 	if (status == GOT_STATUS_NONEXISTENT)
8811 		return got_error_set_errno(ENOENT, relpath);
8812 
8813 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8814 	if (ie == NULL)
8815 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8816 
8817 	if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8818 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8819 	    relpath) == -1)
8820 		return got_error_from_errno("asprintf");
8821 
8822 	if (got_fileindex_entry_has_commit(ie)) {
8823 		base_commit_idp = got_fileindex_entry_get_commit_id(
8824 		    &base_commit_id, ie);
8825 	}
8826 
8827 	if (status == GOT_STATUS_CONFLICT) {
8828 		err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8829 		goto done;
8830 	} else if (status != GOT_STATUS_ADD &&
8831 	    status != GOT_STATUS_MODIFY &&
8832 	    status != GOT_STATUS_DELETE) {
8833 		err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8834 		goto done;
8835 	}
8836 
8837 	a->have_changes = 1;
8838 
8839 	p = in_repo_path;
8840 	while (p[0] == '/')
8841 		p++;
8842 	err = check_out_of_date(p, status, staged_status,
8843 	    blob_id, base_commit_idp, a->head_commit_id, a->repo,
8844 	    GOT_ERR_STAGE_OUT_OF_DATE);
8845 done:
8846 	free(in_repo_path);
8847 	return err;
8848 }
8849 
8850 struct stage_path_arg {
8851 	struct got_worktree *worktree;
8852 	struct got_fileindex *fileindex;
8853 	struct got_repository *repo;
8854 	got_worktree_status_cb status_cb;
8855 	void *status_arg;
8856 	got_worktree_patch_cb patch_cb;
8857 	void *patch_arg;
8858 	int staged_something;
8859 	int allow_bad_symlinks;
8860 };
8861 
8862 static const struct got_error *
8863 stage_path(void *arg, unsigned char status,
8864     unsigned char staged_status, const char *relpath,
8865     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8866     struct got_object_id *commit_id, int dirfd, const char *de_name)
8867 {
8868 	struct stage_path_arg *a = arg;
8869 	const struct got_error *err = NULL;
8870 	struct got_fileindex_entry *ie;
8871 	char *ondisk_path = NULL, *path_content = NULL;
8872 	uint32_t stage;
8873 	struct got_object_id *new_staged_blob_id = NULL;
8874 	struct stat sb;
8875 
8876 	if (status == GOT_STATUS_UNVERSIONED)
8877 		return NULL;
8878 
8879 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8880 	if (ie == NULL)
8881 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8882 
8883 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8884 	    relpath)== -1)
8885 		return got_error_from_errno("asprintf");
8886 
8887 	switch (status) {
8888 	case GOT_STATUS_ADD:
8889 	case GOT_STATUS_MODIFY:
8890 		/* XXX could sb.st_mode be passed in by our caller? */
8891 		if (lstat(ondisk_path, &sb) == -1) {
8892 			err = got_error_from_errno2("lstat", ondisk_path);
8893 			break;
8894 		}
8895 		if (a->patch_cb) {
8896 			if (status == GOT_STATUS_ADD) {
8897 				int choice = GOT_PATCH_CHOICE_NONE;
8898 				err = (*a->patch_cb)(&choice, a->patch_arg,
8899 				    status, ie->path, NULL, 1, 1);
8900 				if (err)
8901 					break;
8902 				if (choice != GOT_PATCH_CHOICE_YES)
8903 					break;
8904 			} else {
8905 				err = create_patched_content(&path_content, 0,
8906 				    staged_blob_id ? staged_blob_id : blob_id,
8907 				    ondisk_path, dirfd, de_name, ie->path,
8908 				    a->repo, a->patch_cb, a->patch_arg);
8909 				if (err || path_content == NULL)
8910 					break;
8911 			}
8912 		}
8913 		err = got_object_blob_create(&new_staged_blob_id,
8914 		    path_content ? path_content : ondisk_path, a->repo);
8915 		if (err)
8916 			break;
8917 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8918 		    SHA1_DIGEST_LENGTH);
8919 		if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8920 			stage = GOT_FILEIDX_STAGE_ADD;
8921 		else
8922 			stage = GOT_FILEIDX_STAGE_MODIFY;
8923 		got_fileindex_entry_stage_set(ie, stage);
8924 		if (S_ISLNK(sb.st_mode)) {
8925 			int is_bad_symlink = 0;
8926 			if (!a->allow_bad_symlinks) {
8927 				char target_path[PATH_MAX];
8928 				ssize_t target_len;
8929 				target_len = readlink(ondisk_path, target_path,
8930 				    sizeof(target_path));
8931 				if (target_len == -1) {
8932 					err = got_error_from_errno2("readlink",
8933 					    ondisk_path);
8934 					break;
8935 				}
8936 				err = is_bad_symlink_target(&is_bad_symlink,
8937 				    target_path, target_len, ondisk_path,
8938 				    a->worktree->root_path);
8939 				if (err)
8940 					break;
8941 				if (is_bad_symlink) {
8942 					err = got_error_path(ondisk_path,
8943 					    GOT_ERR_BAD_SYMLINK);
8944 					break;
8945 				}
8946 			}
8947 			if (is_bad_symlink)
8948 				got_fileindex_entry_staged_filetype_set(ie,
8949 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
8950 			else
8951 				got_fileindex_entry_staged_filetype_set(ie,
8952 				    GOT_FILEIDX_MODE_SYMLINK);
8953 		} else {
8954 			got_fileindex_entry_staged_filetype_set(ie,
8955 			    GOT_FILEIDX_MODE_REGULAR_FILE);
8956 		}
8957 		a->staged_something = 1;
8958 		if (a->status_cb == NULL)
8959 			break;
8960 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8961 		    get_staged_status(ie), relpath, blob_id,
8962 		    new_staged_blob_id, NULL, dirfd, de_name);
8963 		if (err)
8964 			break;
8965 		/*
8966 		 * When staging the reverse of the staged diff,
8967 		 * implicitly unstage the file.
8968 		 */
8969 		if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8970 		    sizeof(ie->blob_sha1)) == 0) {
8971 			got_fileindex_entry_stage_set(ie,
8972 			    GOT_FILEIDX_STAGE_NONE);
8973 		}
8974 		break;
8975 	case GOT_STATUS_DELETE:
8976 		if (staged_status == GOT_STATUS_DELETE)
8977 			break;
8978 		if (a->patch_cb) {
8979 			int choice = GOT_PATCH_CHOICE_NONE;
8980 			err = (*a->patch_cb)(&choice, a->patch_arg, status,
8981 			    ie->path, NULL, 1, 1);
8982 			if (err)
8983 				break;
8984 			if (choice == GOT_PATCH_CHOICE_NO)
8985 				break;
8986 			if (choice != GOT_PATCH_CHOICE_YES) {
8987 				err = got_error(GOT_ERR_PATCH_CHOICE);
8988 				break;
8989 			}
8990 		}
8991 		stage = GOT_FILEIDX_STAGE_DELETE;
8992 		got_fileindex_entry_stage_set(ie, stage);
8993 		a->staged_something = 1;
8994 		if (a->status_cb == NULL)
8995 			break;
8996 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8997 		    get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8998 		    de_name);
8999 		break;
9000 	case GOT_STATUS_NO_CHANGE:
9001 		break;
9002 	case GOT_STATUS_CONFLICT:
9003 		err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
9004 		break;
9005 	case GOT_STATUS_NONEXISTENT:
9006 		err = got_error_set_errno(ENOENT, relpath);
9007 		break;
9008 	default:
9009 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
9010 		break;
9011 	}
9012 
9013 	if (path_content && unlink(path_content) == -1 && err == NULL)
9014 		err = got_error_from_errno2("unlink", path_content);
9015 	free(path_content);
9016 	free(ondisk_path);
9017 	free(new_staged_blob_id);
9018 	return err;
9019 }
9020 
9021 const struct got_error *
9022 got_worktree_stage(struct got_worktree *worktree,
9023     struct got_pathlist_head *paths,
9024     got_worktree_status_cb status_cb, void *status_arg,
9025     got_worktree_patch_cb patch_cb, void *patch_arg,
9026     int allow_bad_symlinks, struct got_repository *repo)
9027 {
9028 	const struct got_error *err = NULL, *sync_err, *unlockerr;
9029 	struct got_pathlist_entry *pe;
9030 	struct got_fileindex *fileindex = NULL;
9031 	char *fileindex_path = NULL;
9032 	struct got_reference *head_ref = NULL;
9033 	struct got_object_id *head_commit_id = NULL;
9034 	struct check_stage_ok_arg oka;
9035 	struct stage_path_arg spa;
9036 
9037 	err = lock_worktree(worktree, LOCK_EX);
9038 	if (err)
9039 		return err;
9040 
9041 	err = got_ref_open(&head_ref, repo,
9042 	    got_worktree_get_head_ref_name(worktree), 0);
9043 	if (err)
9044 		goto done;
9045 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
9046 	if (err)
9047 		goto done;
9048 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
9049 	if (err)
9050 		goto done;
9051 
9052 	/* Check pre-conditions before staging anything. */
9053 	oka.head_commit_id = head_commit_id;
9054 	oka.worktree = worktree;
9055 	oka.fileindex = fileindex;
9056 	oka.repo = repo;
9057 	oka.have_changes = 0;
9058 	TAILQ_FOREACH(pe, paths, entry) {
9059 		err = worktree_status(worktree, pe->path, fileindex, repo,
9060 		    check_stage_ok, &oka, NULL, NULL, 1, 0);
9061 		if (err)
9062 			goto done;
9063 	}
9064 	if (!oka.have_changes) {
9065 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
9066 		goto done;
9067 	}
9068 
9069 	spa.worktree = worktree;
9070 	spa.fileindex = fileindex;
9071 	spa.repo = repo;
9072 	spa.patch_cb = patch_cb;
9073 	spa.patch_arg = patch_arg;
9074 	spa.status_cb = status_cb;
9075 	spa.status_arg = status_arg;
9076 	spa.staged_something = 0;
9077 	spa.allow_bad_symlinks = allow_bad_symlinks;
9078 	TAILQ_FOREACH(pe, paths, entry) {
9079 		err = worktree_status(worktree, pe->path, fileindex, repo,
9080 		    stage_path, &spa, NULL, NULL, 1, 0);
9081 		if (err)
9082 			goto done;
9083 	}
9084 	if (!spa.staged_something) {
9085 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
9086 		goto done;
9087 	}
9088 
9089 	sync_err = sync_fileindex(fileindex, fileindex_path);
9090 	if (sync_err && err == NULL)
9091 		err = sync_err;
9092 done:
9093 	if (head_ref)
9094 		got_ref_close(head_ref);
9095 	free(head_commit_id);
9096 	free(fileindex_path);
9097 	if (fileindex)
9098 		got_fileindex_free(fileindex);
9099 	unlockerr = lock_worktree(worktree, LOCK_SH);
9100 	if (unlockerr && err == NULL)
9101 		err = unlockerr;
9102 	return err;
9103 }
9104 
9105 struct unstage_path_arg {
9106 	struct got_worktree *worktree;
9107 	struct got_fileindex *fileindex;
9108 	struct got_repository *repo;
9109 	got_worktree_checkout_cb progress_cb;
9110 	void *progress_arg;
9111 	got_worktree_patch_cb patch_cb;
9112 	void *patch_arg;
9113 };
9114 
9115 static const struct got_error *
9116 create_unstaged_content(char **path_unstaged_content,
9117     char **path_new_staged_content, struct got_object_id *blob_id,
9118     struct got_object_id *staged_blob_id, const char *relpath,
9119     struct got_repository *repo,
9120     got_worktree_patch_cb patch_cb, void *patch_arg)
9121 {
9122 	const struct got_error *err, *free_err;
9123 	struct got_blob_object *blob = NULL, *staged_blob = NULL;
9124 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
9125 	char *path1 = NULL, *path2 = NULL, *label1 = NULL;
9126 	struct got_diffreg_result *diffreg_result = NULL;
9127 	int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
9128 	int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
9129 	int fd1 = -1, fd2 = -1;
9130 
9131 	*path_unstaged_content = NULL;
9132 	*path_new_staged_content = NULL;
9133 
9134 	err = got_object_id_str(&label1, blob_id);
9135 	if (err)
9136 		return err;
9137 
9138 	fd1 = got_opentempfd();
9139 	if (fd1 == -1) {
9140 		err = got_error_from_errno("got_opentempfd");
9141 		goto done;
9142 	}
9143 	fd2 = got_opentempfd();
9144 	if (fd2 == -1) {
9145 		err = got_error_from_errno("got_opentempfd");
9146 		goto done;
9147 	}
9148 
9149 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
9150 	if (err)
9151 		goto done;
9152 
9153 	err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
9154 	if (err)
9155 		goto done;
9156 
9157 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
9158 	if (err)
9159 		goto done;
9160 
9161 	err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
9162 	    fd2);
9163 	if (err)
9164 		goto done;
9165 
9166 	err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
9167 	if (err)
9168 		goto done;
9169 
9170 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
9171 	if (err)
9172 		goto done;
9173 
9174 	err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
9175 	    path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
9176 	if (err)
9177 		goto done;
9178 
9179 	err = got_opentemp_named(path_unstaged_content, &outfile,
9180 	    "got-unstaged-content", "");
9181 	if (err)
9182 		goto done;
9183 	err = got_opentemp_named(path_new_staged_content, &rejectfile,
9184 	    "got-new-staged-content", "");
9185 	if (err)
9186 		goto done;
9187 
9188 	if (fseek(f1, 0L, SEEK_SET) == -1) {
9189 		err = got_ferror(f1, GOT_ERR_IO);
9190 		goto done;
9191 	}
9192 	if (fseek(f2, 0L, SEEK_SET) == -1) {
9193 		err = got_ferror(f2, GOT_ERR_IO);
9194 		goto done;
9195 	}
9196 	/* Count the number of actual changes in the diff result. */
9197 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
9198 		struct diff_chunk_context cc = {};
9199 		diff_chunk_context_load_change(&cc, &nchunks_used,
9200 		    diffreg_result->result, n, 0);
9201 		nchanges++;
9202 	}
9203 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
9204 		int choice;
9205 		err = apply_or_reject_change(&choice, &nchunks_used,
9206 		    diffreg_result->result, n, relpath, f1, f2,
9207 		    &line_cur1, &line_cur2,
9208 		    outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
9209 		if (err)
9210 			goto done;
9211 		if (choice == GOT_PATCH_CHOICE_YES)
9212 			have_content = 1;
9213 		else
9214 			have_rejected_content = 1;
9215 		if (choice == GOT_PATCH_CHOICE_QUIT)
9216 			break;
9217 	}
9218 	if (have_content || have_rejected_content)
9219 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
9220 		    outfile, rejectfile);
9221 done:
9222 	free(label1);
9223 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9224 		err = got_error_from_errno("close");
9225 	if (blob)
9226 		got_object_blob_close(blob);
9227 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9228 		err = got_error_from_errno("close");
9229 	if (staged_blob)
9230 		got_object_blob_close(staged_blob);
9231 	free_err = got_diffreg_result_free(diffreg_result);
9232 	if (free_err && err == NULL)
9233 		err = free_err;
9234 	if (f1 && fclose(f1) == EOF && err == NULL)
9235 		err = got_error_from_errno2("fclose", path1);
9236 	if (f2 && fclose(f2) == EOF && err == NULL)
9237 		err = got_error_from_errno2("fclose", path2);
9238 	if (outfile && fclose(outfile) == EOF && err == NULL)
9239 		err = got_error_from_errno2("fclose", *path_unstaged_content);
9240 	if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
9241 		err = got_error_from_errno2("fclose", *path_new_staged_content);
9242 	if (path1 && unlink(path1) == -1 && err == NULL)
9243 		err = got_error_from_errno2("unlink", path1);
9244 	if (path2 && unlink(path2) == -1 && err == NULL)
9245 		err = got_error_from_errno2("unlink", path2);
9246 	if (err || !have_content) {
9247 		if (*path_unstaged_content &&
9248 		    unlink(*path_unstaged_content) == -1 && err == NULL)
9249 			err = got_error_from_errno2("unlink",
9250 			    *path_unstaged_content);
9251 		free(*path_unstaged_content);
9252 		*path_unstaged_content = NULL;
9253 	}
9254 	if (err || !have_content || !have_rejected_content) {
9255 		if (*path_new_staged_content &&
9256 		    unlink(*path_new_staged_content) == -1 && err == NULL)
9257 			err = got_error_from_errno2("unlink",
9258 			    *path_new_staged_content);
9259 		free(*path_new_staged_content);
9260 		*path_new_staged_content = NULL;
9261 	}
9262 	free(path1);
9263 	free(path2);
9264 	return err;
9265 }
9266 
9267 static const struct got_error *
9268 unstage_hunks(struct got_object_id *staged_blob_id,
9269     struct got_blob_object *blob_base,
9270     struct got_object_id *blob_id, struct got_fileindex_entry *ie,
9271     const char *ondisk_path, const char *label_orig,
9272     struct got_worktree *worktree, struct got_repository *repo,
9273     got_worktree_patch_cb patch_cb, void *patch_arg,
9274     got_worktree_checkout_cb progress_cb, void *progress_arg)
9275 {
9276 	const struct got_error *err = NULL;
9277 	char *path_unstaged_content = NULL;
9278 	char *path_new_staged_content = NULL;
9279 	char *parent = NULL, *base_path = NULL;
9280 	char *blob_base_path = NULL;
9281 	struct got_object_id *new_staged_blob_id = NULL;
9282 	FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
9283 	struct stat sb;
9284 
9285 	err = create_unstaged_content(&path_unstaged_content,
9286 	    &path_new_staged_content, blob_id, staged_blob_id,
9287 	    ie->path, repo, patch_cb, patch_arg);
9288 	if (err)
9289 		return err;
9290 
9291 	if (path_unstaged_content == NULL)
9292 		return NULL;
9293 
9294 	if (path_new_staged_content) {
9295 		err = got_object_blob_create(&new_staged_blob_id,
9296 		    path_new_staged_content, repo);
9297 		if (err)
9298 			goto done;
9299 	}
9300 
9301 	f = fopen(path_unstaged_content, "re");
9302 	if (f == NULL) {
9303 		err = got_error_from_errno2("fopen",
9304 		    path_unstaged_content);
9305 		goto done;
9306 	}
9307 	if (fstat(fileno(f), &sb) == -1) {
9308 		err = got_error_from_errno2("fstat", path_unstaged_content);
9309 		goto done;
9310 	}
9311 	if (got_fileindex_entry_staged_filetype_get(ie) ==
9312 	    GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
9313 		char link_target[PATH_MAX];
9314 		size_t r;
9315 		r = fread(link_target, 1, sizeof(link_target), f);
9316 		if (r == 0 && ferror(f)) {
9317 			err = got_error_from_errno("fread");
9318 			goto done;
9319 		}
9320 		if (r >= sizeof(link_target)) { /* should not happen */
9321 			err = got_error(GOT_ERR_NO_SPACE);
9322 			goto done;
9323 		}
9324 		link_target[r] = '\0';
9325 		err = merge_symlink(worktree, blob_base,
9326 		    ondisk_path, ie->path, label_orig, link_target,
9327 		    worktree->base_commit_id, repo, progress_cb,
9328 		    progress_arg);
9329 	} else {
9330 		int local_changes_subsumed;
9331 
9332 		err = got_path_dirname(&parent, ondisk_path);
9333 		if (err)
9334 			return err;
9335 
9336 		if (asprintf(&base_path, "%s/got-unstage-blob-orig",
9337 		    parent) == -1) {
9338 			err = got_error_from_errno("asprintf");
9339 			base_path = NULL;
9340 			goto done;
9341 		}
9342 
9343 		err = got_opentemp_named(&blob_base_path, &f_base,
9344 		    base_path, "");
9345 		if (err)
9346 			goto done;
9347 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
9348 		    blob_base);
9349 		if (err)
9350 			goto done;
9351 
9352 		/*
9353 		 * In order the run a 3-way merge with a symlink we copy the symlink's
9354 		 * target path into a temporary file and use that file with diff3.
9355 		 */
9356 		if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
9357 			err = dump_symlink_target_path_to_file(&f_deriv2,
9358 			    ondisk_path);
9359 			if (err)
9360 				goto done;
9361 		} else {
9362 			int fd;
9363 			fd = open(ondisk_path,
9364 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
9365 			if (fd == -1) {
9366 				err = got_error_from_errno2("open", ondisk_path);
9367 				goto done;
9368 			}
9369 			f_deriv2 = fdopen(fd, "r");
9370 			if (f_deriv2 == NULL) {
9371 				err = got_error_from_errno2("fdopen", ondisk_path);
9372 				close(fd);
9373 				goto done;
9374 			}
9375 		}
9376 
9377 		err = merge_file(&local_changes_subsumed, worktree,
9378 		    f_base, f, f_deriv2, ondisk_path, ie->path,
9379 		    got_fileindex_perms_to_st(ie),
9380 		    label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
9381 		    repo, progress_cb, progress_arg);
9382 	}
9383 	if (err)
9384 		goto done;
9385 
9386 	if (new_staged_blob_id) {
9387 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
9388 		    SHA1_DIGEST_LENGTH);
9389 	} else {
9390 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9391 		got_fileindex_entry_staged_filetype_set(ie, 0);
9392 	}
9393 done:
9394 	free(new_staged_blob_id);
9395 	if (path_unstaged_content &&
9396 	    unlink(path_unstaged_content) == -1 && err == NULL)
9397 		err = got_error_from_errno2("unlink", path_unstaged_content);
9398 	if (path_new_staged_content &&
9399 	    unlink(path_new_staged_content) == -1 && err == NULL)
9400 		err = got_error_from_errno2("unlink", path_new_staged_content);
9401 	if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
9402 		err = got_error_from_errno2("unlink", blob_base_path);
9403 	if (f_base && fclose(f_base) == EOF && err == NULL)
9404 		err = got_error_from_errno2("fclose", path_unstaged_content);
9405 	if (f && fclose(f) == EOF && err == NULL)
9406 		err = got_error_from_errno2("fclose", path_unstaged_content);
9407 	if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
9408 		err = got_error_from_errno2("fclose", ondisk_path);
9409 	free(path_unstaged_content);
9410 	free(path_new_staged_content);
9411 	free(blob_base_path);
9412 	free(parent);
9413 	free(base_path);
9414 	return err;
9415 }
9416 
9417 static const struct got_error *
9418 unstage_path(void *arg, unsigned char status,
9419     unsigned char staged_status, const char *relpath,
9420     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9421     struct got_object_id *commit_id, int dirfd, const char *de_name)
9422 {
9423 	const struct got_error *err = NULL;
9424 	struct unstage_path_arg *a = arg;
9425 	struct got_fileindex_entry *ie;
9426 	struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
9427 	char *ondisk_path = NULL;
9428 	char *id_str = NULL, *label_orig = NULL;
9429 	int local_changes_subsumed;
9430 	struct stat sb;
9431 	int fd1 = -1, fd2 = -1;
9432 
9433 	if (staged_status != GOT_STATUS_ADD &&
9434 	    staged_status != GOT_STATUS_MODIFY &&
9435 	    staged_status != GOT_STATUS_DELETE)
9436 		return NULL;
9437 
9438 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
9439 	if (ie == NULL)
9440 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
9441 
9442 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
9443 	    == -1)
9444 		return got_error_from_errno("asprintf");
9445 
9446 	err = got_object_id_str(&id_str,
9447 	    commit_id ? commit_id : a->worktree->base_commit_id);
9448 	if (err)
9449 		goto done;
9450 	if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
9451 	    id_str) == -1) {
9452 		err = got_error_from_errno("asprintf");
9453 		goto done;
9454 	}
9455 
9456 	fd1 = got_opentempfd();
9457 	if (fd1 == -1) {
9458 		err = got_error_from_errno("got_opentempfd");
9459 		goto done;
9460 	}
9461 	fd2 = got_opentempfd();
9462 	if (fd2 == -1) {
9463 		err = got_error_from_errno("got_opentempfd");
9464 		goto done;
9465 	}
9466 
9467 	switch (staged_status) {
9468 	case GOT_STATUS_MODIFY:
9469 		err = got_object_open_as_blob(&blob_base, a->repo,
9470 		    blob_id, 8192, fd1);
9471 		if (err)
9472 			break;
9473 		/* fall through */
9474 	case GOT_STATUS_ADD:
9475 		if (a->patch_cb) {
9476 			if (staged_status == GOT_STATUS_ADD) {
9477 				int choice = GOT_PATCH_CHOICE_NONE;
9478 				err = (*a->patch_cb)(&choice, a->patch_arg,
9479 				    staged_status, ie->path, NULL, 1, 1);
9480 				if (err)
9481 					break;
9482 				if (choice != GOT_PATCH_CHOICE_YES)
9483 					break;
9484 			} else {
9485 				err = unstage_hunks(staged_blob_id,
9486 				    blob_base, blob_id, ie, ondisk_path,
9487 				    label_orig, a->worktree, a->repo,
9488 				    a->patch_cb, a->patch_arg,
9489 				    a->progress_cb, a->progress_arg);
9490 				break; /* Done with this file. */
9491 			}
9492 		}
9493 		err = got_object_open_as_blob(&blob_staged, a->repo,
9494 		    staged_blob_id, 8192, fd2);
9495 		if (err)
9496 			break;
9497 		switch (got_fileindex_entry_staged_filetype_get(ie)) {
9498 		case GOT_FILEIDX_MODE_BAD_SYMLINK:
9499 		case GOT_FILEIDX_MODE_REGULAR_FILE:
9500 			err = merge_blob(&local_changes_subsumed, a->worktree,
9501 			    blob_base, ondisk_path, relpath,
9502 			    got_fileindex_perms_to_st(ie), label_orig,
9503 			    blob_staged, commit_id ? commit_id :
9504 			    a->worktree->base_commit_id, a->repo,
9505 			    a->progress_cb, a->progress_arg);
9506 			break;
9507 		case GOT_FILEIDX_MODE_SYMLINK:
9508 			if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
9509 				char *staged_target;
9510 				err = got_object_blob_read_to_str(
9511 				    &staged_target, blob_staged);
9512 				if (err)
9513 					goto done;
9514 				err = merge_symlink(a->worktree, blob_base,
9515 				    ondisk_path, relpath, label_orig,
9516 				    staged_target, commit_id ? commit_id :
9517 				    a->worktree->base_commit_id,
9518 				    a->repo, a->progress_cb, a->progress_arg);
9519 				free(staged_target);
9520 			} else {
9521 				err = merge_blob(&local_changes_subsumed,
9522 				    a->worktree, blob_base, ondisk_path,
9523 				    relpath, got_fileindex_perms_to_st(ie),
9524 				    label_orig, blob_staged,
9525 				    commit_id ? commit_id :
9526 				    a->worktree->base_commit_id, a->repo,
9527 				    a->progress_cb, a->progress_arg);
9528 			}
9529 			break;
9530 		default:
9531 			err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
9532 			break;
9533 		}
9534 		if (err == NULL) {
9535 			got_fileindex_entry_stage_set(ie,
9536 			    GOT_FILEIDX_STAGE_NONE);
9537 			got_fileindex_entry_staged_filetype_set(ie, 0);
9538 		}
9539 		break;
9540 	case GOT_STATUS_DELETE:
9541 		if (a->patch_cb) {
9542 			int choice = GOT_PATCH_CHOICE_NONE;
9543 			err = (*a->patch_cb)(&choice, a->patch_arg,
9544 			    staged_status, ie->path, NULL, 1, 1);
9545 			if (err)
9546 				break;
9547 			if (choice == GOT_PATCH_CHOICE_NO)
9548 				break;
9549 			if (choice != GOT_PATCH_CHOICE_YES) {
9550 				err = got_error(GOT_ERR_PATCH_CHOICE);
9551 				break;
9552 			}
9553 		}
9554 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9555 		got_fileindex_entry_staged_filetype_set(ie, 0);
9556 		err = get_file_status(&status, &sb, ie, ondisk_path,
9557 		    dirfd, de_name, a->repo);
9558 		if (err)
9559 			break;
9560 		err = (*a->progress_cb)(a->progress_arg, status, relpath);
9561 		break;
9562 	}
9563 done:
9564 	free(ondisk_path);
9565 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9566 		err = got_error_from_errno("close");
9567 	if (blob_base)
9568 		got_object_blob_close(blob_base);
9569 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9570 		err = got_error_from_errno("close");
9571 	if (blob_staged)
9572 		got_object_blob_close(blob_staged);
9573 	free(id_str);
9574 	free(label_orig);
9575 	return err;
9576 }
9577 
9578 const struct got_error *
9579 got_worktree_unstage(struct got_worktree *worktree,
9580     struct got_pathlist_head *paths,
9581     got_worktree_checkout_cb progress_cb, void *progress_arg,
9582     got_worktree_patch_cb patch_cb, void *patch_arg,
9583     struct got_repository *repo)
9584 {
9585 	const struct got_error *err = NULL, *sync_err, *unlockerr;
9586 	struct got_pathlist_entry *pe;
9587 	struct got_fileindex *fileindex = NULL;
9588 	char *fileindex_path = NULL;
9589 	struct unstage_path_arg upa;
9590 
9591 	err = lock_worktree(worktree, LOCK_EX);
9592 	if (err)
9593 		return err;
9594 
9595 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
9596 	if (err)
9597 		goto done;
9598 
9599 	upa.worktree = worktree;
9600 	upa.fileindex = fileindex;
9601 	upa.repo = repo;
9602 	upa.progress_cb = progress_cb;
9603 	upa.progress_arg = progress_arg;
9604 	upa.patch_cb = patch_cb;
9605 	upa.patch_arg = patch_arg;
9606 	TAILQ_FOREACH(pe, paths, entry) {
9607 		err = worktree_status(worktree, pe->path, fileindex, repo,
9608 		    unstage_path, &upa, NULL, NULL, 1, 0);
9609 		if (err)
9610 			goto done;
9611 	}
9612 
9613 	sync_err = sync_fileindex(fileindex, fileindex_path);
9614 	if (sync_err && err == NULL)
9615 		err = sync_err;
9616 done:
9617 	free(fileindex_path);
9618 	if (fileindex)
9619 		got_fileindex_free(fileindex);
9620 	unlockerr = lock_worktree(worktree, LOCK_SH);
9621 	if (unlockerr && err == NULL)
9622 		err = unlockerr;
9623 	return err;
9624 }
9625 
9626 struct report_file_info_arg {
9627 	struct got_worktree *worktree;
9628 	got_worktree_path_info_cb info_cb;
9629 	void *info_arg;
9630 	struct got_pathlist_head *paths;
9631 	got_cancel_cb cancel_cb;
9632 	void *cancel_arg;
9633 };
9634 
9635 static const struct got_error *
9636 report_file_info(void *arg, struct got_fileindex_entry *ie)
9637 {
9638 	struct report_file_info_arg *a = arg;
9639 	struct got_pathlist_entry *pe;
9640 	struct got_object_id blob_id, staged_blob_id, commit_id;
9641 	struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9642 	struct got_object_id *commit_idp = NULL;
9643 	int stage;
9644 
9645 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9646 		return got_error(GOT_ERR_CANCELLED);
9647 
9648 	TAILQ_FOREACH(pe, a->paths, entry) {
9649 		if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9650 		    got_path_is_child(ie->path, pe->path, pe->path_len))
9651 			break;
9652 	}
9653 	if (pe == NULL) /* not found */
9654 		return NULL;
9655 
9656 	if (got_fileindex_entry_has_blob(ie))
9657 		blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
9658 	stage = got_fileindex_entry_stage_get(ie);
9659 	if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9660 	    stage == GOT_FILEIDX_STAGE_ADD) {
9661 		staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
9662 		    &staged_blob_id, ie);
9663 	}
9664 
9665 	if (got_fileindex_entry_has_commit(ie))
9666 		commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
9667 
9668 	return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9669 	    (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9670 }
9671 
9672 const struct got_error *
9673 got_worktree_path_info(struct got_worktree *worktree,
9674     struct got_pathlist_head *paths,
9675     got_worktree_path_info_cb info_cb, void *info_arg,
9676     got_cancel_cb cancel_cb, void *cancel_arg)
9677 
9678 {
9679 	const struct got_error *err = NULL, *unlockerr;
9680 	struct got_fileindex *fileindex = NULL;
9681 	char *fileindex_path = NULL;
9682 	struct report_file_info_arg arg;
9683 
9684 	err = lock_worktree(worktree, LOCK_SH);
9685 	if (err)
9686 		return err;
9687 
9688 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
9689 	if (err)
9690 		goto done;
9691 
9692 	arg.worktree = worktree;
9693 	arg.info_cb = info_cb;
9694 	arg.info_arg = info_arg;
9695 	arg.paths = paths;
9696 	arg.cancel_cb = cancel_cb;
9697 	arg.cancel_arg = cancel_arg;
9698 	err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9699 	    &arg);
9700 done:
9701 	free(fileindex_path);
9702 	if (fileindex)
9703 		got_fileindex_free(fileindex);
9704 	unlockerr = lock_worktree(worktree, LOCK_UN);
9705 	if (unlockerr && err == NULL)
9706 		err = unlockerr;
9707 	return err;
9708 }
9709 
9710 static const struct got_error *
9711 patch_check_path(const char *p, char **path, unsigned char *status,
9712     unsigned char *staged_status, struct got_fileindex *fileindex,
9713     struct got_worktree *worktree, struct got_repository *repo)
9714 {
9715 	const struct got_error *err;
9716 	struct got_fileindex_entry *ie;
9717 	struct stat sb;
9718 	char *ondisk_path = NULL;
9719 
9720 	err = got_worktree_resolve_path(path, worktree, p);
9721 	if (err)
9722 		return err;
9723 
9724 	if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9725 	    *path[0] ? "/" : "", *path) == -1)
9726 		return got_error_from_errno("asprintf");
9727 
9728 	ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9729 	if (ie) {
9730 		*staged_status = get_staged_status(ie);
9731 		err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9732 		    repo);
9733 		if (err)
9734 			goto done;
9735 	} else {
9736 		*staged_status = GOT_STATUS_NO_CHANGE;
9737 		*status = GOT_STATUS_UNVERSIONED;
9738 		if (lstat(ondisk_path, &sb) == -1) {
9739 			if (errno != ENOENT) {
9740 				err = got_error_from_errno2("lstat",
9741 				    ondisk_path);
9742 				goto done;
9743 			}
9744 			*status = GOT_STATUS_NONEXISTENT;
9745 		}
9746 	}
9747 
9748 done:
9749 	free(ondisk_path);
9750 	return err;
9751 }
9752 
9753 static const struct got_error *
9754 patch_can_rm(const char *path, unsigned char status,
9755     unsigned char staged_status)
9756 {
9757 	if (status == GOT_STATUS_NONEXISTENT)
9758 		return got_error_set_errno(ENOENT, path);
9759 	if (status != GOT_STATUS_NO_CHANGE &&
9760 	    status != GOT_STATUS_ADD &&
9761 	    status != GOT_STATUS_MODIFY &&
9762 	    status != GOT_STATUS_MODE_CHANGE)
9763 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9764 	if (staged_status == GOT_STATUS_DELETE)
9765 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9766 	return NULL;
9767 }
9768 
9769 static const struct got_error *
9770 patch_can_add(const char *path, unsigned char status)
9771 {
9772 	if (status != GOT_STATUS_NONEXISTENT)
9773 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9774 	return NULL;
9775 }
9776 
9777 static const struct got_error *
9778 patch_can_edit(const char *path, unsigned char status,
9779     unsigned char staged_status)
9780 {
9781 	if (status == GOT_STATUS_NONEXISTENT)
9782 		return got_error_set_errno(ENOENT, path);
9783 	if (status != GOT_STATUS_NO_CHANGE &&
9784 	    status != GOT_STATUS_ADD &&
9785 	    status != GOT_STATUS_MODIFY)
9786 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9787 	if (staged_status == GOT_STATUS_DELETE)
9788 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9789 	return NULL;
9790 }
9791 
9792 const struct got_error *
9793 got_worktree_patch_prepare(struct got_fileindex **fileindex,
9794     char **fileindex_path, struct got_worktree *worktree)
9795 {
9796 	return open_fileindex(fileindex, fileindex_path, worktree);
9797 }
9798 
9799 const struct got_error *
9800 got_worktree_patch_check_path(const char *old, const char *new,
9801     char **oldpath, char **newpath, struct got_worktree *worktree,
9802     struct got_repository *repo, struct got_fileindex *fileindex)
9803 {
9804 	const struct got_error *err = NULL;
9805 	int file_renamed = 0;
9806 	unsigned char status_old, staged_status_old;
9807 	unsigned char status_new, staged_status_new;
9808 
9809 	*oldpath = NULL;
9810 	*newpath = NULL;
9811 
9812 	err = patch_check_path(old != NULL ? old : new, oldpath,
9813 	    &status_old, &staged_status_old, fileindex, worktree, repo);
9814 	if (err)
9815 		goto done;
9816 
9817 	err = patch_check_path(new != NULL ? new : old, newpath,
9818 	    &status_new, &staged_status_new, fileindex, worktree, repo);
9819 	if (err)
9820 		goto done;
9821 
9822 	if (old != NULL && new != NULL && strcmp(old, new) != 0)
9823 		file_renamed = 1;
9824 
9825 	if (old != NULL && new == NULL)
9826 		err = patch_can_rm(*oldpath, status_old, staged_status_old);
9827 	else if (file_renamed) {
9828 		err = patch_can_rm(*oldpath, status_old, staged_status_old);
9829 		if (err == NULL)
9830 			err = patch_can_add(*newpath, status_new);
9831 	} else if (old == NULL)
9832 		err = patch_can_add(*newpath, status_new);
9833 	else
9834 		err = patch_can_edit(*newpath, status_new, staged_status_new);
9835 
9836 done:
9837 	if (err) {
9838 		free(*oldpath);
9839 		*oldpath = NULL;
9840 		free(*newpath);
9841 		*newpath = NULL;
9842 	}
9843 	return err;
9844 }
9845 
9846 const struct got_error *
9847 got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9848     struct got_worktree *worktree, struct got_fileindex *fileindex,
9849     got_worktree_checkout_cb progress_cb, void *progress_arg)
9850 {
9851 	struct schedule_addition_args saa;
9852 
9853 	memset(&saa, 0, sizeof(saa));
9854 	saa.worktree = worktree;
9855 	saa.fileindex = fileindex;
9856 	saa.progress_cb = progress_cb;
9857 	saa.progress_arg = progress_arg;
9858 	saa.repo = repo;
9859 
9860 	return worktree_status(worktree, path, fileindex, repo,
9861 	    schedule_addition, &saa, NULL, NULL, 1, 0);
9862 }
9863 
9864 const struct got_error *
9865 got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9866     struct got_worktree *worktree, struct got_fileindex *fileindex,
9867     got_worktree_delete_cb progress_cb, void *progress_arg)
9868 {
9869 	const struct got_error *err;
9870 	struct schedule_deletion_args sda;
9871 	char *ondisk_status_path;
9872 
9873 	memset(&sda, 0, sizeof(sda));
9874 	sda.worktree = worktree;
9875 	sda.fileindex = fileindex;
9876 	sda.progress_cb = progress_cb;
9877 	sda.progress_arg = progress_arg;
9878 	sda.repo = repo;
9879 	sda.delete_local_mods = 0;
9880 	sda.keep_on_disk = 0;
9881 	sda.ignore_missing_paths = 0;
9882 	sda.status_codes = NULL;
9883 	if (asprintf(&ondisk_status_path, "%s/%s",
9884 	    got_worktree_get_root_path(worktree), path) == -1)
9885 		return got_error_from_errno("asprintf");
9886 	sda.status_path = ondisk_status_path;
9887 	sda.status_path_len = strlen(ondisk_status_path);
9888 
9889 	err = worktree_status(worktree, path, fileindex, repo,
9890 	    schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9891 	free(ondisk_status_path);
9892 	return err;
9893 }
9894 
9895 const struct got_error *
9896 got_worktree_patch_complete(struct got_fileindex *fileindex,
9897     const char *fileindex_path)
9898 {
9899 	const struct got_error *err = NULL;
9900 
9901 	err = sync_fileindex(fileindex, fileindex_path);
9902 	got_fileindex_free(fileindex);
9903 
9904 	return err;
9905 }