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