1 /*
2  * Copyright (c) 2018, 2019, 2020 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/queue.h>
19 #include <sys/tree.h>
20 
21 #include <dirent.h>
22 #include <limits.h>
23 #include <stddef.h>
24 #include <string.h>
25 #include <stdio.h>
26 #include <stdlib.h>
27 #include <time.h>
28 #include <fcntl.h>
29 #include <errno.h>
30 #include <unistd.h>
31 #include <sha1.h>
32 #include <zlib.h>
33 #include <fnmatch.h>
34 #include <libgen.h>
35 #include <uuid.h>
36 #include <util.h>
37 
38 #include "got_error.h"
39 #include "got_repository.h"
40 #include "got_reference.h"
41 #include "got_object.h"
42 #include "got_path.h"
43 #include "got_cancel.h"
44 #include "got_worktree.h"
45 #include "got_opentemp.h"
46 #include "got_diff.h"
47 
48 #include "got_lib_worktree.h"
49 #include "got_lib_sha1.h"
50 #include "got_lib_fileindex.h"
51 #include "got_lib_inflate.h"
52 #include "got_lib_delta.h"
53 #include "got_lib_object.h"
54 #include "got_lib_object_parse.h"
55 #include "got_lib_object_create.h"
56 #include "got_lib_object_idset.h"
57 #include "got_lib_diff.h"
58 
59 #ifndef MIN
60 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 #endif
62 
63 #define GOT_MERGE_LABEL_MERGED	"merged change"
64 #define GOT_MERGE_LABEL_BASE	"3-way merge base"
65 
66 static const struct got_error *
67 create_meta_file(const char *path_got, const char *name, const char *content)
68 {
69 	const struct got_error *err = NULL;
70 	char *path;
71 
72 	if (asprintf(&path, "%s/%s", path_got, name) == -1)
73 		return got_error_from_errno("asprintf");
74 
75 	err = got_path_create_file(path, content);
76 	free(path);
77 	return err;
78 }
79 
80 static const struct got_error *
81 update_meta_file(const char *path_got, const char *name, const char *content)
82 {
83 	const struct got_error *err = NULL;
84 	FILE *tmpfile = NULL;
85 	char *tmppath = NULL;
86 	char *path = NULL;
87 
88 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
89 		err = got_error_from_errno("asprintf");
90 		path = NULL;
91 		goto done;
92 	}
93 
94 	err = got_opentemp_named(&tmppath, &tmpfile, path);
95 	if (err)
96 		goto done;
97 
98 	if (content) {
99 		int len = fprintf(tmpfile, "%s\n", content);
100 		if (len != strlen(content) + 1) {
101 			err = got_error_from_errno2("fprintf", tmppath);
102 			goto done;
103 		}
104 	}
105 
106 	if (rename(tmppath, path) != 0) {
107 		err = got_error_from_errno3("rename", tmppath, path);
108 		unlink(tmppath);
109 		goto done;
110 	}
111 
112 done:
113 	if (fclose(tmpfile) != 0 && err == NULL)
114 		err = got_error_from_errno2("fclose", tmppath);
115 	free(tmppath);
116 	return err;
117 }
118 
119 static const struct got_error *
120 read_meta_file(char **content, const char *path_got, const char *name)
121 {
122 	const struct got_error *err = NULL;
123 	char *path;
124 	int fd = -1;
125 	ssize_t n;
126 	struct stat sb;
127 
128 	*content = NULL;
129 
130 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
131 		err = got_error_from_errno("asprintf");
132 		path = NULL;
133 		goto done;
134 	}
135 
136 	fd = open(path, O_RDONLY | O_NOFOLLOW);
137 	if (fd == -1) {
138 		if (errno == ENOENT)
139 			err = got_error_path(path, GOT_ERR_WORKTREE_META);
140 		else
141 			err = got_error_from_errno2("open", path);
142 		goto done;
143 	}
144 	if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
145 		err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
146 		    : got_error_from_errno2("flock", path));
147 		goto done;
148 	}
149 
150 	if (fstat(fd, &sb) != 0) {
151 		err = got_error_from_errno2("fstat", path);
152 		goto done;
153 	}
154 	*content = calloc(1, sb.st_size);
155 	if (*content == NULL) {
156 		err = got_error_from_errno("calloc");
157 		goto done;
158 	}
159 
160 	n = read(fd, *content, sb.st_size);
161 	if (n != sb.st_size) {
162 		err = (n == -1 ? got_error_from_errno2("read", path) :
163 		    got_error_path(path, GOT_ERR_WORKTREE_META));
164 		goto done;
165 	}
166 	if ((*content)[sb.st_size - 1] != '\n') {
167 		err = got_error_path(path, GOT_ERR_WORKTREE_META);
168 		goto done;
169 	}
170 	(*content)[sb.st_size - 1] = '\0';
171 
172 done:
173 	if (fd != -1 && close(fd) == -1 && err == NULL)
174 		err = got_error_from_errno2("close", path_got);
175 	free(path);
176 	if (err) {
177 		free(*content);
178 		*content = NULL;
179 	}
180 	return err;
181 }
182 
183 static const struct got_error *
184 write_head_ref(const char *path_got, struct got_reference *head_ref)
185 {
186 	const struct got_error *err = NULL;
187 	char *refstr = NULL;
188 
189 	if (got_ref_is_symbolic(head_ref)) {
190 		refstr = got_ref_to_str(head_ref);
191 		if (refstr == NULL)
192 			return got_error_from_errno("got_ref_to_str");
193 	} else {
194 		refstr = strdup(got_ref_get_name(head_ref));
195 		if (refstr == NULL)
196 			return got_error_from_errno("strdup");
197 	}
198 	err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
199 	free(refstr);
200 	return err;
201 }
202 
203 const struct got_error *
204 got_worktree_init(const char *path, struct got_reference *head_ref,
205     const char *prefix, struct got_repository *repo)
206 {
207 	const struct got_error *err = NULL;
208 	struct got_object_id *commit_id = NULL;
209 	uuid_t uuid;
210 	uint32_t uuid_status;
211 	int obj_type;
212 	char *path_got = NULL;
213 	char *formatstr = NULL;
214 	char *absprefix = NULL;
215 	char *basestr = NULL;
216 	char *uuidstr = NULL;
217 
218 	if (strcmp(path, got_repo_get_path(repo)) == 0) {
219 		err = got_error(GOT_ERR_WORKTREE_REPO);
220 		goto done;
221 	}
222 
223 	err = got_ref_resolve(&commit_id, repo, head_ref);
224 	if (err)
225 		return err;
226 	err = got_object_get_type(&obj_type, repo, commit_id);
227 	if (err)
228 		return err;
229 	if (obj_type != GOT_OBJ_TYPE_COMMIT)
230 		return got_error(GOT_ERR_OBJ_TYPE);
231 
232 	if (!got_path_is_absolute(prefix)) {
233 		if (asprintf(&absprefix, "/%s", prefix) == -1)
234 			return got_error_from_errno("asprintf");
235 	}
236 
237 	/* Create top-level directory (may already exist). */
238 	if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
239 		err = got_error_from_errno2("mkdir", path);
240 		goto done;
241 	}
242 
243 	/* Create .got directory (may already exist). */
244 	if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
245 		err = got_error_from_errno("asprintf");
246 		goto done;
247 	}
248 	if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
249 		err = got_error_from_errno2("mkdir", path_got);
250 		goto done;
251 	}
252 
253 	/* Create an empty lock file. */
254 	err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
255 	if (err)
256 		goto done;
257 
258 	/* Create an empty file index. */
259 	err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
260 	if (err)
261 		goto done;
262 
263 	/* Write the HEAD reference. */
264 	err = write_head_ref(path_got, head_ref);
265 	if (err)
266 		goto done;
267 
268 	/* Record our base commit. */
269 	err = got_object_id_str(&basestr, commit_id);
270 	if (err)
271 		goto done;
272 	err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
273 	if (err)
274 		goto done;
275 
276 	/* Store path to repository. */
277 	err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
278 	    got_repo_get_path(repo));
279 	if (err)
280 		goto done;
281 
282 	/* Store in-repository path prefix. */
283 	err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
284 	    absprefix ? absprefix : prefix);
285 	if (err)
286 		goto done;
287 
288 	/* Generate UUID. */
289 	uuid_create(&uuid, &uuid_status);
290 	if (uuid_status != uuid_s_ok) {
291 		err = got_error_uuid(uuid_status, "uuid_create");
292 		goto done;
293 	}
294 	uuid_to_string(&uuid, &uuidstr, &uuid_status);
295 	if (uuid_status != uuid_s_ok) {
296 		err = got_error_uuid(uuid_status, "uuid_to_string");
297 		goto done;
298 	}
299 	err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
300 	if (err)
301 		goto done;
302 
303 	/* Stamp work tree with format file. */
304 	if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
305 		err = got_error_from_errno("asprintf");
306 		goto done;
307 	}
308 	err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
309 	if (err)
310 		goto done;
311 
312 done:
313 	free(commit_id);
314 	free(path_got);
315 	free(formatstr);
316 	free(absprefix);
317 	free(basestr);
318 	free(uuidstr);
319 	return err;
320 }
321 
322 static const struct got_error *
323 open_worktree(struct got_worktree **worktree, const char *path)
324 {
325 	const struct got_error *err = NULL;
326 	char *path_got;
327 	char *formatstr = NULL;
328 	char *uuidstr = NULL;
329 	char *path_lock = NULL;
330 	char *base_commit_id_str = NULL;
331 	int version, fd = -1;
332 	const char *errstr;
333 	struct got_repository *repo = NULL;
334 	uint32_t uuid_status;
335 
336 	*worktree = NULL;
337 
338 	if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
339 		err = got_error_from_errno("asprintf");
340 		path_got = NULL;
341 		goto done;
342 	}
343 
344 	if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
345 		err = got_error_from_errno("asprintf");
346 		path_lock = NULL;
347 		goto done;
348 	}
349 
350 	fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
351 	if (fd == -1) {
352 		err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
353 		    : got_error_from_errno2("open", path_lock));
354 		goto done;
355 	}
356 
357 	err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
358 	if (err)
359 		goto done;
360 
361 	version = strtonum(formatstr, 1, INT_MAX, &errstr);
362 	if (errstr) {
363 		err = got_error_msg(GOT_ERR_WORKTREE_META,
364 		    "could not parse work tree format version number");
365 		goto done;
366 	}
367 	if (version != GOT_WORKTREE_FORMAT_VERSION) {
368 		err = got_error(GOT_ERR_WORKTREE_VERS);
369 		goto done;
370 	}
371 
372 	*worktree = calloc(1, sizeof(**worktree));
373 	if (*worktree == NULL) {
374 		err = got_error_from_errno("calloc");
375 		goto done;
376 	}
377 	(*worktree)->lockfd = -1;
378 
379 	(*worktree)->root_path = strdup(path);
380 	if ((*worktree)->root_path == NULL) {
381 		err = got_error_from_errno("strdup");
382 		goto done;
383 	}
384 	err = read_meta_file(&(*worktree)->repo_path, path_got,
385 	    GOT_WORKTREE_REPOSITORY);
386 	if (err)
387 		goto done;
388 
389 	err = read_meta_file(&(*worktree)->path_prefix, path_got,
390 	    GOT_WORKTREE_PATH_PREFIX);
391 	if (err)
392 		goto done;
393 
394 	err = read_meta_file(&base_commit_id_str, path_got,
395 	    GOT_WORKTREE_BASE_COMMIT);
396 	if (err)
397 		goto done;
398 
399 	err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
400 	if (err)
401 		goto done;
402 	uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
403 	if (uuid_status != uuid_s_ok) {
404 		err = got_error_uuid(uuid_status, "uuid_from_string");
405 		goto done;
406 	}
407 
408 	err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
409 	if (err)
410 		goto done;
411 
412 	err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
413 	    base_commit_id_str);
414 	if (err)
415 		goto done;
416 
417 	err = read_meta_file(&(*worktree)->head_ref_name, path_got,
418 	    GOT_WORKTREE_HEAD_REF);
419 done:
420 	if (repo)
421 		got_repo_close(repo);
422 	free(path_got);
423 	free(path_lock);
424 	free(base_commit_id_str);
425 	free(uuidstr);
426 	free(formatstr);
427 	if (err) {
428 		if (fd != -1)
429 			close(fd);
430 		if (*worktree != NULL)
431 			got_worktree_close(*worktree);
432 		*worktree = NULL;
433 	} else
434 		(*worktree)->lockfd = fd;
435 
436 	return err;
437 }
438 
439 const struct got_error *
440 got_worktree_open(struct got_worktree **worktree, const char *path)
441 {
442 	const struct got_error *err = NULL;
443 
444 	do {
445 		err = open_worktree(worktree, path);
446 		if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
447 			return err;
448 		if (*worktree)
449 			return NULL;
450 		path = dirname(path);
451 		if (path == NULL)
452 			return got_error_from_errno2("dirname", path);
453 	} while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
454 
455 	return got_error(GOT_ERR_NOT_WORKTREE);
456 }
457 
458 const struct got_error *
459 got_worktree_close(struct got_worktree *worktree)
460 {
461 	const struct got_error *err = NULL;
462 	free(worktree->repo_path);
463 	free(worktree->path_prefix);
464 	free(worktree->base_commit_id);
465 	free(worktree->head_ref_name);
466 	if (worktree->lockfd != -1)
467 		if (close(worktree->lockfd) != 0)
468 			err = got_error_from_errno2("close",
469 			    got_worktree_get_root_path(worktree));
470 	free(worktree->root_path);
471 	free(worktree);
472 	return err;
473 }
474 
475 const char *
476 got_worktree_get_root_path(struct got_worktree *worktree)
477 {
478 	return worktree->root_path;
479 }
480 
481 const char *
482 got_worktree_get_repo_path(struct got_worktree *worktree)
483 {
484 	return worktree->repo_path;
485 }
486 
487 const char *
488 got_worktree_get_path_prefix(struct got_worktree *worktree)
489 {
490 	return worktree->path_prefix;
491 }
492 
493 const struct got_error *
494 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
495     const char *path_prefix)
496 {
497 	char *absprefix = NULL;
498 
499 	if (!got_path_is_absolute(path_prefix)) {
500 		if (asprintf(&absprefix, "/%s", path_prefix) == -1)
501 			return got_error_from_errno("asprintf");
502 	}
503 	*match = (strcmp(absprefix ? absprefix : path_prefix,
504 	    worktree->path_prefix) == 0);
505 	free(absprefix);
506 	return NULL;
507 }
508 
509 const char *
510 got_worktree_get_head_ref_name(struct got_worktree *worktree)
511 {
512 	return worktree->head_ref_name;
513 }
514 
515 const struct got_error *
516 got_worktree_set_head_ref(struct got_worktree *worktree,
517     struct got_reference *head_ref)
518 {
519 	const struct got_error *err = NULL;
520 	char *path_got = NULL, *head_ref_name = NULL;
521 
522 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
523 	    GOT_WORKTREE_GOT_DIR) == -1) {
524 		err = got_error_from_errno("asprintf");
525 		path_got = NULL;
526 		goto done;
527 	}
528 
529 	head_ref_name = strdup(got_ref_get_name(head_ref));
530 	if (head_ref_name == NULL) {
531 		err = got_error_from_errno("strdup");
532 		goto done;
533 	}
534 
535 	err = write_head_ref(path_got, head_ref);
536 	if (err)
537 		goto done;
538 
539 	free(worktree->head_ref_name);
540 	worktree->head_ref_name = head_ref_name;
541 done:
542 	free(path_got);
543 	if (err)
544 		free(head_ref_name);
545 	return err;
546 }
547 
548 struct got_object_id *
549 got_worktree_get_base_commit_id(struct got_worktree *worktree)
550 {
551 	return worktree->base_commit_id;
552 }
553 
554 const struct got_error *
555 got_worktree_set_base_commit_id(struct got_worktree *worktree,
556     struct got_repository *repo, struct got_object_id *commit_id)
557 {
558 	const struct got_error *err;
559 	struct got_object *obj = NULL;
560 	char *id_str = NULL;
561 	char *path_got = NULL;
562 
563 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
564 	    GOT_WORKTREE_GOT_DIR) == -1) {
565 		err = got_error_from_errno("asprintf");
566 		path_got = NULL;
567 		goto done;
568 	}
569 
570 	err = got_object_open(&obj, repo, commit_id);
571 	if (err)
572 		return err;
573 
574 	if (obj->type != GOT_OBJ_TYPE_COMMIT) {
575 		err = got_error(GOT_ERR_OBJ_TYPE);
576 		goto done;
577 	}
578 
579 	/* Record our base commit. */
580 	err = got_object_id_str(&id_str, commit_id);
581 	if (err)
582 		goto done;
583 	err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
584 	if (err)
585 		goto done;
586 
587 	free(worktree->base_commit_id);
588 	worktree->base_commit_id = got_object_id_dup(commit_id);
589 	if (worktree->base_commit_id == NULL) {
590 		err = got_error_from_errno("got_object_id_dup");
591 		goto done;
592 	}
593 done:
594 	if (obj)
595 		got_object_close(obj);
596 	free(id_str);
597 	free(path_got);
598 	return err;
599 }
600 
601 static const struct got_error *
602 lock_worktree(struct got_worktree *worktree, int operation)
603 {
604 	if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
605 		return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
606 		    : got_error_from_errno2("flock",
607 		    got_worktree_get_root_path(worktree)));
608 	return NULL;
609 }
610 
611 static const struct got_error *
612 add_dir_on_disk(struct got_worktree *worktree, const char *path)
613 {
614 	const struct got_error *err = NULL;
615 	char *abspath;
616 
617 	if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
618 		return got_error_from_errno("asprintf");
619 
620 	err = got_path_mkdir(abspath);
621 	if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
622 		struct stat sb;
623 		err = NULL;
624 		if (lstat(abspath, &sb) == -1) {
625 			err = got_error_from_errno2("lstat", abspath);
626 		} else if (!S_ISDIR(sb.st_mode)) {
627 			/* TODO directory is obstructed; do something */
628 			err = got_error(GOT_ERR_FILE_OBSTRUCTED);
629 		}
630 	}
631 	free(abspath);
632 	return err;
633 }
634 
635 static const struct got_error *
636 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
637 {
638 	const struct got_error *err = NULL;
639 	uint8_t fbuf1[8192];
640 	uint8_t fbuf2[8192];
641 	size_t flen1 = 0, flen2 = 0;
642 
643 	*same = 1;
644 
645 	for (;;) {
646 		flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
647 		if (flen1 == 0 && ferror(f1)) {
648 			err = got_error_from_errno("fread");
649 			break;
650 		}
651 		flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
652 		if (flen2 == 0 && ferror(f2)) {
653 			err = got_error_from_errno("fread");
654 			break;
655 		}
656 		if (flen1 == 0) {
657 			if (flen2 != 0)
658 				*same = 0;
659 			break;
660 		} else if (flen2 == 0) {
661 			if (flen1 != 0)
662 				*same = 0;
663 			break;
664 		} else if (flen1 == flen2) {
665 			if (memcmp(fbuf1, fbuf2, flen2) != 0) {
666 				*same = 0;
667 				break;
668 			}
669 		} else {
670 			*same = 0;
671 			break;
672 		}
673 	}
674 
675 	return err;
676 }
677 
678 static const struct got_error *
679 check_files_equal(int *same, const char *f1_path, const char *f2_path)
680 {
681 	const struct got_error *err = NULL;
682 	struct stat sb;
683 	size_t size1, size2;
684 	FILE *f1 = NULL, *f2 = NULL;
685 
686 	*same = 1;
687 
688 	if (lstat(f1_path, &sb) != 0) {
689 		err = got_error_from_errno2("lstat", f1_path);
690 		goto done;
691 	}
692 	size1 = sb.st_size;
693 
694 	if (lstat(f2_path, &sb) != 0) {
695 		err = got_error_from_errno2("lstat", f2_path);
696 		goto done;
697 	}
698 	size2 = sb.st_size;
699 
700 	if (size1 != size2) {
701 		*same = 0;
702 		return NULL;
703 	}
704 
705 	f1 = fopen(f1_path, "r");
706 	if (f1 == NULL)
707 		return got_error_from_errno2("fopen", f1_path);
708 
709 	f2 = fopen(f2_path, "r");
710 	if (f2 == NULL) {
711 		err = got_error_from_errno2("fopen", f2_path);
712 		goto done;
713 	}
714 
715 	err = check_file_contents_equal(same, f1, f2);
716 done:
717 	if (f1 && fclose(f1) != 0 && err == NULL)
718 		err = got_error_from_errno("fclose");
719 	if (f2 && fclose(f2) != 0 && err == NULL)
720 		err = got_error_from_errno("fclose");
721 
722 	return err;
723 }
724 
725 /*
726  * Perform a 3-way merge where blob_orig acts as the common ancestor,
727  * the file at deriv_path acts as the first derived version, and the
728  * file on disk acts as the second derived version.
729  */
730 static const struct got_error *
731 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
732     struct got_blob_object *blob_orig, const char *ondisk_path,
733     const char *path, uint16_t st_mode, const char *deriv_path,
734     const char *label_orig, const char *label_deriv,
735     struct got_repository *repo,
736     got_worktree_checkout_cb progress_cb, void *progress_arg)
737 {
738 	const struct got_error *err = NULL;
739 	int merged_fd = -1;
740 	FILE *f_orig = NULL;
741 	char *blob_orig_path = NULL;
742 	char *merged_path = NULL, *base_path = NULL;
743 	int overlapcnt = 0;
744 	char *parent;
745 
746 	*local_changes_subsumed = 0;
747 
748 	parent = dirname(ondisk_path);
749 	if (parent == NULL)
750 		return got_error_from_errno2("dirname", ondisk_path);
751 
752 	if (asprintf(&base_path, "%s/got-merged", parent) == -1)
753 		return got_error_from_errno("asprintf");
754 
755 	err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
756 	if (err)
757 		goto done;
758 
759 	free(base_path);
760 	if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
761 		err = got_error_from_errno("asprintf");
762 		base_path = NULL;
763 		goto done;
764 	}
765 
766 	err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
767 	if (err)
768 		goto done;
769 	if (blob_orig) {
770 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
771 		    blob_orig);
772 		if (err)
773 			goto done;
774 	} else {
775 		/*
776 		 * If the file has no blob, this is an "add vs add" conflict,
777 		 * and we simply use an empty ancestor file to make both files
778 		 * appear in the merged result in their entirety.
779 		 */
780 	}
781 
782 	err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
783 	    blob_orig_path, ondisk_path, label_deriv, label_orig, NULL);
784 	if (err)
785 		goto done;
786 
787 	err = (*progress_cb)(progress_arg,
788 	    overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
789 	if (err)
790 		goto done;
791 
792 	if (fsync(merged_fd) != 0) {
793 		err = got_error_from_errno("fsync");
794 		goto done;
795 	}
796 
797 	/* Check if a clean merge has subsumed all local changes. */
798 	if (overlapcnt == 0) {
799 		err = check_files_equal(local_changes_subsumed, deriv_path,
800 		    merged_path);
801 		if (err)
802 			goto done;
803 	}
804 
805 	if (fchmod(merged_fd, st_mode) != 0) {
806 		err = got_error_from_errno2("fchmod", merged_path);
807 		goto done;
808 	}
809 
810 	if (rename(merged_path, ondisk_path) != 0) {
811 		err = got_error_from_errno3("rename", merged_path,
812 		    ondisk_path);
813 		goto done;
814 	}
815 done:
816 	if (err) {
817 		if (merged_path)
818 			unlink(merged_path);
819 	}
820 	if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
821 		err = got_error_from_errno("close");
822 	if (f_orig && fclose(f_orig) != 0 && err == NULL)
823 		err = got_error_from_errno("fclose");
824 	free(merged_path);
825 	free(base_path);
826 	if (blob_orig_path) {
827 		unlink(blob_orig_path);
828 		free(blob_orig_path);
829 	}
830 	return err;
831 }
832 
833 /*
834  * Perform a 3-way merge where blob_orig acts as the common ancestor,
835  * blob_deriv acts as the first derived version, and the file on disk
836  * acts as the second derived version.
837  */
838 static const struct got_error *
839 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
840     struct got_blob_object *blob_orig, const char *ondisk_path,
841     const char *path, uint16_t st_mode, const char *label_orig,
842     struct got_blob_object *blob_deriv,
843     struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
844     got_worktree_checkout_cb progress_cb, void *progress_arg)
845 {
846 	const struct got_error *err = NULL;
847 	FILE *f_deriv = NULL;
848 	char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
849 	char *label_deriv = NULL, *parent;
850 
851 	*local_changes_subsumed = 0;
852 
853 	parent = dirname(ondisk_path);
854 	if (parent == NULL)
855 		return got_error_from_errno2("dirname", ondisk_path);
856 
857 	free(base_path);
858 	if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
859 		err = got_error_from_errno("asprintf");
860 		base_path = NULL;
861 		goto done;
862 	}
863 
864 	err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
865 	if (err)
866 		goto done;
867 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
868 	    blob_deriv);
869 	if (err)
870 		goto done;
871 
872 	err = got_object_id_str(&id_str, deriv_base_commit_id);
873 	if (err)
874 		goto done;
875 	if (asprintf(&label_deriv, "%s: commit %s",
876 	    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
877 		err = got_error_from_errno("asprintf");
878 		goto done;
879 	}
880 
881 	err = merge_file(local_changes_subsumed, worktree, blob_orig,
882 	    ondisk_path, path, st_mode, blob_deriv_path, label_orig,
883 	    label_deriv, repo, progress_cb, progress_arg);
884 done:
885 	if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
886 		err = got_error_from_errno("fclose");
887 	free(base_path);
888 	if (blob_deriv_path) {
889 		unlink(blob_deriv_path);
890 		free(blob_deriv_path);
891 	}
892 	free(id_str);
893 	free(label_deriv);
894 	return err;
895 }
896 
897 static const struct got_error *
898 update_blob_fileindex_entry(struct got_worktree *worktree,
899     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
900     const char *ondisk_path, const char *path, struct got_blob_object *blob,
901     int update_timestamps)
902 {
903 	const struct got_error *err = NULL;
904 
905 	if (ie == NULL)
906 		ie = got_fileindex_entry_get(fileindex, path, strlen(path));
907 	if (ie)
908 		err = got_fileindex_entry_update(ie, ondisk_path,
909 		    blob->id.sha1, worktree->base_commit_id->sha1,
910 		    update_timestamps);
911 	else {
912 		struct got_fileindex_entry *new_ie;
913 		err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
914 		    path, blob->id.sha1, worktree->base_commit_id->sha1);
915 		if (!err)
916 			err = got_fileindex_entry_add(fileindex, new_ie);
917 	}
918 	return err;
919 }
920 
921 static mode_t
922 get_ondisk_perms(int executable, mode_t st_mode)
923 {
924 	mode_t xbits = S_IXUSR;
925 
926 	if (executable) {
927 		/* Map read bits to execute bits. */
928 		if (st_mode & S_IRGRP)
929 			xbits |= S_IXGRP;
930 		if (st_mode & S_IROTH)
931 			xbits |= S_IXOTH;
932 		return st_mode | xbits;
933 	}
934 
935 	return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
936 }
937 
938 static const struct got_error *
939 install_blob(struct got_worktree *worktree, const char *ondisk_path,
940     const char *path, mode_t te_mode, mode_t st_mode,
941     struct got_blob_object *blob, int restoring_missing_file,
942     int reverting_versioned_file, struct got_repository *repo,
943     got_worktree_checkout_cb progress_cb, void *progress_arg)
944 {
945 	const struct got_error *err = NULL;
946 	int fd = -1;
947 	size_t len, hdrlen;
948 	int update = 0;
949 	char *tmppath = NULL;
950 
951 	fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
952 	    GOT_DEFAULT_FILE_MODE);
953 	if (fd == -1) {
954 		if (errno == ENOENT) {
955 			char *parent = dirname(path);
956 			if (parent == NULL)
957 				return got_error_from_errno2("dirname", path);
958 			err = add_dir_on_disk(worktree, parent);
959 			if (err)
960 				return err;
961 			fd = open(ondisk_path,
962 			    O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
963 			    GOT_DEFAULT_FILE_MODE);
964 			if (fd == -1)
965 				return got_error_from_errno2("open",
966 				    ondisk_path);
967 		} else if (errno == EEXIST) {
968 			if (!S_ISREG(st_mode)) {
969 				/* TODO file is obstructed; do something */
970 				err = got_error(GOT_ERR_FILE_OBSTRUCTED);
971 				goto done;
972 			} else {
973 				err = got_opentemp_named_fd(&tmppath, &fd,
974 				    ondisk_path);
975 				if (err)
976 					goto done;
977 				update = 1;
978 			}
979 		} else
980 			return got_error_from_errno2("open", ondisk_path);
981 	}
982 
983 	if (restoring_missing_file)
984 		err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
985 	else if (reverting_versioned_file)
986 		err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
987 	else
988 		err = (*progress_cb)(progress_arg,
989 		    update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
990 	if (err)
991 		goto done;
992 
993 	hdrlen = got_object_blob_get_hdrlen(blob);
994 	do {
995 		const uint8_t *buf = got_object_blob_get_read_buf(blob);
996 		err = got_object_blob_read_block(&len, blob);
997 		if (err)
998 			break;
999 		if (len > 0) {
1000 			/* Skip blob object header first time around. */
1001 			ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1002 			if (outlen == -1) {
1003 				err = got_error_from_errno("write");
1004 				goto done;
1005 			} else if (outlen != len - hdrlen) {
1006 				err = got_error(GOT_ERR_IO);
1007 				goto done;
1008 			}
1009 			hdrlen = 0;
1010 		}
1011 	} while (len != 0);
1012 
1013 	if (fsync(fd) != 0) {
1014 		err = got_error_from_errno("fsync");
1015 		goto done;
1016 	}
1017 
1018 	if (update) {
1019 		if (rename(tmppath, ondisk_path) != 0) {
1020 			err = got_error_from_errno3("rename", tmppath,
1021 			    ondisk_path);
1022 			unlink(tmppath);
1023 			goto done;
1024 		}
1025 	}
1026 
1027 	if (chmod(ondisk_path,
1028 	    get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1029 		err = got_error_from_errno2("chmod", ondisk_path);
1030 		goto done;
1031 	}
1032 
1033 done:
1034 	if (fd != -1 && close(fd) != 0 && err == NULL)
1035 		err = got_error_from_errno("close");
1036 	free(tmppath);
1037 	return err;
1038 }
1039 
1040 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1041 static const struct got_error *
1042 get_modified_file_content_status(unsigned char *status, FILE *f)
1043 {
1044 	const struct got_error *err = NULL;
1045 	const char *markers[3] = {
1046 		GOT_DIFF_CONFLICT_MARKER_BEGIN,
1047 		GOT_DIFF_CONFLICT_MARKER_SEP,
1048 		GOT_DIFF_CONFLICT_MARKER_END
1049 	};
1050 	int i = 0;
1051 	char *line;
1052 	size_t len;
1053 	const char delim[3] = {'\0', '\0', '\0'};
1054 
1055 	while (*status == GOT_STATUS_MODIFY) {
1056 		line = fparseln(f, &len, NULL, delim, 0);
1057 		if (line == NULL) {
1058 			if (feof(f))
1059 				break;
1060 			err = got_ferror(f, GOT_ERR_IO);
1061 			break;
1062 		}
1063 
1064 		if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1065 			if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1066 			    == 0)
1067 				*status = GOT_STATUS_CONFLICT;
1068 			else
1069 				i++;
1070 		}
1071 	}
1072 
1073 	return err;
1074 }
1075 
1076 static int
1077 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1078 {
1079 	mode_t ie_mode = got_fileindex_perms_to_st(ie);
1080 	return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1081 }
1082 
1083 static int
1084 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1085 {
1086 	return !(ie->ctime_sec == sb->st_ctime &&
1087 	    ie->ctime_nsec == sb->st_ctimensec &&
1088 	    ie->mtime_sec == sb->st_mtime &&
1089 	    ie->mtime_nsec == sb->st_mtimensec &&
1090 	    ie->size == (sb->st_size & 0xffffffff) &&
1091 	    !xbit_differs(ie, sb->st_mode));
1092 }
1093 
1094 static unsigned char
1095 get_staged_status(struct got_fileindex_entry *ie)
1096 {
1097 	switch (got_fileindex_entry_stage_get(ie)) {
1098 	case GOT_FILEIDX_STAGE_ADD:
1099 		return GOT_STATUS_ADD;
1100 	case GOT_FILEIDX_STAGE_DELETE:
1101 		return GOT_STATUS_DELETE;
1102 	case GOT_FILEIDX_STAGE_MODIFY:
1103 		return GOT_STATUS_MODIFY;
1104 	default:
1105 		return GOT_STATUS_NO_CHANGE;
1106 	}
1107 }
1108 
1109 static const struct got_error *
1110 get_file_status(unsigned char *status, struct stat *sb,
1111     struct got_fileindex_entry *ie, const char *abspath,
1112     int dirfd, const char *de_name, struct got_repository *repo)
1113 {
1114 	const struct got_error *err = NULL;
1115 	struct got_object_id id;
1116 	size_t hdrlen;
1117 	int fd = -1;
1118 	FILE *f = NULL;
1119 	uint8_t fbuf[8192];
1120 	struct got_blob_object *blob = NULL;
1121 	size_t flen, blen;
1122 	unsigned char staged_status = get_staged_status(ie);
1123 
1124 	*status = GOT_STATUS_NO_CHANGE;
1125 
1126 	/*
1127 	 * Whenever the caller provides a directory descriptor and a
1128 	 * directory entry name for the file, use them! This prevents
1129 	 * race conditions if filesystem paths change beneath our feet.
1130 	 */
1131 	if (dirfd != -1) {
1132 		if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1133 			if (errno == ENOENT) {
1134 				if (got_fileindex_entry_has_file_on_disk(ie))
1135 					*status = GOT_STATUS_MISSING;
1136 				else
1137 					*status = GOT_STATUS_DELETE;
1138 				goto done;
1139 			}
1140 			err = got_error_from_errno2("fstatat", abspath);
1141 			goto done;
1142 		}
1143 	} else {
1144 		fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1145 		if (fd == -1 && errno != ENOENT)
1146 			return got_error_from_errno2("open", abspath);
1147 		if (fd == -1 || fstat(fd, sb) == -1) {
1148 			if (errno == ENOENT) {
1149 				if (got_fileindex_entry_has_file_on_disk(ie))
1150 					*status = GOT_STATUS_MISSING;
1151 				else
1152 					*status = GOT_STATUS_DELETE;
1153 				goto done;
1154 			}
1155 			err = got_error_from_errno2("fstat", abspath);
1156 			goto done;
1157 		}
1158 	}
1159 
1160 	if (!S_ISREG(sb->st_mode)) {
1161 		*status = GOT_STATUS_OBSTRUCTED;
1162 		goto done;
1163 	}
1164 
1165 	if (!got_fileindex_entry_has_file_on_disk(ie)) {
1166 		*status = GOT_STATUS_DELETE;
1167 		goto done;
1168 	} else if (!got_fileindex_entry_has_blob(ie) &&
1169 	    staged_status != GOT_STATUS_ADD) {
1170 		*status = GOT_STATUS_ADD;
1171 		goto done;
1172 	}
1173 
1174 	if (!stat_info_differs(ie, sb))
1175 		goto done;
1176 
1177 	if (staged_status == GOT_STATUS_MODIFY ||
1178 	    staged_status == GOT_STATUS_ADD)
1179 		memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1180 	else
1181 		memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1182 
1183 	err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1184 	if (err)
1185 		goto done;
1186 
1187 	if (dirfd != -1) {
1188 		fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1189 		if (fd == -1) {
1190 			err = got_error_from_errno2("openat", abspath);
1191 			goto done;
1192 		}
1193 	}
1194 
1195 	f = fdopen(fd, "r");
1196 	if (f == NULL) {
1197 		err = got_error_from_errno2("fdopen", abspath);
1198 		goto done;
1199 	}
1200 	fd = -1;
1201 	hdrlen = got_object_blob_get_hdrlen(blob);
1202 	for (;;) {
1203 		const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1204 		err = got_object_blob_read_block(&blen, blob);
1205 		if (err)
1206 			goto done;
1207 		/* Skip length of blob object header first time around. */
1208 		flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1209 		if (flen == 0 && ferror(f)) {
1210 			err = got_error_from_errno("fread");
1211 			goto done;
1212 		}
1213 		if (blen == 0) {
1214 			if (flen != 0)
1215 				*status = GOT_STATUS_MODIFY;
1216 			break;
1217 		} else if (flen == 0) {
1218 			if (blen != 0)
1219 				*status = GOT_STATUS_MODIFY;
1220 			break;
1221 		} else if (blen - hdrlen == flen) {
1222 			/* Skip blob object header first time around. */
1223 			if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1224 				*status = GOT_STATUS_MODIFY;
1225 				break;
1226 			}
1227 		} else {
1228 			*status = GOT_STATUS_MODIFY;
1229 			break;
1230 		}
1231 		hdrlen = 0;
1232 	}
1233 
1234 	if (*status == GOT_STATUS_MODIFY) {
1235 		rewind(f);
1236 		err = get_modified_file_content_status(status, f);
1237 	} else if (xbit_differs(ie, sb->st_mode))
1238 		*status = GOT_STATUS_MODE_CHANGE;
1239 done:
1240 	if (blob)
1241 		got_object_blob_close(blob);
1242 	if (f != NULL && fclose(f) == EOF && err == NULL)
1243 		err = got_error_from_errno2("fclose", abspath);
1244 	if (fd != -1 && close(fd) == -1 && err == NULL)
1245 		err = got_error_from_errno2("close", abspath);
1246 	return err;
1247 }
1248 
1249 /*
1250  * Update timestamps in the file index if a file is unmodified and
1251  * we had to run a full content comparison to find out.
1252  */
1253 static const struct got_error *
1254 sync_timestamps(char *ondisk_path, unsigned char status,
1255     struct got_fileindex_entry *ie, struct stat *sb)
1256 {
1257 	if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1258 		return got_fileindex_entry_update(ie, ondisk_path,
1259 		    ie->blob_sha1, ie->commit_sha1, 1);
1260 
1261 	return NULL;
1262 }
1263 
1264 static const struct got_error *
1265 update_blob(struct got_worktree *worktree,
1266     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1267     struct got_tree_entry *te, const char *path,
1268     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1269     void *progress_arg)
1270 {
1271 	const struct got_error *err = NULL;
1272 	struct got_blob_object *blob = NULL;
1273 	char *ondisk_path;
1274 	unsigned char status = GOT_STATUS_NO_CHANGE;
1275 	struct stat sb;
1276 
1277 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1278 		return got_error_from_errno("asprintf");
1279 
1280 	if (ie) {
1281 		if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1282 			err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1283 			goto done;
1284 		}
1285 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1286 		    repo);
1287 		if (err)
1288 			goto done;
1289 		if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1290 			sb.st_mode = got_fileindex_perms_to_st(ie);
1291 	} else
1292 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
1293 
1294 	if (status == GOT_STATUS_OBSTRUCTED) {
1295 		err = (*progress_cb)(progress_arg, status, path);
1296 		goto done;
1297 	}
1298 
1299 	if (ie && status != GOT_STATUS_MISSING &&
1300 	    (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1301 		if (got_fileindex_entry_has_commit(ie) &&
1302 		    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1303 		    SHA1_DIGEST_LENGTH) == 0) {
1304 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1305 			if (err)
1306 				goto done;
1307 			err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1308 			    path);
1309 			goto done;
1310 		}
1311 		if (got_fileindex_entry_has_blob(ie) &&
1312 		    memcmp(ie->blob_sha1, te->id.sha1,
1313 		    SHA1_DIGEST_LENGTH) == 0) {
1314 			err = sync_timestamps(ondisk_path, status, ie, &sb);
1315 			goto done;
1316 		}
1317 	}
1318 
1319 	err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1320 	if (err)
1321 		goto done;
1322 
1323 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1324 		int update_timestamps;
1325 		struct got_blob_object *blob2 = NULL;
1326 		char *label_orig = NULL;
1327 		if (got_fileindex_entry_has_blob(ie)) {
1328 			struct got_object_id id2;
1329 			memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1330 			err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1331 			if (err)
1332 				goto done;
1333 		}
1334 		if (got_fileindex_entry_has_commit(ie)) {
1335 			char id_str[SHA1_DIGEST_STRING_LENGTH];
1336 			if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1337 			    sizeof(id_str)) == NULL) {
1338 				err = got_error_path(id_str,
1339 				    GOT_ERR_BAD_OBJ_ID_STR);
1340 				goto done;
1341 			}
1342 			if (asprintf(&label_orig, "%s: commit %s",
1343 			    GOT_MERGE_LABEL_BASE, id_str) == -1) {
1344 				err = got_error_from_errno("asprintf");
1345 				goto done;
1346 			}
1347 		}
1348 		err = merge_blob(&update_timestamps, worktree, blob2,
1349 		    ondisk_path, path, sb.st_mode, label_orig, blob,
1350 		    worktree->base_commit_id, repo,
1351 		    progress_cb, progress_arg);
1352 		free(label_orig);
1353 		if (blob2)
1354 			got_object_blob_close(blob2);
1355 		if (err)
1356 			goto done;
1357 		/*
1358 		 * Do not update timestamps of files with local changes.
1359 		 * Otherwise, a future status walk would treat them as
1360 		 * unmodified files again.
1361 		 */
1362 		err = got_fileindex_entry_update(ie, ondisk_path,
1363 		    blob->id.sha1, worktree->base_commit_id->sha1,
1364 		    update_timestamps);
1365 	} else if (status == GOT_STATUS_MODE_CHANGE) {
1366 		err = got_fileindex_entry_update(ie, ondisk_path,
1367 		    blob->id.sha1, worktree->base_commit_id->sha1, 0);
1368 	} else if (status == GOT_STATUS_DELETE) {
1369 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1370 		if (err)
1371 			goto done;
1372 		err = update_blob_fileindex_entry(worktree, fileindex, ie,
1373 		    ondisk_path, path, blob, 0);
1374 		if (err)
1375 			goto done;
1376 	} else {
1377 		err = install_blob(worktree, ondisk_path, path, te->mode,
1378 		    sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1379 		    repo, progress_cb, progress_arg);
1380 		if (err)
1381 			goto done;
1382 		err = update_blob_fileindex_entry(worktree, fileindex, ie,
1383 		    ondisk_path, path, blob, 1);
1384 		if (err)
1385 			goto done;
1386 	}
1387 	got_object_blob_close(blob);
1388 done:
1389 	free(ondisk_path);
1390 	return err;
1391 }
1392 
1393 static const struct got_error *
1394 remove_ondisk_file(const char *root_path, const char *path)
1395 {
1396 	const struct got_error *err = NULL;
1397 	char *ondisk_path = NULL;
1398 
1399 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1400 		return got_error_from_errno("asprintf");
1401 
1402 	if (unlink(ondisk_path) == -1) {
1403 		if (errno != ENOENT)
1404 			err = got_error_from_errno2("unlink", ondisk_path);
1405 	} else {
1406 		char *parent = dirname(ondisk_path);
1407 		while (parent && strcmp(parent, root_path) != 0) {
1408 			if (rmdir(parent) == -1) {
1409 				if (errno != ENOTEMPTY)
1410 					err = got_error_from_errno2("rmdir",
1411 					    parent);
1412 				break;
1413 			}
1414 			parent = dirname(parent);
1415 		}
1416 	}
1417 	free(ondisk_path);
1418 	return err;
1419 }
1420 
1421 static const struct got_error *
1422 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1423     struct got_fileindex_entry *ie, struct got_repository *repo,
1424     got_worktree_checkout_cb progress_cb, void *progress_arg)
1425 {
1426 	const struct got_error *err = NULL;
1427 	unsigned char status;
1428 	struct stat sb;
1429 	char *ondisk_path;
1430 
1431 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1432 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1433 
1434 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1435 	    == -1)
1436 		return got_error_from_errno("asprintf");
1437 
1438 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
1439 	if (err)
1440 		return err;
1441 
1442 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1443 	    status == GOT_STATUS_ADD) {
1444 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1445 		if (err)
1446 			return err;
1447 		/*
1448 		 * Preserve the working file and change the deleted blob's
1449 		 * entry into a schedule-add entry.
1450 		 */
1451 		err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1452 		    0);
1453 		if (err)
1454 			return err;
1455 	} else {
1456 		err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1457 		if (err)
1458 			return err;
1459 		if (status == GOT_STATUS_NO_CHANGE) {
1460 			err = remove_ondisk_file(worktree->root_path, ie->path);
1461 			if (err)
1462 				return err;
1463 		}
1464 		got_fileindex_entry_remove(fileindex, ie);
1465 	}
1466 
1467 	return err;
1468 }
1469 
1470 struct diff_cb_arg {
1471     struct got_fileindex *fileindex;
1472     struct got_worktree *worktree;
1473     struct got_repository *repo;
1474     got_worktree_checkout_cb progress_cb;
1475     void *progress_arg;
1476     got_cancel_cb cancel_cb;
1477     void *cancel_arg;
1478 };
1479 
1480 static const struct got_error *
1481 diff_old_new(void *arg, struct got_fileindex_entry *ie,
1482     struct got_tree_entry *te, const char *parent_path)
1483 {
1484 	struct diff_cb_arg *a = arg;
1485 
1486 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1487 		return got_error(GOT_ERR_CANCELLED);
1488 
1489 	return update_blob(a->worktree, a->fileindex, ie, te,
1490 	    ie->path, a->repo, a->progress_cb, a->progress_arg);
1491 }
1492 
1493 static const struct got_error *
1494 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1495 {
1496 	struct diff_cb_arg *a = arg;
1497 
1498 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1499 		return got_error(GOT_ERR_CANCELLED);
1500 
1501 	return delete_blob(a->worktree, a->fileindex, ie,
1502 	    a->repo, a->progress_cb, a->progress_arg);
1503 }
1504 
1505 static const struct got_error *
1506 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1507 {
1508 	struct diff_cb_arg *a = arg;
1509 	const struct got_error *err;
1510 	char *path;
1511 
1512 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1513 		return got_error(GOT_ERR_CANCELLED);
1514 
1515 	if (got_object_tree_entry_is_submodule(te))
1516 		return NULL;
1517 
1518 	if (asprintf(&path, "%s%s%s", parent_path,
1519 	    parent_path[0] ? "/" : "", te->name)
1520 	    == -1)
1521 		return got_error_from_errno("asprintf");
1522 
1523 	if (S_ISDIR(te->mode))
1524 		err = add_dir_on_disk(a->worktree, path);
1525 	else
1526 		err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1527 		    a->repo, a->progress_cb, a->progress_arg);
1528 
1529 	free(path);
1530 	return err;
1531 }
1532 
1533 static const struct got_error *
1534 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1535 {
1536 	const struct got_error *err = NULL;
1537 	char *uuidstr = NULL;
1538 	uint32_t uuid_status;
1539 
1540 	*refname = NULL;
1541 
1542 	uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1543 	if (uuid_status != uuid_s_ok)
1544 		return got_error_uuid(uuid_status, "uuid_to_string");
1545 
1546 	if (asprintf(refname, "%s-%s", prefix, uuidstr)
1547 	    == -1) {
1548 		err = got_error_from_errno("asprintf");
1549 		*refname = NULL;
1550 	}
1551 	free(uuidstr);
1552 	return err;
1553 }
1554 
1555 const struct got_error *
1556 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1557 {
1558 	return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1559 }
1560 
1561 static const struct got_error *
1562 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1563 {
1564 	return get_ref_name(refname, worktree,
1565 	    GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1566 }
1567 
1568 static const struct got_error *
1569 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1570 {
1571 	return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1572 }
1573 
1574 static const struct got_error *
1575 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1576 {
1577 	return get_ref_name(refname, worktree,
1578 	    GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1579 }
1580 
1581 static const struct got_error *
1582 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1583 {
1584 	return get_ref_name(refname, worktree,
1585 	    GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1586 }
1587 
1588 static const struct got_error *
1589 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1590 {
1591 	return get_ref_name(refname, worktree,
1592 	    GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1593 }
1594 
1595 static const struct got_error *
1596 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1597 {
1598 	return get_ref_name(refname, worktree,
1599 	    GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1600 }
1601 
1602 static const struct got_error *
1603 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1604 {
1605 	return get_ref_name(refname, worktree,
1606 	    GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1607 }
1608 
1609 static const struct got_error *
1610 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1611 {
1612 	return get_ref_name(refname, worktree,
1613 	    GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1614 }
1615 
1616 const struct got_error *
1617 got_worktree_get_histedit_script_path(char **path,
1618     struct got_worktree *worktree)
1619 {
1620 	if (asprintf(path, "%s/%s/%s", worktree->root_path,
1621 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1622 		*path = NULL;
1623 		return got_error_from_errno("asprintf");
1624 	}
1625 	return NULL;
1626 }
1627 
1628 /*
1629  * Prevent Git's garbage collector from deleting our base commit by
1630  * setting a reference to our base commit's ID.
1631  */
1632 static const struct got_error *
1633 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1634 {
1635 	const struct got_error *err = NULL;
1636 	struct got_reference *ref = NULL;
1637 	char *refname;
1638 
1639 	err = got_worktree_get_base_ref_name(&refname, worktree);
1640 	if (err)
1641 		return err;
1642 
1643 	err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1644 	if (err)
1645 		goto done;
1646 
1647 	err = got_ref_write(ref, repo);
1648 done:
1649 	free(refname);
1650 	if (ref)
1651 		got_ref_close(ref);
1652 	return err;
1653 }
1654 
1655 static const struct got_error *
1656 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1657 {
1658 	const struct got_error *err = NULL;
1659 
1660 	if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1661 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1662 		err = got_error_from_errno("asprintf");
1663 		*fileindex_path = NULL;
1664 	}
1665 	return err;
1666 }
1667 
1668 
1669 static const struct got_error *
1670 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1671     struct got_worktree *worktree)
1672 {
1673 	const struct got_error *err = NULL;
1674 	FILE *index = NULL;
1675 
1676 	*fileindex_path = NULL;
1677 	*fileindex = got_fileindex_alloc();
1678 	if (*fileindex == NULL)
1679 		return got_error_from_errno("got_fileindex_alloc");
1680 
1681 	err = get_fileindex_path(fileindex_path, worktree);
1682 	if (err)
1683 		goto done;
1684 
1685 	index = fopen(*fileindex_path, "rb");
1686 	if (index == NULL) {
1687 		if (errno != ENOENT)
1688 			err = got_error_from_errno2("fopen", *fileindex_path);
1689 	} else {
1690 		err = got_fileindex_read(*fileindex, index);
1691 		if (fclose(index) != 0 && err == NULL)
1692 			err = got_error_from_errno("fclose");
1693 	}
1694 done:
1695 	if (err) {
1696 		free(*fileindex_path);
1697 		*fileindex_path = NULL;
1698 		got_fileindex_free(*fileindex);
1699 		*fileindex = NULL;
1700 	}
1701 	return err;
1702 }
1703 
1704 struct bump_base_commit_id_arg {
1705 	struct got_object_id *base_commit_id;
1706 	const char *path;
1707 	size_t path_len;
1708 	const char *entry_name;
1709 	got_worktree_checkout_cb progress_cb;
1710 	void *progress_arg;
1711 };
1712 
1713 /* Bump base commit ID of all files within an updated part of the work tree. */
1714 static const struct got_error *
1715 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1716 {
1717 	const struct got_error *err;
1718 	struct bump_base_commit_id_arg *a = arg;
1719 
1720 	if (a->entry_name) {
1721 		if (strcmp(ie->path, a->path) != 0)
1722 			return NULL;
1723 	} else if (!got_path_is_child(ie->path, a->path, a->path_len))
1724 		return NULL;
1725 
1726 	if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1727 	    SHA1_DIGEST_LENGTH) == 0)
1728 		return NULL;
1729 
1730 	if (a->progress_cb) {
1731 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1732 		    ie->path);
1733 		if (err)
1734 			return err;
1735 	}
1736 	memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1737 	return NULL;
1738 }
1739 
1740 static const struct got_error *
1741 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1742 {
1743 	const struct got_error *err = NULL;
1744 	char *new_fileindex_path = NULL;
1745 	FILE *new_index = NULL;
1746 	struct timespec timeout;
1747 
1748 	err = got_opentemp_named(&new_fileindex_path, &new_index,
1749 	    fileindex_path);
1750 	if (err)
1751 		goto done;
1752 
1753 	err = got_fileindex_write(fileindex, new_index);
1754 	if (err)
1755 		goto done;
1756 
1757 	if (rename(new_fileindex_path, fileindex_path) != 0) {
1758 		err = got_error_from_errno3("rename", new_fileindex_path,
1759 		    fileindex_path);
1760 		unlink(new_fileindex_path);
1761 	}
1762 
1763 	/*
1764 	 * Sleep for a short amount of time to ensure that files modified after
1765 	 * this program exits have a different time stamp from the one which
1766 	 * was recorded in the file index.
1767 	 */
1768 	 timeout.tv_sec = 0;
1769 	 timeout.tv_nsec = 1;
1770 	 nanosleep(&timeout,  NULL);
1771 done:
1772 	if (new_index)
1773 		fclose(new_index);
1774 	free(new_fileindex_path);
1775 	return err;
1776 }
1777 
1778 static const struct got_error *
1779 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1780     struct got_object_id **tree_id, const char *wt_relpath,
1781     struct got_worktree *worktree, struct got_repository *repo)
1782 {
1783 	const struct got_error *err = NULL;
1784 	struct got_object_id *id = NULL;
1785 	char *in_repo_path = NULL;
1786 	int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1787 
1788 	*entry_type = GOT_OBJ_TYPE_ANY;
1789 	*tree_relpath = NULL;
1790 	*tree_id = NULL;
1791 
1792 	if (wt_relpath[0] == '\0') {
1793 		/* Check out all files within the work tree. */
1794 		*entry_type = GOT_OBJ_TYPE_TREE;
1795 		*tree_relpath = strdup("");
1796 		if (*tree_relpath == NULL) {
1797 			err = got_error_from_errno("strdup");
1798 			goto done;
1799 		}
1800 		err = got_object_id_by_path(tree_id, repo,
1801 		    worktree->base_commit_id, worktree->path_prefix);
1802 		if (err)
1803 			goto done;
1804 		return NULL;
1805 	}
1806 
1807 	/* Check out a subset of files in the work tree. */
1808 
1809 	if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1810 	    is_root_wt ? "" : "/", wt_relpath) == -1) {
1811 		err = got_error_from_errno("asprintf");
1812 		goto done;
1813 	}
1814 
1815 	err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1816 	    in_repo_path);
1817 	if (err)
1818 		goto done;
1819 
1820 	free(in_repo_path);
1821 	in_repo_path = NULL;
1822 
1823 	err = got_object_get_type(entry_type, repo, id);
1824 	if (err)
1825 		goto done;
1826 
1827 	if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1828 		/* Check out a single file. */
1829 		if (strchr(wt_relpath, '/')  == NULL) {
1830 			/* Check out a single file in work tree's root dir. */
1831 			in_repo_path = strdup(worktree->path_prefix);
1832 			if (in_repo_path == NULL) {
1833 				err = got_error_from_errno("strdup");
1834 				goto done;
1835 			}
1836 			*tree_relpath = strdup("");
1837 			if (*tree_relpath == NULL) {
1838 				err = got_error_from_errno("strdup");
1839 				goto done;
1840 			}
1841 		} else {
1842 			/* Check out a single file in a subdirectory. */
1843 			err = got_path_dirname(tree_relpath, wt_relpath);
1844 			if (err)
1845 				return err;
1846 			if (asprintf(&in_repo_path, "%s%s%s",
1847 			    worktree->path_prefix, is_root_wt ? "" : "/",
1848 			    *tree_relpath) == -1) {
1849 				err = got_error_from_errno("asprintf");
1850 				goto done;
1851 			}
1852 		}
1853 		err = got_object_id_by_path(tree_id, repo,
1854 		    worktree->base_commit_id, in_repo_path);
1855 	} else {
1856 		/* Check out all files within a subdirectory. */
1857 		*tree_id = got_object_id_dup(id);
1858 		if (*tree_id == NULL) {
1859 			err = got_error_from_errno("got_object_id_dup");
1860 			goto done;
1861 		}
1862 		*tree_relpath = strdup(wt_relpath);
1863 		if (*tree_relpath == NULL) {
1864 			err = got_error_from_errno("strdup");
1865 			goto done;
1866 		}
1867 	}
1868 done:
1869 	free(id);
1870 	free(in_repo_path);
1871 	if (err) {
1872 		*entry_type = GOT_OBJ_TYPE_ANY;
1873 		free(*tree_relpath);
1874 		*tree_relpath = NULL;
1875 		free(*tree_id);
1876 		*tree_id = NULL;
1877 	}
1878 	return err;
1879 }
1880 
1881 static const struct got_error *
1882 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1883     const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1884     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1885     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1886 {
1887 	const struct got_error *err = NULL;
1888 	struct got_commit_object *commit = NULL;
1889 	struct got_tree_object *tree = NULL;
1890 	struct got_fileindex_diff_tree_cb diff_cb;
1891 	struct diff_cb_arg arg;
1892 
1893 	err = ref_base_commit(worktree, repo);
1894 	if (err) {
1895 		if (!(err->code == GOT_ERR_ERRNO &&
1896 		    (errno == EACCES || errno == EROFS)))
1897 			goto done;
1898 		err = (*progress_cb)(progress_arg,
1899 		    GOT_STATUS_BASE_REF_ERR, worktree->root_path);
1900 		if (err)
1901 			return err;
1902 	}
1903 
1904 	err = got_object_open_as_commit(&commit, repo,
1905 	   worktree->base_commit_id);
1906 	if (err)
1907 		goto done;
1908 
1909 	err = got_object_open_as_tree(&tree, repo, tree_id);
1910 	if (err)
1911 		goto done;
1912 
1913 	if (entry_name &&
1914 	    got_object_tree_find_entry(tree, entry_name) == NULL) {
1915 		err = got_error(GOT_ERR_NO_TREE_ENTRY);
1916 		goto done;
1917 	}
1918 
1919 	diff_cb.diff_old_new = diff_old_new;
1920 	diff_cb.diff_old = diff_old;
1921 	diff_cb.diff_new = diff_new;
1922 	arg.fileindex = fileindex;
1923 	arg.worktree = worktree;
1924 	arg.repo = repo;
1925 	arg.progress_cb = progress_cb;
1926 	arg.progress_arg = progress_arg;
1927 	arg.cancel_cb = cancel_cb;
1928 	arg.cancel_arg = cancel_arg;
1929 	err = got_fileindex_diff_tree(fileindex, tree, relpath,
1930 	    entry_name, repo, &diff_cb, &arg);
1931 done:
1932 	if (tree)
1933 		got_object_tree_close(tree);
1934 	if (commit)
1935 		got_object_commit_close(commit);
1936 	return err;
1937 }
1938 
1939 const struct got_error *
1940 got_worktree_checkout_files(struct got_worktree *worktree,
1941     struct got_pathlist_head *paths, struct got_repository *repo,
1942     got_worktree_checkout_cb progress_cb, void *progress_arg,
1943     got_cancel_cb cancel_cb, void *cancel_arg)
1944 {
1945 	const struct got_error *err = NULL, *sync_err, *unlockerr;
1946 	struct got_commit_object *commit = NULL;
1947 	struct got_tree_object *tree = NULL;
1948 	struct got_fileindex *fileindex = NULL;
1949 	char *fileindex_path = NULL;
1950 	struct got_pathlist_entry *pe;
1951 	struct tree_path_data {
1952 		SIMPLEQ_ENTRY(tree_path_data) entry;
1953 		struct got_object_id *tree_id;
1954 		int entry_type;
1955 		char *relpath;
1956 		char *entry_name;
1957 	} *tpd = NULL;
1958 	SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1959 
1960 	SIMPLEQ_INIT(&tree_paths);
1961 
1962 	err = lock_worktree(worktree, LOCK_EX);
1963 	if (err)
1964 		return err;
1965 
1966 	/* Map all specified paths to in-repository trees. */
1967 	TAILQ_FOREACH(pe, paths, entry) {
1968 		tpd = malloc(sizeof(*tpd));
1969 		if (tpd == NULL) {
1970 			err = got_error_from_errno("malloc");
1971 			goto done;
1972 		}
1973 
1974 		err = find_tree_entry_for_checkout(&tpd->entry_type,
1975 		    &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1976 		if (err) {
1977 			free(tpd);
1978 			goto done;
1979 		}
1980 
1981 		if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1982 			err = got_path_basename(&tpd->entry_name, pe->path);
1983 			if (err) {
1984 				free(tpd->relpath);
1985 				free(tpd->tree_id);
1986 				free(tpd);
1987 				goto done;
1988 			}
1989 		} else
1990 			tpd->entry_name = NULL;
1991 
1992 		SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1993 	}
1994 
1995 	/*
1996 	 * Read the file index.
1997 	 * Checking out files is supposed to be an idempotent operation.
1998 	 * If the on-disk file index is incomplete we will try to complete it.
1999 	 */
2000 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2001 	if (err)
2002 		goto done;
2003 
2004 	tpd = SIMPLEQ_FIRST(&tree_paths);
2005 	TAILQ_FOREACH(pe, paths, entry) {
2006 		struct bump_base_commit_id_arg bbc_arg;
2007 
2008 		err = checkout_files(worktree, fileindex, tpd->relpath,
2009 		    tpd->tree_id, tpd->entry_name, repo,
2010 		    progress_cb, progress_arg, cancel_cb, cancel_arg);
2011 		if (err)
2012 			break;
2013 
2014 		bbc_arg.base_commit_id = worktree->base_commit_id;
2015 		bbc_arg.entry_name = tpd->entry_name;
2016 		bbc_arg.path = pe->path;
2017 		bbc_arg.path_len = pe->path_len;
2018 		bbc_arg.progress_cb = progress_cb;
2019 		bbc_arg.progress_arg = progress_arg;
2020 		err = got_fileindex_for_each_entry_safe(fileindex,
2021 		    bump_base_commit_id, &bbc_arg);
2022 		if (err)
2023 			break;
2024 
2025 		tpd = SIMPLEQ_NEXT(tpd, entry);
2026 	}
2027 	sync_err = sync_fileindex(fileindex, fileindex_path);
2028 	if (sync_err && err == NULL)
2029 		err = sync_err;
2030 done:
2031 	free(fileindex_path);
2032 	if (tree)
2033 		got_object_tree_close(tree);
2034 	if (commit)
2035 		got_object_commit_close(commit);
2036 	if (fileindex)
2037 		got_fileindex_free(fileindex);
2038 	while (!SIMPLEQ_EMPTY(&tree_paths)) {
2039 		tpd = SIMPLEQ_FIRST(&tree_paths);
2040 		SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2041 		free(tpd->relpath);
2042 		free(tpd->tree_id);
2043 		free(tpd);
2044 	}
2045 	unlockerr = lock_worktree(worktree, LOCK_SH);
2046 	if (unlockerr && err == NULL)
2047 		err = unlockerr;
2048 	return err;
2049 }
2050 
2051 struct merge_file_cb_arg {
2052     struct got_worktree *worktree;
2053     struct got_fileindex *fileindex;
2054     got_worktree_checkout_cb progress_cb;
2055     void *progress_arg;
2056     got_cancel_cb cancel_cb;
2057     void *cancel_arg;
2058     const char *label_orig;
2059     struct got_object_id *commit_id2;
2060 };
2061 
2062 static const struct got_error *
2063 merge_file_cb(void *arg, struct got_blob_object *blob1,
2064     struct got_blob_object *blob2, struct got_object_id *id1,
2065     struct got_object_id *id2, const char *path1, const char *path2,
2066     mode_t mode1, mode_t mode2, struct got_repository *repo)
2067 {
2068 	static const struct got_error *err = NULL;
2069 	struct merge_file_cb_arg *a = arg;
2070 	struct got_fileindex_entry *ie;
2071 	char *ondisk_path = NULL;
2072 	struct stat sb;
2073 	unsigned char status;
2074 	int local_changes_subsumed;
2075 
2076 	if (blob1 && blob2) {
2077 		ie = got_fileindex_entry_get(a->fileindex, path2,
2078 		    strlen(path2));
2079 		if (ie == NULL)
2080 			return (*a->progress_cb)(a->progress_arg,
2081 			    GOT_STATUS_MISSING, path2);
2082 
2083 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2084 		    path2) == -1)
2085 			return got_error_from_errno("asprintf");
2086 
2087 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2088 		    repo);
2089 		if (err)
2090 			goto done;
2091 
2092 		if (status == GOT_STATUS_DELETE) {
2093 			err = (*a->progress_cb)(a->progress_arg,
2094 			    GOT_STATUS_MERGE, path2);
2095 			goto done;
2096 		}
2097 		if (status != GOT_STATUS_NO_CHANGE &&
2098 		    status != GOT_STATUS_MODIFY &&
2099 		    status != GOT_STATUS_CONFLICT &&
2100 		    status != GOT_STATUS_ADD) {
2101 			err = (*a->progress_cb)(a->progress_arg, status, path2);
2102 			goto done;
2103 		}
2104 
2105 		err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2106 		    ondisk_path, path2, sb.st_mode, a->label_orig, blob2,
2107 		    a->commit_id2, repo, a->progress_cb, a->progress_arg);
2108 	} else if (blob1) {
2109 		ie = got_fileindex_entry_get(a->fileindex, path1,
2110 		    strlen(path1));
2111 		if (ie == NULL)
2112 			return (*a->progress_cb)(a->progress_arg,
2113 			    GOT_STATUS_MISSING, path1);
2114 
2115 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2116 		    path1) == -1)
2117 			return got_error_from_errno("asprintf");
2118 
2119 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2120 		    repo);
2121 		if (err)
2122 			goto done;
2123 
2124 		switch (status) {
2125 		case GOT_STATUS_NO_CHANGE:
2126 			err = (*a->progress_cb)(a->progress_arg,
2127 			    GOT_STATUS_DELETE, path1);
2128 			if (err)
2129 				goto done;
2130 			err = remove_ondisk_file(a->worktree->root_path, path1);
2131 			if (err)
2132 				goto done;
2133 			if (ie)
2134 				got_fileindex_entry_mark_deleted_from_disk(ie);
2135 			break;
2136 		case GOT_STATUS_DELETE:
2137 		case GOT_STATUS_MISSING:
2138 			err = (*a->progress_cb)(a->progress_arg,
2139 			    GOT_STATUS_DELETE, path1);
2140 			if (err)
2141 				goto done;
2142 			if (ie)
2143 				got_fileindex_entry_mark_deleted_from_disk(ie);
2144 			break;
2145 		case GOT_STATUS_ADD:
2146 		case GOT_STATUS_MODIFY:
2147 		case GOT_STATUS_CONFLICT:
2148 			err = (*a->progress_cb)(a->progress_arg,
2149 			    GOT_STATUS_CANNOT_DELETE, path1);
2150 			if (err)
2151 				goto done;
2152 			break;
2153 		case GOT_STATUS_OBSTRUCTED:
2154 			err = (*a->progress_cb)(a->progress_arg, status, path1);
2155 			if (err)
2156 				goto done;
2157 			break;
2158 		default:
2159 			break;
2160 		}
2161 	} else if (blob2) {
2162 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2163 		    path2) == -1)
2164 			return got_error_from_errno("asprintf");
2165 		ie = got_fileindex_entry_get(a->fileindex, path2,
2166 		    strlen(path2));
2167 		if (ie) {
2168 			err = get_file_status(&status, &sb, ie, ondisk_path,
2169 			    -1, NULL, repo);
2170 			if (err)
2171 				goto done;
2172 			if (status != GOT_STATUS_NO_CHANGE &&
2173 			    status != GOT_STATUS_MODIFY &&
2174 			    status != GOT_STATUS_CONFLICT &&
2175 			    status != GOT_STATUS_ADD) {
2176 				err = (*a->progress_cb)(a->progress_arg,
2177 				    status, path2);
2178 				goto done;
2179 			}
2180 			err = merge_blob(&local_changes_subsumed, a->worktree,
2181 			    NULL, ondisk_path, path2, sb.st_mode,
2182 			    a->label_orig, blob2, a->commit_id2, repo,
2183 			    a->progress_cb,
2184 			    a->progress_arg);
2185 			if (status == GOT_STATUS_DELETE) {
2186 				err = update_blob_fileindex_entry(a->worktree,
2187 				    a->fileindex, ie, ondisk_path, ie->path,
2188 				    blob2, 0);
2189 				if (err)
2190 					goto done;
2191 			}
2192 		} else {
2193 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
2194 			err = install_blob(a->worktree, ondisk_path, path2,
2195 			    /* XXX get this from parent tree! */
2196 			    GOT_DEFAULT_FILE_MODE,
2197 			    sb.st_mode, blob2, 0, 0, repo,
2198 			    a->progress_cb, a->progress_arg);
2199 			if (err)
2200 				goto done;
2201 			err = got_fileindex_entry_alloc(&ie,
2202 			    ondisk_path, path2, NULL, NULL);
2203 			if (err)
2204 				goto done;
2205 			err = got_fileindex_entry_add(a->fileindex, ie);
2206 			if (err) {
2207 				got_fileindex_entry_free(ie);
2208 				goto done;
2209 			}
2210 		}
2211 	}
2212 done:
2213 	free(ondisk_path);
2214 	return err;
2215 }
2216 
2217 struct check_merge_ok_arg {
2218 	struct got_worktree *worktree;
2219 	struct got_repository *repo;
2220 };
2221 
2222 static const struct got_error *
2223 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2224 {
2225 	const struct got_error *err = NULL;
2226 	struct check_merge_ok_arg *a = arg;
2227 	unsigned char status;
2228 	struct stat sb;
2229 	char *ondisk_path;
2230 
2231 	/* Reject merges into a work tree with mixed base commits. */
2232 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2233 	    SHA1_DIGEST_LENGTH))
2234 		return got_error(GOT_ERR_MIXED_COMMITS);
2235 
2236 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2237 	    == -1)
2238 		return got_error_from_errno("asprintf");
2239 
2240 	/* Reject merges into a work tree with conflicted files. */
2241 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2242 	if (err)
2243 		return err;
2244 	if (status == GOT_STATUS_CONFLICT)
2245 		return got_error(GOT_ERR_CONFLICTS);
2246 
2247 	return NULL;
2248 }
2249 
2250 static const struct got_error *
2251 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2252     const char *fileindex_path, struct got_object_id *commit_id1,
2253     struct got_object_id *commit_id2, struct got_repository *repo,
2254     got_worktree_checkout_cb progress_cb, void *progress_arg,
2255     got_cancel_cb cancel_cb, void *cancel_arg)
2256 {
2257 	const struct got_error *err = NULL, *sync_err;
2258 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2259 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2260 	struct merge_file_cb_arg arg;
2261 	char *label_orig = NULL;
2262 
2263 	if (commit_id1) {
2264 		char *id_str;
2265 
2266 		err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2267 		    worktree->path_prefix);
2268 		if (err)
2269 			goto done;
2270 
2271 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
2272 		if (err)
2273 			goto done;
2274 
2275 		err = got_object_id_str(&id_str, commit_id1);
2276 		if (err)
2277 			goto done;
2278 
2279 		if (asprintf(&label_orig, "%s: commit %s",
2280 		    GOT_MERGE_LABEL_BASE, id_str) == -1) {
2281 			err = got_error_from_errno("asprintf");
2282 			free(id_str);
2283 			goto done;
2284 		}
2285 		free(id_str);
2286 	}
2287 
2288 	err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2289 	    worktree->path_prefix);
2290 	if (err)
2291 		goto done;
2292 
2293 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
2294 	if (err)
2295 		goto done;
2296 
2297 	arg.worktree = worktree;
2298 	arg.fileindex = fileindex;
2299 	arg.progress_cb = progress_cb;
2300 	arg.progress_arg = progress_arg;
2301 	arg.cancel_cb = cancel_cb;
2302 	arg.cancel_arg = cancel_arg;
2303 	arg.label_orig = label_orig;
2304 	arg.commit_id2 = commit_id2;
2305 	err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2306 	sync_err = sync_fileindex(fileindex, fileindex_path);
2307 	if (sync_err && err == NULL)
2308 		err = sync_err;
2309 done:
2310 	if (tree1)
2311 		got_object_tree_close(tree1);
2312 	if (tree2)
2313 		got_object_tree_close(tree2);
2314 	free(label_orig);
2315 	return err;
2316 }
2317 
2318 const struct got_error *
2319 got_worktree_merge_files(struct got_worktree *worktree,
2320     struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2321     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2322     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2323 {
2324 	const struct got_error *err, *unlockerr;
2325 	char *fileindex_path = NULL;
2326 	struct got_fileindex *fileindex = NULL;
2327 	struct check_merge_ok_arg mok_arg;
2328 
2329 	err = lock_worktree(worktree, LOCK_EX);
2330 	if (err)
2331 		return err;
2332 
2333 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2334 	if (err)
2335 		goto done;
2336 
2337 	mok_arg.worktree = worktree;
2338 	mok_arg.repo = repo;
2339 	err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2340 	    &mok_arg);
2341 	if (err)
2342 		goto done;
2343 
2344 	err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2345 	    commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2346 done:
2347 	if (fileindex)
2348 		got_fileindex_free(fileindex);
2349 	free(fileindex_path);
2350 	unlockerr = lock_worktree(worktree, LOCK_SH);
2351 	if (unlockerr && err == NULL)
2352 		err = unlockerr;
2353 	return err;
2354 }
2355 
2356 struct diff_dir_cb_arg {
2357     struct got_fileindex *fileindex;
2358     struct got_worktree *worktree;
2359     const char *status_path;
2360     size_t status_path_len;
2361     struct got_repository *repo;
2362     got_worktree_status_cb status_cb;
2363     void *status_arg;
2364     got_cancel_cb cancel_cb;
2365     void *cancel_arg;
2366     /* A pathlist containing per-directory pathlists of ignore patterns. */
2367     struct got_pathlist_head ignores;
2368     int report_unchanged;
2369 };
2370 
2371 static const struct got_error *
2372 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2373     int dirfd, const char *de_name,
2374     got_worktree_status_cb status_cb, void *status_arg,
2375     struct got_repository *repo, int report_unchanged)
2376 {
2377 	const struct got_error *err = NULL;
2378 	unsigned char status = GOT_STATUS_NO_CHANGE;
2379 	unsigned char staged_status = get_staged_status(ie);
2380 	struct stat sb;
2381 	struct got_object_id blob_id, commit_id, staged_blob_id;
2382 	struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2383 	struct got_object_id *staged_blob_idp = NULL;
2384 
2385 	err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
2386 	if (err)
2387 		return err;
2388 
2389 	if (status == GOT_STATUS_NO_CHANGE &&
2390 	    staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
2391 		return NULL;
2392 
2393 	if (got_fileindex_entry_has_blob(ie)) {
2394 		memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2395 		blob_idp = &blob_id;
2396 	}
2397 	if (got_fileindex_entry_has_commit(ie)) {
2398 		memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2399 		commit_idp = &commit_id;
2400 	}
2401 	if (staged_status == GOT_STATUS_ADD ||
2402 	    staged_status == GOT_STATUS_MODIFY) {
2403 		memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2404 		    SHA1_DIGEST_LENGTH);
2405 		staged_blob_idp = &staged_blob_id;
2406 	}
2407 
2408 	return (*status_cb)(status_arg, status, staged_status,
2409 	    ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
2410 }
2411 
2412 static const struct got_error *
2413 status_old_new(void *arg, struct got_fileindex_entry *ie,
2414     struct dirent *de, const char *parent_path, int dirfd)
2415 {
2416 	const struct got_error *err = NULL;
2417 	struct diff_dir_cb_arg *a = arg;
2418 	char *abspath;
2419 
2420 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2421 		return got_error(GOT_ERR_CANCELLED);
2422 
2423 	if (got_path_cmp(parent_path, a->status_path,
2424 	    strlen(parent_path), a->status_path_len) != 0 &&
2425 	    !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2426 		return NULL;
2427 
2428 	if (parent_path[0]) {
2429 		if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2430 		    parent_path, de->d_name) == -1)
2431 			return got_error_from_errno("asprintf");
2432 	} else {
2433 		if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2434 		    de->d_name) == -1)
2435 			return got_error_from_errno("asprintf");
2436 	}
2437 
2438 	err = report_file_status(ie, abspath, dirfd, de->d_name,
2439 	    a->status_cb, a->status_arg, a->repo, a->report_unchanged);
2440 	free(abspath);
2441 	return err;
2442 }
2443 
2444 static const struct got_error *
2445 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2446 {
2447 	struct diff_dir_cb_arg *a = arg;
2448 	struct got_object_id blob_id, commit_id;
2449 	unsigned char status;
2450 
2451 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2452 		return got_error(GOT_ERR_CANCELLED);
2453 
2454 	if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2455 		return NULL;
2456 
2457 	memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2458 	memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2459 	if (got_fileindex_entry_has_file_on_disk(ie))
2460 		status = GOT_STATUS_MISSING;
2461 	else
2462 		status = GOT_STATUS_DELETE;
2463 	return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2464 	    ie->path, &blob_id, NULL, &commit_id, -1, NULL);
2465 }
2466 
2467 void
2468 free_ignorelist(struct got_pathlist_head *ignorelist)
2469 {
2470 	struct got_pathlist_entry *pe;
2471 
2472 	TAILQ_FOREACH(pe, ignorelist, entry)
2473 		free((char *)pe->path);
2474 	got_pathlist_free(ignorelist);
2475 }
2476 
2477 void
2478 free_ignores(struct got_pathlist_head *ignores)
2479 {
2480 	struct got_pathlist_entry *pe;
2481 
2482 	TAILQ_FOREACH(pe, ignores, entry) {
2483 		struct got_pathlist_head *ignorelist = pe->data;
2484 		free_ignorelist(ignorelist);
2485 		free((char *)pe->path);
2486 	}
2487 	got_pathlist_free(ignores);
2488 }
2489 
2490 static const struct got_error *
2491 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2492 {
2493 	const struct got_error *err = NULL;
2494 	struct got_pathlist_entry *pe = NULL;
2495 	struct got_pathlist_head *ignorelist;
2496 	char *line = NULL, *pattern, *dirpath = NULL;
2497 	size_t linesize = 0;
2498 	ssize_t linelen;
2499 
2500 	ignorelist = calloc(1, sizeof(*ignorelist));
2501 	if (ignorelist == NULL)
2502 		return got_error_from_errno("calloc");
2503 	TAILQ_INIT(ignorelist);
2504 
2505 	while ((linelen = getline(&line, &linesize, f)) != -1) {
2506 		if (linelen > 0 && line[linelen - 1] == '\n')
2507 			line[linelen - 1] = '\0';
2508 
2509 		/* Git's ignores may contain comments. */
2510 		if (line[0] == '#')
2511 			continue;
2512 
2513 		/* Git's negated patterns are not (yet?) supported. */
2514 		if (line[0] == '!')
2515 			continue;
2516 
2517 		if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2518 		    line) == -1) {
2519 			err = got_error_from_errno("asprintf");
2520 			goto done;
2521 		}
2522 		err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2523 		if (err)
2524 			goto done;
2525 	}
2526 	if (ferror(f)) {
2527 		err = got_error_from_errno("getline");
2528 		goto done;
2529 	}
2530 
2531 	dirpath = strdup(path);
2532 	if (dirpath == NULL) {
2533 		err = got_error_from_errno("strdup");
2534 		goto done;
2535 	}
2536 	err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2537 done:
2538 	free(line);
2539 	if (err || pe == NULL) {
2540 		free(dirpath);
2541 		free_ignorelist(ignorelist);
2542 	}
2543 	return err;
2544 }
2545 
2546 int
2547 match_ignores(struct got_pathlist_head *ignores, const char *path)
2548 {
2549 	struct got_pathlist_entry *pe;
2550 
2551 	/* Handle patterns which match in all directories. */
2552 	TAILQ_FOREACH(pe, ignores, entry) {
2553 		struct got_pathlist_head *ignorelist = pe->data;
2554 		struct got_pathlist_entry *pi;
2555 
2556 		TAILQ_FOREACH(pi, ignorelist, entry) {
2557 			const char *p, *pattern = pi->path;
2558 
2559 			if (strncmp(pattern, "**/", 3) != 0)
2560 				continue;
2561 			pattern += 3;
2562 			p = path;
2563 			while (*p) {
2564 				if (fnmatch(pattern, p,
2565 				    FNM_PATHNAME | FNM_LEADING_DIR)) {
2566 					/* Retry in next directory. */
2567 					while (*p && *p != '/')
2568 						p++;
2569 					while (*p == '/')
2570 						p++;
2571 					continue;
2572 				}
2573 				return 1;
2574 			}
2575 		}
2576 	}
2577 
2578 	/*
2579 	 * The ignores pathlist contains ignore lists from children before
2580 	 * parents, so we can find the most specific ignorelist by walking
2581 	 * ignores backwards.
2582 	 */
2583 	pe = TAILQ_LAST(ignores, got_pathlist_head);
2584 	while (pe) {
2585 		if (got_path_is_child(path, pe->path, pe->path_len)) {
2586 			struct got_pathlist_head *ignorelist = pe->data;
2587 			struct got_pathlist_entry *pi;
2588 			TAILQ_FOREACH(pi, ignorelist, entry) {
2589 				const char *pattern = pi->path;
2590 				int flags = FNM_LEADING_DIR;
2591 				if (strstr(pattern, "/**/") == NULL)
2592 					flags |= FNM_PATHNAME;
2593 				if (fnmatch(pattern, path, flags))
2594 					continue;
2595 				return 1;
2596 			}
2597 		}
2598 		pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2599 	}
2600 
2601 	return 0;
2602 }
2603 
2604 static const struct got_error *
2605 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2606     const char *path, int dirfd, const char *ignores_filename)
2607 {
2608 	const struct got_error *err = NULL;
2609 	char *ignorespath;
2610 	int fd = -1;
2611 	FILE *ignoresfile = NULL;
2612 
2613 	if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2614 	    path[0] ? "/" : "", ignores_filename) == -1)
2615 		return got_error_from_errno("asprintf");
2616 
2617 	if (dirfd != -1) {
2618 		fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
2619 		if (fd == -1) {
2620 			if (errno != ENOENT && errno != EACCES)
2621 				err = got_error_from_errno2("openat",
2622 				    ignorespath);
2623 		} else {
2624 			ignoresfile = fdopen(fd, "r");
2625 			if (ignoresfile == NULL) 
2626 				err = got_error_from_errno2("fdopen",
2627 				    ignorespath);
2628 			else {
2629 				fd = -1;
2630 				err = read_ignores(ignores, path, ignoresfile);
2631 			}
2632 		}
2633 	} else {
2634 		ignoresfile = fopen(ignorespath, "r");
2635 		if (ignoresfile == NULL) {
2636 			if (errno != ENOENT && errno != EACCES)
2637 				err = got_error_from_errno2("fopen",
2638 				    ignorespath);
2639 		} else
2640 			err = read_ignores(ignores, path, ignoresfile);
2641 	}
2642 
2643 	if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2644 		err = got_error_from_errno2("fclose", path);
2645 	if (fd != -1 && close(fd) == -1 && err == NULL)
2646 		err = got_error_from_errno2("close", path);
2647 	free(ignorespath);
2648 	return err;
2649 }
2650 
2651 static const struct got_error *
2652 status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
2653 {
2654 	const struct got_error *err = NULL;
2655 	struct diff_dir_cb_arg *a = arg;
2656 	char *path = NULL;
2657 
2658 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2659 		return got_error(GOT_ERR_CANCELLED);
2660 
2661 	/* XXX ignore symlinks for now */
2662 	if (de->d_type == DT_LNK)
2663 		return NULL;
2664 
2665 	if (parent_path[0]) {
2666 		if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2667 			return got_error_from_errno("asprintf");
2668 	} else {
2669 		path = de->d_name;
2670 	}
2671 
2672 	if (de->d_type == DT_DIR) {
2673 		int subdirfd = openat(dirfd, de->d_name,
2674 		    O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2675 		if (subdirfd == -1) {
2676 			if (errno != ENOENT && errno != EACCES)
2677 				err = got_error_from_errno2("openat", path);
2678 		} else {
2679 			err = add_ignores(&a->ignores, a->worktree->root_path,
2680 			    path, subdirfd, ".cvsignore");
2681 			if (err == NULL)
2682 				err = add_ignores(&a->ignores,
2683 				    a->worktree->root_path, path,
2684 				    subdirfd, ".gitignore");
2685 			if (close(subdirfd) == -1 && err == NULL)
2686 				err = got_error_from_errno2("close", path);
2687 		}
2688 	} else if (got_path_is_child(path, a->status_path, a->status_path_len)
2689 	    && !match_ignores(&a->ignores, path))
2690 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2691 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2692 	if (parent_path[0])
2693 		free(path);
2694 	return err;
2695 }
2696 
2697 static const struct got_error *
2698 report_single_file_status(const char *path, const char *ondisk_path,
2699 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2700 void *status_arg, struct got_repository *repo, int report_unchanged)
2701 {
2702 	struct got_fileindex_entry *ie;
2703 	struct stat sb;
2704 
2705 	ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2706 	if (ie)
2707 		return report_file_status(ie, ondisk_path, -1, NULL,
2708 		    status_cb, status_arg, repo, report_unchanged);
2709 
2710 	if (lstat(ondisk_path, &sb) == -1) {
2711 		if (errno != ENOENT)
2712 			return got_error_from_errno2("lstat", ondisk_path);
2713 		return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2714 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2715 		return NULL;
2716 	}
2717 
2718 	if (S_ISREG(sb.st_mode))
2719 		return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2720 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2721 
2722 	return NULL;
2723 }
2724 
2725 static const struct got_error *
2726 worktree_status(struct got_worktree *worktree, const char *path,
2727     struct got_fileindex *fileindex, struct got_repository *repo,
2728     got_worktree_status_cb status_cb, void *status_arg,
2729     got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
2730     int report_unchanged)
2731 {
2732 	const struct got_error *err = NULL;
2733 	int fd = -1;
2734 	struct got_fileindex_diff_dir_cb fdiff_cb;
2735 	struct diff_dir_cb_arg arg;
2736 	char *ondisk_path = NULL;
2737 
2738 	if (asprintf(&ondisk_path, "%s%s%s",
2739 	    worktree->root_path, path[0] ? "/" : "", path) == -1)
2740 		return got_error_from_errno("asprintf");
2741 
2742 	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2743 	if (fd == -1) {
2744 		if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2745 			err = got_error_from_errno2("open", ondisk_path);
2746 		else
2747 			err = report_single_file_status(path, ondisk_path,
2748 			    fileindex, status_cb, status_arg, repo,
2749 			    report_unchanged);
2750 	} else {
2751 		fdiff_cb.diff_old_new = status_old_new;
2752 		fdiff_cb.diff_old = status_old;
2753 		fdiff_cb.diff_new = status_new;
2754 		arg.fileindex = fileindex;
2755 		arg.worktree = worktree;
2756 		arg.status_path = path;
2757 		arg.status_path_len = strlen(path);
2758 		arg.repo = repo;
2759 		arg.status_cb = status_cb;
2760 		arg.status_arg = status_arg;
2761 		arg.cancel_cb = cancel_cb;
2762 		arg.cancel_arg = cancel_arg;
2763 		arg.report_unchanged = report_unchanged;
2764 		TAILQ_INIT(&arg.ignores);
2765 		if (!no_ignores) {
2766 			err = add_ignores(&arg.ignores, worktree->root_path,
2767 			    path, fd, ".cvsignore");
2768 			if (err == NULL)
2769 				err = add_ignores(&arg.ignores,
2770 				    worktree->root_path, path, fd,
2771 				    ".gitignore");
2772 		}
2773 		if (err == NULL)
2774 			err = got_fileindex_diff_dir(fileindex, fd,
2775 			    worktree->root_path, path, repo, &fdiff_cb, &arg);
2776 		free_ignores(&arg.ignores);
2777 	}
2778 
2779 	if (fd != -1 && close(fd) != 0 && err == NULL)
2780 		err = got_error_from_errno("close");
2781 	free(ondisk_path);
2782 	return err;
2783 }
2784 
2785 const struct got_error *
2786 got_worktree_status(struct got_worktree *worktree,
2787     struct got_pathlist_head *paths, struct got_repository *repo,
2788     got_worktree_status_cb status_cb, void *status_arg,
2789     got_cancel_cb cancel_cb, void *cancel_arg)
2790 {
2791 	const struct got_error *err = NULL;
2792 	char *fileindex_path = NULL;
2793 	struct got_fileindex *fileindex = NULL;
2794 	struct got_pathlist_entry *pe;
2795 
2796 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2797 	if (err)
2798 		return err;
2799 
2800 	TAILQ_FOREACH(pe, paths, entry) {
2801 		err = worktree_status(worktree, pe->path, fileindex, repo,
2802 			status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
2803 		if (err)
2804 			break;
2805 	}
2806 	free(fileindex_path);
2807 	got_fileindex_free(fileindex);
2808 	return err;
2809 }
2810 
2811 const struct got_error *
2812 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2813     const char *arg)
2814 {
2815 	const struct got_error *err = NULL;
2816 	char *resolved, *cwd = NULL, *path = NULL;
2817 	size_t len;
2818 
2819 	*wt_path = NULL;
2820 
2821 	resolved = realpath(arg, NULL);
2822 	if (resolved == NULL) {
2823 		if (errno != ENOENT)
2824 			return got_error_from_errno2("realpath", arg);
2825 		cwd = getcwd(NULL, 0);
2826 		if (cwd == NULL)
2827 			return got_error_from_errno("getcwd");
2828 		if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2829 			err = got_error_from_errno("asprintf");
2830 			goto done;
2831 		}
2832 	}
2833 
2834 	if (strncmp(got_worktree_get_root_path(worktree), resolved,
2835 	    strlen(got_worktree_get_root_path(worktree)))) {
2836 		err = got_error_path(resolved, GOT_ERR_BAD_PATH);
2837 		goto done;
2838 	}
2839 
2840 	if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2841 		err = got_path_skip_common_ancestor(&path,
2842 		    got_worktree_get_root_path(worktree), resolved);
2843 		if (err)
2844 			goto done;
2845 	} else {
2846 		path = strdup("");
2847 		if (path == NULL) {
2848 			err = got_error_from_errno("strdup");
2849 			goto done;
2850 		}
2851 	}
2852 
2853 	/* XXX status walk can't deal with trailing slash! */
2854 	len = strlen(path);
2855 	while (len > 0 && path[len - 1] == '/') {
2856 		path[len - 1] = '\0';
2857 		len--;
2858 	}
2859 done:
2860 	free(resolved);
2861 	free(cwd);
2862 	if (err == NULL)
2863 		*wt_path = path;
2864 	else
2865 		free(path);
2866 	return err;
2867 }
2868 
2869 struct schedule_addition_args {
2870 	struct got_worktree *worktree;
2871 	struct got_fileindex *fileindex;
2872 	got_worktree_checkout_cb progress_cb;
2873 	void *progress_arg;
2874 	struct got_repository *repo;
2875 };
2876 
2877 static const struct got_error *
2878 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
2879     const char *relpath, struct got_object_id *blob_id,
2880     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2881     int dirfd, const char *de_name)
2882 {
2883 	struct schedule_addition_args *a = arg;
2884 	const struct got_error *err = NULL;
2885 	struct got_fileindex_entry *ie;
2886 	struct stat sb;
2887 	char *ondisk_path;
2888 
2889 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2890 	    relpath) == -1)
2891 		return got_error_from_errno("asprintf");
2892 
2893 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2894 	if (ie) {
2895 		err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
2896 		    de_name, a->repo);
2897 		if (err)
2898 			goto done;
2899 		/* Re-adding an existing entry is a no-op. */
2900 		if (status == GOT_STATUS_ADD)
2901 			goto done;
2902 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
2903 		if (err)
2904 			goto done;
2905 	}
2906 
2907 	if (status != GOT_STATUS_UNVERSIONED) {
2908 		err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
2909 		goto done;
2910 	}
2911 
2912 	err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2913 	if (err)
2914 		goto done;
2915 
2916 	err = got_fileindex_entry_add(a->fileindex, ie);
2917 	if (err) {
2918 		got_fileindex_entry_free(ie);
2919 		goto done;
2920 	}
2921 done:
2922 	free(ondisk_path);
2923 	if (err)
2924 		return err;
2925 	if (status == GOT_STATUS_ADD)
2926 		return NULL;
2927 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
2928 }
2929 
2930 const struct got_error *
2931 got_worktree_schedule_add(struct got_worktree *worktree,
2932     struct got_pathlist_head *paths,
2933     got_worktree_checkout_cb progress_cb, void *progress_arg,
2934     struct got_repository *repo, int no_ignores)
2935 {
2936 	struct got_fileindex *fileindex = NULL;
2937 	char *fileindex_path = NULL;
2938 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2939 	struct got_pathlist_entry *pe;
2940 	struct schedule_addition_args saa;
2941 
2942 	err = lock_worktree(worktree, LOCK_EX);
2943 	if (err)
2944 		return err;
2945 
2946 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2947 	if (err)
2948 		goto done;
2949 
2950 	saa.worktree = worktree;
2951 	saa.fileindex = fileindex;
2952 	saa.progress_cb = progress_cb;
2953 	saa.progress_arg = progress_arg;
2954 	saa.repo = repo;
2955 
2956 	TAILQ_FOREACH(pe, paths, entry) {
2957 		err = worktree_status(worktree, pe->path, fileindex, repo,
2958 			schedule_addition, &saa, NULL, NULL, no_ignores, 0);
2959 		if (err)
2960 			break;
2961 	}
2962 	sync_err = sync_fileindex(fileindex, fileindex_path);
2963 	if (sync_err && err == NULL)
2964 		err = sync_err;
2965 done:
2966 	free(fileindex_path);
2967 	if (fileindex)
2968 		got_fileindex_free(fileindex);
2969 	unlockerr = lock_worktree(worktree, LOCK_SH);
2970 	if (unlockerr && err == NULL)
2971 		err = unlockerr;
2972 	return err;
2973 }
2974 
2975 struct schedule_deletion_args {
2976 	struct got_worktree *worktree;
2977 	struct got_fileindex *fileindex;
2978 	got_worktree_delete_cb progress_cb;
2979 	void *progress_arg;
2980 	struct got_repository *repo;
2981 	int delete_local_mods;
2982 	int keep_on_disk;
2983 };
2984 
2985 static const struct got_error *
2986 schedule_for_deletion(void *arg, unsigned char status,
2987     unsigned char staged_status, const char *relpath,
2988     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
2989     struct got_object_id *commit_id, int dirfd, const char *de_name)
2990 {
2991 	struct schedule_deletion_args *a = arg;
2992 	const struct got_error *err = NULL;
2993 	struct got_fileindex_entry *ie = NULL;
2994 	struct stat sb;
2995 	char *ondisk_path, *parent = NULL;
2996 
2997 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2998 	if (ie == NULL)
2999 		return got_error_path(relpath, GOT_ERR_BAD_PATH);
3000 
3001 	staged_status = get_staged_status(ie);
3002 	if (staged_status != GOT_STATUS_NO_CHANGE) {
3003 		if (staged_status == GOT_STATUS_DELETE)
3004 			return NULL;
3005 		return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3006 	}
3007 
3008 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3009 	    relpath) == -1)
3010 		return got_error_from_errno("asprintf");
3011 
3012 	err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3013 	    a->repo);
3014 	if (err)
3015 		goto done;
3016 
3017 	if (status != GOT_STATUS_NO_CHANGE) {
3018 		if (status == GOT_STATUS_DELETE)
3019 			goto done;
3020 		if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3021 			err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3022 			goto done;
3023 		}
3024 		if (status != GOT_STATUS_MODIFY &&
3025 		    status != GOT_STATUS_MISSING) {
3026 			err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3027 			goto done;
3028 		}
3029 	}
3030 
3031 	if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3032 		if (dirfd != -1) {
3033 			if (unlinkat(dirfd, de_name, 0) != 0) {
3034 				err = got_error_from_errno2("unlinkat",
3035 				    ondisk_path);
3036 				goto done;
3037 			}
3038 		} else if (unlink(ondisk_path) != 0) {
3039 			err = got_error_from_errno2("unlink", ondisk_path);
3040 			goto done;
3041 		}
3042 
3043 		parent = dirname(ondisk_path);
3044 
3045 		if (parent == NULL) {
3046 			err = got_error_from_errno2("dirname", ondisk_path);
3047 			goto done;
3048 		}
3049 		while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3050 			if (rmdir(parent) == -1) {
3051 				if (errno != ENOTEMPTY)
3052 					err = got_error_from_errno2("rmdir",
3053 					    parent);
3054 				break;
3055 			}
3056 			parent = dirname(parent);
3057 			if (parent == NULL) {
3058 				err = got_error_from_errno2("dirname", parent);
3059 				goto done;
3060 			}
3061 		}
3062 	}
3063 
3064 	got_fileindex_entry_mark_deleted_from_disk(ie);
3065 done:
3066 	free(ondisk_path);
3067 	if (err)
3068 		return err;
3069 	if (status == GOT_STATUS_DELETE)
3070 		return NULL;
3071 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3072 	    staged_status, relpath);
3073 }
3074 
3075 const struct got_error *
3076 got_worktree_schedule_delete(struct got_worktree *worktree,
3077     struct got_pathlist_head *paths, int delete_local_mods,
3078     got_worktree_delete_cb progress_cb, void *progress_arg,
3079     struct got_repository *repo, int keep_on_disk)
3080 {
3081 	struct got_fileindex *fileindex = NULL;
3082 	char *fileindex_path = NULL;
3083 	const struct got_error *err = NULL, *sync_err, *unlockerr;
3084 	struct got_pathlist_entry *pe;
3085 	struct schedule_deletion_args sda;
3086 
3087 	err = lock_worktree(worktree, LOCK_EX);
3088 	if (err)
3089 		return err;
3090 
3091 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3092 	if (err)
3093 		goto done;
3094 
3095 	sda.worktree = worktree;
3096 	sda.fileindex = fileindex;
3097 	sda.progress_cb = progress_cb;
3098 	sda.progress_arg = progress_arg;
3099 	sda.repo = repo;
3100 	sda.delete_local_mods = delete_local_mods;
3101 	sda.keep_on_disk = keep_on_disk;
3102 
3103 	TAILQ_FOREACH(pe, paths, entry) {
3104 		err = worktree_status(worktree, pe->path, fileindex, repo,
3105 			schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3106 		if (err)
3107 			break;
3108 	}
3109 	sync_err = sync_fileindex(fileindex, fileindex_path);
3110 	if (sync_err && err == NULL)
3111 		err = sync_err;
3112 done:
3113 	free(fileindex_path);
3114 	if (fileindex)
3115 		got_fileindex_free(fileindex);
3116 	unlockerr = lock_worktree(worktree, LOCK_SH);
3117 	if (unlockerr && err == NULL)
3118 		err = unlockerr;
3119 	return err;
3120 }
3121 
3122 static const struct got_error *
3123 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3124 {
3125 	const struct got_error *err = NULL;
3126 	char *line = NULL;
3127 	size_t linesize = 0, n;
3128 	ssize_t linelen;
3129 
3130 	linelen = getline(&line, &linesize, infile);
3131 	if (linelen == -1) {
3132 		if (ferror(infile)) {
3133 			err = got_error_from_errno("getline");
3134 			goto done;
3135 		}
3136 		return NULL;
3137 	}
3138 	if (outfile) {
3139 		n = fwrite(line, 1, linelen, outfile);
3140 		if (n != linelen) {
3141 			err = got_ferror(outfile, GOT_ERR_IO);
3142 			goto done;
3143 		}
3144 	}
3145 	if (rejectfile) {
3146 		n = fwrite(line, 1, linelen, rejectfile);
3147 		if (n != linelen)
3148 			err = got_ferror(outfile, GOT_ERR_IO);
3149 	}
3150 done:
3151 	free(line);
3152 	return err;
3153 }
3154 
3155 static const struct got_error *
3156 skip_one_line(FILE *f)
3157 {
3158 	char *line = NULL;
3159 	size_t linesize = 0;
3160 	ssize_t linelen;
3161 
3162 	linelen = getline(&line, &linesize, f);
3163 	if (linelen == -1) {
3164 		if (ferror(f))
3165 			return got_error_from_errno("getline");
3166 		return NULL;
3167 	}
3168 	free(line);
3169 	return NULL;
3170 }
3171 
3172 static const struct got_error *
3173 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3174     int start_old, int end_old, int start_new, int end_new,
3175     FILE *outfile, FILE *rejectfile)
3176  {
3177 	const struct got_error *err;
3178 
3179 	/* Copy old file's lines leading up to patch. */
3180 	while (!feof(f1) && *line_cur1 < start_old) {
3181 		err = copy_one_line(f1, outfile, NULL);
3182 		if (err)
3183 			return err;
3184 		(*line_cur1)++;
3185 	}
3186 	/* Skip new file's lines leading up to patch. */
3187 	while (!feof(f2) && *line_cur2 < start_new) {
3188 		if (rejectfile)
3189 			err = copy_one_line(f2, NULL, rejectfile);
3190 		else
3191 			err = skip_one_line(f2);
3192 		if (err)
3193 			return err;
3194 		(*line_cur2)++;
3195 	}
3196 	/* Copy patched lines. */
3197 	while (!feof(f2) && *line_cur2 <= end_new) {
3198 		err = copy_one_line(f2, outfile, NULL);
3199 		if (err)
3200 			return err;
3201 		(*line_cur2)++;
3202 	}
3203 	/* Skip over old file's replaced lines. */
3204 	while (!feof(f1) && *line_cur1 <= end_old) {
3205 		if (rejectfile)
3206 			err = copy_one_line(f1, NULL, rejectfile);
3207 		else
3208 			err = skip_one_line(f1);
3209 		if (err)
3210 			return err;
3211 		(*line_cur1)++;
3212 	}
3213 
3214 	return NULL;
3215 }
3216 
3217 static const struct got_error *
3218 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3219     FILE *outfile, FILE *rejectfile)
3220 {
3221 	const struct got_error *err;
3222 
3223 	if (outfile) {
3224 		/* Copy old file's lines until EOF. */
3225 		while (!feof(f1)) {
3226 			err = copy_one_line(f1, outfile, NULL);
3227 			if (err)
3228 				return err;
3229 			(*line_cur1)++;
3230 		}
3231 	}
3232 	if (rejectfile) {
3233 		/* Copy new file's lines until EOF. */
3234 		while (!feof(f2)) {
3235 			err = copy_one_line(f2, NULL, rejectfile);
3236 			if (err)
3237 				return err;
3238 			(*line_cur2)++;
3239 		}
3240 	}
3241 
3242 	return NULL;
3243 }
3244 
3245 static const struct got_error *
3246 apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3247     int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3248     int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3249     int *line_cur2, FILE *outfile, FILE *rejectfile,
3250     got_worktree_patch_cb patch_cb, void *patch_arg)
3251 {
3252 	const struct got_error *err = NULL;
3253 	int start_old = change->cv.a;
3254 	int end_old = change->cv.b;
3255 	int start_new = change->cv.c;
3256 	int end_new = change->cv.d;
3257 	long pos1, pos2;
3258 	FILE *hunkfile;
3259 
3260 	*choice = GOT_PATCH_CHOICE_NONE;
3261 
3262 	hunkfile = got_opentemp();
3263 	if (hunkfile == NULL)
3264 		return got_error_from_errno("got_opentemp");
3265 
3266 	pos1 = ftell(f1);
3267 	pos2 = ftell(f2);
3268 
3269 	/* XXX TODO needs error checking */
3270 	got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3271 
3272 	if (fseek(f1, pos1, SEEK_SET) == -1) {
3273 		err = got_ferror(f1, GOT_ERR_IO);
3274 		goto done;
3275 	}
3276 	if (fseek(f2, pos2, SEEK_SET) == -1) {
3277 		err = got_ferror(f1, GOT_ERR_IO);
3278 		goto done;
3279 	}
3280 	if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3281 		err = got_ferror(hunkfile, GOT_ERR_IO);
3282 		goto done;
3283 	}
3284 
3285 	err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3286 	    hunkfile, n, nchanges);
3287 	if (err)
3288 		goto done;
3289 
3290 	switch (*choice) {
3291 	case GOT_PATCH_CHOICE_YES:
3292 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3293 		    end_old, start_new, end_new, outfile, rejectfile);
3294 		break;
3295 	case GOT_PATCH_CHOICE_NO:
3296 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3297 		    end_old, start_new, end_new, rejectfile, outfile);
3298 		break;
3299 	case GOT_PATCH_CHOICE_QUIT:
3300 		break;
3301 	default:
3302 		err = got_error(GOT_ERR_PATCH_CHOICE);
3303 		break;
3304 	}
3305 done:
3306 	if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3307 		err = got_error_from_errno("fclose");
3308 	return err;
3309 }
3310 
3311 struct revert_file_args {
3312 	struct got_worktree *worktree;
3313 	struct got_fileindex *fileindex;
3314 	got_worktree_checkout_cb progress_cb;
3315 	void *progress_arg;
3316 	got_worktree_patch_cb patch_cb;
3317 	void *patch_arg;
3318 	struct got_repository *repo;
3319 };
3320 
3321 static const struct got_error *
3322 create_patched_content(char **path_outfile, int reverse_patch,
3323     struct got_object_id *blob_id, const char *path2,
3324     int dirfd2, const char *de_name2,
3325     const char *relpath, struct got_repository *repo,
3326     got_worktree_patch_cb patch_cb, void *patch_arg)
3327 {
3328 	const struct got_error *err;
3329 	struct got_blob_object *blob = NULL;
3330 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3331 	int fd2 = -1;
3332 	char *path1 = NULL, *id_str = NULL;
3333 	struct stat sb1, sb2;
3334 	struct got_diff_changes *changes = NULL;
3335 	struct got_diff_state *ds = NULL;
3336 	struct got_diff_args *args = NULL;
3337 	struct got_diff_change *change;
3338 	int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3339 	int n = 0;
3340 
3341 	*path_outfile = NULL;
3342 
3343 	err = got_object_id_str(&id_str, blob_id);
3344 	if (err)
3345 		return err;
3346 
3347 	if (dirfd2 != -1) {
3348 		fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
3349 		if (fd2 == -1) {
3350 			err = got_error_from_errno2("openat", path2);
3351 			goto done;
3352 		}
3353 	} else {
3354 		fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3355 		if (fd2 == -1) {
3356 			err = got_error_from_errno2("open", path2);
3357 			goto done;
3358 		}
3359 	}
3360 	if (fstat(fd2, &sb2) == -1) {
3361 		err = got_error_from_errno2("fstat", path2);
3362 		goto done;
3363 	}
3364 
3365 	f2 = fdopen(fd2, "r");
3366 	if (f2 == NULL) {
3367 		err = got_error_from_errno2("fdopen", path2);
3368 		goto done;
3369 	}
3370 	fd2 = -1;
3371 
3372 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3373 	if (err)
3374 		goto done;
3375 
3376 	err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3377 	if (err)
3378 		goto done;
3379 
3380 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3381 	if (err)
3382 		goto done;
3383 
3384 	if (stat(path1, &sb1) == -1) {
3385 		err = got_error_from_errno2("stat", path1);
3386 		goto done;
3387 	}
3388 
3389 	err = got_diff_files(&changes, &ds, &args, &diff_flags,
3390 	    f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3391 	if (err)
3392 		goto done;
3393 
3394 	err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3395 	if (err)
3396 		goto done;
3397 
3398 	if (fseek(f1, 0L, SEEK_SET) == -1)
3399 		return got_ferror(f1, GOT_ERR_IO);
3400 	if (fseek(f2, 0L, SEEK_SET) == -1)
3401 		return got_ferror(f2, GOT_ERR_IO);
3402 	SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3403 		int choice;
3404 		err = apply_or_reject_change(&choice, change, ++n,
3405 		    changes->nchanges, ds, args, diff_flags, relpath,
3406 		    f1, f2, &line_cur1, &line_cur2,
3407 		    reverse_patch ? NULL : outfile,
3408 		    reverse_patch ? outfile : NULL,
3409 		    patch_cb, patch_arg);
3410 		if (err)
3411 			goto done;
3412 		if (choice == GOT_PATCH_CHOICE_YES)
3413 			have_content = 1;
3414 		else if (choice == GOT_PATCH_CHOICE_QUIT)
3415 			break;
3416 	}
3417 	if (have_content) {
3418 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3419 		    reverse_patch ? NULL : outfile,
3420 		    reverse_patch ? outfile : NULL);
3421 		if (err)
3422 			goto done;
3423 
3424 		if (chmod(*path_outfile, sb2.st_mode) == -1) {
3425 			err = got_error_from_errno2("chmod", path2);
3426 			goto done;
3427 		}
3428 	}
3429 done:
3430 	free(id_str);
3431 	if (blob)
3432 		got_object_blob_close(blob);
3433 	if (f1 && fclose(f1) == EOF && err == NULL)
3434 		err = got_error_from_errno2("fclose", path1);
3435 	if (f2 && fclose(f2) == EOF && err == NULL)
3436 		err = got_error_from_errno2("fclose", path2);
3437 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3438 		err = got_error_from_errno2("close", path2);
3439 	if (outfile && fclose(outfile) == EOF && err == NULL)
3440 		err = got_error_from_errno2("fclose", *path_outfile);
3441 	if (path1 && unlink(path1) == -1 && err == NULL)
3442 		err = got_error_from_errno2("unlink", path1);
3443 	if (err || !have_content) {
3444 		if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3445 			err = got_error_from_errno2("unlink", *path_outfile);
3446 		free(*path_outfile);
3447 		*path_outfile = NULL;
3448 	}
3449 	free(args);
3450 	if (ds) {
3451 		got_diff_state_free(ds);
3452 		free(ds);
3453 	}
3454 	if (changes)
3455 		got_diff_free_changes(changes);
3456 	free(path1);
3457 	return err;
3458 }
3459 
3460 static const struct got_error *
3461 revert_file(void *arg, unsigned char status, unsigned char staged_status,
3462     const char *relpath, struct got_object_id *blob_id,
3463     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3464     int dirfd, const char *de_name)
3465 {
3466 	struct revert_file_args *a = arg;
3467 	const struct got_error *err = NULL;
3468 	char *parent_path = NULL;
3469 	struct got_fileindex_entry *ie;
3470 	struct got_tree_object *tree = NULL;
3471 	struct got_object_id *tree_id = NULL;
3472 	const struct got_tree_entry *te = NULL;
3473 	char *tree_path = NULL, *te_name;
3474 	char *ondisk_path = NULL, *path_content = NULL;
3475 	struct got_blob_object *blob = NULL;
3476 
3477 	/* Reverting a staged deletion is a no-op. */
3478 	if (status == GOT_STATUS_DELETE &&
3479 	    staged_status != GOT_STATUS_NO_CHANGE)
3480 		return NULL;
3481 
3482 	if (status == GOT_STATUS_UNVERSIONED)
3483 		return (*a->progress_cb)(a->progress_arg,
3484 		    GOT_STATUS_UNVERSIONED, relpath);
3485 
3486 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3487 	if (ie == NULL)
3488 		return got_error_path(relpath, GOT_ERR_BAD_PATH);
3489 
3490 	/* Construct in-repository path of tree which contains this blob. */
3491 	err = got_path_dirname(&parent_path, ie->path);
3492 	if (err) {
3493 		if (err->code != GOT_ERR_BAD_PATH)
3494 			goto done;
3495 		parent_path = strdup("/");
3496 		if (parent_path == NULL) {
3497 			err = got_error_from_errno("strdup");
3498 			goto done;
3499 		}
3500 	}
3501 	if (got_path_is_root_dir(a->worktree->path_prefix)) {
3502 		tree_path = strdup(parent_path);
3503 		if (tree_path == NULL) {
3504 			err = got_error_from_errno("strdup");
3505 			goto done;
3506 		}
3507 	} else {
3508 		if (got_path_is_root_dir(parent_path)) {
3509 			tree_path = strdup(a->worktree->path_prefix);
3510 			if (tree_path == NULL) {
3511 				err = got_error_from_errno("strdup");
3512 				goto done;
3513 			}
3514 		} else {
3515 			if (asprintf(&tree_path, "%s/%s",
3516 			    a->worktree->path_prefix, parent_path) == -1) {
3517 				err = got_error_from_errno("asprintf");
3518 				goto done;
3519 			}
3520 		}
3521 	}
3522 
3523 	err = got_object_id_by_path(&tree_id, a->repo,
3524 	    a->worktree->base_commit_id, tree_path);
3525 	if (err) {
3526 		if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3527 		    (status == GOT_STATUS_ADD ||
3528 		    staged_status == GOT_STATUS_ADD)))
3529 			goto done;
3530 	} else {
3531 		err = got_object_open_as_tree(&tree, a->repo, tree_id);
3532 		if (err)
3533 			goto done;
3534 
3535 		te_name = basename(ie->path);
3536 		if (te_name == NULL) {
3537 			err = got_error_from_errno2("basename", ie->path);
3538 			goto done;
3539 		}
3540 
3541 		te = got_object_tree_find_entry(tree, te_name);
3542 		if (te == NULL && status != GOT_STATUS_ADD &&
3543 		    staged_status != GOT_STATUS_ADD) {
3544 			err = got_error(GOT_ERR_NO_TREE_ENTRY);
3545 			goto done;
3546 		}
3547 	}
3548 
3549 	switch (status) {
3550 	case GOT_STATUS_ADD:
3551 		if (a->patch_cb) {
3552 			int choice = GOT_PATCH_CHOICE_NONE;
3553 			err = (*a->patch_cb)(&choice, a->patch_arg,
3554 			    status, ie->path, NULL, 1, 1);
3555 			if (err)
3556 				goto done;
3557 			if (choice != GOT_PATCH_CHOICE_YES)
3558 				break;
3559 		}
3560 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3561 		    ie->path);
3562 		if (err)
3563 			goto done;
3564 		got_fileindex_entry_remove(a->fileindex, ie);
3565 		break;
3566 	case GOT_STATUS_DELETE:
3567 		if (a->patch_cb) {
3568 			int choice = GOT_PATCH_CHOICE_NONE;
3569 			err = (*a->patch_cb)(&choice, a->patch_arg,
3570 			    status, ie->path, NULL, 1, 1);
3571 			if (err)
3572 				goto done;
3573 			if (choice != GOT_PATCH_CHOICE_YES)
3574 				break;
3575 		}
3576 		/* fall through */
3577 	case GOT_STATUS_MODIFY:
3578 	case GOT_STATUS_MODE_CHANGE:
3579 	case GOT_STATUS_CONFLICT:
3580 	case GOT_STATUS_MISSING: {
3581 		struct got_object_id id;
3582 		if (staged_status == GOT_STATUS_ADD ||
3583 		    staged_status == GOT_STATUS_MODIFY) {
3584 			memcpy(id.sha1, ie->staged_blob_sha1,
3585 			    SHA1_DIGEST_LENGTH);
3586 		} else
3587 			memcpy(id.sha1, ie->blob_sha1,
3588 			    SHA1_DIGEST_LENGTH);
3589 		err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3590 		if (err)
3591 			goto done;
3592 
3593 		if (asprintf(&ondisk_path, "%s/%s",
3594 		    got_worktree_get_root_path(a->worktree), relpath) == -1) {
3595 			err = got_error_from_errno("asprintf");
3596 			goto done;
3597 		}
3598 
3599 		if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3600 		    status == GOT_STATUS_CONFLICT)) {
3601 			err = create_patched_content(&path_content, 1, &id,
3602 			    ondisk_path, dirfd, de_name, ie->path, a->repo,
3603 			    a->patch_cb, a->patch_arg);
3604 			if (err || path_content == NULL)
3605 				break;
3606 			if (rename(path_content, ondisk_path) == -1) {
3607 				err = got_error_from_errno3("rename",
3608 				    path_content, ondisk_path);
3609 				goto done;
3610 			}
3611 		} else {
3612 			err = install_blob(a->worktree, ondisk_path, ie->path,
3613 			    te ? te->mode : GOT_DEFAULT_FILE_MODE,
3614 			    got_fileindex_perms_to_st(ie), blob, 0, 1,
3615 			    a->repo, a->progress_cb, a->progress_arg);
3616 			if (err)
3617 				goto done;
3618 			if (status == GOT_STATUS_DELETE ||
3619 			    status == GOT_STATUS_MODE_CHANGE) {
3620 				err = update_blob_fileindex_entry(a->worktree,
3621 				    a->fileindex, ie, ondisk_path, ie->path,
3622 				    blob, 1);
3623 				if (err)
3624 					goto done;
3625 			}
3626 		}
3627 		break;
3628 	}
3629 	default:
3630 		break;
3631 	}
3632 done:
3633 	free(ondisk_path);
3634 	free(path_content);
3635 	free(parent_path);
3636 	free(tree_path);
3637 	if (blob)
3638 		got_object_blob_close(blob);
3639 	if (tree)
3640 		got_object_tree_close(tree);
3641 	free(tree_id);
3642 	return err;
3643 }
3644 
3645 const struct got_error *
3646 got_worktree_revert(struct got_worktree *worktree,
3647     struct got_pathlist_head *paths,
3648     got_worktree_checkout_cb progress_cb, void *progress_arg,
3649     got_worktree_patch_cb patch_cb, void *patch_arg,
3650     struct got_repository *repo)
3651 {
3652 	struct got_fileindex *fileindex = NULL;
3653 	char *fileindex_path = NULL;
3654 	const struct got_error *err = NULL, *unlockerr = NULL;
3655 	const struct got_error *sync_err = NULL;
3656 	struct got_pathlist_entry *pe;
3657 	struct revert_file_args rfa;
3658 
3659 	err = lock_worktree(worktree, LOCK_EX);
3660 	if (err)
3661 		return err;
3662 
3663 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3664 	if (err)
3665 		goto done;
3666 
3667 	rfa.worktree = worktree;
3668 	rfa.fileindex = fileindex;
3669 	rfa.progress_cb = progress_cb;
3670 	rfa.progress_arg = progress_arg;
3671 	rfa.patch_cb = patch_cb;
3672 	rfa.patch_arg = patch_arg;
3673 	rfa.repo = repo;
3674 	TAILQ_FOREACH(pe, paths, entry) {
3675 		err = worktree_status(worktree, pe->path, fileindex, repo,
3676 		    revert_file, &rfa, NULL, NULL, 0, 0);
3677 		if (err)
3678 			break;
3679 	}
3680 	sync_err = sync_fileindex(fileindex, fileindex_path);
3681 	if (sync_err && err == NULL)
3682 		err = sync_err;
3683 done:
3684 	free(fileindex_path);
3685 	if (fileindex)
3686 		got_fileindex_free(fileindex);
3687 	unlockerr = lock_worktree(worktree, LOCK_SH);
3688 	if (unlockerr && err == NULL)
3689 		err = unlockerr;
3690 	return err;
3691 }
3692 
3693 static void
3694 free_commitable(struct got_commitable *ct)
3695 {
3696 	free(ct->path);
3697 	free(ct->in_repo_path);
3698 	free(ct->ondisk_path);
3699 	free(ct->blob_id);
3700 	free(ct->base_blob_id);
3701 	free(ct->staged_blob_id);
3702 	free(ct->base_commit_id);
3703 	free(ct);
3704 }
3705 
3706 struct collect_commitables_arg {
3707 	struct got_pathlist_head *commitable_paths;
3708 	struct got_repository *repo;
3709 	struct got_worktree *worktree;
3710 	int have_staged_files;
3711 };
3712 
3713 static const struct got_error *
3714 collect_commitables(void *arg, unsigned char status,
3715     unsigned char staged_status, const char *relpath,
3716     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3717     struct got_object_id *commit_id, int dirfd, const char *de_name)
3718 {
3719 	struct collect_commitables_arg *a = arg;
3720 	const struct got_error *err = NULL;
3721 	struct got_commitable *ct = NULL;
3722 	struct got_pathlist_entry *new = NULL;
3723 	char *parent_path = NULL, *path = NULL;
3724 	struct stat sb;
3725 
3726 	if (a->have_staged_files) {
3727 		if (staged_status != GOT_STATUS_MODIFY &&
3728 		    staged_status != GOT_STATUS_ADD &&
3729 		    staged_status != GOT_STATUS_DELETE)
3730 			return NULL;
3731 	} else {
3732 		if (status == GOT_STATUS_CONFLICT)
3733 			return got_error(GOT_ERR_COMMIT_CONFLICT);
3734 
3735 		if (status != GOT_STATUS_MODIFY &&
3736 		    status != GOT_STATUS_MODE_CHANGE &&
3737 		    status != GOT_STATUS_ADD &&
3738 		    status != GOT_STATUS_DELETE)
3739 			return NULL;
3740 	}
3741 
3742 	if (asprintf(&path, "/%s", relpath) == -1) {
3743 		err = got_error_from_errno("asprintf");
3744 		goto done;
3745 	}
3746 	if (strcmp(path, "/") == 0) {
3747 		parent_path = strdup("");
3748 		if (parent_path == NULL)
3749 			return got_error_from_errno("strdup");
3750 	} else {
3751 		err = got_path_dirname(&parent_path, path);
3752 		if (err)
3753 			return err;
3754 	}
3755 
3756 	ct = calloc(1, sizeof(*ct));
3757 	if (ct == NULL) {
3758 		err = got_error_from_errno("calloc");
3759 		goto done;
3760 	}
3761 
3762 	if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3763 	    relpath) == -1) {
3764 		err = got_error_from_errno("asprintf");
3765 		goto done;
3766 	}
3767 	if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3768 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
3769 	} else {
3770 		if (dirfd != -1) {
3771 			if (fstatat(dirfd, de_name, &sb,
3772 			    AT_SYMLINK_NOFOLLOW) == -1) {
3773 				err = got_error_from_errno2("fstatat",
3774 				    ct->ondisk_path);
3775 				goto done;
3776 			}
3777 		} else if (lstat(ct->ondisk_path, &sb) == -1) {
3778 			err = got_error_from_errno2("lstat", ct->ondisk_path);
3779 			goto done;
3780 		}
3781 		ct->mode = sb.st_mode;
3782 	}
3783 
3784 	if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3785 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3786 	    relpath) == -1) {
3787 		err = got_error_from_errno("asprintf");
3788 		goto done;
3789 	}
3790 
3791 	ct->status = status;
3792 	ct->staged_status = staged_status;
3793 	ct->blob_id = NULL; /* will be filled in when blob gets created */
3794 	if (ct->status != GOT_STATUS_ADD &&
3795 	    ct->staged_status != GOT_STATUS_ADD) {
3796 		ct->base_blob_id = got_object_id_dup(blob_id);
3797 		if (ct->base_blob_id == NULL) {
3798 			err = got_error_from_errno("got_object_id_dup");
3799 			goto done;
3800 		}
3801 		ct->base_commit_id = got_object_id_dup(commit_id);
3802 		if (ct->base_commit_id == NULL) {
3803 			err = got_error_from_errno("got_object_id_dup");
3804 			goto done;
3805 		}
3806 	}
3807 	if (ct->staged_status == GOT_STATUS_ADD ||
3808 	    ct->staged_status == GOT_STATUS_MODIFY) {
3809 		ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3810 		if (ct->staged_blob_id == NULL) {
3811 			err = got_error_from_errno("got_object_id_dup");
3812 			goto done;
3813 		}
3814 	}
3815 	ct->path = strdup(path);
3816 	if (ct->path == NULL) {
3817 		err = got_error_from_errno("strdup");
3818 		goto done;
3819 	}
3820 	err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3821 done:
3822 	if (ct && (err || new == NULL))
3823 		free_commitable(ct);
3824 	free(parent_path);
3825 	free(path);
3826 	return err;
3827 }
3828 
3829 static const struct got_error *write_tree(struct got_object_id **,
3830     struct got_tree_object *, const char *, struct got_pathlist_head *,
3831     got_worktree_status_cb status_cb, void *status_arg,
3832     struct got_repository *);
3833 
3834 static const struct got_error *
3835 write_subtree(struct got_object_id **new_subtree_id,
3836     struct got_tree_entry *te, const char *parent_path,
3837     struct got_pathlist_head *commitable_paths,
3838     got_worktree_status_cb status_cb, void *status_arg,
3839     struct got_repository *repo)
3840 {
3841 	const struct got_error *err = NULL;
3842 	struct got_tree_object *subtree;
3843 	char *subpath;
3844 
3845 	if (asprintf(&subpath, "%s%s%s", parent_path,
3846 	    got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3847 		return got_error_from_errno("asprintf");
3848 
3849 	err = got_object_open_as_tree(&subtree, repo, &te->id);
3850 	if (err)
3851 		return err;
3852 
3853 	err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3854 	    status_cb, status_arg, repo);
3855 	got_object_tree_close(subtree);
3856 	free(subpath);
3857 	return err;
3858 }
3859 
3860 static const struct got_error *
3861 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3862 {
3863 	const struct got_error *err = NULL;
3864 	char *ct_parent_path = NULL;
3865 
3866 	*match = 0;
3867 
3868 	if (strchr(ct->in_repo_path, '/') == NULL) {
3869 		*match = got_path_is_root_dir(path);
3870 		return NULL;
3871 	}
3872 
3873 	err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3874 	if (err)
3875 		return err;
3876 	*match = (strcmp(path, ct_parent_path) == 0);
3877 	free(ct_parent_path);
3878 	return err;
3879 }
3880 
3881 static mode_t
3882 get_ct_file_mode(struct got_commitable *ct)
3883 {
3884 	return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3885 }
3886 
3887 static const struct got_error *
3888 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3889     struct got_tree_entry *te, struct got_commitable *ct)
3890 {
3891 	const struct got_error *err = NULL;
3892 
3893 	*new_te = NULL;
3894 
3895 	err = got_object_tree_entry_dup(new_te, te);
3896 	if (err)
3897 		goto done;
3898 
3899 	(*new_te)->mode = get_ct_file_mode(ct);
3900 
3901 	if (ct->staged_status == GOT_STATUS_MODIFY)
3902 		memcpy(&(*new_te)->id, ct->staged_blob_id,
3903 		    sizeof((*new_te)->id));
3904 	else
3905 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3906 done:
3907 	if (err && *new_te) {
3908 		free(*new_te);
3909 		*new_te = NULL;
3910 	}
3911 	return err;
3912 }
3913 
3914 static const struct got_error *
3915 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3916     struct got_commitable *ct)
3917 {
3918 	const struct got_error *err = NULL;
3919 	char *ct_name;
3920 
3921 	 *new_te = NULL;
3922 
3923 	*new_te = calloc(1, sizeof(**new_te));
3924 	if (*new_te == NULL)
3925 		return got_error_from_errno("calloc");
3926 
3927 	ct_name = basename(ct->path);
3928 	if (ct_name == NULL) {
3929 		err = got_error_from_errno2("basename", ct->path);
3930 		goto done;
3931 	}
3932 	if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
3933 	    sizeof((*new_te)->name)) {
3934 		err = got_error(GOT_ERR_NO_SPACE);
3935 		goto done;
3936 	}
3937 
3938 	(*new_te)->mode = get_ct_file_mode(ct);
3939 
3940 	if (ct->staged_status == GOT_STATUS_ADD)
3941 		memcpy(&(*new_te)->id, ct->staged_blob_id,
3942 		    sizeof((*new_te)->id));
3943 	else
3944 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3945 done:
3946 	if (err && *new_te) {
3947 		free(*new_te);
3948 		*new_te = NULL;
3949 	}
3950 	return err;
3951 }
3952 
3953 static const struct got_error *
3954 insert_tree_entry(struct got_tree_entry *new_te,
3955     struct got_pathlist_head *paths)
3956 {
3957 	const struct got_error *err = NULL;
3958 	struct got_pathlist_entry *new_pe;
3959 
3960 	err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3961 	if (err)
3962 		return err;
3963 	if (new_pe == NULL)
3964 		return got_error(GOT_ERR_TREE_DUP_ENTRY);
3965 	return NULL;
3966 }
3967 
3968 static const struct got_error *
3969 report_ct_status(struct got_commitable *ct,
3970     got_worktree_status_cb status_cb, void *status_arg)
3971 {
3972 	const char *ct_path = ct->path;
3973 	unsigned char status;
3974 
3975 	while (ct_path[0] == '/')
3976 		ct_path++;
3977 
3978 	if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3979 		status = ct->staged_status;
3980 	else
3981 		status = ct->status;
3982 
3983 	return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3984 	    ct_path, ct->blob_id, NULL, NULL, -1, NULL);
3985 }
3986 
3987 static const struct got_error *
3988 match_modified_subtree(int *modified, struct got_tree_entry *te,
3989     const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3990 {
3991 	const struct got_error *err = NULL;
3992 	struct got_pathlist_entry *pe;
3993 	char *te_path;
3994 
3995 	*modified = 0;
3996 
3997 	if (asprintf(&te_path, "%s%s%s", base_tree_path,
3998 	    got_path_is_root_dir(base_tree_path) ? "" : "/",
3999 	    te->name) == -1)
4000 		return got_error_from_errno("asprintf");
4001 
4002 	TAILQ_FOREACH(pe, commitable_paths, entry) {
4003 		struct got_commitable *ct = pe->data;
4004 		*modified = got_path_is_child(ct->in_repo_path, te_path,
4005 		    strlen(te_path));
4006 		 if (*modified)
4007 			break;
4008 	}
4009 
4010 	free(te_path);
4011 	return err;
4012 }
4013 
4014 static const struct got_error *
4015 match_deleted_or_modified_ct(struct got_commitable **ctp,
4016     struct got_tree_entry *te, const char *base_tree_path,
4017     struct got_pathlist_head *commitable_paths)
4018 {
4019 	const struct got_error *err = NULL;
4020 	struct got_pathlist_entry *pe;
4021 
4022 	*ctp = NULL;
4023 
4024 	TAILQ_FOREACH(pe, commitable_paths, entry) {
4025 		struct got_commitable *ct = pe->data;
4026 		char *ct_name = NULL;
4027 		int path_matches;
4028 
4029 		if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
4030 			if (ct->status != GOT_STATUS_MODIFY &&
4031 			    ct->status != GOT_STATUS_MODE_CHANGE &&
4032 			    ct->status != GOT_STATUS_DELETE)
4033 				continue;
4034 		} else {
4035 			if (ct->staged_status != GOT_STATUS_MODIFY &&
4036 			    ct->staged_status != GOT_STATUS_DELETE)
4037 				continue;
4038 		}
4039 
4040 		if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
4041 			continue;
4042 
4043 		 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
4044 		 if (err)
4045 			return err;
4046 		if (!path_matches)
4047 			continue;
4048 
4049 		ct_name = basename(pe->path);
4050 		if (ct_name == NULL)
4051 			return got_error_from_errno2("basename", pe->path);
4052 
4053 		if (strcmp(te->name, ct_name) != 0)
4054 			continue;
4055 
4056 		*ctp = ct;
4057 		break;
4058 	}
4059 
4060 	return err;
4061 }
4062 
4063 static const struct got_error *
4064 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
4065     const char *child_path, const char *path_base_tree,
4066     struct got_pathlist_head *commitable_paths,
4067     got_worktree_status_cb status_cb, void *status_arg,
4068     struct got_repository *repo)
4069 {
4070 	const struct got_error *err = NULL;
4071 	struct got_tree_entry *new_te;
4072 	char *subtree_path;
4073 	struct got_object_id *id = NULL;
4074 
4075 	*new_tep = NULL;
4076 
4077 	if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
4078 	    got_path_is_root_dir(path_base_tree) ? "" : "/",
4079 	    child_path) == -1)
4080 		return got_error_from_errno("asprintf");
4081 
4082 	new_te = calloc(1, sizeof(*new_te));
4083 	if (new_te == NULL)
4084 		return got_error_from_errno("calloc");
4085 	new_te->mode = S_IFDIR;
4086 
4087 	if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4088 	    sizeof(new_te->name)) {
4089 		err = got_error(GOT_ERR_NO_SPACE);
4090 		goto done;
4091 	}
4092 	err = write_tree(&id, NULL, subtree_path,
4093 	    commitable_paths, status_cb, status_arg, repo);
4094 	if (err) {
4095 		free(new_te);
4096 		goto done;
4097 	}
4098 	memcpy(&new_te->id, id, sizeof(new_te->id));
4099 done:
4100 	free(id);
4101 	free(subtree_path);
4102 	if (err == NULL)
4103 		*new_tep = new_te;
4104 	return err;
4105 }
4106 
4107 static const struct got_error *
4108 write_tree(struct got_object_id **new_tree_id,
4109     struct got_tree_object *base_tree, const char *path_base_tree,
4110     struct got_pathlist_head *commitable_paths,
4111     got_worktree_status_cb status_cb, void *status_arg,
4112     struct got_repository *repo)
4113 {
4114 	const struct got_error *err = NULL;
4115 	struct got_pathlist_head paths;
4116 	struct got_tree_entry *te, *new_te = NULL;
4117 	struct got_pathlist_entry *pe;
4118 	int nentries = 0;
4119 
4120 	TAILQ_INIT(&paths);
4121 
4122 	/* Insert, and recurse into, newly added entries first. */
4123 	TAILQ_FOREACH(pe, commitable_paths, entry) {
4124 		struct got_commitable *ct = pe->data;
4125 		char *child_path = NULL, *slash;
4126 
4127 		if ((ct->status != GOT_STATUS_ADD &&
4128 		    ct->staged_status != GOT_STATUS_ADD) ||
4129 		    (ct->flags & GOT_COMMITABLE_ADDED))
4130 			continue;
4131 
4132 		 if (!got_path_is_child(pe->path, path_base_tree,
4133 		     strlen(path_base_tree)))
4134 			continue;
4135 
4136 		err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4137 		    pe->path);
4138 		if (err)
4139 			goto done;
4140 
4141 		slash = strchr(child_path, '/');
4142 		if (slash == NULL) {
4143 			err = alloc_added_blob_tree_entry(&new_te, ct);
4144 			if (err)
4145 				goto done;
4146 			err = report_ct_status(ct, status_cb, status_arg);
4147 			if (err)
4148 				goto done;
4149 			ct->flags |= GOT_COMMITABLE_ADDED;
4150 			err = insert_tree_entry(new_te, &paths);
4151 			if (err)
4152 				goto done;
4153 			nentries++;
4154 		} else {
4155 			*slash = '\0'; /* trim trailing path components */
4156 			if (base_tree == NULL ||
4157 			    got_object_tree_find_entry(base_tree, child_path)
4158 			    == NULL) {
4159 				err = make_subtree_for_added_blob(&new_te,
4160 				    child_path, path_base_tree,
4161 				    commitable_paths, status_cb, status_arg,
4162 				    repo);
4163 				if (err)
4164 					goto done;
4165 				err = insert_tree_entry(new_te, &paths);
4166 				if (err)
4167 					goto done;
4168 				nentries++;
4169 			}
4170 		}
4171 	}
4172 
4173 	if (base_tree) {
4174 		int i, nbase_entries;
4175 		/* Handle modified and deleted entries. */
4176 		nbase_entries = got_object_tree_get_nentries(base_tree);
4177 		for (i = 0; i < nbase_entries; i++) {
4178 			struct got_commitable *ct = NULL;
4179 
4180 			te = got_object_tree_get_entry(base_tree, i);
4181 			if (got_object_tree_entry_is_submodule(te)) {
4182 				/* Entry is a submodule; just copy it. */
4183 				err = got_object_tree_entry_dup(&new_te, te);
4184 				if (err)
4185 					goto done;
4186 				err = insert_tree_entry(new_te, &paths);
4187 				if (err)
4188 					goto done;
4189 				nentries++;
4190 				continue;
4191 			}
4192 
4193 			if (S_ISDIR(te->mode)) {
4194 				int modified;
4195 				err = got_object_tree_entry_dup(&new_te, te);
4196 				if (err)
4197 					goto done;
4198 				err = match_modified_subtree(&modified, te,
4199 				    path_base_tree, commitable_paths);
4200 				if (err)
4201 					goto done;
4202 				/* Avoid recursion into unmodified subtrees. */
4203 				if (modified) {
4204 					struct got_object_id *new_id;
4205 					err = write_subtree(&new_id, te,
4206 					    path_base_tree, commitable_paths,
4207 					    status_cb, status_arg, repo);
4208 					if (err)
4209 						goto done;
4210 					memcpy(&new_te->id, new_id,
4211 					    sizeof(new_te->id));
4212 					free(new_id);
4213 				}
4214 				err = insert_tree_entry(new_te, &paths);
4215 				if (err)
4216 					goto done;
4217 				nentries++;
4218 				continue;
4219 			}
4220 
4221 			err = match_deleted_or_modified_ct(&ct, te,
4222 			    path_base_tree, commitable_paths);
4223 			if (err)
4224 				goto done;
4225 			if (ct) {
4226 				/* NB: Deleted entries get dropped here. */
4227 				if (ct->status == GOT_STATUS_MODIFY ||
4228 				    ct->status == GOT_STATUS_MODE_CHANGE ||
4229 				    ct->staged_status == GOT_STATUS_MODIFY) {
4230 					err = alloc_modified_blob_tree_entry(
4231 					    &new_te, te, ct);
4232 					if (err)
4233 						goto done;
4234 					err = insert_tree_entry(new_te, &paths);
4235 					if (err)
4236 						goto done;
4237 					nentries++;
4238 				}
4239 				err = report_ct_status(ct, status_cb,
4240 				    status_arg);
4241 				if (err)
4242 					goto done;
4243 			} else {
4244 				/* Entry is unchanged; just copy it. */
4245 				err = got_object_tree_entry_dup(&new_te, te);
4246 				if (err)
4247 					goto done;
4248 				err = insert_tree_entry(new_te, &paths);
4249 				if (err)
4250 					goto done;
4251 				nentries++;
4252 			}
4253 		}
4254 	}
4255 
4256 	/* Write new list of entries; deleted entries have been dropped. */
4257 	err = got_object_tree_create(new_tree_id, &paths, nentries, repo);
4258 done:
4259 	got_pathlist_free(&paths);
4260 	return err;
4261 }
4262 
4263 static const struct got_error *
4264 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4265     struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4266     int have_staged_files)
4267 {
4268 	const struct got_error *err = NULL;
4269 	struct got_pathlist_entry *pe;
4270 
4271 	TAILQ_FOREACH(pe, commitable_paths, entry) {
4272 		struct got_fileindex_entry *ie;
4273 		struct got_commitable *ct = pe->data;
4274 
4275 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4276 		if (ie) {
4277 			if (ct->status == GOT_STATUS_DELETE ||
4278 			    ct->staged_status == GOT_STATUS_DELETE) {
4279 				got_fileindex_entry_remove(fileindex, ie);
4280 			} else if (ct->staged_status == GOT_STATUS_ADD ||
4281 			    ct->staged_status == GOT_STATUS_MODIFY) {
4282 				got_fileindex_entry_stage_set(ie,
4283 				    GOT_FILEIDX_STAGE_NONE);
4284 				err = got_fileindex_entry_update(ie,
4285 				    ct->ondisk_path, ct->staged_blob_id->sha1,
4286 				    new_base_commit_id->sha1,
4287 				    !have_staged_files);
4288 			} else
4289 				err = got_fileindex_entry_update(ie,
4290 				    ct->ondisk_path, ct->blob_id->sha1,
4291 				    new_base_commit_id->sha1,
4292 				    !have_staged_files);
4293 		} else {
4294 			err = got_fileindex_entry_alloc(&ie,
4295 			    ct->ondisk_path, pe->path, ct->blob_id->sha1,
4296 			    new_base_commit_id->sha1);
4297 			if (err)
4298 				break;
4299 			err = got_fileindex_entry_add(fileindex, ie);
4300 			if (err)
4301 				break;
4302 		}
4303 	}
4304 	return err;
4305 }
4306 
4307 
4308 static const struct got_error *
4309 check_out_of_date(const char *in_repo_path, unsigned char status,
4310     unsigned char staged_status, struct got_object_id *base_blob_id,
4311     struct got_object_id *base_commit_id,
4312     struct got_object_id *head_commit_id, struct got_repository *repo,
4313     int ood_errcode)
4314 {
4315 	const struct got_error *err = NULL;
4316 	struct got_object_id *id = NULL;
4317 
4318 	if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4319 		/* Trivial case: base commit == head commit */
4320 		if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4321 			return NULL;
4322 		/*
4323 		 * Ensure file content which local changes were based
4324 		 * on matches file content in the branch head.
4325 		 */
4326 		err = got_object_id_by_path(&id, repo, head_commit_id,
4327 		    in_repo_path);
4328 		if (err) {
4329 			if (err->code == GOT_ERR_NO_TREE_ENTRY)
4330 				err = got_error(ood_errcode);
4331 			goto done;
4332 		} else if (got_object_id_cmp(id, base_blob_id) != 0)
4333 			err = got_error(ood_errcode);
4334 	} else {
4335 		/* Require that added files don't exist in the branch head. */
4336 		err = got_object_id_by_path(&id, repo, head_commit_id,
4337 		    in_repo_path);
4338 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4339 			goto done;
4340 		err = id ? got_error(ood_errcode) : NULL;
4341 	}
4342 done:
4343 	free(id);
4344 	return err;
4345 }
4346 
4347 const struct got_error *
4348 commit_worktree(struct got_object_id **new_commit_id,
4349     struct got_pathlist_head *commitable_paths,
4350     struct got_object_id *head_commit_id, struct got_worktree *worktree,
4351     const char *author, const char *committer,
4352     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4353     got_worktree_status_cb status_cb, void *status_arg,
4354     struct got_repository *repo)
4355 {
4356 	const struct got_error *err = NULL, *unlockerr = NULL;
4357 	struct got_pathlist_entry *pe;
4358 	const char *head_ref_name = NULL;
4359 	struct got_commit_object *head_commit = NULL;
4360 	struct got_reference *head_ref2 = NULL;
4361 	struct got_object_id *head_commit_id2 = NULL;
4362 	struct got_tree_object *head_tree = NULL;
4363 	struct got_object_id *new_tree_id = NULL;
4364 	struct got_object_id_queue parent_ids;
4365 	struct got_object_qid *pid = NULL;
4366 	char *logmsg = NULL;
4367 
4368 	*new_commit_id = NULL;
4369 
4370 	SIMPLEQ_INIT(&parent_ids);
4371 
4372 	err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4373 	if (err)
4374 		goto done;
4375 
4376 	err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4377 	if (err)
4378 		goto done;
4379 
4380 	if (commit_msg_cb != NULL) {
4381 		err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4382 		if (err)
4383 			goto done;
4384 	}
4385 
4386 	if (logmsg == NULL || strlen(logmsg) == 0) {
4387 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4388 		goto done;
4389 	}
4390 
4391 	/* Create blobs from added and modified files and record their IDs. */
4392 	TAILQ_FOREACH(pe, commitable_paths, entry) {
4393 		struct got_commitable *ct = pe->data;
4394 		char *ondisk_path;
4395 
4396 		/* Blobs for staged files already exist. */
4397 		if (ct->staged_status == GOT_STATUS_ADD ||
4398 		    ct->staged_status == GOT_STATUS_MODIFY)
4399 			continue;
4400 
4401 		if (ct->status != GOT_STATUS_ADD &&
4402 		    ct->status != GOT_STATUS_MODIFY &&
4403 		    ct->status != GOT_STATUS_MODE_CHANGE)
4404 			continue;
4405 
4406 		if (asprintf(&ondisk_path, "%s/%s",
4407 		    worktree->root_path, pe->path) == -1) {
4408 			err = got_error_from_errno("asprintf");
4409 			goto done;
4410 		}
4411 		err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4412 		free(ondisk_path);
4413 		if (err)
4414 			goto done;
4415 	}
4416 
4417 	/* Recursively write new tree objects. */
4418 	err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4419 	    status_cb, status_arg, repo);
4420 	if (err)
4421 		goto done;
4422 
4423 	err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4424 	if (err)
4425 		goto done;
4426 	SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4427 	err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4428 	    1, author, time(NULL), committer, time(NULL), logmsg, repo);
4429 	got_object_qid_free(pid);
4430 	if (logmsg != NULL)
4431 		free(logmsg);
4432 	if (err)
4433 		goto done;
4434 
4435 	/* Check if a concurrent commit to our branch has occurred. */
4436 	head_ref_name = got_worktree_get_head_ref_name(worktree);
4437 	if (head_ref_name == NULL) {
4438 		err = got_error_from_errno("got_worktree_get_head_ref_name");
4439 		goto done;
4440 	}
4441 	/* Lock the reference here to prevent concurrent modification. */
4442 	err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4443 	if (err)
4444 		goto done;
4445 	err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4446 	if (err)
4447 		goto done;
4448 	if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4449 		err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4450 		goto done;
4451 	}
4452 	/* Update branch head in repository. */
4453 	err = got_ref_change_ref(head_ref2, *new_commit_id);
4454 	if (err)
4455 		goto done;
4456 	err = got_ref_write(head_ref2, repo);
4457 	if (err)
4458 		goto done;
4459 
4460 	err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4461 	if (err)
4462 		goto done;
4463 
4464 	err = ref_base_commit(worktree, repo);
4465 	if (err)
4466 		goto done;
4467 done:
4468 	if (head_tree)
4469 		got_object_tree_close(head_tree);
4470 	if (head_commit)
4471 		got_object_commit_close(head_commit);
4472 	free(head_commit_id2);
4473 	if (head_ref2) {
4474 		unlockerr = got_ref_unlock(head_ref2);
4475 		if (unlockerr && err == NULL)
4476 			err = unlockerr;
4477 		got_ref_close(head_ref2);
4478 	}
4479 	return err;
4480 }
4481 
4482 static const struct got_error *
4483 check_path_is_commitable(const char *path,
4484     struct got_pathlist_head *commitable_paths)
4485 {
4486 	struct got_pathlist_entry *cpe = NULL;
4487 	size_t path_len = strlen(path);
4488 
4489 	TAILQ_FOREACH(cpe, commitable_paths, entry) {
4490 		struct got_commitable *ct = cpe->data;
4491 		const char *ct_path = ct->path;
4492 
4493 		while (ct_path[0] == '/')
4494 			ct_path++;
4495 
4496 		if (strcmp(path, ct_path) == 0 ||
4497 		    got_path_is_child(ct_path, path, path_len))
4498 			break;
4499 	}
4500 
4501 	if (cpe == NULL)
4502 		return got_error_path(path, GOT_ERR_BAD_PATH);
4503 
4504 	return NULL;
4505 }
4506 
4507 static const struct got_error *
4508 check_staged_file(void *arg, struct got_fileindex_entry *ie)
4509 {
4510 	int *have_staged_files = arg;
4511 
4512 	if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4513 		*have_staged_files = 1;
4514 		return got_error(GOT_ERR_CANCELLED);
4515 	}
4516 
4517 	return NULL;
4518 }
4519 
4520 static const struct got_error *
4521 check_non_staged_files(struct got_fileindex *fileindex,
4522     struct got_pathlist_head *paths)
4523 {
4524 	struct got_pathlist_entry *pe;
4525 	struct got_fileindex_entry *ie;
4526 
4527 	TAILQ_FOREACH(pe, paths, entry) {
4528 		if (pe->path[0] == '\0')
4529 			continue;
4530 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4531 		if (ie == NULL)
4532 			return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4533 		if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4534 			return got_error_path(pe->path,
4535 			    GOT_ERR_FILE_NOT_STAGED);
4536 	}
4537 
4538 	return NULL;
4539 }
4540 
4541 const struct got_error *
4542 got_worktree_commit(struct got_object_id **new_commit_id,
4543     struct got_worktree *worktree, struct got_pathlist_head *paths,
4544     const char *author, const char *committer,
4545     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4546     got_worktree_status_cb status_cb, void *status_arg,
4547     struct got_repository *repo)
4548 {
4549 	const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4550 	struct got_fileindex *fileindex = NULL;
4551 	char *fileindex_path = NULL;
4552 	struct got_pathlist_head commitable_paths;
4553 	struct collect_commitables_arg cc_arg;
4554 	struct got_pathlist_entry *pe;
4555 	struct got_reference *head_ref = NULL;
4556 	struct got_object_id *head_commit_id = NULL;
4557 	int have_staged_files = 0;
4558 
4559 	*new_commit_id = NULL;
4560 
4561 	TAILQ_INIT(&commitable_paths);
4562 
4563 	err = lock_worktree(worktree, LOCK_EX);
4564 	if (err)
4565 		goto done;
4566 
4567 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4568 	if (err)
4569 		goto done;
4570 
4571 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
4572 	if (err)
4573 		goto done;
4574 
4575 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4576 	if (err)
4577 		goto done;
4578 
4579 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4580 	    &have_staged_files);
4581 	if (err && err->code != GOT_ERR_CANCELLED)
4582 		goto done;
4583 	if (have_staged_files) {
4584 		err = check_non_staged_files(fileindex, paths);
4585 		if (err)
4586 			goto done;
4587 	}
4588 
4589 	cc_arg.commitable_paths = &commitable_paths;
4590 	cc_arg.worktree = worktree;
4591 	cc_arg.repo = repo;
4592 	cc_arg.have_staged_files = have_staged_files;
4593 	TAILQ_FOREACH(pe, paths, entry) {
4594 		err = worktree_status(worktree, pe->path, fileindex, repo,
4595 		    collect_commitables, &cc_arg, NULL, NULL, 0, 0);
4596 		if (err)
4597 			goto done;
4598 	}
4599 
4600 	if (TAILQ_EMPTY(&commitable_paths)) {
4601 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4602 		goto done;
4603 	}
4604 
4605 	TAILQ_FOREACH(pe, paths, entry) {
4606 		err = check_path_is_commitable(pe->path, &commitable_paths);
4607 		if (err)
4608 			goto done;
4609 	}
4610 
4611 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
4612 		struct got_commitable *ct = pe->data;
4613 		const char *ct_path = ct->in_repo_path;
4614 
4615 		while (ct_path[0] == '/')
4616 			ct_path++;
4617 		err = check_out_of_date(ct_path, ct->status,
4618 		    ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4619 		    head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4620 		if (err)
4621 			goto done;
4622 
4623 	}
4624 
4625 	err = commit_worktree(new_commit_id, &commitable_paths,
4626 	    head_commit_id, worktree, author, committer,
4627 	    commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4628 	if (err)
4629 		goto done;
4630 
4631 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4632 	    fileindex, have_staged_files);
4633 	sync_err = sync_fileindex(fileindex, fileindex_path);
4634 	if (sync_err && err == NULL)
4635 		err = sync_err;
4636 done:
4637 	if (fileindex)
4638 		got_fileindex_free(fileindex);
4639 	free(fileindex_path);
4640 	unlockerr = lock_worktree(worktree, LOCK_SH);
4641 	if (unlockerr && err == NULL)
4642 		err = unlockerr;
4643 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
4644 		struct got_commitable *ct = pe->data;
4645 		free_commitable(ct);
4646 	}
4647 	got_pathlist_free(&commitable_paths);
4648 	return err;
4649 }
4650 
4651 const char *
4652 got_commitable_get_path(struct got_commitable *ct)
4653 {
4654 	return ct->path;
4655 }
4656 
4657 unsigned int
4658 got_commitable_get_status(struct got_commitable *ct)
4659 {
4660 	return ct->status;
4661 }
4662 
4663 struct check_rebase_ok_arg {
4664 	struct got_worktree *worktree;
4665 	struct got_repository *repo;
4666 };
4667 
4668 static const struct got_error *
4669 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4670 {
4671 	const struct got_error *err = NULL;
4672 	struct check_rebase_ok_arg *a = arg;
4673 	unsigned char status;
4674 	struct stat sb;
4675 	char *ondisk_path;
4676 
4677 	/* Reject rebase of a work tree with mixed base commits. */
4678 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4679 	    SHA1_DIGEST_LENGTH))
4680 		return got_error(GOT_ERR_MIXED_COMMITS);
4681 
4682 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4683 	    == -1)
4684 		return got_error_from_errno("asprintf");
4685 
4686 	/* Reject rebase of a work tree with modified or staged files. */
4687 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
4688 	free(ondisk_path);
4689 	if (err)
4690 		return err;
4691 
4692 	if (status != GOT_STATUS_NO_CHANGE)
4693 		return got_error(GOT_ERR_MODIFIED);
4694 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4695 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4696 
4697 	return NULL;
4698 }
4699 
4700 const struct got_error *
4701 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4702     struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4703     struct got_worktree *worktree, struct got_reference *branch,
4704     struct got_repository *repo)
4705 {
4706 	const struct got_error *err = NULL;
4707 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4708 	char *branch_ref_name = NULL;
4709 	char *fileindex_path = NULL;
4710 	struct check_rebase_ok_arg ok_arg;
4711 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4712 	struct got_object_id *wt_branch_tip = NULL;
4713 
4714 	*new_base_branch_ref = NULL;
4715 	*tmp_branch = NULL;
4716 	*fileindex = NULL;
4717 
4718 	err = lock_worktree(worktree, LOCK_EX);
4719 	if (err)
4720 		return err;
4721 
4722 	err = open_fileindex(fileindex, &fileindex_path, worktree);
4723 	if (err)
4724 		goto done;
4725 
4726 	ok_arg.worktree = worktree;
4727 	ok_arg.repo = repo;
4728 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4729 	    &ok_arg);
4730 	if (err)
4731 		goto done;
4732 
4733 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4734 	if (err)
4735 		goto done;
4736 
4737 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4738 	if (err)
4739 		goto done;
4740 
4741 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4742 	if (err)
4743 		goto done;
4744 
4745 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4746 	    0);
4747 	if (err)
4748 		goto done;
4749 
4750 	err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
4751 	if (err)
4752 		goto done;
4753 	if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
4754 		err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
4755 		goto done;
4756 	}
4757 
4758 	err = got_ref_alloc_symref(new_base_branch_ref,
4759 	    new_base_branch_ref_name, wt_branch);
4760 	if (err)
4761 		goto done;
4762 	err = got_ref_write(*new_base_branch_ref, repo);
4763 	if (err)
4764 		goto done;
4765 
4766 	/* TODO Lock original branch's ref while rebasing? */
4767 
4768 	err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4769 	if (err)
4770 		goto done;
4771 
4772 	err = got_ref_write(branch_ref, repo);
4773 	if (err)
4774 		goto done;
4775 
4776 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
4777 	    worktree->base_commit_id);
4778 	if (err)
4779 		goto done;
4780 	err = got_ref_write(*tmp_branch, repo);
4781 	if (err)
4782 		goto done;
4783 
4784 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
4785 	if (err)
4786 		goto done;
4787 done:
4788 	free(fileindex_path);
4789 	free(tmp_branch_name);
4790 	free(new_base_branch_ref_name);
4791 	free(branch_ref_name);
4792 	if (branch_ref)
4793 		got_ref_close(branch_ref);
4794 	if (wt_branch)
4795 		got_ref_close(wt_branch);
4796 	free(wt_branch_tip);
4797 	if (err) {
4798 		if (*new_base_branch_ref) {
4799 			got_ref_close(*new_base_branch_ref);
4800 			*new_base_branch_ref = NULL;
4801 		}
4802 		if (*tmp_branch) {
4803 			got_ref_close(*tmp_branch);
4804 			*tmp_branch = NULL;
4805 		}
4806 		if (*fileindex) {
4807 			got_fileindex_free(*fileindex);
4808 			*fileindex = NULL;
4809 		}
4810 		lock_worktree(worktree, LOCK_SH);
4811 	}
4812 	return err;
4813 }
4814 
4815 const struct got_error *
4816 got_worktree_rebase_continue(struct got_object_id **commit_id,
4817     struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4818     struct got_reference **branch, struct got_fileindex **fileindex,
4819     struct got_worktree *worktree, struct got_repository *repo)
4820 {
4821 	const struct got_error *err;
4822 	char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4823 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4824 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4825 	char *fileindex_path = NULL;
4826 	int have_staged_files = 0;
4827 
4828 	*commit_id = NULL;
4829 	*new_base_branch = NULL;
4830 	*tmp_branch = NULL;
4831 	*branch = NULL;
4832 	*fileindex = NULL;
4833 
4834 	err = lock_worktree(worktree, LOCK_EX);
4835 	if (err)
4836 		return err;
4837 
4838 	err = open_fileindex(fileindex, &fileindex_path, worktree);
4839 	if (err)
4840 		goto done;
4841 
4842 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4843 	    &have_staged_files);
4844 	if (err && err->code != GOT_ERR_CANCELLED)
4845 		goto done;
4846 	if (have_staged_files) {
4847 		err = got_error(GOT_ERR_STAGED_PATHS);
4848 		goto done;
4849 	}
4850 
4851 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4852 	if (err)
4853 		goto done;
4854 
4855 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4856 	if (err)
4857 		goto done;
4858 
4859 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4860 	if (err)
4861 		goto done;
4862 
4863 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4864 	if (err)
4865 		goto done;
4866 
4867 	err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4868 	if (err)
4869 		goto done;
4870 
4871 	err = got_ref_open(branch, repo,
4872 	    got_ref_get_symref_target(branch_ref), 0);
4873 	if (err)
4874 		goto done;
4875 
4876 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4877 	if (err)
4878 		goto done;
4879 
4880 	err = got_ref_resolve(commit_id, repo, commit_ref);
4881 	if (err)
4882 		goto done;
4883 
4884 	err = got_ref_open(new_base_branch, repo,
4885 	    new_base_branch_ref_name, 0);
4886 	if (err)
4887 		goto done;
4888 
4889 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4890 	if (err)
4891 		goto done;
4892 done:
4893 	free(commit_ref_name);
4894 	free(branch_ref_name);
4895 	free(fileindex_path);
4896 	if (commit_ref)
4897 		got_ref_close(commit_ref);
4898 	if (branch_ref)
4899 		got_ref_close(branch_ref);
4900 	if (err) {
4901 		free(*commit_id);
4902 		*commit_id = NULL;
4903 		if (*tmp_branch) {
4904 			got_ref_close(*tmp_branch);
4905 			*tmp_branch = NULL;
4906 		}
4907 		if (*new_base_branch) {
4908 			got_ref_close(*new_base_branch);
4909 			*new_base_branch = NULL;
4910 		}
4911 		if (*branch) {
4912 			got_ref_close(*branch);
4913 			*branch = NULL;
4914 		}
4915 		if (*fileindex) {
4916 			got_fileindex_free(*fileindex);
4917 			*fileindex = NULL;
4918 		}
4919 		lock_worktree(worktree, LOCK_SH);
4920 	}
4921 	return err;
4922 }
4923 
4924 const struct got_error *
4925 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4926 {
4927 	const struct got_error *err;
4928 	char *tmp_branch_name = NULL;
4929 
4930 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4931 	if (err)
4932 		return err;
4933 
4934 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4935 	free(tmp_branch_name);
4936 	return NULL;
4937 }
4938 
4939 static const struct got_error *
4940 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4941     char **logmsg, void *arg)
4942 {
4943 	*logmsg = arg;
4944 	return NULL;
4945 }
4946 
4947 static const struct got_error *
4948 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4949     const char *path, struct got_object_id *blob_id,
4950     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4951     int dirfd, const char *de_name)
4952 {
4953 	return NULL;
4954 }
4955 
4956 struct collect_merged_paths_arg {
4957 	got_worktree_checkout_cb progress_cb;
4958 	void *progress_arg;
4959 	struct got_pathlist_head *merged_paths;
4960 };
4961 
4962 static const struct got_error *
4963 collect_merged_paths(void *arg, unsigned char status, const char *path)
4964 {
4965 	const struct got_error *err;
4966 	struct collect_merged_paths_arg *a = arg;
4967 	char *p;
4968 	struct got_pathlist_entry *new;
4969 
4970 	err = (*a->progress_cb)(a->progress_arg, status, path);
4971 	if (err)
4972 		return err;
4973 
4974 	if (status != GOT_STATUS_MERGE &&
4975 	    status != GOT_STATUS_ADD &&
4976 	    status != GOT_STATUS_DELETE &&
4977 	    status != GOT_STATUS_CONFLICT)
4978 		return NULL;
4979 
4980 	p = strdup(path);
4981 	if (p == NULL)
4982 		return got_error_from_errno("strdup");
4983 
4984 	err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4985 	if (err || new == NULL)
4986 		free(p);
4987 	return err;
4988 }
4989 
4990 void
4991 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4992 {
4993 	struct got_pathlist_entry *pe;
4994 
4995 	TAILQ_FOREACH(pe, merged_paths, entry)
4996 		free((char *)pe->path);
4997 
4998 	got_pathlist_free(merged_paths);
4999 }
5000 
5001 static const struct got_error *
5002 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
5003     int is_rebase, struct got_repository *repo)
5004 {
5005 	const struct got_error *err;
5006 	struct got_reference *commit_ref = NULL;
5007 
5008 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5009 	if (err) {
5010 		if (err->code != GOT_ERR_NOT_REF)
5011 			goto done;
5012 		err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
5013 		if (err)
5014 			goto done;
5015 		err = got_ref_write(commit_ref, repo);
5016 		if (err)
5017 			goto done;
5018 	} else if (is_rebase) {
5019 		struct got_object_id *stored_id;
5020 		int cmp;
5021 
5022 		err = got_ref_resolve(&stored_id, repo, commit_ref);
5023 		if (err)
5024 			goto done;
5025 		cmp = got_object_id_cmp(commit_id, stored_id);
5026 		free(stored_id);
5027 		if (cmp != 0) {
5028 			err = got_error(GOT_ERR_REBASE_COMMITID);
5029 			goto done;
5030 		}
5031 	}
5032 done:
5033 	if (commit_ref)
5034 		got_ref_close(commit_ref);
5035 	return err;
5036 }
5037 
5038 static const struct got_error *
5039 rebase_merge_files(struct got_pathlist_head *merged_paths,
5040     const char *commit_ref_name, struct got_worktree *worktree,
5041     struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
5042     struct got_object_id *commit_id, struct got_repository *repo,
5043     got_worktree_checkout_cb progress_cb, void *progress_arg,
5044     got_cancel_cb cancel_cb, void *cancel_arg)
5045 {
5046 	const struct got_error *err;
5047 	struct got_reference *commit_ref = NULL;
5048 	struct collect_merged_paths_arg cmp_arg;
5049 	char *fileindex_path;
5050 
5051 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
5052 
5053 	err = get_fileindex_path(&fileindex_path, worktree);
5054 	if (err)
5055 		return err;
5056 
5057 	cmp_arg.progress_cb = progress_cb;
5058 	cmp_arg.progress_arg = progress_arg;
5059 	cmp_arg.merged_paths = merged_paths;
5060 	err = merge_files(worktree, fileindex, fileindex_path,
5061 	    parent_commit_id, commit_id, repo, collect_merged_paths,
5062 	    &cmp_arg, cancel_cb, cancel_arg);
5063 	if (commit_ref)
5064 		got_ref_close(commit_ref);
5065 	return err;
5066 }
5067 
5068 const struct got_error *
5069 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
5070     struct got_worktree *worktree, struct got_fileindex *fileindex,
5071     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5072     struct got_repository *repo,
5073     got_worktree_checkout_cb progress_cb, void *progress_arg,
5074     got_cancel_cb cancel_cb, void *cancel_arg)
5075 {
5076 	const struct got_error *err;
5077 	char *commit_ref_name;
5078 
5079 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5080 	if (err)
5081 		return err;
5082 
5083 	err = store_commit_id(commit_ref_name, commit_id, 1, repo);
5084 	if (err)
5085 		goto done;
5086 
5087 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5088 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
5089 	    progress_arg, cancel_cb, cancel_arg);
5090 done:
5091 	free(commit_ref_name);
5092 	return err;
5093 }
5094 
5095 const struct got_error *
5096 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
5097     struct got_worktree *worktree, struct got_fileindex *fileindex,
5098     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5099     struct got_repository *repo,
5100     got_worktree_checkout_cb progress_cb, void *progress_arg,
5101     got_cancel_cb cancel_cb, void *cancel_arg)
5102 {
5103 	const struct got_error *err;
5104 	char *commit_ref_name;
5105 
5106 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5107 	if (err)
5108 		return err;
5109 
5110 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
5111 	if (err)
5112 		goto done;
5113 
5114 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5115 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
5116 	    progress_arg, cancel_cb, cancel_arg);
5117 done:
5118 	free(commit_ref_name);
5119 	return err;
5120 }
5121 
5122 static const struct got_error *
5123 rebase_commit(struct got_object_id **new_commit_id,
5124     struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
5125     struct got_worktree *worktree, struct got_fileindex *fileindex,
5126     struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
5127     const char *new_logmsg, struct got_repository *repo)
5128 {
5129 	const struct got_error *err, *sync_err;
5130 	struct got_pathlist_head commitable_paths;
5131 	struct collect_commitables_arg cc_arg;
5132 	char *fileindex_path = NULL;
5133 	struct got_reference *head_ref = NULL;
5134 	struct got_object_id *head_commit_id = NULL;
5135 	char *logmsg = NULL;
5136 
5137 	TAILQ_INIT(&commitable_paths);
5138 	*new_commit_id = NULL;
5139 
5140 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
5141 
5142 	err = get_fileindex_path(&fileindex_path, worktree);
5143 	if (err)
5144 		return err;
5145 
5146 	cc_arg.commitable_paths = &commitable_paths;
5147 	cc_arg.worktree = worktree;
5148 	cc_arg.repo = repo;
5149 	cc_arg.have_staged_files = 0;
5150 	/*
5151 	 * If possible get the status of individual files directly to
5152 	 * avoid crawling the entire work tree once per rebased commit.
5153 	 * TODO: Ideally, merged_paths would contain a list of commitables
5154 	 * we could use so we could skip worktree_status() entirely.
5155 	 */
5156 	if (merged_paths) {
5157 		struct got_pathlist_entry *pe;
5158 		if (TAILQ_EMPTY(merged_paths)) {
5159 			err = got_error(GOT_ERR_NO_MERGED_PATHS);
5160 			goto done;
5161 		}
5162 		TAILQ_FOREACH(pe, merged_paths, entry) {
5163 			err = worktree_status(worktree, pe->path, fileindex,
5164 			    repo, collect_commitables, &cc_arg, NULL, NULL, 0,
5165 			    0);
5166 			if (err)
5167 				goto done;
5168 		}
5169 	} else {
5170 		err = worktree_status(worktree, "", fileindex, repo,
5171 		    collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5172 		if (err)
5173 			goto done;
5174 	}
5175 
5176 	if (TAILQ_EMPTY(&commitable_paths)) {
5177 		/* No-op change; commit will be elided. */
5178 		err = got_ref_delete(commit_ref, repo);
5179 		if (err)
5180 			goto done;
5181 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5182 		goto done;
5183 	}
5184 
5185 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5186 	if (err)
5187 		goto done;
5188 
5189 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
5190 	if (err)
5191 		goto done;
5192 
5193 	if (new_logmsg) {
5194 		logmsg = strdup(new_logmsg);
5195 		if (logmsg == NULL) {
5196 			err = got_error_from_errno("strdup");
5197 			goto done;
5198 		}
5199 	} else {
5200 		err = got_object_commit_get_logmsg(&logmsg, orig_commit);
5201 		if (err)
5202 			goto done;
5203 	}
5204 
5205 	/* NB: commit_worktree will call free(logmsg) */
5206 	err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
5207 	    worktree, got_object_commit_get_author(orig_commit),
5208 	    got_object_commit_get_committer(orig_commit),
5209 	    collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5210 	if (err)
5211 		goto done;
5212 
5213 	err = got_ref_change_ref(tmp_branch, *new_commit_id);
5214 	if (err)
5215 		goto done;
5216 
5217 	err = got_ref_delete(commit_ref, repo);
5218 	if (err)
5219 		goto done;
5220 
5221 	err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5222 	    fileindex, 0);
5223 	sync_err = sync_fileindex(fileindex, fileindex_path);
5224 	if (sync_err && err == NULL)
5225 		err = sync_err;
5226 done:
5227 	free(fileindex_path);
5228 	free(head_commit_id);
5229 	if (head_ref)
5230 		got_ref_close(head_ref);
5231 	if (err) {
5232 		free(*new_commit_id);
5233 		*new_commit_id = NULL;
5234 	}
5235 	return err;
5236 }
5237 
5238 const struct got_error *
5239 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5240     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5241     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5242     struct got_commit_object *orig_commit,
5243     struct got_object_id *orig_commit_id, struct got_repository *repo)
5244 {
5245 	const struct got_error *err;
5246 	char *commit_ref_name;
5247 	struct got_reference *commit_ref = NULL;
5248 	struct got_object_id *commit_id = NULL;
5249 
5250 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5251 	if (err)
5252 		return err;
5253 
5254 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5255 	if (err)
5256 		goto done;
5257 	err = got_ref_resolve(&commit_id, repo, commit_ref);
5258 	if (err)
5259 		goto done;
5260 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5261 		err = got_error(GOT_ERR_REBASE_COMMITID);
5262 		goto done;
5263 	}
5264 
5265 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5266 	    worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5267 done:
5268 	if (commit_ref)
5269 		got_ref_close(commit_ref);
5270 	free(commit_ref_name);
5271 	free(commit_id);
5272 	return err;
5273 }
5274 
5275 const struct got_error *
5276 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5277     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5278     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5279     struct got_commit_object *orig_commit,
5280     struct got_object_id *orig_commit_id, const char *new_logmsg,
5281     struct got_repository *repo)
5282 {
5283 	const struct got_error *err;
5284 	char *commit_ref_name;
5285 	struct got_reference *commit_ref = NULL;
5286 
5287 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5288 	if (err)
5289 		return err;
5290 
5291 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5292 	if (err)
5293 		goto done;
5294 
5295 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5296 	    worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5297 done:
5298 	if (commit_ref)
5299 		got_ref_close(commit_ref);
5300 	free(commit_ref_name);
5301 	return err;
5302 }
5303 
5304 const struct got_error *
5305 got_worktree_rebase_postpone(struct got_worktree *worktree,
5306     struct got_fileindex *fileindex)
5307 {
5308 	if (fileindex)
5309 		got_fileindex_free(fileindex);
5310 	return lock_worktree(worktree, LOCK_SH);
5311 }
5312 
5313 static const struct got_error *
5314 delete_ref(const char *name, struct got_repository *repo)
5315 {
5316 	const struct got_error *err;
5317 	struct got_reference *ref;
5318 
5319 	err = got_ref_open(&ref, repo, name, 0);
5320 	if (err) {
5321 		if (err->code == GOT_ERR_NOT_REF)
5322 			return NULL;
5323 		return err;
5324 	}
5325 
5326 	err = got_ref_delete(ref, repo);
5327 	got_ref_close(ref);
5328 	return err;
5329 }
5330 
5331 static const struct got_error *
5332 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5333 {
5334 	const struct got_error *err;
5335 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5336 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
5337 
5338 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5339 	if (err)
5340 		goto done;
5341 	err = delete_ref(tmp_branch_name, repo);
5342 	if (err)
5343 		goto done;
5344 
5345 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5346 	if (err)
5347 		goto done;
5348 	err = delete_ref(new_base_branch_ref_name, repo);
5349 	if (err)
5350 		goto done;
5351 
5352 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5353 	if (err)
5354 		goto done;
5355 	err = delete_ref(branch_ref_name, repo);
5356 	if (err)
5357 		goto done;
5358 
5359 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5360 	if (err)
5361 		goto done;
5362 	err = delete_ref(commit_ref_name, repo);
5363 	if (err)
5364 		goto done;
5365 
5366 done:
5367 	free(tmp_branch_name);
5368 	free(new_base_branch_ref_name);
5369 	free(branch_ref_name);
5370 	free(commit_ref_name);
5371 	return err;
5372 }
5373 
5374 const struct got_error *
5375 got_worktree_rebase_complete(struct got_worktree *worktree,
5376     struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5377     struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5378     struct got_repository *repo)
5379 {
5380 	const struct got_error *err, *unlockerr;
5381 	struct got_object_id *new_head_commit_id = NULL;
5382 
5383 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5384 	if (err)
5385 		return err;
5386 
5387 	err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5388 	if (err)
5389 		goto done;
5390 
5391 	err = got_ref_write(rebased_branch, repo);
5392 	if (err)
5393 		goto done;
5394 
5395 	err = got_worktree_set_head_ref(worktree, rebased_branch);
5396 	if (err)
5397 		goto done;
5398 
5399 	err = delete_rebase_refs(worktree, repo);
5400 done:
5401 	if (fileindex)
5402 		got_fileindex_free(fileindex);
5403 	free(new_head_commit_id);
5404 	unlockerr = lock_worktree(worktree, LOCK_SH);
5405 	if (unlockerr && err == NULL)
5406 		err = unlockerr;
5407 	return err;
5408 }
5409 
5410 const struct got_error *
5411 got_worktree_rebase_abort(struct got_worktree *worktree,
5412     struct got_fileindex *fileindex, struct got_repository *repo,
5413     struct got_reference *new_base_branch,
5414      got_worktree_checkout_cb progress_cb, void *progress_arg)
5415 {
5416 	const struct got_error *err, *unlockerr, *sync_err;
5417 	struct got_reference *resolved = NULL;
5418 	struct got_object_id *commit_id = NULL;
5419 	char *fileindex_path = NULL;
5420 	struct revert_file_args rfa;
5421 	struct got_object_id *tree_id = NULL;
5422 
5423 	err = lock_worktree(worktree, LOCK_EX);
5424 	if (err)
5425 		return err;
5426 
5427 	err = got_ref_open(&resolved, repo,
5428 	    got_ref_get_symref_target(new_base_branch), 0);
5429 	if (err)
5430 		goto done;
5431 
5432 	err = got_worktree_set_head_ref(worktree, resolved);
5433 	if (err)
5434 		goto done;
5435 
5436 	/*
5437 	 * XXX commits to the base branch could have happened while
5438 	 * we were busy rebasing; should we store the original commit ID
5439 	 * when rebase begins and read it back here?
5440 	 */
5441 	err = got_ref_resolve(&commit_id, repo, resolved);
5442 	if (err)
5443 		goto done;
5444 
5445 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5446 	if (err)
5447 		goto done;
5448 
5449 	err = got_object_id_by_path(&tree_id, repo,
5450 	    worktree->base_commit_id, worktree->path_prefix);
5451 	if (err)
5452 		goto done;
5453 
5454 	err = delete_rebase_refs(worktree, repo);
5455 	if (err)
5456 		goto done;
5457 
5458 	err = get_fileindex_path(&fileindex_path, worktree);
5459 	if (err)
5460 		goto done;
5461 
5462 	rfa.worktree = worktree;
5463 	rfa.fileindex = fileindex;
5464 	rfa.progress_cb = progress_cb;
5465 	rfa.progress_arg = progress_arg;
5466 	rfa.patch_cb = NULL;
5467 	rfa.patch_arg = NULL;
5468 	rfa.repo = repo;
5469 	err = worktree_status(worktree, "", fileindex, repo,
5470 	    revert_file, &rfa, NULL, NULL, 0, 0);
5471 	if (err)
5472 		goto sync;
5473 
5474 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5475 	    repo, progress_cb, progress_arg, NULL, NULL);
5476 sync:
5477 	sync_err = sync_fileindex(fileindex, fileindex_path);
5478 	if (sync_err && err == NULL)
5479 		err = sync_err;
5480 done:
5481 	got_ref_close(resolved);
5482 	free(tree_id);
5483 	free(commit_id);
5484 	if (fileindex)
5485 		got_fileindex_free(fileindex);
5486 	free(fileindex_path);
5487 
5488 	unlockerr = lock_worktree(worktree, LOCK_SH);
5489 	if (unlockerr && err == NULL)
5490 		err = unlockerr;
5491 	return err;
5492 }
5493 
5494 const struct got_error *
5495 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5496     struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5497     struct got_fileindex **fileindex, struct got_worktree *worktree,
5498     struct got_repository *repo)
5499 {
5500 	const struct got_error *err = NULL;
5501 	char *tmp_branch_name = NULL;
5502 	char *branch_ref_name = NULL;
5503 	char *base_commit_ref_name = NULL;
5504 	char *fileindex_path = NULL;
5505 	struct check_rebase_ok_arg ok_arg;
5506 	struct got_reference *wt_branch = NULL;
5507 	struct got_reference *base_commit_ref = NULL;
5508 
5509 	*tmp_branch = NULL;
5510 	*branch_ref = NULL;
5511 	*base_commit_id = NULL;
5512 	*fileindex = NULL;
5513 
5514 	err = lock_worktree(worktree, LOCK_EX);
5515 	if (err)
5516 		return err;
5517 
5518 	err = open_fileindex(fileindex, &fileindex_path, worktree);
5519 	if (err)
5520 		goto done;
5521 
5522 	ok_arg.worktree = worktree;
5523 	ok_arg.repo = repo;
5524 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5525 	    &ok_arg);
5526 	if (err)
5527 		goto done;
5528 
5529 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5530 	if (err)
5531 		goto done;
5532 
5533 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5534 	if (err)
5535 		goto done;
5536 
5537 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5538 	    worktree);
5539 	if (err)
5540 		goto done;
5541 
5542 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5543 	    0);
5544 	if (err)
5545 		goto done;
5546 
5547 	err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5548 	if (err)
5549 		goto done;
5550 
5551 	err = got_ref_write(*branch_ref, repo);
5552 	if (err)
5553 		goto done;
5554 
5555 	err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5556 	    worktree->base_commit_id);
5557 	if (err)
5558 		goto done;
5559 	err = got_ref_write(base_commit_ref, repo);
5560 	if (err)
5561 		goto done;
5562 	*base_commit_id = got_object_id_dup(worktree->base_commit_id);
5563 	if (*base_commit_id == NULL) {
5564 		err = got_error_from_errno("got_object_id_dup");
5565 		goto done;
5566 	}
5567 
5568 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
5569 	    worktree->base_commit_id);
5570 	if (err)
5571 		goto done;
5572 	err = got_ref_write(*tmp_branch, repo);
5573 	if (err)
5574 		goto done;
5575 
5576 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
5577 	if (err)
5578 		goto done;
5579 done:
5580 	free(fileindex_path);
5581 	free(tmp_branch_name);
5582 	free(branch_ref_name);
5583 	free(base_commit_ref_name);
5584 	if (wt_branch)
5585 		got_ref_close(wt_branch);
5586 	if (err) {
5587 		if (*branch_ref) {
5588 			got_ref_close(*branch_ref);
5589 			*branch_ref = NULL;
5590 		}
5591 		if (*tmp_branch) {
5592 			got_ref_close(*tmp_branch);
5593 			*tmp_branch = NULL;
5594 		}
5595 		free(*base_commit_id);
5596 		if (*fileindex) {
5597 			got_fileindex_free(*fileindex);
5598 			*fileindex = NULL;
5599 		}
5600 		lock_worktree(worktree, LOCK_SH);
5601 	}
5602 	return err;
5603 }
5604 
5605 const struct got_error *
5606 got_worktree_histedit_postpone(struct got_worktree *worktree,
5607     struct got_fileindex *fileindex)
5608 {
5609 	if (fileindex)
5610 		got_fileindex_free(fileindex);
5611 	return lock_worktree(worktree, LOCK_SH);
5612 }
5613 
5614 const struct got_error *
5615 got_worktree_histedit_in_progress(int *in_progress,
5616     struct got_worktree *worktree)
5617 {
5618 	const struct got_error *err;
5619 	char *tmp_branch_name = NULL;
5620 
5621 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5622 	if (err)
5623 		return err;
5624 
5625 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5626 	free(tmp_branch_name);
5627 	return NULL;
5628 }
5629 
5630 const struct got_error *
5631 got_worktree_histedit_continue(struct got_object_id **commit_id,
5632     struct got_reference **tmp_branch, struct got_reference **branch_ref,
5633     struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5634     struct got_worktree *worktree, struct got_repository *repo)
5635 {
5636 	const struct got_error *err;
5637 	char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5638 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5639 	struct got_reference *commit_ref = NULL;
5640 	struct got_reference *base_commit_ref = NULL;
5641 	char *fileindex_path = NULL;
5642 	int have_staged_files = 0;
5643 
5644 	*commit_id = NULL;
5645 	*tmp_branch = NULL;
5646 	*base_commit_id = NULL;
5647 	*fileindex = NULL;
5648 
5649 	err = lock_worktree(worktree, LOCK_EX);
5650 	if (err)
5651 		return err;
5652 
5653 	err = open_fileindex(fileindex, &fileindex_path, worktree);
5654 	if (err)
5655 		goto done;
5656 
5657 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5658 	    &have_staged_files);
5659 	if (err && err->code != GOT_ERR_CANCELLED)
5660 		goto done;
5661 	if (have_staged_files) {
5662 		err = got_error(GOT_ERR_STAGED_PATHS);
5663 		goto done;
5664 	}
5665 
5666 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5667 	if (err)
5668 		goto done;
5669 
5670 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5671 	if (err)
5672 		goto done;
5673 
5674 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5675 	if (err)
5676 		goto done;
5677 
5678 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5679 	    worktree);
5680 	if (err)
5681 		goto done;
5682 
5683 	err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5684 	if (err)
5685 		goto done;
5686 
5687 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5688 	if (err)
5689 		goto done;
5690 	err = got_ref_resolve(commit_id, repo, commit_ref);
5691 	if (err)
5692 		goto done;
5693 
5694 	err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5695 	if (err)
5696 		goto done;
5697 	err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5698 	if (err)
5699 		goto done;
5700 
5701 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5702 	if (err)
5703 		goto done;
5704 done:
5705 	free(commit_ref_name);
5706 	free(branch_ref_name);
5707 	free(fileindex_path);
5708 	if (commit_ref)
5709 		got_ref_close(commit_ref);
5710 	if (base_commit_ref)
5711 		got_ref_close(base_commit_ref);
5712 	if (err) {
5713 		free(*commit_id);
5714 		*commit_id = NULL;
5715 		free(*base_commit_id);
5716 		*base_commit_id = NULL;
5717 		if (*tmp_branch) {
5718 			got_ref_close(*tmp_branch);
5719 			*tmp_branch = NULL;
5720 		}
5721 		if (*fileindex) {
5722 			got_fileindex_free(*fileindex);
5723 			*fileindex = NULL;
5724 		}
5725 		lock_worktree(worktree, LOCK_EX);
5726 	}
5727 	return err;
5728 }
5729 
5730 static const struct got_error *
5731 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5732 {
5733 	const struct got_error *err;
5734 	char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5735 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
5736 
5737 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5738 	if (err)
5739 		goto done;
5740 	err = delete_ref(tmp_branch_name, repo);
5741 	if (err)
5742 		goto done;
5743 
5744 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5745 	    worktree);
5746 	if (err)
5747 		goto done;
5748 	err = delete_ref(base_commit_ref_name, repo);
5749 	if (err)
5750 		goto done;
5751 
5752 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5753 	if (err)
5754 		goto done;
5755 	err = delete_ref(branch_ref_name, repo);
5756 	if (err)
5757 		goto done;
5758 
5759 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5760 	if (err)
5761 		goto done;
5762 	err = delete_ref(commit_ref_name, repo);
5763 	if (err)
5764 		goto done;
5765 done:
5766 	free(tmp_branch_name);
5767 	free(base_commit_ref_name);
5768 	free(branch_ref_name);
5769 	free(commit_ref_name);
5770 	return err;
5771 }
5772 
5773 const struct got_error *
5774 got_worktree_histedit_abort(struct got_worktree *worktree,
5775     struct got_fileindex *fileindex, struct got_repository *repo,
5776     struct got_reference *branch, struct got_object_id *base_commit_id,
5777     got_worktree_checkout_cb progress_cb, void *progress_arg)
5778 {
5779 	const struct got_error *err, *unlockerr, *sync_err;
5780 	struct got_reference *resolved = NULL;
5781 	char *fileindex_path = NULL;
5782 	struct got_object_id *tree_id = NULL;
5783 	struct revert_file_args rfa;
5784 
5785 	err = lock_worktree(worktree, LOCK_EX);
5786 	if (err)
5787 		return err;
5788 
5789 	err = got_ref_open(&resolved, repo,
5790 	    got_ref_get_symref_target(branch), 0);
5791 	if (err)
5792 		goto done;
5793 
5794 	err = got_worktree_set_head_ref(worktree, resolved);
5795 	if (err)
5796 		goto done;
5797 
5798 	err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5799 	if (err)
5800 		goto done;
5801 
5802 	err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5803 	    worktree->path_prefix);
5804 	if (err)
5805 		goto done;
5806 
5807 	err = delete_histedit_refs(worktree, repo);
5808 	if (err)
5809 		goto done;
5810 
5811 	err = get_fileindex_path(&fileindex_path, worktree);
5812 	if (err)
5813 		goto done;
5814 
5815 	rfa.worktree = worktree;
5816 	rfa.fileindex = fileindex;
5817 	rfa.progress_cb = progress_cb;
5818 	rfa.progress_arg = progress_arg;
5819 	rfa.patch_cb = NULL;
5820 	rfa.patch_arg = NULL;
5821 	rfa.repo = repo;
5822 	err = worktree_status(worktree, "", fileindex, repo,
5823 	    revert_file, &rfa, NULL, NULL, 0, 0);
5824 	if (err)
5825 		goto sync;
5826 
5827 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5828 	    repo, progress_cb, progress_arg, NULL, NULL);
5829 sync:
5830 	sync_err = sync_fileindex(fileindex, fileindex_path);
5831 	if (sync_err && err == NULL)
5832 		err = sync_err;
5833 done:
5834 	got_ref_close(resolved);
5835 	free(tree_id);
5836 	free(fileindex_path);
5837 
5838 	unlockerr = lock_worktree(worktree, LOCK_SH);
5839 	if (unlockerr && err == NULL)
5840 		err = unlockerr;
5841 	return err;
5842 }
5843 
5844 const struct got_error *
5845 got_worktree_histedit_complete(struct got_worktree *worktree,
5846     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5847     struct got_reference *edited_branch, struct got_repository *repo)
5848 {
5849 	const struct got_error *err, *unlockerr;
5850 	struct got_object_id *new_head_commit_id = NULL;
5851 	struct got_reference *resolved = NULL;
5852 
5853 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5854 	if (err)
5855 		return err;
5856 
5857 	err = got_ref_open(&resolved, repo,
5858 	    got_ref_get_symref_target(edited_branch), 0);
5859 	if (err)
5860 		goto done;
5861 
5862 	err = got_ref_change_ref(resolved, new_head_commit_id);
5863 	if (err)
5864 		goto done;
5865 
5866 	err = got_ref_write(resolved, repo);
5867 	if (err)
5868 		goto done;
5869 
5870 	err = got_worktree_set_head_ref(worktree, resolved);
5871 	if (err)
5872 		goto done;
5873 
5874 	err = delete_histedit_refs(worktree, repo);
5875 done:
5876 	if (fileindex)
5877 		got_fileindex_free(fileindex);
5878 	free(new_head_commit_id);
5879 	unlockerr = lock_worktree(worktree, LOCK_SH);
5880 	if (unlockerr && err == NULL)
5881 		err = unlockerr;
5882 	return err;
5883 }
5884 
5885 const struct got_error *
5886 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5887     struct got_object_id *commit_id, struct got_repository *repo)
5888 {
5889 	const struct got_error *err;
5890 	char *commit_ref_name;
5891 
5892 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5893 	if (err)
5894 		return err;
5895 
5896 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
5897 	if (err)
5898 		goto done;
5899 
5900 	err = delete_ref(commit_ref_name, repo);
5901 done:
5902 	free(commit_ref_name);
5903 	return err;
5904 }
5905 
5906 const struct got_error *
5907 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
5908     struct got_reference **branch_ref, struct got_reference **base_branch_ref,
5909     struct got_worktree *worktree, const char *refname,
5910     struct got_repository *repo)
5911 {
5912 	const struct got_error *err = NULL;
5913 	char *fileindex_path = NULL;
5914 	struct check_rebase_ok_arg ok_arg;
5915 
5916 	*fileindex = NULL;
5917 	*branch_ref = NULL;
5918 	*base_branch_ref = NULL;
5919 
5920 	err = lock_worktree(worktree, LOCK_EX);
5921 	if (err)
5922 		return err;
5923 
5924 	if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
5925 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
5926 		    "cannot integrate a branch into itself; "
5927 		    "update -b or different branch name required");
5928 		goto done;
5929 	}
5930 
5931 	err = open_fileindex(fileindex, &fileindex_path, worktree);
5932 	if (err)
5933 		goto done;
5934 
5935 	/* Preconditions are the same as for rebase. */
5936 	ok_arg.worktree = worktree;
5937 	ok_arg.repo = repo;
5938 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5939 	    &ok_arg);
5940 	if (err)
5941 		goto done;
5942 
5943 	err = got_ref_open(branch_ref, repo, refname, 1);
5944 	if (err)
5945 		goto done;
5946 
5947 	err = got_ref_open(base_branch_ref, repo,
5948 	    got_worktree_get_head_ref_name(worktree), 1);
5949 done:
5950 	if (err) {
5951 		if (*branch_ref) {
5952 			got_ref_close(*branch_ref);
5953 			*branch_ref = NULL;
5954 		}
5955 		if (*base_branch_ref) {
5956 			got_ref_close(*base_branch_ref);
5957 			*base_branch_ref = NULL;
5958 		}
5959 		if (*fileindex) {
5960 			got_fileindex_free(*fileindex);
5961 			*fileindex = NULL;
5962 		}
5963 		lock_worktree(worktree, LOCK_SH);
5964 	}
5965 	return err;
5966 }
5967 
5968 const struct got_error *
5969 got_worktree_integrate_continue(struct got_worktree *worktree,
5970     struct got_fileindex *fileindex, struct got_repository *repo,
5971     struct got_reference *branch_ref, struct got_reference *base_branch_ref,
5972     got_worktree_checkout_cb progress_cb, void *progress_arg,
5973     got_cancel_cb cancel_cb, void *cancel_arg)
5974 {
5975 	const struct got_error *err = NULL, *sync_err, *unlockerr;
5976 	char *fileindex_path = NULL;
5977 	struct got_object_id *tree_id = NULL, *commit_id = NULL;
5978 
5979 	err = get_fileindex_path(&fileindex_path, worktree);
5980 	if (err)
5981 		goto done;
5982 
5983 	err = got_ref_resolve(&commit_id, repo, branch_ref);
5984 	if (err)
5985 		goto done;
5986 
5987 	err = got_object_id_by_path(&tree_id, repo, commit_id,
5988 	    worktree->path_prefix);
5989 	if (err)
5990 		goto done;
5991 
5992 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5993 	if (err)
5994 		goto done;
5995 
5996 	err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
5997 	    progress_cb, progress_arg, cancel_cb, cancel_arg);
5998 	if (err)
5999 		goto sync;
6000 
6001 	err = got_ref_change_ref(base_branch_ref, commit_id);
6002 	if (err)
6003 		goto sync;
6004 
6005 	err = got_ref_write(base_branch_ref, repo);
6006 sync:
6007 	sync_err = sync_fileindex(fileindex, fileindex_path);
6008 	if (sync_err && err == NULL)
6009 		err = sync_err;
6010 
6011 done:
6012 	unlockerr = got_ref_unlock(branch_ref);
6013 	if (unlockerr && err == NULL)
6014 		err = unlockerr;
6015 	got_ref_close(branch_ref);
6016 
6017 	unlockerr = got_ref_unlock(base_branch_ref);
6018 	if (unlockerr && err == NULL)
6019 		err = unlockerr;
6020 	got_ref_close(base_branch_ref);
6021 
6022 	got_fileindex_free(fileindex);
6023 	free(fileindex_path);
6024 	free(tree_id);
6025 
6026 	unlockerr = lock_worktree(worktree, LOCK_SH);
6027 	if (unlockerr && err == NULL)
6028 		err = unlockerr;
6029 	return err;
6030 }
6031 
6032 const struct got_error *
6033 got_worktree_integrate_abort(struct got_worktree *worktree,
6034     struct got_fileindex *fileindex, struct got_repository *repo,
6035     struct got_reference *branch_ref, struct got_reference *base_branch_ref)
6036 {
6037 	const struct got_error *err = NULL, *unlockerr = NULL;
6038 
6039 	got_fileindex_free(fileindex);
6040 
6041 	err = lock_worktree(worktree, LOCK_SH);
6042 
6043 	unlockerr = got_ref_unlock(branch_ref);
6044 	if (unlockerr && err == NULL)
6045 		err = unlockerr;
6046 	got_ref_close(branch_ref);
6047 
6048 	unlockerr = got_ref_unlock(base_branch_ref);
6049 	if (unlockerr && err == NULL)
6050 		err = unlockerr;
6051 	got_ref_close(base_branch_ref);
6052 
6053 	return err;
6054 }
6055 
6056 struct check_stage_ok_arg {
6057 	struct got_object_id *head_commit_id;
6058 	struct got_worktree *worktree;
6059 	struct got_fileindex *fileindex;
6060 	struct got_repository *repo;
6061 	int have_changes;
6062 };
6063 
6064 const struct got_error *
6065 check_stage_ok(void *arg, unsigned char status,
6066     unsigned char staged_status, const char *relpath,
6067     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6068     struct got_object_id *commit_id, int dirfd, const char *de_name)
6069 {
6070 	struct check_stage_ok_arg *a = arg;
6071 	const struct got_error *err = NULL;
6072 	struct got_fileindex_entry *ie;
6073 	struct got_object_id base_commit_id;
6074 	struct got_object_id *base_commit_idp = NULL;
6075 	char *in_repo_path = NULL, *p;
6076 
6077 	if (status == GOT_STATUS_UNVERSIONED ||
6078 	    status == GOT_STATUS_NO_CHANGE)
6079 		return NULL;
6080 	if (status == GOT_STATUS_NONEXISTENT)
6081 		return got_error_set_errno(ENOENT, relpath);
6082 
6083 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6084 	if (ie == NULL)
6085 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6086 
6087 	if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
6088 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
6089 	    relpath) == -1)
6090 		return got_error_from_errno("asprintf");
6091 
6092 	if (got_fileindex_entry_has_commit(ie)) {
6093 		memcpy(base_commit_id.sha1, ie->commit_sha1,
6094 		    SHA1_DIGEST_LENGTH);
6095 		base_commit_idp = &base_commit_id;
6096 	}
6097 
6098 	if (status == GOT_STATUS_CONFLICT) {
6099 		err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
6100 		goto done;
6101 	} else if (status != GOT_STATUS_ADD &&
6102 	    status != GOT_STATUS_MODIFY &&
6103 	    status != GOT_STATUS_DELETE) {
6104 		err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
6105 		goto done;
6106 	}
6107 
6108 	a->have_changes = 1;
6109 
6110 	p = in_repo_path;
6111 	while (p[0] == '/')
6112 		p++;
6113 	err = check_out_of_date(p, status, staged_status,
6114 	    blob_id, base_commit_idp, a->head_commit_id, a->repo,
6115 	    GOT_ERR_STAGE_OUT_OF_DATE);
6116 done:
6117 	free(in_repo_path);
6118 	return err;
6119 }
6120 
6121 struct stage_path_arg {
6122 	struct got_worktree *worktree;
6123 	struct got_fileindex *fileindex;
6124 	struct got_repository *repo;
6125 	got_worktree_status_cb status_cb;
6126 	void *status_arg;
6127 	got_worktree_patch_cb patch_cb;
6128 	void *patch_arg;
6129 	int staged_something;
6130 };
6131 
6132 static const struct got_error *
6133 stage_path(void *arg, unsigned char status,
6134     unsigned char staged_status, const char *relpath,
6135     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6136     struct got_object_id *commit_id, int dirfd, const char *de_name)
6137 {
6138 	struct stage_path_arg *a = arg;
6139 	const struct got_error *err = NULL;
6140 	struct got_fileindex_entry *ie;
6141 	char *ondisk_path = NULL, *path_content = NULL;
6142 	uint32_t stage;
6143 	struct got_object_id *new_staged_blob_id = NULL;
6144 
6145 	if (status == GOT_STATUS_UNVERSIONED)
6146 		return NULL;
6147 
6148 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6149 	if (ie == NULL)
6150 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6151 
6152 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
6153 	    relpath)== -1)
6154 		return got_error_from_errno("asprintf");
6155 
6156 	switch (status) {
6157 	case GOT_STATUS_ADD:
6158 	case GOT_STATUS_MODIFY:
6159 		if (a->patch_cb) {
6160 			if (status == GOT_STATUS_ADD) {
6161 				int choice = GOT_PATCH_CHOICE_NONE;
6162 				err = (*a->patch_cb)(&choice, a->patch_arg,
6163 				    status, ie->path, NULL, 1, 1);
6164 				if (err)
6165 					break;
6166 				if (choice != GOT_PATCH_CHOICE_YES)
6167 					break;
6168 			} else {
6169 				err = create_patched_content(&path_content, 0,
6170 				    staged_blob_id ? staged_blob_id : blob_id,
6171 				    ondisk_path, dirfd, de_name, ie->path,
6172 				    a->repo, a->patch_cb, a->patch_arg);
6173 				if (err || path_content == NULL)
6174 					break;
6175 			}
6176 		}
6177 		err = got_object_blob_create(&new_staged_blob_id,
6178 		    path_content ? path_content : ondisk_path, a->repo);
6179 		if (err)
6180 			break;
6181 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
6182 		    SHA1_DIGEST_LENGTH);
6183 		if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
6184 			stage = GOT_FILEIDX_STAGE_ADD;
6185 		else
6186 			stage = GOT_FILEIDX_STAGE_MODIFY;
6187 		got_fileindex_entry_stage_set(ie, stage);
6188 		a->staged_something = 1;
6189 		if (a->status_cb == NULL)
6190 			break;
6191 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6192 		    get_staged_status(ie), relpath, blob_id,
6193 		    new_staged_blob_id, NULL, dirfd, de_name);
6194 		break;
6195 	case GOT_STATUS_DELETE:
6196 		if (staged_status == GOT_STATUS_DELETE)
6197 			break;
6198 		if (a->patch_cb) {
6199 			int choice = GOT_PATCH_CHOICE_NONE;
6200 			err = (*a->patch_cb)(&choice, a->patch_arg, status,
6201 			    ie->path, NULL, 1, 1);
6202 			if (err)
6203 				break;
6204 			if (choice == GOT_PATCH_CHOICE_NO)
6205 				break;
6206 			if (choice != GOT_PATCH_CHOICE_YES) {
6207 				err = got_error(GOT_ERR_PATCH_CHOICE);
6208 				break;
6209 			}
6210 		}
6211 		stage = GOT_FILEIDX_STAGE_DELETE;
6212 		got_fileindex_entry_stage_set(ie, stage);
6213 		a->staged_something = 1;
6214 		if (a->status_cb == NULL)
6215 			break;
6216 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6217 		    get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
6218 		    de_name);
6219 		break;
6220 	case GOT_STATUS_NO_CHANGE:
6221 		break;
6222 	case GOT_STATUS_CONFLICT:
6223 		err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6224 		break;
6225 	case GOT_STATUS_NONEXISTENT:
6226 		err = got_error_set_errno(ENOENT, relpath);
6227 		break;
6228 	default:
6229 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6230 		break;
6231 	}
6232 
6233 	if (path_content && unlink(path_content) == -1 && err == NULL)
6234 		err = got_error_from_errno2("unlink", path_content);
6235 	free(path_content);
6236 	free(ondisk_path);
6237 	free(new_staged_blob_id);
6238 	return err;
6239 }
6240 
6241 const struct got_error *
6242 got_worktree_stage(struct got_worktree *worktree,
6243     struct got_pathlist_head *paths,
6244     got_worktree_status_cb status_cb, void *status_arg,
6245     got_worktree_patch_cb patch_cb, void *patch_arg,
6246     struct got_repository *repo)
6247 {
6248 	const struct got_error *err = NULL, *sync_err, *unlockerr;
6249 	struct got_pathlist_entry *pe;
6250 	struct got_fileindex *fileindex = NULL;
6251 	char *fileindex_path = NULL;
6252 	struct got_reference *head_ref = NULL;
6253 	struct got_object_id *head_commit_id = NULL;
6254 	struct check_stage_ok_arg oka;
6255 	struct stage_path_arg spa;
6256 
6257 	err = lock_worktree(worktree, LOCK_EX);
6258 	if (err)
6259 		return err;
6260 
6261 	err = got_ref_open(&head_ref, repo,
6262 	    got_worktree_get_head_ref_name(worktree), 0);
6263 	if (err)
6264 		goto done;
6265 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
6266 	if (err)
6267 		goto done;
6268 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
6269 	if (err)
6270 		goto done;
6271 
6272 	/* Check pre-conditions before staging anything. */
6273 	oka.head_commit_id = head_commit_id;
6274 	oka.worktree = worktree;
6275 	oka.fileindex = fileindex;
6276 	oka.repo = repo;
6277 	oka.have_changes = 0;
6278 	TAILQ_FOREACH(pe, paths, entry) {
6279 		err = worktree_status(worktree, pe->path, fileindex, repo,
6280 		    check_stage_ok, &oka, NULL, NULL, 0, 0);
6281 		if (err)
6282 			goto done;
6283 	}
6284 	if (!oka.have_changes) {
6285 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6286 		goto done;
6287 	}
6288 
6289 	spa.worktree = worktree;
6290 	spa.fileindex = fileindex;
6291 	spa.repo = repo;
6292 	spa.patch_cb = patch_cb;
6293 	spa.patch_arg = patch_arg;
6294 	spa.status_cb = status_cb;
6295 	spa.status_arg = status_arg;
6296 	spa.staged_something = 0;
6297 	TAILQ_FOREACH(pe, paths, entry) {
6298 		err = worktree_status(worktree, pe->path, fileindex, repo,
6299 		    stage_path, &spa, NULL, NULL, 0, 0);
6300 		if (err)
6301 			goto done;
6302 	}
6303 	if (!spa.staged_something) {
6304 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6305 		goto done;
6306 	}
6307 
6308 	sync_err = sync_fileindex(fileindex, fileindex_path);
6309 	if (sync_err && err == NULL)
6310 		err = sync_err;
6311 done:
6312 	if (head_ref)
6313 		got_ref_close(head_ref);
6314 	free(head_commit_id);
6315 	free(fileindex_path);
6316 	if (fileindex)
6317 		got_fileindex_free(fileindex);
6318 	unlockerr = lock_worktree(worktree, LOCK_SH);
6319 	if (unlockerr && err == NULL)
6320 		err = unlockerr;
6321 	return err;
6322 }
6323 
6324 struct unstage_path_arg {
6325 	struct got_worktree *worktree;
6326 	struct got_fileindex *fileindex;
6327 	struct got_repository *repo;
6328 	got_worktree_checkout_cb progress_cb;
6329 	void *progress_arg;
6330 	got_worktree_patch_cb patch_cb;
6331 	void *patch_arg;
6332 };
6333 
6334 static const struct got_error *
6335 create_unstaged_content(char **path_unstaged_content,
6336     char **path_new_staged_content, struct got_object_id *blob_id,
6337     struct got_object_id *staged_blob_id, const char *relpath,
6338     struct got_repository *repo,
6339     got_worktree_patch_cb patch_cb, void *patch_arg)
6340 {
6341 	const struct got_error *err;
6342 	struct got_blob_object *blob = NULL, *staged_blob = NULL;
6343 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6344 	char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6345 	struct stat sb1, sb2;
6346 	struct got_diff_changes *changes = NULL;
6347 	struct got_diff_state *ds = NULL;
6348 	struct got_diff_args *args = NULL;
6349 	struct got_diff_change *change;
6350 	int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6351 	int have_content = 0, have_rejected_content = 0;
6352 
6353 	*path_unstaged_content = NULL;
6354 	*path_new_staged_content = NULL;
6355 
6356 	err = got_object_id_str(&label1, blob_id);
6357 	if (err)
6358 		return err;
6359 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6360 	if (err)
6361 		goto done;
6362 
6363 	err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6364 	if (err)
6365 		goto done;
6366 
6367 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6368 	if (err)
6369 		goto done;
6370 
6371 	err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6372 	if (err)
6373 		goto done;
6374 
6375 	err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6376 	if (err)
6377 		goto done;
6378 
6379 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6380 	if (err)
6381 		goto done;
6382 
6383 	if (stat(path1, &sb1) == -1) {
6384 		err = got_error_from_errno2("stat", path1);
6385 		goto done;
6386 	}
6387 
6388 	if (stat(path2, &sb2) == -1) {
6389 		err = got_error_from_errno2("stat", path2);
6390 		goto done;
6391 	}
6392 
6393 	err = got_diff_files(&changes, &ds, &args, &diff_flags,
6394 	    f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6395 	if (err)
6396 		goto done;
6397 
6398 	err = got_opentemp_named(path_unstaged_content, &outfile,
6399 	    "got-unstaged-content");
6400 	if (err)
6401 		goto done;
6402 	err = got_opentemp_named(path_new_staged_content, &rejectfile,
6403 	    "got-new-staged-content");
6404 	if (err)
6405 		goto done;
6406 
6407 	if (fseek(f1, 0L, SEEK_SET) == -1) {
6408 		err = got_ferror(f1, GOT_ERR_IO);
6409 		goto done;
6410 	}
6411 	if (fseek(f2, 0L, SEEK_SET) == -1) {
6412 		err = got_ferror(f2, GOT_ERR_IO);
6413 		goto done;
6414 	}
6415 	SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6416 		int choice;
6417 		err = apply_or_reject_change(&choice, change, ++n,
6418 		    changes->nchanges, ds, args, diff_flags, relpath,
6419 		    f1, f2, &line_cur1, &line_cur2,
6420 		    outfile, rejectfile, patch_cb, patch_arg);
6421 		if (err)
6422 			goto done;
6423 		if (choice == GOT_PATCH_CHOICE_YES)
6424 			have_content = 1;
6425 		else
6426 			have_rejected_content = 1;
6427 		if (choice == GOT_PATCH_CHOICE_QUIT)
6428 			break;
6429 	}
6430 	if (have_content || have_rejected_content)
6431 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6432 		    outfile, rejectfile);
6433 done:
6434 	free(label1);
6435 	if (blob)
6436 		got_object_blob_close(blob);
6437 	if (staged_blob)
6438 		got_object_blob_close(staged_blob);
6439 	if (f1 && fclose(f1) == EOF && err == NULL)
6440 		err = got_error_from_errno2("fclose", path1);
6441 	if (f2 && fclose(f2) == EOF && err == NULL)
6442 		err = got_error_from_errno2("fclose", path2);
6443 	if (outfile && fclose(outfile) == EOF && err == NULL)
6444 		err = got_error_from_errno2("fclose", *path_unstaged_content);
6445 	if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6446 		err = got_error_from_errno2("fclose", *path_new_staged_content);
6447 	if (path1 && unlink(path1) == -1 && err == NULL)
6448 		err = got_error_from_errno2("unlink", path1);
6449 	if (path2 && unlink(path2) == -1 && err == NULL)
6450 		err = got_error_from_errno2("unlink", path2);
6451 	if (err || !have_content) {
6452 		if (*path_unstaged_content &&
6453 		    unlink(*path_unstaged_content) == -1 && err == NULL)
6454 			err = got_error_from_errno2("unlink",
6455 			    *path_unstaged_content);
6456 		free(*path_unstaged_content);
6457 		*path_unstaged_content = NULL;
6458 	}
6459 	if (err || !have_rejected_content) {
6460 		if (*path_new_staged_content &&
6461 		    unlink(*path_new_staged_content) == -1 && err == NULL)
6462 			err = got_error_from_errno2("unlink",
6463 			    *path_new_staged_content);
6464 		free(*path_new_staged_content);
6465 		*path_new_staged_content = NULL;
6466 	}
6467 	free(args);
6468 	if (ds) {
6469 		got_diff_state_free(ds);
6470 		free(ds);
6471 	}
6472 	if (changes)
6473 		got_diff_free_changes(changes);
6474 	free(path1);
6475 	free(path2);
6476 	return err;
6477 }
6478 
6479 static const struct got_error *
6480 unstage_path(void *arg, unsigned char status,
6481     unsigned char staged_status, const char *relpath,
6482     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6483     struct got_object_id *commit_id, int dirfd, const char *de_name)
6484 {
6485 	const struct got_error *err = NULL;
6486 	struct unstage_path_arg *a = arg;
6487 	struct got_fileindex_entry *ie;
6488 	struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6489 	char *ondisk_path = NULL, *path_unstaged_content = NULL;
6490 	char *path_new_staged_content = NULL;
6491 	char *id_str = NULL, *label_orig = NULL;
6492 	int local_changes_subsumed;
6493 	struct stat sb;
6494 
6495 	if (staged_status != GOT_STATUS_ADD &&
6496 	    staged_status != GOT_STATUS_MODIFY &&
6497 	    staged_status != GOT_STATUS_DELETE)
6498 		return NULL;
6499 
6500 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6501 	if (ie == NULL)
6502 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6503 
6504 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6505 	    == -1)
6506 		return got_error_from_errno("asprintf");
6507 
6508 	err = got_object_id_str(&id_str,
6509 	    commit_id ? commit_id : a->worktree->base_commit_id);
6510 	if (err)
6511 		goto done;
6512 	if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
6513 	    id_str) == -1) {
6514 		err = got_error_from_errno("asprintf");
6515 		goto done;
6516 	}
6517 
6518 	switch (staged_status) {
6519 	case GOT_STATUS_MODIFY:
6520 		err = got_object_open_as_blob(&blob_base, a->repo,
6521 		    blob_id, 8192);
6522 		if (err)
6523 			break;
6524 		/* fall through */
6525 	case GOT_STATUS_ADD:
6526 		if (a->patch_cb) {
6527 			if (staged_status == GOT_STATUS_ADD) {
6528 				int choice = GOT_PATCH_CHOICE_NONE;
6529 				err = (*a->patch_cb)(&choice, a->patch_arg,
6530 				    staged_status, ie->path, NULL, 1, 1);
6531 				if (err)
6532 					break;
6533 				if (choice != GOT_PATCH_CHOICE_YES)
6534 					break;
6535 			} else {
6536 				err = create_unstaged_content(
6537 				    &path_unstaged_content,
6538 				    &path_new_staged_content, blob_id,
6539 				    staged_blob_id, ie->path, a->repo,
6540 				    a->patch_cb, a->patch_arg);
6541 				if (err || path_unstaged_content == NULL)
6542 					break;
6543 				if (path_new_staged_content) {
6544 					err = got_object_blob_create(
6545 					    &staged_blob_id,
6546 					    path_new_staged_content,
6547 					    a->repo);
6548 					if (err)
6549 						break;
6550 					memcpy(ie->staged_blob_sha1,
6551 					    staged_blob_id->sha1,
6552 					    SHA1_DIGEST_LENGTH);
6553 				}
6554 				err = merge_file(&local_changes_subsumed,
6555 				    a->worktree, blob_base, ondisk_path,
6556 				    relpath, got_fileindex_perms_to_st(ie),
6557 				    path_unstaged_content, label_orig,
6558 				    "unstaged", a->repo, a->progress_cb,
6559 				    a->progress_arg);
6560 				if (err == NULL &&
6561 				    path_new_staged_content == NULL)
6562 					got_fileindex_entry_stage_set(ie,
6563 					    GOT_FILEIDX_STAGE_NONE);
6564 				break; /* Done with this file. */
6565 			}
6566 		}
6567 		err = got_object_open_as_blob(&blob_staged, a->repo,
6568 		    staged_blob_id, 8192);
6569 		if (err)
6570 			break;
6571 		err = merge_blob(&local_changes_subsumed, a->worktree,
6572 		    blob_base, ondisk_path, relpath,
6573 		    got_fileindex_perms_to_st(ie), label_orig, blob_staged,
6574 		    commit_id ? commit_id : a->worktree->base_commit_id,
6575 		    a->repo, a->progress_cb, a->progress_arg);
6576 		if (err == NULL)
6577 			got_fileindex_entry_stage_set(ie,
6578 			    GOT_FILEIDX_STAGE_NONE);
6579 		break;
6580 	case GOT_STATUS_DELETE:
6581 		if (a->patch_cb) {
6582 			int choice = GOT_PATCH_CHOICE_NONE;
6583 			err = (*a->patch_cb)(&choice, a->patch_arg,
6584 			    staged_status, ie->path, NULL, 1, 1);
6585 			if (err)
6586 				break;
6587 			if (choice == GOT_PATCH_CHOICE_NO)
6588 				break;
6589 			if (choice != GOT_PATCH_CHOICE_YES) {
6590 				err = got_error(GOT_ERR_PATCH_CHOICE);
6591 				break;
6592 			}
6593 		}
6594 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6595 		err = get_file_status(&status, &sb, ie, ondisk_path,
6596 		    dirfd, de_name, a->repo);
6597 		if (err)
6598 			break;
6599 		err = (*a->progress_cb)(a->progress_arg, status, relpath);
6600 		break;
6601 	}
6602 done:
6603 	free(ondisk_path);
6604 	if (path_unstaged_content &&
6605 	    unlink(path_unstaged_content) == -1 && err == NULL)
6606 		err = got_error_from_errno2("unlink", path_unstaged_content);
6607 	if (path_new_staged_content &&
6608 	    unlink(path_new_staged_content) == -1 && err == NULL)
6609 		err = got_error_from_errno2("unlink", path_new_staged_content);
6610 	free(path_unstaged_content);
6611 	free(path_new_staged_content);
6612 	if (blob_base)
6613 		got_object_blob_close(blob_base);
6614 	if (blob_staged)
6615 		got_object_blob_close(blob_staged);
6616 	free(id_str);
6617 	free(label_orig);
6618 	return err;
6619 }
6620 
6621 const struct got_error *
6622 got_worktree_unstage(struct got_worktree *worktree,
6623     struct got_pathlist_head *paths,
6624     got_worktree_checkout_cb progress_cb, void *progress_arg,
6625     got_worktree_patch_cb patch_cb, void *patch_arg,
6626     struct got_repository *repo)
6627 {
6628 	const struct got_error *err = NULL, *sync_err, *unlockerr;
6629 	struct got_pathlist_entry *pe;
6630 	struct got_fileindex *fileindex = NULL;
6631 	char *fileindex_path = NULL;
6632 	struct unstage_path_arg upa;
6633 
6634 	err = lock_worktree(worktree, LOCK_EX);
6635 	if (err)
6636 		return err;
6637 
6638 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
6639 	if (err)
6640 		goto done;
6641 
6642 	upa.worktree = worktree;
6643 	upa.fileindex = fileindex;
6644 	upa.repo = repo;
6645 	upa.progress_cb = progress_cb;
6646 	upa.progress_arg = progress_arg;
6647 	upa.patch_cb = patch_cb;
6648 	upa.patch_arg = patch_arg;
6649 	TAILQ_FOREACH(pe, paths, entry) {
6650 		err = worktree_status(worktree, pe->path, fileindex, repo,
6651 		    unstage_path, &upa, NULL, NULL, 0, 0);
6652 		if (err)
6653 			goto done;
6654 	}
6655 
6656 	sync_err = sync_fileindex(fileindex, fileindex_path);
6657 	if (sync_err && err == NULL)
6658 		err = sync_err;
6659 done:
6660 	free(fileindex_path);
6661 	if (fileindex)
6662 		got_fileindex_free(fileindex);
6663 	unlockerr = lock_worktree(worktree, LOCK_SH);
6664 	if (unlockerr && err == NULL)
6665 		err = unlockerr;
6666 	return err;
6667 }