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