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