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