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