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