Blob


1 /*
2 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
3 *
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */
17 #include <sys/stat.h>
18 #include <sys/queue.h>
19 #include <sys/tree.h>
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>
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"
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 #include "got_lib_gotconfig.h"
60 #ifndef MIN
61 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
62 #endif
64 #define GOT_MERGE_LABEL_MERGED "merged change"
65 #define GOT_MERGE_LABEL_BASE "3-way merge base"
67 static const struct got_error *
68 create_meta_file(const char *path_got, const char *name, const char *content)
69 {
70 const struct got_error *err = NULL;
71 char *path;
73 if (asprintf(&path, "%s/%s", path_got, name) == -1)
74 return got_error_from_errno("asprintf");
76 err = got_path_create_file(path, content);
77 free(path);
78 return err;
79 }
81 static const struct got_error *
82 update_meta_file(const char *path_got, const char *name, const char *content)
83 {
84 const struct got_error *err = NULL;
85 FILE *tmpfile = NULL;
86 char *tmppath = NULL;
87 char *path = NULL;
89 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
90 err = got_error_from_errno("asprintf");
91 path = NULL;
92 goto done;
93 }
95 err = got_opentemp_named(&tmppath, &tmpfile, path);
96 if (err)
97 goto done;
99 if (content) {
100 int len = fprintf(tmpfile, "%s\n", content);
101 if (len != strlen(content) + 1) {
102 err = got_error_from_errno2("fprintf", tmppath);
103 goto done;
107 if (rename(tmppath, path) != 0) {
108 err = got_error_from_errno3("rename", tmppath, path);
109 unlink(tmppath);
110 goto done;
113 done:
114 if (fclose(tmpfile) == EOF && err == NULL)
115 err = got_error_from_errno2("fclose", tmppath);
116 free(tmppath);
117 return err;
120 static const struct got_error *
121 read_meta_file(char **content, const char *path_got, const char *name)
123 const struct got_error *err = NULL;
124 char *path;
125 int fd = -1;
126 ssize_t n;
127 struct stat sb;
129 *content = NULL;
131 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
132 err = got_error_from_errno("asprintf");
133 path = NULL;
134 goto done;
137 fd = open(path, O_RDONLY | O_NOFOLLOW);
138 if (fd == -1) {
139 if (errno == ENOENT)
140 err = got_error_path(path, GOT_ERR_WORKTREE_META);
141 else
142 err = got_error_from_errno2("open", path);
143 goto done;
145 if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
146 err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
147 : got_error_from_errno2("flock", path));
148 goto done;
151 if (fstat(fd, &sb) != 0) {
152 err = got_error_from_errno2("fstat", path);
153 goto done;
155 *content = calloc(1, sb.st_size);
156 if (*content == NULL) {
157 err = got_error_from_errno("calloc");
158 goto done;
161 n = read(fd, *content, sb.st_size);
162 if (n != sb.st_size) {
163 err = (n == -1 ? got_error_from_errno2("read", path) :
164 got_error_path(path, GOT_ERR_WORKTREE_META));
165 goto done;
167 if ((*content)[sb.st_size - 1] != '\n') {
168 err = got_error_path(path, GOT_ERR_WORKTREE_META);
169 goto done;
171 (*content)[sb.st_size - 1] = '\0';
173 done:
174 if (fd != -1 && close(fd) == -1 && err == NULL)
175 err = got_error_from_errno2("close", path_got);
176 free(path);
177 if (err) {
178 free(*content);
179 *content = NULL;
181 return err;
184 static const struct got_error *
185 write_head_ref(const char *path_got, struct got_reference *head_ref)
187 const struct got_error *err = NULL;
188 char *refstr = NULL;
190 if (got_ref_is_symbolic(head_ref)) {
191 refstr = got_ref_to_str(head_ref);
192 if (refstr == NULL)
193 return got_error_from_errno("got_ref_to_str");
194 } else {
195 refstr = strdup(got_ref_get_name(head_ref));
196 if (refstr == NULL)
197 return got_error_from_errno("strdup");
199 err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
200 free(refstr);
201 return err;
204 const struct got_error *
205 got_worktree_init(const char *path, struct got_reference *head_ref,
206 const char *prefix, struct got_repository *repo)
208 const struct got_error *err = NULL;
209 struct got_object_id *commit_id = NULL;
210 uuid_t uuid;
211 uint32_t uuid_status;
212 int obj_type;
213 char *path_got = NULL;
214 char *formatstr = NULL;
215 char *absprefix = NULL;
216 char *basestr = NULL;
217 char *uuidstr = NULL;
219 if (strcmp(path, got_repo_get_path(repo)) == 0) {
220 err = got_error(GOT_ERR_WORKTREE_REPO);
221 goto done;
224 err = got_ref_resolve(&commit_id, repo, head_ref);
225 if (err)
226 return err;
227 err = got_object_get_type(&obj_type, repo, commit_id);
228 if (err)
229 return err;
230 if (obj_type != GOT_OBJ_TYPE_COMMIT)
231 return got_error(GOT_ERR_OBJ_TYPE);
233 if (!got_path_is_absolute(prefix)) {
234 if (asprintf(&absprefix, "/%s", prefix) == -1)
235 return got_error_from_errno("asprintf");
238 /* Create top-level directory (may already exist). */
239 if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
240 err = got_error_from_errno2("mkdir", path);
241 goto done;
244 /* Create .got directory (may already exist). */
245 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
246 err = got_error_from_errno("asprintf");
247 goto done;
249 if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
250 err = got_error_from_errno2("mkdir", path_got);
251 goto done;
254 /* Create an empty lock file. */
255 err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
256 if (err)
257 goto done;
259 /* Create an empty file index. */
260 err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
261 if (err)
262 goto done;
264 /* Write the HEAD reference. */
265 err = write_head_ref(path_got, head_ref);
266 if (err)
267 goto done;
269 /* Record our base commit. */
270 err = got_object_id_str(&basestr, commit_id);
271 if (err)
272 goto done;
273 err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
274 if (err)
275 goto done;
277 /* Store path to repository. */
278 err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
279 got_repo_get_path(repo));
280 if (err)
281 goto done;
283 /* Store in-repository path prefix. */
284 err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
285 absprefix ? absprefix : prefix);
286 if (err)
287 goto done;
289 /* Generate UUID. */
290 uuid_create(&uuid, &uuid_status);
291 if (uuid_status != uuid_s_ok) {
292 err = got_error_uuid(uuid_status, "uuid_create");
293 goto done;
295 uuid_to_string(&uuid, &uuidstr, &uuid_status);
296 if (uuid_status != uuid_s_ok) {
297 err = got_error_uuid(uuid_status, "uuid_to_string");
298 goto done;
300 err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
301 if (err)
302 goto done;
304 /* Stamp work tree with format file. */
305 if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
306 err = got_error_from_errno("asprintf");
307 goto done;
309 err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
310 if (err)
311 goto done;
313 done:
314 free(commit_id);
315 free(path_got);
316 free(formatstr);
317 free(absprefix);
318 free(basestr);
319 free(uuidstr);
320 return err;
323 static const struct got_error *
324 open_worktree(struct got_worktree **worktree, const char *path)
326 const struct got_error *err = NULL;
327 char *path_got;
328 char *formatstr = NULL;
329 char *uuidstr = NULL;
330 char *path_lock = NULL;
331 char *base_commit_id_str = NULL;
332 int version, fd = -1;
333 const char *errstr;
334 struct got_repository *repo = NULL;
335 uint32_t uuid_status;
337 *worktree = NULL;
339 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
340 err = got_error_from_errno("asprintf");
341 path_got = NULL;
342 goto done;
345 if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
346 err = got_error_from_errno("asprintf");
347 path_lock = NULL;
348 goto done;
351 fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
352 if (fd == -1) {
353 err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
354 : got_error_from_errno2("open", path_lock));
355 goto done;
358 err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
359 if (err)
360 goto done;
362 version = strtonum(formatstr, 1, INT_MAX, &errstr);
363 if (errstr) {
364 err = got_error_msg(GOT_ERR_WORKTREE_META,
365 "could not parse work tree format version number");
366 goto done;
368 if (version != GOT_WORKTREE_FORMAT_VERSION) {
369 err = got_error(GOT_ERR_WORKTREE_VERS);
370 goto done;
373 *worktree = calloc(1, sizeof(**worktree));
374 if (*worktree == NULL) {
375 err = got_error_from_errno("calloc");
376 goto done;
378 (*worktree)->lockfd = -1;
380 (*worktree)->root_path = realpath(path, NULL);
381 if ((*worktree)->root_path == NULL) {
382 err = got_error_from_errno2("realpath", path);
383 goto done;
385 err = read_meta_file(&(*worktree)->repo_path, path_got,
386 GOT_WORKTREE_REPOSITORY);
387 if (err)
388 goto done;
390 err = read_meta_file(&(*worktree)->path_prefix, path_got,
391 GOT_WORKTREE_PATH_PREFIX);
392 if (err)
393 goto done;
395 err = read_meta_file(&base_commit_id_str, path_got,
396 GOT_WORKTREE_BASE_COMMIT);
397 if (err)
398 goto done;
400 err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
401 if (err)
402 goto done;
403 uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
404 if (uuid_status != uuid_s_ok) {
405 err = got_error_uuid(uuid_status, "uuid_from_string");
406 goto done;
409 err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
410 if (err)
411 goto done;
413 err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
414 base_commit_id_str);
415 if (err)
416 goto done;
418 err = read_meta_file(&(*worktree)->head_ref_name, path_got,
419 GOT_WORKTREE_HEAD_REF);
420 if (err)
421 goto done;
423 if (asprintf(&(*worktree)->gotconfig_path, "%s/%s/%s",
424 (*worktree)->root_path,
425 GOT_WORKTREE_GOT_DIR, GOT_GOTCONFIG_FILENAME) == -1) {
426 err = got_error_from_errno("asprintf");
427 goto done;
430 err = got_gotconfig_read(&(*worktree)->gotconfig,
431 (*worktree)->gotconfig_path);
433 (*worktree)->root_fd = open((*worktree)->root_path, O_DIRECTORY);
434 if ((*worktree)->root_fd == -1) {
435 err = got_error_from_errno2("open", (*worktree)->root_path);
436 goto done;
438 done:
439 if (repo) {
440 const struct got_error *close_err = got_repo_close(repo);
441 if (err == NULL)
442 err = close_err;
444 free(path_got);
445 free(path_lock);
446 free(base_commit_id_str);
447 free(uuidstr);
448 free(formatstr);
449 if (err) {
450 if (fd != -1)
451 close(fd);
452 if (*worktree != NULL)
453 got_worktree_close(*worktree);
454 *worktree = NULL;
455 } else
456 (*worktree)->lockfd = fd;
458 return err;
461 const struct got_error *
462 got_worktree_open(struct got_worktree **worktree, const char *path)
464 const struct got_error *err = NULL;
465 char *worktree_path;
467 worktree_path = strdup(path);
468 if (worktree_path == NULL)
469 return got_error_from_errno("strdup");
471 for (;;) {
472 char *parent_path;
474 err = open_worktree(worktree, worktree_path);
475 if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT)) {
476 free(worktree_path);
477 return err;
479 if (*worktree) {
480 free(worktree_path);
481 return NULL;
483 if (worktree_path[0] == '/' && worktree_path[1] == '\0')
484 break;
485 err = got_path_dirname(&parent_path, worktree_path);
486 if (err) {
487 if (err->code != GOT_ERR_BAD_PATH) {
488 free(worktree_path);
489 return err;
491 break;
493 free(worktree_path);
494 worktree_path = parent_path;
497 free(worktree_path);
498 return got_error(GOT_ERR_NOT_WORKTREE);
501 const struct got_error *
502 got_worktree_close(struct got_worktree *worktree)
504 const struct got_error *err = NULL;
506 if (worktree->lockfd != -1) {
507 if (close(worktree->lockfd) == -1)
508 err = got_error_from_errno2("close",
509 got_worktree_get_root_path(worktree));
511 if (close(worktree->root_fd) == -1 && err == NULL)
512 err = got_error_from_errno2("close",
513 got_worktree_get_root_path(worktree));
514 free(worktree->repo_path);
515 free(worktree->path_prefix);
516 free(worktree->base_commit_id);
517 free(worktree->head_ref_name);
518 free(worktree->root_path);
519 free(worktree->gotconfig_path);
520 got_gotconfig_free(worktree->gotconfig);
521 free(worktree);
522 return err;
525 const char *
526 got_worktree_get_root_path(struct got_worktree *worktree)
528 return worktree->root_path;
531 const char *
532 got_worktree_get_repo_path(struct got_worktree *worktree)
534 return worktree->repo_path;
536 const char *
537 got_worktree_get_path_prefix(struct got_worktree *worktree)
539 return worktree->path_prefix;
542 const struct got_error *
543 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
544 const char *path_prefix)
546 char *absprefix = NULL;
548 if (!got_path_is_absolute(path_prefix)) {
549 if (asprintf(&absprefix, "/%s", path_prefix) == -1)
550 return got_error_from_errno("asprintf");
552 *match = (strcmp(absprefix ? absprefix : path_prefix,
553 worktree->path_prefix) == 0);
554 free(absprefix);
555 return NULL;
558 const char *
559 got_worktree_get_head_ref_name(struct got_worktree *worktree)
561 return worktree->head_ref_name;
564 const struct got_error *
565 got_worktree_set_head_ref(struct got_worktree *worktree,
566 struct got_reference *head_ref)
568 const struct got_error *err = NULL;
569 char *path_got = NULL, *head_ref_name = NULL;
571 if (asprintf(&path_got, "%s/%s", worktree->root_path,
572 GOT_WORKTREE_GOT_DIR) == -1) {
573 err = got_error_from_errno("asprintf");
574 path_got = NULL;
575 goto done;
578 head_ref_name = strdup(got_ref_get_name(head_ref));
579 if (head_ref_name == NULL) {
580 err = got_error_from_errno("strdup");
581 goto done;
584 err = write_head_ref(path_got, head_ref);
585 if (err)
586 goto done;
588 free(worktree->head_ref_name);
589 worktree->head_ref_name = head_ref_name;
590 done:
591 free(path_got);
592 if (err)
593 free(head_ref_name);
594 return err;
597 struct got_object_id *
598 got_worktree_get_base_commit_id(struct got_worktree *worktree)
600 return worktree->base_commit_id;
603 const struct got_error *
604 got_worktree_set_base_commit_id(struct got_worktree *worktree,
605 struct got_repository *repo, struct got_object_id *commit_id)
607 const struct got_error *err;
608 struct got_object *obj = NULL;
609 char *id_str = NULL;
610 char *path_got = NULL;
612 if (asprintf(&path_got, "%s/%s", worktree->root_path,
613 GOT_WORKTREE_GOT_DIR) == -1) {
614 err = got_error_from_errno("asprintf");
615 path_got = NULL;
616 goto done;
619 err = got_object_open(&obj, repo, commit_id);
620 if (err)
621 return err;
623 if (obj->type != GOT_OBJ_TYPE_COMMIT) {
624 err = got_error(GOT_ERR_OBJ_TYPE);
625 goto done;
628 /* Record our base commit. */
629 err = got_object_id_str(&id_str, commit_id);
630 if (err)
631 goto done;
632 err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
633 if (err)
634 goto done;
636 free(worktree->base_commit_id);
637 worktree->base_commit_id = got_object_id_dup(commit_id);
638 if (worktree->base_commit_id == NULL) {
639 err = got_error_from_errno("got_object_id_dup");
640 goto done;
642 done:
643 if (obj)
644 got_object_close(obj);
645 free(id_str);
646 free(path_got);
647 return err;
650 const struct got_gotconfig *
651 got_worktree_get_gotconfig(struct got_worktree *worktree)
653 return worktree->gotconfig;
656 static const struct got_error *
657 lock_worktree(struct got_worktree *worktree, int operation)
659 if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
660 return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
661 : got_error_from_errno2("flock",
662 got_worktree_get_root_path(worktree)));
663 return NULL;
666 static const struct got_error *
667 add_dir_on_disk(struct got_worktree *worktree, const char *path)
669 const struct got_error *err = NULL;
670 char *abspath;
672 if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
673 return got_error_from_errno("asprintf");
675 err = got_path_mkdir(abspath);
676 if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
677 struct stat sb;
678 err = NULL;
679 if (lstat(abspath, &sb) == -1) {
680 err = got_error_from_errno2("lstat", abspath);
681 } else if (!S_ISDIR(sb.st_mode)) {
682 /* TODO directory is obstructed; do something */
683 err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
686 free(abspath);
687 return err;
690 static const struct got_error *
691 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
693 const struct got_error *err = NULL;
694 uint8_t fbuf1[8192];
695 uint8_t fbuf2[8192];
696 size_t flen1 = 0, flen2 = 0;
698 *same = 1;
700 for (;;) {
701 flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
702 if (flen1 == 0 && ferror(f1)) {
703 err = got_error_from_errno("fread");
704 break;
706 flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
707 if (flen2 == 0 && ferror(f2)) {
708 err = got_error_from_errno("fread");
709 break;
711 if (flen1 == 0) {
712 if (flen2 != 0)
713 *same = 0;
714 break;
715 } else if (flen2 == 0) {
716 if (flen1 != 0)
717 *same = 0;
718 break;
719 } else if (flen1 == flen2) {
720 if (memcmp(fbuf1, fbuf2, flen2) != 0) {
721 *same = 0;
722 break;
724 } else {
725 *same = 0;
726 break;
730 return err;
733 static const struct got_error *
734 check_files_equal(int *same, FILE *f1, FILE *f2)
736 struct stat sb;
737 size_t size1, size2;
739 *same = 1;
741 if (fstat(fileno(f1), &sb) != 0)
742 return got_error_from_errno("fstat");
743 size1 = sb.st_size;
745 if (fstat(fileno(f2), &sb) != 0)
746 return got_error_from_errno("fstat");
747 size2 = sb.st_size;
749 if (size1 != size2) {
750 *same = 0;
751 return NULL;
754 if (fseek(f1, 0L, SEEK_SET) == -1)
755 return got_ferror(f1, GOT_ERR_IO);
756 if (fseek(f2, 0L, SEEK_SET) == -1)
757 return got_ferror(f2, GOT_ERR_IO);
759 return check_file_contents_equal(same, f1, f2);
762 /*
763 * Perform a 3-way merge where the file f_orig acts as the common
764 * ancestor, the file f_deriv acts as the first derived version,
765 * and the file f_deriv2 acts as the second derived version.
766 * The merge result will be written to a new file at ondisk_path; any
767 * existing file at this path will be replaced.
768 */
769 static const struct got_error *
770 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
771 FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
772 const char *path, uint16_t st_mode,
773 const char *label_orig, const char *label_deriv, const char *label_deriv2,
774 enum got_diff_algorithm diff_algo, struct got_repository *repo,
775 got_worktree_checkout_cb progress_cb, void *progress_arg)
777 const struct got_error *err = NULL;
778 int merged_fd = -1;
779 FILE *f_merged = NULL;
780 char *merged_path = NULL, *base_path = NULL;
781 int overlapcnt = 0;
782 char *parent = NULL;
784 *local_changes_subsumed = 0;
786 err = got_path_dirname(&parent, ondisk_path);
787 if (err)
788 return err;
790 if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
791 err = got_error_from_errno("asprintf");
792 goto done;
795 err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
796 if (err)
797 goto done;
799 err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
800 f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
801 if (err)
802 goto done;
804 err = (*progress_cb)(progress_arg,
805 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
806 if (err)
807 goto done;
809 if (fsync(merged_fd) != 0) {
810 err = got_error_from_errno("fsync");
811 goto done;
814 f_merged = fdopen(merged_fd, "r");
815 if (f_merged == NULL) {
816 err = got_error_from_errno("fdopen");
817 goto done;
819 merged_fd = -1;
821 /* Check if a clean merge has subsumed all local changes. */
822 if (overlapcnt == 0) {
823 err = check_files_equal(local_changes_subsumed, f_deriv,
824 f_merged);
825 if (err)
826 goto done;
829 if (fchmod(fileno(f_merged), st_mode) != 0) {
830 err = got_error_from_errno2("fchmod", merged_path);
831 goto done;
834 if (rename(merged_path, ondisk_path) != 0) {
835 err = got_error_from_errno3("rename", merged_path,
836 ondisk_path);
837 goto done;
839 done:
840 if (err) {
841 if (merged_path)
842 unlink(merged_path);
844 if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
845 err = got_error_from_errno("close");
846 if (f_merged && fclose(f_merged) == EOF && err == NULL)
847 err = got_error_from_errno("fclose");
848 free(merged_path);
849 free(base_path);
850 free(parent);
851 return err;
854 static const struct got_error *
855 update_symlink(const char *ondisk_path, const char *target_path,
856 size_t target_len)
858 /* This is not atomic but matches what 'ln -sf' does. */
859 if (unlink(ondisk_path) == -1)
860 return got_error_from_errno2("unlink", ondisk_path);
861 if (symlink(target_path, ondisk_path) == -1)
862 return got_error_from_errno3("symlink", target_path,
863 ondisk_path);
864 return NULL;
867 /*
868 * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
869 * in the work tree with a file that contains conflict markers and the
870 * conflicting target paths of the original version, a "derived version"
871 * of a symlink from an incoming change, and a local version of the symlink.
873 * The original versions's target path can be NULL if it is not available,
874 * such as if both derived versions added a new symlink at the same path.
876 * The incoming derived symlink target is NULL in case the incoming change
877 * has deleted this symlink.
878 */
879 static const struct got_error *
880 install_symlink_conflict(const char *deriv_target,
881 struct got_object_id *deriv_base_commit_id, const char *orig_target,
882 const char *label_orig, const char *local_target, const char *ondisk_path)
884 const struct got_error *err;
885 char *id_str = NULL, *label_deriv = NULL, *path = NULL;
886 FILE *f = NULL;
888 err = got_object_id_str(&id_str, deriv_base_commit_id);
889 if (err)
890 return got_error_from_errno("asprintf");
892 if (asprintf(&label_deriv, "%s: commit %s",
893 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
894 err = got_error_from_errno("asprintf");
895 goto done;
898 err = got_opentemp_named(&path, &f, "got-symlink-conflict");
899 if (err)
900 goto done;
902 if (fchmod(fileno(f), GOT_DEFAULT_FILE_MODE) == -1) {
903 err = got_error_from_errno2("fchmod", path);
904 goto done;
907 if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
908 GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
909 deriv_target ? deriv_target : "(symlink was deleted)",
910 orig_target ? label_orig : "",
911 orig_target ? "\n" : "",
912 orig_target ? orig_target : "",
913 orig_target ? "\n" : "",
914 GOT_DIFF_CONFLICT_MARKER_SEP,
915 local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
916 err = got_error_from_errno2("fprintf", path);
917 goto done;
920 if (unlink(ondisk_path) == -1) {
921 err = got_error_from_errno2("unlink", ondisk_path);
922 goto done;
924 if (rename(path, ondisk_path) == -1) {
925 err = got_error_from_errno3("rename", path, ondisk_path);
926 goto done;
928 done:
929 if (f != NULL && fclose(f) == EOF && err == NULL)
930 err = got_error_from_errno2("fclose", path);
931 free(path);
932 free(id_str);
933 free(label_deriv);
934 return err;
937 /* forward declaration */
938 static const struct got_error *
939 merge_blob(int *, struct got_worktree *, struct got_blob_object *,
940 const char *, const char *, uint16_t, const char *,
941 struct got_blob_object *, struct got_object_id *,
942 struct got_repository *, got_worktree_checkout_cb, void *);
944 /*
945 * Merge a symlink into the work tree, where blob_orig acts as the common
946 * ancestor, deriv_target is the link target of the first derived version,
947 * and the symlink on disk acts as the second derived version.
948 * Assume that contents of both blobs represent symlinks.
949 */
950 static const struct got_error *
951 merge_symlink(struct got_worktree *worktree,
952 struct got_blob_object *blob_orig, const char *ondisk_path,
953 const char *path, const char *label_orig, const char *deriv_target,
954 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
955 got_worktree_checkout_cb progress_cb, void *progress_arg)
957 const struct got_error *err = NULL;
958 char *ancestor_target = NULL;
959 struct stat sb;
960 ssize_t ondisk_len, deriv_len;
961 char ondisk_target[PATH_MAX];
962 int have_local_change = 0;
963 int have_incoming_change = 0;
965 if (lstat(ondisk_path, &sb) == -1)
966 return got_error_from_errno2("lstat", ondisk_path);
968 ondisk_len = readlink(ondisk_path, ondisk_target,
969 sizeof(ondisk_target));
970 if (ondisk_len == -1) {
971 err = got_error_from_errno2("readlink",
972 ondisk_path);
973 goto done;
975 ondisk_target[ondisk_len] = '\0';
977 if (blob_orig) {
978 err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
979 if (err)
980 goto done;
983 if (ancestor_target == NULL ||
984 (ondisk_len != strlen(ancestor_target) ||
985 memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
986 have_local_change = 1;
988 deriv_len = strlen(deriv_target);
989 if (ancestor_target == NULL ||
990 (deriv_len != strlen(ancestor_target) ||
991 memcmp(deriv_target, ancestor_target, deriv_len) != 0))
992 have_incoming_change = 1;
994 if (!have_local_change && !have_incoming_change) {
995 if (ancestor_target) {
996 /* Both sides made the same change. */
997 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
998 path);
999 } else if (deriv_len == ondisk_len &&
1000 memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
1001 /* Both sides added the same symlink. */
1002 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1003 path);
1004 } else {
1005 /* Both sides added symlinks which don't match. */
1006 err = install_symlink_conflict(deriv_target,
1007 deriv_base_commit_id, ancestor_target,
1008 label_orig, ondisk_target, ondisk_path);
1009 if (err)
1010 goto done;
1011 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1012 path);
1014 } else if (!have_local_change && have_incoming_change) {
1015 /* Apply the incoming change. */
1016 err = update_symlink(ondisk_path, deriv_target,
1017 strlen(deriv_target));
1018 if (err)
1019 goto done;
1020 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1021 } else if (have_local_change && have_incoming_change) {
1022 if (deriv_len == ondisk_len &&
1023 memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
1024 /* Both sides made the same change. */
1025 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1026 path);
1027 } else {
1028 err = install_symlink_conflict(deriv_target,
1029 deriv_base_commit_id, ancestor_target, label_orig,
1030 ondisk_target, ondisk_path);
1031 if (err)
1032 goto done;
1033 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1034 path);
1038 done:
1039 free(ancestor_target);
1040 return err;
1043 static const struct got_error *
1044 dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
1046 const struct got_error *err = NULL;
1047 char target_path[PATH_MAX];
1048 ssize_t target_len;
1049 size_t n;
1050 FILE *f;
1052 *outfile = NULL;
1054 f = got_opentemp();
1055 if (f == NULL)
1056 return got_error_from_errno("got_opentemp");
1057 target_len = readlink(ondisk_path, target_path, sizeof(target_path));
1058 if (target_len == -1) {
1059 err = got_error_from_errno2("readlink", ondisk_path);
1060 goto done;
1062 n = fwrite(target_path, 1, target_len, f);
1063 if (n != target_len) {
1064 err = got_ferror(f, GOT_ERR_IO);
1065 goto done;
1067 if (fflush(f) == EOF) {
1068 err = got_error_from_errno("fflush");
1069 goto done;
1071 if (fseek(f, 0L, SEEK_SET) == -1) {
1072 err = got_ferror(f, GOT_ERR_IO);
1073 goto done;
1075 done:
1076 if (err)
1077 fclose(f);
1078 else
1079 *outfile = f;
1080 return err;
1084 * Perform a 3-way merge where blob_orig acts as the common ancestor,
1085 * blob_deriv acts as the first derived version, and the file on disk
1086 * acts as the second derived version.
1088 static const struct got_error *
1089 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
1090 struct got_blob_object *blob_orig, const char *ondisk_path,
1091 const char *path, uint16_t st_mode, const char *label_orig,
1092 struct got_blob_object *blob_deriv,
1093 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1094 got_worktree_checkout_cb progress_cb, void *progress_arg)
1096 const struct got_error *err = NULL;
1097 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
1098 char *blob_orig_path = NULL;
1099 char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
1100 char *label_deriv = NULL, *parent = NULL;
1102 *local_changes_subsumed = 0;
1104 err = got_path_dirname(&parent, ondisk_path);
1105 if (err)
1106 return err;
1108 if (blob_orig) {
1109 if (asprintf(&base_path, "%s/got-merge-blob-orig",
1110 parent) == -1) {
1111 err = got_error_from_errno("asprintf");
1112 base_path = NULL;
1113 goto done;
1116 err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
1117 if (err)
1118 goto done;
1119 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
1120 blob_orig);
1121 if (err)
1122 goto done;
1123 free(base_path);
1124 } else {
1126 * No common ancestor exists. This is an "add vs add" conflict
1127 * and we simply use an empty ancestor file to make both files
1128 * appear in the merged result in their entirety.
1130 f_orig = got_opentemp();
1131 if (f_orig == NULL) {
1132 err = got_error_from_errno("got_opentemp");
1133 goto done;
1137 if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1138 err = got_error_from_errno("asprintf");
1139 base_path = NULL;
1140 goto done;
1143 err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1144 if (err)
1145 goto done;
1146 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1147 blob_deriv);
1148 if (err)
1149 goto done;
1151 err = got_object_id_str(&id_str, deriv_base_commit_id);
1152 if (err)
1153 goto done;
1154 if (asprintf(&label_deriv, "%s: commit %s",
1155 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1156 err = got_error_from_errno("asprintf");
1157 goto done;
1161 * In order the run a 3-way merge with a symlink we copy the symlink's
1162 * target path into a temporary file and use that file with diff3.
1164 if (S_ISLNK(st_mode)) {
1165 err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1166 if (err)
1167 goto done;
1168 } else {
1169 int fd;
1170 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
1171 if (fd == -1) {
1172 err = got_error_from_errno2("open", ondisk_path);
1173 goto done;
1175 f_deriv2 = fdopen(fd, "r");
1176 if (f_deriv2 == NULL) {
1177 err = got_error_from_errno2("fdopen", ondisk_path);
1178 close(fd);
1179 goto done;
1183 err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1184 f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1185 NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1186 done:
1187 if (f_orig && fclose(f_orig) == EOF && err == NULL)
1188 err = got_error_from_errno("fclose");
1189 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1190 err = got_error_from_errno("fclose");
1191 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1192 err = got_error_from_errno("fclose");
1193 free(base_path);
1194 if (blob_orig_path) {
1195 unlink(blob_orig_path);
1196 free(blob_orig_path);
1198 if (blob_deriv_path) {
1199 unlink(blob_deriv_path);
1200 free(blob_deriv_path);
1202 free(id_str);
1203 free(label_deriv);
1204 free(parent);
1205 return err;
1208 static const struct got_error *
1209 create_fileindex_entry(struct got_fileindex_entry **new_iep,
1210 struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1211 int wt_fd, const char *path, struct got_object_id *blob_id)
1213 const struct got_error *err = NULL;
1214 struct got_fileindex_entry *new_ie;
1216 *new_iep = NULL;
1218 err = got_fileindex_entry_alloc(&new_ie, path);
1219 if (err)
1220 return err;
1222 err = got_fileindex_entry_update(new_ie, wt_fd, path,
1223 blob_id->sha1, base_commit_id->sha1, 1);
1224 if (err)
1225 goto done;
1227 err = got_fileindex_entry_add(fileindex, new_ie);
1228 done:
1229 if (err)
1230 got_fileindex_entry_free(new_ie);
1231 else
1232 *new_iep = new_ie;
1233 return err;
1236 static mode_t
1237 get_ondisk_perms(int executable, mode_t st_mode)
1239 mode_t xbits = S_IXUSR;
1241 if (executable) {
1242 /* Map read bits to execute bits. */
1243 if (st_mode & S_IRGRP)
1244 xbits |= S_IXGRP;
1245 if (st_mode & S_IROTH)
1246 xbits |= S_IXOTH;
1247 return st_mode | xbits;
1250 return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1253 /* forward declaration */
1254 static const struct got_error *
1255 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1256 const char *path, mode_t te_mode, mode_t st_mode,
1257 struct got_blob_object *blob, int restoring_missing_file,
1258 int reverting_versioned_file, int installing_bad_symlink,
1259 int path_is_unversioned, struct got_repository *repo,
1260 got_worktree_checkout_cb progress_cb, void *progress_arg);
1263 * This function assumes that the provided symlink target points at a
1264 * safe location in the work tree!
1266 static const struct got_error *
1267 replace_existing_symlink(int *did_something, const char *ondisk_path,
1268 const char *target_path, size_t target_len)
1270 const struct got_error *err = NULL;
1271 ssize_t elen;
1272 char etarget[PATH_MAX];
1273 int fd;
1275 *did_something = 0;
1278 * "Bad" symlinks (those pointing outside the work tree or into the
1279 * .got directory) are installed in the work tree as a regular file
1280 * which contains the bad symlink target path.
1281 * The new symlink target has already been checked for safety by our
1282 * caller. If we can successfully open a regular file then we simply
1283 * replace this file with a symlink below.
1285 fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
1286 if (fd == -1) {
1287 if (errno != ELOOP)
1288 return got_error_from_errno2("open", ondisk_path);
1290 /* We are updating an existing on-disk symlink. */
1291 elen = readlink(ondisk_path, etarget, sizeof(etarget));
1292 if (elen == -1)
1293 return got_error_from_errno2("readlink", ondisk_path);
1295 if (elen == target_len &&
1296 memcmp(etarget, target_path, target_len) == 0)
1297 return NULL; /* nothing to do */
1300 *did_something = 1;
1301 err = update_symlink(ondisk_path, target_path, target_len);
1302 if (fd != -1 && close(fd) == -1 && err == NULL)
1303 err = got_error_from_errno2("close", ondisk_path);
1304 return err;
1307 static const struct got_error *
1308 is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1309 size_t target_len, const char *ondisk_path, const char *wtroot_path)
1311 const struct got_error *err = NULL;
1312 char canonpath[PATH_MAX];
1313 char *path_got = NULL;
1315 *is_bad_symlink = 0;
1317 if (target_len >= sizeof(canonpath)) {
1318 *is_bad_symlink = 1;
1319 return NULL;
1323 * We do not use realpath(3) to resolve the symlink's target
1324 * path because we don't want to resolve symlinks recursively.
1325 * Instead we make the path absolute and then canonicalize it.
1326 * Relative symlink target lookup should begin at the directory
1327 * in which the blob object is being installed.
1329 if (!got_path_is_absolute(target_path)) {
1330 char *abspath, *parent;
1331 err = got_path_dirname(&parent, ondisk_path);
1332 if (err)
1333 return err;
1334 if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1335 free(parent);
1336 return got_error_from_errno("asprintf");
1338 free(parent);
1339 if (strlen(abspath) >= sizeof(canonpath)) {
1340 err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1341 free(abspath);
1342 return err;
1344 err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1345 free(abspath);
1346 if (err)
1347 return err;
1348 } else {
1349 err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1350 if (err)
1351 return err;
1354 /* Only allow symlinks pointing at paths within the work tree. */
1355 if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1356 *is_bad_symlink = 1;
1357 return NULL;
1360 /* Do not allow symlinks pointing into the .got directory. */
1361 if (asprintf(&path_got, "%s/%s", wtroot_path,
1362 GOT_WORKTREE_GOT_DIR) == -1)
1363 return got_error_from_errno("asprintf");
1364 if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1365 *is_bad_symlink = 1;
1367 free(path_got);
1368 return NULL;
1371 static const struct got_error *
1372 install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1373 const char *ondisk_path, const char *path, struct got_blob_object *blob,
1374 int restoring_missing_file, int reverting_versioned_file,
1375 int path_is_unversioned, struct got_repository *repo,
1376 got_worktree_checkout_cb progress_cb, void *progress_arg)
1378 const struct got_error *err = NULL;
1379 char target_path[PATH_MAX];
1380 size_t len, target_len = 0;
1381 char *path_got = NULL;
1382 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1383 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1385 *is_bad_symlink = 0;
1388 * Blob object content specifies the target path of the link.
1389 * If a symbolic link cannot be installed we instead create
1390 * a regular file which contains the link target path stored
1391 * in the blob object.
1393 do {
1394 err = got_object_blob_read_block(&len, blob);
1395 if (len + target_len >= sizeof(target_path)) {
1396 /* Path too long; install as a regular file. */
1397 *is_bad_symlink = 1;
1398 got_object_blob_rewind(blob);
1399 return install_blob(worktree, ondisk_path, path,
1400 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1401 restoring_missing_file, reverting_versioned_file,
1402 1, path_is_unversioned, repo, progress_cb,
1403 progress_arg);
1405 if (len > 0) {
1406 /* Skip blob object header first time around. */
1407 memcpy(target_path + target_len, buf + hdrlen,
1408 len - hdrlen);
1409 target_len += len - hdrlen;
1410 hdrlen = 0;
1412 } while (len != 0);
1413 target_path[target_len] = '\0';
1415 err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1416 ondisk_path, worktree->root_path);
1417 if (err)
1418 return err;
1420 if (*is_bad_symlink) {
1421 /* install as a regular file */
1422 got_object_blob_rewind(blob);
1423 err = install_blob(worktree, ondisk_path, path,
1424 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1425 restoring_missing_file, reverting_versioned_file, 1,
1426 path_is_unversioned, repo, progress_cb, progress_arg);
1427 goto done;
1430 if (symlink(target_path, ondisk_path) == -1) {
1431 if (errno == EEXIST) {
1432 int symlink_replaced;
1433 if (path_is_unversioned) {
1434 err = (*progress_cb)(progress_arg,
1435 GOT_STATUS_UNVERSIONED, path);
1436 goto done;
1438 err = replace_existing_symlink(&symlink_replaced,
1439 ondisk_path, target_path, target_len);
1440 if (err)
1441 goto done;
1442 if (progress_cb) {
1443 if (symlink_replaced) {
1444 err = (*progress_cb)(progress_arg,
1445 reverting_versioned_file ?
1446 GOT_STATUS_REVERT :
1447 GOT_STATUS_UPDATE, path);
1448 } else {
1449 err = (*progress_cb)(progress_arg,
1450 GOT_STATUS_EXISTS, path);
1453 goto done; /* Nothing else to do. */
1456 if (errno == ENOENT) {
1457 char *parent;
1458 err = got_path_dirname(&parent, ondisk_path);
1459 if (err)
1460 goto done;
1461 err = add_dir_on_disk(worktree, parent);
1462 free(parent);
1463 if (err)
1464 goto done;
1466 * Retry, and fall through to error handling
1467 * below if this second attempt fails.
1469 if (symlink(target_path, ondisk_path) != -1) {
1470 err = NULL; /* success */
1471 goto done;
1475 /* Handle errors from first or second creation attempt. */
1476 if (errno == ENAMETOOLONG) {
1477 /* bad target path; install as a regular file */
1478 *is_bad_symlink = 1;
1479 got_object_blob_rewind(blob);
1480 err = install_blob(worktree, ondisk_path, path,
1481 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1482 restoring_missing_file, reverting_versioned_file, 1,
1483 path_is_unversioned, repo,
1484 progress_cb, progress_arg);
1485 } else if (errno == ENOTDIR) {
1486 err = got_error_path(ondisk_path,
1487 GOT_ERR_FILE_OBSTRUCTED);
1488 } else {
1489 err = got_error_from_errno3("symlink",
1490 target_path, ondisk_path);
1492 } else if (progress_cb)
1493 err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1494 GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1495 done:
1496 free(path_got);
1497 return err;
1500 static const struct got_error *
1501 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1502 const char *path, mode_t te_mode, mode_t st_mode,
1503 struct got_blob_object *blob, int restoring_missing_file,
1504 int reverting_versioned_file, int installing_bad_symlink,
1505 int path_is_unversioned, struct got_repository *repo,
1506 got_worktree_checkout_cb progress_cb, void *progress_arg)
1508 const struct got_error *err = NULL;
1509 int fd = -1;
1510 size_t len, hdrlen;
1511 int update = 0;
1512 char *tmppath = NULL;
1514 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1515 GOT_DEFAULT_FILE_MODE);
1516 if (fd == -1) {
1517 if (errno == ENOENT) {
1518 char *parent;
1519 err = got_path_dirname(&parent, path);
1520 if (err)
1521 return err;
1522 err = add_dir_on_disk(worktree, parent);
1523 free(parent);
1524 if (err)
1525 return err;
1526 fd = open(ondisk_path,
1527 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1528 GOT_DEFAULT_FILE_MODE);
1529 if (fd == -1)
1530 return got_error_from_errno2("open",
1531 ondisk_path);
1532 } else if (errno == EEXIST) {
1533 if (path_is_unversioned) {
1534 err = (*progress_cb)(progress_arg,
1535 GOT_STATUS_UNVERSIONED, path);
1536 goto done;
1538 if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1539 !S_ISREG(st_mode) && !installing_bad_symlink) {
1540 /* TODO file is obstructed; do something */
1541 err = got_error_path(ondisk_path,
1542 GOT_ERR_FILE_OBSTRUCTED);
1543 goto done;
1544 } else {
1545 err = got_opentemp_named_fd(&tmppath, &fd,
1546 ondisk_path);
1547 if (err)
1548 goto done;
1549 update = 1;
1551 } else
1552 return got_error_from_errno2("open", ondisk_path);
1555 if (fchmod(fd, get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1556 err = got_error_from_errno2("fchmod",
1557 update ? tmppath : ondisk_path);
1558 goto done;
1561 if (progress_cb) {
1562 if (restoring_missing_file)
1563 err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1564 path);
1565 else if (reverting_versioned_file)
1566 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1567 path);
1568 else
1569 err = (*progress_cb)(progress_arg,
1570 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1571 if (err)
1572 goto done;
1575 hdrlen = got_object_blob_get_hdrlen(blob);
1576 do {
1577 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1578 err = got_object_blob_read_block(&len, blob);
1579 if (err)
1580 break;
1581 if (len > 0) {
1582 /* Skip blob object header first time around. */
1583 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1584 if (outlen == -1) {
1585 err = got_error_from_errno("write");
1586 goto done;
1587 } else if (outlen != len - hdrlen) {
1588 err = got_error(GOT_ERR_IO);
1589 goto done;
1591 hdrlen = 0;
1593 } while (len != 0);
1595 if (fsync(fd) != 0) {
1596 err = got_error_from_errno("fsync");
1597 goto done;
1600 if (update) {
1601 if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1602 err = got_error_from_errno2("unlink", ondisk_path);
1603 goto done;
1605 if (rename(tmppath, ondisk_path) != 0) {
1606 err = got_error_from_errno3("rename", tmppath,
1607 ondisk_path);
1608 goto done;
1610 free(tmppath);
1611 tmppath = NULL;
1614 done:
1615 if (fd != -1 && close(fd) == -1 && err == NULL)
1616 err = got_error_from_errno("close");
1617 if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1618 err = got_error_from_errno2("unlink", tmppath);
1619 free(tmppath);
1620 return err;
1623 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1624 static const struct got_error *
1625 get_modified_file_content_status(unsigned char *status, FILE *f)
1627 const struct got_error *err = NULL;
1628 const char *markers[3] = {
1629 GOT_DIFF_CONFLICT_MARKER_BEGIN,
1630 GOT_DIFF_CONFLICT_MARKER_SEP,
1631 GOT_DIFF_CONFLICT_MARKER_END
1633 int i = 0;
1634 char *line = NULL;
1635 size_t linesize = 0;
1636 ssize_t linelen;
1638 while (*status == GOT_STATUS_MODIFY) {
1639 linelen = getline(&line, &linesize, f);
1640 if (linelen == -1) {
1641 if (feof(f))
1642 break;
1643 err = got_ferror(f, GOT_ERR_IO);
1644 break;
1647 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1648 if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1649 == 0)
1650 *status = GOT_STATUS_CONFLICT;
1651 else
1652 i++;
1655 free(line);
1657 return err;
1660 static int
1661 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1663 mode_t ie_mode = got_fileindex_perms_to_st(ie);
1664 return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1667 static int
1668 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1670 return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1671 ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1672 ie->mtime_sec == sb->st_mtim.tv_sec &&
1673 ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1674 ie->size == (sb->st_size & 0xffffffff) &&
1675 !xbit_differs(ie, sb->st_mode));
1678 static unsigned char
1679 get_staged_status(struct got_fileindex_entry *ie)
1681 switch (got_fileindex_entry_stage_get(ie)) {
1682 case GOT_FILEIDX_STAGE_ADD:
1683 return GOT_STATUS_ADD;
1684 case GOT_FILEIDX_STAGE_DELETE:
1685 return GOT_STATUS_DELETE;
1686 case GOT_FILEIDX_STAGE_MODIFY:
1687 return GOT_STATUS_MODIFY;
1688 default:
1689 return GOT_STATUS_NO_CHANGE;
1693 static const struct got_error *
1694 get_symlink_modification_status(unsigned char *status,
1695 struct got_fileindex_entry *ie, const char *abspath,
1696 int dirfd, const char *de_name, struct got_blob_object *blob)
1698 const struct got_error *err = NULL;
1699 char target_path[PATH_MAX];
1700 char etarget[PATH_MAX];
1701 ssize_t elen;
1702 size_t len, target_len = 0;
1703 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1704 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1706 *status = GOT_STATUS_NO_CHANGE;
1708 /* Blob object content specifies the target path of the link. */
1709 do {
1710 err = got_object_blob_read_block(&len, blob);
1711 if (err)
1712 return err;
1713 if (len + target_len >= sizeof(target_path)) {
1715 * Should not happen. The blob contents were OK
1716 * when this symlink was installed.
1718 return got_error(GOT_ERR_NO_SPACE);
1720 if (len > 0) {
1721 /* Skip blob object header first time around. */
1722 memcpy(target_path + target_len, buf + hdrlen,
1723 len - hdrlen);
1724 target_len += len - hdrlen;
1725 hdrlen = 0;
1727 } while (len != 0);
1728 target_path[target_len] = '\0';
1730 if (dirfd != -1) {
1731 elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1732 if (elen == -1)
1733 return got_error_from_errno2("readlinkat", abspath);
1734 } else {
1735 elen = readlink(abspath, etarget, sizeof(etarget));
1736 if (elen == -1)
1737 return got_error_from_errno2("readlink", abspath);
1740 if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1741 *status = GOT_STATUS_MODIFY;
1743 return NULL;
1746 static const struct got_error *
1747 get_file_status(unsigned char *status, struct stat *sb,
1748 struct got_fileindex_entry *ie, const char *abspath,
1749 int dirfd, const char *de_name, struct got_repository *repo)
1751 const struct got_error *err = NULL;
1752 struct got_object_id id;
1753 size_t hdrlen;
1754 int fd = -1;
1755 FILE *f = NULL;
1756 uint8_t fbuf[8192];
1757 struct got_blob_object *blob = NULL;
1758 size_t flen, blen;
1759 unsigned char staged_status = get_staged_status(ie);
1761 *status = GOT_STATUS_NO_CHANGE;
1762 memset(sb, 0, sizeof(*sb));
1765 * Whenever the caller provides a directory descriptor and a
1766 * directory entry name for the file, use them! This prevents
1767 * race conditions if filesystem paths change beneath our feet.
1769 if (dirfd != -1) {
1770 if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1771 if (errno == ENOENT) {
1772 if (got_fileindex_entry_has_file_on_disk(ie))
1773 *status = GOT_STATUS_MISSING;
1774 else
1775 *status = GOT_STATUS_DELETE;
1776 goto done;
1778 err = got_error_from_errno2("fstatat", abspath);
1779 goto done;
1781 } else {
1782 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1783 if (fd == -1 && errno != ENOENT && errno != ELOOP)
1784 return got_error_from_errno2("open", abspath);
1785 else if (fd == -1 && errno == ELOOP) {
1786 if (lstat(abspath, sb) == -1)
1787 return got_error_from_errno2("lstat", abspath);
1788 } else if (fd == -1 || fstat(fd, sb) == -1) {
1789 if (errno == ENOENT) {
1790 if (got_fileindex_entry_has_file_on_disk(ie))
1791 *status = GOT_STATUS_MISSING;
1792 else
1793 *status = GOT_STATUS_DELETE;
1794 goto done;
1796 err = got_error_from_errno2("fstat", abspath);
1797 goto done;
1801 if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1802 *status = GOT_STATUS_OBSTRUCTED;
1803 goto done;
1806 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1807 *status = GOT_STATUS_DELETE;
1808 goto done;
1809 } else if (!got_fileindex_entry_has_blob(ie) &&
1810 staged_status != GOT_STATUS_ADD) {
1811 *status = GOT_STATUS_ADD;
1812 goto done;
1815 if (!stat_info_differs(ie, sb))
1816 goto done;
1818 if (S_ISLNK(sb->st_mode) &&
1819 got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1820 *status = GOT_STATUS_MODIFY;
1821 goto done;
1824 if (staged_status == GOT_STATUS_MODIFY ||
1825 staged_status == GOT_STATUS_ADD)
1826 memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1827 else
1828 memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1830 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1831 if (err)
1832 goto done;
1834 if (S_ISLNK(sb->st_mode)) {
1835 err = get_symlink_modification_status(status, ie,
1836 abspath, dirfd, de_name, blob);
1837 goto done;
1840 if (dirfd != -1) {
1841 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1842 if (fd == -1) {
1843 err = got_error_from_errno2("openat", abspath);
1844 goto done;
1848 f = fdopen(fd, "r");
1849 if (f == NULL) {
1850 err = got_error_from_errno2("fdopen", abspath);
1851 goto done;
1853 fd = -1;
1854 hdrlen = got_object_blob_get_hdrlen(blob);
1855 for (;;) {
1856 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1857 err = got_object_blob_read_block(&blen, blob);
1858 if (err)
1859 goto done;
1860 /* Skip length of blob object header first time around. */
1861 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1862 if (flen == 0 && ferror(f)) {
1863 err = got_error_from_errno("fread");
1864 goto done;
1866 if (blen - hdrlen == 0) {
1867 if (flen != 0)
1868 *status = GOT_STATUS_MODIFY;
1869 break;
1870 } else if (flen == 0) {
1871 if (blen - hdrlen != 0)
1872 *status = GOT_STATUS_MODIFY;
1873 break;
1874 } else if (blen - hdrlen == flen) {
1875 /* Skip blob object header first time around. */
1876 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1877 *status = GOT_STATUS_MODIFY;
1878 break;
1880 } else {
1881 *status = GOT_STATUS_MODIFY;
1882 break;
1884 hdrlen = 0;
1887 if (*status == GOT_STATUS_MODIFY) {
1888 rewind(f);
1889 err = get_modified_file_content_status(status, f);
1890 } else if (xbit_differs(ie, sb->st_mode))
1891 *status = GOT_STATUS_MODE_CHANGE;
1892 done:
1893 if (blob)
1894 got_object_blob_close(blob);
1895 if (f != NULL && fclose(f) == EOF && err == NULL)
1896 err = got_error_from_errno2("fclose", abspath);
1897 if (fd != -1 && close(fd) == -1 && err == NULL)
1898 err = got_error_from_errno2("close", abspath);
1899 return err;
1903 * Update timestamps in the file index if a file is unmodified and
1904 * we had to run a full content comparison to find out.
1906 static const struct got_error *
1907 sync_timestamps(int wt_fd, const char *path, unsigned char status,
1908 struct got_fileindex_entry *ie, struct stat *sb)
1910 if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1911 return got_fileindex_entry_update(ie, wt_fd, path,
1912 ie->blob_sha1, ie->commit_sha1, 1);
1914 return NULL;
1917 static const struct got_error *
1918 update_blob(struct got_worktree *worktree,
1919 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1920 struct got_tree_entry *te, const char *path,
1921 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1922 void *progress_arg)
1924 const struct got_error *err = NULL;
1925 struct got_blob_object *blob = NULL;
1926 char *ondisk_path;
1927 unsigned char status = GOT_STATUS_NO_CHANGE;
1928 struct stat sb;
1930 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1931 return got_error_from_errno("asprintf");
1933 if (ie) {
1934 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1935 err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1936 goto done;
1938 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1939 repo);
1940 if (err)
1941 goto done;
1942 if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1943 sb.st_mode = got_fileindex_perms_to_st(ie);
1944 } else {
1945 sb.st_mode = GOT_DEFAULT_FILE_MODE;
1946 status = GOT_STATUS_UNVERSIONED;
1949 if (status == GOT_STATUS_OBSTRUCTED) {
1950 if (ie)
1951 got_fileindex_entry_mark_skipped(ie);
1952 err = (*progress_cb)(progress_arg, status, path);
1953 goto done;
1955 if (status == GOT_STATUS_CONFLICT) {
1956 if (ie)
1957 got_fileindex_entry_mark_skipped(ie);
1958 err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1959 path);
1960 goto done;
1963 if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1964 (S_ISLNK(te->mode) ||
1965 (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1967 * This is a regular file or an installed bad symlink.
1968 * If the file index indicates that this file is already
1969 * up-to-date with respect to the repository we can skip
1970 * updating contents of this file.
1972 if (got_fileindex_entry_has_commit(ie) &&
1973 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1974 SHA1_DIGEST_LENGTH) == 0) {
1975 /* Same commit. */
1976 err = sync_timestamps(worktree->root_fd,
1977 path, status, ie, &sb);
1978 if (err)
1979 goto done;
1980 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1981 path);
1982 goto done;
1984 if (got_fileindex_entry_has_blob(ie) &&
1985 memcmp(ie->blob_sha1, te->id.sha1,
1986 SHA1_DIGEST_LENGTH) == 0) {
1987 /* Different commit but the same blob. */
1988 err = sync_timestamps(worktree->root_fd,
1989 path, status, ie, &sb);
1990 if (err)
1991 goto done;
1992 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1993 path);
1994 goto done;
1998 err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1999 if (err)
2000 goto done;
2002 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
2003 int update_timestamps;
2004 struct got_blob_object *blob2 = NULL;
2005 char *label_orig = NULL;
2006 if (got_fileindex_entry_has_blob(ie)) {
2007 struct got_object_id id2;
2008 memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2009 err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
2010 if (err)
2011 goto done;
2013 if (got_fileindex_entry_has_commit(ie)) {
2014 char id_str[SHA1_DIGEST_STRING_LENGTH];
2015 if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
2016 sizeof(id_str)) == NULL) {
2017 err = got_error_path(id_str,
2018 GOT_ERR_BAD_OBJ_ID_STR);
2019 goto done;
2021 if (asprintf(&label_orig, "%s: commit %s",
2022 GOT_MERGE_LABEL_BASE, id_str) == -1) {
2023 err = got_error_from_errno("asprintf");
2024 goto done;
2027 if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
2028 char *link_target;
2029 err = got_object_blob_read_to_str(&link_target, blob);
2030 if (err)
2031 goto done;
2032 err = merge_symlink(worktree, blob2, ondisk_path, path,
2033 label_orig, link_target, worktree->base_commit_id,
2034 repo, progress_cb, progress_arg);
2035 free(link_target);
2036 } else {
2037 err = merge_blob(&update_timestamps, worktree, blob2,
2038 ondisk_path, path, sb.st_mode, label_orig, blob,
2039 worktree->base_commit_id, repo,
2040 progress_cb, progress_arg);
2042 free(label_orig);
2043 if (blob2)
2044 got_object_blob_close(blob2);
2045 if (err)
2046 goto done;
2048 * Do not update timestamps of files with local changes.
2049 * Otherwise, a future status walk would treat them as
2050 * unmodified files again.
2052 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2053 blob->id.sha1, worktree->base_commit_id->sha1,
2054 update_timestamps);
2055 } else if (status == GOT_STATUS_MODE_CHANGE) {
2056 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2057 blob->id.sha1, worktree->base_commit_id->sha1, 0);
2058 } else if (status == GOT_STATUS_DELETE) {
2059 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
2060 if (err)
2061 goto done;
2062 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2063 blob->id.sha1, worktree->base_commit_id->sha1, 0);
2064 if (err)
2065 goto done;
2066 } else {
2067 int is_bad_symlink = 0;
2068 if (S_ISLNK(te->mode)) {
2069 err = install_symlink(&is_bad_symlink, worktree,
2070 ondisk_path, path, blob,
2071 status == GOT_STATUS_MISSING, 0,
2072 status == GOT_STATUS_UNVERSIONED, repo,
2073 progress_cb, progress_arg);
2074 } else {
2075 err = install_blob(worktree, ondisk_path, path,
2076 te->mode, sb.st_mode, blob,
2077 status == GOT_STATUS_MISSING, 0, 0,
2078 status == GOT_STATUS_UNVERSIONED, repo,
2079 progress_cb, progress_arg);
2081 if (err)
2082 goto done;
2084 if (ie) {
2085 err = got_fileindex_entry_update(ie,
2086 worktree->root_fd, path, blob->id.sha1,
2087 worktree->base_commit_id->sha1, 1);
2088 } else {
2089 err = create_fileindex_entry(&ie, fileindex,
2090 worktree->base_commit_id, worktree->root_fd, path,
2091 &blob->id);
2093 if (err)
2094 goto done;
2096 if (is_bad_symlink) {
2097 got_fileindex_entry_filetype_set(ie,
2098 GOT_FILEIDX_MODE_BAD_SYMLINK);
2101 got_object_blob_close(blob);
2102 done:
2103 free(ondisk_path);
2104 return err;
2107 static const struct got_error *
2108 remove_ondisk_file(const char *root_path, const char *path)
2110 const struct got_error *err = NULL;
2111 char *ondisk_path = NULL, *parent = NULL;
2113 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2114 return got_error_from_errno("asprintf");
2116 if (unlink(ondisk_path) == -1) {
2117 if (errno != ENOENT)
2118 err = got_error_from_errno2("unlink", ondisk_path);
2119 } else {
2120 size_t root_len = strlen(root_path);
2121 err = got_path_dirname(&parent, ondisk_path);
2122 if (err)
2123 goto done;
2124 while (got_path_cmp(parent, root_path,
2125 strlen(parent), root_len) != 0) {
2126 free(ondisk_path);
2127 ondisk_path = parent;
2128 parent = NULL;
2129 if (rmdir(ondisk_path) == -1) {
2130 if (errno != ENOTEMPTY)
2131 err = got_error_from_errno2("rmdir",
2132 ondisk_path);
2133 break;
2135 err = got_path_dirname(&parent, ondisk_path);
2136 if (err)
2137 break;
2140 done:
2141 free(ondisk_path);
2142 free(parent);
2143 return err;
2146 static const struct got_error *
2147 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2148 struct got_fileindex_entry *ie, struct got_repository *repo,
2149 got_worktree_checkout_cb progress_cb, void *progress_arg)
2151 const struct got_error *err = NULL;
2152 unsigned char status;
2153 struct stat sb;
2154 char *ondisk_path;
2156 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2157 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2159 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2160 == -1)
2161 return got_error_from_errno("asprintf");
2163 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2164 if (err)
2165 goto done;
2167 if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2168 char ondisk_target[PATH_MAX];
2169 ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2170 sizeof(ondisk_target));
2171 if (ondisk_len == -1) {
2172 err = got_error_from_errno2("readlink", ondisk_path);
2173 goto done;
2175 ondisk_target[ondisk_len] = '\0';
2176 err = install_symlink_conflict(NULL, worktree->base_commit_id,
2177 NULL, NULL, /* XXX pass common ancestor info? */
2178 ondisk_target, ondisk_path);
2179 if (err)
2180 goto done;
2181 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2182 ie->path);
2183 goto done;
2186 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2187 status == GOT_STATUS_ADD) {
2188 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2189 if (err)
2190 goto done;
2192 * Preserve the working file and change the deleted blob's
2193 * entry into a schedule-add entry.
2195 err = got_fileindex_entry_update(ie, worktree->root_fd,
2196 ie->path, NULL, NULL, 0);
2197 } else {
2198 err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2199 if (err)
2200 goto done;
2201 if (status == GOT_STATUS_NO_CHANGE) {
2202 err = remove_ondisk_file(worktree->root_path, ie->path);
2203 if (err)
2204 goto done;
2206 got_fileindex_entry_remove(fileindex, ie);
2208 done:
2209 free(ondisk_path);
2210 return err;
2213 struct diff_cb_arg {
2214 struct got_fileindex *fileindex;
2215 struct got_worktree *worktree;
2216 struct got_repository *repo;
2217 got_worktree_checkout_cb progress_cb;
2218 void *progress_arg;
2219 got_cancel_cb cancel_cb;
2220 void *cancel_arg;
2223 static const struct got_error *
2224 diff_old_new(void *arg, struct got_fileindex_entry *ie,
2225 struct got_tree_entry *te, const char *parent_path)
2227 struct diff_cb_arg *a = arg;
2229 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2230 return got_error(GOT_ERR_CANCELLED);
2232 return update_blob(a->worktree, a->fileindex, ie, te,
2233 ie->path, a->repo, a->progress_cb, a->progress_arg);
2236 static const struct got_error *
2237 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2239 struct diff_cb_arg *a = arg;
2241 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2242 return got_error(GOT_ERR_CANCELLED);
2244 return delete_blob(a->worktree, a->fileindex, ie,
2245 a->repo, a->progress_cb, a->progress_arg);
2248 static const struct got_error *
2249 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2251 struct diff_cb_arg *a = arg;
2252 const struct got_error *err;
2253 char *path;
2255 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2256 return got_error(GOT_ERR_CANCELLED);
2258 if (got_object_tree_entry_is_submodule(te))
2259 return NULL;
2261 if (asprintf(&path, "%s%s%s", parent_path,
2262 parent_path[0] ? "/" : "", te->name)
2263 == -1)
2264 return got_error_from_errno("asprintf");
2266 if (S_ISDIR(te->mode))
2267 err = add_dir_on_disk(a->worktree, path);
2268 else
2269 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2270 a->repo, a->progress_cb, a->progress_arg);
2272 free(path);
2273 return err;
2276 const struct got_error *
2277 got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2279 uint32_t uuid_status;
2281 uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2282 if (uuid_status != uuid_s_ok) {
2283 *uuidstr = NULL;
2284 return got_error_uuid(uuid_status, "uuid_to_string");
2287 return NULL;
2290 static const struct got_error *
2291 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2293 const struct got_error *err = NULL;
2294 char *uuidstr = NULL;
2296 *refname = NULL;
2298 err = got_worktree_get_uuid(&uuidstr, worktree);
2299 if (err)
2300 return err;
2302 if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2303 err = got_error_from_errno("asprintf");
2304 *refname = NULL;
2306 free(uuidstr);
2307 return err;
2310 const struct got_error *
2311 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2313 return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2316 static const struct got_error *
2317 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2319 return get_ref_name(refname, worktree,
2320 GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2323 static const struct got_error *
2324 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2326 return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2329 static const struct got_error *
2330 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2332 return get_ref_name(refname, worktree,
2333 GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2336 static const struct got_error *
2337 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2339 return get_ref_name(refname, worktree,
2340 GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2343 static const struct got_error *
2344 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2346 return get_ref_name(refname, worktree,
2347 GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2350 static const struct got_error *
2351 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2353 return get_ref_name(refname, worktree,
2354 GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2357 static const struct got_error *
2358 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2360 return get_ref_name(refname, worktree,
2361 GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2364 static const struct got_error *
2365 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2367 return get_ref_name(refname, worktree,
2368 GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2371 const struct got_error *
2372 got_worktree_get_histedit_script_path(char **path,
2373 struct got_worktree *worktree)
2375 if (asprintf(path, "%s/%s/%s", worktree->root_path,
2376 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2377 *path = NULL;
2378 return got_error_from_errno("asprintf");
2380 return NULL;
2384 * Prevent Git's garbage collector from deleting our base commit by
2385 * setting a reference to our base commit's ID.
2387 static const struct got_error *
2388 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2390 const struct got_error *err = NULL;
2391 struct got_reference *ref = NULL;
2392 char *refname;
2394 err = got_worktree_get_base_ref_name(&refname, worktree);
2395 if (err)
2396 return err;
2398 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2399 if (err)
2400 goto done;
2402 err = got_ref_write(ref, repo);
2403 done:
2404 free(refname);
2405 if (ref)
2406 got_ref_close(ref);
2407 return err;
2410 static const struct got_error *
2411 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2413 const struct got_error *err = NULL;
2415 if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2416 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2417 err = got_error_from_errno("asprintf");
2418 *fileindex_path = NULL;
2420 return err;
2424 static const struct got_error *
2425 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2426 struct got_worktree *worktree)
2428 const struct got_error *err = NULL;
2429 FILE *index = NULL;
2431 *fileindex_path = NULL;
2432 *fileindex = got_fileindex_alloc();
2433 if (*fileindex == NULL)
2434 return got_error_from_errno("got_fileindex_alloc");
2436 err = get_fileindex_path(fileindex_path, worktree);
2437 if (err)
2438 goto done;
2440 index = fopen(*fileindex_path, "rb");
2441 if (index == NULL) {
2442 if (errno != ENOENT)
2443 err = got_error_from_errno2("fopen", *fileindex_path);
2444 } else {
2445 err = got_fileindex_read(*fileindex, index);
2446 if (fclose(index) == EOF && err == NULL)
2447 err = got_error_from_errno("fclose");
2449 done:
2450 if (err) {
2451 free(*fileindex_path);
2452 *fileindex_path = NULL;
2453 got_fileindex_free(*fileindex);
2454 *fileindex = NULL;
2456 return err;
2459 struct bump_base_commit_id_arg {
2460 struct got_object_id *base_commit_id;
2461 const char *path;
2462 size_t path_len;
2463 const char *entry_name;
2464 got_worktree_checkout_cb progress_cb;
2465 void *progress_arg;
2468 /* Bump base commit ID of all files within an updated part of the work tree. */
2469 static const struct got_error *
2470 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2472 const struct got_error *err;
2473 struct bump_base_commit_id_arg *a = arg;
2475 if (a->entry_name) {
2476 if (strcmp(ie->path, a->path) != 0)
2477 return NULL;
2478 } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2479 return NULL;
2481 if (got_fileindex_entry_was_skipped(ie))
2482 return NULL;
2484 if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2485 SHA1_DIGEST_LENGTH) == 0)
2486 return NULL;
2488 if (a->progress_cb) {
2489 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2490 ie->path);
2491 if (err)
2492 return err;
2494 memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2495 return NULL;
2498 static const struct got_error *
2499 bump_base_commit_id_everywhere(struct got_worktree *worktree,
2500 struct got_fileindex *fileindex,
2501 got_worktree_checkout_cb progress_cb, void *progress_arg)
2503 struct bump_base_commit_id_arg bbc_arg;
2505 bbc_arg.base_commit_id = worktree->base_commit_id;
2506 bbc_arg.entry_name = NULL;
2507 bbc_arg.path = "";
2508 bbc_arg.path_len = 0;
2509 bbc_arg.progress_cb = progress_cb;
2510 bbc_arg.progress_arg = progress_arg;
2512 return got_fileindex_for_each_entry_safe(fileindex,
2513 bump_base_commit_id, &bbc_arg);
2516 static const struct got_error *
2517 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2519 const struct got_error *err = NULL;
2520 char *new_fileindex_path = NULL;
2521 FILE *new_index = NULL;
2522 struct timespec timeout;
2524 err = got_opentemp_named(&new_fileindex_path, &new_index,
2525 fileindex_path);
2526 if (err)
2527 goto done;
2529 err = got_fileindex_write(fileindex, new_index);
2530 if (err)
2531 goto done;
2533 if (rename(new_fileindex_path, fileindex_path) != 0) {
2534 err = got_error_from_errno3("rename", new_fileindex_path,
2535 fileindex_path);
2536 unlink(new_fileindex_path);
2540 * Sleep for a short amount of time to ensure that files modified after
2541 * this program exits have a different time stamp from the one which
2542 * was recorded in the file index.
2544 timeout.tv_sec = 0;
2545 timeout.tv_nsec = 1;
2546 nanosleep(&timeout, NULL);
2547 done:
2548 if (new_index)
2549 fclose(new_index);
2550 free(new_fileindex_path);
2551 return err;
2554 static const struct got_error *
2555 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2556 struct got_object_id **tree_id, const char *wt_relpath,
2557 struct got_worktree *worktree, struct got_repository *repo)
2559 const struct got_error *err = NULL;
2560 struct got_object_id *id = NULL;
2561 char *in_repo_path = NULL;
2562 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2564 *entry_type = GOT_OBJ_TYPE_ANY;
2565 *tree_relpath = NULL;
2566 *tree_id = NULL;
2568 if (wt_relpath[0] == '\0') {
2569 /* Check out all files within the work tree. */
2570 *entry_type = GOT_OBJ_TYPE_TREE;
2571 *tree_relpath = strdup("");
2572 if (*tree_relpath == NULL) {
2573 err = got_error_from_errno("strdup");
2574 goto done;
2576 err = got_object_id_by_path(tree_id, repo,
2577 worktree->base_commit_id, worktree->path_prefix);
2578 if (err)
2579 goto done;
2580 return NULL;
2583 /* Check out a subset of files in the work tree. */
2585 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2586 is_root_wt ? "" : "/", wt_relpath) == -1) {
2587 err = got_error_from_errno("asprintf");
2588 goto done;
2591 err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2592 in_repo_path);
2593 if (err)
2594 goto done;
2596 free(in_repo_path);
2597 in_repo_path = NULL;
2599 err = got_object_get_type(entry_type, repo, id);
2600 if (err)
2601 goto done;
2603 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2604 /* Check out a single file. */
2605 if (strchr(wt_relpath, '/') == NULL) {
2606 /* Check out a single file in work tree's root dir. */
2607 in_repo_path = strdup(worktree->path_prefix);
2608 if (in_repo_path == NULL) {
2609 err = got_error_from_errno("strdup");
2610 goto done;
2612 *tree_relpath = strdup("");
2613 if (*tree_relpath == NULL) {
2614 err = got_error_from_errno("strdup");
2615 goto done;
2617 } else {
2618 /* Check out a single file in a subdirectory. */
2619 err = got_path_dirname(tree_relpath, wt_relpath);
2620 if (err)
2621 return err;
2622 if (asprintf(&in_repo_path, "%s%s%s",
2623 worktree->path_prefix, is_root_wt ? "" : "/",
2624 *tree_relpath) == -1) {
2625 err = got_error_from_errno("asprintf");
2626 goto done;
2629 err = got_object_id_by_path(tree_id, repo,
2630 worktree->base_commit_id, in_repo_path);
2631 } else {
2632 /* Check out all files within a subdirectory. */
2633 *tree_id = got_object_id_dup(id);
2634 if (*tree_id == NULL) {
2635 err = got_error_from_errno("got_object_id_dup");
2636 goto done;
2638 *tree_relpath = strdup(wt_relpath);
2639 if (*tree_relpath == NULL) {
2640 err = got_error_from_errno("strdup");
2641 goto done;
2644 done:
2645 free(id);
2646 free(in_repo_path);
2647 if (err) {
2648 *entry_type = GOT_OBJ_TYPE_ANY;
2649 free(*tree_relpath);
2650 *tree_relpath = NULL;
2651 free(*tree_id);
2652 *tree_id = NULL;
2654 return err;
2657 static const struct got_error *
2658 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2659 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2660 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2661 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2663 const struct got_error *err = NULL;
2664 struct got_commit_object *commit = NULL;
2665 struct got_tree_object *tree = NULL;
2666 struct got_fileindex_diff_tree_cb diff_cb;
2667 struct diff_cb_arg arg;
2669 err = ref_base_commit(worktree, repo);
2670 if (err) {
2671 if (!(err->code == GOT_ERR_ERRNO &&
2672 (errno == EACCES || errno == EROFS)))
2673 goto done;
2674 err = (*progress_cb)(progress_arg,
2675 GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2676 if (err)
2677 return err;
2680 err = got_object_open_as_commit(&commit, repo,
2681 worktree->base_commit_id);
2682 if (err)
2683 goto done;
2685 err = got_object_open_as_tree(&tree, repo, tree_id);
2686 if (err)
2687 goto done;
2689 if (entry_name &&
2690 got_object_tree_find_entry(tree, entry_name) == NULL) {
2691 err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2692 goto done;
2695 diff_cb.diff_old_new = diff_old_new;
2696 diff_cb.diff_old = diff_old;
2697 diff_cb.diff_new = diff_new;
2698 arg.fileindex = fileindex;
2699 arg.worktree = worktree;
2700 arg.repo = repo;
2701 arg.progress_cb = progress_cb;
2702 arg.progress_arg = progress_arg;
2703 arg.cancel_cb = cancel_cb;
2704 arg.cancel_arg = cancel_arg;
2705 err = got_fileindex_diff_tree(fileindex, tree, relpath,
2706 entry_name, repo, &diff_cb, &arg);
2707 done:
2708 if (tree)
2709 got_object_tree_close(tree);
2710 if (commit)
2711 got_object_commit_close(commit);
2712 return err;
2715 const struct got_error *
2716 got_worktree_checkout_files(struct got_worktree *worktree,
2717 struct got_pathlist_head *paths, struct got_repository *repo,
2718 got_worktree_checkout_cb progress_cb, void *progress_arg,
2719 got_cancel_cb cancel_cb, void *cancel_arg)
2721 const struct got_error *err = NULL, *sync_err, *unlockerr;
2722 struct got_commit_object *commit = NULL;
2723 struct got_tree_object *tree = NULL;
2724 struct got_fileindex *fileindex = NULL;
2725 char *fileindex_path = NULL;
2726 struct got_pathlist_entry *pe;
2727 struct tree_path_data {
2728 STAILQ_ENTRY(tree_path_data) entry;
2729 struct got_object_id *tree_id;
2730 int entry_type;
2731 char *relpath;
2732 char *entry_name;
2733 } *tpd = NULL;
2734 STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2736 STAILQ_INIT(&tree_paths);
2738 err = lock_worktree(worktree, LOCK_EX);
2739 if (err)
2740 return err;
2742 /* Map all specified paths to in-repository trees. */
2743 TAILQ_FOREACH(pe, paths, entry) {
2744 tpd = malloc(sizeof(*tpd));
2745 if (tpd == NULL) {
2746 err = got_error_from_errno("malloc");
2747 goto done;
2750 err = find_tree_entry_for_checkout(&tpd->entry_type,
2751 &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2752 if (err) {
2753 free(tpd);
2754 goto done;
2757 if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2758 err = got_path_basename(&tpd->entry_name, pe->path);
2759 if (err) {
2760 free(tpd->relpath);
2761 free(tpd->tree_id);
2762 free(tpd);
2763 goto done;
2765 } else
2766 tpd->entry_name = NULL;
2768 STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2772 * Read the file index.
2773 * Checking out files is supposed to be an idempotent operation.
2774 * If the on-disk file index is incomplete we will try to complete it.
2776 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2777 if (err)
2778 goto done;
2780 tpd = STAILQ_FIRST(&tree_paths);
2781 TAILQ_FOREACH(pe, paths, entry) {
2782 struct bump_base_commit_id_arg bbc_arg;
2784 err = checkout_files(worktree, fileindex, tpd->relpath,
2785 tpd->tree_id, tpd->entry_name, repo,
2786 progress_cb, progress_arg, cancel_cb, cancel_arg);
2787 if (err)
2788 break;
2790 bbc_arg.base_commit_id = worktree->base_commit_id;
2791 bbc_arg.entry_name = tpd->entry_name;
2792 bbc_arg.path = pe->path;
2793 bbc_arg.path_len = pe->path_len;
2794 bbc_arg.progress_cb = progress_cb;
2795 bbc_arg.progress_arg = progress_arg;
2796 err = got_fileindex_for_each_entry_safe(fileindex,
2797 bump_base_commit_id, &bbc_arg);
2798 if (err)
2799 break;
2801 tpd = STAILQ_NEXT(tpd, entry);
2803 sync_err = sync_fileindex(fileindex, fileindex_path);
2804 if (sync_err && err == NULL)
2805 err = sync_err;
2806 done:
2807 free(fileindex_path);
2808 if (tree)
2809 got_object_tree_close(tree);
2810 if (commit)
2811 got_object_commit_close(commit);
2812 if (fileindex)
2813 got_fileindex_free(fileindex);
2814 while (!STAILQ_EMPTY(&tree_paths)) {
2815 tpd = STAILQ_FIRST(&tree_paths);
2816 STAILQ_REMOVE_HEAD(&tree_paths, entry);
2817 free(tpd->relpath);
2818 free(tpd->tree_id);
2819 free(tpd);
2821 unlockerr = lock_worktree(worktree, LOCK_SH);
2822 if (unlockerr && err == NULL)
2823 err = unlockerr;
2824 return err;
2827 struct merge_file_cb_arg {
2828 struct got_worktree *worktree;
2829 struct got_fileindex *fileindex;
2830 got_worktree_checkout_cb progress_cb;
2831 void *progress_arg;
2832 got_cancel_cb cancel_cb;
2833 void *cancel_arg;
2834 const char *label_orig;
2835 struct got_object_id *commit_id2;
2838 static const struct got_error *
2839 merge_file_cb(void *arg, struct got_blob_object *blob1,
2840 struct got_blob_object *blob2, struct got_object_id *id1,
2841 struct got_object_id *id2, const char *path1, const char *path2,
2842 mode_t mode1, mode_t mode2, struct got_repository *repo)
2844 static const struct got_error *err = NULL;
2845 struct merge_file_cb_arg *a = arg;
2846 struct got_fileindex_entry *ie;
2847 char *ondisk_path = NULL;
2848 struct stat sb;
2849 unsigned char status;
2850 int local_changes_subsumed;
2851 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2852 char *id_str = NULL, *label_deriv2 = NULL;
2854 if (blob1 && blob2) {
2855 ie = got_fileindex_entry_get(a->fileindex, path2,
2856 strlen(path2));
2857 if (ie == NULL)
2858 return (*a->progress_cb)(a->progress_arg,
2859 GOT_STATUS_MISSING, path2);
2861 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2862 path2) == -1)
2863 return got_error_from_errno("asprintf");
2865 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2866 repo);
2867 if (err)
2868 goto done;
2870 if (status == GOT_STATUS_DELETE) {
2871 err = (*a->progress_cb)(a->progress_arg,
2872 GOT_STATUS_MERGE, path2);
2873 goto done;
2875 if (status != GOT_STATUS_NO_CHANGE &&
2876 status != GOT_STATUS_MODIFY &&
2877 status != GOT_STATUS_CONFLICT &&
2878 status != GOT_STATUS_ADD) {
2879 err = (*a->progress_cb)(a->progress_arg, status, path2);
2880 goto done;
2883 if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2884 char *link_target2;
2885 err = got_object_blob_read_to_str(&link_target2, blob2);
2886 if (err)
2887 goto done;
2888 err = merge_symlink(a->worktree, blob1, ondisk_path,
2889 path2, a->label_orig, link_target2, a->commit_id2,
2890 repo, a->progress_cb, a->progress_arg);
2891 free(link_target2);
2892 } else {
2893 int fd;
2895 f_orig = got_opentemp();
2896 if (f_orig == NULL) {
2897 err = got_error_from_errno("got_opentemp");
2898 goto done;
2900 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2901 f_orig, blob1);
2902 if (err)
2903 goto done;
2905 f_deriv2 = got_opentemp();
2906 if (f_deriv2 == NULL)
2907 goto done;
2908 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2909 f_deriv2, blob2);
2910 if (err)
2911 goto done;
2913 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
2914 if (fd == -1) {
2915 err = got_error_from_errno2("open",
2916 ondisk_path);
2917 goto done;
2919 f_deriv = fdopen(fd, "r");
2920 if (f_deriv == NULL) {
2921 err = got_error_from_errno2("fdopen",
2922 ondisk_path);
2923 close(fd);
2924 goto done;
2926 err = got_object_id_str(&id_str, a->commit_id2);
2927 if (err)
2928 goto done;
2929 if (asprintf(&label_deriv2, "%s: commit %s",
2930 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2931 err = got_error_from_errno("asprintf");
2932 goto done;
2934 err = merge_file(&local_changes_subsumed, a->worktree,
2935 f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2936 sb.st_mode, a->label_orig, NULL, label_deriv2,
2937 GOT_DIFF_ALGORITHM_PATIENCE, repo,
2938 a->progress_cb, a->progress_arg);
2940 } else if (blob1) {
2941 ie = got_fileindex_entry_get(a->fileindex, path1,
2942 strlen(path1));
2943 if (ie == NULL)
2944 return (*a->progress_cb)(a->progress_arg,
2945 GOT_STATUS_MISSING, path1);
2947 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2948 path1) == -1)
2949 return got_error_from_errno("asprintf");
2951 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2952 repo);
2953 if (err)
2954 goto done;
2956 switch (status) {
2957 case GOT_STATUS_NO_CHANGE:
2958 err = (*a->progress_cb)(a->progress_arg,
2959 GOT_STATUS_DELETE, path1);
2960 if (err)
2961 goto done;
2962 err = remove_ondisk_file(a->worktree->root_path, path1);
2963 if (err)
2964 goto done;
2965 if (ie)
2966 got_fileindex_entry_mark_deleted_from_disk(ie);
2967 break;
2968 case GOT_STATUS_DELETE:
2969 case GOT_STATUS_MISSING:
2970 err = (*a->progress_cb)(a->progress_arg,
2971 GOT_STATUS_DELETE, path1);
2972 if (err)
2973 goto done;
2974 if (ie)
2975 got_fileindex_entry_mark_deleted_from_disk(ie);
2976 break;
2977 case GOT_STATUS_ADD: {
2978 struct got_object_id *id;
2979 FILE *blob1_f;
2981 * Delete the added file only if its content already
2982 * exists in the repository.
2984 err = got_object_blob_file_create(&id, &blob1_f, path1);
2985 if (err)
2986 goto done;
2987 if (got_object_id_cmp(id, id1) == 0) {
2988 err = (*a->progress_cb)(a->progress_arg,
2989 GOT_STATUS_DELETE, path1);
2990 if (err)
2991 goto done;
2992 err = remove_ondisk_file(a->worktree->root_path,
2993 path1);
2994 if (err)
2995 goto done;
2996 if (ie)
2997 got_fileindex_entry_remove(a->fileindex,
2998 ie);
2999 } else {
3000 err = (*a->progress_cb)(a->progress_arg,
3001 GOT_STATUS_CANNOT_DELETE, path1);
3003 if (fclose(blob1_f) == EOF && err == NULL)
3004 err = got_error_from_errno("fclose");
3005 free(id);
3006 if (err)
3007 goto done;
3008 break;
3010 case GOT_STATUS_MODIFY:
3011 case GOT_STATUS_CONFLICT:
3012 err = (*a->progress_cb)(a->progress_arg,
3013 GOT_STATUS_CANNOT_DELETE, path1);
3014 if (err)
3015 goto done;
3016 break;
3017 case GOT_STATUS_OBSTRUCTED:
3018 err = (*a->progress_cb)(a->progress_arg, status, path1);
3019 if (err)
3020 goto done;
3021 break;
3022 default:
3023 break;
3025 } else if (blob2) {
3026 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3027 path2) == -1)
3028 return got_error_from_errno("asprintf");
3029 ie = got_fileindex_entry_get(a->fileindex, path2,
3030 strlen(path2));
3031 if (ie) {
3032 err = get_file_status(&status, &sb, ie, ondisk_path,
3033 -1, NULL, repo);
3034 if (err)
3035 goto done;
3036 if (status != GOT_STATUS_NO_CHANGE &&
3037 status != GOT_STATUS_MODIFY &&
3038 status != GOT_STATUS_CONFLICT &&
3039 status != GOT_STATUS_ADD) {
3040 err = (*a->progress_cb)(a->progress_arg,
3041 status, path2);
3042 goto done;
3044 if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3045 char *link_target2;
3046 err = got_object_blob_read_to_str(&link_target2,
3047 blob2);
3048 if (err)
3049 goto done;
3050 err = merge_symlink(a->worktree, NULL,
3051 ondisk_path, path2, a->label_orig,
3052 link_target2, a->commit_id2, repo,
3053 a->progress_cb, a->progress_arg);
3054 free(link_target2);
3055 } else if (S_ISREG(sb.st_mode)) {
3056 err = merge_blob(&local_changes_subsumed,
3057 a->worktree, NULL, ondisk_path, path2,
3058 sb.st_mode, a->label_orig, blob2,
3059 a->commit_id2, repo, a->progress_cb,
3060 a->progress_arg);
3061 } else {
3062 err = got_error_path(ondisk_path,
3063 GOT_ERR_FILE_OBSTRUCTED);
3065 if (err)
3066 goto done;
3067 if (status == GOT_STATUS_DELETE) {
3068 err = got_fileindex_entry_update(ie,
3069 a->worktree->root_fd, path2, blob2->id.sha1,
3070 a->worktree->base_commit_id->sha1, 0);
3071 if (err)
3072 goto done;
3074 } else {
3075 int is_bad_symlink = 0;
3076 sb.st_mode = GOT_DEFAULT_FILE_MODE;
3077 if (S_ISLNK(mode2)) {
3078 err = install_symlink(&is_bad_symlink,
3079 a->worktree, ondisk_path, path2, blob2, 0,
3080 0, 1, repo, a->progress_cb, a->progress_arg);
3081 } else {
3082 err = install_blob(a->worktree, ondisk_path, path2,
3083 mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3084 a->progress_cb, a->progress_arg);
3086 if (err)
3087 goto done;
3088 err = got_fileindex_entry_alloc(&ie, path2);
3089 if (err)
3090 goto done;
3091 err = got_fileindex_entry_update(ie,
3092 a->worktree->root_fd, path2, NULL, NULL, 1);
3093 if (err) {
3094 got_fileindex_entry_free(ie);
3095 goto done;
3097 err = got_fileindex_entry_add(a->fileindex, ie);
3098 if (err) {
3099 got_fileindex_entry_free(ie);
3100 goto done;
3102 if (is_bad_symlink) {
3103 got_fileindex_entry_filetype_set(ie,
3104 GOT_FILEIDX_MODE_BAD_SYMLINK);
3108 done:
3109 if (f_orig && fclose(f_orig) == EOF && err == NULL)
3110 err = got_error_from_errno("fclose");
3111 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3112 err = got_error_from_errno("fclose");
3113 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3114 err = got_error_from_errno("fclose");
3115 free(id_str);
3116 free(label_deriv2);
3117 free(ondisk_path);
3118 return err;
3121 struct check_merge_ok_arg {
3122 struct got_worktree *worktree;
3123 struct got_repository *repo;
3126 static const struct got_error *
3127 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
3129 const struct got_error *err = NULL;
3130 struct check_merge_ok_arg *a = arg;
3131 unsigned char status;
3132 struct stat sb;
3133 char *ondisk_path;
3135 /* Reject merges into a work tree with mixed base commits. */
3136 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3137 SHA1_DIGEST_LENGTH))
3138 return got_error(GOT_ERR_MIXED_COMMITS);
3140 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3141 == -1)
3142 return got_error_from_errno("asprintf");
3144 /* Reject merges into a work tree with conflicted files. */
3145 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3146 if (err)
3147 return err;
3148 if (status == GOT_STATUS_CONFLICT)
3149 return got_error(GOT_ERR_CONFLICTS);
3151 return NULL;
3154 static const struct got_error *
3155 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3156 const char *fileindex_path, struct got_object_id *commit_id1,
3157 struct got_object_id *commit_id2, struct got_repository *repo,
3158 got_worktree_checkout_cb progress_cb, void *progress_arg,
3159 got_cancel_cb cancel_cb, void *cancel_arg)
3161 const struct got_error *err = NULL, *sync_err;
3162 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3163 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3164 struct merge_file_cb_arg arg;
3165 char *label_orig = NULL;
3167 if (commit_id1) {
3168 err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3169 worktree->path_prefix);
3170 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3171 goto done;
3173 if (tree_id1) {
3174 char *id_str;
3176 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3177 if (err)
3178 goto done;
3180 err = got_object_id_str(&id_str, commit_id1);
3181 if (err)
3182 goto done;
3184 if (asprintf(&label_orig, "%s: commit %s",
3185 GOT_MERGE_LABEL_BASE, id_str) == -1) {
3186 err = got_error_from_errno("asprintf");
3187 free(id_str);
3188 goto done;
3190 free(id_str);
3193 err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3194 worktree->path_prefix);
3195 if (err)
3196 goto done;
3198 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3199 if (err)
3200 goto done;
3202 arg.worktree = worktree;
3203 arg.fileindex = fileindex;
3204 arg.progress_cb = progress_cb;
3205 arg.progress_arg = progress_arg;
3206 arg.cancel_cb = cancel_cb;
3207 arg.cancel_arg = cancel_arg;
3208 arg.label_orig = label_orig;
3209 arg.commit_id2 = commit_id2;
3210 err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3211 sync_err = sync_fileindex(fileindex, fileindex_path);
3212 if (sync_err && err == NULL)
3213 err = sync_err;
3214 done:
3215 if (tree1)
3216 got_object_tree_close(tree1);
3217 if (tree2)
3218 got_object_tree_close(tree2);
3219 free(label_orig);
3220 return err;
3223 const struct got_error *
3224 got_worktree_merge_files(struct got_worktree *worktree,
3225 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3226 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3227 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3229 const struct got_error *err, *unlockerr;
3230 char *fileindex_path = NULL;
3231 struct got_fileindex *fileindex = NULL;
3232 struct check_merge_ok_arg mok_arg;
3234 err = lock_worktree(worktree, LOCK_EX);
3235 if (err)
3236 return err;
3238 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3239 if (err)
3240 goto done;
3242 mok_arg.worktree = worktree;
3243 mok_arg.repo = repo;
3244 err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3245 &mok_arg);
3246 if (err)
3247 goto done;
3249 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3250 commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3251 done:
3252 if (fileindex)
3253 got_fileindex_free(fileindex);
3254 free(fileindex_path);
3255 unlockerr = lock_worktree(worktree, LOCK_SH);
3256 if (unlockerr && err == NULL)
3257 err = unlockerr;
3258 return err;
3261 struct diff_dir_cb_arg {
3262 struct got_fileindex *fileindex;
3263 struct got_worktree *worktree;
3264 const char *status_path;
3265 size_t status_path_len;
3266 struct got_repository *repo;
3267 got_worktree_status_cb status_cb;
3268 void *status_arg;
3269 got_cancel_cb cancel_cb;
3270 void *cancel_arg;
3271 /* A pathlist containing per-directory pathlists of ignore patterns. */
3272 struct got_pathlist_head ignores;
3273 int report_unchanged;
3274 int no_ignores;
3277 static const struct got_error *
3278 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3279 int dirfd, const char *de_name,
3280 got_worktree_status_cb status_cb, void *status_arg,
3281 struct got_repository *repo, int report_unchanged)
3283 const struct got_error *err = NULL;
3284 unsigned char status = GOT_STATUS_NO_CHANGE;
3285 unsigned char staged_status = get_staged_status(ie);
3286 struct stat sb;
3287 struct got_object_id blob_id, commit_id, staged_blob_id;
3288 struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3289 struct got_object_id *staged_blob_idp = NULL;
3291 err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3292 if (err)
3293 return err;
3295 if (status == GOT_STATUS_NO_CHANGE &&
3296 staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3297 return NULL;
3299 if (got_fileindex_entry_has_blob(ie)) {
3300 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3301 blob_idp = &blob_id;
3303 if (got_fileindex_entry_has_commit(ie)) {
3304 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3305 commit_idp = &commit_id;
3307 if (staged_status == GOT_STATUS_ADD ||
3308 staged_status == GOT_STATUS_MODIFY) {
3309 memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3310 SHA1_DIGEST_LENGTH);
3311 staged_blob_idp = &staged_blob_id;
3314 return (*status_cb)(status_arg, status, staged_status,
3315 ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3318 static const struct got_error *
3319 status_old_new(void *arg, struct got_fileindex_entry *ie,
3320 struct dirent *de, const char *parent_path, int dirfd)
3322 const struct got_error *err = NULL;
3323 struct diff_dir_cb_arg *a = arg;
3324 char *abspath;
3326 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3327 return got_error(GOT_ERR_CANCELLED);
3329 if (got_path_cmp(parent_path, a->status_path,
3330 strlen(parent_path), a->status_path_len) != 0 &&
3331 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3332 return NULL;
3334 if (parent_path[0]) {
3335 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3336 parent_path, de->d_name) == -1)
3337 return got_error_from_errno("asprintf");
3338 } else {
3339 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3340 de->d_name) == -1)
3341 return got_error_from_errno("asprintf");
3344 err = report_file_status(ie, abspath, dirfd, de->d_name,
3345 a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3346 free(abspath);
3347 return err;
3350 static const struct got_error *
3351 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3353 struct diff_dir_cb_arg *a = arg;
3354 struct got_object_id blob_id, commit_id;
3355 unsigned char status;
3357 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3358 return got_error(GOT_ERR_CANCELLED);
3360 if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3361 return NULL;
3363 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3364 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3365 if (got_fileindex_entry_has_file_on_disk(ie))
3366 status = GOT_STATUS_MISSING;
3367 else
3368 status = GOT_STATUS_DELETE;
3369 return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3370 ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3373 void
3374 free_ignorelist(struct got_pathlist_head *ignorelist)
3376 struct got_pathlist_entry *pe;
3378 TAILQ_FOREACH(pe, ignorelist, entry)
3379 free((char *)pe->path);
3380 got_pathlist_free(ignorelist);
3383 void
3384 free_ignores(struct got_pathlist_head *ignores)
3386 struct got_pathlist_entry *pe;
3388 TAILQ_FOREACH(pe, ignores, entry) {
3389 struct got_pathlist_head *ignorelist = pe->data;
3390 free_ignorelist(ignorelist);
3391 free((char *)pe->path);
3393 got_pathlist_free(ignores);
3396 static const struct got_error *
3397 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3399 const struct got_error *err = NULL;
3400 struct got_pathlist_entry *pe = NULL;
3401 struct got_pathlist_head *ignorelist;
3402 char *line = NULL, *pattern, *dirpath = NULL;
3403 size_t linesize = 0;
3404 ssize_t linelen;
3406 ignorelist = calloc(1, sizeof(*ignorelist));
3407 if (ignorelist == NULL)
3408 return got_error_from_errno("calloc");
3409 TAILQ_INIT(ignorelist);
3411 while ((linelen = getline(&line, &linesize, f)) != -1) {
3412 if (linelen > 0 && line[linelen - 1] == '\n')
3413 line[linelen - 1] = '\0';
3415 /* Git's ignores may contain comments. */
3416 if (line[0] == '#')
3417 continue;
3419 /* Git's negated patterns are not (yet?) supported. */
3420 if (line[0] == '!')
3421 continue;
3423 if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3424 line) == -1) {
3425 err = got_error_from_errno("asprintf");
3426 goto done;
3428 err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3429 if (err)
3430 goto done;
3432 if (ferror(f)) {
3433 err = got_error_from_errno("getline");
3434 goto done;
3437 dirpath = strdup(path);
3438 if (dirpath == NULL) {
3439 err = got_error_from_errno("strdup");
3440 goto done;
3442 err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3443 done:
3444 free(line);
3445 if (err || pe == NULL) {
3446 free(dirpath);
3447 free_ignorelist(ignorelist);
3449 return err;
3452 int
3453 match_ignores(struct got_pathlist_head *ignores, const char *path)
3455 struct got_pathlist_entry *pe;
3457 /* Handle patterns which match in all directories. */
3458 TAILQ_FOREACH(pe, ignores, entry) {
3459 struct got_pathlist_head *ignorelist = pe->data;
3460 struct got_pathlist_entry *pi;
3462 TAILQ_FOREACH(pi, ignorelist, entry) {
3463 const char *p, *pattern = pi->path;
3465 if (strncmp(pattern, "**/", 3) != 0)
3466 continue;
3467 pattern += 3;
3468 p = path;
3469 while (*p) {
3470 if (fnmatch(pattern, p,
3471 FNM_PATHNAME | FNM_LEADING_DIR)) {
3472 /* Retry in next directory. */
3473 while (*p && *p != '/')
3474 p++;
3475 while (*p == '/')
3476 p++;
3477 continue;
3479 return 1;
3485 * The ignores pathlist contains ignore lists from children before
3486 * parents, so we can find the most specific ignorelist by walking
3487 * ignores backwards.
3489 pe = TAILQ_LAST(ignores, got_pathlist_head);
3490 while (pe) {
3491 if (got_path_is_child(path, pe->path, pe->path_len)) {
3492 struct got_pathlist_head *ignorelist = pe->data;
3493 struct got_pathlist_entry *pi;
3494 TAILQ_FOREACH(pi, ignorelist, entry) {
3495 const char *pattern = pi->path;
3496 int flags = FNM_LEADING_DIR;
3497 if (strstr(pattern, "/**/") == NULL)
3498 flags |= FNM_PATHNAME;
3499 if (fnmatch(pattern, path, flags))
3500 continue;
3501 return 1;
3504 pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3507 return 0;
3510 static const struct got_error *
3511 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3512 const char *path, int dirfd, const char *ignores_filename)
3514 const struct got_error *err = NULL;
3515 char *ignorespath;
3516 int fd = -1;
3517 FILE *ignoresfile = NULL;
3519 if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3520 path[0] ? "/" : "", ignores_filename) == -1)
3521 return got_error_from_errno("asprintf");
3523 if (dirfd != -1) {
3524 fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3525 if (fd == -1) {
3526 if (errno != ENOENT && errno != EACCES)
3527 err = got_error_from_errno2("openat",
3528 ignorespath);
3529 } else {
3530 ignoresfile = fdopen(fd, "r");
3531 if (ignoresfile == NULL)
3532 err = got_error_from_errno2("fdopen",
3533 ignorespath);
3534 else {
3535 fd = -1;
3536 err = read_ignores(ignores, path, ignoresfile);
3539 } else {
3540 ignoresfile = fopen(ignorespath, "r");
3541 if (ignoresfile == NULL) {
3542 if (errno != ENOENT && errno != EACCES)
3543 err = got_error_from_errno2("fopen",
3544 ignorespath);
3545 } else
3546 err = read_ignores(ignores, path, ignoresfile);
3549 if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3550 err = got_error_from_errno2("fclose", path);
3551 if (fd != -1 && close(fd) == -1 && err == NULL)
3552 err = got_error_from_errno2("close", path);
3553 free(ignorespath);
3554 return err;
3557 static const struct got_error *
3558 status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3560 const struct got_error *err = NULL;
3561 struct diff_dir_cb_arg *a = arg;
3562 char *path = NULL;
3564 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3565 return got_error(GOT_ERR_CANCELLED);
3567 if (parent_path[0]) {
3568 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3569 return got_error_from_errno("asprintf");
3570 } else {
3571 path = de->d_name;
3574 if (de->d_type != DT_DIR &&
3575 got_path_is_child(path, a->status_path, a->status_path_len)
3576 && !match_ignores(&a->ignores, path))
3577 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3578 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3579 if (parent_path[0])
3580 free(path);
3581 return err;
3584 static const struct got_error *
3585 status_traverse(void *arg, const char *path, int dirfd)
3587 const struct got_error *err = NULL;
3588 struct diff_dir_cb_arg *a = arg;
3590 if (a->no_ignores)
3591 return NULL;
3593 err = add_ignores(&a->ignores, a->worktree->root_path,
3594 path, dirfd, ".cvsignore");
3595 if (err)
3596 return err;
3598 err = add_ignores(&a->ignores, a->worktree->root_path, path,
3599 dirfd, ".gitignore");
3601 return err;
3604 static const struct got_error *
3605 report_single_file_status(const char *path, const char *ondisk_path,
3606 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3607 void *status_arg, struct got_repository *repo, int report_unchanged)
3609 struct got_fileindex_entry *ie;
3610 struct stat sb;
3612 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3613 if (ie)
3614 return report_file_status(ie, ondisk_path, -1, NULL,
3615 status_cb, status_arg, repo, report_unchanged);
3617 if (lstat(ondisk_path, &sb) == -1) {
3618 if (errno != ENOENT)
3619 return got_error_from_errno2("lstat", ondisk_path);
3620 return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3621 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3622 return NULL;
3625 if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3626 return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3627 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3629 return NULL;
3632 static const struct got_error *
3633 add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3634 const char *root_path, const char *path)
3636 const struct got_error *err;
3637 char *parent_path, *next_parent_path = NULL;
3639 err = add_ignores(ignores, root_path, "", -1,
3640 ".cvsignore");
3641 if (err)
3642 return err;
3644 err = add_ignores(ignores, root_path, "", -1,
3645 ".gitignore");
3646 if (err)
3647 return err;
3649 err = got_path_dirname(&parent_path, path);
3650 if (err) {
3651 if (err->code == GOT_ERR_BAD_PATH)
3652 return NULL; /* cannot traverse parent */
3653 return err;
3655 for (;;) {
3656 err = add_ignores(ignores, root_path, parent_path, -1,
3657 ".cvsignore");
3658 if (err)
3659 break;
3660 err = add_ignores(ignores, root_path, parent_path, -1,
3661 ".gitignore");
3662 if (err)
3663 break;
3664 err = got_path_dirname(&next_parent_path, parent_path);
3665 if (err) {
3666 if (err->code == GOT_ERR_BAD_PATH)
3667 err = NULL; /* traversed everything */
3668 break;
3670 free(parent_path);
3671 parent_path = next_parent_path;
3672 next_parent_path = NULL;
3675 free(parent_path);
3676 free(next_parent_path);
3677 return err;
3680 static const struct got_error *
3681 worktree_status(struct got_worktree *worktree, const char *path,
3682 struct got_fileindex *fileindex, struct got_repository *repo,
3683 got_worktree_status_cb status_cb, void *status_arg,
3684 got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3685 int report_unchanged)
3687 const struct got_error *err = NULL;
3688 int fd = -1;
3689 struct got_fileindex_diff_dir_cb fdiff_cb;
3690 struct diff_dir_cb_arg arg;
3691 char *ondisk_path = NULL;
3693 TAILQ_INIT(&arg.ignores);
3695 if (asprintf(&ondisk_path, "%s%s%s",
3696 worktree->root_path, path[0] ? "/" : "", path) == -1)
3697 return got_error_from_errno("asprintf");
3699 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3700 if (fd == -1) {
3701 if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3702 errno != ELOOP)
3703 err = got_error_from_errno2("open", ondisk_path);
3704 else
3705 err = report_single_file_status(path, ondisk_path,
3706 fileindex, status_cb, status_arg, repo,
3707 report_unchanged);
3708 } else {
3709 fdiff_cb.diff_old_new = status_old_new;
3710 fdiff_cb.diff_old = status_old;
3711 fdiff_cb.diff_new = status_new;
3712 fdiff_cb.diff_traverse = status_traverse;
3713 arg.fileindex = fileindex;
3714 arg.worktree = worktree;
3715 arg.status_path = path;
3716 arg.status_path_len = strlen(path);
3717 arg.repo = repo;
3718 arg.status_cb = status_cb;
3719 arg.status_arg = status_arg;
3720 arg.cancel_cb = cancel_cb;
3721 arg.cancel_arg = cancel_arg;
3722 arg.report_unchanged = report_unchanged;
3723 arg.no_ignores = no_ignores;
3724 if (!no_ignores) {
3725 err = add_ignores_from_parent_paths(&arg.ignores,
3726 worktree->root_path, path);
3727 if (err)
3728 goto done;
3730 err = got_fileindex_diff_dir(fileindex, fd,
3731 worktree->root_path, path, repo, &fdiff_cb, &arg);
3733 done:
3734 free_ignores(&arg.ignores);
3735 if (fd != -1 && close(fd) == -1 && err == NULL)
3736 err = got_error_from_errno("close");
3737 free(ondisk_path);
3738 return err;
3741 const struct got_error *
3742 got_worktree_status(struct got_worktree *worktree,
3743 struct got_pathlist_head *paths, struct got_repository *repo,
3744 int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3745 got_cancel_cb cancel_cb, void *cancel_arg)
3747 const struct got_error *err = NULL;
3748 char *fileindex_path = NULL;
3749 struct got_fileindex *fileindex = NULL;
3750 struct got_pathlist_entry *pe;
3752 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3753 if (err)
3754 return err;
3756 TAILQ_FOREACH(pe, paths, entry) {
3757 err = worktree_status(worktree, pe->path, fileindex, repo,
3758 status_cb, status_arg, cancel_cb, cancel_arg,
3759 no_ignores, 0);
3760 if (err)
3761 break;
3763 free(fileindex_path);
3764 got_fileindex_free(fileindex);
3765 return err;
3768 const struct got_error *
3769 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3770 const char *arg)
3772 const struct got_error *err = NULL;
3773 char *resolved = NULL, *cwd = NULL, *path = NULL;
3774 size_t len;
3775 struct stat sb;
3776 char *abspath = NULL;
3777 char canonpath[PATH_MAX];
3779 *wt_path = NULL;
3781 cwd = getcwd(NULL, 0);
3782 if (cwd == NULL)
3783 return got_error_from_errno("getcwd");
3785 if (lstat(arg, &sb) == -1) {
3786 if (errno != ENOENT) {
3787 err = got_error_from_errno2("lstat", arg);
3788 goto done;
3790 sb.st_mode = 0;
3792 if (S_ISLNK(sb.st_mode)) {
3794 * We cannot use realpath(3) with symlinks since we want to
3795 * operate on the symlink itself.
3796 * But we can make the path absolute, assuming it is relative
3797 * to the current working directory, and then canonicalize it.
3799 if (!got_path_is_absolute(arg)) {
3800 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3801 err = got_error_from_errno("asprintf");
3802 goto done;
3806 err = got_canonpath(abspath ? abspath : arg, canonpath,
3807 sizeof(canonpath));
3808 if (err)
3809 goto done;
3810 resolved = strdup(canonpath);
3811 if (resolved == NULL) {
3812 err = got_error_from_errno("strdup");
3813 goto done;
3815 } else {
3816 resolved = realpath(arg, NULL);
3817 if (resolved == NULL) {
3818 if (errno != ENOENT) {
3819 err = got_error_from_errno2("realpath", arg);
3820 goto done;
3822 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3823 err = got_error_from_errno("asprintf");
3824 goto done;
3826 err = got_canonpath(abspath, canonpath,
3827 sizeof(canonpath));
3828 if (err)
3829 goto done;
3830 resolved = strdup(canonpath);
3831 if (resolved == NULL) {
3832 err = got_error_from_errno("strdup");
3833 goto done;
3838 if (strncmp(got_worktree_get_root_path(worktree), resolved,
3839 strlen(got_worktree_get_root_path(worktree)))) {
3840 err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3841 goto done;
3844 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3845 err = got_path_skip_common_ancestor(&path,
3846 got_worktree_get_root_path(worktree), resolved);
3847 if (err)
3848 goto done;
3849 } else {
3850 path = strdup("");
3851 if (path == NULL) {
3852 err = got_error_from_errno("strdup");
3853 goto done;
3857 /* XXX status walk can't deal with trailing slash! */
3858 len = strlen(path);
3859 while (len > 0 && path[len - 1] == '/') {
3860 path[len - 1] = '\0';
3861 len--;
3863 done:
3864 free(abspath);
3865 free(resolved);
3866 free(cwd);
3867 if (err == NULL)
3868 *wt_path = path;
3869 else
3870 free(path);
3871 return err;
3874 struct schedule_addition_args {
3875 struct got_worktree *worktree;
3876 struct got_fileindex *fileindex;
3877 got_worktree_checkout_cb progress_cb;
3878 void *progress_arg;
3879 struct got_repository *repo;
3882 static const struct got_error *
3883 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3884 const char *relpath, struct got_object_id *blob_id,
3885 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3886 int dirfd, const char *de_name)
3888 struct schedule_addition_args *a = arg;
3889 const struct got_error *err = NULL;
3890 struct got_fileindex_entry *ie;
3891 struct stat sb;
3892 char *ondisk_path;
3894 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3895 relpath) == -1)
3896 return got_error_from_errno("asprintf");
3898 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3899 if (ie) {
3900 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3901 de_name, a->repo);
3902 if (err)
3903 goto done;
3904 /* Re-adding an existing entry is a no-op. */
3905 if (status == GOT_STATUS_ADD)
3906 goto done;
3907 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3908 if (err)
3909 goto done;
3912 if (status != GOT_STATUS_UNVERSIONED) {
3913 err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3914 goto done;
3917 err = got_fileindex_entry_alloc(&ie, relpath);
3918 if (err)
3919 goto done;
3920 err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3921 relpath, NULL, NULL, 1);
3922 if (err) {
3923 got_fileindex_entry_free(ie);
3924 goto done;
3926 err = got_fileindex_entry_add(a->fileindex, ie);
3927 if (err) {
3928 got_fileindex_entry_free(ie);
3929 goto done;
3931 done:
3932 free(ondisk_path);
3933 if (err)
3934 return err;
3935 if (status == GOT_STATUS_ADD)
3936 return NULL;
3937 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3940 const struct got_error *
3941 got_worktree_schedule_add(struct got_worktree *worktree,
3942 struct got_pathlist_head *paths,
3943 got_worktree_checkout_cb progress_cb, void *progress_arg,
3944 struct got_repository *repo, int no_ignores)
3946 struct got_fileindex *fileindex = NULL;
3947 char *fileindex_path = NULL;
3948 const struct got_error *err = NULL, *sync_err, *unlockerr;
3949 struct got_pathlist_entry *pe;
3950 struct schedule_addition_args saa;
3952 err = lock_worktree(worktree, LOCK_EX);
3953 if (err)
3954 return err;
3956 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3957 if (err)
3958 goto done;
3960 saa.worktree = worktree;
3961 saa.fileindex = fileindex;
3962 saa.progress_cb = progress_cb;
3963 saa.progress_arg = progress_arg;
3964 saa.repo = repo;
3966 TAILQ_FOREACH(pe, paths, entry) {
3967 err = worktree_status(worktree, pe->path, fileindex, repo,
3968 schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3969 if (err)
3970 break;
3972 sync_err = sync_fileindex(fileindex, fileindex_path);
3973 if (sync_err && err == NULL)
3974 err = sync_err;
3975 done:
3976 free(fileindex_path);
3977 if (fileindex)
3978 got_fileindex_free(fileindex);
3979 unlockerr = lock_worktree(worktree, LOCK_SH);
3980 if (unlockerr && err == NULL)
3981 err = unlockerr;
3982 return err;
3985 struct schedule_deletion_args {
3986 struct got_worktree *worktree;
3987 struct got_fileindex *fileindex;
3988 got_worktree_delete_cb progress_cb;
3989 void *progress_arg;
3990 struct got_repository *repo;
3991 int delete_local_mods;
3992 int keep_on_disk;
3993 const char *status_codes;
3996 static const struct got_error *
3997 schedule_for_deletion(void *arg, unsigned char status,
3998 unsigned char staged_status, const char *relpath,
3999 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4000 struct got_object_id *commit_id, int dirfd, const char *de_name)
4002 struct schedule_deletion_args *a = arg;
4003 const struct got_error *err = NULL;
4004 struct got_fileindex_entry *ie = NULL;
4005 struct stat sb;
4006 char *ondisk_path;
4008 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4009 if (ie == NULL)
4010 return got_error_path(relpath, GOT_ERR_BAD_PATH);
4012 staged_status = get_staged_status(ie);
4013 if (staged_status != GOT_STATUS_NO_CHANGE) {
4014 if (staged_status == GOT_STATUS_DELETE)
4015 return NULL;
4016 return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4019 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4020 relpath) == -1)
4021 return got_error_from_errno("asprintf");
4023 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4024 a->repo);
4025 if (err)
4026 goto done;
4028 if (a->status_codes) {
4029 size_t ncodes = strlen(a->status_codes);
4030 int i;
4031 for (i = 0; i < ncodes ; i++) {
4032 if (status == a->status_codes[i])
4033 break;
4035 if (i == ncodes) {
4036 /* Do not delete files in non-matching status. */
4037 free(ondisk_path);
4038 return NULL;
4040 if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4041 a->status_codes[i] != GOT_STATUS_MISSING) {
4042 static char msg[64];
4043 snprintf(msg, sizeof(msg),
4044 "invalid status code '%c'", a->status_codes[i]);
4045 err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4046 goto done;
4050 if (status != GOT_STATUS_NO_CHANGE) {
4051 if (status == GOT_STATUS_DELETE)
4052 goto done;
4053 if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4054 err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4055 goto done;
4057 if (status != GOT_STATUS_MODIFY &&
4058 status != GOT_STATUS_MISSING) {
4059 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4060 goto done;
4064 if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4065 size_t root_len;
4067 if (dirfd != -1) {
4068 if (unlinkat(dirfd, de_name, 0) != 0) {
4069 err = got_error_from_errno2("unlinkat",
4070 ondisk_path);
4071 goto done;
4073 } else if (unlink(ondisk_path) != 0) {
4074 err = got_error_from_errno2("unlink", ondisk_path);
4075 goto done;
4078 root_len = strlen(a->worktree->root_path);
4079 do {
4080 char *parent;
4081 err = got_path_dirname(&parent, ondisk_path);
4082 if (err)
4083 goto done;
4084 free(ondisk_path);
4085 ondisk_path = parent;
4086 if (rmdir(ondisk_path) == -1) {
4087 if (errno != ENOTEMPTY)
4088 err = got_error_from_errno2("rmdir",
4089 ondisk_path);
4090 break;
4092 } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4093 strlen(ondisk_path), root_len) != 0);
4096 got_fileindex_entry_mark_deleted_from_disk(ie);
4097 done:
4098 free(ondisk_path);
4099 if (err)
4100 return err;
4101 if (status == GOT_STATUS_DELETE)
4102 return NULL;
4103 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4104 staged_status, relpath);
4107 const struct got_error *
4108 got_worktree_schedule_delete(struct got_worktree *worktree,
4109 struct got_pathlist_head *paths, int delete_local_mods,
4110 const char *status_codes,
4111 got_worktree_delete_cb progress_cb, void *progress_arg,
4112 struct got_repository *repo, int keep_on_disk)
4114 struct got_fileindex *fileindex = NULL;
4115 char *fileindex_path = NULL;
4116 const struct got_error *err = NULL, *sync_err, *unlockerr;
4117 struct got_pathlist_entry *pe;
4118 struct schedule_deletion_args sda;
4120 err = lock_worktree(worktree, LOCK_EX);
4121 if (err)
4122 return err;
4124 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4125 if (err)
4126 goto done;
4128 sda.worktree = worktree;
4129 sda.fileindex = fileindex;
4130 sda.progress_cb = progress_cb;
4131 sda.progress_arg = progress_arg;
4132 sda.repo = repo;
4133 sda.delete_local_mods = delete_local_mods;
4134 sda.keep_on_disk = keep_on_disk;
4135 sda.status_codes = status_codes;
4137 TAILQ_FOREACH(pe, paths, entry) {
4138 err = worktree_status(worktree, pe->path, fileindex, repo,
4139 schedule_for_deletion, &sda, NULL, NULL, 0, 1);
4140 if (err)
4141 break;
4143 sync_err = sync_fileindex(fileindex, fileindex_path);
4144 if (sync_err && err == NULL)
4145 err = sync_err;
4146 done:
4147 free(fileindex_path);
4148 if (fileindex)
4149 got_fileindex_free(fileindex);
4150 unlockerr = lock_worktree(worktree, LOCK_SH);
4151 if (unlockerr && err == NULL)
4152 err = unlockerr;
4153 return err;
4156 static const struct got_error *
4157 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4159 const struct got_error *err = NULL;
4160 char *line = NULL;
4161 size_t linesize = 0, n;
4162 ssize_t linelen;
4164 linelen = getline(&line, &linesize, infile);
4165 if (linelen == -1) {
4166 if (ferror(infile)) {
4167 err = got_error_from_errno("getline");
4168 goto done;
4170 return NULL;
4172 if (outfile) {
4173 n = fwrite(line, 1, linelen, outfile);
4174 if (n != linelen) {
4175 err = got_ferror(outfile, GOT_ERR_IO);
4176 goto done;
4179 if (rejectfile) {
4180 n = fwrite(line, 1, linelen, rejectfile);
4181 if (n != linelen)
4182 err = got_ferror(outfile, GOT_ERR_IO);
4184 done:
4185 free(line);
4186 return err;
4189 static const struct got_error *
4190 skip_one_line(FILE *f)
4192 char *line = NULL;
4193 size_t linesize = 0;
4194 ssize_t linelen;
4196 linelen = getline(&line, &linesize, f);
4197 if (linelen == -1) {
4198 if (ferror(f))
4199 return got_error_from_errno("getline");
4200 return NULL;
4202 free(line);
4203 return NULL;
4206 static const struct got_error *
4207 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4208 int start_old, int end_old, int start_new, int end_new,
4209 FILE *outfile, FILE *rejectfile)
4211 const struct got_error *err;
4213 /* Copy old file's lines leading up to patch. */
4214 while (!feof(f1) && *line_cur1 < start_old) {
4215 err = copy_one_line(f1, outfile, NULL);
4216 if (err)
4217 return err;
4218 (*line_cur1)++;
4220 /* Skip new file's lines leading up to patch. */
4221 while (!feof(f2) && *line_cur2 < start_new) {
4222 if (rejectfile)
4223 err = copy_one_line(f2, NULL, rejectfile);
4224 else
4225 err = skip_one_line(f2);
4226 if (err)
4227 return err;
4228 (*line_cur2)++;
4230 /* Copy patched lines. */
4231 while (!feof(f2) && *line_cur2 <= end_new) {
4232 err = copy_one_line(f2, outfile, NULL);
4233 if (err)
4234 return err;
4235 (*line_cur2)++;
4237 /* Skip over old file's replaced lines. */
4238 while (!feof(f1) && *line_cur1 <= end_old) {
4239 if (rejectfile)
4240 err = copy_one_line(f1, NULL, rejectfile);
4241 else
4242 err = skip_one_line(f1);
4243 if (err)
4244 return err;
4245 (*line_cur1)++;
4248 return NULL;
4251 static const struct got_error *
4252 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4253 FILE *outfile, FILE *rejectfile)
4255 const struct got_error *err;
4257 if (outfile) {
4258 /* Copy old file's lines until EOF. */
4259 while (!feof(f1)) {
4260 err = copy_one_line(f1, outfile, NULL);
4261 if (err)
4262 return err;
4263 (*line_cur1)++;
4266 if (rejectfile) {
4267 /* Copy new file's lines until EOF. */
4268 while (!feof(f2)) {
4269 err = copy_one_line(f2, NULL, rejectfile);
4270 if (err)
4271 return err;
4272 (*line_cur2)++;
4276 return NULL;
4279 static const struct got_error *
4280 apply_or_reject_change(int *choice, int *nchunks_used,
4281 struct diff_result *diff_result, int n,
4282 const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4283 FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4284 got_worktree_patch_cb patch_cb, void *patch_arg)
4286 const struct got_error *err = NULL;
4287 struct diff_chunk_context cc = {};
4288 int start_old, end_old, start_new, end_new;
4289 FILE *hunkfile;
4290 struct diff_output_unidiff_state *diff_state;
4291 struct diff_input_info diff_info;
4292 int rc;
4294 *choice = GOT_PATCH_CHOICE_NONE;
4296 /* Get changed line numbers without context lines for copy_change(). */
4297 diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4298 start_old = cc.left.start;
4299 end_old = cc.left.end;
4300 start_new = cc.right.start;
4301 end_new = cc.right.end;
4303 /* Get the same change with context lines for display. */
4304 memset(&cc, 0, sizeof(cc));
4305 diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4307 memset(&diff_info, 0, sizeof(diff_info));
4308 diff_info.left_path = relpath;
4309 diff_info.right_path = relpath;
4311 diff_state = diff_output_unidiff_state_alloc();
4312 if (diff_state == NULL)
4313 return got_error_set_errno(ENOMEM,
4314 "diff_output_unidiff_state_alloc");
4316 hunkfile = got_opentemp();
4317 if (hunkfile == NULL) {
4318 err = got_error_from_errno("got_opentemp");
4319 goto done;
4322 rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4323 diff_result, &cc);
4324 if (rc != DIFF_RC_OK) {
4325 err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4326 goto done;
4329 if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4330 err = got_ferror(hunkfile, GOT_ERR_IO);
4331 goto done;
4334 err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4335 hunkfile, changeno, nchanges);
4336 if (err)
4337 goto done;
4339 switch (*choice) {
4340 case GOT_PATCH_CHOICE_YES:
4341 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4342 end_old, start_new, end_new, outfile, rejectfile);
4343 break;
4344 case GOT_PATCH_CHOICE_NO:
4345 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4346 end_old, start_new, end_new, rejectfile, outfile);
4347 break;
4348 case GOT_PATCH_CHOICE_QUIT:
4349 break;
4350 default:
4351 err = got_error(GOT_ERR_PATCH_CHOICE);
4352 break;
4354 done:
4355 diff_output_unidiff_state_free(diff_state);
4356 if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4357 err = got_error_from_errno("fclose");
4358 return err;
4361 struct revert_file_args {
4362 struct got_worktree *worktree;
4363 struct got_fileindex *fileindex;
4364 got_worktree_checkout_cb progress_cb;
4365 void *progress_arg;
4366 got_worktree_patch_cb patch_cb;
4367 void *patch_arg;
4368 struct got_repository *repo;
4371 static const struct got_error *
4372 create_patched_content(char **path_outfile, int reverse_patch,
4373 struct got_object_id *blob_id, const char *path2,
4374 int dirfd2, const char *de_name2,
4375 const char *relpath, struct got_repository *repo,
4376 got_worktree_patch_cb patch_cb, void *patch_arg)
4378 const struct got_error *err, *free_err;
4379 struct got_blob_object *blob = NULL;
4380 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4381 int fd2 = -1;
4382 char link_target[PATH_MAX];
4383 ssize_t link_len = 0;
4384 char *path1 = NULL, *id_str = NULL;
4385 struct stat sb2;
4386 struct got_diffreg_result *diffreg_result = NULL;
4387 int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4388 int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4390 *path_outfile = NULL;
4392 err = got_object_id_str(&id_str, blob_id);
4393 if (err)
4394 return err;
4396 if (dirfd2 != -1) {
4397 fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4398 if (fd2 == -1) {
4399 if (errno != ELOOP) {
4400 err = got_error_from_errno2("openat", path2);
4401 goto done;
4403 link_len = readlinkat(dirfd2, de_name2,
4404 link_target, sizeof(link_target));
4405 if (link_len == -1)
4406 return got_error_from_errno2("readlinkat", path2);
4407 sb2.st_mode = S_IFLNK;
4408 sb2.st_size = link_len;
4410 } else {
4411 fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4412 if (fd2 == -1) {
4413 if (errno != ELOOP) {
4414 err = got_error_from_errno2("open", path2);
4415 goto done;
4417 link_len = readlink(path2, link_target,
4418 sizeof(link_target));
4419 if (link_len == -1)
4420 return got_error_from_errno2("readlink", path2);
4421 sb2.st_mode = S_IFLNK;
4422 sb2.st_size = link_len;
4425 if (fd2 != -1) {
4426 if (fstat(fd2, &sb2) == -1) {
4427 err = got_error_from_errno2("fstat", path2);
4428 goto done;
4431 f2 = fdopen(fd2, "r");
4432 if (f2 == NULL) {
4433 err = got_error_from_errno2("fdopen", path2);
4434 goto done;
4436 fd2 = -1;
4437 } else {
4438 size_t n;
4439 f2 = got_opentemp();
4440 if (f2 == NULL) {
4441 err = got_error_from_errno2("got_opentemp", path2);
4442 goto done;
4444 n = fwrite(link_target, 1, link_len, f2);
4445 if (n != link_len) {
4446 err = got_ferror(f2, GOT_ERR_IO);
4447 goto done;
4449 if (fflush(f2) == EOF) {
4450 err = got_error_from_errno("fflush");
4451 goto done;
4453 rewind(f2);
4456 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4457 if (err)
4458 goto done;
4460 err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4461 if (err)
4462 goto done;
4464 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4465 if (err)
4466 goto done;
4468 err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4469 NULL);
4470 if (err)
4471 goto done;
4473 err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4474 if (err)
4475 goto done;
4477 if (fseek(f1, 0L, SEEK_SET) == -1)
4478 return got_ferror(f1, GOT_ERR_IO);
4479 if (fseek(f2, 0L, SEEK_SET) == -1)
4480 return got_ferror(f2, GOT_ERR_IO);
4482 /* Count the number of actual changes in the diff result. */
4483 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4484 struct diff_chunk_context cc = {};
4485 diff_chunk_context_load_change(&cc, &nchunks_used,
4486 diffreg_result->result, n, 0);
4487 nchanges++;
4489 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4490 int choice;
4491 err = apply_or_reject_change(&choice, &nchunks_used,
4492 diffreg_result->result, n, relpath, f1, f2,
4493 &line_cur1, &line_cur2,
4494 reverse_patch ? NULL : outfile,
4495 reverse_patch ? outfile : NULL,
4496 ++i, nchanges, patch_cb, patch_arg);
4497 if (err)
4498 goto done;
4499 if (choice == GOT_PATCH_CHOICE_YES)
4500 have_content = 1;
4501 else if (choice == GOT_PATCH_CHOICE_QUIT)
4502 break;
4504 if (have_content) {
4505 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4506 reverse_patch ? NULL : outfile,
4507 reverse_patch ? outfile : NULL);
4508 if (err)
4509 goto done;
4511 if (!S_ISLNK(sb2.st_mode)) {
4512 if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4513 err = got_error_from_errno2("fchmod", path2);
4514 goto done;
4518 done:
4519 free(id_str);
4520 if (blob)
4521 got_object_blob_close(blob);
4522 free_err = got_diffreg_result_free(diffreg_result);
4523 if (err == NULL)
4524 err = free_err;
4525 if (f1 && fclose(f1) == EOF && err == NULL)
4526 err = got_error_from_errno2("fclose", path1);
4527 if (f2 && fclose(f2) == EOF && err == NULL)
4528 err = got_error_from_errno2("fclose", path2);
4529 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4530 err = got_error_from_errno2("close", path2);
4531 if (outfile && fclose(outfile) == EOF && err == NULL)
4532 err = got_error_from_errno2("fclose", *path_outfile);
4533 if (path1 && unlink(path1) == -1 && err == NULL)
4534 err = got_error_from_errno2("unlink", path1);
4535 if (err || !have_content) {
4536 if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4537 err = got_error_from_errno2("unlink", *path_outfile);
4538 free(*path_outfile);
4539 *path_outfile = NULL;
4541 free(path1);
4542 return err;
4545 static const struct got_error *
4546 revert_file(void *arg, unsigned char status, unsigned char staged_status,
4547 const char *relpath, struct got_object_id *blob_id,
4548 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4549 int dirfd, const char *de_name)
4551 struct revert_file_args *a = arg;
4552 const struct got_error *err = NULL;
4553 char *parent_path = NULL;
4554 struct got_fileindex_entry *ie;
4555 struct got_tree_object *tree = NULL;
4556 struct got_object_id *tree_id = NULL;
4557 const struct got_tree_entry *te = NULL;
4558 char *tree_path = NULL, *te_name;
4559 char *ondisk_path = NULL, *path_content = NULL;
4560 struct got_blob_object *blob = NULL;
4562 /* Reverting a staged deletion is a no-op. */
4563 if (status == GOT_STATUS_DELETE &&
4564 staged_status != GOT_STATUS_NO_CHANGE)
4565 return NULL;
4567 if (status == GOT_STATUS_UNVERSIONED)
4568 return (*a->progress_cb)(a->progress_arg,
4569 GOT_STATUS_UNVERSIONED, relpath);
4571 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4572 if (ie == NULL)
4573 return got_error_path(relpath, GOT_ERR_BAD_PATH);
4575 /* Construct in-repository path of tree which contains this blob. */
4576 err = got_path_dirname(&parent_path, ie->path);
4577 if (err) {
4578 if (err->code != GOT_ERR_BAD_PATH)
4579 goto done;
4580 parent_path = strdup("/");
4581 if (parent_path == NULL) {
4582 err = got_error_from_errno("strdup");
4583 goto done;
4586 if (got_path_is_root_dir(a->worktree->path_prefix)) {
4587 tree_path = strdup(parent_path);
4588 if (tree_path == NULL) {
4589 err = got_error_from_errno("strdup");
4590 goto done;
4592 } else {
4593 if (got_path_is_root_dir(parent_path)) {
4594 tree_path = strdup(a->worktree->path_prefix);
4595 if (tree_path == NULL) {
4596 err = got_error_from_errno("strdup");
4597 goto done;
4599 } else {
4600 if (asprintf(&tree_path, "%s/%s",
4601 a->worktree->path_prefix, parent_path) == -1) {
4602 err = got_error_from_errno("asprintf");
4603 goto done;
4608 err = got_object_id_by_path(&tree_id, a->repo,
4609 a->worktree->base_commit_id, tree_path);
4610 if (err) {
4611 if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4612 (status == GOT_STATUS_ADD ||
4613 staged_status == GOT_STATUS_ADD)))
4614 goto done;
4615 } else {
4616 err = got_object_open_as_tree(&tree, a->repo, tree_id);
4617 if (err)
4618 goto done;
4620 err = got_path_basename(&te_name, ie->path);
4621 if (err)
4622 goto done;
4624 te = got_object_tree_find_entry(tree, te_name);
4625 free(te_name);
4626 if (te == NULL && status != GOT_STATUS_ADD &&
4627 staged_status != GOT_STATUS_ADD) {
4628 err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4629 goto done;
4633 switch (status) {
4634 case GOT_STATUS_ADD:
4635 if (a->patch_cb) {
4636 int choice = GOT_PATCH_CHOICE_NONE;
4637 err = (*a->patch_cb)(&choice, a->patch_arg,
4638 status, ie->path, NULL, 1, 1);
4639 if (err)
4640 goto done;
4641 if (choice != GOT_PATCH_CHOICE_YES)
4642 break;
4644 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4645 ie->path);
4646 if (err)
4647 goto done;
4648 got_fileindex_entry_remove(a->fileindex, ie);
4649 break;
4650 case GOT_STATUS_DELETE:
4651 if (a->patch_cb) {
4652 int choice = GOT_PATCH_CHOICE_NONE;
4653 err = (*a->patch_cb)(&choice, a->patch_arg,
4654 status, ie->path, NULL, 1, 1);
4655 if (err)
4656 goto done;
4657 if (choice != GOT_PATCH_CHOICE_YES)
4658 break;
4660 /* fall through */
4661 case GOT_STATUS_MODIFY:
4662 case GOT_STATUS_MODE_CHANGE:
4663 case GOT_STATUS_CONFLICT:
4664 case GOT_STATUS_MISSING: {
4665 struct got_object_id id;
4666 if (staged_status == GOT_STATUS_ADD ||
4667 staged_status == GOT_STATUS_MODIFY) {
4668 memcpy(id.sha1, ie->staged_blob_sha1,
4669 SHA1_DIGEST_LENGTH);
4670 } else
4671 memcpy(id.sha1, ie->blob_sha1,
4672 SHA1_DIGEST_LENGTH);
4673 err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4674 if (err)
4675 goto done;
4677 if (asprintf(&ondisk_path, "%s/%s",
4678 got_worktree_get_root_path(a->worktree), relpath) == -1) {
4679 err = got_error_from_errno("asprintf");
4680 goto done;
4683 if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4684 status == GOT_STATUS_CONFLICT)) {
4685 int is_bad_symlink = 0;
4686 err = create_patched_content(&path_content, 1, &id,
4687 ondisk_path, dirfd, de_name, ie->path, a->repo,
4688 a->patch_cb, a->patch_arg);
4689 if (err || path_content == NULL)
4690 break;
4691 if (te && S_ISLNK(te->mode)) {
4692 if (unlink(path_content) == -1) {
4693 err = got_error_from_errno2("unlink",
4694 path_content);
4695 break;
4697 err = install_symlink(&is_bad_symlink,
4698 a->worktree, ondisk_path, ie->path,
4699 blob, 0, 1, 0, a->repo,
4700 a->progress_cb, a->progress_arg);
4701 } else {
4702 if (rename(path_content, ondisk_path) == -1) {
4703 err = got_error_from_errno3("rename",
4704 path_content, ondisk_path);
4705 goto done;
4708 } else {
4709 int is_bad_symlink = 0;
4710 if (te && S_ISLNK(te->mode)) {
4711 err = install_symlink(&is_bad_symlink,
4712 a->worktree, ondisk_path, ie->path,
4713 blob, 0, 1, 0, a->repo,
4714 a->progress_cb, a->progress_arg);
4715 } else {
4716 err = install_blob(a->worktree, ondisk_path,
4717 ie->path,
4718 te ? te->mode : GOT_DEFAULT_FILE_MODE,
4719 got_fileindex_perms_to_st(ie), blob,
4720 0, 1, 0, 0, a->repo,
4721 a->progress_cb, a->progress_arg);
4723 if (err)
4724 goto done;
4725 if (status == GOT_STATUS_DELETE ||
4726 status == GOT_STATUS_MODE_CHANGE) {
4727 err = got_fileindex_entry_update(ie,
4728 a->worktree->root_fd, relpath,
4729 blob->id.sha1,
4730 a->worktree->base_commit_id->sha1, 1);
4731 if (err)
4732 goto done;
4734 if (is_bad_symlink) {
4735 got_fileindex_entry_filetype_set(ie,
4736 GOT_FILEIDX_MODE_BAD_SYMLINK);
4739 break;
4741 default:
4742 break;
4744 done:
4745 free(ondisk_path);
4746 free(path_content);
4747 free(parent_path);
4748 free(tree_path);
4749 if (blob)
4750 got_object_blob_close(blob);
4751 if (tree)
4752 got_object_tree_close(tree);
4753 free(tree_id);
4754 return err;
4757 const struct got_error *
4758 got_worktree_revert(struct got_worktree *worktree,
4759 struct got_pathlist_head *paths,
4760 got_worktree_checkout_cb progress_cb, void *progress_arg,
4761 got_worktree_patch_cb patch_cb, void *patch_arg,
4762 struct got_repository *repo)
4764 struct got_fileindex *fileindex = NULL;
4765 char *fileindex_path = NULL;
4766 const struct got_error *err = NULL, *unlockerr = NULL;
4767 const struct got_error *sync_err = NULL;
4768 struct got_pathlist_entry *pe;
4769 struct revert_file_args rfa;
4771 err = lock_worktree(worktree, LOCK_EX);
4772 if (err)
4773 return err;
4775 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4776 if (err)
4777 goto done;
4779 rfa.worktree = worktree;
4780 rfa.fileindex = fileindex;
4781 rfa.progress_cb = progress_cb;
4782 rfa.progress_arg = progress_arg;
4783 rfa.patch_cb = patch_cb;
4784 rfa.patch_arg = patch_arg;
4785 rfa.repo = repo;
4786 TAILQ_FOREACH(pe, paths, entry) {
4787 err = worktree_status(worktree, pe->path, fileindex, repo,
4788 revert_file, &rfa, NULL, NULL, 0, 0);
4789 if (err)
4790 break;
4792 sync_err = sync_fileindex(fileindex, fileindex_path);
4793 if (sync_err && err == NULL)
4794 err = sync_err;
4795 done:
4796 free(fileindex_path);
4797 if (fileindex)
4798 got_fileindex_free(fileindex);
4799 unlockerr = lock_worktree(worktree, LOCK_SH);
4800 if (unlockerr && err == NULL)
4801 err = unlockerr;
4802 return err;
4805 static void
4806 free_commitable(struct got_commitable *ct)
4808 free(ct->path);
4809 free(ct->in_repo_path);
4810 free(ct->ondisk_path);
4811 free(ct->blob_id);
4812 free(ct->base_blob_id);
4813 free(ct->staged_blob_id);
4814 free(ct->base_commit_id);
4815 free(ct);
4818 struct collect_commitables_arg {
4819 struct got_pathlist_head *commitable_paths;
4820 struct got_repository *repo;
4821 struct got_worktree *worktree;
4822 struct got_fileindex *fileindex;
4823 int have_staged_files;
4824 int allow_bad_symlinks;
4827 static const struct got_error *
4828 collect_commitables(void *arg, unsigned char status,
4829 unsigned char staged_status, const char *relpath,
4830 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4831 struct got_object_id *commit_id, int dirfd, const char *de_name)
4833 struct collect_commitables_arg *a = arg;
4834 const struct got_error *err = NULL;
4835 struct got_commitable *ct = NULL;
4836 struct got_pathlist_entry *new = NULL;
4837 char *parent_path = NULL, *path = NULL;
4838 struct stat sb;
4840 if (a->have_staged_files) {
4841 if (staged_status != GOT_STATUS_MODIFY &&
4842 staged_status != GOT_STATUS_ADD &&
4843 staged_status != GOT_STATUS_DELETE)
4844 return NULL;
4845 } else {
4846 if (status == GOT_STATUS_CONFLICT)
4847 return got_error(GOT_ERR_COMMIT_CONFLICT);
4849 if (status != GOT_STATUS_MODIFY &&
4850 status != GOT_STATUS_MODE_CHANGE &&
4851 status != GOT_STATUS_ADD &&
4852 status != GOT_STATUS_DELETE)
4853 return NULL;
4856 if (asprintf(&path, "/%s", relpath) == -1) {
4857 err = got_error_from_errno("asprintf");
4858 goto done;
4860 if (strcmp(path, "/") == 0) {
4861 parent_path = strdup("");
4862 if (parent_path == NULL)
4863 return got_error_from_errno("strdup");
4864 } else {
4865 err = got_path_dirname(&parent_path, path);
4866 if (err)
4867 return err;
4870 ct = calloc(1, sizeof(*ct));
4871 if (ct == NULL) {
4872 err = got_error_from_errno("calloc");
4873 goto done;
4876 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4877 relpath) == -1) {
4878 err = got_error_from_errno("asprintf");
4879 goto done;
4882 if (staged_status == GOT_STATUS_ADD ||
4883 staged_status == GOT_STATUS_MODIFY) {
4884 struct got_fileindex_entry *ie;
4885 ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4886 switch (got_fileindex_entry_staged_filetype_get(ie)) {
4887 case GOT_FILEIDX_MODE_REGULAR_FILE:
4888 case GOT_FILEIDX_MODE_BAD_SYMLINK:
4889 ct->mode = S_IFREG;
4890 break;
4891 case GOT_FILEIDX_MODE_SYMLINK:
4892 ct->mode = S_IFLNK;
4893 break;
4894 default:
4895 err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4896 goto done;
4898 ct->mode |= got_fileindex_entry_perms_get(ie);
4899 } else if (status != GOT_STATUS_DELETE &&
4900 staged_status != GOT_STATUS_DELETE) {
4901 if (dirfd != -1) {
4902 if (fstatat(dirfd, de_name, &sb,
4903 AT_SYMLINK_NOFOLLOW) == -1) {
4904 err = got_error_from_errno2("fstatat",
4905 ct->ondisk_path);
4906 goto done;
4908 } else if (lstat(ct->ondisk_path, &sb) == -1) {
4909 err = got_error_from_errno2("lstat", ct->ondisk_path);
4910 goto done;
4912 ct->mode = sb.st_mode;
4915 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4916 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4917 relpath) == -1) {
4918 err = got_error_from_errno("asprintf");
4919 goto done;
4922 if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4923 status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4924 int is_bad_symlink;
4925 char target_path[PATH_MAX];
4926 ssize_t target_len;
4927 target_len = readlink(ct->ondisk_path, target_path,
4928 sizeof(target_path));
4929 if (target_len == -1) {
4930 err = got_error_from_errno2("readlink",
4931 ct->ondisk_path);
4932 goto done;
4934 err = is_bad_symlink_target(&is_bad_symlink, target_path,
4935 target_len, ct->ondisk_path, a->worktree->root_path);
4936 if (err)
4937 goto done;
4938 if (is_bad_symlink) {
4939 err = got_error_path(ct->ondisk_path,
4940 GOT_ERR_BAD_SYMLINK);
4941 goto done;
4946 ct->status = status;
4947 ct->staged_status = staged_status;
4948 ct->blob_id = NULL; /* will be filled in when blob gets created */
4949 if (ct->status != GOT_STATUS_ADD &&
4950 ct->staged_status != GOT_STATUS_ADD) {
4951 ct->base_blob_id = got_object_id_dup(blob_id);
4952 if (ct->base_blob_id == NULL) {
4953 err = got_error_from_errno("got_object_id_dup");
4954 goto done;
4956 ct->base_commit_id = got_object_id_dup(commit_id);
4957 if (ct->base_commit_id == NULL) {
4958 err = got_error_from_errno("got_object_id_dup");
4959 goto done;
4962 if (ct->staged_status == GOT_STATUS_ADD ||
4963 ct->staged_status == GOT_STATUS_MODIFY) {
4964 ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4965 if (ct->staged_blob_id == NULL) {
4966 err = got_error_from_errno("got_object_id_dup");
4967 goto done;
4970 ct->path = strdup(path);
4971 if (ct->path == NULL) {
4972 err = got_error_from_errno("strdup");
4973 goto done;
4975 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4976 done:
4977 if (ct && (err || new == NULL))
4978 free_commitable(ct);
4979 free(parent_path);
4980 free(path);
4981 return err;
4984 static const struct got_error *write_tree(struct got_object_id **, int *,
4985 struct got_tree_object *, const char *, struct got_pathlist_head *,
4986 got_worktree_status_cb status_cb, void *status_arg,
4987 struct got_repository *);
4989 static const struct got_error *
4990 write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4991 struct got_tree_entry *te, const char *parent_path,
4992 struct got_pathlist_head *commitable_paths,
4993 got_worktree_status_cb status_cb, void *status_arg,
4994 struct got_repository *repo)
4996 const struct got_error *err = NULL;
4997 struct got_tree_object *subtree;
4998 char *subpath;
5000 if (asprintf(&subpath, "%s%s%s", parent_path,
5001 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5002 return got_error_from_errno("asprintf");
5004 err = got_object_open_as_tree(&subtree, repo, &te->id);
5005 if (err)
5006 return err;
5008 err = write_tree(new_subtree_id, nentries, subtree, subpath,
5009 commitable_paths, status_cb, status_arg, repo);
5010 got_object_tree_close(subtree);
5011 free(subpath);
5012 return err;
5015 static const struct got_error *
5016 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5018 const struct got_error *err = NULL;
5019 char *ct_parent_path = NULL;
5021 *match = 0;
5023 if (strchr(ct->in_repo_path, '/') == NULL) {
5024 *match = got_path_is_root_dir(path);
5025 return NULL;
5028 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5029 if (err)
5030 return err;
5031 *match = (strcmp(path, ct_parent_path) == 0);
5032 free(ct_parent_path);
5033 return err;
5036 static mode_t
5037 get_ct_file_mode(struct got_commitable *ct)
5039 if (S_ISLNK(ct->mode))
5040 return S_IFLNK;
5042 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5045 static const struct got_error *
5046 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5047 struct got_tree_entry *te, struct got_commitable *ct)
5049 const struct got_error *err = NULL;
5051 *new_te = NULL;
5053 err = got_object_tree_entry_dup(new_te, te);
5054 if (err)
5055 goto done;
5057 (*new_te)->mode = get_ct_file_mode(ct);
5059 if (ct->staged_status == GOT_STATUS_MODIFY)
5060 memcpy(&(*new_te)->id, ct->staged_blob_id,
5061 sizeof((*new_te)->id));
5062 else
5063 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5064 done:
5065 if (err && *new_te) {
5066 free(*new_te);
5067 *new_te = NULL;
5069 return err;
5072 static const struct got_error *
5073 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5074 struct got_commitable *ct)
5076 const struct got_error *err = NULL;
5077 char *ct_name = NULL;
5079 *new_te = NULL;
5081 *new_te = calloc(1, sizeof(**new_te));
5082 if (*new_te == NULL)
5083 return got_error_from_errno("calloc");
5085 err = got_path_basename(&ct_name, ct->path);
5086 if (err)
5087 goto done;
5088 if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5089 sizeof((*new_te)->name)) {
5090 err = got_error(GOT_ERR_NO_SPACE);
5091 goto done;
5094 (*new_te)->mode = get_ct_file_mode(ct);
5096 if (ct->staged_status == GOT_STATUS_ADD)
5097 memcpy(&(*new_te)->id, ct->staged_blob_id,
5098 sizeof((*new_te)->id));
5099 else
5100 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5101 done:
5102 free(ct_name);
5103 if (err && *new_te) {
5104 free(*new_te);
5105 *new_te = NULL;
5107 return err;
5110 static const struct got_error *
5111 insert_tree_entry(struct got_tree_entry *new_te,
5112 struct got_pathlist_head *paths)
5114 const struct got_error *err = NULL;
5115 struct got_pathlist_entry *new_pe;
5117 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5118 if (err)
5119 return err;
5120 if (new_pe == NULL)
5121 return got_error(GOT_ERR_TREE_DUP_ENTRY);
5122 return NULL;
5125 static const struct got_error *
5126 report_ct_status(struct got_commitable *ct,
5127 got_worktree_status_cb status_cb, void *status_arg)
5129 const char *ct_path = ct->path;
5130 unsigned char status;
5132 while (ct_path[0] == '/')
5133 ct_path++;
5135 if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5136 status = ct->staged_status;
5137 else
5138 status = ct->status;
5140 return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5141 ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5144 static const struct got_error *
5145 match_modified_subtree(int *modified, struct got_tree_entry *te,
5146 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5148 const struct got_error *err = NULL;
5149 struct got_pathlist_entry *pe;
5150 char *te_path;
5152 *modified = 0;
5154 if (asprintf(&te_path, "%s%s%s", base_tree_path,
5155 got_path_is_root_dir(base_tree_path) ? "" : "/",
5156 te->name) == -1)
5157 return got_error_from_errno("asprintf");
5159 TAILQ_FOREACH(pe, commitable_paths, entry) {
5160 struct got_commitable *ct = pe->data;
5161 *modified = got_path_is_child(ct->in_repo_path, te_path,
5162 strlen(te_path));
5163 if (*modified)
5164 break;
5167 free(te_path);
5168 return err;
5171 static const struct got_error *
5172 match_deleted_or_modified_ct(struct got_commitable **ctp,
5173 struct got_tree_entry *te, const char *base_tree_path,
5174 struct got_pathlist_head *commitable_paths)
5176 const struct got_error *err = NULL;
5177 struct got_pathlist_entry *pe;
5179 *ctp = NULL;
5181 TAILQ_FOREACH(pe, commitable_paths, entry) {
5182 struct got_commitable *ct = pe->data;
5183 char *ct_name = NULL;
5184 int path_matches;
5186 if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5187 if (ct->status != GOT_STATUS_MODIFY &&
5188 ct->status != GOT_STATUS_MODE_CHANGE &&
5189 ct->status != GOT_STATUS_DELETE)
5190 continue;
5191 } else {
5192 if (ct->staged_status != GOT_STATUS_MODIFY &&
5193 ct->staged_status != GOT_STATUS_DELETE)
5194 continue;
5197 if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5198 continue;
5200 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5201 if (err)
5202 return err;
5203 if (!path_matches)
5204 continue;
5206 err = got_path_basename(&ct_name, pe->path);
5207 if (err)
5208 return err;
5210 if (strcmp(te->name, ct_name) != 0) {
5211 free(ct_name);
5212 continue;
5214 free(ct_name);
5216 *ctp = ct;
5217 break;
5220 return err;
5223 static const struct got_error *
5224 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5225 const char *child_path, const char *path_base_tree,
5226 struct got_pathlist_head *commitable_paths,
5227 got_worktree_status_cb status_cb, void *status_arg,
5228 struct got_repository *repo)
5230 const struct got_error *err = NULL;
5231 struct got_tree_entry *new_te;
5232 char *subtree_path;
5233 struct got_object_id *id = NULL;
5234 int nentries;
5236 *new_tep = NULL;
5238 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5239 got_path_is_root_dir(path_base_tree) ? "" : "/",
5240 child_path) == -1)
5241 return got_error_from_errno("asprintf");
5243 new_te = calloc(1, sizeof(*new_te));
5244 if (new_te == NULL)
5245 return got_error_from_errno("calloc");
5246 new_te->mode = S_IFDIR;
5248 if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5249 sizeof(new_te->name)) {
5250 err = got_error(GOT_ERR_NO_SPACE);
5251 goto done;
5253 err = write_tree(&id, &nentries, NULL, subtree_path,
5254 commitable_paths, status_cb, status_arg, repo);
5255 if (err) {
5256 free(new_te);
5257 goto done;
5259 memcpy(&new_te->id, id, sizeof(new_te->id));
5260 done:
5261 free(id);
5262 free(subtree_path);
5263 if (err == NULL)
5264 *new_tep = new_te;
5265 return err;
5268 static const struct got_error *
5269 write_tree(struct got_object_id **new_tree_id, int *nentries,
5270 struct got_tree_object *base_tree, const char *path_base_tree,
5271 struct got_pathlist_head *commitable_paths,
5272 got_worktree_status_cb status_cb, void *status_arg,
5273 struct got_repository *repo)
5275 const struct got_error *err = NULL;
5276 struct got_pathlist_head paths;
5277 struct got_tree_entry *te, *new_te = NULL;
5278 struct got_pathlist_entry *pe;
5280 TAILQ_INIT(&paths);
5281 *nentries = 0;
5283 /* Insert, and recurse into, newly added entries first. */
5284 TAILQ_FOREACH(pe, commitable_paths, entry) {
5285 struct got_commitable *ct = pe->data;
5286 char *child_path = NULL, *slash;
5288 if ((ct->status != GOT_STATUS_ADD &&
5289 ct->staged_status != GOT_STATUS_ADD) ||
5290 (ct->flags & GOT_COMMITABLE_ADDED))
5291 continue;
5293 if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5294 strlen(path_base_tree)))
5295 continue;
5297 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5298 ct->in_repo_path);
5299 if (err)
5300 goto done;
5302 slash = strchr(child_path, '/');
5303 if (slash == NULL) {
5304 err = alloc_added_blob_tree_entry(&new_te, ct);
5305 if (err)
5306 goto done;
5307 err = report_ct_status(ct, status_cb, status_arg);
5308 if (err)
5309 goto done;
5310 ct->flags |= GOT_COMMITABLE_ADDED;
5311 err = insert_tree_entry(new_te, &paths);
5312 if (err)
5313 goto done;
5314 (*nentries)++;
5315 } else {
5316 *slash = '\0'; /* trim trailing path components */
5317 if (base_tree == NULL ||
5318 got_object_tree_find_entry(base_tree, child_path)
5319 == NULL) {
5320 err = make_subtree_for_added_blob(&new_te,
5321 child_path, path_base_tree,
5322 commitable_paths, status_cb, status_arg,
5323 repo);
5324 if (err)
5325 goto done;
5326 err = insert_tree_entry(new_te, &paths);
5327 if (err)
5328 goto done;
5329 (*nentries)++;
5334 if (base_tree) {
5335 int i, nbase_entries;
5336 /* Handle modified and deleted entries. */
5337 nbase_entries = got_object_tree_get_nentries(base_tree);
5338 for (i = 0; i < nbase_entries; i++) {
5339 struct got_commitable *ct = NULL;
5341 te = got_object_tree_get_entry(base_tree, i);
5342 if (got_object_tree_entry_is_submodule(te)) {
5343 /* Entry is a submodule; just copy it. */
5344 err = got_object_tree_entry_dup(&new_te, te);
5345 if (err)
5346 goto done;
5347 err = insert_tree_entry(new_te, &paths);
5348 if (err)
5349 goto done;
5350 (*nentries)++;
5351 continue;
5354 if (S_ISDIR(te->mode)) {
5355 int modified;
5356 err = got_object_tree_entry_dup(&new_te, te);
5357 if (err)
5358 goto done;
5359 err = match_modified_subtree(&modified, te,
5360 path_base_tree, commitable_paths);
5361 if (err)
5362 goto done;
5363 /* Avoid recursion into unmodified subtrees. */
5364 if (modified) {
5365 struct got_object_id *new_id;
5366 int nsubentries;
5367 err = write_subtree(&new_id,
5368 &nsubentries, te,
5369 path_base_tree, commitable_paths,
5370 status_cb, status_arg, repo);
5371 if (err)
5372 goto done;
5373 if (nsubentries == 0) {
5374 /* All entries were deleted. */
5375 free(new_id);
5376 continue;
5378 memcpy(&new_te->id, new_id,
5379 sizeof(new_te->id));
5380 free(new_id);
5382 err = insert_tree_entry(new_te, &paths);
5383 if (err)
5384 goto done;
5385 (*nentries)++;
5386 continue;
5389 err = match_deleted_or_modified_ct(&ct, te,
5390 path_base_tree, commitable_paths);
5391 if (err)
5392 goto done;
5393 if (ct) {
5394 /* NB: Deleted entries get dropped here. */
5395 if (ct->status == GOT_STATUS_MODIFY ||
5396 ct->status == GOT_STATUS_MODE_CHANGE ||
5397 ct->staged_status == GOT_STATUS_MODIFY) {
5398 err = alloc_modified_blob_tree_entry(
5399 &new_te, te, ct);
5400 if (err)
5401 goto done;
5402 err = insert_tree_entry(new_te, &paths);
5403 if (err)
5404 goto done;
5405 (*nentries)++;
5407 err = report_ct_status(ct, status_cb,
5408 status_arg);
5409 if (err)
5410 goto done;
5411 } else {
5412 /* Entry is unchanged; just copy it. */
5413 err = got_object_tree_entry_dup(&new_te, te);
5414 if (err)
5415 goto done;
5416 err = insert_tree_entry(new_te, &paths);
5417 if (err)
5418 goto done;
5419 (*nentries)++;
5424 /* Write new list of entries; deleted entries have been dropped. */
5425 err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5426 done:
5427 got_pathlist_free(&paths);
5428 return err;
5431 static const struct got_error *
5432 update_fileindex_after_commit(struct got_worktree *worktree,
5433 struct got_pathlist_head *commitable_paths,
5434 struct got_object_id *new_base_commit_id,
5435 struct got_fileindex *fileindex, int have_staged_files)
5437 const struct got_error *err = NULL;
5438 struct got_pathlist_entry *pe;
5439 char *relpath = NULL;
5441 TAILQ_FOREACH(pe, commitable_paths, entry) {
5442 struct got_fileindex_entry *ie;
5443 struct got_commitable *ct = pe->data;
5445 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5447 err = got_path_skip_common_ancestor(&relpath,
5448 worktree->root_path, ct->ondisk_path);
5449 if (err)
5450 goto done;
5452 if (ie) {
5453 if (ct->status == GOT_STATUS_DELETE ||
5454 ct->staged_status == GOT_STATUS_DELETE) {
5455 got_fileindex_entry_remove(fileindex, ie);
5456 } else if (ct->staged_status == GOT_STATUS_ADD ||
5457 ct->staged_status == GOT_STATUS_MODIFY) {
5458 got_fileindex_entry_stage_set(ie,
5459 GOT_FILEIDX_STAGE_NONE);
5460 got_fileindex_entry_staged_filetype_set(ie, 0);
5462 err = got_fileindex_entry_update(ie,
5463 worktree->root_fd, relpath,
5464 ct->staged_blob_id->sha1,
5465 new_base_commit_id->sha1,
5466 !have_staged_files);
5467 } else
5468 err = got_fileindex_entry_update(ie,
5469 worktree->root_fd, relpath,
5470 ct->blob_id->sha1,
5471 new_base_commit_id->sha1,
5472 !have_staged_files);
5473 } else {
5474 err = got_fileindex_entry_alloc(&ie, pe->path);
5475 if (err)
5476 goto done;
5477 err = got_fileindex_entry_update(ie,
5478 worktree->root_fd, relpath, ct->blob_id->sha1,
5479 new_base_commit_id->sha1, 1);
5480 if (err) {
5481 got_fileindex_entry_free(ie);
5482 goto done;
5484 err = got_fileindex_entry_add(fileindex, ie);
5485 if (err) {
5486 got_fileindex_entry_free(ie);
5487 goto done;
5490 free(relpath);
5491 relpath = NULL;
5493 done:
5494 free(relpath);
5495 return err;
5499 static const struct got_error *
5500 check_out_of_date(const char *in_repo_path, unsigned char status,
5501 unsigned char staged_status, struct got_object_id *base_blob_id,
5502 struct got_object_id *base_commit_id,
5503 struct got_object_id *head_commit_id, struct got_repository *repo,
5504 int ood_errcode)
5506 const struct got_error *err = NULL;
5507 struct got_object_id *id = NULL;
5509 if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5510 /* Trivial case: base commit == head commit */
5511 if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5512 return NULL;
5514 * Ensure file content which local changes were based
5515 * on matches file content in the branch head.
5517 err = got_object_id_by_path(&id, repo, head_commit_id,
5518 in_repo_path);
5519 if (err) {
5520 if (err->code == GOT_ERR_NO_TREE_ENTRY)
5521 err = got_error(ood_errcode);
5522 goto done;
5523 } else if (got_object_id_cmp(id, base_blob_id) != 0)
5524 err = got_error(ood_errcode);
5525 } else {
5526 /* Require that added files don't exist in the branch head. */
5527 err = got_object_id_by_path(&id, repo, head_commit_id,
5528 in_repo_path);
5529 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5530 goto done;
5531 err = id ? got_error(ood_errcode) : NULL;
5533 done:
5534 free(id);
5535 return err;
5538 const struct got_error *
5539 commit_worktree(struct got_object_id **new_commit_id,
5540 struct got_pathlist_head *commitable_paths,
5541 struct got_object_id *head_commit_id, struct got_worktree *worktree,
5542 const char *author, const char *committer,
5543 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5544 got_worktree_status_cb status_cb, void *status_arg,
5545 struct got_repository *repo)
5547 const struct got_error *err = NULL, *unlockerr = NULL;
5548 struct got_pathlist_entry *pe;
5549 const char *head_ref_name = NULL;
5550 struct got_commit_object *head_commit = NULL;
5551 struct got_reference *head_ref2 = NULL;
5552 struct got_object_id *head_commit_id2 = NULL;
5553 struct got_tree_object *head_tree = NULL;
5554 struct got_object_id *new_tree_id = NULL;
5555 int nentries;
5556 struct got_object_id_queue parent_ids;
5557 struct got_object_qid *pid = NULL;
5558 char *logmsg = NULL;
5560 *new_commit_id = NULL;
5562 STAILQ_INIT(&parent_ids);
5564 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5565 if (err)
5566 goto done;
5568 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5569 if (err)
5570 goto done;
5572 if (commit_msg_cb != NULL) {
5573 err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5574 if (err)
5575 goto done;
5578 if (logmsg == NULL || strlen(logmsg) == 0) {
5579 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5580 goto done;
5583 /* Create blobs from added and modified files and record their IDs. */
5584 TAILQ_FOREACH(pe, commitable_paths, entry) {
5585 struct got_commitable *ct = pe->data;
5586 char *ondisk_path;
5588 /* Blobs for staged files already exist. */
5589 if (ct->staged_status == GOT_STATUS_ADD ||
5590 ct->staged_status == GOT_STATUS_MODIFY)
5591 continue;
5593 if (ct->status != GOT_STATUS_ADD &&
5594 ct->status != GOT_STATUS_MODIFY &&
5595 ct->status != GOT_STATUS_MODE_CHANGE)
5596 continue;
5598 if (asprintf(&ondisk_path, "%s/%s",
5599 worktree->root_path, pe->path) == -1) {
5600 err = got_error_from_errno("asprintf");
5601 goto done;
5603 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5604 free(ondisk_path);
5605 if (err)
5606 goto done;
5609 /* Recursively write new tree objects. */
5610 err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5611 commitable_paths, status_cb, status_arg, repo);
5612 if (err)
5613 goto done;
5615 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5616 if (err)
5617 goto done;
5618 STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5619 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5620 1, author, time(NULL), committer, time(NULL), logmsg, repo);
5621 got_object_qid_free(pid);
5622 if (logmsg != NULL)
5623 free(logmsg);
5624 if (err)
5625 goto done;
5627 /* Check if a concurrent commit to our branch has occurred. */
5628 head_ref_name = got_worktree_get_head_ref_name(worktree);
5629 if (head_ref_name == NULL) {
5630 err = got_error_from_errno("got_worktree_get_head_ref_name");
5631 goto done;
5633 /* Lock the reference here to prevent concurrent modification. */
5634 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5635 if (err)
5636 goto done;
5637 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5638 if (err)
5639 goto done;
5640 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5641 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5642 goto done;
5644 /* Update branch head in repository. */
5645 err = got_ref_change_ref(head_ref2, *new_commit_id);
5646 if (err)
5647 goto done;
5648 err = got_ref_write(head_ref2, repo);
5649 if (err)
5650 goto done;
5652 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5653 if (err)
5654 goto done;
5656 err = ref_base_commit(worktree, repo);
5657 if (err)
5658 goto done;
5659 done:
5660 if (head_tree)
5661 got_object_tree_close(head_tree);
5662 if (head_commit)
5663 got_object_commit_close(head_commit);
5664 free(head_commit_id2);
5665 if (head_ref2) {
5666 unlockerr = got_ref_unlock(head_ref2);
5667 if (unlockerr && err == NULL)
5668 err = unlockerr;
5669 got_ref_close(head_ref2);
5671 return err;
5674 static const struct got_error *
5675 check_path_is_commitable(const char *path,
5676 struct got_pathlist_head *commitable_paths)
5678 struct got_pathlist_entry *cpe = NULL;
5679 size_t path_len = strlen(path);
5681 TAILQ_FOREACH(cpe, commitable_paths, entry) {
5682 struct got_commitable *ct = cpe->data;
5683 const char *ct_path = ct->path;
5685 while (ct_path[0] == '/')
5686 ct_path++;
5688 if (strcmp(path, ct_path) == 0 ||
5689 got_path_is_child(ct_path, path, path_len))
5690 break;
5693 if (cpe == NULL)
5694 return got_error_path(path, GOT_ERR_BAD_PATH);
5696 return NULL;
5699 static const struct got_error *
5700 check_staged_file(void *arg, struct got_fileindex_entry *ie)
5702 int *have_staged_files = arg;
5704 if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5705 *have_staged_files = 1;
5706 return got_error(GOT_ERR_CANCELLED);
5709 return NULL;
5712 static const struct got_error *
5713 check_non_staged_files(struct got_fileindex *fileindex,
5714 struct got_pathlist_head *paths)
5716 struct got_pathlist_entry *pe;
5717 struct got_fileindex_entry *ie;
5719 TAILQ_FOREACH(pe, paths, entry) {
5720 if (pe->path[0] == '\0')
5721 continue;
5722 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5723 if (ie == NULL)
5724 return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5725 if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5726 return got_error_path(pe->path,
5727 GOT_ERR_FILE_NOT_STAGED);
5730 return NULL;
5733 const struct got_error *
5734 got_worktree_commit(struct got_object_id **new_commit_id,
5735 struct got_worktree *worktree, struct got_pathlist_head *paths,
5736 const char *author, const char *committer, int allow_bad_symlinks,
5737 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5738 got_worktree_status_cb status_cb, void *status_arg,
5739 struct got_repository *repo)
5741 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5742 struct got_fileindex *fileindex = NULL;
5743 char *fileindex_path = NULL;
5744 struct got_pathlist_head commitable_paths;
5745 struct collect_commitables_arg cc_arg;
5746 struct got_pathlist_entry *pe;
5747 struct got_reference *head_ref = NULL;
5748 struct got_object_id *head_commit_id = NULL;
5749 int have_staged_files = 0;
5751 *new_commit_id = NULL;
5753 TAILQ_INIT(&commitable_paths);
5755 err = lock_worktree(worktree, LOCK_EX);
5756 if (err)
5757 goto done;
5759 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5760 if (err)
5761 goto done;
5763 err = got_ref_resolve(&head_commit_id, repo, head_ref);
5764 if (err)
5765 goto done;
5767 err = open_fileindex(&fileindex, &fileindex_path, worktree);
5768 if (err)
5769 goto done;
5771 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5772 &have_staged_files);
5773 if (err && err->code != GOT_ERR_CANCELLED)
5774 goto done;
5775 if (have_staged_files) {
5776 err = check_non_staged_files(fileindex, paths);
5777 if (err)
5778 goto done;
5781 cc_arg.commitable_paths = &commitable_paths;
5782 cc_arg.worktree = worktree;
5783 cc_arg.fileindex = fileindex;
5784 cc_arg.repo = repo;
5785 cc_arg.have_staged_files = have_staged_files;
5786 cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5787 TAILQ_FOREACH(pe, paths, entry) {
5788 err = worktree_status(worktree, pe->path, fileindex, repo,
5789 collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5790 if (err)
5791 goto done;
5794 if (TAILQ_EMPTY(&commitable_paths)) {
5795 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5796 goto done;
5799 TAILQ_FOREACH(pe, paths, entry) {
5800 err = check_path_is_commitable(pe->path, &commitable_paths);
5801 if (err)
5802 goto done;
5805 TAILQ_FOREACH(pe, &commitable_paths, entry) {
5806 struct got_commitable *ct = pe->data;
5807 const char *ct_path = ct->in_repo_path;
5809 while (ct_path[0] == '/')
5810 ct_path++;
5811 err = check_out_of_date(ct_path, ct->status,
5812 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5813 head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5814 if (err)
5815 goto done;
5819 err = commit_worktree(new_commit_id, &commitable_paths,
5820 head_commit_id, worktree, author, committer,
5821 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5822 if (err)
5823 goto done;
5825 err = update_fileindex_after_commit(worktree, &commitable_paths,
5826 *new_commit_id, fileindex, have_staged_files);
5827 sync_err = sync_fileindex(fileindex, fileindex_path);
5828 if (sync_err && err == NULL)
5829 err = sync_err;
5830 done:
5831 if (fileindex)
5832 got_fileindex_free(fileindex);
5833 free(fileindex_path);
5834 unlockerr = lock_worktree(worktree, LOCK_SH);
5835 if (unlockerr && err == NULL)
5836 err = unlockerr;
5837 TAILQ_FOREACH(pe, &commitable_paths, entry) {
5838 struct got_commitable *ct = pe->data;
5839 free_commitable(ct);
5841 got_pathlist_free(&commitable_paths);
5842 return err;
5845 const char *
5846 got_commitable_get_path(struct got_commitable *ct)
5848 return ct->path;
5851 unsigned int
5852 got_commitable_get_status(struct got_commitable *ct)
5854 return ct->status;
5857 struct check_rebase_ok_arg {
5858 struct got_worktree *worktree;
5859 struct got_repository *repo;
5862 static const struct got_error *
5863 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5865 const struct got_error *err = NULL;
5866 struct check_rebase_ok_arg *a = arg;
5867 unsigned char status;
5868 struct stat sb;
5869 char *ondisk_path;
5871 /* Reject rebase of a work tree with mixed base commits. */
5872 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5873 SHA1_DIGEST_LENGTH))
5874 return got_error(GOT_ERR_MIXED_COMMITS);
5876 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5877 == -1)
5878 return got_error_from_errno("asprintf");
5880 /* Reject rebase of a work tree with modified or staged files. */
5881 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5882 free(ondisk_path);
5883 if (err)
5884 return err;
5886 if (status != GOT_STATUS_NO_CHANGE)
5887 return got_error(GOT_ERR_MODIFIED);
5888 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5889 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5891 return NULL;
5894 const struct got_error *
5895 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5896 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5897 struct got_worktree *worktree, struct got_reference *branch,
5898 struct got_repository *repo)
5900 const struct got_error *err = NULL;
5901 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5902 char *branch_ref_name = NULL;
5903 char *fileindex_path = NULL;
5904 struct check_rebase_ok_arg ok_arg;
5905 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5906 struct got_object_id *wt_branch_tip = NULL;
5908 *new_base_branch_ref = NULL;
5909 *tmp_branch = NULL;
5910 *fileindex = NULL;
5912 err = lock_worktree(worktree, LOCK_EX);
5913 if (err)
5914 return err;
5916 err = open_fileindex(fileindex, &fileindex_path, worktree);
5917 if (err)
5918 goto done;
5920 ok_arg.worktree = worktree;
5921 ok_arg.repo = repo;
5922 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5923 &ok_arg);
5924 if (err)
5925 goto done;
5927 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5928 if (err)
5929 goto done;
5931 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5932 if (err)
5933 goto done;
5935 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5936 if (err)
5937 goto done;
5939 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5940 0);
5941 if (err)
5942 goto done;
5944 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5945 if (err)
5946 goto done;
5947 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5948 err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5949 goto done;
5952 err = got_ref_alloc_symref(new_base_branch_ref,
5953 new_base_branch_ref_name, wt_branch);
5954 if (err)
5955 goto done;
5956 err = got_ref_write(*new_base_branch_ref, repo);
5957 if (err)
5958 goto done;
5960 /* TODO Lock original branch's ref while rebasing? */
5962 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5963 if (err)
5964 goto done;
5966 err = got_ref_write(branch_ref, repo);
5967 if (err)
5968 goto done;
5970 err = got_ref_alloc(tmp_branch, tmp_branch_name,
5971 worktree->base_commit_id);
5972 if (err)
5973 goto done;
5974 err = got_ref_write(*tmp_branch, repo);
5975 if (err)
5976 goto done;
5978 err = got_worktree_set_head_ref(worktree, *tmp_branch);
5979 if (err)
5980 goto done;
5981 done:
5982 free(fileindex_path);
5983 free(tmp_branch_name);
5984 free(new_base_branch_ref_name);
5985 free(branch_ref_name);
5986 if (branch_ref)
5987 got_ref_close(branch_ref);
5988 if (wt_branch)
5989 got_ref_close(wt_branch);
5990 free(wt_branch_tip);
5991 if (err) {
5992 if (*new_base_branch_ref) {
5993 got_ref_close(*new_base_branch_ref);
5994 *new_base_branch_ref = NULL;
5996 if (*tmp_branch) {
5997 got_ref_close(*tmp_branch);
5998 *tmp_branch = NULL;
6000 if (*fileindex) {
6001 got_fileindex_free(*fileindex);
6002 *fileindex = NULL;
6004 lock_worktree(worktree, LOCK_SH);
6006 return err;
6009 const struct got_error *
6010 got_worktree_rebase_continue(struct got_object_id **commit_id,
6011 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6012 struct got_reference **branch, struct got_fileindex **fileindex,
6013 struct got_worktree *worktree, struct got_repository *repo)
6015 const struct got_error *err;
6016 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6017 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6018 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6019 char *fileindex_path = NULL;
6020 int have_staged_files = 0;
6022 *commit_id = NULL;
6023 *new_base_branch = NULL;
6024 *tmp_branch = NULL;
6025 *branch = NULL;
6026 *fileindex = NULL;
6028 err = lock_worktree(worktree, LOCK_EX);
6029 if (err)
6030 return err;
6032 err = open_fileindex(fileindex, &fileindex_path, worktree);
6033 if (err)
6034 goto done;
6036 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6037 &have_staged_files);
6038 if (err && err->code != GOT_ERR_CANCELLED)
6039 goto done;
6040 if (have_staged_files) {
6041 err = got_error(GOT_ERR_STAGED_PATHS);
6042 goto done;
6045 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6046 if (err)
6047 goto done;
6049 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6050 if (err)
6051 goto done;
6053 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6054 if (err)
6055 goto done;
6057 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6058 if (err)
6059 goto done;
6061 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6062 if (err)
6063 goto done;
6065 err = got_ref_open(branch, repo,
6066 got_ref_get_symref_target(branch_ref), 0);
6067 if (err)
6068 goto done;
6070 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6071 if (err)
6072 goto done;
6074 err = got_ref_resolve(commit_id, repo, commit_ref);
6075 if (err)
6076 goto done;
6078 err = got_ref_open(new_base_branch, repo,
6079 new_base_branch_ref_name, 0);
6080 if (err)
6081 goto done;
6083 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6084 if (err)
6085 goto done;
6086 done:
6087 free(commit_ref_name);
6088 free(branch_ref_name);
6089 free(fileindex_path);
6090 if (commit_ref)
6091 got_ref_close(commit_ref);
6092 if (branch_ref)
6093 got_ref_close(branch_ref);
6094 if (err) {
6095 free(*commit_id);
6096 *commit_id = NULL;
6097 if (*tmp_branch) {
6098 got_ref_close(*tmp_branch);
6099 *tmp_branch = NULL;
6101 if (*new_base_branch) {
6102 got_ref_close(*new_base_branch);
6103 *new_base_branch = NULL;
6105 if (*branch) {
6106 got_ref_close(*branch);
6107 *branch = NULL;
6109 if (*fileindex) {
6110 got_fileindex_free(*fileindex);
6111 *fileindex = NULL;
6113 lock_worktree(worktree, LOCK_SH);
6115 return err;
6118 const struct got_error *
6119 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6121 const struct got_error *err;
6122 char *tmp_branch_name = NULL;
6124 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6125 if (err)
6126 return err;
6128 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6129 free(tmp_branch_name);
6130 return NULL;
6133 static const struct got_error *
6134 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6135 char **logmsg, void *arg)
6137 *logmsg = arg;
6138 return NULL;
6141 static const struct got_error *
6142 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6143 const char *path, struct got_object_id *blob_id,
6144 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6145 int dirfd, const char *de_name)
6147 return NULL;
6150 struct collect_merged_paths_arg {
6151 got_worktree_checkout_cb progress_cb;
6152 void *progress_arg;
6153 struct got_pathlist_head *merged_paths;
6156 static const struct got_error *
6157 collect_merged_paths(void *arg, unsigned char status, const char *path)
6159 const struct got_error *err;
6160 struct collect_merged_paths_arg *a = arg;
6161 char *p;
6162 struct got_pathlist_entry *new;
6164 err = (*a->progress_cb)(a->progress_arg, status, path);
6165 if (err)
6166 return err;
6168 if (status != GOT_STATUS_MERGE &&
6169 status != GOT_STATUS_ADD &&
6170 status != GOT_STATUS_DELETE &&
6171 status != GOT_STATUS_CONFLICT)
6172 return NULL;
6174 p = strdup(path);
6175 if (p == NULL)
6176 return got_error_from_errno("strdup");
6178 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6179 if (err || new == NULL)
6180 free(p);
6181 return err;
6184 void
6185 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6187 struct got_pathlist_entry *pe;
6189 TAILQ_FOREACH(pe, merged_paths, entry)
6190 free((char *)pe->path);
6192 got_pathlist_free(merged_paths);
6195 static const struct got_error *
6196 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6197 int is_rebase, struct got_repository *repo)
6199 const struct got_error *err;
6200 struct got_reference *commit_ref = NULL;
6202 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6203 if (err) {
6204 if (err->code != GOT_ERR_NOT_REF)
6205 goto done;
6206 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6207 if (err)
6208 goto done;
6209 err = got_ref_write(commit_ref, repo);
6210 if (err)
6211 goto done;
6212 } else if (is_rebase) {
6213 struct got_object_id *stored_id;
6214 int cmp;
6216 err = got_ref_resolve(&stored_id, repo, commit_ref);
6217 if (err)
6218 goto done;
6219 cmp = got_object_id_cmp(commit_id, stored_id);
6220 free(stored_id);
6221 if (cmp != 0) {
6222 err = got_error(GOT_ERR_REBASE_COMMITID);
6223 goto done;
6226 done:
6227 if (commit_ref)
6228 got_ref_close(commit_ref);
6229 return err;
6232 static const struct got_error *
6233 rebase_merge_files(struct got_pathlist_head *merged_paths,
6234 const char *commit_ref_name, struct got_worktree *worktree,
6235 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6236 struct got_object_id *commit_id, struct got_repository *repo,
6237 got_worktree_checkout_cb progress_cb, void *progress_arg,
6238 got_cancel_cb cancel_cb, void *cancel_arg)
6240 const struct got_error *err;
6241 struct got_reference *commit_ref = NULL;
6242 struct collect_merged_paths_arg cmp_arg;
6243 char *fileindex_path;
6245 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6247 err = get_fileindex_path(&fileindex_path, worktree);
6248 if (err)
6249 return err;
6251 cmp_arg.progress_cb = progress_cb;
6252 cmp_arg.progress_arg = progress_arg;
6253 cmp_arg.merged_paths = merged_paths;
6254 err = merge_files(worktree, fileindex, fileindex_path,
6255 parent_commit_id, commit_id, repo, collect_merged_paths,
6256 &cmp_arg, cancel_cb, cancel_arg);
6257 if (commit_ref)
6258 got_ref_close(commit_ref);
6259 return err;
6262 const struct got_error *
6263 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6264 struct got_worktree *worktree, struct got_fileindex *fileindex,
6265 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6266 struct got_repository *repo,
6267 got_worktree_checkout_cb progress_cb, void *progress_arg,
6268 got_cancel_cb cancel_cb, void *cancel_arg)
6270 const struct got_error *err;
6271 char *commit_ref_name;
6273 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6274 if (err)
6275 return err;
6277 err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6278 if (err)
6279 goto done;
6281 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6282 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6283 progress_arg, cancel_cb, cancel_arg);
6284 done:
6285 free(commit_ref_name);
6286 return err;
6289 const struct got_error *
6290 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6291 struct got_worktree *worktree, struct got_fileindex *fileindex,
6292 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6293 struct got_repository *repo,
6294 got_worktree_checkout_cb progress_cb, void *progress_arg,
6295 got_cancel_cb cancel_cb, void *cancel_arg)
6297 const struct got_error *err;
6298 char *commit_ref_name;
6300 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6301 if (err)
6302 return err;
6304 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6305 if (err)
6306 goto done;
6308 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6309 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6310 progress_arg, cancel_cb, cancel_arg);
6311 done:
6312 free(commit_ref_name);
6313 return err;
6316 static const struct got_error *
6317 rebase_commit(struct got_object_id **new_commit_id,
6318 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6319 struct got_worktree *worktree, struct got_fileindex *fileindex,
6320 struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6321 const char *new_logmsg, struct got_repository *repo)
6323 const struct got_error *err, *sync_err;
6324 struct got_pathlist_head commitable_paths;
6325 struct collect_commitables_arg cc_arg;
6326 char *fileindex_path = NULL;
6327 struct got_reference *head_ref = NULL;
6328 struct got_object_id *head_commit_id = NULL;
6329 char *logmsg = NULL;
6331 TAILQ_INIT(&commitable_paths);
6332 *new_commit_id = NULL;
6334 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6336 err = get_fileindex_path(&fileindex_path, worktree);
6337 if (err)
6338 return err;
6340 cc_arg.commitable_paths = &commitable_paths;
6341 cc_arg.worktree = worktree;
6342 cc_arg.repo = repo;
6343 cc_arg.have_staged_files = 0;
6345 * If possible get the status of individual files directly to
6346 * avoid crawling the entire work tree once per rebased commit.
6347 * TODO: Ideally, merged_paths would contain a list of commitables
6348 * we could use so we could skip worktree_status() entirely.
6350 if (merged_paths) {
6351 struct got_pathlist_entry *pe;
6352 TAILQ_FOREACH(pe, merged_paths, entry) {
6353 err = worktree_status(worktree, pe->path, fileindex,
6354 repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6355 0);
6356 if (err)
6357 goto done;
6359 } else {
6360 err = worktree_status(worktree, "", fileindex, repo,
6361 collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6362 if (err)
6363 goto done;
6366 if (TAILQ_EMPTY(&commitable_paths)) {
6367 /* No-op change; commit will be elided. */
6368 err = got_ref_delete(commit_ref, repo);
6369 if (err)
6370 goto done;
6371 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6372 goto done;
6375 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6376 if (err)
6377 goto done;
6379 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6380 if (err)
6381 goto done;
6383 if (new_logmsg) {
6384 logmsg = strdup(new_logmsg);
6385 if (logmsg == NULL) {
6386 err = got_error_from_errno("strdup");
6387 goto done;
6389 } else {
6390 err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6391 if (err)
6392 goto done;
6395 /* NB: commit_worktree will call free(logmsg) */
6396 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6397 worktree, got_object_commit_get_author(orig_commit),
6398 got_object_commit_get_committer(orig_commit),
6399 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6400 if (err)
6401 goto done;
6403 err = got_ref_change_ref(tmp_branch, *new_commit_id);
6404 if (err)
6405 goto done;
6407 err = got_ref_delete(commit_ref, repo);
6408 if (err)
6409 goto done;
6411 err = update_fileindex_after_commit(worktree, &commitable_paths,
6412 *new_commit_id, fileindex, 0);
6413 sync_err = sync_fileindex(fileindex, fileindex_path);
6414 if (sync_err && err == NULL)
6415 err = sync_err;
6416 done:
6417 free(fileindex_path);
6418 free(head_commit_id);
6419 if (head_ref)
6420 got_ref_close(head_ref);
6421 if (err) {
6422 free(*new_commit_id);
6423 *new_commit_id = NULL;
6425 return err;
6428 const struct got_error *
6429 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6430 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6431 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6432 struct got_commit_object *orig_commit,
6433 struct got_object_id *orig_commit_id, struct got_repository *repo)
6435 const struct got_error *err;
6436 char *commit_ref_name;
6437 struct got_reference *commit_ref = NULL;
6438 struct got_object_id *commit_id = NULL;
6440 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6441 if (err)
6442 return err;
6444 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6445 if (err)
6446 goto done;
6447 err = got_ref_resolve(&commit_id, repo, commit_ref);
6448 if (err)
6449 goto done;
6450 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6451 err = got_error(GOT_ERR_REBASE_COMMITID);
6452 goto done;
6455 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6456 worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6457 done:
6458 if (commit_ref)
6459 got_ref_close(commit_ref);
6460 free(commit_ref_name);
6461 free(commit_id);
6462 return err;
6465 const struct got_error *
6466 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6467 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6468 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6469 struct got_commit_object *orig_commit,
6470 struct got_object_id *orig_commit_id, const char *new_logmsg,
6471 struct got_repository *repo)
6473 const struct got_error *err;
6474 char *commit_ref_name;
6475 struct got_reference *commit_ref = NULL;
6477 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6478 if (err)
6479 return err;
6481 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6482 if (err)
6483 goto done;
6485 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6486 worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6487 done:
6488 if (commit_ref)
6489 got_ref_close(commit_ref);
6490 free(commit_ref_name);
6491 return err;
6494 const struct got_error *
6495 got_worktree_rebase_postpone(struct got_worktree *worktree,
6496 struct got_fileindex *fileindex)
6498 if (fileindex)
6499 got_fileindex_free(fileindex);
6500 return lock_worktree(worktree, LOCK_SH);
6503 static const struct got_error *
6504 delete_ref(const char *name, struct got_repository *repo)
6506 const struct got_error *err;
6507 struct got_reference *ref;
6509 err = got_ref_open(&ref, repo, name, 0);
6510 if (err) {
6511 if (err->code == GOT_ERR_NOT_REF)
6512 return NULL;
6513 return err;
6516 err = got_ref_delete(ref, repo);
6517 got_ref_close(ref);
6518 return err;
6521 static const struct got_error *
6522 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6524 const struct got_error *err;
6525 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6526 char *branch_ref_name = NULL, *commit_ref_name = NULL;
6528 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6529 if (err)
6530 goto done;
6531 err = delete_ref(tmp_branch_name, repo);
6532 if (err)
6533 goto done;
6535 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6536 if (err)
6537 goto done;
6538 err = delete_ref(new_base_branch_ref_name, repo);
6539 if (err)
6540 goto done;
6542 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6543 if (err)
6544 goto done;
6545 err = delete_ref(branch_ref_name, repo);
6546 if (err)
6547 goto done;
6549 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6550 if (err)
6551 goto done;
6552 err = delete_ref(commit_ref_name, repo);
6553 if (err)
6554 goto done;
6556 done:
6557 free(tmp_branch_name);
6558 free(new_base_branch_ref_name);
6559 free(branch_ref_name);
6560 free(commit_ref_name);
6561 return err;
6564 const struct got_error *
6565 create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6566 struct got_object_id *new_commit_id, struct got_repository *repo)
6568 const struct got_error *err;
6569 struct got_reference *ref = NULL;
6570 struct got_object_id *old_commit_id = NULL;
6571 const char *branch_name = NULL;
6572 char *new_id_str = NULL;
6573 char *refname = NULL;
6575 branch_name = got_ref_get_name(branch);
6576 if (strncmp(branch_name, "refs/heads/", 11) != 0)
6577 return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6578 branch_name += 11;
6580 err = got_object_id_str(&new_id_str, new_commit_id);
6581 if (err)
6582 return err;
6584 if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6585 new_id_str) == -1) {
6586 err = got_error_from_errno("asprintf");
6587 goto done;
6590 err = got_ref_resolve(&old_commit_id, repo, branch);
6591 if (err)
6592 goto done;
6594 err = got_ref_alloc(&ref, refname, old_commit_id);
6595 if (err)
6596 goto done;
6598 err = got_ref_write(ref, repo);
6599 done:
6600 free(new_id_str);
6601 free(refname);
6602 free(old_commit_id);
6603 if (ref)
6604 got_ref_close(ref);
6605 return err;
6608 const struct got_error *
6609 got_worktree_rebase_complete(struct got_worktree *worktree,
6610 struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6611 struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6612 struct got_repository *repo, int create_backup)
6614 const struct got_error *err, *unlockerr, *sync_err;
6615 struct got_object_id *new_head_commit_id = NULL;
6616 char *fileindex_path = NULL;
6618 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6619 if (err)
6620 return err;
6622 if (create_backup) {
6623 err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6624 rebased_branch, new_head_commit_id, repo);
6625 if (err)
6626 goto done;
6629 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6630 if (err)
6631 goto done;
6633 err = got_ref_write(rebased_branch, repo);
6634 if (err)
6635 goto done;
6637 err = got_worktree_set_head_ref(worktree, rebased_branch);
6638 if (err)
6639 goto done;
6641 err = delete_rebase_refs(worktree, repo);
6642 if (err)
6643 goto done;
6645 err = get_fileindex_path(&fileindex_path, worktree);
6646 if (err)
6647 goto done;
6648 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6649 sync_err = sync_fileindex(fileindex, fileindex_path);
6650 if (sync_err && err == NULL)
6651 err = sync_err;
6652 done:
6653 got_fileindex_free(fileindex);
6654 free(fileindex_path);
6655 free(new_head_commit_id);
6656 unlockerr = lock_worktree(worktree, LOCK_SH);
6657 if (unlockerr && err == NULL)
6658 err = unlockerr;
6659 return err;
6662 const struct got_error *
6663 got_worktree_rebase_abort(struct got_worktree *worktree,
6664 struct got_fileindex *fileindex, struct got_repository *repo,
6665 struct got_reference *new_base_branch,
6666 got_worktree_checkout_cb progress_cb, void *progress_arg)
6668 const struct got_error *err, *unlockerr, *sync_err;
6669 struct got_reference *resolved = NULL;
6670 struct got_object_id *commit_id = NULL;
6671 char *fileindex_path = NULL;
6672 struct revert_file_args rfa;
6673 struct got_object_id *tree_id = NULL;
6675 err = lock_worktree(worktree, LOCK_EX);
6676 if (err)
6677 return err;
6679 err = got_ref_open(&resolved, repo,
6680 got_ref_get_symref_target(new_base_branch), 0);
6681 if (err)
6682 goto done;
6684 err = got_worktree_set_head_ref(worktree, resolved);
6685 if (err)
6686 goto done;
6689 * XXX commits to the base branch could have happened while
6690 * we were busy rebasing; should we store the original commit ID
6691 * when rebase begins and read it back here?
6693 err = got_ref_resolve(&commit_id, repo, resolved);
6694 if (err)
6695 goto done;
6697 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6698 if (err)
6699 goto done;
6701 err = got_object_id_by_path(&tree_id, repo,
6702 worktree->base_commit_id, worktree->path_prefix);
6703 if (err)
6704 goto done;
6706 err = delete_rebase_refs(worktree, repo);
6707 if (err)
6708 goto done;
6710 err = get_fileindex_path(&fileindex_path, worktree);
6711 if (err)
6712 goto done;
6714 rfa.worktree = worktree;
6715 rfa.fileindex = fileindex;
6716 rfa.progress_cb = progress_cb;
6717 rfa.progress_arg = progress_arg;
6718 rfa.patch_cb = NULL;
6719 rfa.patch_arg = NULL;
6720 rfa.repo = repo;
6721 err = worktree_status(worktree, "", fileindex, repo,
6722 revert_file, &rfa, NULL, NULL, 0, 0);
6723 if (err)
6724 goto sync;
6726 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6727 repo, progress_cb, progress_arg, NULL, NULL);
6728 sync:
6729 sync_err = sync_fileindex(fileindex, fileindex_path);
6730 if (sync_err && err == NULL)
6731 err = sync_err;
6732 done:
6733 got_ref_close(resolved);
6734 free(tree_id);
6735 free(commit_id);
6736 if (fileindex)
6737 got_fileindex_free(fileindex);
6738 free(fileindex_path);
6740 unlockerr = lock_worktree(worktree, LOCK_SH);
6741 if (unlockerr && err == NULL)
6742 err = unlockerr;
6743 return err;
6746 const struct got_error *
6747 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6748 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6749 struct got_fileindex **fileindex, struct got_worktree *worktree,
6750 struct got_repository *repo)
6752 const struct got_error *err = NULL;
6753 char *tmp_branch_name = NULL;
6754 char *branch_ref_name = NULL;
6755 char *base_commit_ref_name = NULL;
6756 char *fileindex_path = NULL;
6757 struct check_rebase_ok_arg ok_arg;
6758 struct got_reference *wt_branch = NULL;
6759 struct got_reference *base_commit_ref = NULL;
6761 *tmp_branch = NULL;
6762 *branch_ref = NULL;
6763 *base_commit_id = NULL;
6764 *fileindex = NULL;
6766 err = lock_worktree(worktree, LOCK_EX);
6767 if (err)
6768 return err;
6770 err = open_fileindex(fileindex, &fileindex_path, worktree);
6771 if (err)
6772 goto done;
6774 ok_arg.worktree = worktree;
6775 ok_arg.repo = repo;
6776 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6777 &ok_arg);
6778 if (err)
6779 goto done;
6781 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6782 if (err)
6783 goto done;
6785 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6786 if (err)
6787 goto done;
6789 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6790 worktree);
6791 if (err)
6792 goto done;
6794 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6795 0);
6796 if (err)
6797 goto done;
6799 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6800 if (err)
6801 goto done;
6803 err = got_ref_write(*branch_ref, repo);
6804 if (err)
6805 goto done;
6807 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6808 worktree->base_commit_id);
6809 if (err)
6810 goto done;
6811 err = got_ref_write(base_commit_ref, repo);
6812 if (err)
6813 goto done;
6814 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6815 if (*base_commit_id == NULL) {
6816 err = got_error_from_errno("got_object_id_dup");
6817 goto done;
6820 err = got_ref_alloc(tmp_branch, tmp_branch_name,
6821 worktree->base_commit_id);
6822 if (err)
6823 goto done;
6824 err = got_ref_write(*tmp_branch, repo);
6825 if (err)
6826 goto done;
6828 err = got_worktree_set_head_ref(worktree, *tmp_branch);
6829 if (err)
6830 goto done;
6831 done:
6832 free(fileindex_path);
6833 free(tmp_branch_name);
6834 free(branch_ref_name);
6835 free(base_commit_ref_name);
6836 if (wt_branch)
6837 got_ref_close(wt_branch);
6838 if (err) {
6839 if (*branch_ref) {
6840 got_ref_close(*branch_ref);
6841 *branch_ref = NULL;
6843 if (*tmp_branch) {
6844 got_ref_close(*tmp_branch);
6845 *tmp_branch = NULL;
6847 free(*base_commit_id);
6848 if (*fileindex) {
6849 got_fileindex_free(*fileindex);
6850 *fileindex = NULL;
6852 lock_worktree(worktree, LOCK_SH);
6854 return err;
6857 const struct got_error *
6858 got_worktree_histedit_postpone(struct got_worktree *worktree,
6859 struct got_fileindex *fileindex)
6861 if (fileindex)
6862 got_fileindex_free(fileindex);
6863 return lock_worktree(worktree, LOCK_SH);
6866 const struct got_error *
6867 got_worktree_histedit_in_progress(int *in_progress,
6868 struct got_worktree *worktree)
6870 const struct got_error *err;
6871 char *tmp_branch_name = NULL;
6873 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6874 if (err)
6875 return err;
6877 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6878 free(tmp_branch_name);
6879 return NULL;
6882 const struct got_error *
6883 got_worktree_histedit_continue(struct got_object_id **commit_id,
6884 struct got_reference **tmp_branch, struct got_reference **branch_ref,
6885 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6886 struct got_worktree *worktree, struct got_repository *repo)
6888 const struct got_error *err;
6889 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6890 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6891 struct got_reference *commit_ref = NULL;
6892 struct got_reference *base_commit_ref = NULL;
6893 char *fileindex_path = NULL;
6894 int have_staged_files = 0;
6896 *commit_id = NULL;
6897 *tmp_branch = NULL;
6898 *base_commit_id = NULL;
6899 *fileindex = NULL;
6901 err = lock_worktree(worktree, LOCK_EX);
6902 if (err)
6903 return err;
6905 err = open_fileindex(fileindex, &fileindex_path, worktree);
6906 if (err)
6907 goto done;
6909 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6910 &have_staged_files);
6911 if (err && err->code != GOT_ERR_CANCELLED)
6912 goto done;
6913 if (have_staged_files) {
6914 err = got_error(GOT_ERR_STAGED_PATHS);
6915 goto done;
6918 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6919 if (err)
6920 goto done;
6922 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6923 if (err)
6924 goto done;
6926 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6927 if (err)
6928 goto done;
6930 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6931 worktree);
6932 if (err)
6933 goto done;
6935 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6936 if (err)
6937 goto done;
6939 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6940 if (err)
6941 goto done;
6942 err = got_ref_resolve(commit_id, repo, commit_ref);
6943 if (err)
6944 goto done;
6946 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6947 if (err)
6948 goto done;
6949 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6950 if (err)
6951 goto done;
6953 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6954 if (err)
6955 goto done;
6956 done:
6957 free(commit_ref_name);
6958 free(branch_ref_name);
6959 free(fileindex_path);
6960 if (commit_ref)
6961 got_ref_close(commit_ref);
6962 if (base_commit_ref)
6963 got_ref_close(base_commit_ref);
6964 if (err) {
6965 free(*commit_id);
6966 *commit_id = NULL;
6967 free(*base_commit_id);
6968 *base_commit_id = NULL;
6969 if (*tmp_branch) {
6970 got_ref_close(*tmp_branch);
6971 *tmp_branch = NULL;
6973 if (*fileindex) {
6974 got_fileindex_free(*fileindex);
6975 *fileindex = NULL;
6977 lock_worktree(worktree, LOCK_EX);
6979 return err;
6982 static const struct got_error *
6983 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6985 const struct got_error *err;
6986 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6987 char *branch_ref_name = NULL, *commit_ref_name = NULL;
6989 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6990 if (err)
6991 goto done;
6992 err = delete_ref(tmp_branch_name, repo);
6993 if (err)
6994 goto done;
6996 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6997 worktree);
6998 if (err)
6999 goto done;
7000 err = delete_ref(base_commit_ref_name, repo);
7001 if (err)
7002 goto done;
7004 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7005 if (err)
7006 goto done;
7007 err = delete_ref(branch_ref_name, repo);
7008 if (err)
7009 goto done;
7011 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7012 if (err)
7013 goto done;
7014 err = delete_ref(commit_ref_name, repo);
7015 if (err)
7016 goto done;
7017 done:
7018 free(tmp_branch_name);
7019 free(base_commit_ref_name);
7020 free(branch_ref_name);
7021 free(commit_ref_name);
7022 return err;
7025 const struct got_error *
7026 got_worktree_histedit_abort(struct got_worktree *worktree,
7027 struct got_fileindex *fileindex, struct got_repository *repo,
7028 struct got_reference *branch, struct got_object_id *base_commit_id,
7029 got_worktree_checkout_cb progress_cb, void *progress_arg)
7031 const struct got_error *err, *unlockerr, *sync_err;
7032 struct got_reference *resolved = NULL;
7033 char *fileindex_path = NULL;
7034 struct got_object_id *tree_id = NULL;
7035 struct revert_file_args rfa;
7037 err = lock_worktree(worktree, LOCK_EX);
7038 if (err)
7039 return err;
7041 err = got_ref_open(&resolved, repo,
7042 got_ref_get_symref_target(branch), 0);
7043 if (err)
7044 goto done;
7046 err = got_worktree_set_head_ref(worktree, resolved);
7047 if (err)
7048 goto done;
7050 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7051 if (err)
7052 goto done;
7054 err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7055 worktree->path_prefix);
7056 if (err)
7057 goto done;
7059 err = delete_histedit_refs(worktree, repo);
7060 if (err)
7061 goto done;
7063 err = get_fileindex_path(&fileindex_path, worktree);
7064 if (err)
7065 goto done;
7067 rfa.worktree = worktree;
7068 rfa.fileindex = fileindex;
7069 rfa.progress_cb = progress_cb;
7070 rfa.progress_arg = progress_arg;
7071 rfa.patch_cb = NULL;
7072 rfa.patch_arg = NULL;
7073 rfa.repo = repo;
7074 err = worktree_status(worktree, "", fileindex, repo,
7075 revert_file, &rfa, NULL, NULL, 0, 0);
7076 if (err)
7077 goto sync;
7079 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7080 repo, progress_cb, progress_arg, NULL, NULL);
7081 sync:
7082 sync_err = sync_fileindex(fileindex, fileindex_path);
7083 if (sync_err && err == NULL)
7084 err = sync_err;
7085 done:
7086 got_ref_close(resolved);
7087 free(tree_id);
7088 free(fileindex_path);
7090 unlockerr = lock_worktree(worktree, LOCK_SH);
7091 if (unlockerr && err == NULL)
7092 err = unlockerr;
7093 return err;
7096 const struct got_error *
7097 got_worktree_histedit_complete(struct got_worktree *worktree,
7098 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7099 struct got_reference *edited_branch, struct got_repository *repo)
7101 const struct got_error *err, *unlockerr, *sync_err;
7102 struct got_object_id *new_head_commit_id = NULL;
7103 struct got_reference *resolved = NULL;
7104 char *fileindex_path = NULL;
7106 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7107 if (err)
7108 return err;
7110 err = got_ref_open(&resolved, repo,
7111 got_ref_get_symref_target(edited_branch), 0);
7112 if (err)
7113 goto done;
7115 err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7116 resolved, new_head_commit_id, repo);
7117 if (err)
7118 goto done;
7120 err = got_ref_change_ref(resolved, new_head_commit_id);
7121 if (err)
7122 goto done;
7124 err = got_ref_write(resolved, repo);
7125 if (err)
7126 goto done;
7128 err = got_worktree_set_head_ref(worktree, resolved);
7129 if (err)
7130 goto done;
7132 err = delete_histedit_refs(worktree, repo);
7133 if (err)
7134 goto done;
7136 err = get_fileindex_path(&fileindex_path, worktree);
7137 if (err)
7138 goto done;
7139 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7140 sync_err = sync_fileindex(fileindex, fileindex_path);
7141 if (sync_err && err == NULL)
7142 err = sync_err;
7143 done:
7144 got_fileindex_free(fileindex);
7145 free(fileindex_path);
7146 free(new_head_commit_id);
7147 unlockerr = lock_worktree(worktree, LOCK_SH);
7148 if (unlockerr && err == NULL)
7149 err = unlockerr;
7150 return err;
7153 const struct got_error *
7154 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7155 struct got_object_id *commit_id, struct got_repository *repo)
7157 const struct got_error *err;
7158 char *commit_ref_name;
7160 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7161 if (err)
7162 return err;
7164 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7165 if (err)
7166 goto done;
7168 err = delete_ref(commit_ref_name, repo);
7169 done:
7170 free(commit_ref_name);
7171 return err;
7174 const struct got_error *
7175 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7176 struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7177 struct got_worktree *worktree, const char *refname,
7178 struct got_repository *repo)
7180 const struct got_error *err = NULL;
7181 char *fileindex_path = NULL;
7182 struct check_rebase_ok_arg ok_arg;
7184 *fileindex = NULL;
7185 *branch_ref = NULL;
7186 *base_branch_ref = NULL;
7188 err = lock_worktree(worktree, LOCK_EX);
7189 if (err)
7190 return err;
7192 if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7193 err = got_error_msg(GOT_ERR_SAME_BRANCH,
7194 "cannot integrate a branch into itself; "
7195 "update -b or different branch name required");
7196 goto done;
7199 err = open_fileindex(fileindex, &fileindex_path, worktree);
7200 if (err)
7201 goto done;
7203 /* Preconditions are the same as for rebase. */
7204 ok_arg.worktree = worktree;
7205 ok_arg.repo = repo;
7206 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7207 &ok_arg);
7208 if (err)
7209 goto done;
7211 err = got_ref_open(branch_ref, repo, refname, 1);
7212 if (err)
7213 goto done;
7215 err = got_ref_open(base_branch_ref, repo,
7216 got_worktree_get_head_ref_name(worktree), 1);
7217 done:
7218 if (err) {
7219 if (*branch_ref) {
7220 got_ref_close(*branch_ref);
7221 *branch_ref = NULL;
7223 if (*base_branch_ref) {
7224 got_ref_close(*base_branch_ref);
7225 *base_branch_ref = NULL;
7227 if (*fileindex) {
7228 got_fileindex_free(*fileindex);
7229 *fileindex = NULL;
7231 lock_worktree(worktree, LOCK_SH);
7233 return err;
7236 const struct got_error *
7237 got_worktree_integrate_continue(struct got_worktree *worktree,
7238 struct got_fileindex *fileindex, struct got_repository *repo,
7239 struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7240 got_worktree_checkout_cb progress_cb, void *progress_arg,
7241 got_cancel_cb cancel_cb, void *cancel_arg)
7243 const struct got_error *err = NULL, *sync_err, *unlockerr;
7244 char *fileindex_path = NULL;
7245 struct got_object_id *tree_id = NULL, *commit_id = NULL;
7247 err = get_fileindex_path(&fileindex_path, worktree);
7248 if (err)
7249 goto done;
7251 err = got_ref_resolve(&commit_id, repo, branch_ref);
7252 if (err)
7253 goto done;
7255 err = got_object_id_by_path(&tree_id, repo, commit_id,
7256 worktree->path_prefix);
7257 if (err)
7258 goto done;
7260 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7261 if (err)
7262 goto done;
7264 err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7265 progress_cb, progress_arg, cancel_cb, cancel_arg);
7266 if (err)
7267 goto sync;
7269 err = got_ref_change_ref(base_branch_ref, commit_id);
7270 if (err)
7271 goto sync;
7273 err = got_ref_write(base_branch_ref, repo);
7274 if (err)
7275 goto sync;
7277 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7278 sync:
7279 sync_err = sync_fileindex(fileindex, fileindex_path);
7280 if (sync_err && err == NULL)
7281 err = sync_err;
7283 done:
7284 unlockerr = got_ref_unlock(branch_ref);
7285 if (unlockerr && err == NULL)
7286 err = unlockerr;
7287 got_ref_close(branch_ref);
7289 unlockerr = got_ref_unlock(base_branch_ref);
7290 if (unlockerr && err == NULL)
7291 err = unlockerr;
7292 got_ref_close(base_branch_ref);
7294 got_fileindex_free(fileindex);
7295 free(fileindex_path);
7296 free(tree_id);
7298 unlockerr = lock_worktree(worktree, LOCK_SH);
7299 if (unlockerr && err == NULL)
7300 err = unlockerr;
7301 return err;
7304 const struct got_error *
7305 got_worktree_integrate_abort(struct got_worktree *worktree,
7306 struct got_fileindex *fileindex, struct got_repository *repo,
7307 struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7309 const struct got_error *err = NULL, *unlockerr = NULL;
7311 got_fileindex_free(fileindex);
7313 err = lock_worktree(worktree, LOCK_SH);
7315 unlockerr = got_ref_unlock(branch_ref);
7316 if (unlockerr && err == NULL)
7317 err = unlockerr;
7318 got_ref_close(branch_ref);
7320 unlockerr = got_ref_unlock(base_branch_ref);
7321 if (unlockerr && err == NULL)
7322 err = unlockerr;
7323 got_ref_close(base_branch_ref);
7325 return err;
7328 struct check_stage_ok_arg {
7329 struct got_object_id *head_commit_id;
7330 struct got_worktree *worktree;
7331 struct got_fileindex *fileindex;
7332 struct got_repository *repo;
7333 int have_changes;
7336 const struct got_error *
7337 check_stage_ok(void *arg, unsigned char status,
7338 unsigned char staged_status, const char *relpath,
7339 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7340 struct got_object_id *commit_id, int dirfd, const char *de_name)
7342 struct check_stage_ok_arg *a = arg;
7343 const struct got_error *err = NULL;
7344 struct got_fileindex_entry *ie;
7345 struct got_object_id base_commit_id;
7346 struct got_object_id *base_commit_idp = NULL;
7347 char *in_repo_path = NULL, *p;
7349 if (status == GOT_STATUS_UNVERSIONED ||
7350 status == GOT_STATUS_NO_CHANGE)
7351 return NULL;
7352 if (status == GOT_STATUS_NONEXISTENT)
7353 return got_error_set_errno(ENOENT, relpath);
7355 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7356 if (ie == NULL)
7357 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7359 if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7360 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7361 relpath) == -1)
7362 return got_error_from_errno("asprintf");
7364 if (got_fileindex_entry_has_commit(ie)) {
7365 memcpy(base_commit_id.sha1, ie->commit_sha1,
7366 SHA1_DIGEST_LENGTH);
7367 base_commit_idp = &base_commit_id;
7370 if (status == GOT_STATUS_CONFLICT) {
7371 err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7372 goto done;
7373 } else if (status != GOT_STATUS_ADD &&
7374 status != GOT_STATUS_MODIFY &&
7375 status != GOT_STATUS_DELETE) {
7376 err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7377 goto done;
7380 a->have_changes = 1;
7382 p = in_repo_path;
7383 while (p[0] == '/')
7384 p++;
7385 err = check_out_of_date(p, status, staged_status,
7386 blob_id, base_commit_idp, a->head_commit_id, a->repo,
7387 GOT_ERR_STAGE_OUT_OF_DATE);
7388 done:
7389 free(in_repo_path);
7390 return err;
7393 struct stage_path_arg {
7394 struct got_worktree *worktree;
7395 struct got_fileindex *fileindex;
7396 struct got_repository *repo;
7397 got_worktree_status_cb status_cb;
7398 void *status_arg;
7399 got_worktree_patch_cb patch_cb;
7400 void *patch_arg;
7401 int staged_something;
7402 int allow_bad_symlinks;
7405 static const struct got_error *
7406 stage_path(void *arg, unsigned char status,
7407 unsigned char staged_status, const char *relpath,
7408 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7409 struct got_object_id *commit_id, int dirfd, const char *de_name)
7411 struct stage_path_arg *a = arg;
7412 const struct got_error *err = NULL;
7413 struct got_fileindex_entry *ie;
7414 char *ondisk_path = NULL, *path_content = NULL;
7415 uint32_t stage;
7416 struct got_object_id *new_staged_blob_id = NULL;
7417 struct stat sb;
7419 if (status == GOT_STATUS_UNVERSIONED)
7420 return NULL;
7422 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7423 if (ie == NULL)
7424 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7426 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7427 relpath)== -1)
7428 return got_error_from_errno("asprintf");
7430 switch (status) {
7431 case GOT_STATUS_ADD:
7432 case GOT_STATUS_MODIFY:
7433 /* XXX could sb.st_mode be passed in by our caller? */
7434 if (lstat(ondisk_path, &sb) == -1) {
7435 err = got_error_from_errno2("lstat", ondisk_path);
7436 break;
7438 if (a->patch_cb) {
7439 if (status == GOT_STATUS_ADD) {
7440 int choice = GOT_PATCH_CHOICE_NONE;
7441 err = (*a->patch_cb)(&choice, a->patch_arg,
7442 status, ie->path, NULL, 1, 1);
7443 if (err)
7444 break;
7445 if (choice != GOT_PATCH_CHOICE_YES)
7446 break;
7447 } else {
7448 err = create_patched_content(&path_content, 0,
7449 staged_blob_id ? staged_blob_id : blob_id,
7450 ondisk_path, dirfd, de_name, ie->path,
7451 a->repo, a->patch_cb, a->patch_arg);
7452 if (err || path_content == NULL)
7453 break;
7456 err = got_object_blob_create(&new_staged_blob_id,
7457 path_content ? path_content : ondisk_path, a->repo);
7458 if (err)
7459 break;
7460 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7461 SHA1_DIGEST_LENGTH);
7462 if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7463 stage = GOT_FILEIDX_STAGE_ADD;
7464 else
7465 stage = GOT_FILEIDX_STAGE_MODIFY;
7466 got_fileindex_entry_stage_set(ie, stage);
7467 if (S_ISLNK(sb.st_mode)) {
7468 int is_bad_symlink = 0;
7469 if (!a->allow_bad_symlinks) {
7470 char target_path[PATH_MAX];
7471 ssize_t target_len;
7472 target_len = readlink(ondisk_path, target_path,
7473 sizeof(target_path));
7474 if (target_len == -1) {
7475 err = got_error_from_errno2("readlink",
7476 ondisk_path);
7477 break;
7479 err = is_bad_symlink_target(&is_bad_symlink,
7480 target_path, target_len, ondisk_path,
7481 a->worktree->root_path);
7482 if (err)
7483 break;
7484 if (is_bad_symlink) {
7485 err = got_error_path(ondisk_path,
7486 GOT_ERR_BAD_SYMLINK);
7487 break;
7490 if (is_bad_symlink)
7491 got_fileindex_entry_staged_filetype_set(ie,
7492 GOT_FILEIDX_MODE_BAD_SYMLINK);
7493 else
7494 got_fileindex_entry_staged_filetype_set(ie,
7495 GOT_FILEIDX_MODE_SYMLINK);
7496 } else {
7497 got_fileindex_entry_staged_filetype_set(ie,
7498 GOT_FILEIDX_MODE_REGULAR_FILE);
7500 a->staged_something = 1;
7501 if (a->status_cb == NULL)
7502 break;
7503 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7504 get_staged_status(ie), relpath, blob_id,
7505 new_staged_blob_id, NULL, dirfd, de_name);
7506 break;
7507 case GOT_STATUS_DELETE:
7508 if (staged_status == GOT_STATUS_DELETE)
7509 break;
7510 if (a->patch_cb) {
7511 int choice = GOT_PATCH_CHOICE_NONE;
7512 err = (*a->patch_cb)(&choice, a->patch_arg, status,
7513 ie->path, NULL, 1, 1);
7514 if (err)
7515 break;
7516 if (choice == GOT_PATCH_CHOICE_NO)
7517 break;
7518 if (choice != GOT_PATCH_CHOICE_YES) {
7519 err = got_error(GOT_ERR_PATCH_CHOICE);
7520 break;
7523 stage = GOT_FILEIDX_STAGE_DELETE;
7524 got_fileindex_entry_stage_set(ie, stage);
7525 a->staged_something = 1;
7526 if (a->status_cb == NULL)
7527 break;
7528 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7529 get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7530 de_name);
7531 break;
7532 case GOT_STATUS_NO_CHANGE:
7533 break;
7534 case GOT_STATUS_CONFLICT:
7535 err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7536 break;
7537 case GOT_STATUS_NONEXISTENT:
7538 err = got_error_set_errno(ENOENT, relpath);
7539 break;
7540 default:
7541 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7542 break;
7545 if (path_content && unlink(path_content) == -1 && err == NULL)
7546 err = got_error_from_errno2("unlink", path_content);
7547 free(path_content);
7548 free(ondisk_path);
7549 free(new_staged_blob_id);
7550 return err;
7553 const struct got_error *
7554 got_worktree_stage(struct got_worktree *worktree,
7555 struct got_pathlist_head *paths,
7556 got_worktree_status_cb status_cb, void *status_arg,
7557 got_worktree_patch_cb patch_cb, void *patch_arg,
7558 int allow_bad_symlinks, struct got_repository *repo)
7560 const struct got_error *err = NULL, *sync_err, *unlockerr;
7561 struct got_pathlist_entry *pe;
7562 struct got_fileindex *fileindex = NULL;
7563 char *fileindex_path = NULL;
7564 struct got_reference *head_ref = NULL;
7565 struct got_object_id *head_commit_id = NULL;
7566 struct check_stage_ok_arg oka;
7567 struct stage_path_arg spa;
7569 err = lock_worktree(worktree, LOCK_EX);
7570 if (err)
7571 return err;
7573 err = got_ref_open(&head_ref, repo,
7574 got_worktree_get_head_ref_name(worktree), 0);
7575 if (err)
7576 goto done;
7577 err = got_ref_resolve(&head_commit_id, repo, head_ref);
7578 if (err)
7579 goto done;
7580 err = open_fileindex(&fileindex, &fileindex_path, worktree);
7581 if (err)
7582 goto done;
7584 /* Check pre-conditions before staging anything. */
7585 oka.head_commit_id = head_commit_id;
7586 oka.worktree = worktree;
7587 oka.fileindex = fileindex;
7588 oka.repo = repo;
7589 oka.have_changes = 0;
7590 TAILQ_FOREACH(pe, paths, entry) {
7591 err = worktree_status(worktree, pe->path, fileindex, repo,
7592 check_stage_ok, &oka, NULL, NULL, 0, 0);
7593 if (err)
7594 goto done;
7596 if (!oka.have_changes) {
7597 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7598 goto done;
7601 spa.worktree = worktree;
7602 spa.fileindex = fileindex;
7603 spa.repo = repo;
7604 spa.patch_cb = patch_cb;
7605 spa.patch_arg = patch_arg;
7606 spa.status_cb = status_cb;
7607 spa.status_arg = status_arg;
7608 spa.staged_something = 0;
7609 spa.allow_bad_symlinks = allow_bad_symlinks;
7610 TAILQ_FOREACH(pe, paths, entry) {
7611 err = worktree_status(worktree, pe->path, fileindex, repo,
7612 stage_path, &spa, NULL, NULL, 0, 0);
7613 if (err)
7614 goto done;
7616 if (!spa.staged_something) {
7617 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7618 goto done;
7621 sync_err = sync_fileindex(fileindex, fileindex_path);
7622 if (sync_err && err == NULL)
7623 err = sync_err;
7624 done:
7625 if (head_ref)
7626 got_ref_close(head_ref);
7627 free(head_commit_id);
7628 free(fileindex_path);
7629 if (fileindex)
7630 got_fileindex_free(fileindex);
7631 unlockerr = lock_worktree(worktree, LOCK_SH);
7632 if (unlockerr && err == NULL)
7633 err = unlockerr;
7634 return err;
7637 struct unstage_path_arg {
7638 struct got_worktree *worktree;
7639 struct got_fileindex *fileindex;
7640 struct got_repository *repo;
7641 got_worktree_checkout_cb progress_cb;
7642 void *progress_arg;
7643 got_worktree_patch_cb patch_cb;
7644 void *patch_arg;
7647 static const struct got_error *
7648 create_unstaged_content(char **path_unstaged_content,
7649 char **path_new_staged_content, struct got_object_id *blob_id,
7650 struct got_object_id *staged_blob_id, const char *relpath,
7651 struct got_repository *repo,
7652 got_worktree_patch_cb patch_cb, void *patch_arg)
7654 const struct got_error *err, *free_err;
7655 struct got_blob_object *blob = NULL, *staged_blob = NULL;
7656 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7657 char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7658 struct got_diffreg_result *diffreg_result = NULL;
7659 int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
7660 int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
7662 *path_unstaged_content = NULL;
7663 *path_new_staged_content = NULL;
7665 err = got_object_id_str(&label1, blob_id);
7666 if (err)
7667 return err;
7668 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7669 if (err)
7670 goto done;
7672 err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7673 if (err)
7674 goto done;
7676 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7677 if (err)
7678 goto done;
7680 err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7681 if (err)
7682 goto done;
7684 err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7685 if (err)
7686 goto done;
7688 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7689 if (err)
7690 goto done;
7692 err = got_diff_files(&diffreg_result, f1, label1, f2,
7693 path2, 3, 0, 1, NULL);
7694 if (err)
7695 goto done;
7697 err = got_opentemp_named(path_unstaged_content, &outfile,
7698 "got-unstaged-content");
7699 if (err)
7700 goto done;
7701 err = got_opentemp_named(path_new_staged_content, &rejectfile,
7702 "got-new-staged-content");
7703 if (err)
7704 goto done;
7706 if (fseek(f1, 0L, SEEK_SET) == -1) {
7707 err = got_ferror(f1, GOT_ERR_IO);
7708 goto done;
7710 if (fseek(f2, 0L, SEEK_SET) == -1) {
7711 err = got_ferror(f2, GOT_ERR_IO);
7712 goto done;
7714 /* Count the number of actual changes in the diff result. */
7715 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
7716 struct diff_chunk_context cc = {};
7717 diff_chunk_context_load_change(&cc, &nchunks_used,
7718 diffreg_result->result, n, 0);
7719 nchanges++;
7721 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
7722 int choice;
7723 err = apply_or_reject_change(&choice, &nchunks_used,
7724 diffreg_result->result, n, relpath, f1, f2,
7725 &line_cur1, &line_cur2,
7726 outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
7727 if (err)
7728 goto done;
7729 if (choice == GOT_PATCH_CHOICE_YES)
7730 have_content = 1;
7731 else
7732 have_rejected_content = 1;
7733 if (choice == GOT_PATCH_CHOICE_QUIT)
7734 break;
7736 if (have_content || have_rejected_content)
7737 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7738 outfile, rejectfile);
7739 done:
7740 free(label1);
7741 if (blob)
7742 got_object_blob_close(blob);
7743 if (staged_blob)
7744 got_object_blob_close(staged_blob);
7745 free_err = got_diffreg_result_free(diffreg_result);
7746 if (free_err && err == NULL)
7747 err = free_err;
7748 if (f1 && fclose(f1) == EOF && err == NULL)
7749 err = got_error_from_errno2("fclose", path1);
7750 if (f2 && fclose(f2) == EOF && err == NULL)
7751 err = got_error_from_errno2("fclose", path2);
7752 if (outfile && fclose(outfile) == EOF && err == NULL)
7753 err = got_error_from_errno2("fclose", *path_unstaged_content);
7754 if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7755 err = got_error_from_errno2("fclose", *path_new_staged_content);
7756 if (path1 && unlink(path1) == -1 && err == NULL)
7757 err = got_error_from_errno2("unlink", path1);
7758 if (path2 && unlink(path2) == -1 && err == NULL)
7759 err = got_error_from_errno2("unlink", path2);
7760 if (err || !have_content) {
7761 if (*path_unstaged_content &&
7762 unlink(*path_unstaged_content) == -1 && err == NULL)
7763 err = got_error_from_errno2("unlink",
7764 *path_unstaged_content);
7765 free(*path_unstaged_content);
7766 *path_unstaged_content = NULL;
7768 if (err || !have_content || !have_rejected_content) {
7769 if (*path_new_staged_content &&
7770 unlink(*path_new_staged_content) == -1 && err == NULL)
7771 err = got_error_from_errno2("unlink",
7772 *path_new_staged_content);
7773 free(*path_new_staged_content);
7774 *path_new_staged_content = NULL;
7776 free(path1);
7777 free(path2);
7778 return err;
7781 static const struct got_error *
7782 unstage_hunks(struct got_object_id *staged_blob_id,
7783 struct got_blob_object *blob_base,
7784 struct got_object_id *blob_id, struct got_fileindex_entry *ie,
7785 const char *ondisk_path, const char *label_orig,
7786 struct got_worktree *worktree, struct got_repository *repo,
7787 got_worktree_patch_cb patch_cb, void *patch_arg,
7788 got_worktree_checkout_cb progress_cb, void *progress_arg)
7790 const struct got_error *err = NULL;
7791 char *path_unstaged_content = NULL;
7792 char *path_new_staged_content = NULL;
7793 char *parent = NULL, *base_path = NULL;
7794 char *blob_base_path = NULL;
7795 struct got_object_id *new_staged_blob_id = NULL;
7796 FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
7797 struct stat sb;
7799 err = create_unstaged_content(&path_unstaged_content,
7800 &path_new_staged_content, blob_id, staged_blob_id,
7801 ie->path, repo, patch_cb, patch_arg);
7802 if (err)
7803 return err;
7805 if (path_unstaged_content == NULL)
7806 return NULL;
7808 if (path_new_staged_content) {
7809 err = got_object_blob_create(&new_staged_blob_id,
7810 path_new_staged_content, repo);
7811 if (err)
7812 goto done;
7815 f = fopen(path_unstaged_content, "r");
7816 if (f == NULL) {
7817 err = got_error_from_errno2("fopen",
7818 path_unstaged_content);
7819 goto done;
7821 if (fstat(fileno(f), &sb) == -1) {
7822 err = got_error_from_errno2("fstat", path_unstaged_content);
7823 goto done;
7825 if (got_fileindex_entry_staged_filetype_get(ie) ==
7826 GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
7827 char link_target[PATH_MAX];
7828 size_t r;
7829 r = fread(link_target, 1, sizeof(link_target), f);
7830 if (r == 0 && ferror(f)) {
7831 err = got_error_from_errno("fread");
7832 goto done;
7834 if (r >= sizeof(link_target)) { /* should not happen */
7835 err = got_error(GOT_ERR_NO_SPACE);
7836 goto done;
7838 link_target[r] = '\0';
7839 err = merge_symlink(worktree, blob_base,
7840 ondisk_path, ie->path, label_orig, link_target,
7841 worktree->base_commit_id, repo, progress_cb,
7842 progress_arg);
7843 } else {
7844 int local_changes_subsumed;
7846 err = got_path_dirname(&parent, ondisk_path);
7847 if (err)
7848 return err;
7850 if (asprintf(&base_path, "%s/got-unstage-blob-orig",
7851 parent) == -1) {
7852 err = got_error_from_errno("asprintf");
7853 base_path = NULL;
7854 goto done;
7857 err = got_opentemp_named(&blob_base_path, &f_base, base_path);
7858 if (err)
7859 goto done;
7860 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
7861 blob_base);
7862 if (err)
7863 goto done;
7866 * In order the run a 3-way merge with a symlink we copy the symlink's
7867 * target path into a temporary file and use that file with diff3.
7869 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
7870 err = dump_symlink_target_path_to_file(&f_deriv2,
7871 ondisk_path);
7872 if (err)
7873 goto done;
7874 } else {
7875 int fd;
7876 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
7877 if (fd == -1) {
7878 err = got_error_from_errno2("open", ondisk_path);
7879 goto done;
7881 f_deriv2 = fdopen(fd, "r");
7882 if (f_deriv2 == NULL) {
7883 err = got_error_from_errno2("fdopen", ondisk_path);
7884 close(fd);
7885 goto done;
7889 err = merge_file(&local_changes_subsumed, worktree,
7890 f_base, f, f_deriv2, ondisk_path, ie->path,
7891 got_fileindex_perms_to_st(ie),
7892 label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
7893 repo, progress_cb, progress_arg);
7895 if (err)
7896 goto done;
7898 if (new_staged_blob_id) {
7899 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7900 SHA1_DIGEST_LENGTH);
7901 } else {
7902 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7903 got_fileindex_entry_staged_filetype_set(ie, 0);
7905 done:
7906 free(new_staged_blob_id);
7907 if (path_unstaged_content &&
7908 unlink(path_unstaged_content) == -1 && err == NULL)
7909 err = got_error_from_errno2("unlink", path_unstaged_content);
7910 if (path_new_staged_content &&
7911 unlink(path_new_staged_content) == -1 && err == NULL)
7912 err = got_error_from_errno2("unlink", path_new_staged_content);
7913 if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
7914 err = got_error_from_errno2("unlink", blob_base_path);
7915 if (f_base && fclose(f_base) == EOF && err == NULL)
7916 err = got_error_from_errno2("fclose", path_unstaged_content);
7917 if (f && fclose(f) == EOF && err == NULL)
7918 err = got_error_from_errno2("fclose", path_unstaged_content);
7919 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
7920 err = got_error_from_errno2("fclose", ondisk_path);
7921 free(path_unstaged_content);
7922 free(path_new_staged_content);
7923 free(blob_base_path);
7924 free(parent);
7925 free(base_path);
7926 return err;
7929 static const struct got_error *
7930 unstage_path(void *arg, unsigned char status,
7931 unsigned char staged_status, const char *relpath,
7932 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7933 struct got_object_id *commit_id, int dirfd, const char *de_name)
7935 const struct got_error *err = NULL;
7936 struct unstage_path_arg *a = arg;
7937 struct got_fileindex_entry *ie;
7938 struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7939 char *ondisk_path = NULL;
7940 char *id_str = NULL, *label_orig = NULL;
7941 int local_changes_subsumed;
7942 struct stat sb;
7944 if (staged_status != GOT_STATUS_ADD &&
7945 staged_status != GOT_STATUS_MODIFY &&
7946 staged_status != GOT_STATUS_DELETE)
7947 return NULL;
7949 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7950 if (ie == NULL)
7951 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7953 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7954 == -1)
7955 return got_error_from_errno("asprintf");
7957 err = got_object_id_str(&id_str,
7958 commit_id ? commit_id : a->worktree->base_commit_id);
7959 if (err)
7960 goto done;
7961 if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7962 id_str) == -1) {
7963 err = got_error_from_errno("asprintf");
7964 goto done;
7967 switch (staged_status) {
7968 case GOT_STATUS_MODIFY:
7969 err = got_object_open_as_blob(&blob_base, a->repo,
7970 blob_id, 8192);
7971 if (err)
7972 break;
7973 /* fall through */
7974 case GOT_STATUS_ADD:
7975 if (a->patch_cb) {
7976 if (staged_status == GOT_STATUS_ADD) {
7977 int choice = GOT_PATCH_CHOICE_NONE;
7978 err = (*a->patch_cb)(&choice, a->patch_arg,
7979 staged_status, ie->path, NULL, 1, 1);
7980 if (err)
7981 break;
7982 if (choice != GOT_PATCH_CHOICE_YES)
7983 break;
7984 } else {
7985 err = unstage_hunks(staged_blob_id,
7986 blob_base, blob_id, ie, ondisk_path,
7987 label_orig, a->worktree, a->repo,
7988 a->patch_cb, a->patch_arg,
7989 a->progress_cb, a->progress_arg);
7990 break; /* Done with this file. */
7993 err = got_object_open_as_blob(&blob_staged, a->repo,
7994 staged_blob_id, 8192);
7995 if (err)
7996 break;
7997 switch (got_fileindex_entry_staged_filetype_get(ie)) {
7998 case GOT_FILEIDX_MODE_BAD_SYMLINK:
7999 case GOT_FILEIDX_MODE_REGULAR_FILE:
8000 err = merge_blob(&local_changes_subsumed, a->worktree,
8001 blob_base, ondisk_path, relpath,
8002 got_fileindex_perms_to_st(ie), label_orig,
8003 blob_staged, commit_id ? commit_id :
8004 a->worktree->base_commit_id, a->repo,
8005 a->progress_cb, a->progress_arg);
8006 break;
8007 case GOT_FILEIDX_MODE_SYMLINK:
8008 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8009 char *staged_target;
8010 err = got_object_blob_read_to_str(
8011 &staged_target, blob_staged);
8012 if (err)
8013 goto done;
8014 err = merge_symlink(a->worktree, blob_base,
8015 ondisk_path, relpath, label_orig,
8016 staged_target, commit_id ? commit_id :
8017 a->worktree->base_commit_id,
8018 a->repo, a->progress_cb, a->progress_arg);
8019 free(staged_target);
8020 } else {
8021 err = merge_blob(&local_changes_subsumed,
8022 a->worktree, blob_base, ondisk_path,
8023 relpath, got_fileindex_perms_to_st(ie),
8024 label_orig, blob_staged,
8025 commit_id ? commit_id :
8026 a->worktree->base_commit_id, a->repo,
8027 a->progress_cb, a->progress_arg);
8029 break;
8030 default:
8031 err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8032 break;
8034 if (err == NULL) {
8035 got_fileindex_entry_stage_set(ie,
8036 GOT_FILEIDX_STAGE_NONE);
8037 got_fileindex_entry_staged_filetype_set(ie, 0);
8039 break;
8040 case GOT_STATUS_DELETE:
8041 if (a->patch_cb) {
8042 int choice = GOT_PATCH_CHOICE_NONE;
8043 err = (*a->patch_cb)(&choice, a->patch_arg,
8044 staged_status, ie->path, NULL, 1, 1);
8045 if (err)
8046 break;
8047 if (choice == GOT_PATCH_CHOICE_NO)
8048 break;
8049 if (choice != GOT_PATCH_CHOICE_YES) {
8050 err = got_error(GOT_ERR_PATCH_CHOICE);
8051 break;
8054 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8055 got_fileindex_entry_staged_filetype_set(ie, 0);
8056 err = get_file_status(&status, &sb, ie, ondisk_path,
8057 dirfd, de_name, a->repo);
8058 if (err)
8059 break;
8060 err = (*a->progress_cb)(a->progress_arg, status, relpath);
8061 break;
8063 done:
8064 free(ondisk_path);
8065 if (blob_base)
8066 got_object_blob_close(blob_base);
8067 if (blob_staged)
8068 got_object_blob_close(blob_staged);
8069 free(id_str);
8070 free(label_orig);
8071 return err;
8074 const struct got_error *
8075 got_worktree_unstage(struct got_worktree *worktree,
8076 struct got_pathlist_head *paths,
8077 got_worktree_checkout_cb progress_cb, void *progress_arg,
8078 got_worktree_patch_cb patch_cb, void *patch_arg,
8079 struct got_repository *repo)
8081 const struct got_error *err = NULL, *sync_err, *unlockerr;
8082 struct got_pathlist_entry *pe;
8083 struct got_fileindex *fileindex = NULL;
8084 char *fileindex_path = NULL;
8085 struct unstage_path_arg upa;
8087 err = lock_worktree(worktree, LOCK_EX);
8088 if (err)
8089 return err;
8091 err = open_fileindex(&fileindex, &fileindex_path, worktree);
8092 if (err)
8093 goto done;
8095 upa.worktree = worktree;
8096 upa.fileindex = fileindex;
8097 upa.repo = repo;
8098 upa.progress_cb = progress_cb;
8099 upa.progress_arg = progress_arg;
8100 upa.patch_cb = patch_cb;
8101 upa.patch_arg = patch_arg;
8102 TAILQ_FOREACH(pe, paths, entry) {
8103 err = worktree_status(worktree, pe->path, fileindex, repo,
8104 unstage_path, &upa, NULL, NULL, 0, 0);
8105 if (err)
8106 goto done;
8109 sync_err = sync_fileindex(fileindex, fileindex_path);
8110 if (sync_err && err == NULL)
8111 err = sync_err;
8112 done:
8113 free(fileindex_path);
8114 if (fileindex)
8115 got_fileindex_free(fileindex);
8116 unlockerr = lock_worktree(worktree, LOCK_SH);
8117 if (unlockerr && err == NULL)
8118 err = unlockerr;
8119 return err;
8122 struct report_file_info_arg {
8123 struct got_worktree *worktree;
8124 got_worktree_path_info_cb info_cb;
8125 void *info_arg;
8126 struct got_pathlist_head *paths;
8127 got_cancel_cb cancel_cb;
8128 void *cancel_arg;
8131 static const struct got_error *
8132 report_file_info(void *arg, struct got_fileindex_entry *ie)
8134 struct report_file_info_arg *a = arg;
8135 struct got_pathlist_entry *pe;
8136 struct got_object_id blob_id, staged_blob_id, commit_id;
8137 struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8138 struct got_object_id *commit_idp = NULL;
8139 int stage;
8141 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8142 return got_error(GOT_ERR_CANCELLED);
8144 TAILQ_FOREACH(pe, a->paths, entry) {
8145 if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8146 got_path_is_child(ie->path, pe->path, pe->path_len))
8147 break;
8149 if (pe == NULL) /* not found */
8150 return NULL;
8152 if (got_fileindex_entry_has_blob(ie)) {
8153 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8154 blob_idp = &blob_id;
8156 stage = got_fileindex_entry_stage_get(ie);
8157 if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8158 stage == GOT_FILEIDX_STAGE_ADD) {
8159 memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8160 SHA1_DIGEST_LENGTH);
8161 staged_blob_idp = &staged_blob_id;
8164 if (got_fileindex_entry_has_commit(ie)) {
8165 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8166 commit_idp = &commit_id;
8169 return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8170 (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8173 const struct got_error *
8174 got_worktree_path_info(struct got_worktree *worktree,
8175 struct got_pathlist_head *paths,
8176 got_worktree_path_info_cb info_cb, void *info_arg,
8177 got_cancel_cb cancel_cb, void *cancel_arg)
8180 const struct got_error *err = NULL, *unlockerr;
8181 struct got_fileindex *fileindex = NULL;
8182 char *fileindex_path = NULL;
8183 struct report_file_info_arg arg;
8185 err = lock_worktree(worktree, LOCK_SH);
8186 if (err)
8187 return err;
8189 err = open_fileindex(&fileindex, &fileindex_path, worktree);
8190 if (err)
8191 goto done;
8193 arg.worktree = worktree;
8194 arg.info_cb = info_cb;
8195 arg.info_arg = info_arg;
8196 arg.paths = paths;
8197 arg.cancel_cb = cancel_cb;
8198 arg.cancel_arg = cancel_arg;
8199 err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8200 &arg);
8201 done:
8202 free(fileindex_path);
8203 if (fileindex)
8204 got_fileindex_free(fileindex);
8205 unlockerr = lock_worktree(worktree, LOCK_UN);
8206 if (unlockerr && err == NULL)
8207 err = unlockerr;
8208 return err;