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