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  * the file at deriv_path acts as the first derived version, and the
723  * file on disk acts as the second derived version.
724  */
725 static const struct got_error *
726 merge_file(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, const char *deriv_path,
729     const char *label_deriv, struct got_repository *repo,
730     got_worktree_checkout_cb progress_cb, void *progress_arg)
731 {
732 	const struct got_error *err = NULL;
733 	int merged_fd = -1;
734 	FILE *f_orig = NULL;
735 	char *blob_orig_path = NULL;
736 	char *merged_path = NULL, *base_path = NULL;
737 	int overlapcnt = 0;
738 	char *parent;
739 
740 	*local_changes_subsumed = 0;
741 
742 	parent = dirname(ondisk_path);
743 	if (parent == NULL)
744 		return got_error_from_errno2("dirname", ondisk_path);
745 
746 	if (asprintf(&base_path, "%s/got-merged", parent) == -1)
747 		return got_error_from_errno("asprintf");
748 
749 	err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
750 	if (err)
751 		goto done;
752 
753 	free(base_path);
754 	if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
755 		err = got_error_from_errno("asprintf");
756 		base_path = NULL;
757 		goto done;
758 	}
759 
760 	err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
761 	if (err)
762 		goto done;
763 	if (blob_orig) {
764 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
765 		    blob_orig);
766 		if (err)
767 			goto done;
768 	} else {
769 		/*
770 		 * If the file has no blob, this is an "add vs add" conflict,
771 		 * and we simply use an empty ancestor file to make both files
772 		 * appear in the merged result in their entirety.
773 		 */
774 	}
775 
776 	err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
777 	    blob_orig_path, ondisk_path, label_deriv, path);
778 	if (err)
779 		goto done;
780 
781 	err = (*progress_cb)(progress_arg,
782 	    overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
783 	if (err)
784 		goto done;
785 
786 	if (fsync(merged_fd) != 0) {
787 		err = got_error_from_errno("fsync");
788 		goto done;
789 	}
790 
791 	/* Check if a clean merge has subsumed all local changes. */
792 	if (overlapcnt == 0) {
793 		err = check_files_equal(local_changes_subsumed, deriv_path,
794 		    merged_path);
795 		if (err)
796 			goto done;
797 	}
798 
799 	if (chmod(merged_path, st_mode) != 0) {
800 		err = got_error_from_errno2("chmod", merged_path);
801 		goto done;
802 	}
803 
804 	if (rename(merged_path, ondisk_path) != 0) {
805 		err = got_error_from_errno3("rename", merged_path,
806 		    ondisk_path);
807 		unlink(merged_path);
808 		goto done;
809 	}
810 
811 done:
812 	if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
813 		err = got_error_from_errno("close");
814 	if (f_orig && fclose(f_orig) != 0 && err == NULL)
815 		err = got_error_from_errno("fclose");
816 	free(merged_path);
817 	free(base_path);
818 	if (blob_orig_path) {
819 		unlink(blob_orig_path);
820 		free(blob_orig_path);
821 	}
822 	return err;
823 }
824 
825 /*
826  * Perform a 3-way merge where blob_orig acts as the common ancestor,
827  * blob_deriv acts as the first derived version, and the file on disk
828  * acts as the second derived version.
829  */
830 static const struct got_error *
831 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
832     struct got_blob_object *blob_orig, const char *ondisk_path,
833     const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
834     struct got_object_id *deriv_base_commit_id,
835     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
836     void *progress_arg)
837 {
838 	const struct got_error *err = NULL;
839 	FILE *f_deriv = NULL;
840 	char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
841 	char *label_deriv = NULL, *parent;
842 
843 	*local_changes_subsumed = 0;
844 
845 	parent = dirname(ondisk_path);
846 	if (parent == NULL)
847 		return got_error_from_errno2("dirname", ondisk_path);
848 
849 	free(base_path);
850 	if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
851 		err = got_error_from_errno("asprintf");
852 		base_path = NULL;
853 		goto done;
854 	}
855 
856 	err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
857 	if (err)
858 		goto done;
859 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
860 	    blob_deriv);
861 	if (err)
862 		goto done;
863 
864 	err = got_object_id_str(&id_str, deriv_base_commit_id);
865 	if (err)
866 		goto done;
867 	if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
868 		err = got_error_from_errno("asprintf");
869 		goto done;
870 	}
871 
872 	err = merge_file(local_changes_subsumed, worktree, blob_orig,
873 	    ondisk_path, path, st_mode, blob_deriv_path, label_deriv,
874 	    repo, progress_cb, progress_arg);
875 done:
876 	if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
877 		err = got_error_from_errno("fclose");
878 	free(base_path);
879 	if (blob_deriv_path) {
880 		unlink(blob_deriv_path);
881 		free(blob_deriv_path);
882 	}
883 	free(id_str);
884 	free(label_deriv);
885 	return err;
886 }
887 
888 static const struct got_error *
889 update_blob_fileindex_entry(struct got_worktree *worktree,
890     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
891     const char *ondisk_path, const char *path, struct got_blob_object *blob,
892     int update_timestamps)
893 {
894 	const struct got_error *err = NULL;
895 
896 	if (ie == NULL)
897 		ie = got_fileindex_entry_get(fileindex, path, strlen(path));
898 	if (ie)
899 		err = got_fileindex_entry_update(ie, ondisk_path,
900 		    blob->id.sha1, worktree->base_commit_id->sha1,
901 		    update_timestamps);
902 	else {
903 		struct got_fileindex_entry *new_ie;
904 		err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
905 		    path, blob->id.sha1, worktree->base_commit_id->sha1);
906 		if (!err)
907 			err = got_fileindex_entry_add(fileindex, new_ie);
908 	}
909 	return err;
910 }
911 
912 static const struct got_error *
913 install_blob(struct got_worktree *worktree, const char *ondisk_path,
914    const char *path, uint16_t te_mode, uint16_t st_mode,
915    struct got_blob_object *blob, int restoring_missing_file,
916    int reverting_versioned_file, struct got_repository *repo,
917    got_worktree_checkout_cb progress_cb, void *progress_arg)
918 {
919 	const struct got_error *err = NULL;
920 	int fd = -1;
921 	size_t len, hdrlen;
922 	int update = 0;
923 	char *tmppath = NULL;
924 
925 	fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
926 	    GOT_DEFAULT_FILE_MODE);
927 	if (fd == -1) {
928 		if (errno == ENOENT) {
929 			char *parent = dirname(path);
930 			if (parent == NULL)
931 				return got_error_from_errno2("dirname", path);
932 			err = add_dir_on_disk(worktree, parent);
933 			if (err)
934 				return err;
935 			fd = open(ondisk_path,
936 			    O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
937 			    GOT_DEFAULT_FILE_MODE);
938 			if (fd == -1)
939 				return got_error_from_errno2("open",
940 				    ondisk_path);
941 		} else if (errno == EEXIST) {
942 			if (!S_ISREG(st_mode)) {
943 				/* TODO file is obstructed; do something */
944 				err = got_error(GOT_ERR_FILE_OBSTRUCTED);
945 				goto done;
946 			} else {
947 				err = got_opentemp_named_fd(&tmppath, &fd,
948 				    ondisk_path);
949 				if (err)
950 					goto done;
951 				update = 1;
952 			}
953 		} else
954 			return got_error_from_errno2("open", ondisk_path);
955 	}
956 
957 	if (restoring_missing_file)
958 		err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
959 	else if (reverting_versioned_file)
960 		err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
961 	else
962 		err = (*progress_cb)(progress_arg,
963 		    update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
964 	if (err)
965 		goto done;
966 
967 	hdrlen = got_object_blob_get_hdrlen(blob);
968 	do {
969 		const uint8_t *buf = got_object_blob_get_read_buf(blob);
970 		err = got_object_blob_read_block(&len, blob);
971 		if (err)
972 			break;
973 		if (len > 0) {
974 			/* Skip blob object header first time around. */
975 			ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
976 			if (outlen == -1) {
977 				err = got_error_from_errno("write");
978 				goto done;
979 			} else if (outlen != len - hdrlen) {
980 				err = got_error(GOT_ERR_IO);
981 				goto done;
982 			}
983 			hdrlen = 0;
984 		}
985 	} while (len != 0);
986 
987 	if (fsync(fd) != 0) {
988 		err = got_error_from_errno("fsync");
989 		goto done;
990 	}
991 
992 	if (update) {
993 		if (rename(tmppath, ondisk_path) != 0) {
994 			err = got_error_from_errno3("rename", tmppath,
995 			    ondisk_path);
996 			unlink(tmppath);
997 			goto done;
998 		}
999 	}
1000 
1001 	if (te_mode & S_IXUSR) {
1002 		if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
1003 			err = got_error_from_errno2("chmod", ondisk_path);
1004 			goto done;
1005 		}
1006 	} else {
1007 		if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
1008 			err = got_error_from_errno2("chmod", ondisk_path);
1009 			goto done;
1010 		}
1011 	}
1012 
1013 done:
1014 	if (fd != -1 && close(fd) != 0 && err == NULL)
1015 		err = got_error_from_errno("close");
1016 	free(tmppath);
1017 	return err;
1018 }
1019 
1020 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1021 static const struct got_error *
1022 get_modified_file_content_status(unsigned char *status, FILE *f)
1023 {
1024 	const struct got_error *err = NULL;
1025 	const char *markers[3] = {
1026 		GOT_DIFF_CONFLICT_MARKER_BEGIN,
1027 		GOT_DIFF_CONFLICT_MARKER_SEP,
1028 		GOT_DIFF_CONFLICT_MARKER_END
1029 	};
1030 	int i = 0;
1031 	char *line;
1032 	size_t len;
1033 	const char delim[3] = {'\0', '\0', '\0'};
1034 
1035 	while (*status == GOT_STATUS_MODIFY) {
1036 		line = fparseln(f, &len, NULL, delim, 0);
1037 		if (line == NULL) {
1038 			if (feof(f))
1039 				break;
1040 			err = got_ferror(f, GOT_ERR_IO);
1041 			break;
1042 		}
1043 
1044 		if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1045 			if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1046 			    == 0)
1047 				*status = GOT_STATUS_CONFLICT;
1048 			else
1049 				i++;
1050 		}
1051 	}
1052 
1053 	return err;
1054 }
1055 
1056 static int
1057 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1058 {
1059 	return !(ie->ctime_sec == sb->st_ctime &&
1060 	    ie->ctime_nsec == sb->st_ctimensec &&
1061 	    ie->mtime_sec == sb->st_mtime &&
1062 	    ie->mtime_nsec == sb->st_mtimensec &&
1063 	    ie->size == (sb->st_size & 0xffffffff));
1064 }
1065 
1066 static unsigned char
1067 get_staged_status(struct got_fileindex_entry *ie)
1068 {
1069 	switch (got_fileindex_entry_stage_get(ie)) {
1070 	case GOT_FILEIDX_STAGE_ADD:
1071 		return GOT_STATUS_ADD;
1072 	case GOT_FILEIDX_STAGE_DELETE:
1073 		return GOT_STATUS_DELETE;
1074 	case GOT_FILEIDX_STAGE_MODIFY:
1075 		return GOT_STATUS_MODIFY;
1076 	default:
1077 		return GOT_STATUS_NO_CHANGE;
1078 	}
1079 }
1080 
1081 static const struct got_error *
1082 get_file_status(unsigned char *status, struct stat *sb,
1083     struct got_fileindex_entry *ie, const char *abspath,
1084     struct got_repository *repo)
1085 {
1086 	const struct got_error *err = NULL;
1087 	struct got_object_id id;
1088 	size_t hdrlen;
1089 	FILE *f = NULL;
1090 	uint8_t fbuf[8192];
1091 	struct got_blob_object *blob = NULL;
1092 	size_t flen, blen;
1093 	unsigned char staged_status = get_staged_status(ie);
1094 
1095 	*status = GOT_STATUS_NO_CHANGE;
1096 
1097 	if (lstat(abspath, sb) == -1) {
1098 		if (errno == ENOENT) {
1099 			if (got_fileindex_entry_has_file_on_disk(ie))
1100 				*status = GOT_STATUS_MISSING;
1101 			else
1102 				*status = GOT_STATUS_DELETE;
1103 			return NULL;
1104 		}
1105 		return got_error_from_errno2("lstat", abspath);
1106 	}
1107 
1108 	if (!S_ISREG(sb->st_mode)) {
1109 		*status = GOT_STATUS_OBSTRUCTED;
1110 		return NULL;
1111 	}
1112 
1113 	if (!got_fileindex_entry_has_file_on_disk(ie)) {
1114 		*status = GOT_STATUS_DELETE;
1115 		return NULL;
1116 	} else if (!got_fileindex_entry_has_blob(ie) &&
1117 	    staged_status != GOT_STATUS_ADD) {
1118 		*status = GOT_STATUS_ADD;
1119 		return NULL;
1120 	}
1121 
1122 	if (!stat_info_differs(ie, sb))
1123 		return NULL;
1124 
1125 	if (staged_status == GOT_STATUS_MODIFY ||
1126 	    staged_status == GOT_STATUS_ADD)
1127 		memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1128 	else
1129 		memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1130 
1131 	err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1132 	if (err)
1133 		return err;
1134 
1135 	f = fopen(abspath, "r");
1136 	if (f == NULL) {
1137 		err = got_error_from_errno2("fopen", abspath);
1138 		goto done;
1139 	}
1140 	hdrlen = got_object_blob_get_hdrlen(blob);
1141 	for (;;) {
1142 		const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1143 		err = got_object_blob_read_block(&blen, blob);
1144 		if (err)
1145 			goto done;
1146 		/* Skip length of blob object header first time around. */
1147 		flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1148 		if (flen == 0 && ferror(f)) {
1149 			err = got_error_from_errno("fread");
1150 			goto done;
1151 		}
1152 		if (blen == 0) {
1153 			if (flen != 0)
1154 				*status = GOT_STATUS_MODIFY;
1155 			break;
1156 		} else if (flen == 0) {
1157 			if (blen != 0)
1158 				*status = GOT_STATUS_MODIFY;
1159 			break;
1160 		} else if (blen - hdrlen == flen) {
1161 			/* Skip blob object header first time around. */
1162 			if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1163 				*status = GOT_STATUS_MODIFY;
1164 				break;
1165 			}
1166 		} else {
1167 			*status = GOT_STATUS_MODIFY;
1168 			break;
1169 		}
1170 		hdrlen = 0;
1171 	}
1172 
1173 	if (*status == GOT_STATUS_MODIFY) {
1174 		rewind(f);
1175 		err = get_modified_file_content_status(status, f);
1176 	}
1177 done:
1178 	if (blob)
1179 		got_object_blob_close(blob);
1180 	if (f)
1181 		fclose(f);
1182 	return err;
1183 }
1184 
1185 /*
1186  * Update timestamps in the file index if a file is unmodified and
1187  * we had to run a full content comparison to find out.
1188  */
1189 static const struct got_error *
1190 sync_timestamps(char *ondisk_path, unsigned char status,
1191     struct got_fileindex_entry *ie, struct stat *sb)
1192 {
1193 	if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1194 		return got_fileindex_entry_update(ie, ondisk_path,
1195 		    ie->blob_sha1, ie->commit_sha1, 1);
1196 
1197 	return NULL;
1198 }
1199 
1200 static const struct got_error *
1201 update_blob(struct got_worktree *worktree,
1202     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1203     struct got_tree_entry *te, const char *path,
1204     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1205     void *progress_arg)
1206 {
1207 	const struct got_error *err = NULL;
1208 	struct got_blob_object *blob = NULL;
1209 	char *ondisk_path;
1210 	unsigned char status = GOT_STATUS_NO_CHANGE;
1211 	struct stat sb;
1212 
1213 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1214 		return got_error_from_errno("asprintf");
1215 
1216 	if (ie) {
1217 		if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1218 			err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1219 			goto done;
1220 		}
1221 		err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1222 		if (err)
1223 			goto done;
1224 		if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1225 			sb.st_mode = got_fileindex_perms_to_st(ie);
1226 	} else
1227 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
1228 
1229 	if (status == GOT_STATUS_OBSTRUCTED) {
1230 		err = (*progress_cb)(progress_arg, status, path);
1231 		goto done;
1232 	}
1233 
1234 	if (ie && status != GOT_STATUS_MISSING) {
1235 		if (got_fileindex_entry_has_commit(ie) &&
1236 		    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1237 		    SHA1_DIGEST_LENGTH) == 0) {
1238 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1239 			if (err)
1240 				goto done;
1241 			err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1242 			    path);
1243 			goto done;
1244 		}
1245 		if (got_fileindex_entry_has_blob(ie) &&
1246 		    memcmp(ie->blob_sha1, te->id->sha1,
1247 		    SHA1_DIGEST_LENGTH) == 0) {
1248 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1249 			goto done;
1250 		}
1251 	}
1252 
1253 	err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1254 	if (err)
1255 		goto done;
1256 
1257 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1258 		int update_timestamps;
1259 		struct got_blob_object *blob2 = NULL;
1260 		if (got_fileindex_entry_has_blob(ie)) {
1261 			struct got_object_id id2;
1262 			memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1263 			err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1264 			if (err)
1265 				goto done;
1266 		}
1267 		err = merge_blob(&update_timestamps, worktree, blob2,
1268 		    ondisk_path, path, sb.st_mode, blob,
1269 		    worktree->base_commit_id, repo,
1270 		    progress_cb, progress_arg);
1271 		if (blob2)
1272 			got_object_blob_close(blob2);
1273 		/*
1274 		 * Do not update timestamps of files with local changes.
1275 		 * Otherwise, a future status walk would treat them as
1276 		 * unmodified files again.
1277 		 */
1278 		err = got_fileindex_entry_update(ie, ondisk_path,
1279 		    blob->id.sha1, worktree->base_commit_id->sha1,
1280 		    update_timestamps);
1281 	} else if (status == GOT_STATUS_DELETE) {
1282 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1283 		if (err)
1284 			goto done;
1285 		err = update_blob_fileindex_entry(worktree, fileindex, ie,
1286 		    ondisk_path, path, blob, 0);
1287 		if (err)
1288 			goto done;
1289 	} else {
1290 		err = install_blob(worktree, ondisk_path, path, te->mode,
1291 		    sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1292 		    repo, progress_cb, progress_arg);
1293 		if (err)
1294 			goto done;
1295 		err = update_blob_fileindex_entry(worktree, fileindex, ie,
1296 		    ondisk_path, path, blob, 1);
1297 		if (err)
1298 			goto done;
1299 	}
1300 	got_object_blob_close(blob);
1301 done:
1302 	free(ondisk_path);
1303 	return err;
1304 }
1305 
1306 static const struct got_error *
1307 remove_ondisk_file(const char *root_path, const char *path)
1308 {
1309 	const struct got_error *err = NULL;
1310 	char *ondisk_path = NULL;
1311 
1312 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1313 		return got_error_from_errno("asprintf");
1314 
1315 	if (unlink(ondisk_path) == -1) {
1316 		if (errno != ENOENT)
1317 			err = got_error_from_errno2("unlink", ondisk_path);
1318 	} else {
1319 		char *parent = dirname(ondisk_path);
1320 		while (parent && strcmp(parent, root_path) != 0) {
1321 			if (rmdir(parent) == -1) {
1322 				if (errno != ENOTEMPTY)
1323 					err = got_error_from_errno2("rmdir",
1324 					    parent);
1325 				break;
1326 			}
1327 			parent = dirname(parent);
1328 		}
1329 	}
1330 	free(ondisk_path);
1331 	return err;
1332 }
1333 
1334 static const struct got_error *
1335 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1336     struct got_fileindex_entry *ie, struct got_repository *repo,
1337     got_worktree_checkout_cb progress_cb, void *progress_arg)
1338 {
1339 	const struct got_error *err = NULL;
1340 	unsigned char status;
1341 	struct stat sb;
1342 	char *ondisk_path;
1343 
1344 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1345 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1346 
1347 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1348 	    == -1)
1349 		return got_error_from_errno("asprintf");
1350 
1351 	err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1352 	if (err)
1353 		return err;
1354 
1355 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1356 	    status == GOT_STATUS_ADD) {
1357 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1358 		if (err)
1359 			return err;
1360 		/*
1361 		 * Preserve the working file and change the deleted blob's
1362 		 * entry into a schedule-add entry.
1363 		 */
1364 		err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1365 		    0);
1366 		if (err)
1367 			return err;
1368 	} else {
1369 		err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1370 		if (err)
1371 			return err;
1372 		if (status == GOT_STATUS_NO_CHANGE) {
1373 			err = remove_ondisk_file(worktree->root_path, ie->path);
1374 			if (err)
1375 				return err;
1376 		}
1377 		got_fileindex_entry_remove(fileindex, ie);
1378 	}
1379 
1380 	return err;
1381 }
1382 
1383 struct diff_cb_arg {
1384     struct got_fileindex *fileindex;
1385     struct got_worktree *worktree;
1386     struct got_repository *repo;
1387     got_worktree_checkout_cb progress_cb;
1388     void *progress_arg;
1389     got_worktree_cancel_cb cancel_cb;
1390     void *cancel_arg;
1391 };
1392 
1393 static const struct got_error *
1394 diff_old_new(void *arg, struct got_fileindex_entry *ie,
1395     struct got_tree_entry *te, const char *parent_path)
1396 {
1397 	struct diff_cb_arg *a = arg;
1398 
1399 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1400 		return got_error(GOT_ERR_CANCELLED);
1401 
1402 	return update_blob(a->worktree, a->fileindex, ie, te,
1403 	    ie->path, a->repo, a->progress_cb, a->progress_arg);
1404 }
1405 
1406 static const struct got_error *
1407 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1408 {
1409 	struct diff_cb_arg *a = arg;
1410 
1411 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1412 		return got_error(GOT_ERR_CANCELLED);
1413 
1414 	return delete_blob(a->worktree, a->fileindex, ie,
1415 	    a->repo, a->progress_cb, a->progress_arg);
1416 }
1417 
1418 static const struct got_error *
1419 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1420 {
1421 	struct diff_cb_arg *a = arg;
1422 	const struct got_error *err;
1423 	char *path;
1424 
1425 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1426 		return got_error(GOT_ERR_CANCELLED);
1427 
1428 	if (asprintf(&path, "%s%s%s", parent_path,
1429 	    parent_path[0] ? "/" : "", te->name)
1430 	    == -1)
1431 		return got_error_from_errno("asprintf");
1432 
1433 	if (S_ISDIR(te->mode))
1434 		err = add_dir_on_disk(a->worktree, path);
1435 	else
1436 		err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1437 		    a->repo, a->progress_cb, a->progress_arg);
1438 
1439 	free(path);
1440 	return err;
1441 }
1442 
1443 static const struct got_error *
1444 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1445 {
1446 	const struct got_error *err = NULL;
1447 	char *uuidstr = NULL;
1448 	uint32_t uuid_status;
1449 
1450 	*refname = NULL;
1451 
1452 	uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1453 	if (uuid_status != uuid_s_ok)
1454 		return got_error_uuid(uuid_status);
1455 
1456 	if (asprintf(refname, "%s-%s", prefix, uuidstr)
1457 	    == -1) {
1458 		err = got_error_from_errno("asprintf");
1459 		*refname = NULL;
1460 	}
1461 	free(uuidstr);
1462 	return err;
1463 }
1464 
1465 const struct got_error *
1466 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1467 {
1468 	return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1469 }
1470 
1471 static const struct got_error *
1472 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1473 {
1474 	return get_ref_name(refname, worktree,
1475 	    GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1476 }
1477 
1478 static const struct got_error *
1479 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1480 {
1481 	return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1482 }
1483 
1484 static const struct got_error *
1485 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1486 {
1487 	return get_ref_name(refname, worktree,
1488 	    GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1489 }
1490 
1491 static const struct got_error *
1492 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1493 {
1494 	return get_ref_name(refname, worktree,
1495 	    GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1496 }
1497 
1498 static const struct got_error *
1499 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1500 {
1501 	return get_ref_name(refname, worktree,
1502 	    GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1503 }
1504 
1505 static const struct got_error *
1506 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1507 {
1508 	return get_ref_name(refname, worktree,
1509 	    GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1510 }
1511 
1512 static const struct got_error *
1513 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1514 {
1515 	return get_ref_name(refname, worktree,
1516 	    GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1517 }
1518 
1519 static const struct got_error *
1520 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1521 {
1522 	return get_ref_name(refname, worktree,
1523 	    GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1524 }
1525 
1526 const struct got_error *
1527 got_worktree_get_histedit_script_path(char **path,
1528     struct got_worktree *worktree)
1529 {
1530 	if (asprintf(path, "%s/%s/%s", worktree->root_path,
1531 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1532 		*path = NULL;
1533 		return got_error_from_errno("asprintf");
1534 	}
1535 	return NULL;
1536 }
1537 
1538 /*
1539  * Prevent Git's garbage collector from deleting our base commit by
1540  * setting a reference to our base commit's ID.
1541  */
1542 static const struct got_error *
1543 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1544 {
1545 	const struct got_error *err = NULL;
1546 	struct got_reference *ref = NULL;
1547 	char *refname;
1548 
1549 	err = got_worktree_get_base_ref_name(&refname, worktree);
1550 	if (err)
1551 		return err;
1552 
1553 	err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1554 	if (err)
1555 		goto done;
1556 
1557 	err = got_ref_write(ref, repo);
1558 done:
1559 	free(refname);
1560 	if (ref)
1561 		got_ref_close(ref);
1562 	return err;
1563 }
1564 
1565 static const struct got_error *
1566 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1567 {
1568 	const struct got_error *err = NULL;
1569 
1570 	if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1571 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1572 		err = got_error_from_errno("asprintf");
1573 		*fileindex_path = NULL;
1574 	}
1575 	return err;
1576 }
1577 
1578 
1579 static const struct got_error *
1580 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1581    struct got_worktree *worktree)
1582 {
1583 	const struct got_error *err = NULL;
1584 	FILE *index = NULL;
1585 
1586 	*fileindex_path = NULL;
1587 	*fileindex = got_fileindex_alloc();
1588 	if (*fileindex == NULL)
1589 		return got_error_from_errno("got_fileindex_alloc");
1590 
1591 	err = get_fileindex_path(fileindex_path, worktree);
1592 	if (err)
1593 		goto done;
1594 
1595 	index = fopen(*fileindex_path, "rb");
1596 	if (index == NULL) {
1597 		if (errno != ENOENT)
1598 			err = got_error_from_errno2("fopen", *fileindex_path);
1599 	} else {
1600 		err = got_fileindex_read(*fileindex, index);
1601 		if (fclose(index) != 0 && err == NULL)
1602 			err = got_error_from_errno("fclose");
1603 	}
1604 done:
1605 	if (err) {
1606 		free(*fileindex_path);
1607 		*fileindex_path = NULL;
1608 		got_fileindex_free(*fileindex);
1609 		*fileindex = NULL;
1610 	}
1611 	return err;
1612 }
1613 
1614 struct bump_base_commit_id_arg {
1615 	struct got_object_id *base_commit_id;
1616 	const char *path;
1617 	size_t path_len;
1618 	const char *entry_name;
1619 	got_worktree_checkout_cb progress_cb;
1620 	void *progress_arg;
1621 };
1622 
1623 /* Bump base commit ID of all files within an updated part of the work tree. */
1624 static const struct got_error *
1625 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1626 {
1627 	const struct got_error *err;
1628 	struct bump_base_commit_id_arg *a = arg;
1629 
1630 	if (a->entry_name) {
1631 		if (strcmp(ie->path, a->path) != 0)
1632 			return NULL;
1633 	} else if (!got_path_is_child(ie->path, a->path, a->path_len))
1634 		return NULL;
1635 
1636 	if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1637 	    SHA1_DIGEST_LENGTH) == 0)
1638 		return NULL;
1639 
1640 	if (a->progress_cb) {
1641 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1642 		    ie->path);
1643 		if (err)
1644 			return err;
1645 	}
1646 	memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1647 	return NULL;
1648 }
1649 
1650 static const struct got_error *
1651 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1652 {
1653 	const struct got_error *err = NULL;
1654 	char *new_fileindex_path = NULL;
1655 	FILE *new_index = NULL;
1656 
1657 	err = got_opentemp_named(&new_fileindex_path, &new_index,
1658 	    fileindex_path);
1659 	if (err)
1660 		goto done;
1661 
1662 	err = got_fileindex_write(fileindex, new_index);
1663 	if (err)
1664 		goto done;
1665 
1666 	if (rename(new_fileindex_path, fileindex_path) != 0) {
1667 		err = got_error_from_errno3("rename", new_fileindex_path,
1668 		    fileindex_path);
1669 		unlink(new_fileindex_path);
1670 	}
1671 done:
1672 	if (new_index)
1673 		fclose(new_index);
1674 	free(new_fileindex_path);
1675 	return err;
1676 }
1677 
1678 static const struct got_error *
1679 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1680     struct got_object_id **tree_id, const char *wt_relpath,
1681     struct got_worktree *worktree, struct got_repository *repo)
1682 {
1683 	const struct got_error *err = NULL;
1684 	struct got_object_id *id = NULL;
1685 	char *in_repo_path = NULL;
1686 	int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1687 
1688 	*entry_type = GOT_OBJ_TYPE_ANY;
1689 	*tree_relpath = NULL;
1690 	*tree_id = NULL;
1691 
1692 	if (wt_relpath[0] == '\0') {
1693 		/* Check out all files within the work tree. */
1694 		*entry_type = GOT_OBJ_TYPE_TREE;
1695 		*tree_relpath = strdup("");
1696 		if (*tree_relpath == NULL) {
1697 			err = got_error_from_errno("strdup");
1698 			goto done;
1699 		}
1700 		err = got_object_id_by_path(tree_id, repo,
1701 		    worktree->base_commit_id, worktree->path_prefix);
1702 		if (err)
1703 			goto done;
1704 		return NULL;
1705 	}
1706 
1707 	/* Check out a subset of files in the work tree. */
1708 
1709 	if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1710 	    is_root_wt ? "" : "/", wt_relpath) == -1) {
1711 		err = got_error_from_errno("asprintf");
1712 		goto done;
1713 	}
1714 
1715 	err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1716 	    in_repo_path);
1717 	if (err)
1718 		goto done;
1719 
1720 	free(in_repo_path);
1721 	in_repo_path = NULL;
1722 
1723 	err = got_object_get_type(entry_type, repo, id);
1724 	if (err)
1725 		goto done;
1726 
1727 	if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1728 		/* Check out a single file. */
1729 		if (strchr(wt_relpath, '/')  == NULL) {
1730 			/* Check out a single file in work tree's root dir. */
1731 			in_repo_path = strdup(worktree->path_prefix);
1732 			if (in_repo_path == NULL) {
1733 				err = got_error_from_errno("strdup");
1734 				goto done;
1735 			}
1736 			*tree_relpath = strdup("");
1737 			if (*tree_relpath == NULL) {
1738 				err = got_error_from_errno("strdup");
1739 				goto done;
1740 			}
1741 		} else {
1742 			/* Check out a single file in a subdirectory. */
1743 			err = got_path_dirname(tree_relpath, wt_relpath);
1744 			if (err)
1745 				return err;
1746 			if (asprintf(&in_repo_path, "%s%s%s",
1747 			    worktree->path_prefix, is_root_wt ? "" : "/",
1748 			    *tree_relpath) == -1) {
1749 				err = got_error_from_errno("asprintf");
1750 				goto done;
1751 			}
1752 		}
1753 		err = got_object_id_by_path(tree_id, repo,
1754 		    worktree->base_commit_id, in_repo_path);
1755 	} else {
1756 		/* Check out all files within a subdirectory. */
1757 		*tree_id = got_object_id_dup(id);
1758 		if (*tree_id == NULL) {
1759 			err = got_error_from_errno("got_object_id_dup");
1760 			goto done;
1761 		}
1762 		*tree_relpath = strdup(wt_relpath);
1763 		if (*tree_relpath == NULL) {
1764 			err = got_error_from_errno("strdup");
1765 			goto done;
1766 		}
1767 	}
1768 done:
1769 	free(id);
1770 	free(in_repo_path);
1771 	if (err) {
1772 		*entry_type = GOT_OBJ_TYPE_ANY;
1773 		free(*tree_relpath);
1774 		*tree_relpath = NULL;
1775 		free(*tree_id);
1776 		*tree_id = NULL;
1777 	}
1778 	return err;
1779 }
1780 
1781 static const struct got_error *
1782 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1783     const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1784     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1785     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1786 {
1787 	const struct got_error *err = NULL;
1788 	struct got_commit_object *commit = NULL;
1789 	struct got_tree_object *tree = NULL;
1790 	struct got_fileindex_diff_tree_cb diff_cb;
1791 	struct diff_cb_arg arg;
1792 
1793 	err = ref_base_commit(worktree, repo);
1794 	if (err)
1795 		goto done;
1796 
1797 	err = got_object_open_as_commit(&commit, repo,
1798 	   worktree->base_commit_id);
1799 	if (err)
1800 		goto done;
1801 
1802 	err = got_object_open_as_tree(&tree, repo, tree_id);
1803 	if (err)
1804 		goto done;
1805 
1806 	if (entry_name &&
1807 	    got_object_tree_find_entry(tree, entry_name) == NULL) {
1808 		err = got_error(GOT_ERR_NO_TREE_ENTRY);
1809 		goto done;
1810 	}
1811 
1812 	diff_cb.diff_old_new = diff_old_new;
1813 	diff_cb.diff_old = diff_old;
1814 	diff_cb.diff_new = diff_new;
1815 	arg.fileindex = fileindex;
1816 	arg.worktree = worktree;
1817 	arg.repo = repo;
1818 	arg.progress_cb = progress_cb;
1819 	arg.progress_arg = progress_arg;
1820 	arg.cancel_cb = cancel_cb;
1821 	arg.cancel_arg = cancel_arg;
1822 	err = got_fileindex_diff_tree(fileindex, tree, relpath,
1823 	    entry_name, repo, &diff_cb, &arg);
1824 done:
1825 	if (tree)
1826 		got_object_tree_close(tree);
1827 	if (commit)
1828 		got_object_commit_close(commit);
1829 	return err;
1830 }
1831 
1832 const struct got_error *
1833 got_worktree_checkout_files(struct got_worktree *worktree,
1834     struct got_pathlist_head *paths, struct got_repository *repo,
1835     got_worktree_checkout_cb progress_cb, void *progress_arg,
1836     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1837 {
1838 	const struct got_error *err = NULL, *sync_err, *unlockerr;
1839 	struct got_commit_object *commit = NULL;
1840 	struct got_tree_object *tree = NULL;
1841 	struct got_fileindex *fileindex = NULL;
1842 	char *fileindex_path = NULL;
1843 	struct got_pathlist_entry *pe;
1844 	struct tree_path_data {
1845 		SIMPLEQ_ENTRY(tree_path_data) entry;
1846 		struct got_object_id *tree_id;
1847 		int entry_type;
1848 		char *relpath;
1849 		char *entry_name;
1850 	} *tpd = NULL;
1851 	SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1852 
1853 	SIMPLEQ_INIT(&tree_paths);
1854 
1855 	err = lock_worktree(worktree, LOCK_EX);
1856 	if (err)
1857 		return err;
1858 
1859 	/* Map all specified paths to in-repository trees. */
1860 	TAILQ_FOREACH(pe, paths, entry) {
1861 		tpd = malloc(sizeof(*tpd));
1862 		if (tpd == NULL) {
1863 			err = got_error_from_errno("malloc");
1864 			goto done;
1865 		}
1866 
1867 		err = find_tree_entry_for_checkout(&tpd->entry_type,
1868 		    &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1869 		if (err) {
1870 			free(tpd);
1871 			goto done;
1872 		}
1873 
1874 		if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1875 			err = got_path_basename(&tpd->entry_name, pe->path);
1876 			if (err) {
1877 				free(tpd->relpath);
1878 				free(tpd->tree_id);
1879 				free(tpd);
1880 				goto done;
1881 			}
1882 		} else
1883 			tpd->entry_name = NULL;
1884 
1885 		SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1886 	}
1887 
1888 	/*
1889 	 * Read the file index.
1890 	 * Checking out files is supposed to be an idempotent operation.
1891 	 * If the on-disk file index is incomplete we will try to complete it.
1892 	 */
1893 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
1894 	if (err)
1895 		goto done;
1896 
1897 	tpd = SIMPLEQ_FIRST(&tree_paths);
1898 	TAILQ_FOREACH(pe, paths, entry) {
1899 		struct bump_base_commit_id_arg bbc_arg;
1900 
1901 		err = checkout_files(worktree, fileindex, tpd->relpath,
1902 		    tpd->tree_id, tpd->entry_name, repo,
1903 		    progress_cb, progress_arg, cancel_cb, cancel_arg);
1904 		if (err)
1905 			break;
1906 
1907 		bbc_arg.base_commit_id = worktree->base_commit_id;
1908 		bbc_arg.entry_name = tpd->entry_name;
1909 		bbc_arg.path = pe->path;
1910 		bbc_arg.path_len = pe->path_len;
1911 		bbc_arg.progress_cb = progress_cb;
1912 		bbc_arg.progress_arg = progress_arg;
1913 		err = got_fileindex_for_each_entry_safe(fileindex,
1914 		    bump_base_commit_id, &bbc_arg);
1915 		if (err)
1916 			break;
1917 
1918 		tpd = SIMPLEQ_NEXT(tpd, entry);
1919 	}
1920 	sync_err = sync_fileindex(fileindex, fileindex_path);
1921 	if (sync_err && err == NULL)
1922 		err = sync_err;
1923 done:
1924 	free(fileindex_path);
1925 	if (tree)
1926 		got_object_tree_close(tree);
1927 	if (commit)
1928 		got_object_commit_close(commit);
1929 	if (fileindex)
1930 		got_fileindex_free(fileindex);
1931 	while (!SIMPLEQ_EMPTY(&tree_paths)) {
1932 		tpd = SIMPLEQ_FIRST(&tree_paths);
1933 		SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
1934 		free(tpd->relpath);
1935 		free(tpd->tree_id);
1936 		free(tpd);
1937 	}
1938 	unlockerr = lock_worktree(worktree, LOCK_SH);
1939 	if (unlockerr && err == NULL)
1940 		err = unlockerr;
1941 	return err;
1942 }
1943 
1944 struct merge_file_cb_arg {
1945     struct got_worktree *worktree;
1946     struct got_fileindex *fileindex;
1947     got_worktree_checkout_cb progress_cb;
1948     void *progress_arg;
1949     got_worktree_cancel_cb cancel_cb;
1950     void *cancel_arg;
1951     struct got_object_id *commit_id2;
1952 };
1953 
1954 static const struct got_error *
1955 merge_file_cb(void *arg, struct got_blob_object *blob1,
1956     struct got_blob_object *blob2, struct got_object_id *id1,
1957     struct got_object_id *id2, const char *path1, const char *path2,
1958     struct got_repository *repo)
1959 {
1960 	static const struct got_error *err = NULL;
1961 	struct merge_file_cb_arg *a = arg;
1962 	struct got_fileindex_entry *ie;
1963 	char *ondisk_path = NULL;
1964 	struct stat sb;
1965 	unsigned char status;
1966 	int local_changes_subsumed;
1967 
1968 	if (blob1 && blob2) {
1969 		ie = got_fileindex_entry_get(a->fileindex, path2,
1970 		    strlen(path2));
1971 		if (ie == NULL)
1972 			return (*a->progress_cb)(a->progress_arg,
1973 			    GOT_STATUS_MISSING, path2);
1974 
1975 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1976 		    path2) == -1)
1977 			return got_error_from_errno("asprintf");
1978 
1979 		err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1980 		if (err)
1981 			goto done;
1982 
1983 		if (status == GOT_STATUS_DELETE) {
1984 			err = (*a->progress_cb)(a->progress_arg,
1985 			    GOT_STATUS_MERGE, path2);
1986 			goto done;
1987 		}
1988 		if (status != GOT_STATUS_NO_CHANGE &&
1989 		    status != GOT_STATUS_MODIFY &&
1990 		    status != GOT_STATUS_CONFLICT &&
1991 		    status != GOT_STATUS_ADD) {
1992 			err = (*a->progress_cb)(a->progress_arg, status, path2);
1993 			goto done;
1994 		}
1995 
1996 		err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1997 		    ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1998 		    a->progress_cb, a->progress_arg);
1999 	} else if (blob1) {
2000 		ie = got_fileindex_entry_get(a->fileindex, path1,
2001 		    strlen(path1));
2002 		if (ie == NULL)
2003 			return (*a->progress_cb)(a->progress_arg,
2004 			    GOT_STATUS_MISSING, path2);
2005 
2006 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2007 		    path1) == -1)
2008 			return got_error_from_errno("asprintf");
2009 
2010 		err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2011 		if (err)
2012 			goto done;
2013 
2014 		switch (status) {
2015 		case GOT_STATUS_NO_CHANGE:
2016 			err = (*a->progress_cb)(a->progress_arg,
2017 			    GOT_STATUS_DELETE, path1);
2018 			if (err)
2019 				goto done;
2020 			err = remove_ondisk_file(a->worktree->root_path, path1);
2021 			if (err)
2022 				goto done;
2023 			if (ie)
2024 				got_fileindex_entry_mark_deleted_from_disk(ie);
2025 			break;
2026 		case GOT_STATUS_DELETE:
2027 		case GOT_STATUS_MISSING:
2028 			err = (*a->progress_cb)(a->progress_arg,
2029 			    GOT_STATUS_DELETE, path1);
2030 			if (err)
2031 				goto done;
2032 			if (ie)
2033 				got_fileindex_entry_mark_deleted_from_disk(ie);
2034 			break;
2035 		case GOT_STATUS_ADD:
2036 		case GOT_STATUS_MODIFY:
2037 		case GOT_STATUS_CONFLICT:
2038 			err = (*a->progress_cb)(a->progress_arg,
2039 			    GOT_STATUS_CANNOT_DELETE, path1);
2040 			if (err)
2041 				goto done;
2042 			break;
2043 		case GOT_STATUS_OBSTRUCTED:
2044 			err = (*a->progress_cb)(a->progress_arg, status, path1);
2045 			if (err)
2046 				goto done;
2047 			break;
2048 		default:
2049 			break;
2050 		}
2051 	} else if (blob2) {
2052 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2053 		    path2) == -1)
2054 			return got_error_from_errno("asprintf");
2055 		ie = got_fileindex_entry_get(a->fileindex, path2,
2056 		    strlen(path2));
2057 		if (ie) {
2058 			err = get_file_status(&status, &sb, ie, ondisk_path,
2059 			    repo);
2060 			if (err)
2061 				goto done;
2062 			if (status != GOT_STATUS_NO_CHANGE &&
2063 			    status != GOT_STATUS_MODIFY &&
2064 			    status != GOT_STATUS_CONFLICT &&
2065 			    status != GOT_STATUS_ADD) {
2066 				err = (*a->progress_cb)(a->progress_arg,
2067 				    status, path2);
2068 				goto done;
2069 			}
2070 			err = merge_blob(&local_changes_subsumed, a->worktree,
2071 			    NULL, ondisk_path, path2, sb.st_mode, blob2,
2072 			    a->commit_id2, repo,
2073 			    a->progress_cb, a->progress_arg);
2074 			if (status == GOT_STATUS_DELETE) {
2075 				err = update_blob_fileindex_entry(a->worktree,
2076 				    a->fileindex, ie, ondisk_path, ie->path,
2077 				    blob2, 0);
2078 				if (err)
2079 					goto done;
2080 			}
2081 		} else {
2082 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
2083 			err = install_blob(a->worktree, ondisk_path, path2,
2084 			    /* XXX get this from parent tree! */
2085 			    GOT_DEFAULT_FILE_MODE,
2086 			    sb.st_mode, blob2, 0, 0, repo,
2087 			    a->progress_cb, a->progress_arg);
2088 			if (err)
2089 				goto done;
2090 			err = got_fileindex_entry_alloc(&ie,
2091 			    ondisk_path, path2, NULL, NULL);
2092 			if (err)
2093 				goto done;
2094 			err = got_fileindex_entry_add(a->fileindex, ie);
2095 			if (err) {
2096 				got_fileindex_entry_free(ie);
2097 				goto done;
2098 			}
2099 		}
2100 	}
2101 done:
2102 	free(ondisk_path);
2103 	return err;
2104 }
2105 
2106 struct check_merge_ok_arg {
2107 	struct got_worktree *worktree;
2108 	struct got_repository *repo;
2109 };
2110 
2111 static const struct got_error *
2112 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2113 {
2114 	const struct got_error *err = NULL;
2115 	struct check_merge_ok_arg *a = arg;
2116 	unsigned char status;
2117 	struct stat sb;
2118 	char *ondisk_path;
2119 
2120 	/* Reject merges into a work tree with mixed base commits. */
2121 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2122 	    SHA1_DIGEST_LENGTH))
2123 		return got_error(GOT_ERR_MIXED_COMMITS);
2124 
2125 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2126 	    == -1)
2127 		return got_error_from_errno("asprintf");
2128 
2129 	/* Reject merges into a work tree with conflicted files. */
2130 	err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2131 	if (err)
2132 		return err;
2133 	if (status == GOT_STATUS_CONFLICT)
2134 		return got_error(GOT_ERR_CONFLICTS);
2135 
2136 	return NULL;
2137 }
2138 
2139 static const struct got_error *
2140 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2141     const char *fileindex_path, struct got_object_id *commit_id1,
2142     struct got_object_id *commit_id2, struct got_repository *repo,
2143     got_worktree_checkout_cb progress_cb, void *progress_arg,
2144     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2145 {
2146 	const struct got_error *err = NULL, *sync_err;
2147 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2148 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2149 	struct merge_file_cb_arg arg;
2150 
2151 	if (commit_id1) {
2152 		err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2153 		    worktree->path_prefix);
2154 		if (err)
2155 			goto done;
2156 
2157 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
2158 		if (err)
2159 			goto done;
2160 	}
2161 
2162 	err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2163 	    worktree->path_prefix);
2164 	if (err)
2165 		goto done;
2166 
2167 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
2168 	if (err)
2169 		goto done;
2170 
2171 	arg.worktree = worktree;
2172 	arg.fileindex = fileindex;
2173 	arg.progress_cb = progress_cb;
2174 	arg.progress_arg = progress_arg;
2175 	arg.cancel_cb = cancel_cb;
2176 	arg.cancel_arg = cancel_arg;
2177 	arg.commit_id2 = commit_id2;
2178 	err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2179 	sync_err = sync_fileindex(fileindex, fileindex_path);
2180 	if (sync_err && err == NULL)
2181 		err = sync_err;
2182 done:
2183 	if (tree1)
2184 		got_object_tree_close(tree1);
2185 	if (tree2)
2186 		got_object_tree_close(tree2);
2187 	return err;
2188 }
2189 
2190 const struct got_error *
2191 got_worktree_merge_files(struct got_worktree *worktree,
2192     struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2193     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2194     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2195 {
2196 	const struct got_error *err, *unlockerr;
2197 	char *fileindex_path = NULL;
2198 	struct got_fileindex *fileindex = NULL;
2199 	struct check_merge_ok_arg mok_arg;
2200 
2201 	err = lock_worktree(worktree, LOCK_EX);
2202 	if (err)
2203 		return err;
2204 
2205 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2206 	if (err)
2207 		goto done;
2208 
2209 	mok_arg.worktree = worktree;
2210 	mok_arg.repo = repo;
2211 	err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2212 	    &mok_arg);
2213 	if (err)
2214 		goto done;
2215 
2216 	err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2217 	    commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2218 done:
2219 	if (fileindex)
2220 		got_fileindex_free(fileindex);
2221 	free(fileindex_path);
2222 	unlockerr = lock_worktree(worktree, LOCK_SH);
2223 	if (unlockerr && err == NULL)
2224 		err = unlockerr;
2225 	return err;
2226 }
2227 
2228 struct diff_dir_cb_arg {
2229     struct got_fileindex *fileindex;
2230     struct got_worktree *worktree;
2231     const char *status_path;
2232     size_t status_path_len;
2233     struct got_repository *repo;
2234     got_worktree_status_cb status_cb;
2235     void *status_arg;
2236     got_worktree_cancel_cb cancel_cb;
2237     void *cancel_arg;
2238 };
2239 
2240 static const struct got_error *
2241 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2242     got_worktree_status_cb status_cb, void *status_arg,
2243     struct got_repository *repo)
2244 {
2245 	const struct got_error *err = NULL;
2246 	unsigned char status = GOT_STATUS_NO_CHANGE;
2247 	unsigned char staged_status = get_staged_status(ie);
2248 	struct stat sb;
2249 	struct got_object_id blob_id, commit_id, staged_blob_id;
2250 	struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2251 	struct got_object_id *staged_blob_idp = NULL;
2252 
2253 	err = get_file_status(&status, &sb, ie, abspath, repo);
2254 	if (err)
2255 		return err;
2256 
2257 	if (status == GOT_STATUS_NO_CHANGE &&
2258 	    staged_status == GOT_STATUS_NO_CHANGE)
2259 		return NULL;
2260 
2261 	if (got_fileindex_entry_has_blob(ie)) {
2262 		memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2263 		blob_idp = &blob_id;
2264 	}
2265 	if (got_fileindex_entry_has_commit(ie)) {
2266 		memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2267 		commit_idp = &commit_id;
2268 	}
2269 	if (staged_status == GOT_STATUS_ADD ||
2270 	    staged_status == GOT_STATUS_MODIFY) {
2271 		memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2272 		    SHA1_DIGEST_LENGTH);
2273 		staged_blob_idp = &staged_blob_id;
2274 	}
2275 
2276 	return (*status_cb)(status_arg, status, staged_status,
2277 	    ie->path, blob_idp, staged_blob_idp, commit_idp);
2278 }
2279 
2280 static const struct got_error *
2281 status_old_new(void *arg, struct got_fileindex_entry *ie,
2282     struct dirent *de, const char *parent_path)
2283 {
2284 	const struct got_error *err = NULL;
2285 	struct diff_dir_cb_arg *a = arg;
2286 	char *abspath;
2287 
2288 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2289 		return got_error(GOT_ERR_CANCELLED);
2290 
2291 	if (got_path_cmp(parent_path, a->status_path,
2292 	    strlen(parent_path), a->status_path_len) != 0 &&
2293 	    !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2294 		return NULL;
2295 
2296 	if (parent_path[0]) {
2297 		if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2298 		    parent_path, de->d_name) == -1)
2299 			return got_error_from_errno("asprintf");
2300 	} else {
2301 		if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2302 		    de->d_name) == -1)
2303 			return got_error_from_errno("asprintf");
2304 	}
2305 
2306 	err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2307 	    a->repo);
2308 	free(abspath);
2309 	return err;
2310 }
2311 
2312 static const struct got_error *
2313 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2314 {
2315 	struct diff_dir_cb_arg *a = arg;
2316 	struct got_object_id blob_id, commit_id;
2317 	unsigned char status;
2318 
2319 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2320 		return got_error(GOT_ERR_CANCELLED);
2321 
2322 	if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2323 		return NULL;
2324 
2325 	memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2326 	memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2327 	if (got_fileindex_entry_has_file_on_disk(ie))
2328 		status = GOT_STATUS_MISSING;
2329 	else
2330 		status = GOT_STATUS_DELETE;
2331 	return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2332 	    ie->path, &blob_id, NULL, &commit_id);
2333 }
2334 
2335 static const struct got_error *
2336 status_new(void *arg, struct dirent *de, const char *parent_path)
2337 {
2338 	const struct got_error *err = NULL;
2339 	struct diff_dir_cb_arg *a = arg;
2340 	char *path = NULL;
2341 
2342 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2343 		return got_error(GOT_ERR_CANCELLED);
2344 
2345 	if (de->d_type == DT_DIR)
2346 		return NULL;
2347 
2348 	/* XXX ignore symlinks for now */
2349 	if (de->d_type == DT_LNK)
2350 		return NULL;
2351 
2352 	if (parent_path[0]) {
2353 		if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2354 			return got_error_from_errno("asprintf");
2355 	} else {
2356 		path = de->d_name;
2357 	}
2358 
2359 	if (got_path_is_child(path, a->status_path, a->status_path_len))
2360 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2361 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2362 	if (parent_path[0])
2363 		free(path);
2364 	return err;
2365 }
2366 
2367 static const struct got_error *
2368 report_single_file_status(const char *path, const char *ondisk_path,
2369 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2370 void *status_arg, struct got_repository *repo)
2371 {
2372 	struct got_fileindex_entry *ie;
2373 	struct stat sb;
2374 
2375 	ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2376 	if (ie)
2377 		return report_file_status(ie, ondisk_path, status_cb,
2378 		    status_arg, repo);
2379 
2380 	if (lstat(ondisk_path, &sb) == -1) {
2381 		if (errno != ENOENT)
2382 			return got_error_from_errno2("lstat", ondisk_path);
2383 		return NULL;
2384 	}
2385 
2386 	if (S_ISREG(sb.st_mode))
2387 		return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2388 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2389 
2390 	return NULL;
2391 }
2392 
2393 static const struct got_error *
2394 worktree_status(struct got_worktree *worktree, const char *path,
2395     struct got_fileindex *fileindex, struct got_repository *repo,
2396     got_worktree_status_cb status_cb, void *status_arg,
2397     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2398 {
2399 	const struct got_error *err = NULL;
2400 	DIR *workdir = NULL;
2401 	struct got_fileindex_diff_dir_cb fdiff_cb;
2402 	struct diff_dir_cb_arg arg;
2403 	char *ondisk_path = NULL;
2404 
2405 	if (asprintf(&ondisk_path, "%s%s%s",
2406 	    worktree->root_path, path[0] ? "/" : "", path) == -1)
2407 		return got_error_from_errno("asprintf");
2408 
2409 	workdir = opendir(ondisk_path);
2410 	if (workdir == NULL) {
2411 		if (errno != ENOTDIR && errno != ENOENT)
2412 			err = got_error_from_errno2("opendir", ondisk_path);
2413 		else
2414 			err = report_single_file_status(path, ondisk_path,
2415 			    fileindex, status_cb, status_arg, repo);
2416 	} else {
2417 		fdiff_cb.diff_old_new = status_old_new;
2418 		fdiff_cb.diff_old = status_old;
2419 		fdiff_cb.diff_new = status_new;
2420 		arg.fileindex = fileindex;
2421 		arg.worktree = worktree;
2422 		arg.status_path = path;
2423 		arg.status_path_len = strlen(path);
2424 		arg.repo = repo;
2425 		arg.status_cb = status_cb;
2426 		arg.status_arg = status_arg;
2427 		arg.cancel_cb = cancel_cb;
2428 		arg.cancel_arg = cancel_arg;
2429 		err = got_fileindex_diff_dir(fileindex, workdir,
2430 		    worktree->root_path, path, repo, &fdiff_cb, &arg);
2431 	}
2432 
2433 	if (workdir)
2434 		closedir(workdir);
2435 	free(ondisk_path);
2436 	return err;
2437 }
2438 
2439 const struct got_error *
2440 got_worktree_status(struct got_worktree *worktree,
2441     struct got_pathlist_head *paths, struct got_repository *repo,
2442     got_worktree_status_cb status_cb, void *status_arg,
2443     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2444 {
2445 	const struct got_error *err = NULL;
2446 	char *fileindex_path = NULL;
2447 	struct got_fileindex *fileindex = NULL;
2448 	struct got_pathlist_entry *pe;
2449 
2450 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2451 	if (err)
2452 		return err;
2453 
2454 	TAILQ_FOREACH(pe, paths, entry) {
2455 		err = worktree_status(worktree, pe->path, fileindex, repo,
2456 			status_cb, status_arg, cancel_cb, cancel_arg);
2457 		if (err)
2458 			break;
2459 	}
2460 	free(fileindex_path);
2461 	got_fileindex_free(fileindex);
2462 	return err;
2463 }
2464 
2465 const struct got_error *
2466 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2467     const char *arg)
2468 {
2469 	const struct got_error *err = NULL;
2470 	char *resolved, *cwd = NULL, *path = NULL;
2471 	size_t len;
2472 
2473 	*wt_path = NULL;
2474 
2475 	resolved = realpath(arg, NULL);
2476 	if (resolved == NULL) {
2477 		if (errno != ENOENT)
2478 			return got_error_from_errno2("realpath", arg);
2479 		cwd = getcwd(NULL, 0);
2480 		if (cwd == NULL)
2481 			return got_error_from_errno("getcwd");
2482 		if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2483 			err = got_error_from_errno("asprintf");
2484 			goto done;
2485 		}
2486 	}
2487 
2488 	if (strncmp(got_worktree_get_root_path(worktree), resolved,
2489 	    strlen(got_worktree_get_root_path(worktree)))) {
2490 		err = got_error(GOT_ERR_BAD_PATH);
2491 		goto done;
2492 	}
2493 
2494 	if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2495 		err = got_path_skip_common_ancestor(&path,
2496 		    got_worktree_get_root_path(worktree), resolved);
2497 		if (err)
2498 			goto done;
2499 	} else {
2500 		path = strdup("");
2501 		if (path == NULL) {
2502 			err = got_error_from_errno("strdup");
2503 			goto done;
2504 		}
2505 	}
2506 
2507 	/* XXX status walk can't deal with trailing slash! */
2508 	len = strlen(path);
2509 	while (len > 0 && path[len - 1] == '/') {
2510 		path[len - 1] = '\0';
2511 		len--;
2512 	}
2513 done:
2514 	free(resolved);
2515 	free(cwd);
2516 	if (err == NULL)
2517 		*wt_path = path;
2518 	else
2519 		free(path);
2520 	return err;
2521 }
2522 
2523 static const struct got_error *
2524 schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2525     const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2526     struct got_repository *repo)
2527 {
2528 	const struct got_error *err = NULL;
2529 	struct got_fileindex_entry *ie;
2530 	unsigned char status;
2531 	struct stat sb;
2532 
2533 	ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2534 	if (ie) {
2535 		err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2536 		if (err)
2537 			return err;
2538 		/* Re-adding an existing entry is a no-op. */
2539 		if (status == GOT_STATUS_ADD)
2540 			return NULL;
2541 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2542 	}
2543 
2544 	err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2545 	if (err)
2546 		return err;
2547 
2548 	err = got_fileindex_entry_add(fileindex, ie);
2549 	if (err) {
2550 		got_fileindex_entry_free(ie);
2551 		return err;
2552 	}
2553 
2554 	return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2555 }
2556 
2557 const struct got_error *
2558 got_worktree_schedule_add(struct got_worktree *worktree,
2559     struct got_pathlist_head *paths,
2560     got_worktree_status_cb status_cb, void *status_arg,
2561     struct got_repository *repo)
2562 {
2563 	struct got_fileindex *fileindex = NULL;
2564 	char *fileindex_path = NULL;
2565 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2566 	struct got_pathlist_entry *pe;
2567 
2568 	err = lock_worktree(worktree, LOCK_EX);
2569 	if (err)
2570 		return err;
2571 
2572 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2573 	if (err)
2574 		goto done;
2575 
2576 	TAILQ_FOREACH(pe, paths, entry) {
2577 		char *ondisk_path;
2578 		if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2579 		    pe->path) == -1)
2580 			return got_error_from_errno("asprintf");
2581 		err = schedule_addition(ondisk_path, fileindex, pe->path,
2582 		    status_cb, status_arg, repo);
2583 		free(ondisk_path);
2584 		if (err)
2585 			break;
2586 	}
2587 	sync_err = sync_fileindex(fileindex, fileindex_path);
2588 	if (sync_err && err == NULL)
2589 		err = sync_err;
2590 done:
2591 	free(fileindex_path);
2592 	if (fileindex)
2593 		got_fileindex_free(fileindex);
2594 	unlockerr = lock_worktree(worktree, LOCK_SH);
2595 	if (unlockerr && err == NULL)
2596 		err = unlockerr;
2597 	return err;
2598 }
2599 
2600 static const struct got_error *
2601 schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2602     const char *relpath, int delete_local_mods,
2603     got_worktree_status_cb status_cb, void *status_arg,
2604     struct got_repository *repo)
2605 {
2606 	const struct got_error *err = NULL;
2607 	struct got_fileindex_entry *ie = NULL;
2608 	unsigned char status, staged_status;
2609 	struct stat sb;
2610 
2611 	ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2612 	if (ie == NULL)
2613 		return got_error(GOT_ERR_BAD_PATH);
2614 
2615 	staged_status = get_staged_status(ie);
2616 	if (staged_status != GOT_STATUS_NO_CHANGE) {
2617 		if (staged_status == GOT_STATUS_DELETE)
2618 			return NULL;
2619 		return got_error_path(relpath, GOT_ERR_FILE_STAGED);
2620 	}
2621 
2622 	err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2623 	if (err)
2624 		return err;
2625 
2626 	if (status != GOT_STATUS_NO_CHANGE) {
2627 		if (status == GOT_STATUS_DELETE)
2628 			return NULL;
2629 		if (status == GOT_STATUS_MODIFY && !delete_local_mods)
2630 			return got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
2631 		if (status != GOT_STATUS_MODIFY &&
2632 		    status != GOT_STATUS_MISSING)
2633 			return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2634 	}
2635 
2636 	if (status != GOT_STATUS_MISSING && unlink(ondisk_path) != 0)
2637 		return got_error_from_errno2("unlink", ondisk_path);
2638 
2639 	got_fileindex_entry_mark_deleted_from_disk(ie);
2640 	return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2641 }
2642 
2643 const struct got_error *
2644 got_worktree_schedule_delete(struct got_worktree *worktree,
2645     struct got_pathlist_head *paths, int delete_local_mods,
2646     got_worktree_status_cb status_cb, void *status_arg,
2647     struct got_repository *repo)
2648 {
2649 	struct got_fileindex *fileindex = NULL;
2650 	char *fileindex_path = NULL;
2651 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2652 	struct got_pathlist_entry *pe;
2653 
2654 	err = lock_worktree(worktree, LOCK_EX);
2655 	if (err)
2656 		return err;
2657 
2658 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2659 	if (err)
2660 		goto done;
2661 
2662 	TAILQ_FOREACH(pe, paths, entry) {
2663 		char *ondisk_path;
2664 		if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2665 		    pe->path) == -1)
2666 			return got_error_from_errno("asprintf");
2667 		err = schedule_for_deletion(ondisk_path, fileindex, pe->path,
2668 		    delete_local_mods, status_cb, status_arg, repo);
2669 		free(ondisk_path);
2670 		if (err)
2671 			break;
2672 	}
2673 	sync_err = sync_fileindex(fileindex, fileindex_path);
2674 	if (sync_err && err == NULL)
2675 		err = sync_err;
2676 done:
2677 	free(fileindex_path);
2678 	if (fileindex)
2679 		got_fileindex_free(fileindex);
2680 	unlockerr = lock_worktree(worktree, LOCK_SH);
2681 	if (unlockerr && err == NULL)
2682 		err = unlockerr;
2683 	return err;
2684 }
2685 
2686 static const struct got_error *
2687 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
2688 {
2689 	const struct got_error *err = NULL;
2690 	char *line = NULL;
2691 	size_t linesize = 0, n;
2692 	ssize_t linelen;
2693 
2694 	linelen = getline(&line, &linesize, infile);
2695 	if (linelen == -1) {
2696 		if (ferror(infile)) {
2697 			err = got_error_from_errno("getline");
2698 			goto done;
2699 		}
2700 		return NULL;
2701 	}
2702 	if (outfile) {
2703 		n = fwrite(line, 1, linelen, outfile);
2704 		if (n != linelen) {
2705 			err = got_ferror(outfile, GOT_ERR_IO);
2706 			goto done;
2707 		}
2708 	}
2709 	if (rejectfile) {
2710 		n = fwrite(line, 1, linelen, rejectfile);
2711 		if (n != linelen)
2712 			err = got_ferror(outfile, GOT_ERR_IO);
2713 	}
2714 done:
2715 	free(line);
2716 	return err;
2717 }
2718 
2719 static const struct got_error *
2720 skip_one_line(FILE *f)
2721 {
2722 	char *line = NULL;
2723 	size_t linesize = 0;
2724 	ssize_t linelen;
2725 
2726 	linelen = getline(&line, &linesize, f);
2727 	free(line);
2728 	if (linelen == -1 && ferror(f))
2729 		return got_error_from_errno("getline");
2730 	return NULL;
2731 }
2732 
2733 static const struct got_error *
2734 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
2735     int start_old, int end_old, int start_new, int end_new,
2736     FILE *outfile, FILE *rejectfile)
2737  {
2738 	const struct got_error *err;
2739 
2740 	/* Copy old file's lines leading up to patch. */
2741 	while (!feof(f1) && *line_cur1 < start_old) {
2742 		err = copy_one_line(f1, outfile, NULL);
2743 		if (err)
2744 			return err;
2745 		(*line_cur1)++;
2746 	}
2747 	/* Skip new file's lines leading up to patch. */
2748 	while (!feof(f2) && *line_cur2 < start_new) {
2749 		if (rejectfile)
2750 			err = copy_one_line(f2, NULL, rejectfile);
2751 		else
2752 			err = skip_one_line(f2);
2753 		if (err)
2754 			return err;
2755 		(*line_cur2)++;
2756 	}
2757 	/* Copy patched lines. */
2758 	while (!feof(f2) && *line_cur2 <= end_new) {
2759 		err = copy_one_line(f2, outfile, NULL);
2760 		if (err)
2761 			return err;
2762 		(*line_cur2)++;
2763 	}
2764 	/* Skip over old file's replaced lines. */
2765 	while (!feof(f1) && *line_cur1 <= end_new) {
2766 		if (rejectfile)
2767 			err = copy_one_line(f1, NULL, rejectfile);
2768 		else
2769 			err = skip_one_line(f1);
2770 		if (err)
2771 			return err;
2772 		(*line_cur1)++;
2773 	}
2774 	/* Copy old file's lines after patch. */
2775 	while (!feof(f1) && *line_cur1 <= end_old) {
2776 		err = copy_one_line(f1, outfile, rejectfile);
2777 		if (err)
2778 			return err;
2779 		(*line_cur1)++;
2780 	}
2781 
2782 	return NULL;
2783 }
2784 
2785 static const struct got_error *
2786 apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
2787     int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
2788     int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
2789     int *line_cur2, FILE *outfile, FILE *rejectfile,
2790     got_worktree_patch_cb patch_cb, void *patch_arg)
2791 {
2792 	const struct got_error *err = NULL;
2793 	int start_old = change->cv.a;
2794 	int end_old = change->cv.b;
2795 	int start_new = change->cv.c;
2796 	int end_new = change->cv.d;
2797 	long pos1, pos2;
2798 	FILE *hunkfile;
2799 
2800 	*choice = GOT_PATCH_CHOICE_NONE;
2801 
2802 	hunkfile = got_opentemp();
2803 	if (hunkfile == NULL)
2804 		return got_error_from_errno("got_opentemp");
2805 
2806 	pos1 = ftell(f1);
2807 	pos2 = ftell(f2);
2808 
2809 	/* XXX TODO needs error checking */
2810 	got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
2811 
2812 	if (fseek(f1, pos1, SEEK_SET) == -1) {
2813 		err = got_ferror(f1, GOT_ERR_IO);
2814 		goto done;
2815 	}
2816 	if (fseek(f2, pos2, SEEK_SET) == -1) {
2817 		err = got_ferror(f1, GOT_ERR_IO);
2818 		goto done;
2819 	}
2820 	if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
2821 		err = got_ferror(hunkfile, GOT_ERR_IO);
2822 		goto done;
2823 	}
2824 
2825 	err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
2826 	    hunkfile, n, nchanges);
2827 	if (err)
2828 		goto done;
2829 
2830 	switch (*choice) {
2831 	case GOT_PATCH_CHOICE_YES:
2832 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
2833 		    end_old, start_new, end_new, outfile, rejectfile);
2834 		break;
2835 	case GOT_PATCH_CHOICE_NO:
2836 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
2837 		    end_old, start_new, end_new, rejectfile, outfile);
2838 		break;
2839 	case GOT_PATCH_CHOICE_QUIT:
2840 		if (outfile) {
2841 			/* Copy old file's lines until EOF. */
2842 			while (!feof(f1)) {
2843 				err = copy_one_line(f1, outfile, NULL);
2844 				if (err)
2845 					goto done;
2846 				(*line_cur1)++;
2847 			}
2848 		}
2849 		if (rejectfile) {
2850 			/* Copy new file's lines until EOF. */
2851 			while (!feof(f2)) {
2852 				err = copy_one_line(f2, NULL, rejectfile);
2853 				if (err)
2854 					goto done;
2855 				(*line_cur2)++;
2856 			}
2857 		}
2858 		break;
2859 	default:
2860 		err = got_error(GOT_ERR_PATCH_CHOICE);
2861 		break;
2862 	}
2863 done:
2864 	if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
2865 		err = got_error_from_errno("fclose");
2866 	return err;
2867 }
2868 
2869 struct revert_file_args {
2870 	struct got_worktree *worktree;
2871 	struct got_fileindex *fileindex;
2872 	got_worktree_checkout_cb progress_cb;
2873 	void *progress_arg;
2874 	got_worktree_patch_cb patch_cb;
2875 	void *patch_arg;
2876 	struct got_repository *repo;
2877 };
2878 
2879 static const struct got_error *
2880 create_patched_content(char **path_outfile, int reverse_patch,
2881     struct got_object_id *blob_id, const char *path2,
2882     const char *relpath, struct got_repository *repo,
2883     got_worktree_patch_cb patch_cb, void *patch_arg)
2884 {
2885 	const struct got_error *err;
2886 	struct got_blob_object *blob = NULL;
2887 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
2888 	char *path1 = NULL, *id_str = NULL;
2889 	struct stat sb1, sb2;
2890 	struct got_diff_changes *changes = NULL;
2891 	struct got_diff_state *ds = NULL;
2892 	struct got_diff_args *args = NULL;
2893 	struct got_diff_change *change;
2894 	int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
2895 	int n = 0;
2896 
2897 	*path_outfile = NULL;
2898 
2899 	err = got_object_id_str(&id_str, blob_id);
2900 	if (err)
2901 		return err;
2902 
2903 	f2 = fopen(path2, "r");
2904 	if (f2 == NULL) {
2905 		err = got_error_from_errno2("fopen", path2);
2906 		goto done;
2907 	}
2908 
2909 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
2910 	if (err)
2911 		goto done;
2912 
2913 	err = got_opentemp_named(&path1, &f1, "got-patched-blob");
2914 	if (err)
2915 		goto done;
2916 
2917 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
2918 	if (err)
2919 		goto done;
2920 
2921 	if (stat(path1, &sb1) == -1) {
2922 		err = got_error_from_errno2("stat", path1);
2923 		goto done;
2924 	}
2925 	if (stat(path2, &sb2) == -1) {
2926 		err = got_error_from_errno2("stat", path2);
2927 		goto done;
2928 	}
2929 
2930 	err = got_diff_files(&changes, &ds, &args, &diff_flags,
2931 	    f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
2932 	if (err)
2933 		goto done;
2934 
2935 	err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
2936 	if (err)
2937 		goto done;
2938 
2939 	if (fseek(f1, 0L, SEEK_SET) == -1)
2940 		return got_ferror(f1, GOT_ERR_IO);
2941 	if (fseek(f2, 0L, SEEK_SET) == -1)
2942 		return got_ferror(f2, GOT_ERR_IO);
2943 	SIMPLEQ_FOREACH(change, &changes->entries, entry) {
2944 		int choice;
2945 		err = apply_or_reject_change(&choice, change, ++n,
2946 		    changes->nchanges, ds, args, diff_flags, relpath,
2947 		    f1, f2, &line_cur1, &line_cur2,
2948 		    reverse_patch ? NULL : outfile,
2949 		    reverse_patch ? outfile : NULL,
2950 		    patch_cb, patch_arg);
2951 		if (err)
2952 			goto done;
2953 		if (choice == GOT_PATCH_CHOICE_YES)
2954 			have_content = 1;
2955 		else if (choice == GOT_PATCH_CHOICE_QUIT)
2956 			break;
2957 	}
2958 done:
2959 	free(id_str);
2960 	if (blob)
2961 		got_object_blob_close(blob);
2962 	if (f1 && fclose(f1) == EOF && err == NULL)
2963 		err = got_error_from_errno2("fclose", path1);
2964 	if (f2 && fclose(f2) == EOF && err == NULL)
2965 		err = got_error_from_errno2("fclose", path2);
2966 	if (outfile && fclose(outfile) == EOF && err == NULL)
2967 		err = got_error_from_errno2("fclose", *path_outfile);
2968 	if (path1 && unlink(path1) == -1 && err == NULL)
2969 		err = got_error_from_errno2("unlink", path1);
2970 	if (err || !have_content) {
2971 		if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
2972 			err = got_error_from_errno2("unlink", *path_outfile);
2973 		free(*path_outfile);
2974 		*path_outfile = NULL;
2975 	}
2976 	free(args);
2977 	if (ds) {
2978 		got_diff_state_free(ds);
2979 		free(ds);
2980 	}
2981 	if (changes)
2982 		got_diff_free_changes(changes);
2983 	free(path1);
2984 	return err;
2985 }
2986 
2987 static const struct got_error *
2988 revert_file(void *arg, unsigned char status, unsigned char staged_status,
2989     const char *relpath, struct got_object_id *blob_id,
2990     struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2991 {
2992 	struct revert_file_args *a = arg;
2993 	const struct got_error *err = NULL;
2994 	char *parent_path = NULL;
2995 	struct got_fileindex_entry *ie;
2996 	struct got_tree_object *tree = NULL;
2997 	struct got_object_id *tree_id = NULL;
2998 	const struct got_tree_entry *te = NULL;
2999 	char *tree_path = NULL, *te_name;
3000 	char *ondisk_path = NULL, *path_content = NULL;
3001 	struct got_blob_object *blob = NULL;
3002 
3003 	/* Reverting a staged deletion is a no-op. */
3004 	if (status == GOT_STATUS_DELETE &&
3005 	    staged_status != GOT_STATUS_NO_CHANGE)
3006 		return NULL;
3007 
3008 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3009 	if (ie == NULL)
3010 		return got_error(GOT_ERR_BAD_PATH);
3011 
3012 	/* Construct in-repository path of tree which contains this blob. */
3013 	err = got_path_dirname(&parent_path, ie->path);
3014 	if (err) {
3015 		if (err->code != GOT_ERR_BAD_PATH)
3016 			goto done;
3017 		parent_path = strdup("/");
3018 		if (parent_path == NULL) {
3019 			err = got_error_from_errno("strdup");
3020 			goto done;
3021 		}
3022 	}
3023 	if (got_path_is_root_dir(a->worktree->path_prefix)) {
3024 		tree_path = strdup(parent_path);
3025 		if (tree_path == NULL) {
3026 			err = got_error_from_errno("strdup");
3027 			goto done;
3028 		}
3029 	} else {
3030 		if (got_path_is_root_dir(parent_path)) {
3031 			tree_path = strdup(a->worktree->path_prefix);
3032 			if (tree_path == NULL) {
3033 				err = got_error_from_errno("strdup");
3034 				goto done;
3035 			}
3036 		} else {
3037 			if (asprintf(&tree_path, "%s/%s",
3038 			    a->worktree->path_prefix, parent_path) == -1) {
3039 				err = got_error_from_errno("asprintf");
3040 				goto done;
3041 			}
3042 		}
3043 	}
3044 
3045 	err = got_object_id_by_path(&tree_id, a->repo,
3046 	    a->worktree->base_commit_id, tree_path);
3047 	if (err) {
3048 		if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3049 		    (status == GOT_STATUS_ADD ||
3050 		    staged_status == GOT_STATUS_ADD)))
3051 			goto done;
3052 	} else {
3053 		err = got_object_open_as_tree(&tree, a->repo, tree_id);
3054 		if (err)
3055 			goto done;
3056 
3057 		te_name = basename(ie->path);
3058 		if (te_name == NULL) {
3059 			err = got_error_from_errno2("basename", ie->path);
3060 			goto done;
3061 		}
3062 
3063 		te = got_object_tree_find_entry(tree, te_name);
3064 		if (te == NULL && status != GOT_STATUS_ADD &&
3065 		    staged_status != GOT_STATUS_ADD) {
3066 			err = got_error(GOT_ERR_NO_TREE_ENTRY);
3067 			goto done;
3068 		}
3069 	}
3070 
3071 	switch (status) {
3072 	case GOT_STATUS_ADD:
3073 		if (a->patch_cb) {
3074 			int choice = GOT_PATCH_CHOICE_NONE;
3075 			err = (*a->patch_cb)(&choice, a->patch_arg,
3076 			    status, ie->path, NULL, 1, 1);
3077 			if (err)
3078 				goto done;
3079 			if (choice != GOT_PATCH_CHOICE_YES)
3080 				break;
3081 		}
3082 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3083 		    ie->path);
3084 		if (err)
3085 			goto done;
3086 		got_fileindex_entry_remove(a->fileindex, ie);
3087 		break;
3088 	case GOT_STATUS_DELETE:
3089 		if (a->patch_cb) {
3090 			int choice = GOT_PATCH_CHOICE_NONE;
3091 			err = (*a->patch_cb)(&choice, a->patch_arg,
3092 			    status, ie->path, NULL, 1, 1);
3093 			if (err)
3094 				goto done;
3095 			if (choice != GOT_PATCH_CHOICE_YES)
3096 				break;
3097 		}
3098 		/* fall through */
3099 	case GOT_STATUS_MODIFY:
3100 	case GOT_STATUS_CONFLICT:
3101 	case GOT_STATUS_MISSING: {
3102 		struct got_object_id id;
3103 		if (staged_status == GOT_STATUS_ADD ||
3104 		    staged_status == GOT_STATUS_MODIFY) {
3105 			memcpy(id.sha1, ie->staged_blob_sha1,
3106 			    SHA1_DIGEST_LENGTH);
3107 		} else
3108 			memcpy(id.sha1, ie->blob_sha1,
3109 			    SHA1_DIGEST_LENGTH);
3110 		err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3111 		if (err)
3112 			goto done;
3113 
3114 		if (asprintf(&ondisk_path, "%s/%s",
3115 		    got_worktree_get_root_path(a->worktree), relpath) == -1) {
3116 			err = got_error_from_errno("asprintf");
3117 			goto done;
3118 		}
3119 
3120 		if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3121 		    status == GOT_STATUS_CONFLICT)) {
3122 			err = create_patched_content(&path_content, 1, &id,
3123 			    ondisk_path, ie->path, a->repo,
3124 			    a->patch_cb, a->patch_arg);
3125 			if (err || path_content == NULL)
3126 				break;
3127 			if (rename(path_content, ondisk_path) == -1) {
3128 				err = got_error_from_errno3("rename",
3129 				    path_content, ondisk_path);
3130 				goto done;
3131 			}
3132 		} else {
3133 			err = install_blob(a->worktree, ondisk_path, ie->path,
3134 			    te ? te->mode : GOT_DEFAULT_FILE_MODE,
3135 			    got_fileindex_perms_to_st(ie), blob, 0, 1,
3136 			    a->repo, a->progress_cb, a->progress_arg);
3137 			if (err)
3138 				goto done;
3139 			if (status == GOT_STATUS_DELETE) {
3140 				err = update_blob_fileindex_entry(a->worktree,
3141 				    a->fileindex, ie, ondisk_path, ie->path,
3142 				    blob, 1);
3143 				if (err)
3144 					goto done;
3145 			}
3146 		}
3147 		break;
3148 	}
3149 	default:
3150 		break;
3151 	}
3152 done:
3153 	free(ondisk_path);
3154 	free(path_content);
3155 	free(parent_path);
3156 	free(tree_path);
3157 	if (blob)
3158 		got_object_blob_close(blob);
3159 	if (tree)
3160 		got_object_tree_close(tree);
3161 	free(tree_id);
3162 	return err;
3163 }
3164 
3165 const struct got_error *
3166 got_worktree_revert(struct got_worktree *worktree,
3167     struct got_pathlist_head *paths,
3168     got_worktree_checkout_cb progress_cb, void *progress_arg,
3169     got_worktree_patch_cb patch_cb, void *patch_arg,
3170     struct got_repository *repo)
3171 {
3172 	struct got_fileindex *fileindex = NULL;
3173 	char *fileindex_path = NULL;
3174 	const struct got_error *err = NULL, *unlockerr = NULL;
3175 	const struct got_error *sync_err = NULL;
3176 	struct got_pathlist_entry *pe;
3177 	struct revert_file_args rfa;
3178 
3179 	err = lock_worktree(worktree, LOCK_EX);
3180 	if (err)
3181 		return err;
3182 
3183 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3184 	if (err)
3185 		goto done;
3186 
3187 	rfa.worktree = worktree;
3188 	rfa.fileindex = fileindex;
3189 	rfa.progress_cb = progress_cb;
3190 	rfa.progress_arg = progress_arg;
3191 	rfa.patch_cb = patch_cb;
3192 	rfa.patch_arg = patch_arg;
3193 	rfa.repo = repo;
3194 	TAILQ_FOREACH(pe, paths, entry) {
3195 		err = worktree_status(worktree, pe->path, fileindex, repo,
3196 		    revert_file, &rfa, NULL, NULL);
3197 		if (err)
3198 			break;
3199 	}
3200 	sync_err = sync_fileindex(fileindex, fileindex_path);
3201 	if (sync_err && err == NULL)
3202 		err = sync_err;
3203 done:
3204 	free(fileindex_path);
3205 	if (fileindex)
3206 		got_fileindex_free(fileindex);
3207 	unlockerr = lock_worktree(worktree, LOCK_SH);
3208 	if (unlockerr && err == NULL)
3209 		err = unlockerr;
3210 	return err;
3211 }
3212 
3213 static void
3214 free_commitable(struct got_commitable *ct)
3215 {
3216 	free(ct->path);
3217 	free(ct->in_repo_path);
3218 	free(ct->ondisk_path);
3219 	free(ct->blob_id);
3220 	free(ct->base_blob_id);
3221 	free(ct->staged_blob_id);
3222 	free(ct->base_commit_id);
3223 	free(ct);
3224 }
3225 
3226 struct collect_commitables_arg {
3227 	struct got_pathlist_head *commitable_paths;
3228 	struct got_repository *repo;
3229 	struct got_worktree *worktree;
3230 	int have_staged_files;
3231 };
3232 
3233 static const struct got_error *
3234 collect_commitables(void *arg, unsigned char status,
3235     unsigned char staged_status, const char *relpath,
3236     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3237     struct got_object_id *commit_id)
3238 {
3239 	struct collect_commitables_arg *a = arg;
3240 	const struct got_error *err = NULL;
3241 	struct got_commitable *ct = NULL;
3242 	struct got_pathlist_entry *new = NULL;
3243 	char *parent_path = NULL, *path = NULL;
3244 	struct stat sb;
3245 
3246 	if (a->have_staged_files) {
3247 		if (staged_status != GOT_STATUS_MODIFY &&
3248 		    staged_status != GOT_STATUS_ADD &&
3249 		    staged_status != GOT_STATUS_DELETE)
3250 			return NULL;
3251 	} else {
3252 		if (status == GOT_STATUS_CONFLICT)
3253 			return got_error(GOT_ERR_COMMIT_CONFLICT);
3254 
3255 		if (status != GOT_STATUS_MODIFY &&
3256 		    status != GOT_STATUS_ADD &&
3257 		    status != GOT_STATUS_DELETE)
3258 			return NULL;
3259 	}
3260 
3261 	if (asprintf(&path, "/%s", relpath) == -1) {
3262 		err = got_error_from_errno("asprintf");
3263 		goto done;
3264 	}
3265 	if (strcmp(path, "/") == 0) {
3266 		parent_path = strdup("");
3267 		if (parent_path == NULL)
3268 			return got_error_from_errno("strdup");
3269 	} else {
3270 		err = got_path_dirname(&parent_path, path);
3271 		if (err)
3272 			return err;
3273 	}
3274 
3275 	ct = calloc(1, sizeof(*ct));
3276 	if (ct == NULL) {
3277 		err = got_error_from_errno("calloc");
3278 		goto done;
3279 	}
3280 
3281 	if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3282 	    relpath) == -1) {
3283 		err = got_error_from_errno("asprintf");
3284 		goto done;
3285 	}
3286 	if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3287 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
3288 	} else {
3289 		if (lstat(ct->ondisk_path, &sb) != 0) {
3290 			err = got_error_from_errno2("lstat", ct->ondisk_path);
3291 			goto done;
3292 		}
3293 		ct->mode = sb.st_mode;
3294 	}
3295 
3296 	if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3297 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3298 	    relpath) == -1) {
3299 		err = got_error_from_errno("asprintf");
3300 		goto done;
3301 	}
3302 
3303 	ct->status = status;
3304 	ct->staged_status = staged_status;
3305 	ct->blob_id = NULL; /* will be filled in when blob gets created */
3306 	if (ct->status != GOT_STATUS_ADD &&
3307 	    ct->staged_status != GOT_STATUS_ADD) {
3308 		ct->base_blob_id = got_object_id_dup(blob_id);
3309 		if (ct->base_blob_id == NULL) {
3310 			err = got_error_from_errno("got_object_id_dup");
3311 			goto done;
3312 		}
3313 		ct->base_commit_id = got_object_id_dup(commit_id);
3314 		if (ct->base_commit_id == NULL) {
3315 			err = got_error_from_errno("got_object_id_dup");
3316 			goto done;
3317 		}
3318 	}
3319 	if (ct->staged_status == GOT_STATUS_ADD ||
3320 	    ct->staged_status == GOT_STATUS_MODIFY) {
3321 		ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3322 		if (ct->staged_blob_id == NULL) {
3323 			err = got_error_from_errno("got_object_id_dup");
3324 			goto done;
3325 		}
3326 	}
3327 	ct->path = strdup(path);
3328 	if (ct->path == NULL) {
3329 		err = got_error_from_errno("strdup");
3330 		goto done;
3331 	}
3332 	err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3333 done:
3334 	if (ct && (err || new == NULL))
3335 		free_commitable(ct);
3336 	free(parent_path);
3337 	free(path);
3338 	return err;
3339 }
3340 
3341 static const struct got_error *write_tree(struct got_object_id **,
3342     struct got_tree_object *, const char *, struct got_pathlist_head *,
3343     got_worktree_status_cb status_cb, void *status_arg,
3344     struct got_repository *);
3345 
3346 static const struct got_error *
3347 write_subtree(struct got_object_id **new_subtree_id,
3348     struct got_tree_entry *te, const char *parent_path,
3349     struct got_pathlist_head *commitable_paths,
3350     got_worktree_status_cb status_cb, void *status_arg,
3351     struct got_repository *repo)
3352 {
3353 	const struct got_error *err = NULL;
3354 	struct got_tree_object *subtree;
3355 	char *subpath;
3356 
3357 	if (asprintf(&subpath, "%s%s%s", parent_path,
3358 	    got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3359 		return got_error_from_errno("asprintf");
3360 
3361 	err = got_object_open_as_tree(&subtree, repo, te->id);
3362 	if (err)
3363 		return err;
3364 
3365 	err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3366 	    status_cb, status_arg, repo);
3367 	got_object_tree_close(subtree);
3368 	free(subpath);
3369 	return err;
3370 }
3371 
3372 static const struct got_error *
3373 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3374 {
3375 	const struct got_error *err = NULL;
3376 	char *ct_parent_path = NULL;
3377 
3378 	*match = 0;
3379 
3380 	if (strchr(ct->in_repo_path, '/') == NULL) {
3381 		*match = got_path_is_root_dir(path);
3382 		return NULL;
3383 	}
3384 
3385 	err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3386 	if (err)
3387 		return err;
3388 	*match = (strcmp(path, ct_parent_path) == 0);
3389 	free(ct_parent_path);
3390 	return err;
3391 }
3392 
3393 static mode_t
3394 get_ct_file_mode(struct got_commitable *ct)
3395 {
3396 	return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3397 }
3398 
3399 static const struct got_error *
3400 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3401     struct got_tree_entry *te, struct got_commitable *ct)
3402 {
3403 	const struct got_error *err = NULL;
3404 
3405 	*new_te = NULL;
3406 
3407 	err = got_object_tree_entry_dup(new_te, te);
3408 	if (err)
3409 		goto done;
3410 
3411 	(*new_te)->mode = get_ct_file_mode(ct);
3412 
3413 	free((*new_te)->id);
3414 	if (ct->staged_status == GOT_STATUS_MODIFY)
3415 		(*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3416 	else
3417 		(*new_te)->id = got_object_id_dup(ct->blob_id);
3418 	if ((*new_te)->id == NULL) {
3419 		err = got_error_from_errno("got_object_id_dup");
3420 		goto done;
3421 	}
3422 done:
3423 	if (err && *new_te) {
3424 		got_object_tree_entry_close(*new_te);
3425 		*new_te = NULL;
3426 	}
3427 	return err;
3428 }
3429 
3430 static const struct got_error *
3431 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3432     struct got_commitable *ct)
3433 {
3434 	const struct got_error *err = NULL;
3435 	char *ct_name;
3436 
3437 	 *new_te = NULL;
3438 
3439 	*new_te = calloc(1, sizeof(**new_te));
3440 	if (*new_te == NULL)
3441 		return got_error_from_errno("calloc");
3442 
3443 	ct_name = basename(ct->path);
3444 	if (ct_name == NULL) {
3445 		err = got_error_from_errno2("basename", ct->path);
3446 		goto done;
3447 	}
3448 	(*new_te)->name = strdup(ct_name);
3449 	if ((*new_te)->name == NULL) {
3450 		err = got_error_from_errno("strdup");
3451 		goto done;
3452 	}
3453 
3454 	(*new_te)->mode = get_ct_file_mode(ct);
3455 
3456 	if (ct->staged_status == GOT_STATUS_ADD)
3457 		(*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3458 	else
3459 		(*new_te)->id = got_object_id_dup(ct->blob_id);
3460 	if ((*new_te)->id == NULL) {
3461 		err = got_error_from_errno("got_object_id_dup");
3462 		goto done;
3463 	}
3464 done:
3465 	if (err && *new_te) {
3466 		got_object_tree_entry_close(*new_te);
3467 		*new_te = NULL;
3468 	}
3469 	return err;
3470 }
3471 
3472 static const struct got_error *
3473 insert_tree_entry(struct got_tree_entry *new_te,
3474     struct got_pathlist_head *paths)
3475 {
3476 	const struct got_error *err = NULL;
3477 	struct got_pathlist_entry *new_pe;
3478 
3479 	err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3480 	if (err)
3481 		return err;
3482 	if (new_pe == NULL)
3483 		return got_error(GOT_ERR_TREE_DUP_ENTRY);
3484 	return NULL;
3485 }
3486 
3487 static const struct got_error *
3488 report_ct_status(struct got_commitable *ct,
3489     got_worktree_status_cb status_cb, void *status_arg)
3490 {
3491 	const char *ct_path = ct->path;
3492 	unsigned char status;
3493 
3494 	while (ct_path[0] == '/')
3495 		ct_path++;
3496 
3497 	if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3498 		status = ct->staged_status;
3499 	else
3500 		status = ct->status;
3501 
3502 	return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3503 	    ct_path, ct->blob_id, NULL, NULL);
3504 }
3505 
3506 static const struct got_error *
3507 match_modified_subtree(int *modified, struct got_tree_entry *te,
3508     const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3509 {
3510 	const struct got_error *err = NULL;
3511 	struct got_pathlist_entry *pe;
3512 	char *te_path;
3513 
3514 	*modified = 0;
3515 
3516 	if (asprintf(&te_path, "%s%s%s", base_tree_path,
3517 	    got_path_is_root_dir(base_tree_path) ? "" : "/",
3518 	    te->name) == -1)
3519 		return got_error_from_errno("asprintf");
3520 
3521 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3522 		struct got_commitable *ct = pe->data;
3523 		*modified = got_path_is_child(ct->in_repo_path, te_path,
3524 		    strlen(te_path));
3525 		 if (*modified)
3526 			break;
3527 	}
3528 
3529 	free(te_path);
3530 	return err;
3531 }
3532 
3533 static const struct got_error *
3534 match_deleted_or_modified_ct(struct got_commitable **ctp,
3535     struct got_tree_entry *te, const char *base_tree_path,
3536     struct got_pathlist_head *commitable_paths)
3537 {
3538 	const struct got_error *err = NULL;
3539 	struct got_pathlist_entry *pe;
3540 
3541 	*ctp = NULL;
3542 
3543 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3544 		struct got_commitable *ct = pe->data;
3545 		char *ct_name = NULL;
3546 		int path_matches;
3547 
3548 		if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3549 			if (ct->status != GOT_STATUS_MODIFY &&
3550 			    ct->status != GOT_STATUS_DELETE)
3551 				continue;
3552 		} else {
3553 			if (ct->staged_status != GOT_STATUS_MODIFY &&
3554 			    ct->staged_status != GOT_STATUS_DELETE)
3555 				continue;
3556 		}
3557 
3558 		if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3559 			continue;
3560 
3561 		 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3562 		 if (err)
3563 			return err;
3564 		if (!path_matches)
3565 			continue;
3566 
3567 		ct_name = basename(pe->path);
3568 		if (ct_name == NULL)
3569 			return got_error_from_errno2("basename", pe->path);
3570 
3571 		if (strcmp(te->name, ct_name) != 0)
3572 			continue;
3573 
3574 		*ctp = ct;
3575 		break;
3576 	}
3577 
3578 	return err;
3579 }
3580 
3581 static const struct got_error *
3582 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3583     const char *child_path, const char *path_base_tree,
3584     struct got_pathlist_head *commitable_paths,
3585     got_worktree_status_cb status_cb, void *status_arg,
3586     struct got_repository *repo)
3587 {
3588 	const struct got_error *err = NULL;
3589 	struct got_tree_entry *new_te;
3590 	char *subtree_path;
3591 
3592 	*new_tep = NULL;
3593 
3594 	if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3595 	    got_path_is_root_dir(path_base_tree) ? "" : "/",
3596 	    child_path) == -1)
3597 		return got_error_from_errno("asprintf");
3598 
3599 	new_te = calloc(1, sizeof(*new_te));
3600 	new_te->mode = S_IFDIR;
3601 	new_te->name = strdup(child_path);
3602 	if (new_te->name == NULL) {
3603 		err = got_error_from_errno("strdup");
3604 		got_object_tree_entry_close(new_te);
3605 		goto done;
3606 	}
3607 	err = write_tree(&new_te->id, NULL, subtree_path,
3608 	    commitable_paths, status_cb, status_arg, repo);
3609 	if (err) {
3610 		got_object_tree_entry_close(new_te);
3611 		goto done;
3612 	}
3613 done:
3614 	free(subtree_path);
3615 	if (err == NULL)
3616 		*new_tep = new_te;
3617 	return err;
3618 }
3619 
3620 static const struct got_error *
3621 write_tree(struct got_object_id **new_tree_id,
3622     struct got_tree_object *base_tree, const char *path_base_tree,
3623     struct got_pathlist_head *commitable_paths,
3624     got_worktree_status_cb status_cb, void *status_arg,
3625     struct got_repository *repo)
3626 {
3627 	const struct got_error *err = NULL;
3628 	const struct got_tree_entries *base_entries = NULL;
3629 	struct got_pathlist_head paths;
3630 	struct got_tree_entries new_tree_entries;
3631 	struct got_tree_entry *te, *new_te = NULL;
3632 	struct got_pathlist_entry *pe;
3633 
3634 	TAILQ_INIT(&paths);
3635 	new_tree_entries.nentries = 0;
3636 	SIMPLEQ_INIT(&new_tree_entries.head);
3637 
3638 	/* Insert, and recurse into, newly added entries first. */
3639 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3640 		struct got_commitable *ct = pe->data;
3641 		char *child_path = NULL, *slash;
3642 
3643 		if ((ct->status != GOT_STATUS_ADD &&
3644 		    ct->staged_status != GOT_STATUS_ADD) ||
3645 		    (ct->flags & GOT_COMMITABLE_ADDED))
3646 			continue;
3647 
3648 		 if (!got_path_is_child(pe->path, path_base_tree,
3649 		     strlen(path_base_tree)))
3650 			continue;
3651 
3652 		err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3653 		    pe->path);
3654 		if (err)
3655 			goto done;
3656 
3657 		slash = strchr(child_path, '/');
3658 		if (slash == NULL) {
3659 			err = alloc_added_blob_tree_entry(&new_te, ct);
3660 			if (err)
3661 				goto done;
3662 			err = report_ct_status(ct, status_cb, status_arg);
3663 			if (err)
3664 				goto done;
3665 			ct->flags |= GOT_COMMITABLE_ADDED;
3666 			err = insert_tree_entry(new_te, &paths);
3667 			if (err)
3668 				goto done;
3669 		} else {
3670 			*slash = '\0'; /* trim trailing path components */
3671 			if (base_tree == NULL ||
3672 			    got_object_tree_find_entry(base_tree, child_path)
3673 			    == NULL) {
3674 				err = make_subtree_for_added_blob(&new_te,
3675 				    child_path, path_base_tree,
3676 				    commitable_paths, status_cb, status_arg,
3677 				    repo);
3678 				if (err)
3679 					goto done;
3680 				err = insert_tree_entry(new_te, &paths);
3681 				if (err)
3682 					goto done;
3683 			}
3684 		}
3685 	}
3686 
3687 	if (base_tree) {
3688 		/* Handle modified and deleted entries. */
3689 		base_entries = got_object_tree_get_entries(base_tree);
3690 		SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3691 			struct got_commitable *ct = NULL;
3692 
3693 			if (S_ISDIR(te->mode)) {
3694 				int modified;
3695 				err = got_object_tree_entry_dup(&new_te, te);
3696 				if (err)
3697 					goto done;
3698 				err = match_modified_subtree(&modified, te,
3699 				    path_base_tree, commitable_paths);
3700 				if (err)
3701 					goto done;
3702 				/* Avoid recursion into unmodified subtrees. */
3703 				if (modified) {
3704 					free(new_te->id);
3705 					err = write_subtree(&new_te->id, te,
3706 					    path_base_tree, commitable_paths,
3707 					    status_cb, status_arg, repo);
3708 					if (err)
3709 						goto done;
3710 				}
3711 				err = insert_tree_entry(new_te, &paths);
3712 				if (err)
3713 					goto done;
3714 				continue;
3715 			}
3716 
3717 			err = match_deleted_or_modified_ct(&ct, te,
3718 			    path_base_tree, commitable_paths);
3719 			if (ct) {
3720 				/* NB: Deleted entries get dropped here. */
3721 				if (ct->status == GOT_STATUS_MODIFY ||
3722 				    ct->staged_status == GOT_STATUS_MODIFY) {
3723 					err = alloc_modified_blob_tree_entry(
3724 					    &new_te, te, ct);
3725 					if (err)
3726 						goto done;
3727 					err = insert_tree_entry(new_te, &paths);
3728 					if (err)
3729 						goto done;
3730 				}
3731 				err = report_ct_status(ct, status_cb,
3732 				    status_arg);
3733 				if (err)
3734 					goto done;
3735 			} else {
3736 				/* Entry is unchanged; just copy it. */
3737 				err = got_object_tree_entry_dup(&new_te, te);
3738 				if (err)
3739 					goto done;
3740 				err = insert_tree_entry(new_te, &paths);
3741 				if (err)
3742 					goto done;
3743 			}
3744 		}
3745 	}
3746 
3747 	/* Write new list of entries; deleted entries have been dropped. */
3748 	TAILQ_FOREACH(pe, &paths, entry) {
3749 		struct got_tree_entry *te = pe->data;
3750 		new_tree_entries.nentries++;
3751 		SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3752 	}
3753 	err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3754 done:
3755 	got_object_tree_entries_close(&new_tree_entries);
3756 	got_pathlist_free(&paths);
3757 	return err;
3758 }
3759 
3760 static const struct got_error *
3761 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3762     struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3763 {
3764 	const struct got_error *err = NULL;
3765 	struct got_pathlist_entry *pe;
3766 
3767 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3768 		struct got_fileindex_entry *ie;
3769 		struct got_commitable *ct = pe->data;
3770 
3771 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3772 		if (ie) {
3773 			if (ct->status == GOT_STATUS_DELETE ||
3774 			    ct->staged_status == GOT_STATUS_DELETE) {
3775 				got_fileindex_entry_remove(fileindex, ie);
3776 				got_fileindex_entry_free(ie);
3777 			} else if (ct->staged_status == GOT_STATUS_ADD ||
3778 			    ct->staged_status == GOT_STATUS_MODIFY) {
3779 				got_fileindex_entry_stage_set(ie,
3780 				    GOT_FILEIDX_STAGE_NONE);
3781 				err = got_fileindex_entry_update(ie,
3782 				    ct->ondisk_path, ct->staged_blob_id->sha1,
3783 				    new_base_commit_id->sha1, 1);
3784 			} else
3785 				err = got_fileindex_entry_update(ie,
3786 				    ct->ondisk_path, ct->blob_id->sha1,
3787 				    new_base_commit_id->sha1, 1);
3788 		} else {
3789 			err = got_fileindex_entry_alloc(&ie,
3790 			    ct->ondisk_path, pe->path, ct->blob_id->sha1,
3791 			    new_base_commit_id->sha1);
3792 			if (err)
3793 				break;
3794 			err = got_fileindex_entry_add(fileindex, ie);
3795 			if (err)
3796 				break;
3797 		}
3798 	}
3799 	return err;
3800 }
3801 
3802 
3803 static const struct got_error *
3804 check_out_of_date(const char *in_repo_path, unsigned char status,
3805     unsigned char staged_status, struct got_object_id *base_blob_id,
3806     struct got_object_id *base_commit_id,
3807     struct got_object_id *head_commit_id, struct got_repository *repo,
3808     int ood_errcode)
3809 {
3810 	const struct got_error *err = NULL;
3811 	struct got_object_id *id = NULL;
3812 
3813 	if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
3814 		/* Trivial case: base commit == head commit */
3815 		if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
3816 			return NULL;
3817 		/*
3818 		 * Ensure file content which local changes were based
3819 		 * on matches file content in the branch head.
3820 		 */
3821 		err = got_object_id_by_path(&id, repo, head_commit_id,
3822 		    in_repo_path);
3823 		if (err) {
3824 			if (err->code == GOT_ERR_NO_TREE_ENTRY)
3825 				err = got_error(ood_errcode);
3826 			goto done;
3827 		} else if (got_object_id_cmp(id, base_blob_id) != 0)
3828 			err = got_error(ood_errcode);
3829 	} else {
3830 		/* Require that added files don't exist in the branch head. */
3831 		err = got_object_id_by_path(&id, repo, head_commit_id,
3832 		    in_repo_path);
3833 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3834 			goto done;
3835 		err = id ? got_error(ood_errcode) : NULL;
3836 	}
3837 done:
3838 	free(id);
3839 	return err;
3840 }
3841 
3842 const struct got_error *
3843 commit_worktree(struct got_object_id **new_commit_id,
3844     struct got_pathlist_head *commitable_paths,
3845     struct got_object_id *head_commit_id, struct got_worktree *worktree,
3846     const char *author, const char *committer,
3847     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3848     got_worktree_status_cb status_cb, void *status_arg,
3849     struct got_repository *repo)
3850 {
3851 	const struct got_error *err = NULL, *unlockerr = NULL;
3852 	struct got_pathlist_entry *pe;
3853 	const char *head_ref_name = NULL;
3854 	struct got_commit_object *head_commit = NULL;
3855 	struct got_reference *head_ref2 = NULL;
3856 	struct got_object_id *head_commit_id2 = NULL;
3857 	struct got_tree_object *head_tree = NULL;
3858 	struct got_object_id *new_tree_id = NULL;
3859 	struct got_object_id_queue parent_ids;
3860 	struct got_object_qid *pid = NULL;
3861 	char *logmsg = NULL;
3862 
3863 	*new_commit_id = NULL;
3864 
3865 	SIMPLEQ_INIT(&parent_ids);
3866 
3867 	err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3868 	if (err)
3869 		goto done;
3870 
3871 	err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3872 	if (err)
3873 		goto done;
3874 
3875 	if (commit_msg_cb != NULL) {
3876 		err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3877 		if (err)
3878 			goto done;
3879 	}
3880 
3881 	if (logmsg == NULL || strlen(logmsg) == 0) {
3882 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3883 		goto done;
3884 	}
3885 
3886 	/* Create blobs from added and modified files and record their IDs. */
3887 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3888 		struct got_commitable *ct = pe->data;
3889 		char *ondisk_path;
3890 
3891 		/* Blobs for staged files already exist. */
3892 		if (ct->staged_status == GOT_STATUS_ADD ||
3893 		    ct->staged_status == GOT_STATUS_MODIFY)
3894 			continue;
3895 
3896 		if (ct->status != GOT_STATUS_ADD &&
3897 		    ct->status != GOT_STATUS_MODIFY)
3898 			continue;
3899 
3900 		if (asprintf(&ondisk_path, "%s/%s",
3901 		    worktree->root_path, pe->path) == -1) {
3902 			err = got_error_from_errno("asprintf");
3903 			goto done;
3904 		}
3905 		err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3906 		free(ondisk_path);
3907 		if (err)
3908 			goto done;
3909 	}
3910 
3911 	/* Recursively write new tree objects. */
3912 	err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3913 	    status_cb, status_arg, repo);
3914 	if (err)
3915 		goto done;
3916 
3917 	err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3918 	if (err)
3919 		goto done;
3920 	SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3921 	err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3922 	    1, author, time(NULL), committer, time(NULL), logmsg, repo);
3923 	got_object_qid_free(pid);
3924 	if (logmsg != NULL)
3925 		free(logmsg);
3926 	if (err)
3927 		goto done;
3928 
3929 	/* Check if a concurrent commit to our branch has occurred. */
3930 	head_ref_name = got_worktree_get_head_ref_name(worktree);
3931 	if (head_ref_name == NULL) {
3932 		err = got_error_from_errno("got_worktree_get_head_ref_name");
3933 		goto done;
3934 	}
3935 	/* Lock the reference here to prevent concurrent modification. */
3936 	err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3937 	if (err)
3938 		goto done;
3939 	err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3940 	if (err)
3941 		goto done;
3942 	if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3943 		err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3944 		goto done;
3945 	}
3946 	/* Update branch head in repository. */
3947 	err = got_ref_change_ref(head_ref2, *new_commit_id);
3948 	if (err)
3949 		goto done;
3950 	err = got_ref_write(head_ref2, repo);
3951 	if (err)
3952 		goto done;
3953 
3954 	err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3955 	if (err)
3956 		goto done;
3957 
3958 	err = ref_base_commit(worktree, repo);
3959 	if (err)
3960 		goto done;
3961 done:
3962 	if (head_tree)
3963 		got_object_tree_close(head_tree);
3964 	if (head_commit)
3965 		got_object_commit_close(head_commit);
3966 	free(head_commit_id2);
3967 	if (head_ref2) {
3968 		unlockerr = got_ref_unlock(head_ref2);
3969 		if (unlockerr && err == NULL)
3970 			err = unlockerr;
3971 		got_ref_close(head_ref2);
3972 	}
3973 	return err;
3974 }
3975 
3976 static const struct got_error *
3977 check_path_is_commitable(const char *path,
3978     struct got_pathlist_head *commitable_paths)
3979 {
3980 	struct got_pathlist_entry *cpe = NULL;
3981 	size_t path_len = strlen(path);
3982 
3983 	TAILQ_FOREACH(cpe, commitable_paths, entry) {
3984 		struct got_commitable *ct = cpe->data;
3985 		const char *ct_path = ct->path;
3986 
3987 		while (ct_path[0] == '/')
3988 			ct_path++;
3989 
3990 		if (strcmp(path, ct_path) == 0 ||
3991 		    got_path_is_child(ct_path, path, path_len))
3992 			break;
3993 	}
3994 
3995 	if (cpe == NULL)
3996 		return got_error_path(path, GOT_ERR_BAD_PATH);
3997 
3998 	return NULL;
3999 }
4000 
4001 static const struct got_error *
4002 check_staged_file(void *arg, struct got_fileindex_entry *ie)
4003 {
4004 	int *have_staged_files = arg;
4005 
4006 	if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4007 		*have_staged_files = 1;
4008 		return got_error(GOT_ERR_CANCELLED);
4009 	}
4010 
4011 	return NULL;
4012 }
4013 
4014 static const struct got_error *
4015 check_non_staged_files(struct got_fileindex *fileindex,
4016     struct got_pathlist_head *paths)
4017 {
4018 	struct got_pathlist_entry *pe;
4019 	struct got_fileindex_entry *ie;
4020 
4021 	TAILQ_FOREACH(pe, paths, entry) {
4022 		if (pe->path[0] == '\0')
4023 			continue;
4024 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4025 		if (ie == NULL)
4026 			return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4027 		if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4028 			return got_error_path(pe->path,
4029 			    GOT_ERR_FILE_NOT_STAGED);
4030 	}
4031 
4032 	return NULL;
4033 }
4034 
4035 const struct got_error *
4036 got_worktree_commit(struct got_object_id **new_commit_id,
4037     struct got_worktree *worktree, struct got_pathlist_head *paths,
4038     const char *author, const char *committer,
4039     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4040     got_worktree_status_cb status_cb, void *status_arg,
4041     struct got_repository *repo)
4042 {
4043 	const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4044 	struct got_fileindex *fileindex = NULL;
4045 	char *fileindex_path = NULL;
4046 	struct got_pathlist_head commitable_paths;
4047 	struct collect_commitables_arg cc_arg;
4048 	struct got_pathlist_entry *pe;
4049 	struct got_reference *head_ref = NULL;
4050 	struct got_object_id *head_commit_id = NULL;
4051 	int have_staged_files = 0;
4052 
4053 	*new_commit_id = NULL;
4054 
4055 	TAILQ_INIT(&commitable_paths);
4056 
4057 	err = lock_worktree(worktree, LOCK_EX);
4058 	if (err)
4059 		goto done;
4060 
4061 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4062 	if (err)
4063 		goto done;
4064 
4065 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
4066 	if (err)
4067 		goto done;
4068 
4069 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4070 	if (err)
4071 		goto done;
4072 
4073 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4074 	    &have_staged_files);
4075 	if (err && err->code != GOT_ERR_CANCELLED)
4076 		goto done;
4077 	if (have_staged_files) {
4078 		err = check_non_staged_files(fileindex, paths);
4079 		if (err)
4080 			goto done;
4081 	}
4082 
4083 	cc_arg.commitable_paths = &commitable_paths;
4084 	cc_arg.worktree = worktree;
4085 	cc_arg.repo = repo;
4086 	cc_arg.have_staged_files = have_staged_files;
4087 	TAILQ_FOREACH(pe, paths, entry) {
4088 		err = worktree_status(worktree, pe->path, fileindex, repo,
4089 		    collect_commitables, &cc_arg, NULL, NULL);
4090 		if (err)
4091 			goto done;
4092 	}
4093 
4094 	if (TAILQ_EMPTY(&commitable_paths)) {
4095 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4096 		goto done;
4097 	}
4098 
4099 	TAILQ_FOREACH(pe, paths, entry) {
4100 		err = check_path_is_commitable(pe->path, &commitable_paths);
4101 		if (err)
4102 			goto done;
4103 	}
4104 
4105 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
4106 		struct got_commitable *ct = pe->data;
4107 		const char *ct_path = ct->in_repo_path;
4108 
4109 		while (ct_path[0] == '/')
4110 			ct_path++;
4111 		err = check_out_of_date(ct_path, ct->status,
4112 		    ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4113 		    head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4114 		if (err)
4115 			goto done;
4116 
4117 	}
4118 
4119 	err = commit_worktree(new_commit_id, &commitable_paths,
4120 	    head_commit_id, worktree, author, committer,
4121 	    commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4122 	if (err)
4123 		goto done;
4124 
4125 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4126 	    fileindex);
4127 	sync_err = sync_fileindex(fileindex, fileindex_path);
4128 	if (sync_err && err == NULL)
4129 		err = sync_err;
4130 done:
4131 	if (fileindex)
4132 		got_fileindex_free(fileindex);
4133 	free(fileindex_path);
4134 	unlockerr = lock_worktree(worktree, LOCK_SH);
4135 	if (unlockerr && err == NULL)
4136 		err = unlockerr;
4137 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
4138 		struct got_commitable *ct = pe->data;
4139 		free_commitable(ct);
4140 	}
4141 	got_pathlist_free(&commitable_paths);
4142 	return err;
4143 }
4144 
4145 const char *
4146 got_commitable_get_path(struct got_commitable *ct)
4147 {
4148 	return ct->path;
4149 }
4150 
4151 unsigned int
4152 got_commitable_get_status(struct got_commitable *ct)
4153 {
4154 	return ct->status;
4155 }
4156 
4157 struct check_rebase_ok_arg {
4158 	struct got_worktree *worktree;
4159 	struct got_repository *repo;
4160 };
4161 
4162 static const struct got_error *
4163 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4164 {
4165 	const struct got_error *err = NULL;
4166 	struct check_rebase_ok_arg *a = arg;
4167 	unsigned char status;
4168 	struct stat sb;
4169 	char *ondisk_path;
4170 
4171 	/* Reject rebase of a work tree with mixed base commits. */
4172 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4173 	    SHA1_DIGEST_LENGTH))
4174 		return got_error(GOT_ERR_MIXED_COMMITS);
4175 
4176 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4177 	    == -1)
4178 		return got_error_from_errno("asprintf");
4179 
4180 	/* Reject rebase of a work tree with modified or staged files. */
4181 	err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
4182 	free(ondisk_path);
4183 	if (err)
4184 		return err;
4185 
4186 	if (status != GOT_STATUS_NO_CHANGE)
4187 		return got_error(GOT_ERR_MODIFIED);
4188 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4189 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4190 
4191 	return NULL;
4192 }
4193 
4194 const struct got_error *
4195 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4196     struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4197     struct got_worktree *worktree, struct got_reference *branch,
4198     struct got_repository *repo)
4199 {
4200 	const struct got_error *err = NULL;
4201 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4202 	char *branch_ref_name = NULL;
4203 	char *fileindex_path = NULL;
4204 	struct check_rebase_ok_arg ok_arg;
4205 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4206 
4207 	*new_base_branch_ref = NULL;
4208 	*tmp_branch = NULL;
4209 	*fileindex = NULL;
4210 
4211 	err = lock_worktree(worktree, LOCK_EX);
4212 	if (err)
4213 		return err;
4214 
4215 	err = open_fileindex(fileindex, &fileindex_path, worktree);
4216 	if (err)
4217 		goto done;
4218 
4219 	ok_arg.worktree = worktree;
4220 	ok_arg.repo = repo;
4221 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4222 	    &ok_arg);
4223 	if (err)
4224 		goto done;
4225 
4226 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4227 	if (err)
4228 		goto done;
4229 
4230 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4231 	if (err)
4232 		goto done;
4233 
4234 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4235 	if (err)
4236 		goto done;
4237 
4238 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4239 	    0);
4240 	if (err)
4241 		goto done;
4242 
4243 	err = got_ref_alloc_symref(new_base_branch_ref,
4244 	    new_base_branch_ref_name, wt_branch);
4245 	if (err)
4246 		goto done;
4247 	err = got_ref_write(*new_base_branch_ref, repo);
4248 	if (err)
4249 		goto done;
4250 
4251 	/* TODO Lock original branch's ref while rebasing? */
4252 
4253 	err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4254 	if (err)
4255 		goto done;
4256 
4257 	err = got_ref_write(branch_ref, repo);
4258 	if (err)
4259 		goto done;
4260 
4261 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
4262 	    worktree->base_commit_id);
4263 	if (err)
4264 		goto done;
4265 	err = got_ref_write(*tmp_branch, repo);
4266 	if (err)
4267 		goto done;
4268 
4269 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
4270 	if (err)
4271 		goto done;
4272 done:
4273 	free(fileindex_path);
4274 	free(tmp_branch_name);
4275 	free(new_base_branch_ref_name);
4276 	free(branch_ref_name);
4277 	if (branch_ref)
4278 		got_ref_close(branch_ref);
4279 	if (wt_branch)
4280 		got_ref_close(wt_branch);
4281 	if (err) {
4282 		if (*new_base_branch_ref) {
4283 			got_ref_close(*new_base_branch_ref);
4284 			*new_base_branch_ref = NULL;
4285 		}
4286 		if (*tmp_branch) {
4287 			got_ref_close(*tmp_branch);
4288 			*tmp_branch = NULL;
4289 		}
4290 		if (*fileindex) {
4291 			got_fileindex_free(*fileindex);
4292 			*fileindex = NULL;
4293 		}
4294 		lock_worktree(worktree, LOCK_SH);
4295 	}
4296 	return err;
4297 }
4298 
4299 const struct got_error *
4300 got_worktree_rebase_continue(struct got_object_id **commit_id,
4301     struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4302     struct got_reference **branch, struct got_fileindex **fileindex,
4303     struct got_worktree *worktree, struct got_repository *repo)
4304 {
4305 	const struct got_error *err;
4306 	char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4307 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4308 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4309 	char *fileindex_path = NULL;
4310 	int have_staged_files = 0;
4311 
4312 	*commit_id = NULL;
4313 	*new_base_branch = NULL;
4314 	*tmp_branch = NULL;
4315 	*branch = NULL;
4316 	*fileindex = NULL;
4317 
4318 	err = lock_worktree(worktree, LOCK_EX);
4319 	if (err)
4320 		return err;
4321 
4322 	err = open_fileindex(fileindex, &fileindex_path, worktree);
4323 	if (err)
4324 		goto done;
4325 
4326 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4327 	    &have_staged_files);
4328 	if (err && err->code != GOT_ERR_CANCELLED)
4329 		goto done;
4330 	if (have_staged_files) {
4331 		err = got_error(GOT_ERR_STAGED_PATHS);
4332 		goto done;
4333 	}
4334 
4335 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4336 	if (err)
4337 		goto done;
4338 
4339 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4340 	if (err)
4341 		goto done;
4342 
4343 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4344 	if (err)
4345 		goto done;
4346 
4347 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4348 	if (err)
4349 		goto done;
4350 
4351 	err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4352 	if (err)
4353 		goto done;
4354 
4355 	err = got_ref_open(branch, repo,
4356 	    got_ref_get_symref_target(branch_ref), 0);
4357 	if (err)
4358 		goto done;
4359 
4360 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4361 	if (err)
4362 		goto done;
4363 
4364 	err = got_ref_resolve(commit_id, repo, commit_ref);
4365 	if (err)
4366 		goto done;
4367 
4368 	err = got_ref_open(new_base_branch, repo,
4369 	    new_base_branch_ref_name, 0);
4370 	if (err)
4371 		goto done;
4372 
4373 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4374 	if (err)
4375 		goto done;
4376 done:
4377 	free(commit_ref_name);
4378 	free(branch_ref_name);
4379 	free(fileindex_path);
4380 	if (commit_ref)
4381 		got_ref_close(commit_ref);
4382 	if (branch_ref)
4383 		got_ref_close(branch_ref);
4384 	if (err) {
4385 		free(*commit_id);
4386 		*commit_id = NULL;
4387 		if (*tmp_branch) {
4388 			got_ref_close(*tmp_branch);
4389 			*tmp_branch = NULL;
4390 		}
4391 		if (*new_base_branch) {
4392 			got_ref_close(*new_base_branch);
4393 			*new_base_branch = NULL;
4394 		}
4395 		if (*branch) {
4396 			got_ref_close(*branch);
4397 			*branch = NULL;
4398 		}
4399 		if (*fileindex) {
4400 			got_fileindex_free(*fileindex);
4401 			*fileindex = NULL;
4402 		}
4403 		lock_worktree(worktree, LOCK_SH);
4404 	}
4405 	return err;
4406 }
4407 
4408 const struct got_error *
4409 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4410 {
4411 	const struct got_error *err;
4412 	char *tmp_branch_name = NULL;
4413 
4414 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4415 	if (err)
4416 		return err;
4417 
4418 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4419 	free(tmp_branch_name);
4420 	return NULL;
4421 }
4422 
4423 static const struct got_error *
4424 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4425     char **logmsg, void *arg)
4426 {
4427 	*logmsg = arg;
4428 	return NULL;
4429 }
4430 
4431 static const struct got_error *
4432 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4433     const char *path, struct got_object_id *blob_id,
4434     struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
4435 {
4436 	return NULL;
4437 }
4438 
4439 struct collect_merged_paths_arg {
4440 	got_worktree_checkout_cb progress_cb;
4441 	void *progress_arg;
4442 	struct got_pathlist_head *merged_paths;
4443 };
4444 
4445 static const struct got_error *
4446 collect_merged_paths(void *arg, unsigned char status, const char *path)
4447 {
4448 	const struct got_error *err;
4449 	struct collect_merged_paths_arg *a = arg;
4450 	char *p;
4451 	struct got_pathlist_entry *new;
4452 
4453 	err = (*a->progress_cb)(a->progress_arg, status, path);
4454 	if (err)
4455 		return err;
4456 
4457 	if (status != GOT_STATUS_MERGE &&
4458 	    status != GOT_STATUS_ADD &&
4459 	    status != GOT_STATUS_DELETE &&
4460 	    status != GOT_STATUS_CONFLICT)
4461 		return NULL;
4462 
4463 	p = strdup(path);
4464 	if (p == NULL)
4465 		return got_error_from_errno("strdup");
4466 
4467 	err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4468 	if (err || new == NULL)
4469 		free(p);
4470 	return err;
4471 }
4472 
4473 void
4474 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4475 {
4476 	struct got_pathlist_entry *pe;
4477 
4478 	TAILQ_FOREACH(pe, merged_paths, entry)
4479 		free((char *)pe->path);
4480 
4481 	got_pathlist_free(merged_paths);
4482 }
4483 
4484 static const struct got_error *
4485 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4486     struct got_repository *repo)
4487 {
4488 	const struct got_error *err;
4489 	struct got_reference *commit_ref = NULL;
4490 
4491 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4492 	if (err) {
4493 		if (err->code != GOT_ERR_NOT_REF)
4494 			goto done;
4495 		err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4496 		if (err)
4497 			goto done;
4498 		err = got_ref_write(commit_ref, repo);
4499 		if (err)
4500 			goto done;
4501 	} else {
4502 		struct got_object_id *stored_id;
4503 		int cmp;
4504 
4505 		err = got_ref_resolve(&stored_id, repo, commit_ref);
4506 		if (err)
4507 			goto done;
4508 		cmp = got_object_id_cmp(commit_id, stored_id);
4509 		free(stored_id);
4510 		if (cmp != 0) {
4511 			err = got_error(GOT_ERR_REBASE_COMMITID);
4512 			goto done;
4513 		}
4514 	}
4515 done:
4516 	if (commit_ref)
4517 		got_ref_close(commit_ref);
4518 	return err;
4519 }
4520 
4521 static const struct got_error *
4522 rebase_merge_files(struct got_pathlist_head *merged_paths,
4523     const char *commit_ref_name, struct got_worktree *worktree,
4524     struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4525     struct got_object_id *commit_id, struct got_repository *repo,
4526     got_worktree_checkout_cb progress_cb, void *progress_arg,
4527     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4528 {
4529 	const struct got_error *err;
4530 	struct got_reference *commit_ref = NULL;
4531 	struct collect_merged_paths_arg cmp_arg;
4532 	char *fileindex_path;
4533 
4534 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
4535 
4536 	err = get_fileindex_path(&fileindex_path, worktree);
4537 	if (err)
4538 		return err;
4539 
4540 	cmp_arg.progress_cb = progress_cb;
4541 	cmp_arg.progress_arg = progress_arg;
4542 	cmp_arg.merged_paths = merged_paths;
4543 	err = merge_files(worktree, fileindex, fileindex_path,
4544 	    parent_commit_id, commit_id, repo, collect_merged_paths,
4545 	    &cmp_arg, cancel_cb, cancel_arg);
4546 	if (commit_ref)
4547 		got_ref_close(commit_ref);
4548 	return err;
4549 }
4550 
4551 const struct got_error *
4552 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4553     struct got_worktree *worktree, struct got_fileindex *fileindex,
4554     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4555     struct got_repository *repo,
4556     got_worktree_checkout_cb progress_cb, void *progress_arg,
4557     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4558 {
4559 	const struct got_error *err;
4560 	char *commit_ref_name;
4561 
4562 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4563 	if (err)
4564 		return err;
4565 
4566 	err = store_commit_id(commit_ref_name, commit_id, repo);
4567 	if (err)
4568 		goto done;
4569 
4570 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4571 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
4572 	    progress_arg, cancel_cb, cancel_arg);
4573 done:
4574 	free(commit_ref_name);
4575 	return err;
4576 }
4577 
4578 const struct got_error *
4579 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4580     struct got_worktree *worktree, struct got_fileindex *fileindex,
4581     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4582     struct got_repository *repo,
4583     got_worktree_checkout_cb progress_cb, void *progress_arg,
4584     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4585 {
4586 	const struct got_error *err;
4587 	char *commit_ref_name;
4588 
4589 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4590 	if (err)
4591 		return err;
4592 
4593 	err = store_commit_id(commit_ref_name, commit_id, repo);
4594 	if (err)
4595 		goto done;
4596 
4597 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4598 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
4599 	    progress_arg, cancel_cb, cancel_arg);
4600 done:
4601 	free(commit_ref_name);
4602 	return err;
4603 }
4604 
4605 static const struct got_error *
4606 rebase_commit(struct got_object_id **new_commit_id,
4607     struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4608     struct got_worktree *worktree, struct got_fileindex *fileindex,
4609     struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4610     const char *new_logmsg, struct got_repository *repo)
4611 {
4612 	const struct got_error *err, *sync_err;
4613 	struct got_pathlist_head commitable_paths;
4614 	struct collect_commitables_arg cc_arg;
4615 	char *fileindex_path = NULL;
4616 	struct got_reference *head_ref = NULL;
4617 	struct got_object_id *head_commit_id = NULL;
4618 	char *logmsg = NULL;
4619 
4620 	TAILQ_INIT(&commitable_paths);
4621 	*new_commit_id = NULL;
4622 
4623 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
4624 
4625 	err = get_fileindex_path(&fileindex_path, worktree);
4626 	if (err)
4627 		return err;
4628 
4629 	cc_arg.commitable_paths = &commitable_paths;
4630 	cc_arg.worktree = worktree;
4631 	cc_arg.repo = repo;
4632 	cc_arg.have_staged_files = 0;
4633 	/*
4634 	 * If possible get the status of individual files directly to
4635 	 * avoid crawling the entire work tree once per rebased commit.
4636 	 * TODO: Ideally, merged_paths would contain a list of commitables
4637 	 * we could use so we could skip worktree_status() entirely.
4638 	 */
4639 	if (merged_paths) {
4640 		struct got_pathlist_entry *pe;
4641 		if (TAILQ_EMPTY(merged_paths)) {
4642 			err = got_error(GOT_ERR_NO_MERGED_PATHS);
4643 			goto done;
4644 		}
4645 		TAILQ_FOREACH(pe, merged_paths, entry) {
4646 			err = worktree_status(worktree, pe->path, fileindex,
4647 			    repo, collect_commitables, &cc_arg, NULL, NULL);
4648 			if (err)
4649 				goto done;
4650 		}
4651 	} else {
4652 		err = worktree_status(worktree, "", fileindex, repo,
4653 		    collect_commitables, &cc_arg, NULL, NULL);
4654 		if (err)
4655 			goto done;
4656 	}
4657 
4658 	if (TAILQ_EMPTY(&commitable_paths)) {
4659 		/* No-op change; commit will be elided. */
4660 		err = got_ref_delete(commit_ref, repo);
4661 		if (err)
4662 			goto done;
4663 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4664 		goto done;
4665 	}
4666 
4667 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4668 	if (err)
4669 		goto done;
4670 
4671 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
4672 	if (err)
4673 		goto done;
4674 
4675 	if (new_logmsg)
4676 		logmsg = strdup(new_logmsg);
4677 	else
4678 		logmsg = strdup(got_object_commit_get_logmsg(orig_commit));
4679 	if (logmsg == NULL)
4680 		return got_error_from_errno("strdup");
4681 
4682 	err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4683 	    worktree, got_object_commit_get_author(orig_commit),
4684 	    got_object_commit_get_committer(orig_commit),
4685 	    collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4686 	if (err)
4687 		goto done;
4688 
4689 	err = got_ref_change_ref(tmp_branch, *new_commit_id);
4690 	if (err)
4691 		goto done;
4692 
4693 	err = got_ref_delete(commit_ref, repo);
4694 	if (err)
4695 		goto done;
4696 
4697 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4698 	    fileindex);
4699 	sync_err = sync_fileindex(fileindex, fileindex_path);
4700 	if (sync_err && err == NULL)
4701 		err = sync_err;
4702 done:
4703 	free(fileindex_path);
4704 	free(head_commit_id);
4705 	if (head_ref)
4706 		got_ref_close(head_ref);
4707 	if (err) {
4708 		free(*new_commit_id);
4709 		*new_commit_id = NULL;
4710 	}
4711 	return err;
4712 }
4713 
4714 const struct got_error *
4715 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4716     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4717     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4718     struct got_commit_object *orig_commit,
4719     struct got_object_id *orig_commit_id, struct got_repository *repo)
4720 {
4721 	const struct got_error *err;
4722 	char *commit_ref_name;
4723 	struct got_reference *commit_ref = NULL;
4724 	struct got_object_id *commit_id = NULL;
4725 
4726 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4727 	if (err)
4728 		return err;
4729 
4730 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4731 	if (err)
4732 		goto done;
4733 	err = got_ref_resolve(&commit_id, repo, commit_ref);
4734 	if (err)
4735 		goto done;
4736 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4737 		err = got_error(GOT_ERR_REBASE_COMMITID);
4738 		goto done;
4739 	}
4740 
4741 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4742 	    worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4743 done:
4744 	if (commit_ref)
4745 		got_ref_close(commit_ref);
4746 	free(commit_ref_name);
4747 	free(commit_id);
4748 	return err;
4749 }
4750 
4751 const struct got_error *
4752 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4753     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4754     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4755     struct got_commit_object *orig_commit,
4756     struct got_object_id *orig_commit_id, const char *new_logmsg,
4757     struct got_repository *repo)
4758 {
4759 	const struct got_error *err;
4760 	char *commit_ref_name;
4761 	struct got_reference *commit_ref = NULL;
4762 	struct got_object_id *commit_id = NULL;
4763 
4764 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4765 	if (err)
4766 		return err;
4767 
4768 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4769 	if (err)
4770 		goto done;
4771 	err = got_ref_resolve(&commit_id, repo, commit_ref);
4772 	if (err)
4773 		goto done;
4774 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4775 		err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4776 		goto done;
4777 	}
4778 
4779 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4780 	    worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4781 done:
4782 	if (commit_ref)
4783 		got_ref_close(commit_ref);
4784 	free(commit_ref_name);
4785 	free(commit_id);
4786 	return err;
4787 }
4788 
4789 const struct got_error *
4790 got_worktree_rebase_postpone(struct got_worktree *worktree,
4791     struct got_fileindex *fileindex)
4792 {
4793 	if (fileindex)
4794 		got_fileindex_free(fileindex);
4795 	return lock_worktree(worktree, LOCK_SH);
4796 }
4797 
4798 static const struct got_error *
4799 delete_ref(const char *name, struct got_repository *repo)
4800 {
4801 	const struct got_error *err;
4802 	struct got_reference *ref;
4803 
4804 	err = got_ref_open(&ref, repo, name, 0);
4805 	if (err) {
4806 		if (err->code == GOT_ERR_NOT_REF)
4807 			return NULL;
4808 		return err;
4809 	}
4810 
4811 	err = got_ref_delete(ref, repo);
4812 	got_ref_close(ref);
4813 	return err;
4814 }
4815 
4816 static const struct got_error *
4817 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4818 {
4819 	const struct got_error *err;
4820 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4821 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
4822 
4823 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4824 	if (err)
4825 		goto done;
4826 	err = delete_ref(tmp_branch_name, repo);
4827 	if (err)
4828 		goto done;
4829 
4830 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4831 	if (err)
4832 		goto done;
4833 	err = delete_ref(new_base_branch_ref_name, repo);
4834 	if (err)
4835 		goto done;
4836 
4837 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4838 	if (err)
4839 		goto done;
4840 	err = delete_ref(branch_ref_name, repo);
4841 	if (err)
4842 		goto done;
4843 
4844 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4845 	if (err)
4846 		goto done;
4847 	err = delete_ref(commit_ref_name, repo);
4848 	if (err)
4849 		goto done;
4850 
4851 done:
4852 	free(tmp_branch_name);
4853 	free(new_base_branch_ref_name);
4854 	free(branch_ref_name);
4855 	free(commit_ref_name);
4856 	return err;
4857 }
4858 
4859 const struct got_error *
4860 got_worktree_rebase_complete(struct got_worktree *worktree,
4861     struct got_fileindex *fileindex, struct got_reference *new_base_branch,
4862     struct got_reference *tmp_branch, struct got_reference *rebased_branch,
4863     struct got_repository *repo)
4864 {
4865 	const struct got_error *err, *unlockerr;
4866 	struct got_object_id *new_head_commit_id = NULL;
4867 
4868 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4869 	if (err)
4870 		return err;
4871 
4872 	err = got_ref_change_ref(rebased_branch, new_head_commit_id);
4873 	if (err)
4874 		goto done;
4875 
4876 	err = got_ref_write(rebased_branch, repo);
4877 	if (err)
4878 		goto done;
4879 
4880 	err = got_worktree_set_head_ref(worktree, rebased_branch);
4881 	if (err)
4882 		goto done;
4883 
4884 	err = delete_rebase_refs(worktree, repo);
4885 done:
4886 	if (fileindex)
4887 		got_fileindex_free(fileindex);
4888 	free(new_head_commit_id);
4889 	unlockerr = lock_worktree(worktree, LOCK_SH);
4890 	if (unlockerr && err == NULL)
4891 		err = unlockerr;
4892 	return err;
4893 }
4894 
4895 const struct got_error *
4896 got_worktree_rebase_abort(struct got_worktree *worktree,
4897     struct got_fileindex *fileindex, struct got_repository *repo,
4898     struct got_reference *new_base_branch,
4899      got_worktree_checkout_cb progress_cb, void *progress_arg)
4900 {
4901 	const struct got_error *err, *unlockerr, *sync_err;
4902 	struct got_reference *resolved = NULL;
4903 	struct got_object_id *commit_id = NULL;
4904 	char *fileindex_path = NULL;
4905 	struct revert_file_args rfa;
4906 	struct got_object_id *tree_id = NULL;
4907 
4908 	err = lock_worktree(worktree, LOCK_EX);
4909 	if (err)
4910 		return err;
4911 
4912 	err = got_ref_open(&resolved, repo,
4913 	    got_ref_get_symref_target(new_base_branch), 0);
4914 	if (err)
4915 		goto done;
4916 
4917 	err = got_worktree_set_head_ref(worktree, resolved);
4918 	if (err)
4919 		goto done;
4920 
4921 	/*
4922 	 * XXX commits to the base branch could have happened while
4923 	 * we were busy rebasing; should we store the original commit ID
4924 	 * when rebase begins and read it back here?
4925 	 */
4926 	err = got_ref_resolve(&commit_id, repo, resolved);
4927 	if (err)
4928 		goto done;
4929 
4930 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4931 	if (err)
4932 		goto done;
4933 
4934 	err = got_object_id_by_path(&tree_id, repo,
4935 	    worktree->base_commit_id, worktree->path_prefix);
4936 	if (err)
4937 		goto done;
4938 
4939 	err = delete_rebase_refs(worktree, repo);
4940 	if (err)
4941 		goto done;
4942 
4943 	err = get_fileindex_path(&fileindex_path, worktree);
4944 	if (err)
4945 		goto done;
4946 
4947 	rfa.worktree = worktree;
4948 	rfa.fileindex = fileindex;
4949 	rfa.progress_cb = progress_cb;
4950 	rfa.progress_arg = progress_arg;
4951 	rfa.patch_cb = NULL;
4952 	rfa.patch_arg = NULL;
4953 	rfa.repo = repo;
4954 	err = worktree_status(worktree, "", fileindex, repo,
4955 	    revert_file, &rfa, NULL, NULL);
4956 	if (err)
4957 		goto sync;
4958 
4959 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4960 	    repo, progress_cb, progress_arg, NULL, NULL);
4961 sync:
4962 	sync_err = sync_fileindex(fileindex, fileindex_path);
4963 	if (sync_err && err == NULL)
4964 		err = sync_err;
4965 done:
4966 	got_ref_close(resolved);
4967 	free(tree_id);
4968 	free(commit_id);
4969 	if (fileindex)
4970 		got_fileindex_free(fileindex);
4971 	free(fileindex_path);
4972 
4973 	unlockerr = lock_worktree(worktree, LOCK_SH);
4974 	if (unlockerr && err == NULL)
4975 		err = unlockerr;
4976 	return err;
4977 }
4978 
4979 const struct got_error *
4980 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
4981     struct got_reference **branch_ref, struct got_object_id **base_commit_id,
4982     struct got_fileindex **fileindex, struct got_worktree *worktree,
4983     struct got_repository *repo)
4984 {
4985 	const struct got_error *err = NULL;
4986 	char *tmp_branch_name = NULL;
4987 	char *branch_ref_name = NULL;
4988 	char *base_commit_ref_name = NULL;
4989 	char *fileindex_path = NULL;
4990 	struct check_rebase_ok_arg ok_arg;
4991 	struct got_reference *wt_branch = NULL;
4992 	struct got_reference *base_commit_ref = NULL;
4993 
4994 	*tmp_branch = NULL;
4995 	*branch_ref = NULL;
4996 	*base_commit_id = NULL;
4997 	*fileindex = NULL;
4998 
4999 	err = lock_worktree(worktree, LOCK_EX);
5000 	if (err)
5001 		return err;
5002 
5003 	err = open_fileindex(fileindex, &fileindex_path, worktree);
5004 	if (err)
5005 		goto done;
5006 
5007 	ok_arg.worktree = worktree;
5008 	ok_arg.repo = repo;
5009 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5010 	    &ok_arg);
5011 	if (err)
5012 		goto done;
5013 
5014 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5015 	if (err)
5016 		goto done;
5017 
5018 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5019 	if (err)
5020 		goto done;
5021 
5022 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5023 	    worktree);
5024 	if (err)
5025 		goto done;
5026 
5027 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5028 	    0);
5029 	if (err)
5030 		goto done;
5031 
5032 	err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5033 	if (err)
5034 		goto done;
5035 
5036 	err = got_ref_write(*branch_ref, repo);
5037 	if (err)
5038 		goto done;
5039 
5040 	err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5041 	    worktree->base_commit_id);
5042 	if (err)
5043 		goto done;
5044 	err = got_ref_write(base_commit_ref, repo);
5045 	if (err)
5046 		goto done;
5047 	*base_commit_id = got_object_id_dup(worktree->base_commit_id);
5048 	if (*base_commit_id == NULL) {
5049 		err = got_error_from_errno("got_object_id_dup");
5050 		goto done;
5051 	}
5052 
5053 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
5054 	    worktree->base_commit_id);
5055 	if (err)
5056 		goto done;
5057 	err = got_ref_write(*tmp_branch, repo);
5058 	if (err)
5059 		goto done;
5060 
5061 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
5062 	if (err)
5063 		goto done;
5064 done:
5065 	free(fileindex_path);
5066 	free(tmp_branch_name);
5067 	free(branch_ref_name);
5068 	free(base_commit_ref_name);
5069 	if (wt_branch)
5070 		got_ref_close(wt_branch);
5071 	if (err) {
5072 		if (*branch_ref) {
5073 			got_ref_close(*branch_ref);
5074 			*branch_ref = NULL;
5075 		}
5076 		if (*tmp_branch) {
5077 			got_ref_close(*tmp_branch);
5078 			*tmp_branch = NULL;
5079 		}
5080 		free(*base_commit_id);
5081 		if (*fileindex) {
5082 			got_fileindex_free(*fileindex);
5083 			*fileindex = NULL;
5084 		}
5085 		lock_worktree(worktree, LOCK_SH);
5086 	}
5087 	return err;
5088 }
5089 
5090 const struct got_error *
5091 got_worktree_histedit_postpone(struct got_worktree *worktree,
5092     struct got_fileindex *fileindex)
5093 {
5094 	if (fileindex)
5095 		got_fileindex_free(fileindex);
5096 	return lock_worktree(worktree, LOCK_SH);
5097 }
5098 
5099 const struct got_error *
5100 got_worktree_histedit_in_progress(int *in_progress,
5101     struct got_worktree *worktree)
5102 {
5103 	const struct got_error *err;
5104 	char *tmp_branch_name = NULL;
5105 
5106 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5107 	if (err)
5108 		return err;
5109 
5110 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5111 	free(tmp_branch_name);
5112 	return NULL;
5113 }
5114 
5115 const struct got_error *
5116 got_worktree_histedit_continue(struct got_object_id **commit_id,
5117     struct got_reference **tmp_branch, struct got_reference **branch_ref,
5118     struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5119     struct got_worktree *worktree, struct got_repository *repo)
5120 {
5121 	const struct got_error *err;
5122 	char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5123 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5124 	struct got_reference *commit_ref = NULL;
5125 	struct got_reference *base_commit_ref = NULL;
5126 	char *fileindex_path = NULL;
5127 	int have_staged_files = 0;
5128 
5129 	*commit_id = NULL;
5130 	*tmp_branch = NULL;
5131 	*base_commit_id = NULL;
5132 	*fileindex = NULL;
5133 
5134 	err = lock_worktree(worktree, LOCK_EX);
5135 	if (err)
5136 		return err;
5137 
5138 	err = open_fileindex(fileindex, &fileindex_path, worktree);
5139 	if (err)
5140 		goto done;
5141 
5142 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5143 	    &have_staged_files);
5144 	if (err && err->code != GOT_ERR_CANCELLED)
5145 		goto done;
5146 	if (have_staged_files) {
5147 		err = got_error(GOT_ERR_STAGED_PATHS);
5148 		goto done;
5149 	}
5150 
5151 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5152 	if (err)
5153 		goto done;
5154 
5155 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5156 	if (err)
5157 		goto done;
5158 
5159 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5160 	if (err)
5161 		goto done;
5162 
5163 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5164 	    worktree);
5165 	if (err)
5166 		goto done;
5167 
5168 	err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5169 	if (err)
5170 		goto done;
5171 
5172 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5173 	if (err)
5174 		goto done;
5175 	err = got_ref_resolve(commit_id, repo, commit_ref);
5176 	if (err)
5177 		goto done;
5178 
5179 	err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5180 	if (err)
5181 		goto done;
5182 	err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5183 	if (err)
5184 		goto done;
5185 
5186 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5187 	if (err)
5188 		goto done;
5189 done:
5190 	free(commit_ref_name);
5191 	free(branch_ref_name);
5192 	free(fileindex_path);
5193 	if (commit_ref)
5194 		got_ref_close(commit_ref);
5195 	if (base_commit_ref)
5196 		got_ref_close(base_commit_ref);
5197 	if (err) {
5198 		free(*commit_id);
5199 		*commit_id = NULL;
5200 		free(*base_commit_id);
5201 		*base_commit_id = NULL;
5202 		if (*tmp_branch) {
5203 			got_ref_close(*tmp_branch);
5204 			*tmp_branch = NULL;
5205 		}
5206 		if (*fileindex) {
5207 			got_fileindex_free(*fileindex);
5208 			*fileindex = NULL;
5209 		}
5210 		lock_worktree(worktree, LOCK_EX);
5211 	}
5212 	return err;
5213 }
5214 
5215 static const struct got_error *
5216 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5217 {
5218 	const struct got_error *err;
5219 	char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5220 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
5221 
5222 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5223 	if (err)
5224 		goto done;
5225 	err = delete_ref(tmp_branch_name, repo);
5226 	if (err)
5227 		goto done;
5228 
5229 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5230 	    worktree);
5231 	if (err)
5232 		goto done;
5233 	err = delete_ref(base_commit_ref_name, repo);
5234 	if (err)
5235 		goto done;
5236 
5237 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5238 	if (err)
5239 		goto done;
5240 	err = delete_ref(branch_ref_name, repo);
5241 	if (err)
5242 		goto done;
5243 
5244 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5245 	if (err)
5246 		goto done;
5247 	err = delete_ref(commit_ref_name, repo);
5248 	if (err)
5249 		goto done;
5250 done:
5251 	free(tmp_branch_name);
5252 	free(base_commit_ref_name);
5253 	free(branch_ref_name);
5254 	free(commit_ref_name);
5255 	return err;
5256 }
5257 
5258 const struct got_error *
5259 got_worktree_histedit_abort(struct got_worktree *worktree,
5260     struct got_fileindex *fileindex, struct got_repository *repo,
5261     struct got_reference *branch, struct got_object_id *base_commit_id,
5262     got_worktree_checkout_cb progress_cb, void *progress_arg)
5263 {
5264 	const struct got_error *err, *unlockerr, *sync_err;
5265 	struct got_reference *resolved = NULL;
5266 	char *fileindex_path = NULL;
5267 	struct got_object_id *tree_id = NULL;
5268 	struct revert_file_args rfa;
5269 
5270 	err = lock_worktree(worktree, LOCK_EX);
5271 	if (err)
5272 		return err;
5273 
5274 	err = got_ref_open(&resolved, repo,
5275 	    got_ref_get_symref_target(branch), 0);
5276 	if (err)
5277 		goto done;
5278 
5279 	err = got_worktree_set_head_ref(worktree, resolved);
5280 	if (err)
5281 		goto done;
5282 
5283 	err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5284 	if (err)
5285 		goto done;
5286 
5287 	err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5288 	    worktree->path_prefix);
5289 	if (err)
5290 		goto done;
5291 
5292 	err = delete_histedit_refs(worktree, repo);
5293 	if (err)
5294 		goto done;
5295 
5296 	err = get_fileindex_path(&fileindex_path, worktree);
5297 	if (err)
5298 		goto done;
5299 
5300 	rfa.worktree = worktree;
5301 	rfa.fileindex = fileindex;
5302 	rfa.progress_cb = progress_cb;
5303 	rfa.progress_arg = progress_arg;
5304 	rfa.patch_cb = NULL;
5305 	rfa.patch_arg = NULL;
5306 	rfa.repo = repo;
5307 	err = worktree_status(worktree, "", fileindex, repo,
5308 	    revert_file, &rfa, NULL, NULL);
5309 	if (err)
5310 		goto sync;
5311 
5312 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5313 	    repo, progress_cb, progress_arg, NULL, NULL);
5314 sync:
5315 	sync_err = sync_fileindex(fileindex, fileindex_path);
5316 	if (sync_err && err == NULL)
5317 		err = sync_err;
5318 done:
5319 	got_ref_close(resolved);
5320 	free(tree_id);
5321 	free(fileindex_path);
5322 
5323 	unlockerr = lock_worktree(worktree, LOCK_SH);
5324 	if (unlockerr && err == NULL)
5325 		err = unlockerr;
5326 	return err;
5327 }
5328 
5329 const struct got_error *
5330 got_worktree_histedit_complete(struct got_worktree *worktree,
5331     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5332     struct got_reference *edited_branch, struct got_repository *repo)
5333 {
5334 	const struct got_error *err, *unlockerr;
5335 	struct got_object_id *new_head_commit_id = NULL;
5336 	struct got_reference *resolved = NULL;
5337 
5338 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5339 	if (err)
5340 		return err;
5341 
5342 	err = got_ref_open(&resolved, repo,
5343 	    got_ref_get_symref_target(edited_branch), 0);
5344 	if (err)
5345 		goto done;
5346 
5347 	err = got_ref_change_ref(resolved, new_head_commit_id);
5348 	if (err)
5349 		goto done;
5350 
5351 	err = got_ref_write(resolved, repo);
5352 	if (err)
5353 		goto done;
5354 
5355 	err = got_worktree_set_head_ref(worktree, resolved);
5356 	if (err)
5357 		goto done;
5358 
5359 	err = delete_histedit_refs(worktree, repo);
5360 done:
5361 	if (fileindex)
5362 		got_fileindex_free(fileindex);
5363 	free(new_head_commit_id);
5364 	unlockerr = lock_worktree(worktree, LOCK_SH);
5365 	if (unlockerr && err == NULL)
5366 		err = unlockerr;
5367 	return err;
5368 }
5369 
5370 const struct got_error *
5371 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5372     struct got_object_id *commit_id, struct got_repository *repo)
5373 {
5374 	const struct got_error *err;
5375 	char *commit_ref_name;
5376 
5377 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5378 	if (err)
5379 		return err;
5380 
5381 	err = store_commit_id(commit_ref_name, commit_id, repo);
5382 	if (err)
5383 		goto done;
5384 
5385 	err = delete_ref(commit_ref_name, repo);
5386 done:
5387 	free(commit_ref_name);
5388 	return err;
5389 }
5390 
5391 struct check_stage_ok_arg {
5392 	struct got_object_id *head_commit_id;
5393 	struct got_worktree *worktree;
5394 	struct got_fileindex *fileindex;
5395 	struct got_repository *repo;
5396 	int have_changes;
5397 };
5398 
5399 const struct got_error *
5400 check_stage_ok(void *arg, unsigned char status,
5401     unsigned char staged_status, const char *relpath,
5402     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5403     struct got_object_id *commit_id)
5404 {
5405 	struct check_stage_ok_arg *a = arg;
5406 	const struct got_error *err = NULL;
5407 	struct got_fileindex_entry *ie;
5408 	struct got_object_id base_commit_id;
5409 	struct got_object_id *base_commit_idp = NULL;
5410 	char *in_repo_path = NULL, *p;
5411 
5412 	if (status == GOT_STATUS_UNVERSIONED)
5413 		return NULL;
5414 
5415 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5416 	if (ie == NULL)
5417 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5418 
5419 	if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
5420 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5421 	    relpath) == -1)
5422 		return got_error_from_errno("asprintf");
5423 
5424 	if (got_fileindex_entry_has_commit(ie)) {
5425 		memcpy(base_commit_id.sha1, ie->commit_sha1,
5426 		    SHA1_DIGEST_LENGTH);
5427 		base_commit_idp = &base_commit_id;
5428 	}
5429 
5430 	if (status == GOT_STATUS_NO_CHANGE) {
5431 		err = got_error_path(ie->path, GOT_ERR_STAGE_NO_CHANGE);
5432 		goto done;
5433 	} else if (status == GOT_STATUS_CONFLICT) {
5434 		err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
5435 		goto done;
5436 	} else if (status != GOT_STATUS_ADD &&
5437 	    status != GOT_STATUS_MODIFY &&
5438 	    status != GOT_STATUS_DELETE) {
5439 		err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
5440 		goto done;
5441 	}
5442 
5443 	a->have_changes = 1;
5444 
5445 	p = in_repo_path;
5446 	while (p[0] == '/')
5447 		p++;
5448 	err = check_out_of_date(p, status, staged_status,
5449 	    blob_id, base_commit_idp, a->head_commit_id, a->repo,
5450 	    GOT_ERR_STAGE_OUT_OF_DATE);
5451 done:
5452 	free(in_repo_path);
5453 	return err;
5454 }
5455 
5456 struct stage_path_arg {
5457 	struct got_worktree *worktree;
5458 	struct got_fileindex *fileindex;
5459 	struct got_repository *repo;
5460 	got_worktree_status_cb status_cb;
5461 	void *status_arg;
5462 	got_worktree_patch_cb patch_cb;
5463 	void *patch_arg;
5464 };
5465 
5466 static const struct got_error *
5467 stage_path(void *arg, unsigned char status,
5468     unsigned char staged_status, const char *relpath,
5469     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5470     struct got_object_id *commit_id)
5471 {
5472 	struct stage_path_arg *a = arg;
5473 	const struct got_error *err = NULL;
5474 	struct got_fileindex_entry *ie;
5475 	char *ondisk_path = NULL, *path_content = NULL;
5476 	uint32_t stage;
5477 	struct got_object_id *new_staged_blob_id = NULL;
5478 
5479 	if (status == GOT_STATUS_UNVERSIONED)
5480 		return NULL;
5481 
5482 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5483 	if (ie == NULL)
5484 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5485 
5486 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
5487 	    relpath)== -1)
5488 		return got_error_from_errno("asprintf");
5489 
5490 	switch (status) {
5491 	case GOT_STATUS_ADD:
5492 	case GOT_STATUS_MODIFY:
5493 		if (a->patch_cb) {
5494 			if (status == GOT_STATUS_ADD) {
5495 				int choice = GOT_PATCH_CHOICE_NONE;
5496 				err = (*a->patch_cb)(&choice, a->patch_arg,
5497 				    status, ie->path, NULL, 1, 1);
5498 				if (err)
5499 					break;
5500 				if (choice != GOT_PATCH_CHOICE_YES)
5501 					break;
5502 			} else {
5503 				err = create_patched_content(&path_content, 0,
5504 				    staged_blob_id ? staged_blob_id : blob_id,
5505 				    ondisk_path, ie->path, a->repo,
5506 				    a->patch_cb, a->patch_arg);
5507 				if (err || path_content == NULL)
5508 					break;
5509 			}
5510 		}
5511 		err = got_object_blob_create(&new_staged_blob_id,
5512 		    path_content ? path_content : ondisk_path, a->repo);
5513 		if (err)
5514 			break;
5515 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
5516 		    SHA1_DIGEST_LENGTH);
5517 		if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
5518 			stage = GOT_FILEIDX_STAGE_ADD;
5519 		else
5520 			stage = GOT_FILEIDX_STAGE_MODIFY;
5521 		got_fileindex_entry_stage_set(ie, stage);
5522 		if (a->status_cb == NULL)
5523 			break;
5524 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5525 		    get_staged_status(ie), relpath, blob_id,
5526 		    new_staged_blob_id, NULL);
5527 		break;
5528 	case GOT_STATUS_DELETE:
5529 		if (staged_status == GOT_STATUS_DELETE)
5530 			break;
5531 		if (a->patch_cb) {
5532 			int choice = GOT_PATCH_CHOICE_NONE;
5533 			err = (*a->patch_cb)(&choice, a->patch_arg, status,
5534 			    ie->path, NULL, 1, 1);
5535 			if (err)
5536 				break;
5537 			if (choice == GOT_PATCH_CHOICE_NO)
5538 				break;
5539 			if (choice != GOT_PATCH_CHOICE_YES) {
5540 				err = got_error(GOT_ERR_PATCH_CHOICE);
5541 				break;
5542 			}
5543 		}
5544 		stage = GOT_FILEIDX_STAGE_DELETE;
5545 		got_fileindex_entry_stage_set(ie, stage);
5546 		if (a->status_cb == NULL)
5547 			break;
5548 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5549 		    get_staged_status(ie), relpath, NULL, NULL, NULL);
5550 		break;
5551 	case GOT_STATUS_NO_CHANGE:
5552 		err = got_error_path(relpath, GOT_ERR_STAGE_NO_CHANGE);
5553 		break;
5554 	case GOT_STATUS_CONFLICT:
5555 		err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
5556 		break;
5557 	default:
5558 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
5559 		break;
5560 	}
5561 
5562 	if (path_content && unlink(path_content) == -1 && err == NULL)
5563 		err = got_error_from_errno2("unlink", path_content);
5564 	free(path_content);
5565 	free(ondisk_path);
5566 	free(new_staged_blob_id);
5567 	return err;
5568 }
5569 
5570 const struct got_error *
5571 got_worktree_stage(struct got_worktree *worktree,
5572     struct got_pathlist_head *paths,
5573     got_worktree_status_cb status_cb, void *status_arg,
5574     got_worktree_patch_cb patch_cb, void *patch_arg,
5575     struct got_repository *repo)
5576 {
5577 	const struct got_error *err = NULL, *sync_err, *unlockerr;
5578 	struct got_pathlist_entry *pe;
5579 	struct got_fileindex *fileindex = NULL;
5580 	char *fileindex_path = NULL;
5581 	struct got_reference *head_ref = NULL;
5582 	struct got_object_id *head_commit_id = NULL;
5583 	struct check_stage_ok_arg oka;
5584 	struct stage_path_arg spa;
5585 
5586 	err = lock_worktree(worktree, LOCK_EX);
5587 	if (err)
5588 		return err;
5589 
5590 	err = got_ref_open(&head_ref, repo,
5591 	    got_worktree_get_head_ref_name(worktree), 0);
5592 	if (err)
5593 		goto done;
5594 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
5595 	if (err)
5596 		goto done;
5597 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
5598 	if (err)
5599 		goto done;
5600 
5601 	/* Check pre-conditions before staging anything. */
5602 	oka.head_commit_id = head_commit_id;
5603 	oka.worktree = worktree;
5604 	oka.fileindex = fileindex;
5605 	oka.repo = repo;
5606 	oka.have_changes = 0;
5607 	TAILQ_FOREACH(pe, paths, entry) {
5608 		err = worktree_status(worktree, pe->path, fileindex, repo,
5609 		    check_stage_ok, &oka, NULL, NULL);
5610 		if (err)
5611 			goto done;
5612 	}
5613 	if (!oka.have_changes) {
5614 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
5615 		goto done;
5616 	}
5617 
5618 	spa.worktree = worktree;
5619 	spa.fileindex = fileindex;
5620 	spa.repo = repo;
5621 	spa.patch_cb = patch_cb;
5622 	spa.patch_arg = patch_arg;
5623 	spa.status_cb = status_cb;
5624 	spa.status_arg = status_arg;
5625 	TAILQ_FOREACH(pe, paths, entry) {
5626 		err = worktree_status(worktree, pe->path, fileindex, repo,
5627 		    stage_path, &spa, NULL, NULL);
5628 		if (err)
5629 			goto done;
5630 	}
5631 
5632 	sync_err = sync_fileindex(fileindex, fileindex_path);
5633 	if (sync_err && err == NULL)
5634 		err = sync_err;
5635 done:
5636 	if (head_ref)
5637 		got_ref_close(head_ref);
5638 	free(head_commit_id);
5639 	free(fileindex_path);
5640 	if (fileindex)
5641 		got_fileindex_free(fileindex);
5642 	unlockerr = lock_worktree(worktree, LOCK_SH);
5643 	if (unlockerr && err == NULL)
5644 		err = unlockerr;
5645 	return err;
5646 }
5647 
5648 struct unstage_path_arg {
5649 	struct got_worktree *worktree;
5650 	struct got_fileindex *fileindex;
5651 	struct got_repository *repo;
5652 	got_worktree_checkout_cb progress_cb;
5653 	void *progress_arg;
5654 	got_worktree_patch_cb patch_cb;
5655 	void *patch_arg;
5656 };
5657 
5658 static const struct got_error *
5659 create_unstaged_content(char **path_unstaged_content,
5660     char **path_new_staged_content, struct got_object_id *blob_id,
5661     struct got_object_id *staged_blob_id, const char *relpath,
5662     struct got_repository *repo,
5663     got_worktree_patch_cb patch_cb, void *patch_arg)
5664 {
5665 	const struct got_error *err;
5666 	struct got_blob_object *blob = NULL, *staged_blob = NULL;
5667 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
5668 	char *path1 = NULL, *path2 = NULL, *label1 = NULL;
5669 	struct stat sb1, sb2;
5670 	struct got_diff_changes *changes = NULL;
5671 	struct got_diff_state *ds = NULL;
5672 	struct got_diff_args *args = NULL;
5673 	struct got_diff_change *change;
5674 	int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
5675 	int have_content = 0, have_rejected_content = 0;
5676 
5677 	*path_unstaged_content = NULL;
5678 	*path_new_staged_content = NULL;
5679 
5680 	err = got_object_id_str(&label1, blob_id);
5681 	if (err)
5682 		return err;
5683 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
5684 	if (err)
5685 		goto done;
5686 
5687 	err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
5688 	if (err)
5689 		goto done;
5690 
5691 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
5692 	if (err)
5693 		goto done;
5694 
5695 	err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
5696 	if (err)
5697 		goto done;
5698 
5699 	err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
5700 	if (err)
5701 		goto done;
5702 
5703 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
5704 	if (err)
5705 		goto done;
5706 
5707 	if (stat(path1, &sb1) == -1) {
5708 		err = got_error_from_errno2("stat", path1);
5709 		goto done;
5710 	}
5711 
5712 	if (stat(path2, &sb2) == -1) {
5713 		err = got_error_from_errno2("stat", path2);
5714 		goto done;
5715 	}
5716 
5717 	err = got_diff_files(&changes, &ds, &args, &diff_flags,
5718 	    f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
5719 	if (err)
5720 		goto done;
5721 
5722 	err = got_opentemp_named(path_unstaged_content, &outfile,
5723 	    "got-unstaged-content");
5724 	if (err)
5725 		goto done;
5726 	err = got_opentemp_named(path_new_staged_content, &rejectfile,
5727 	    "got-new-staged-content");
5728 	if (err)
5729 		goto done;
5730 
5731 	if (fseek(f1, 0L, SEEK_SET) == -1) {
5732 		err = got_ferror(f1, GOT_ERR_IO);
5733 		goto done;
5734 	}
5735 	if (fseek(f2, 0L, SEEK_SET) == -1) {
5736 		err = got_ferror(f2, GOT_ERR_IO);
5737 		goto done;
5738 	}
5739 	SIMPLEQ_FOREACH(change, &changes->entries, entry) {
5740 		int choice;
5741 		err = apply_or_reject_change(&choice, change, ++n,
5742 		    changes->nchanges, ds, args, diff_flags, relpath,
5743 		    f1, f2, &line_cur1, &line_cur2,
5744 		    outfile, rejectfile, patch_cb, patch_arg);
5745 		if (err)
5746 			goto done;
5747 		if (choice == GOT_PATCH_CHOICE_YES)
5748 			have_content = 1;
5749 		else
5750 			have_rejected_content = 1;
5751 		if (choice == GOT_PATCH_CHOICE_QUIT)
5752 			break;
5753 	}
5754 done:
5755 	free(label1);
5756 	if (blob)
5757 		got_object_blob_close(blob);
5758 	if (staged_blob)
5759 		got_object_blob_close(staged_blob);
5760 	if (f1 && fclose(f1) == EOF && err == NULL)
5761 		err = got_error_from_errno2("fclose", path1);
5762 	if (f2 && fclose(f2) == EOF && err == NULL)
5763 		err = got_error_from_errno2("fclose", path2);
5764 	if (outfile && fclose(outfile) == EOF && err == NULL)
5765 		err = got_error_from_errno2("fclose", *path_unstaged_content);
5766 	if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
5767 		err = got_error_from_errno2("fclose", *path_new_staged_content);
5768 	if (path1 && unlink(path1) == -1 && err == NULL)
5769 		err = got_error_from_errno2("unlink", path1);
5770 	if (path2 && unlink(path2) == -1 && err == NULL)
5771 		err = got_error_from_errno2("unlink", path2);
5772 	if (err || !have_content) {
5773 		if (*path_unstaged_content &&
5774 		    unlink(*path_unstaged_content) == -1 && err == NULL)
5775 			err = got_error_from_errno2("unlink",
5776 			    *path_unstaged_content);
5777 		free(*path_unstaged_content);
5778 		*path_unstaged_content = NULL;
5779 	}
5780 	if (err || !have_rejected_content) {
5781 		if (*path_new_staged_content &&
5782 		    unlink(*path_new_staged_content) == -1 && err == NULL)
5783 			err = got_error_from_errno2("unlink",
5784 			    *path_new_staged_content);
5785 		free(*path_new_staged_content);
5786 		*path_new_staged_content = NULL;
5787 	}
5788 	free(args);
5789 	if (ds) {
5790 		got_diff_state_free(ds);
5791 		free(ds);
5792 	}
5793 	if (changes)
5794 		got_diff_free_changes(changes);
5795 	free(path1);
5796 	free(path2);
5797 	return err;
5798 }
5799 
5800 static const struct got_error *
5801 unstage_path(void *arg, unsigned char status,
5802     unsigned char staged_status, const char *relpath,
5803     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5804     struct got_object_id *commit_id)
5805 {
5806 	const struct got_error *err = NULL;
5807 	struct unstage_path_arg *a = arg;
5808 	struct got_fileindex_entry *ie;
5809 	struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
5810 	char *ondisk_path = NULL, *path_unstaged_content = NULL;
5811 	char *path_new_staged_content = NULL;
5812 	int local_changes_subsumed;
5813 	struct stat sb;
5814 
5815 	if (staged_status != GOT_STATUS_ADD &&
5816 	    staged_status != GOT_STATUS_MODIFY &&
5817 	    staged_status != GOT_STATUS_DELETE)
5818 		return NULL;
5819 
5820 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5821 	if (ie == NULL)
5822 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5823 
5824 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
5825 	    == -1)
5826 		return got_error_from_errno("asprintf");
5827 
5828 	switch (staged_status) {
5829 	case GOT_STATUS_MODIFY:
5830 		err = got_object_open_as_blob(&blob_base, a->repo,
5831 		    blob_id, 8192);
5832 		if (err)
5833 			break;
5834 		/* fall through */
5835 	case GOT_STATUS_ADD:
5836 		if (a->patch_cb) {
5837 			if (staged_status == GOT_STATUS_ADD) {
5838 				int choice = GOT_PATCH_CHOICE_NONE;
5839 				err = (*a->patch_cb)(&choice, a->patch_arg,
5840 				    staged_status, ie->path, NULL, 1, 1);
5841 				if (err)
5842 					break;
5843 				if (choice != GOT_PATCH_CHOICE_YES)
5844 					break;
5845 			} else {
5846 				err = create_unstaged_content(
5847 				    &path_unstaged_content,
5848 				    &path_new_staged_content, blob_id,
5849 				    staged_blob_id, ie->path, a->repo,
5850 				    a->patch_cb, a->patch_arg);
5851 				if (err || path_unstaged_content == NULL)
5852 					break;
5853 				if (path_new_staged_content) {
5854 					err = got_object_blob_create(
5855 					    &staged_blob_id,
5856 					    path_new_staged_content,
5857 					    a->repo);
5858 					if (err)
5859 						break;
5860 					memcpy(ie->staged_blob_sha1,
5861 					    staged_blob_id->sha1,
5862 					    SHA1_DIGEST_LENGTH);
5863 				}
5864 				err = merge_file(&local_changes_subsumed,
5865 				    a->worktree, blob_base, ondisk_path,
5866 				    relpath, got_fileindex_perms_to_st(ie),
5867 				    path_unstaged_content, "unstaged",
5868 				    a->repo, a->progress_cb, a->progress_arg);
5869 				if (err == NULL &&
5870 				    path_new_staged_content == NULL)
5871 					got_fileindex_entry_stage_set(ie,
5872 					    GOT_FILEIDX_STAGE_NONE);
5873 				break; /* Done with this file. */
5874 			}
5875 		}
5876 		err = got_object_open_as_blob(&blob_staged, a->repo,
5877 		    staged_blob_id, 8192);
5878 		if (err)
5879 			break;
5880 		err = merge_blob(&local_changes_subsumed, a->worktree,
5881 		    blob_base, ondisk_path, relpath,
5882 		    got_fileindex_perms_to_st(ie), blob_staged,
5883 		    commit_id ? commit_id : a->worktree->base_commit_id,
5884 		    a->repo, a->progress_cb, a->progress_arg);
5885 		if (err == NULL)
5886 			got_fileindex_entry_stage_set(ie,
5887 			    GOT_FILEIDX_STAGE_NONE);
5888 		break;
5889 	case GOT_STATUS_DELETE:
5890 		if (a->patch_cb) {
5891 			int choice = GOT_PATCH_CHOICE_NONE;
5892 			err = (*a->patch_cb)(&choice, a->patch_arg,
5893 			    staged_status, ie->path, NULL, 1, 1);
5894 			if (err)
5895 				break;
5896 			if (choice == GOT_PATCH_CHOICE_NO)
5897 				break;
5898 			if (choice != GOT_PATCH_CHOICE_YES) {
5899 				err = got_error(GOT_ERR_PATCH_CHOICE);
5900 				break;
5901 			}
5902 		}
5903 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
5904 		err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
5905 		if (err)
5906 			break;
5907 		err = (*a->progress_cb)(a->progress_arg, status, relpath);
5908 		break;
5909 	}
5910 
5911 	free(ondisk_path);
5912 	if (path_unstaged_content &&
5913 	    unlink(path_unstaged_content) == -1 && err == NULL)
5914 		err = got_error_from_errno2("unlink", path_unstaged_content);
5915 	if (path_new_staged_content &&
5916 	    unlink(path_new_staged_content) == -1 && err == NULL)
5917 		err = got_error_from_errno2("unlink", path_new_staged_content);
5918 	free(path_unstaged_content);
5919 	free(path_new_staged_content);
5920 	if (blob_base)
5921 		got_object_blob_close(blob_base);
5922 	if (blob_staged)
5923 		got_object_blob_close(blob_staged);
5924 	return err;
5925 }
5926 
5927 const struct got_error *
5928 got_worktree_unstage(struct got_worktree *worktree,
5929     struct got_pathlist_head *paths,
5930     got_worktree_checkout_cb progress_cb, void *progress_arg,
5931     got_worktree_patch_cb patch_cb, void *patch_arg,
5932     struct got_repository *repo)
5933 {
5934 	const struct got_error *err = NULL, *sync_err, *unlockerr;
5935 	struct got_pathlist_entry *pe;
5936 	struct got_fileindex *fileindex = NULL;
5937 	char *fileindex_path = NULL;
5938 	struct unstage_path_arg upa;
5939 
5940 	err = lock_worktree(worktree, LOCK_EX);
5941 	if (err)
5942 		return err;
5943 
5944 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
5945 	if (err)
5946 		goto done;
5947 
5948 	upa.worktree = worktree;
5949 	upa.fileindex = fileindex;
5950 	upa.repo = repo;
5951 	upa.progress_cb = progress_cb;
5952 	upa.progress_arg = progress_arg;
5953 	upa.patch_cb = patch_cb;
5954 	upa.patch_arg = patch_arg;
5955 	TAILQ_FOREACH(pe, paths, entry) {
5956 		err = worktree_status(worktree, pe->path, fileindex, repo,
5957 		    unstage_path, &upa, NULL, NULL);
5958 		if (err)
5959 			goto done;
5960 	}
5961 
5962 	sync_err = sync_fileindex(fileindex, fileindex_path);
5963 	if (sync_err && err == NULL)
5964 		err = sync_err;
5965 done:
5966 	free(fileindex_path);
5967 	if (fileindex)
5968 		got_fileindex_free(fileindex);
5969 	unlockerr = lock_worktree(worktree, LOCK_SH);
5970 	if (unlockerr && err == NULL)
5971 		err = unlockerr;
5972 	return err;
5973 }