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