2 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
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.
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.
18 #include <sys/queue.h>
38 #include "got_error.h"
39 #include "got_repository.h"
40 #include "got_reference.h"
41 #include "got_object.h"
43 #include "got_cancel.h"
44 #include "got_worktree.h"
45 #include "got_opentemp.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"
61 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
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)
70 const struct got_error *err = NULL;
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);
81 static const struct got_error *
82 update_meta_file(const char *path_got, const char *name, const char *content)
84 const struct got_error *err = NULL;
89 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
90 err = got_error_from_errno("asprintf");
95 err = got_opentemp_named(&tmppath, &tmpfile, path);
100 int len = fprintf(tmpfile, "%s\n", content);
101 if (len != strlen(content) + 1) {
102 err = got_error_from_errno2("fprintf", tmppath);
107 if (rename(tmppath, path) != 0) {
108 err = got_error_from_errno3("rename", tmppath, path);
114 if (fclose(tmpfile) == EOF && err == NULL)
115 err = got_error_from_errno2("fclose", tmppath);
120 static const struct got_error *
121 write_head_ref(const char *path_got, struct got_reference *head_ref)
123 const struct got_error *err = NULL;
126 if (got_ref_is_symbolic(head_ref)) {
127 refstr = got_ref_to_str(head_ref);
129 return got_error_from_errno("got_ref_to_str");
131 refstr = strdup(got_ref_get_name(head_ref));
133 return got_error_from_errno("strdup");
135 err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
140 const struct got_error *
141 got_worktree_init(const char *path, struct got_reference *head_ref,
142 const char *prefix, struct got_repository *repo)
144 const struct got_error *err = NULL;
145 struct got_object_id *commit_id = NULL;
147 uint32_t uuid_status;
149 char *path_got = NULL;
150 char *formatstr = NULL;
151 char *absprefix = NULL;
152 char *basestr = NULL;
153 char *uuidstr = NULL;
155 if (strcmp(path, got_repo_get_path(repo)) == 0) {
156 err = got_error(GOT_ERR_WORKTREE_REPO);
160 err = got_ref_resolve(&commit_id, repo, head_ref);
163 err = got_object_get_type(&obj_type, repo, commit_id);
166 if (obj_type != GOT_OBJ_TYPE_COMMIT)
167 return got_error(GOT_ERR_OBJ_TYPE);
169 if (!got_path_is_absolute(prefix)) {
170 if (asprintf(&absprefix, "/%s", prefix) == -1)
171 return got_error_from_errno("asprintf");
174 /* Create top-level directory (may already exist). */
175 if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
176 err = got_error_from_errno2("mkdir", path);
180 /* Create .got directory (may already exist). */
181 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
182 err = got_error_from_errno("asprintf");
185 if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
186 err = got_error_from_errno2("mkdir", path_got);
190 /* Create an empty lock file. */
191 err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
195 /* Create an empty file index. */
196 err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
200 /* Write the HEAD reference. */
201 err = write_head_ref(path_got, head_ref);
205 /* Record our base commit. */
206 err = got_object_id_str(&basestr, commit_id);
209 err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
213 /* Store path to repository. */
214 err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
215 got_repo_get_path(repo));
219 /* Store in-repository path prefix. */
220 err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
221 absprefix ? absprefix : prefix);
226 uuid_create(&uuid, &uuid_status);
227 if (uuid_status != uuid_s_ok) {
228 err = got_error_uuid(uuid_status, "uuid_create");
231 uuid_to_string(&uuid, &uuidstr, &uuid_status);
232 if (uuid_status != uuid_s_ok) {
233 err = got_error_uuid(uuid_status, "uuid_to_string");
236 err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
240 /* Stamp work tree with format file. */
241 if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
242 err = got_error_from_errno("asprintf");
245 err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
259 const struct got_error *
260 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
261 const char *path_prefix)
263 char *absprefix = NULL;
265 if (!got_path_is_absolute(path_prefix)) {
266 if (asprintf(&absprefix, "/%s", path_prefix) == -1)
267 return got_error_from_errno("asprintf");
269 *match = (strcmp(absprefix ? absprefix : path_prefix,
270 worktree->path_prefix) == 0);
276 got_worktree_get_head_ref_name(struct got_worktree *worktree)
278 return worktree->head_ref_name;
281 const struct got_error *
282 got_worktree_set_head_ref(struct got_worktree *worktree,
283 struct got_reference *head_ref)
285 const struct got_error *err = NULL;
286 char *path_got = NULL, *head_ref_name = NULL;
288 if (asprintf(&path_got, "%s/%s", worktree->root_path,
289 GOT_WORKTREE_GOT_DIR) == -1) {
290 err = got_error_from_errno("asprintf");
295 head_ref_name = strdup(got_ref_get_name(head_ref));
296 if (head_ref_name == NULL) {
297 err = got_error_from_errno("strdup");
301 err = write_head_ref(path_got, head_ref);
305 free(worktree->head_ref_name);
306 worktree->head_ref_name = head_ref_name;
314 struct got_object_id *
315 got_worktree_get_base_commit_id(struct got_worktree *worktree)
317 return worktree->base_commit_id;
320 const struct got_error *
321 got_worktree_set_base_commit_id(struct got_worktree *worktree,
322 struct got_repository *repo, struct got_object_id *commit_id)
324 const struct got_error *err;
325 struct got_object *obj = NULL;
327 char *path_got = NULL;
329 if (asprintf(&path_got, "%s/%s", worktree->root_path,
330 GOT_WORKTREE_GOT_DIR) == -1) {
331 err = got_error_from_errno("asprintf");
336 err = got_object_open(&obj, repo, commit_id);
340 if (obj->type != GOT_OBJ_TYPE_COMMIT) {
341 err = got_error(GOT_ERR_OBJ_TYPE);
345 /* Record our base commit. */
346 err = got_object_id_str(&id_str, commit_id);
349 err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
353 free(worktree->base_commit_id);
354 worktree->base_commit_id = got_object_id_dup(commit_id);
355 if (worktree->base_commit_id == NULL) {
356 err = got_error_from_errno("got_object_id_dup");
361 got_object_close(obj);
367 const struct got_gotconfig *
368 got_worktree_get_gotconfig(struct got_worktree *worktree)
370 return worktree->gotconfig;
373 static const struct got_error *
374 lock_worktree(struct got_worktree *worktree, int operation)
376 if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
377 return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
378 : got_error_from_errno2("flock",
379 got_worktree_get_root_path(worktree)));
383 static const struct got_error *
384 add_dir_on_disk(struct got_worktree *worktree, const char *path)
386 const struct got_error *err = NULL;
389 if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
390 return got_error_from_errno("asprintf");
392 err = got_path_mkdir(abspath);
393 if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
396 if (lstat(abspath, &sb) == -1) {
397 err = got_error_from_errno2("lstat", abspath);
398 } else if (!S_ISDIR(sb.st_mode)) {
399 /* TODO directory is obstructed; do something */
400 err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
407 static const struct got_error *
408 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
410 const struct got_error *err = NULL;
413 size_t flen1 = 0, flen2 = 0;
418 flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
419 if (flen1 == 0 && ferror(f1)) {
420 err = got_error_from_errno("fread");
423 flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
424 if (flen2 == 0 && ferror(f2)) {
425 err = got_error_from_errno("fread");
432 } else if (flen2 == 0) {
436 } else if (flen1 == flen2) {
437 if (memcmp(fbuf1, fbuf2, flen2) != 0) {
450 static const struct got_error *
451 check_files_equal(int *same, FILE *f1, FILE *f2)
458 if (fstat(fileno(f1), &sb) != 0)
459 return got_error_from_errno("fstat");
462 if (fstat(fileno(f2), &sb) != 0)
463 return got_error_from_errno("fstat");
466 if (size1 != size2) {
471 if (fseek(f1, 0L, SEEK_SET) == -1)
472 return got_ferror(f1, GOT_ERR_IO);
473 if (fseek(f2, 0L, SEEK_SET) == -1)
474 return got_ferror(f2, GOT_ERR_IO);
476 return check_file_contents_equal(same, f1, f2);
479 static const struct got_error *
480 copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
488 if (fseek(f, 0L, SEEK_SET) == -1)
489 return got_ferror(f, GOT_ERR_IO);
492 flen = fread(fbuf, 1, sizeof(fbuf), f);
495 return got_error_from_errno("fread");
499 outlen = write(outfd, fbuf, flen);
501 return got_error_from_errno("write");
503 return got_error(GOT_ERR_IO);
510 static const struct got_error *
511 merge_binary_file(int *overlapcnt, int merged_fd,
512 FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
513 const char *label_deriv, const char *label_orig, const char *label_deriv2,
514 const char *ondisk_path)
516 const struct got_error *err = NULL;
517 int same_content, changed_deriv, changed_deriv2;
518 int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
519 off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
520 char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
521 char *base_path_orig = NULL, *base_path_deriv = NULL;
522 char *base_path_deriv2 = NULL;
526 err = check_files_equal(&same_content, f_deriv, f_deriv2);
531 return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
533 err = check_files_equal(&same_content, f_deriv, f_orig);
536 changed_deriv = !same_content;
537 err = check_files_equal(&same_content, f_deriv2, f_orig);
540 changed_deriv2 = !same_content;
542 if (changed_deriv && changed_deriv2) {
544 if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
545 err = got_error_from_errno("asprintf");
548 if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
549 err = got_error_from_errno("asprintf");
552 if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
553 err = got_error_from_errno("asprintf");
556 err = got_opentemp_named_fd(&path_orig, &fd_orig,
560 err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
564 err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
568 err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
571 err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
574 err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
577 if (dprintf(merged_fd, "Binary files differ and cannot be "
578 "merged automatically:\n") < 0) {
579 err = got_error_from_errno("dprintf");
582 if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
583 GOT_DIFF_CONFLICT_MARKER_BEGIN,
584 label_deriv ? " " : "",
585 label_deriv ? label_deriv : "",
587 err = got_error_from_errno("dprintf");
591 if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
592 GOT_DIFF_CONFLICT_MARKER_ORIG,
593 label_orig ? " " : "",
594 label_orig ? label_orig : "",
596 err = got_error_from_errno("dprintf");
600 if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
601 GOT_DIFF_CONFLICT_MARKER_SEP,
603 GOT_DIFF_CONFLICT_MARKER_END,
604 label_deriv2 ? " " : "",
605 label_deriv2 ? label_deriv2 : "") < 0) {
606 err = got_error_from_errno("dprintf");
609 } else if (changed_deriv)
610 err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
611 else if (changed_deriv2)
612 err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
614 if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
616 err = got_error_from_errno2("unlink", path_orig);
617 if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
618 err = got_error_from_errno2("close", path_orig);
619 if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
620 err = got_error_from_errno2("close", path_deriv);
621 if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
622 err = got_error_from_errno2("close", path_deriv2);
626 free(base_path_orig);
627 free(base_path_deriv);
628 free(base_path_deriv2);
633 * Perform a 3-way merge where the file f_orig acts as the common
634 * ancestor, the file f_deriv acts as the first derived version,
635 * and the file f_deriv2 acts as the second derived version.
636 * The merge result will be written to a new file at ondisk_path; any
637 * existing file at this path will be replaced.
639 static const struct got_error *
640 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
641 FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
642 const char *path, uint16_t st_mode,
643 const char *label_orig, const char *label_deriv, const char *label_deriv2,
644 enum got_diff_algorithm diff_algo, struct got_repository *repo,
645 got_worktree_checkout_cb progress_cb, void *progress_arg)
647 const struct got_error *err = NULL;
649 FILE *f_merged = NULL;
650 char *merged_path = NULL, *base_path = NULL;
654 *local_changes_subsumed = 0;
656 err = got_path_dirname(&parent, ondisk_path);
660 if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
661 err = got_error_from_errno("asprintf");
665 err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
669 err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
670 f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
672 if (err->code != GOT_ERR_FILE_BINARY)
674 err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
675 f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
681 err = (*progress_cb)(progress_arg,
682 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
686 if (fsync(merged_fd) != 0) {
687 err = got_error_from_errno("fsync");
691 f_merged = fdopen(merged_fd, "r");
692 if (f_merged == NULL) {
693 err = got_error_from_errno("fdopen");
698 /* Check if a clean merge has subsumed all local changes. */
699 if (overlapcnt == 0) {
700 err = check_files_equal(local_changes_subsumed, f_deriv,
706 if (fchmod(fileno(f_merged), st_mode) != 0) {
707 err = got_error_from_errno2("fchmod", merged_path);
711 if (rename(merged_path, ondisk_path) != 0) {
712 err = got_error_from_errno3("rename", merged_path,
721 if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
722 err = got_error_from_errno("close");
723 if (f_merged && fclose(f_merged) == EOF && err == NULL)
724 err = got_error_from_errno("fclose");
731 static const struct got_error *
732 update_symlink(const char *ondisk_path, const char *target_path,
735 /* This is not atomic but matches what 'ln -sf' does. */
736 if (unlink(ondisk_path) == -1)
737 return got_error_from_errno2("unlink", ondisk_path);
738 if (symlink(target_path, ondisk_path) == -1)
739 return got_error_from_errno3("symlink", target_path,
745 * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
746 * in the work tree with a file that contains conflict markers and the
747 * conflicting target paths of the original version, a "derived version"
748 * of a symlink from an incoming change, and a local version of the symlink.
750 * The original versions's target path can be NULL if it is not available,
751 * such as if both derived versions added a new symlink at the same path.
753 * The incoming derived symlink target is NULL in case the incoming change
754 * has deleted this symlink.
756 static const struct got_error *
757 install_symlink_conflict(const char *deriv_target,
758 struct got_object_id *deriv_base_commit_id, const char *orig_target,
759 const char *label_orig, const char *local_target, const char *ondisk_path)
761 const struct got_error *err;
762 char *id_str = NULL, *label_deriv = NULL, *path = NULL;
765 err = got_object_id_str(&id_str, deriv_base_commit_id);
767 return got_error_from_errno("asprintf");
769 if (asprintf(&label_deriv, "%s: commit %s",
770 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
771 err = got_error_from_errno("asprintf");
775 err = got_opentemp_named(&path, &f, "got-symlink-conflict");
779 if (fchmod(fileno(f), GOT_DEFAULT_FILE_MODE) == -1) {
780 err = got_error_from_errno2("fchmod", path);
784 if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
785 GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
786 deriv_target ? deriv_target : "(symlink was deleted)",
787 orig_target ? label_orig : "",
788 orig_target ? "\n" : "",
789 orig_target ? orig_target : "",
790 orig_target ? "\n" : "",
791 GOT_DIFF_CONFLICT_MARKER_SEP,
792 local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
793 err = got_error_from_errno2("fprintf", path);
797 if (unlink(ondisk_path) == -1) {
798 err = got_error_from_errno2("unlink", ondisk_path);
801 if (rename(path, ondisk_path) == -1) {
802 err = got_error_from_errno3("rename", path, ondisk_path);
806 if (f != NULL && fclose(f) == EOF && err == NULL)
807 err = got_error_from_errno2("fclose", path);
814 /* forward declaration */
815 static const struct got_error *
816 merge_blob(int *, struct got_worktree *, struct got_blob_object *,
817 const char *, const char *, uint16_t, const char *,
818 struct got_blob_object *, struct got_object_id *,
819 struct got_repository *, got_worktree_checkout_cb, void *);
822 * Merge a symlink into the work tree, where blob_orig acts as the common
823 * ancestor, deriv_target is the link target of the first derived version,
824 * and the symlink on disk acts as the second derived version.
825 * Assume that contents of both blobs represent symlinks.
827 static const struct got_error *
828 merge_symlink(struct got_worktree *worktree,
829 struct got_blob_object *blob_orig, const char *ondisk_path,
830 const char *path, const char *label_orig, const char *deriv_target,
831 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
832 got_worktree_checkout_cb progress_cb, void *progress_arg)
834 const struct got_error *err = NULL;
835 char *ancestor_target = NULL;
837 ssize_t ondisk_len, deriv_len;
838 char ondisk_target[PATH_MAX];
839 int have_local_change = 0;
840 int have_incoming_change = 0;
842 if (lstat(ondisk_path, &sb) == -1)
843 return got_error_from_errno2("lstat", ondisk_path);
845 ondisk_len = readlink(ondisk_path, ondisk_target,
846 sizeof(ondisk_target));
847 if (ondisk_len == -1) {
848 err = got_error_from_errno2("readlink",
852 ondisk_target[ondisk_len] = '\0';
855 err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
860 if (ancestor_target == NULL ||
861 (ondisk_len != strlen(ancestor_target) ||
862 memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
863 have_local_change = 1;
865 deriv_len = strlen(deriv_target);
866 if (ancestor_target == NULL ||
867 (deriv_len != strlen(ancestor_target) ||
868 memcmp(deriv_target, ancestor_target, deriv_len) != 0))
869 have_incoming_change = 1;
871 if (!have_local_change && !have_incoming_change) {
872 if (ancestor_target) {
873 /* Both sides made the same change. */
874 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
876 } else if (deriv_len == ondisk_len &&
877 memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
878 /* Both sides added the same symlink. */
879 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
882 /* Both sides added symlinks which don't match. */
883 err = install_symlink_conflict(deriv_target,
884 deriv_base_commit_id, ancestor_target,
885 label_orig, ondisk_target, ondisk_path);
888 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
891 } else if (!have_local_change && have_incoming_change) {
892 /* Apply the incoming change. */
893 err = update_symlink(ondisk_path, deriv_target,
894 strlen(deriv_target));
897 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
898 } else if (have_local_change && have_incoming_change) {
899 if (deriv_len == ondisk_len &&
900 memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
901 /* Both sides made the same change. */
902 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
905 err = install_symlink_conflict(deriv_target,
906 deriv_base_commit_id, ancestor_target, label_orig,
907 ondisk_target, ondisk_path);
910 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
916 free(ancestor_target);
920 static const struct got_error *
921 dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
923 const struct got_error *err = NULL;
924 char target_path[PATH_MAX];
933 return got_error_from_errno("got_opentemp");
934 target_len = readlink(ondisk_path, target_path, sizeof(target_path));
935 if (target_len == -1) {
936 err = got_error_from_errno2("readlink", ondisk_path);
939 n = fwrite(target_path, 1, target_len, f);
940 if (n != target_len) {
941 err = got_ferror(f, GOT_ERR_IO);
944 if (fflush(f) == EOF) {
945 err = got_error_from_errno("fflush");
948 if (fseek(f, 0L, SEEK_SET) == -1) {
949 err = got_ferror(f, GOT_ERR_IO);
961 * Perform a 3-way merge where blob_orig acts as the common ancestor,
962 * blob_deriv acts as the first derived version, and the file on disk
963 * acts as the second derived version.
965 static const struct got_error *
966 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
967 struct got_blob_object *blob_orig, const char *ondisk_path,
968 const char *path, uint16_t st_mode, const char *label_orig,
969 struct got_blob_object *blob_deriv,
970 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
971 got_worktree_checkout_cb progress_cb, void *progress_arg)
973 const struct got_error *err = NULL;
974 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
975 char *blob_orig_path = NULL;
976 char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
977 char *label_deriv = NULL, *parent = NULL;
979 *local_changes_subsumed = 0;
981 err = got_path_dirname(&parent, ondisk_path);
986 if (asprintf(&base_path, "%s/got-merge-blob-orig",
988 err = got_error_from_errno("asprintf");
993 err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
996 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
1003 * No common ancestor exists. This is an "add vs add" conflict
1004 * and we simply use an empty ancestor file to make both files
1005 * appear in the merged result in their entirety.
1007 f_orig = got_opentemp();
1008 if (f_orig == NULL) {
1009 err = got_error_from_errno("got_opentemp");
1014 if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1015 err = got_error_from_errno("asprintf");
1020 err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1023 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1028 err = got_object_id_str(&id_str, deriv_base_commit_id);
1031 if (asprintf(&label_deriv, "%s: commit %s",
1032 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1033 err = got_error_from_errno("asprintf");
1038 * In order the run a 3-way merge with a symlink we copy the symlink's
1039 * target path into a temporary file and use that file with diff3.
1041 if (S_ISLNK(st_mode)) {
1042 err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1047 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1049 err = got_error_from_errno2("open", ondisk_path);
1052 f_deriv2 = fdopen(fd, "r");
1053 if (f_deriv2 == NULL) {
1054 err = got_error_from_errno2("fdopen", ondisk_path);
1060 err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1061 f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1062 NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1064 if (f_orig && fclose(f_orig) == EOF && err == NULL)
1065 err = got_error_from_errno("fclose");
1066 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1067 err = got_error_from_errno("fclose");
1068 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1069 err = got_error_from_errno("fclose");
1071 if (blob_orig_path) {
1072 unlink(blob_orig_path);
1073 free(blob_orig_path);
1075 if (blob_deriv_path) {
1076 unlink(blob_deriv_path);
1077 free(blob_deriv_path);
1085 static const struct got_error *
1086 create_fileindex_entry(struct got_fileindex_entry **new_iep,
1087 struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1088 int wt_fd, const char *path, struct got_object_id *blob_id)
1090 const struct got_error *err = NULL;
1091 struct got_fileindex_entry *new_ie;
1095 err = got_fileindex_entry_alloc(&new_ie, path);
1099 err = got_fileindex_entry_update(new_ie, wt_fd, path,
1100 blob_id->sha1, base_commit_id->sha1, 1);
1104 err = got_fileindex_entry_add(fileindex, new_ie);
1107 got_fileindex_entry_free(new_ie);
1114 get_ondisk_perms(int executable, mode_t st_mode)
1116 mode_t xbits = S_IXUSR;
1119 /* Map read bits to execute bits. */
1120 if (st_mode & S_IRGRP)
1122 if (st_mode & S_IROTH)
1124 return st_mode | xbits;
1127 return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1130 /* forward declaration */
1131 static const struct got_error *
1132 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1133 const char *path, mode_t te_mode, mode_t st_mode,
1134 struct got_blob_object *blob, int restoring_missing_file,
1135 int reverting_versioned_file, int installing_bad_symlink,
1136 int path_is_unversioned, struct got_repository *repo,
1137 got_worktree_checkout_cb progress_cb, void *progress_arg);
1140 * This function assumes that the provided symlink target points at a
1141 * safe location in the work tree!
1143 static const struct got_error *
1144 replace_existing_symlink(int *did_something, const char *ondisk_path,
1145 const char *target_path, size_t target_len)
1147 const struct got_error *err = NULL;
1149 char etarget[PATH_MAX];
1155 * "Bad" symlinks (those pointing outside the work tree or into the
1156 * .got directory) are installed in the work tree as a regular file
1157 * which contains the bad symlink target path.
1158 * The new symlink target has already been checked for safety by our
1159 * caller. If we can successfully open a regular file then we simply
1160 * replace this file with a symlink below.
1162 fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1164 if (!got_err_open_nofollow_on_symlink())
1165 return got_error_from_errno2("open", ondisk_path);
1167 /* We are updating an existing on-disk symlink. */
1168 elen = readlink(ondisk_path, etarget, sizeof(etarget));
1170 return got_error_from_errno2("readlink", ondisk_path);
1172 if (elen == target_len &&
1173 memcmp(etarget, target_path, target_len) == 0)
1174 return NULL; /* nothing to do */
1178 err = update_symlink(ondisk_path, target_path, target_len);
1179 if (fd != -1 && close(fd) == -1 && err == NULL)
1180 err = got_error_from_errno2("close", ondisk_path);
1184 static const struct got_error *
1185 is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1186 size_t target_len, const char *ondisk_path, const char *wtroot_path)
1188 const struct got_error *err = NULL;
1189 char canonpath[PATH_MAX];
1190 char *path_got = NULL;
1192 *is_bad_symlink = 0;
1194 if (target_len >= sizeof(canonpath)) {
1195 *is_bad_symlink = 1;
1200 * We do not use realpath(3) to resolve the symlink's target
1201 * path because we don't want to resolve symlinks recursively.
1202 * Instead we make the path absolute and then canonicalize it.
1203 * Relative symlink target lookup should begin at the directory
1204 * in which the blob object is being installed.
1206 if (!got_path_is_absolute(target_path)) {
1207 char *abspath, *parent;
1208 err = got_path_dirname(&parent, ondisk_path);
1211 if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1213 return got_error_from_errno("asprintf");
1216 if (strlen(abspath) >= sizeof(canonpath)) {
1217 err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1221 err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1226 err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1231 /* Only allow symlinks pointing at paths within the work tree. */
1232 if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1233 *is_bad_symlink = 1;
1237 /* Do not allow symlinks pointing into the .got directory. */
1238 if (asprintf(&path_got, "%s/%s", wtroot_path,
1239 GOT_WORKTREE_GOT_DIR) == -1)
1240 return got_error_from_errno("asprintf");
1241 if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1242 *is_bad_symlink = 1;
1248 static const struct got_error *
1249 install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1250 const char *ondisk_path, const char *path, struct got_blob_object *blob,
1251 int restoring_missing_file, int reverting_versioned_file,
1252 int path_is_unversioned, int allow_bad_symlinks,
1253 struct got_repository *repo,
1254 got_worktree_checkout_cb progress_cb, void *progress_arg)
1256 const struct got_error *err = NULL;
1257 char target_path[PATH_MAX];
1258 size_t len, target_len = 0;
1259 char *path_got = NULL;
1260 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1261 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1263 *is_bad_symlink = 0;
1266 * Blob object content specifies the target path of the link.
1267 * If a symbolic link cannot be installed we instead create
1268 * a regular file which contains the link target path stored
1269 * in the blob object.
1272 err = got_object_blob_read_block(&len, blob);
1273 if (len + target_len >= sizeof(target_path)) {
1274 /* Path too long; install as a regular file. */
1275 *is_bad_symlink = 1;
1276 got_object_blob_rewind(blob);
1277 return install_blob(worktree, ondisk_path, path,
1278 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1279 restoring_missing_file, reverting_versioned_file,
1280 1, path_is_unversioned, repo, progress_cb,
1284 /* Skip blob object header first time around. */
1285 memcpy(target_path + target_len, buf + hdrlen,
1287 target_len += len - hdrlen;
1291 target_path[target_len] = '\0';
1293 err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1294 ondisk_path, worktree->root_path);
1298 if (*is_bad_symlink && !allow_bad_symlinks) {
1299 /* install as a regular file */
1300 got_object_blob_rewind(blob);
1301 err = install_blob(worktree, ondisk_path, path,
1302 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1303 restoring_missing_file, reverting_versioned_file, 1,
1304 path_is_unversioned, repo, progress_cb, progress_arg);
1308 if (symlink(target_path, ondisk_path) == -1) {
1309 if (errno == EEXIST) {
1310 int symlink_replaced;
1311 if (path_is_unversioned) {
1312 err = (*progress_cb)(progress_arg,
1313 GOT_STATUS_UNVERSIONED, path);
1316 err = replace_existing_symlink(&symlink_replaced,
1317 ondisk_path, target_path, target_len);
1321 if (symlink_replaced) {
1322 err = (*progress_cb)(progress_arg,
1323 reverting_versioned_file ?
1325 GOT_STATUS_UPDATE, path);
1327 err = (*progress_cb)(progress_arg,
1328 GOT_STATUS_EXISTS, path);
1331 goto done; /* Nothing else to do. */
1334 if (errno == ENOENT) {
1336 err = got_path_dirname(&parent, ondisk_path);
1339 err = add_dir_on_disk(worktree, parent);
1344 * Retry, and fall through to error handling
1345 * below if this second attempt fails.
1347 if (symlink(target_path, ondisk_path) != -1) {
1348 err = NULL; /* success */
1353 /* Handle errors from first or second creation attempt. */
1354 if (errno == ENAMETOOLONG) {
1355 /* bad target path; install as a regular file */
1356 *is_bad_symlink = 1;
1357 got_object_blob_rewind(blob);
1358 err = install_blob(worktree, ondisk_path, path,
1359 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1360 restoring_missing_file, reverting_versioned_file, 1,
1361 path_is_unversioned, repo,
1362 progress_cb, progress_arg);
1363 } else if (errno == ENOTDIR) {
1364 err = got_error_path(ondisk_path,
1365 GOT_ERR_FILE_OBSTRUCTED);
1367 err = got_error_from_errno3("symlink",
1368 target_path, ondisk_path);
1370 } else if (progress_cb)
1371 err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1372 GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1378 static const struct got_error *
1379 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1380 const char *path, mode_t te_mode, mode_t st_mode,
1381 struct got_blob_object *blob, int restoring_missing_file,
1382 int reverting_versioned_file, int installing_bad_symlink,
1383 int path_is_unversioned, struct got_repository *repo,
1384 got_worktree_checkout_cb progress_cb, void *progress_arg)
1386 const struct got_error *err = NULL;
1390 char *tmppath = NULL;
1392 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1393 O_CLOEXEC, GOT_DEFAULT_FILE_MODE);
1395 if (errno == ENOENT) {
1397 err = got_path_dirname(&parent, path);
1400 err = add_dir_on_disk(worktree, parent);
1404 fd = open(ondisk_path,
1405 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1406 GOT_DEFAULT_FILE_MODE);
1408 return got_error_from_errno2("open",
1410 } else if (errno == EEXIST) {
1411 if (path_is_unversioned) {
1412 err = (*progress_cb)(progress_arg,
1413 GOT_STATUS_UNVERSIONED, path);
1416 if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1417 !S_ISREG(st_mode) && !installing_bad_symlink) {
1418 /* TODO file is obstructed; do something */
1419 err = got_error_path(ondisk_path,
1420 GOT_ERR_FILE_OBSTRUCTED);
1423 err = got_opentemp_named_fd(&tmppath, &fd,
1430 return got_error_from_errno2("open", ondisk_path);
1433 if (fchmod(fd, get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1434 err = got_error_from_errno2("fchmod",
1435 update ? tmppath : ondisk_path);
1440 if (restoring_missing_file)
1441 err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1443 else if (reverting_versioned_file)
1444 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1447 err = (*progress_cb)(progress_arg,
1448 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1453 hdrlen = got_object_blob_get_hdrlen(blob);
1455 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1456 err = got_object_blob_read_block(&len, blob);
1460 /* Skip blob object header first time around. */
1461 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1463 err = got_error_from_errno("write");
1465 } else if (outlen != len - hdrlen) {
1466 err = got_error(GOT_ERR_IO);
1473 if (fsync(fd) != 0) {
1474 err = got_error_from_errno("fsync");
1479 if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1480 err = got_error_from_errno2("unlink", ondisk_path);
1483 if (rename(tmppath, ondisk_path) != 0) {
1484 err = got_error_from_errno3("rename", tmppath,
1493 if (fd != -1 && close(fd) == -1 && err == NULL)
1494 err = got_error_from_errno("close");
1495 if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1496 err = got_error_from_errno2("unlink", tmppath);
1501 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1502 static const struct got_error *
1503 get_modified_file_content_status(unsigned char *status, FILE *f)
1505 const struct got_error *err = NULL;
1506 const char *markers[3] = {
1507 GOT_DIFF_CONFLICT_MARKER_BEGIN,
1508 GOT_DIFF_CONFLICT_MARKER_SEP,
1509 GOT_DIFF_CONFLICT_MARKER_END
1513 size_t linesize = 0;
1516 while (*status == GOT_STATUS_MODIFY) {
1517 linelen = getline(&line, &linesize, f);
1518 if (linelen == -1) {
1521 err = got_ferror(f, GOT_ERR_IO);
1525 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1526 if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1528 *status = GOT_STATUS_CONFLICT;
1539 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1541 mode_t ie_mode = got_fileindex_perms_to_st(ie);
1542 return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1546 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1548 return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1549 ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1550 ie->mtime_sec == sb->st_mtim.tv_sec &&
1551 ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1552 ie->size == (sb->st_size & 0xffffffff) &&
1553 !xbit_differs(ie, sb->st_mode));
1556 static unsigned char
1557 get_staged_status(struct got_fileindex_entry *ie)
1559 switch (got_fileindex_entry_stage_get(ie)) {
1560 case GOT_FILEIDX_STAGE_ADD:
1561 return GOT_STATUS_ADD;
1562 case GOT_FILEIDX_STAGE_DELETE:
1563 return GOT_STATUS_DELETE;
1564 case GOT_FILEIDX_STAGE_MODIFY:
1565 return GOT_STATUS_MODIFY;
1567 return GOT_STATUS_NO_CHANGE;
1571 static const struct got_error *
1572 get_symlink_modification_status(unsigned char *status,
1573 struct got_fileindex_entry *ie, const char *abspath,
1574 int dirfd, const char *de_name, struct got_blob_object *blob)
1576 const struct got_error *err = NULL;
1577 char target_path[PATH_MAX];
1578 char etarget[PATH_MAX];
1580 size_t len, target_len = 0;
1581 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1582 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1584 *status = GOT_STATUS_NO_CHANGE;
1586 /* Blob object content specifies the target path of the link. */
1588 err = got_object_blob_read_block(&len, blob);
1591 if (len + target_len >= sizeof(target_path)) {
1593 * Should not happen. The blob contents were OK
1594 * when this symlink was installed.
1596 return got_error(GOT_ERR_NO_SPACE);
1599 /* Skip blob object header first time around. */
1600 memcpy(target_path + target_len, buf + hdrlen,
1602 target_len += len - hdrlen;
1606 target_path[target_len] = '\0';
1609 elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1611 return got_error_from_errno2("readlinkat", abspath);
1613 elen = readlink(abspath, etarget, sizeof(etarget));
1615 return got_error_from_errno2("readlink", abspath);
1618 if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1619 *status = GOT_STATUS_MODIFY;
1624 static const struct got_error *
1625 get_file_status(unsigned char *status, struct stat *sb,
1626 struct got_fileindex_entry *ie, const char *abspath,
1627 int dirfd, const char *de_name, struct got_repository *repo)
1629 const struct got_error *err = NULL;
1630 struct got_object_id id;
1635 struct got_blob_object *blob = NULL;
1637 unsigned char staged_status = get_staged_status(ie);
1639 *status = GOT_STATUS_NO_CHANGE;
1640 memset(sb, 0, sizeof(*sb));
1643 * Whenever the caller provides a directory descriptor and a
1644 * directory entry name for the file, use them! This prevents
1645 * race conditions if filesystem paths change beneath our feet.
1648 if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1649 if (errno == ENOENT) {
1650 if (got_fileindex_entry_has_file_on_disk(ie))
1651 *status = GOT_STATUS_MISSING;
1653 *status = GOT_STATUS_DELETE;
1656 err = got_error_from_errno2("fstatat", abspath);
1660 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1661 if (fd == -1 && errno != ENOENT &&
1662 !got_err_open_nofollow_on_symlink())
1663 return got_error_from_errno2("open", abspath);
1664 else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1665 if (lstat(abspath, sb) == -1)
1666 return got_error_from_errno2("lstat", abspath);
1667 } else if (fd == -1 || fstat(fd, sb) == -1) {
1668 if (errno == ENOENT) {
1669 if (got_fileindex_entry_has_file_on_disk(ie))
1670 *status = GOT_STATUS_MISSING;
1672 *status = GOT_STATUS_DELETE;
1675 err = got_error_from_errno2("fstat", abspath);
1680 if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1681 *status = GOT_STATUS_OBSTRUCTED;
1685 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1686 *status = GOT_STATUS_DELETE;
1688 } else if (!got_fileindex_entry_has_blob(ie) &&
1689 staged_status != GOT_STATUS_ADD) {
1690 *status = GOT_STATUS_ADD;
1694 if (!stat_info_differs(ie, sb))
1697 if (S_ISLNK(sb->st_mode) &&
1698 got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1699 *status = GOT_STATUS_MODIFY;
1703 if (staged_status == GOT_STATUS_MODIFY ||
1704 staged_status == GOT_STATUS_ADD)
1705 memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1707 memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1709 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1713 if (S_ISLNK(sb->st_mode)) {
1714 err = get_symlink_modification_status(status, ie,
1715 abspath, dirfd, de_name, blob);
1720 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1722 err = got_error_from_errno2("openat", abspath);
1727 f = fdopen(fd, "r");
1729 err = got_error_from_errno2("fdopen", abspath);
1733 hdrlen = got_object_blob_get_hdrlen(blob);
1735 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1736 err = got_object_blob_read_block(&blen, blob);
1739 /* Skip length of blob object header first time around. */
1740 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1741 if (flen == 0 && ferror(f)) {
1742 err = got_error_from_errno("fread");
1745 if (blen - hdrlen == 0) {
1747 *status = GOT_STATUS_MODIFY;
1749 } else if (flen == 0) {
1750 if (blen - hdrlen != 0)
1751 *status = GOT_STATUS_MODIFY;
1753 } else if (blen - hdrlen == flen) {
1754 /* Skip blob object header first time around. */
1755 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1756 *status = GOT_STATUS_MODIFY;
1760 *status = GOT_STATUS_MODIFY;
1766 if (*status == GOT_STATUS_MODIFY) {
1768 err = get_modified_file_content_status(status, f);
1769 } else if (xbit_differs(ie, sb->st_mode))
1770 *status = GOT_STATUS_MODE_CHANGE;
1773 got_object_blob_close(blob);
1774 if (f != NULL && fclose(f) == EOF && err == NULL)
1775 err = got_error_from_errno2("fclose", abspath);
1776 if (fd != -1 && close(fd) == -1 && err == NULL)
1777 err = got_error_from_errno2("close", abspath);
1782 * Update timestamps in the file index if a file is unmodified and
1783 * we had to run a full content comparison to find out.
1785 static const struct got_error *
1786 sync_timestamps(int wt_fd, const char *path, unsigned char status,
1787 struct got_fileindex_entry *ie, struct stat *sb)
1789 if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1790 return got_fileindex_entry_update(ie, wt_fd, path,
1791 ie->blob_sha1, ie->commit_sha1, 1);
1796 static const struct got_error *
1797 update_blob(struct got_worktree *worktree,
1798 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1799 struct got_tree_entry *te, const char *path,
1800 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1803 const struct got_error *err = NULL;
1804 struct got_blob_object *blob = NULL;
1806 unsigned char status = GOT_STATUS_NO_CHANGE;
1809 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1810 return got_error_from_errno("asprintf");
1813 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1814 err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1817 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1821 if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1822 sb.st_mode = got_fileindex_perms_to_st(ie);
1824 if (stat(ondisk_path, &sb) == -1) {
1825 if (errno != ENOENT) {
1826 err = got_error_from_errno2("stat",
1830 sb.st_mode = GOT_DEFAULT_FILE_MODE;
1831 status = GOT_STATUS_UNVERSIONED;
1833 if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1834 status = GOT_STATUS_UNVERSIONED;
1836 status = GOT_STATUS_OBSTRUCTED;
1840 if (status == GOT_STATUS_OBSTRUCTED) {
1842 got_fileindex_entry_mark_skipped(ie);
1843 err = (*progress_cb)(progress_arg, status, path);
1846 if (status == GOT_STATUS_CONFLICT) {
1848 got_fileindex_entry_mark_skipped(ie);
1849 err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1854 if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1855 (S_ISLNK(te->mode) ||
1856 (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1858 * This is a regular file or an installed bad symlink.
1859 * If the file index indicates that this file is already
1860 * up-to-date with respect to the repository we can skip
1861 * updating contents of this file.
1863 if (got_fileindex_entry_has_commit(ie) &&
1864 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1865 SHA1_DIGEST_LENGTH) == 0) {
1867 err = sync_timestamps(worktree->root_fd,
1868 path, status, ie, &sb);
1871 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1875 if (got_fileindex_entry_has_blob(ie) &&
1876 memcmp(ie->blob_sha1, te->id.sha1,
1877 SHA1_DIGEST_LENGTH) == 0) {
1878 /* Different commit but the same blob. */
1879 err = sync_timestamps(worktree->root_fd,
1880 path, status, ie, &sb);
1883 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1889 err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1893 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1894 int update_timestamps;
1895 struct got_blob_object *blob2 = NULL;
1896 char *label_orig = NULL;
1897 if (got_fileindex_entry_has_blob(ie)) {
1898 struct got_object_id id2;
1899 memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1900 err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1904 if (got_fileindex_entry_has_commit(ie)) {
1905 char id_str[SHA1_DIGEST_STRING_LENGTH];
1906 if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1907 sizeof(id_str)) == NULL) {
1908 err = got_error_path(id_str,
1909 GOT_ERR_BAD_OBJ_ID_STR);
1912 if (asprintf(&label_orig, "%s: commit %s",
1913 GOT_MERGE_LABEL_BASE, id_str) == -1) {
1914 err = got_error_from_errno("asprintf");
1918 if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1920 err = got_object_blob_read_to_str(&link_target, blob);
1923 err = merge_symlink(worktree, blob2, ondisk_path, path,
1924 label_orig, link_target, worktree->base_commit_id,
1925 repo, progress_cb, progress_arg);
1928 err = merge_blob(&update_timestamps, worktree, blob2,
1929 ondisk_path, path, sb.st_mode, label_orig, blob,
1930 worktree->base_commit_id, repo,
1931 progress_cb, progress_arg);
1935 got_object_blob_close(blob2);
1939 * Do not update timestamps of files with local changes.
1940 * Otherwise, a future status walk would treat them as
1941 * unmodified files again.
1943 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1944 blob->id.sha1, worktree->base_commit_id->sha1,
1946 } else if (status == GOT_STATUS_MODE_CHANGE) {
1947 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1948 blob->id.sha1, worktree->base_commit_id->sha1, 0);
1949 } else if (status == GOT_STATUS_DELETE) {
1950 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1953 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1954 blob->id.sha1, worktree->base_commit_id->sha1, 0);
1958 int is_bad_symlink = 0;
1959 if (S_ISLNK(te->mode)) {
1960 err = install_symlink(&is_bad_symlink, worktree,
1961 ondisk_path, path, blob,
1962 status == GOT_STATUS_MISSING, 0,
1963 status == GOT_STATUS_UNVERSIONED, 0,
1964 repo, progress_cb, progress_arg);
1966 err = install_blob(worktree, ondisk_path, path,
1967 te->mode, sb.st_mode, blob,
1968 status == GOT_STATUS_MISSING, 0, 0,
1969 status == GOT_STATUS_UNVERSIONED, repo,
1970 progress_cb, progress_arg);
1976 err = got_fileindex_entry_update(ie,
1977 worktree->root_fd, path, blob->id.sha1,
1978 worktree->base_commit_id->sha1, 1);
1980 err = create_fileindex_entry(&ie, fileindex,
1981 worktree->base_commit_id, worktree->root_fd, path,
1987 if (is_bad_symlink) {
1988 got_fileindex_entry_filetype_set(ie,
1989 GOT_FILEIDX_MODE_BAD_SYMLINK);
1992 got_object_blob_close(blob);
1998 static const struct got_error *
1999 remove_ondisk_file(const char *root_path, const char *path)
2001 const struct got_error *err = NULL;
2002 char *ondisk_path = NULL, *parent = NULL;
2004 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2005 return got_error_from_errno("asprintf");
2007 if (unlink(ondisk_path) == -1) {
2008 if (errno != ENOENT)
2009 err = got_error_from_errno2("unlink", ondisk_path);
2011 size_t root_len = strlen(root_path);
2012 err = got_path_dirname(&parent, ondisk_path);
2015 while (got_path_cmp(parent, root_path,
2016 strlen(parent), root_len) != 0) {
2018 ondisk_path = parent;
2020 if (rmdir(ondisk_path) == -1) {
2021 if (errno != ENOTEMPTY)
2022 err = got_error_from_errno2("rmdir",
2026 err = got_path_dirname(&parent, ondisk_path);
2037 static const struct got_error *
2038 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2039 struct got_fileindex_entry *ie, struct got_repository *repo,
2040 got_worktree_checkout_cb progress_cb, void *progress_arg)
2042 const struct got_error *err = NULL;
2043 unsigned char status;
2047 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2048 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2050 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2052 return got_error_from_errno("asprintf");
2054 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2058 if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2059 char ondisk_target[PATH_MAX];
2060 ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2061 sizeof(ondisk_target));
2062 if (ondisk_len == -1) {
2063 err = got_error_from_errno2("readlink", ondisk_path);
2066 ondisk_target[ondisk_len] = '\0';
2067 err = install_symlink_conflict(NULL, worktree->base_commit_id,
2068 NULL, NULL, /* XXX pass common ancestor info? */
2069 ondisk_target, ondisk_path);
2072 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2077 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2078 status == GOT_STATUS_ADD) {
2079 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2083 * Preserve the working file and change the deleted blob's
2084 * entry into a schedule-add entry.
2086 err = got_fileindex_entry_update(ie, worktree->root_fd,
2087 ie->path, NULL, NULL, 0);
2089 err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2092 if (status == GOT_STATUS_NO_CHANGE) {
2093 err = remove_ondisk_file(worktree->root_path, ie->path);
2097 got_fileindex_entry_remove(fileindex, ie);
2104 struct diff_cb_arg {
2105 struct got_fileindex *fileindex;
2106 struct got_worktree *worktree;
2107 struct got_repository *repo;
2108 got_worktree_checkout_cb progress_cb;
2110 got_cancel_cb cancel_cb;
2114 static const struct got_error *
2115 diff_old_new(void *arg, struct got_fileindex_entry *ie,
2116 struct got_tree_entry *te, const char *parent_path)
2118 struct diff_cb_arg *a = arg;
2120 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2121 return got_error(GOT_ERR_CANCELLED);
2123 return update_blob(a->worktree, a->fileindex, ie, te,
2124 ie->path, a->repo, a->progress_cb, a->progress_arg);
2127 static const struct got_error *
2128 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2130 struct diff_cb_arg *a = arg;
2132 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2133 return got_error(GOT_ERR_CANCELLED);
2135 return delete_blob(a->worktree, a->fileindex, ie,
2136 a->repo, a->progress_cb, a->progress_arg);
2139 static const struct got_error *
2140 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2142 struct diff_cb_arg *a = arg;
2143 const struct got_error *err;
2146 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2147 return got_error(GOT_ERR_CANCELLED);
2149 if (got_object_tree_entry_is_submodule(te))
2152 if (asprintf(&path, "%s%s%s", parent_path,
2153 parent_path[0] ? "/" : "", te->name)
2155 return got_error_from_errno("asprintf");
2157 if (S_ISDIR(te->mode))
2158 err = add_dir_on_disk(a->worktree, path);
2160 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2161 a->repo, a->progress_cb, a->progress_arg);
2167 const struct got_error *
2168 got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2170 uint32_t uuid_status;
2172 uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2173 if (uuid_status != uuid_s_ok) {
2175 return got_error_uuid(uuid_status, "uuid_to_string");
2181 static const struct got_error *
2182 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2184 const struct got_error *err = NULL;
2185 char *uuidstr = NULL;
2189 err = got_worktree_get_uuid(&uuidstr, worktree);
2193 if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2194 err = got_error_from_errno("asprintf");
2201 const struct got_error *
2202 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2204 return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2207 static const struct got_error *
2208 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2210 return get_ref_name(refname, worktree,
2211 GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2214 static const struct got_error *
2215 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2217 return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2220 static const struct got_error *
2221 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2223 return get_ref_name(refname, worktree,
2224 GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2227 static const struct got_error *
2228 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2230 return get_ref_name(refname, worktree,
2231 GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2234 static const struct got_error *
2235 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2237 return get_ref_name(refname, worktree,
2238 GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2241 static const struct got_error *
2242 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2244 return get_ref_name(refname, worktree,
2245 GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2248 static const struct got_error *
2249 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2251 return get_ref_name(refname, worktree,
2252 GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2255 static const struct got_error *
2256 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2258 return get_ref_name(refname, worktree,
2259 GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2262 const struct got_error *
2263 got_worktree_get_histedit_script_path(char **path,
2264 struct got_worktree *worktree)
2266 if (asprintf(path, "%s/%s/%s", worktree->root_path,
2267 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2269 return got_error_from_errno("asprintf");
2274 static const struct got_error *
2275 get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2277 return get_ref_name(refname, worktree,
2278 GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2281 static const struct got_error *
2282 get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2284 return get_ref_name(refname, worktree,
2285 GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2289 * Prevent Git's garbage collector from deleting our base commit by
2290 * setting a reference to our base commit's ID.
2292 static const struct got_error *
2293 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2295 const struct got_error *err = NULL;
2296 struct got_reference *ref = NULL;
2299 err = got_worktree_get_base_ref_name(&refname, worktree);
2303 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2307 err = got_ref_write(ref, repo);
2315 static const struct got_error *
2316 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2318 const struct got_error *err = NULL;
2320 if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2321 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2322 err = got_error_from_errno("asprintf");
2323 *fileindex_path = NULL;
2329 static const struct got_error *
2330 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2331 struct got_worktree *worktree)
2333 const struct got_error *err = NULL;
2336 *fileindex_path = NULL;
2337 *fileindex = got_fileindex_alloc();
2338 if (*fileindex == NULL)
2339 return got_error_from_errno("got_fileindex_alloc");
2341 err = get_fileindex_path(fileindex_path, worktree);
2345 index = fopen(*fileindex_path, "rbe");
2346 if (index == NULL) {
2347 if (errno != ENOENT)
2348 err = got_error_from_errno2("fopen", *fileindex_path);
2350 err = got_fileindex_read(*fileindex, index);
2351 if (fclose(index) == EOF && err == NULL)
2352 err = got_error_from_errno("fclose");
2356 free(*fileindex_path);
2357 *fileindex_path = NULL;
2358 got_fileindex_free(*fileindex);
2364 struct bump_base_commit_id_arg {
2365 struct got_object_id *base_commit_id;
2368 const char *entry_name;
2369 got_worktree_checkout_cb progress_cb;
2373 /* Bump base commit ID of all files within an updated part of the work tree. */
2374 static const struct got_error *
2375 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2377 const struct got_error *err;
2378 struct bump_base_commit_id_arg *a = arg;
2380 if (a->entry_name) {
2381 if (strcmp(ie->path, a->path) != 0)
2383 } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2386 if (got_fileindex_entry_was_skipped(ie))
2389 if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2390 SHA1_DIGEST_LENGTH) == 0)
2393 if (a->progress_cb) {
2394 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2399 memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2403 static const struct got_error *
2404 bump_base_commit_id_everywhere(struct got_worktree *worktree,
2405 struct got_fileindex *fileindex,
2406 got_worktree_checkout_cb progress_cb, void *progress_arg)
2408 struct bump_base_commit_id_arg bbc_arg;
2410 bbc_arg.base_commit_id = worktree->base_commit_id;
2411 bbc_arg.entry_name = NULL;
2413 bbc_arg.path_len = 0;
2414 bbc_arg.progress_cb = progress_cb;
2415 bbc_arg.progress_arg = progress_arg;
2417 return got_fileindex_for_each_entry_safe(fileindex,
2418 bump_base_commit_id, &bbc_arg);
2421 static const struct got_error *
2422 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2424 const struct got_error *err = NULL;
2425 char *new_fileindex_path = NULL;
2426 FILE *new_index = NULL;
2427 struct timespec timeout;
2429 err = got_opentemp_named(&new_fileindex_path, &new_index,
2434 err = got_fileindex_write(fileindex, new_index);
2438 if (rename(new_fileindex_path, fileindex_path) != 0) {
2439 err = got_error_from_errno3("rename", new_fileindex_path,
2441 unlink(new_fileindex_path);
2445 * Sleep for a short amount of time to ensure that files modified after
2446 * this program exits have a different time stamp from the one which
2447 * was recorded in the file index.
2450 timeout.tv_nsec = 1;
2451 nanosleep(&timeout, NULL);
2455 free(new_fileindex_path);
2459 static const struct got_error *
2460 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2461 struct got_object_id **tree_id, const char *wt_relpath,
2462 struct got_worktree *worktree, struct got_repository *repo)
2464 const struct got_error *err = NULL;
2465 struct got_object_id *id = NULL;
2466 char *in_repo_path = NULL;
2467 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2469 *entry_type = GOT_OBJ_TYPE_ANY;
2470 *tree_relpath = NULL;
2473 if (wt_relpath[0] == '\0') {
2474 /* Check out all files within the work tree. */
2475 *entry_type = GOT_OBJ_TYPE_TREE;
2476 *tree_relpath = strdup("");
2477 if (*tree_relpath == NULL) {
2478 err = got_error_from_errno("strdup");
2481 err = got_object_id_by_path(tree_id, repo,
2482 worktree->base_commit_id, worktree->path_prefix);
2488 /* Check out a subset of files in the work tree. */
2490 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2491 is_root_wt ? "" : "/", wt_relpath) == -1) {
2492 err = got_error_from_errno("asprintf");
2496 err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2502 in_repo_path = NULL;
2504 err = got_object_get_type(entry_type, repo, id);
2508 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2509 /* Check out a single file. */
2510 if (strchr(wt_relpath, '/') == NULL) {
2511 /* Check out a single file in work tree's root dir. */
2512 in_repo_path = strdup(worktree->path_prefix);
2513 if (in_repo_path == NULL) {
2514 err = got_error_from_errno("strdup");
2517 *tree_relpath = strdup("");
2518 if (*tree_relpath == NULL) {
2519 err = got_error_from_errno("strdup");
2523 /* Check out a single file in a subdirectory. */
2524 err = got_path_dirname(tree_relpath, wt_relpath);
2527 if (asprintf(&in_repo_path, "%s%s%s",
2528 worktree->path_prefix, is_root_wt ? "" : "/",
2529 *tree_relpath) == -1) {
2530 err = got_error_from_errno("asprintf");
2534 err = got_object_id_by_path(tree_id, repo,
2535 worktree->base_commit_id, in_repo_path);
2537 /* Check out all files within a subdirectory. */
2538 *tree_id = got_object_id_dup(id);
2539 if (*tree_id == NULL) {
2540 err = got_error_from_errno("got_object_id_dup");
2543 *tree_relpath = strdup(wt_relpath);
2544 if (*tree_relpath == NULL) {
2545 err = got_error_from_errno("strdup");
2553 *entry_type = GOT_OBJ_TYPE_ANY;
2554 free(*tree_relpath);
2555 *tree_relpath = NULL;
2562 static const struct got_error *
2563 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2564 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2565 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2566 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2568 const struct got_error *err = NULL;
2569 struct got_commit_object *commit = NULL;
2570 struct got_tree_object *tree = NULL;
2571 struct got_fileindex_diff_tree_cb diff_cb;
2572 struct diff_cb_arg arg;
2574 err = ref_base_commit(worktree, repo);
2576 if (!(err->code == GOT_ERR_ERRNO &&
2577 (errno == EACCES || errno == EROFS)))
2579 err = (*progress_cb)(progress_arg,
2580 GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2585 err = got_object_open_as_commit(&commit, repo,
2586 worktree->base_commit_id);
2590 err = got_object_open_as_tree(&tree, repo, tree_id);
2595 got_object_tree_find_entry(tree, entry_name) == NULL) {
2596 err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2600 diff_cb.diff_old_new = diff_old_new;
2601 diff_cb.diff_old = diff_old;
2602 diff_cb.diff_new = diff_new;
2603 arg.fileindex = fileindex;
2604 arg.worktree = worktree;
2606 arg.progress_cb = progress_cb;
2607 arg.progress_arg = progress_arg;
2608 arg.cancel_cb = cancel_cb;
2609 arg.cancel_arg = cancel_arg;
2610 err = got_fileindex_diff_tree(fileindex, tree, relpath,
2611 entry_name, repo, &diff_cb, &arg);
2614 got_object_tree_close(tree);
2616 got_object_commit_close(commit);
2620 const struct got_error *
2621 got_worktree_checkout_files(struct got_worktree *worktree,
2622 struct got_pathlist_head *paths, struct got_repository *repo,
2623 got_worktree_checkout_cb progress_cb, void *progress_arg,
2624 got_cancel_cb cancel_cb, void *cancel_arg)
2626 const struct got_error *err = NULL, *sync_err, *unlockerr;
2627 struct got_commit_object *commit = NULL;
2628 struct got_tree_object *tree = NULL;
2629 struct got_fileindex *fileindex = NULL;
2630 char *fileindex_path = NULL;
2631 struct got_pathlist_entry *pe;
2632 struct tree_path_data {
2633 STAILQ_ENTRY(tree_path_data) entry;
2634 struct got_object_id *tree_id;
2639 STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2641 STAILQ_INIT(&tree_paths);
2643 err = lock_worktree(worktree, LOCK_EX);
2647 /* Map all specified paths to in-repository trees. */
2648 TAILQ_FOREACH(pe, paths, entry) {
2649 tpd = malloc(sizeof(*tpd));
2651 err = got_error_from_errno("malloc");
2655 err = find_tree_entry_for_checkout(&tpd->entry_type,
2656 &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2662 if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2663 err = got_path_basename(&tpd->entry_name, pe->path);
2671 tpd->entry_name = NULL;
2673 STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2677 * Read the file index.
2678 * Checking out files is supposed to be an idempotent operation.
2679 * If the on-disk file index is incomplete we will try to complete it.
2681 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2685 tpd = STAILQ_FIRST(&tree_paths);
2686 TAILQ_FOREACH(pe, paths, entry) {
2687 struct bump_base_commit_id_arg bbc_arg;
2689 err = checkout_files(worktree, fileindex, tpd->relpath,
2690 tpd->tree_id, tpd->entry_name, repo,
2691 progress_cb, progress_arg, cancel_cb, cancel_arg);
2695 bbc_arg.base_commit_id = worktree->base_commit_id;
2696 bbc_arg.entry_name = tpd->entry_name;
2697 bbc_arg.path = pe->path;
2698 bbc_arg.path_len = pe->path_len;
2699 bbc_arg.progress_cb = progress_cb;
2700 bbc_arg.progress_arg = progress_arg;
2701 err = got_fileindex_for_each_entry_safe(fileindex,
2702 bump_base_commit_id, &bbc_arg);
2706 tpd = STAILQ_NEXT(tpd, entry);
2708 sync_err = sync_fileindex(fileindex, fileindex_path);
2709 if (sync_err && err == NULL)
2712 free(fileindex_path);
2714 got_object_tree_close(tree);
2716 got_object_commit_close(commit);
2718 got_fileindex_free(fileindex);
2719 while (!STAILQ_EMPTY(&tree_paths)) {
2720 tpd = STAILQ_FIRST(&tree_paths);
2721 STAILQ_REMOVE_HEAD(&tree_paths, entry);
2726 unlockerr = lock_worktree(worktree, LOCK_SH);
2727 if (unlockerr && err == NULL)
2732 struct merge_file_cb_arg {
2733 struct got_worktree *worktree;
2734 struct got_fileindex *fileindex;
2735 got_worktree_checkout_cb progress_cb;
2737 got_cancel_cb cancel_cb;
2739 const char *label_orig;
2740 struct got_object_id *commit_id2;
2741 int allow_bad_symlinks;
2744 static const struct got_error *
2745 merge_file_cb(void *arg, struct got_blob_object *blob1,
2746 struct got_blob_object *blob2, struct got_object_id *id1,
2747 struct got_object_id *id2, const char *path1, const char *path2,
2748 mode_t mode1, mode_t mode2, struct got_repository *repo)
2750 static const struct got_error *err = NULL;
2751 struct merge_file_cb_arg *a = arg;
2752 struct got_fileindex_entry *ie;
2753 char *ondisk_path = NULL;
2755 unsigned char status;
2756 int local_changes_subsumed;
2757 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2758 char *id_str = NULL, *label_deriv2 = NULL;
2760 if (blob1 && blob2) {
2761 ie = got_fileindex_entry_get(a->fileindex, path2,
2764 return (*a->progress_cb)(a->progress_arg,
2765 GOT_STATUS_MISSING, path2);
2767 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2769 return got_error_from_errno("asprintf");
2771 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2776 if (status == GOT_STATUS_DELETE) {
2777 err = (*a->progress_cb)(a->progress_arg,
2778 GOT_STATUS_MERGE, path2);
2781 if (status != GOT_STATUS_NO_CHANGE &&
2782 status != GOT_STATUS_MODIFY &&
2783 status != GOT_STATUS_CONFLICT &&
2784 status != GOT_STATUS_ADD) {
2785 err = (*a->progress_cb)(a->progress_arg, status, path2);
2789 if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2791 err = got_object_blob_read_to_str(&link_target2, blob2);
2794 err = merge_symlink(a->worktree, blob1, ondisk_path,
2795 path2, a->label_orig, link_target2, a->commit_id2,
2796 repo, a->progress_cb, a->progress_arg);
2801 f_orig = got_opentemp();
2802 if (f_orig == NULL) {
2803 err = got_error_from_errno("got_opentemp");
2806 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2811 f_deriv2 = got_opentemp();
2812 if (f_deriv2 == NULL)
2814 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2819 fd = open(ondisk_path,
2820 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2822 err = got_error_from_errno2("open",
2826 f_deriv = fdopen(fd, "r");
2827 if (f_deriv == NULL) {
2828 err = got_error_from_errno2("fdopen",
2833 err = got_object_id_str(&id_str, a->commit_id2);
2836 if (asprintf(&label_deriv2, "%s: commit %s",
2837 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2838 err = got_error_from_errno("asprintf");
2841 err = merge_file(&local_changes_subsumed, a->worktree,
2842 f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2843 sb.st_mode, a->label_orig, NULL, label_deriv2,
2844 GOT_DIFF_ALGORITHM_PATIENCE, repo,
2845 a->progress_cb, a->progress_arg);
2848 ie = got_fileindex_entry_get(a->fileindex, path1,
2851 return (*a->progress_cb)(a->progress_arg,
2852 GOT_STATUS_MISSING, path1);
2854 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2856 return got_error_from_errno("asprintf");
2858 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2864 case GOT_STATUS_NO_CHANGE:
2865 err = (*a->progress_cb)(a->progress_arg,
2866 GOT_STATUS_DELETE, path1);
2869 err = remove_ondisk_file(a->worktree->root_path, path1);
2873 got_fileindex_entry_mark_deleted_from_disk(ie);
2875 case GOT_STATUS_DELETE:
2876 case GOT_STATUS_MISSING:
2877 err = (*a->progress_cb)(a->progress_arg,
2878 GOT_STATUS_DELETE, path1);
2882 got_fileindex_entry_mark_deleted_from_disk(ie);
2884 case GOT_STATUS_ADD: {
2885 struct got_object_id *id;
2889 * Delete the added file only if its content already
2890 * exists in the repository.
2892 err = got_object_blob_file_create(&id, &blob1_f,
2893 &blob1_size, path1);
2896 if (got_object_id_cmp(id, id1) == 0) {
2897 err = (*a->progress_cb)(a->progress_arg,
2898 GOT_STATUS_DELETE, path1);
2901 err = remove_ondisk_file(a->worktree->root_path,
2906 got_fileindex_entry_remove(a->fileindex,
2909 err = (*a->progress_cb)(a->progress_arg,
2910 GOT_STATUS_CANNOT_DELETE, path1);
2912 if (fclose(blob1_f) == EOF && err == NULL)
2913 err = got_error_from_errno("fclose");
2919 case GOT_STATUS_MODIFY:
2920 case GOT_STATUS_CONFLICT:
2921 err = (*a->progress_cb)(a->progress_arg,
2922 GOT_STATUS_CANNOT_DELETE, path1);
2926 case GOT_STATUS_OBSTRUCTED:
2927 err = (*a->progress_cb)(a->progress_arg, status, path1);
2935 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2937 return got_error_from_errno("asprintf");
2938 ie = got_fileindex_entry_get(a->fileindex, path2,
2941 err = get_file_status(&status, &sb, ie, ondisk_path,
2945 if (status != GOT_STATUS_NO_CHANGE &&
2946 status != GOT_STATUS_MODIFY &&
2947 status != GOT_STATUS_CONFLICT &&
2948 status != GOT_STATUS_ADD) {
2949 err = (*a->progress_cb)(a->progress_arg,
2953 if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2955 err = got_object_blob_read_to_str(&link_target2,
2959 err = merge_symlink(a->worktree, NULL,
2960 ondisk_path, path2, a->label_orig,
2961 link_target2, a->commit_id2, repo,
2962 a->progress_cb, a->progress_arg);
2964 } else if (S_ISREG(sb.st_mode)) {
2965 err = merge_blob(&local_changes_subsumed,
2966 a->worktree, NULL, ondisk_path, path2,
2967 sb.st_mode, a->label_orig, blob2,
2968 a->commit_id2, repo, a->progress_cb,
2971 err = got_error_path(ondisk_path,
2972 GOT_ERR_FILE_OBSTRUCTED);
2976 if (status == GOT_STATUS_DELETE) {
2977 err = got_fileindex_entry_update(ie,
2978 a->worktree->root_fd, path2, blob2->id.sha1,
2979 a->worktree->base_commit_id->sha1, 0);
2984 int is_bad_symlink = 0;
2985 sb.st_mode = GOT_DEFAULT_FILE_MODE;
2986 if (S_ISLNK(mode2)) {
2987 err = install_symlink(&is_bad_symlink,
2988 a->worktree, ondisk_path, path2, blob2, 0,
2989 0, 1, a->allow_bad_symlinks, repo,
2990 a->progress_cb, a->progress_arg);
2992 err = install_blob(a->worktree, ondisk_path, path2,
2993 mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2994 a->progress_cb, a->progress_arg);
2998 err = got_fileindex_entry_alloc(&ie, path2);
3001 err = got_fileindex_entry_update(ie,
3002 a->worktree->root_fd, path2, NULL, NULL, 1);
3004 got_fileindex_entry_free(ie);
3007 err = got_fileindex_entry_add(a->fileindex, ie);
3009 got_fileindex_entry_free(ie);
3012 if (is_bad_symlink) {
3013 got_fileindex_entry_filetype_set(ie,
3014 GOT_FILEIDX_MODE_BAD_SYMLINK);
3019 if (f_orig && fclose(f_orig) == EOF && err == NULL)
3020 err = got_error_from_errno("fclose");
3021 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3022 err = got_error_from_errno("fclose");
3023 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3024 err = got_error_from_errno("fclose");
3031 static const struct got_error *
3032 check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3034 struct got_worktree *worktree = arg;
3036 /* Reject merges into a work tree with mixed base commits. */
3037 if (got_fileindex_entry_has_commit(ie) &&
3038 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3039 SHA1_DIGEST_LENGTH) != 0)
3040 return got_error(GOT_ERR_MIXED_COMMITS);
3045 struct check_merge_conflicts_arg {
3046 struct got_worktree *worktree;
3047 struct got_fileindex *fileindex;
3048 struct got_repository *repo;
3051 static const struct got_error *
3052 check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3053 struct got_blob_object *blob2, struct got_object_id *id1,
3054 struct got_object_id *id2, const char *path1, const char *path2,
3055 mode_t mode1, mode_t mode2, struct got_repository *repo)
3057 const struct got_error *err = NULL;
3058 struct check_merge_conflicts_arg *a = arg;
3059 unsigned char status;
3061 struct got_fileindex_entry *ie;
3062 const char *path = path2 ? path2 : path1;
3063 struct got_object_id *id = id2 ? id2 : id1;
3069 ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3073 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3075 return got_error_from_errno("asprintf");
3077 /* Reject merges into a work tree with conflicted files. */
3078 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3082 if (status == GOT_STATUS_CONFLICT)
3083 return got_error(GOT_ERR_CONFLICTS);
3088 static const struct got_error *
3089 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3090 const char *fileindex_path, struct got_object_id *commit_id1,
3091 struct got_object_id *commit_id2, struct got_repository *repo,
3092 got_worktree_checkout_cb progress_cb, void *progress_arg,
3093 got_cancel_cb cancel_cb, void *cancel_arg)
3095 const struct got_error *err = NULL, *sync_err;
3096 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3097 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3098 struct check_merge_conflicts_arg cmc_arg;
3099 struct merge_file_cb_arg arg;
3100 char *label_orig = NULL;
3103 err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3104 worktree->path_prefix);
3105 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3111 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3115 err = got_object_id_str(&id_str, commit_id1);
3119 if (asprintf(&label_orig, "%s: commit %s",
3120 GOT_MERGE_LABEL_BASE, id_str) == -1) {
3121 err = got_error_from_errno("asprintf");
3128 err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3129 worktree->path_prefix);
3133 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3137 cmc_arg.worktree = worktree;
3138 cmc_arg.fileindex = fileindex;
3139 cmc_arg.repo = repo;
3140 err = got_diff_tree(tree1, tree2, "", "", repo,
3141 check_merge_conflicts, &cmc_arg, 0);
3145 arg.worktree = worktree;
3146 arg.fileindex = fileindex;
3147 arg.progress_cb = progress_cb;
3148 arg.progress_arg = progress_arg;
3149 arg.cancel_cb = cancel_cb;
3150 arg.cancel_arg = cancel_arg;
3151 arg.label_orig = label_orig;
3152 arg.commit_id2 = commit_id2;
3153 arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3154 err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3155 sync_err = sync_fileindex(fileindex, fileindex_path);
3156 if (sync_err && err == NULL)
3160 got_object_tree_close(tree1);
3162 got_object_tree_close(tree2);
3167 const struct got_error *
3168 got_worktree_merge_files(struct got_worktree *worktree,
3169 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3170 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3171 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3173 const struct got_error *err, *unlockerr;
3174 char *fileindex_path = NULL;
3175 struct got_fileindex *fileindex = NULL;
3177 err = lock_worktree(worktree, LOCK_EX);
3181 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3185 err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3190 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3191 commit_id2, repo, progress_cb, progress_arg,
3192 cancel_cb, cancel_arg);
3195 got_fileindex_free(fileindex);
3196 free(fileindex_path);
3197 unlockerr = lock_worktree(worktree, LOCK_SH);
3198 if (unlockerr && err == NULL)
3203 struct diff_dir_cb_arg {
3204 struct got_fileindex *fileindex;
3205 struct got_worktree *worktree;
3206 const char *status_path;
3207 size_t status_path_len;
3208 struct got_repository *repo;
3209 got_worktree_status_cb status_cb;
3211 got_cancel_cb cancel_cb;
3213 /* A pathlist containing per-directory pathlists of ignore patterns. */
3214 struct got_pathlist_head *ignores;
3215 int report_unchanged;
3219 static const struct got_error *
3220 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3221 int dirfd, const char *de_name,
3222 got_worktree_status_cb status_cb, void *status_arg,
3223 struct got_repository *repo, int report_unchanged)
3225 const struct got_error *err = NULL;
3226 unsigned char status = GOT_STATUS_NO_CHANGE;
3227 unsigned char staged_status = get_staged_status(ie);
3229 struct got_object_id blob_id, commit_id, staged_blob_id;
3230 struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3231 struct got_object_id *staged_blob_idp = NULL;
3233 err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3237 if (status == GOT_STATUS_NO_CHANGE &&
3238 staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3241 if (got_fileindex_entry_has_blob(ie)) {
3242 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3243 blob_idp = &blob_id;
3245 if (got_fileindex_entry_has_commit(ie)) {
3246 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3247 commit_idp = &commit_id;
3249 if (staged_status == GOT_STATUS_ADD ||
3250 staged_status == GOT_STATUS_MODIFY) {
3251 memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3252 SHA1_DIGEST_LENGTH);
3253 staged_blob_idp = &staged_blob_id;
3256 return (*status_cb)(status_arg, status, staged_status,
3257 ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3260 static const struct got_error *
3261 status_old_new(void *arg, struct got_fileindex_entry *ie,
3262 struct dirent *de, const char *parent_path, int dirfd)
3264 const struct got_error *err = NULL;
3265 struct diff_dir_cb_arg *a = arg;
3268 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3269 return got_error(GOT_ERR_CANCELLED);
3271 if (got_path_cmp(parent_path, a->status_path,
3272 strlen(parent_path), a->status_path_len) != 0 &&
3273 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3276 if (parent_path[0]) {
3277 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3278 parent_path, de->d_name) == -1)
3279 return got_error_from_errno("asprintf");
3281 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3283 return got_error_from_errno("asprintf");
3286 err = report_file_status(ie, abspath, dirfd, de->d_name,
3287 a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3292 static const struct got_error *
3293 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3295 struct diff_dir_cb_arg *a = arg;
3296 struct got_object_id blob_id, commit_id;
3297 unsigned char status;
3299 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3300 return got_error(GOT_ERR_CANCELLED);
3302 if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3305 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3306 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3307 if (got_fileindex_entry_has_file_on_disk(ie))
3308 status = GOT_STATUS_MISSING;
3310 status = GOT_STATUS_DELETE;
3311 return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3312 ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3316 free_ignorelist(struct got_pathlist_head *ignorelist)
3318 struct got_pathlist_entry *pe;
3320 TAILQ_FOREACH(pe, ignorelist, entry)
3321 free((char *)pe->path);
3322 got_pathlist_free(ignorelist);
3326 free_ignores(struct got_pathlist_head *ignores)
3328 struct got_pathlist_entry *pe;
3330 TAILQ_FOREACH(pe, ignores, entry) {
3331 struct got_pathlist_head *ignorelist = pe->data;
3332 free_ignorelist(ignorelist);
3333 free((char *)pe->path);
3335 got_pathlist_free(ignores);
3338 static const struct got_error *
3339 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3341 const struct got_error *err = NULL;
3342 struct got_pathlist_entry *pe = NULL;
3343 struct got_pathlist_head *ignorelist;
3344 char *line = NULL, *pattern, *dirpath = NULL;
3345 size_t linesize = 0;
3348 ignorelist = calloc(1, sizeof(*ignorelist));
3349 if (ignorelist == NULL)
3350 return got_error_from_errno("calloc");
3351 TAILQ_INIT(ignorelist);
3353 while ((linelen = getline(&line, &linesize, f)) != -1) {
3354 if (linelen > 0 && line[linelen - 1] == '\n')
3355 line[linelen - 1] = '\0';
3357 /* Git's ignores may contain comments. */
3361 /* Git's negated patterns are not (yet?) supported. */
3365 if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3367 err = got_error_from_errno("asprintf");
3370 err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3375 err = got_error_from_errno("getline");
3379 dirpath = strdup(path);
3380 if (dirpath == NULL) {
3381 err = got_error_from_errno("strdup");
3384 err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3387 if (err || pe == NULL) {
3389 free_ignorelist(ignorelist);
3395 match_ignores(struct got_pathlist_head *ignores, const char *path)
3397 struct got_pathlist_entry *pe;
3399 /* Handle patterns which match in all directories. */
3400 TAILQ_FOREACH(pe, ignores, entry) {
3401 struct got_pathlist_head *ignorelist = pe->data;
3402 struct got_pathlist_entry *pi;
3404 TAILQ_FOREACH(pi, ignorelist, entry) {
3405 const char *p, *pattern = pi->path;
3407 if (strncmp(pattern, "**/", 3) != 0)
3412 if (fnmatch(pattern, p,
3413 FNM_PATHNAME | FNM_LEADING_DIR)) {
3414 /* Retry in next directory. */
3415 while (*p && *p != '/')
3427 * The ignores pathlist contains ignore lists from children before
3428 * parents, so we can find the most specific ignorelist by walking
3429 * ignores backwards.
3431 pe = TAILQ_LAST(ignores, got_pathlist_head);
3433 if (got_path_is_child(path, pe->path, pe->path_len)) {
3434 struct got_pathlist_head *ignorelist = pe->data;
3435 struct got_pathlist_entry *pi;
3436 TAILQ_FOREACH(pi, ignorelist, entry) {
3437 const char *pattern = pi->path;
3438 int flags = FNM_LEADING_DIR;
3439 if (strstr(pattern, "/**/") == NULL)
3440 flags |= FNM_PATHNAME;
3441 if (fnmatch(pattern, path, flags))
3446 pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3452 static const struct got_error *
3453 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3454 const char *path, int dirfd, const char *ignores_filename)
3456 const struct got_error *err = NULL;
3459 FILE *ignoresfile = NULL;
3461 if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3462 path[0] ? "/" : "", ignores_filename) == -1)
3463 return got_error_from_errno("asprintf");
3466 fd = openat(dirfd, ignores_filename,
3467 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3469 if (errno != ENOENT && errno != EACCES)
3470 err = got_error_from_errno2("openat",
3473 ignoresfile = fdopen(fd, "r");
3474 if (ignoresfile == NULL)
3475 err = got_error_from_errno2("fdopen",
3479 err = read_ignores(ignores, path, ignoresfile);
3483 ignoresfile = fopen(ignorespath, "re");
3484 if (ignoresfile == NULL) {
3485 if (errno != ENOENT && errno != EACCES)
3486 err = got_error_from_errno2("fopen",
3489 err = read_ignores(ignores, path, ignoresfile);
3492 if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3493 err = got_error_from_errno2("fclose", path);
3494 if (fd != -1 && close(fd) == -1 && err == NULL)
3495 err = got_error_from_errno2("close", path);
3500 static const struct got_error *
3501 status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3504 const struct got_error *err = NULL;
3505 struct diff_dir_cb_arg *a = arg;
3511 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3512 return got_error(GOT_ERR_CANCELLED);
3514 if (parent_path[0]) {
3515 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3516 return got_error_from_errno("asprintf");
3521 if (de->d_type == DT_DIR) {
3522 if (!a->no_ignores && ignore != NULL &&
3523 match_ignores(a->ignores, path))
3525 } else if (!match_ignores(a->ignores, path) &&
3526 got_path_is_child(path, a->status_path, a->status_path_len))
3527 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3528 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3534 static const struct got_error *
3535 status_traverse(void *arg, const char *path, int dirfd)
3537 const struct got_error *err = NULL;
3538 struct diff_dir_cb_arg *a = arg;
3543 err = add_ignores(a->ignores, a->worktree->root_path,
3544 path, dirfd, ".cvsignore");
3548 err = add_ignores(a->ignores, a->worktree->root_path, path,
3549 dirfd, ".gitignore");
3554 static const struct got_error *
3555 report_single_file_status(const char *path, const char *ondisk_path,
3556 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3557 void *status_arg, struct got_repository *repo, int report_unchanged,
3558 struct got_pathlist_head *ignores, int no_ignores)
3560 struct got_fileindex_entry *ie;
3563 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3565 return report_file_status(ie, ondisk_path, -1, NULL,
3566 status_cb, status_arg, repo, report_unchanged);
3568 if (lstat(ondisk_path, &sb) == -1) {
3569 if (errno != ENOENT)
3570 return got_error_from_errno2("lstat", ondisk_path);
3571 return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3572 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3575 if (!no_ignores && match_ignores(ignores, path))
3578 if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3579 return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3580 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3585 static const struct got_error *
3586 add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3587 const char *root_path, const char *path)
3589 const struct got_error *err;
3590 char *parent_path, *next_parent_path = NULL;
3592 err = add_ignores(ignores, root_path, "", -1,
3597 err = add_ignores(ignores, root_path, "", -1,
3602 err = got_path_dirname(&parent_path, path);
3604 if (err->code == GOT_ERR_BAD_PATH)
3605 return NULL; /* cannot traverse parent */
3609 err = add_ignores(ignores, root_path, parent_path, -1,
3613 err = add_ignores(ignores, root_path, parent_path, -1,
3617 err = got_path_dirname(&next_parent_path, parent_path);
3619 if (err->code == GOT_ERR_BAD_PATH)
3620 err = NULL; /* traversed everything */
3623 if (got_path_is_root_dir(parent_path))
3626 parent_path = next_parent_path;
3627 next_parent_path = NULL;
3631 free(next_parent_path);
3635 static const struct got_error *
3636 worktree_status(struct got_worktree *worktree, const char *path,
3637 struct got_fileindex *fileindex, struct got_repository *repo,
3638 got_worktree_status_cb status_cb, void *status_arg,
3639 got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3640 int report_unchanged)
3642 const struct got_error *err = NULL;
3644 struct got_fileindex_diff_dir_cb fdiff_cb;
3645 struct diff_dir_cb_arg arg;
3646 char *ondisk_path = NULL;
3647 struct got_pathlist_head ignores;
3649 TAILQ_INIT(&ignores);
3651 if (asprintf(&ondisk_path, "%s%s%s",
3652 worktree->root_path, path[0] ? "/" : "", path) == -1)
3653 return got_error_from_errno("asprintf");
3655 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3657 if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3658 !got_err_open_nofollow_on_symlink())
3659 err = got_error_from_errno2("open", ondisk_path);
3662 err = add_ignores_from_parent_paths(&ignores,
3663 worktree->root_path, ondisk_path);
3667 err = report_single_file_status(path, ondisk_path,
3668 fileindex, status_cb, status_arg, repo,
3669 report_unchanged, &ignores, no_ignores);
3672 fdiff_cb.diff_old_new = status_old_new;
3673 fdiff_cb.diff_old = status_old;
3674 fdiff_cb.diff_new = status_new;
3675 fdiff_cb.diff_traverse = status_traverse;
3676 arg.fileindex = fileindex;
3677 arg.worktree = worktree;
3678 arg.status_path = path;
3679 arg.status_path_len = strlen(path);
3681 arg.status_cb = status_cb;
3682 arg.status_arg = status_arg;
3683 arg.cancel_cb = cancel_cb;
3684 arg.cancel_arg = cancel_arg;
3685 arg.report_unchanged = report_unchanged;
3686 arg.no_ignores = no_ignores;
3688 err = add_ignores_from_parent_paths(&ignores,
3689 worktree->root_path, path);
3693 arg.ignores = &ignores;
3694 err = got_fileindex_diff_dir(fileindex, fd,
3695 worktree->root_path, path, repo, &fdiff_cb, &arg);
3698 free_ignores(&ignores);
3699 if (fd != -1 && close(fd) == -1 && err == NULL)
3700 err = got_error_from_errno("close");
3705 const struct got_error *
3706 got_worktree_status(struct got_worktree *worktree,
3707 struct got_pathlist_head *paths, struct got_repository *repo,
3708 int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3709 got_cancel_cb cancel_cb, void *cancel_arg)
3711 const struct got_error *err = NULL;
3712 char *fileindex_path = NULL;
3713 struct got_fileindex *fileindex = NULL;
3714 struct got_pathlist_entry *pe;
3716 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3720 TAILQ_FOREACH(pe, paths, entry) {
3721 err = worktree_status(worktree, pe->path, fileindex, repo,
3722 status_cb, status_arg, cancel_cb, cancel_arg,
3727 free(fileindex_path);
3728 got_fileindex_free(fileindex);
3732 const struct got_error *
3733 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3736 const struct got_error *err = NULL;
3737 char *resolved = NULL, *cwd = NULL, *path = NULL;
3740 char *abspath = NULL;
3741 char canonpath[PATH_MAX];
3745 cwd = getcwd(NULL, 0);
3747 return got_error_from_errno("getcwd");
3749 if (lstat(arg, &sb) == -1) {
3750 if (errno != ENOENT) {
3751 err = got_error_from_errno2("lstat", arg);
3756 if (S_ISLNK(sb.st_mode)) {
3758 * We cannot use realpath(3) with symlinks since we want to
3759 * operate on the symlink itself.
3760 * But we can make the path absolute, assuming it is relative
3761 * to the current working directory, and then canonicalize it.
3763 if (!got_path_is_absolute(arg)) {
3764 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3765 err = got_error_from_errno("asprintf");
3770 err = got_canonpath(abspath ? abspath : arg, canonpath,
3774 resolved = strdup(canonpath);
3775 if (resolved == NULL) {
3776 err = got_error_from_errno("strdup");
3780 resolved = realpath(arg, NULL);
3781 if (resolved == NULL) {
3782 if (errno != ENOENT) {
3783 err = got_error_from_errno2("realpath", arg);
3786 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3787 err = got_error_from_errno("asprintf");
3790 err = got_canonpath(abspath, canonpath,
3794 resolved = strdup(canonpath);
3795 if (resolved == NULL) {
3796 err = got_error_from_errno("strdup");
3802 if (strncmp(got_worktree_get_root_path(worktree), resolved,
3803 strlen(got_worktree_get_root_path(worktree)))) {
3804 err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3808 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3809 err = got_path_skip_common_ancestor(&path,
3810 got_worktree_get_root_path(worktree), resolved);
3816 err = got_error_from_errno("strdup");
3821 /* XXX status walk can't deal with trailing slash! */
3823 while (len > 0 && path[len - 1] == '/') {
3824 path[len - 1] = '\0';
3838 struct schedule_addition_args {
3839 struct got_worktree *worktree;
3840 struct got_fileindex *fileindex;
3841 got_worktree_checkout_cb progress_cb;
3843 struct got_repository *repo;
3846 static const struct got_error *
3847 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3848 const char *relpath, struct got_object_id *blob_id,
3849 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3850 int dirfd, const char *de_name)
3852 struct schedule_addition_args *a = arg;
3853 const struct got_error *err = NULL;
3854 struct got_fileindex_entry *ie;
3858 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3860 return got_error_from_errno("asprintf");
3862 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3864 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3868 /* Re-adding an existing entry is a no-op. */
3869 if (status == GOT_STATUS_ADD)
3871 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3876 if (status != GOT_STATUS_UNVERSIONED) {
3877 if (status == GOT_STATUS_NONEXISTENT)
3878 err = got_error_set_errno(ENOENT, ondisk_path);
3880 err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3884 err = got_fileindex_entry_alloc(&ie, relpath);
3887 err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3888 relpath, NULL, NULL, 1);
3890 got_fileindex_entry_free(ie);
3893 err = got_fileindex_entry_add(a->fileindex, ie);
3895 got_fileindex_entry_free(ie);
3902 if (status == GOT_STATUS_ADD)
3904 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3907 const struct got_error *
3908 got_worktree_schedule_add(struct got_worktree *worktree,
3909 struct got_pathlist_head *paths,
3910 got_worktree_checkout_cb progress_cb, void *progress_arg,
3911 struct got_repository *repo, int no_ignores)
3913 struct got_fileindex *fileindex = NULL;
3914 char *fileindex_path = NULL;
3915 const struct got_error *err = NULL, *sync_err, *unlockerr;
3916 struct got_pathlist_entry *pe;
3917 struct schedule_addition_args saa;
3919 err = lock_worktree(worktree, LOCK_EX);
3923 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3927 saa.worktree = worktree;
3928 saa.fileindex = fileindex;
3929 saa.progress_cb = progress_cb;
3930 saa.progress_arg = progress_arg;
3933 TAILQ_FOREACH(pe, paths, entry) {
3934 err = worktree_status(worktree, pe->path, fileindex, repo,
3935 schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3939 sync_err = sync_fileindex(fileindex, fileindex_path);
3940 if (sync_err && err == NULL)
3943 free(fileindex_path);
3945 got_fileindex_free(fileindex);
3946 unlockerr = lock_worktree(worktree, LOCK_SH);
3947 if (unlockerr && err == NULL)
3952 struct schedule_deletion_args {
3953 struct got_worktree *worktree;
3954 struct got_fileindex *fileindex;
3955 got_worktree_delete_cb progress_cb;
3957 struct got_repository *repo;
3958 int delete_local_mods;
3960 int ignore_missing_paths;
3961 const char *status_codes;
3964 static const struct got_error *
3965 schedule_for_deletion(void *arg, unsigned char status,
3966 unsigned char staged_status, const char *relpath,
3967 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3968 struct got_object_id *commit_id, int dirfd, const char *de_name)
3970 struct schedule_deletion_args *a = arg;
3971 const struct got_error *err = NULL;
3972 struct got_fileindex_entry *ie = NULL;
3976 if (status == GOT_STATUS_NONEXISTENT) {
3977 if (a->ignore_missing_paths)
3979 return got_error_set_errno(ENOENT, relpath);
3982 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3984 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
3986 staged_status = get_staged_status(ie);
3987 if (staged_status != GOT_STATUS_NO_CHANGE) {
3988 if (staged_status == GOT_STATUS_DELETE)
3990 return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3993 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3995 return got_error_from_errno("asprintf");
3997 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4002 if (a->status_codes) {
4003 size_t ncodes = strlen(a->status_codes);
4005 for (i = 0; i < ncodes ; i++) {
4006 if (status == a->status_codes[i])
4010 /* Do not delete files in non-matching status. */
4014 if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4015 a->status_codes[i] != GOT_STATUS_MISSING) {
4016 static char msg[64];
4017 snprintf(msg, sizeof(msg),
4018 "invalid status code '%c'", a->status_codes[i]);
4019 err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4024 if (status != GOT_STATUS_NO_CHANGE) {
4025 if (status == GOT_STATUS_DELETE)
4027 if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4028 err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4031 if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4032 err = got_error_set_errno(ENOENT, relpath);
4035 if (status != GOT_STATUS_MODIFY &&
4036 status != GOT_STATUS_MISSING) {
4037 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4042 if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4046 if (unlinkat(dirfd, de_name, 0) != 0) {
4047 err = got_error_from_errno2("unlinkat",
4051 } else if (unlink(ondisk_path) != 0) {
4052 err = got_error_from_errno2("unlink", ondisk_path);
4056 root_len = strlen(a->worktree->root_path);
4059 err = got_path_dirname(&parent, ondisk_path);
4063 ondisk_path = parent;
4064 if (rmdir(ondisk_path) == -1) {
4065 if (errno != ENOTEMPTY)
4066 err = got_error_from_errno2("rmdir",
4070 } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4071 strlen(ondisk_path), root_len) != 0);
4074 got_fileindex_entry_mark_deleted_from_disk(ie);
4079 if (status == GOT_STATUS_DELETE)
4081 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4082 staged_status, relpath);
4085 const struct got_error *
4086 got_worktree_schedule_delete(struct got_worktree *worktree,
4087 struct got_pathlist_head *paths, int delete_local_mods,
4088 const char *status_codes,
4089 got_worktree_delete_cb progress_cb, void *progress_arg,
4090 struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4092 struct got_fileindex *fileindex = NULL;
4093 char *fileindex_path = NULL;
4094 const struct got_error *err = NULL, *sync_err, *unlockerr;
4095 struct got_pathlist_entry *pe;
4096 struct schedule_deletion_args sda;
4098 err = lock_worktree(worktree, LOCK_EX);
4102 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4106 sda.worktree = worktree;
4107 sda.fileindex = fileindex;
4108 sda.progress_cb = progress_cb;
4109 sda.progress_arg = progress_arg;
4111 sda.delete_local_mods = delete_local_mods;
4112 sda.keep_on_disk = keep_on_disk;
4113 sda.ignore_missing_paths = ignore_missing_paths;
4114 sda.status_codes = status_codes;
4116 TAILQ_FOREACH(pe, paths, entry) {
4117 err = worktree_status(worktree, pe->path, fileindex, repo,
4118 schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4122 sync_err = sync_fileindex(fileindex, fileindex_path);
4123 if (sync_err && err == NULL)
4126 free(fileindex_path);
4128 got_fileindex_free(fileindex);
4129 unlockerr = lock_worktree(worktree, LOCK_SH);
4130 if (unlockerr && err == NULL)
4135 static const struct got_error *
4136 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4138 const struct got_error *err = NULL;
4140 size_t linesize = 0, n;
4143 linelen = getline(&line, &linesize, infile);
4144 if (linelen == -1) {
4145 if (ferror(infile)) {
4146 err = got_error_from_errno("getline");
4152 n = fwrite(line, 1, linelen, outfile);
4154 err = got_ferror(outfile, GOT_ERR_IO);
4159 n = fwrite(line, 1, linelen, rejectfile);
4161 err = got_ferror(outfile, GOT_ERR_IO);
4168 static const struct got_error *
4169 skip_one_line(FILE *f)
4172 size_t linesize = 0;
4175 linelen = getline(&line, &linesize, f);
4176 if (linelen == -1) {
4178 return got_error_from_errno("getline");
4185 static const struct got_error *
4186 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4187 int start_old, int end_old, int start_new, int end_new,
4188 FILE *outfile, FILE *rejectfile)
4190 const struct got_error *err;
4192 /* Copy old file's lines leading up to patch. */
4193 while (!feof(f1) && *line_cur1 < start_old) {
4194 err = copy_one_line(f1, outfile, NULL);
4199 /* Skip new file's lines leading up to patch. */
4200 while (!feof(f2) && *line_cur2 < start_new) {
4202 err = copy_one_line(f2, NULL, rejectfile);
4204 err = skip_one_line(f2);
4209 /* Copy patched lines. */
4210 while (!feof(f2) && *line_cur2 <= end_new) {
4211 err = copy_one_line(f2, outfile, NULL);
4216 /* Skip over old file's replaced lines. */
4217 while (!feof(f1) && *line_cur1 <= end_old) {
4219 err = copy_one_line(f1, NULL, rejectfile);
4221 err = skip_one_line(f1);
4230 static const struct got_error *
4231 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4232 FILE *outfile, FILE *rejectfile)
4234 const struct got_error *err;
4237 /* Copy old file's lines until EOF. */
4239 err = copy_one_line(f1, outfile, NULL);
4246 /* Copy new file's lines until EOF. */
4248 err = copy_one_line(f2, NULL, rejectfile);
4258 static const struct got_error *
4259 apply_or_reject_change(int *choice, int *nchunks_used,
4260 struct diff_result *diff_result, int n,
4261 const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4262 FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4263 got_worktree_patch_cb patch_cb, void *patch_arg)
4265 const struct got_error *err = NULL;
4266 struct diff_chunk_context cc = {};
4267 int start_old, end_old, start_new, end_new;
4269 struct diff_output_unidiff_state *diff_state;
4270 struct diff_input_info diff_info;
4273 *choice = GOT_PATCH_CHOICE_NONE;
4275 /* Get changed line numbers without context lines for copy_change(). */
4276 diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4277 start_old = cc.left.start;
4278 end_old = cc.left.end;
4279 start_new = cc.right.start;
4280 end_new = cc.right.end;
4282 /* Get the same change with context lines for display. */
4283 memset(&cc, 0, sizeof(cc));
4284 diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4286 memset(&diff_info, 0, sizeof(diff_info));
4287 diff_info.left_path = relpath;
4288 diff_info.right_path = relpath;
4290 diff_state = diff_output_unidiff_state_alloc();
4291 if (diff_state == NULL)
4292 return got_error_set_errno(ENOMEM,
4293 "diff_output_unidiff_state_alloc");
4295 hunkfile = got_opentemp();
4296 if (hunkfile == NULL) {
4297 err = got_error_from_errno("got_opentemp");
4301 rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4303 if (rc != DIFF_RC_OK) {
4304 err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4308 if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4309 err = got_ferror(hunkfile, GOT_ERR_IO);
4313 err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4314 hunkfile, changeno, nchanges);
4319 case GOT_PATCH_CHOICE_YES:
4320 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4321 end_old, start_new, end_new, outfile, rejectfile);
4323 case GOT_PATCH_CHOICE_NO:
4324 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4325 end_old, start_new, end_new, rejectfile, outfile);
4327 case GOT_PATCH_CHOICE_QUIT:
4330 err = got_error(GOT_ERR_PATCH_CHOICE);
4334 diff_output_unidiff_state_free(diff_state);
4335 if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4336 err = got_error_from_errno("fclose");
4340 struct revert_file_args {
4341 struct got_worktree *worktree;
4342 struct got_fileindex *fileindex;
4343 got_worktree_checkout_cb progress_cb;
4345 got_worktree_patch_cb patch_cb;
4347 struct got_repository *repo;
4348 int unlink_added_files;
4351 static const struct got_error *
4352 create_patched_content(char **path_outfile, int reverse_patch,
4353 struct got_object_id *blob_id, const char *path2,
4354 int dirfd2, const char *de_name2,
4355 const char *relpath, struct got_repository *repo,
4356 got_worktree_patch_cb patch_cb, void *patch_arg)
4358 const struct got_error *err, *free_err;
4359 struct got_blob_object *blob = NULL;
4360 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4362 char link_target[PATH_MAX];
4363 ssize_t link_len = 0;
4364 char *path1 = NULL, *id_str = NULL;
4366 struct got_diffreg_result *diffreg_result = NULL;
4367 int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4368 int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4370 *path_outfile = NULL;
4372 err = got_object_id_str(&id_str, blob_id);
4377 fd2 = openat(dirfd2, de_name2,
4378 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4380 if (!got_err_open_nofollow_on_symlink()) {
4381 err = got_error_from_errno2("openat", path2);
4384 link_len = readlinkat(dirfd2, de_name2,
4385 link_target, sizeof(link_target));
4386 if (link_len == -1) {
4387 return got_error_from_errno2("readlinkat",
4390 sb2.st_mode = S_IFLNK;
4391 sb2.st_size = link_len;
4394 fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4396 if (!got_err_open_nofollow_on_symlink()) {
4397 err = got_error_from_errno2("open", path2);
4400 link_len = readlink(path2, link_target,
4401 sizeof(link_target));
4403 return got_error_from_errno2("readlink", path2);
4404 sb2.st_mode = S_IFLNK;
4405 sb2.st_size = link_len;
4409 if (fstat(fd2, &sb2) == -1) {
4410 err = got_error_from_errno2("fstat", path2);
4414 f2 = fdopen(fd2, "r");
4416 err = got_error_from_errno2("fdopen", path2);
4422 f2 = got_opentemp();
4424 err = got_error_from_errno2("got_opentemp", path2);
4427 n = fwrite(link_target, 1, link_len, f2);
4428 if (n != link_len) {
4429 err = got_ferror(f2, GOT_ERR_IO);
4432 if (fflush(f2) == EOF) {
4433 err = got_error_from_errno("fflush");
4439 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4443 err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4447 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4451 err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4456 err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4460 if (fseek(f1, 0L, SEEK_SET) == -1)
4461 return got_ferror(f1, GOT_ERR_IO);
4462 if (fseek(f2, 0L, SEEK_SET) == -1)
4463 return got_ferror(f2, GOT_ERR_IO);
4465 /* Count the number of actual changes in the diff result. */
4466 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4467 struct diff_chunk_context cc = {};
4468 diff_chunk_context_load_change(&cc, &nchunks_used,
4469 diffreg_result->result, n, 0);
4472 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4474 err = apply_or_reject_change(&choice, &nchunks_used,
4475 diffreg_result->result, n, relpath, f1, f2,
4476 &line_cur1, &line_cur2,
4477 reverse_patch ? NULL : outfile,
4478 reverse_patch ? outfile : NULL,
4479 ++i, nchanges, patch_cb, patch_arg);
4482 if (choice == GOT_PATCH_CHOICE_YES)
4484 else if (choice == GOT_PATCH_CHOICE_QUIT)
4488 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4489 reverse_patch ? NULL : outfile,
4490 reverse_patch ? outfile : NULL);
4494 if (!S_ISLNK(sb2.st_mode)) {
4495 if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4496 err = got_error_from_errno2("fchmod", path2);
4504 got_object_blob_close(blob);
4505 free_err = got_diffreg_result_free(diffreg_result);
4508 if (f1 && fclose(f1) == EOF && err == NULL)
4509 err = got_error_from_errno2("fclose", path1);
4510 if (f2 && fclose(f2) == EOF && err == NULL)
4511 err = got_error_from_errno2("fclose", path2);
4512 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4513 err = got_error_from_errno2("close", path2);
4514 if (outfile && fclose(outfile) == EOF && err == NULL)
4515 err = got_error_from_errno2("fclose", *path_outfile);
4516 if (path1 && unlink(path1) == -1 && err == NULL)
4517 err = got_error_from_errno2("unlink", path1);
4518 if (err || !have_content) {
4519 if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4520 err = got_error_from_errno2("unlink", *path_outfile);
4521 free(*path_outfile);
4522 *path_outfile = NULL;
4528 static const struct got_error *
4529 revert_file(void *arg, unsigned char status, unsigned char staged_status,
4530 const char *relpath, struct got_object_id *blob_id,
4531 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4532 int dirfd, const char *de_name)
4534 struct revert_file_args *a = arg;
4535 const struct got_error *err = NULL;
4536 char *parent_path = NULL;
4537 struct got_fileindex_entry *ie;
4538 struct got_tree_object *tree = NULL;
4539 struct got_object_id *tree_id = NULL;
4540 const struct got_tree_entry *te = NULL;
4541 char *tree_path = NULL, *te_name;
4542 char *ondisk_path = NULL, *path_content = NULL;
4543 struct got_blob_object *blob = NULL;
4545 /* Reverting a staged deletion is a no-op. */
4546 if (status == GOT_STATUS_DELETE &&
4547 staged_status != GOT_STATUS_NO_CHANGE)
4550 if (status == GOT_STATUS_UNVERSIONED)
4551 return (*a->progress_cb)(a->progress_arg,
4552 GOT_STATUS_UNVERSIONED, relpath);
4554 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4556 return got_error_path(relpath, GOT_ERR_BAD_PATH);
4558 /* Construct in-repository path of tree which contains this blob. */
4559 err = got_path_dirname(&parent_path, ie->path);
4561 if (err->code != GOT_ERR_BAD_PATH)
4563 parent_path = strdup("/");
4564 if (parent_path == NULL) {
4565 err = got_error_from_errno("strdup");
4569 if (got_path_is_root_dir(a->worktree->path_prefix)) {
4570 tree_path = strdup(parent_path);
4571 if (tree_path == NULL) {
4572 err = got_error_from_errno("strdup");
4576 if (got_path_is_root_dir(parent_path)) {
4577 tree_path = strdup(a->worktree->path_prefix);
4578 if (tree_path == NULL) {
4579 err = got_error_from_errno("strdup");
4583 if (asprintf(&tree_path, "%s/%s",
4584 a->worktree->path_prefix, parent_path) == -1) {
4585 err = got_error_from_errno("asprintf");
4591 err = got_object_id_by_path(&tree_id, a->repo,
4592 a->worktree->base_commit_id, tree_path);
4594 if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4595 (status == GOT_STATUS_ADD ||
4596 staged_status == GOT_STATUS_ADD)))
4599 err = got_object_open_as_tree(&tree, a->repo, tree_id);
4603 err = got_path_basename(&te_name, ie->path);
4607 te = got_object_tree_find_entry(tree, te_name);
4609 if (te == NULL && status != GOT_STATUS_ADD &&
4610 staged_status != GOT_STATUS_ADD) {
4611 err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4617 case GOT_STATUS_ADD:
4619 int choice = GOT_PATCH_CHOICE_NONE;
4620 err = (*a->patch_cb)(&choice, a->patch_arg,
4621 status, ie->path, NULL, 1, 1);
4624 if (choice != GOT_PATCH_CHOICE_YES)
4627 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4631 got_fileindex_entry_remove(a->fileindex, ie);
4632 if (a->unlink_added_files) {
4633 if (asprintf(&ondisk_path, "%s/%s",
4634 got_worktree_get_root_path(a->worktree),
4636 err = got_error_from_errno("asprintf");
4639 if (unlink(ondisk_path) == -1) {
4640 err = got_error_from_errno2("unlink",
4646 case GOT_STATUS_DELETE:
4648 int choice = GOT_PATCH_CHOICE_NONE;
4649 err = (*a->patch_cb)(&choice, a->patch_arg,
4650 status, ie->path, NULL, 1, 1);
4653 if (choice != GOT_PATCH_CHOICE_YES)
4657 case GOT_STATUS_MODIFY:
4658 case GOT_STATUS_MODE_CHANGE:
4659 case GOT_STATUS_CONFLICT:
4660 case GOT_STATUS_MISSING: {
4661 struct got_object_id id;
4662 if (staged_status == GOT_STATUS_ADD ||
4663 staged_status == GOT_STATUS_MODIFY) {
4664 memcpy(id.sha1, ie->staged_blob_sha1,
4665 SHA1_DIGEST_LENGTH);
4667 memcpy(id.sha1, ie->blob_sha1,
4668 SHA1_DIGEST_LENGTH);
4669 err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4673 if (asprintf(&ondisk_path, "%s/%s",
4674 got_worktree_get_root_path(a->worktree), relpath) == -1) {
4675 err = got_error_from_errno("asprintf");
4679 if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4680 status == GOT_STATUS_CONFLICT)) {
4681 int is_bad_symlink = 0;
4682 err = create_patched_content(&path_content, 1, &id,
4683 ondisk_path, dirfd, de_name, ie->path, a->repo,
4684 a->patch_cb, a->patch_arg);
4685 if (err || path_content == NULL)
4687 if (te && S_ISLNK(te->mode)) {
4688 if (unlink(path_content) == -1) {
4689 err = got_error_from_errno2("unlink",
4693 err = install_symlink(&is_bad_symlink,
4694 a->worktree, ondisk_path, ie->path,
4695 blob, 0, 1, 0, 0, a->repo,
4696 a->progress_cb, a->progress_arg);
4698 if (rename(path_content, ondisk_path) == -1) {
4699 err = got_error_from_errno3("rename",
4700 path_content, ondisk_path);
4705 int is_bad_symlink = 0;
4706 if (te && S_ISLNK(te->mode)) {
4707 err = install_symlink(&is_bad_symlink,
4708 a->worktree, ondisk_path, ie->path,
4709 blob, 0, 1, 0, 0, a->repo,
4710 a->progress_cb, a->progress_arg);
4712 err = install_blob(a->worktree, ondisk_path,
4714 te ? te->mode : GOT_DEFAULT_FILE_MODE,
4715 got_fileindex_perms_to_st(ie), blob,
4716 0, 1, 0, 0, a->repo,
4717 a->progress_cb, a->progress_arg);
4721 if (status == GOT_STATUS_DELETE ||
4722 status == GOT_STATUS_MODE_CHANGE) {
4723 err = got_fileindex_entry_update(ie,
4724 a->worktree->root_fd, relpath,
4726 a->worktree->base_commit_id->sha1, 1);
4730 if (is_bad_symlink) {
4731 got_fileindex_entry_filetype_set(ie,
4732 GOT_FILEIDX_MODE_BAD_SYMLINK);
4746 got_object_blob_close(blob);
4748 got_object_tree_close(tree);
4753 const struct got_error *
4754 got_worktree_revert(struct got_worktree *worktree,
4755 struct got_pathlist_head *paths,
4756 got_worktree_checkout_cb progress_cb, void *progress_arg,
4757 got_worktree_patch_cb patch_cb, void *patch_arg,
4758 struct got_repository *repo)
4760 struct got_fileindex *fileindex = NULL;
4761 char *fileindex_path = NULL;
4762 const struct got_error *err = NULL, *unlockerr = NULL;
4763 const struct got_error *sync_err = NULL;
4764 struct got_pathlist_entry *pe;
4765 struct revert_file_args rfa;
4767 err = lock_worktree(worktree, LOCK_EX);
4771 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4775 rfa.worktree = worktree;
4776 rfa.fileindex = fileindex;
4777 rfa.progress_cb = progress_cb;
4778 rfa.progress_arg = progress_arg;
4779 rfa.patch_cb = patch_cb;
4780 rfa.patch_arg = patch_arg;
4782 rfa.unlink_added_files = 0;
4783 TAILQ_FOREACH(pe, paths, entry) {
4784 err = worktree_status(worktree, pe->path, fileindex, repo,
4785 revert_file, &rfa, NULL, NULL, 1, 0);
4789 sync_err = sync_fileindex(fileindex, fileindex_path);
4790 if (sync_err && err == NULL)
4793 free(fileindex_path);
4795 got_fileindex_free(fileindex);
4796 unlockerr = lock_worktree(worktree, LOCK_SH);
4797 if (unlockerr && err == NULL)
4803 free_commitable(struct got_commitable *ct)
4806 free(ct->in_repo_path);
4807 free(ct->ondisk_path);
4809 free(ct->base_blob_id);
4810 free(ct->staged_blob_id);
4811 free(ct->base_commit_id);
4815 struct collect_commitables_arg {
4816 struct got_pathlist_head *commitable_paths;
4817 struct got_repository *repo;
4818 struct got_worktree *worktree;
4819 struct got_fileindex *fileindex;
4820 int have_staged_files;
4821 int allow_bad_symlinks;
4824 static const struct got_error *
4825 collect_commitables(void *arg, unsigned char status,
4826 unsigned char staged_status, const char *relpath,
4827 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4828 struct got_object_id *commit_id, int dirfd, const char *de_name)
4830 struct collect_commitables_arg *a = arg;
4831 const struct got_error *err = NULL;
4832 struct got_commitable *ct = NULL;
4833 struct got_pathlist_entry *new = NULL;
4834 char *parent_path = NULL, *path = NULL;
4837 if (a->have_staged_files) {
4838 if (staged_status != GOT_STATUS_MODIFY &&
4839 staged_status != GOT_STATUS_ADD &&
4840 staged_status != GOT_STATUS_DELETE)
4843 if (status == GOT_STATUS_CONFLICT)
4844 return got_error(GOT_ERR_COMMIT_CONFLICT);
4846 if (status != GOT_STATUS_MODIFY &&
4847 status != GOT_STATUS_MODE_CHANGE &&
4848 status != GOT_STATUS_ADD &&
4849 status != GOT_STATUS_DELETE)
4853 if (asprintf(&path, "/%s", relpath) == -1) {
4854 err = got_error_from_errno("asprintf");
4857 if (strcmp(path, "/") == 0) {
4858 parent_path = strdup("");
4859 if (parent_path == NULL)
4860 return got_error_from_errno("strdup");
4862 err = got_path_dirname(&parent_path, path);
4867 ct = calloc(1, sizeof(*ct));
4869 err = got_error_from_errno("calloc");
4873 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4875 err = got_error_from_errno("asprintf");
4879 if (staged_status == GOT_STATUS_ADD ||
4880 staged_status == GOT_STATUS_MODIFY) {
4881 struct got_fileindex_entry *ie;
4882 ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4883 switch (got_fileindex_entry_staged_filetype_get(ie)) {
4884 case GOT_FILEIDX_MODE_REGULAR_FILE:
4885 case GOT_FILEIDX_MODE_BAD_SYMLINK:
4888 case GOT_FILEIDX_MODE_SYMLINK:
4892 err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4895 ct->mode |= got_fileindex_entry_perms_get(ie);
4896 } else if (status != GOT_STATUS_DELETE &&
4897 staged_status != GOT_STATUS_DELETE) {
4899 if (fstatat(dirfd, de_name, &sb,
4900 AT_SYMLINK_NOFOLLOW) == -1) {
4901 err = got_error_from_errno2("fstatat",
4905 } else if (lstat(ct->ondisk_path, &sb) == -1) {
4906 err = got_error_from_errno2("lstat", ct->ondisk_path);
4909 ct->mode = sb.st_mode;
4912 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4913 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4915 err = got_error_from_errno("asprintf");
4919 if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4920 status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4922 char target_path[PATH_MAX];
4924 target_len = readlink(ct->ondisk_path, target_path,
4925 sizeof(target_path));
4926 if (target_len == -1) {
4927 err = got_error_from_errno2("readlink",
4931 err = is_bad_symlink_target(&is_bad_symlink, target_path,
4932 target_len, ct->ondisk_path, a->worktree->root_path);
4935 if (is_bad_symlink) {
4936 err = got_error_path(ct->ondisk_path,
4937 GOT_ERR_BAD_SYMLINK);
4943 ct->status = status;
4944 ct->staged_status = staged_status;
4945 ct->blob_id = NULL; /* will be filled in when blob gets created */
4946 if (ct->status != GOT_STATUS_ADD &&
4947 ct->staged_status != GOT_STATUS_ADD) {
4948 ct->base_blob_id = got_object_id_dup(blob_id);
4949 if (ct->base_blob_id == NULL) {
4950 err = got_error_from_errno("got_object_id_dup");
4953 ct->base_commit_id = got_object_id_dup(commit_id);
4954 if (ct->base_commit_id == NULL) {
4955 err = got_error_from_errno("got_object_id_dup");
4959 if (ct->staged_status == GOT_STATUS_ADD ||
4960 ct->staged_status == GOT_STATUS_MODIFY) {
4961 ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4962 if (ct->staged_blob_id == NULL) {
4963 err = got_error_from_errno("got_object_id_dup");
4967 ct->path = strdup(path);
4968 if (ct->path == NULL) {
4969 err = got_error_from_errno("strdup");
4972 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4974 if (ct && (err || new == NULL))
4975 free_commitable(ct);
4981 static const struct got_error *write_tree(struct got_object_id **, int *,
4982 struct got_tree_object *, const char *, struct got_pathlist_head *,
4983 got_worktree_status_cb status_cb, void *status_arg,
4984 struct got_repository *);
4986 static const struct got_error *
4987 write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4988 struct got_tree_entry *te, const char *parent_path,
4989 struct got_pathlist_head *commitable_paths,
4990 got_worktree_status_cb status_cb, void *status_arg,
4991 struct got_repository *repo)
4993 const struct got_error *err = NULL;
4994 struct got_tree_object *subtree;
4997 if (asprintf(&subpath, "%s%s%s", parent_path,
4998 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4999 return got_error_from_errno("asprintf");
5001 err = got_object_open_as_tree(&subtree, repo, &te->id);
5005 err = write_tree(new_subtree_id, nentries, subtree, subpath,
5006 commitable_paths, status_cb, status_arg, repo);
5007 got_object_tree_close(subtree);
5012 static const struct got_error *
5013 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5015 const struct got_error *err = NULL;
5016 char *ct_parent_path = NULL;
5020 if (strchr(ct->in_repo_path, '/') == NULL) {
5021 *match = got_path_is_root_dir(path);
5025 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5028 *match = (strcmp(path, ct_parent_path) == 0);
5029 free(ct_parent_path);
5034 get_ct_file_mode(struct got_commitable *ct)
5036 if (S_ISLNK(ct->mode))
5039 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5042 static const struct got_error *
5043 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5044 struct got_tree_entry *te, struct got_commitable *ct)
5046 const struct got_error *err = NULL;
5050 err = got_object_tree_entry_dup(new_te, te);
5054 (*new_te)->mode = get_ct_file_mode(ct);
5056 if (ct->staged_status == GOT_STATUS_MODIFY)
5057 memcpy(&(*new_te)->id, ct->staged_blob_id,
5058 sizeof((*new_te)->id));
5060 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5062 if (err && *new_te) {
5069 static const struct got_error *
5070 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5071 struct got_commitable *ct)
5073 const struct got_error *err = NULL;
5074 char *ct_name = NULL;
5078 *new_te = calloc(1, sizeof(**new_te));
5079 if (*new_te == NULL)
5080 return got_error_from_errno("calloc");
5082 err = got_path_basename(&ct_name, ct->path);
5085 if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5086 sizeof((*new_te)->name)) {
5087 err = got_error(GOT_ERR_NO_SPACE);
5091 (*new_te)->mode = get_ct_file_mode(ct);
5093 if (ct->staged_status == GOT_STATUS_ADD)
5094 memcpy(&(*new_te)->id, ct->staged_blob_id,
5095 sizeof((*new_te)->id));
5097 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5100 if (err && *new_te) {
5107 static const struct got_error *
5108 insert_tree_entry(struct got_tree_entry *new_te,
5109 struct got_pathlist_head *paths)
5111 const struct got_error *err = NULL;
5112 struct got_pathlist_entry *new_pe;
5114 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5118 return got_error(GOT_ERR_TREE_DUP_ENTRY);
5122 static const struct got_error *
5123 report_ct_status(struct got_commitable *ct,
5124 got_worktree_status_cb status_cb, void *status_arg)
5126 const char *ct_path = ct->path;
5127 unsigned char status;
5129 if (status_cb == NULL) /* no commit progress output desired */
5132 while (ct_path[0] == '/')
5135 if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5136 status = ct->staged_status;
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;
5154 if (asprintf(&te_path, "%s%s%s", base_tree_path,
5155 got_path_is_root_dir(base_tree_path) ? "" : "/",
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,
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;
5181 TAILQ_FOREACH(pe, commitable_paths, entry) {
5182 struct got_commitable *ct = pe->data;
5183 char *ct_name = NULL;
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)
5192 if (ct->staged_status != GOT_STATUS_MODIFY &&
5193 ct->staged_status != GOT_STATUS_DELETE)
5197 if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5200 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5206 err = got_path_basename(&ct_name, pe->path);
5210 if (strcmp(te->name, ct_name) != 0) {
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;
5233 struct got_object_id *id = NULL;
5238 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5239 got_path_is_root_dir(path_base_tree) ? "" : "/",
5241 return got_error_from_errno("asprintf");
5243 new_te = calloc(1, sizeof(*new_te));
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);
5253 err = write_tree(&id, &nentries, NULL, subtree_path,
5254 commitable_paths, status_cb, status_arg, repo);
5259 memcpy(&new_te->id, id, sizeof(new_te->id));
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;
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))
5293 if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5294 strlen(path_base_tree)))
5297 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5302 slash = strchr(child_path, '/');
5303 if (slash == NULL) {
5304 err = alloc_added_blob_tree_entry(&new_te, ct);
5307 err = report_ct_status(ct, status_cb, status_arg);
5310 ct->flags |= GOT_COMMITABLE_ADDED;
5311 err = insert_tree_entry(new_te, &paths);
5316 *slash = '\0'; /* trim trailing path components */
5317 if (base_tree == NULL ||
5318 got_object_tree_find_entry(base_tree, child_path)
5320 err = make_subtree_for_added_blob(&new_te,
5321 child_path, path_base_tree,
5322 commitable_paths, status_cb, status_arg,
5326 err = insert_tree_entry(new_te, &paths);
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);
5347 err = insert_tree_entry(new_te, &paths);
5354 if (S_ISDIR(te->mode)) {
5356 err = got_object_tree_entry_dup(&new_te, te);
5359 err = match_modified_subtree(&modified, te,
5360 path_base_tree, commitable_paths);
5363 /* Avoid recursion into unmodified subtrees. */
5365 struct got_object_id *new_id;
5367 err = write_subtree(&new_id,
5369 path_base_tree, commitable_paths,
5370 status_cb, status_arg, repo);
5373 if (nsubentries == 0) {
5374 /* All entries were deleted. */
5378 memcpy(&new_te->id, new_id,
5379 sizeof(new_te->id));
5382 err = insert_tree_entry(new_te, &paths);
5389 err = match_deleted_or_modified_ct(&ct, te,
5390 path_base_tree, commitable_paths);
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(
5402 err = insert_tree_entry(new_te, &paths);
5407 err = report_ct_status(ct, status_cb,
5412 /* Entry is unchanged; just copy it. */
5413 err = got_object_tree_entry_dup(&new_te, te);
5416 err = insert_tree_entry(new_te, &paths);
5424 /* Write new list of entries; deleted entries have been dropped. */
5425 err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5427 got_pathlist_free(&paths);
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);
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);
5468 err = got_fileindex_entry_update(ie,
5469 worktree->root_fd, relpath,
5471 new_base_commit_id->sha1,
5472 !have_staged_files);
5474 err = got_fileindex_entry_alloc(&ie, pe->path);
5477 err = got_fileindex_entry_update(ie,
5478 worktree->root_fd, relpath, ct->blob_id->sha1,
5479 new_base_commit_id->sha1, 1);
5481 got_fileindex_entry_free(ie);
5484 err = got_fileindex_entry_add(fileindex, ie);
5486 got_fileindex_entry_free(ie);
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,
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)
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,
5520 if (err->code == GOT_ERR_NO_TREE_ENTRY)
5521 err = got_error(ood_errcode);
5523 } else if (got_object_id_cmp(id, base_blob_id) != 0)
5524 err = got_error(ood_errcode);
5526 /* Require that added files don't exist in the branch head. */
5527 err = got_object_id_by_path(&id, repo, head_commit_id,
5529 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5531 err = id ? got_error(ood_errcode) : NULL;
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,
5542 struct got_object_id *parent_id2,
5543 struct got_worktree *worktree,
5544 const char *author, const char *committer,
5545 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5546 got_worktree_status_cb status_cb, void *status_arg,
5547 struct got_repository *repo)
5549 const struct got_error *err = NULL, *unlockerr = NULL;
5550 struct got_pathlist_entry *pe;
5551 const char *head_ref_name = NULL;
5552 struct got_commit_object *head_commit = NULL;
5553 struct got_reference *head_ref2 = NULL;
5554 struct got_object_id *head_commit_id2 = NULL;
5555 struct got_tree_object *head_tree = NULL;
5556 struct got_object_id *new_tree_id = NULL;
5557 int nentries, nparents = 0;
5558 struct got_object_id_queue parent_ids;
5559 struct got_object_qid *pid = NULL;
5560 char *logmsg = NULL;
5562 *new_commit_id = NULL;
5564 STAILQ_INIT(&parent_ids);
5566 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5570 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5574 if (commit_msg_cb != NULL) {
5575 err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5580 if (logmsg == NULL || strlen(logmsg) == 0) {
5581 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5585 /* Create blobs from added and modified files and record their IDs. */
5586 TAILQ_FOREACH(pe, commitable_paths, entry) {
5587 struct got_commitable *ct = pe->data;
5590 /* Blobs for staged files already exist. */
5591 if (ct->staged_status == GOT_STATUS_ADD ||
5592 ct->staged_status == GOT_STATUS_MODIFY)
5595 if (ct->status != GOT_STATUS_ADD &&
5596 ct->status != GOT_STATUS_MODIFY &&
5597 ct->status != GOT_STATUS_MODE_CHANGE)
5600 if (asprintf(&ondisk_path, "%s/%s",
5601 worktree->root_path, pe->path) == -1) {
5602 err = got_error_from_errno("asprintf");
5605 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5611 /* Recursively write new tree objects. */
5612 err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5613 commitable_paths, status_cb, status_arg, repo);
5617 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5620 STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5623 err = got_object_qid_alloc(&pid, parent_id2);
5626 STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5629 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5630 nparents, author, time(NULL), committer, time(NULL), logmsg, repo);
5636 /* Check if a concurrent commit to our branch has occurred. */
5637 head_ref_name = got_worktree_get_head_ref_name(worktree);
5638 if (head_ref_name == NULL) {
5639 err = got_error_from_errno("got_worktree_get_head_ref_name");
5642 /* Lock the reference here to prevent concurrent modification. */
5643 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5646 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5649 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5650 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5653 /* Update branch head in repository. */
5654 err = got_ref_change_ref(head_ref2, *new_commit_id);
5657 err = got_ref_write(head_ref2, repo);
5661 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5665 err = ref_base_commit(worktree, repo);
5669 got_object_id_queue_free(&parent_ids);
5671 got_object_tree_close(head_tree);
5673 got_object_commit_close(head_commit);
5674 free(head_commit_id2);
5676 unlockerr = got_ref_unlock(head_ref2);
5677 if (unlockerr && err == NULL)
5679 got_ref_close(head_ref2);
5684 static const struct got_error *
5685 check_path_is_commitable(const char *path,
5686 struct got_pathlist_head *commitable_paths)
5688 struct got_pathlist_entry *cpe = NULL;
5689 size_t path_len = strlen(path);
5691 TAILQ_FOREACH(cpe, commitable_paths, entry) {
5692 struct got_commitable *ct = cpe->data;
5693 const char *ct_path = ct->path;
5695 while (ct_path[0] == '/')
5698 if (strcmp(path, ct_path) == 0 ||
5699 got_path_is_child(ct_path, path, path_len))
5704 return got_error_path(path, GOT_ERR_BAD_PATH);
5709 static const struct got_error *
5710 check_staged_file(void *arg, struct got_fileindex_entry *ie)
5712 int *have_staged_files = arg;
5714 if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5715 *have_staged_files = 1;
5716 return got_error(GOT_ERR_CANCELLED);
5722 static const struct got_error *
5723 check_non_staged_files(struct got_fileindex *fileindex,
5724 struct got_pathlist_head *paths)
5726 struct got_pathlist_entry *pe;
5727 struct got_fileindex_entry *ie;
5729 TAILQ_FOREACH(pe, paths, entry) {
5730 if (pe->path[0] == '\0')
5732 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5734 return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5735 if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5736 return got_error_path(pe->path,
5737 GOT_ERR_FILE_NOT_STAGED);
5743 const struct got_error *
5744 got_worktree_commit(struct got_object_id **new_commit_id,
5745 struct got_worktree *worktree, struct got_pathlist_head *paths,
5746 const char *author, const char *committer, int allow_bad_symlinks,
5747 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5748 got_worktree_status_cb status_cb, void *status_arg,
5749 struct got_repository *repo)
5751 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5752 struct got_fileindex *fileindex = NULL;
5753 char *fileindex_path = NULL;
5754 struct got_pathlist_head commitable_paths;
5755 struct collect_commitables_arg cc_arg;
5756 struct got_pathlist_entry *pe;
5757 struct got_reference *head_ref = NULL;
5758 struct got_object_id *head_commit_id = NULL;
5759 int have_staged_files = 0;
5761 *new_commit_id = NULL;
5763 TAILQ_INIT(&commitable_paths);
5765 err = lock_worktree(worktree, LOCK_EX);
5769 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5773 err = got_ref_resolve(&head_commit_id, repo, head_ref);
5777 err = open_fileindex(&fileindex, &fileindex_path, worktree);
5781 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5782 &have_staged_files);
5783 if (err && err->code != GOT_ERR_CANCELLED)
5785 if (have_staged_files) {
5786 err = check_non_staged_files(fileindex, paths);
5791 cc_arg.commitable_paths = &commitable_paths;
5792 cc_arg.worktree = worktree;
5793 cc_arg.fileindex = fileindex;
5795 cc_arg.have_staged_files = have_staged_files;
5796 cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5797 TAILQ_FOREACH(pe, paths, entry) {
5798 err = worktree_status(worktree, pe->path, fileindex, repo,
5799 collect_commitables, &cc_arg, NULL, NULL, 1, 0);
5804 if (TAILQ_EMPTY(&commitable_paths)) {
5805 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5809 TAILQ_FOREACH(pe, paths, entry) {
5810 err = check_path_is_commitable(pe->path, &commitable_paths);
5815 TAILQ_FOREACH(pe, &commitable_paths, entry) {
5816 struct got_commitable *ct = pe->data;
5817 const char *ct_path = ct->in_repo_path;
5819 while (ct_path[0] == '/')
5821 err = check_out_of_date(ct_path, ct->status,
5822 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5823 head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5829 err = commit_worktree(new_commit_id, &commitable_paths,
5830 head_commit_id, NULL, worktree, author, committer,
5831 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5835 err = update_fileindex_after_commit(worktree, &commitable_paths,
5836 *new_commit_id, fileindex, have_staged_files);
5837 sync_err = sync_fileindex(fileindex, fileindex_path);
5838 if (sync_err && err == NULL)
5842 got_fileindex_free(fileindex);
5843 free(fileindex_path);
5844 unlockerr = lock_worktree(worktree, LOCK_SH);
5845 if (unlockerr && err == NULL)
5847 TAILQ_FOREACH(pe, &commitable_paths, entry) {
5848 struct got_commitable *ct = pe->data;
5849 free_commitable(ct);
5851 got_pathlist_free(&commitable_paths);
5856 got_commitable_get_path(struct got_commitable *ct)
5862 got_commitable_get_status(struct got_commitable *ct)
5867 struct check_rebase_ok_arg {
5868 struct got_worktree *worktree;
5869 struct got_repository *repo;
5872 static const struct got_error *
5873 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5875 const struct got_error *err = NULL;
5876 struct check_rebase_ok_arg *a = arg;
5877 unsigned char status;
5881 /* Reject rebase of a work tree with mixed base commits. */
5882 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5883 SHA1_DIGEST_LENGTH))
5884 return got_error(GOT_ERR_MIXED_COMMITS);
5886 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5888 return got_error_from_errno("asprintf");
5890 /* Reject rebase of a work tree with modified or staged files. */
5891 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5896 if (status != GOT_STATUS_NO_CHANGE)
5897 return got_error(GOT_ERR_MODIFIED);
5898 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5899 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5904 const struct got_error *
5905 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5906 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5907 struct got_worktree *worktree, struct got_reference *branch,
5908 struct got_repository *repo)
5910 const struct got_error *err = NULL;
5911 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5912 char *branch_ref_name = NULL;
5913 char *fileindex_path = NULL;
5914 struct check_rebase_ok_arg ok_arg;
5915 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5916 struct got_object_id *wt_branch_tip = NULL;
5918 *new_base_branch_ref = NULL;
5922 err = lock_worktree(worktree, LOCK_EX);
5926 err = open_fileindex(fileindex, &fileindex_path, worktree);
5930 ok_arg.worktree = worktree;
5932 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5937 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5941 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5945 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5949 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5954 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5957 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5958 err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5962 err = got_ref_alloc_symref(new_base_branch_ref,
5963 new_base_branch_ref_name, wt_branch);
5966 err = got_ref_write(*new_base_branch_ref, repo);
5970 /* TODO Lock original branch's ref while rebasing? */
5972 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5976 err = got_ref_write(branch_ref, repo);
5980 err = got_ref_alloc(tmp_branch, tmp_branch_name,
5981 worktree->base_commit_id);
5984 err = got_ref_write(*tmp_branch, repo);
5988 err = got_worktree_set_head_ref(worktree, *tmp_branch);
5992 free(fileindex_path);
5993 free(tmp_branch_name);
5994 free(new_base_branch_ref_name);
5995 free(branch_ref_name);
5997 got_ref_close(branch_ref);
5999 got_ref_close(wt_branch);
6000 free(wt_branch_tip);
6002 if (*new_base_branch_ref) {
6003 got_ref_close(*new_base_branch_ref);
6004 *new_base_branch_ref = NULL;
6007 got_ref_close(*tmp_branch);
6011 got_fileindex_free(*fileindex);
6014 lock_worktree(worktree, LOCK_SH);
6019 const struct got_error *
6020 got_worktree_rebase_continue(struct got_object_id **commit_id,
6021 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6022 struct got_reference **branch, struct got_fileindex **fileindex,
6023 struct got_worktree *worktree, struct got_repository *repo)
6025 const struct got_error *err;
6026 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6027 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6028 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6029 char *fileindex_path = NULL;
6030 int have_staged_files = 0;
6033 *new_base_branch = NULL;
6038 err = lock_worktree(worktree, LOCK_EX);
6042 err = open_fileindex(fileindex, &fileindex_path, worktree);
6046 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6047 &have_staged_files);
6048 if (err && err->code != GOT_ERR_CANCELLED)
6050 if (have_staged_files) {
6051 err = got_error(GOT_ERR_STAGED_PATHS);
6055 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6059 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6063 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6067 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6071 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6075 err = got_ref_open(branch, repo,
6076 got_ref_get_symref_target(branch_ref), 0);
6080 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6084 err = got_ref_resolve(commit_id, repo, commit_ref);
6088 err = got_ref_open(new_base_branch, repo,
6089 new_base_branch_ref_name, 0);
6093 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6097 free(commit_ref_name);
6098 free(branch_ref_name);
6099 free(fileindex_path);
6101 got_ref_close(commit_ref);
6103 got_ref_close(branch_ref);
6108 got_ref_close(*tmp_branch);
6111 if (*new_base_branch) {
6112 got_ref_close(*new_base_branch);
6113 *new_base_branch = NULL;
6116 got_ref_close(*branch);
6120 got_fileindex_free(*fileindex);
6123 lock_worktree(worktree, LOCK_SH);
6128 const struct got_error *
6129 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6131 const struct got_error *err;
6132 char *tmp_branch_name = NULL;
6134 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6138 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6139 free(tmp_branch_name);
6143 static const struct got_error *
6144 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6145 char **logmsg, void *arg)
6151 static const struct got_error *
6152 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6153 const char *path, struct got_object_id *blob_id,
6154 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6155 int dirfd, const char *de_name)
6160 struct collect_merged_paths_arg {
6161 got_worktree_checkout_cb progress_cb;
6163 struct got_pathlist_head *merged_paths;
6166 static const struct got_error *
6167 collect_merged_paths(void *arg, unsigned char status, const char *path)
6169 const struct got_error *err;
6170 struct collect_merged_paths_arg *a = arg;
6172 struct got_pathlist_entry *new;
6174 err = (*a->progress_cb)(a->progress_arg, status, path);
6178 if (status != GOT_STATUS_MERGE &&
6179 status != GOT_STATUS_ADD &&
6180 status != GOT_STATUS_DELETE &&
6181 status != GOT_STATUS_CONFLICT)
6186 return got_error_from_errno("strdup");
6188 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6189 if (err || new == NULL)
6195 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6197 struct got_pathlist_entry *pe;
6199 TAILQ_FOREACH(pe, merged_paths, entry)
6200 free((char *)pe->path);
6202 got_pathlist_free(merged_paths);
6205 static const struct got_error *
6206 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6207 int is_rebase, struct got_repository *repo)
6209 const struct got_error *err;
6210 struct got_reference *commit_ref = NULL;
6212 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6214 if (err->code != GOT_ERR_NOT_REF)
6216 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6219 err = got_ref_write(commit_ref, repo);
6222 } else if (is_rebase) {
6223 struct got_object_id *stored_id;
6226 err = got_ref_resolve(&stored_id, repo, commit_ref);
6229 cmp = got_object_id_cmp(commit_id, stored_id);
6232 err = got_error(GOT_ERR_REBASE_COMMITID);
6238 got_ref_close(commit_ref);
6242 static const struct got_error *
6243 rebase_merge_files(struct got_pathlist_head *merged_paths,
6244 const char *commit_ref_name, struct got_worktree *worktree,
6245 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6246 struct got_object_id *commit_id, struct got_repository *repo,
6247 got_worktree_checkout_cb progress_cb, void *progress_arg,
6248 got_cancel_cb cancel_cb, void *cancel_arg)
6250 const struct got_error *err;
6251 struct got_reference *commit_ref = NULL;
6252 struct collect_merged_paths_arg cmp_arg;
6253 char *fileindex_path;
6255 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6257 err = get_fileindex_path(&fileindex_path, worktree);
6261 cmp_arg.progress_cb = progress_cb;
6262 cmp_arg.progress_arg = progress_arg;
6263 cmp_arg.merged_paths = merged_paths;
6264 err = merge_files(worktree, fileindex, fileindex_path,
6265 parent_commit_id, commit_id, repo, collect_merged_paths,
6266 &cmp_arg, cancel_cb, cancel_arg);
6268 got_ref_close(commit_ref);
6272 const struct got_error *
6273 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6274 struct got_worktree *worktree, struct got_fileindex *fileindex,
6275 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6276 struct got_repository *repo,
6277 got_worktree_checkout_cb progress_cb, void *progress_arg,
6278 got_cancel_cb cancel_cb, void *cancel_arg)
6280 const struct got_error *err;
6281 char *commit_ref_name;
6283 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6287 err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6291 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6292 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6293 progress_arg, cancel_cb, cancel_arg);
6295 free(commit_ref_name);
6299 const struct got_error *
6300 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6301 struct got_worktree *worktree, struct got_fileindex *fileindex,
6302 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6303 struct got_repository *repo,
6304 got_worktree_checkout_cb progress_cb, void *progress_arg,
6305 got_cancel_cb cancel_cb, void *cancel_arg)
6307 const struct got_error *err;
6308 char *commit_ref_name;
6310 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6314 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6318 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6319 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6320 progress_arg, cancel_cb, cancel_arg);
6322 free(commit_ref_name);
6326 static const struct got_error *
6327 rebase_commit(struct got_object_id **new_commit_id,
6328 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6329 struct got_worktree *worktree, struct got_fileindex *fileindex,
6330 struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6331 const char *new_logmsg, struct got_repository *repo)
6333 const struct got_error *err, *sync_err;
6334 struct got_pathlist_head commitable_paths;
6335 struct collect_commitables_arg cc_arg;
6336 char *fileindex_path = NULL;
6337 struct got_reference *head_ref = NULL;
6338 struct got_object_id *head_commit_id = NULL;
6339 char *logmsg = NULL;
6341 TAILQ_INIT(&commitable_paths);
6342 *new_commit_id = NULL;
6344 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6346 err = get_fileindex_path(&fileindex_path, worktree);
6350 cc_arg.commitable_paths = &commitable_paths;
6351 cc_arg.worktree = worktree;
6353 cc_arg.have_staged_files = 0;
6355 * If possible get the status of individual files directly to
6356 * avoid crawling the entire work tree once per rebased commit.
6358 * Ideally, merged_paths would contain a list of commitables
6359 * we could use so we could skip worktree_status() entirely.
6360 * However, we would then need carefully keep track of cumulative
6361 * effects of operations such as file additions and deletions
6362 * in 'got histedit -f' (folding multiple commits into one),
6363 * and this extra complexity is not really worth it.
6366 struct got_pathlist_entry *pe;
6367 TAILQ_FOREACH(pe, merged_paths, entry) {
6368 err = worktree_status(worktree, pe->path, fileindex,
6369 repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6375 err = worktree_status(worktree, "", fileindex, repo,
6376 collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6381 if (TAILQ_EMPTY(&commitable_paths)) {
6382 /* No-op change; commit will be elided. */
6383 err = got_ref_delete(commit_ref, repo);
6386 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6390 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6394 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6399 logmsg = strdup(new_logmsg);
6400 if (logmsg == NULL) {
6401 err = got_error_from_errno("strdup");
6405 err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6410 /* NB: commit_worktree will call free(logmsg) */
6411 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6412 NULL, worktree, got_object_commit_get_author(orig_commit),
6413 got_object_commit_get_committer(orig_commit),
6414 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6418 err = got_ref_change_ref(tmp_branch, *new_commit_id);
6422 err = got_ref_delete(commit_ref, repo);
6426 err = update_fileindex_after_commit(worktree, &commitable_paths,
6427 *new_commit_id, fileindex, 0);
6428 sync_err = sync_fileindex(fileindex, fileindex_path);
6429 if (sync_err && err == NULL)
6432 free(fileindex_path);
6433 free(head_commit_id);
6435 got_ref_close(head_ref);
6437 free(*new_commit_id);
6438 *new_commit_id = NULL;
6443 const struct got_error *
6444 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6445 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6446 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6447 struct got_commit_object *orig_commit,
6448 struct got_object_id *orig_commit_id, struct got_repository *repo)
6450 const struct got_error *err;
6451 char *commit_ref_name;
6452 struct got_reference *commit_ref = NULL;
6453 struct got_object_id *commit_id = NULL;
6455 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6459 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6462 err = got_ref_resolve(&commit_id, repo, commit_ref);
6465 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6466 err = got_error(GOT_ERR_REBASE_COMMITID);
6470 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6471 worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6474 got_ref_close(commit_ref);
6475 free(commit_ref_name);
6480 const struct got_error *
6481 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6482 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6483 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6484 struct got_commit_object *orig_commit,
6485 struct got_object_id *orig_commit_id, const char *new_logmsg,
6486 struct got_repository *repo)
6488 const struct got_error *err;
6489 char *commit_ref_name;
6490 struct got_reference *commit_ref = NULL;
6492 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6496 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6500 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6501 worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6504 got_ref_close(commit_ref);
6505 free(commit_ref_name);
6509 const struct got_error *
6510 got_worktree_rebase_postpone(struct got_worktree *worktree,
6511 struct got_fileindex *fileindex)
6514 got_fileindex_free(fileindex);
6515 return lock_worktree(worktree, LOCK_SH);
6518 static const struct got_error *
6519 delete_ref(const char *name, struct got_repository *repo)
6521 const struct got_error *err;
6522 struct got_reference *ref;
6524 err = got_ref_open(&ref, repo, name, 0);
6526 if (err->code == GOT_ERR_NOT_REF)
6531 err = got_ref_delete(ref, repo);
6536 static const struct got_error *
6537 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6539 const struct got_error *err;
6540 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6541 char *branch_ref_name = NULL, *commit_ref_name = NULL;
6543 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6546 err = delete_ref(tmp_branch_name, repo);
6550 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6553 err = delete_ref(new_base_branch_ref_name, repo);
6557 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6560 err = delete_ref(branch_ref_name, repo);
6564 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6567 err = delete_ref(commit_ref_name, repo);
6572 free(tmp_branch_name);
6573 free(new_base_branch_ref_name);
6574 free(branch_ref_name);
6575 free(commit_ref_name);
6579 const struct got_error *
6580 create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6581 struct got_object_id *new_commit_id, struct got_repository *repo)
6583 const struct got_error *err;
6584 struct got_reference *ref = NULL;
6585 struct got_object_id *old_commit_id = NULL;
6586 const char *branch_name = NULL;
6587 char *new_id_str = NULL;
6588 char *refname = NULL;
6590 branch_name = got_ref_get_name(branch);
6591 if (strncmp(branch_name, "refs/heads/", 11) != 0)
6592 return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6595 err = got_object_id_str(&new_id_str, new_commit_id);
6599 if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6600 new_id_str) == -1) {
6601 err = got_error_from_errno("asprintf");
6605 err = got_ref_resolve(&old_commit_id, repo, branch);
6609 err = got_ref_alloc(&ref, refname, old_commit_id);
6613 err = got_ref_write(ref, repo);
6617 free(old_commit_id);
6623 const struct got_error *
6624 got_worktree_rebase_complete(struct got_worktree *worktree,
6625 struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6626 struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6627 struct got_repository *repo, int create_backup)
6629 const struct got_error *err, *unlockerr, *sync_err;
6630 struct got_object_id *new_head_commit_id = NULL;
6631 char *fileindex_path = NULL;
6633 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6637 if (create_backup) {
6638 err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6639 rebased_branch, new_head_commit_id, repo);
6644 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6648 err = got_ref_write(rebased_branch, repo);
6652 err = got_worktree_set_head_ref(worktree, rebased_branch);
6656 err = delete_rebase_refs(worktree, repo);
6660 err = get_fileindex_path(&fileindex_path, worktree);
6663 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6664 sync_err = sync_fileindex(fileindex, fileindex_path);
6665 if (sync_err && err == NULL)
6668 got_fileindex_free(fileindex);
6669 free(fileindex_path);
6670 free(new_head_commit_id);
6671 unlockerr = lock_worktree(worktree, LOCK_SH);
6672 if (unlockerr && err == NULL)
6677 const struct got_error *
6678 got_worktree_rebase_abort(struct got_worktree *worktree,
6679 struct got_fileindex *fileindex, struct got_repository *repo,
6680 struct got_reference *new_base_branch,
6681 got_worktree_checkout_cb progress_cb, void *progress_arg)
6683 const struct got_error *err, *unlockerr, *sync_err;
6684 struct got_reference *resolved = NULL;
6685 struct got_object_id *commit_id = NULL;
6686 char *fileindex_path = NULL;
6687 struct revert_file_args rfa;
6688 struct got_object_id *tree_id = NULL;
6690 err = lock_worktree(worktree, LOCK_EX);
6694 err = got_ref_open(&resolved, repo,
6695 got_ref_get_symref_target(new_base_branch), 0);
6699 err = got_worktree_set_head_ref(worktree, resolved);
6704 * XXX commits to the base branch could have happened while
6705 * we were busy rebasing; should we store the original commit ID
6706 * when rebase begins and read it back here?
6708 err = got_ref_resolve(&commit_id, repo, resolved);
6712 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6716 err = got_object_id_by_path(&tree_id, repo,
6717 worktree->base_commit_id, worktree->path_prefix);
6721 err = delete_rebase_refs(worktree, repo);
6725 err = get_fileindex_path(&fileindex_path, worktree);
6729 rfa.worktree = worktree;
6730 rfa.fileindex = fileindex;
6731 rfa.progress_cb = progress_cb;
6732 rfa.progress_arg = progress_arg;
6733 rfa.patch_cb = NULL;
6734 rfa.patch_arg = NULL;
6736 rfa.unlink_added_files = 0;
6737 err = worktree_status(worktree, "", fileindex, repo,
6738 revert_file, &rfa, NULL, NULL, 1, 0);
6742 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6743 repo, progress_cb, progress_arg, NULL, NULL);
6745 sync_err = sync_fileindex(fileindex, fileindex_path);
6746 if (sync_err && err == NULL)
6749 got_ref_close(resolved);
6753 got_fileindex_free(fileindex);
6754 free(fileindex_path);
6756 unlockerr = lock_worktree(worktree, LOCK_SH);
6757 if (unlockerr && err == NULL)
6762 const struct got_error *
6763 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6764 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6765 struct got_fileindex **fileindex, struct got_worktree *worktree,
6766 struct got_repository *repo)
6768 const struct got_error *err = NULL;
6769 char *tmp_branch_name = NULL;
6770 char *branch_ref_name = NULL;
6771 char *base_commit_ref_name = NULL;
6772 char *fileindex_path = NULL;
6773 struct check_rebase_ok_arg ok_arg;
6774 struct got_reference *wt_branch = NULL;
6775 struct got_reference *base_commit_ref = NULL;
6779 *base_commit_id = NULL;
6782 err = lock_worktree(worktree, LOCK_EX);
6786 err = open_fileindex(fileindex, &fileindex_path, worktree);
6790 ok_arg.worktree = worktree;
6792 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6797 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6801 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6805 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6810 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6815 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6819 err = got_ref_write(*branch_ref, repo);
6823 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6824 worktree->base_commit_id);
6827 err = got_ref_write(base_commit_ref, repo);
6830 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6831 if (*base_commit_id == NULL) {
6832 err = got_error_from_errno("got_object_id_dup");
6836 err = got_ref_alloc(tmp_branch, tmp_branch_name,
6837 worktree->base_commit_id);
6840 err = got_ref_write(*tmp_branch, repo);
6844 err = got_worktree_set_head_ref(worktree, *tmp_branch);
6848 free(fileindex_path);
6849 free(tmp_branch_name);
6850 free(branch_ref_name);
6851 free(base_commit_ref_name);
6853 got_ref_close(wt_branch);
6856 got_ref_close(*branch_ref);
6860 got_ref_close(*tmp_branch);
6863 free(*base_commit_id);
6865 got_fileindex_free(*fileindex);
6868 lock_worktree(worktree, LOCK_SH);
6873 const struct got_error *
6874 got_worktree_histedit_postpone(struct got_worktree *worktree,
6875 struct got_fileindex *fileindex)
6878 got_fileindex_free(fileindex);
6879 return lock_worktree(worktree, LOCK_SH);
6882 const struct got_error *
6883 got_worktree_histedit_in_progress(int *in_progress,
6884 struct got_worktree *worktree)
6886 const struct got_error *err;
6887 char *tmp_branch_name = NULL;
6889 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6893 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6894 free(tmp_branch_name);
6898 const struct got_error *
6899 got_worktree_histedit_continue(struct got_object_id **commit_id,
6900 struct got_reference **tmp_branch, struct got_reference **branch_ref,
6901 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6902 struct got_worktree *worktree, struct got_repository *repo)
6904 const struct got_error *err;
6905 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6906 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6907 struct got_reference *commit_ref = NULL;
6908 struct got_reference *base_commit_ref = NULL;
6909 char *fileindex_path = NULL;
6910 int have_staged_files = 0;
6914 *base_commit_id = NULL;
6917 err = lock_worktree(worktree, LOCK_EX);
6921 err = open_fileindex(fileindex, &fileindex_path, worktree);
6925 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6926 &have_staged_files);
6927 if (err && err->code != GOT_ERR_CANCELLED)
6929 if (have_staged_files) {
6930 err = got_error(GOT_ERR_STAGED_PATHS);
6934 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6938 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6942 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6946 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6951 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6955 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6958 err = got_ref_resolve(commit_id, repo, commit_ref);
6962 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6965 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6969 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6973 free(commit_ref_name);
6974 free(branch_ref_name);
6975 free(fileindex_path);
6977 got_ref_close(commit_ref);
6978 if (base_commit_ref)
6979 got_ref_close(base_commit_ref);
6983 free(*base_commit_id);
6984 *base_commit_id = NULL;
6986 got_ref_close(*tmp_branch);
6990 got_fileindex_free(*fileindex);
6993 lock_worktree(worktree, LOCK_EX);
6998 static const struct got_error *
6999 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7001 const struct got_error *err;
7002 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7003 char *branch_ref_name = NULL, *commit_ref_name = NULL;
7005 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7008 err = delete_ref(tmp_branch_name, repo);
7012 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7016 err = delete_ref(base_commit_ref_name, repo);
7020 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7023 err = delete_ref(branch_ref_name, repo);
7027 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7030 err = delete_ref(commit_ref_name, repo);
7034 free(tmp_branch_name);
7035 free(base_commit_ref_name);
7036 free(branch_ref_name);
7037 free(commit_ref_name);
7041 const struct got_error *
7042 got_worktree_histedit_abort(struct got_worktree *worktree,
7043 struct got_fileindex *fileindex, struct got_repository *repo,
7044 struct got_reference *branch, struct got_object_id *base_commit_id,
7045 got_worktree_checkout_cb progress_cb, void *progress_arg)
7047 const struct got_error *err, *unlockerr, *sync_err;
7048 struct got_reference *resolved = NULL;
7049 char *fileindex_path = NULL;
7050 struct got_object_id *tree_id = NULL;
7051 struct revert_file_args rfa;
7053 err = lock_worktree(worktree, LOCK_EX);
7057 err = got_ref_open(&resolved, repo,
7058 got_ref_get_symref_target(branch), 0);
7062 err = got_worktree_set_head_ref(worktree, resolved);
7066 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7070 err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7071 worktree->path_prefix);
7075 err = delete_histedit_refs(worktree, repo);
7079 err = get_fileindex_path(&fileindex_path, worktree);
7083 rfa.worktree = worktree;
7084 rfa.fileindex = fileindex;
7085 rfa.progress_cb = progress_cb;
7086 rfa.progress_arg = progress_arg;
7087 rfa.patch_cb = NULL;
7088 rfa.patch_arg = NULL;
7090 rfa.unlink_added_files = 0;
7091 err = worktree_status(worktree, "", fileindex, repo,
7092 revert_file, &rfa, NULL, NULL, 1, 0);
7096 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7097 repo, progress_cb, progress_arg, NULL, NULL);
7099 sync_err = sync_fileindex(fileindex, fileindex_path);
7100 if (sync_err && err == NULL)
7103 got_ref_close(resolved);
7105 free(fileindex_path);
7107 unlockerr = lock_worktree(worktree, LOCK_SH);
7108 if (unlockerr && err == NULL)
7113 const struct got_error *
7114 got_worktree_histedit_complete(struct got_worktree *worktree,
7115 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7116 struct got_reference *edited_branch, struct got_repository *repo)
7118 const struct got_error *err, *unlockerr, *sync_err;
7119 struct got_object_id *new_head_commit_id = NULL;
7120 struct got_reference *resolved = NULL;
7121 char *fileindex_path = NULL;
7123 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7127 err = got_ref_open(&resolved, repo,
7128 got_ref_get_symref_target(edited_branch), 0);
7132 err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7133 resolved, new_head_commit_id, repo);
7137 err = got_ref_change_ref(resolved, new_head_commit_id);
7141 err = got_ref_write(resolved, repo);
7145 err = got_worktree_set_head_ref(worktree, resolved);
7149 err = delete_histedit_refs(worktree, repo);
7153 err = get_fileindex_path(&fileindex_path, worktree);
7156 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7157 sync_err = sync_fileindex(fileindex, fileindex_path);
7158 if (sync_err && err == NULL)
7161 got_fileindex_free(fileindex);
7162 free(fileindex_path);
7163 free(new_head_commit_id);
7164 unlockerr = lock_worktree(worktree, LOCK_SH);
7165 if (unlockerr && err == NULL)
7170 const struct got_error *
7171 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7172 struct got_object_id *commit_id, struct got_repository *repo)
7174 const struct got_error *err;
7175 char *commit_ref_name;
7177 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7181 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7185 err = delete_ref(commit_ref_name, repo);
7187 free(commit_ref_name);
7191 const struct got_error *
7192 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7193 struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7194 struct got_worktree *worktree, const char *refname,
7195 struct got_repository *repo)
7197 const struct got_error *err = NULL;
7198 char *fileindex_path = NULL;
7199 struct check_rebase_ok_arg ok_arg;
7203 *base_branch_ref = NULL;
7205 err = lock_worktree(worktree, LOCK_EX);
7209 if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7210 err = got_error_msg(GOT_ERR_SAME_BRANCH,
7211 "cannot integrate a branch into itself; "
7212 "update -b or different branch name required");
7216 err = open_fileindex(fileindex, &fileindex_path, worktree);
7220 /* Preconditions are the same as for rebase. */
7221 ok_arg.worktree = worktree;
7223 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7228 err = got_ref_open(branch_ref, repo, refname, 1);
7232 err = got_ref_open(base_branch_ref, repo,
7233 got_worktree_get_head_ref_name(worktree), 1);
7237 got_ref_close(*branch_ref);
7240 if (*base_branch_ref) {
7241 got_ref_close(*base_branch_ref);
7242 *base_branch_ref = NULL;
7245 got_fileindex_free(*fileindex);
7248 lock_worktree(worktree, LOCK_SH);
7253 const struct got_error *
7254 got_worktree_integrate_continue(struct got_worktree *worktree,
7255 struct got_fileindex *fileindex, struct got_repository *repo,
7256 struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7257 got_worktree_checkout_cb progress_cb, void *progress_arg,
7258 got_cancel_cb cancel_cb, void *cancel_arg)
7260 const struct got_error *err = NULL, *sync_err, *unlockerr;
7261 char *fileindex_path = NULL;
7262 struct got_object_id *tree_id = NULL, *commit_id = NULL;
7264 err = get_fileindex_path(&fileindex_path, worktree);
7268 err = got_ref_resolve(&commit_id, repo, branch_ref);
7272 err = got_object_id_by_path(&tree_id, repo, commit_id,
7273 worktree->path_prefix);
7277 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7281 err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7282 progress_cb, progress_arg, cancel_cb, cancel_arg);
7286 err = got_ref_change_ref(base_branch_ref, commit_id);
7290 err = got_ref_write(base_branch_ref, repo);
7294 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7296 sync_err = sync_fileindex(fileindex, fileindex_path);
7297 if (sync_err && err == NULL)
7301 unlockerr = got_ref_unlock(branch_ref);
7302 if (unlockerr && err == NULL)
7304 got_ref_close(branch_ref);
7306 unlockerr = got_ref_unlock(base_branch_ref);
7307 if (unlockerr && err == NULL)
7309 got_ref_close(base_branch_ref);
7311 got_fileindex_free(fileindex);
7312 free(fileindex_path);
7315 unlockerr = lock_worktree(worktree, LOCK_SH);
7316 if (unlockerr && err == NULL)
7321 const struct got_error *
7322 got_worktree_integrate_abort(struct got_worktree *worktree,
7323 struct got_fileindex *fileindex, struct got_repository *repo,
7324 struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7326 const struct got_error *err = NULL, *unlockerr = NULL;
7328 got_fileindex_free(fileindex);
7330 err = lock_worktree(worktree, LOCK_SH);
7332 unlockerr = got_ref_unlock(branch_ref);
7333 if (unlockerr && err == NULL)
7335 got_ref_close(branch_ref);
7337 unlockerr = got_ref_unlock(base_branch_ref);
7338 if (unlockerr && err == NULL)
7340 got_ref_close(base_branch_ref);
7345 const struct got_error *
7346 got_worktree_merge_postpone(struct got_worktree *worktree,
7347 struct got_fileindex *fileindex)
7349 const struct got_error *err, *sync_err;
7350 char *fileindex_path = NULL;
7352 err = get_fileindex_path(&fileindex_path, worktree);
7356 sync_err = sync_fileindex(fileindex, fileindex_path);
7358 err = lock_worktree(worktree, LOCK_SH);
7359 if (sync_err && err == NULL)
7362 got_fileindex_free(fileindex);
7363 free(fileindex_path);
7367 static const struct got_error *
7368 delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7370 const struct got_error *err;
7371 char *branch_refname = NULL, *commit_refname = NULL;
7373 err = get_merge_branch_ref_name(&branch_refname, worktree);
7376 err = delete_ref(branch_refname, repo);
7380 err = get_merge_commit_ref_name(&commit_refname, worktree);
7383 err = delete_ref(commit_refname, repo);
7388 free(branch_refname);
7389 free(commit_refname);
7393 struct merge_commit_msg_arg {
7394 struct got_worktree *worktree;
7395 const char *branch_name;
7398 static const struct got_error *
7399 merge_commit_msg_cb(struct got_pathlist_head *commitable_paths, char **logmsg,
7402 struct merge_commit_msg_arg *a = arg;
7404 if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7405 got_worktree_get_head_ref_name(a->worktree)) == -1)
7406 return got_error_from_errno("asprintf");
7412 const struct got_error *
7413 got_worktree_merge_branch(struct got_worktree *worktree,
7414 struct got_fileindex *fileindex,
7415 struct got_object_id *yca_commit_id,
7416 struct got_object_id *branch_tip,
7417 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7418 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7420 const struct got_error *err;
7421 char *fileindex_path = NULL;
7423 err = get_fileindex_path(&fileindex_path, worktree);
7427 err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7432 err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7433 branch_tip, repo, progress_cb, progress_arg,
7434 cancel_cb, cancel_arg);
7436 free(fileindex_path);
7440 const struct got_error *
7441 got_worktree_merge_commit(struct got_object_id **new_commit_id,
7442 struct got_worktree *worktree, struct got_fileindex *fileindex,
7443 const char *author, const char *committer, int allow_bad_symlinks,
7444 struct got_object_id *branch_tip, const char *branch_name,
7445 struct got_repository *repo,
7446 got_worktree_status_cb status_cb, void *status_arg)
7449 const struct got_error *err = NULL, *sync_err;
7450 struct got_pathlist_head commitable_paths;
7451 struct collect_commitables_arg cc_arg;
7452 struct got_pathlist_entry *pe;
7453 struct got_reference *head_ref = NULL;
7454 struct got_object_id *head_commit_id = NULL;
7455 int have_staged_files = 0;
7456 struct merge_commit_msg_arg mcm_arg;
7457 char *fileindex_path = NULL;
7459 *new_commit_id = NULL;
7461 TAILQ_INIT(&commitable_paths);
7463 err = get_fileindex_path(&fileindex_path, worktree);
7467 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7471 err = got_ref_resolve(&head_commit_id, repo, head_ref);
7475 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7476 &have_staged_files);
7477 if (err && err->code != GOT_ERR_CANCELLED)
7479 if (have_staged_files) {
7480 err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7484 cc_arg.commitable_paths = &commitable_paths;
7485 cc_arg.worktree = worktree;
7486 cc_arg.fileindex = fileindex;
7488 cc_arg.have_staged_files = have_staged_files;
7489 cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7490 err = worktree_status(worktree, "", fileindex, repo,
7491 collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7495 if (TAILQ_EMPTY(&commitable_paths)) {
7496 err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7497 "merge of %s cannot proceed", branch_name);
7501 TAILQ_FOREACH(pe, &commitable_paths, entry) {
7502 struct got_commitable *ct = pe->data;
7503 const char *ct_path = ct->in_repo_path;
7505 while (ct_path[0] == '/')
7507 err = check_out_of_date(ct_path, ct->status,
7508 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7509 head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7515 mcm_arg.worktree = worktree;
7516 mcm_arg.branch_name = branch_name;
7517 err = commit_worktree(new_commit_id, &commitable_paths,
7518 head_commit_id, branch_tip, worktree, author, committer,
7519 merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7523 err = update_fileindex_after_commit(worktree, &commitable_paths,
7524 *new_commit_id, fileindex, have_staged_files);
7525 sync_err = sync_fileindex(fileindex, fileindex_path);
7526 if (sync_err && err == NULL)
7529 TAILQ_FOREACH(pe, &commitable_paths, entry) {
7530 struct got_commitable *ct = pe->data;
7531 free_commitable(ct);
7533 got_pathlist_free(&commitable_paths);
7534 free(fileindex_path);
7538 const struct got_error *
7539 got_worktree_merge_complete(struct got_worktree *worktree,
7540 struct got_fileindex *fileindex, struct got_repository *repo)
7542 const struct got_error *err, *unlockerr, *sync_err;
7543 char *fileindex_path = NULL;
7545 err = delete_merge_refs(worktree, repo);
7549 err = get_fileindex_path(&fileindex_path, worktree);
7552 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7553 sync_err = sync_fileindex(fileindex, fileindex_path);
7554 if (sync_err && err == NULL)
7557 got_fileindex_free(fileindex);
7558 free(fileindex_path);
7559 unlockerr = lock_worktree(worktree, LOCK_SH);
7560 if (unlockerr && err == NULL)
7565 const struct got_error *
7566 got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7567 struct got_repository *repo)
7569 const struct got_error *err;
7570 char *branch_refname = NULL;
7571 struct got_reference *branch_ref = NULL;
7575 err = get_merge_branch_ref_name(&branch_refname, worktree);
7578 err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7579 free(branch_refname);
7581 if (err->code != GOT_ERR_NOT_REF)
7589 const struct got_error *got_worktree_merge_prepare(
7590 struct got_fileindex **fileindex, struct got_worktree *worktree,
7591 struct got_reference *branch, struct got_repository *repo)
7593 const struct got_error *err = NULL;
7594 char *fileindex_path = NULL;
7595 char *branch_refname = NULL, *commit_refname = NULL;
7596 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
7597 struct got_reference *commit_ref = NULL;
7598 struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
7599 struct check_rebase_ok_arg ok_arg;
7603 err = lock_worktree(worktree, LOCK_EX);
7607 err = open_fileindex(fileindex, &fileindex_path, worktree);
7611 /* Preconditions are the same as for rebase. */
7612 ok_arg.worktree = worktree;
7614 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7619 err = get_merge_branch_ref_name(&branch_refname, worktree);
7623 err = get_merge_commit_ref_name(&commit_refname, worktree);
7627 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7632 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
7636 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
7637 err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
7641 err = got_ref_resolve(&branch_tip, repo, branch);
7645 err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
7648 err = got_ref_write(branch_ref, repo);
7652 err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
7655 err = got_ref_write(commit_ref, repo);
7660 free(branch_refname);
7661 free(commit_refname);
7662 free(fileindex_path);
7664 got_ref_close(branch_ref);
7666 got_ref_close(commit_ref);
7668 got_ref_close(wt_branch);
7669 free(wt_branch_tip);
7672 got_fileindex_free(*fileindex);
7675 lock_worktree(worktree, LOCK_SH);
7680 const struct got_error *
7681 got_worktree_merge_continue(char **branch_name,
7682 struct got_object_id **branch_tip, struct got_fileindex **fileindex,
7683 struct got_worktree *worktree, struct got_repository *repo)
7685 const struct got_error *err;
7686 char *commit_refname = NULL, *branch_refname = NULL;
7687 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
7688 char *fileindex_path = NULL;
7689 int have_staged_files = 0;
7691 *branch_name = NULL;
7695 err = lock_worktree(worktree, LOCK_EX);
7699 err = open_fileindex(fileindex, &fileindex_path, worktree);
7703 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7704 &have_staged_files);
7705 if (err && err->code != GOT_ERR_CANCELLED)
7707 if (have_staged_files) {
7708 err = got_error(GOT_ERR_STAGED_PATHS);
7712 err = get_merge_branch_ref_name(&branch_refname, worktree);
7716 err = get_merge_commit_ref_name(&commit_refname, worktree);
7720 err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7724 if (!got_ref_is_symbolic(branch_ref)) {
7725 err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
7726 "%s is not a symbolic reference",
7727 got_ref_get_name(branch_ref));
7730 *branch_name = strdup(got_ref_get_symref_target(branch_ref));
7731 if (*branch_name == NULL) {
7732 err = got_error_from_errno("strdup");
7736 err = got_ref_open(&commit_ref, repo, commit_refname, 0);
7740 err = got_ref_resolve(branch_tip, repo, commit_ref);
7744 free(commit_refname);
7745 free(branch_refname);
7746 free(fileindex_path);
7748 got_ref_close(commit_ref);
7750 got_ref_close(branch_ref);
7754 *branch_name = NULL;
7759 got_fileindex_free(*fileindex);
7762 lock_worktree(worktree, LOCK_SH);
7767 const struct got_error *
7768 got_worktree_merge_abort(struct got_worktree *worktree,
7769 struct got_fileindex *fileindex, struct got_repository *repo,
7770 got_worktree_checkout_cb progress_cb, void *progress_arg)
7772 const struct got_error *err, *unlockerr, *sync_err;
7773 struct got_object_id *commit_id = NULL;
7774 char *fileindex_path = NULL;
7775 struct revert_file_args rfa;
7776 struct got_object_id *tree_id = NULL;
7778 err = got_object_id_by_path(&tree_id, repo,
7779 worktree->base_commit_id, worktree->path_prefix);
7783 err = delete_merge_refs(worktree, repo);
7787 err = get_fileindex_path(&fileindex_path, worktree);
7791 rfa.worktree = worktree;
7792 rfa.fileindex = fileindex;
7793 rfa.progress_cb = progress_cb;
7794 rfa.progress_arg = progress_arg;
7795 rfa.patch_cb = NULL;
7796 rfa.patch_arg = NULL;
7798 rfa.unlink_added_files = 1;
7799 err = worktree_status(worktree, "", fileindex, repo,
7800 revert_file, &rfa, NULL, NULL, 1, 0);
7804 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7805 repo, progress_cb, progress_arg, NULL, NULL);
7807 sync_err = sync_fileindex(fileindex, fileindex_path);
7808 if (sync_err && err == NULL)
7814 got_fileindex_free(fileindex);
7815 free(fileindex_path);
7817 unlockerr = lock_worktree(worktree, LOCK_SH);
7818 if (unlockerr && err == NULL)
7823 struct check_stage_ok_arg {
7824 struct got_object_id *head_commit_id;
7825 struct got_worktree *worktree;
7826 struct got_fileindex *fileindex;
7827 struct got_repository *repo;
7831 const struct got_error *
7832 check_stage_ok(void *arg, unsigned char status,
7833 unsigned char staged_status, const char *relpath,
7834 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7835 struct got_object_id *commit_id, int dirfd, const char *de_name)
7837 struct check_stage_ok_arg *a = arg;
7838 const struct got_error *err = NULL;
7839 struct got_fileindex_entry *ie;
7840 struct got_object_id base_commit_id;
7841 struct got_object_id *base_commit_idp = NULL;
7842 char *in_repo_path = NULL, *p;
7844 if (status == GOT_STATUS_UNVERSIONED ||
7845 status == GOT_STATUS_NO_CHANGE)
7847 if (status == GOT_STATUS_NONEXISTENT)
7848 return got_error_set_errno(ENOENT, relpath);
7850 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7852 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7854 if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7855 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7857 return got_error_from_errno("asprintf");
7859 if (got_fileindex_entry_has_commit(ie)) {
7860 memcpy(base_commit_id.sha1, ie->commit_sha1,
7861 SHA1_DIGEST_LENGTH);
7862 base_commit_idp = &base_commit_id;
7865 if (status == GOT_STATUS_CONFLICT) {
7866 err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7868 } else if (status != GOT_STATUS_ADD &&
7869 status != GOT_STATUS_MODIFY &&
7870 status != GOT_STATUS_DELETE) {
7871 err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7875 a->have_changes = 1;
7880 err = check_out_of_date(p, status, staged_status,
7881 blob_id, base_commit_idp, a->head_commit_id, a->repo,
7882 GOT_ERR_STAGE_OUT_OF_DATE);
7888 struct stage_path_arg {
7889 struct got_worktree *worktree;
7890 struct got_fileindex *fileindex;
7891 struct got_repository *repo;
7892 got_worktree_status_cb status_cb;
7894 got_worktree_patch_cb patch_cb;
7896 int staged_something;
7897 int allow_bad_symlinks;
7900 static const struct got_error *
7901 stage_path(void *arg, unsigned char status,
7902 unsigned char staged_status, const char *relpath,
7903 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7904 struct got_object_id *commit_id, int dirfd, const char *de_name)
7906 struct stage_path_arg *a = arg;
7907 const struct got_error *err = NULL;
7908 struct got_fileindex_entry *ie;
7909 char *ondisk_path = NULL, *path_content = NULL;
7911 struct got_object_id *new_staged_blob_id = NULL;
7914 if (status == GOT_STATUS_UNVERSIONED)
7917 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7919 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7921 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7923 return got_error_from_errno("asprintf");
7926 case GOT_STATUS_ADD:
7927 case GOT_STATUS_MODIFY:
7928 /* XXX could sb.st_mode be passed in by our caller? */
7929 if (lstat(ondisk_path, &sb) == -1) {
7930 err = got_error_from_errno2("lstat", ondisk_path);
7934 if (status == GOT_STATUS_ADD) {
7935 int choice = GOT_PATCH_CHOICE_NONE;
7936 err = (*a->patch_cb)(&choice, a->patch_arg,
7937 status, ie->path, NULL, 1, 1);
7940 if (choice != GOT_PATCH_CHOICE_YES)
7943 err = create_patched_content(&path_content, 0,
7944 staged_blob_id ? staged_blob_id : blob_id,
7945 ondisk_path, dirfd, de_name, ie->path,
7946 a->repo, a->patch_cb, a->patch_arg);
7947 if (err || path_content == NULL)
7951 err = got_object_blob_create(&new_staged_blob_id,
7952 path_content ? path_content : ondisk_path, a->repo);
7955 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7956 SHA1_DIGEST_LENGTH);
7957 if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7958 stage = GOT_FILEIDX_STAGE_ADD;
7960 stage = GOT_FILEIDX_STAGE_MODIFY;
7961 got_fileindex_entry_stage_set(ie, stage);
7962 if (S_ISLNK(sb.st_mode)) {
7963 int is_bad_symlink = 0;
7964 if (!a->allow_bad_symlinks) {
7965 char target_path[PATH_MAX];
7967 target_len = readlink(ondisk_path, target_path,
7968 sizeof(target_path));
7969 if (target_len == -1) {
7970 err = got_error_from_errno2("readlink",
7974 err = is_bad_symlink_target(&is_bad_symlink,
7975 target_path, target_len, ondisk_path,
7976 a->worktree->root_path);
7979 if (is_bad_symlink) {
7980 err = got_error_path(ondisk_path,
7981 GOT_ERR_BAD_SYMLINK);
7986 got_fileindex_entry_staged_filetype_set(ie,
7987 GOT_FILEIDX_MODE_BAD_SYMLINK);
7989 got_fileindex_entry_staged_filetype_set(ie,
7990 GOT_FILEIDX_MODE_SYMLINK);
7992 got_fileindex_entry_staged_filetype_set(ie,
7993 GOT_FILEIDX_MODE_REGULAR_FILE);
7995 a->staged_something = 1;
7996 if (a->status_cb == NULL)
7998 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7999 get_staged_status(ie), relpath, blob_id,
8000 new_staged_blob_id, NULL, dirfd, de_name);
8002 case GOT_STATUS_DELETE:
8003 if (staged_status == GOT_STATUS_DELETE)
8006 int choice = GOT_PATCH_CHOICE_NONE;
8007 err = (*a->patch_cb)(&choice, a->patch_arg, status,
8008 ie->path, NULL, 1, 1);
8011 if (choice == GOT_PATCH_CHOICE_NO)
8013 if (choice != GOT_PATCH_CHOICE_YES) {
8014 err = got_error(GOT_ERR_PATCH_CHOICE);
8018 stage = GOT_FILEIDX_STAGE_DELETE;
8019 got_fileindex_entry_stage_set(ie, stage);
8020 a->staged_something = 1;
8021 if (a->status_cb == NULL)
8023 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8024 get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8027 case GOT_STATUS_NO_CHANGE:
8029 case GOT_STATUS_CONFLICT:
8030 err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8032 case GOT_STATUS_NONEXISTENT:
8033 err = got_error_set_errno(ENOENT, relpath);
8036 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8040 if (path_content && unlink(path_content) == -1 && err == NULL)
8041 err = got_error_from_errno2("unlink", path_content);
8044 free(new_staged_blob_id);
8048 const struct got_error *
8049 got_worktree_stage(struct got_worktree *worktree,
8050 struct got_pathlist_head *paths,
8051 got_worktree_status_cb status_cb, void *status_arg,
8052 got_worktree_patch_cb patch_cb, void *patch_arg,
8053 int allow_bad_symlinks, struct got_repository *repo)
8055 const struct got_error *err = NULL, *sync_err, *unlockerr;
8056 struct got_pathlist_entry *pe;
8057 struct got_fileindex *fileindex = NULL;
8058 char *fileindex_path = NULL;
8059 struct got_reference *head_ref = NULL;
8060 struct got_object_id *head_commit_id = NULL;
8061 struct check_stage_ok_arg oka;
8062 struct stage_path_arg spa;
8064 err = lock_worktree(worktree, LOCK_EX);
8068 err = got_ref_open(&head_ref, repo,
8069 got_worktree_get_head_ref_name(worktree), 0);
8072 err = got_ref_resolve(&head_commit_id, repo, head_ref);
8075 err = open_fileindex(&fileindex, &fileindex_path, worktree);
8079 /* Check pre-conditions before staging anything. */
8080 oka.head_commit_id = head_commit_id;
8081 oka.worktree = worktree;
8082 oka.fileindex = fileindex;
8084 oka.have_changes = 0;
8085 TAILQ_FOREACH(pe, paths, entry) {
8086 err = worktree_status(worktree, pe->path, fileindex, repo,
8087 check_stage_ok, &oka, NULL, NULL, 1, 0);
8091 if (!oka.have_changes) {
8092 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8096 spa.worktree = worktree;
8097 spa.fileindex = fileindex;
8099 spa.patch_cb = patch_cb;
8100 spa.patch_arg = patch_arg;
8101 spa.status_cb = status_cb;
8102 spa.status_arg = status_arg;
8103 spa.staged_something = 0;
8104 spa.allow_bad_symlinks = allow_bad_symlinks;
8105 TAILQ_FOREACH(pe, paths, entry) {
8106 err = worktree_status(worktree, pe->path, fileindex, repo,
8107 stage_path, &spa, NULL, NULL, 1, 0);
8111 if (!spa.staged_something) {
8112 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8116 sync_err = sync_fileindex(fileindex, fileindex_path);
8117 if (sync_err && err == NULL)
8121 got_ref_close(head_ref);
8122 free(head_commit_id);
8123 free(fileindex_path);
8125 got_fileindex_free(fileindex);
8126 unlockerr = lock_worktree(worktree, LOCK_SH);
8127 if (unlockerr && err == NULL)
8132 struct unstage_path_arg {
8133 struct got_worktree *worktree;
8134 struct got_fileindex *fileindex;
8135 struct got_repository *repo;
8136 got_worktree_checkout_cb progress_cb;
8138 got_worktree_patch_cb patch_cb;
8142 static const struct got_error *
8143 create_unstaged_content(char **path_unstaged_content,
8144 char **path_new_staged_content, struct got_object_id *blob_id,
8145 struct got_object_id *staged_blob_id, const char *relpath,
8146 struct got_repository *repo,
8147 got_worktree_patch_cb patch_cb, void *patch_arg)
8149 const struct got_error *err, *free_err;
8150 struct got_blob_object *blob = NULL, *staged_blob = NULL;
8151 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8152 char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8153 struct got_diffreg_result *diffreg_result = NULL;
8154 int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8155 int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8157 *path_unstaged_content = NULL;
8158 *path_new_staged_content = NULL;
8160 err = got_object_id_str(&label1, blob_id);
8163 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
8167 err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8171 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8175 err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
8179 err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8183 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8187 err = got_diff_files(&diffreg_result, f1, label1, f2,
8188 path2, 3, 0, 1, NULL);
8192 err = got_opentemp_named(path_unstaged_content, &outfile,
8193 "got-unstaged-content");
8196 err = got_opentemp_named(path_new_staged_content, &rejectfile,
8197 "got-new-staged-content");
8201 if (fseek(f1, 0L, SEEK_SET) == -1) {
8202 err = got_ferror(f1, GOT_ERR_IO);
8205 if (fseek(f2, 0L, SEEK_SET) == -1) {
8206 err = got_ferror(f2, GOT_ERR_IO);
8209 /* Count the number of actual changes in the diff result. */
8210 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8211 struct diff_chunk_context cc = {};
8212 diff_chunk_context_load_change(&cc, &nchunks_used,
8213 diffreg_result->result, n, 0);
8216 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8218 err = apply_or_reject_change(&choice, &nchunks_used,
8219 diffreg_result->result, n, relpath, f1, f2,
8220 &line_cur1, &line_cur2,
8221 outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8224 if (choice == GOT_PATCH_CHOICE_YES)
8227 have_rejected_content = 1;
8228 if (choice == GOT_PATCH_CHOICE_QUIT)
8231 if (have_content || have_rejected_content)
8232 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8233 outfile, rejectfile);
8237 got_object_blob_close(blob);
8239 got_object_blob_close(staged_blob);
8240 free_err = got_diffreg_result_free(diffreg_result);
8241 if (free_err && err == NULL)
8243 if (f1 && fclose(f1) == EOF && err == NULL)
8244 err = got_error_from_errno2("fclose", path1);
8245 if (f2 && fclose(f2) == EOF && err == NULL)
8246 err = got_error_from_errno2("fclose", path2);
8247 if (outfile && fclose(outfile) == EOF && err == NULL)
8248 err = got_error_from_errno2("fclose", *path_unstaged_content);
8249 if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8250 err = got_error_from_errno2("fclose", *path_new_staged_content);
8251 if (path1 && unlink(path1) == -1 && err == NULL)
8252 err = got_error_from_errno2("unlink", path1);
8253 if (path2 && unlink(path2) == -1 && err == NULL)
8254 err = got_error_from_errno2("unlink", path2);
8255 if (err || !have_content) {
8256 if (*path_unstaged_content &&
8257 unlink(*path_unstaged_content) == -1 && err == NULL)
8258 err = got_error_from_errno2("unlink",
8259 *path_unstaged_content);
8260 free(*path_unstaged_content);
8261 *path_unstaged_content = NULL;
8263 if (err || !have_content || !have_rejected_content) {
8264 if (*path_new_staged_content &&
8265 unlink(*path_new_staged_content) == -1 && err == NULL)
8266 err = got_error_from_errno2("unlink",
8267 *path_new_staged_content);
8268 free(*path_new_staged_content);
8269 *path_new_staged_content = NULL;
8276 static const struct got_error *
8277 unstage_hunks(struct got_object_id *staged_blob_id,
8278 struct got_blob_object *blob_base,
8279 struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8280 const char *ondisk_path, const char *label_orig,
8281 struct got_worktree *worktree, struct got_repository *repo,
8282 got_worktree_patch_cb patch_cb, void *patch_arg,
8283 got_worktree_checkout_cb progress_cb, void *progress_arg)
8285 const struct got_error *err = NULL;
8286 char *path_unstaged_content = NULL;
8287 char *path_new_staged_content = NULL;
8288 char *parent = NULL, *base_path = NULL;
8289 char *blob_base_path = NULL;
8290 struct got_object_id *new_staged_blob_id = NULL;
8291 FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8294 err = create_unstaged_content(&path_unstaged_content,
8295 &path_new_staged_content, blob_id, staged_blob_id,
8296 ie->path, repo, patch_cb, patch_arg);
8300 if (path_unstaged_content == NULL)
8303 if (path_new_staged_content) {
8304 err = got_object_blob_create(&new_staged_blob_id,
8305 path_new_staged_content, repo);
8310 f = fopen(path_unstaged_content, "re");
8312 err = got_error_from_errno2("fopen",
8313 path_unstaged_content);
8316 if (fstat(fileno(f), &sb) == -1) {
8317 err = got_error_from_errno2("fstat", path_unstaged_content);
8320 if (got_fileindex_entry_staged_filetype_get(ie) ==
8321 GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8322 char link_target[PATH_MAX];
8324 r = fread(link_target, 1, sizeof(link_target), f);
8325 if (r == 0 && ferror(f)) {
8326 err = got_error_from_errno("fread");
8329 if (r >= sizeof(link_target)) { /* should not happen */
8330 err = got_error(GOT_ERR_NO_SPACE);
8333 link_target[r] = '\0';
8334 err = merge_symlink(worktree, blob_base,
8335 ondisk_path, ie->path, label_orig, link_target,
8336 worktree->base_commit_id, repo, progress_cb,
8339 int local_changes_subsumed;
8341 err = got_path_dirname(&parent, ondisk_path);
8345 if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8347 err = got_error_from_errno("asprintf");
8352 err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8355 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8361 * In order the run a 3-way merge with a symlink we copy the symlink's
8362 * target path into a temporary file and use that file with diff3.
8364 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8365 err = dump_symlink_target_path_to_file(&f_deriv2,
8371 fd = open(ondisk_path,
8372 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8374 err = got_error_from_errno2("open", ondisk_path);
8377 f_deriv2 = fdopen(fd, "r");
8378 if (f_deriv2 == NULL) {
8379 err = got_error_from_errno2("fdopen", ondisk_path);
8385 err = merge_file(&local_changes_subsumed, worktree,
8386 f_base, f, f_deriv2, ondisk_path, ie->path,
8387 got_fileindex_perms_to_st(ie),
8388 label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8389 repo, progress_cb, progress_arg);
8394 if (new_staged_blob_id) {
8395 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8396 SHA1_DIGEST_LENGTH);
8398 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8399 got_fileindex_entry_staged_filetype_set(ie, 0);
8402 free(new_staged_blob_id);
8403 if (path_unstaged_content &&
8404 unlink(path_unstaged_content) == -1 && err == NULL)
8405 err = got_error_from_errno2("unlink", path_unstaged_content);
8406 if (path_new_staged_content &&
8407 unlink(path_new_staged_content) == -1 && err == NULL)
8408 err = got_error_from_errno2("unlink", path_new_staged_content);
8409 if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8410 err = got_error_from_errno2("unlink", blob_base_path);
8411 if (f_base && fclose(f_base) == EOF && err == NULL)
8412 err = got_error_from_errno2("fclose", path_unstaged_content);
8413 if (f && fclose(f) == EOF && err == NULL)
8414 err = got_error_from_errno2("fclose", path_unstaged_content);
8415 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8416 err = got_error_from_errno2("fclose", ondisk_path);
8417 free(path_unstaged_content);
8418 free(path_new_staged_content);
8419 free(blob_base_path);
8425 static const struct got_error *
8426 unstage_path(void *arg, unsigned char status,
8427 unsigned char staged_status, const char *relpath,
8428 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8429 struct got_object_id *commit_id, int dirfd, const char *de_name)
8431 const struct got_error *err = NULL;
8432 struct unstage_path_arg *a = arg;
8433 struct got_fileindex_entry *ie;
8434 struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8435 char *ondisk_path = NULL;
8436 char *id_str = NULL, *label_orig = NULL;
8437 int local_changes_subsumed;
8440 if (staged_status != GOT_STATUS_ADD &&
8441 staged_status != GOT_STATUS_MODIFY &&
8442 staged_status != GOT_STATUS_DELETE)
8445 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8447 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8449 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8451 return got_error_from_errno("asprintf");
8453 err = got_object_id_str(&id_str,
8454 commit_id ? commit_id : a->worktree->base_commit_id);
8457 if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8459 err = got_error_from_errno("asprintf");
8463 switch (staged_status) {
8464 case GOT_STATUS_MODIFY:
8465 err = got_object_open_as_blob(&blob_base, a->repo,
8470 case GOT_STATUS_ADD:
8472 if (staged_status == GOT_STATUS_ADD) {
8473 int choice = GOT_PATCH_CHOICE_NONE;
8474 err = (*a->patch_cb)(&choice, a->patch_arg,
8475 staged_status, ie->path, NULL, 1, 1);
8478 if (choice != GOT_PATCH_CHOICE_YES)
8481 err = unstage_hunks(staged_blob_id,
8482 blob_base, blob_id, ie, ondisk_path,
8483 label_orig, a->worktree, a->repo,
8484 a->patch_cb, a->patch_arg,
8485 a->progress_cb, a->progress_arg);
8486 break; /* Done with this file. */
8489 err = got_object_open_as_blob(&blob_staged, a->repo,
8490 staged_blob_id, 8192);
8493 switch (got_fileindex_entry_staged_filetype_get(ie)) {
8494 case GOT_FILEIDX_MODE_BAD_SYMLINK:
8495 case GOT_FILEIDX_MODE_REGULAR_FILE:
8496 err = merge_blob(&local_changes_subsumed, a->worktree,
8497 blob_base, ondisk_path, relpath,
8498 got_fileindex_perms_to_st(ie), label_orig,
8499 blob_staged, commit_id ? commit_id :
8500 a->worktree->base_commit_id, a->repo,
8501 a->progress_cb, a->progress_arg);
8503 case GOT_FILEIDX_MODE_SYMLINK:
8504 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8505 char *staged_target;
8506 err = got_object_blob_read_to_str(
8507 &staged_target, blob_staged);
8510 err = merge_symlink(a->worktree, blob_base,
8511 ondisk_path, relpath, label_orig,
8512 staged_target, commit_id ? commit_id :
8513 a->worktree->base_commit_id,
8514 a->repo, a->progress_cb, a->progress_arg);
8515 free(staged_target);
8517 err = merge_blob(&local_changes_subsumed,
8518 a->worktree, blob_base, ondisk_path,
8519 relpath, got_fileindex_perms_to_st(ie),
8520 label_orig, blob_staged,
8521 commit_id ? commit_id :
8522 a->worktree->base_commit_id, a->repo,
8523 a->progress_cb, a->progress_arg);
8527 err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8531 got_fileindex_entry_stage_set(ie,
8532 GOT_FILEIDX_STAGE_NONE);
8533 got_fileindex_entry_staged_filetype_set(ie, 0);
8536 case GOT_STATUS_DELETE:
8538 int choice = GOT_PATCH_CHOICE_NONE;
8539 err = (*a->patch_cb)(&choice, a->patch_arg,
8540 staged_status, ie->path, NULL, 1, 1);
8543 if (choice == GOT_PATCH_CHOICE_NO)
8545 if (choice != GOT_PATCH_CHOICE_YES) {
8546 err = got_error(GOT_ERR_PATCH_CHOICE);
8550 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8551 got_fileindex_entry_staged_filetype_set(ie, 0);
8552 err = get_file_status(&status, &sb, ie, ondisk_path,
8553 dirfd, de_name, a->repo);
8556 err = (*a->progress_cb)(a->progress_arg, status, relpath);
8562 got_object_blob_close(blob_base);
8564 got_object_blob_close(blob_staged);
8570 const struct got_error *
8571 got_worktree_unstage(struct got_worktree *worktree,
8572 struct got_pathlist_head *paths,
8573 got_worktree_checkout_cb progress_cb, void *progress_arg,
8574 got_worktree_patch_cb patch_cb, void *patch_arg,
8575 struct got_repository *repo)
8577 const struct got_error *err = NULL, *sync_err, *unlockerr;
8578 struct got_pathlist_entry *pe;
8579 struct got_fileindex *fileindex = NULL;
8580 char *fileindex_path = NULL;
8581 struct unstage_path_arg upa;
8583 err = lock_worktree(worktree, LOCK_EX);
8587 err = open_fileindex(&fileindex, &fileindex_path, worktree);
8591 upa.worktree = worktree;
8592 upa.fileindex = fileindex;
8594 upa.progress_cb = progress_cb;
8595 upa.progress_arg = progress_arg;
8596 upa.patch_cb = patch_cb;
8597 upa.patch_arg = patch_arg;
8598 TAILQ_FOREACH(pe, paths, entry) {
8599 err = worktree_status(worktree, pe->path, fileindex, repo,
8600 unstage_path, &upa, NULL, NULL, 1, 0);
8605 sync_err = sync_fileindex(fileindex, fileindex_path);
8606 if (sync_err && err == NULL)
8609 free(fileindex_path);
8611 got_fileindex_free(fileindex);
8612 unlockerr = lock_worktree(worktree, LOCK_SH);
8613 if (unlockerr && err == NULL)
8618 struct report_file_info_arg {
8619 struct got_worktree *worktree;
8620 got_worktree_path_info_cb info_cb;
8622 struct got_pathlist_head *paths;
8623 got_cancel_cb cancel_cb;
8627 static const struct got_error *
8628 report_file_info(void *arg, struct got_fileindex_entry *ie)
8630 struct report_file_info_arg *a = arg;
8631 struct got_pathlist_entry *pe;
8632 struct got_object_id blob_id, staged_blob_id, commit_id;
8633 struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8634 struct got_object_id *commit_idp = NULL;
8637 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8638 return got_error(GOT_ERR_CANCELLED);
8640 TAILQ_FOREACH(pe, a->paths, entry) {
8641 if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8642 got_path_is_child(ie->path, pe->path, pe->path_len))
8645 if (pe == NULL) /* not found */
8648 if (got_fileindex_entry_has_blob(ie)) {
8649 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8650 blob_idp = &blob_id;
8652 stage = got_fileindex_entry_stage_get(ie);
8653 if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8654 stage == GOT_FILEIDX_STAGE_ADD) {
8655 memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8656 SHA1_DIGEST_LENGTH);
8657 staged_blob_idp = &staged_blob_id;
8660 if (got_fileindex_entry_has_commit(ie)) {
8661 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8662 commit_idp = &commit_id;
8665 return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8666 (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8669 const struct got_error *
8670 got_worktree_path_info(struct got_worktree *worktree,
8671 struct got_pathlist_head *paths,
8672 got_worktree_path_info_cb info_cb, void *info_arg,
8673 got_cancel_cb cancel_cb, void *cancel_arg)
8676 const struct got_error *err = NULL, *unlockerr;
8677 struct got_fileindex *fileindex = NULL;
8678 char *fileindex_path = NULL;
8679 struct report_file_info_arg arg;
8681 err = lock_worktree(worktree, LOCK_SH);
8685 err = open_fileindex(&fileindex, &fileindex_path, worktree);
8689 arg.worktree = worktree;
8690 arg.info_cb = info_cb;
8691 arg.info_arg = info_arg;
8693 arg.cancel_cb = cancel_cb;
8694 arg.cancel_arg = cancel_arg;
8695 err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8698 free(fileindex_path);
8700 got_fileindex_free(fileindex);
8701 unlockerr = lock_worktree(worktree, LOCK_UN);
8702 if (unlockerr && err == NULL)