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);
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 const struct got_error *
1038 get_file_status(unsigned char *status, struct stat *sb,
1039     struct got_fileindex_entry *ie, const char *abspath,
1040     struct got_repository *repo)
1041 {
1042 	const struct got_error *err = NULL;
1043 	struct got_object_id id;
1044 	size_t hdrlen;
1045 	FILE *f = NULL;
1046 	uint8_t fbuf[8192];
1047 	struct got_blob_object *blob = NULL;
1048 	size_t flen, blen;
1049 
1050 	*status = GOT_STATUS_NO_CHANGE;
1051 
1052 	if (lstat(abspath, sb) == -1) {
1053 		if (errno == ENOENT) {
1054 			if (got_fileindex_entry_has_file_on_disk(ie))
1055 				*status = GOT_STATUS_MISSING;
1056 			else
1057 				*status = GOT_STATUS_DELETE;
1058 			return NULL;
1059 		}
1060 		return got_error_from_errno2("lstat", abspath);
1061 	}
1062 
1063 	if (!S_ISREG(sb->st_mode)) {
1064 		*status = GOT_STATUS_OBSTRUCTED;
1065 		return NULL;
1066 	}
1067 
1068 	if (!got_fileindex_entry_has_file_on_disk(ie)) {
1069 		*status = GOT_STATUS_DELETE;
1070 		return NULL;
1071 	} else if (!got_fileindex_entry_has_blob(ie)) {
1072 		*status = GOT_STATUS_ADD;
1073 		return NULL;
1074 	}
1075 
1076 	if (!stat_info_differs(ie, sb))
1077 		return NULL;
1078 
1079 	memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1080 	err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1081 	if (err)
1082 		return err;
1083 
1084 	f = fopen(abspath, "r");
1085 	if (f == NULL) {
1086 		err = got_error_from_errno2("fopen", abspath);
1087 		goto done;
1088 	}
1089 	hdrlen = got_object_blob_get_hdrlen(blob);
1090 	for (;;) {
1091 		const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1092 		err = got_object_blob_read_block(&blen, blob);
1093 		if (err)
1094 			goto done;
1095 		/* Skip length of blob object header first time around. */
1096 		flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1097 		if (flen == 0 && ferror(f)) {
1098 			err = got_error_from_errno("fread");
1099 			goto done;
1100 		}
1101 		if (blen == 0) {
1102 			if (flen != 0)
1103 				*status = GOT_STATUS_MODIFY;
1104 			break;
1105 		} else if (flen == 0) {
1106 			if (blen != 0)
1107 				*status = GOT_STATUS_MODIFY;
1108 			break;
1109 		} else if (blen - hdrlen == flen) {
1110 			/* Skip blob object header first time around. */
1111 			if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1112 				*status = GOT_STATUS_MODIFY;
1113 				break;
1114 			}
1115 		} else {
1116 			*status = GOT_STATUS_MODIFY;
1117 			break;
1118 		}
1119 		hdrlen = 0;
1120 	}
1121 
1122 	if (*status == GOT_STATUS_MODIFY) {
1123 		rewind(f);
1124 		err = get_modified_file_content_status(status, f);
1125 	}
1126 done:
1127 	if (blob)
1128 		got_object_blob_close(blob);
1129 	if (f)
1130 		fclose(f);
1131 	return err;
1132 }
1133 
1134 /*
1135  * Update timestamps in the file index if a file is unmodified and
1136  * we had to run a full content comparison to find out.
1137  */
1138 static const struct got_error *
1139 sync_timestamps(char *ondisk_path, unsigned char status,
1140     struct got_fileindex_entry *ie, struct stat *sb)
1141 {
1142 	if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1143 		return got_fileindex_entry_update(ie, ondisk_path,
1144 		    ie->blob_sha1, ie->commit_sha1, 1);
1145 
1146 	return NULL;
1147 }
1148 
1149 static const struct got_error *
1150 update_blob(struct got_worktree *worktree,
1151     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1152     struct got_tree_entry *te, const char *path,
1153     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1154     void *progress_arg)
1155 {
1156 	const struct got_error *err = NULL;
1157 	struct got_blob_object *blob = NULL;
1158 	char *ondisk_path;
1159 	unsigned char status = GOT_STATUS_NO_CHANGE;
1160 	struct stat sb;
1161 
1162 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1163 		return got_error_from_errno("asprintf");
1164 
1165 	if (ie) {
1166 		err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1167 		if (err)
1168 			goto done;
1169 		if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1170 			sb.st_mode = got_fileindex_perms_to_st(ie);
1171 	} else
1172 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
1173 
1174 	if (status == GOT_STATUS_OBSTRUCTED) {
1175 		err = (*progress_cb)(progress_arg, status, path);
1176 		goto done;
1177 	}
1178 
1179 	if (ie && status != GOT_STATUS_MISSING) {
1180 		if (got_fileindex_entry_has_commit(ie) &&
1181 		    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1182 		    SHA1_DIGEST_LENGTH) == 0) {
1183 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1184 			if (err)
1185 				goto done;
1186 			err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1187 			    path);
1188 			goto done;
1189 		}
1190 		if (got_fileindex_entry_has_blob(ie) &&
1191 		    memcmp(ie->blob_sha1, te->id->sha1,
1192 		    SHA1_DIGEST_LENGTH) == 0) {
1193 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1194 			goto done;
1195 		}
1196 	}
1197 
1198 	err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1199 	if (err)
1200 		goto done;
1201 
1202 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1203 		int update_timestamps;
1204 		struct got_blob_object *blob2 = NULL;
1205 		if (got_fileindex_entry_has_blob(ie)) {
1206 			struct got_object_id id2;
1207 			memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1208 			err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1209 			if (err)
1210 				goto done;
1211 		}
1212 		err = merge_blob(&update_timestamps, worktree, blob2,
1213 		    ondisk_path, path, sb.st_mode, blob,
1214 		    worktree->base_commit_id, repo,
1215 		    progress_cb, progress_arg);
1216 		if (blob2)
1217 			got_object_blob_close(blob2);
1218 		/*
1219 		 * Do not update timestamps of files with local changes.
1220 		 * Otherwise, a future status walk would treat them as
1221 		 * unmodified files again.
1222 		 */
1223 		err = got_fileindex_entry_update(ie, ondisk_path,
1224 		    blob->id.sha1, worktree->base_commit_id->sha1,
1225 		    update_timestamps);
1226 	} else if (status == GOT_STATUS_DELETE) {
1227 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1228 		if (err)
1229 			goto done;
1230 		err = update_blob_fileindex_entry(worktree, fileindex, ie,
1231 		    ondisk_path, path, blob, 0);
1232 		if (err)
1233 			goto done;
1234 	} else {
1235 		err = install_blob(worktree, ondisk_path, path, te->mode,
1236 		    sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1237 		    repo, progress_cb, progress_arg);
1238 		if (err)
1239 			goto done;
1240 		err = update_blob_fileindex_entry(worktree, fileindex, ie,
1241 		    ondisk_path, path, blob, 1);
1242 		if (err)
1243 			goto done;
1244 	}
1245 	got_object_blob_close(blob);
1246 done:
1247 	free(ondisk_path);
1248 	return err;
1249 }
1250 
1251 static const struct got_error *
1252 remove_ondisk_file(const char *root_path, const char *path)
1253 {
1254 	const struct got_error *err = NULL;
1255 	char *ondisk_path = NULL;
1256 
1257 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1258 		return got_error_from_errno("asprintf");
1259 
1260 	if (unlink(ondisk_path) == -1) {
1261 		if (errno != ENOENT)
1262 			err = got_error_from_errno2("unlink", ondisk_path);
1263 	} else {
1264 		char *parent = dirname(ondisk_path);
1265 		while (parent && strcmp(parent, root_path) != 0) {
1266 			if (rmdir(parent) == -1) {
1267 				if (errno != ENOTEMPTY)
1268 					err = got_error_from_errno2("rmdir",
1269 					    parent);
1270 				break;
1271 			}
1272 			parent = dirname(parent);
1273 		}
1274 	}
1275 	free(ondisk_path);
1276 	return err;
1277 }
1278 
1279 static const struct got_error *
1280 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1281     struct got_fileindex_entry *ie, struct got_repository *repo,
1282     got_worktree_checkout_cb progress_cb, void *progress_arg)
1283 {
1284 	const struct got_error *err = NULL;
1285 	unsigned char status;
1286 	struct stat sb;
1287 	char *ondisk_path;
1288 
1289 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1290 	    == -1)
1291 		return got_error_from_errno("asprintf");
1292 
1293 	err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1294 	if (err)
1295 		return err;
1296 
1297 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1298 	    status == GOT_STATUS_ADD) {
1299 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1300 		if (err)
1301 			return err;
1302 		/*
1303 		 * Preserve the working file and change the deleted blob's
1304 		 * entry into a schedule-add entry.
1305 		 */
1306 		err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1307 		    0);
1308 		if (err)
1309 			return err;
1310 	} else {
1311 		err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1312 		if (err)
1313 			return err;
1314 		if (status == GOT_STATUS_NO_CHANGE) {
1315 			err = remove_ondisk_file(worktree->root_path, ie->path);
1316 			if (err)
1317 				return err;
1318 		}
1319 		got_fileindex_entry_remove(fileindex, ie);
1320 	}
1321 
1322 	return err;
1323 }
1324 
1325 struct diff_cb_arg {
1326     struct got_fileindex *fileindex;
1327     struct got_worktree *worktree;
1328     struct got_repository *repo;
1329     got_worktree_checkout_cb progress_cb;
1330     void *progress_arg;
1331     got_worktree_cancel_cb cancel_cb;
1332     void *cancel_arg;
1333 };
1334 
1335 static const struct got_error *
1336 diff_old_new(void *arg, struct got_fileindex_entry *ie,
1337     struct got_tree_entry *te, const char *parent_path)
1338 {
1339 	struct diff_cb_arg *a = arg;
1340 
1341 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1342 		return got_error(GOT_ERR_CANCELLED);
1343 
1344 	return update_blob(a->worktree, a->fileindex, ie, te,
1345 	    ie->path, a->repo, a->progress_cb, a->progress_arg);
1346 }
1347 
1348 static const struct got_error *
1349 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1350 {
1351 	struct diff_cb_arg *a = arg;
1352 
1353 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1354 		return got_error(GOT_ERR_CANCELLED);
1355 
1356 	return delete_blob(a->worktree, a->fileindex, ie,
1357 	    a->repo, a->progress_cb, a->progress_arg);
1358 }
1359 
1360 static const struct got_error *
1361 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1362 {
1363 	struct diff_cb_arg *a = arg;
1364 	const struct got_error *err;
1365 	char *path;
1366 
1367 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1368 		return got_error(GOT_ERR_CANCELLED);
1369 
1370 	if (asprintf(&path, "%s%s%s", parent_path,
1371 	    parent_path[0] ? "/" : "", te->name)
1372 	    == -1)
1373 		return got_error_from_errno("asprintf");
1374 
1375 	if (S_ISDIR(te->mode))
1376 		err = add_dir_on_disk(a->worktree, path);
1377 	else
1378 		err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1379 		    a->repo, a->progress_cb, a->progress_arg);
1380 
1381 	free(path);
1382 	return err;
1383 }
1384 
1385 static const struct got_error *
1386 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1387 {
1388 	const struct got_error *err = NULL;
1389 	char *uuidstr = NULL;
1390 	uint32_t uuid_status;
1391 
1392 	*refname = NULL;
1393 
1394 	uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1395 	if (uuid_status != uuid_s_ok)
1396 		return got_error_uuid(uuid_status);
1397 
1398 	if (asprintf(refname, "%s-%s", prefix, uuidstr)
1399 	    == -1) {
1400 		err = got_error_from_errno("asprintf");
1401 		*refname = NULL;
1402 	}
1403 	free(uuidstr);
1404 	return err;
1405 }
1406 
1407 const struct got_error *
1408 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1409 {
1410 	return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1411 }
1412 
1413 static const struct got_error *
1414 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1415 {
1416 	return get_ref_name(refname, worktree,
1417 	    GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1418 }
1419 
1420 static const struct got_error *
1421 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1422 {
1423 	return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1424 }
1425 
1426 static const struct got_error *
1427 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1428 {
1429 	return get_ref_name(refname, worktree,
1430 	    GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1431 }
1432 
1433 static const struct got_error *
1434 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1435 {
1436 	return get_ref_name(refname, worktree,
1437 	    GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1438 }
1439 
1440 static const struct got_error *
1441 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1442 {
1443 	return get_ref_name(refname, worktree,
1444 	    GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1445 }
1446 
1447 static const struct got_error *
1448 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1449 {
1450 	return get_ref_name(refname, worktree,
1451 	    GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1452 }
1453 
1454 static const struct got_error *
1455 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1456 {
1457 	return get_ref_name(refname, worktree,
1458 	    GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1459 }
1460 
1461 static const struct got_error *
1462 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1463 {
1464 	return get_ref_name(refname, worktree,
1465 	    GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1466 }
1467 
1468 const struct got_error *
1469 got_worktree_get_histedit_script_path(char **path,
1470     struct got_worktree *worktree)
1471 {
1472 	if (asprintf(path, "%s/%s/%s", worktree->root_path,
1473 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1474 		*path = NULL;
1475 		return got_error_from_errno("asprintf");
1476 	}
1477 	return NULL;
1478 }
1479 
1480 /*
1481  * Prevent Git's garbage collector from deleting our base commit by
1482  * setting a reference to our base commit's ID.
1483  */
1484 static const struct got_error *
1485 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1486 {
1487 	const struct got_error *err = NULL;
1488 	struct got_reference *ref = NULL;
1489 	char *refname;
1490 
1491 	err = got_worktree_get_base_ref_name(&refname, worktree);
1492 	if (err)
1493 		return err;
1494 
1495 	err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1496 	if (err)
1497 		goto done;
1498 
1499 	err = got_ref_write(ref, repo);
1500 done:
1501 	free(refname);
1502 	if (ref)
1503 		got_ref_close(ref);
1504 	return err;
1505 }
1506 
1507 static const struct got_error *
1508 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1509 {
1510 	const struct got_error *err = NULL;
1511 
1512 	if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1513 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1514 		err = got_error_from_errno("asprintf");
1515 		*fileindex_path = NULL;
1516 	}
1517 	return err;
1518 }
1519 
1520 
1521 static const struct got_error *
1522 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1523    struct got_worktree *worktree)
1524 {
1525 	const struct got_error *err = NULL;
1526 	FILE *index = NULL;
1527 
1528 	*fileindex_path = NULL;
1529 	*fileindex = got_fileindex_alloc();
1530 	if (*fileindex == NULL)
1531 		return got_error_from_errno("got_fileindex_alloc");
1532 
1533 	err = get_fileindex_path(fileindex_path, worktree);
1534 	if (err)
1535 		goto done;
1536 
1537 	index = fopen(*fileindex_path, "rb");
1538 	if (index == NULL) {
1539 		if (errno != ENOENT)
1540 			err = got_error_from_errno2("fopen", *fileindex_path);
1541 	} else {
1542 		err = got_fileindex_read(*fileindex, index);
1543 		if (fclose(index) != 0 && err == NULL)
1544 			err = got_error_from_errno("fclose");
1545 	}
1546 done:
1547 	if (err) {
1548 		free(*fileindex_path);
1549 		*fileindex_path = NULL;
1550 		got_fileindex_free(*fileindex);
1551 		*fileindex = NULL;
1552 	}
1553 	return err;
1554 }
1555 
1556 struct bump_base_commit_id_arg {
1557 	struct got_object_id *base_commit_id;
1558 	const char *path;
1559 	size_t path_len;
1560 	const char *entry_name;
1561 	got_worktree_checkout_cb progress_cb;
1562 	void *progress_arg;
1563 };
1564 
1565 /* Bump base commit ID of all files within an updated part of the work tree. */
1566 static const struct got_error *
1567 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1568 {
1569 	const struct got_error *err;
1570 	struct bump_base_commit_id_arg *a = arg;
1571 
1572 	if (a->entry_name) {
1573 		if (strcmp(ie->path, a->path) != 0)
1574 			return NULL;
1575 	} else if (!got_path_is_child(ie->path, a->path, a->path_len))
1576 		return NULL;
1577 
1578 	if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1579 	    SHA1_DIGEST_LENGTH) == 0)
1580 		return NULL;
1581 
1582 	if (a->progress_cb) {
1583 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1584 		    ie->path);
1585 		if (err)
1586 			return err;
1587 	}
1588 	memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1589 	return NULL;
1590 }
1591 
1592 static const struct got_error *
1593 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1594 {
1595 	const struct got_error *err = NULL;
1596 	char *new_fileindex_path = NULL;
1597 	FILE *new_index = NULL;
1598 
1599 	err = got_opentemp_named(&new_fileindex_path, &new_index,
1600 	    fileindex_path);
1601 	if (err)
1602 		goto done;
1603 
1604 	err = got_fileindex_write(fileindex, new_index);
1605 	if (err)
1606 		goto done;
1607 
1608 	if (rename(new_fileindex_path, fileindex_path) != 0) {
1609 		err = got_error_from_errno3("rename", new_fileindex_path,
1610 		    fileindex_path);
1611 		unlink(new_fileindex_path);
1612 	}
1613 done:
1614 	if (new_index)
1615 		fclose(new_index);
1616 	free(new_fileindex_path);
1617 	return err;
1618 }
1619 
1620 static const struct got_error *
1621 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1622     struct got_object_id **tree_id, const char *wt_relpath,
1623     struct got_worktree *worktree, struct got_repository *repo)
1624 {
1625 	const struct got_error *err = NULL;
1626 	struct got_object_id *id = NULL;
1627 	char *in_repo_path = NULL;
1628 	int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1629 
1630 	*entry_type = GOT_OBJ_TYPE_ANY;
1631 	*tree_relpath = NULL;
1632 	*tree_id = NULL;
1633 
1634 	if (wt_relpath[0] == '\0') {
1635 		/* Check out all files within the work tree. */
1636 		*entry_type = GOT_OBJ_TYPE_TREE;
1637 		*tree_relpath = strdup("");
1638 		if (*tree_relpath == NULL) {
1639 			err = got_error_from_errno("strdup");
1640 			goto done;
1641 		}
1642 		err = got_object_id_by_path(tree_id, repo,
1643 		    worktree->base_commit_id, worktree->path_prefix);
1644 		if (err)
1645 			goto done;
1646 		return NULL;
1647 	}
1648 
1649 	/* Check out a subset of files in the work tree. */
1650 
1651 	if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1652 	    is_root_wt ? "" : "/", wt_relpath) == -1) {
1653 		err = got_error_from_errno("asprintf");
1654 		goto done;
1655 	}
1656 
1657 	err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1658 	    in_repo_path);
1659 	if (err)
1660 		goto done;
1661 
1662 	free(in_repo_path);
1663 	in_repo_path = NULL;
1664 
1665 	err = got_object_get_type(entry_type, repo, id);
1666 	if (err)
1667 		goto done;
1668 
1669 	if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1670 		/* Check out a single file. */
1671 		if (strchr(wt_relpath, '/')  == NULL) {
1672 			/* Check out a single file in work tree's root dir. */
1673 			in_repo_path = strdup(worktree->path_prefix);
1674 			if (in_repo_path == NULL) {
1675 				err = got_error_from_errno("strdup");
1676 				goto done;
1677 			}
1678 			*tree_relpath = strdup("");
1679 			if (*tree_relpath == NULL) {
1680 				err = got_error_from_errno("strdup");
1681 				goto done;
1682 			}
1683 		} else {
1684 			/* Check out a single file in a subdirectory. */
1685 			err = got_path_dirname(tree_relpath, wt_relpath);
1686 			if (err)
1687 				return err;
1688 			if (asprintf(&in_repo_path, "%s%s%s",
1689 			    worktree->path_prefix, is_root_wt ? "" : "/",
1690 			    *tree_relpath) == -1) {
1691 				err = got_error_from_errno("asprintf");
1692 				goto done;
1693 			}
1694 		}
1695 		err = got_object_id_by_path(tree_id, repo,
1696 		    worktree->base_commit_id, in_repo_path);
1697 	} else {
1698 		/* Check out all files within a subdirectory. */
1699 		*tree_id = got_object_id_dup(id);
1700 		if (*tree_id == NULL) {
1701 			err = got_error_from_errno("got_object_id_dup");
1702 			goto done;
1703 		}
1704 		*tree_relpath = strdup(wt_relpath);
1705 		if (*tree_relpath == NULL) {
1706 			err = got_error_from_errno("strdup");
1707 			goto done;
1708 		}
1709 	}
1710 done:
1711 	free(id);
1712 	free(in_repo_path);
1713 	if (err) {
1714 		*entry_type = GOT_OBJ_TYPE_ANY;
1715 		free(*tree_relpath);
1716 		*tree_relpath = NULL;
1717 		free(*tree_id);
1718 		*tree_id = NULL;
1719 	}
1720 	return err;
1721 }
1722 
1723 static const struct got_error *
1724 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1725     const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1726     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1727     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1728 {
1729 	const struct got_error *err = NULL;
1730 	struct got_commit_object *commit = NULL;
1731 	struct got_tree_object *tree = NULL;
1732 	struct got_fileindex_diff_tree_cb diff_cb;
1733 	struct diff_cb_arg arg;
1734 
1735 	err = ref_base_commit(worktree, repo);
1736 	if (err)
1737 		goto done;
1738 
1739 	err = got_object_open_as_commit(&commit, repo,
1740 	   worktree->base_commit_id);
1741 	if (err)
1742 		goto done;
1743 
1744 	err = got_object_open_as_tree(&tree, repo, tree_id);
1745 	if (err)
1746 		goto done;
1747 
1748 	if (entry_name &&
1749 	    got_object_tree_find_entry(tree, entry_name) == NULL) {
1750 		err = got_error(GOT_ERR_NO_TREE_ENTRY);
1751 		goto done;
1752 	}
1753 
1754 	diff_cb.diff_old_new = diff_old_new;
1755 	diff_cb.diff_old = diff_old;
1756 	diff_cb.diff_new = diff_new;
1757 	arg.fileindex = fileindex;
1758 	arg.worktree = worktree;
1759 	arg.repo = repo;
1760 	arg.progress_cb = progress_cb;
1761 	arg.progress_arg = progress_arg;
1762 	arg.cancel_cb = cancel_cb;
1763 	arg.cancel_arg = cancel_arg;
1764 	err = got_fileindex_diff_tree(fileindex, tree, relpath,
1765 	    entry_name, repo, &diff_cb, &arg);
1766 done:
1767 	if (tree)
1768 		got_object_tree_close(tree);
1769 	if (commit)
1770 		got_object_commit_close(commit);
1771 	return err;
1772 }
1773 
1774 const struct got_error *
1775 got_worktree_checkout_files(struct got_worktree *worktree,
1776     struct got_pathlist_head *paths, struct got_repository *repo,
1777     got_worktree_checkout_cb progress_cb, void *progress_arg,
1778     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1779 {
1780 	const struct got_error *err = NULL, *sync_err, *unlockerr;
1781 	struct got_commit_object *commit = NULL;
1782 	struct got_tree_object *tree = NULL;
1783 	struct got_fileindex *fileindex = NULL;
1784 	char *fileindex_path = NULL;
1785 	struct got_pathlist_entry *pe;
1786 	struct tree_path_data {
1787 		SIMPLEQ_ENTRY(tree_path_data) entry;
1788 		struct got_object_id *tree_id;
1789 		int entry_type;
1790 		char *relpath;
1791 		char *entry_name;
1792 	} *tpd = NULL;
1793 	SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1794 
1795 	SIMPLEQ_INIT(&tree_paths);
1796 
1797 	err = lock_worktree(worktree, LOCK_EX);
1798 	if (err)
1799 		return err;
1800 
1801 	/* Map all specified paths to in-repository trees. */
1802 	TAILQ_FOREACH(pe, paths, entry) {
1803 		tpd = malloc(sizeof(*tpd));
1804 		if (tpd == NULL) {
1805 			err = got_error_from_errno("malloc");
1806 			goto done;
1807 		}
1808 
1809 		err = find_tree_entry_for_checkout(&tpd->entry_type,
1810 		    &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1811 		if (err) {
1812 			free(tpd);
1813 			goto done;
1814 		}
1815 
1816 		if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1817 			err = got_path_basename(&tpd->entry_name, pe->path);
1818 			if (err) {
1819 				free(tpd->relpath);
1820 				free(tpd->tree_id);
1821 				free(tpd);
1822 				goto done;
1823 			}
1824 		} else
1825 			tpd->entry_name = NULL;
1826 
1827 		SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1828 	}
1829 
1830 	/*
1831 	 * Read the file index.
1832 	 * Checking out files is supposed to be an idempotent operation.
1833 	 * If the on-disk file index is incomplete we will try to complete it.
1834 	 */
1835 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
1836 	if (err)
1837 		goto done;
1838 
1839 	tpd = SIMPLEQ_FIRST(&tree_paths);
1840 	TAILQ_FOREACH(pe, paths, entry) {
1841 		struct bump_base_commit_id_arg bbc_arg;
1842 
1843 		err = checkout_files(worktree, fileindex, tpd->relpath,
1844 		    tpd->tree_id, tpd->entry_name, repo,
1845 		    progress_cb, progress_arg, cancel_cb, cancel_arg);
1846 		if (err)
1847 			break;
1848 
1849 		bbc_arg.base_commit_id = worktree->base_commit_id;
1850 		bbc_arg.entry_name = tpd->entry_name;
1851 		bbc_arg.path = pe->path;
1852 		bbc_arg.path_len = strlen(pe->path);
1853 		bbc_arg.progress_cb = progress_cb;
1854 		bbc_arg.progress_arg = progress_arg;
1855 		err = got_fileindex_for_each_entry_safe(fileindex,
1856 		    bump_base_commit_id, &bbc_arg);
1857 		if (err)
1858 			break;
1859 
1860 		tpd = SIMPLEQ_NEXT(tpd, entry);
1861 	}
1862 	sync_err = sync_fileindex(fileindex, fileindex_path);
1863 	if (sync_err && err == NULL)
1864 		err = sync_err;
1865 done:
1866 	free(fileindex_path);
1867 	if (tree)
1868 		got_object_tree_close(tree);
1869 	if (commit)
1870 		got_object_commit_close(commit);
1871 	if (fileindex)
1872 		got_fileindex_free(fileindex);
1873 	while (!SIMPLEQ_EMPTY(&tree_paths)) {
1874 		tpd = SIMPLEQ_FIRST(&tree_paths);
1875 		SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
1876 		free(tpd->relpath);
1877 		free(tpd->tree_id);
1878 		free(tpd);
1879 	}
1880 	unlockerr = lock_worktree(worktree, LOCK_SH);
1881 	if (unlockerr && err == NULL)
1882 		err = unlockerr;
1883 	return err;
1884 }
1885 
1886 struct merge_file_cb_arg {
1887     struct got_worktree *worktree;
1888     struct got_fileindex *fileindex;
1889     got_worktree_checkout_cb progress_cb;
1890     void *progress_arg;
1891     got_worktree_cancel_cb cancel_cb;
1892     void *cancel_arg;
1893     struct got_object_id *commit_id2;
1894 };
1895 
1896 static const struct got_error *
1897 merge_file_cb(void *arg, struct got_blob_object *blob1,
1898     struct got_blob_object *blob2, struct got_object_id *id1,
1899     struct got_object_id *id2, const char *path1, const char *path2,
1900     struct got_repository *repo)
1901 {
1902 	static const struct got_error *err = NULL;
1903 	struct merge_file_cb_arg *a = arg;
1904 	struct got_fileindex_entry *ie;
1905 	char *ondisk_path = NULL;
1906 	struct stat sb;
1907 	unsigned char status;
1908 	int local_changes_subsumed;
1909 
1910 	if (blob1 && blob2) {
1911 		ie = got_fileindex_entry_get(a->fileindex, path2);
1912 		if (ie == NULL)
1913 			return (*a->progress_cb)(a->progress_arg,
1914 			    GOT_STATUS_MISSING, path2);
1915 
1916 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1917 		    path2) == -1)
1918 			return got_error_from_errno("asprintf");
1919 
1920 		err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1921 		if (err)
1922 			goto done;
1923 
1924 		if (status == GOT_STATUS_DELETE) {
1925 			err = (*a->progress_cb)(a->progress_arg,
1926 			    GOT_STATUS_MERGE, path2);
1927 			goto done;
1928 		}
1929 		if (status != GOT_STATUS_NO_CHANGE &&
1930 		    status != GOT_STATUS_MODIFY &&
1931 		    status != GOT_STATUS_CONFLICT &&
1932 		    status != GOT_STATUS_ADD) {
1933 			err = (*a->progress_cb)(a->progress_arg, status, path2);
1934 			goto done;
1935 		}
1936 
1937 		err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1938 		    ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1939 		    a->progress_cb, a->progress_arg);
1940 	} else if (blob1) {
1941 		ie = got_fileindex_entry_get(a->fileindex, path1);
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 		    path1) == -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 		switch (status) {
1955 		case GOT_STATUS_NO_CHANGE:
1956 			err = (*a->progress_cb)(a->progress_arg,
1957 			    GOT_STATUS_DELETE, path1);
1958 			if (err)
1959 				goto done;
1960 			err = remove_ondisk_file(a->worktree->root_path, path1);
1961 			if (err)
1962 				goto done;
1963 			if (ie)
1964 				got_fileindex_entry_mark_deleted_from_disk(ie);
1965 			break;
1966 		case GOT_STATUS_DELETE:
1967 		case GOT_STATUS_MISSING:
1968 			err = (*a->progress_cb)(a->progress_arg,
1969 			    GOT_STATUS_DELETE, path1);
1970 			if (err)
1971 				goto done;
1972 			if (ie)
1973 				got_fileindex_entry_mark_deleted_from_disk(ie);
1974 			break;
1975 		case GOT_STATUS_ADD:
1976 		case GOT_STATUS_MODIFY:
1977 		case GOT_STATUS_CONFLICT:
1978 			err = (*a->progress_cb)(a->progress_arg,
1979 			    GOT_STATUS_CANNOT_DELETE, path1);
1980 			if (err)
1981 				goto done;
1982 			break;
1983 		case GOT_STATUS_OBSTRUCTED:
1984 			err = (*a->progress_cb)(a->progress_arg, status, path1);
1985 			if (err)
1986 				goto done;
1987 			break;
1988 		default:
1989 			break;
1990 		}
1991 	} else if (blob2) {
1992 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1993 		    path2) == -1)
1994 			return got_error_from_errno("asprintf");
1995 		ie = got_fileindex_entry_get(a->fileindex, path2);
1996 		if (ie) {
1997 			err = get_file_status(&status, &sb, ie, ondisk_path,
1998 			    repo);
1999 			if (err)
2000 				goto done;
2001 			if (status != GOT_STATUS_NO_CHANGE &&
2002 			    status != GOT_STATUS_MODIFY &&
2003 			    status != GOT_STATUS_CONFLICT &&
2004 			    status != GOT_STATUS_ADD) {
2005 				err = (*a->progress_cb)(a->progress_arg,
2006 				    status, path2);
2007 				goto done;
2008 			}
2009 			err = merge_blob(&local_changes_subsumed, a->worktree,
2010 			    NULL, ondisk_path, path2, sb.st_mode, blob2,
2011 			    a->commit_id2, repo,
2012 			    a->progress_cb, a->progress_arg);
2013 			if (status == GOT_STATUS_DELETE) {
2014 				err = update_blob_fileindex_entry(a->worktree,
2015 				    a->fileindex, ie, ondisk_path, ie->path,
2016 				    blob2, 0);
2017 				if (err)
2018 					goto done;
2019 			}
2020 		} else {
2021 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
2022 			err = install_blob(a->worktree, ondisk_path, path2,
2023 			    /* XXX get this from parent tree! */
2024 			    GOT_DEFAULT_FILE_MODE,
2025 			    sb.st_mode, blob2, 0, 0, repo,
2026 			    a->progress_cb, a->progress_arg);
2027 			if (err)
2028 				goto done;
2029 			err = got_fileindex_entry_alloc(&ie,
2030 			    ondisk_path, path2, NULL, NULL);
2031 			if (err)
2032 				goto done;
2033 			err = got_fileindex_entry_add(a->fileindex, ie);
2034 			if (err) {
2035 				got_fileindex_entry_free(ie);
2036 				goto done;
2037 			}
2038 		}
2039 	}
2040 done:
2041 	free(ondisk_path);
2042 	return err;
2043 }
2044 
2045 struct check_merge_ok_arg {
2046 	struct got_worktree *worktree;
2047 	struct got_repository *repo;
2048 };
2049 
2050 static const struct got_error *
2051 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2052 {
2053 	const struct got_error *err = NULL;
2054 	struct check_merge_ok_arg *a = arg;
2055 	unsigned char status;
2056 	struct stat sb;
2057 	char *ondisk_path;
2058 
2059 	/* Reject merges into a work tree with mixed base commits. */
2060 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2061 	    SHA1_DIGEST_LENGTH))
2062 		return got_error(GOT_ERR_MIXED_COMMITS);
2063 
2064 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2065 	    == -1)
2066 		return got_error_from_errno("asprintf");
2067 
2068 	/* Reject merges into a work tree with conflicted files. */
2069 	err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2070 	if (err)
2071 		return err;
2072 	if (status == GOT_STATUS_CONFLICT)
2073 		return got_error(GOT_ERR_CONFLICTS);
2074 
2075 	return NULL;
2076 }
2077 
2078 static const struct got_error *
2079 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2080     const char *fileindex_path, struct got_object_id *commit_id1,
2081     struct got_object_id *commit_id2, struct got_repository *repo,
2082     got_worktree_checkout_cb progress_cb, void *progress_arg,
2083     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2084 {
2085 	const struct got_error *err = NULL, *sync_err;
2086 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2087 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2088 	struct merge_file_cb_arg arg;
2089 
2090 	if (commit_id1) {
2091 		err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2092 		    worktree->path_prefix);
2093 		if (err)
2094 			goto done;
2095 
2096 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
2097 		if (err)
2098 			goto done;
2099 	}
2100 
2101 	err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2102 	    worktree->path_prefix);
2103 	if (err)
2104 		goto done;
2105 
2106 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
2107 	if (err)
2108 		goto done;
2109 
2110 	arg.worktree = worktree;
2111 	arg.fileindex = fileindex;
2112 	arg.progress_cb = progress_cb;
2113 	arg.progress_arg = progress_arg;
2114 	arg.cancel_cb = cancel_cb;
2115 	arg.cancel_arg = cancel_arg;
2116 	arg.commit_id2 = commit_id2;
2117 	err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2118 	sync_err = sync_fileindex(fileindex, fileindex_path);
2119 	if (sync_err && err == NULL)
2120 		err = sync_err;
2121 done:
2122 	if (tree1)
2123 		got_object_tree_close(tree1);
2124 	if (tree2)
2125 		got_object_tree_close(tree2);
2126 	return err;
2127 }
2128 
2129 const struct got_error *
2130 got_worktree_merge_files(struct got_worktree *worktree,
2131     struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2132     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2133     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2134 {
2135 	const struct got_error *err, *unlockerr;
2136 	char *fileindex_path = NULL;
2137 	struct got_fileindex *fileindex = NULL;
2138 	struct check_merge_ok_arg mok_arg;
2139 
2140 	err = lock_worktree(worktree, LOCK_EX);
2141 	if (err)
2142 		return err;
2143 
2144 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2145 	if (err)
2146 		goto done;
2147 
2148 	mok_arg.worktree = worktree;
2149 	mok_arg.repo = repo;
2150 	err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2151 	    &mok_arg);
2152 	if (err)
2153 		goto done;
2154 
2155 	err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2156 	    commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2157 done:
2158 	if (fileindex)
2159 		got_fileindex_free(fileindex);
2160 	free(fileindex_path);
2161 	unlockerr = lock_worktree(worktree, LOCK_SH);
2162 	if (unlockerr && err == NULL)
2163 		err = unlockerr;
2164 	return err;
2165 }
2166 
2167 struct diff_dir_cb_arg {
2168     struct got_fileindex *fileindex;
2169     struct got_worktree *worktree;
2170     const char *status_path;
2171     size_t status_path_len;
2172     struct got_repository *repo;
2173     got_worktree_status_cb status_cb;
2174     void *status_arg;
2175     got_worktree_cancel_cb cancel_cb;
2176     void *cancel_arg;
2177 };
2178 
2179 static const struct got_error *
2180 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2181     got_worktree_status_cb status_cb, void *status_arg,
2182     struct got_repository *repo)
2183 {
2184 	const struct got_error *err = NULL;
2185 	unsigned char status = GOT_STATUS_NO_CHANGE;
2186 	struct stat sb;
2187 	struct got_object_id blob_id, commit_id;
2188 
2189 	err = get_file_status(&status, &sb, ie, abspath, repo);
2190 	if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
2191 		memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2192 		memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2193 		err = (*status_cb)(status_arg, status, ie->path, &blob_id,
2194 		    &commit_id);
2195 	}
2196 	return err;
2197 }
2198 
2199 static const struct got_error *
2200 status_old_new(void *arg, struct got_fileindex_entry *ie,
2201     struct dirent *de, const char *parent_path)
2202 {
2203 	const struct got_error *err = NULL;
2204 	struct diff_dir_cb_arg *a = arg;
2205 	char *abspath;
2206 
2207 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2208 		return got_error(GOT_ERR_CANCELLED);
2209 
2210 	if (got_path_cmp(parent_path, a->status_path,
2211 	    strlen(parent_path), a->status_path_len) != 0 &&
2212 	    !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2213 		return NULL;
2214 
2215 	if (parent_path[0]) {
2216 		if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2217 		    parent_path, de->d_name) == -1)
2218 			return got_error_from_errno("asprintf");
2219 	} else {
2220 		if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2221 		    de->d_name) == -1)
2222 			return got_error_from_errno("asprintf");
2223 	}
2224 
2225 	err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2226 	    a->repo);
2227 	free(abspath);
2228 	return err;
2229 }
2230 
2231 static const struct got_error *
2232 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2233 {
2234 	struct diff_dir_cb_arg *a = arg;
2235 	struct got_object_id blob_id, commit_id;
2236 	unsigned char status;
2237 
2238 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2239 		return got_error(GOT_ERR_CANCELLED);
2240 
2241 	if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2242 		return NULL;
2243 
2244 	memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2245 	memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2246 	if (got_fileindex_entry_has_file_on_disk(ie))
2247 		status = GOT_STATUS_MISSING;
2248 	else
2249 		status = GOT_STATUS_DELETE;
2250 	return (*a->status_cb)(a->status_arg, status, ie->path, &blob_id,
2251 	    &commit_id);
2252 }
2253 
2254 static const struct got_error *
2255 status_new(void *arg, struct dirent *de, const char *parent_path)
2256 {
2257 	const struct got_error *err = NULL;
2258 	struct diff_dir_cb_arg *a = arg;
2259 	char *path = NULL;
2260 
2261 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2262 		return got_error(GOT_ERR_CANCELLED);
2263 
2264 	if (de->d_type == DT_DIR)
2265 		return NULL;
2266 
2267 	/* XXX ignore symlinks for now */
2268 	if (de->d_type == DT_LNK)
2269 		return NULL;
2270 
2271 	if (parent_path[0]) {
2272 		if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2273 			return got_error_from_errno("asprintf");
2274 	} else {
2275 		path = de->d_name;
2276 	}
2277 
2278 	if (got_path_is_child(path, a->status_path, a->status_path_len))
2279 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2280 		    path, NULL, NULL);
2281 	if (parent_path[0])
2282 		free(path);
2283 	return err;
2284 }
2285 
2286 static const struct got_error *
2287 report_single_file_status(const char *path, const char *ondisk_path,
2288 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2289 void *status_arg, struct got_repository *repo)
2290 {
2291 	struct got_fileindex_entry *ie;
2292 	struct stat sb;
2293 
2294 	ie = got_fileindex_entry_get(fileindex, path);
2295 	if (ie)
2296 		return report_file_status(ie, ondisk_path, status_cb,
2297 		    status_arg, repo);
2298 
2299 	if (lstat(ondisk_path, &sb) == -1) {
2300 		if (errno != ENOENT)
2301 			return got_error_from_errno2("lstat", ondisk_path);
2302 		return NULL;
2303 	}
2304 
2305 	if (S_ISREG(sb.st_mode))
2306 		return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED, path,
2307 		    NULL, NULL);
2308 
2309 	return NULL;
2310 }
2311 
2312 static const struct got_error *
2313 worktree_status(struct got_worktree *worktree, const char *path,
2314     struct got_fileindex *fileindex, struct got_repository *repo,
2315     got_worktree_status_cb status_cb, void *status_arg,
2316     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2317 {
2318 	const struct got_error *err = NULL;
2319 	DIR *workdir = NULL;
2320 	struct got_fileindex_diff_dir_cb fdiff_cb;
2321 	struct diff_dir_cb_arg arg;
2322 	char *ondisk_path = NULL;
2323 
2324 	if (asprintf(&ondisk_path, "%s%s%s",
2325 	    worktree->root_path, path[0] ? "/" : "", path) == -1)
2326 		return got_error_from_errno("asprintf");
2327 
2328 	workdir = opendir(ondisk_path);
2329 	if (workdir == NULL) {
2330 		if (errno != ENOTDIR && errno != ENOENT)
2331 			err = got_error_from_errno2("opendir", ondisk_path);
2332 		else
2333 			err = report_single_file_status(path, ondisk_path,
2334 			    fileindex, status_cb, status_arg, repo);
2335 	} else {
2336 		fdiff_cb.diff_old_new = status_old_new;
2337 		fdiff_cb.diff_old = status_old;
2338 		fdiff_cb.diff_new = status_new;
2339 		arg.fileindex = fileindex;
2340 		arg.worktree = worktree;
2341 		arg.status_path = path;
2342 		arg.status_path_len = strlen(path);
2343 		arg.repo = repo;
2344 		arg.status_cb = status_cb;
2345 		arg.status_arg = status_arg;
2346 		arg.cancel_cb = cancel_cb;
2347 		arg.cancel_arg = cancel_arg;
2348 		err = got_fileindex_diff_dir(fileindex, workdir,
2349 		    worktree->root_path, path, repo, &fdiff_cb, &arg);
2350 	}
2351 
2352 	if (workdir)
2353 		closedir(workdir);
2354 	free(ondisk_path);
2355 	return err;
2356 }
2357 
2358 const struct got_error *
2359 got_worktree_status(struct got_worktree *worktree,
2360     struct got_pathlist_head *paths, struct got_repository *repo,
2361     got_worktree_status_cb status_cb, void *status_arg,
2362     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2363 {
2364 	const struct got_error *err = NULL;
2365 	char *fileindex_path = NULL;
2366 	struct got_fileindex *fileindex = NULL;
2367 	struct got_pathlist_entry *pe;
2368 
2369 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2370 	if (err)
2371 		return err;
2372 
2373 	TAILQ_FOREACH(pe, paths, entry) {
2374 		err = worktree_status(worktree, pe->path, fileindex, repo,
2375 			status_cb, status_arg, cancel_cb, cancel_arg);
2376 		if (err)
2377 			break;
2378 	}
2379 	free(fileindex_path);
2380 	got_fileindex_free(fileindex);
2381 	return err;
2382 }
2383 
2384 const struct got_error *
2385 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2386     const char *arg)
2387 {
2388 	const struct got_error *err = NULL;
2389 	char *resolved, *cwd = NULL, *path = NULL;
2390 	size_t len;
2391 
2392 	*wt_path = NULL;
2393 
2394 	resolved = realpath(arg, NULL);
2395 	if (resolved == NULL) {
2396 		if (errno != ENOENT)
2397 			return got_error_from_errno2("realpath", arg);
2398 		cwd = getcwd(NULL, 0);
2399 		if (cwd == NULL)
2400 			return got_error_from_errno("getcwd");
2401 		if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2402 			err = got_error_from_errno("asprintf");
2403 			goto done;
2404 		}
2405 	}
2406 
2407 	if (strncmp(got_worktree_get_root_path(worktree), resolved,
2408 	    strlen(got_worktree_get_root_path(worktree)))) {
2409 		err = got_error(GOT_ERR_BAD_PATH);
2410 		goto done;
2411 	}
2412 
2413 	if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2414 		err = got_path_skip_common_ancestor(&path,
2415 		    got_worktree_get_root_path(worktree), resolved);
2416 		if (err)
2417 			goto done;
2418 	} else {
2419 		path = strdup("");
2420 		if (path == NULL) {
2421 			err = got_error_from_errno("strdup");
2422 			goto done;
2423 		}
2424 	}
2425 
2426 	/* XXX status walk can't deal with trailing slash! */
2427 	len = strlen(path);
2428 	while (len > 0 && path[len - 1] == '/') {
2429 		path[len - 1] = '\0';
2430 		len--;
2431 	}
2432 done:
2433 	free(resolved);
2434 	free(cwd);
2435 	if (err == NULL)
2436 		*wt_path = path;
2437 	else
2438 		free(path);
2439 	return err;
2440 }
2441 
2442 static const struct got_error *
2443 schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2444     const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2445     struct got_repository *repo)
2446 {
2447 	const struct got_error *err = NULL;
2448 	struct got_fileindex_entry *ie;
2449 
2450 	/* Re-adding an existing entry is a no-op. */
2451 	if (got_fileindex_entry_get(fileindex, relpath) != NULL)
2452 		return NULL;
2453 
2454 	err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2455 	if (err)
2456 		return err;
2457 
2458 	err = got_fileindex_entry_add(fileindex, ie);
2459 	if (err) {
2460 		got_fileindex_entry_free(ie);
2461 		return err;
2462 	}
2463 
2464 	return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2465 }
2466 
2467 const struct got_error *
2468 got_worktree_schedule_add(struct got_worktree *worktree,
2469     struct got_pathlist_head *ondisk_paths,
2470     got_worktree_status_cb status_cb, void *status_arg,
2471     struct got_repository *repo)
2472 {
2473 	struct got_fileindex *fileindex = NULL;
2474 	char *fileindex_path = NULL;
2475 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2476 	struct got_pathlist_entry *pe;
2477 
2478 	err = lock_worktree(worktree, LOCK_EX);
2479 	if (err)
2480 		return err;
2481 
2482 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2483 	if (err)
2484 		goto done;
2485 
2486 	TAILQ_FOREACH(pe, ondisk_paths, entry) {
2487 		char *relpath;
2488 		err = got_path_skip_common_ancestor(&relpath,
2489 		    got_worktree_get_root_path(worktree), pe->path);
2490 		if (err)
2491 			break;
2492 		err = schedule_addition(pe->path, fileindex, relpath,
2493 		    status_cb, status_arg, repo);
2494 		free(relpath);
2495 		if (err)
2496 			break;
2497 	}
2498 	sync_err = sync_fileindex(fileindex, fileindex_path);
2499 	if (sync_err && err == NULL)
2500 		err = sync_err;
2501 done:
2502 	free(fileindex_path);
2503 	if (fileindex)
2504 		got_fileindex_free(fileindex);
2505 	unlockerr = lock_worktree(worktree, LOCK_SH);
2506 	if (unlockerr && err == NULL)
2507 		err = unlockerr;
2508 	return err;
2509 }
2510 
2511 static const struct got_error *
2512 schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2513     const char *relpath, int delete_local_mods,
2514     got_worktree_status_cb status_cb, void *status_arg,
2515     struct got_repository *repo)
2516 {
2517 	const struct got_error *err = NULL;
2518 	struct got_fileindex_entry *ie = NULL;
2519 	unsigned char status;
2520 	struct stat sb;
2521 
2522 	ie = got_fileindex_entry_get(fileindex, relpath);
2523 	if (ie == NULL)
2524 		return got_error(GOT_ERR_BAD_PATH);
2525 
2526 	err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2527 	if (err)
2528 		return err;
2529 
2530 	if (status != GOT_STATUS_NO_CHANGE) {
2531 		if (status == GOT_STATUS_DELETE)
2532 			return got_error_set_errno(ENOENT, ondisk_path);
2533 		if (status != GOT_STATUS_MODIFY)
2534 			return got_error(GOT_ERR_FILE_STATUS);
2535 		if (!delete_local_mods)
2536 			return got_error(GOT_ERR_FILE_MODIFIED);
2537 	}
2538 
2539 	if (unlink(ondisk_path) != 0)
2540 		return got_error_from_errno2("unlink", ondisk_path);
2541 
2542 	got_fileindex_entry_mark_deleted_from_disk(ie);
2543 	return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2544 }
2545 
2546 const struct got_error *
2547 got_worktree_schedule_delete(struct got_worktree *worktree,
2548     struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2549     got_worktree_status_cb status_cb, void *status_arg,
2550     struct got_repository *repo)
2551 {
2552 	struct got_fileindex *fileindex = NULL;
2553 	char *fileindex_path = NULL;
2554 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2555 	struct got_pathlist_entry *pe;
2556 
2557 	err = lock_worktree(worktree, LOCK_EX);
2558 	if (err)
2559 		return err;
2560 
2561 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2562 	if (err)
2563 		goto done;
2564 
2565 	TAILQ_FOREACH(pe, ondisk_paths, entry) {
2566 		char *relpath;
2567 		err = got_path_skip_common_ancestor(&relpath,
2568 		    got_worktree_get_root_path(worktree), pe->path);
2569 		if (err)
2570 			break;
2571 		err = schedule_for_deletion(pe->path, fileindex, relpath,
2572 		    delete_local_mods, status_cb, status_arg, repo);
2573 		free(relpath);
2574 		if (err)
2575 			break;
2576 	}
2577 	sync_err = sync_fileindex(fileindex, fileindex_path);
2578 	if (sync_err && err == NULL)
2579 		err = sync_err;
2580 done:
2581 	free(fileindex_path);
2582 	if (fileindex)
2583 		got_fileindex_free(fileindex);
2584 	unlockerr = lock_worktree(worktree, LOCK_SH);
2585 	if (unlockerr && err == NULL)
2586 		err = unlockerr;
2587 	return err;
2588 }
2589 
2590 static const struct got_error *
2591 revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2592     const char *ondisk_path,
2593     got_worktree_checkout_cb progress_cb, void *progress_arg,
2594     struct got_repository *repo)
2595 {
2596 	const struct got_error *err = NULL;
2597 	char *relpath = NULL, *parent_path = NULL;
2598 	struct got_fileindex_entry *ie;
2599 	struct got_tree_object *tree = NULL;
2600 	struct got_object_id *tree_id = NULL;
2601 	const struct got_tree_entry *te;
2602 	char *tree_path = NULL, *te_name;
2603 	struct got_blob_object *blob = NULL;
2604 	unsigned char status;
2605 	struct stat sb;
2606 
2607 	err = got_path_skip_common_ancestor(&relpath,
2608 	    got_worktree_get_root_path(worktree), ondisk_path);
2609 	if (err)
2610 		goto done;
2611 
2612 	ie = got_fileindex_entry_get(fileindex, relpath);
2613 	if (ie == NULL) {
2614 		err = got_error(GOT_ERR_BAD_PATH);
2615 		goto done;
2616 	}
2617 
2618 	/* Construct in-repository path of tree which contains this blob. */
2619 	err = got_path_dirname(&parent_path, ie->path);
2620 	if (err) {
2621 		if (err->code != GOT_ERR_BAD_PATH)
2622 			goto done;
2623 		parent_path = strdup("/");
2624 		if (parent_path == NULL) {
2625 			err = got_error_from_errno("strdup");
2626 			goto done;
2627 		}
2628 	}
2629 	if (got_path_is_root_dir(worktree->path_prefix)) {
2630 		tree_path = strdup(parent_path);
2631 		if (tree_path == NULL) {
2632 			err = got_error_from_errno("strdup");
2633 			goto done;
2634 		}
2635 	} else {
2636 		if (got_path_is_root_dir(parent_path)) {
2637 			tree_path = strdup(worktree->path_prefix);
2638 			if (tree_path == NULL) {
2639 				err = got_error_from_errno("strdup");
2640 				goto done;
2641 			}
2642 		} else {
2643 			if (asprintf(&tree_path, "%s/%s",
2644 			    worktree->path_prefix, parent_path) == -1) {
2645 				err = got_error_from_errno("asprintf");
2646 				goto done;
2647 			}
2648 		}
2649 	}
2650 
2651 	err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2652 	if (err)
2653 		goto done;
2654 
2655 	err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2656 	    tree_path);
2657 	if (err) {
2658 		if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
2659 		    status == GOT_STATUS_ADD))
2660 			goto done;
2661 	} else {
2662 		err = got_object_open_as_tree(&tree, repo, tree_id);
2663 		if (err)
2664 			goto done;
2665 
2666 		te_name = basename(ie->path);
2667 		if (te_name == NULL) {
2668 			err = got_error_from_errno2("basename", ie->path);
2669 			goto done;
2670 		}
2671 
2672 		te = got_object_tree_find_entry(tree, te_name);
2673 		if (te == NULL && status != GOT_STATUS_ADD) {
2674 			err = got_error(GOT_ERR_NO_TREE_ENTRY);
2675 			goto done;
2676 		}
2677 	}
2678 
2679 	switch (status) {
2680 	case GOT_STATUS_ADD:
2681 		err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2682 		if (err)
2683 			goto done;
2684 		got_fileindex_entry_remove(fileindex, ie);
2685 		break;
2686 	case GOT_STATUS_DELETE:
2687 	case GOT_STATUS_MODIFY:
2688 	case GOT_STATUS_CONFLICT:
2689 	case GOT_STATUS_MISSING: {
2690 		struct got_object_id id;
2691 		memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2692 		err = got_object_open_as_blob(&blob, repo, &id, 8192);
2693 		if (err)
2694 			goto done;
2695 		err = install_blob(worktree, ondisk_path, ie->path,
2696 		    te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2697 		    progress_arg);
2698 		if (err)
2699 			goto done;
2700 		if (status == GOT_STATUS_DELETE) {
2701 			err = update_blob_fileindex_entry(worktree,
2702 			    fileindex, ie, ondisk_path, ie->path, blob, 1);
2703 			if (err)
2704 				goto done;
2705 		}
2706 		break;
2707 	}
2708 	default:
2709 			goto done;
2710 	}
2711 done:
2712 	free(relpath);
2713 	free(parent_path);
2714 	free(tree_path);
2715 	if (blob)
2716 		got_object_blob_close(blob);
2717 	if (tree)
2718 		got_object_tree_close(tree);
2719 	free(tree_id);
2720 	return err;
2721 }
2722 
2723 const struct got_error *
2724 got_worktree_revert(struct got_worktree *worktree,
2725     struct got_pathlist_head *ondisk_paths,
2726     got_worktree_checkout_cb progress_cb, void *progress_arg,
2727     struct got_repository *repo)
2728 {
2729 	struct got_fileindex *fileindex = NULL;
2730 	char *fileindex_path = NULL;
2731 	const struct got_error *err = NULL, *unlockerr = NULL;
2732 	const struct got_error *sync_err = NULL;
2733 	struct got_pathlist_entry *pe;
2734 
2735 	err = lock_worktree(worktree, LOCK_EX);
2736 	if (err)
2737 		return err;
2738 
2739 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2740 	if (err)
2741 		goto done;
2742 
2743 	TAILQ_FOREACH(pe, ondisk_paths, entry) {
2744 		err = revert_file(worktree, fileindex, pe->path,
2745 		    progress_cb, progress_arg, repo);
2746 		if (err)
2747 			break;
2748 	}
2749 	sync_err = sync_fileindex(fileindex, fileindex_path);
2750 	if (sync_err && err == NULL)
2751 		err = sync_err;
2752 done:
2753 	free(fileindex_path);
2754 	if (fileindex)
2755 		got_fileindex_free(fileindex);
2756 	unlockerr = lock_worktree(worktree, LOCK_SH);
2757 	if (unlockerr && err == NULL)
2758 		err = unlockerr;
2759 	return err;
2760 }
2761 
2762 static void
2763 free_commitable(struct got_commitable *ct)
2764 {
2765 	free(ct->path);
2766 	free(ct->in_repo_path);
2767 	free(ct->ondisk_path);
2768 	free(ct->blob_id);
2769 	free(ct->base_blob_id);
2770 	free(ct->base_commit_id);
2771 	free(ct);
2772 }
2773 
2774 struct collect_commitables_arg {
2775 	struct got_pathlist_head *commitable_paths;
2776 	struct got_repository *repo;
2777 	struct got_worktree *worktree;
2778 };
2779 
2780 static const struct got_error *
2781 collect_commitables(void *arg, unsigned char status, const char *relpath,
2782     struct got_object_id *blob_id, struct got_object_id *commit_id)
2783 {
2784 	struct collect_commitables_arg *a = arg;
2785 	const struct got_error *err = NULL;
2786 	struct got_commitable *ct = NULL;
2787 	struct got_pathlist_entry *new = NULL;
2788 	char *parent_path = NULL, *path = NULL;
2789 	struct stat sb;
2790 
2791 	if (status == GOT_STATUS_CONFLICT)
2792 		return got_error(GOT_ERR_COMMIT_CONFLICT);
2793 
2794 	if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2795 	    status != GOT_STATUS_DELETE)
2796 		return NULL;
2797 
2798 	if (asprintf(&path, "/%s", relpath) == -1) {
2799 		err = got_error_from_errno("asprintf");
2800 		goto done;
2801 	}
2802 	if (strcmp(path, "/") == 0) {
2803 		parent_path = strdup("");
2804 		if (parent_path == NULL)
2805 			return got_error_from_errno("strdup");
2806 	} else {
2807 		err = got_path_dirname(&parent_path, path);
2808 		if (err)
2809 			return err;
2810 	}
2811 
2812 	ct = calloc(1, sizeof(*ct));
2813 	if (ct == NULL) {
2814 		err = got_error_from_errno("calloc");
2815 		goto done;
2816 	}
2817 
2818 	if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2819 	    relpath) == -1) {
2820 		err = got_error_from_errno("asprintf");
2821 		goto done;
2822 	}
2823 	if (status == GOT_STATUS_DELETE) {
2824 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
2825 	} else {
2826 		if (lstat(ct->ondisk_path, &sb) != 0) {
2827 			err = got_error_from_errno2("lstat", ct->ondisk_path);
2828 			goto done;
2829 		}
2830 		ct->mode = sb.st_mode;
2831 	}
2832 
2833 	if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2834 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2835 	    relpath) == -1) {
2836 		err = got_error_from_errno("asprintf");
2837 		goto done;
2838 	}
2839 
2840 	ct->status = status;
2841 	ct->blob_id = NULL; /* will be filled in when blob gets created */
2842 	if (ct->status != GOT_STATUS_ADD) {
2843 		ct->base_blob_id = got_object_id_dup(blob_id);
2844 		if (ct->base_blob_id == NULL) {
2845 			err = got_error_from_errno("got_object_id_dup");
2846 			goto done;
2847 		}
2848 		ct->base_commit_id = got_object_id_dup(commit_id);
2849 		if (ct->base_commit_id == NULL) {
2850 			err = got_error_from_errno("got_object_id_dup");
2851 			goto done;
2852 		}
2853 	}
2854 	ct->path = strdup(path);
2855 	if (ct->path == NULL) {
2856 		err = got_error_from_errno("strdup");
2857 		goto done;
2858 	}
2859 	err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2860 done:
2861 	if (ct && (err || new == NULL))
2862 		free_commitable(ct);
2863 	free(parent_path);
2864 	free(path);
2865 	return err;
2866 }
2867 
2868 static const struct got_error *write_tree(struct got_object_id **,
2869     struct got_tree_object *, const char *, struct got_pathlist_head *,
2870     got_worktree_status_cb status_cb, void *status_arg,
2871     struct got_repository *);
2872 
2873 static const struct got_error *
2874 write_subtree(struct got_object_id **new_subtree_id,
2875     struct got_tree_entry *te, const char *parent_path,
2876     struct got_pathlist_head *commitable_paths,
2877     got_worktree_status_cb status_cb, void *status_arg,
2878     struct got_repository *repo)
2879 {
2880 	const struct got_error *err = NULL;
2881 	struct got_tree_object *subtree;
2882 	char *subpath;
2883 
2884 	if (asprintf(&subpath, "%s%s%s", parent_path,
2885 	    got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2886 		return got_error_from_errno("asprintf");
2887 
2888 	err = got_object_open_as_tree(&subtree, repo, te->id);
2889 	if (err)
2890 		return err;
2891 
2892 	err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2893 	    status_cb, status_arg, repo);
2894 	got_object_tree_close(subtree);
2895 	free(subpath);
2896 	return err;
2897 }
2898 
2899 static const struct got_error *
2900 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2901 {
2902 	const struct got_error *err = NULL;
2903 	char *ct_parent_path = NULL;
2904 
2905 	*match = 0;
2906 
2907 	if (strchr(ct->in_repo_path, '/') == NULL) {
2908 		*match = got_path_is_root_dir(path);
2909 		return NULL;
2910 	}
2911 
2912 	err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
2913 	if (err)
2914 		return err;
2915 	*match = (strcmp(path, ct_parent_path) == 0);
2916 	free(ct_parent_path);
2917 	return err;
2918 }
2919 
2920 static mode_t
2921 get_ct_file_mode(struct got_commitable *ct)
2922 {
2923 	return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2924 }
2925 
2926 static const struct got_error *
2927 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2928     struct got_tree_entry *te, struct got_commitable *ct)
2929 {
2930 	const struct got_error *err = NULL;
2931 
2932 	*new_te = NULL;
2933 
2934 	err = got_object_tree_entry_dup(new_te, te);
2935 	if (err)
2936 		goto done;
2937 
2938 	(*new_te)->mode = get_ct_file_mode(ct);
2939 
2940 	free((*new_te)->id);
2941 	(*new_te)->id = got_object_id_dup(ct->blob_id);
2942 	if ((*new_te)->id == NULL) {
2943 		err = got_error_from_errno("got_object_id_dup");
2944 		goto done;
2945 	}
2946 done:
2947 	if (err && *new_te) {
2948 		got_object_tree_entry_close(*new_te);
2949 		*new_te = NULL;
2950 	}
2951 	return err;
2952 }
2953 
2954 static const struct got_error *
2955 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2956     struct got_commitable *ct)
2957 {
2958 	const struct got_error *err = NULL;
2959 	char *ct_name;
2960 
2961 	 *new_te = NULL;
2962 
2963 	*new_te = calloc(1, sizeof(**new_te));
2964 	if (*new_te == NULL)
2965 		return got_error_from_errno("calloc");
2966 
2967 	ct_name = basename(ct->path);
2968 	if (ct_name == NULL) {
2969 		err = got_error_from_errno2("basename", ct->path);
2970 		goto done;
2971 	}
2972 	(*new_te)->name = strdup(ct_name);
2973 	if ((*new_te)->name == NULL) {
2974 		err = got_error_from_errno("strdup");
2975 		goto done;
2976 	}
2977 
2978 	(*new_te)->mode = get_ct_file_mode(ct);
2979 
2980 	(*new_te)->id = got_object_id_dup(ct->blob_id);
2981 	if ((*new_te)->id == NULL) {
2982 		err = got_error_from_errno("got_object_id_dup");
2983 		goto done;
2984 	}
2985 done:
2986 	if (err && *new_te) {
2987 		got_object_tree_entry_close(*new_te);
2988 		*new_te = NULL;
2989 	}
2990 	return err;
2991 }
2992 
2993 static const struct got_error *
2994 insert_tree_entry(struct got_tree_entry *new_te,
2995     struct got_pathlist_head *paths)
2996 {
2997 	const struct got_error *err = NULL;
2998 	struct got_pathlist_entry *new_pe;
2999 
3000 	err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3001 	if (err)
3002 		return err;
3003 	if (new_pe == NULL)
3004 		return got_error(GOT_ERR_TREE_DUP_ENTRY);
3005 	return NULL;
3006 }
3007 
3008 static const struct got_error *
3009 report_ct_status(struct got_commitable *ct,
3010     got_worktree_status_cb status_cb, void *status_arg)
3011 {
3012 	const char *ct_path = ct->path;
3013 	while (ct_path[0] == '/')
3014 		ct_path++;
3015 	return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id, NULL);
3016 }
3017 
3018 static const struct got_error *
3019 match_modified_subtree(int *modified, struct got_tree_entry *te,
3020     const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3021 {
3022 	const struct got_error *err = NULL;
3023 	struct got_pathlist_entry *pe;
3024 	char *te_path;
3025 
3026 	*modified = 0;
3027 
3028 	if (asprintf(&te_path, "%s%s%s", base_tree_path,
3029 	    got_path_is_root_dir(base_tree_path) ? "" : "/",
3030 	    te->name) == -1)
3031 		return got_error_from_errno("asprintf");
3032 
3033 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3034 		struct got_commitable *ct = pe->data;
3035 		*modified = got_path_is_child(ct->in_repo_path, te_path,
3036 		    strlen(te_path));
3037 		 if (*modified)
3038 			break;
3039 	}
3040 
3041 	free(te_path);
3042 	return err;
3043 }
3044 
3045 static const struct got_error *
3046 match_deleted_or_modified_ct(struct got_commitable **ctp,
3047     struct got_tree_entry *te, const char *base_tree_path,
3048     struct got_pathlist_head *commitable_paths)
3049 {
3050 	const struct got_error *err = NULL;
3051 	struct got_pathlist_entry *pe;
3052 
3053 	*ctp = NULL;
3054 
3055 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3056 		struct got_commitable *ct = pe->data;
3057 		char *ct_name = NULL;
3058 		int path_matches;
3059 
3060 		if (ct->status != GOT_STATUS_MODIFY &&
3061 		    ct->status != GOT_STATUS_DELETE)
3062 			continue;
3063 
3064 		if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3065 			continue;
3066 
3067 		 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3068 		 if (err)
3069 			return err;
3070 		if (!path_matches)
3071 			continue;
3072 
3073 		ct_name = basename(pe->path);
3074 		if (ct_name == NULL)
3075 			return got_error_from_errno2("basename", pe->path);
3076 
3077 		if (strcmp(te->name, ct_name) != 0)
3078 			continue;
3079 
3080 		*ctp = ct;
3081 		break;
3082 	}
3083 
3084 	return err;
3085 }
3086 
3087 static const struct got_error *
3088 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3089     const char *child_path, const char *path_base_tree,
3090     struct got_pathlist_head *commitable_paths,
3091     got_worktree_status_cb status_cb, void *status_arg,
3092     struct got_repository *repo)
3093 {
3094 	const struct got_error *err = NULL;
3095 	struct got_tree_entry *new_te;
3096 	char *subtree_path;
3097 
3098 	*new_tep = NULL;
3099 
3100 	if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3101 	    got_path_is_root_dir(path_base_tree) ? "" : "/",
3102 	    child_path) == -1)
3103 		return got_error_from_errno("asprintf");
3104 
3105 	new_te = calloc(1, sizeof(*new_te));
3106 	new_te->mode = S_IFDIR;
3107 	new_te->name = strdup(child_path);
3108 	if (new_te->name == NULL) {
3109 		err = got_error_from_errno("strdup");
3110 		got_object_tree_entry_close(new_te);
3111 		goto done;
3112 	}
3113 	err = write_tree(&new_te->id, NULL, subtree_path,
3114 	    commitable_paths, status_cb, status_arg, repo);
3115 	if (err) {
3116 		got_object_tree_entry_close(new_te);
3117 		goto done;
3118 	}
3119 done:
3120 	free(subtree_path);
3121 	if (err == NULL)
3122 		*new_tep = new_te;
3123 	return err;
3124 }
3125 
3126 static const struct got_error *
3127 write_tree(struct got_object_id **new_tree_id,
3128     struct got_tree_object *base_tree, const char *path_base_tree,
3129     struct got_pathlist_head *commitable_paths,
3130     got_worktree_status_cb status_cb, void *status_arg,
3131     struct got_repository *repo)
3132 {
3133 	const struct got_error *err = NULL;
3134 	const struct got_tree_entries *base_entries = NULL;
3135 	struct got_pathlist_head paths;
3136 	struct got_tree_entries new_tree_entries;
3137 	struct got_tree_entry *te, *new_te = NULL;
3138 	struct got_pathlist_entry *pe;
3139 
3140 	TAILQ_INIT(&paths);
3141 	new_tree_entries.nentries = 0;
3142 	SIMPLEQ_INIT(&new_tree_entries.head);
3143 
3144 	/* Insert, and recurse into, newly added entries first. */
3145 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3146 		struct got_commitable *ct = pe->data;
3147 		char *child_path = NULL, *slash;
3148 
3149 		if (ct->status != GOT_STATUS_ADD ||
3150 		    (ct->flags & GOT_COMMITABLE_ADDED))
3151 			continue;
3152 
3153 		 if (!got_path_is_child(pe->path, path_base_tree,
3154 		     strlen(path_base_tree)))
3155 			continue;
3156 
3157 		err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3158 		    pe->path);
3159 		if (err)
3160 			goto done;
3161 
3162 		slash = strchr(child_path, '/');
3163 		if (slash == NULL) {
3164 			err = alloc_added_blob_tree_entry(&new_te, ct);
3165 			if (err)
3166 				goto done;
3167 			err = report_ct_status(ct, status_cb, status_arg);
3168 			if (err)
3169 				goto done;
3170 			ct->flags |= GOT_COMMITABLE_ADDED;
3171 			err = insert_tree_entry(new_te, &paths);
3172 			if (err)
3173 				goto done;
3174 		} else {
3175 			*slash = '\0'; /* trim trailing path components */
3176 			if (base_tree == NULL ||
3177 			    got_object_tree_find_entry(base_tree, child_path)
3178 			    == NULL) {
3179 				err = make_subtree_for_added_blob(&new_te,
3180 				    child_path, path_base_tree,
3181 				    commitable_paths, status_cb, status_arg,
3182 				    repo);
3183 				if (err)
3184 					goto done;
3185 				err = insert_tree_entry(new_te, &paths);
3186 				if (err)
3187 					goto done;
3188 			}
3189 		}
3190 	}
3191 
3192 	if (base_tree) {
3193 		/* Handle modified and deleted entries. */
3194 		base_entries = got_object_tree_get_entries(base_tree);
3195 		SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3196 			struct got_commitable *ct = NULL;
3197 
3198 			if (S_ISDIR(te->mode)) {
3199 				int modified;
3200 				err = got_object_tree_entry_dup(&new_te, te);
3201 				if (err)
3202 					goto done;
3203 				err = match_modified_subtree(&modified, te,
3204 				    path_base_tree, commitable_paths);
3205 				if (err)
3206 					goto done;
3207 				/* Avoid recursion into unmodified subtrees. */
3208 				if (modified) {
3209 					free(new_te->id);
3210 					err = write_subtree(&new_te->id, te,
3211 					    path_base_tree, commitable_paths,
3212 					    status_cb, status_arg, repo);
3213 					if (err)
3214 						goto done;
3215 				}
3216 				err = insert_tree_entry(new_te, &paths);
3217 				if (err)
3218 					goto done;
3219 				continue;
3220 			}
3221 
3222 			err = match_deleted_or_modified_ct(&ct, te,
3223 			    path_base_tree, commitable_paths);
3224 			if (ct) {
3225 				/* NB: Deleted entries get dropped here. */
3226 				if (ct->status == GOT_STATUS_MODIFY) {
3227 					err = alloc_modified_blob_tree_entry(
3228 					    &new_te, te, ct);
3229 					if (err)
3230 						goto done;
3231 					err = insert_tree_entry(new_te, &paths);
3232 					if (err)
3233 						goto done;
3234 				}
3235 				err = report_ct_status(ct, status_cb,
3236 				    status_arg);
3237 				if (err)
3238 					goto done;
3239 			} else {
3240 				/* Entry is unchanged; just copy it. */
3241 				err = got_object_tree_entry_dup(&new_te, te);
3242 				if (err)
3243 					goto done;
3244 				err = insert_tree_entry(new_te, &paths);
3245 				if (err)
3246 					goto done;
3247 			}
3248 		}
3249 	}
3250 
3251 	/* Write new list of entries; deleted entries have been dropped. */
3252 	TAILQ_FOREACH(pe, &paths, entry) {
3253 		struct got_tree_entry *te = pe->data;
3254 		new_tree_entries.nentries++;
3255 		SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3256 	}
3257 	err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3258 done:
3259 	got_object_tree_entries_close(&new_tree_entries);
3260 	got_pathlist_free(&paths);
3261 	return err;
3262 }
3263 
3264 static const struct got_error *
3265 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3266     struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3267 {
3268 	const struct got_error *err = NULL;
3269 	struct got_pathlist_entry *pe;
3270 
3271 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3272 		struct got_fileindex_entry *ie;
3273 		struct got_commitable *ct = pe->data;
3274 
3275 		ie = got_fileindex_entry_get(fileindex, pe->path);
3276 		if (ie) {
3277 			if (ct->status == GOT_STATUS_DELETE) {
3278 				got_fileindex_entry_remove(fileindex, ie);
3279 				got_fileindex_entry_free(ie);
3280 			} else
3281 				err = got_fileindex_entry_update(ie,
3282 				    ct->ondisk_path, ct->blob_id->sha1,
3283 				    new_base_commit_id->sha1, 1);
3284 		} else {
3285 			err = got_fileindex_entry_alloc(&ie,
3286 			    ct->ondisk_path, pe->path, ct->blob_id->sha1,
3287 			    new_base_commit_id->sha1);
3288 			if (err)
3289 				break;
3290 			err = got_fileindex_entry_add(fileindex, ie);
3291 			if (err)
3292 				break;
3293 		}
3294 	}
3295 	return err;
3296 }
3297 
3298 static const struct got_error *
3299 check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3300 	struct got_object_id *head_commit_id)
3301 {
3302 	const struct got_error *err = NULL;
3303 	struct got_object_id *id = NULL;
3304 	struct got_commit_object *commit = NULL;
3305 	const char *ct_path = ct->in_repo_path;
3306 
3307 	while (ct_path[0] == '/')
3308 		ct_path++;
3309 
3310 	if (ct->status != GOT_STATUS_ADD) {
3311 		/* Trivial case: base commit == head commit */
3312 		if (got_object_id_cmp(ct->base_commit_id, head_commit_id) == 0)
3313 			return NULL;
3314 		/*
3315 		 * Ensure file content which local changes were based
3316 		 * on matches file content in the branch head.
3317 		 */
3318 		err = got_object_id_by_path(&id, repo, head_commit_id, ct_path);
3319 		if (err) {
3320 			if (err->code != GOT_ERR_NO_TREE_ENTRY)
3321 				goto done;
3322 			err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3323 			goto done;
3324 		} else if (got_object_id_cmp(id, ct->base_blob_id) != 0)
3325 			err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3326 	} else {
3327 		/* Require that added files don't exist in the branch head. */
3328 		err = got_object_id_by_path(&id, repo, head_commit_id, ct_path);
3329 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3330 			goto done;
3331 		err = id ? got_error(GOT_ERR_COMMIT_OUT_OF_DATE) : NULL;
3332 	}
3333 done:
3334 	if (commit)
3335 		got_object_commit_close(commit);
3336 	free(id);
3337 	return err;
3338 }
3339 
3340 const struct got_error *
3341 commit_worktree(struct got_object_id **new_commit_id,
3342     struct got_pathlist_head *commitable_paths,
3343     struct got_object_id *head_commit_id, struct got_worktree *worktree,
3344     const char *author, const char *committer,
3345     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3346     got_worktree_status_cb status_cb, void *status_arg,
3347     struct got_repository *repo)
3348 {
3349 	const struct got_error *err = NULL, *unlockerr = NULL;
3350 	struct got_pathlist_entry *pe;
3351 	const char *head_ref_name = NULL;
3352 	struct got_commit_object *head_commit = NULL;
3353 	struct got_reference *head_ref2 = NULL;
3354 	struct got_object_id *head_commit_id2 = NULL;
3355 	struct got_tree_object *head_tree = NULL;
3356 	struct got_object_id *new_tree_id = NULL;
3357 	struct got_object_id_queue parent_ids;
3358 	struct got_object_qid *pid = NULL;
3359 	char *logmsg = NULL;
3360 
3361 	*new_commit_id = NULL;
3362 
3363 	SIMPLEQ_INIT(&parent_ids);
3364 
3365 	err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3366 	if (err)
3367 		goto done;
3368 
3369 	err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3370 	if (err)
3371 		goto done;
3372 
3373 	if (commit_msg_cb != NULL) {
3374 		err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3375 		if (err)
3376 			goto done;
3377 	}
3378 
3379 	if (logmsg == NULL || strlen(logmsg) == 0) {
3380 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3381 		goto done;
3382 	}
3383 
3384 	/* Create blobs from added and modified files and record their IDs. */
3385 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3386 		struct got_commitable *ct = pe->data;
3387 		char *ondisk_path;
3388 
3389 		if (ct->status != GOT_STATUS_ADD &&
3390 		    ct->status != GOT_STATUS_MODIFY)
3391 			continue;
3392 
3393 		if (asprintf(&ondisk_path, "%s/%s",
3394 		    worktree->root_path, pe->path) == -1) {
3395 			err = got_error_from_errno("asprintf");
3396 			goto done;
3397 		}
3398 		err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3399 		free(ondisk_path);
3400 		if (err)
3401 			goto done;
3402 	}
3403 
3404 	/* Recursively write new tree objects. */
3405 	err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3406 	    status_cb, status_arg, repo);
3407 	if (err)
3408 		goto done;
3409 
3410 	err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3411 	if (err)
3412 		goto done;
3413 	SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3414 	err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3415 	    1, author, time(NULL), committer, time(NULL), logmsg, repo);
3416 	got_object_qid_free(pid);
3417 	if (logmsg != NULL)
3418 		free(logmsg);
3419 	if (err)
3420 		goto done;
3421 
3422 	/* Check if a concurrent commit to our branch has occurred. */
3423 	head_ref_name = got_worktree_get_head_ref_name(worktree);
3424 	if (head_ref_name == NULL) {
3425 		err = got_error_from_errno("got_worktree_get_head_ref_name");
3426 		goto done;
3427 	}
3428 	/* Lock the reference here to prevent concurrent modification. */
3429 	err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3430 	if (err)
3431 		goto done;
3432 	err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3433 	if (err)
3434 		goto done;
3435 	if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3436 		err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3437 		goto done;
3438 	}
3439 	/* Update branch head in repository. */
3440 	err = got_ref_change_ref(head_ref2, *new_commit_id);
3441 	if (err)
3442 		goto done;
3443 	err = got_ref_write(head_ref2, repo);
3444 	if (err)
3445 		goto done;
3446 
3447 	err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3448 	if (err)
3449 		goto done;
3450 
3451 	err = ref_base_commit(worktree, repo);
3452 	if (err)
3453 		goto done;
3454 done:
3455 	if (head_tree)
3456 		got_object_tree_close(head_tree);
3457 	if (head_commit)
3458 		got_object_commit_close(head_commit);
3459 	free(head_commit_id2);
3460 	if (head_ref2) {
3461 		unlockerr = got_ref_unlock(head_ref2);
3462 		if (unlockerr && err == NULL)
3463 			err = unlockerr;
3464 		got_ref_close(head_ref2);
3465 	}
3466 	return err;
3467 }
3468 
3469 static const struct got_error *
3470 check_path_is_commitable(const char *path,
3471     struct got_pathlist_head *commitable_paths)
3472 {
3473 	struct got_pathlist_entry *cpe = NULL;
3474 	size_t path_len = strlen(path);
3475 
3476 	TAILQ_FOREACH(cpe, commitable_paths, entry) {
3477 		struct got_commitable *ct = cpe->data;
3478 		const char *ct_path = ct->path;
3479 
3480 		while (ct_path[0] == '/')
3481 			ct_path++;
3482 
3483 		if (strcmp(path, ct_path) == 0 ||
3484 		    got_path_is_child(ct_path, path, path_len))
3485 			break;
3486 	}
3487 
3488 	if (cpe == NULL)
3489 		return got_error_path(path, GOT_ERR_BAD_PATH);
3490 
3491 	return NULL;
3492 }
3493 
3494 const struct got_error *
3495 got_worktree_commit(struct got_object_id **new_commit_id,
3496     struct got_worktree *worktree, struct got_pathlist_head *paths,
3497     const char *author, const char *committer,
3498     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3499     got_worktree_status_cb status_cb, void *status_arg,
3500     struct got_repository *repo)
3501 {
3502 	const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3503 	struct got_fileindex *fileindex = NULL;
3504 	char *fileindex_path = NULL;
3505 	struct got_pathlist_head commitable_paths;
3506 	struct collect_commitables_arg cc_arg;
3507 	struct got_pathlist_entry *pe;
3508 	struct got_reference *head_ref = NULL;
3509 	struct got_object_id *head_commit_id = NULL;
3510 
3511 	*new_commit_id = NULL;
3512 
3513 	TAILQ_INIT(&commitable_paths);
3514 
3515 	err = lock_worktree(worktree, LOCK_EX);
3516 	if (err)
3517 		goto done;
3518 
3519 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3520 	if (err)
3521 		goto done;
3522 
3523 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
3524 	if (err)
3525 		goto done;
3526 
3527 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3528 	if (err)
3529 		goto done;
3530 
3531 	cc_arg.commitable_paths = &commitable_paths;
3532 	cc_arg.worktree = worktree;
3533 	cc_arg.repo = repo;
3534 	TAILQ_FOREACH(pe, paths, entry) {
3535 		err = worktree_status(worktree, pe->path, fileindex, repo,
3536 		    collect_commitables, &cc_arg, NULL, NULL);
3537 		if (err)
3538 			goto done;
3539 	}
3540 
3541 	if (TAILQ_EMPTY(&commitable_paths)) {
3542 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3543 		goto done;
3544 	}
3545 
3546 	TAILQ_FOREACH(pe, paths, entry) {
3547 		err = check_path_is_commitable(pe->path, &commitable_paths);
3548 		if (err)
3549 			goto done;
3550 	}
3551 
3552 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
3553 		struct got_commitable *ct = pe->data;
3554 		err = check_ct_out_of_date(ct, repo, head_commit_id);
3555 		if (err)
3556 			goto done;
3557 	}
3558 
3559 	err = commit_worktree(new_commit_id, &commitable_paths,
3560 	    head_commit_id, worktree, author, committer,
3561 	    commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3562 	if (err)
3563 		goto done;
3564 
3565 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3566 	    fileindex);
3567 	sync_err = sync_fileindex(fileindex, fileindex_path);
3568 	if (sync_err && err == NULL)
3569 		err = sync_err;
3570 done:
3571 	if (fileindex)
3572 		got_fileindex_free(fileindex);
3573 	free(fileindex_path);
3574 	unlockerr = lock_worktree(worktree, LOCK_SH);
3575 	if (unlockerr && err == NULL)
3576 		err = unlockerr;
3577 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
3578 		struct got_commitable *ct = pe->data;
3579 		free_commitable(ct);
3580 	}
3581 	got_pathlist_free(&commitable_paths);
3582 	return err;
3583 }
3584 
3585 const char *
3586 got_commitable_get_path(struct got_commitable *ct)
3587 {
3588 	return ct->path;
3589 }
3590 
3591 unsigned int
3592 got_commitable_get_status(struct got_commitable *ct)
3593 {
3594 	return ct->status;
3595 }
3596 
3597 struct check_rebase_ok_arg {
3598 	struct got_worktree *worktree;
3599 	struct got_repository *repo;
3600 };
3601 
3602 static const struct got_error *
3603 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3604 {
3605 	const struct got_error *err = NULL;
3606 	struct check_rebase_ok_arg *a = arg;
3607 	unsigned char status;
3608 	struct stat sb;
3609 	char *ondisk_path;
3610 
3611 	/* Reject rebase of a work tree with mixed base commits. */
3612 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3613 	    SHA1_DIGEST_LENGTH))
3614 		return got_error(GOT_ERR_MIXED_COMMITS);
3615 
3616 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3617 	    == -1)
3618 		return got_error_from_errno("asprintf");
3619 
3620 	/* Reject rebase of a work tree with modified or conflicted files. */
3621 	err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3622 	free(ondisk_path);
3623 	if (err)
3624 		return err;
3625 
3626 	if (status != GOT_STATUS_NO_CHANGE)
3627 		return got_error(GOT_ERR_MODIFIED);
3628 
3629 	return NULL;
3630 }
3631 
3632 const struct got_error *
3633 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3634     struct got_reference **tmp_branch, struct got_fileindex **fileindex,
3635     struct got_worktree *worktree, struct got_reference *branch,
3636     struct got_repository *repo)
3637 {
3638 	const struct got_error *err = NULL;
3639 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3640 	char *branch_ref_name = NULL;
3641 	char *fileindex_path = NULL;
3642 	struct check_rebase_ok_arg ok_arg;
3643 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3644 
3645 	*new_base_branch_ref = NULL;
3646 	*tmp_branch = NULL;
3647 	*fileindex = NULL;
3648 
3649 	err = lock_worktree(worktree, LOCK_EX);
3650 	if (err)
3651 		return err;
3652 
3653 	err = open_fileindex(fileindex, &fileindex_path, worktree);
3654 	if (err)
3655 		goto done;
3656 
3657 	ok_arg.worktree = worktree;
3658 	ok_arg.repo = repo;
3659 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
3660 	    &ok_arg);
3661 	if (err)
3662 		goto done;
3663 
3664 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3665 	if (err)
3666 		goto done;
3667 
3668 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3669 	if (err)
3670 		goto done;
3671 
3672 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3673 	if (err)
3674 		goto done;
3675 
3676 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3677 	    0);
3678 	if (err)
3679 		goto done;
3680 
3681 	err = got_ref_alloc_symref(new_base_branch_ref,
3682 	    new_base_branch_ref_name, wt_branch);
3683 	if (err)
3684 		goto done;
3685 	err = got_ref_write(*new_base_branch_ref, repo);
3686 	if (err)
3687 		goto done;
3688 
3689 	/* TODO Lock original branch's ref while rebasing? */
3690 
3691 	err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3692 	if (err)
3693 		goto done;
3694 
3695 	err = got_ref_write(branch_ref, repo);
3696 	if (err)
3697 		goto done;
3698 
3699 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
3700 	    worktree->base_commit_id);
3701 	if (err)
3702 		goto done;
3703 	err = got_ref_write(*tmp_branch, repo);
3704 	if (err)
3705 		goto done;
3706 
3707 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
3708 	if (err)
3709 		goto done;
3710 done:
3711 	free(fileindex_path);
3712 	free(tmp_branch_name);
3713 	free(new_base_branch_ref_name);
3714 	free(branch_ref_name);
3715 	if (branch_ref)
3716 		got_ref_close(branch_ref);
3717 	if (wt_branch)
3718 		got_ref_close(wt_branch);
3719 	if (err) {
3720 		if (*new_base_branch_ref) {
3721 			got_ref_close(*new_base_branch_ref);
3722 			*new_base_branch_ref = NULL;
3723 		}
3724 		if (*tmp_branch) {
3725 			got_ref_close(*tmp_branch);
3726 			*tmp_branch = NULL;
3727 		}
3728 		if (*fileindex) {
3729 			got_fileindex_free(*fileindex);
3730 			*fileindex = NULL;
3731 		}
3732 		lock_worktree(worktree, LOCK_SH);
3733 	}
3734 	return err;
3735 }
3736 
3737 const struct got_error *
3738 got_worktree_rebase_continue(struct got_object_id **commit_id,
3739     struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3740     struct got_reference **branch, struct got_fileindex **fileindex,
3741     struct got_worktree *worktree, struct got_repository *repo)
3742 {
3743 	const struct got_error *err;
3744 	char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3745 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3746 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3747 	char *fileindex_path = NULL;
3748 
3749 	*commit_id = NULL;
3750 	*new_base_branch = NULL;
3751 	*tmp_branch = NULL;
3752 	*branch = NULL;
3753 	*fileindex = NULL;
3754 
3755 	err = lock_worktree(worktree, LOCK_EX);
3756 	if (err)
3757 		return err;
3758 
3759 	err = open_fileindex(fileindex, &fileindex_path, worktree);
3760 	if (err)
3761 		goto done;
3762 
3763 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3764 	if (err)
3765 		return err;
3766 
3767 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3768 	if (err)
3769 		goto done;
3770 
3771 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3772 	if (err)
3773 		goto done;
3774 
3775 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3776 	if (err)
3777 		goto done;
3778 
3779 	err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
3780 	if (err)
3781 		goto done;
3782 
3783 	err = got_ref_open(branch, repo,
3784 	    got_ref_get_symref_target(branch_ref), 0);
3785 	if (err)
3786 		goto done;
3787 
3788 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3789 	if (err)
3790 		goto done;
3791 
3792 	err = got_ref_resolve(commit_id, repo, commit_ref);
3793 	if (err)
3794 		goto done;
3795 
3796 	err = got_ref_open(new_base_branch, repo,
3797 	    new_base_branch_ref_name, 0);
3798 	if (err)
3799 		goto done;
3800 
3801 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
3802 	if (err)
3803 		goto done;
3804 done:
3805 	free(commit_ref_name);
3806 	free(branch_ref_name);
3807 	free(fileindex_path);
3808 	if (commit_ref)
3809 		got_ref_close(commit_ref);
3810 	if (branch_ref)
3811 		got_ref_close(branch_ref);
3812 	if (err) {
3813 		free(*commit_id);
3814 		*commit_id = NULL;
3815 		if (*tmp_branch) {
3816 			got_ref_close(*tmp_branch);
3817 			*tmp_branch = NULL;
3818 		}
3819 		if (*new_base_branch) {
3820 			got_ref_close(*new_base_branch);
3821 			*new_base_branch = NULL;
3822 		}
3823 		if (*branch) {
3824 			got_ref_close(*branch);
3825 			*branch = NULL;
3826 		}
3827 		if (*fileindex) {
3828 			got_fileindex_free(*fileindex);
3829 			*fileindex = NULL;
3830 		}
3831 		lock_worktree(worktree, LOCK_SH);
3832 	}
3833 	return err;
3834 }
3835 
3836 const struct got_error *
3837 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
3838 {
3839 	const struct got_error *err;
3840 	char *tmp_branch_name = NULL;
3841 
3842 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3843 	if (err)
3844 		return err;
3845 
3846 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
3847 	free(tmp_branch_name);
3848 	return NULL;
3849 }
3850 
3851 static const struct got_error *
3852 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
3853     char **logmsg, void *arg)
3854 {
3855 	*logmsg = arg;
3856 	return NULL;
3857 }
3858 
3859 static const struct got_error *
3860 rebase_status(void *arg, unsigned char status, const char *path,
3861     struct got_object_id *blob_id, struct got_object_id *commit_id)
3862 {
3863 	return NULL;
3864 }
3865 
3866 struct collect_merged_paths_arg {
3867 	got_worktree_checkout_cb progress_cb;
3868 	void *progress_arg;
3869 	struct got_pathlist_head *merged_paths;
3870 };
3871 
3872 static const struct got_error *
3873 collect_merged_paths(void *arg, unsigned char status, const char *path)
3874 {
3875 	const struct got_error *err;
3876 	struct collect_merged_paths_arg *a = arg;
3877 	char *p;
3878 	struct got_pathlist_entry *new;
3879 
3880 	err = (*a->progress_cb)(a->progress_arg, status, path);
3881 	if (err)
3882 		return err;
3883 
3884 	if (status != GOT_STATUS_MERGE &&
3885 	    status != GOT_STATUS_ADD &&
3886 	    status != GOT_STATUS_DELETE &&
3887 	    status != GOT_STATUS_CONFLICT)
3888 		return NULL;
3889 
3890 	p = strdup(path);
3891 	if (p == NULL)
3892 		return got_error_from_errno("strdup");
3893 
3894 	err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
3895 	if (err || new == NULL)
3896 		free(p);
3897 	return err;
3898 }
3899 
3900 void
3901 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
3902 {
3903 	struct got_pathlist_entry *pe;
3904 
3905 	TAILQ_FOREACH(pe, merged_paths, entry)
3906 		free((char *)pe->path);
3907 
3908 	got_pathlist_free(merged_paths);
3909 }
3910 
3911 static const struct got_error *
3912 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
3913     struct got_repository *repo)
3914 {
3915 	const struct got_error *err;
3916 	struct got_reference *commit_ref = NULL;
3917 
3918 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3919 	if (err) {
3920 		if (err->code != GOT_ERR_NOT_REF)
3921 			goto done;
3922 		err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
3923 		if (err)
3924 			goto done;
3925 		err = got_ref_write(commit_ref, repo);
3926 		if (err)
3927 			goto done;
3928 	} else {
3929 		struct got_object_id *stored_id;
3930 		int cmp;
3931 
3932 		err = got_ref_resolve(&stored_id, repo, commit_ref);
3933 		if (err)
3934 			goto done;
3935 		cmp = got_object_id_cmp(commit_id, stored_id);
3936 		free(stored_id);
3937 		if (cmp != 0) {
3938 			err = got_error(GOT_ERR_REBASE_COMMITID);
3939 			goto done;
3940 		}
3941 	}
3942 done:
3943 	if (commit_ref)
3944 		got_ref_close(commit_ref);
3945 	return err;
3946 }
3947 
3948 static const struct got_error *
3949 rebase_merge_files(struct got_pathlist_head *merged_paths,
3950     const char *commit_ref_name, struct got_worktree *worktree,
3951     struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
3952     struct got_object_id *commit_id, struct got_repository *repo,
3953     got_worktree_checkout_cb progress_cb, void *progress_arg,
3954     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3955 {
3956 	const struct got_error *err;
3957 	struct got_reference *commit_ref = NULL;
3958 	struct collect_merged_paths_arg cmp_arg;
3959 	char *fileindex_path;
3960 
3961 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
3962 
3963 	err = get_fileindex_path(&fileindex_path, worktree);
3964 	if (err)
3965 		return err;
3966 
3967 	cmp_arg.progress_cb = progress_cb;
3968 	cmp_arg.progress_arg = progress_arg;
3969 	cmp_arg.merged_paths = merged_paths;
3970 	err = merge_files(worktree, fileindex, fileindex_path,
3971 	    parent_commit_id, commit_id, repo, collect_merged_paths,
3972 	    &cmp_arg, cancel_cb, cancel_arg);
3973 	if (commit_ref)
3974 		got_ref_close(commit_ref);
3975 	return err;
3976 }
3977 
3978 const struct got_error *
3979 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
3980     struct got_worktree *worktree, struct got_fileindex *fileindex,
3981     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
3982     struct got_repository *repo,
3983     got_worktree_checkout_cb progress_cb, void *progress_arg,
3984     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3985 {
3986 	const struct got_error *err;
3987 	char *commit_ref_name;
3988 
3989 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3990 	if (err)
3991 		return err;
3992 
3993 	err = store_commit_id(commit_ref_name, commit_id, repo);
3994 	if (err)
3995 		goto done;
3996 
3997 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
3998 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
3999 	    progress_arg, cancel_cb, cancel_arg);
4000 done:
4001 	free(commit_ref_name);
4002 	return err;
4003 }
4004 
4005 const struct got_error *
4006 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4007     struct got_worktree *worktree, struct got_fileindex *fileindex,
4008     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4009     struct got_repository *repo,
4010     got_worktree_checkout_cb progress_cb, void *progress_arg,
4011     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4012 {
4013 	const struct got_error *err;
4014 	char *commit_ref_name;
4015 
4016 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4017 	if (err)
4018 		return err;
4019 
4020 	err = store_commit_id(commit_ref_name, commit_id, repo);
4021 	if (err)
4022 		goto done;
4023 
4024 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4025 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
4026 	    progress_arg, cancel_cb, cancel_arg);
4027 done:
4028 	free(commit_ref_name);
4029 	return err;
4030 }
4031 
4032 static const struct got_error *
4033 rebase_commit(struct got_object_id **new_commit_id,
4034     struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4035     struct got_worktree *worktree, struct got_fileindex *fileindex,
4036     struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4037     const char *new_logmsg, struct got_repository *repo)
4038 {
4039 	const struct got_error *err, *sync_err;
4040 	struct got_pathlist_head commitable_paths;
4041 	struct collect_commitables_arg cc_arg;
4042 	char *fileindex_path = NULL;
4043 	struct got_reference *head_ref = NULL;
4044 	struct got_object_id *head_commit_id = NULL;
4045 	char *logmsg = NULL;
4046 
4047 	TAILQ_INIT(&commitable_paths);
4048 	*new_commit_id = NULL;
4049 
4050 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
4051 
4052 	err = get_fileindex_path(&fileindex_path, worktree);
4053 	if (err)
4054 		return err;
4055 
4056 	cc_arg.commitable_paths = &commitable_paths;
4057 	cc_arg.worktree = worktree;
4058 	cc_arg.repo = repo;
4059 	/*
4060 	 * If possible get the status of individual files directly to
4061 	 * avoid crawling the entire work tree once per rebased commit.
4062 	 * TODO: Ideally, merged_paths would contain a list of commitables
4063 	 * we could use so we could skip worktree_status() entirely.
4064 	 */
4065 	if (merged_paths) {
4066 		struct got_pathlist_entry *pe;
4067 		if (TAILQ_EMPTY(merged_paths)) {
4068 			err = got_error(GOT_ERR_NO_MERGED_PATHS);
4069 			goto done;
4070 		}
4071 		TAILQ_FOREACH(pe, merged_paths, entry) {
4072 			err = worktree_status(worktree, pe->path, fileindex,
4073 			    repo, collect_commitables, &cc_arg, NULL, NULL);
4074 			if (err)
4075 				goto done;
4076 		}
4077 	} else {
4078 		err = worktree_status(worktree, "", fileindex, repo,
4079 		    collect_commitables, &cc_arg, NULL, NULL);
4080 		if (err)
4081 			goto done;
4082 	}
4083 
4084 	if (TAILQ_EMPTY(&commitable_paths)) {
4085 		/* No-op change; commit will be elided. */
4086 		err = got_ref_delete(commit_ref, repo);
4087 		if (err)
4088 			goto done;
4089 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4090 		goto done;
4091 	}
4092 
4093 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4094 	if (err)
4095 		goto done;
4096 
4097 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
4098 	if (err)
4099 		goto done;
4100 
4101 	if (new_logmsg)
4102 		logmsg = strdup(new_logmsg);
4103 	else
4104 		logmsg = strdup(got_object_commit_get_logmsg(orig_commit));
4105 	if (logmsg == NULL)
4106 		return got_error_from_errno("strdup");
4107 
4108 	err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4109 	    worktree, got_object_commit_get_author(orig_commit),
4110 	    got_object_commit_get_committer(orig_commit),
4111 	    collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4112 	if (err)
4113 		goto done;
4114 
4115 	err = got_ref_change_ref(tmp_branch, *new_commit_id);
4116 	if (err)
4117 		goto done;
4118 
4119 	err = got_ref_delete(commit_ref, repo);
4120 	if (err)
4121 		goto done;
4122 
4123 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4124 	    fileindex);
4125 	sync_err = sync_fileindex(fileindex, fileindex_path);
4126 	if (sync_err && err == NULL)
4127 		err = sync_err;
4128 done:
4129 	free(fileindex_path);
4130 	free(head_commit_id);
4131 	if (head_ref)
4132 		got_ref_close(head_ref);
4133 	if (err) {
4134 		free(*new_commit_id);
4135 		*new_commit_id = NULL;
4136 	}
4137 	return err;
4138 }
4139 
4140 const struct got_error *
4141 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4142     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4143     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4144     struct got_commit_object *orig_commit,
4145     struct got_object_id *orig_commit_id, struct got_repository *repo)
4146 {
4147 	const struct got_error *err;
4148 	char *commit_ref_name;
4149 	struct got_reference *commit_ref = NULL;
4150 	struct got_object_id *commit_id = NULL;
4151 
4152 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4153 	if (err)
4154 		return err;
4155 
4156 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4157 	if (err)
4158 		goto done;
4159 	err = got_ref_resolve(&commit_id, repo, commit_ref);
4160 	if (err)
4161 		goto done;
4162 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4163 		err = got_error(GOT_ERR_REBASE_COMMITID);
4164 		goto done;
4165 	}
4166 
4167 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4168 	    worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4169 done:
4170 	if (commit_ref)
4171 		got_ref_close(commit_ref);
4172 	free(commit_ref_name);
4173 	free(commit_id);
4174 	return err;
4175 }
4176 
4177 const struct got_error *
4178 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4179     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4180     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4181     struct got_commit_object *orig_commit,
4182     struct got_object_id *orig_commit_id, const char *new_logmsg,
4183     struct got_repository *repo)
4184 {
4185 	const struct got_error *err;
4186 	char *commit_ref_name;
4187 	struct got_reference *commit_ref = NULL;
4188 	struct got_object_id *commit_id = NULL;
4189 
4190 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4191 	if (err)
4192 		return err;
4193 
4194 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4195 	if (err)
4196 		goto done;
4197 	err = got_ref_resolve(&commit_id, repo, commit_ref);
4198 	if (err)
4199 		goto done;
4200 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4201 		err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4202 		goto done;
4203 	}
4204 
4205 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4206 	    worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4207 done:
4208 	if (commit_ref)
4209 		got_ref_close(commit_ref);
4210 	free(commit_ref_name);
4211 	free(commit_id);
4212 	return err;
4213 }
4214 
4215 const struct got_error *
4216 got_worktree_rebase_postpone(struct got_worktree *worktree,
4217     struct got_fileindex *fileindex)
4218 {
4219 	if (fileindex)
4220 		got_fileindex_free(fileindex);
4221 	return lock_worktree(worktree, LOCK_SH);
4222 }
4223 
4224 static const struct got_error *
4225 delete_ref(const char *name, struct got_repository *repo)
4226 {
4227 	const struct got_error *err;
4228 	struct got_reference *ref;
4229 
4230 	err = got_ref_open(&ref, repo, name, 0);
4231 	if (err) {
4232 		if (err->code == GOT_ERR_NOT_REF)
4233 			return NULL;
4234 		return err;
4235 	}
4236 
4237 	err = got_ref_delete(ref, repo);
4238 	got_ref_close(ref);
4239 	return err;
4240 }
4241 
4242 static const struct got_error *
4243 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4244 {
4245 	const struct got_error *err;
4246 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4247 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
4248 
4249 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4250 	if (err)
4251 		goto done;
4252 	err = delete_ref(tmp_branch_name, repo);
4253 	if (err)
4254 		goto done;
4255 
4256 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4257 	if (err)
4258 		goto done;
4259 	err = delete_ref(new_base_branch_ref_name, repo);
4260 	if (err)
4261 		goto done;
4262 
4263 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4264 	if (err)
4265 		goto done;
4266 	err = delete_ref(branch_ref_name, repo);
4267 	if (err)
4268 		goto done;
4269 
4270 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4271 	if (err)
4272 		goto done;
4273 	err = delete_ref(commit_ref_name, repo);
4274 	if (err)
4275 		goto done;
4276 
4277 done:
4278 	free(tmp_branch_name);
4279 	free(new_base_branch_ref_name);
4280 	free(branch_ref_name);
4281 	free(commit_ref_name);
4282 	return err;
4283 }
4284 
4285 const struct got_error *
4286 got_worktree_rebase_complete(struct got_worktree *worktree,
4287     struct got_fileindex *fileindex, struct got_reference *new_base_branch,
4288     struct got_reference *tmp_branch, struct got_reference *rebased_branch,
4289     struct got_repository *repo)
4290 {
4291 	const struct got_error *err, *unlockerr;
4292 	struct got_object_id *new_head_commit_id = NULL;
4293 
4294 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4295 	if (err)
4296 		return err;
4297 
4298 	err = got_ref_change_ref(rebased_branch, new_head_commit_id);
4299 	if (err)
4300 		goto done;
4301 
4302 	err = got_ref_write(rebased_branch, repo);
4303 	if (err)
4304 		goto done;
4305 
4306 	err = got_worktree_set_head_ref(worktree, rebased_branch);
4307 	if (err)
4308 		goto done;
4309 
4310 	err = delete_rebase_refs(worktree, repo);
4311 done:
4312 	if (fileindex)
4313 		got_fileindex_free(fileindex);
4314 	free(new_head_commit_id);
4315 	unlockerr = lock_worktree(worktree, LOCK_SH);
4316 	if (unlockerr && err == NULL)
4317 		err = unlockerr;
4318 	return err;
4319 }
4320 
4321 struct collect_revertible_paths_arg {
4322 	struct got_pathlist_head *revertible_paths;
4323 	struct got_worktree *worktree;
4324 };
4325 
4326 static const struct got_error *
4327 collect_revertible_paths(void *arg, unsigned char status, const char *relpath,
4328     struct got_object_id *blob_id, struct got_object_id *commit_id)
4329 {
4330 	struct collect_revertible_paths_arg *a = arg;
4331 	const struct got_error *err = NULL;
4332 	struct got_pathlist_entry *new = NULL;
4333 	char *path = NULL;
4334 
4335 	if (status != GOT_STATUS_ADD &&
4336 	    status != GOT_STATUS_DELETE &&
4337 	    status != GOT_STATUS_MODIFY &&
4338 	    status != GOT_STATUS_CONFLICT &&
4339 	    status != GOT_STATUS_MISSING)
4340 		return NULL;
4341 
4342 	if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
4343 		return got_error_from_errno("asprintf");
4344 
4345 	err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
4346 	if (err || new == NULL)
4347 		free(path);
4348 	return err;
4349 }
4350 
4351 const struct got_error *
4352 got_worktree_rebase_abort(struct got_worktree *worktree,
4353     struct got_fileindex *fileindex, struct got_repository *repo,
4354     struct got_reference *new_base_branch,
4355      got_worktree_checkout_cb progress_cb, void *progress_arg)
4356 {
4357 	const struct got_error *err, *unlockerr, *sync_err;
4358 	struct got_reference *resolved = NULL;
4359 	struct got_object_id *commit_id = NULL;
4360 	char *fileindex_path = NULL;
4361 	struct got_pathlist_head revertible_paths;
4362 	struct got_pathlist_entry *pe;
4363 	struct collect_revertible_paths_arg crp_arg;
4364 	struct got_object_id *tree_id = NULL;
4365 
4366 	TAILQ_INIT(&revertible_paths);
4367 
4368 	err = lock_worktree(worktree, LOCK_EX);
4369 	if (err)
4370 		return err;
4371 
4372 	err = got_ref_open(&resolved, repo,
4373 	    got_ref_get_symref_target(new_base_branch), 0);
4374 	if (err)
4375 		goto done;
4376 
4377 	err = got_worktree_set_head_ref(worktree, resolved);
4378 	if (err)
4379 		goto done;
4380 
4381 	/*
4382 	 * XXX commits to the base branch could have happened while
4383 	 * we were busy rebasing; should we store the original commit ID
4384 	 * when rebase begins and read it back here?
4385 	 */
4386 	err = got_ref_resolve(&commit_id, repo, resolved);
4387 	if (err)
4388 		goto done;
4389 
4390 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4391 	if (err)
4392 		goto done;
4393 
4394 	err = got_object_id_by_path(&tree_id, repo,
4395 	    worktree->base_commit_id, worktree->path_prefix);
4396 	if (err)
4397 		goto done;
4398 
4399 	err = delete_rebase_refs(worktree, repo);
4400 	if (err)
4401 		goto done;
4402 
4403 	err = get_fileindex_path(&fileindex_path, worktree);
4404 	if (err)
4405 		goto done;
4406 
4407 	crp_arg.revertible_paths = &revertible_paths;
4408 	crp_arg.worktree = worktree;
4409 	err = worktree_status(worktree, "", fileindex, repo,
4410 	    collect_revertible_paths, &crp_arg, NULL, NULL);
4411 	if (err)
4412 		goto done;
4413 
4414 	TAILQ_FOREACH(pe, &revertible_paths, entry) {
4415 		err = revert_file(worktree, fileindex, pe->path,
4416 		    progress_cb, progress_arg, repo);
4417 		if (err)
4418 			goto sync;
4419 	}
4420 
4421 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4422 	    repo, progress_cb, progress_arg, NULL, NULL);
4423 sync:
4424 	sync_err = sync_fileindex(fileindex, fileindex_path);
4425 	if (sync_err && err == NULL)
4426 		err = sync_err;
4427 done:
4428 	got_ref_close(resolved);
4429 	free(tree_id);
4430 	free(commit_id);
4431 	if (fileindex)
4432 		got_fileindex_free(fileindex);
4433 	free(fileindex_path);
4434 	TAILQ_FOREACH(pe, &revertible_paths, entry)
4435 		free((char *)pe->path);
4436 	got_pathlist_free(&revertible_paths);
4437 
4438 	unlockerr = lock_worktree(worktree, LOCK_SH);
4439 	if (unlockerr && err == NULL)
4440 		err = unlockerr;
4441 	return err;
4442 }
4443 
4444 const struct got_error *
4445 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
4446     struct got_reference **branch_ref, struct got_object_id **base_commit_id,
4447     struct got_fileindex **fileindex, struct got_worktree *worktree,
4448     struct got_repository *repo)
4449 {
4450 	const struct got_error *err = NULL;
4451 	char *tmp_branch_name = NULL;
4452 	char *branch_ref_name = NULL;
4453 	char *base_commit_ref_name = NULL;
4454 	char *fileindex_path = NULL;
4455 	struct check_rebase_ok_arg ok_arg;
4456 	struct got_reference *wt_branch = NULL;
4457 	struct got_reference *base_commit_ref = NULL;
4458 
4459 	*tmp_branch = NULL;
4460 	*branch_ref = NULL;
4461 	*base_commit_id = NULL;
4462 	*fileindex = NULL;
4463 
4464 	err = lock_worktree(worktree, LOCK_EX);
4465 	if (err)
4466 		return err;
4467 
4468 	err = open_fileindex(fileindex, &fileindex_path, worktree);
4469 	if (err)
4470 		goto done;
4471 
4472 	ok_arg.worktree = worktree;
4473 	ok_arg.repo = repo;
4474 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4475 	    &ok_arg);
4476 	if (err)
4477 		goto done;
4478 
4479 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4480 	if (err)
4481 		goto done;
4482 
4483 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4484 	if (err)
4485 		goto done;
4486 
4487 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4488 	    worktree);
4489 	if (err)
4490 		goto done;
4491 
4492 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4493 	    0);
4494 	if (err)
4495 		goto done;
4496 
4497 	err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
4498 	if (err)
4499 		goto done;
4500 
4501 	err = got_ref_write(*branch_ref, repo);
4502 	if (err)
4503 		goto done;
4504 
4505 	err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
4506 	    worktree->base_commit_id);
4507 	if (err)
4508 		goto done;
4509 	err = got_ref_write(base_commit_ref, repo);
4510 	if (err)
4511 		goto done;
4512 	*base_commit_id = got_object_id_dup(worktree->base_commit_id);
4513 	if (*base_commit_id == NULL) {
4514 		err = got_error_from_errno("got_object_id_dup");
4515 		goto done;
4516 	}
4517 
4518 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
4519 	    worktree->base_commit_id);
4520 	if (err)
4521 		goto done;
4522 	err = got_ref_write(*tmp_branch, repo);
4523 	if (err)
4524 		goto done;
4525 
4526 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
4527 	if (err)
4528 		goto done;
4529 done:
4530 	free(fileindex_path);
4531 	free(tmp_branch_name);
4532 	free(branch_ref_name);
4533 	free(base_commit_ref_name);
4534 	if (wt_branch)
4535 		got_ref_close(wt_branch);
4536 	if (err) {
4537 		if (*branch_ref) {
4538 			got_ref_close(*branch_ref);
4539 			*branch_ref = NULL;
4540 		}
4541 		if (*tmp_branch) {
4542 			got_ref_close(*tmp_branch);
4543 			*tmp_branch = NULL;
4544 		}
4545 		free(*base_commit_id);
4546 		if (*fileindex) {
4547 			got_fileindex_free(*fileindex);
4548 			*fileindex = NULL;
4549 		}
4550 		lock_worktree(worktree, LOCK_SH);
4551 	}
4552 	return err;
4553 }
4554 
4555 const struct got_error *
4556 got_worktree_histedit_postpone(struct got_worktree *worktree,
4557     struct got_fileindex *fileindex)
4558 {
4559 	if (fileindex)
4560 		got_fileindex_free(fileindex);
4561 	return lock_worktree(worktree, LOCK_SH);
4562 }
4563 
4564 const struct got_error *
4565 got_worktree_histedit_in_progress(int *in_progress,
4566     struct got_worktree *worktree)
4567 {
4568 	const struct got_error *err;
4569 	char *tmp_branch_name = NULL;
4570 
4571 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4572 	if (err)
4573 		return err;
4574 
4575 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4576 	free(tmp_branch_name);
4577 	return NULL;
4578 }
4579 
4580 const struct got_error *
4581 got_worktree_histedit_continue(struct got_object_id **commit_id,
4582     struct got_reference **tmp_branch, struct got_reference **branch_ref,
4583     struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
4584     struct got_worktree *worktree, struct got_repository *repo)
4585 {
4586 	const struct got_error *err;
4587 	char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
4588 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4589 	struct got_reference *commit_ref = NULL;
4590 	struct got_reference *base_commit_ref = NULL;
4591 	char *fileindex_path = NULL;
4592 
4593 	*commit_id = NULL;
4594 	*tmp_branch = NULL;
4595 	*base_commit_id = NULL;
4596 	*fileindex = NULL;
4597 
4598 	err = lock_worktree(worktree, LOCK_EX);
4599 	if (err)
4600 		return err;
4601 
4602 	err = open_fileindex(fileindex, &fileindex_path, worktree);
4603 	if (err)
4604 		goto done;
4605 
4606 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4607 	if (err)
4608 		return err;
4609 
4610 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4611 	if (err)
4612 		goto done;
4613 
4614 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4615 	if (err)
4616 		goto done;
4617 
4618 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4619 	    worktree);
4620 	if (err)
4621 		goto done;
4622 
4623 	err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
4624 	if (err)
4625 		goto done;
4626 
4627 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4628 	if (err)
4629 		goto done;
4630 	err = got_ref_resolve(commit_id, repo, commit_ref);
4631 	if (err)
4632 		goto done;
4633 
4634 	err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
4635 	if (err)
4636 		goto done;
4637 	err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
4638 	if (err)
4639 		goto done;
4640 
4641 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4642 	if (err)
4643 		goto done;
4644 done:
4645 	free(commit_ref_name);
4646 	free(branch_ref_name);
4647 	free(fileindex_path);
4648 	if (commit_ref)
4649 		got_ref_close(commit_ref);
4650 	if (base_commit_ref)
4651 		got_ref_close(base_commit_ref);
4652 	if (err) {
4653 		free(*commit_id);
4654 		*commit_id = NULL;
4655 		free(*base_commit_id);
4656 		*base_commit_id = NULL;
4657 		if (*tmp_branch) {
4658 			got_ref_close(*tmp_branch);
4659 			*tmp_branch = NULL;
4660 		}
4661 		if (*fileindex) {
4662 			got_fileindex_free(*fileindex);
4663 			*fileindex = NULL;
4664 		}
4665 		lock_worktree(worktree, LOCK_EX);
4666 	}
4667 	return err;
4668 }
4669 
4670 static const struct got_error *
4671 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
4672 {
4673 	const struct got_error *err;
4674 	char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
4675 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
4676 
4677 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4678 	if (err)
4679 		goto done;
4680 	err = delete_ref(tmp_branch_name, repo);
4681 	if (err)
4682 		goto done;
4683 
4684 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4685 	    worktree);
4686 	if (err)
4687 		goto done;
4688 	err = delete_ref(base_commit_ref_name, repo);
4689 	if (err)
4690 		goto done;
4691 
4692 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4693 	if (err)
4694 		goto done;
4695 	err = delete_ref(branch_ref_name, repo);
4696 	if (err)
4697 		goto done;
4698 
4699 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4700 	if (err)
4701 		goto done;
4702 	err = delete_ref(commit_ref_name, repo);
4703 	if (err)
4704 		goto done;
4705 done:
4706 	free(tmp_branch_name);
4707 	free(base_commit_ref_name);
4708 	free(branch_ref_name);
4709 	free(commit_ref_name);
4710 	return err;
4711 }
4712 
4713 const struct got_error *
4714 got_worktree_histedit_abort(struct got_worktree *worktree,
4715     struct got_fileindex *fileindex, struct got_repository *repo,
4716     struct got_reference *branch, struct got_object_id *base_commit_id,
4717     got_worktree_checkout_cb progress_cb, void *progress_arg)
4718 {
4719 	const struct got_error *err, *unlockerr, *sync_err;
4720 	struct got_reference *resolved = NULL;
4721 	char *fileindex_path = NULL;
4722 	struct got_pathlist_head revertible_paths;
4723 	struct got_pathlist_entry *pe;
4724 	struct collect_revertible_paths_arg crp_arg;
4725 	struct got_object_id *tree_id = NULL;
4726 
4727 	TAILQ_INIT(&revertible_paths);
4728 
4729 	err = lock_worktree(worktree, LOCK_EX);
4730 	if (err)
4731 		return err;
4732 
4733 	err = got_ref_open(&resolved, repo,
4734 	    got_ref_get_symref_target(branch), 0);
4735 	if (err)
4736 		goto done;
4737 
4738 	err = got_worktree_set_head_ref(worktree, resolved);
4739 	if (err)
4740 		goto done;
4741 
4742 	err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
4743 	if (err)
4744 		goto done;
4745 
4746 	err = got_object_id_by_path(&tree_id, repo, base_commit_id,
4747 	    worktree->path_prefix);
4748 	if (err)
4749 		goto done;
4750 
4751 	err = delete_histedit_refs(worktree, repo);
4752 	if (err)
4753 		goto done;
4754 
4755 	err = get_fileindex_path(&fileindex_path, worktree);
4756 	if (err)
4757 		goto done;
4758 
4759 	crp_arg.revertible_paths = &revertible_paths;
4760 	crp_arg.worktree = worktree;
4761 	err = worktree_status(worktree, "", fileindex, repo,
4762 	    collect_revertible_paths, &crp_arg, NULL, NULL);
4763 	if (err)
4764 		goto done;
4765 
4766 	TAILQ_FOREACH(pe, &revertible_paths, entry) {
4767 		err = revert_file(worktree, fileindex, pe->path,
4768 		    progress_cb, progress_arg, repo);
4769 		if (err)
4770 			goto sync;
4771 	}
4772 
4773 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4774 	    repo, progress_cb, progress_arg, NULL, NULL);
4775 sync:
4776 	sync_err = sync_fileindex(fileindex, fileindex_path);
4777 	if (sync_err && err == NULL)
4778 		err = sync_err;
4779 done:
4780 	got_ref_close(resolved);
4781 	free(tree_id);
4782 	free(fileindex_path);
4783 	TAILQ_FOREACH(pe, &revertible_paths, entry)
4784 		free((char *)pe->path);
4785 	got_pathlist_free(&revertible_paths);
4786 
4787 	unlockerr = lock_worktree(worktree, LOCK_SH);
4788 	if (unlockerr && err == NULL)
4789 		err = unlockerr;
4790 	return err;
4791 }
4792 
4793 const struct got_error *
4794 got_worktree_histedit_complete(struct got_worktree *worktree,
4795     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4796     struct got_reference *edited_branch, struct got_repository *repo)
4797 {
4798 	const struct got_error *err, *unlockerr;
4799 	struct got_object_id *new_head_commit_id = NULL;
4800 	struct got_reference *resolved = NULL;
4801 
4802 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4803 	if (err)
4804 		return err;
4805 
4806 	err = got_ref_open(&resolved, repo,
4807 	    got_ref_get_symref_target(edited_branch), 0);
4808 	if (err)
4809 		goto done;
4810 
4811 	err = got_ref_change_ref(resolved, new_head_commit_id);
4812 	if (err)
4813 		goto done;
4814 
4815 	err = got_ref_write(resolved, repo);
4816 	if (err)
4817 		goto done;
4818 
4819 	err = got_worktree_set_head_ref(worktree, resolved);
4820 	if (err)
4821 		goto done;
4822 
4823 	err = delete_histedit_refs(worktree, repo);
4824 done:
4825 	if (fileindex)
4826 		got_fileindex_free(fileindex);
4827 	free(new_head_commit_id);
4828 	unlockerr = lock_worktree(worktree, LOCK_SH);
4829 	if (unlockerr && err == NULL)
4830 		err = unlockerr;
4831 	return err;
4832 }
4833 
4834 const struct got_error *
4835 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
4836     struct got_object_id *commit_id, struct got_repository *repo)
4837 {
4838 	const struct got_error *err;
4839 	char *commit_ref_name;
4840 
4841 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4842 	if (err)
4843 		return err;
4844 
4845 	err = store_commit_id(commit_ref_name, commit_id, repo);
4846 	if (err)
4847 		goto done;
4848 
4849 	err = delete_ref(commit_ref_name, repo);
4850 done:
4851 	free(commit_ref_name);
4852 	return err;
4853 }