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