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