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