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