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