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