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 struct revert_file_args {
2687 	struct got_worktree *worktree;
2688 	struct got_fileindex *fileindex;
2689 	got_worktree_checkout_cb progress_cb;
2690 	void *progress_arg;
2691 	struct got_repository *repo;
2692 };
2693 
2694 static const struct got_error *
2695 revert_file(void *arg, unsigned char status, unsigned char staged_status,
2696     const char *relpath, struct got_object_id *blob_id,
2697     struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2698 {
2699 	struct revert_file_args *a = arg;
2700 	const struct got_error *err = NULL;
2701 	char *parent_path = NULL;
2702 	struct got_fileindex_entry *ie;
2703 	struct got_tree_object *tree = NULL;
2704 	struct got_object_id *tree_id = NULL;
2705 	const struct got_tree_entry *te = NULL;
2706 	char *tree_path = NULL, *te_name;
2707 	char *ondisk_path = NULL;
2708 	struct got_blob_object *blob = NULL;
2709 
2710 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2711 	if (ie == NULL)
2712 		return got_error(GOT_ERR_BAD_PATH);
2713 
2714 	if (status == GOT_STATUS_DELETE &&
2715 	    staged_status != GOT_STATUS_NO_CHANGE) {
2716 		err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2717 		goto done;
2718 	}
2719 
2720 	/* Construct in-repository path of tree which contains this blob. */
2721 	err = got_path_dirname(&parent_path, ie->path);
2722 	if (err) {
2723 		if (err->code != GOT_ERR_BAD_PATH)
2724 			goto done;
2725 		parent_path = strdup("/");
2726 		if (parent_path == NULL) {
2727 			err = got_error_from_errno("strdup");
2728 			goto done;
2729 		}
2730 	}
2731 	if (got_path_is_root_dir(a->worktree->path_prefix)) {
2732 		tree_path = strdup(parent_path);
2733 		if (tree_path == NULL) {
2734 			err = got_error_from_errno("strdup");
2735 			goto done;
2736 		}
2737 	} else {
2738 		if (got_path_is_root_dir(parent_path)) {
2739 			tree_path = strdup(a->worktree->path_prefix);
2740 			if (tree_path == NULL) {
2741 				err = got_error_from_errno("strdup");
2742 				goto done;
2743 			}
2744 		} else {
2745 			if (asprintf(&tree_path, "%s/%s",
2746 			    a->worktree->path_prefix, parent_path) == -1) {
2747 				err = got_error_from_errno("asprintf");
2748 				goto done;
2749 			}
2750 		}
2751 	}
2752 
2753 	err = got_object_id_by_path(&tree_id, a->repo,
2754 	    a->worktree->base_commit_id, tree_path);
2755 	if (err) {
2756 		if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
2757 		    (status == GOT_STATUS_ADD ||
2758 		    staged_status == GOT_STATUS_ADD)))
2759 			goto done;
2760 	} else {
2761 		err = got_object_open_as_tree(&tree, a->repo, tree_id);
2762 		if (err)
2763 			goto done;
2764 
2765 		te_name = basename(ie->path);
2766 		if (te_name == NULL) {
2767 			err = got_error_from_errno2("basename", ie->path);
2768 			goto done;
2769 		}
2770 
2771 		te = got_object_tree_find_entry(tree, te_name);
2772 		if (te == NULL && status != GOT_STATUS_ADD &&
2773 		    staged_status != GOT_STATUS_ADD) {
2774 			err = got_error(GOT_ERR_NO_TREE_ENTRY);
2775 			goto done;
2776 		}
2777 	}
2778 
2779 	switch (status) {
2780 	case GOT_STATUS_ADD:
2781 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
2782 		    ie->path);
2783 		if (err)
2784 			goto done;
2785 		got_fileindex_entry_remove(a->fileindex, ie);
2786 		break;
2787 	case GOT_STATUS_DELETE:
2788 	case GOT_STATUS_MODIFY:
2789 	case GOT_STATUS_CONFLICT:
2790 	case GOT_STATUS_MISSING: {
2791 		struct got_object_id id;
2792 		if (staged_status == GOT_STATUS_ADD ||
2793 		    staged_status == GOT_STATUS_MODIFY) {
2794 			memcpy(id.sha1, ie->staged_blob_sha1,
2795 			    SHA1_DIGEST_LENGTH);
2796 		} else
2797 			memcpy(id.sha1, ie->blob_sha1,
2798 			    SHA1_DIGEST_LENGTH);
2799 		err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
2800 		if (err)
2801 			goto done;
2802 
2803 		if (asprintf(&ondisk_path, "%s/%s",
2804 		    got_worktree_get_root_path(a->worktree), relpath) == -1) {
2805 			err = got_error_from_errno("asprintf");
2806 			goto done;
2807 		}
2808 
2809 		err = install_blob(a->worktree, ondisk_path, ie->path,
2810 		    te ? te->mode : GOT_DEFAULT_FILE_MODE,
2811 		    got_fileindex_perms_to_st(ie), blob, 0, 1,
2812 		    a->repo, a->progress_cb, a->progress_arg);
2813 		if (err)
2814 			goto done;
2815 		if (status == GOT_STATUS_DELETE) {
2816 			err = update_blob_fileindex_entry(a->worktree,
2817 			    a->fileindex, ie, ondisk_path, ie->path, blob, 1);
2818 			if (err)
2819 				goto done;
2820 		}
2821 		break;
2822 	}
2823 	default:
2824 		break;
2825 	}
2826 done:
2827 	free(ondisk_path);
2828 	free(parent_path);
2829 	free(tree_path);
2830 	if (blob)
2831 		got_object_blob_close(blob);
2832 	if (tree)
2833 		got_object_tree_close(tree);
2834 	free(tree_id);
2835 	return err;
2836 }
2837 
2838 const struct got_error *
2839 got_worktree_revert(struct got_worktree *worktree,
2840     struct got_pathlist_head *paths,
2841     got_worktree_checkout_cb progress_cb, void *progress_arg,
2842     struct got_repository *repo)
2843 {
2844 	struct got_fileindex *fileindex = NULL;
2845 	char *fileindex_path = NULL;
2846 	const struct got_error *err = NULL, *unlockerr = NULL;
2847 	const struct got_error *sync_err = NULL;
2848 	struct got_pathlist_entry *pe;
2849 	struct revert_file_args rfa;
2850 
2851 	err = lock_worktree(worktree, LOCK_EX);
2852 	if (err)
2853 		return err;
2854 
2855 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2856 	if (err)
2857 		goto done;
2858 
2859 	rfa.worktree = worktree;
2860 	rfa.fileindex = fileindex;
2861 	rfa.progress_cb = progress_cb;
2862 	rfa.progress_arg = progress_arg;
2863 	rfa.repo = repo;
2864 	TAILQ_FOREACH(pe, paths, entry) {
2865 		err = worktree_status(worktree, pe->path, fileindex, repo,
2866 		    revert_file, &rfa, NULL, NULL);
2867 		if (err)
2868 			break;
2869 	}
2870 	sync_err = sync_fileindex(fileindex, fileindex_path);
2871 	if (sync_err && err == NULL)
2872 		err = sync_err;
2873 done:
2874 	free(fileindex_path);
2875 	if (fileindex)
2876 		got_fileindex_free(fileindex);
2877 	unlockerr = lock_worktree(worktree, LOCK_SH);
2878 	if (unlockerr && err == NULL)
2879 		err = unlockerr;
2880 	return err;
2881 }
2882 
2883 static void
2884 free_commitable(struct got_commitable *ct)
2885 {
2886 	free(ct->path);
2887 	free(ct->in_repo_path);
2888 	free(ct->ondisk_path);
2889 	free(ct->blob_id);
2890 	free(ct->base_blob_id);
2891 	free(ct->staged_blob_id);
2892 	free(ct->base_commit_id);
2893 	free(ct);
2894 }
2895 
2896 struct collect_commitables_arg {
2897 	struct got_pathlist_head *commitable_paths;
2898 	struct got_repository *repo;
2899 	struct got_worktree *worktree;
2900 	int have_staged_files;
2901 };
2902 
2903 static const struct got_error *
2904 collect_commitables(void *arg, unsigned char status,
2905     unsigned char staged_status, const char *relpath,
2906     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
2907     struct got_object_id *commit_id)
2908 {
2909 	struct collect_commitables_arg *a = arg;
2910 	const struct got_error *err = NULL;
2911 	struct got_commitable *ct = NULL;
2912 	struct got_pathlist_entry *new = NULL;
2913 	char *parent_path = NULL, *path = NULL;
2914 	struct stat sb;
2915 
2916 	if (a->have_staged_files) {
2917 		if (staged_status != GOT_STATUS_MODIFY &&
2918 		    staged_status != GOT_STATUS_ADD &&
2919 		    staged_status != GOT_STATUS_DELETE)
2920 			return NULL;
2921 	} else {
2922 		if (status == GOT_STATUS_CONFLICT)
2923 			return got_error(GOT_ERR_COMMIT_CONFLICT);
2924 
2925 		if (status != GOT_STATUS_MODIFY &&
2926 		    status != GOT_STATUS_ADD &&
2927 		    status != GOT_STATUS_DELETE)
2928 			return NULL;
2929 	}
2930 
2931 	if (asprintf(&path, "/%s", relpath) == -1) {
2932 		err = got_error_from_errno("asprintf");
2933 		goto done;
2934 	}
2935 	if (strcmp(path, "/") == 0) {
2936 		parent_path = strdup("");
2937 		if (parent_path == NULL)
2938 			return got_error_from_errno("strdup");
2939 	} else {
2940 		err = got_path_dirname(&parent_path, path);
2941 		if (err)
2942 			return err;
2943 	}
2944 
2945 	ct = calloc(1, sizeof(*ct));
2946 	if (ct == NULL) {
2947 		err = got_error_from_errno("calloc");
2948 		goto done;
2949 	}
2950 
2951 	if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2952 	    relpath) == -1) {
2953 		err = got_error_from_errno("asprintf");
2954 		goto done;
2955 	}
2956 	if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
2957 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
2958 	} else {
2959 		if (lstat(ct->ondisk_path, &sb) != 0) {
2960 			err = got_error_from_errno2("lstat", ct->ondisk_path);
2961 			goto done;
2962 		}
2963 		ct->mode = sb.st_mode;
2964 	}
2965 
2966 	if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2967 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2968 	    relpath) == -1) {
2969 		err = got_error_from_errno("asprintf");
2970 		goto done;
2971 	}
2972 
2973 	ct->status = status;
2974 	ct->staged_status = staged_status;
2975 	ct->blob_id = NULL; /* will be filled in when blob gets created */
2976 	if (ct->status != GOT_STATUS_ADD &&
2977 	    ct->staged_status != GOT_STATUS_ADD) {
2978 		ct->base_blob_id = got_object_id_dup(blob_id);
2979 		if (ct->base_blob_id == NULL) {
2980 			err = got_error_from_errno("got_object_id_dup");
2981 			goto done;
2982 		}
2983 		ct->base_commit_id = got_object_id_dup(commit_id);
2984 		if (ct->base_commit_id == NULL) {
2985 			err = got_error_from_errno("got_object_id_dup");
2986 			goto done;
2987 		}
2988 	}
2989 	if (ct->staged_status == GOT_STATUS_ADD ||
2990 	    ct->staged_status == GOT_STATUS_MODIFY) {
2991 		ct->staged_blob_id = got_object_id_dup(staged_blob_id);
2992 		if (ct->staged_blob_id == NULL) {
2993 			err = got_error_from_errno("got_object_id_dup");
2994 			goto done;
2995 		}
2996 	}
2997 	ct->path = strdup(path);
2998 	if (ct->path == NULL) {
2999 		err = got_error_from_errno("strdup");
3000 		goto done;
3001 	}
3002 	err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3003 done:
3004 	if (ct && (err || new == NULL))
3005 		free_commitable(ct);
3006 	free(parent_path);
3007 	free(path);
3008 	return err;
3009 }
3010 
3011 static const struct got_error *write_tree(struct got_object_id **,
3012     struct got_tree_object *, const char *, struct got_pathlist_head *,
3013     got_worktree_status_cb status_cb, void *status_arg,
3014     struct got_repository *);
3015 
3016 static const struct got_error *
3017 write_subtree(struct got_object_id **new_subtree_id,
3018     struct got_tree_entry *te, const char *parent_path,
3019     struct got_pathlist_head *commitable_paths,
3020     got_worktree_status_cb status_cb, void *status_arg,
3021     struct got_repository *repo)
3022 {
3023 	const struct got_error *err = NULL;
3024 	struct got_tree_object *subtree;
3025 	char *subpath;
3026 
3027 	if (asprintf(&subpath, "%s%s%s", parent_path,
3028 	    got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3029 		return got_error_from_errno("asprintf");
3030 
3031 	err = got_object_open_as_tree(&subtree, repo, te->id);
3032 	if (err)
3033 		return err;
3034 
3035 	err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3036 	    status_cb, status_arg, repo);
3037 	got_object_tree_close(subtree);
3038 	free(subpath);
3039 	return err;
3040 }
3041 
3042 static const struct got_error *
3043 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3044 {
3045 	const struct got_error *err = NULL;
3046 	char *ct_parent_path = NULL;
3047 
3048 	*match = 0;
3049 
3050 	if (strchr(ct->in_repo_path, '/') == NULL) {
3051 		*match = got_path_is_root_dir(path);
3052 		return NULL;
3053 	}
3054 
3055 	err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3056 	if (err)
3057 		return err;
3058 	*match = (strcmp(path, ct_parent_path) == 0);
3059 	free(ct_parent_path);
3060 	return err;
3061 }
3062 
3063 static mode_t
3064 get_ct_file_mode(struct got_commitable *ct)
3065 {
3066 	return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3067 }
3068 
3069 static const struct got_error *
3070 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3071     struct got_tree_entry *te, struct got_commitable *ct)
3072 {
3073 	const struct got_error *err = NULL;
3074 
3075 	*new_te = NULL;
3076 
3077 	err = got_object_tree_entry_dup(new_te, te);
3078 	if (err)
3079 		goto done;
3080 
3081 	(*new_te)->mode = get_ct_file_mode(ct);
3082 
3083 	free((*new_te)->id);
3084 	if (ct->staged_status == GOT_STATUS_MODIFY)
3085 		(*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3086 	else
3087 		(*new_te)->id = got_object_id_dup(ct->blob_id);
3088 	if ((*new_te)->id == NULL) {
3089 		err = got_error_from_errno("got_object_id_dup");
3090 		goto done;
3091 	}
3092 done:
3093 	if (err && *new_te) {
3094 		got_object_tree_entry_close(*new_te);
3095 		*new_te = NULL;
3096 	}
3097 	return err;
3098 }
3099 
3100 static const struct got_error *
3101 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3102     struct got_commitable *ct)
3103 {
3104 	const struct got_error *err = NULL;
3105 	char *ct_name;
3106 
3107 	 *new_te = NULL;
3108 
3109 	*new_te = calloc(1, sizeof(**new_te));
3110 	if (*new_te == NULL)
3111 		return got_error_from_errno("calloc");
3112 
3113 	ct_name = basename(ct->path);
3114 	if (ct_name == NULL) {
3115 		err = got_error_from_errno2("basename", ct->path);
3116 		goto done;
3117 	}
3118 	(*new_te)->name = strdup(ct_name);
3119 	if ((*new_te)->name == NULL) {
3120 		err = got_error_from_errno("strdup");
3121 		goto done;
3122 	}
3123 
3124 	(*new_te)->mode = get_ct_file_mode(ct);
3125 
3126 	if (ct->staged_status == GOT_STATUS_ADD)
3127 		(*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3128 	else
3129 		(*new_te)->id = got_object_id_dup(ct->blob_id);
3130 	if ((*new_te)->id == NULL) {
3131 		err = got_error_from_errno("got_object_id_dup");
3132 		goto done;
3133 	}
3134 done:
3135 	if (err && *new_te) {
3136 		got_object_tree_entry_close(*new_te);
3137 		*new_te = NULL;
3138 	}
3139 	return err;
3140 }
3141 
3142 static const struct got_error *
3143 insert_tree_entry(struct got_tree_entry *new_te,
3144     struct got_pathlist_head *paths)
3145 {
3146 	const struct got_error *err = NULL;
3147 	struct got_pathlist_entry *new_pe;
3148 
3149 	err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3150 	if (err)
3151 		return err;
3152 	if (new_pe == NULL)
3153 		return got_error(GOT_ERR_TREE_DUP_ENTRY);
3154 	return NULL;
3155 }
3156 
3157 static const struct got_error *
3158 report_ct_status(struct got_commitable *ct,
3159     got_worktree_status_cb status_cb, void *status_arg)
3160 {
3161 	const char *ct_path = ct->path;
3162 	unsigned char status;
3163 
3164 	while (ct_path[0] == '/')
3165 		ct_path++;
3166 
3167 	if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3168 		status = ct->staged_status;
3169 	else
3170 		status = ct->status;
3171 
3172 	return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3173 	    ct_path, ct->blob_id, NULL, NULL);
3174 }
3175 
3176 static const struct got_error *
3177 match_modified_subtree(int *modified, struct got_tree_entry *te,
3178     const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3179 {
3180 	const struct got_error *err = NULL;
3181 	struct got_pathlist_entry *pe;
3182 	char *te_path;
3183 
3184 	*modified = 0;
3185 
3186 	if (asprintf(&te_path, "%s%s%s", base_tree_path,
3187 	    got_path_is_root_dir(base_tree_path) ? "" : "/",
3188 	    te->name) == -1)
3189 		return got_error_from_errno("asprintf");
3190 
3191 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3192 		struct got_commitable *ct = pe->data;
3193 		*modified = got_path_is_child(ct->in_repo_path, te_path,
3194 		    strlen(te_path));
3195 		 if (*modified)
3196 			break;
3197 	}
3198 
3199 	free(te_path);
3200 	return err;
3201 }
3202 
3203 static const struct got_error *
3204 match_deleted_or_modified_ct(struct got_commitable **ctp,
3205     struct got_tree_entry *te, const char *base_tree_path,
3206     struct got_pathlist_head *commitable_paths)
3207 {
3208 	const struct got_error *err = NULL;
3209 	struct got_pathlist_entry *pe;
3210 
3211 	*ctp = NULL;
3212 
3213 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3214 		struct got_commitable *ct = pe->data;
3215 		char *ct_name = NULL;
3216 		int path_matches;
3217 
3218 		if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3219 			if (ct->status != GOT_STATUS_MODIFY &&
3220 			    ct->status != GOT_STATUS_DELETE)
3221 				continue;
3222 		} else {
3223 			if (ct->staged_status != GOT_STATUS_MODIFY &&
3224 			    ct->staged_status != GOT_STATUS_DELETE)
3225 				continue;
3226 		}
3227 
3228 		if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3229 			continue;
3230 
3231 		 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3232 		 if (err)
3233 			return err;
3234 		if (!path_matches)
3235 			continue;
3236 
3237 		ct_name = basename(pe->path);
3238 		if (ct_name == NULL)
3239 			return got_error_from_errno2("basename", pe->path);
3240 
3241 		if (strcmp(te->name, ct_name) != 0)
3242 			continue;
3243 
3244 		*ctp = ct;
3245 		break;
3246 	}
3247 
3248 	return err;
3249 }
3250 
3251 static const struct got_error *
3252 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3253     const char *child_path, const char *path_base_tree,
3254     struct got_pathlist_head *commitable_paths,
3255     got_worktree_status_cb status_cb, void *status_arg,
3256     struct got_repository *repo)
3257 {
3258 	const struct got_error *err = NULL;
3259 	struct got_tree_entry *new_te;
3260 	char *subtree_path;
3261 
3262 	*new_tep = NULL;
3263 
3264 	if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3265 	    got_path_is_root_dir(path_base_tree) ? "" : "/",
3266 	    child_path) == -1)
3267 		return got_error_from_errno("asprintf");
3268 
3269 	new_te = calloc(1, sizeof(*new_te));
3270 	new_te->mode = S_IFDIR;
3271 	new_te->name = strdup(child_path);
3272 	if (new_te->name == NULL) {
3273 		err = got_error_from_errno("strdup");
3274 		got_object_tree_entry_close(new_te);
3275 		goto done;
3276 	}
3277 	err = write_tree(&new_te->id, NULL, subtree_path,
3278 	    commitable_paths, status_cb, status_arg, repo);
3279 	if (err) {
3280 		got_object_tree_entry_close(new_te);
3281 		goto done;
3282 	}
3283 done:
3284 	free(subtree_path);
3285 	if (err == NULL)
3286 		*new_tep = new_te;
3287 	return err;
3288 }
3289 
3290 static const struct got_error *
3291 write_tree(struct got_object_id **new_tree_id,
3292     struct got_tree_object *base_tree, const char *path_base_tree,
3293     struct got_pathlist_head *commitable_paths,
3294     got_worktree_status_cb status_cb, void *status_arg,
3295     struct got_repository *repo)
3296 {
3297 	const struct got_error *err = NULL;
3298 	const struct got_tree_entries *base_entries = NULL;
3299 	struct got_pathlist_head paths;
3300 	struct got_tree_entries new_tree_entries;
3301 	struct got_tree_entry *te, *new_te = NULL;
3302 	struct got_pathlist_entry *pe;
3303 
3304 	TAILQ_INIT(&paths);
3305 	new_tree_entries.nentries = 0;
3306 	SIMPLEQ_INIT(&new_tree_entries.head);
3307 
3308 	/* Insert, and recurse into, newly added entries first. */
3309 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3310 		struct got_commitable *ct = pe->data;
3311 		char *child_path = NULL, *slash;
3312 
3313 		if ((ct->status != GOT_STATUS_ADD &&
3314 		    ct->staged_status != GOT_STATUS_ADD) ||
3315 		    (ct->flags & GOT_COMMITABLE_ADDED))
3316 			continue;
3317 
3318 		 if (!got_path_is_child(pe->path, path_base_tree,
3319 		     strlen(path_base_tree)))
3320 			continue;
3321 
3322 		err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3323 		    pe->path);
3324 		if (err)
3325 			goto done;
3326 
3327 		slash = strchr(child_path, '/');
3328 		if (slash == NULL) {
3329 			err = alloc_added_blob_tree_entry(&new_te, ct);
3330 			if (err)
3331 				goto done;
3332 			err = report_ct_status(ct, status_cb, status_arg);
3333 			if (err)
3334 				goto done;
3335 			ct->flags |= GOT_COMMITABLE_ADDED;
3336 			err = insert_tree_entry(new_te, &paths);
3337 			if (err)
3338 				goto done;
3339 		} else {
3340 			*slash = '\0'; /* trim trailing path components */
3341 			if (base_tree == NULL ||
3342 			    got_object_tree_find_entry(base_tree, child_path)
3343 			    == NULL) {
3344 				err = make_subtree_for_added_blob(&new_te,
3345 				    child_path, path_base_tree,
3346 				    commitable_paths, status_cb, status_arg,
3347 				    repo);
3348 				if (err)
3349 					goto done;
3350 				err = insert_tree_entry(new_te, &paths);
3351 				if (err)
3352 					goto done;
3353 			}
3354 		}
3355 	}
3356 
3357 	if (base_tree) {
3358 		/* Handle modified and deleted entries. */
3359 		base_entries = got_object_tree_get_entries(base_tree);
3360 		SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3361 			struct got_commitable *ct = NULL;
3362 
3363 			if (S_ISDIR(te->mode)) {
3364 				int modified;
3365 				err = got_object_tree_entry_dup(&new_te, te);
3366 				if (err)
3367 					goto done;
3368 				err = match_modified_subtree(&modified, te,
3369 				    path_base_tree, commitable_paths);
3370 				if (err)
3371 					goto done;
3372 				/* Avoid recursion into unmodified subtrees. */
3373 				if (modified) {
3374 					free(new_te->id);
3375 					err = write_subtree(&new_te->id, te,
3376 					    path_base_tree, commitable_paths,
3377 					    status_cb, status_arg, repo);
3378 					if (err)
3379 						goto done;
3380 				}
3381 				err = insert_tree_entry(new_te, &paths);
3382 				if (err)
3383 					goto done;
3384 				continue;
3385 			}
3386 
3387 			err = match_deleted_or_modified_ct(&ct, te,
3388 			    path_base_tree, commitable_paths);
3389 			if (ct) {
3390 				/* NB: Deleted entries get dropped here. */
3391 				if (ct->status == GOT_STATUS_MODIFY ||
3392 				    ct->staged_status == GOT_STATUS_MODIFY) {
3393 					err = alloc_modified_blob_tree_entry(
3394 					    &new_te, te, ct);
3395 					if (err)
3396 						goto done;
3397 					err = insert_tree_entry(new_te, &paths);
3398 					if (err)
3399 						goto done;
3400 				}
3401 				err = report_ct_status(ct, status_cb,
3402 				    status_arg);
3403 				if (err)
3404 					goto done;
3405 			} else {
3406 				/* Entry is unchanged; just copy it. */
3407 				err = got_object_tree_entry_dup(&new_te, te);
3408 				if (err)
3409 					goto done;
3410 				err = insert_tree_entry(new_te, &paths);
3411 				if (err)
3412 					goto done;
3413 			}
3414 		}
3415 	}
3416 
3417 	/* Write new list of entries; deleted entries have been dropped. */
3418 	TAILQ_FOREACH(pe, &paths, entry) {
3419 		struct got_tree_entry *te = pe->data;
3420 		new_tree_entries.nentries++;
3421 		SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3422 	}
3423 	err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3424 done:
3425 	got_object_tree_entries_close(&new_tree_entries);
3426 	got_pathlist_free(&paths);
3427 	return err;
3428 }
3429 
3430 static const struct got_error *
3431 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3432     struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3433 {
3434 	const struct got_error *err = NULL;
3435 	struct got_pathlist_entry *pe;
3436 
3437 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3438 		struct got_fileindex_entry *ie;
3439 		struct got_commitable *ct = pe->data;
3440 
3441 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3442 		if (ie) {
3443 			if (ct->status == GOT_STATUS_DELETE ||
3444 			    ct->staged_status == GOT_STATUS_DELETE) {
3445 				got_fileindex_entry_remove(fileindex, ie);
3446 				got_fileindex_entry_free(ie);
3447 			} else if (ct->staged_status == GOT_STATUS_ADD ||
3448 			    ct->staged_status == GOT_STATUS_MODIFY) {
3449 				got_fileindex_entry_stage_set(ie,
3450 				    GOT_FILEIDX_STAGE_NONE);
3451 				err = got_fileindex_entry_update(ie,
3452 				    ct->ondisk_path, ct->staged_blob_id->sha1,
3453 				    new_base_commit_id->sha1, 1);
3454 			} else
3455 				err = got_fileindex_entry_update(ie,
3456 				    ct->ondisk_path, ct->blob_id->sha1,
3457 				    new_base_commit_id->sha1, 1);
3458 		} else {
3459 			err = got_fileindex_entry_alloc(&ie,
3460 			    ct->ondisk_path, pe->path, ct->blob_id->sha1,
3461 			    new_base_commit_id->sha1);
3462 			if (err)
3463 				break;
3464 			err = got_fileindex_entry_add(fileindex, ie);
3465 			if (err)
3466 				break;
3467 		}
3468 	}
3469 	return err;
3470 }
3471 
3472 
3473 static const struct got_error *
3474 check_out_of_date(const char *in_repo_path, unsigned char status,
3475     unsigned char staged_status, struct got_object_id *base_blob_id,
3476     struct got_object_id *base_commit_id,
3477     struct got_object_id *head_commit_id, struct got_repository *repo,
3478     int ood_errcode)
3479 {
3480 	const struct got_error *err = NULL;
3481 	struct got_object_id *id = NULL;
3482 
3483 	if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
3484 		/* Trivial case: base commit == head commit */
3485 		if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
3486 			return NULL;
3487 		/*
3488 		 * Ensure file content which local changes were based
3489 		 * on matches file content in the branch head.
3490 		 */
3491 		err = got_object_id_by_path(&id, repo, head_commit_id,
3492 		    in_repo_path);
3493 		if (err) {
3494 			if (err->code == GOT_ERR_NO_TREE_ENTRY)
3495 				err = got_error(ood_errcode);
3496 			goto done;
3497 		} else if (got_object_id_cmp(id, base_blob_id) != 0)
3498 			err = got_error(ood_errcode);
3499 	} else {
3500 		/* Require that added files don't exist in the branch head. */
3501 		err = got_object_id_by_path(&id, repo, head_commit_id,
3502 		    in_repo_path);
3503 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3504 			goto done;
3505 		err = id ? got_error(ood_errcode) : NULL;
3506 	}
3507 done:
3508 	free(id);
3509 	return err;
3510 }
3511 
3512 const struct got_error *
3513 commit_worktree(struct got_object_id **new_commit_id,
3514     struct got_pathlist_head *commitable_paths,
3515     struct got_object_id *head_commit_id, struct got_worktree *worktree,
3516     const char *author, const char *committer,
3517     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3518     got_worktree_status_cb status_cb, void *status_arg,
3519     struct got_repository *repo)
3520 {
3521 	const struct got_error *err = NULL, *unlockerr = NULL;
3522 	struct got_pathlist_entry *pe;
3523 	const char *head_ref_name = NULL;
3524 	struct got_commit_object *head_commit = NULL;
3525 	struct got_reference *head_ref2 = NULL;
3526 	struct got_object_id *head_commit_id2 = NULL;
3527 	struct got_tree_object *head_tree = NULL;
3528 	struct got_object_id *new_tree_id = NULL;
3529 	struct got_object_id_queue parent_ids;
3530 	struct got_object_qid *pid = NULL;
3531 	char *logmsg = NULL;
3532 
3533 	*new_commit_id = NULL;
3534 
3535 	SIMPLEQ_INIT(&parent_ids);
3536 
3537 	err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3538 	if (err)
3539 		goto done;
3540 
3541 	err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3542 	if (err)
3543 		goto done;
3544 
3545 	if (commit_msg_cb != NULL) {
3546 		err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3547 		if (err)
3548 			goto done;
3549 	}
3550 
3551 	if (logmsg == NULL || strlen(logmsg) == 0) {
3552 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3553 		goto done;
3554 	}
3555 
3556 	/* Create blobs from added and modified files and record their IDs. */
3557 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3558 		struct got_commitable *ct = pe->data;
3559 		char *ondisk_path;
3560 
3561 		/* Blobs for staged files already exist. */
3562 		if (ct->staged_status == GOT_STATUS_ADD ||
3563 		    ct->staged_status == GOT_STATUS_MODIFY)
3564 			continue;
3565 
3566 		if (ct->status != GOT_STATUS_ADD &&
3567 		    ct->status != GOT_STATUS_MODIFY)
3568 			continue;
3569 
3570 		if (asprintf(&ondisk_path, "%s/%s",
3571 		    worktree->root_path, pe->path) == -1) {
3572 			err = got_error_from_errno("asprintf");
3573 			goto done;
3574 		}
3575 		err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3576 		free(ondisk_path);
3577 		if (err)
3578 			goto done;
3579 	}
3580 
3581 	/* Recursively write new tree objects. */
3582 	err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3583 	    status_cb, status_arg, repo);
3584 	if (err)
3585 		goto done;
3586 
3587 	err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3588 	if (err)
3589 		goto done;
3590 	SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3591 	err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3592 	    1, author, time(NULL), committer, time(NULL), logmsg, repo);
3593 	got_object_qid_free(pid);
3594 	if (logmsg != NULL)
3595 		free(logmsg);
3596 	if (err)
3597 		goto done;
3598 
3599 	/* Check if a concurrent commit to our branch has occurred. */
3600 	head_ref_name = got_worktree_get_head_ref_name(worktree);
3601 	if (head_ref_name == NULL) {
3602 		err = got_error_from_errno("got_worktree_get_head_ref_name");
3603 		goto done;
3604 	}
3605 	/* Lock the reference here to prevent concurrent modification. */
3606 	err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3607 	if (err)
3608 		goto done;
3609 	err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3610 	if (err)
3611 		goto done;
3612 	if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3613 		err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3614 		goto done;
3615 	}
3616 	/* Update branch head in repository. */
3617 	err = got_ref_change_ref(head_ref2, *new_commit_id);
3618 	if (err)
3619 		goto done;
3620 	err = got_ref_write(head_ref2, repo);
3621 	if (err)
3622 		goto done;
3623 
3624 	err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3625 	if (err)
3626 		goto done;
3627 
3628 	err = ref_base_commit(worktree, repo);
3629 	if (err)
3630 		goto done;
3631 done:
3632 	if (head_tree)
3633 		got_object_tree_close(head_tree);
3634 	if (head_commit)
3635 		got_object_commit_close(head_commit);
3636 	free(head_commit_id2);
3637 	if (head_ref2) {
3638 		unlockerr = got_ref_unlock(head_ref2);
3639 		if (unlockerr && err == NULL)
3640 			err = unlockerr;
3641 		got_ref_close(head_ref2);
3642 	}
3643 	return err;
3644 }
3645 
3646 static const struct got_error *
3647 check_path_is_commitable(const char *path,
3648     struct got_pathlist_head *commitable_paths)
3649 {
3650 	struct got_pathlist_entry *cpe = NULL;
3651 	size_t path_len = strlen(path);
3652 
3653 	TAILQ_FOREACH(cpe, commitable_paths, entry) {
3654 		struct got_commitable *ct = cpe->data;
3655 		const char *ct_path = ct->path;
3656 
3657 		while (ct_path[0] == '/')
3658 			ct_path++;
3659 
3660 		if (strcmp(path, ct_path) == 0 ||
3661 		    got_path_is_child(ct_path, path, path_len))
3662 			break;
3663 	}
3664 
3665 	if (cpe == NULL)
3666 		return got_error_path(path, GOT_ERR_BAD_PATH);
3667 
3668 	return NULL;
3669 }
3670 
3671 static const struct got_error *
3672 check_staged_file(void *arg, struct got_fileindex_entry *ie)
3673 {
3674 	int *have_staged_files = arg;
3675 
3676 	if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
3677 		*have_staged_files = 1;
3678 		return got_error(GOT_ERR_CANCELLED);
3679 	}
3680 
3681 	return NULL;
3682 }
3683 
3684 static const struct got_error *
3685 check_non_staged_files(struct got_fileindex *fileindex,
3686     struct got_pathlist_head *paths)
3687 {
3688 	struct got_pathlist_entry *pe;
3689 	struct got_fileindex_entry *ie;
3690 
3691 	TAILQ_FOREACH(pe, paths, entry) {
3692 		if (pe->path[0] == '\0')
3693 			continue;
3694 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3695 		if (ie == NULL)
3696 			return got_error_path(pe->path, GOT_ERR_BAD_PATH);
3697 		if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
3698 			return got_error_path(pe->path,
3699 			    GOT_ERR_FILE_NOT_STAGED);
3700 	}
3701 
3702 	return NULL;
3703 }
3704 
3705 const struct got_error *
3706 got_worktree_commit(struct got_object_id **new_commit_id,
3707     struct got_worktree *worktree, struct got_pathlist_head *paths,
3708     const char *author, const char *committer,
3709     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3710     got_worktree_status_cb status_cb, void *status_arg,
3711     struct got_repository *repo)
3712 {
3713 	const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3714 	struct got_fileindex *fileindex = NULL;
3715 	char *fileindex_path = NULL;
3716 	struct got_pathlist_head commitable_paths;
3717 	struct collect_commitables_arg cc_arg;
3718 	struct got_pathlist_entry *pe;
3719 	struct got_reference *head_ref = NULL;
3720 	struct got_object_id *head_commit_id = NULL;
3721 	int have_staged_files = 0;
3722 
3723 	*new_commit_id = NULL;
3724 
3725 	TAILQ_INIT(&commitable_paths);
3726 
3727 	err = lock_worktree(worktree, LOCK_EX);
3728 	if (err)
3729 		goto done;
3730 
3731 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3732 	if (err)
3733 		goto done;
3734 
3735 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
3736 	if (err)
3737 		goto done;
3738 
3739 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3740 	if (err)
3741 		goto done;
3742 
3743 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
3744 	    &have_staged_files);
3745 	if (err && err->code != GOT_ERR_CANCELLED)
3746 		goto done;
3747 	if (have_staged_files) {
3748 		err = check_non_staged_files(fileindex, paths);
3749 		if (err)
3750 			goto done;
3751 	}
3752 
3753 	cc_arg.commitable_paths = &commitable_paths;
3754 	cc_arg.worktree = worktree;
3755 	cc_arg.repo = repo;
3756 	cc_arg.have_staged_files = have_staged_files;
3757 	TAILQ_FOREACH(pe, paths, entry) {
3758 		err = worktree_status(worktree, pe->path, fileindex, repo,
3759 		    collect_commitables, &cc_arg, NULL, NULL);
3760 		if (err)
3761 			goto done;
3762 	}
3763 
3764 	if (TAILQ_EMPTY(&commitable_paths)) {
3765 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3766 		goto done;
3767 	}
3768 
3769 	TAILQ_FOREACH(pe, paths, entry) {
3770 		err = check_path_is_commitable(pe->path, &commitable_paths);
3771 		if (err)
3772 			goto done;
3773 	}
3774 
3775 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
3776 		struct got_commitable *ct = pe->data;
3777 		const char *ct_path = ct->in_repo_path;
3778 
3779 		while (ct_path[0] == '/')
3780 			ct_path++;
3781 		err = check_out_of_date(ct_path, ct->status,
3782 		    ct->staged_status, ct->base_blob_id, ct->base_commit_id,
3783 		    head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
3784 		if (err)
3785 			goto done;
3786 
3787 	}
3788 
3789 	err = commit_worktree(new_commit_id, &commitable_paths,
3790 	    head_commit_id, worktree, author, committer,
3791 	    commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3792 	if (err)
3793 		goto done;
3794 
3795 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3796 	    fileindex);
3797 	sync_err = sync_fileindex(fileindex, fileindex_path);
3798 	if (sync_err && err == NULL)
3799 		err = sync_err;
3800 done:
3801 	if (fileindex)
3802 		got_fileindex_free(fileindex);
3803 	free(fileindex_path);
3804 	unlockerr = lock_worktree(worktree, LOCK_SH);
3805 	if (unlockerr && err == NULL)
3806 		err = unlockerr;
3807 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
3808 		struct got_commitable *ct = pe->data;
3809 		free_commitable(ct);
3810 	}
3811 	got_pathlist_free(&commitable_paths);
3812 	return err;
3813 }
3814 
3815 const char *
3816 got_commitable_get_path(struct got_commitable *ct)
3817 {
3818 	return ct->path;
3819 }
3820 
3821 unsigned int
3822 got_commitable_get_status(struct got_commitable *ct)
3823 {
3824 	return ct->status;
3825 }
3826 
3827 struct check_rebase_ok_arg {
3828 	struct got_worktree *worktree;
3829 	struct got_repository *repo;
3830 };
3831 
3832 static const struct got_error *
3833 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3834 {
3835 	const struct got_error *err = NULL;
3836 	struct check_rebase_ok_arg *a = arg;
3837 	unsigned char status;
3838 	struct stat sb;
3839 	char *ondisk_path;
3840 
3841 	/* Reject rebase of a work tree with mixed base commits. */
3842 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3843 	    SHA1_DIGEST_LENGTH))
3844 		return got_error(GOT_ERR_MIXED_COMMITS);
3845 
3846 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3847 	    == -1)
3848 		return got_error_from_errno("asprintf");
3849 
3850 	/* Reject rebase of a work tree with modified or staged files. */
3851 	err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3852 	free(ondisk_path);
3853 	if (err)
3854 		return err;
3855 
3856 	if (status != GOT_STATUS_NO_CHANGE)
3857 		return got_error(GOT_ERR_MODIFIED);
3858 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
3859 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
3860 
3861 	return NULL;
3862 }
3863 
3864 const struct got_error *
3865 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3866     struct got_reference **tmp_branch, struct got_fileindex **fileindex,
3867     struct got_worktree *worktree, struct got_reference *branch,
3868     struct got_repository *repo)
3869 {
3870 	const struct got_error *err = NULL;
3871 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3872 	char *branch_ref_name = NULL;
3873 	char *fileindex_path = NULL;
3874 	struct check_rebase_ok_arg ok_arg;
3875 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3876 
3877 	*new_base_branch_ref = NULL;
3878 	*tmp_branch = NULL;
3879 	*fileindex = NULL;
3880 
3881 	err = lock_worktree(worktree, LOCK_EX);
3882 	if (err)
3883 		return err;
3884 
3885 	err = open_fileindex(fileindex, &fileindex_path, worktree);
3886 	if (err)
3887 		goto done;
3888 
3889 	ok_arg.worktree = worktree;
3890 	ok_arg.repo = repo;
3891 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
3892 	    &ok_arg);
3893 	if (err)
3894 		goto done;
3895 
3896 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3897 	if (err)
3898 		goto done;
3899 
3900 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3901 	if (err)
3902 		goto done;
3903 
3904 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3905 	if (err)
3906 		goto done;
3907 
3908 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3909 	    0);
3910 	if (err)
3911 		goto done;
3912 
3913 	err = got_ref_alloc_symref(new_base_branch_ref,
3914 	    new_base_branch_ref_name, wt_branch);
3915 	if (err)
3916 		goto done;
3917 	err = got_ref_write(*new_base_branch_ref, repo);
3918 	if (err)
3919 		goto done;
3920 
3921 	/* TODO Lock original branch's ref while rebasing? */
3922 
3923 	err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3924 	if (err)
3925 		goto done;
3926 
3927 	err = got_ref_write(branch_ref, repo);
3928 	if (err)
3929 		goto done;
3930 
3931 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
3932 	    worktree->base_commit_id);
3933 	if (err)
3934 		goto done;
3935 	err = got_ref_write(*tmp_branch, repo);
3936 	if (err)
3937 		goto done;
3938 
3939 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
3940 	if (err)
3941 		goto done;
3942 done:
3943 	free(fileindex_path);
3944 	free(tmp_branch_name);
3945 	free(new_base_branch_ref_name);
3946 	free(branch_ref_name);
3947 	if (branch_ref)
3948 		got_ref_close(branch_ref);
3949 	if (wt_branch)
3950 		got_ref_close(wt_branch);
3951 	if (err) {
3952 		if (*new_base_branch_ref) {
3953 			got_ref_close(*new_base_branch_ref);
3954 			*new_base_branch_ref = NULL;
3955 		}
3956 		if (*tmp_branch) {
3957 			got_ref_close(*tmp_branch);
3958 			*tmp_branch = NULL;
3959 		}
3960 		if (*fileindex) {
3961 			got_fileindex_free(*fileindex);
3962 			*fileindex = NULL;
3963 		}
3964 		lock_worktree(worktree, LOCK_SH);
3965 	}
3966 	return err;
3967 }
3968 
3969 const struct got_error *
3970 got_worktree_rebase_continue(struct got_object_id **commit_id,
3971     struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3972     struct got_reference **branch, struct got_fileindex **fileindex,
3973     struct got_worktree *worktree, struct got_repository *repo)
3974 {
3975 	const struct got_error *err;
3976 	char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3977 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3978 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3979 	char *fileindex_path = NULL;
3980 	int have_staged_files = 0;
3981 
3982 	*commit_id = NULL;
3983 	*new_base_branch = NULL;
3984 	*tmp_branch = NULL;
3985 	*branch = NULL;
3986 	*fileindex = NULL;
3987 
3988 	err = lock_worktree(worktree, LOCK_EX);
3989 	if (err)
3990 		return err;
3991 
3992 	err = open_fileindex(fileindex, &fileindex_path, worktree);
3993 	if (err)
3994 		goto done;
3995 
3996 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
3997 	    &have_staged_files);
3998 	if (err && err->code != GOT_ERR_CANCELLED)
3999 		goto done;
4000 	if (have_staged_files) {
4001 		err = got_error(GOT_ERR_STAGED_PATHS);
4002 		goto done;
4003 	}
4004 
4005 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4006 	if (err)
4007 		goto done;
4008 
4009 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4010 	if (err)
4011 		goto done;
4012 
4013 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4014 	if (err)
4015 		goto done;
4016 
4017 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4018 	if (err)
4019 		goto done;
4020 
4021 	err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4022 	if (err)
4023 		goto done;
4024 
4025 	err = got_ref_open(branch, repo,
4026 	    got_ref_get_symref_target(branch_ref), 0);
4027 	if (err)
4028 		goto done;
4029 
4030 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4031 	if (err)
4032 		goto done;
4033 
4034 	err = got_ref_resolve(commit_id, repo, commit_ref);
4035 	if (err)
4036 		goto done;
4037 
4038 	err = got_ref_open(new_base_branch, repo,
4039 	    new_base_branch_ref_name, 0);
4040 	if (err)
4041 		goto done;
4042 
4043 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4044 	if (err)
4045 		goto done;
4046 done:
4047 	free(commit_ref_name);
4048 	free(branch_ref_name);
4049 	free(fileindex_path);
4050 	if (commit_ref)
4051 		got_ref_close(commit_ref);
4052 	if (branch_ref)
4053 		got_ref_close(branch_ref);
4054 	if (err) {
4055 		free(*commit_id);
4056 		*commit_id = NULL;
4057 		if (*tmp_branch) {
4058 			got_ref_close(*tmp_branch);
4059 			*tmp_branch = NULL;
4060 		}
4061 		if (*new_base_branch) {
4062 			got_ref_close(*new_base_branch);
4063 			*new_base_branch = NULL;
4064 		}
4065 		if (*branch) {
4066 			got_ref_close(*branch);
4067 			*branch = NULL;
4068 		}
4069 		if (*fileindex) {
4070 			got_fileindex_free(*fileindex);
4071 			*fileindex = NULL;
4072 		}
4073 		lock_worktree(worktree, LOCK_SH);
4074 	}
4075 	return err;
4076 }
4077 
4078 const struct got_error *
4079 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4080 {
4081 	const struct got_error *err;
4082 	char *tmp_branch_name = NULL;
4083 
4084 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4085 	if (err)
4086 		return err;
4087 
4088 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4089 	free(tmp_branch_name);
4090 	return NULL;
4091 }
4092 
4093 static const struct got_error *
4094 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4095     char **logmsg, void *arg)
4096 {
4097 	*logmsg = arg;
4098 	return NULL;
4099 }
4100 
4101 static const struct got_error *
4102 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4103     const char *path, struct got_object_id *blob_id,
4104     struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
4105 {
4106 	return NULL;
4107 }
4108 
4109 struct collect_merged_paths_arg {
4110 	got_worktree_checkout_cb progress_cb;
4111 	void *progress_arg;
4112 	struct got_pathlist_head *merged_paths;
4113 };
4114 
4115 static const struct got_error *
4116 collect_merged_paths(void *arg, unsigned char status, const char *path)
4117 {
4118 	const struct got_error *err;
4119 	struct collect_merged_paths_arg *a = arg;
4120 	char *p;
4121 	struct got_pathlist_entry *new;
4122 
4123 	err = (*a->progress_cb)(a->progress_arg, status, path);
4124 	if (err)
4125 		return err;
4126 
4127 	if (status != GOT_STATUS_MERGE &&
4128 	    status != GOT_STATUS_ADD &&
4129 	    status != GOT_STATUS_DELETE &&
4130 	    status != GOT_STATUS_CONFLICT)
4131 		return NULL;
4132 
4133 	p = strdup(path);
4134 	if (p == NULL)
4135 		return got_error_from_errno("strdup");
4136 
4137 	err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4138 	if (err || new == NULL)
4139 		free(p);
4140 	return err;
4141 }
4142 
4143 void
4144 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4145 {
4146 	struct got_pathlist_entry *pe;
4147 
4148 	TAILQ_FOREACH(pe, merged_paths, entry)
4149 		free((char *)pe->path);
4150 
4151 	got_pathlist_free(merged_paths);
4152 }
4153 
4154 static const struct got_error *
4155 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4156     struct got_repository *repo)
4157 {
4158 	const struct got_error *err;
4159 	struct got_reference *commit_ref = NULL;
4160 
4161 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4162 	if (err) {
4163 		if (err->code != GOT_ERR_NOT_REF)
4164 			goto done;
4165 		err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4166 		if (err)
4167 			goto done;
4168 		err = got_ref_write(commit_ref, repo);
4169 		if (err)
4170 			goto done;
4171 	} else {
4172 		struct got_object_id *stored_id;
4173 		int cmp;
4174 
4175 		err = got_ref_resolve(&stored_id, repo, commit_ref);
4176 		if (err)
4177 			goto done;
4178 		cmp = got_object_id_cmp(commit_id, stored_id);
4179 		free(stored_id);
4180 		if (cmp != 0) {
4181 			err = got_error(GOT_ERR_REBASE_COMMITID);
4182 			goto done;
4183 		}
4184 	}
4185 done:
4186 	if (commit_ref)
4187 		got_ref_close(commit_ref);
4188 	return err;
4189 }
4190 
4191 static const struct got_error *
4192 rebase_merge_files(struct got_pathlist_head *merged_paths,
4193     const char *commit_ref_name, struct got_worktree *worktree,
4194     struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4195     struct got_object_id *commit_id, struct got_repository *repo,
4196     got_worktree_checkout_cb progress_cb, void *progress_arg,
4197     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4198 {
4199 	const struct got_error *err;
4200 	struct got_reference *commit_ref = NULL;
4201 	struct collect_merged_paths_arg cmp_arg;
4202 	char *fileindex_path;
4203 
4204 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
4205 
4206 	err = get_fileindex_path(&fileindex_path, worktree);
4207 	if (err)
4208 		return err;
4209 
4210 	cmp_arg.progress_cb = progress_cb;
4211 	cmp_arg.progress_arg = progress_arg;
4212 	cmp_arg.merged_paths = merged_paths;
4213 	err = merge_files(worktree, fileindex, fileindex_path,
4214 	    parent_commit_id, commit_id, repo, collect_merged_paths,
4215 	    &cmp_arg, cancel_cb, cancel_arg);
4216 	if (commit_ref)
4217 		got_ref_close(commit_ref);
4218 	return err;
4219 }
4220 
4221 const struct got_error *
4222 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4223     struct got_worktree *worktree, struct got_fileindex *fileindex,
4224     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4225     struct got_repository *repo,
4226     got_worktree_checkout_cb progress_cb, void *progress_arg,
4227     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4228 {
4229 	const struct got_error *err;
4230 	char *commit_ref_name;
4231 
4232 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4233 	if (err)
4234 		return err;
4235 
4236 	err = store_commit_id(commit_ref_name, commit_id, repo);
4237 	if (err)
4238 		goto done;
4239 
4240 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4241 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
4242 	    progress_arg, cancel_cb, cancel_arg);
4243 done:
4244 	free(commit_ref_name);
4245 	return err;
4246 }
4247 
4248 const struct got_error *
4249 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4250     struct got_worktree *worktree, struct got_fileindex *fileindex,
4251     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4252     struct got_repository *repo,
4253     got_worktree_checkout_cb progress_cb, void *progress_arg,
4254     got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4255 {
4256 	const struct got_error *err;
4257 	char *commit_ref_name;
4258 
4259 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4260 	if (err)
4261 		return err;
4262 
4263 	err = store_commit_id(commit_ref_name, commit_id, repo);
4264 	if (err)
4265 		goto done;
4266 
4267 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4268 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
4269 	    progress_arg, cancel_cb, cancel_arg);
4270 done:
4271 	free(commit_ref_name);
4272 	return err;
4273 }
4274 
4275 static const struct got_error *
4276 rebase_commit(struct got_object_id **new_commit_id,
4277     struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4278     struct got_worktree *worktree, struct got_fileindex *fileindex,
4279     struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4280     const char *new_logmsg, struct got_repository *repo)
4281 {
4282 	const struct got_error *err, *sync_err;
4283 	struct got_pathlist_head commitable_paths;
4284 	struct collect_commitables_arg cc_arg;
4285 	char *fileindex_path = NULL;
4286 	struct got_reference *head_ref = NULL;
4287 	struct got_object_id *head_commit_id = NULL;
4288 	char *logmsg = NULL;
4289 
4290 	TAILQ_INIT(&commitable_paths);
4291 	*new_commit_id = NULL;
4292 
4293 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
4294 
4295 	err = get_fileindex_path(&fileindex_path, worktree);
4296 	if (err)
4297 		return err;
4298 
4299 	cc_arg.commitable_paths = &commitable_paths;
4300 	cc_arg.worktree = worktree;
4301 	cc_arg.repo = repo;
4302 	cc_arg.have_staged_files = 0;
4303 	/*
4304 	 * If possible get the status of individual files directly to
4305 	 * avoid crawling the entire work tree once per rebased commit.
4306 	 * TODO: Ideally, merged_paths would contain a list of commitables
4307 	 * we could use so we could skip worktree_status() entirely.
4308 	 */
4309 	if (merged_paths) {
4310 		struct got_pathlist_entry *pe;
4311 		if (TAILQ_EMPTY(merged_paths)) {
4312 			err = got_error(GOT_ERR_NO_MERGED_PATHS);
4313 			goto done;
4314 		}
4315 		TAILQ_FOREACH(pe, merged_paths, entry) {
4316 			err = worktree_status(worktree, pe->path, fileindex,
4317 			    repo, collect_commitables, &cc_arg, NULL, NULL);
4318 			if (err)
4319 				goto done;
4320 		}
4321 	} else {
4322 		err = worktree_status(worktree, "", fileindex, repo,
4323 		    collect_commitables, &cc_arg, NULL, NULL);
4324 		if (err)
4325 			goto done;
4326 	}
4327 
4328 	if (TAILQ_EMPTY(&commitable_paths)) {
4329 		/* No-op change; commit will be elided. */
4330 		err = got_ref_delete(commit_ref, repo);
4331 		if (err)
4332 			goto done;
4333 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4334 		goto done;
4335 	}
4336 
4337 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4338 	if (err)
4339 		goto done;
4340 
4341 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
4342 	if (err)
4343 		goto done;
4344 
4345 	if (new_logmsg)
4346 		logmsg = strdup(new_logmsg);
4347 	else
4348 		logmsg = strdup(got_object_commit_get_logmsg(orig_commit));
4349 	if (logmsg == NULL)
4350 		return got_error_from_errno("strdup");
4351 
4352 	err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4353 	    worktree, got_object_commit_get_author(orig_commit),
4354 	    got_object_commit_get_committer(orig_commit),
4355 	    collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4356 	if (err)
4357 		goto done;
4358 
4359 	err = got_ref_change_ref(tmp_branch, *new_commit_id);
4360 	if (err)
4361 		goto done;
4362 
4363 	err = got_ref_delete(commit_ref, repo);
4364 	if (err)
4365 		goto done;
4366 
4367 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4368 	    fileindex);
4369 	sync_err = sync_fileindex(fileindex, fileindex_path);
4370 	if (sync_err && err == NULL)
4371 		err = sync_err;
4372 done:
4373 	free(fileindex_path);
4374 	free(head_commit_id);
4375 	if (head_ref)
4376 		got_ref_close(head_ref);
4377 	if (err) {
4378 		free(*new_commit_id);
4379 		*new_commit_id = NULL;
4380 	}
4381 	return err;
4382 }
4383 
4384 const struct got_error *
4385 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4386     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4387     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4388     struct got_commit_object *orig_commit,
4389     struct got_object_id *orig_commit_id, struct got_repository *repo)
4390 {
4391 	const struct got_error *err;
4392 	char *commit_ref_name;
4393 	struct got_reference *commit_ref = NULL;
4394 	struct got_object_id *commit_id = NULL;
4395 
4396 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4397 	if (err)
4398 		return err;
4399 
4400 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4401 	if (err)
4402 		goto done;
4403 	err = got_ref_resolve(&commit_id, repo, commit_ref);
4404 	if (err)
4405 		goto done;
4406 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4407 		err = got_error(GOT_ERR_REBASE_COMMITID);
4408 		goto done;
4409 	}
4410 
4411 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4412 	    worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4413 done:
4414 	if (commit_ref)
4415 		got_ref_close(commit_ref);
4416 	free(commit_ref_name);
4417 	free(commit_id);
4418 	return err;
4419 }
4420 
4421 const struct got_error *
4422 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4423     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4424     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4425     struct got_commit_object *orig_commit,
4426     struct got_object_id *orig_commit_id, const char *new_logmsg,
4427     struct got_repository *repo)
4428 {
4429 	const struct got_error *err;
4430 	char *commit_ref_name;
4431 	struct got_reference *commit_ref = NULL;
4432 	struct got_object_id *commit_id = NULL;
4433 
4434 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4435 	if (err)
4436 		return err;
4437 
4438 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4439 	if (err)
4440 		goto done;
4441 	err = got_ref_resolve(&commit_id, repo, commit_ref);
4442 	if (err)
4443 		goto done;
4444 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4445 		err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4446 		goto done;
4447 	}
4448 
4449 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4450 	    worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4451 done:
4452 	if (commit_ref)
4453 		got_ref_close(commit_ref);
4454 	free(commit_ref_name);
4455 	free(commit_id);
4456 	return err;
4457 }
4458 
4459 const struct got_error *
4460 got_worktree_rebase_postpone(struct got_worktree *worktree,
4461     struct got_fileindex *fileindex)
4462 {
4463 	if (fileindex)
4464 		got_fileindex_free(fileindex);
4465 	return lock_worktree(worktree, LOCK_SH);
4466 }
4467 
4468 static const struct got_error *
4469 delete_ref(const char *name, struct got_repository *repo)
4470 {
4471 	const struct got_error *err;
4472 	struct got_reference *ref;
4473 
4474 	err = got_ref_open(&ref, repo, name, 0);
4475 	if (err) {
4476 		if (err->code == GOT_ERR_NOT_REF)
4477 			return NULL;
4478 		return err;
4479 	}
4480 
4481 	err = got_ref_delete(ref, repo);
4482 	got_ref_close(ref);
4483 	return err;
4484 }
4485 
4486 static const struct got_error *
4487 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4488 {
4489 	const struct got_error *err;
4490 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4491 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
4492 
4493 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4494 	if (err)
4495 		goto done;
4496 	err = delete_ref(tmp_branch_name, repo);
4497 	if (err)
4498 		goto done;
4499 
4500 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4501 	if (err)
4502 		goto done;
4503 	err = delete_ref(new_base_branch_ref_name, repo);
4504 	if (err)
4505 		goto done;
4506 
4507 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4508 	if (err)
4509 		goto done;
4510 	err = delete_ref(branch_ref_name, repo);
4511 	if (err)
4512 		goto done;
4513 
4514 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4515 	if (err)
4516 		goto done;
4517 	err = delete_ref(commit_ref_name, repo);
4518 	if (err)
4519 		goto done;
4520 
4521 done:
4522 	free(tmp_branch_name);
4523 	free(new_base_branch_ref_name);
4524 	free(branch_ref_name);
4525 	free(commit_ref_name);
4526 	return err;
4527 }
4528 
4529 const struct got_error *
4530 got_worktree_rebase_complete(struct got_worktree *worktree,
4531     struct got_fileindex *fileindex, struct got_reference *new_base_branch,
4532     struct got_reference *tmp_branch, struct got_reference *rebased_branch,
4533     struct got_repository *repo)
4534 {
4535 	const struct got_error *err, *unlockerr;
4536 	struct got_object_id *new_head_commit_id = NULL;
4537 
4538 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4539 	if (err)
4540 		return err;
4541 
4542 	err = got_ref_change_ref(rebased_branch, new_head_commit_id);
4543 	if (err)
4544 		goto done;
4545 
4546 	err = got_ref_write(rebased_branch, repo);
4547 	if (err)
4548 		goto done;
4549 
4550 	err = got_worktree_set_head_ref(worktree, rebased_branch);
4551 	if (err)
4552 		goto done;
4553 
4554 	err = delete_rebase_refs(worktree, repo);
4555 done:
4556 	if (fileindex)
4557 		got_fileindex_free(fileindex);
4558 	free(new_head_commit_id);
4559 	unlockerr = lock_worktree(worktree, LOCK_SH);
4560 	if (unlockerr && err == NULL)
4561 		err = unlockerr;
4562 	return err;
4563 }
4564 
4565 const struct got_error *
4566 got_worktree_rebase_abort(struct got_worktree *worktree,
4567     struct got_fileindex *fileindex, struct got_repository *repo,
4568     struct got_reference *new_base_branch,
4569      got_worktree_checkout_cb progress_cb, void *progress_arg)
4570 {
4571 	const struct got_error *err, *unlockerr, *sync_err;
4572 	struct got_reference *resolved = NULL;
4573 	struct got_object_id *commit_id = NULL;
4574 	char *fileindex_path = NULL;
4575 	struct revert_file_args rfa;
4576 	struct got_object_id *tree_id = NULL;
4577 
4578 	err = lock_worktree(worktree, LOCK_EX);
4579 	if (err)
4580 		return err;
4581 
4582 	err = got_ref_open(&resolved, repo,
4583 	    got_ref_get_symref_target(new_base_branch), 0);
4584 	if (err)
4585 		goto done;
4586 
4587 	err = got_worktree_set_head_ref(worktree, resolved);
4588 	if (err)
4589 		goto done;
4590 
4591 	/*
4592 	 * XXX commits to the base branch could have happened while
4593 	 * we were busy rebasing; should we store the original commit ID
4594 	 * when rebase begins and read it back here?
4595 	 */
4596 	err = got_ref_resolve(&commit_id, repo, resolved);
4597 	if (err)
4598 		goto done;
4599 
4600 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4601 	if (err)
4602 		goto done;
4603 
4604 	err = got_object_id_by_path(&tree_id, repo,
4605 	    worktree->base_commit_id, worktree->path_prefix);
4606 	if (err)
4607 		goto done;
4608 
4609 	err = delete_rebase_refs(worktree, repo);
4610 	if (err)
4611 		goto done;
4612 
4613 	err = get_fileindex_path(&fileindex_path, worktree);
4614 	if (err)
4615 		goto done;
4616 
4617 	rfa.worktree = worktree;
4618 	rfa.fileindex = fileindex;
4619 	rfa.progress_cb = progress_cb;
4620 	rfa.progress_arg = progress_arg;
4621 	rfa.repo = repo;
4622 	err = worktree_status(worktree, "", fileindex, repo,
4623 	    revert_file, &rfa, NULL, NULL);
4624 	if (err)
4625 		goto sync;
4626 
4627 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4628 	    repo, progress_cb, progress_arg, NULL, NULL);
4629 sync:
4630 	sync_err = sync_fileindex(fileindex, fileindex_path);
4631 	if (sync_err && err == NULL)
4632 		err = sync_err;
4633 done:
4634 	got_ref_close(resolved);
4635 	free(tree_id);
4636 	free(commit_id);
4637 	if (fileindex)
4638 		got_fileindex_free(fileindex);
4639 	free(fileindex_path);
4640 
4641 	unlockerr = lock_worktree(worktree, LOCK_SH);
4642 	if (unlockerr && err == NULL)
4643 		err = unlockerr;
4644 	return err;
4645 }
4646 
4647 const struct got_error *
4648 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
4649     struct got_reference **branch_ref, struct got_object_id **base_commit_id,
4650     struct got_fileindex **fileindex, struct got_worktree *worktree,
4651     struct got_repository *repo)
4652 {
4653 	const struct got_error *err = NULL;
4654 	char *tmp_branch_name = NULL;
4655 	char *branch_ref_name = NULL;
4656 	char *base_commit_ref_name = NULL;
4657 	char *fileindex_path = NULL;
4658 	struct check_rebase_ok_arg ok_arg;
4659 	struct got_reference *wt_branch = NULL;
4660 	struct got_reference *base_commit_ref = NULL;
4661 
4662 	*tmp_branch = NULL;
4663 	*branch_ref = NULL;
4664 	*base_commit_id = NULL;
4665 	*fileindex = NULL;
4666 
4667 	err = lock_worktree(worktree, LOCK_EX);
4668 	if (err)
4669 		return err;
4670 
4671 	err = open_fileindex(fileindex, &fileindex_path, worktree);
4672 	if (err)
4673 		goto done;
4674 
4675 	ok_arg.worktree = worktree;
4676 	ok_arg.repo = repo;
4677 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4678 	    &ok_arg);
4679 	if (err)
4680 		goto done;
4681 
4682 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4683 	if (err)
4684 		goto done;
4685 
4686 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4687 	if (err)
4688 		goto done;
4689 
4690 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4691 	    worktree);
4692 	if (err)
4693 		goto done;
4694 
4695 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4696 	    0);
4697 	if (err)
4698 		goto done;
4699 
4700 	err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
4701 	if (err)
4702 		goto done;
4703 
4704 	err = got_ref_write(*branch_ref, repo);
4705 	if (err)
4706 		goto done;
4707 
4708 	err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
4709 	    worktree->base_commit_id);
4710 	if (err)
4711 		goto done;
4712 	err = got_ref_write(base_commit_ref, repo);
4713 	if (err)
4714 		goto done;
4715 	*base_commit_id = got_object_id_dup(worktree->base_commit_id);
4716 	if (*base_commit_id == NULL) {
4717 		err = got_error_from_errno("got_object_id_dup");
4718 		goto done;
4719 	}
4720 
4721 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
4722 	    worktree->base_commit_id);
4723 	if (err)
4724 		goto done;
4725 	err = got_ref_write(*tmp_branch, repo);
4726 	if (err)
4727 		goto done;
4728 
4729 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
4730 	if (err)
4731 		goto done;
4732 done:
4733 	free(fileindex_path);
4734 	free(tmp_branch_name);
4735 	free(branch_ref_name);
4736 	free(base_commit_ref_name);
4737 	if (wt_branch)
4738 		got_ref_close(wt_branch);
4739 	if (err) {
4740 		if (*branch_ref) {
4741 			got_ref_close(*branch_ref);
4742 			*branch_ref = NULL;
4743 		}
4744 		if (*tmp_branch) {
4745 			got_ref_close(*tmp_branch);
4746 			*tmp_branch = NULL;
4747 		}
4748 		free(*base_commit_id);
4749 		if (*fileindex) {
4750 			got_fileindex_free(*fileindex);
4751 			*fileindex = NULL;
4752 		}
4753 		lock_worktree(worktree, LOCK_SH);
4754 	}
4755 	return err;
4756 }
4757 
4758 const struct got_error *
4759 got_worktree_histedit_postpone(struct got_worktree *worktree,
4760     struct got_fileindex *fileindex)
4761 {
4762 	if (fileindex)
4763 		got_fileindex_free(fileindex);
4764 	return lock_worktree(worktree, LOCK_SH);
4765 }
4766 
4767 const struct got_error *
4768 got_worktree_histedit_in_progress(int *in_progress,
4769     struct got_worktree *worktree)
4770 {
4771 	const struct got_error *err;
4772 	char *tmp_branch_name = NULL;
4773 
4774 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4775 	if (err)
4776 		return err;
4777 
4778 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4779 	free(tmp_branch_name);
4780 	return NULL;
4781 }
4782 
4783 const struct got_error *
4784 got_worktree_histedit_continue(struct got_object_id **commit_id,
4785     struct got_reference **tmp_branch, struct got_reference **branch_ref,
4786     struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
4787     struct got_worktree *worktree, struct got_repository *repo)
4788 {
4789 	const struct got_error *err;
4790 	char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
4791 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4792 	struct got_reference *commit_ref = NULL;
4793 	struct got_reference *base_commit_ref = NULL;
4794 	char *fileindex_path = NULL;
4795 	int have_staged_files = 0;
4796 
4797 	*commit_id = NULL;
4798 	*tmp_branch = NULL;
4799 	*base_commit_id = NULL;
4800 	*fileindex = NULL;
4801 
4802 	err = lock_worktree(worktree, LOCK_EX);
4803 	if (err)
4804 		return err;
4805 
4806 	err = open_fileindex(fileindex, &fileindex_path, worktree);
4807 	if (err)
4808 		goto done;
4809 
4810 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4811 	    &have_staged_files);
4812 	if (err && err->code != GOT_ERR_CANCELLED)
4813 		goto done;
4814 	if (have_staged_files) {
4815 		err = got_error(GOT_ERR_STAGED_PATHS);
4816 		goto done;
4817 	}
4818 
4819 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4820 	if (err)
4821 		goto done;
4822 
4823 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4824 	if (err)
4825 		goto done;
4826 
4827 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4828 	if (err)
4829 		goto done;
4830 
4831 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4832 	    worktree);
4833 	if (err)
4834 		goto done;
4835 
4836 	err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
4837 	if (err)
4838 		goto done;
4839 
4840 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4841 	if (err)
4842 		goto done;
4843 	err = got_ref_resolve(commit_id, repo, commit_ref);
4844 	if (err)
4845 		goto done;
4846 
4847 	err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
4848 	if (err)
4849 		goto done;
4850 	err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
4851 	if (err)
4852 		goto done;
4853 
4854 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4855 	if (err)
4856 		goto done;
4857 done:
4858 	free(commit_ref_name);
4859 	free(branch_ref_name);
4860 	free(fileindex_path);
4861 	if (commit_ref)
4862 		got_ref_close(commit_ref);
4863 	if (base_commit_ref)
4864 		got_ref_close(base_commit_ref);
4865 	if (err) {
4866 		free(*commit_id);
4867 		*commit_id = NULL;
4868 		free(*base_commit_id);
4869 		*base_commit_id = NULL;
4870 		if (*tmp_branch) {
4871 			got_ref_close(*tmp_branch);
4872 			*tmp_branch = NULL;
4873 		}
4874 		if (*fileindex) {
4875 			got_fileindex_free(*fileindex);
4876 			*fileindex = NULL;
4877 		}
4878 		lock_worktree(worktree, LOCK_EX);
4879 	}
4880 	return err;
4881 }
4882 
4883 static const struct got_error *
4884 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
4885 {
4886 	const struct got_error *err;
4887 	char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
4888 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
4889 
4890 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4891 	if (err)
4892 		goto done;
4893 	err = delete_ref(tmp_branch_name, repo);
4894 	if (err)
4895 		goto done;
4896 
4897 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4898 	    worktree);
4899 	if (err)
4900 		goto done;
4901 	err = delete_ref(base_commit_ref_name, repo);
4902 	if (err)
4903 		goto done;
4904 
4905 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4906 	if (err)
4907 		goto done;
4908 	err = delete_ref(branch_ref_name, repo);
4909 	if (err)
4910 		goto done;
4911 
4912 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4913 	if (err)
4914 		goto done;
4915 	err = delete_ref(commit_ref_name, repo);
4916 	if (err)
4917 		goto done;
4918 done:
4919 	free(tmp_branch_name);
4920 	free(base_commit_ref_name);
4921 	free(branch_ref_name);
4922 	free(commit_ref_name);
4923 	return err;
4924 }
4925 
4926 const struct got_error *
4927 got_worktree_histedit_abort(struct got_worktree *worktree,
4928     struct got_fileindex *fileindex, struct got_repository *repo,
4929     struct got_reference *branch, struct got_object_id *base_commit_id,
4930     got_worktree_checkout_cb progress_cb, void *progress_arg)
4931 {
4932 	const struct got_error *err, *unlockerr, *sync_err;
4933 	struct got_reference *resolved = NULL;
4934 	char *fileindex_path = NULL;
4935 	struct got_object_id *tree_id = NULL;
4936 	struct revert_file_args rfa;
4937 
4938 	err = lock_worktree(worktree, LOCK_EX);
4939 	if (err)
4940 		return err;
4941 
4942 	err = got_ref_open(&resolved, repo,
4943 	    got_ref_get_symref_target(branch), 0);
4944 	if (err)
4945 		goto done;
4946 
4947 	err = got_worktree_set_head_ref(worktree, resolved);
4948 	if (err)
4949 		goto done;
4950 
4951 	err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
4952 	if (err)
4953 		goto done;
4954 
4955 	err = got_object_id_by_path(&tree_id, repo, base_commit_id,
4956 	    worktree->path_prefix);
4957 	if (err)
4958 		goto done;
4959 
4960 	err = delete_histedit_refs(worktree, repo);
4961 	if (err)
4962 		goto done;
4963 
4964 	err = get_fileindex_path(&fileindex_path, worktree);
4965 	if (err)
4966 		goto done;
4967 
4968 	rfa.worktree = worktree;
4969 	rfa.fileindex = fileindex;
4970 	rfa.progress_cb = progress_cb;
4971 	rfa.progress_arg = progress_arg;
4972 	rfa.repo = repo;
4973 	err = worktree_status(worktree, "", fileindex, repo,
4974 	    revert_file, &rfa, NULL, NULL);
4975 	if (err)
4976 		goto sync;
4977 
4978 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4979 	    repo, progress_cb, progress_arg, NULL, NULL);
4980 sync:
4981 	sync_err = sync_fileindex(fileindex, fileindex_path);
4982 	if (sync_err && err == NULL)
4983 		err = sync_err;
4984 done:
4985 	got_ref_close(resolved);
4986 	free(tree_id);
4987 	free(fileindex_path);
4988 
4989 	unlockerr = lock_worktree(worktree, LOCK_SH);
4990 	if (unlockerr && err == NULL)
4991 		err = unlockerr;
4992 	return err;
4993 }
4994 
4995 const struct got_error *
4996 got_worktree_histedit_complete(struct got_worktree *worktree,
4997     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4998     struct got_reference *edited_branch, struct got_repository *repo)
4999 {
5000 	const struct got_error *err, *unlockerr;
5001 	struct got_object_id *new_head_commit_id = NULL;
5002 	struct got_reference *resolved = NULL;
5003 
5004 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5005 	if (err)
5006 		return err;
5007 
5008 	err = got_ref_open(&resolved, repo,
5009 	    got_ref_get_symref_target(edited_branch), 0);
5010 	if (err)
5011 		goto done;
5012 
5013 	err = got_ref_change_ref(resolved, new_head_commit_id);
5014 	if (err)
5015 		goto done;
5016 
5017 	err = got_ref_write(resolved, repo);
5018 	if (err)
5019 		goto done;
5020 
5021 	err = got_worktree_set_head_ref(worktree, resolved);
5022 	if (err)
5023 		goto done;
5024 
5025 	err = delete_histedit_refs(worktree, repo);
5026 done:
5027 	if (fileindex)
5028 		got_fileindex_free(fileindex);
5029 	free(new_head_commit_id);
5030 	unlockerr = lock_worktree(worktree, LOCK_SH);
5031 	if (unlockerr && err == NULL)
5032 		err = unlockerr;
5033 	return err;
5034 }
5035 
5036 const struct got_error *
5037 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5038     struct got_object_id *commit_id, struct got_repository *repo)
5039 {
5040 	const struct got_error *err;
5041 	char *commit_ref_name;
5042 
5043 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5044 	if (err)
5045 		return err;
5046 
5047 	err = store_commit_id(commit_ref_name, commit_id, repo);
5048 	if (err)
5049 		goto done;
5050 
5051 	err = delete_ref(commit_ref_name, repo);
5052 done:
5053 	free(commit_ref_name);
5054 	return err;
5055 }
5056 
5057 struct check_stage_ok_arg {
5058 	struct got_object_id *head_commit_id;
5059 	struct got_worktree *worktree;
5060 	struct got_fileindex *fileindex;
5061 	struct got_repository *repo;
5062 	int have_changes;
5063 };
5064 
5065 const struct got_error *
5066 check_stage_ok(void *arg, unsigned char status,
5067     unsigned char staged_status, const char *relpath,
5068     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5069     struct got_object_id *commit_id)
5070 {
5071 	struct check_stage_ok_arg *a = arg;
5072 	const struct got_error *err = NULL;
5073 	struct got_fileindex_entry *ie;
5074 	struct got_object_id base_commit_id;
5075 	struct got_object_id *base_commit_idp = NULL;
5076 	char *in_repo_path = NULL, *p;
5077 
5078 	if (status == GOT_STATUS_UNVERSIONED)
5079 		return NULL;
5080 
5081 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5082 	if (ie == NULL)
5083 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5084 
5085 	if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
5086 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5087 	    relpath) == -1)
5088 		return got_error_from_errno("asprintf");
5089 
5090 	if (got_fileindex_entry_has_commit(ie)) {
5091 		memcpy(base_commit_id.sha1, ie->commit_sha1,
5092 		    SHA1_DIGEST_LENGTH);
5093 		base_commit_idp = &base_commit_id;
5094 	}
5095 
5096 	if (status == GOT_STATUS_NO_CHANGE) {
5097 		err = got_error_path(ie->path, GOT_ERR_STAGE_NO_CHANGE);
5098 		goto done;
5099 	} else if (status == GOT_STATUS_CONFLICT) {
5100 		err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
5101 		goto done;
5102 	} else if (status != GOT_STATUS_ADD &&
5103 	    status != GOT_STATUS_MODIFY &&
5104 	    status != GOT_STATUS_DELETE) {
5105 		err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
5106 		goto done;
5107 	}
5108 
5109 	a->have_changes = 1;
5110 
5111 	p = in_repo_path;
5112 	while (p[0] == '/')
5113 		p++;
5114 	err = check_out_of_date(p, status, staged_status,
5115 	    blob_id, base_commit_idp, a->head_commit_id, a->repo,
5116 	    GOT_ERR_STAGE_OUT_OF_DATE);
5117 done:
5118 	free(in_repo_path);
5119 	return err;
5120 }
5121 
5122 static const struct got_error *
5123 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
5124 {
5125 	const struct got_error *err = NULL;
5126 	char *line = NULL;
5127 	size_t linesize = 0, n;
5128 	ssize_t linelen;
5129 
5130 	linelen = getline(&line, &linesize, infile);
5131 	if (linelen == -1) {
5132 		if (ferror(infile)) {
5133 			err = got_error_from_errno("getline");
5134 			goto done;
5135 		}
5136 		return NULL;
5137 	}
5138 	if (outfile) {
5139 		n = fwrite(line, 1, linelen, outfile);
5140 		if (n != linelen) {
5141 			err = got_ferror(outfile, GOT_ERR_IO);
5142 			goto done;
5143 		}
5144 	}
5145 	if (rejectfile) {
5146 		n = fwrite(line, 1, linelen, rejectfile);
5147 		if (n != linelen)
5148 			err = got_ferror(outfile, GOT_ERR_IO);
5149 	}
5150 done:
5151 	free(line);
5152 	return err;
5153 }
5154 
5155 static const struct got_error *
5156 skip_one_line(FILE *f)
5157 {
5158 	char *line = NULL;
5159 	size_t linesize = 0;
5160 	ssize_t linelen;
5161 
5162 	linelen = getline(&line, &linesize, f);
5163 	free(line);
5164 	if (linelen == -1 && ferror(f))
5165 		return got_error_from_errno("getline");
5166 	return NULL;
5167 }
5168 
5169 static const struct got_error *
5170 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
5171     int start_old, int end_old, int start_new, int end_new,
5172     FILE *outfile, FILE *rejectfile)
5173  {
5174 	const struct got_error *err;
5175 
5176 	/* Copy old file's lines leading up to patch. */
5177 	while (!feof(f1) && *line_cur1 < start_old) {
5178 		err = copy_one_line(f1, outfile, NULL);
5179 		if (err)
5180 			return err;
5181 		(*line_cur1)++;
5182 	}
5183 	/* Skip new file's lines leading up to patch. */
5184 	while (!feof(f2) && *line_cur2 < start_new) {
5185 		if (rejectfile)
5186 			err = copy_one_line(f2, NULL, rejectfile);
5187 		else
5188 			err = skip_one_line(f2);
5189 		if (err)
5190 			return err;
5191 		(*line_cur2)++;
5192 	}
5193 	/* Copy patched lines. */
5194 	while (!feof(f2) && *line_cur2 <= end_new) {
5195 		err = copy_one_line(f2, outfile, NULL);
5196 		if (err)
5197 			return err;
5198 		(*line_cur2)++;
5199 	}
5200 	/* Skip over old file's replaced lines. */
5201 	while (!feof(f1) && *line_cur1 <= end_new) {
5202 		if (rejectfile)
5203 			err = copy_one_line(f1, NULL, rejectfile);
5204 		else
5205 			err = skip_one_line(f1);
5206 		if (err)
5207 			return err;
5208 		(*line_cur1)++;
5209 	}
5210 	/* Copy old file's lines after patch. */
5211 	while (!feof(f1) && *line_cur1 <= end_old) {
5212 		err = copy_one_line(f1, outfile, rejectfile);
5213 		if (err)
5214 			return err;
5215 		(*line_cur1)++;
5216 	}
5217 
5218 	return NULL;
5219 }
5220 
5221 static const struct got_error *
5222 apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
5223     int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
5224     int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
5225     int *line_cur2, FILE *outfile, FILE *rejectfile,
5226     got_worktree_patch_cb patch_cb, void *patch_arg)
5227 {
5228 	const struct got_error *err = NULL;
5229 	int start_old = change->cv.a;
5230 	int end_old = change->cv.b;
5231 	int start_new = change->cv.c;
5232 	int end_new = change->cv.d;
5233 	long pos1, pos2;
5234 	FILE *hunkfile;
5235 
5236 	*choice = GOT_PATCH_CHOICE_NONE;
5237 
5238 	hunkfile = got_opentemp();
5239 	if (hunkfile == NULL)
5240 		return got_error_from_errno("got_opentemp");
5241 
5242 	pos1 = ftell(f1);
5243 	pos2 = ftell(f2);
5244 
5245 	/* XXX TODO needs error checking */
5246 	got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
5247 
5248 	if (fseek(f1, pos1, SEEK_SET) == -1) {
5249 		err = got_ferror(f1, GOT_ERR_IO);
5250 		goto done;
5251 	}
5252 	if (fseek(f2, pos2, SEEK_SET) == -1) {
5253 		err = got_ferror(f1, GOT_ERR_IO);
5254 		goto done;
5255 	}
5256 	if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
5257 		err = got_ferror(hunkfile, GOT_ERR_IO);
5258 		goto done;
5259 	}
5260 
5261 	err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
5262 	    hunkfile, n, nchanges);
5263 	if (err)
5264 		goto done;
5265 
5266 	switch (*choice) {
5267 	case GOT_PATCH_CHOICE_YES:
5268 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
5269 		    end_old, start_new, end_new, outfile, rejectfile);
5270 		break;
5271 	case GOT_PATCH_CHOICE_NO:
5272 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
5273 		    end_old, start_new, end_new, rejectfile, outfile);
5274 		break;
5275 	case GOT_PATCH_CHOICE_QUIT:
5276 		if (outfile) {
5277 			/* Copy old file's lines until EOF. */
5278 			while (!feof(f1)) {
5279 				err = copy_one_line(f1, outfile, NULL);
5280 				if (err)
5281 					goto done;
5282 				(*line_cur1)++;
5283 			}
5284 		}
5285 		if (rejectfile) {
5286 			/* Copy new file's lines until EOF. */
5287 			while (!feof(f2)) {
5288 				err = copy_one_line(f2, NULL, rejectfile);
5289 				if (err)
5290 					goto done;
5291 				(*line_cur2)++;
5292 			}
5293 		}
5294 		break;
5295 	default:
5296 		err = got_error(GOT_ERR_PATCH_CHOICE);
5297 		break;
5298 	}
5299 done:
5300 	if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
5301 		err = got_error_from_errno("fclose");
5302 	return err;
5303 }
5304 
5305 static const struct got_error *
5306 create_staged_content(char **path_outfile, struct got_object_id *blob_id,
5307     const char *path2, const char *relpath, struct got_repository *repo,
5308     got_worktree_patch_cb patch_cb, void *patch_arg)
5309 {
5310 	const struct got_error *err;
5311 	struct got_blob_object *blob = NULL;
5312 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5313 	char *path1 = NULL, *id_str = NULL;
5314 	struct stat sb1, sb2;
5315 	struct got_diff_changes *changes = NULL;
5316 	struct got_diff_state *ds = NULL;
5317 	struct got_diff_args *args = NULL;
5318 	struct got_diff_change *change;
5319 	int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
5320 	int n = 0;
5321 
5322 	*path_outfile = NULL;
5323 
5324 	err = got_object_id_str(&id_str, blob_id);
5325 	if (err)
5326 		return err;
5327 
5328 	f2 = fopen(path2, "r");
5329 	if (f2 == NULL) {
5330 		err = got_error_from_errno2("fopen", path2);
5331 		goto done;
5332 	}
5333 
5334 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
5335 	if (err)
5336 		goto done;
5337 
5338 	err = got_opentemp_named(&path1, &f1, "got-stage-blob");
5339 	if (err)
5340 		goto done;
5341 
5342 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
5343 	if (err)
5344 		goto done;
5345 
5346 	if (stat(path1, &sb1) == -1) {
5347 		err = got_error_from_errno2("stat", path1);
5348 		goto done;
5349 	}
5350 	if (stat(path2, &sb2) == -1) {
5351 		err = got_error_from_errno2("stat", path2);
5352 		goto done;
5353 	}
5354 
5355 	err = got_diff_files(&changes, &ds, &args, &diff_flags,
5356 	    f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
5357 	if (err)
5358 		goto done;
5359 
5360 	err = got_opentemp_named(path_outfile, &outfile, "got-stage-content");
5361 	if (err)
5362 		goto done;
5363 
5364 	if (fseek(f1, 0L, SEEK_SET) == -1)
5365 		return got_ferror(f1, GOT_ERR_IO);
5366 	if (fseek(f2, 0L, SEEK_SET) == -1)
5367 		return got_ferror(f2, GOT_ERR_IO);
5368 	SIMPLEQ_FOREACH(change, &changes->entries, entry) {
5369 		int choice;
5370 		err = apply_or_reject_change(&choice, change, ++n,
5371 		    changes->nchanges, ds, args, diff_flags, relpath,
5372 		    f1, f2, &line_cur1, &line_cur2,
5373 		    outfile, NULL, patch_cb, patch_arg);
5374 		if (err)
5375 			goto done;
5376 		if (choice == GOT_PATCH_CHOICE_YES)
5377 			have_content = 1;
5378 		else if (choice == GOT_PATCH_CHOICE_QUIT)
5379 			break;
5380 	}
5381 done:
5382 	free(id_str);
5383 	if (blob)
5384 		got_object_blob_close(blob);
5385 	if (f1 && fclose(f1) == EOF && err == NULL)
5386 		err = got_error_from_errno2("fclose", path1);
5387 	if (f2 && fclose(f2) == EOF && err == NULL)
5388 		err = got_error_from_errno2("fclose", path2);
5389 	if (outfile && fclose(outfile) == EOF && err == NULL)
5390 		err = got_error_from_errno2("fclose", *path_outfile);
5391 	if (path1 && unlink(path1) == -1 && err == NULL)
5392 		err = got_error_from_errno2("unlink", path1);
5393 	if (err || !have_content) {
5394 		if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
5395 			err = got_error_from_errno2("unlink", *path_outfile);
5396 		free(*path_outfile);
5397 		*path_outfile = NULL;
5398 	}
5399 	free(args);
5400 	if (ds) {
5401 		got_diff_state_free(ds);
5402 		free(ds);
5403 	}
5404 	if (changes)
5405 		got_diff_free_changes(changes);
5406 	free(path1);
5407 	return err;
5408 }
5409 
5410 struct stage_path_arg {
5411 	struct got_worktree *worktree;
5412 	struct got_fileindex *fileindex;
5413 	struct got_repository *repo;
5414 	got_worktree_status_cb status_cb;
5415 	void *status_arg;
5416 	got_worktree_patch_cb patch_cb;
5417 	void *patch_arg;
5418 };
5419 
5420 static const struct got_error *
5421 stage_path(void *arg, unsigned char status,
5422     unsigned char staged_status, const char *relpath,
5423     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5424     struct got_object_id *commit_id)
5425 {
5426 	struct stage_path_arg *a = arg;
5427 	const struct got_error *err = NULL;
5428 	struct got_fileindex_entry *ie;
5429 	char *ondisk_path = NULL, *path_content = NULL;
5430 	uint32_t stage;
5431 	struct got_object_id *new_staged_blob_id = NULL;
5432 
5433 	if (status == GOT_STATUS_UNVERSIONED)
5434 		return NULL;
5435 
5436 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5437 	if (ie == NULL)
5438 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5439 
5440 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
5441 	    relpath)== -1)
5442 		return got_error_from_errno("asprintf");
5443 
5444 	switch (status) {
5445 	case GOT_STATUS_ADD:
5446 	case GOT_STATUS_MODIFY:
5447 		if (a->patch_cb) {
5448 			if (status == GOT_STATUS_ADD) {
5449 				int choice = GOT_PATCH_CHOICE_NONE;
5450 				err = (*a->patch_cb)(&choice, a->patch_arg,
5451 				    status, ie->path, NULL, 1, 1);
5452 				if (err)
5453 					break;
5454 				if (choice != GOT_PATCH_CHOICE_YES)
5455 					break;
5456 			} else {
5457 				err = create_staged_content(&path_content,
5458 				    staged_blob_id ? staged_blob_id : blob_id,
5459 				    ondisk_path, ie->path, a->repo,
5460 				    a->patch_cb, a->patch_arg);
5461 				if (err || path_content == NULL)
5462 					break;
5463 			}
5464 		}
5465 		err = got_object_blob_create(&new_staged_blob_id,
5466 		    path_content ? path_content : ondisk_path, a->repo);
5467 		if (err)
5468 			break;
5469 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
5470 		    SHA1_DIGEST_LENGTH);
5471 		if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
5472 			stage = GOT_FILEIDX_STAGE_ADD;
5473 		else
5474 			stage = GOT_FILEIDX_STAGE_MODIFY;
5475 		got_fileindex_entry_stage_set(ie, stage);
5476 		if (a->status_cb == NULL)
5477 			break;
5478 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5479 		    get_staged_status(ie), relpath, blob_id,
5480 		    new_staged_blob_id, NULL);
5481 		break;
5482 	case GOT_STATUS_DELETE:
5483 		if (staged_status == GOT_STATUS_DELETE)
5484 			break;
5485 		if (a->patch_cb) {
5486 			int choice = GOT_PATCH_CHOICE_NONE;
5487 			err = (*a->patch_cb)(&choice, a->patch_arg, status,
5488 			    ie->path, NULL, 1, 1);
5489 			if (err)
5490 				break;
5491 			if (choice == GOT_PATCH_CHOICE_NO)
5492 				break;
5493 			if (choice != GOT_PATCH_CHOICE_YES) {
5494 				err = got_error(GOT_ERR_PATCH_CHOICE);
5495 				break;
5496 			}
5497 		}
5498 		stage = GOT_FILEIDX_STAGE_DELETE;
5499 		got_fileindex_entry_stage_set(ie, stage);
5500 		if (a->status_cb == NULL)
5501 			break;
5502 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5503 		    get_staged_status(ie), relpath, NULL, NULL, NULL);
5504 		break;
5505 	case GOT_STATUS_NO_CHANGE:
5506 		err = got_error_path(relpath, GOT_ERR_STAGE_NO_CHANGE);
5507 		break;
5508 	case GOT_STATUS_CONFLICT:
5509 		err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
5510 		break;
5511 	default:
5512 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
5513 		break;
5514 	}
5515 
5516 	if (path_content && unlink(path_content) == -1 && err == NULL)
5517 		err = got_error_from_errno2("unlink", path_content);
5518 	free(path_content);
5519 	free(ondisk_path);
5520 	free(new_staged_blob_id);
5521 	return err;
5522 }
5523 
5524 const struct got_error *
5525 got_worktree_stage(struct got_worktree *worktree,
5526     struct got_pathlist_head *paths,
5527     got_worktree_status_cb status_cb, void *status_arg,
5528     got_worktree_patch_cb patch_cb, void *patch_arg,
5529     struct got_repository *repo)
5530 {
5531 	const struct got_error *err = NULL, *sync_err, *unlockerr;
5532 	struct got_pathlist_entry *pe;
5533 	struct got_fileindex *fileindex = NULL;
5534 	char *fileindex_path = NULL;
5535 	struct got_reference *head_ref = NULL;
5536 	struct got_object_id *head_commit_id = NULL;
5537 	struct check_stage_ok_arg oka;
5538 	struct stage_path_arg spa;
5539 
5540 	err = lock_worktree(worktree, LOCK_EX);
5541 	if (err)
5542 		return err;
5543 
5544 	err = got_ref_open(&head_ref, repo,
5545 	    got_worktree_get_head_ref_name(worktree), 0);
5546 	if (err)
5547 		goto done;
5548 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
5549 	if (err)
5550 		goto done;
5551 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
5552 	if (err)
5553 		goto done;
5554 
5555 	/* Check pre-conditions before staging anything. */
5556 	oka.head_commit_id = head_commit_id;
5557 	oka.worktree = worktree;
5558 	oka.fileindex = fileindex;
5559 	oka.repo = repo;
5560 	oka.have_changes = 0;
5561 	TAILQ_FOREACH(pe, paths, entry) {
5562 		err = worktree_status(worktree, pe->path, fileindex, repo,
5563 		    check_stage_ok, &oka, NULL, NULL);
5564 		if (err)
5565 			goto done;
5566 	}
5567 	if (!oka.have_changes) {
5568 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
5569 		goto done;
5570 	}
5571 
5572 	spa.worktree = worktree;
5573 	spa.fileindex = fileindex;
5574 	spa.repo = repo;
5575 	spa.patch_cb = patch_cb;
5576 	spa.patch_arg = patch_arg;
5577 	spa.status_cb = status_cb;
5578 	spa.status_arg = status_arg;
5579 	TAILQ_FOREACH(pe, paths, entry) {
5580 		err = worktree_status(worktree, pe->path, fileindex, repo,
5581 		    stage_path, &spa, NULL, NULL);
5582 		if (err)
5583 			goto done;
5584 	}
5585 
5586 	sync_err = sync_fileindex(fileindex, fileindex_path);
5587 	if (sync_err && err == NULL)
5588 		err = sync_err;
5589 done:
5590 	if (head_ref)
5591 		got_ref_close(head_ref);
5592 	free(head_commit_id);
5593 	free(fileindex_path);
5594 	if (fileindex)
5595 		got_fileindex_free(fileindex);
5596 	unlockerr = lock_worktree(worktree, LOCK_SH);
5597 	if (unlockerr && err == NULL)
5598 		err = unlockerr;
5599 	return err;
5600 }
5601 
5602 struct unstage_path_arg {
5603 	struct got_worktree *worktree;
5604 	struct got_fileindex *fileindex;
5605 	struct got_repository *repo;
5606 	got_worktree_checkout_cb progress_cb;
5607 	void *progress_arg;
5608 	got_worktree_patch_cb patch_cb;
5609 	void *patch_arg;
5610 };
5611 
5612 static const struct got_error *
5613 create_unstaged_content(char **path_unstaged_content,
5614     char **path_new_staged_content, struct got_object_id *blob_id,
5615     struct got_object_id *staged_blob_id, const char *relpath,
5616     struct got_repository *repo,
5617     got_worktree_patch_cb patch_cb, void *patch_arg)
5618 {
5619 	const struct got_error *err;
5620 	struct got_blob_object *blob = NULL, *staged_blob = NULL;
5621 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
5622 	char *path1 = NULL, *path2 = NULL, *label1 = NULL;
5623 	struct stat sb1, sb2;
5624 	struct got_diff_changes *changes = NULL;
5625 	struct got_diff_state *ds = NULL;
5626 	struct got_diff_args *args = NULL;
5627 	struct got_diff_change *change;
5628 	int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
5629 	int have_content = 0, have_rejected_content = 0;
5630 
5631 	*path_unstaged_content = NULL;
5632 	*path_new_staged_content = NULL;
5633 
5634 	err = got_object_id_str(&label1, blob_id);
5635 	if (err)
5636 		return err;
5637 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
5638 	if (err)
5639 		goto done;
5640 
5641 	err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
5642 	if (err)
5643 		goto done;
5644 
5645 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
5646 	if (err)
5647 		goto done;
5648 
5649 	err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
5650 	if (err)
5651 		goto done;
5652 
5653 	err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
5654 	if (err)
5655 		goto done;
5656 
5657 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
5658 	if (err)
5659 		goto done;
5660 
5661 	if (stat(path1, &sb1) == -1) {
5662 		err = got_error_from_errno2("stat", path1);
5663 		goto done;
5664 	}
5665 
5666 	if (stat(path2, &sb2) == -1) {
5667 		err = got_error_from_errno2("stat", path2);
5668 		goto done;
5669 	}
5670 
5671 	err = got_diff_files(&changes, &ds, &args, &diff_flags,
5672 	    f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
5673 	if (err)
5674 		goto done;
5675 
5676 	err = got_opentemp_named(path_unstaged_content, &outfile,
5677 	    "got-unstaged-content");
5678 	if (err)
5679 		goto done;
5680 	err = got_opentemp_named(path_new_staged_content, &rejectfile,
5681 	    "got-new-staged-content");
5682 	if (err)
5683 		goto done;
5684 
5685 	if (fseek(f1, 0L, SEEK_SET) == -1) {
5686 		err = got_ferror(f1, GOT_ERR_IO);
5687 		goto done;
5688 	}
5689 	if (fseek(f2, 0L, SEEK_SET) == -1) {
5690 		err = got_ferror(f2, GOT_ERR_IO);
5691 		goto done;
5692 	}
5693 	SIMPLEQ_FOREACH(change, &changes->entries, entry) {
5694 		int choice;
5695 		err = apply_or_reject_change(&choice, change, ++n,
5696 		    changes->nchanges, ds, args, diff_flags, relpath,
5697 		    f1, f2, &line_cur1, &line_cur2,
5698 		    outfile, rejectfile, patch_cb, patch_arg);
5699 		if (err)
5700 			goto done;
5701 		if (choice == GOT_PATCH_CHOICE_YES)
5702 			have_content = 1;
5703 		else
5704 			have_rejected_content = 1;
5705 		if (choice == GOT_PATCH_CHOICE_QUIT)
5706 			break;
5707 	}
5708 done:
5709 	free(label1);
5710 	if (blob)
5711 		got_object_blob_close(blob);
5712 	if (staged_blob)
5713 		got_object_blob_close(staged_blob);
5714 	if (f1 && fclose(f1) == EOF && err == NULL)
5715 		err = got_error_from_errno2("fclose", path1);
5716 	if (f2 && fclose(f2) == EOF && err == NULL)
5717 		err = got_error_from_errno2("fclose", path2);
5718 	if (outfile && fclose(outfile) == EOF && err == NULL)
5719 		err = got_error_from_errno2("fclose", *path_unstaged_content);
5720 	if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
5721 		err = got_error_from_errno2("fclose", *path_new_staged_content);
5722 	if (path1 && unlink(path1) == -1 && err == NULL)
5723 		err = got_error_from_errno2("unlink", path1);
5724 	if (path2 && unlink(path2) == -1 && err == NULL)
5725 		err = got_error_from_errno2("unlink", path2);
5726 	if (err || !have_content) {
5727 		if (*path_unstaged_content &&
5728 		    unlink(*path_unstaged_content) == -1 && err == NULL)
5729 			err = got_error_from_errno2("unlink",
5730 			    *path_unstaged_content);
5731 		free(*path_unstaged_content);
5732 		*path_unstaged_content = NULL;
5733 	}
5734 	if (err || !have_rejected_content) {
5735 		if (*path_new_staged_content &&
5736 		    unlink(*path_new_staged_content) == -1 && err == NULL)
5737 			err = got_error_from_errno2("unlink",
5738 			    *path_new_staged_content);
5739 		free(*path_new_staged_content);
5740 		*path_new_staged_content = NULL;
5741 	}
5742 	free(args);
5743 	if (ds) {
5744 		got_diff_state_free(ds);
5745 		free(ds);
5746 	}
5747 	if (changes)
5748 		got_diff_free_changes(changes);
5749 	free(path1);
5750 	free(path2);
5751 	return err;
5752 }
5753 
5754 static const struct got_error *
5755 unstage_path(void *arg, unsigned char status,
5756     unsigned char staged_status, const char *relpath,
5757     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5758     struct got_object_id *commit_id)
5759 {
5760 	const struct got_error *err = NULL;
5761 	struct unstage_path_arg *a = arg;
5762 	struct got_fileindex_entry *ie;
5763 	struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
5764 	char *ondisk_path = NULL, *path_unstaged_content = NULL;
5765 	char *path_new_staged_content = NULL;
5766 	int local_changes_subsumed;
5767 	struct stat sb;
5768 
5769 	if (staged_status != GOT_STATUS_ADD &&
5770 	    staged_status != GOT_STATUS_MODIFY &&
5771 	    staged_status != GOT_STATUS_DELETE)
5772 		return NULL;
5773 
5774 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5775 	if (ie == NULL)
5776 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5777 
5778 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
5779 	    == -1)
5780 		return got_error_from_errno("asprintf");
5781 
5782 	switch (staged_status) {
5783 	case GOT_STATUS_MODIFY:
5784 		err = got_object_open_as_blob(&blob_base, a->repo,
5785 		    blob_id, 8192);
5786 		if (err)
5787 			break;
5788 		/* fall through */
5789 	case GOT_STATUS_ADD:
5790 		if (a->patch_cb) {
5791 			if (staged_status == GOT_STATUS_ADD) {
5792 				int choice = GOT_PATCH_CHOICE_NONE;
5793 				err = (*a->patch_cb)(&choice, a->patch_arg,
5794 				    staged_status, ie->path, NULL, 1, 1);
5795 				if (err)
5796 					break;
5797 				if (choice != GOT_PATCH_CHOICE_YES)
5798 					break;
5799 			} else {
5800 				err = create_unstaged_content(
5801 				    &path_unstaged_content,
5802 				    &path_new_staged_content, blob_id,
5803 				    staged_blob_id, ie->path, a->repo,
5804 				    a->patch_cb, a->patch_arg);
5805 				if (err || path_unstaged_content == NULL)
5806 					break;
5807 				if (path_new_staged_content) {
5808 					err = got_object_blob_create(
5809 					    &staged_blob_id,
5810 					    path_new_staged_content,
5811 					    a->repo);
5812 					if (err)
5813 						break;
5814 					memcpy(ie->staged_blob_sha1,
5815 					    staged_blob_id->sha1,
5816 					    SHA1_DIGEST_LENGTH);
5817 				}
5818 				err = merge_file(&local_changes_subsumed,
5819 				    a->worktree, blob_base, ondisk_path,
5820 				    relpath, got_fileindex_perms_to_st(ie),
5821 				    path_unstaged_content, "unstaged",
5822 				    a->repo, a->progress_cb, a->progress_arg);
5823 				if (err == NULL &&
5824 				    path_new_staged_content == NULL)
5825 					got_fileindex_entry_stage_set(ie,
5826 					    GOT_FILEIDX_STAGE_NONE);
5827 				break; /* Done with this file. */
5828 			}
5829 		}
5830 		err = got_object_open_as_blob(&blob_staged, a->repo,
5831 		    staged_blob_id, 8192);
5832 		if (err)
5833 			break;
5834 		err = merge_blob(&local_changes_subsumed, a->worktree,
5835 		    blob_base, ondisk_path, relpath,
5836 		    got_fileindex_perms_to_st(ie), blob_staged,
5837 		    commit_id ? commit_id : a->worktree->base_commit_id,
5838 		    a->repo, a->progress_cb, a->progress_arg);
5839 		if (err == NULL)
5840 			got_fileindex_entry_stage_set(ie,
5841 			    GOT_FILEIDX_STAGE_NONE);
5842 		break;
5843 	case GOT_STATUS_DELETE:
5844 		if (a->patch_cb) {
5845 			int choice = GOT_PATCH_CHOICE_NONE;
5846 			err = (*a->patch_cb)(&choice, a->patch_arg,
5847 			    staged_status, ie->path, NULL, 1, 1);
5848 			if (err)
5849 				break;
5850 			if (choice == GOT_PATCH_CHOICE_NO)
5851 				break;
5852 			if (choice != GOT_PATCH_CHOICE_YES) {
5853 				err = got_error(GOT_ERR_PATCH_CHOICE);
5854 				break;
5855 			}
5856 		}
5857 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
5858 		err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
5859 		if (err)
5860 			break;
5861 		err = (*a->progress_cb)(a->progress_arg, status, relpath);
5862 		break;
5863 	}
5864 
5865 	free(ondisk_path);
5866 	if (path_unstaged_content &&
5867 	    unlink(path_unstaged_content) == -1 && err == NULL)
5868 		err = got_error_from_errno2("unlink", path_unstaged_content);
5869 	if (path_new_staged_content &&
5870 	    unlink(path_new_staged_content) == -1 && err == NULL)
5871 		err = got_error_from_errno2("unlink", path_new_staged_content);
5872 	free(path_unstaged_content);
5873 	free(path_new_staged_content);
5874 	if (blob_base)
5875 		got_object_blob_close(blob_base);
5876 	if (blob_staged)
5877 		got_object_blob_close(blob_staged);
5878 	return err;
5879 }
5880 
5881 const struct got_error *
5882 got_worktree_unstage(struct got_worktree *worktree,
5883     struct got_pathlist_head *paths,
5884     got_worktree_checkout_cb progress_cb, void *progress_arg,
5885     got_worktree_patch_cb patch_cb, void *patch_arg,
5886     struct got_repository *repo)
5887 {
5888 	const struct got_error *err = NULL, *sync_err, *unlockerr;
5889 	struct got_pathlist_entry *pe;
5890 	struct got_fileindex *fileindex = NULL;
5891 	char *fileindex_path = NULL;
5892 	struct unstage_path_arg upa;
5893 
5894 	err = lock_worktree(worktree, LOCK_EX);
5895 	if (err)
5896 		return err;
5897 
5898 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
5899 	if (err)
5900 		goto done;
5901 
5902 	upa.worktree = worktree;
5903 	upa.fileindex = fileindex;
5904 	upa.repo = repo;
5905 	upa.progress_cb = progress_cb;
5906 	upa.progress_arg = progress_arg;
5907 	upa.patch_cb = patch_cb;
5908 	upa.patch_arg = patch_arg;
5909 	TAILQ_FOREACH(pe, paths, entry) {
5910 		err = worktree_status(worktree, pe->path, fileindex, repo,
5911 		    unstage_path, &upa, NULL, NULL);
5912 		if (err)
5913 			goto done;
5914 	}
5915 
5916 	sync_err = sync_fileindex(fileindex, fileindex_path);
5917 	if (sync_err && err == NULL)
5918 		err = sync_err;
5919 done:
5920 	free(fileindex_path);
5921 	if (fileindex)
5922 		got_fileindex_free(fileindex);
5923 	unlockerr = lock_worktree(worktree, LOCK_SH);
5924 	if (unlockerr && err == NULL)
5925 		err = unlockerr;
5926 	return err;
5927 }