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(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 (lstat(path, &sb) != 0) {
146 		err = got_error_from_errno2("lstat", 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(GOT_ERR_WORKTREE_META));
159 		goto done;
160 	}
161 	if ((*content)[sb.st_size - 1] != '\n') {
162 		err = got_error(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(GOT_ERR_WORKTREE_META);
359 		goto done;
360 	}
361 	if (version != GOT_WORKTREE_FORMAT_VERSION) {
362 		err = got_error(GOT_ERR_WORKTREE_VERS);
363 		goto done;
364 	}
365 
366 	*worktree = calloc(1, sizeof(**worktree));
367 	if (*worktree == NULL) {
368 		err = got_error_from_errno("calloc");
369 		goto done;
370 	}
371 	(*worktree)->lockfd = -1;
372 
373 	(*worktree)->root_path = strdup(path);
374 	if ((*worktree)->root_path == NULL) {
375 		err = got_error_from_errno("strdup");
376 		goto done;
377 	}
378 	err = read_meta_file(&(*worktree)->repo_path, path_got,
379 	    GOT_WORKTREE_REPOSITORY);
380 	if (err)
381 		goto done;
382 
383 	err = read_meta_file(&(*worktree)->path_prefix, path_got,
384 	    GOT_WORKTREE_PATH_PREFIX);
385 	if (err)
386 		goto done;
387 
388 	err = read_meta_file(&base_commit_id_str, path_got,
389 	    GOT_WORKTREE_BASE_COMMIT);
390 	if (err)
391 		goto done;
392 
393 	err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
394 	if (err)
395 		goto done;
396 	uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
397 	if (uuid_status != uuid_s_ok) {
398 		err = got_error_uuid(uuid_status);
399 		goto done;
400 	}
401 
402 	err = got_repo_open(&repo, (*worktree)->repo_path);
403 	if (err)
404 		goto done;
405 
406 	err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
407 	    base_commit_id_str);
408 	if (err)
409 		goto done;
410 
411 	err = read_meta_file(&(*worktree)->head_ref_name, path_got,
412 	    GOT_WORKTREE_HEAD_REF);
413 done:
414 	if (repo)
415 		got_repo_close(repo);
416 	free(path_got);
417 	free(path_lock);
418 	free(base_commit_id_str);
419 	free(uuidstr);
420 	free(formatstr);
421 	if (err) {
422 		if (fd != -1)
423 			close(fd);
424 		if (*worktree != NULL)
425 			got_worktree_close(*worktree);
426 		*worktree = NULL;
427 	} else
428 		(*worktree)->lockfd = fd;
429 
430 	return err;
431 }
432 
433 const struct got_error *
434 got_worktree_open(struct got_worktree **worktree, const char *path)
435 {
436 	const struct got_error *err = NULL;
437 
438 	do {
439 		err = open_worktree(worktree, path);
440 		if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
441 			return err;
442 		if (*worktree)
443 			return NULL;
444 		path = dirname(path);
445 		if (path == NULL)
446 			return got_error_from_errno2("dirname", path);
447 	} while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
448 
449 	return got_error(GOT_ERR_NOT_WORKTREE);
450 }
451 
452 const struct got_error *
453 got_worktree_close(struct got_worktree *worktree)
454 {
455 	const struct got_error *err = NULL;
456 	free(worktree->root_path);
457 	free(worktree->repo_path);
458 	free(worktree->path_prefix);
459 	free(worktree->base_commit_id);
460 	free(worktree->head_ref_name);
461 	if (worktree->lockfd != -1)
462 		if (close(worktree->lockfd) != 0)
463 			err = got_error_from_errno2("close",
464 			    got_worktree_get_root_path(worktree));
465 	free(worktree);
466 	return err;
467 }
468 
469 const char *
470 got_worktree_get_root_path(struct got_worktree *worktree)
471 {
472 	return worktree->root_path;
473 }
474 
475 const char *
476 got_worktree_get_repo_path(struct got_worktree *worktree)
477 {
478 	return worktree->repo_path;
479 }
480 
481 const char *
482 got_worktree_get_path_prefix(struct got_worktree *worktree)
483 {
484 	return worktree->path_prefix;
485 }
486 
487 const struct got_error *
488 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
489     const char *path_prefix)
490 {
491 	char *absprefix = NULL;
492 
493 	if (!got_path_is_absolute(path_prefix)) {
494 		if (asprintf(&absprefix, "/%s", path_prefix) == -1)
495 			return got_error_from_errno("asprintf");
496 	}
497 	*match = (strcmp(absprefix ? absprefix : path_prefix,
498 	    worktree->path_prefix) == 0);
499 	free(absprefix);
500 	return NULL;
501 }
502 
503 const char *
504 got_worktree_get_head_ref_name(struct got_worktree *worktree)
505 {
506 	return worktree->head_ref_name;
507 }
508 
509 const struct got_error *
510 got_worktree_set_head_ref(struct got_worktree *worktree,
511     struct got_reference *head_ref)
512 {
513 	const struct got_error *err = NULL;
514 	char *path_got = NULL, *head_ref_name = NULL;
515 
516 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
517 	    GOT_WORKTREE_GOT_DIR) == -1) {
518 		err = got_error_from_errno("asprintf");
519 		path_got = NULL;
520 		goto done;
521 	}
522 
523 	head_ref_name = strdup(got_ref_get_name(head_ref));
524 	if (head_ref_name == NULL) {
525 		err = got_error_from_errno("strdup");
526 		goto done;
527 	}
528 
529 	err = write_head_ref(path_got, head_ref);
530 	if (err)
531 		goto done;
532 
533 	free(worktree->head_ref_name);
534 	worktree->head_ref_name = head_ref_name;
535 done:
536 	free(path_got);
537 	if (err)
538 		free(head_ref_name);
539 	return err;
540 }
541 
542 struct got_object_id *
543 got_worktree_get_base_commit_id(struct got_worktree *worktree)
544 {
545 	return worktree->base_commit_id;
546 }
547 
548 const struct got_error *
549 got_worktree_set_base_commit_id(struct got_worktree *worktree,
550     struct got_repository *repo, struct got_object_id *commit_id)
551 {
552 	const struct got_error *err;
553 	struct got_object *obj = NULL;
554 	char *id_str = NULL;
555 	char *path_got = NULL;
556 
557 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
558 	    GOT_WORKTREE_GOT_DIR) == -1) {
559 		err = got_error_from_errno("asprintf");
560 		path_got = NULL;
561 		goto done;
562 	}
563 
564 	err = got_object_open(&obj, repo, commit_id);
565 	if (err)
566 		return err;
567 
568 	if (obj->type != GOT_OBJ_TYPE_COMMIT) {
569 		err = got_error(GOT_ERR_OBJ_TYPE);
570 		goto done;
571 	}
572 
573 	/* Record our base commit. */
574 	err = got_object_id_str(&id_str, commit_id);
575 	if (err)
576 		goto done;
577 	err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
578 	if (err)
579 		goto done;
580 
581 	free(worktree->base_commit_id);
582 	worktree->base_commit_id = got_object_id_dup(commit_id);
583 	if (worktree->base_commit_id == NULL) {
584 		err = got_error_from_errno("got_object_id_dup");
585 		goto done;
586 	}
587 done:
588 	if (obj)
589 		got_object_close(obj);
590 	free(id_str);
591 	free(path_got);
592 	return err;
593 }
594 
595 static const struct got_error *
596 lock_worktree(struct got_worktree *worktree, int operation)
597 {
598 	if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
599 		return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
600 		    : got_error_from_errno2("flock",
601 		    got_worktree_get_root_path(worktree)));
602 	return NULL;
603 }
604 
605 static const struct got_error *
606 add_dir_on_disk(struct got_worktree *worktree, const char *path)
607 {
608 	const struct got_error *err = NULL;
609 	char *abspath;
610 
611 	if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
612 		return got_error_from_errno("asprintf");
613 
614 	err = got_path_mkdir(abspath);
615 	if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
616 		struct stat sb;
617 		err = NULL;
618 		if (lstat(abspath, &sb) == -1) {
619 			err = got_error_from_errno2("lstat", abspath);
620 		} else if (!S_ISDIR(sb.st_mode)) {
621 			/* TODO directory is obstructed; do something */
622 			err = got_error(GOT_ERR_FILE_OBSTRUCTED);
623 		}
624 	}
625 	free(abspath);
626 	return err;
627 }
628 
629 static const struct got_error *
630 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
631 {
632 	const struct got_error *err = NULL;
633 	uint8_t fbuf1[8192];
634 	uint8_t fbuf2[8192];
635 	size_t flen1 = 0, flen2 = 0;
636 
637 	*same = 1;
638 
639 	for (;;) {
640 		flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
641 		if (flen1 == 0 && ferror(f1)) {
642 			err = got_error_from_errno("fread");
643 			break;
644 		}
645 		flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
646 		if (flen2 == 0 && ferror(f2)) {
647 			err = got_error_from_errno("fread");
648 			break;
649 		}
650 		if (flen1 == 0) {
651 			if (flen2 != 0)
652 				*same = 0;
653 			break;
654 		} else if (flen2 == 0) {
655 			if (flen1 != 0)
656 				*same = 0;
657 			break;
658 		} else if (flen1 == flen2) {
659 			if (memcmp(fbuf1, fbuf2, flen2) != 0) {
660 				*same = 0;
661 				break;
662 			}
663 		} else {
664 			*same = 0;
665 			break;
666 		}
667 	}
668 
669 	return err;
670 }
671 
672 static const struct got_error *
673 check_files_equal(int *same, const char *f1_path, const char *f2_path)
674 {
675 	const struct got_error *err = NULL;
676 	struct stat sb;
677 	size_t size1, size2;
678 	FILE *f1 = NULL, *f2 = NULL;
679 
680 	*same = 1;
681 
682 	if (lstat(f1_path, &sb) != 0) {
683 		err = got_error_from_errno2("lstat", f1_path);
684 		goto done;
685 	}
686 	size1 = sb.st_size;
687 
688 	if (lstat(f2_path, &sb) != 0) {
689 		err = got_error_from_errno2("lstat", f2_path);
690 		goto done;
691 	}
692 	size2 = sb.st_size;
693 
694 	if (size1 != size2) {
695 		*same = 0;
696 		return NULL;
697 	}
698 
699 	f1 = fopen(f1_path, "r");
700 	if (f1 == NULL)
701 		return got_error_from_errno2("open", f1_path);
702 
703 	f2 = fopen(f2_path, "r");
704 	if (f2 == NULL) {
705 		err = got_error_from_errno2("open", f2_path);
706 		goto done;
707 	}
708 
709 	err = check_file_contents_equal(same, f1, f2);
710 done:
711 	if (f1 && fclose(f1) != 0 && err == NULL)
712 		err = got_error_from_errno("fclose");
713 	if (f2 && fclose(f2) != 0 && err == NULL)
714 		err = got_error_from_errno("fclose");
715 
716 	return err;
717 }
718 
719 /*
720  * Perform a 3-way merge where blob_orig acts as the common ancestor,
721  * blob_deriv acts as the first derived version, and the file on disk
722  * acts as the second derived version.
723  */
724 static const struct got_error *
725 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
726     struct got_blob_object *blob_orig, const char *ondisk_path,
727     const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
728     struct got_object_id *deriv_base_commit_id,
729     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
730     void *progress_arg)
731 {
732 	const struct got_error *err = NULL;
733 	int merged_fd = -1;
734 	FILE *f_deriv = NULL, *f_orig = NULL;
735 	char *blob_deriv_path = NULL, *blob_orig_path = NULL;
736 	char *merged_path = NULL, *base_path = NULL;
737 	char *id_str = NULL;
738 	char *label_deriv = NULL;
739 	int overlapcnt = 0;
740 	char *parent;
741 
742 	*local_changes_subsumed = 0;
743 
744 	parent = dirname(ondisk_path);
745 	if (parent == NULL)
746 		return got_error_from_errno2("dirname", ondisk_path);
747 
748 	if (asprintf(&base_path, "%s/got-merged", parent) == -1)
749 		return got_error_from_errno("asprintf");
750 
751 	err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
752 	if (err)
753 		goto done;
754 
755 	free(base_path);
756 	if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
757 		err = got_error_from_errno("asprintf");
758 		base_path = NULL;
759 		goto done;
760 	}
761 
762 	err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
763 	if (err)
764 		goto done;
765 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
766 	    blob_deriv);
767 	if (err)
768 		goto done;
769 
770 	free(base_path);
771 	if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
772 		err = got_error_from_errno("asprintf");
773 		base_path = NULL;
774 		goto done;
775 	}
776 
777 	err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
778 	if (err)
779 		goto done;
780 	if (blob_orig) {
781 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
782 		    blob_orig);
783 		if (err)
784 			goto done;
785 	} else {
786 		/*
787 		 * If the file has no blob, this is an "add vs add" conflict,
788 		 * and we simply use an empty ancestor file to make both files
789 		 * appear in the merged result in their entirety.
790 		 */
791 	}
792 
793 	err = got_object_id_str(&id_str, deriv_base_commit_id);
794 	if (err)
795 		goto done;
796 	if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
797 		err = got_error_from_errno("asprintf");
798 		goto done;
799 	}
800 
801 	err = got_merge_diff3(&overlapcnt, merged_fd, blob_deriv_path,
802 	    blob_orig_path, ondisk_path, label_deriv, path);
803 	if (err)
804 		goto done;
805 
806 	(*progress_cb)(progress_arg,
807 	    overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
808 
809 	if (fsync(merged_fd) != 0) {
810 		err = got_error_from_errno("fsync");
811 		goto done;
812 	}
813 
814 	/* Check if a clean merge has subsumed all local changes. */
815 	if (overlapcnt == 0) {
816 		err = check_files_equal(local_changes_subsumed, blob_deriv_path,
817 		    merged_path);
818 		if (err)
819 			goto done;
820 	}
821 
822 	if (chmod(merged_path, st_mode) != 0) {
823 		err = got_error_from_errno2("chmod", merged_path);
824 		goto done;
825 	}
826 
827 	if (rename(merged_path, ondisk_path) != 0) {
828 		err = got_error_from_errno3("rename", merged_path,
829 		    ondisk_path);
830 		unlink(merged_path);
831 		goto done;
832 	}
833 
834 done:
835 	if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
836 		err = got_error_from_errno("close");
837 	if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
838 		err = got_error_from_errno("fclose");
839 	if (f_orig && fclose(f_orig) != 0 && err == NULL)
840 		err = got_error_from_errno("fclose");
841 	free(merged_path);
842 	free(base_path);
843 	if (blob_deriv_path) {
844 		unlink(blob_deriv_path);
845 		free(blob_deriv_path);
846 	}
847 	if (blob_orig_path) {
848 		unlink(blob_orig_path);
849 		free(blob_orig_path);
850 	}
851 	free(id_str);
852 	free(label_deriv);
853 	return err;
854 }
855 
856 static const struct got_error *
857 update_blob_fileindex_entry(struct got_worktree *worktree,
858     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
859     const char *ondisk_path, const char *path, struct got_blob_object *blob,
860     int update_timestamps)
861 {
862 	const struct got_error *err = NULL;
863 
864 	if (ie == NULL)
865 		ie = got_fileindex_entry_get(fileindex, path);
866 	if (ie)
867 		err = got_fileindex_entry_update(ie, ondisk_path,
868 		    blob->id.sha1, worktree->base_commit_id->sha1,
869 		    update_timestamps);
870 	else {
871 		struct got_fileindex_entry *new_ie;
872 		err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
873 		    path, blob->id.sha1, worktree->base_commit_id->sha1);
874 		if (!err)
875 			err = got_fileindex_entry_add(fileindex, new_ie);
876 	}
877 	return err;
878 }
879 
880 static const struct got_error *
881 install_blob(struct got_worktree *worktree, const char *ondisk_path,
882    const char *path, uint16_t te_mode, uint16_t st_mode,
883    struct got_blob_object *blob, int restoring_missing_file,
884    int reverting_versioned_file, struct got_repository *repo,
885    got_worktree_checkout_cb progress_cb, void *progress_arg)
886 {
887 	const struct got_error *err = NULL;
888 	int fd = -1;
889 	size_t len, hdrlen;
890 	int update = 0;
891 	char *tmppath = NULL;
892 
893 	fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
894 	    GOT_DEFAULT_FILE_MODE);
895 	if (fd == -1) {
896 		if (errno == ENOENT) {
897 			char *parent = dirname(path);
898 			if (parent == NULL)
899 				return got_error_from_errno2("dirname", path);
900 			err = add_dir_on_disk(worktree, parent);
901 			if (err)
902 				return err;
903 			fd = open(ondisk_path,
904 			    O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
905 			    GOT_DEFAULT_FILE_MODE);
906 			if (fd == -1)
907 				return got_error_from_errno2("open",
908 				    ondisk_path);
909 		} else if (errno == EEXIST) {
910 			if (!S_ISREG(st_mode)) {
911 				/* TODO file is obstructed; do something */
912 				err = got_error(GOT_ERR_FILE_OBSTRUCTED);
913 				goto done;
914 			} else {
915 				err = got_opentemp_named_fd(&tmppath, &fd,
916 				    ondisk_path);
917 				if (err)
918 					goto done;
919 				update = 1;
920 			}
921 		} else
922 			return got_error_from_errno2("open", ondisk_path);
923 	}
924 
925 	if (restoring_missing_file)
926 		(*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
927 	else if (reverting_versioned_file)
928 		(*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
929 	else
930 		(*progress_cb)(progress_arg,
931 		    update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
932 
933 	hdrlen = got_object_blob_get_hdrlen(blob);
934 	do {
935 		const uint8_t *buf = got_object_blob_get_read_buf(blob);
936 		err = got_object_blob_read_block(&len, blob);
937 		if (err)
938 			break;
939 		if (len > 0) {
940 			/* Skip blob object header first time around. */
941 			ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
942 			if (outlen == -1) {
943 				err = got_error_from_errno("write");
944 				goto done;
945 			} else if (outlen != len - hdrlen) {
946 				err = got_error(GOT_ERR_IO);
947 				goto done;
948 			}
949 			hdrlen = 0;
950 		}
951 	} while (len != 0);
952 
953 	if (fsync(fd) != 0) {
954 		err = got_error_from_errno("fsync");
955 		goto done;
956 	}
957 
958 	if (update) {
959 		if (rename(tmppath, ondisk_path) != 0) {
960 			err = got_error_from_errno3("rename", tmppath,
961 			    ondisk_path);
962 			unlink(tmppath);
963 			goto done;
964 		}
965 	}
966 
967 	if (te_mode & S_IXUSR) {
968 		if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
969 			err = got_error_from_errno2("chmod", ondisk_path);
970 			goto done;
971 		}
972 	} else {
973 		if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
974 			err = got_error_from_errno2("chmod", ondisk_path);
975 			goto done;
976 		}
977 	}
978 
979 done:
980 	if (fd != -1 && close(fd) != 0 && err == NULL)
981 		err = got_error_from_errno("close");
982 	free(tmppath);
983 	return err;
984 }
985 
986 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
987 static const struct got_error *
988 get_modified_file_content_status(unsigned char *status, FILE *f)
989 {
990 	const struct got_error *err = NULL;
991 	const char *markers[3] = {
992 		GOT_DIFF_CONFLICT_MARKER_BEGIN,
993 		GOT_DIFF_CONFLICT_MARKER_SEP,
994 		GOT_DIFF_CONFLICT_MARKER_END
995 	};
996 	int i = 0;
997 	char *line;
998 	size_t len;
999 	const char delim[3] = {'\0', '\0', '\0'};
1000 
1001 	while (*status == GOT_STATUS_MODIFY) {
1002 		line = fparseln(f, &len, NULL, delim, 0);
1003 		if (line == NULL) {
1004 			if (feof(f))
1005 				break;
1006 			err = got_ferror(f, GOT_ERR_IO);
1007 			break;
1008 		}
1009 
1010 		if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1011 			if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1012 			    == 0)
1013 				*status = GOT_STATUS_CONFLICT;
1014 			else
1015 				i++;
1016 		}
1017 	}
1018 
1019 	return err;
1020 }
1021 
1022 static const struct got_error *
1023 get_file_status(unsigned char *status, struct stat *sb,
1024     struct got_fileindex_entry *ie, const char *abspath,
1025     struct got_repository *repo)
1026 {
1027 	const struct got_error *err = NULL;
1028 	struct got_object_id id;
1029 	size_t hdrlen;
1030 	FILE *f = NULL;
1031 	uint8_t fbuf[8192];
1032 	struct got_blob_object *blob = NULL;
1033 	size_t flen, blen;
1034 
1035 	*status = GOT_STATUS_NO_CHANGE;
1036 
1037 	if (lstat(abspath, sb) == -1) {
1038 		if (errno == ENOENT) {
1039 			if (ie) {
1040 				if (got_fileindex_entry_has_file_on_disk(ie))
1041 					*status = GOT_STATUS_MISSING;
1042 				else
1043 					*status = GOT_STATUS_DELETE;
1044 				sb->st_mode =
1045 				    ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1046 				    & (S_IRWXU | S_IRWXG | S_IRWXO));
1047 			} else
1048 				sb->st_mode = GOT_DEFAULT_FILE_MODE;
1049 			return NULL;
1050 		}
1051 		return got_error_from_errno2("lstat", abspath);
1052 	}
1053 
1054 	if (!S_ISREG(sb->st_mode)) {
1055 		*status = GOT_STATUS_OBSTRUCTED;
1056 		return NULL;
1057 	}
1058 
1059 	if (ie == NULL)
1060 		return NULL;
1061 
1062 	if (!got_fileindex_entry_has_file_on_disk(ie)) {
1063 		*status = GOT_STATUS_DELETE;
1064 		return NULL;
1065 	} else if (!got_fileindex_entry_has_blob(ie)) {
1066 		*status = GOT_STATUS_ADD;
1067 		return NULL;
1068 	}
1069 
1070 	if (ie->ctime_sec == sb->st_ctime &&
1071 	    ie->ctime_nsec == sb->st_ctimensec &&
1072 	    ie->mtime_sec == sb->st_mtime &&
1073 	    ie->mtime_sec == sb->st_mtime &&
1074 	    ie->mtime_nsec == sb->st_mtimensec &&
1075 	    ie->size == (sb->st_size & 0xffffffff))
1076 		return NULL;
1077 
1078 	memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1079 	err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1080 	if (err)
1081 		return err;
1082 
1083 	f = fopen(abspath, "r");
1084 	if (f == NULL) {
1085 		err = got_error_from_errno2("fopen", abspath);
1086 		goto done;
1087 	}
1088 	hdrlen = got_object_blob_get_hdrlen(blob);
1089 	for (;;) {
1090 		const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1091 		err = got_object_blob_read_block(&blen, blob);
1092 		if (err)
1093 			goto done;
1094 		/* Skip length of blob object header first time around. */
1095 		flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1096 		if (flen == 0 && ferror(f)) {
1097 			err = got_error_from_errno("fread");
1098 			goto done;
1099 		}
1100 		if (blen == 0) {
1101 			if (flen != 0)
1102 				*status = GOT_STATUS_MODIFY;
1103 			break;
1104 		} else if (flen == 0) {
1105 			if (blen != 0)
1106 				*status = GOT_STATUS_MODIFY;
1107 			break;
1108 		} else if (blen - hdrlen == flen) {
1109 			/* Skip blob object header first time around. */
1110 			if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1111 				*status = GOT_STATUS_MODIFY;
1112 				break;
1113 			}
1114 		} else {
1115 			*status = GOT_STATUS_MODIFY;
1116 			break;
1117 		}
1118 		hdrlen = 0;
1119 	}
1120 
1121 	if (*status == GOT_STATUS_MODIFY) {
1122 		rewind(f);
1123 		err = get_modified_file_content_status(status, f);
1124 	}
1125 done:
1126 	if (blob)
1127 		got_object_blob_close(blob);
1128 	if (f)
1129 		fclose(f);
1130 	return err;
1131 }
1132 
1133 static const struct got_error *
1134 update_blob(struct got_worktree *worktree,
1135     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1136     struct got_tree_entry *te, const char *path,
1137     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1138     void *progress_arg)
1139 {
1140 	const struct got_error *err = NULL;
1141 	struct got_blob_object *blob = NULL;
1142 	char *ondisk_path;
1143 	unsigned char status = GOT_STATUS_NO_CHANGE;
1144 	struct stat sb;
1145 
1146 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1147 		return got_error_from_errno("asprintf");
1148 
1149 	err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1150 	if (err)
1151 		goto done;
1152 
1153 	if (status == GOT_STATUS_OBSTRUCTED) {
1154 		(*progress_cb)(progress_arg, status, path);
1155 		goto done;
1156 	}
1157 
1158 	if (ie && status != GOT_STATUS_MISSING) {
1159 		if (got_fileindex_entry_has_commit(ie) &&
1160 		    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1161 		    SHA1_DIGEST_LENGTH) == 0) {
1162 			(*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1163 			    path);
1164 			goto done;
1165 		}
1166 		if (got_fileindex_entry_has_blob(ie) &&
1167 		    memcmp(ie->blob_sha1, te->id->sha1,
1168 		    SHA1_DIGEST_LENGTH) == 0)
1169 			goto done;
1170 	}
1171 
1172 	err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1173 	if (err)
1174 		goto done;
1175 
1176 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1177 		int update_timestamps;
1178 		struct got_blob_object *blob2 = NULL;
1179 		if (got_fileindex_entry_has_blob(ie)) {
1180 			struct got_object_id id2;
1181 			memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1182 			err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1183 			if (err)
1184 				goto done;
1185 		}
1186 		err = merge_blob(&update_timestamps, worktree, blob2,
1187 		    ondisk_path, path, sb.st_mode, blob,
1188 		    worktree->base_commit_id, repo,
1189 		    progress_cb, progress_arg);
1190 		if (blob2)
1191 			got_object_blob_close(blob2);
1192 		/*
1193 		 * Do not update timestamps of files with local changes.
1194 		 * Otherwise, a future status walk would treat them as
1195 		 * unmodified files again.
1196 		 */
1197 		err = got_fileindex_entry_update(ie, ondisk_path,
1198 		    blob->id.sha1, worktree->base_commit_id->sha1,
1199 		    update_timestamps);
1200 	} else if (status == GOT_STATUS_DELETE) {
1201 		(*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1202 		err = update_blob_fileindex_entry(worktree, fileindex, ie,
1203 		    ondisk_path, path, blob, 0);
1204 		if (err)
1205 			goto done;
1206 	} else {
1207 		err = install_blob(worktree, ondisk_path, path, te->mode,
1208 		    sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1209 		    repo, progress_cb, progress_arg);
1210 		if (err)
1211 			goto done;
1212 		err = update_blob_fileindex_entry(worktree, fileindex, ie,
1213 		    ondisk_path, path, blob, 1);
1214 		if (err)
1215 			goto done;
1216 	}
1217 	got_object_blob_close(blob);
1218 done:
1219 	free(ondisk_path);
1220 	return err;
1221 }
1222 
1223 static const struct got_error *
1224 remove_ondisk_file(const char *root_path, const char *path)
1225 {
1226 	const struct got_error *err = NULL;
1227 	char *ondisk_path = NULL;
1228 
1229 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1230 		return got_error_from_errno("asprintf");
1231 
1232 	if (unlink(ondisk_path) == -1) {
1233 		if (errno != ENOENT)
1234 			err = got_error_from_errno2("unlink", ondisk_path);
1235 	} else {
1236 		char *parent = dirname(ondisk_path);
1237 		while (parent && strcmp(parent, root_path) != 0) {
1238 			if (rmdir(parent) == -1) {
1239 				if (errno != ENOTEMPTY)
1240 					err = got_error_from_errno2("rmdir",
1241 					    parent);
1242 				break;
1243 			}
1244 			parent = dirname(parent);
1245 		}
1246 	}
1247 	free(ondisk_path);
1248 	return err;
1249 }
1250 
1251 static const struct got_error *
1252 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1253     struct got_fileindex_entry *ie, struct got_repository *repo,
1254     got_worktree_checkout_cb progress_cb, void *progress_arg)
1255 {
1256 	const struct got_error *err = NULL;
1257 	unsigned char status;
1258 	struct stat sb;
1259 	char *ondisk_path;
1260 
1261 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1262 	    == -1)
1263 		return got_error_from_errno("asprintf");
1264 
1265 	err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1266 	if (err)
1267 		return err;
1268 
1269 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1270 	    status == GOT_STATUS_ADD) {
1271 		(*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1272 		/*
1273 		 * Preserve the working file and change the deleted blob's
1274 		 * entry into a schedule-add entry.
1275 		 */
1276 		err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1277 		    0);
1278 		if (err)
1279 			return err;
1280 	} else {
1281 		(*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1282 		if (status == GOT_STATUS_NO_CHANGE) {
1283 			err = remove_ondisk_file(worktree->root_path, ie->path);
1284 			if (err)
1285 				return err;
1286 		}
1287 		got_fileindex_entry_remove(fileindex, ie);
1288 	}
1289 
1290 	return err;
1291 }
1292 
1293 struct diff_cb_arg {
1294     struct got_fileindex *fileindex;
1295     struct got_worktree *worktree;
1296     struct got_repository *repo;
1297     got_worktree_checkout_cb progress_cb;
1298     void *progress_arg;
1299     got_worktree_cancel_cb cancel_cb;
1300     void *cancel_arg;
1301 };
1302 
1303 static const struct got_error *
1304 diff_old_new(void *arg, struct got_fileindex_entry *ie,
1305     struct got_tree_entry *te, const char *parent_path)
1306 {
1307 	struct diff_cb_arg *a = arg;
1308 
1309 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1310 		return got_error(GOT_ERR_CANCELLED);
1311 
1312 	return update_blob(a->worktree, a->fileindex, ie, te,
1313 	    ie->path, a->repo, a->progress_cb, a->progress_arg);
1314 }
1315 
1316 static const struct got_error *
1317 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1318 {
1319 	struct diff_cb_arg *a = arg;
1320 
1321 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1322 		return got_error(GOT_ERR_CANCELLED);
1323 
1324 	return delete_blob(a->worktree, a->fileindex, ie,
1325 	    a->repo, a->progress_cb, a->progress_arg);
1326 }
1327 
1328 static const struct got_error *
1329 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1330 {
1331 	struct diff_cb_arg *a = arg;
1332 	const struct got_error *err;
1333 	char *path;
1334 
1335 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1336 		return got_error(GOT_ERR_CANCELLED);
1337 
1338 	if (asprintf(&path, "%s%s%s", parent_path,
1339 	    parent_path[0] ? "/" : "", te->name)
1340 	    == -1)
1341 		return got_error_from_errno("asprintf");
1342 
1343 	if (S_ISDIR(te->mode))
1344 		err = add_dir_on_disk(a->worktree, path);
1345 	else
1346 		err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1347 		    a->repo, a->progress_cb, a->progress_arg);
1348 
1349 	free(path);
1350 	return err;
1351 }
1352 
1353 static const struct got_error *
1354 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1355 {
1356 	const struct got_error *err = NULL;
1357 	char *uuidstr = NULL;
1358 	uint32_t uuid_status;
1359 
1360 	*refname = NULL;
1361 
1362 	uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1363 	if (uuid_status != uuid_s_ok)
1364 		return got_error_uuid(uuid_status);
1365 
1366 	if (asprintf(refname, "%s-%s", prefix, uuidstr)
1367 	    == -1) {
1368 		err = got_error_from_errno("asprintf");
1369 		*refname = NULL;
1370 	}
1371 	free(uuidstr);
1372 	return err;
1373 }
1374 
1375 const struct got_error *
1376 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1377 {
1378 	return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1379 }
1380 
1381 static const struct got_error *
1382 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1383 {
1384 	return get_ref_name(refname, worktree,
1385 	    GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1386 }
1387 
1388 static const struct got_error *
1389 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1390 {
1391 	return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1392 }
1393 
1394 static const struct got_error *
1395 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1396 {
1397 	return get_ref_name(refname, worktree,
1398 	    GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1399 }
1400 
1401 static const struct got_error *
1402 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1403 {
1404 	return get_ref_name(refname, worktree,
1405 	    GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1406 }
1407 
1408 
1409 /*
1410  * Prevent Git's garbage collector from deleting our base commit by
1411  * setting a reference to our base commit's ID.
1412  */
1413 static const struct got_error *
1414 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1415 {
1416 	const struct got_error *err = NULL;
1417 	struct got_reference *ref = NULL;
1418 	char *refname;
1419 
1420 	err = got_worktree_get_base_ref_name(&refname, worktree);
1421 	if (err)
1422 		return err;
1423 
1424 	err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1425 	if (err)
1426 		goto done;
1427 
1428 	err = got_ref_write(ref, repo);
1429 done:
1430 	free(refname);
1431 	if (ref)
1432 		got_ref_close(ref);
1433 	return err;
1434 }
1435 
1436 static const struct got_error *
1437 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1438    struct got_worktree *worktree)
1439 {
1440 	const struct got_error *err = NULL;
1441 	FILE *index = NULL;
1442 
1443 	*fileindex_path = NULL;
1444 	*fileindex = got_fileindex_alloc();
1445 	if (*fileindex == NULL)
1446 		return got_error_from_errno("got_fileindex_alloc");
1447 
1448 	if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1449 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1450 		err = got_error_from_errno("asprintf");
1451 		*fileindex_path = NULL;
1452 		goto done;
1453 	}
1454 
1455 	index = fopen(*fileindex_path, "rb");
1456 	if (index == NULL) {
1457 		if (errno != ENOENT)
1458 			err = got_error_from_errno2("fopen", *fileindex_path);
1459 	} else {
1460 		err = got_fileindex_read(*fileindex, index);
1461 		if (fclose(index) != 0 && err == NULL)
1462 			err = got_error_from_errno("fclose");
1463 	}
1464 done:
1465 	if (err) {
1466 		free(*fileindex_path);
1467 		*fileindex_path = NULL;
1468 		got_fileindex_free(*fileindex);
1469 		*fileindex = NULL;
1470 	}
1471 	return err;
1472 }
1473 
1474 struct bump_base_commit_id_arg {
1475 	struct got_object_id *base_commit_id;
1476 	const char *path;
1477 	size_t path_len;
1478 	const char *entry_name;
1479 	got_worktree_checkout_cb progress_cb;
1480 	void *progress_arg;
1481 };
1482 
1483 /* Bump base commit ID of all files within an updated part of the work tree. */
1484 static const struct got_error *
1485 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1486 {
1487 	struct bump_base_commit_id_arg *a = arg;
1488 
1489 	if (a->entry_name) {
1490 		if (strcmp(ie->path, a->path) != 0)
1491 			return NULL;
1492 	} else if (!got_path_is_child(ie->path, a->path, a->path_len))
1493 		return NULL;
1494 
1495 	if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1496 	    SHA1_DIGEST_LENGTH) == 0)
1497 		return NULL;
1498 
1499 	if (a->progress_cb)
1500 		(*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1501 		    ie->path);
1502 	memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1503 	return NULL;
1504 }
1505 
1506 static const struct got_error *
1507 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1508 {
1509 	const struct got_error *err = NULL;
1510 	char *new_fileindex_path = NULL;
1511 	FILE *new_index = NULL;
1512 
1513 	err = got_opentemp_named(&new_fileindex_path, &new_index,
1514 	    fileindex_path);
1515 	if (err)
1516 		goto done;
1517 
1518 	err = got_fileindex_write(fileindex, new_index);
1519 	if (err)
1520 		goto done;
1521 
1522 	if (rename(new_fileindex_path, fileindex_path) != 0) {
1523 		err = got_error_from_errno3("rename", new_fileindex_path,
1524 		    fileindex_path);
1525 		unlink(new_fileindex_path);
1526 	}
1527 done:
1528 	if (new_index)
1529 		fclose(new_index);
1530 	free(new_fileindex_path);
1531 	return err;
1532 }
1533 
1534 static const struct got_error *
1535 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1536     struct got_object_id **tree_id, const char *wt_relpath,
1537     struct got_worktree *worktree, struct got_repository *repo)
1538 {
1539 	const struct got_error *err = NULL;
1540 	struct got_object_id *id = NULL;
1541 	char *in_repo_path = NULL;
1542 	int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1543 
1544 	*entry_type = GOT_OBJ_TYPE_ANY;
1545 	*tree_relpath = NULL;
1546 	*tree_id = NULL;
1547 
1548 	if (wt_relpath[0] == '\0') {
1549 		/* Check out all files within the work tree. */
1550 		*entry_type = GOT_OBJ_TYPE_TREE;
1551 		*tree_relpath = strdup("");
1552 		if (*tree_relpath == NULL) {
1553 			err = got_error_from_errno("strdup");
1554 			goto done;
1555 		}
1556 		err = got_object_id_by_path(tree_id, repo,
1557 		    worktree->base_commit_id, worktree->path_prefix);
1558 		if (err)
1559 			goto done;
1560 		return NULL;
1561 	}
1562 
1563 	/* Check out a subset of files in the work tree. */
1564 
1565 	if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1566 	    is_root_wt ? "" : "/", wt_relpath) == -1) {
1567 		err = got_error_from_errno("asprintf");
1568 		goto done;
1569 	}
1570 
1571 	err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1572 	    in_repo_path);
1573 	if (err)
1574 		goto done;
1575 
1576 	free(in_repo_path);
1577 	in_repo_path = NULL;
1578 
1579 	err = got_object_get_type(entry_type, repo, id);
1580 	if (err)
1581 		goto done;
1582 
1583 	if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1584 		/* Check out a single file. */
1585 		if (strchr(wt_relpath, '/')  == NULL) {
1586 			/* Check out a single file in work tree's root dir. */
1587 			in_repo_path = strdup(worktree->path_prefix);
1588 			if (in_repo_path == NULL) {
1589 				err = got_error_from_errno("strdup");
1590 				goto done;
1591 			}
1592 			*tree_relpath = strdup("");
1593 			if (*tree_relpath == NULL) {
1594 				err = got_error_from_errno("strdup");
1595 				goto done;
1596 			}
1597 		} else {
1598 			/* Check out a single file in a subdirectory. */
1599 			err = got_path_dirname(tree_relpath, wt_relpath);
1600 			if (err)
1601 				return err;
1602 			if (asprintf(&in_repo_path, "%s%s%s",
1603 			    worktree->path_prefix, is_root_wt ? "" : "/",
1604 			    *tree_relpath) == -1) {
1605 				err = got_error_from_errno("asprintf");
1606 				goto done;
1607 			}
1608 		}
1609 		err = got_object_id_by_path(tree_id, repo,
1610 		    worktree->base_commit_id, in_repo_path);
1611 	} else {
1612 		/* Check out all files within a subdirectory. */
1613 		*tree_id = got_object_id_dup(id);
1614 		if (*tree_id == NULL) {
1615 			err = got_error_from_errno("got_object_id_dup");
1616 			goto done;
1617 		}
1618 		*tree_relpath = strdup(wt_relpath);
1619 		if (*tree_relpath == NULL) {
1620 			err = got_error_from_errno("strdup");
1621 			goto done;
1622 		}
1623 	}
1624 done:
1625 	free(id);
1626 	free(in_repo_path);
1627 	if (err) {
1628 		*entry_type = GOT_OBJ_TYPE_ANY;
1629 		free(*tree_relpath);
1630 		*tree_relpath = NULL;
1631 		free(*tree_id);
1632 		*tree_id = NULL;
1633 	}
1634 	return err;
1635 }
1636 
1637 static const struct got_error *
1638 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1639     const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1640     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1641     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1642 {
1643 	const struct got_error *err = NULL;
1644 	struct got_commit_object *commit = NULL;
1645 	struct got_tree_object *tree = NULL;
1646 	struct got_fileindex_diff_tree_cb diff_cb;
1647 	struct diff_cb_arg arg;
1648 
1649 	err = ref_base_commit(worktree, repo);
1650 	if (err)
1651 		goto done;
1652 
1653 	err = got_object_open_as_commit(&commit, repo,
1654 	   worktree->base_commit_id);
1655 	if (err)
1656 		goto done;
1657 
1658 	err = got_object_open_as_tree(&tree, repo, tree_id);
1659 	if (err)
1660 		goto done;
1661 
1662 	if (entry_name &&
1663 	    got_object_tree_find_entry(tree, entry_name) == NULL) {
1664 		err = got_error(GOT_ERR_NO_TREE_ENTRY);
1665 		goto done;
1666 	}
1667 
1668 	diff_cb.diff_old_new = diff_old_new;
1669 	diff_cb.diff_old = diff_old;
1670 	diff_cb.diff_new = diff_new;
1671 	arg.fileindex = fileindex;
1672 	arg.worktree = worktree;
1673 	arg.repo = repo;
1674 	arg.progress_cb = progress_cb;
1675 	arg.progress_arg = progress_arg;
1676 	arg.cancel_cb = cancel_cb;
1677 	arg.cancel_arg = cancel_arg;
1678 	err = got_fileindex_diff_tree(fileindex, tree, relpath,
1679 	    entry_name, repo, &diff_cb, &arg);
1680 done:
1681 	if (tree)
1682 		got_object_tree_close(tree);
1683 	if (commit)
1684 		got_object_commit_close(commit);
1685 	return err;
1686 }
1687 
1688 const struct got_error *
1689 got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1690     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1691     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1692 {
1693 	const struct got_error *err = NULL, *sync_err, *unlockerr;
1694 	struct got_commit_object *commit = NULL;
1695 	struct got_object_id *tree_id = NULL;
1696 	struct got_tree_object *tree = NULL;
1697 	struct got_fileindex *fileindex = NULL;
1698 	char *fileindex_path = NULL;
1699 	char *relpath = NULL, *entry_name = NULL;
1700 	int entry_type;
1701 
1702 	err = lock_worktree(worktree, LOCK_EX);
1703 	if (err)
1704 		return err;
1705 
1706 	err = find_tree_entry_for_checkout(&entry_type, &relpath, &tree_id,
1707 	    path, worktree, repo);
1708 	if (err)
1709 		goto done;
1710 
1711 	if (entry_type == GOT_OBJ_TYPE_BLOB) {
1712 		entry_name = basename(path);
1713 		if (entry_name == NULL) {
1714 			err = got_error_from_errno2("basename", path);
1715 			goto done;
1716 		}
1717 	}
1718 
1719 	/*
1720 	 * Read the file index.
1721 	 * Checking out files is supposed to be an idempotent operation.
1722 	 * If the on-disk file index is incomplete we will try to complete it.
1723 	 */
1724 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
1725 	if (err)
1726 		goto done;
1727 
1728 	err = checkout_files(worktree, fileindex, relpath, tree_id, entry_name,
1729 	    repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
1730 	if (err == NULL) {
1731 		struct bump_base_commit_id_arg bbc_arg;
1732 		bbc_arg.base_commit_id = worktree->base_commit_id;
1733 		bbc_arg.entry_name = entry_name;
1734 		bbc_arg.path = path;
1735 		bbc_arg.path_len = strlen(path);
1736 		bbc_arg.progress_cb = progress_cb;
1737 		bbc_arg.progress_arg = progress_arg;
1738 		err = got_fileindex_for_each_entry_safe(fileindex,
1739 		    bump_base_commit_id, &bbc_arg);
1740 	}
1741 	sync_err = sync_fileindex(fileindex, fileindex_path);
1742 	if (sync_err && err == NULL)
1743 		err = sync_err;
1744 done:
1745 	free(fileindex_path);
1746 	free(relpath);
1747 	if (tree)
1748 		got_object_tree_close(tree);
1749 	if (commit)
1750 		got_object_commit_close(commit);
1751 	if (fileindex)
1752 		got_fileindex_free(fileindex);
1753 	unlockerr = lock_worktree(worktree, LOCK_SH);
1754 	if (unlockerr && err == NULL)
1755 		err = unlockerr;
1756 	return err;
1757 }
1758 
1759 struct merge_file_cb_arg {
1760     struct got_worktree *worktree;
1761     struct got_fileindex *fileindex;
1762     got_worktree_checkout_cb progress_cb;
1763     void *progress_arg;
1764     got_worktree_cancel_cb cancel_cb;
1765     void *cancel_arg;
1766     struct got_object_id *commit_id2;
1767 };
1768 
1769 static const struct got_error *
1770 merge_file_cb(void *arg, struct got_blob_object *blob1,
1771     struct got_blob_object *blob2, struct got_object_id *id1,
1772     struct got_object_id *id2, const char *path1, const char *path2,
1773     struct got_repository *repo)
1774 {
1775 	static const struct got_error *err = NULL;
1776 	struct merge_file_cb_arg *a = arg;
1777 	struct got_fileindex_entry *ie;
1778 	char *ondisk_path = NULL;
1779 	struct stat sb;
1780 	unsigned char status;
1781 	int local_changes_subsumed;
1782 
1783 	if (blob1 && blob2) {
1784 		ie = got_fileindex_entry_get(a->fileindex, path2);
1785 		if (ie == NULL) {
1786 			(*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1787 			    path2);
1788 			return NULL;
1789 		}
1790 
1791 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1792 		    path2) == -1)
1793 			return got_error_from_errno("asprintf");
1794 
1795 		err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1796 		if (err)
1797 			goto done;
1798 
1799 		if (status == GOT_STATUS_DELETE) {
1800 			(*a->progress_cb)(a->progress_arg, GOT_STATUS_MERGE,
1801 			    path2);
1802 			goto done;
1803 		}
1804 		if (status != GOT_STATUS_NO_CHANGE &&
1805 		    status != GOT_STATUS_MODIFY &&
1806 		    status != GOT_STATUS_CONFLICT &&
1807 		    status != GOT_STATUS_ADD) {
1808 			(*a->progress_cb)(a->progress_arg, status, path2);
1809 			goto done;
1810 		}
1811 
1812 		err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1813 		    ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1814 		    a->progress_cb, a->progress_arg);
1815 	} else if (blob1) {
1816 		ie = got_fileindex_entry_get(a->fileindex, path1);
1817 		if (ie == NULL) {
1818 			(*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1819 			    path2);
1820 			return NULL;
1821 		}
1822 
1823 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1824 		    path1) == -1)
1825 			return got_error_from_errno("asprintf");
1826 
1827 		err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1828 		if (err)
1829 			goto done;
1830 
1831 		switch (status) {
1832 		case GOT_STATUS_NO_CHANGE:
1833 			(*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1834 			    path1);
1835 			err = remove_ondisk_file(a->worktree->root_path, path1);
1836 			if (err)
1837 				goto done;
1838 			if (ie)
1839 				got_fileindex_entry_mark_deleted_from_disk(ie);
1840 			break;
1841 		case GOT_STATUS_DELETE:
1842 		case GOT_STATUS_MISSING:
1843 			(*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1844 			    path1);
1845 			if (ie)
1846 				got_fileindex_entry_mark_deleted_from_disk(ie);
1847 			break;
1848 		case GOT_STATUS_ADD:
1849 		case GOT_STATUS_MODIFY:
1850 		case GOT_STATUS_CONFLICT:
1851 			(*a->progress_cb)(a->progress_arg,
1852 			    GOT_STATUS_CANNOT_DELETE, path1);
1853 			break;
1854 		case GOT_STATUS_OBSTRUCTED:
1855 			(*a->progress_cb)(a->progress_arg, status, path1);
1856 			break;
1857 		default:
1858 			break;
1859 		}
1860 	} else if (blob2) {
1861 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1862 		    path2) == -1)
1863 			return got_error_from_errno("asprintf");
1864 		ie = got_fileindex_entry_get(a->fileindex, path2);
1865 		if (ie) {
1866 			err = get_file_status(&status, &sb, ie, ondisk_path,
1867 			    repo);
1868 			if (err)
1869 				goto done;
1870 			if (status != GOT_STATUS_NO_CHANGE &&
1871 			    status != GOT_STATUS_MODIFY &&
1872 			    status != GOT_STATUS_CONFLICT &&
1873 			    status != GOT_STATUS_ADD) {
1874 				(*a->progress_cb)(a->progress_arg, status,
1875 				    path2);
1876 				goto done;
1877 			}
1878 			err = merge_blob(&local_changes_subsumed, a->worktree,
1879 			    NULL, ondisk_path, path2, sb.st_mode, blob2,
1880 			    a->commit_id2, repo,
1881 			    a->progress_cb, a->progress_arg);
1882 			if (status == GOT_STATUS_DELETE) {
1883 				err = update_blob_fileindex_entry(a->worktree,
1884 				    a->fileindex, ie, ondisk_path, ie->path,
1885 				    blob2, 0);
1886 				if (err)
1887 					goto done;
1888 			}
1889 		} else {
1890 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
1891 			err = install_blob(a->worktree, ondisk_path, path2,
1892 			    /* XXX get this from parent tree! */
1893 			    GOT_DEFAULT_FILE_MODE,
1894 			    sb.st_mode, blob2, 0, 0, repo,
1895 			    a->progress_cb, a->progress_arg);
1896 			if (err)
1897 				goto done;
1898 			err = got_fileindex_entry_alloc(&ie,
1899 			    ondisk_path, path2, NULL, NULL);
1900 			if (err)
1901 				goto done;
1902 			err = got_fileindex_entry_add(a->fileindex, ie);
1903 			if (err) {
1904 				got_fileindex_entry_free(ie);
1905 				goto done;
1906 			}
1907 		}
1908 	}
1909 done:
1910 	free(ondisk_path);
1911 	return err;
1912 }
1913 
1914 struct check_merge_ok_arg {
1915 	struct got_worktree *worktree;
1916 	struct got_repository *repo;
1917 };
1918 
1919 static const struct got_error *
1920 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
1921 {
1922 	const struct got_error *err = NULL;
1923 	struct check_merge_ok_arg *a = arg;
1924 	unsigned char status;
1925 	struct stat sb;
1926 	char *ondisk_path;
1927 
1928 	/* Reject merges into a work tree with mixed base commits. */
1929 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
1930 	    SHA1_DIGEST_LENGTH))
1931 		return got_error(GOT_ERR_MIXED_COMMITS);
1932 
1933 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
1934 	    == -1)
1935 		return got_error_from_errno("asprintf");
1936 
1937 	/* Reject merges into a work tree with conflicted files. */
1938 	err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
1939 	if (err)
1940 		return err;
1941 	if (status == GOT_STATUS_CONFLICT)
1942 		return got_error(GOT_ERR_CONFLICTS);
1943 
1944 	return NULL;
1945 }
1946 
1947 static const struct got_error *
1948 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1949     const char *fileindex_path, struct got_object_id *commit_id1,
1950     struct got_object_id *commit_id2, struct got_repository *repo,
1951     got_worktree_checkout_cb progress_cb, void *progress_arg,
1952     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1953 {
1954 	const struct got_error *err = NULL, *sync_err;
1955 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
1956 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1957 	struct merge_file_cb_arg arg;
1958 
1959 	if (commit_id1) {
1960 		err = got_object_id_by_path(&tree_id1, repo, commit_id1,
1961 		    worktree->path_prefix);
1962 		if (err)
1963 			goto done;
1964 
1965 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
1966 		if (err)
1967 			goto done;
1968 	}
1969 
1970 	err = got_object_id_by_path(&tree_id2, repo, commit_id2,
1971 	    worktree->path_prefix);
1972 	if (err)
1973 		goto done;
1974 
1975 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
1976 	if (err)
1977 		goto done;
1978 
1979 	arg.worktree = worktree;
1980 	arg.fileindex = fileindex;
1981 	arg.progress_cb = progress_cb;
1982 	arg.progress_arg = progress_arg;
1983 	arg.cancel_cb = cancel_cb;
1984 	arg.cancel_arg = cancel_arg;
1985 	arg.commit_id2 = commit_id2;
1986 	err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg);
1987 	sync_err = sync_fileindex(fileindex, fileindex_path);
1988 	if (sync_err && err == NULL)
1989 		err = sync_err;
1990 done:
1991 	if (tree1)
1992 		got_object_tree_close(tree1);
1993 	if (tree2)
1994 		got_object_tree_close(tree2);
1995 	return err;
1996 }
1997 
1998 const struct got_error *
1999 got_worktree_merge_files(struct got_worktree *worktree,
2000     struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2001     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2002     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2003 {
2004 	const struct got_error *err, *unlockerr;
2005 	char *fileindex_path = NULL;
2006 	struct got_fileindex *fileindex = NULL;
2007 	struct check_merge_ok_arg mok_arg;
2008 
2009 	err = lock_worktree(worktree, LOCK_EX);
2010 	if (err)
2011 		return err;
2012 
2013 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2014 	if (err)
2015 		goto done;
2016 
2017 	mok_arg.worktree = worktree;
2018 	mok_arg.repo = repo;
2019 	err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2020 	    &mok_arg);
2021 	if (err)
2022 		goto done;
2023 
2024 	err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2025 	    commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2026 done:
2027 	if (fileindex)
2028 		got_fileindex_free(fileindex);
2029 	free(fileindex_path);
2030 	unlockerr = lock_worktree(worktree, LOCK_SH);
2031 	if (unlockerr && err == NULL)
2032 		err = unlockerr;
2033 	return err;
2034 }
2035 
2036 struct diff_dir_cb_arg {
2037     struct got_fileindex *fileindex;
2038     struct got_worktree *worktree;
2039     const char *status_path;
2040     size_t status_path_len;
2041     struct got_repository *repo;
2042     got_worktree_status_cb status_cb;
2043     void *status_arg;
2044     got_worktree_cancel_cb cancel_cb;
2045     void *cancel_arg;
2046 };
2047 
2048 static const struct got_error *
2049 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2050     got_worktree_status_cb status_cb, void *status_arg,
2051     struct got_repository *repo)
2052 {
2053 	const struct got_error *err = NULL;
2054 	unsigned char status = GOT_STATUS_NO_CHANGE;
2055 	struct stat sb;
2056 	struct got_object_id blob_id, commit_id;
2057 
2058 	err = get_file_status(&status, &sb, ie, abspath, repo);
2059 	if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
2060 		memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2061 		memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2062 		err = (*status_cb)(status_arg, status, ie->path, &blob_id,
2063 		    &commit_id);
2064 	}
2065 	return err;
2066 }
2067 
2068 static const struct got_error *
2069 status_old_new(void *arg, struct got_fileindex_entry *ie,
2070     struct dirent *de, const char *parent_path)
2071 {
2072 	const struct got_error *err = NULL;
2073 	struct diff_dir_cb_arg *a = arg;
2074 	char *abspath;
2075 
2076 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2077 		return got_error(GOT_ERR_CANCELLED);
2078 
2079 	if (got_path_cmp(parent_path, a->status_path) != 0 &&
2080 	    !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2081 		return NULL;
2082 
2083 	if (parent_path[0]) {
2084 		if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2085 		    parent_path, de->d_name) == -1)
2086 			return got_error_from_errno("asprintf");
2087 	} else {
2088 		if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2089 		    de->d_name) == -1)
2090 			return got_error_from_errno("asprintf");
2091 	}
2092 
2093 	err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2094 	    a->repo);
2095 	free(abspath);
2096 	return err;
2097 }
2098 
2099 static const struct got_error *
2100 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2101 {
2102 	struct diff_dir_cb_arg *a = arg;
2103 	struct got_object_id blob_id, commit_id;
2104 	unsigned char status;
2105 
2106 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2107 		return got_error(GOT_ERR_CANCELLED);
2108 
2109 	if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2110 		return NULL;
2111 
2112 	memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2113 	memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2114 	if (got_fileindex_entry_has_file_on_disk(ie))
2115 		status = GOT_STATUS_MISSING;
2116 	else
2117 		status = GOT_STATUS_DELETE;
2118 	return (*a->status_cb)(a->status_arg, status, ie->path, &blob_id,
2119 	    &commit_id);
2120 }
2121 
2122 static const struct got_error *
2123 status_new(void *arg, struct dirent *de, const char *parent_path)
2124 {
2125 	const struct got_error *err = NULL;
2126 	struct diff_dir_cb_arg *a = arg;
2127 	char *path = NULL;
2128 
2129 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2130 		return got_error(GOT_ERR_CANCELLED);
2131 
2132 	if (de->d_type == DT_DIR)
2133 		return NULL;
2134 
2135 	/* XXX ignore symlinks for now */
2136 	if (de->d_type == DT_LNK)
2137 		return NULL;
2138 
2139 	if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2140 		return NULL;
2141 
2142 	if (parent_path[0]) {
2143 		if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2144 			return got_error_from_errno("asprintf");
2145 	} else {
2146 		path = de->d_name;
2147 	}
2148 
2149 	err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
2150 	    NULL, NULL);
2151 	if (parent_path[0])
2152 		free(path);
2153 	return err;
2154 }
2155 
2156 const struct got_error *
2157 got_worktree_status(struct got_worktree *worktree, const char *path,
2158     struct got_repository *repo, got_worktree_status_cb status_cb,
2159     void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2160 {
2161 	const struct got_error *err = NULL;
2162 	DIR *workdir = NULL;
2163 	char *fileindex_path = NULL;
2164 	struct got_fileindex *fileindex = NULL;
2165 	struct got_fileindex_diff_dir_cb fdiff_cb;
2166 	struct diff_dir_cb_arg arg;
2167 	char *ondisk_path = NULL;
2168 
2169 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2170 	if (err)
2171 		return err;
2172 
2173 	if (asprintf(&ondisk_path, "%s%s%s",
2174 	    worktree->root_path, path[0] ? "/" : "", path) == -1) {
2175 		err = got_error_from_errno("asprintf");
2176 		goto done;
2177 	}
2178 	workdir = opendir(ondisk_path);
2179 	if (workdir == NULL) {
2180 		if (errno == ENOTDIR || errno == ENOENT) {
2181 			struct got_fileindex_entry *ie;
2182 			ie = got_fileindex_entry_get(fileindex, path);
2183 			if (ie == NULL) {
2184 				err = got_error(GOT_ERR_BAD_PATH);
2185 				goto done;
2186 			}
2187 			err = report_file_status(ie, ondisk_path,
2188 			    status_cb, status_arg, repo);
2189 			goto done;
2190 		} else {
2191 			err = got_error_from_errno2("opendir", ondisk_path);
2192 			goto done;
2193 		}
2194 	}
2195 	fdiff_cb.diff_old_new = status_old_new;
2196 	fdiff_cb.diff_old = status_old;
2197 	fdiff_cb.diff_new = status_new;
2198 	arg.fileindex = fileindex;
2199 	arg.worktree = worktree;
2200 	arg.status_path = path;
2201 	arg.status_path_len = strlen(path);
2202 	arg.repo = repo;
2203 	arg.status_cb = status_cb;
2204 	arg.status_arg = status_arg;
2205 	arg.cancel_cb = cancel_cb;
2206 	arg.cancel_arg = cancel_arg;
2207 	err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
2208 	    path, repo, &fdiff_cb, &arg);
2209 done:
2210 	if (workdir)
2211 		closedir(workdir);
2212 	free(ondisk_path);
2213 	free(fileindex_path);
2214 	got_fileindex_free(fileindex);
2215 	return err;
2216 }
2217 
2218 const struct got_error *
2219 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2220     const char *arg)
2221 {
2222 	const struct got_error *err = NULL;
2223 	char *resolved, *path = NULL;
2224 	size_t len;
2225 
2226 	*wt_path = NULL;
2227 
2228 	resolved = realpath(arg, NULL);
2229 	if (resolved == NULL)
2230 		return got_error_from_errno2("realpath", arg);
2231 
2232 	if (strncmp(got_worktree_get_root_path(worktree), resolved,
2233 	    strlen(got_worktree_get_root_path(worktree)))) {
2234 		err = got_error(GOT_ERR_BAD_PATH);
2235 		goto done;
2236 	}
2237 
2238 	if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2239 		err = got_path_skip_common_ancestor(&path,
2240 		    got_worktree_get_root_path(worktree), resolved);
2241 		if (err)
2242 			goto done;
2243 	} else {
2244 		path = strdup("");
2245 		if (path == NULL) {
2246 			err = got_error_from_errno("strdup");
2247 			goto done;
2248 		}
2249 	}
2250 
2251 	/* XXX status walk can't deal with trailing slash! */
2252 	len = strlen(path);
2253 	while (path[len - 1] == '/') {
2254 		path[len - 1] = '\0';
2255 		len--;
2256 	}
2257 done:
2258 	free(resolved);
2259 	if (err == NULL)
2260 		*wt_path = path;
2261 	else
2262 		free(path);
2263 	return err;
2264 }
2265 
2266 static const struct got_error *
2267 schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2268     const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2269     struct got_repository *repo)
2270 {
2271 	const struct got_error *err = NULL;
2272 	struct got_fileindex_entry *ie;
2273 
2274 	/* Re-adding an existing entry is a no-op. */
2275 	if (got_fileindex_entry_get(fileindex, relpath) != NULL)
2276 		return NULL;
2277 
2278 	err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2279 	if (err)
2280 		return err;
2281 
2282 	err = got_fileindex_entry_add(fileindex, ie);
2283 	if (err) {
2284 		got_fileindex_entry_free(ie);
2285 		return err;
2286 	}
2287 
2288 	return report_file_status(ie, relpath, status_cb, status_arg, repo);
2289 }
2290 
2291 const struct got_error *
2292 got_worktree_schedule_add(struct got_worktree *worktree,
2293     struct got_pathlist_head *ondisk_paths,
2294     got_worktree_status_cb status_cb, void *status_arg,
2295     struct got_repository *repo)
2296 {
2297 	struct got_fileindex *fileindex = NULL;
2298 	char *fileindex_path = NULL;
2299 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2300 	struct got_pathlist_entry *pe;
2301 
2302 	err = lock_worktree(worktree, LOCK_EX);
2303 	if (err)
2304 		return err;
2305 
2306 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2307 	if (err)
2308 		goto done;
2309 
2310 	TAILQ_FOREACH(pe, ondisk_paths, entry) {
2311 		char *relpath;
2312 		err = got_path_skip_common_ancestor(&relpath,
2313 		    got_worktree_get_root_path(worktree), pe->path);
2314 		if (err)
2315 			break;
2316 		err = schedule_addition(pe->path, fileindex, relpath,
2317 		    status_cb, status_arg, repo);
2318 		free(relpath);
2319 		if (err)
2320 			break;
2321 	}
2322 	sync_err = sync_fileindex(fileindex, fileindex_path);
2323 	if (sync_err && err == NULL)
2324 		err = sync_err;
2325 done:
2326 	free(fileindex_path);
2327 	if (fileindex)
2328 		got_fileindex_free(fileindex);
2329 	unlockerr = lock_worktree(worktree, LOCK_SH);
2330 	if (unlockerr && err == NULL)
2331 		err = unlockerr;
2332 	return err;
2333 }
2334 
2335 static const struct got_error *
2336 schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2337     const char *relpath, int delete_local_mods,
2338     got_worktree_status_cb status_cb, void *status_arg,
2339     struct got_repository *repo)
2340 {
2341 	const struct got_error *err = NULL;
2342 	struct got_fileindex_entry *ie = NULL;
2343 	unsigned char status;
2344 	struct stat sb;
2345 
2346 	ie = got_fileindex_entry_get(fileindex, relpath);
2347 	if (ie == NULL)
2348 		return got_error(GOT_ERR_BAD_PATH);
2349 
2350 	err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2351 	if (err)
2352 		return err;
2353 
2354 	if (status != GOT_STATUS_NO_CHANGE) {
2355 		if (status == GOT_STATUS_DELETE)
2356 			return got_error_set_errno(ENOENT, ondisk_path);
2357 		if (status != GOT_STATUS_MODIFY)
2358 			return got_error(GOT_ERR_FILE_STATUS);
2359 		if (!delete_local_mods)
2360 			return got_error(GOT_ERR_FILE_MODIFIED);
2361 	}
2362 
2363 	if (unlink(ondisk_path) != 0)
2364 		return got_error_from_errno2("unlink", ondisk_path);
2365 
2366 	got_fileindex_entry_mark_deleted_from_disk(ie);
2367 	return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2368 }
2369 
2370 const struct got_error *
2371 got_worktree_schedule_delete(struct got_worktree *worktree,
2372     struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2373     got_worktree_status_cb status_cb, void *status_arg,
2374     struct got_repository *repo)
2375 {
2376 	struct got_fileindex *fileindex = NULL;
2377 	char *fileindex_path = NULL;
2378 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2379 	struct got_pathlist_entry *pe;
2380 
2381 	err = lock_worktree(worktree, LOCK_EX);
2382 	if (err)
2383 		return err;
2384 
2385 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2386 	if (err)
2387 		goto done;
2388 
2389 	TAILQ_FOREACH(pe, ondisk_paths, entry) {
2390 		char *relpath;
2391 		err = got_path_skip_common_ancestor(&relpath,
2392 		    got_worktree_get_root_path(worktree), pe->path);
2393 		if (err)
2394 			break;
2395 		err = schedule_for_deletion(pe->path, fileindex, relpath,
2396 		    delete_local_mods, status_cb, status_arg, repo);
2397 		free(relpath);
2398 		if (err)
2399 			break;
2400 	}
2401 	sync_err = sync_fileindex(fileindex, fileindex_path);
2402 	if (sync_err && err == NULL)
2403 		err = sync_err;
2404 done:
2405 	free(fileindex_path);
2406 	if (fileindex)
2407 		got_fileindex_free(fileindex);
2408 	unlockerr = lock_worktree(worktree, LOCK_SH);
2409 	if (unlockerr && err == NULL)
2410 		err = unlockerr;
2411 	return err;
2412 }
2413 
2414 static const struct got_error *
2415 revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2416     const char *ondisk_path,
2417     got_worktree_checkout_cb progress_cb, void *progress_arg,
2418     struct got_repository *repo)
2419 {
2420 	const struct got_error *err = NULL;
2421 	char *relpath = NULL, *parent_path = NULL;
2422 	struct got_fileindex_entry *ie;
2423 	struct got_tree_object *tree = NULL;
2424 	struct got_object_id *tree_id = NULL;
2425 	const struct got_tree_entry *te;
2426 	char *tree_path = NULL, *te_name;
2427 	struct got_blob_object *blob = NULL;
2428 	unsigned char status;
2429 	struct stat sb;
2430 
2431 	err = got_path_skip_common_ancestor(&relpath,
2432 	    got_worktree_get_root_path(worktree), ondisk_path);
2433 	if (err)
2434 		goto done;
2435 
2436 	ie = got_fileindex_entry_get(fileindex, relpath);
2437 	if (ie == NULL) {
2438 		err = got_error(GOT_ERR_BAD_PATH);
2439 		goto done;
2440 	}
2441 
2442 	/* Construct in-repository path of tree which contains this blob. */
2443 	err = got_path_dirname(&parent_path, ie->path);
2444 	if (err) {
2445 		if (err->code != GOT_ERR_BAD_PATH)
2446 			goto done;
2447 		parent_path = strdup("/");
2448 		if (parent_path == NULL) {
2449 			err = got_error_from_errno("strdup");
2450 			goto done;
2451 		}
2452 	}
2453 	if (got_path_is_root_dir(worktree->path_prefix)) {
2454 		tree_path = strdup(parent_path);
2455 		if (tree_path == NULL) {
2456 			err = got_error_from_errno("strdup");
2457 			goto done;
2458 		}
2459 	} else {
2460 		if (got_path_is_root_dir(parent_path)) {
2461 			tree_path = strdup(worktree->path_prefix);
2462 			if (tree_path == NULL) {
2463 				err = got_error_from_errno("strdup");
2464 				goto done;
2465 			}
2466 		} else {
2467 			if (asprintf(&tree_path, "%s/%s",
2468 			    worktree->path_prefix, parent_path) == -1) {
2469 				err = got_error_from_errno("asprintf");
2470 				goto done;
2471 			}
2472 		}
2473 	}
2474 
2475 	err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2476 	    tree_path);
2477 	if (err)
2478 		goto done;
2479 
2480 	err = got_object_open_as_tree(&tree, repo, tree_id);
2481 	if (err)
2482 		goto done;
2483 
2484 	te_name = basename(ie->path);
2485 	if (te_name == NULL) {
2486 		err = got_error_from_errno2("basename", ie->path);
2487 		goto done;
2488 	}
2489 
2490 	err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2491 	if (err)
2492 		goto done;
2493 
2494 	te = got_object_tree_find_entry(tree, te_name);
2495 	if (te == NULL && status != GOT_STATUS_ADD) {
2496 		err = got_error(GOT_ERR_NO_TREE_ENTRY);
2497 		goto done;
2498 	}
2499 
2500 	switch (status) {
2501 	case GOT_STATUS_ADD:
2502 		(*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2503 		got_fileindex_entry_remove(fileindex, ie);
2504 		break;
2505 	case GOT_STATUS_DELETE:
2506 	case GOT_STATUS_MODIFY:
2507 	case GOT_STATUS_CONFLICT:
2508 	case GOT_STATUS_MISSING: {
2509 		struct got_object_id id;
2510 		memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2511 		err = got_object_open_as_blob(&blob, repo, &id, 8192);
2512 		if (err)
2513 			goto done;
2514 		err = install_blob(worktree, ondisk_path, ie->path,
2515 		    te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2516 		    progress_arg);
2517 		if (err)
2518 			goto done;
2519 		if (status == GOT_STATUS_DELETE) {
2520 			err = update_blob_fileindex_entry(worktree,
2521 			    fileindex, ie, ondisk_path, ie->path, blob, 1);
2522 			if (err)
2523 				goto done;
2524 		}
2525 		break;
2526 	}
2527 	default:
2528 			goto done;
2529 	}
2530 done:
2531 	free(relpath);
2532 	free(parent_path);
2533 	free(tree_path);
2534 	if (blob)
2535 		got_object_blob_close(blob);
2536 	if (tree)
2537 		got_object_tree_close(tree);
2538 	free(tree_id);
2539 	return err;
2540 }
2541 
2542 const struct got_error *
2543 got_worktree_revert(struct got_worktree *worktree,
2544     struct got_pathlist_head *ondisk_paths,
2545     got_worktree_checkout_cb progress_cb, void *progress_arg,
2546     struct got_repository *repo)
2547 {
2548 	struct got_fileindex *fileindex = NULL;
2549 	char *fileindex_path = NULL;
2550 	const struct got_error *err = NULL, *unlockerr = NULL;
2551 	const struct got_error *sync_err = NULL;
2552 	struct got_pathlist_entry *pe;
2553 
2554 	err = lock_worktree(worktree, LOCK_EX);
2555 	if (err)
2556 		return err;
2557 
2558 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2559 	if (err)
2560 		goto done;
2561 
2562 	TAILQ_FOREACH(pe, ondisk_paths, entry) {
2563 		err = revert_file(worktree, fileindex, pe->path,
2564 		    progress_cb, progress_arg, repo);
2565 		if (err)
2566 			break;
2567 	}
2568 	sync_err = sync_fileindex(fileindex, fileindex_path);
2569 	if (sync_err && err == NULL)
2570 		err = sync_err;
2571 done:
2572 	free(fileindex_path);
2573 	if (fileindex)
2574 		got_fileindex_free(fileindex);
2575 	unlockerr = lock_worktree(worktree, LOCK_SH);
2576 	if (unlockerr && err == NULL)
2577 		err = unlockerr;
2578 	return err;
2579 }
2580 
2581 static void
2582 free_commitable(struct got_commitable *ct)
2583 {
2584 	free(ct->path);
2585 	free(ct->in_repo_path);
2586 	free(ct->ondisk_path);
2587 	free(ct->blob_id);
2588 	free(ct->base_blob_id);
2589 	free(ct->base_commit_id);
2590 	free(ct);
2591 }
2592 
2593 struct collect_commitables_arg {
2594 	struct got_pathlist_head *commitable_paths;
2595 	struct got_repository *repo;
2596 	struct got_worktree *worktree;
2597 };
2598 
2599 static const struct got_error *
2600 collect_commitables(void *arg, unsigned char status, const char *relpath,
2601     struct got_object_id *blob_id, struct got_object_id *commit_id)
2602 {
2603 	struct collect_commitables_arg *a = arg;
2604 	const struct got_error *err = NULL;
2605 	struct got_commitable *ct = NULL;
2606 	struct got_pathlist_entry *new = NULL;
2607 	char *parent_path = NULL, *path = NULL;
2608 	struct stat sb;
2609 
2610 	if (status == GOT_STATUS_CONFLICT)
2611 		return got_error(GOT_ERR_COMMIT_CONFLICT);
2612 
2613 	if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2614 	    status != GOT_STATUS_DELETE)
2615 		return NULL;
2616 
2617 	if (asprintf(&path, "/%s", relpath) == -1) {
2618 		err = got_error_from_errno("asprintf");
2619 		goto done;
2620 	}
2621 	if (strcmp(path, "/") == 0) {
2622 		parent_path = strdup("");
2623 		if (parent_path == NULL)
2624 			return got_error_from_errno("strdup");
2625 	} else {
2626 		err = got_path_dirname(&parent_path, path);
2627 		if (err)
2628 			return err;
2629 	}
2630 
2631 	ct = calloc(1, sizeof(*ct));
2632 	if (ct == NULL) {
2633 		err = got_error_from_errno("calloc");
2634 		goto done;
2635 	}
2636 
2637 	if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2638 	    relpath) == -1) {
2639 		err = got_error_from_errno("asprintf");
2640 		goto done;
2641 	}
2642 	if (status == GOT_STATUS_DELETE) {
2643 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
2644 	} else {
2645 		if (lstat(ct->ondisk_path, &sb) != 0) {
2646 			err = got_error_from_errno2("lstat", ct->ondisk_path);
2647 			goto done;
2648 		}
2649 		ct->mode = sb.st_mode;
2650 	}
2651 
2652 	if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2653 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2654 	    relpath) == -1) {
2655 		err = got_error_from_errno("asprintf");
2656 		goto done;
2657 	}
2658 
2659 	ct->status = status;
2660 	ct->blob_id = NULL; /* will be filled in when blob gets created */
2661 	if (ct->status != GOT_STATUS_ADD) {
2662 		ct->base_blob_id = got_object_id_dup(blob_id);
2663 		if (ct->base_blob_id == NULL) {
2664 			err = got_error_from_errno("got_object_id_dup");
2665 			goto done;
2666 		}
2667 		ct->base_commit_id = got_object_id_dup(commit_id);
2668 		if (ct->base_commit_id == NULL) {
2669 			err = got_error_from_errno("got_object_id_dup");
2670 			goto done;
2671 		}
2672 	}
2673 	ct->path = strdup(path);
2674 	if (ct->path == NULL) {
2675 		err = got_error_from_errno("strdup");
2676 		goto done;
2677 	}
2678 	err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2679 done:
2680 	if (ct && (err || new == NULL))
2681 		free_commitable(ct);
2682 	free(parent_path);
2683 	free(path);
2684 	return err;
2685 }
2686 
2687 static const struct got_error *write_tree(struct got_object_id **,
2688     struct got_tree_object *, const char *, struct got_pathlist_head *,
2689     got_worktree_status_cb status_cb, void *status_arg,
2690     struct got_repository *);
2691 
2692 static const struct got_error *
2693 write_subtree(struct got_object_id **new_subtree_id,
2694     struct got_tree_entry *te, const char *parent_path,
2695     struct got_pathlist_head *commitable_paths,
2696     got_worktree_status_cb status_cb, void *status_arg,
2697     struct got_repository *repo)
2698 {
2699 	const struct got_error *err = NULL;
2700 	struct got_tree_object *subtree;
2701 	char *subpath;
2702 
2703 	if (asprintf(&subpath, "%s%s%s", parent_path,
2704 	    got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2705 		return got_error_from_errno("asprintf");
2706 
2707 	err = got_object_open_as_tree(&subtree, repo, te->id);
2708 	if (err)
2709 		return err;
2710 
2711 	err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2712 	    status_cb, status_arg, repo);
2713 	got_object_tree_close(subtree);
2714 	free(subpath);
2715 	return err;
2716 }
2717 
2718 static const struct got_error *
2719 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2720 {
2721 	const struct got_error *err = NULL;
2722 	char *ct_parent_path = NULL;
2723 
2724 	*match = 0;
2725 
2726 	if (strchr(ct->path, '/') == NULL) {
2727 		*match = got_path_is_root_dir(path);
2728 		return NULL;
2729 	}
2730 
2731 	err = got_path_dirname(&ct_parent_path, ct->path);
2732 	if (err)
2733 		return err;
2734 	*match = (strcmp(path, ct_parent_path) == 0);
2735 	free(ct_parent_path);
2736 	return err;
2737 }
2738 
2739 static mode_t
2740 get_ct_file_mode(struct got_commitable *ct)
2741 {
2742 	return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2743 }
2744 
2745 static const struct got_error *
2746 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2747     struct got_tree_entry *te, struct got_commitable *ct)
2748 {
2749 	const struct got_error *err = NULL;
2750 
2751 	*new_te = NULL;
2752 
2753 	err = got_object_tree_entry_dup(new_te, te);
2754 	if (err)
2755 		goto done;
2756 
2757 	(*new_te)->mode = get_ct_file_mode(ct);
2758 
2759 	free((*new_te)->id);
2760 	(*new_te)->id = got_object_id_dup(ct->blob_id);
2761 	if ((*new_te)->id == NULL) {
2762 		err = got_error_from_errno("got_object_id_dup");
2763 		goto done;
2764 	}
2765 done:
2766 	if (err && *new_te) {
2767 		got_object_tree_entry_close(*new_te);
2768 		*new_te = NULL;
2769 	}
2770 	return err;
2771 }
2772 
2773 static const struct got_error *
2774 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2775     struct got_commitable *ct)
2776 {
2777 	const struct got_error *err = NULL;
2778 	char *ct_name;
2779 
2780 	 *new_te = NULL;
2781 
2782 	*new_te = calloc(1, sizeof(**new_te));
2783 	if (*new_te == NULL)
2784 		return got_error_from_errno("calloc");
2785 
2786 	ct_name = basename(ct->path);
2787 	if (ct_name == NULL) {
2788 		err = got_error_from_errno2("basename", ct->path);
2789 		goto done;
2790 	}
2791 	(*new_te)->name = strdup(ct_name);
2792 	if ((*new_te)->name == NULL) {
2793 		err = got_error_from_errno("strdup");
2794 		goto done;
2795 	}
2796 
2797 	(*new_te)->mode = get_ct_file_mode(ct);
2798 
2799 	(*new_te)->id = got_object_id_dup(ct->blob_id);
2800 	if ((*new_te)->id == NULL) {
2801 		err = got_error_from_errno("got_object_id_dup");
2802 		goto done;
2803 	}
2804 done:
2805 	if (err && *new_te) {
2806 		got_object_tree_entry_close(*new_te);
2807 		*new_te = NULL;
2808 	}
2809 	return err;
2810 }
2811 
2812 static const struct got_error *
2813 insert_tree_entry(struct got_tree_entry *new_te,
2814     struct got_pathlist_head *paths)
2815 {
2816 	const struct got_error *err = NULL;
2817 	struct got_pathlist_entry *new_pe;
2818 
2819 	err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2820 	if (err)
2821 		return err;
2822 	if (new_pe == NULL)
2823 		return got_error(GOT_ERR_TREE_DUP_ENTRY);
2824 	return NULL;
2825 }
2826 
2827 static const struct got_error *
2828 report_ct_status(struct got_commitable *ct,
2829     got_worktree_status_cb status_cb, void *status_arg)
2830 {
2831 	const char *ct_path = ct->path;
2832 	while (ct_path[0] == '/')
2833 		ct_path++;
2834 	return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id, NULL);
2835 }
2836 
2837 static const struct got_error *
2838 match_modified_subtree(int *modified, struct got_tree_entry *te,
2839     const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2840 {
2841 	const struct got_error *err = NULL;
2842 	struct got_pathlist_entry *pe;
2843 	char *te_path;
2844 
2845 	*modified = 0;
2846 
2847 	if (asprintf(&te_path, "%s%s%s", base_tree_path,
2848 	    got_path_is_root_dir(base_tree_path) ? "" : "/",
2849 	    te->name) == -1)
2850 		return got_error_from_errno("asprintf");
2851 
2852 	TAILQ_FOREACH(pe, commitable_paths, entry) {
2853 		struct got_commitable *ct = pe->data;
2854 		*modified = got_path_is_child(ct->in_repo_path, te_path,
2855 		    strlen(te_path));
2856 		 if (*modified)
2857 			break;
2858 	}
2859 
2860 	free(te_path);
2861 	return err;
2862 }
2863 
2864 static const struct got_error *
2865 match_deleted_or_modified_ct(struct got_commitable **ctp,
2866     struct got_tree_entry *te, const char *base_tree_path,
2867     struct got_pathlist_head *commitable_paths)
2868 {
2869 	const struct got_error *err = NULL;
2870 	struct got_pathlist_entry *pe;
2871 
2872 	*ctp = NULL;
2873 
2874 	TAILQ_FOREACH(pe, commitable_paths, entry) {
2875 		struct got_commitable *ct = pe->data;
2876 		char *ct_name = NULL;
2877 		int path_matches;
2878 
2879 		if (ct->status != GOT_STATUS_MODIFY &&
2880 		    ct->status != GOT_STATUS_DELETE)
2881 			continue;
2882 
2883 		if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
2884 			continue;
2885 
2886 		 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
2887 		 if (err)
2888 			return err;
2889 		if (!path_matches)
2890 			continue;
2891 
2892 		ct_name = basename(pe->path);
2893 		if (ct_name == NULL)
2894 			return got_error_from_errno2("basename", pe->path);
2895 
2896 		if (strcmp(te->name, ct_name) != 0)
2897 			continue;
2898 
2899 		*ctp = ct;
2900 		break;
2901 	}
2902 
2903 	return err;
2904 }
2905 
2906 static const struct got_error *
2907 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
2908     const char *child_path, const char *path_base_tree,
2909     struct got_pathlist_head *commitable_paths,
2910     got_worktree_status_cb status_cb, void *status_arg,
2911     struct got_repository *repo)
2912 {
2913 	const struct got_error *err = NULL;
2914 	struct got_tree_entry *new_te;
2915 	char *subtree_path;
2916 
2917 	*new_tep = NULL;
2918 
2919 	if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
2920 	    got_path_is_root_dir(path_base_tree) ? "" : "/",
2921 	    child_path) == -1)
2922 		return got_error_from_errno("asprintf");
2923 
2924 	new_te = calloc(1, sizeof(*new_te));
2925 	new_te->mode = S_IFDIR;
2926 	new_te->name = strdup(child_path);
2927 	if (new_te->name == NULL) {
2928 		err = got_error_from_errno("strdup");
2929 		got_object_tree_entry_close(new_te);
2930 		goto done;
2931 	}
2932 	err = write_tree(&new_te->id, NULL, subtree_path,
2933 	    commitable_paths, status_cb, status_arg, repo);
2934 	if (err) {
2935 		got_object_tree_entry_close(new_te);
2936 		goto done;
2937 	}
2938 done:
2939 	free(subtree_path);
2940 	if (err == NULL)
2941 		*new_tep = new_te;
2942 	return err;
2943 }
2944 
2945 static const struct got_error *
2946 write_tree(struct got_object_id **new_tree_id,
2947     struct got_tree_object *base_tree, const char *path_base_tree,
2948     struct got_pathlist_head *commitable_paths,
2949     got_worktree_status_cb status_cb, void *status_arg,
2950     struct got_repository *repo)
2951 {
2952 	const struct got_error *err = NULL;
2953 	const struct got_tree_entries *base_entries = NULL;
2954 	struct got_pathlist_head paths;
2955 	struct got_tree_entries new_tree_entries;
2956 	struct got_tree_entry *te, *new_te = NULL;
2957 	struct got_pathlist_entry *pe;
2958 
2959 	TAILQ_INIT(&paths);
2960 	new_tree_entries.nentries = 0;
2961 	SIMPLEQ_INIT(&new_tree_entries.head);
2962 
2963 	/* Insert, and recurse into, newly added entries first. */
2964 	TAILQ_FOREACH(pe, commitable_paths, entry) {
2965 		struct got_commitable *ct = pe->data;
2966 		char *child_path = NULL, *slash;
2967 
2968 		if (ct->status != GOT_STATUS_ADD ||
2969 		    (ct->flags & GOT_COMMITABLE_ADDED))
2970 			continue;
2971 
2972 		 if (!got_path_is_child(pe->path, path_base_tree,
2973 		     strlen(path_base_tree)))
2974 			continue;
2975 
2976 		err = got_path_skip_common_ancestor(&child_path, path_base_tree,
2977 		    pe->path);
2978 		if (err)
2979 			goto done;
2980 
2981 		slash = strchr(child_path, '/');
2982 		if (slash == NULL) {
2983 			err = alloc_added_blob_tree_entry(&new_te, ct);
2984 			if (err)
2985 				goto done;
2986 			err = report_ct_status(ct, status_cb, status_arg);
2987 			if (err)
2988 				goto done;
2989 			ct->flags |= GOT_COMMITABLE_ADDED;
2990 			err = insert_tree_entry(new_te, &paths);
2991 			if (err)
2992 				goto done;
2993 		} else {
2994 			*slash = '\0'; /* trim trailing path components */
2995 			if (base_tree == NULL ||
2996 			    got_object_tree_find_entry(base_tree, child_path)
2997 			    == NULL) {
2998 				err = make_subtree_for_added_blob(&new_te,
2999 				    child_path, path_base_tree,
3000 				    commitable_paths, status_cb, status_arg,
3001 				    repo);
3002 				if (err)
3003 					goto done;
3004 				err = insert_tree_entry(new_te, &paths);
3005 				if (err)
3006 					goto done;
3007 			}
3008 		}
3009 	}
3010 
3011 	if (base_tree) {
3012 		/* Handle modified and deleted entries. */
3013 		base_entries = got_object_tree_get_entries(base_tree);
3014 		SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3015 			struct got_commitable *ct = NULL;
3016 
3017 			if (S_ISDIR(te->mode)) {
3018 				int modified;
3019 				err = got_object_tree_entry_dup(&new_te, te);
3020 				if (err)
3021 					goto done;
3022 				err = match_modified_subtree(&modified, te,
3023 				    path_base_tree, commitable_paths);
3024 				if (err)
3025 					goto done;
3026 				/* Avoid recursion into unmodified subtrees. */
3027 				if (modified) {
3028 					free(new_te->id);
3029 					err = write_subtree(&new_te->id, te,
3030 					    path_base_tree, commitable_paths,
3031 					    status_cb, status_arg, repo);
3032 					if (err)
3033 						goto done;
3034 				}
3035 				err = insert_tree_entry(new_te, &paths);
3036 				if (err)
3037 					goto done;
3038 				continue;
3039 			}
3040 
3041 			err = match_deleted_or_modified_ct(&ct, te,
3042 			    path_base_tree, commitable_paths);
3043 			if (ct) {
3044 				/* NB: Deleted entries get dropped here. */
3045 				if (ct->status == GOT_STATUS_MODIFY) {
3046 					err = alloc_modified_blob_tree_entry(
3047 					    &new_te, te, ct);
3048 					if (err)
3049 						goto done;
3050 					err = insert_tree_entry(new_te, &paths);
3051 					if (err)
3052 						goto done;
3053 				}
3054 				err = report_ct_status(ct, status_cb,
3055 				    status_arg);
3056 				if (err)
3057 					goto done;
3058 			} else {
3059 				/* Entry is unchanged; just copy it. */
3060 				err = got_object_tree_entry_dup(&new_te, te);
3061 				if (err)
3062 					goto done;
3063 				err = insert_tree_entry(new_te, &paths);
3064 				if (err)
3065 					goto done;
3066 			}
3067 		}
3068 	}
3069 
3070 	/* Write new list of entries; deleted entries have been dropped. */
3071 	TAILQ_FOREACH(pe, &paths, entry) {
3072 		struct got_tree_entry *te = pe->data;
3073 		new_tree_entries.nentries++;
3074 		SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3075 	}
3076 	err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3077 done:
3078 	got_object_tree_entries_close(&new_tree_entries);
3079 	got_pathlist_free(&paths);
3080 	return err;
3081 }
3082 
3083 static const struct got_error *
3084 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3085     struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
3086     struct got_worktree *worktree)
3087 {
3088 	const struct got_error *err = NULL;
3089 	struct got_pathlist_entry *pe;
3090 
3091 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3092 		struct got_fileindex_entry *ie;
3093 		struct got_commitable *ct = pe->data;
3094 
3095 		ie = got_fileindex_entry_get(fileindex, pe->path);
3096 		if (ie) {
3097 			if (ct->status == GOT_STATUS_DELETE) {
3098 				got_fileindex_entry_remove(fileindex, ie);
3099 				got_fileindex_entry_free(ie);
3100 			} else
3101 				err = got_fileindex_entry_update(ie,
3102 				    ct->ondisk_path, ct->blob_id->sha1,
3103 				    new_base_commit_id->sha1, 1);
3104 		} else {
3105 			err = got_fileindex_entry_alloc(&ie,
3106 			    ct->ondisk_path, pe->path, ct->blob_id->sha1,
3107 			    new_base_commit_id->sha1);
3108 			if (err)
3109 				break;
3110 			err = got_fileindex_entry_add(fileindex, ie);
3111 			if (err)
3112 				break;
3113 		}
3114 	}
3115 	return err;
3116 }
3117 
3118 static const struct got_error *
3119 check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3120 	struct got_object_id *head_commit_id)
3121 {
3122 	const struct got_error *err = NULL;
3123 	struct got_object_id *id_in_head = NULL, *id = NULL;
3124 	struct got_commit_object *commit = NULL;
3125 	char *path = NULL;
3126 	const char *ct_path = ct->in_repo_path;
3127 
3128 	while (ct_path[0] == '/')
3129 		ct_path++;
3130 
3131 	/*
3132 	 * Ensure that no modifications were made to files *and their parents*
3133 	 * in commits between the file's base commit and the branch head.
3134 	 *
3135 	 * Checking the parents is important for detecting conflicting tree
3136 	 * configurations (files or parent folders might have been moved,
3137 	 * deleted, added again, etc.). Such changes need to be merged with
3138 	 * local changes before a commit can occur.
3139 	 *
3140 	 * The implication is that the file's (parent) entry in the root
3141 	 * directory must have the same ID in all relevant commits.
3142 	 */
3143 	if (ct->status != GOT_STATUS_ADD) {
3144 		struct got_object_qid *pid;
3145 		char *slash;
3146 		struct got_object_id *root_entry_id = NULL;
3147 
3148 		/* Trivial case: base commit == head commit */
3149 		if (got_object_id_cmp(ct->base_commit_id, head_commit_id) == 0)
3150 			return NULL;
3151 
3152 		/* Compute the path to the root directory's entry. */
3153 		path = strdup(ct_path);
3154 		if (path == NULL) {
3155 			err = got_error_from_errno("strdup");
3156 			goto done;
3157 		}
3158 		slash = strchr(path, '/');
3159 		if (slash)
3160 			*slash = '\0';
3161 
3162 		err = got_object_open_as_commit(&commit, repo, head_commit_id);
3163 		if (err)
3164 			goto done;
3165 
3166 		err = got_object_id_by_path(&root_entry_id, repo,
3167 		    head_commit_id, path);
3168 		if (err)
3169 			goto done;
3170 
3171 		pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3172 		while (pid) {
3173 			struct got_commit_object *pcommit;
3174 
3175 			err = got_object_id_by_path(&id, repo, pid->id, path);
3176 			if (err) {
3177 				if (err->code != GOT_ERR_NO_TREE_ENTRY)
3178 					goto done;
3179 				err = NULL;
3180 				break;
3181 			}
3182 
3183 			err = got_object_id_by_path(&id, repo, pid->id, path);
3184 			if (err)
3185 				goto done;
3186 
3187 			if (got_object_id_cmp(id, root_entry_id) != 0) {
3188 				err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3189 				break;
3190 			}
3191 
3192 			if (got_object_id_cmp(pid->id, ct->base_commit_id) == 0)
3193 				break; /* all relevant commits scanned */
3194 
3195 			err = got_object_open_as_commit(&pcommit, repo,
3196 			    pid->id);
3197 			if (err)
3198 				goto done;
3199 
3200 			got_object_commit_close(commit);
3201 			commit = pcommit;
3202 			pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(
3203 			    commit));
3204 		}
3205 	} else {
3206 		/* Require that added files don't exist in the branch head. */
3207 		err = got_object_id_by_path(&id_in_head, repo, head_commit_id,
3208 		    ct_path);
3209 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3210 			goto done;
3211 		err = id_in_head ? got_error(GOT_ERR_COMMIT_OUT_OF_DATE) : NULL;
3212 	}
3213 done:
3214 	if (commit)
3215 		got_object_commit_close(commit);
3216 	free(id_in_head);
3217 	free(id);
3218 	free(path);
3219 	return err;
3220 }
3221 
3222 const struct got_error *
3223 got_worktree_commit(struct got_object_id **new_commit_id,
3224     struct got_worktree *worktree, const char *ondisk_path,
3225     const char *author, const char *committer,
3226     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3227     got_worktree_status_cb status_cb, void *status_arg,
3228     struct got_repository *repo)
3229 {
3230 	const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3231 	struct got_fileindex *fileindex = NULL;
3232 	char *fileindex_path = NULL;
3233 	struct collect_commitables_arg cc_arg;
3234 	struct got_pathlist_head commitable_paths;
3235 	struct got_pathlist_entry *pe;
3236 	char *relpath = NULL;
3237 	const char *head_ref_name = NULL;
3238 	struct got_reference *head_ref = NULL;
3239 	struct got_commit_object *head_commit = NULL;
3240 	struct got_object_id *head_commit_id = NULL;
3241 	struct got_reference *head_ref2 = NULL;
3242 	struct got_object_id *head_commit_id2 = NULL;
3243 	struct got_tree_object *head_tree = NULL;
3244 	struct got_object_id *new_tree_id = NULL;
3245 	struct got_object_id_queue parent_ids;
3246 	struct got_object_qid *pid = NULL;
3247 	char *logmsg = NULL;
3248 
3249 	*new_commit_id = NULL;
3250 
3251 	TAILQ_INIT(&commitable_paths);
3252 	SIMPLEQ_INIT(&parent_ids);
3253 
3254 	if (ondisk_path) {
3255 		err = got_path_skip_common_ancestor(&relpath,
3256 		    worktree->root_path, ondisk_path);
3257 		if (err)
3258 			return err;
3259 	}
3260 
3261 	err = lock_worktree(worktree, LOCK_EX);
3262 	if (err)
3263 		goto done;
3264 
3265 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3266 	if (err)
3267 		goto done;
3268 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
3269 	if (err)
3270 		goto done;
3271 
3272 	cc_arg.commitable_paths = &commitable_paths;
3273 	cc_arg.worktree = worktree;
3274 	cc_arg.repo = repo;
3275 	err = got_worktree_status(worktree, relpath ? relpath : "",
3276 	    repo, collect_commitables, &cc_arg, NULL, NULL);
3277 	if (err)
3278 		goto done;
3279 
3280 	if (TAILQ_EMPTY(&commitable_paths)) {
3281 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3282 		goto done;
3283 	}
3284 
3285 	err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3286 	if (err)
3287 		goto done;
3288 
3289 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
3290 		struct got_commitable *ct = pe->data;
3291 		err = check_ct_out_of_date(ct, repo, head_commit_id);
3292 		if (err)
3293 			goto done;
3294 	}
3295 
3296 	err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3297 	if (err)
3298 		goto done;
3299 
3300 	if (commit_msg_cb != NULL) {
3301 		err = commit_msg_cb(&commitable_paths, &logmsg, commit_arg);
3302 		if (err)
3303 			goto done;
3304 	}
3305 
3306 	if (logmsg == NULL || strlen(logmsg) == 0) {
3307 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3308 		goto done;
3309 	}
3310 
3311 	/* Create blobs from added and modified files and record their IDs. */
3312 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
3313 		struct got_commitable *ct = pe->data;
3314 		char *ondisk_path;
3315 
3316 		if (ct->status != GOT_STATUS_ADD &&
3317 		    ct->status != GOT_STATUS_MODIFY)
3318 			continue;
3319 
3320 		if (asprintf(&ondisk_path, "%s/%s",
3321 		    worktree->root_path, pe->path) == -1) {
3322 			err = got_error_from_errno("asprintf");
3323 			goto done;
3324 		}
3325 		err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3326 		free(ondisk_path);
3327 		if (err)
3328 			goto done;
3329 	}
3330 
3331 	/* Recursively write new tree objects. */
3332 	err = write_tree(&new_tree_id, head_tree, "/", &commitable_paths,
3333 	    status_cb, status_arg, repo);
3334 	if (err)
3335 		goto done;
3336 
3337 	err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3338 	if (err)
3339 		goto done;
3340 	SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3341 	err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3342 	    1, author, time(NULL), committer, time(NULL), logmsg, repo);
3343 	got_object_qid_free(pid);
3344 	if (logmsg != NULL)
3345 		free(logmsg);
3346 	if (err)
3347 		goto done;
3348 
3349 	/* Check if a concurrent commit to our branch has occurred. */
3350 	head_ref_name = got_worktree_get_head_ref_name(worktree);
3351 	if (head_ref_name == NULL) {
3352 		err = got_error_from_errno("got_worktree_get_head_ref_name");
3353 		goto done;
3354 	}
3355 	/* Lock the reference here to prevent concurrent modification. */
3356 	err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3357 	if (err)
3358 		goto done;
3359 	err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3360 	if (err)
3361 		goto done;
3362 	if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3363 		err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3364 		goto done;
3365 	}
3366 	/* Update branch head in repository. */
3367 	err = got_ref_change_ref(head_ref2, *new_commit_id);
3368 	if (err)
3369 		goto done;
3370 	err = got_ref_write(head_ref2, repo);
3371 	if (err)
3372 		goto done;
3373 
3374 	err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3375 	if (err)
3376 		goto done;
3377 
3378 	err = ref_base_commit(worktree, repo);
3379 	if (err)
3380 		goto done;
3381 
3382 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3383 	if (err)
3384 		goto done;
3385 
3386 	err = update_fileindex_after_commit(&commitable_paths,
3387 	    *new_commit_id, fileindex, worktree);
3388 	if (err)
3389 		goto done;
3390 done:
3391 	if (fileindex) {
3392 		sync_err = sync_fileindex(fileindex, fileindex_path);
3393 		if (sync_err && err == NULL)
3394 			err = sync_err;
3395 		got_fileindex_free(fileindex);
3396 	}
3397 	free(fileindex_path);
3398 	unlockerr = lock_worktree(worktree, LOCK_SH);
3399 	if (unlockerr && err == NULL)
3400 		err = unlockerr;
3401 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
3402 		struct got_commitable *ct = pe->data;
3403 		free_commitable(ct);
3404 	}
3405 	got_pathlist_free(&commitable_paths);
3406 	if (head_tree)
3407 		got_object_tree_close(head_tree);
3408 	if (head_commit)
3409 		got_object_commit_close(head_commit);
3410 	free(relpath);
3411 	free(head_commit_id);
3412 	free(head_commit_id2);
3413 	if (head_ref)
3414 		got_ref_close(head_ref);
3415 	if (head_ref2) {
3416 		unlockerr = got_ref_unlock(head_ref2);
3417 		if (unlockerr && err == NULL)
3418 			err = unlockerr;
3419 		got_ref_close(head_ref2);
3420 	}
3421 	return err;
3422 }
3423 
3424 const char *
3425 got_commitable_get_path(struct got_commitable *ct)
3426 {
3427 	return ct->path;
3428 }
3429 
3430 unsigned int
3431 got_commitable_get_status(struct got_commitable *ct)
3432 {
3433 	return ct->status;
3434 }
3435 
3436 struct check_rebase_ok_arg {
3437 	struct got_worktree *worktree;
3438 	struct got_repository *repo;
3439 	int rebase_in_progress;
3440 };
3441 
3442 static const struct got_error *
3443 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3444 {
3445 	const struct got_error *err = NULL;
3446 	struct check_rebase_ok_arg *a = arg;
3447 	unsigned char status;
3448 	struct stat sb;
3449 	char *ondisk_path;
3450 
3451 	if (!a->rebase_in_progress) {
3452 		/* Reject rebase of a work tree with mixed base commits. */
3453 		if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3454 		    SHA1_DIGEST_LENGTH))
3455 			return got_error(GOT_ERR_MIXED_COMMITS);
3456 	}
3457 
3458 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3459 	    == -1)
3460 		return got_error_from_errno("asprintf");
3461 
3462 	/* Reject rebase of a work tree with modified or conflicted files. */
3463 	err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3464 	free(ondisk_path);
3465 	if (err)
3466 		return err;
3467 
3468 	if (a->rebase_in_progress) {
3469 		if (status == GOT_STATUS_CONFLICT)
3470 			return got_error(GOT_ERR_CONFLICTS);
3471 	} else if (status != GOT_STATUS_NO_CHANGE)
3472 		return got_error(GOT_ERR_MODIFIED);
3473 
3474 	return NULL;
3475 }
3476 
3477 const struct got_error *
3478 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3479     struct got_reference **tmp_branch, struct got_worktree *worktree,
3480     struct got_reference *branch, struct got_repository *repo)
3481 {
3482 	const struct got_error *err = NULL;
3483 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3484 	char *branch_ref_name = NULL;
3485 	struct got_fileindex *fileindex = NULL;
3486 	char *fileindex_path = NULL;
3487 	struct check_rebase_ok_arg ok_arg;
3488 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3489 
3490 	*new_base_branch_ref = NULL;
3491 	*tmp_branch = NULL;
3492 
3493 	err = lock_worktree(worktree, LOCK_EX);
3494 	if (err)
3495 		return err;
3496 
3497 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3498 	if (err)
3499 		goto done;
3500 
3501 	ok_arg.worktree = worktree;
3502 	ok_arg.repo = repo;
3503 	ok_arg.rebase_in_progress = 0;
3504 	err = got_fileindex_for_each_entry_safe(fileindex, check_rebase_ok,
3505 	    &ok_arg);
3506 	if (err)
3507 		goto done;
3508 
3509 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3510 	if (err)
3511 		goto done;
3512 
3513 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3514 	if (err)
3515 		goto done;
3516 
3517 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3518 	if (err)
3519 		goto done;
3520 
3521 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3522 	    0);
3523 	if (err)
3524 		goto done;
3525 
3526 	err = got_ref_alloc_symref(new_base_branch_ref,
3527 	    new_base_branch_ref_name, wt_branch);
3528 	if (err)
3529 		goto done;
3530 	err = got_ref_write(*new_base_branch_ref, repo);
3531 	if (err)
3532 		goto done;
3533 
3534 	/* TODO Lock original branch's ref while rebasing? */
3535 
3536 	err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3537 	if (err)
3538 		goto done;
3539 
3540 	err = got_ref_write(branch_ref, repo);
3541 	if (err)
3542 		goto done;
3543 
3544 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
3545 	    worktree->base_commit_id);
3546 	if (err)
3547 		goto done;
3548 	err = got_ref_write(*tmp_branch, repo);
3549 	if (err)
3550 		goto done;
3551 
3552 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
3553 	if (err)
3554 		goto done;
3555 done:
3556 	free(fileindex_path);
3557 	if (fileindex)
3558 		got_fileindex_free(fileindex);
3559 	free(tmp_branch_name);
3560 	free(new_base_branch_ref_name);
3561 	free(branch_ref_name);
3562 	if (branch_ref)
3563 		got_ref_close(branch_ref);
3564 	if (wt_branch)
3565 		got_ref_close(wt_branch);
3566 	if (err) {
3567 		if (*new_base_branch_ref) {
3568 			got_ref_close(*new_base_branch_ref);
3569 			*new_base_branch_ref = NULL;
3570 		}
3571 		if (*tmp_branch) {
3572 			got_ref_close(*tmp_branch);
3573 			*tmp_branch = NULL;
3574 		}
3575 		lock_worktree(worktree, LOCK_SH);
3576 	}
3577 	return err;
3578 }
3579 
3580 const struct got_error *
3581 got_worktree_rebase_continue(struct got_object_id **commit_id,
3582     struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3583     struct got_reference **branch, struct got_worktree *worktree,
3584     struct got_repository *repo)
3585 {
3586 	const struct got_error *err;
3587 	char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3588 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3589 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3590 
3591 	*commit_id = NULL;
3592 
3593 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3594 	if (err)
3595 		return err;
3596 
3597 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3598 	if (err)
3599 		goto done;
3600 
3601 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3602 	if (err)
3603 		goto done;
3604 
3605 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3606 	if (err)
3607 		goto done;
3608 
3609 	err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
3610 	if (err)
3611 		goto done;
3612 
3613 	err = got_ref_open(branch, repo,
3614 	    got_ref_get_symref_target(branch_ref), 0);
3615 	if (err)
3616 		goto done;
3617 
3618 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3619 	if (err)
3620 		goto done;
3621 
3622 	err = got_ref_resolve(commit_id, repo, commit_ref);
3623 	if (err)
3624 		goto done;
3625 
3626 	err = got_ref_open(new_base_branch, repo,
3627 	    new_base_branch_ref_name, 0);
3628 	if (err)
3629 		goto done;
3630 
3631 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
3632 	if (err)
3633 		goto done;
3634 done:
3635 	free(commit_ref_name);
3636 	free(branch_ref_name);
3637 	if (commit_ref)
3638 		got_ref_close(commit_ref);
3639 	if (branch_ref)
3640 		got_ref_close(branch_ref);
3641 	if (err) {
3642 		free(*commit_id);
3643 		*commit_id = NULL;
3644 		if (*tmp_branch) {
3645 			got_ref_close(*tmp_branch);
3646 			*tmp_branch = NULL;
3647 		}
3648 		if (*new_base_branch) {
3649 			got_ref_close(*new_base_branch);
3650 			*new_base_branch = NULL;
3651 		}
3652 		if (*branch) {
3653 			got_ref_close(*branch);
3654 			*branch = NULL;
3655 		}
3656 	}
3657 	return err;
3658 }
3659 
3660 const struct got_error *
3661 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
3662 {
3663 	const struct got_error *err;
3664 	char *tmp_branch_name = NULL;
3665 
3666 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3667 	if (err)
3668 		return err;
3669 
3670 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
3671 	free(tmp_branch_name);
3672 	return NULL;
3673 }
3674 
3675 static const struct got_error *
3676 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
3677     char **logmsg, void *arg)
3678 {
3679 	struct got_commit_object *commit = arg;
3680 
3681 	*logmsg = strdup(got_object_commit_get_logmsg(commit));
3682 	if (*logmsg == NULL)
3683 		return got_error_from_errno("strdup");
3684 
3685 	return NULL;
3686 }
3687 
3688 static const struct got_error *
3689 rebase_status(void *arg, unsigned char status, const char *path,
3690     struct got_object_id *blob_id, struct got_object_id *commit_id)
3691 {
3692 	return NULL;
3693 }
3694 
3695 const struct got_error *
3696 got_worktree_rebase_merge_files(struct got_worktree *worktree,
3697     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
3698     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3699     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3700 {
3701 	const struct got_error *err;
3702 	struct got_fileindex *fileindex;
3703 	char *fileindex_path, *commit_ref_name = NULL;
3704 	struct got_reference *commit_ref = NULL;
3705 
3706 	/* Work tree is locked/unlocked during rebase prepartion/teardown. */
3707 
3708 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3709 	if (err)
3710 		return err;
3711 
3712 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3713 	if (err)
3714 		goto done;
3715 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3716 	if (err) {
3717 		if (err->code != GOT_ERR_NOT_REF)
3718 			goto done;
3719 		err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
3720 		if (err)
3721 			goto done;
3722 		err = got_ref_write(commit_ref, repo);
3723 		if (err)
3724 			goto done;
3725 	} else {
3726 		struct got_object_id *stored_id;
3727 		int cmp;
3728 
3729 		err = got_ref_resolve(&stored_id, repo, commit_ref);
3730 		if (err)
3731 			goto done;
3732 		cmp = got_object_id_cmp(commit_id, stored_id);
3733 		free(stored_id);
3734 		if (cmp != 0) {
3735 			err = got_error(GOT_ERR_REBASE_COMMITID);
3736 			goto done;
3737 		}
3738 	}
3739 
3740 	err = merge_files(worktree, fileindex, fileindex_path,
3741 	    parent_commit_id, commit_id, repo, progress_cb, progress_arg,
3742 	    cancel_cb, cancel_arg);
3743 done:
3744 	got_fileindex_free(fileindex);
3745 	free(fileindex_path);
3746 	if (commit_ref)
3747 		got_ref_close(commit_ref);
3748 	return err;
3749 }
3750 
3751 static const struct got_error *
3752 bump_all_base_commit_ids(struct got_worktree *worktree,
3753     struct got_object_id *base_commit_id)
3754 {
3755 	const struct got_error *err = NULL, *sync_err;
3756 	struct got_fileindex *fileindex;
3757 	char *fileindex_path;
3758 	struct bump_base_commit_id_arg bbc_arg;
3759 
3760 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3761 	if (err)
3762 		return err;
3763 
3764 	bbc_arg.base_commit_id = base_commit_id;
3765 	bbc_arg.entry_name = NULL;
3766 	bbc_arg.path = "";
3767 	bbc_arg.path_len = 0;
3768 	bbc_arg.progress_cb = NULL;
3769 	bbc_arg.progress_arg = NULL;
3770 	err = got_fileindex_for_each_entry_safe(fileindex,
3771 	    bump_base_commit_id, &bbc_arg);
3772 
3773 	sync_err = sync_fileindex(fileindex, fileindex_path);
3774 	if (sync_err && err == NULL)
3775 		err = sync_err;
3776 
3777 	got_fileindex_free(fileindex);
3778 	free(fileindex_path);
3779 	return err;
3780 }
3781 
3782 const struct got_error *
3783 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
3784     struct got_worktree *worktree, struct got_reference *tmp_branch,
3785     struct got_commit_object *orig_commit,
3786     struct got_object_id *orig_commit_id, struct got_repository *repo)
3787 {
3788 	const struct got_error *err;
3789 	char *commit_ref_name = NULL;
3790 	struct got_reference *commit_ref = NULL;
3791 	struct got_object_id *commit_id = NULL;
3792 
3793 	/* Work tree is locked/unlocked during rebase prepartion/teardown. */
3794 
3795 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3796 	if (err)
3797 		goto done;
3798 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3799 	if (err)
3800 		goto done;
3801 	err = got_ref_resolve(&commit_id, repo, commit_ref);
3802 	if (err)
3803 		goto done;
3804 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
3805 		err = got_error(GOT_ERR_REBASE_COMMITID);
3806 		goto done;
3807 	}
3808 
3809 	err = got_worktree_commit(new_commit_id, worktree, NULL,
3810 	    got_object_commit_get_author(orig_commit),
3811 	    got_object_commit_get_committer(orig_commit),
3812 	    collect_rebase_commit_msg, orig_commit,
3813 	    rebase_status, NULL, repo);
3814 	if (err) {
3815 		if (err->code == GOT_ERR_COMMIT_NO_CHANGES) {
3816 			/* No-op change; commit will be elided. */
3817 			err = got_ref_delete(commit_ref, repo);
3818 			if (err)
3819 				goto done;
3820 			err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3821 		}
3822 		goto done;
3823 	}
3824 
3825 	/* Prevent out-of-date errors during rebase of subsequent commits. */
3826 	err = bump_all_base_commit_ids(worktree, *new_commit_id);
3827 	if (err)
3828 		goto done;
3829 
3830 	err = got_ref_delete(commit_ref, repo);
3831 	if (err)
3832 		goto done;
3833 
3834 	err = got_ref_change_ref(tmp_branch, *new_commit_id);
3835 done:
3836 	free(commit_ref_name);
3837 	if (commit_ref)
3838 		got_ref_close(commit_ref);
3839 	if (err) {
3840 		free(*new_commit_id);
3841 		*new_commit_id = NULL;
3842 	}
3843 	return err;
3844 }
3845 
3846 const struct got_error *
3847 got_worktree_rebase_postpone(struct got_worktree *worktree)
3848 {
3849 	return lock_worktree(worktree, LOCK_SH);
3850 }
3851 
3852 static const struct got_error *
3853 delete_ref(const char *name, struct got_repository *repo)
3854 {
3855 	const struct got_error *err;
3856 	struct got_reference *ref;
3857 
3858 	err = got_ref_open(&ref, repo, name, 0);
3859 	if (err) {
3860 		if (err->code == GOT_ERR_NOT_REF)
3861 			return NULL;
3862 		return err;
3863 	}
3864 
3865 	err = got_ref_delete(ref, repo);
3866 	got_ref_close(ref);
3867 	return err;
3868 }
3869 
3870 static const struct got_error *
3871 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
3872 {
3873 	const struct got_error *err;
3874 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3875 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
3876 
3877 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3878 	if (err)
3879 		goto done;
3880 	err = delete_ref(tmp_branch_name, repo);
3881 	if (err)
3882 		goto done;
3883 
3884 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3885 	if (err)
3886 		goto done;
3887 	err = delete_ref(new_base_branch_ref_name, repo);
3888 	if (err)
3889 		goto done;
3890 
3891 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3892 	if (err)
3893 		goto done;
3894 	err = delete_ref(branch_ref_name, repo);
3895 	if (err)
3896 		goto done;
3897 
3898 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3899 	if (err)
3900 		goto done;
3901 	err = delete_ref(commit_ref_name, repo);
3902 	if (err)
3903 		goto done;
3904 
3905 done:
3906 	free(tmp_branch_name);
3907 	free(new_base_branch_ref_name);
3908 	free(branch_ref_name);
3909 	free(commit_ref_name);
3910 	return err;
3911 }
3912 
3913 const struct got_error *
3914 got_worktree_rebase_complete(struct got_worktree *worktree,
3915     struct got_reference *new_base_branch, struct got_reference *tmp_branch,
3916     struct got_reference *rebased_branch,
3917     struct got_repository *repo)
3918 {
3919 	const struct got_error *err, *unlockerr;
3920 	struct got_object_id *new_head_commit_id = NULL;
3921 
3922 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
3923 	if (err)
3924 		return err;
3925 
3926 	err = got_ref_change_ref(rebased_branch, new_head_commit_id);
3927 	if (err)
3928 		goto done;
3929 
3930 	err = got_ref_write(rebased_branch, repo);
3931 	if (err)
3932 		goto done;
3933 
3934 	err = got_worktree_set_head_ref(worktree, rebased_branch);
3935 	if (err)
3936 		goto done;
3937 
3938 	err = delete_rebase_refs(worktree, repo);
3939 done:
3940 	free(new_head_commit_id);
3941 	unlockerr = lock_worktree(worktree, LOCK_SH);
3942 	if (unlockerr && err == NULL)
3943 		err = unlockerr;
3944 	return err;
3945 }
3946 
3947 struct collect_revertible_paths_arg {
3948 	struct got_pathlist_head *revertible_paths;
3949 	struct got_worktree *worktree;
3950 };
3951 
3952 static const struct got_error *
3953 collect_revertible_paths(void *arg, unsigned char status, const char *relpath,
3954     struct got_object_id *blob_id, struct got_object_id *commit_id)
3955 {
3956 	struct collect_revertible_paths_arg *a = arg;
3957 	const struct got_error *err = NULL;
3958 	struct got_pathlist_entry *new = NULL;
3959 	char *path = NULL;
3960 
3961 	if (status != GOT_STATUS_ADD &&
3962 	    status != GOT_STATUS_DELETE &&
3963 	    status != GOT_STATUS_MODIFY &&
3964 	    status != GOT_STATUS_CONFLICT &&
3965 	    status != GOT_STATUS_MISSING)
3966 		return NULL;
3967 
3968 	if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
3969 		return got_error_from_errno("asprintf");
3970 
3971 	err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
3972 	if (err || new == NULL)
3973 		free(path);
3974 	return err;
3975 }
3976 
3977 const struct got_error *
3978 got_worktree_rebase_abort(struct got_worktree *worktree,
3979     struct got_repository *repo, struct got_reference *new_base_branch,
3980      got_worktree_checkout_cb progress_cb, void *progress_arg)
3981 {
3982 	const struct got_error *err, *unlockerr;
3983 	struct got_reference *resolved = NULL;
3984 	struct got_object_id *commit_id = NULL;
3985 	struct got_fileindex *fileindex = NULL;
3986 	char *fileindex_path = NULL;
3987 	struct got_pathlist_head revertible_paths;
3988 	struct got_pathlist_entry *pe;
3989 	struct collect_revertible_paths_arg crp_arg;
3990 	struct got_object_id *tree_id = NULL;
3991 
3992 	TAILQ_INIT(&revertible_paths);
3993 
3994 	err = lock_worktree(worktree, LOCK_EX);
3995 	if (err)
3996 		return err;
3997 
3998 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3999 	if (err)
4000 		goto done;
4001 
4002 	err = got_ref_open(&resolved, repo,
4003 	    got_ref_get_symref_target(new_base_branch), 0);
4004 	if (err)
4005 		goto done;
4006 
4007 	err = got_worktree_set_head_ref(worktree, resolved);
4008 	if (err)
4009 		goto done;
4010 
4011 	/*
4012 	 * XXX commits to the base branch could have happened while
4013 	 * we were busy rebasing; should we store the original commit ID
4014 	 * when rebase begins and read it back here?
4015 	 */
4016 	err = got_ref_resolve(&commit_id, repo, resolved);
4017 	if (err)
4018 		goto done;
4019 
4020 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4021 	if (err)
4022 		goto done;
4023 
4024 	err = got_object_id_by_path(&tree_id, repo,
4025 	    worktree->base_commit_id, worktree->path_prefix);
4026 	if (err)
4027 		goto done;
4028 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4029 	    repo, progress_cb, progress_arg, NULL, NULL);
4030 	if (err)
4031 		goto done;
4032 
4033 	crp_arg.revertible_paths = &revertible_paths;
4034 	crp_arg.worktree = worktree;
4035 	err = got_worktree_status(worktree, "", repo,
4036 	    collect_revertible_paths, &crp_arg, NULL, NULL);
4037 	if (err)
4038 		goto done;
4039 
4040 	TAILQ_FOREACH(pe, &revertible_paths, entry) {
4041 		err = revert_file(worktree, fileindex, pe->path,
4042 		    progress_cb, progress_arg, repo);
4043 		if (err)
4044 			goto done;
4045 	}
4046 
4047 	err = delete_rebase_refs(worktree, repo);
4048 done:
4049 	got_ref_close(resolved);
4050 	free(tree_id);
4051 	free(commit_id);
4052 	if (fileindex)
4053 		got_fileindex_free(fileindex);
4054 	free(fileindex_path);
4055 	TAILQ_FOREACH(pe, &revertible_paths, entry)
4056 		free((char *)pe->path);
4057 	got_pathlist_free(&revertible_paths);
4058 
4059 	unlockerr = lock_worktree(worktree, LOCK_SH);
4060 	if (unlockerr && err == NULL)
4061 		err = unlockerr;
4062 	return err;
4063 }