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 mode_t apply_umask(mode_t);
69 static const struct got_error *
70 create_meta_file(const char *path_got, const char *name, const char *content)
72 const struct got_error *err = NULL;
75 if (asprintf(&path, "%s/%s", path_got, name) == -1)
76 return got_error_from_errno("asprintf");
78 err = got_path_create_file(path, content);
83 static const struct got_error *
84 update_meta_file(const char *path_got, const char *name, const char *content)
86 const struct got_error *err = NULL;
91 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
92 err = got_error_from_errno("asprintf");
97 err = got_opentemp_named(&tmppath, &tmpfile, path, "");
102 int len = fprintf(tmpfile, "%s\n", content);
103 if (len != strlen(content) + 1) {
104 err = got_error_from_errno2("fprintf", tmppath);
109 if (rename(tmppath, path) != 0) {
110 err = got_error_from_errno3("rename", tmppath, path);
116 if (fclose(tmpfile) == EOF && err == NULL)
117 err = got_error_from_errno2("fclose", tmppath);
122 static const struct got_error *
123 write_head_ref(const char *path_got, struct got_reference *head_ref)
125 const struct got_error *err = NULL;
128 if (got_ref_is_symbolic(head_ref)) {
129 refstr = got_ref_to_str(head_ref);
131 return got_error_from_errno("got_ref_to_str");
133 refstr = strdup(got_ref_get_name(head_ref));
135 return got_error_from_errno("strdup");
137 err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
142 const struct got_error *
143 got_worktree_init(const char *path, struct got_reference *head_ref,
144 const char *prefix, struct got_repository *repo)
146 const struct got_error *err = NULL;
147 struct got_object_id *commit_id = NULL;
149 uint32_t uuid_status;
151 char *path_got = NULL;
152 char *formatstr = NULL;
153 char *absprefix = NULL;
154 char *basestr = NULL;
155 char *uuidstr = NULL;
157 if (strcmp(path, got_repo_get_path(repo)) == 0) {
158 err = got_error(GOT_ERR_WORKTREE_REPO);
162 err = got_ref_resolve(&commit_id, repo, head_ref);
165 err = got_object_get_type(&obj_type, repo, commit_id);
168 if (obj_type != GOT_OBJ_TYPE_COMMIT)
169 return got_error(GOT_ERR_OBJ_TYPE);
171 if (!got_path_is_absolute(prefix)) {
172 if (asprintf(&absprefix, "/%s", prefix) == -1)
173 return got_error_from_errno("asprintf");
176 /* Create top-level directory (may already exist). */
177 if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
178 err = got_error_from_errno2("mkdir", path);
182 /* Create .got directory (may already exist). */
183 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
184 err = got_error_from_errno("asprintf");
187 if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
188 err = got_error_from_errno2("mkdir", path_got);
192 /* Create an empty lock file. */
193 err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
197 /* Create an empty file index. */
198 err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
202 /* Write the HEAD reference. */
203 err = write_head_ref(path_got, head_ref);
207 /* Record our base commit. */
208 err = got_object_id_str(&basestr, commit_id);
211 err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
215 /* Store path to repository. */
216 err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
217 got_repo_get_path(repo));
221 /* Store in-repository path prefix. */
222 err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
223 absprefix ? absprefix : prefix);
228 uuid_create(&uuid, &uuid_status);
229 if (uuid_status != uuid_s_ok) {
230 err = got_error_uuid(uuid_status, "uuid_create");
233 uuid_to_string(&uuid, &uuidstr, &uuid_status);
234 if (uuid_status != uuid_s_ok) {
235 err = got_error_uuid(uuid_status, "uuid_to_string");
238 err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
242 /* Stamp work tree with format file. */
243 if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
244 err = got_error_from_errno("asprintf");
247 err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
261 const struct got_error *
262 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
263 const char *path_prefix)
265 char *absprefix = NULL;
267 if (!got_path_is_absolute(path_prefix)) {
268 if (asprintf(&absprefix, "/%s", path_prefix) == -1)
269 return got_error_from_errno("asprintf");
271 *match = (strcmp(absprefix ? absprefix : path_prefix,
272 worktree->path_prefix) == 0);
278 got_worktree_get_head_ref_name(struct got_worktree *worktree)
280 return worktree->head_ref_name;
283 const struct got_error *
284 got_worktree_set_head_ref(struct got_worktree *worktree,
285 struct got_reference *head_ref)
287 const struct got_error *err = NULL;
288 char *path_got = NULL, *head_ref_name = NULL;
290 if (asprintf(&path_got, "%s/%s", worktree->root_path,
291 GOT_WORKTREE_GOT_DIR) == -1) {
292 err = got_error_from_errno("asprintf");
297 head_ref_name = strdup(got_ref_get_name(head_ref));
298 if (head_ref_name == NULL) {
299 err = got_error_from_errno("strdup");
303 err = write_head_ref(path_got, head_ref);
307 free(worktree->head_ref_name);
308 worktree->head_ref_name = head_ref_name;
316 struct got_object_id *
317 got_worktree_get_base_commit_id(struct got_worktree *worktree)
319 return worktree->base_commit_id;
322 const struct got_error *
323 got_worktree_set_base_commit_id(struct got_worktree *worktree,
324 struct got_repository *repo, struct got_object_id *commit_id)
326 const struct got_error *err;
327 struct got_object *obj = NULL;
329 char *path_got = NULL;
331 if (asprintf(&path_got, "%s/%s", worktree->root_path,
332 GOT_WORKTREE_GOT_DIR) == -1) {
333 err = got_error_from_errno("asprintf");
338 err = got_object_open(&obj, repo, commit_id);
342 if (obj->type != GOT_OBJ_TYPE_COMMIT) {
343 err = got_error(GOT_ERR_OBJ_TYPE);
347 /* Record our base commit. */
348 err = got_object_id_str(&id_str, commit_id);
351 err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
355 free(worktree->base_commit_id);
356 worktree->base_commit_id = got_object_id_dup(commit_id);
357 if (worktree->base_commit_id == NULL) {
358 err = got_error_from_errno("got_object_id_dup");
363 got_object_close(obj);
369 const struct got_gotconfig *
370 got_worktree_get_gotconfig(struct got_worktree *worktree)
372 return worktree->gotconfig;
375 static const struct got_error *
376 lock_worktree(struct got_worktree *worktree, int operation)
378 if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
379 return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
380 : got_error_from_errno2("flock",
381 got_worktree_get_root_path(worktree)));
385 static const struct got_error *
386 add_dir_on_disk(struct got_worktree *worktree, const char *path)
388 const struct got_error *err = NULL;
391 if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
392 return got_error_from_errno("asprintf");
394 err = got_path_mkdir(abspath);
395 if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
398 if (lstat(abspath, &sb) == -1) {
399 err = got_error_from_errno2("lstat", abspath);
400 } else if (!S_ISDIR(sb.st_mode)) {
401 /* TODO directory is obstructed; do something */
402 err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
409 static const struct got_error *
410 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
412 const struct got_error *err = NULL;
415 size_t flen1 = 0, flen2 = 0;
420 flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
421 if (flen1 == 0 && ferror(f1)) {
422 err = got_error_from_errno("fread");
425 flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
426 if (flen2 == 0 && ferror(f2)) {
427 err = got_error_from_errno("fread");
434 } else if (flen2 == 0) {
438 } else if (flen1 == flen2) {
439 if (memcmp(fbuf1, fbuf2, flen2) != 0) {
452 static const struct got_error *
453 check_files_equal(int *same, FILE *f1, FILE *f2)
460 if (fstat(fileno(f1), &sb) != 0)
461 return got_error_from_errno("fstat");
464 if (fstat(fileno(f2), &sb) != 0)
465 return got_error_from_errno("fstat");
468 if (size1 != size2) {
473 if (fseek(f1, 0L, SEEK_SET) == -1)
474 return got_ferror(f1, GOT_ERR_IO);
475 if (fseek(f2, 0L, SEEK_SET) == -1)
476 return got_ferror(f2, GOT_ERR_IO);
478 return check_file_contents_equal(same, f1, f2);
481 static const struct got_error *
482 copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
490 if (fseek(f, 0L, SEEK_SET) == -1)
491 return got_ferror(f, GOT_ERR_IO);
494 flen = fread(fbuf, 1, sizeof(fbuf), f);
497 return got_error_from_errno("fread");
501 outlen = write(outfd, fbuf, flen);
503 return got_error_from_errno("write");
505 return got_error(GOT_ERR_IO);
512 static const struct got_error *
513 merge_binary_file(int *overlapcnt, int merged_fd,
514 FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
515 const char *label_deriv, const char *label_orig, const char *label_deriv2,
516 const char *ondisk_path)
518 const struct got_error *err = NULL;
519 int same_content, changed_deriv, changed_deriv2;
520 int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
521 off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
522 char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
523 char *base_path_orig = NULL, *base_path_deriv = NULL;
524 char *base_path_deriv2 = NULL;
528 err = check_files_equal(&same_content, f_deriv, f_deriv2);
533 return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
535 err = check_files_equal(&same_content, f_deriv, f_orig);
538 changed_deriv = !same_content;
539 err = check_files_equal(&same_content, f_deriv2, f_orig);
542 changed_deriv2 = !same_content;
544 if (changed_deriv && changed_deriv2) {
546 if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
547 err = got_error_from_errno("asprintf");
550 if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
551 err = got_error_from_errno("asprintf");
554 if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
555 err = got_error_from_errno("asprintf");
558 err = got_opentemp_named_fd(&path_orig, &fd_orig,
562 err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
563 base_path_deriv, "");
566 err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
567 base_path_deriv2, "");
570 err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
573 err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
576 err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
579 if (dprintf(merged_fd, "Binary files differ and cannot be "
580 "merged automatically:\n") < 0) {
581 err = got_error_from_errno("dprintf");
584 if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
585 GOT_DIFF_CONFLICT_MARKER_BEGIN,
586 label_deriv ? " " : "",
587 label_deriv ? label_deriv : "",
589 err = got_error_from_errno("dprintf");
593 if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
594 GOT_DIFF_CONFLICT_MARKER_ORIG,
595 label_orig ? " " : "",
596 label_orig ? label_orig : "",
598 err = got_error_from_errno("dprintf");
602 if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
603 GOT_DIFF_CONFLICT_MARKER_SEP,
605 GOT_DIFF_CONFLICT_MARKER_END,
606 label_deriv2 ? " " : "",
607 label_deriv2 ? label_deriv2 : "") < 0) {
608 err = got_error_from_errno("dprintf");
611 } else if (changed_deriv)
612 err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
613 else if (changed_deriv2)
614 err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
616 if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
618 err = got_error_from_errno2("unlink", path_orig);
619 if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
620 err = got_error_from_errno2("close", path_orig);
621 if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
622 err = got_error_from_errno2("close", path_deriv);
623 if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
624 err = got_error_from_errno2("close", path_deriv2);
628 free(base_path_orig);
629 free(base_path_deriv);
630 free(base_path_deriv2);
635 * Perform a 3-way merge where the file f_orig acts as the common
636 * ancestor, the file f_deriv acts as the first derived version,
637 * and the file f_deriv2 acts as the second derived version.
638 * The merge result will be written to a new file at ondisk_path; any
639 * existing file at this path will be replaced.
641 static const struct got_error *
642 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
643 FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
644 const char *path, uint16_t st_mode,
645 const char *label_orig, const char *label_deriv, const char *label_deriv2,
646 enum got_diff_algorithm diff_algo, struct got_repository *repo,
647 got_worktree_checkout_cb progress_cb, void *progress_arg)
649 const struct got_error *err = NULL;
651 FILE *f_merged = NULL;
652 char *merged_path = NULL, *base_path = NULL;
656 *local_changes_subsumed = 0;
658 err = got_path_dirname(&parent, ondisk_path);
662 if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
663 err = got_error_from_errno("asprintf");
667 err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path, "");
671 err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
672 f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
674 if (err->code != GOT_ERR_FILE_BINARY)
676 err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
677 f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
683 err = (*progress_cb)(progress_arg,
684 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
688 if (fsync(merged_fd) != 0) {
689 err = got_error_from_errno("fsync");
693 f_merged = fdopen(merged_fd, "r");
694 if (f_merged == NULL) {
695 err = got_error_from_errno("fdopen");
700 /* Check if a clean merge has subsumed all local changes. */
701 if (overlapcnt == 0) {
702 err = check_files_equal(local_changes_subsumed, f_deriv,
708 if (fchmod(fileno(f_merged), apply_umask(st_mode)) != 0) {
709 err = got_error_from_errno2("fchmod", merged_path);
713 if (rename(merged_path, ondisk_path) != 0) {
714 err = got_error_from_errno3("rename", merged_path,
723 if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
724 err = got_error_from_errno("close");
725 if (f_merged && fclose(f_merged) == EOF && err == NULL)
726 err = got_error_from_errno("fclose");
733 static const struct got_error *
734 update_symlink(const char *ondisk_path, const char *target_path,
737 /* This is not atomic but matches what 'ln -sf' does. */
738 if (unlink(ondisk_path) == -1)
739 return got_error_from_errno2("unlink", ondisk_path);
740 if (symlink(target_path, ondisk_path) == -1)
741 return got_error_from_errno3("symlink", target_path,
747 * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
748 * in the work tree with a file that contains conflict markers and the
749 * conflicting target paths of the original version, a "derived version"
750 * of a symlink from an incoming change, and a local version of the symlink.
752 * The original versions's target path can be NULL if it is not available,
753 * such as if both derived versions added a new symlink at the same path.
755 * The incoming derived symlink target is NULL in case the incoming change
756 * has deleted this symlink.
758 static const struct got_error *
759 install_symlink_conflict(const char *deriv_target,
760 struct got_object_id *deriv_base_commit_id, const char *orig_target,
761 const char *label_orig, const char *local_target, const char *ondisk_path)
763 const struct got_error *err;
764 char *id_str = NULL, *label_deriv = NULL, *path = NULL;
767 err = got_object_id_str(&id_str, deriv_base_commit_id);
769 return got_error_from_errno("asprintf");
771 if (asprintf(&label_deriv, "%s: commit %s",
772 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
773 err = got_error_from_errno("asprintf");
777 err = got_opentemp_named(&path, &f, "got-symlink-conflict", "");
781 if (fchmod(fileno(f), apply_umask(GOT_DEFAULT_FILE_MODE)) == -1) {
782 err = got_error_from_errno2("fchmod", path);
786 if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
787 GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
788 deriv_target ? deriv_target : "(symlink was deleted)",
789 orig_target ? label_orig : "",
790 orig_target ? "\n" : "",
791 orig_target ? orig_target : "",
792 orig_target ? "\n" : "",
793 GOT_DIFF_CONFLICT_MARKER_SEP,
794 local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
795 err = got_error_from_errno2("fprintf", path);
799 if (unlink(ondisk_path) == -1) {
800 err = got_error_from_errno2("unlink", ondisk_path);
803 if (rename(path, ondisk_path) == -1) {
804 err = got_error_from_errno3("rename", path, ondisk_path);
808 if (f != NULL && fclose(f) == EOF && err == NULL)
809 err = got_error_from_errno2("fclose", path);
816 /* forward declaration */
817 static const struct got_error *
818 merge_blob(int *, struct got_worktree *, struct got_blob_object *,
819 const char *, const char *, uint16_t, const char *,
820 struct got_blob_object *, struct got_object_id *,
821 struct got_repository *, got_worktree_checkout_cb, void *);
824 * Merge a symlink into the work tree, where blob_orig acts as the common
825 * ancestor, deriv_target is the link target of the first derived version,
826 * and the symlink on disk acts as the second derived version.
827 * Assume that contents of both blobs represent symlinks.
829 static const struct got_error *
830 merge_symlink(struct got_worktree *worktree,
831 struct got_blob_object *blob_orig, const char *ondisk_path,
832 const char *path, const char *label_orig, const char *deriv_target,
833 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
834 got_worktree_checkout_cb progress_cb, void *progress_arg)
836 const struct got_error *err = NULL;
837 char *ancestor_target = NULL;
839 ssize_t ondisk_len, deriv_len;
840 char ondisk_target[PATH_MAX];
841 int have_local_change = 0;
842 int have_incoming_change = 0;
844 if (lstat(ondisk_path, &sb) == -1)
845 return got_error_from_errno2("lstat", ondisk_path);
847 ondisk_len = readlink(ondisk_path, ondisk_target,
848 sizeof(ondisk_target));
849 if (ondisk_len == -1) {
850 err = got_error_from_errno2("readlink",
854 ondisk_target[ondisk_len] = '\0';
857 err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
862 if (ancestor_target == NULL ||
863 (ondisk_len != strlen(ancestor_target) ||
864 memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
865 have_local_change = 1;
867 deriv_len = strlen(deriv_target);
868 if (ancestor_target == NULL ||
869 (deriv_len != strlen(ancestor_target) ||
870 memcmp(deriv_target, ancestor_target, deriv_len) != 0))
871 have_incoming_change = 1;
873 if (!have_local_change && !have_incoming_change) {
874 if (ancestor_target) {
875 /* Both sides made the same change. */
876 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
878 } else if (deriv_len == ondisk_len &&
879 memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
880 /* Both sides added the same symlink. */
881 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
884 /* Both sides added symlinks which don't match. */
885 err = install_symlink_conflict(deriv_target,
886 deriv_base_commit_id, ancestor_target,
887 label_orig, ondisk_target, ondisk_path);
890 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
893 } else if (!have_local_change && have_incoming_change) {
894 /* Apply the incoming change. */
895 err = update_symlink(ondisk_path, deriv_target,
896 strlen(deriv_target));
899 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
900 } else if (have_local_change && have_incoming_change) {
901 if (deriv_len == ondisk_len &&
902 memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
903 /* Both sides made the same change. */
904 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
907 err = install_symlink_conflict(deriv_target,
908 deriv_base_commit_id, ancestor_target, label_orig,
909 ondisk_target, ondisk_path);
912 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
918 free(ancestor_target);
922 static const struct got_error *
923 dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
925 const struct got_error *err = NULL;
926 char target_path[PATH_MAX];
935 return got_error_from_errno("got_opentemp");
936 target_len = readlink(ondisk_path, target_path, sizeof(target_path));
937 if (target_len == -1) {
938 err = got_error_from_errno2("readlink", ondisk_path);
941 n = fwrite(target_path, 1, target_len, f);
942 if (n != target_len) {
943 err = got_ferror(f, GOT_ERR_IO);
946 if (fflush(f) == EOF) {
947 err = got_error_from_errno("fflush");
950 if (fseek(f, 0L, SEEK_SET) == -1) {
951 err = got_ferror(f, GOT_ERR_IO);
963 * Perform a 3-way merge where blob_orig acts as the common ancestor,
964 * blob_deriv acts as the first derived version, and the file on disk
965 * acts as the second derived version.
967 static const struct got_error *
968 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
969 struct got_blob_object *blob_orig, const char *ondisk_path,
970 const char *path, uint16_t st_mode, const char *label_orig,
971 struct got_blob_object *blob_deriv,
972 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
973 got_worktree_checkout_cb progress_cb, void *progress_arg)
975 const struct got_error *err = NULL;
976 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
977 char *blob_orig_path = NULL;
978 char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
979 char *label_deriv = NULL, *parent = NULL;
981 *local_changes_subsumed = 0;
983 err = got_path_dirname(&parent, ondisk_path);
988 if (asprintf(&base_path, "%s/got-merge-blob-orig",
990 err = got_error_from_errno("asprintf");
995 err = got_opentemp_named(&blob_orig_path, &f_orig,
999 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
1006 * No common ancestor exists. This is an "add vs add" conflict
1007 * and we simply use an empty ancestor file to make both files
1008 * appear in the merged result in their entirety.
1010 f_orig = got_opentemp();
1011 if (f_orig == NULL) {
1012 err = got_error_from_errno("got_opentemp");
1017 if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1018 err = got_error_from_errno("asprintf");
1023 err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path, "");
1026 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1031 err = got_object_id_str(&id_str, deriv_base_commit_id);
1034 if (asprintf(&label_deriv, "%s: commit %s",
1035 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1036 err = got_error_from_errno("asprintf");
1041 * In order the run a 3-way merge with a symlink we copy the symlink's
1042 * target path into a temporary file and use that file with diff3.
1044 if (S_ISLNK(st_mode)) {
1045 err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1050 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1052 err = got_error_from_errno2("open", ondisk_path);
1055 f_deriv2 = fdopen(fd, "r");
1056 if (f_deriv2 == NULL) {
1057 err = got_error_from_errno2("fdopen", ondisk_path);
1063 err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1064 f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1065 NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1067 if (f_orig && fclose(f_orig) == EOF && err == NULL)
1068 err = got_error_from_errno("fclose");
1069 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1070 err = got_error_from_errno("fclose");
1071 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1072 err = got_error_from_errno("fclose");
1074 if (blob_orig_path) {
1075 unlink(blob_orig_path);
1076 free(blob_orig_path);
1078 if (blob_deriv_path) {
1079 unlink(blob_deriv_path);
1080 free(blob_deriv_path);
1088 static const struct got_error *
1089 create_fileindex_entry(struct got_fileindex_entry **new_iep,
1090 struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1091 int wt_fd, const char *path, struct got_object_id *blob_id)
1093 const struct got_error *err = NULL;
1094 struct got_fileindex_entry *new_ie;
1098 err = got_fileindex_entry_alloc(&new_ie, path);
1102 err = got_fileindex_entry_update(new_ie, wt_fd, path,
1103 blob_id->sha1, base_commit_id->sha1, 1);
1107 err = got_fileindex_entry_add(fileindex, new_ie);
1110 got_fileindex_entry_free(new_ie);
1117 get_ondisk_perms(int executable, mode_t st_mode)
1119 mode_t xbits = S_IXUSR;
1122 /* Map read bits to execute bits. */
1123 if (st_mode & S_IRGRP)
1125 if (st_mode & S_IROTH)
1127 return st_mode | xbits;
1134 apply_umask(mode_t mode)
1143 /* forward declaration */
1144 static const struct got_error *
1145 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1146 const char *path, mode_t te_mode, mode_t st_mode,
1147 struct got_blob_object *blob, int restoring_missing_file,
1148 int reverting_versioned_file, int installing_bad_symlink,
1149 int path_is_unversioned, struct got_repository *repo,
1150 got_worktree_checkout_cb progress_cb, void *progress_arg);
1153 * This function assumes that the provided symlink target points at a
1154 * safe location in the work tree!
1156 static const struct got_error *
1157 replace_existing_symlink(int *did_something, const char *ondisk_path,
1158 const char *target_path, size_t target_len)
1160 const struct got_error *err = NULL;
1162 char etarget[PATH_MAX];
1168 * "Bad" symlinks (those pointing outside the work tree or into the
1169 * .got directory) are installed in the work tree as a regular file
1170 * which contains the bad symlink target path.
1171 * The new symlink target has already been checked for safety by our
1172 * caller. If we can successfully open a regular file then we simply
1173 * replace this file with a symlink below.
1175 fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1177 if (!got_err_open_nofollow_on_symlink())
1178 return got_error_from_errno2("open", ondisk_path);
1180 /* We are updating an existing on-disk symlink. */
1181 elen = readlink(ondisk_path, etarget, sizeof(etarget));
1183 return got_error_from_errno2("readlink", ondisk_path);
1185 if (elen == target_len &&
1186 memcmp(etarget, target_path, target_len) == 0)
1187 return NULL; /* nothing to do */
1191 err = update_symlink(ondisk_path, target_path, target_len);
1192 if (fd != -1 && close(fd) == -1 && err == NULL)
1193 err = got_error_from_errno2("close", ondisk_path);
1197 static const struct got_error *
1198 is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1199 size_t target_len, const char *ondisk_path, const char *wtroot_path)
1201 const struct got_error *err = NULL;
1202 char canonpath[PATH_MAX];
1203 char *path_got = NULL;
1205 *is_bad_symlink = 0;
1207 if (target_len >= sizeof(canonpath)) {
1208 *is_bad_symlink = 1;
1213 * We do not use realpath(3) to resolve the symlink's target
1214 * path because we don't want to resolve symlinks recursively.
1215 * Instead we make the path absolute and then canonicalize it.
1216 * Relative symlink target lookup should begin at the directory
1217 * in which the blob object is being installed.
1219 if (!got_path_is_absolute(target_path)) {
1220 char *abspath, *parent;
1221 err = got_path_dirname(&parent, ondisk_path);
1224 if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1226 return got_error_from_errno("asprintf");
1229 if (strlen(abspath) >= sizeof(canonpath)) {
1230 err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1234 err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1239 err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1244 /* Only allow symlinks pointing at paths within the work tree. */
1245 if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1246 *is_bad_symlink = 1;
1250 /* Do not allow symlinks pointing into the .got directory. */
1251 if (asprintf(&path_got, "%s/%s", wtroot_path,
1252 GOT_WORKTREE_GOT_DIR) == -1)
1253 return got_error_from_errno("asprintf");
1254 if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1255 *is_bad_symlink = 1;
1261 static const struct got_error *
1262 install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1263 const char *ondisk_path, const char *path, struct got_blob_object *blob,
1264 int restoring_missing_file, int reverting_versioned_file,
1265 int path_is_unversioned, int allow_bad_symlinks,
1266 struct got_repository *repo,
1267 got_worktree_checkout_cb progress_cb, void *progress_arg)
1269 const struct got_error *err = NULL;
1270 char target_path[PATH_MAX];
1271 size_t len, target_len = 0;
1272 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1273 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1275 *is_bad_symlink = 0;
1278 * Blob object content specifies the target path of the link.
1279 * If a symbolic link cannot be installed we instead create
1280 * a regular file which contains the link target path stored
1281 * in the blob object.
1284 err = got_object_blob_read_block(&len, blob);
1288 if (len + target_len >= sizeof(target_path)) {
1289 /* Path too long; install as a regular file. */
1290 *is_bad_symlink = 1;
1291 got_object_blob_rewind(blob);
1292 return install_blob(worktree, ondisk_path, path,
1293 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1294 restoring_missing_file, reverting_versioned_file,
1295 1, path_is_unversioned, repo, progress_cb,
1299 /* Skip blob object header first time around. */
1300 memcpy(target_path + target_len, buf + hdrlen,
1302 target_len += len - hdrlen;
1306 target_path[target_len] = '\0';
1308 err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1309 ondisk_path, worktree->root_path);
1313 if (*is_bad_symlink && !allow_bad_symlinks) {
1314 /* install as a regular file */
1315 got_object_blob_rewind(blob);
1316 err = install_blob(worktree, ondisk_path, path,
1317 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1318 restoring_missing_file, reverting_versioned_file, 1,
1319 path_is_unversioned, repo, progress_cb, progress_arg);
1323 if (symlink(target_path, ondisk_path) == -1) {
1324 if (errno == EEXIST) {
1325 int symlink_replaced;
1326 if (path_is_unversioned) {
1327 err = (*progress_cb)(progress_arg,
1328 GOT_STATUS_UNVERSIONED, path);
1331 err = replace_existing_symlink(&symlink_replaced,
1332 ondisk_path, target_path, target_len);
1336 if (symlink_replaced) {
1337 err = (*progress_cb)(progress_arg,
1338 reverting_versioned_file ?
1340 GOT_STATUS_UPDATE, path);
1342 err = (*progress_cb)(progress_arg,
1343 GOT_STATUS_EXISTS, path);
1346 return err; /* Nothing else to do. */
1349 if (errno == ENOENT) {
1351 err = got_path_dirname(&parent, ondisk_path);
1354 err = add_dir_on_disk(worktree, parent);
1359 * Retry, and fall through to error handling
1360 * below if this second attempt fails.
1362 if (symlink(target_path, ondisk_path) != -1) {
1363 err = NULL; /* success */
1368 /* Handle errors from first or second creation attempt. */
1369 if (errno == ENAMETOOLONG) {
1370 /* bad target path; install as a regular file */
1371 *is_bad_symlink = 1;
1372 got_object_blob_rewind(blob);
1373 err = install_blob(worktree, ondisk_path, path,
1374 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1375 restoring_missing_file, reverting_versioned_file, 1,
1376 path_is_unversioned, repo,
1377 progress_cb, progress_arg);
1378 } else if (errno == ENOTDIR) {
1379 err = got_error_path(ondisk_path,
1380 GOT_ERR_FILE_OBSTRUCTED);
1382 err = got_error_from_errno3("symlink",
1383 target_path, ondisk_path);
1385 } else if (progress_cb)
1386 err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1387 GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1391 static const struct got_error *
1392 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1393 const char *path, mode_t te_mode, mode_t st_mode,
1394 struct got_blob_object *blob, int restoring_missing_file,
1395 int reverting_versioned_file, int installing_bad_symlink,
1396 int path_is_unversioned, struct got_repository *repo,
1397 got_worktree_checkout_cb progress_cb, void *progress_arg)
1399 const struct got_error *err = NULL;
1403 char *tmppath = NULL;
1406 mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1407 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1410 if (errno == ENOENT) {
1412 err = got_path_dirname(&parent, path);
1415 err = add_dir_on_disk(worktree, parent);
1419 fd = open(ondisk_path,
1420 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1423 return got_error_from_errno2("open",
1425 } else if (errno == EEXIST) {
1426 if (path_is_unversioned) {
1427 err = (*progress_cb)(progress_arg,
1428 GOT_STATUS_UNVERSIONED, path);
1431 if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1432 !S_ISREG(st_mode) && !installing_bad_symlink) {
1433 /* TODO file is obstructed; do something */
1434 err = got_error_path(ondisk_path,
1435 GOT_ERR_FILE_OBSTRUCTED);
1438 err = got_opentemp_named_fd(&tmppath, &fd,
1444 if (fchmod(fd, apply_umask(mode)) == -1) {
1445 err = got_error_from_errno2("fchmod",
1451 return got_error_from_errno2("open", ondisk_path);
1455 if (restoring_missing_file)
1456 err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1458 else if (reverting_versioned_file)
1459 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1462 err = (*progress_cb)(progress_arg,
1463 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1468 hdrlen = got_object_blob_get_hdrlen(blob);
1470 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1471 err = got_object_blob_read_block(&len, blob);
1475 /* Skip blob object header first time around. */
1476 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1478 err = got_error_from_errno("write");
1480 } else if (outlen != len - hdrlen) {
1481 err = got_error(GOT_ERR_IO);
1488 if (fsync(fd) != 0) {
1489 err = got_error_from_errno("fsync");
1494 if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1495 err = got_error_from_errno2("unlink", ondisk_path);
1498 if (rename(tmppath, ondisk_path) != 0) {
1499 err = got_error_from_errno3("rename", tmppath,
1508 if (fd != -1 && close(fd) == -1 && err == NULL)
1509 err = got_error_from_errno("close");
1510 if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1511 err = got_error_from_errno2("unlink", tmppath);
1516 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1517 static const struct got_error *
1518 get_modified_file_content_status(unsigned char *status, FILE *f)
1520 const struct got_error *err = NULL;
1521 const char *markers[3] = {
1522 GOT_DIFF_CONFLICT_MARKER_BEGIN,
1523 GOT_DIFF_CONFLICT_MARKER_SEP,
1524 GOT_DIFF_CONFLICT_MARKER_END
1528 size_t linesize = 0;
1531 while (*status == GOT_STATUS_MODIFY) {
1532 linelen = getline(&line, &linesize, f);
1533 if (linelen == -1) {
1536 err = got_ferror(f, GOT_ERR_IO);
1540 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1541 if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1543 *status = GOT_STATUS_CONFLICT;
1554 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1556 mode_t ie_mode = got_fileindex_perms_to_st(ie);
1557 return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1561 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1563 return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1564 ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1565 ie->mtime_sec == sb->st_mtim.tv_sec &&
1566 ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1567 ie->size == (sb->st_size & 0xffffffff) &&
1568 !xbit_differs(ie, sb->st_mode));
1571 static unsigned char
1572 get_staged_status(struct got_fileindex_entry *ie)
1574 switch (got_fileindex_entry_stage_get(ie)) {
1575 case GOT_FILEIDX_STAGE_ADD:
1576 return GOT_STATUS_ADD;
1577 case GOT_FILEIDX_STAGE_DELETE:
1578 return GOT_STATUS_DELETE;
1579 case GOT_FILEIDX_STAGE_MODIFY:
1580 return GOT_STATUS_MODIFY;
1582 return GOT_STATUS_NO_CHANGE;
1586 static const struct got_error *
1587 get_symlink_modification_status(unsigned char *status,
1588 struct got_fileindex_entry *ie, const char *abspath,
1589 int dirfd, const char *de_name, struct got_blob_object *blob)
1591 const struct got_error *err = NULL;
1592 char target_path[PATH_MAX];
1593 char etarget[PATH_MAX];
1595 size_t len, target_len = 0;
1596 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1597 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1599 *status = GOT_STATUS_NO_CHANGE;
1601 /* Blob object content specifies the target path of the link. */
1603 err = got_object_blob_read_block(&len, blob);
1606 if (len + target_len >= sizeof(target_path)) {
1608 * Should not happen. The blob contents were OK
1609 * when this symlink was installed.
1611 return got_error(GOT_ERR_NO_SPACE);
1614 /* Skip blob object header first time around. */
1615 memcpy(target_path + target_len, buf + hdrlen,
1617 target_len += len - hdrlen;
1621 target_path[target_len] = '\0';
1624 elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1626 return got_error_from_errno2("readlinkat", abspath);
1628 elen = readlink(abspath, etarget, sizeof(etarget));
1630 return got_error_from_errno2("readlink", abspath);
1633 if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1634 *status = GOT_STATUS_MODIFY;
1639 static const struct got_error *
1640 get_file_status(unsigned char *status, struct stat *sb,
1641 struct got_fileindex_entry *ie, const char *abspath,
1642 int dirfd, const char *de_name, struct got_repository *repo)
1644 const struct got_error *err = NULL;
1645 struct got_object_id id;
1647 int fd = -1, fd1 = -1;
1650 struct got_blob_object *blob = NULL;
1652 unsigned char staged_status = get_staged_status(ie);
1654 *status = GOT_STATUS_NO_CHANGE;
1655 memset(sb, 0, sizeof(*sb));
1658 * Whenever the caller provides a directory descriptor and a
1659 * directory entry name for the file, use them! This prevents
1660 * race conditions if filesystem paths change beneath our feet.
1663 if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1664 if (errno == ENOENT) {
1665 if (got_fileindex_entry_has_file_on_disk(ie))
1666 *status = GOT_STATUS_MISSING;
1668 *status = GOT_STATUS_DELETE;
1671 err = got_error_from_errno2("fstatat", abspath);
1675 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1676 if (fd == -1 && errno != ENOENT &&
1677 !got_err_open_nofollow_on_symlink())
1678 return got_error_from_errno2("open", abspath);
1679 else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1680 if (lstat(abspath, sb) == -1)
1681 return got_error_from_errno2("lstat", abspath);
1682 } else if (fd == -1 || fstat(fd, sb) == -1) {
1683 if (errno == ENOENT) {
1684 if (got_fileindex_entry_has_file_on_disk(ie))
1685 *status = GOT_STATUS_MISSING;
1687 *status = GOT_STATUS_DELETE;
1690 err = got_error_from_errno2("fstat", abspath);
1695 if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1696 *status = GOT_STATUS_OBSTRUCTED;
1700 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1701 *status = GOT_STATUS_DELETE;
1703 } else if (!got_fileindex_entry_has_blob(ie) &&
1704 staged_status != GOT_STATUS_ADD) {
1705 *status = GOT_STATUS_ADD;
1709 if (!stat_info_differs(ie, sb))
1712 if (S_ISLNK(sb->st_mode) &&
1713 got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1714 *status = GOT_STATUS_MODIFY;
1718 if (staged_status == GOT_STATUS_MODIFY ||
1719 staged_status == GOT_STATUS_ADD)
1720 got_fileindex_entry_get_staged_blob_id(&id, ie);
1722 got_fileindex_entry_get_blob_id(&id, ie);
1724 fd1 = got_opentempfd();
1726 err = got_error_from_errno("got_opentempfd");
1729 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1733 if (S_ISLNK(sb->st_mode)) {
1734 err = get_symlink_modification_status(status, ie,
1735 abspath, dirfd, de_name, blob);
1740 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1742 err = got_error_from_errno2("openat", abspath);
1747 f = fdopen(fd, "r");
1749 err = got_error_from_errno2("fdopen", abspath);
1753 hdrlen = got_object_blob_get_hdrlen(blob);
1755 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1756 err = got_object_blob_read_block(&blen, blob);
1759 /* Skip length of blob object header first time around. */
1760 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1761 if (flen == 0 && ferror(f)) {
1762 err = got_error_from_errno("fread");
1765 if (blen - hdrlen == 0) {
1767 *status = GOT_STATUS_MODIFY;
1769 } else if (flen == 0) {
1770 if (blen - hdrlen != 0)
1771 *status = GOT_STATUS_MODIFY;
1773 } else if (blen - hdrlen == flen) {
1774 /* Skip blob object header first time around. */
1775 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1776 *status = GOT_STATUS_MODIFY;
1780 *status = GOT_STATUS_MODIFY;
1786 if (*status == GOT_STATUS_MODIFY) {
1788 err = get_modified_file_content_status(status, f);
1789 } else if (xbit_differs(ie, sb->st_mode))
1790 *status = GOT_STATUS_MODE_CHANGE;
1792 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1793 err = got_error_from_errno("close");
1795 got_object_blob_close(blob);
1796 if (f != NULL && fclose(f) == EOF && err == NULL)
1797 err = got_error_from_errno2("fclose", abspath);
1798 if (fd != -1 && close(fd) == -1 && err == NULL)
1799 err = got_error_from_errno2("close", abspath);
1804 * Update timestamps in the file index if a file is unmodified and
1805 * we had to run a full content comparison to find out.
1807 static const struct got_error *
1808 sync_timestamps(int wt_fd, const char *path, unsigned char status,
1809 struct got_fileindex_entry *ie, struct stat *sb)
1811 if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1812 return got_fileindex_entry_update(ie, wt_fd, path,
1813 ie->blob_sha1, ie->commit_sha1, 1);
1818 static const struct got_error *
1819 update_blob(struct got_worktree *worktree,
1820 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1821 struct got_tree_entry *te, const char *path,
1822 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1825 const struct got_error *err = NULL;
1826 struct got_blob_object *blob = NULL;
1827 char *ondisk_path = NULL;
1828 unsigned char status = GOT_STATUS_NO_CHANGE;
1830 int fd1 = -1, fd2 = -1;
1832 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1833 return got_error_from_errno("asprintf");
1836 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1837 err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1840 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1844 if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1845 sb.st_mode = got_fileindex_perms_to_st(ie);
1847 if (stat(ondisk_path, &sb) == -1) {
1848 if (errno != ENOENT) {
1849 err = got_error_from_errno2("stat",
1853 sb.st_mode = GOT_DEFAULT_FILE_MODE;
1854 status = GOT_STATUS_UNVERSIONED;
1856 if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1857 status = GOT_STATUS_UNVERSIONED;
1859 status = GOT_STATUS_OBSTRUCTED;
1863 if (status == GOT_STATUS_OBSTRUCTED) {
1865 got_fileindex_entry_mark_skipped(ie);
1866 err = (*progress_cb)(progress_arg, status, path);
1869 if (status == GOT_STATUS_CONFLICT) {
1871 got_fileindex_entry_mark_skipped(ie);
1872 err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1877 if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1878 (S_ISLNK(te->mode) ||
1879 (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1881 * This is a regular file or an installed bad symlink.
1882 * If the file index indicates that this file is already
1883 * up-to-date with respect to the repository we can skip
1884 * updating contents of this file.
1886 if (got_fileindex_entry_has_commit(ie) &&
1887 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1888 SHA1_DIGEST_LENGTH) == 0) {
1890 err = sync_timestamps(worktree->root_fd,
1891 path, status, ie, &sb);
1894 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1898 if (got_fileindex_entry_has_blob(ie) &&
1899 memcmp(ie->blob_sha1, te->id.sha1,
1900 SHA1_DIGEST_LENGTH) == 0) {
1901 /* Different commit but the same blob. */
1902 err = sync_timestamps(worktree->root_fd,
1903 path, status, ie, &sb);
1906 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1912 fd1 = got_opentempfd();
1914 err = got_error_from_errno("got_opentempfd");
1917 err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1921 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1922 int update_timestamps;
1923 struct got_blob_object *blob2 = NULL;
1924 char *label_orig = NULL;
1925 if (got_fileindex_entry_has_blob(ie)) {
1926 fd2 = got_opentempfd();
1928 err = got_error_from_errno("got_opentempfd");
1931 struct got_object_id id2;
1932 got_fileindex_entry_get_blob_id(&id2, ie);
1933 err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
1938 if (got_fileindex_entry_has_commit(ie)) {
1939 char id_str[SHA1_DIGEST_STRING_LENGTH];
1940 if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1941 sizeof(id_str)) == NULL) {
1942 err = got_error_path(id_str,
1943 GOT_ERR_BAD_OBJ_ID_STR);
1946 if (asprintf(&label_orig, "%s: commit %s",
1947 GOT_MERGE_LABEL_BASE, id_str) == -1) {
1948 err = got_error_from_errno("asprintf");
1952 if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1954 err = got_object_blob_read_to_str(&link_target, blob);
1957 err = merge_symlink(worktree, blob2, ondisk_path, path,
1958 label_orig, link_target, worktree->base_commit_id,
1959 repo, progress_cb, progress_arg);
1962 err = merge_blob(&update_timestamps, worktree, blob2,
1963 ondisk_path, path, sb.st_mode, label_orig, blob,
1964 worktree->base_commit_id, repo,
1965 progress_cb, progress_arg);
1968 if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
1969 err = got_error_from_errno("close");
1973 got_object_blob_close(blob2);
1977 * Do not update timestamps of files with local changes.
1978 * Otherwise, a future status walk would treat them as
1979 * unmodified files again.
1981 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1982 blob->id.sha1, worktree->base_commit_id->sha1,
1984 } else if (status == GOT_STATUS_MODE_CHANGE) {
1985 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1986 blob->id.sha1, worktree->base_commit_id->sha1, 0);
1987 } else if (status == GOT_STATUS_DELETE) {
1988 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1991 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1992 blob->id.sha1, worktree->base_commit_id->sha1, 0);
1996 int is_bad_symlink = 0;
1997 if (S_ISLNK(te->mode)) {
1998 err = install_symlink(&is_bad_symlink, worktree,
1999 ondisk_path, path, blob,
2000 status == GOT_STATUS_MISSING, 0,
2001 status == GOT_STATUS_UNVERSIONED, 0,
2002 repo, progress_cb, progress_arg);
2004 err = install_blob(worktree, ondisk_path, path,
2005 te->mode, sb.st_mode, blob,
2006 status == GOT_STATUS_MISSING, 0, 0,
2007 status == GOT_STATUS_UNVERSIONED, repo,
2008 progress_cb, progress_arg);
2014 err = got_fileindex_entry_update(ie,
2015 worktree->root_fd, path, blob->id.sha1,
2016 worktree->base_commit_id->sha1, 1);
2018 err = create_fileindex_entry(&ie, fileindex,
2019 worktree->base_commit_id, worktree->root_fd, path,
2025 if (is_bad_symlink) {
2026 got_fileindex_entry_filetype_set(ie,
2027 GOT_FILEIDX_MODE_BAD_SYMLINK);
2031 if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2032 err = got_error_from_errno("close");
2035 got_object_blob_close(blob);
2041 static const struct got_error *
2042 remove_ondisk_file(const char *root_path, const char *path)
2044 const struct got_error *err = NULL;
2045 char *ondisk_path = NULL, *parent = NULL;
2047 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2048 return got_error_from_errno("asprintf");
2050 if (unlink(ondisk_path) == -1) {
2051 if (errno != ENOENT)
2052 err = got_error_from_errno2("unlink", ondisk_path);
2054 size_t root_len = strlen(root_path);
2055 err = got_path_dirname(&parent, ondisk_path);
2058 while (got_path_cmp(parent, root_path,
2059 strlen(parent), root_len) != 0) {
2061 ondisk_path = parent;
2063 if (rmdir(ondisk_path) == -1) {
2064 if (errno != ENOTEMPTY)
2065 err = got_error_from_errno2("rmdir",
2069 err = got_path_dirname(&parent, ondisk_path);
2080 static const struct got_error *
2081 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2082 struct got_fileindex_entry *ie, struct got_repository *repo,
2083 got_worktree_checkout_cb progress_cb, void *progress_arg)
2085 const struct got_error *err = NULL;
2086 unsigned char status;
2090 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2091 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2093 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2095 return got_error_from_errno("asprintf");
2097 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2101 if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2102 char ondisk_target[PATH_MAX];
2103 ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2104 sizeof(ondisk_target));
2105 if (ondisk_len == -1) {
2106 err = got_error_from_errno2("readlink", ondisk_path);
2109 ondisk_target[ondisk_len] = '\0';
2110 err = install_symlink_conflict(NULL, worktree->base_commit_id,
2111 NULL, NULL, /* XXX pass common ancestor info? */
2112 ondisk_target, ondisk_path);
2115 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2120 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2121 status == GOT_STATUS_ADD) {
2122 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2126 * Preserve the working file and change the deleted blob's
2127 * entry into a schedule-add entry.
2129 err = got_fileindex_entry_update(ie, worktree->root_fd,
2130 ie->path, NULL, NULL, 0);
2132 err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2135 if (status == GOT_STATUS_NO_CHANGE) {
2136 err = remove_ondisk_file(worktree->root_path, ie->path);
2140 got_fileindex_entry_remove(fileindex, ie);
2147 struct diff_cb_arg {
2148 struct got_fileindex *fileindex;
2149 struct got_worktree *worktree;
2150 struct got_repository *repo;
2151 got_worktree_checkout_cb progress_cb;
2153 got_cancel_cb cancel_cb;
2157 static const struct got_error *
2158 diff_old_new(void *arg, struct got_fileindex_entry *ie,
2159 struct got_tree_entry *te, const char *parent_path)
2161 struct diff_cb_arg *a = arg;
2163 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2164 return got_error(GOT_ERR_CANCELLED);
2166 return update_blob(a->worktree, a->fileindex, ie, te,
2167 ie->path, a->repo, a->progress_cb, a->progress_arg);
2170 static const struct got_error *
2171 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2173 struct diff_cb_arg *a = arg;
2175 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2176 return got_error(GOT_ERR_CANCELLED);
2178 return delete_blob(a->worktree, a->fileindex, ie,
2179 a->repo, a->progress_cb, a->progress_arg);
2182 static const struct got_error *
2183 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2185 struct diff_cb_arg *a = arg;
2186 const struct got_error *err;
2189 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2190 return got_error(GOT_ERR_CANCELLED);
2192 if (got_object_tree_entry_is_submodule(te))
2195 if (asprintf(&path, "%s%s%s", parent_path,
2196 parent_path[0] ? "/" : "", te->name)
2198 return got_error_from_errno("asprintf");
2200 if (S_ISDIR(te->mode))
2201 err = add_dir_on_disk(a->worktree, path);
2203 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2204 a->repo, a->progress_cb, a->progress_arg);
2210 const struct got_error *
2211 got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2213 uint32_t uuid_status;
2215 uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2216 if (uuid_status != uuid_s_ok) {
2218 return got_error_uuid(uuid_status, "uuid_to_string");
2224 static const struct got_error *
2225 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2227 const struct got_error *err = NULL;
2228 char *uuidstr = NULL;
2232 err = got_worktree_get_uuid(&uuidstr, worktree);
2236 if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2237 err = got_error_from_errno("asprintf");
2244 const struct got_error *
2245 got_worktree_get_logmsg_ref_name(char **refname, struct got_worktree *worktree,
2248 return get_ref_name(refname, worktree, prefix);
2251 const struct got_error *
2252 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2254 return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2257 static const struct got_error *
2258 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2260 return get_ref_name(refname, worktree,
2261 GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2264 static const struct got_error *
2265 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2267 return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2270 static const struct got_error *
2271 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2273 return get_ref_name(refname, worktree,
2274 GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2277 static const struct got_error *
2278 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2280 return get_ref_name(refname, worktree,
2281 GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2284 static const struct got_error *
2285 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2287 return get_ref_name(refname, worktree,
2288 GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2291 static const struct got_error *
2292 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2294 return get_ref_name(refname, worktree,
2295 GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2298 static const struct got_error *
2299 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2301 return get_ref_name(refname, worktree,
2302 GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2305 static const struct got_error *
2306 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2308 return get_ref_name(refname, worktree,
2309 GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2312 const struct got_error *
2313 got_worktree_get_histedit_script_path(char **path,
2314 struct got_worktree *worktree)
2316 if (asprintf(path, "%s/%s/%s", worktree->root_path,
2317 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2319 return got_error_from_errno("asprintf");
2324 static const struct got_error *
2325 get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2327 return get_ref_name(refname, worktree,
2328 GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2331 static const struct got_error *
2332 get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2334 return get_ref_name(refname, worktree,
2335 GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2339 * Prevent Git's garbage collector from deleting our base commit by
2340 * setting a reference to our base commit's ID.
2342 static const struct got_error *
2343 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2345 const struct got_error *err = NULL;
2346 struct got_reference *ref = NULL;
2349 err = got_worktree_get_base_ref_name(&refname, worktree);
2353 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2357 err = got_ref_write(ref, repo);
2365 static const struct got_error *
2366 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2368 const struct got_error *err = NULL;
2370 if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2371 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2372 err = got_error_from_errno("asprintf");
2373 *fileindex_path = NULL;
2379 static const struct got_error *
2380 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2381 struct got_worktree *worktree)
2383 const struct got_error *err = NULL;
2386 *fileindex_path = NULL;
2387 *fileindex = got_fileindex_alloc();
2388 if (*fileindex == NULL)
2389 return got_error_from_errno("got_fileindex_alloc");
2391 err = get_fileindex_path(fileindex_path, worktree);
2395 index = fopen(*fileindex_path, "rbe");
2396 if (index == NULL) {
2397 if (errno != ENOENT)
2398 err = got_error_from_errno2("fopen", *fileindex_path);
2400 err = got_fileindex_read(*fileindex, index);
2401 if (fclose(index) == EOF && err == NULL)
2402 err = got_error_from_errno("fclose");
2406 free(*fileindex_path);
2407 *fileindex_path = NULL;
2408 got_fileindex_free(*fileindex);
2414 struct bump_base_commit_id_arg {
2415 struct got_object_id *base_commit_id;
2418 const char *entry_name;
2419 got_worktree_checkout_cb progress_cb;
2423 static const struct got_error *
2424 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2426 const struct got_error *err;
2427 struct bump_base_commit_id_arg *a = arg;
2429 if (a->entry_name) {
2430 if (strcmp(ie->path, a->path) != 0)
2432 } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2435 if (got_fileindex_entry_was_skipped(ie))
2438 if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2439 SHA1_DIGEST_LENGTH) == 0)
2442 if (a->progress_cb) {
2443 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2448 memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2452 /* Bump base commit ID of all files within an updated part of the work tree. */
2453 static const struct got_error *
2454 bump_base_commit_id_everywhere(struct got_worktree *worktree,
2455 struct got_fileindex *fileindex,
2456 got_worktree_checkout_cb progress_cb, void *progress_arg)
2458 struct bump_base_commit_id_arg bbc_arg;
2460 bbc_arg.base_commit_id = worktree->base_commit_id;
2461 bbc_arg.entry_name = NULL;
2463 bbc_arg.path_len = 0;
2464 bbc_arg.progress_cb = progress_cb;
2465 bbc_arg.progress_arg = progress_arg;
2467 return got_fileindex_for_each_entry_safe(fileindex,
2468 bump_base_commit_id, &bbc_arg);
2471 static const struct got_error *
2472 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2474 const struct got_error *err = NULL;
2475 char *new_fileindex_path = NULL;
2476 FILE *new_index = NULL;
2477 struct timespec timeout;
2479 err = got_opentemp_named(&new_fileindex_path, &new_index,
2480 fileindex_path, "");
2484 err = got_fileindex_write(fileindex, new_index);
2488 if (rename(new_fileindex_path, fileindex_path) != 0) {
2489 err = got_error_from_errno3("rename", new_fileindex_path,
2491 unlink(new_fileindex_path);
2495 * Sleep for a short amount of time to ensure that files modified after
2496 * this program exits have a different time stamp from the one which
2497 * was recorded in the file index.
2500 timeout.tv_nsec = 1;
2501 nanosleep(&timeout, NULL);
2505 free(new_fileindex_path);
2509 static const struct got_error *
2510 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2511 struct got_object_id **tree_id, const char *wt_relpath,
2512 struct got_commit_object *base_commit, struct got_worktree *worktree,
2513 struct got_repository *repo)
2515 const struct got_error *err = NULL;
2516 struct got_object_id *id = NULL;
2517 char *in_repo_path = NULL;
2518 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2520 *entry_type = GOT_OBJ_TYPE_ANY;
2521 *tree_relpath = NULL;
2524 if (wt_relpath[0] == '\0') {
2525 /* Check out all files within the work tree. */
2526 *entry_type = GOT_OBJ_TYPE_TREE;
2527 *tree_relpath = strdup("");
2528 if (*tree_relpath == NULL) {
2529 err = got_error_from_errno("strdup");
2532 err = got_object_id_by_path(tree_id, repo, base_commit,
2533 worktree->path_prefix);
2539 /* Check out a subset of files in the work tree. */
2541 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2542 is_root_wt ? "" : "/", wt_relpath) == -1) {
2543 err = got_error_from_errno("asprintf");
2547 err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2552 in_repo_path = NULL;
2554 err = got_object_get_type(entry_type, repo, id);
2558 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2559 /* Check out a single file. */
2560 if (strchr(wt_relpath, '/') == NULL) {
2561 /* Check out a single file in work tree's root dir. */
2562 in_repo_path = strdup(worktree->path_prefix);
2563 if (in_repo_path == NULL) {
2564 err = got_error_from_errno("strdup");
2567 *tree_relpath = strdup("");
2568 if (*tree_relpath == NULL) {
2569 err = got_error_from_errno("strdup");
2573 /* Check out a single file in a subdirectory. */
2574 err = got_path_dirname(tree_relpath, wt_relpath);
2577 if (asprintf(&in_repo_path, "%s%s%s",
2578 worktree->path_prefix, is_root_wt ? "" : "/",
2579 *tree_relpath) == -1) {
2580 err = got_error_from_errno("asprintf");
2584 err = got_object_id_by_path(tree_id, repo,
2585 base_commit, in_repo_path);
2587 /* Check out all files within a subdirectory. */
2588 *tree_id = got_object_id_dup(id);
2589 if (*tree_id == NULL) {
2590 err = got_error_from_errno("got_object_id_dup");
2593 *tree_relpath = strdup(wt_relpath);
2594 if (*tree_relpath == NULL) {
2595 err = got_error_from_errno("strdup");
2603 *entry_type = GOT_OBJ_TYPE_ANY;
2604 free(*tree_relpath);
2605 *tree_relpath = NULL;
2612 static const struct got_error *
2613 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2614 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2615 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2616 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2618 const struct got_error *err = NULL;
2619 struct got_commit_object *commit = NULL;
2620 struct got_tree_object *tree = NULL;
2621 struct got_fileindex_diff_tree_cb diff_cb;
2622 struct diff_cb_arg arg;
2624 err = ref_base_commit(worktree, repo);
2626 if (!(err->code == GOT_ERR_ERRNO &&
2627 (errno == EACCES || errno == EROFS)))
2629 err = (*progress_cb)(progress_arg,
2630 GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2635 err = got_object_open_as_commit(&commit, repo,
2636 worktree->base_commit_id);
2640 err = got_object_open_as_tree(&tree, repo, tree_id);
2645 got_object_tree_find_entry(tree, entry_name) == NULL) {
2646 err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2650 diff_cb.diff_old_new = diff_old_new;
2651 diff_cb.diff_old = diff_old;
2652 diff_cb.diff_new = diff_new;
2653 arg.fileindex = fileindex;
2654 arg.worktree = worktree;
2656 arg.progress_cb = progress_cb;
2657 arg.progress_arg = progress_arg;
2658 arg.cancel_cb = cancel_cb;
2659 arg.cancel_arg = cancel_arg;
2660 err = got_fileindex_diff_tree(fileindex, tree, relpath,
2661 entry_name, repo, &diff_cb, &arg);
2664 got_object_tree_close(tree);
2666 got_object_commit_close(commit);
2670 const struct got_error *
2671 got_worktree_checkout_files(struct got_worktree *worktree,
2672 struct got_pathlist_head *paths, struct got_repository *repo,
2673 got_worktree_checkout_cb progress_cb, void *progress_arg,
2674 got_cancel_cb cancel_cb, void *cancel_arg)
2676 const struct got_error *err = NULL, *sync_err, *unlockerr;
2677 struct got_commit_object *commit = NULL;
2678 struct got_tree_object *tree = NULL;
2679 struct got_fileindex *fileindex = NULL;
2680 char *fileindex_path = NULL;
2681 struct got_pathlist_entry *pe;
2682 struct tree_path_data {
2683 STAILQ_ENTRY(tree_path_data) entry;
2684 struct got_object_id *tree_id;
2689 STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2691 STAILQ_INIT(&tree_paths);
2693 err = lock_worktree(worktree, LOCK_EX);
2697 err = got_object_open_as_commit(&commit, repo,
2698 worktree->base_commit_id);
2702 /* Map all specified paths to in-repository trees. */
2703 TAILQ_FOREACH(pe, paths, entry) {
2704 tpd = malloc(sizeof(*tpd));
2706 err = got_error_from_errno("malloc");
2710 err = find_tree_entry_for_checkout(&tpd->entry_type,
2711 &tpd->relpath, &tpd->tree_id, pe->path, commit,
2718 if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2719 err = got_path_basename(&tpd->entry_name, pe->path);
2727 tpd->entry_name = NULL;
2729 STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2733 * Read the file index.
2734 * Checking out files is supposed to be an idempotent operation.
2735 * If the on-disk file index is incomplete we will try to complete it.
2737 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2741 tpd = STAILQ_FIRST(&tree_paths);
2742 TAILQ_FOREACH(pe, paths, entry) {
2743 struct bump_base_commit_id_arg bbc_arg;
2745 err = checkout_files(worktree, fileindex, tpd->relpath,
2746 tpd->tree_id, tpd->entry_name, repo,
2747 progress_cb, progress_arg, cancel_cb, cancel_arg);
2751 bbc_arg.base_commit_id = worktree->base_commit_id;
2752 bbc_arg.entry_name = tpd->entry_name;
2753 bbc_arg.path = pe->path;
2754 bbc_arg.path_len = pe->path_len;
2755 bbc_arg.progress_cb = progress_cb;
2756 bbc_arg.progress_arg = progress_arg;
2757 err = got_fileindex_for_each_entry_safe(fileindex,
2758 bump_base_commit_id, &bbc_arg);
2762 tpd = STAILQ_NEXT(tpd, entry);
2764 sync_err = sync_fileindex(fileindex, fileindex_path);
2765 if (sync_err && err == NULL)
2768 free(fileindex_path);
2770 got_object_tree_close(tree);
2772 got_object_commit_close(commit);
2774 got_fileindex_free(fileindex);
2775 while (!STAILQ_EMPTY(&tree_paths)) {
2776 tpd = STAILQ_FIRST(&tree_paths);
2777 STAILQ_REMOVE_HEAD(&tree_paths, entry);
2782 unlockerr = lock_worktree(worktree, LOCK_SH);
2783 if (unlockerr && err == NULL)
2788 struct merge_file_cb_arg {
2789 struct got_worktree *worktree;
2790 struct got_fileindex *fileindex;
2791 got_worktree_checkout_cb progress_cb;
2793 got_cancel_cb cancel_cb;
2795 const char *label_orig;
2796 struct got_object_id *commit_id2;
2797 int allow_bad_symlinks;
2800 static const struct got_error *
2801 merge_file_cb(void *arg, struct got_blob_object *blob1,
2802 struct got_blob_object *blob2, FILE *f1, FILE *f2,
2803 struct got_object_id *id1, struct got_object_id *id2,
2804 const char *path1, const char *path2,
2805 mode_t mode1, mode_t mode2, struct got_repository *repo)
2807 static const struct got_error *err = NULL;
2808 struct merge_file_cb_arg *a = arg;
2809 struct got_fileindex_entry *ie;
2810 char *ondisk_path = NULL;
2812 unsigned char status;
2813 int local_changes_subsumed;
2814 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2815 char *id_str = NULL, *label_deriv2 = NULL;
2817 if (blob1 && blob2) {
2818 ie = got_fileindex_entry_get(a->fileindex, path2,
2821 return (*a->progress_cb)(a->progress_arg,
2822 GOT_STATUS_MISSING, path2);
2824 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2826 return got_error_from_errno("asprintf");
2828 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2833 if (status == GOT_STATUS_DELETE) {
2834 err = (*a->progress_cb)(a->progress_arg,
2835 GOT_STATUS_MERGE, path2);
2838 if (status != GOT_STATUS_NO_CHANGE &&
2839 status != GOT_STATUS_MODIFY &&
2840 status != GOT_STATUS_CONFLICT &&
2841 status != GOT_STATUS_ADD) {
2842 err = (*a->progress_cb)(a->progress_arg, status, path2);
2846 if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2848 err = got_object_blob_read_to_str(&link_target2, blob2);
2851 err = merge_symlink(a->worktree, blob1, ondisk_path,
2852 path2, a->label_orig, link_target2, a->commit_id2,
2853 repo, a->progress_cb, a->progress_arg);
2858 f_orig = got_opentemp();
2859 if (f_orig == NULL) {
2860 err = got_error_from_errno("got_opentemp");
2863 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2868 f_deriv2 = got_opentemp();
2869 if (f_deriv2 == NULL)
2871 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2876 fd = open(ondisk_path,
2877 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2879 err = got_error_from_errno2("open",
2883 f_deriv = fdopen(fd, "r");
2884 if (f_deriv == NULL) {
2885 err = got_error_from_errno2("fdopen",
2890 err = got_object_id_str(&id_str, a->commit_id2);
2893 if (asprintf(&label_deriv2, "%s: commit %s",
2894 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2895 err = got_error_from_errno("asprintf");
2898 err = merge_file(&local_changes_subsumed, a->worktree,
2899 f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2900 mode2, a->label_orig, NULL, label_deriv2,
2901 GOT_DIFF_ALGORITHM_PATIENCE, repo,
2902 a->progress_cb, a->progress_arg);
2905 ie = got_fileindex_entry_get(a->fileindex, path1,
2908 return (*a->progress_cb)(a->progress_arg,
2909 GOT_STATUS_MISSING, path1);
2911 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2913 return got_error_from_errno("asprintf");
2915 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2921 case GOT_STATUS_NO_CHANGE:
2922 err = (*a->progress_cb)(a->progress_arg,
2923 GOT_STATUS_DELETE, path1);
2926 err = remove_ondisk_file(a->worktree->root_path, path1);
2930 got_fileindex_entry_mark_deleted_from_disk(ie);
2932 case GOT_STATUS_DELETE:
2933 case GOT_STATUS_MISSING:
2934 err = (*a->progress_cb)(a->progress_arg,
2935 GOT_STATUS_DELETE, path1);
2939 got_fileindex_entry_mark_deleted_from_disk(ie);
2941 case GOT_STATUS_ADD: {
2942 struct got_object_id *id;
2946 * Delete the added file only if its content already
2947 * exists in the repository.
2949 err = got_object_blob_file_create(&id, &blob1_f,
2950 &blob1_size, path1);
2953 if (got_object_id_cmp(id, id1) == 0) {
2954 err = (*a->progress_cb)(a->progress_arg,
2955 GOT_STATUS_DELETE, path1);
2958 err = remove_ondisk_file(a->worktree->root_path,
2963 got_fileindex_entry_remove(a->fileindex,
2966 err = (*a->progress_cb)(a->progress_arg,
2967 GOT_STATUS_CANNOT_DELETE, path1);
2969 if (fclose(blob1_f) == EOF && err == NULL)
2970 err = got_error_from_errno("fclose");
2976 case GOT_STATUS_MODIFY:
2977 case GOT_STATUS_CONFLICT:
2978 err = (*a->progress_cb)(a->progress_arg,
2979 GOT_STATUS_CANNOT_DELETE, path1);
2983 case GOT_STATUS_OBSTRUCTED:
2984 err = (*a->progress_cb)(a->progress_arg, status, path1);
2992 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2994 return got_error_from_errno("asprintf");
2995 ie = got_fileindex_entry_get(a->fileindex, path2,
2998 err = get_file_status(&status, &sb, ie, ondisk_path,
3002 if (status != GOT_STATUS_NO_CHANGE &&
3003 status != GOT_STATUS_MODIFY &&
3004 status != GOT_STATUS_CONFLICT &&
3005 status != GOT_STATUS_ADD) {
3006 err = (*a->progress_cb)(a->progress_arg,
3010 if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3012 err = got_object_blob_read_to_str(&link_target2,
3016 err = merge_symlink(a->worktree, NULL,
3017 ondisk_path, path2, a->label_orig,
3018 link_target2, a->commit_id2, repo,
3019 a->progress_cb, a->progress_arg);
3021 } else if (S_ISREG(sb.st_mode)) {
3022 err = merge_blob(&local_changes_subsumed,
3023 a->worktree, NULL, ondisk_path, path2,
3024 sb.st_mode, a->label_orig, blob2,
3025 a->commit_id2, repo, a->progress_cb,
3028 err = got_error_path(ondisk_path,
3029 GOT_ERR_FILE_OBSTRUCTED);
3033 if (status == GOT_STATUS_DELETE) {
3034 err = got_fileindex_entry_update(ie,
3035 a->worktree->root_fd, path2, blob2->id.sha1,
3036 a->worktree->base_commit_id->sha1, 0);
3041 int is_bad_symlink = 0;
3042 sb.st_mode = GOT_DEFAULT_FILE_MODE;
3043 if (S_ISLNK(mode2)) {
3044 err = install_symlink(&is_bad_symlink,
3045 a->worktree, ondisk_path, path2, blob2, 0,
3046 0, 1, a->allow_bad_symlinks, repo,
3047 a->progress_cb, a->progress_arg);
3049 err = install_blob(a->worktree, ondisk_path, path2,
3050 mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3051 a->progress_cb, a->progress_arg);
3055 err = got_fileindex_entry_alloc(&ie, path2);
3058 err = got_fileindex_entry_update(ie,
3059 a->worktree->root_fd, path2, NULL, NULL, 1);
3061 got_fileindex_entry_free(ie);
3064 err = got_fileindex_entry_add(a->fileindex, ie);
3066 got_fileindex_entry_free(ie);
3069 if (is_bad_symlink) {
3070 got_fileindex_entry_filetype_set(ie,
3071 GOT_FILEIDX_MODE_BAD_SYMLINK);
3076 if (f_orig && fclose(f_orig) == EOF && err == NULL)
3077 err = got_error_from_errno("fclose");
3078 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3079 err = got_error_from_errno("fclose");
3080 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3081 err = got_error_from_errno("fclose");
3088 static const struct got_error *
3089 check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3091 struct got_worktree *worktree = arg;
3093 /* Reject merges into a work tree with mixed base commits. */
3094 if (got_fileindex_entry_has_commit(ie) &&
3095 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3096 SHA1_DIGEST_LENGTH) != 0)
3097 return got_error(GOT_ERR_MIXED_COMMITS);
3102 struct check_merge_conflicts_arg {
3103 struct got_worktree *worktree;
3104 struct got_fileindex *fileindex;
3105 struct got_repository *repo;
3108 static const struct got_error *
3109 check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3110 struct got_blob_object *blob2, FILE *f1, FILE *f2,
3111 struct got_object_id *id1, struct got_object_id *id2,
3112 const char *path1, const char *path2,
3113 mode_t mode1, mode_t mode2, struct got_repository *repo)
3115 const struct got_error *err = NULL;
3116 struct check_merge_conflicts_arg *a = arg;
3117 unsigned char status;
3119 struct got_fileindex_entry *ie;
3120 const char *path = path2 ? path2 : path1;
3121 struct got_object_id *id = id2 ? id2 : id1;
3127 ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3131 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3133 return got_error_from_errno("asprintf");
3135 /* Reject merges into a work tree with conflicted files. */
3136 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3140 if (status == GOT_STATUS_CONFLICT)
3141 return got_error(GOT_ERR_CONFLICTS);
3146 static const struct got_error *
3147 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3148 const char *fileindex_path, struct got_object_id *commit_id1,
3149 struct got_object_id *commit_id2, struct got_repository *repo,
3150 got_worktree_checkout_cb progress_cb, void *progress_arg,
3151 got_cancel_cb cancel_cb, void *cancel_arg)
3153 const struct got_error *err = NULL, *sync_err;
3154 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3155 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3156 struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3157 struct check_merge_conflicts_arg cmc_arg;
3158 struct merge_file_cb_arg arg;
3159 char *label_orig = NULL;
3160 FILE *f1 = NULL, *f2 = NULL;
3161 int fd1 = -1, fd2 = -1;
3164 err = got_object_open_as_commit(&commit1, repo, commit_id1);
3167 err = got_object_id_by_path(&tree_id1, repo, commit1,
3168 worktree->path_prefix);
3169 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3175 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3179 err = got_object_id_str(&id_str, commit_id1);
3183 if (asprintf(&label_orig, "%s: commit %s",
3184 GOT_MERGE_LABEL_BASE, id_str) == -1) {
3185 err = got_error_from_errno("asprintf");
3191 f1 = got_opentemp();
3193 err = got_error_from_errno("got_opentemp");
3198 err = got_object_open_as_commit(&commit2, repo, commit_id2);
3202 err = got_object_id_by_path(&tree_id2, repo, commit2,
3203 worktree->path_prefix);
3207 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3211 f2 = got_opentemp();
3213 err = got_error_from_errno("got_opentemp");
3217 fd1 = got_opentempfd();
3219 err = got_error_from_errno("got_opentempfd");
3223 fd2 = got_opentempfd();
3225 err = got_error_from_errno("got_opentempfd");
3229 cmc_arg.worktree = worktree;
3230 cmc_arg.fileindex = fileindex;
3231 cmc_arg.repo = repo;
3232 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3233 check_merge_conflicts, &cmc_arg, 0);
3237 arg.worktree = worktree;
3238 arg.fileindex = fileindex;
3239 arg.progress_cb = progress_cb;
3240 arg.progress_arg = progress_arg;
3241 arg.cancel_cb = cancel_cb;
3242 arg.cancel_arg = cancel_arg;
3243 arg.label_orig = label_orig;
3244 arg.commit_id2 = commit_id2;
3245 arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3246 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3247 merge_file_cb, &arg, 1);
3248 sync_err = sync_fileindex(fileindex, fileindex_path);
3249 if (sync_err && err == NULL)
3253 got_object_commit_close(commit1);
3255 got_object_commit_close(commit2);
3257 got_object_tree_close(tree1);
3259 got_object_tree_close(tree2);
3260 if (f1 && fclose(f1) == EOF && err == NULL)
3261 err = got_error_from_errno("fclose");
3262 if (f2 && fclose(f2) == EOF && err == NULL)
3263 err = got_error_from_errno("fclose");
3264 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3265 err = got_error_from_errno("close");
3266 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3267 err = got_error_from_errno("close");
3272 const struct got_error *
3273 got_worktree_merge_files(struct got_worktree *worktree,
3274 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3275 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3276 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3278 const struct got_error *err, *unlockerr;
3279 char *fileindex_path = NULL;
3280 struct got_fileindex *fileindex = NULL;
3282 err = lock_worktree(worktree, LOCK_EX);
3286 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3290 err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3295 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3296 commit_id2, repo, progress_cb, progress_arg,
3297 cancel_cb, cancel_arg);
3300 got_fileindex_free(fileindex);
3301 free(fileindex_path);
3302 unlockerr = lock_worktree(worktree, LOCK_SH);
3303 if (unlockerr && err == NULL)
3308 struct diff_dir_cb_arg {
3309 struct got_fileindex *fileindex;
3310 struct got_worktree *worktree;
3311 const char *status_path;
3312 size_t status_path_len;
3313 struct got_repository *repo;
3314 got_worktree_status_cb status_cb;
3316 got_cancel_cb cancel_cb;
3318 /* A pathlist containing per-directory pathlists of ignore patterns. */
3319 struct got_pathlist_head *ignores;
3320 int report_unchanged;
3324 static const struct got_error *
3325 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3326 int dirfd, const char *de_name,
3327 got_worktree_status_cb status_cb, void *status_arg,
3328 struct got_repository *repo, int report_unchanged)
3330 const struct got_error *err = NULL;
3331 unsigned char status = GOT_STATUS_NO_CHANGE;
3332 unsigned char staged_status = get_staged_status(ie);
3334 struct got_object_id blob_id, commit_id, staged_blob_id;
3335 struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3336 struct got_object_id *staged_blob_idp = NULL;
3338 err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3342 if (status == GOT_STATUS_NO_CHANGE &&
3343 staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3346 if (got_fileindex_entry_has_blob(ie))
3347 blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
3348 if (got_fileindex_entry_has_commit(ie))
3349 commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
3350 if (staged_status == GOT_STATUS_ADD ||
3351 staged_status == GOT_STATUS_MODIFY) {
3352 staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
3353 &staged_blob_id, ie);
3356 return (*status_cb)(status_arg, status, staged_status,
3357 ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3360 static const struct got_error *
3361 status_old_new(void *arg, struct got_fileindex_entry *ie,
3362 struct dirent *de, const char *parent_path, int dirfd)
3364 const struct got_error *err = NULL;
3365 struct diff_dir_cb_arg *a = arg;
3368 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3369 return got_error(GOT_ERR_CANCELLED);
3371 if (got_path_cmp(parent_path, a->status_path,
3372 strlen(parent_path), a->status_path_len) != 0 &&
3373 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3376 if (parent_path[0]) {
3377 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3378 parent_path, de->d_name) == -1)
3379 return got_error_from_errno("asprintf");
3381 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3383 return got_error_from_errno("asprintf");
3386 err = report_file_status(ie, abspath, dirfd, de->d_name,
3387 a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3392 static const struct got_error *
3393 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3395 struct diff_dir_cb_arg *a = arg;
3396 struct got_object_id blob_id, commit_id;
3397 unsigned char status;
3399 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3400 return got_error(GOT_ERR_CANCELLED);
3402 if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3405 got_fileindex_entry_get_blob_id(&blob_id, ie);
3406 got_fileindex_entry_get_commit_id(&commit_id, ie);
3407 if (got_fileindex_entry_has_file_on_disk(ie))
3408 status = GOT_STATUS_MISSING;
3410 status = GOT_STATUS_DELETE;
3411 return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3412 ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3416 free_ignores(struct got_pathlist_head *ignores)
3418 struct got_pathlist_entry *pe;
3420 TAILQ_FOREACH(pe, ignores, entry) {
3421 struct got_pathlist_head *ignorelist = pe->data;
3423 got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3425 got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
3428 static const struct got_error *
3429 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3431 const struct got_error *err = NULL;
3432 struct got_pathlist_entry *pe = NULL;
3433 struct got_pathlist_head *ignorelist;
3434 char *line = NULL, *pattern, *dirpath = NULL;
3435 size_t linesize = 0;
3438 ignorelist = calloc(1, sizeof(*ignorelist));
3439 if (ignorelist == NULL)
3440 return got_error_from_errno("calloc");
3441 TAILQ_INIT(ignorelist);
3443 while ((linelen = getline(&line, &linesize, f)) != -1) {
3444 if (linelen > 0 && line[linelen - 1] == '\n')
3445 line[linelen - 1] = '\0';
3447 /* Git's ignores may contain comments. */
3451 /* Git's negated patterns are not (yet?) supported. */
3455 if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3457 err = got_error_from_errno("asprintf");
3460 err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3465 err = got_error_from_errno("getline");
3469 dirpath = strdup(path);
3470 if (dirpath == NULL) {
3471 err = got_error_from_errno("strdup");
3474 err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3477 if (err || pe == NULL) {
3479 got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3485 match_ignores(struct got_pathlist_head *ignores, const char *path)
3487 struct got_pathlist_entry *pe;
3489 /* Handle patterns which match in all directories. */
3490 TAILQ_FOREACH(pe, ignores, entry) {
3491 struct got_pathlist_head *ignorelist = pe->data;
3492 struct got_pathlist_entry *pi;
3494 TAILQ_FOREACH(pi, ignorelist, entry) {
3495 const char *p, *pattern = pi->path;
3497 if (strncmp(pattern, "**/", 3) != 0)
3502 if (fnmatch(pattern, p,
3503 FNM_PATHNAME | FNM_LEADING_DIR)) {
3504 /* Retry in next directory. */
3505 while (*p && *p != '/')
3517 * The ignores pathlist contains ignore lists from children before
3518 * parents, so we can find the most specific ignorelist by walking
3519 * ignores backwards.
3521 pe = TAILQ_LAST(ignores, got_pathlist_head);
3523 if (got_path_is_child(path, pe->path, pe->path_len)) {
3524 struct got_pathlist_head *ignorelist = pe->data;
3525 struct got_pathlist_entry *pi;
3526 TAILQ_FOREACH(pi, ignorelist, entry) {
3527 const char *pattern = pi->path;
3528 int flags = FNM_LEADING_DIR;
3529 if (strstr(pattern, "/**/") == NULL)
3530 flags |= FNM_PATHNAME;
3531 if (fnmatch(pattern, path, flags))
3536 pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3542 static const struct got_error *
3543 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3544 const char *path, int dirfd, const char *ignores_filename)
3546 const struct got_error *err = NULL;
3549 FILE *ignoresfile = NULL;
3551 if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3552 path[0] ? "/" : "", ignores_filename) == -1)
3553 return got_error_from_errno("asprintf");
3556 fd = openat(dirfd, ignores_filename,
3557 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3559 if (errno != ENOENT && errno != EACCES)
3560 err = got_error_from_errno2("openat",
3563 ignoresfile = fdopen(fd, "r");
3564 if (ignoresfile == NULL)
3565 err = got_error_from_errno2("fdopen",
3569 err = read_ignores(ignores, path, ignoresfile);
3573 ignoresfile = fopen(ignorespath, "re");
3574 if (ignoresfile == NULL) {
3575 if (errno != ENOENT && errno != EACCES)
3576 err = got_error_from_errno2("fopen",
3579 err = read_ignores(ignores, path, ignoresfile);
3582 if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3583 err = got_error_from_errno2("fclose", path);
3584 if (fd != -1 && close(fd) == -1 && err == NULL)
3585 err = got_error_from_errno2("close", path);
3590 static const struct got_error *
3591 status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3594 const struct got_error *err = NULL;
3595 struct diff_dir_cb_arg *a = arg;
3601 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3602 return got_error(GOT_ERR_CANCELLED);
3604 if (parent_path[0]) {
3605 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3606 return got_error_from_errno("asprintf");
3611 if (de->d_type == DT_DIR) {
3612 if (!a->no_ignores && ignore != NULL &&
3613 match_ignores(a->ignores, path))
3615 } else if (!match_ignores(a->ignores, path) &&
3616 got_path_is_child(path, a->status_path, a->status_path_len))
3617 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3618 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3624 static const struct got_error *
3625 status_traverse(void *arg, const char *path, int dirfd)
3627 const struct got_error *err = NULL;
3628 struct diff_dir_cb_arg *a = arg;
3633 err = add_ignores(a->ignores, a->worktree->root_path,
3634 path, dirfd, ".cvsignore");
3638 err = add_ignores(a->ignores, a->worktree->root_path, path,
3639 dirfd, ".gitignore");
3644 static const struct got_error *
3645 report_single_file_status(const char *path, const char *ondisk_path,
3646 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3647 void *status_arg, struct got_repository *repo, int report_unchanged,
3648 struct got_pathlist_head *ignores, int no_ignores)
3650 struct got_fileindex_entry *ie;
3653 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3655 return report_file_status(ie, ondisk_path, -1, NULL,
3656 status_cb, status_arg, repo, report_unchanged);
3658 if (lstat(ondisk_path, &sb) == -1) {
3659 if (errno != ENOENT)
3660 return got_error_from_errno2("lstat", ondisk_path);
3661 return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3662 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3665 if (!no_ignores && match_ignores(ignores, path))
3668 if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3669 return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3670 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3675 static const struct got_error *
3676 add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3677 const char *root_path, const char *path)
3679 const struct got_error *err;
3680 char *parent_path, *next_parent_path = NULL;
3682 err = add_ignores(ignores, root_path, "", -1,
3687 err = add_ignores(ignores, root_path, "", -1,
3692 err = got_path_dirname(&parent_path, path);
3694 if (err->code == GOT_ERR_BAD_PATH)
3695 return NULL; /* cannot traverse parent */
3699 err = add_ignores(ignores, root_path, parent_path, -1,
3703 err = add_ignores(ignores, root_path, parent_path, -1,
3707 err = got_path_dirname(&next_parent_path, parent_path);
3709 if (err->code == GOT_ERR_BAD_PATH)
3710 err = NULL; /* traversed everything */
3713 if (got_path_is_root_dir(parent_path))
3716 parent_path = next_parent_path;
3717 next_parent_path = NULL;
3721 free(next_parent_path);
3725 static const struct got_error *
3726 worktree_status(struct got_worktree *worktree, const char *path,
3727 struct got_fileindex *fileindex, struct got_repository *repo,
3728 got_worktree_status_cb status_cb, void *status_arg,
3729 got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3730 int report_unchanged)
3732 const struct got_error *err = NULL;
3734 struct got_fileindex_diff_dir_cb fdiff_cb;
3735 struct diff_dir_cb_arg arg;
3736 char *ondisk_path = NULL;
3737 struct got_pathlist_head ignores;
3738 struct got_fileindex_entry *ie;
3740 TAILQ_INIT(&ignores);
3742 if (asprintf(&ondisk_path, "%s%s%s",
3743 worktree->root_path, path[0] ? "/" : "", path) == -1)
3744 return got_error_from_errno("asprintf");
3746 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3748 err = report_single_file_status(path, ondisk_path,
3749 fileindex, status_cb, status_arg, repo,
3750 report_unchanged, &ignores, no_ignores);
3754 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3756 if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3757 !got_err_open_nofollow_on_symlink())
3758 err = got_error_from_errno2("open", ondisk_path);
3761 err = add_ignores_from_parent_paths(&ignores,
3762 worktree->root_path, ondisk_path);
3766 err = report_single_file_status(path, ondisk_path,
3767 fileindex, status_cb, status_arg, repo,
3768 report_unchanged, &ignores, no_ignores);
3771 fdiff_cb.diff_old_new = status_old_new;
3772 fdiff_cb.diff_old = status_old;
3773 fdiff_cb.diff_new = status_new;
3774 fdiff_cb.diff_traverse = status_traverse;
3775 arg.fileindex = fileindex;
3776 arg.worktree = worktree;
3777 arg.status_path = path;
3778 arg.status_path_len = strlen(path);
3780 arg.status_cb = status_cb;
3781 arg.status_arg = status_arg;
3782 arg.cancel_cb = cancel_cb;
3783 arg.cancel_arg = cancel_arg;
3784 arg.report_unchanged = report_unchanged;
3785 arg.no_ignores = no_ignores;
3787 err = add_ignores_from_parent_paths(&ignores,
3788 worktree->root_path, path);
3792 arg.ignores = &ignores;
3793 err = got_fileindex_diff_dir(fileindex, fd,
3794 worktree->root_path, path, repo, &fdiff_cb, &arg);
3797 free_ignores(&ignores);
3798 if (fd != -1 && close(fd) == -1 && err == NULL)
3799 err = got_error_from_errno("close");
3804 const struct got_error *
3805 got_worktree_status(struct got_worktree *worktree,
3806 struct got_pathlist_head *paths, struct got_repository *repo,
3807 int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3808 got_cancel_cb cancel_cb, void *cancel_arg)
3810 const struct got_error *err = NULL;
3811 char *fileindex_path = NULL;
3812 struct got_fileindex *fileindex = NULL;
3813 struct got_pathlist_entry *pe;
3815 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3819 TAILQ_FOREACH(pe, paths, entry) {
3820 err = worktree_status(worktree, pe->path, fileindex, repo,
3821 status_cb, status_arg, cancel_cb, cancel_arg,
3826 free(fileindex_path);
3827 got_fileindex_free(fileindex);
3831 const struct got_error *
3832 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3835 const struct got_error *err = NULL;
3836 char *resolved = NULL, *cwd = NULL, *path = NULL;
3839 char *abspath = NULL;
3840 char canonpath[PATH_MAX];
3844 cwd = getcwd(NULL, 0);
3846 return got_error_from_errno("getcwd");
3848 if (lstat(arg, &sb) == -1) {
3849 if (errno != ENOENT) {
3850 err = got_error_from_errno2("lstat", arg);
3855 if (S_ISLNK(sb.st_mode)) {
3857 * We cannot use realpath(3) with symlinks since we want to
3858 * operate on the symlink itself.
3859 * But we can make the path absolute, assuming it is relative
3860 * to the current working directory, and then canonicalize it.
3862 if (!got_path_is_absolute(arg)) {
3863 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3864 err = got_error_from_errno("asprintf");
3869 err = got_canonpath(abspath ? abspath : arg, canonpath,
3873 resolved = strdup(canonpath);
3874 if (resolved == NULL) {
3875 err = got_error_from_errno("strdup");
3879 resolved = realpath(arg, NULL);
3880 if (resolved == NULL) {
3881 if (errno != ENOENT) {
3882 err = got_error_from_errno2("realpath", arg);
3885 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3886 err = got_error_from_errno("asprintf");
3889 err = got_canonpath(abspath, canonpath,
3893 resolved = strdup(canonpath);
3894 if (resolved == NULL) {
3895 err = got_error_from_errno("strdup");
3901 if (strncmp(got_worktree_get_root_path(worktree), resolved,
3902 strlen(got_worktree_get_root_path(worktree)))) {
3903 err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3907 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3908 err = got_path_skip_common_ancestor(&path,
3909 got_worktree_get_root_path(worktree), resolved);
3915 err = got_error_from_errno("strdup");
3920 /* XXX status walk can't deal with trailing slash! */
3922 while (len > 0 && path[len - 1] == '/') {
3923 path[len - 1] = '\0';
3937 struct schedule_addition_args {
3938 struct got_worktree *worktree;
3939 struct got_fileindex *fileindex;
3940 got_worktree_checkout_cb progress_cb;
3942 struct got_repository *repo;
3945 static const struct got_error *
3946 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3947 const char *relpath, struct got_object_id *blob_id,
3948 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3949 int dirfd, const char *de_name)
3951 struct schedule_addition_args *a = arg;
3952 const struct got_error *err = NULL;
3953 struct got_fileindex_entry *ie;
3957 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3959 return got_error_from_errno("asprintf");
3961 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3963 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3967 /* Re-adding an existing entry is a no-op. */
3968 if (status == GOT_STATUS_ADD)
3970 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3975 if (status != GOT_STATUS_UNVERSIONED) {
3976 if (status == GOT_STATUS_NONEXISTENT)
3977 err = got_error_set_errno(ENOENT, ondisk_path);
3979 err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3983 err = got_fileindex_entry_alloc(&ie, relpath);
3986 err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3987 relpath, NULL, NULL, 1);
3989 got_fileindex_entry_free(ie);
3992 err = got_fileindex_entry_add(a->fileindex, ie);
3994 got_fileindex_entry_free(ie);
4001 if (status == GOT_STATUS_ADD)
4003 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4006 const struct got_error *
4007 got_worktree_schedule_add(struct got_worktree *worktree,
4008 struct got_pathlist_head *paths,
4009 got_worktree_checkout_cb progress_cb, void *progress_arg,
4010 struct got_repository *repo, int no_ignores)
4012 struct got_fileindex *fileindex = NULL;
4013 char *fileindex_path = NULL;
4014 const struct got_error *err = NULL, *sync_err, *unlockerr;
4015 struct got_pathlist_entry *pe;
4016 struct schedule_addition_args saa;
4018 err = lock_worktree(worktree, LOCK_EX);
4022 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4026 saa.worktree = worktree;
4027 saa.fileindex = fileindex;
4028 saa.progress_cb = progress_cb;
4029 saa.progress_arg = progress_arg;
4032 TAILQ_FOREACH(pe, paths, entry) {
4033 err = worktree_status(worktree, pe->path, fileindex, repo,
4034 schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4038 sync_err = sync_fileindex(fileindex, fileindex_path);
4039 if (sync_err && err == NULL)
4042 free(fileindex_path);
4044 got_fileindex_free(fileindex);
4045 unlockerr = lock_worktree(worktree, LOCK_SH);
4046 if (unlockerr && err == NULL)
4051 struct schedule_deletion_args {
4052 struct got_worktree *worktree;
4053 struct got_fileindex *fileindex;
4054 got_worktree_delete_cb progress_cb;
4056 struct got_repository *repo;
4057 int delete_local_mods;
4059 int ignore_missing_paths;
4060 const char *status_codes;
4063 static const struct got_error *
4064 schedule_for_deletion(void *arg, unsigned char status,
4065 unsigned char staged_status, const char *relpath,
4066 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4067 struct got_object_id *commit_id, int dirfd, const char *de_name)
4069 struct schedule_deletion_args *a = arg;
4070 const struct got_error *err = NULL;
4071 struct got_fileindex_entry *ie = NULL;
4075 if (status == GOT_STATUS_NONEXISTENT) {
4076 if (a->ignore_missing_paths)
4078 return got_error_set_errno(ENOENT, relpath);
4081 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4083 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4085 staged_status = get_staged_status(ie);
4086 if (staged_status != GOT_STATUS_NO_CHANGE) {
4087 if (staged_status == GOT_STATUS_DELETE)
4089 return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4092 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4094 return got_error_from_errno("asprintf");
4096 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4101 if (a->status_codes) {
4102 size_t ncodes = strlen(a->status_codes);
4104 for (i = 0; i < ncodes ; i++) {
4105 if (status == a->status_codes[i])
4109 /* Do not delete files in non-matching status. */
4113 if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4114 a->status_codes[i] != GOT_STATUS_MISSING) {
4115 static char msg[64];
4116 snprintf(msg, sizeof(msg),
4117 "invalid status code '%c'", a->status_codes[i]);
4118 err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4123 if (status != GOT_STATUS_NO_CHANGE) {
4124 if (status == GOT_STATUS_DELETE)
4126 if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4127 err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4130 if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4131 err = got_error_set_errno(ENOENT, relpath);
4134 if (status != GOT_STATUS_MODIFY &&
4135 status != GOT_STATUS_MISSING) {
4136 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4141 if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4145 if (unlinkat(dirfd, de_name, 0) == -1) {
4146 err = got_error_from_errno2("unlinkat",
4150 } else if (unlink(ondisk_path) == -1) {
4151 err = got_error_from_errno2("unlink", ondisk_path);
4155 root_len = strlen(a->worktree->root_path);
4158 err = got_path_dirname(&parent, ondisk_path);
4162 ondisk_path = parent;
4163 if (rmdir(ondisk_path) == -1) {
4164 if (errno != ENOTEMPTY)
4165 err = got_error_from_errno2("rmdir",
4169 } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4170 strlen(ondisk_path), root_len) != 0);
4173 got_fileindex_entry_mark_deleted_from_disk(ie);
4178 if (status == GOT_STATUS_DELETE)
4180 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4181 staged_status, relpath);
4184 const struct got_error *
4185 got_worktree_schedule_delete(struct got_worktree *worktree,
4186 struct got_pathlist_head *paths, int delete_local_mods,
4187 const char *status_codes,
4188 got_worktree_delete_cb progress_cb, void *progress_arg,
4189 struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4191 struct got_fileindex *fileindex = NULL;
4192 char *fileindex_path = NULL;
4193 const struct got_error *err = NULL, *sync_err, *unlockerr;
4194 struct got_pathlist_entry *pe;
4195 struct schedule_deletion_args sda;
4197 err = lock_worktree(worktree, LOCK_EX);
4201 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4205 sda.worktree = worktree;
4206 sda.fileindex = fileindex;
4207 sda.progress_cb = progress_cb;
4208 sda.progress_arg = progress_arg;
4210 sda.delete_local_mods = delete_local_mods;
4211 sda.keep_on_disk = keep_on_disk;
4212 sda.ignore_missing_paths = ignore_missing_paths;
4213 sda.status_codes = status_codes;
4215 TAILQ_FOREACH(pe, paths, entry) {
4216 err = worktree_status(worktree, pe->path, fileindex, repo,
4217 schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4221 sync_err = sync_fileindex(fileindex, fileindex_path);
4222 if (sync_err && err == NULL)
4225 free(fileindex_path);
4227 got_fileindex_free(fileindex);
4228 unlockerr = lock_worktree(worktree, LOCK_SH);
4229 if (unlockerr && err == NULL)
4234 static const struct got_error *
4235 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4237 const struct got_error *err = NULL;
4239 size_t linesize = 0, n;
4242 linelen = getline(&line, &linesize, infile);
4243 if (linelen == -1) {
4244 if (ferror(infile)) {
4245 err = got_error_from_errno("getline");
4251 n = fwrite(line, 1, linelen, outfile);
4253 err = got_ferror(outfile, GOT_ERR_IO);
4258 n = fwrite(line, 1, linelen, rejectfile);
4260 err = got_ferror(rejectfile, GOT_ERR_IO);
4267 static const struct got_error *
4268 skip_one_line(FILE *f)
4271 size_t linesize = 0;
4274 linelen = getline(&line, &linesize, f);
4275 if (linelen == -1) {
4277 return got_error_from_errno("getline");
4284 static const struct got_error *
4285 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4286 int start_old, int end_old, int start_new, int end_new,
4287 FILE *outfile, FILE *rejectfile)
4289 const struct got_error *err;
4291 /* Copy old file's lines leading up to patch. */
4292 while (!feof(f1) && *line_cur1 < start_old) {
4293 err = copy_one_line(f1, outfile, NULL);
4298 /* Skip new file's lines leading up to patch. */
4299 while (!feof(f2) && *line_cur2 < start_new) {
4301 err = copy_one_line(f2, NULL, rejectfile);
4303 err = skip_one_line(f2);
4308 /* Copy patched lines. */
4309 while (!feof(f2) && *line_cur2 <= end_new) {
4310 err = copy_one_line(f2, outfile, NULL);
4315 /* Skip over old file's replaced lines. */
4316 while (!feof(f1) && *line_cur1 <= end_old) {
4318 err = copy_one_line(f1, NULL, rejectfile);
4320 err = skip_one_line(f1);
4329 static const struct got_error *
4330 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4331 FILE *outfile, FILE *rejectfile)
4333 const struct got_error *err;
4336 /* Copy old file's lines until EOF. */
4338 err = copy_one_line(f1, outfile, NULL);
4345 /* Copy new file's lines until EOF. */
4347 err = copy_one_line(f2, NULL, rejectfile);
4357 static const struct got_error *
4358 apply_or_reject_change(int *choice, int *nchunks_used,
4359 struct diff_result *diff_result, int n,
4360 const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4361 FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4362 got_worktree_patch_cb patch_cb, void *patch_arg)
4364 const struct got_error *err = NULL;
4365 struct diff_chunk_context cc = {};
4366 int start_old, end_old, start_new, end_new;
4368 struct diff_output_unidiff_state *diff_state;
4369 struct diff_input_info diff_info;
4372 *choice = GOT_PATCH_CHOICE_NONE;
4374 /* Get changed line numbers without context lines for copy_change(). */
4375 diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4376 start_old = cc.left.start;
4377 end_old = cc.left.end;
4378 start_new = cc.right.start;
4379 end_new = cc.right.end;
4381 /* Get the same change with context lines for display. */
4382 memset(&cc, 0, sizeof(cc));
4383 diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4385 memset(&diff_info, 0, sizeof(diff_info));
4386 diff_info.left_path = relpath;
4387 diff_info.right_path = relpath;
4389 diff_state = diff_output_unidiff_state_alloc();
4390 if (diff_state == NULL)
4391 return got_error_set_errno(ENOMEM,
4392 "diff_output_unidiff_state_alloc");
4394 hunkfile = got_opentemp();
4395 if (hunkfile == NULL) {
4396 err = got_error_from_errno("got_opentemp");
4400 rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4402 if (rc != DIFF_RC_OK) {
4403 err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4407 if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4408 err = got_ferror(hunkfile, GOT_ERR_IO);
4412 err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4413 hunkfile, changeno, nchanges);
4418 case GOT_PATCH_CHOICE_YES:
4419 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4420 end_old, start_new, end_new, outfile, rejectfile);
4422 case GOT_PATCH_CHOICE_NO:
4423 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4424 end_old, start_new, end_new, rejectfile, outfile);
4426 case GOT_PATCH_CHOICE_QUIT:
4429 err = got_error(GOT_ERR_PATCH_CHOICE);
4433 diff_output_unidiff_state_free(diff_state);
4434 if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4435 err = got_error_from_errno("fclose");
4439 struct revert_file_args {
4440 struct got_worktree *worktree;
4441 struct got_fileindex *fileindex;
4442 got_worktree_checkout_cb progress_cb;
4444 got_worktree_patch_cb patch_cb;
4446 struct got_repository *repo;
4447 int unlink_added_files;
4450 static const struct got_error *
4451 create_patched_content(char **path_outfile, int reverse_patch,
4452 struct got_object_id *blob_id, const char *path2,
4453 int dirfd2, const char *de_name2,
4454 const char *relpath, struct got_repository *repo,
4455 got_worktree_patch_cb patch_cb, void *patch_arg)
4457 const struct got_error *err, *free_err;
4458 struct got_blob_object *blob = NULL;
4459 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4460 int fd = -1, fd2 = -1;
4461 char link_target[PATH_MAX];
4462 ssize_t link_len = 0;
4463 char *path1 = NULL, *id_str = NULL;
4465 struct got_diffreg_result *diffreg_result = NULL;
4466 int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4467 int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4469 *path_outfile = NULL;
4471 err = got_object_id_str(&id_str, blob_id);
4476 fd2 = openat(dirfd2, de_name2,
4477 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4479 if (!got_err_open_nofollow_on_symlink()) {
4480 err = got_error_from_errno2("openat", path2);
4483 link_len = readlinkat(dirfd2, de_name2,
4484 link_target, sizeof(link_target));
4485 if (link_len == -1) {
4486 return got_error_from_errno2("readlinkat",
4489 sb2.st_mode = S_IFLNK;
4490 sb2.st_size = link_len;
4493 fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4495 if (!got_err_open_nofollow_on_symlink()) {
4496 err = got_error_from_errno2("open", path2);
4499 link_len = readlink(path2, link_target,
4500 sizeof(link_target));
4502 return got_error_from_errno2("readlink", path2);
4503 sb2.st_mode = S_IFLNK;
4504 sb2.st_size = link_len;
4508 if (fstat(fd2, &sb2) == -1) {
4509 err = got_error_from_errno2("fstat", path2);
4513 f2 = fdopen(fd2, "r");
4515 err = got_error_from_errno2("fdopen", path2);
4521 f2 = got_opentemp();
4523 err = got_error_from_errno2("got_opentemp", path2);
4526 n = fwrite(link_target, 1, link_len, f2);
4527 if (n != link_len) {
4528 err = got_ferror(f2, GOT_ERR_IO);
4531 if (fflush(f2) == EOF) {
4532 err = got_error_from_errno("fflush");
4538 fd = got_opentempfd();
4540 err = got_error_from_errno("got_opentempfd");
4544 err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4548 err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4552 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4556 err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4557 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4561 err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4566 if (fseek(f1, 0L, SEEK_SET) == -1)
4567 return got_ferror(f1, GOT_ERR_IO);
4568 if (fseek(f2, 0L, SEEK_SET) == -1)
4569 return got_ferror(f2, GOT_ERR_IO);
4571 /* Count the number of actual changes in the diff result. */
4572 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4573 struct diff_chunk_context cc = {};
4574 diff_chunk_context_load_change(&cc, &nchunks_used,
4575 diffreg_result->result, n, 0);
4578 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4580 err = apply_or_reject_change(&choice, &nchunks_used,
4581 diffreg_result->result, n, relpath, f1, f2,
4582 &line_cur1, &line_cur2,
4583 reverse_patch ? NULL : outfile,
4584 reverse_patch ? outfile : NULL,
4585 ++i, nchanges, patch_cb, patch_arg);
4588 if (choice == GOT_PATCH_CHOICE_YES)
4590 else if (choice == GOT_PATCH_CHOICE_QUIT)
4594 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4595 reverse_patch ? NULL : outfile,
4596 reverse_patch ? outfile : NULL);
4600 if (!S_ISLNK(sb2.st_mode)) {
4603 mode = apply_umask(sb2.st_mode);
4604 if (fchmod(fileno(outfile), mode) == -1) {
4605 err = got_error_from_errno2("fchmod", path2);
4612 if (fd != -1 && close(fd) == -1 && err == NULL)
4613 err = got_error_from_errno("close");
4615 got_object_blob_close(blob);
4616 free_err = got_diffreg_result_free(diffreg_result);
4619 if (f1 && fclose(f1) == EOF && err == NULL)
4620 err = got_error_from_errno2("fclose", path1);
4621 if (f2 && fclose(f2) == EOF && err == NULL)
4622 err = got_error_from_errno2("fclose", path2);
4623 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4624 err = got_error_from_errno2("close", path2);
4625 if (outfile && fclose(outfile) == EOF && err == NULL)
4626 err = got_error_from_errno2("fclose", *path_outfile);
4627 if (path1 && unlink(path1) == -1 && err == NULL)
4628 err = got_error_from_errno2("unlink", path1);
4629 if (err || !have_content) {
4630 if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4631 err = got_error_from_errno2("unlink", *path_outfile);
4632 free(*path_outfile);
4633 *path_outfile = NULL;
4639 static const struct got_error *
4640 revert_file(void *arg, unsigned char status, unsigned char staged_status,
4641 const char *relpath, struct got_object_id *blob_id,
4642 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4643 int dirfd, const char *de_name)
4645 struct revert_file_args *a = arg;
4646 const struct got_error *err = NULL;
4647 char *parent_path = NULL;
4648 struct got_fileindex_entry *ie;
4649 struct got_commit_object *base_commit = NULL;
4650 struct got_tree_object *tree = NULL;
4651 struct got_object_id *tree_id = NULL;
4652 const struct got_tree_entry *te = NULL;
4653 char *tree_path = NULL, *te_name;
4654 char *ondisk_path = NULL, *path_content = NULL;
4655 struct got_blob_object *blob = NULL;
4658 /* Reverting a staged deletion is a no-op. */
4659 if (status == GOT_STATUS_DELETE &&
4660 staged_status != GOT_STATUS_NO_CHANGE)
4663 if (status == GOT_STATUS_UNVERSIONED)
4664 return (*a->progress_cb)(a->progress_arg,
4665 GOT_STATUS_UNVERSIONED, relpath);
4667 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4669 return got_error_path(relpath, GOT_ERR_BAD_PATH);
4671 /* Construct in-repository path of tree which contains this blob. */
4672 err = got_path_dirname(&parent_path, ie->path);
4674 if (err->code != GOT_ERR_BAD_PATH)
4676 parent_path = strdup("/");
4677 if (parent_path == NULL) {
4678 err = got_error_from_errno("strdup");
4682 if (got_path_is_root_dir(a->worktree->path_prefix)) {
4683 tree_path = strdup(parent_path);
4684 if (tree_path == NULL) {
4685 err = got_error_from_errno("strdup");
4689 if (got_path_is_root_dir(parent_path)) {
4690 tree_path = strdup(a->worktree->path_prefix);
4691 if (tree_path == NULL) {
4692 err = got_error_from_errno("strdup");
4696 if (asprintf(&tree_path, "%s/%s",
4697 a->worktree->path_prefix, parent_path) == -1) {
4698 err = got_error_from_errno("asprintf");
4704 err = got_object_open_as_commit(&base_commit, a->repo,
4705 a->worktree->base_commit_id);
4709 err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4711 if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4712 (status == GOT_STATUS_ADD ||
4713 staged_status == GOT_STATUS_ADD)))
4716 err = got_object_open_as_tree(&tree, a->repo, tree_id);
4720 err = got_path_basename(&te_name, ie->path);
4724 te = got_object_tree_find_entry(tree, te_name);
4726 if (te == NULL && status != GOT_STATUS_ADD &&
4727 staged_status != GOT_STATUS_ADD) {
4728 err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4734 case GOT_STATUS_ADD:
4736 int choice = GOT_PATCH_CHOICE_NONE;
4737 err = (*a->patch_cb)(&choice, a->patch_arg,
4738 status, ie->path, NULL, 1, 1);
4741 if (choice != GOT_PATCH_CHOICE_YES)
4744 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4748 got_fileindex_entry_remove(a->fileindex, ie);
4749 if (a->unlink_added_files) {
4750 if (asprintf(&ondisk_path, "%s/%s",
4751 got_worktree_get_root_path(a->worktree),
4753 err = got_error_from_errno("asprintf");
4756 if (unlink(ondisk_path) == -1) {
4757 err = got_error_from_errno2("unlink",
4763 case GOT_STATUS_DELETE:
4765 int choice = GOT_PATCH_CHOICE_NONE;
4766 err = (*a->patch_cb)(&choice, a->patch_arg,
4767 status, ie->path, NULL, 1, 1);
4770 if (choice != GOT_PATCH_CHOICE_YES)
4774 case GOT_STATUS_MODIFY:
4775 case GOT_STATUS_MODE_CHANGE:
4776 case GOT_STATUS_CONFLICT:
4777 case GOT_STATUS_MISSING: {
4778 struct got_object_id id;
4779 if (staged_status == GOT_STATUS_ADD ||
4780 staged_status == GOT_STATUS_MODIFY)
4781 got_fileindex_entry_get_staged_blob_id(&id, ie);
4783 got_fileindex_entry_get_blob_id(&id, ie);
4784 fd = got_opentempfd();
4786 err = got_error_from_errno("got_opentempfd");
4790 err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4794 if (asprintf(&ondisk_path, "%s/%s",
4795 got_worktree_get_root_path(a->worktree), relpath) == -1) {
4796 err = got_error_from_errno("asprintf");
4800 if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4801 status == GOT_STATUS_CONFLICT)) {
4802 int is_bad_symlink = 0;
4803 err = create_patched_content(&path_content, 1, &id,
4804 ondisk_path, dirfd, de_name, ie->path, a->repo,
4805 a->patch_cb, a->patch_arg);
4806 if (err || path_content == NULL)
4808 if (te && S_ISLNK(te->mode)) {
4809 if (unlink(path_content) == -1) {
4810 err = got_error_from_errno2("unlink",
4814 err = install_symlink(&is_bad_symlink,
4815 a->worktree, ondisk_path, ie->path,
4816 blob, 0, 1, 0, 0, a->repo,
4817 a->progress_cb, a->progress_arg);
4819 if (rename(path_content, ondisk_path) == -1) {
4820 err = got_error_from_errno3("rename",
4821 path_content, ondisk_path);
4826 int is_bad_symlink = 0;
4827 if (te && S_ISLNK(te->mode)) {
4828 err = install_symlink(&is_bad_symlink,
4829 a->worktree, ondisk_path, ie->path,
4830 blob, 0, 1, 0, 0, a->repo,
4831 a->progress_cb, a->progress_arg);
4833 err = install_blob(a->worktree, ondisk_path,
4835 te ? te->mode : GOT_DEFAULT_FILE_MODE,
4836 got_fileindex_perms_to_st(ie), blob,
4837 0, 1, 0, 0, a->repo,
4838 a->progress_cb, a->progress_arg);
4842 if (status == GOT_STATUS_DELETE ||
4843 status == GOT_STATUS_MODE_CHANGE) {
4844 err = got_fileindex_entry_update(ie,
4845 a->worktree->root_fd, relpath,
4847 a->worktree->base_commit_id->sha1, 1);
4851 if (is_bad_symlink) {
4852 got_fileindex_entry_filetype_set(ie,
4853 GOT_FILEIDX_MODE_BAD_SYMLINK);
4866 if (fd != -1 && close(fd) == -1 && err == NULL)
4867 err = got_error_from_errno("close");
4869 got_object_blob_close(blob);
4871 got_object_tree_close(tree);
4874 got_object_commit_close(base_commit);
4878 const struct got_error *
4879 got_worktree_revert(struct got_worktree *worktree,
4880 struct got_pathlist_head *paths,
4881 got_worktree_checkout_cb progress_cb, void *progress_arg,
4882 got_worktree_patch_cb patch_cb, void *patch_arg,
4883 struct got_repository *repo)
4885 struct got_fileindex *fileindex = NULL;
4886 char *fileindex_path = NULL;
4887 const struct got_error *err = NULL, *unlockerr = NULL;
4888 const struct got_error *sync_err = NULL;
4889 struct got_pathlist_entry *pe;
4890 struct revert_file_args rfa;
4892 err = lock_worktree(worktree, LOCK_EX);
4896 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4900 rfa.worktree = worktree;
4901 rfa.fileindex = fileindex;
4902 rfa.progress_cb = progress_cb;
4903 rfa.progress_arg = progress_arg;
4904 rfa.patch_cb = patch_cb;
4905 rfa.patch_arg = patch_arg;
4907 rfa.unlink_added_files = 0;
4908 TAILQ_FOREACH(pe, paths, entry) {
4909 err = worktree_status(worktree, pe->path, fileindex, repo,
4910 revert_file, &rfa, NULL, NULL, 1, 0);
4914 sync_err = sync_fileindex(fileindex, fileindex_path);
4915 if (sync_err && err == NULL)
4918 free(fileindex_path);
4920 got_fileindex_free(fileindex);
4921 unlockerr = lock_worktree(worktree, LOCK_SH);
4922 if (unlockerr && err == NULL)
4928 free_commitable(struct got_commitable *ct)
4931 free(ct->in_repo_path);
4932 free(ct->ondisk_path);
4934 free(ct->base_blob_id);
4935 free(ct->staged_blob_id);
4936 free(ct->base_commit_id);
4940 struct collect_commitables_arg {
4941 struct got_pathlist_head *commitable_paths;
4942 struct got_repository *repo;
4943 struct got_worktree *worktree;
4944 struct got_fileindex *fileindex;
4945 int have_staged_files;
4946 int allow_bad_symlinks;
4947 int diff_header_shown;
4954 * Create a file which contains the target path of a symlink so we can feed
4955 * it as content to the diff engine.
4957 static const struct got_error *
4958 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4959 const char *abspath)
4961 const struct got_error *err = NULL;
4962 char target_path[PATH_MAX];
4963 ssize_t target_len, outlen;
4968 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4969 if (target_len == -1)
4970 return got_error_from_errno2("readlinkat", abspath);
4972 target_len = readlink(abspath, target_path, PATH_MAX);
4973 if (target_len == -1)
4974 return got_error_from_errno2("readlink", abspath);
4977 *fd = got_opentempfd();
4979 return got_error_from_errno("got_opentempfd");
4981 outlen = write(*fd, target_path, target_len);
4983 err = got_error_from_errno("got_opentempfd");
4987 if (lseek(*fd, 0, SEEK_SET) == -1) {
4988 err = got_error_from_errno2("lseek", abspath);
4999 static const struct got_error *
5000 append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5001 FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5002 int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5004 const struct got_error *err = NULL;
5005 struct got_blob_object *blob1 = NULL;
5006 int fd = -1, fd1 = -1, fd2 = -1;
5007 FILE *ondisk_file = NULL;
5008 char *label1 = NULL;
5012 char *id_str = NULL;
5014 memset(&sb, 0, sizeof(sb));
5017 if (ct->staged_status != GOT_STATUS_MODIFY &&
5018 ct->staged_status != GOT_STATUS_ADD &&
5019 ct->staged_status != GOT_STATUS_DELETE)
5022 if (ct->status != GOT_STATUS_MODIFY &&
5023 ct->status != GOT_STATUS_ADD &&
5024 ct->status != GOT_STATUS_DELETE)
5028 err = got_opentemp_truncate(f1);
5030 return got_error_from_errno("got_opentemp_truncate");
5031 err = got_opentemp_truncate(f2);
5033 return got_error_from_errno("got_opentemp_truncate");
5035 if (!*diff_header_shown) {
5036 err = got_object_id_str(&id_str, worktree->base_commit_id);
5039 fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5040 got_worktree_get_root_path(worktree));
5041 fprintf(diff_outfile, "commit - %s\n", id_str);
5042 fprintf(diff_outfile, "path + %s%s\n",
5043 got_worktree_get_root_path(worktree),
5044 diff_staged ? " (staged changes)" : "");
5045 *diff_header_shown = 1;
5049 const char *label1 = NULL, *label2 = NULL;
5050 switch (ct->staged_status) {
5051 case GOT_STATUS_MODIFY:
5055 case GOT_STATUS_ADD:
5058 case GOT_STATUS_DELETE:
5062 return got_error(GOT_ERR_FILE_STATUS);
5064 fd1 = got_opentempfd();
5066 err = got_error_from_errno("got_opentempfd");
5069 fd2 = got_opentempfd();
5071 err = got_error_from_errno("got_opentempfd");
5074 err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5075 fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5076 label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5077 NULL, repo, diff_outfile);
5081 fd1 = got_opentempfd();
5083 err = got_error_from_errno("got_opentempfd");
5087 if (ct->status != GOT_STATUS_ADD) {
5088 err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5094 if (ct->status != GOT_STATUS_DELETE) {
5096 fd = openat(dirfd, de_name,
5097 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5099 if (!got_err_open_nofollow_on_symlink()) {
5100 err = got_error_from_errno2("openat",
5104 err = get_symlink_target_file(&fd, dirfd,
5105 de_name, ct->ondisk_path);
5110 fd = open(ct->ondisk_path,
5111 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5113 if (!got_err_open_nofollow_on_symlink()) {
5114 err = got_error_from_errno2("open",
5118 err = get_symlink_target_file(&fd, dirfd,
5119 de_name, ct->ondisk_path);
5124 if (fstatat(fd, ct->ondisk_path, &sb,
5125 AT_SYMLINK_NOFOLLOW) == -1) {
5126 err = got_error_from_errno2("fstatat", ct->ondisk_path);
5129 ondisk_file = fdopen(fd, "r");
5130 if (ondisk_file == NULL) {
5131 err = got_error_from_errno2("fdopen", ct->ondisk_path);
5139 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5145 err = got_diff_blob_file(blob1, f1, size1, label1,
5146 ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5147 GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
5149 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5150 err = got_error_from_errno("close");
5151 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5152 err = got_error_from_errno("close");
5154 got_object_blob_close(blob1);
5155 if (fd != -1 && close(fd) == -1 && err == NULL)
5156 err = got_error_from_errno("close");
5157 if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5158 err = got_error_from_errno("fclose");
5162 static const struct got_error *
5163 collect_commitables(void *arg, unsigned char status,
5164 unsigned char staged_status, const char *relpath,
5165 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5166 struct got_object_id *commit_id, int dirfd, const char *de_name)
5168 struct collect_commitables_arg *a = arg;
5169 const struct got_error *err = NULL;
5170 struct got_commitable *ct = NULL;
5171 struct got_pathlist_entry *new = NULL;
5172 char *parent_path = NULL, *path = NULL;
5175 if (a->have_staged_files) {
5176 if (staged_status != GOT_STATUS_MODIFY &&
5177 staged_status != GOT_STATUS_ADD &&
5178 staged_status != GOT_STATUS_DELETE)
5181 if (status == GOT_STATUS_CONFLICT)
5182 return got_error(GOT_ERR_COMMIT_CONFLICT);
5184 if (status != GOT_STATUS_MODIFY &&
5185 status != GOT_STATUS_MODE_CHANGE &&
5186 status != GOT_STATUS_ADD &&
5187 status != GOT_STATUS_DELETE)
5191 if (asprintf(&path, "/%s", relpath) == -1) {
5192 err = got_error_from_errno("asprintf");
5195 if (strcmp(path, "/") == 0) {
5196 parent_path = strdup("");
5197 if (parent_path == NULL)
5198 return got_error_from_errno("strdup");
5200 err = got_path_dirname(&parent_path, path);
5205 ct = calloc(1, sizeof(*ct));
5207 err = got_error_from_errno("calloc");
5211 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5213 err = got_error_from_errno("asprintf");
5217 if (staged_status == GOT_STATUS_ADD ||
5218 staged_status == GOT_STATUS_MODIFY) {
5219 struct got_fileindex_entry *ie;
5220 ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5221 switch (got_fileindex_entry_staged_filetype_get(ie)) {
5222 case GOT_FILEIDX_MODE_REGULAR_FILE:
5223 case GOT_FILEIDX_MODE_BAD_SYMLINK:
5226 case GOT_FILEIDX_MODE_SYMLINK:
5230 err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5233 ct->mode |= got_fileindex_entry_perms_get(ie);
5234 } else if (status != GOT_STATUS_DELETE &&
5235 staged_status != GOT_STATUS_DELETE) {
5237 if (fstatat(dirfd, de_name, &sb,
5238 AT_SYMLINK_NOFOLLOW) == -1) {
5239 err = got_error_from_errno2("fstatat",
5243 } else if (lstat(ct->ondisk_path, &sb) == -1) {
5244 err = got_error_from_errno2("lstat", ct->ondisk_path);
5247 ct->mode = sb.st_mode;
5250 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5251 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5253 err = got_error_from_errno("asprintf");
5257 if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5258 status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5260 char target_path[PATH_MAX];
5262 target_len = readlink(ct->ondisk_path, target_path,
5263 sizeof(target_path));
5264 if (target_len == -1) {
5265 err = got_error_from_errno2("readlink",
5269 err = is_bad_symlink_target(&is_bad_symlink, target_path,
5270 target_len, ct->ondisk_path, a->worktree->root_path);
5273 if (is_bad_symlink) {
5274 err = got_error_path(ct->ondisk_path,
5275 GOT_ERR_BAD_SYMLINK);
5281 ct->status = status;
5282 ct->staged_status = staged_status;
5283 ct->blob_id = NULL; /* will be filled in when blob gets created */
5284 if (ct->status != GOT_STATUS_ADD &&
5285 ct->staged_status != GOT_STATUS_ADD) {
5286 ct->base_blob_id = got_object_id_dup(blob_id);
5287 if (ct->base_blob_id == NULL) {
5288 err = got_error_from_errno("got_object_id_dup");
5291 ct->base_commit_id = got_object_id_dup(commit_id);
5292 if (ct->base_commit_id == NULL) {
5293 err = got_error_from_errno("got_object_id_dup");
5297 if (ct->staged_status == GOT_STATUS_ADD ||
5298 ct->staged_status == GOT_STATUS_MODIFY) {
5299 ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5300 if (ct->staged_blob_id == NULL) {
5301 err = got_error_from_errno("got_object_id_dup");
5305 ct->path = strdup(path);
5306 if (ct->path == NULL) {
5307 err = got_error_from_errno("strdup");
5310 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5314 if (a->diff_outfile && ct && new != NULL) {
5315 err = append_ct_diff(ct, &a->diff_header_shown,
5316 a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5317 a->have_staged_files, a->repo, a->worktree);
5322 if (ct && (err || new == NULL))
5323 free_commitable(ct);
5329 static const struct got_error *write_tree(struct got_object_id **, int *,
5330 struct got_tree_object *, const char *, struct got_pathlist_head *,
5331 got_worktree_status_cb status_cb, void *status_arg,
5332 struct got_repository *);
5334 static const struct got_error *
5335 write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5336 struct got_tree_entry *te, const char *parent_path,
5337 struct got_pathlist_head *commitable_paths,
5338 got_worktree_status_cb status_cb, void *status_arg,
5339 struct got_repository *repo)
5341 const struct got_error *err = NULL;
5342 struct got_tree_object *subtree;
5345 if (asprintf(&subpath, "%s%s%s", parent_path,
5346 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5347 return got_error_from_errno("asprintf");
5349 err = got_object_open_as_tree(&subtree, repo, &te->id);
5353 err = write_tree(new_subtree_id, nentries, subtree, subpath,
5354 commitable_paths, status_cb, status_arg, repo);
5355 got_object_tree_close(subtree);
5360 static const struct got_error *
5361 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5363 const struct got_error *err = NULL;
5364 char *ct_parent_path = NULL;
5368 if (strchr(ct->in_repo_path, '/') == NULL) {
5369 *match = got_path_is_root_dir(path);
5373 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5376 *match = (strcmp(path, ct_parent_path) == 0);
5377 free(ct_parent_path);
5382 get_ct_file_mode(struct got_commitable *ct)
5384 if (S_ISLNK(ct->mode))
5387 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5390 static const struct got_error *
5391 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5392 struct got_tree_entry *te, struct got_commitable *ct)
5394 const struct got_error *err = NULL;
5398 err = got_object_tree_entry_dup(new_te, te);
5402 (*new_te)->mode = get_ct_file_mode(ct);
5404 if (ct->staged_status == GOT_STATUS_MODIFY)
5405 memcpy(&(*new_te)->id, ct->staged_blob_id,
5406 sizeof((*new_te)->id));
5408 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5410 if (err && *new_te) {
5417 static const struct got_error *
5418 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5419 struct got_commitable *ct)
5421 const struct got_error *err = NULL;
5422 char *ct_name = NULL;
5426 *new_te = calloc(1, sizeof(**new_te));
5427 if (*new_te == NULL)
5428 return got_error_from_errno("calloc");
5430 err = got_path_basename(&ct_name, ct->path);
5433 if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5434 sizeof((*new_te)->name)) {
5435 err = got_error(GOT_ERR_NO_SPACE);
5439 (*new_te)->mode = get_ct_file_mode(ct);
5441 if (ct->staged_status == GOT_STATUS_ADD)
5442 memcpy(&(*new_te)->id, ct->staged_blob_id,
5443 sizeof((*new_te)->id));
5445 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5448 if (err && *new_te) {
5455 static const struct got_error *
5456 insert_tree_entry(struct got_tree_entry *new_te,
5457 struct got_pathlist_head *paths)
5459 const struct got_error *err = NULL;
5460 struct got_pathlist_entry *new_pe;
5462 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5466 return got_error(GOT_ERR_TREE_DUP_ENTRY);
5470 static const struct got_error *
5471 report_ct_status(struct got_commitable *ct,
5472 got_worktree_status_cb status_cb, void *status_arg)
5474 const char *ct_path = ct->path;
5475 unsigned char status;
5477 if (status_cb == NULL) /* no commit progress output desired */
5480 while (ct_path[0] == '/')
5483 if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5484 status = ct->staged_status;
5486 status = ct->status;
5488 return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5489 ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5492 static const struct got_error *
5493 match_modified_subtree(int *modified, struct got_tree_entry *te,
5494 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5496 const struct got_error *err = NULL;
5497 struct got_pathlist_entry *pe;
5502 if (asprintf(&te_path, "%s%s%s", base_tree_path,
5503 got_path_is_root_dir(base_tree_path) ? "" : "/",
5505 return got_error_from_errno("asprintf");
5507 TAILQ_FOREACH(pe, commitable_paths, entry) {
5508 struct got_commitable *ct = pe->data;
5509 *modified = got_path_is_child(ct->in_repo_path, te_path,
5519 static const struct got_error *
5520 match_deleted_or_modified_ct(struct got_commitable **ctp,
5521 struct got_tree_entry *te, const char *base_tree_path,
5522 struct got_pathlist_head *commitable_paths)
5524 const struct got_error *err = NULL;
5525 struct got_pathlist_entry *pe;
5529 TAILQ_FOREACH(pe, commitable_paths, entry) {
5530 struct got_commitable *ct = pe->data;
5531 char *ct_name = NULL;
5534 if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5535 if (ct->status != GOT_STATUS_MODIFY &&
5536 ct->status != GOT_STATUS_MODE_CHANGE &&
5537 ct->status != GOT_STATUS_DELETE)
5540 if (ct->staged_status != GOT_STATUS_MODIFY &&
5541 ct->staged_status != GOT_STATUS_DELETE)
5545 if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5548 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5554 err = got_path_basename(&ct_name, pe->path);
5558 if (strcmp(te->name, ct_name) != 0) {
5571 static const struct got_error *
5572 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5573 const char *child_path, const char *path_base_tree,
5574 struct got_pathlist_head *commitable_paths,
5575 got_worktree_status_cb status_cb, void *status_arg,
5576 struct got_repository *repo)
5578 const struct got_error *err = NULL;
5579 struct got_tree_entry *new_te;
5581 struct got_object_id *id = NULL;
5586 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5587 got_path_is_root_dir(path_base_tree) ? "" : "/",
5589 return got_error_from_errno("asprintf");
5591 new_te = calloc(1, sizeof(*new_te));
5593 return got_error_from_errno("calloc");
5594 new_te->mode = S_IFDIR;
5596 if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5597 sizeof(new_te->name)) {
5598 err = got_error(GOT_ERR_NO_SPACE);
5601 err = write_tree(&id, &nentries, NULL, subtree_path,
5602 commitable_paths, status_cb, status_arg, repo);
5607 memcpy(&new_te->id, id, sizeof(new_te->id));
5616 static const struct got_error *
5617 write_tree(struct got_object_id **new_tree_id, int *nentries,
5618 struct got_tree_object *base_tree, const char *path_base_tree,
5619 struct got_pathlist_head *commitable_paths,
5620 got_worktree_status_cb status_cb, void *status_arg,
5621 struct got_repository *repo)
5623 const struct got_error *err = NULL;
5624 struct got_pathlist_head paths;
5625 struct got_tree_entry *te, *new_te = NULL;
5626 struct got_pathlist_entry *pe;
5631 /* Insert, and recurse into, newly added entries first. */
5632 TAILQ_FOREACH(pe, commitable_paths, entry) {
5633 struct got_commitable *ct = pe->data;
5634 char *child_path = NULL, *slash;
5636 if ((ct->status != GOT_STATUS_ADD &&
5637 ct->staged_status != GOT_STATUS_ADD) ||
5638 (ct->flags & GOT_COMMITABLE_ADDED))
5641 if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5642 strlen(path_base_tree)))
5645 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5650 slash = strchr(child_path, '/');
5651 if (slash == NULL) {
5652 err = alloc_added_blob_tree_entry(&new_te, ct);
5655 err = report_ct_status(ct, status_cb, status_arg);
5658 ct->flags |= GOT_COMMITABLE_ADDED;
5659 err = insert_tree_entry(new_te, &paths);
5664 *slash = '\0'; /* trim trailing path components */
5665 if (base_tree == NULL ||
5666 got_object_tree_find_entry(base_tree, child_path)
5668 err = make_subtree_for_added_blob(&new_te,
5669 child_path, path_base_tree,
5670 commitable_paths, status_cb, status_arg,
5674 err = insert_tree_entry(new_te, &paths);
5683 int i, nbase_entries;
5684 /* Handle modified and deleted entries. */
5685 nbase_entries = got_object_tree_get_nentries(base_tree);
5686 for (i = 0; i < nbase_entries; i++) {
5687 struct got_commitable *ct = NULL;
5689 te = got_object_tree_get_entry(base_tree, i);
5690 if (got_object_tree_entry_is_submodule(te)) {
5691 /* Entry is a submodule; just copy it. */
5692 err = got_object_tree_entry_dup(&new_te, te);
5695 err = insert_tree_entry(new_te, &paths);
5702 if (S_ISDIR(te->mode)) {
5704 err = got_object_tree_entry_dup(&new_te, te);
5707 err = match_modified_subtree(&modified, te,
5708 path_base_tree, commitable_paths);
5711 /* Avoid recursion into unmodified subtrees. */
5713 struct got_object_id *new_id;
5715 err = write_subtree(&new_id,
5717 path_base_tree, commitable_paths,
5718 status_cb, status_arg, repo);
5721 if (nsubentries == 0) {
5722 /* All entries were deleted. */
5726 memcpy(&new_te->id, new_id,
5727 sizeof(new_te->id));
5730 err = insert_tree_entry(new_te, &paths);
5737 err = match_deleted_or_modified_ct(&ct, te,
5738 path_base_tree, commitable_paths);
5742 /* NB: Deleted entries get dropped here. */
5743 if (ct->status == GOT_STATUS_MODIFY ||
5744 ct->status == GOT_STATUS_MODE_CHANGE ||
5745 ct->staged_status == GOT_STATUS_MODIFY) {
5746 err = alloc_modified_blob_tree_entry(
5750 err = insert_tree_entry(new_te, &paths);
5755 err = report_ct_status(ct, status_cb,
5760 /* Entry is unchanged; just copy it. */
5761 err = got_object_tree_entry_dup(&new_te, te);
5764 err = insert_tree_entry(new_te, &paths);
5772 /* Write new list of entries; deleted entries have been dropped. */
5773 err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5775 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
5779 static const struct got_error *
5780 update_fileindex_after_commit(struct got_worktree *worktree,
5781 struct got_pathlist_head *commitable_paths,
5782 struct got_object_id *new_base_commit_id,
5783 struct got_fileindex *fileindex, int have_staged_files)
5785 const struct got_error *err = NULL;
5786 struct got_pathlist_entry *pe;
5787 char *relpath = NULL;
5789 TAILQ_FOREACH(pe, commitable_paths, entry) {
5790 struct got_fileindex_entry *ie;
5791 struct got_commitable *ct = pe->data;
5793 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5795 err = got_path_skip_common_ancestor(&relpath,
5796 worktree->root_path, ct->ondisk_path);
5801 if (ct->status == GOT_STATUS_DELETE ||
5802 ct->staged_status == GOT_STATUS_DELETE) {
5803 got_fileindex_entry_remove(fileindex, ie);
5804 } else if (ct->staged_status == GOT_STATUS_ADD ||
5805 ct->staged_status == GOT_STATUS_MODIFY) {
5806 got_fileindex_entry_stage_set(ie,
5807 GOT_FILEIDX_STAGE_NONE);
5808 got_fileindex_entry_staged_filetype_set(ie, 0);
5810 err = got_fileindex_entry_update(ie,
5811 worktree->root_fd, relpath,
5812 ct->staged_blob_id->sha1,
5813 new_base_commit_id->sha1,
5814 !have_staged_files);
5816 err = got_fileindex_entry_update(ie,
5817 worktree->root_fd, relpath,
5819 new_base_commit_id->sha1,
5820 !have_staged_files);
5822 err = got_fileindex_entry_alloc(&ie, pe->path);
5825 err = got_fileindex_entry_update(ie,
5826 worktree->root_fd, relpath, ct->blob_id->sha1,
5827 new_base_commit_id->sha1, 1);
5829 got_fileindex_entry_free(ie);
5832 err = got_fileindex_entry_add(fileindex, ie);
5834 got_fileindex_entry_free(ie);
5847 static const struct got_error *
5848 check_out_of_date(const char *in_repo_path, unsigned char status,
5849 unsigned char staged_status, struct got_object_id *base_blob_id,
5850 struct got_object_id *base_commit_id,
5851 struct got_object_id *head_commit_id, struct got_repository *repo,
5854 const struct got_error *err = NULL;
5855 struct got_commit_object *commit = NULL;
5856 struct got_object_id *id = NULL;
5858 if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5859 /* Trivial case: base commit == head commit */
5860 if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5863 * Ensure file content which local changes were based
5864 * on matches file content in the branch head.
5866 err = got_object_open_as_commit(&commit, repo, head_commit_id);
5869 err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5871 if (err->code == GOT_ERR_NO_TREE_ENTRY)
5872 err = got_error(ood_errcode);
5874 } else if (got_object_id_cmp(id, base_blob_id) != 0)
5875 err = got_error(ood_errcode);
5877 /* Require that added files don't exist in the branch head. */
5878 err = got_object_open_as_commit(&commit, repo, head_commit_id);
5881 err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5882 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5884 err = id ? got_error(ood_errcode) : NULL;
5889 got_object_commit_close(commit);
5893 static const struct got_error *
5894 commit_worktree(struct got_object_id **new_commit_id,
5895 struct got_pathlist_head *commitable_paths,
5896 struct got_object_id *head_commit_id,
5897 struct got_object_id *parent_id2,
5898 struct got_worktree *worktree,
5899 const char *author, const char *committer, char *diff_path,
5900 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5901 got_worktree_status_cb status_cb, void *status_arg,
5902 struct got_repository *repo)
5904 const struct got_error *err = NULL, *unlockerr = NULL;
5905 struct got_pathlist_entry *pe;
5906 const char *head_ref_name = NULL;
5907 struct got_commit_object *head_commit = NULL;
5908 struct got_reference *head_ref2 = NULL;
5909 struct got_object_id *head_commit_id2 = NULL;
5910 struct got_tree_object *head_tree = NULL;
5911 struct got_object_id *new_tree_id = NULL;
5912 int nentries, nparents = 0;
5913 struct got_object_id_queue parent_ids;
5914 struct got_object_qid *pid = NULL;
5915 char *logmsg = NULL;
5918 *new_commit_id = NULL;
5920 STAILQ_INIT(&parent_ids);
5922 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5926 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5930 if (commit_msg_cb != NULL) {
5931 err = commit_msg_cb(commitable_paths, diff_path,
5932 &logmsg, commit_arg);
5937 if (logmsg == NULL || strlen(logmsg) == 0) {
5938 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5942 /* Create blobs from added and modified files and record their IDs. */
5943 TAILQ_FOREACH(pe, commitable_paths, entry) {
5944 struct got_commitable *ct = pe->data;
5947 /* Blobs for staged files already exist. */
5948 if (ct->staged_status == GOT_STATUS_ADD ||
5949 ct->staged_status == GOT_STATUS_MODIFY)
5952 if (ct->status != GOT_STATUS_ADD &&
5953 ct->status != GOT_STATUS_MODIFY &&
5954 ct->status != GOT_STATUS_MODE_CHANGE)
5957 if (asprintf(&ondisk_path, "%s/%s",
5958 worktree->root_path, pe->path) == -1) {
5959 err = got_error_from_errno("asprintf");
5962 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5968 /* Recursively write new tree objects. */
5969 err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5970 commitable_paths, status_cb, status_arg, repo);
5974 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5977 STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5980 err = got_object_qid_alloc(&pid, parent_id2);
5983 STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5986 timestamp = time(NULL);
5987 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5988 nparents, author, timestamp, committer, timestamp, logmsg, repo);
5994 /* Check if a concurrent commit to our branch has occurred. */
5995 head_ref_name = got_worktree_get_head_ref_name(worktree);
5996 if (head_ref_name == NULL) {
5997 err = got_error_from_errno("got_worktree_get_head_ref_name");
6000 /* Lock the reference here to prevent concurrent modification. */
6001 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6004 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6007 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6008 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6011 /* Update branch head in repository. */
6012 err = got_ref_change_ref(head_ref2, *new_commit_id);
6015 err = got_ref_write(head_ref2, repo);
6019 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6023 err = ref_base_commit(worktree, repo);
6027 got_object_id_queue_free(&parent_ids);
6029 got_object_tree_close(head_tree);
6031 got_object_commit_close(head_commit);
6032 free(head_commit_id2);
6034 unlockerr = got_ref_unlock(head_ref2);
6035 if (unlockerr && err == NULL)
6037 got_ref_close(head_ref2);
6042 static const struct got_error *
6043 check_path_is_commitable(const char *path,
6044 struct got_pathlist_head *commitable_paths)
6046 struct got_pathlist_entry *cpe = NULL;
6047 size_t path_len = strlen(path);
6049 TAILQ_FOREACH(cpe, commitable_paths, entry) {
6050 struct got_commitable *ct = cpe->data;
6051 const char *ct_path = ct->path;
6053 while (ct_path[0] == '/')
6056 if (strcmp(path, ct_path) == 0 ||
6057 got_path_is_child(ct_path, path, path_len))
6062 return got_error_path(path, GOT_ERR_BAD_PATH);
6067 static const struct got_error *
6068 check_staged_file(void *arg, struct got_fileindex_entry *ie)
6070 int *have_staged_files = arg;
6072 if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6073 *have_staged_files = 1;
6074 return got_error(GOT_ERR_CANCELLED);
6080 static const struct got_error *
6081 check_non_staged_files(struct got_fileindex *fileindex,
6082 struct got_pathlist_head *paths)
6084 struct got_pathlist_entry *pe;
6085 struct got_fileindex_entry *ie;
6087 TAILQ_FOREACH(pe, paths, entry) {
6088 if (pe->path[0] == '\0')
6090 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6092 return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6093 if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6094 return got_error_path(pe->path,
6095 GOT_ERR_FILE_NOT_STAGED);
6101 const struct got_error *
6102 got_worktree_commit(struct got_object_id **new_commit_id,
6103 struct got_worktree *worktree, struct got_pathlist_head *paths,
6104 const char *author, const char *committer, int allow_bad_symlinks,
6105 int show_diff, got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6106 got_worktree_status_cb status_cb, void *status_arg,
6107 struct got_repository *repo)
6109 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6110 struct got_fileindex *fileindex = NULL;
6111 char *fileindex_path = NULL;
6112 struct got_pathlist_head commitable_paths;
6113 struct collect_commitables_arg cc_arg;
6114 struct got_pathlist_entry *pe;
6115 struct got_reference *head_ref = NULL;
6116 struct got_object_id *head_commit_id = NULL;
6117 char *diff_path = NULL;
6118 int have_staged_files = 0;
6120 *new_commit_id = NULL;
6122 memset(&cc_arg, 0, sizeof(cc_arg));
6123 TAILQ_INIT(&commitable_paths);
6125 err = lock_worktree(worktree, LOCK_EX);
6129 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6133 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6137 err = open_fileindex(&fileindex, &fileindex_path, worktree);
6141 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6142 &have_staged_files);
6143 if (err && err->code != GOT_ERR_CANCELLED)
6145 if (have_staged_files) {
6146 err = check_non_staged_files(fileindex, paths);
6151 cc_arg.commitable_paths = &commitable_paths;
6152 cc_arg.worktree = worktree;
6153 cc_arg.fileindex = fileindex;
6155 cc_arg.have_staged_files = have_staged_files;
6156 cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6157 cc_arg.diff_header_shown = 0;
6159 err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6160 GOT_TMPDIR_STR "/got", ".diff");
6163 cc_arg.f1 = got_opentemp();
6164 if (cc_arg.f1 == NULL) {
6165 err = got_error_from_errno("got_opentemp");
6168 cc_arg.f2 = got_opentemp();
6169 if (cc_arg.f2 == NULL) {
6170 err = got_error_from_errno("got_opentemp");
6175 TAILQ_FOREACH(pe, paths, entry) {
6176 err = worktree_status(worktree, pe->path, fileindex, repo,
6177 collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6183 if (fflush(cc_arg.diff_outfile) == EOF) {
6184 err = got_error_from_errno("fflush");
6189 if (TAILQ_EMPTY(&commitable_paths)) {
6190 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6194 TAILQ_FOREACH(pe, paths, entry) {
6195 err = check_path_is_commitable(pe->path, &commitable_paths);
6200 TAILQ_FOREACH(pe, &commitable_paths, entry) {
6201 struct got_commitable *ct = pe->data;
6202 const char *ct_path = ct->in_repo_path;
6204 while (ct_path[0] == '/')
6206 err = check_out_of_date(ct_path, ct->status,
6207 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6208 head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6214 err = commit_worktree(new_commit_id, &commitable_paths,
6215 head_commit_id, NULL, worktree, author, committer,
6216 (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6217 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6221 err = update_fileindex_after_commit(worktree, &commitable_paths,
6222 *new_commit_id, fileindex, have_staged_files);
6223 sync_err = sync_fileindex(fileindex, fileindex_path);
6224 if (sync_err && err == NULL)
6228 got_fileindex_free(fileindex);
6229 free(fileindex_path);
6230 unlockerr = lock_worktree(worktree, LOCK_SH);
6231 if (unlockerr && err == NULL)
6233 TAILQ_FOREACH(pe, &commitable_paths, entry) {
6234 struct got_commitable *ct = pe->data;
6236 free_commitable(ct);
6238 got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6239 if (diff_path && unlink(diff_path) == -1 && err == NULL)
6240 err = got_error_from_errno2("unlink", diff_path);
6242 if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6244 err = got_error_from_errno("fclose");
6249 got_commitable_get_path(struct got_commitable *ct)
6255 got_commitable_get_status(struct got_commitable *ct)
6260 struct check_rebase_ok_arg {
6261 struct got_worktree *worktree;
6262 struct got_repository *repo;
6265 static const struct got_error *
6266 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6268 const struct got_error *err = NULL;
6269 struct check_rebase_ok_arg *a = arg;
6270 unsigned char status;
6274 /* Reject rebase of a work tree with mixed base commits. */
6275 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6276 SHA1_DIGEST_LENGTH))
6277 return got_error(GOT_ERR_MIXED_COMMITS);
6279 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6281 return got_error_from_errno("asprintf");
6283 /* Reject rebase of a work tree with modified or staged files. */
6284 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6289 if (status != GOT_STATUS_NO_CHANGE)
6290 return got_error(GOT_ERR_MODIFIED);
6291 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6292 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6297 const struct got_error *
6298 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6299 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6300 struct got_worktree *worktree, struct got_reference *branch,
6301 struct got_repository *repo)
6303 const struct got_error *err = NULL;
6304 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6305 char *branch_ref_name = NULL;
6306 char *fileindex_path = NULL;
6307 struct check_rebase_ok_arg ok_arg;
6308 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6309 struct got_object_id *wt_branch_tip = NULL;
6311 *new_base_branch_ref = NULL;
6315 err = lock_worktree(worktree, LOCK_EX);
6319 err = open_fileindex(fileindex, &fileindex_path, worktree);
6323 ok_arg.worktree = worktree;
6325 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6330 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6334 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6338 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6342 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6347 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6350 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6351 err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6355 err = got_ref_alloc_symref(new_base_branch_ref,
6356 new_base_branch_ref_name, wt_branch);
6359 err = got_ref_write(*new_base_branch_ref, repo);
6363 /* TODO Lock original branch's ref while rebasing? */
6365 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6369 err = got_ref_write(branch_ref, repo);
6373 err = got_ref_alloc(tmp_branch, tmp_branch_name,
6374 worktree->base_commit_id);
6377 err = got_ref_write(*tmp_branch, repo);
6381 err = got_worktree_set_head_ref(worktree, *tmp_branch);
6385 free(fileindex_path);
6386 free(tmp_branch_name);
6387 free(new_base_branch_ref_name);
6388 free(branch_ref_name);
6390 got_ref_close(branch_ref);
6392 got_ref_close(wt_branch);
6393 free(wt_branch_tip);
6395 if (*new_base_branch_ref) {
6396 got_ref_close(*new_base_branch_ref);
6397 *new_base_branch_ref = NULL;
6400 got_ref_close(*tmp_branch);
6404 got_fileindex_free(*fileindex);
6407 lock_worktree(worktree, LOCK_SH);
6412 const struct got_error *
6413 got_worktree_rebase_continue(struct got_object_id **commit_id,
6414 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6415 struct got_reference **branch, struct got_fileindex **fileindex,
6416 struct got_worktree *worktree, struct got_repository *repo)
6418 const struct got_error *err;
6419 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6420 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6421 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6422 char *fileindex_path = NULL;
6423 int have_staged_files = 0;
6426 *new_base_branch = NULL;
6431 err = lock_worktree(worktree, LOCK_EX);
6435 err = open_fileindex(fileindex, &fileindex_path, worktree);
6439 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6440 &have_staged_files);
6441 if (err && err->code != GOT_ERR_CANCELLED)
6443 if (have_staged_files) {
6444 err = got_error(GOT_ERR_STAGED_PATHS);
6448 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6452 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6456 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6460 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6464 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6468 err = got_ref_open(branch, repo,
6469 got_ref_get_symref_target(branch_ref), 0);
6473 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6477 err = got_ref_resolve(commit_id, repo, commit_ref);
6481 err = got_ref_open(new_base_branch, repo,
6482 new_base_branch_ref_name, 0);
6486 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6490 free(commit_ref_name);
6491 free(branch_ref_name);
6492 free(fileindex_path);
6494 got_ref_close(commit_ref);
6496 got_ref_close(branch_ref);
6501 got_ref_close(*tmp_branch);
6504 if (*new_base_branch) {
6505 got_ref_close(*new_base_branch);
6506 *new_base_branch = NULL;
6509 got_ref_close(*branch);
6513 got_fileindex_free(*fileindex);
6516 lock_worktree(worktree, LOCK_SH);
6521 const struct got_error *
6522 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6524 const struct got_error *err;
6525 char *tmp_branch_name = NULL;
6527 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6531 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6532 free(tmp_branch_name);
6536 static const struct got_error *
6537 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6538 const char *diff_path, char **logmsg, void *arg)
6544 static const struct got_error *
6545 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6546 const char *path, struct got_object_id *blob_id,
6547 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6548 int dirfd, const char *de_name)
6553 struct collect_merged_paths_arg {
6554 got_worktree_checkout_cb progress_cb;
6556 struct got_pathlist_head *merged_paths;
6559 static const struct got_error *
6560 collect_merged_paths(void *arg, unsigned char status, const char *path)
6562 const struct got_error *err;
6563 struct collect_merged_paths_arg *a = arg;
6565 struct got_pathlist_entry *new;
6567 err = (*a->progress_cb)(a->progress_arg, status, path);
6571 if (status != GOT_STATUS_MERGE &&
6572 status != GOT_STATUS_ADD &&
6573 status != GOT_STATUS_DELETE &&
6574 status != GOT_STATUS_CONFLICT)
6579 return got_error_from_errno("strdup");
6581 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6582 if (err || new == NULL)
6587 static const struct got_error *
6588 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6589 int is_rebase, struct got_repository *repo)
6591 const struct got_error *err;
6592 struct got_reference *commit_ref = NULL;
6594 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6596 if (err->code != GOT_ERR_NOT_REF)
6598 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6601 err = got_ref_write(commit_ref, repo);
6604 } else if (is_rebase) {
6605 struct got_object_id *stored_id;
6608 err = got_ref_resolve(&stored_id, repo, commit_ref);
6611 cmp = got_object_id_cmp(commit_id, stored_id);
6614 err = got_error(GOT_ERR_REBASE_COMMITID);
6620 got_ref_close(commit_ref);
6624 static const struct got_error *
6625 rebase_merge_files(struct got_pathlist_head *merged_paths,
6626 const char *commit_ref_name, struct got_worktree *worktree,
6627 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6628 struct got_object_id *commit_id, struct got_repository *repo,
6629 got_worktree_checkout_cb progress_cb, void *progress_arg,
6630 got_cancel_cb cancel_cb, void *cancel_arg)
6632 const struct got_error *err;
6633 struct got_reference *commit_ref = NULL;
6634 struct collect_merged_paths_arg cmp_arg;
6635 char *fileindex_path;
6637 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6639 err = get_fileindex_path(&fileindex_path, worktree);
6643 cmp_arg.progress_cb = progress_cb;
6644 cmp_arg.progress_arg = progress_arg;
6645 cmp_arg.merged_paths = merged_paths;
6646 err = merge_files(worktree, fileindex, fileindex_path,
6647 parent_commit_id, commit_id, repo, collect_merged_paths,
6648 &cmp_arg, cancel_cb, cancel_arg);
6650 got_ref_close(commit_ref);
6654 const struct got_error *
6655 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6656 struct got_worktree *worktree, struct got_fileindex *fileindex,
6657 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6658 struct got_repository *repo,
6659 got_worktree_checkout_cb progress_cb, void *progress_arg,
6660 got_cancel_cb cancel_cb, void *cancel_arg)
6662 const struct got_error *err;
6663 char *commit_ref_name;
6665 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6669 err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6673 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6674 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6675 progress_arg, cancel_cb, cancel_arg);
6677 free(commit_ref_name);
6681 const struct got_error *
6682 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6683 struct got_worktree *worktree, struct got_fileindex *fileindex,
6684 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6685 struct got_repository *repo,
6686 got_worktree_checkout_cb progress_cb, void *progress_arg,
6687 got_cancel_cb cancel_cb, void *cancel_arg)
6689 const struct got_error *err;
6690 char *commit_ref_name;
6692 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6696 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6700 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6701 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6702 progress_arg, cancel_cb, cancel_arg);
6704 free(commit_ref_name);
6708 static const struct got_error *
6709 rebase_commit(struct got_object_id **new_commit_id,
6710 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6711 struct got_worktree *worktree, struct got_fileindex *fileindex,
6712 struct got_reference *tmp_branch, const char *committer,
6713 struct got_commit_object *orig_commit, const char *new_logmsg,
6714 struct got_repository *repo)
6716 const struct got_error *err, *sync_err;
6717 struct got_pathlist_head commitable_paths;
6718 struct collect_commitables_arg cc_arg;
6719 char *fileindex_path = NULL;
6720 struct got_reference *head_ref = NULL;
6721 struct got_object_id *head_commit_id = NULL;
6722 char *logmsg = NULL;
6724 memset(&cc_arg, 0, sizeof(cc_arg));
6725 TAILQ_INIT(&commitable_paths);
6726 *new_commit_id = NULL;
6728 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6730 err = get_fileindex_path(&fileindex_path, worktree);
6734 cc_arg.commitable_paths = &commitable_paths;
6735 cc_arg.worktree = worktree;
6737 cc_arg.have_staged_files = 0;
6739 * If possible get the status of individual files directly to
6740 * avoid crawling the entire work tree once per rebased commit.
6742 * Ideally, merged_paths would contain a list of commitables
6743 * we could use so we could skip worktree_status() entirely.
6744 * However, we would then need carefully keep track of cumulative
6745 * effects of operations such as file additions and deletions
6746 * in 'got histedit -f' (folding multiple commits into one),
6747 * and this extra complexity is not really worth it.
6750 struct got_pathlist_entry *pe;
6751 TAILQ_FOREACH(pe, merged_paths, entry) {
6752 err = worktree_status(worktree, pe->path, fileindex,
6753 repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6759 err = worktree_status(worktree, "", fileindex, repo,
6760 collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6765 if (TAILQ_EMPTY(&commitable_paths)) {
6766 /* No-op change; commit will be elided. */
6767 err = got_ref_delete(commit_ref, repo);
6770 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6774 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6778 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6783 logmsg = strdup(new_logmsg);
6784 if (logmsg == NULL) {
6785 err = got_error_from_errno("strdup");
6789 err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6794 /* NB: commit_worktree will call free(logmsg) */
6795 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6796 NULL, worktree, got_object_commit_get_author(orig_commit),
6797 committer ? committer :
6798 got_object_commit_get_committer(orig_commit), NULL,
6799 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6803 err = got_ref_change_ref(tmp_branch, *new_commit_id);
6807 err = got_ref_delete(commit_ref, repo);
6811 err = update_fileindex_after_commit(worktree, &commitable_paths,
6812 *new_commit_id, fileindex, 0);
6813 sync_err = sync_fileindex(fileindex, fileindex_path);
6814 if (sync_err && err == NULL)
6817 free(fileindex_path);
6818 free(head_commit_id);
6820 got_ref_close(head_ref);
6822 free(*new_commit_id);
6823 *new_commit_id = NULL;
6828 const struct got_error *
6829 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6830 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6831 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6832 const char *committer, struct got_commit_object *orig_commit,
6833 struct got_object_id *orig_commit_id, struct got_repository *repo)
6835 const struct got_error *err;
6836 char *commit_ref_name;
6837 struct got_reference *commit_ref = NULL;
6838 struct got_object_id *commit_id = NULL;
6840 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6844 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6847 err = got_ref_resolve(&commit_id, repo, commit_ref);
6850 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6851 err = got_error(GOT_ERR_REBASE_COMMITID);
6855 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6856 worktree, fileindex, tmp_branch, committer, orig_commit,
6860 got_ref_close(commit_ref);
6861 free(commit_ref_name);
6866 const struct got_error *
6867 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6868 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6869 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6870 const char *committer, struct got_commit_object *orig_commit,
6871 struct got_object_id *orig_commit_id, const char *new_logmsg,
6872 struct got_repository *repo)
6874 const struct got_error *err;
6875 char *commit_ref_name;
6876 struct got_reference *commit_ref = NULL;
6878 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6882 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6886 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6887 worktree, fileindex, tmp_branch, committer, orig_commit,
6891 got_ref_close(commit_ref);
6892 free(commit_ref_name);
6896 const struct got_error *
6897 got_worktree_rebase_postpone(struct got_worktree *worktree,
6898 struct got_fileindex *fileindex)
6901 got_fileindex_free(fileindex);
6902 return lock_worktree(worktree, LOCK_SH);
6905 static const struct got_error *
6906 delete_ref(const char *name, struct got_repository *repo)
6908 const struct got_error *err;
6909 struct got_reference *ref;
6911 err = got_ref_open(&ref, repo, name, 0);
6913 if (err->code == GOT_ERR_NOT_REF)
6918 err = got_ref_delete(ref, repo);
6923 static const struct got_error *
6924 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6926 const struct got_error *err;
6927 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6928 char *branch_ref_name = NULL, *commit_ref_name = NULL;
6930 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6933 err = delete_ref(tmp_branch_name, repo);
6937 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6940 err = delete_ref(new_base_branch_ref_name, repo);
6944 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6947 err = delete_ref(branch_ref_name, repo);
6951 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6954 err = delete_ref(commit_ref_name, repo);
6959 free(tmp_branch_name);
6960 free(new_base_branch_ref_name);
6961 free(branch_ref_name);
6962 free(commit_ref_name);
6966 static const struct got_error *
6967 create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6968 struct got_object_id *new_commit_id, struct got_repository *repo)
6970 const struct got_error *err;
6971 struct got_reference *ref = NULL;
6972 struct got_object_id *old_commit_id = NULL;
6973 const char *branch_name = NULL;
6974 char *new_id_str = NULL;
6975 char *refname = NULL;
6977 branch_name = got_ref_get_name(branch);
6978 if (strncmp(branch_name, "refs/heads/", 11) != 0)
6979 return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6982 err = got_object_id_str(&new_id_str, new_commit_id);
6986 if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6987 new_id_str) == -1) {
6988 err = got_error_from_errno("asprintf");
6992 err = got_ref_resolve(&old_commit_id, repo, branch);
6996 err = got_ref_alloc(&ref, refname, old_commit_id);
7000 err = got_ref_write(ref, repo);
7004 free(old_commit_id);
7010 const struct got_error *
7011 got_worktree_rebase_complete(struct got_worktree *worktree,
7012 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7013 struct got_reference *rebased_branch, struct got_repository *repo,
7016 const struct got_error *err, *unlockerr, *sync_err;
7017 struct got_object_id *new_head_commit_id = NULL;
7018 char *fileindex_path = NULL;
7020 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7024 if (create_backup) {
7025 err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7026 rebased_branch, new_head_commit_id, repo);
7031 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7035 err = got_ref_write(rebased_branch, repo);
7039 err = got_worktree_set_head_ref(worktree, rebased_branch);
7043 err = delete_rebase_refs(worktree, repo);
7047 err = get_fileindex_path(&fileindex_path, worktree);
7050 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7051 sync_err = sync_fileindex(fileindex, fileindex_path);
7052 if (sync_err && err == NULL)
7055 got_fileindex_free(fileindex);
7056 free(fileindex_path);
7057 free(new_head_commit_id);
7058 unlockerr = lock_worktree(worktree, LOCK_SH);
7059 if (unlockerr && err == NULL)
7064 const struct got_error *
7065 got_worktree_rebase_abort(struct got_worktree *worktree,
7066 struct got_fileindex *fileindex, struct got_repository *repo,
7067 struct got_reference *new_base_branch,
7068 got_worktree_checkout_cb progress_cb, void *progress_arg)
7070 const struct got_error *err, *unlockerr, *sync_err;
7071 struct got_reference *resolved = NULL;
7072 struct got_object_id *commit_id = NULL;
7073 struct got_commit_object *commit = NULL;
7074 char *fileindex_path = NULL;
7075 struct revert_file_args rfa;
7076 struct got_object_id *tree_id = NULL;
7078 err = lock_worktree(worktree, LOCK_EX);
7082 err = got_object_open_as_commit(&commit, repo,
7083 worktree->base_commit_id);
7087 err = got_ref_open(&resolved, repo,
7088 got_ref_get_symref_target(new_base_branch), 0);
7092 err = got_worktree_set_head_ref(worktree, resolved);
7097 * XXX commits to the base branch could have happened while
7098 * we were busy rebasing; should we store the original commit ID
7099 * when rebase begins and read it back here?
7101 err = got_ref_resolve(&commit_id, repo, resolved);
7105 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7109 err = got_object_id_by_path(&tree_id, repo, commit,
7110 worktree->path_prefix);
7114 err = delete_rebase_refs(worktree, repo);
7118 err = get_fileindex_path(&fileindex_path, worktree);
7122 rfa.worktree = worktree;
7123 rfa.fileindex = fileindex;
7124 rfa.progress_cb = progress_cb;
7125 rfa.progress_arg = progress_arg;
7126 rfa.patch_cb = NULL;
7127 rfa.patch_arg = NULL;
7129 rfa.unlink_added_files = 0;
7130 err = worktree_status(worktree, "", fileindex, repo,
7131 revert_file, &rfa, NULL, NULL, 1, 0);
7135 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7136 repo, progress_cb, progress_arg, NULL, NULL);
7138 sync_err = sync_fileindex(fileindex, fileindex_path);
7139 if (sync_err && err == NULL)
7142 got_ref_close(resolved);
7146 got_object_commit_close(commit);
7148 got_fileindex_free(fileindex);
7149 free(fileindex_path);
7151 unlockerr = lock_worktree(worktree, LOCK_SH);
7152 if (unlockerr && err == NULL)
7157 const struct got_error *
7158 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7159 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7160 struct got_fileindex **fileindex, struct got_worktree *worktree,
7161 struct got_repository *repo)
7163 const struct got_error *err = NULL;
7164 char *tmp_branch_name = NULL;
7165 char *branch_ref_name = NULL;
7166 char *base_commit_ref_name = NULL;
7167 char *fileindex_path = NULL;
7168 struct check_rebase_ok_arg ok_arg;
7169 struct got_reference *wt_branch = NULL;
7170 struct got_reference *base_commit_ref = NULL;
7174 *base_commit_id = NULL;
7177 err = lock_worktree(worktree, LOCK_EX);
7181 err = open_fileindex(fileindex, &fileindex_path, worktree);
7185 ok_arg.worktree = worktree;
7187 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7192 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7196 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7200 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7205 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7210 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7214 err = got_ref_write(*branch_ref, repo);
7218 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7219 worktree->base_commit_id);
7222 err = got_ref_write(base_commit_ref, repo);
7225 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
7226 if (*base_commit_id == NULL) {
7227 err = got_error_from_errno("got_object_id_dup");
7231 err = got_ref_alloc(tmp_branch, tmp_branch_name,
7232 worktree->base_commit_id);
7235 err = got_ref_write(*tmp_branch, repo);
7239 err = got_worktree_set_head_ref(worktree, *tmp_branch);
7243 free(fileindex_path);
7244 free(tmp_branch_name);
7245 free(branch_ref_name);
7246 free(base_commit_ref_name);
7248 got_ref_close(wt_branch);
7251 got_ref_close(*branch_ref);
7255 got_ref_close(*tmp_branch);
7258 free(*base_commit_id);
7260 got_fileindex_free(*fileindex);
7263 lock_worktree(worktree, LOCK_SH);
7268 const struct got_error *
7269 got_worktree_histedit_postpone(struct got_worktree *worktree,
7270 struct got_fileindex *fileindex)
7273 got_fileindex_free(fileindex);
7274 return lock_worktree(worktree, LOCK_SH);
7277 const struct got_error *
7278 got_worktree_histedit_in_progress(int *in_progress,
7279 struct got_worktree *worktree)
7281 const struct got_error *err;
7282 char *tmp_branch_name = NULL;
7284 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7288 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7289 free(tmp_branch_name);
7293 const struct got_error *
7294 got_worktree_histedit_continue(struct got_object_id **commit_id,
7295 struct got_reference **tmp_branch, struct got_reference **branch_ref,
7296 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7297 struct got_worktree *worktree, struct got_repository *repo)
7299 const struct got_error *err;
7300 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7301 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7302 struct got_reference *commit_ref = NULL;
7303 struct got_reference *base_commit_ref = NULL;
7304 char *fileindex_path = NULL;
7305 int have_staged_files = 0;
7309 *base_commit_id = NULL;
7312 err = lock_worktree(worktree, LOCK_EX);
7316 err = open_fileindex(fileindex, &fileindex_path, worktree);
7320 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7321 &have_staged_files);
7322 if (err && err->code != GOT_ERR_CANCELLED)
7324 if (have_staged_files) {
7325 err = got_error(GOT_ERR_STAGED_PATHS);
7329 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7333 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7337 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7341 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7346 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7350 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7353 err = got_ref_resolve(commit_id, repo, commit_ref);
7357 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7360 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7364 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7368 free(commit_ref_name);
7369 free(branch_ref_name);
7370 free(fileindex_path);
7372 got_ref_close(commit_ref);
7373 if (base_commit_ref)
7374 got_ref_close(base_commit_ref);
7378 free(*base_commit_id);
7379 *base_commit_id = NULL;
7381 got_ref_close(*tmp_branch);
7385 got_fileindex_free(*fileindex);
7388 lock_worktree(worktree, LOCK_EX);
7393 static const struct got_error *
7394 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7396 const struct got_error *err;
7397 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7398 char *branch_ref_name = NULL, *commit_ref_name = NULL;
7400 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7403 err = delete_ref(tmp_branch_name, repo);
7407 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7411 err = delete_ref(base_commit_ref_name, repo);
7415 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7418 err = delete_ref(branch_ref_name, repo);
7422 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7425 err = delete_ref(commit_ref_name, repo);
7429 free(tmp_branch_name);
7430 free(base_commit_ref_name);
7431 free(branch_ref_name);
7432 free(commit_ref_name);
7436 const struct got_error *
7437 got_worktree_histedit_abort(struct got_worktree *worktree,
7438 struct got_fileindex *fileindex, struct got_repository *repo,
7439 struct got_reference *branch, struct got_object_id *base_commit_id,
7440 got_worktree_checkout_cb progress_cb, void *progress_arg)
7442 const struct got_error *err, *unlockerr, *sync_err;
7443 struct got_reference *resolved = NULL;
7444 char *fileindex_path = NULL;
7445 struct got_commit_object *commit = NULL;
7446 struct got_object_id *tree_id = NULL;
7447 struct revert_file_args rfa;
7449 err = lock_worktree(worktree, LOCK_EX);
7453 err = got_object_open_as_commit(&commit, repo,
7454 worktree->base_commit_id);
7458 err = got_ref_open(&resolved, repo,
7459 got_ref_get_symref_target(branch), 0);
7463 err = got_worktree_set_head_ref(worktree, resolved);
7467 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7471 err = got_object_id_by_path(&tree_id, repo, commit,
7472 worktree->path_prefix);
7476 err = delete_histedit_refs(worktree, repo);
7480 err = get_fileindex_path(&fileindex_path, worktree);
7484 rfa.worktree = worktree;
7485 rfa.fileindex = fileindex;
7486 rfa.progress_cb = progress_cb;
7487 rfa.progress_arg = progress_arg;
7488 rfa.patch_cb = NULL;
7489 rfa.patch_arg = NULL;
7491 rfa.unlink_added_files = 0;
7492 err = worktree_status(worktree, "", fileindex, repo,
7493 revert_file, &rfa, NULL, NULL, 1, 0);
7497 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7498 repo, progress_cb, progress_arg, NULL, NULL);
7500 sync_err = sync_fileindex(fileindex, fileindex_path);
7501 if (sync_err && err == NULL)
7504 got_ref_close(resolved);
7506 free(fileindex_path);
7508 unlockerr = lock_worktree(worktree, LOCK_SH);
7509 if (unlockerr && err == NULL)
7514 const struct got_error *
7515 got_worktree_histedit_complete(struct got_worktree *worktree,
7516 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7517 struct got_reference *edited_branch, struct got_repository *repo)
7519 const struct got_error *err, *unlockerr, *sync_err;
7520 struct got_object_id *new_head_commit_id = NULL;
7521 struct got_reference *resolved = NULL;
7522 char *fileindex_path = NULL;
7524 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7528 err = got_ref_open(&resolved, repo,
7529 got_ref_get_symref_target(edited_branch), 0);
7533 err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7534 resolved, new_head_commit_id, repo);
7538 err = got_ref_change_ref(resolved, new_head_commit_id);
7542 err = got_ref_write(resolved, repo);
7546 err = got_worktree_set_head_ref(worktree, resolved);
7550 err = delete_histedit_refs(worktree, repo);
7554 err = get_fileindex_path(&fileindex_path, worktree);
7557 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7558 sync_err = sync_fileindex(fileindex, fileindex_path);
7559 if (sync_err && err == NULL)
7562 got_fileindex_free(fileindex);
7563 free(fileindex_path);
7564 free(new_head_commit_id);
7565 unlockerr = lock_worktree(worktree, LOCK_SH);
7566 if (unlockerr && err == NULL)
7571 const struct got_error *
7572 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7573 struct got_object_id *commit_id, struct got_repository *repo)
7575 const struct got_error *err;
7576 char *commit_ref_name;
7578 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7582 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7586 err = delete_ref(commit_ref_name, repo);
7588 free(commit_ref_name);
7592 const struct got_error *
7593 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7594 struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7595 struct got_worktree *worktree, const char *refname,
7596 struct got_repository *repo)
7598 const struct got_error *err = NULL;
7599 char *fileindex_path = NULL;
7600 struct check_rebase_ok_arg ok_arg;
7604 *base_branch_ref = NULL;
7606 err = lock_worktree(worktree, LOCK_EX);
7610 if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7611 err = got_error_msg(GOT_ERR_SAME_BRANCH,
7612 "cannot integrate a branch into itself; "
7613 "update -b or different branch name required");
7617 err = open_fileindex(fileindex, &fileindex_path, worktree);
7621 /* Preconditions are the same as for rebase. */
7622 ok_arg.worktree = worktree;
7624 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7629 err = got_ref_open(branch_ref, repo, refname, 1);
7633 err = got_ref_open(base_branch_ref, repo,
7634 got_worktree_get_head_ref_name(worktree), 1);
7638 got_ref_close(*branch_ref);
7641 if (*base_branch_ref) {
7642 got_ref_close(*base_branch_ref);
7643 *base_branch_ref = NULL;
7646 got_fileindex_free(*fileindex);
7649 lock_worktree(worktree, LOCK_SH);
7654 const struct got_error *
7655 got_worktree_integrate_continue(struct got_worktree *worktree,
7656 struct got_fileindex *fileindex, struct got_repository *repo,
7657 struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7658 got_worktree_checkout_cb progress_cb, void *progress_arg,
7659 got_cancel_cb cancel_cb, void *cancel_arg)
7661 const struct got_error *err = NULL, *sync_err, *unlockerr;
7662 char *fileindex_path = NULL;
7663 struct got_object_id *tree_id = NULL, *commit_id = NULL;
7664 struct got_commit_object *commit = NULL;
7666 err = get_fileindex_path(&fileindex_path, worktree);
7670 err = got_ref_resolve(&commit_id, repo, branch_ref);
7674 err = got_object_open_as_commit(&commit, repo, commit_id);
7678 err = got_object_id_by_path(&tree_id, repo, commit,
7679 worktree->path_prefix);
7683 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7687 err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7688 progress_cb, progress_arg, cancel_cb, cancel_arg);
7692 err = got_ref_change_ref(base_branch_ref, commit_id);
7696 err = got_ref_write(base_branch_ref, repo);
7700 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7702 sync_err = sync_fileindex(fileindex, fileindex_path);
7703 if (sync_err && err == NULL)
7707 unlockerr = got_ref_unlock(branch_ref);
7708 if (unlockerr && err == NULL)
7710 got_ref_close(branch_ref);
7712 unlockerr = got_ref_unlock(base_branch_ref);
7713 if (unlockerr && err == NULL)
7715 got_ref_close(base_branch_ref);
7717 got_fileindex_free(fileindex);
7718 free(fileindex_path);
7721 got_object_commit_close(commit);
7723 unlockerr = lock_worktree(worktree, LOCK_SH);
7724 if (unlockerr && err == NULL)
7729 const struct got_error *
7730 got_worktree_integrate_abort(struct got_worktree *worktree,
7731 struct got_fileindex *fileindex, struct got_repository *repo,
7732 struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7734 const struct got_error *err = NULL, *unlockerr = NULL;
7736 got_fileindex_free(fileindex);
7738 err = lock_worktree(worktree, LOCK_SH);
7740 unlockerr = got_ref_unlock(branch_ref);
7741 if (unlockerr && err == NULL)
7743 got_ref_close(branch_ref);
7745 unlockerr = got_ref_unlock(base_branch_ref);
7746 if (unlockerr && err == NULL)
7748 got_ref_close(base_branch_ref);
7753 const struct got_error *
7754 got_worktree_merge_postpone(struct got_worktree *worktree,
7755 struct got_fileindex *fileindex)
7757 const struct got_error *err, *sync_err;
7758 char *fileindex_path = NULL;
7760 err = get_fileindex_path(&fileindex_path, worktree);
7764 sync_err = sync_fileindex(fileindex, fileindex_path);
7766 err = lock_worktree(worktree, LOCK_SH);
7767 if (sync_err && err == NULL)
7770 got_fileindex_free(fileindex);
7771 free(fileindex_path);
7775 static const struct got_error *
7776 delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7778 const struct got_error *err;
7779 char *branch_refname = NULL, *commit_refname = NULL;
7781 err = get_merge_branch_ref_name(&branch_refname, worktree);
7784 err = delete_ref(branch_refname, repo);
7788 err = get_merge_commit_ref_name(&commit_refname, worktree);
7791 err = delete_ref(commit_refname, repo);
7796 free(branch_refname);
7797 free(commit_refname);
7801 struct merge_commit_msg_arg {
7802 struct got_worktree *worktree;
7803 const char *branch_name;
7806 static const struct got_error *
7807 merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7808 const char *diff_path, char **logmsg, void *arg)
7810 struct merge_commit_msg_arg *a = arg;
7812 if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7813 got_worktree_get_head_ref_name(a->worktree)) == -1)
7814 return got_error_from_errno("asprintf");
7820 const struct got_error *
7821 got_worktree_merge_branch(struct got_worktree *worktree,
7822 struct got_fileindex *fileindex,
7823 struct got_object_id *yca_commit_id,
7824 struct got_object_id *branch_tip,
7825 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7826 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7828 const struct got_error *err;
7829 char *fileindex_path = NULL;
7831 err = get_fileindex_path(&fileindex_path, worktree);
7835 err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7840 err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7841 branch_tip, repo, progress_cb, progress_arg,
7842 cancel_cb, cancel_arg);
7844 free(fileindex_path);
7848 const struct got_error *
7849 got_worktree_merge_commit(struct got_object_id **new_commit_id,
7850 struct got_worktree *worktree, struct got_fileindex *fileindex,
7851 const char *author, const char *committer, int allow_bad_symlinks,
7852 struct got_object_id *branch_tip, const char *branch_name,
7853 struct got_repository *repo,
7854 got_worktree_status_cb status_cb, void *status_arg)
7857 const struct got_error *err = NULL, *sync_err;
7858 struct got_pathlist_head commitable_paths;
7859 struct collect_commitables_arg cc_arg;
7860 struct got_pathlist_entry *pe;
7861 struct got_reference *head_ref = NULL;
7862 struct got_object_id *head_commit_id = NULL;
7863 int have_staged_files = 0;
7864 struct merge_commit_msg_arg mcm_arg;
7865 char *fileindex_path = NULL;
7867 memset(&cc_arg, 0, sizeof(cc_arg));
7868 *new_commit_id = NULL;
7870 TAILQ_INIT(&commitable_paths);
7872 err = get_fileindex_path(&fileindex_path, worktree);
7876 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7880 err = got_ref_resolve(&head_commit_id, repo, head_ref);
7884 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7885 &have_staged_files);
7886 if (err && err->code != GOT_ERR_CANCELLED)
7888 if (have_staged_files) {
7889 err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7893 cc_arg.commitable_paths = &commitable_paths;
7894 cc_arg.worktree = worktree;
7895 cc_arg.fileindex = fileindex;
7897 cc_arg.have_staged_files = have_staged_files;
7898 cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7899 err = worktree_status(worktree, "", fileindex, repo,
7900 collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7904 if (TAILQ_EMPTY(&commitable_paths)) {
7905 err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7906 "merge of %s cannot proceed", branch_name);
7910 TAILQ_FOREACH(pe, &commitable_paths, entry) {
7911 struct got_commitable *ct = pe->data;
7912 const char *ct_path = ct->in_repo_path;
7914 while (ct_path[0] == '/')
7916 err = check_out_of_date(ct_path, ct->status,
7917 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7918 head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7924 mcm_arg.worktree = worktree;
7925 mcm_arg.branch_name = branch_name;
7926 err = commit_worktree(new_commit_id, &commitable_paths,
7927 head_commit_id, branch_tip, worktree, author, committer, NULL,
7928 merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7932 err = update_fileindex_after_commit(worktree, &commitable_paths,
7933 *new_commit_id, fileindex, have_staged_files);
7934 sync_err = sync_fileindex(fileindex, fileindex_path);
7935 if (sync_err && err == NULL)
7938 TAILQ_FOREACH(pe, &commitable_paths, entry) {
7939 struct got_commitable *ct = pe->data;
7941 free_commitable(ct);
7943 got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
7944 free(fileindex_path);
7948 const struct got_error *
7949 got_worktree_merge_complete(struct got_worktree *worktree,
7950 struct got_fileindex *fileindex, struct got_repository *repo)
7952 const struct got_error *err, *unlockerr, *sync_err;
7953 char *fileindex_path = NULL;
7955 err = delete_merge_refs(worktree, repo);
7959 err = get_fileindex_path(&fileindex_path, worktree);
7962 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7963 sync_err = sync_fileindex(fileindex, fileindex_path);
7964 if (sync_err && err == NULL)
7967 got_fileindex_free(fileindex);
7968 free(fileindex_path);
7969 unlockerr = lock_worktree(worktree, LOCK_SH);
7970 if (unlockerr && err == NULL)
7975 const struct got_error *
7976 got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7977 struct got_repository *repo)
7979 const struct got_error *err;
7980 char *branch_refname = NULL;
7981 struct got_reference *branch_ref = NULL;
7985 err = get_merge_branch_ref_name(&branch_refname, worktree);
7988 err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7989 free(branch_refname);
7991 if (err->code != GOT_ERR_NOT_REF)
7999 const struct got_error *got_worktree_merge_prepare(
8000 struct got_fileindex **fileindex, struct got_worktree *worktree,
8001 struct got_reference *branch, struct got_repository *repo)
8003 const struct got_error *err = NULL;
8004 char *fileindex_path = NULL;
8005 char *branch_refname = NULL, *commit_refname = NULL;
8006 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8007 struct got_reference *commit_ref = NULL;
8008 struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8009 struct check_rebase_ok_arg ok_arg;
8013 err = lock_worktree(worktree, LOCK_EX);
8017 err = open_fileindex(fileindex, &fileindex_path, worktree);
8021 /* Preconditions are the same as for rebase. */
8022 ok_arg.worktree = worktree;
8024 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8029 err = get_merge_branch_ref_name(&branch_refname, worktree);
8033 err = get_merge_commit_ref_name(&commit_refname, worktree);
8037 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8042 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8046 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8047 err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8051 err = got_ref_resolve(&branch_tip, repo, branch);
8055 err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8058 err = got_ref_write(branch_ref, repo);
8062 err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8065 err = got_ref_write(commit_ref, repo);
8070 free(branch_refname);
8071 free(commit_refname);
8072 free(fileindex_path);
8074 got_ref_close(branch_ref);
8076 got_ref_close(commit_ref);
8078 got_ref_close(wt_branch);
8079 free(wt_branch_tip);
8082 got_fileindex_free(*fileindex);
8085 lock_worktree(worktree, LOCK_SH);
8090 const struct got_error *
8091 got_worktree_merge_continue(char **branch_name,
8092 struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8093 struct got_worktree *worktree, struct got_repository *repo)
8095 const struct got_error *err;
8096 char *commit_refname = NULL, *branch_refname = NULL;
8097 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8098 char *fileindex_path = NULL;
8099 int have_staged_files = 0;
8101 *branch_name = NULL;
8105 err = lock_worktree(worktree, LOCK_EX);
8109 err = open_fileindex(fileindex, &fileindex_path, worktree);
8113 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8114 &have_staged_files);
8115 if (err && err->code != GOT_ERR_CANCELLED)
8117 if (have_staged_files) {
8118 err = got_error(GOT_ERR_STAGED_PATHS);
8122 err = get_merge_branch_ref_name(&branch_refname, worktree);
8126 err = get_merge_commit_ref_name(&commit_refname, worktree);
8130 err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8134 if (!got_ref_is_symbolic(branch_ref)) {
8135 err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8136 "%s is not a symbolic reference",
8137 got_ref_get_name(branch_ref));
8140 *branch_name = strdup(got_ref_get_symref_target(branch_ref));
8141 if (*branch_name == NULL) {
8142 err = got_error_from_errno("strdup");
8146 err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8150 err = got_ref_resolve(branch_tip, repo, commit_ref);
8154 free(commit_refname);
8155 free(branch_refname);
8156 free(fileindex_path);
8158 got_ref_close(commit_ref);
8160 got_ref_close(branch_ref);
8164 *branch_name = NULL;
8169 got_fileindex_free(*fileindex);
8172 lock_worktree(worktree, LOCK_SH);
8177 const struct got_error *
8178 got_worktree_merge_abort(struct got_worktree *worktree,
8179 struct got_fileindex *fileindex, struct got_repository *repo,
8180 got_worktree_checkout_cb progress_cb, void *progress_arg)
8182 const struct got_error *err, *unlockerr, *sync_err;
8183 struct got_object_id *commit_id = NULL;
8184 struct got_commit_object *commit = NULL;
8185 char *fileindex_path = NULL;
8186 struct revert_file_args rfa;
8187 struct got_object_id *tree_id = NULL;
8189 err = got_object_open_as_commit(&commit, repo,
8190 worktree->base_commit_id);
8194 err = got_object_id_by_path(&tree_id, repo, commit,
8195 worktree->path_prefix);
8199 err = delete_merge_refs(worktree, repo);
8203 err = get_fileindex_path(&fileindex_path, worktree);
8207 rfa.worktree = worktree;
8208 rfa.fileindex = fileindex;
8209 rfa.progress_cb = progress_cb;
8210 rfa.progress_arg = progress_arg;
8211 rfa.patch_cb = NULL;
8212 rfa.patch_arg = NULL;
8214 rfa.unlink_added_files = 1;
8215 err = worktree_status(worktree, "", fileindex, repo,
8216 revert_file, &rfa, NULL, NULL, 1, 0);
8220 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8221 repo, progress_cb, progress_arg, NULL, NULL);
8223 sync_err = sync_fileindex(fileindex, fileindex_path);
8224 if (sync_err && err == NULL)
8230 got_object_commit_close(commit);
8232 got_fileindex_free(fileindex);
8233 free(fileindex_path);
8235 unlockerr = lock_worktree(worktree, LOCK_SH);
8236 if (unlockerr && err == NULL)
8241 struct check_stage_ok_arg {
8242 struct got_object_id *head_commit_id;
8243 struct got_worktree *worktree;
8244 struct got_fileindex *fileindex;
8245 struct got_repository *repo;
8249 static const struct got_error *
8250 check_stage_ok(void *arg, unsigned char status,
8251 unsigned char staged_status, const char *relpath,
8252 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8253 struct got_object_id *commit_id, int dirfd, const char *de_name)
8255 struct check_stage_ok_arg *a = arg;
8256 const struct got_error *err = NULL;
8257 struct got_fileindex_entry *ie;
8258 struct got_object_id base_commit_id;
8259 struct got_object_id *base_commit_idp = NULL;
8260 char *in_repo_path = NULL, *p;
8262 if (status == GOT_STATUS_UNVERSIONED ||
8263 status == GOT_STATUS_NO_CHANGE)
8265 if (status == GOT_STATUS_NONEXISTENT)
8266 return got_error_set_errno(ENOENT, relpath);
8268 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8270 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8272 if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8273 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8275 return got_error_from_errno("asprintf");
8277 if (got_fileindex_entry_has_commit(ie)) {
8278 base_commit_idp = got_fileindex_entry_get_commit_id(
8279 &base_commit_id, ie);
8282 if (status == GOT_STATUS_CONFLICT) {
8283 err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8285 } else if (status != GOT_STATUS_ADD &&
8286 status != GOT_STATUS_MODIFY &&
8287 status != GOT_STATUS_DELETE) {
8288 err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8292 a->have_changes = 1;
8297 err = check_out_of_date(p, status, staged_status,
8298 blob_id, base_commit_idp, a->head_commit_id, a->repo,
8299 GOT_ERR_STAGE_OUT_OF_DATE);
8305 struct stage_path_arg {
8306 struct got_worktree *worktree;
8307 struct got_fileindex *fileindex;
8308 struct got_repository *repo;
8309 got_worktree_status_cb status_cb;
8311 got_worktree_patch_cb patch_cb;
8313 int staged_something;
8314 int allow_bad_symlinks;
8317 static const struct got_error *
8318 stage_path(void *arg, unsigned char status,
8319 unsigned char staged_status, const char *relpath,
8320 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8321 struct got_object_id *commit_id, int dirfd, const char *de_name)
8323 struct stage_path_arg *a = arg;
8324 const struct got_error *err = NULL;
8325 struct got_fileindex_entry *ie;
8326 char *ondisk_path = NULL, *path_content = NULL;
8328 struct got_object_id *new_staged_blob_id = NULL;
8331 if (status == GOT_STATUS_UNVERSIONED)
8334 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8336 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8338 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8340 return got_error_from_errno("asprintf");
8343 case GOT_STATUS_ADD:
8344 case GOT_STATUS_MODIFY:
8345 /* XXX could sb.st_mode be passed in by our caller? */
8346 if (lstat(ondisk_path, &sb) == -1) {
8347 err = got_error_from_errno2("lstat", ondisk_path);
8351 if (status == GOT_STATUS_ADD) {
8352 int choice = GOT_PATCH_CHOICE_NONE;
8353 err = (*a->patch_cb)(&choice, a->patch_arg,
8354 status, ie->path, NULL, 1, 1);
8357 if (choice != GOT_PATCH_CHOICE_YES)
8360 err = create_patched_content(&path_content, 0,
8361 staged_blob_id ? staged_blob_id : blob_id,
8362 ondisk_path, dirfd, de_name, ie->path,
8363 a->repo, a->patch_cb, a->patch_arg);
8364 if (err || path_content == NULL)
8368 err = got_object_blob_create(&new_staged_blob_id,
8369 path_content ? path_content : ondisk_path, a->repo);
8372 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8373 SHA1_DIGEST_LENGTH);
8374 if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8375 stage = GOT_FILEIDX_STAGE_ADD;
8377 stage = GOT_FILEIDX_STAGE_MODIFY;
8378 got_fileindex_entry_stage_set(ie, stage);
8379 if (S_ISLNK(sb.st_mode)) {
8380 int is_bad_symlink = 0;
8381 if (!a->allow_bad_symlinks) {
8382 char target_path[PATH_MAX];
8384 target_len = readlink(ondisk_path, target_path,
8385 sizeof(target_path));
8386 if (target_len == -1) {
8387 err = got_error_from_errno2("readlink",
8391 err = is_bad_symlink_target(&is_bad_symlink,
8392 target_path, target_len, ondisk_path,
8393 a->worktree->root_path);
8396 if (is_bad_symlink) {
8397 err = got_error_path(ondisk_path,
8398 GOT_ERR_BAD_SYMLINK);
8403 got_fileindex_entry_staged_filetype_set(ie,
8404 GOT_FILEIDX_MODE_BAD_SYMLINK);
8406 got_fileindex_entry_staged_filetype_set(ie,
8407 GOT_FILEIDX_MODE_SYMLINK);
8409 got_fileindex_entry_staged_filetype_set(ie,
8410 GOT_FILEIDX_MODE_REGULAR_FILE);
8412 a->staged_something = 1;
8413 if (a->status_cb == NULL)
8415 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8416 get_staged_status(ie), relpath, blob_id,
8417 new_staged_blob_id, NULL, dirfd, de_name);
8421 * When staging the reverse of the staged diff,
8422 * implicitly unstage the file.
8424 if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8425 sizeof(ie->blob_sha1)) == 0) {
8426 got_fileindex_entry_stage_set(ie,
8427 GOT_FILEIDX_STAGE_NONE);
8430 case GOT_STATUS_DELETE:
8431 if (staged_status == GOT_STATUS_DELETE)
8434 int choice = GOT_PATCH_CHOICE_NONE;
8435 err = (*a->patch_cb)(&choice, a->patch_arg, status,
8436 ie->path, NULL, 1, 1);
8439 if (choice == GOT_PATCH_CHOICE_NO)
8441 if (choice != GOT_PATCH_CHOICE_YES) {
8442 err = got_error(GOT_ERR_PATCH_CHOICE);
8446 stage = GOT_FILEIDX_STAGE_DELETE;
8447 got_fileindex_entry_stage_set(ie, stage);
8448 a->staged_something = 1;
8449 if (a->status_cb == NULL)
8451 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8452 get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8455 case GOT_STATUS_NO_CHANGE:
8457 case GOT_STATUS_CONFLICT:
8458 err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8460 case GOT_STATUS_NONEXISTENT:
8461 err = got_error_set_errno(ENOENT, relpath);
8464 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8468 if (path_content && unlink(path_content) == -1 && err == NULL)
8469 err = got_error_from_errno2("unlink", path_content);
8472 free(new_staged_blob_id);
8476 const struct got_error *
8477 got_worktree_stage(struct got_worktree *worktree,
8478 struct got_pathlist_head *paths,
8479 got_worktree_status_cb status_cb, void *status_arg,
8480 got_worktree_patch_cb patch_cb, void *patch_arg,
8481 int allow_bad_symlinks, struct got_repository *repo)
8483 const struct got_error *err = NULL, *sync_err, *unlockerr;
8484 struct got_pathlist_entry *pe;
8485 struct got_fileindex *fileindex = NULL;
8486 char *fileindex_path = NULL;
8487 struct got_reference *head_ref = NULL;
8488 struct got_object_id *head_commit_id = NULL;
8489 struct check_stage_ok_arg oka;
8490 struct stage_path_arg spa;
8492 err = lock_worktree(worktree, LOCK_EX);
8496 err = got_ref_open(&head_ref, repo,
8497 got_worktree_get_head_ref_name(worktree), 0);
8500 err = got_ref_resolve(&head_commit_id, repo, head_ref);
8503 err = open_fileindex(&fileindex, &fileindex_path, worktree);
8507 /* Check pre-conditions before staging anything. */
8508 oka.head_commit_id = head_commit_id;
8509 oka.worktree = worktree;
8510 oka.fileindex = fileindex;
8512 oka.have_changes = 0;
8513 TAILQ_FOREACH(pe, paths, entry) {
8514 err = worktree_status(worktree, pe->path, fileindex, repo,
8515 check_stage_ok, &oka, NULL, NULL, 1, 0);
8519 if (!oka.have_changes) {
8520 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8524 spa.worktree = worktree;
8525 spa.fileindex = fileindex;
8527 spa.patch_cb = patch_cb;
8528 spa.patch_arg = patch_arg;
8529 spa.status_cb = status_cb;
8530 spa.status_arg = status_arg;
8531 spa.staged_something = 0;
8532 spa.allow_bad_symlinks = allow_bad_symlinks;
8533 TAILQ_FOREACH(pe, paths, entry) {
8534 err = worktree_status(worktree, pe->path, fileindex, repo,
8535 stage_path, &spa, NULL, NULL, 1, 0);
8539 if (!spa.staged_something) {
8540 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8544 sync_err = sync_fileindex(fileindex, fileindex_path);
8545 if (sync_err && err == NULL)
8549 got_ref_close(head_ref);
8550 free(head_commit_id);
8551 free(fileindex_path);
8553 got_fileindex_free(fileindex);
8554 unlockerr = lock_worktree(worktree, LOCK_SH);
8555 if (unlockerr && err == NULL)
8560 struct unstage_path_arg {
8561 struct got_worktree *worktree;
8562 struct got_fileindex *fileindex;
8563 struct got_repository *repo;
8564 got_worktree_checkout_cb progress_cb;
8566 got_worktree_patch_cb patch_cb;
8570 static const struct got_error *
8571 create_unstaged_content(char **path_unstaged_content,
8572 char **path_new_staged_content, struct got_object_id *blob_id,
8573 struct got_object_id *staged_blob_id, const char *relpath,
8574 struct got_repository *repo,
8575 got_worktree_patch_cb patch_cb, void *patch_arg)
8577 const struct got_error *err, *free_err;
8578 struct got_blob_object *blob = NULL, *staged_blob = NULL;
8579 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8580 char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8581 struct got_diffreg_result *diffreg_result = NULL;
8582 int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8583 int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8584 int fd1 = -1, fd2 = -1;
8586 *path_unstaged_content = NULL;
8587 *path_new_staged_content = NULL;
8589 err = got_object_id_str(&label1, blob_id);
8593 fd1 = got_opentempfd();
8595 err = got_error_from_errno("got_opentempfd");
8598 fd2 = got_opentempfd();
8600 err = got_error_from_errno("got_opentempfd");
8604 err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8608 err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
8612 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8616 err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8621 err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
8625 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8629 err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8630 path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8634 err = got_opentemp_named(path_unstaged_content, &outfile,
8635 "got-unstaged-content", "");
8638 err = got_opentemp_named(path_new_staged_content, &rejectfile,
8639 "got-new-staged-content", "");
8643 if (fseek(f1, 0L, SEEK_SET) == -1) {
8644 err = got_ferror(f1, GOT_ERR_IO);
8647 if (fseek(f2, 0L, SEEK_SET) == -1) {
8648 err = got_ferror(f2, GOT_ERR_IO);
8651 /* Count the number of actual changes in the diff result. */
8652 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8653 struct diff_chunk_context cc = {};
8654 diff_chunk_context_load_change(&cc, &nchunks_used,
8655 diffreg_result->result, n, 0);
8658 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8660 err = apply_or_reject_change(&choice, &nchunks_used,
8661 diffreg_result->result, n, relpath, f1, f2,
8662 &line_cur1, &line_cur2,
8663 outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8666 if (choice == GOT_PATCH_CHOICE_YES)
8669 have_rejected_content = 1;
8670 if (choice == GOT_PATCH_CHOICE_QUIT)
8673 if (have_content || have_rejected_content)
8674 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8675 outfile, rejectfile);
8678 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8679 err = got_error_from_errno("close");
8681 got_object_blob_close(blob);
8682 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8683 err = got_error_from_errno("close");
8685 got_object_blob_close(staged_blob);
8686 free_err = got_diffreg_result_free(diffreg_result);
8687 if (free_err && err == NULL)
8689 if (f1 && fclose(f1) == EOF && err == NULL)
8690 err = got_error_from_errno2("fclose", path1);
8691 if (f2 && fclose(f2) == EOF && err == NULL)
8692 err = got_error_from_errno2("fclose", path2);
8693 if (outfile && fclose(outfile) == EOF && err == NULL)
8694 err = got_error_from_errno2("fclose", *path_unstaged_content);
8695 if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8696 err = got_error_from_errno2("fclose", *path_new_staged_content);
8697 if (path1 && unlink(path1) == -1 && err == NULL)
8698 err = got_error_from_errno2("unlink", path1);
8699 if (path2 && unlink(path2) == -1 && err == NULL)
8700 err = got_error_from_errno2("unlink", path2);
8701 if (err || !have_content) {
8702 if (*path_unstaged_content &&
8703 unlink(*path_unstaged_content) == -1 && err == NULL)
8704 err = got_error_from_errno2("unlink",
8705 *path_unstaged_content);
8706 free(*path_unstaged_content);
8707 *path_unstaged_content = NULL;
8709 if (err || !have_content || !have_rejected_content) {
8710 if (*path_new_staged_content &&
8711 unlink(*path_new_staged_content) == -1 && err == NULL)
8712 err = got_error_from_errno2("unlink",
8713 *path_new_staged_content);
8714 free(*path_new_staged_content);
8715 *path_new_staged_content = NULL;
8722 static const struct got_error *
8723 unstage_hunks(struct got_object_id *staged_blob_id,
8724 struct got_blob_object *blob_base,
8725 struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8726 const char *ondisk_path, const char *label_orig,
8727 struct got_worktree *worktree, struct got_repository *repo,
8728 got_worktree_patch_cb patch_cb, void *patch_arg,
8729 got_worktree_checkout_cb progress_cb, void *progress_arg)
8731 const struct got_error *err = NULL;
8732 char *path_unstaged_content = NULL;
8733 char *path_new_staged_content = NULL;
8734 char *parent = NULL, *base_path = NULL;
8735 char *blob_base_path = NULL;
8736 struct got_object_id *new_staged_blob_id = NULL;
8737 FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8740 err = create_unstaged_content(&path_unstaged_content,
8741 &path_new_staged_content, blob_id, staged_blob_id,
8742 ie->path, repo, patch_cb, patch_arg);
8746 if (path_unstaged_content == NULL)
8749 if (path_new_staged_content) {
8750 err = got_object_blob_create(&new_staged_blob_id,
8751 path_new_staged_content, repo);
8756 f = fopen(path_unstaged_content, "re");
8758 err = got_error_from_errno2("fopen",
8759 path_unstaged_content);
8762 if (fstat(fileno(f), &sb) == -1) {
8763 err = got_error_from_errno2("fstat", path_unstaged_content);
8766 if (got_fileindex_entry_staged_filetype_get(ie) ==
8767 GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8768 char link_target[PATH_MAX];
8770 r = fread(link_target, 1, sizeof(link_target), f);
8771 if (r == 0 && ferror(f)) {
8772 err = got_error_from_errno("fread");
8775 if (r >= sizeof(link_target)) { /* should not happen */
8776 err = got_error(GOT_ERR_NO_SPACE);
8779 link_target[r] = '\0';
8780 err = merge_symlink(worktree, blob_base,
8781 ondisk_path, ie->path, label_orig, link_target,
8782 worktree->base_commit_id, repo, progress_cb,
8785 int local_changes_subsumed;
8787 err = got_path_dirname(&parent, ondisk_path);
8791 if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8793 err = got_error_from_errno("asprintf");
8798 err = got_opentemp_named(&blob_base_path, &f_base,
8802 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8808 * In order the run a 3-way merge with a symlink we copy the symlink's
8809 * target path into a temporary file and use that file with diff3.
8811 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8812 err = dump_symlink_target_path_to_file(&f_deriv2,
8818 fd = open(ondisk_path,
8819 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8821 err = got_error_from_errno2("open", ondisk_path);
8824 f_deriv2 = fdopen(fd, "r");
8825 if (f_deriv2 == NULL) {
8826 err = got_error_from_errno2("fdopen", ondisk_path);
8832 err = merge_file(&local_changes_subsumed, worktree,
8833 f_base, f, f_deriv2, ondisk_path, ie->path,
8834 got_fileindex_perms_to_st(ie),
8835 label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8836 repo, progress_cb, progress_arg);
8841 if (new_staged_blob_id) {
8842 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8843 SHA1_DIGEST_LENGTH);
8845 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8846 got_fileindex_entry_staged_filetype_set(ie, 0);
8849 free(new_staged_blob_id);
8850 if (path_unstaged_content &&
8851 unlink(path_unstaged_content) == -1 && err == NULL)
8852 err = got_error_from_errno2("unlink", path_unstaged_content);
8853 if (path_new_staged_content &&
8854 unlink(path_new_staged_content) == -1 && err == NULL)
8855 err = got_error_from_errno2("unlink", path_new_staged_content);
8856 if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8857 err = got_error_from_errno2("unlink", blob_base_path);
8858 if (f_base && fclose(f_base) == EOF && err == NULL)
8859 err = got_error_from_errno2("fclose", path_unstaged_content);
8860 if (f && fclose(f) == EOF && err == NULL)
8861 err = got_error_from_errno2("fclose", path_unstaged_content);
8862 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8863 err = got_error_from_errno2("fclose", ondisk_path);
8864 free(path_unstaged_content);
8865 free(path_new_staged_content);
8866 free(blob_base_path);
8872 static const struct got_error *
8873 unstage_path(void *arg, unsigned char status,
8874 unsigned char staged_status, const char *relpath,
8875 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8876 struct got_object_id *commit_id, int dirfd, const char *de_name)
8878 const struct got_error *err = NULL;
8879 struct unstage_path_arg *a = arg;
8880 struct got_fileindex_entry *ie;
8881 struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8882 char *ondisk_path = NULL;
8883 char *id_str = NULL, *label_orig = NULL;
8884 int local_changes_subsumed;
8886 int fd1 = -1, fd2 = -1;
8888 if (staged_status != GOT_STATUS_ADD &&
8889 staged_status != GOT_STATUS_MODIFY &&
8890 staged_status != GOT_STATUS_DELETE)
8893 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8895 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8897 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8899 return got_error_from_errno("asprintf");
8901 err = got_object_id_str(&id_str,
8902 commit_id ? commit_id : a->worktree->base_commit_id);
8905 if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8907 err = got_error_from_errno("asprintf");
8911 fd1 = got_opentempfd();
8913 err = got_error_from_errno("got_opentempfd");
8916 fd2 = got_opentempfd();
8918 err = got_error_from_errno("got_opentempfd");
8922 switch (staged_status) {
8923 case GOT_STATUS_MODIFY:
8924 err = got_object_open_as_blob(&blob_base, a->repo,
8925 blob_id, 8192, fd1);
8929 case GOT_STATUS_ADD:
8931 if (staged_status == GOT_STATUS_ADD) {
8932 int choice = GOT_PATCH_CHOICE_NONE;
8933 err = (*a->patch_cb)(&choice, a->patch_arg,
8934 staged_status, ie->path, NULL, 1, 1);
8937 if (choice != GOT_PATCH_CHOICE_YES)
8940 err = unstage_hunks(staged_blob_id,
8941 blob_base, blob_id, ie, ondisk_path,
8942 label_orig, a->worktree, a->repo,
8943 a->patch_cb, a->patch_arg,
8944 a->progress_cb, a->progress_arg);
8945 break; /* Done with this file. */
8948 err = got_object_open_as_blob(&blob_staged, a->repo,
8949 staged_blob_id, 8192, fd2);
8952 switch (got_fileindex_entry_staged_filetype_get(ie)) {
8953 case GOT_FILEIDX_MODE_BAD_SYMLINK:
8954 case GOT_FILEIDX_MODE_REGULAR_FILE:
8955 err = merge_blob(&local_changes_subsumed, a->worktree,
8956 blob_base, ondisk_path, relpath,
8957 got_fileindex_perms_to_st(ie), label_orig,
8958 blob_staged, commit_id ? commit_id :
8959 a->worktree->base_commit_id, a->repo,
8960 a->progress_cb, a->progress_arg);
8962 case GOT_FILEIDX_MODE_SYMLINK:
8963 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8964 char *staged_target;
8965 err = got_object_blob_read_to_str(
8966 &staged_target, blob_staged);
8969 err = merge_symlink(a->worktree, blob_base,
8970 ondisk_path, relpath, label_orig,
8971 staged_target, commit_id ? commit_id :
8972 a->worktree->base_commit_id,
8973 a->repo, a->progress_cb, a->progress_arg);
8974 free(staged_target);
8976 err = merge_blob(&local_changes_subsumed,
8977 a->worktree, blob_base, ondisk_path,
8978 relpath, got_fileindex_perms_to_st(ie),
8979 label_orig, blob_staged,
8980 commit_id ? commit_id :
8981 a->worktree->base_commit_id, a->repo,
8982 a->progress_cb, a->progress_arg);
8986 err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8990 got_fileindex_entry_stage_set(ie,
8991 GOT_FILEIDX_STAGE_NONE);
8992 got_fileindex_entry_staged_filetype_set(ie, 0);
8995 case GOT_STATUS_DELETE:
8997 int choice = GOT_PATCH_CHOICE_NONE;
8998 err = (*a->patch_cb)(&choice, a->patch_arg,
8999 staged_status, ie->path, NULL, 1, 1);
9002 if (choice == GOT_PATCH_CHOICE_NO)
9004 if (choice != GOT_PATCH_CHOICE_YES) {
9005 err = got_error(GOT_ERR_PATCH_CHOICE);
9009 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9010 got_fileindex_entry_staged_filetype_set(ie, 0);
9011 err = get_file_status(&status, &sb, ie, ondisk_path,
9012 dirfd, de_name, a->repo);
9015 err = (*a->progress_cb)(a->progress_arg, status, relpath);
9020 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9021 err = got_error_from_errno("close");
9023 got_object_blob_close(blob_base);
9024 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9025 err = got_error_from_errno("close");
9027 got_object_blob_close(blob_staged);
9033 const struct got_error *
9034 got_worktree_unstage(struct got_worktree *worktree,
9035 struct got_pathlist_head *paths,
9036 got_worktree_checkout_cb progress_cb, void *progress_arg,
9037 got_worktree_patch_cb patch_cb, void *patch_arg,
9038 struct got_repository *repo)
9040 const struct got_error *err = NULL, *sync_err, *unlockerr;
9041 struct got_pathlist_entry *pe;
9042 struct got_fileindex *fileindex = NULL;
9043 char *fileindex_path = NULL;
9044 struct unstage_path_arg upa;
9046 err = lock_worktree(worktree, LOCK_EX);
9050 err = open_fileindex(&fileindex, &fileindex_path, worktree);
9054 upa.worktree = worktree;
9055 upa.fileindex = fileindex;
9057 upa.progress_cb = progress_cb;
9058 upa.progress_arg = progress_arg;
9059 upa.patch_cb = patch_cb;
9060 upa.patch_arg = patch_arg;
9061 TAILQ_FOREACH(pe, paths, entry) {
9062 err = worktree_status(worktree, pe->path, fileindex, repo,
9063 unstage_path, &upa, NULL, NULL, 1, 0);
9068 sync_err = sync_fileindex(fileindex, fileindex_path);
9069 if (sync_err && err == NULL)
9072 free(fileindex_path);
9074 got_fileindex_free(fileindex);
9075 unlockerr = lock_worktree(worktree, LOCK_SH);
9076 if (unlockerr && err == NULL)
9081 struct report_file_info_arg {
9082 struct got_worktree *worktree;
9083 got_worktree_path_info_cb info_cb;
9085 struct got_pathlist_head *paths;
9086 got_cancel_cb cancel_cb;
9090 static const struct got_error *
9091 report_file_info(void *arg, struct got_fileindex_entry *ie)
9093 struct report_file_info_arg *a = arg;
9094 struct got_pathlist_entry *pe;
9095 struct got_object_id blob_id, staged_blob_id, commit_id;
9096 struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9097 struct got_object_id *commit_idp = NULL;
9100 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9101 return got_error(GOT_ERR_CANCELLED);
9103 TAILQ_FOREACH(pe, a->paths, entry) {
9104 if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9105 got_path_is_child(ie->path, pe->path, pe->path_len))
9108 if (pe == NULL) /* not found */
9111 if (got_fileindex_entry_has_blob(ie))
9112 blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
9113 stage = got_fileindex_entry_stage_get(ie);
9114 if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9115 stage == GOT_FILEIDX_STAGE_ADD) {
9116 staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
9117 &staged_blob_id, ie);
9120 if (got_fileindex_entry_has_commit(ie))
9121 commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
9123 return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9124 (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9127 const struct got_error *
9128 got_worktree_path_info(struct got_worktree *worktree,
9129 struct got_pathlist_head *paths,
9130 got_worktree_path_info_cb info_cb, void *info_arg,
9131 got_cancel_cb cancel_cb, void *cancel_arg)
9134 const struct got_error *err = NULL, *unlockerr;
9135 struct got_fileindex *fileindex = NULL;
9136 char *fileindex_path = NULL;
9137 struct report_file_info_arg arg;
9139 err = lock_worktree(worktree, LOCK_SH);
9143 err = open_fileindex(&fileindex, &fileindex_path, worktree);
9147 arg.worktree = worktree;
9148 arg.info_cb = info_cb;
9149 arg.info_arg = info_arg;
9151 arg.cancel_cb = cancel_cb;
9152 arg.cancel_arg = cancel_arg;
9153 err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9156 free(fileindex_path);
9158 got_fileindex_free(fileindex);
9159 unlockerr = lock_worktree(worktree, LOCK_UN);
9160 if (unlockerr && err == NULL)
9165 static const struct got_error *
9166 patch_check_path(const char *p, char **path, unsigned char *status,
9167 unsigned char *staged_status, struct got_fileindex *fileindex,
9168 struct got_worktree *worktree, struct got_repository *repo)
9170 const struct got_error *err;
9171 struct got_fileindex_entry *ie;
9173 char *ondisk_path = NULL;
9175 err = got_worktree_resolve_path(path, worktree, p);
9179 if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9180 *path[0] ? "/" : "", *path) == -1)
9181 return got_error_from_errno("asprintf");
9183 ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9185 *staged_status = get_staged_status(ie);
9186 err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9191 *staged_status = GOT_STATUS_NO_CHANGE;
9192 *status = GOT_STATUS_UNVERSIONED;
9193 if (lstat(ondisk_path, &sb) == -1) {
9194 if (errno != ENOENT) {
9195 err = got_error_from_errno2("lstat",
9199 *status = GOT_STATUS_NONEXISTENT;
9208 static const struct got_error *
9209 patch_can_rm(const char *path, unsigned char status,
9210 unsigned char staged_status)
9212 if (status == GOT_STATUS_NONEXISTENT)
9213 return got_error_set_errno(ENOENT, path);
9214 if (status != GOT_STATUS_NO_CHANGE &&
9215 status != GOT_STATUS_ADD &&
9216 status != GOT_STATUS_MODIFY &&
9217 status != GOT_STATUS_MODE_CHANGE)
9218 return got_error_path(path, GOT_ERR_FILE_STATUS);
9219 if (staged_status == GOT_STATUS_DELETE)
9220 return got_error_path(path, GOT_ERR_FILE_STATUS);
9224 static const struct got_error *
9225 patch_can_add(const char *path, unsigned char status)
9227 if (status != GOT_STATUS_NONEXISTENT)
9228 return got_error_path(path, GOT_ERR_FILE_STATUS);
9232 static const struct got_error *
9233 patch_can_edit(const char *path, unsigned char status,
9234 unsigned char staged_status)
9236 if (status == GOT_STATUS_NONEXISTENT)
9237 return got_error_set_errno(ENOENT, path);
9238 if (status != GOT_STATUS_NO_CHANGE &&
9239 status != GOT_STATUS_ADD &&
9240 status != GOT_STATUS_MODIFY)
9241 return got_error_path(path, GOT_ERR_FILE_STATUS);
9242 if (staged_status == GOT_STATUS_DELETE)
9243 return got_error_path(path, GOT_ERR_FILE_STATUS);
9247 const struct got_error *
9248 got_worktree_patch_prepare(struct got_fileindex **fileindex,
9249 char **fileindex_path, struct got_worktree *worktree)
9251 return open_fileindex(fileindex, fileindex_path, worktree);
9254 const struct got_error *
9255 got_worktree_patch_check_path(const char *old, const char *new,
9256 char **oldpath, char **newpath, struct got_worktree *worktree,
9257 struct got_repository *repo, struct got_fileindex *fileindex)
9259 const struct got_error *err = NULL;
9260 int file_renamed = 0;
9261 unsigned char status_old, staged_status_old;
9262 unsigned char status_new, staged_status_new;
9267 err = patch_check_path(old != NULL ? old : new, oldpath,
9268 &status_old, &staged_status_old, fileindex, worktree, repo);
9272 err = patch_check_path(new != NULL ? new : old, newpath,
9273 &status_new, &staged_status_new, fileindex, worktree, repo);
9277 if (old != NULL && new != NULL && strcmp(old, new) != 0)
9280 if (old != NULL && new == NULL)
9281 err = patch_can_rm(*oldpath, status_old, staged_status_old);
9282 else if (file_renamed) {
9283 err = patch_can_rm(*oldpath, status_old, staged_status_old);
9285 err = patch_can_add(*newpath, status_new);
9286 } else if (old == NULL)
9287 err = patch_can_add(*newpath, status_new);
9289 err = patch_can_edit(*newpath, status_new, staged_status_new);
9301 const struct got_error *
9302 got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9303 struct got_worktree *worktree, struct got_fileindex *fileindex,
9304 got_worktree_checkout_cb progress_cb, void *progress_arg)
9306 struct schedule_addition_args saa;
9308 memset(&saa, 0, sizeof(saa));
9309 saa.worktree = worktree;
9310 saa.fileindex = fileindex;
9311 saa.progress_cb = progress_cb;
9312 saa.progress_arg = progress_arg;
9315 return worktree_status(worktree, path, fileindex, repo,
9316 schedule_addition, &saa, NULL, NULL, 1, 0);
9319 const struct got_error *
9320 got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9321 struct got_worktree *worktree, struct got_fileindex *fileindex,
9322 got_worktree_delete_cb progress_cb, void *progress_arg)
9324 struct schedule_deletion_args sda;
9326 memset(&sda, 0, sizeof(sda));
9327 sda.worktree = worktree;
9328 sda.fileindex = fileindex;
9329 sda.progress_cb = progress_cb;
9330 sda.progress_arg = progress_arg;
9332 sda.delete_local_mods = 0;
9333 sda.keep_on_disk = 0;
9334 sda.ignore_missing_paths = 0;
9335 sda.status_codes = NULL;
9337 return worktree_status(worktree, path, fileindex, repo,
9338 schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9341 const struct got_error *
9342 got_worktree_patch_complete(struct got_fileindex *fileindex,
9343 const char *fileindex_path)
9345 const struct got_error *err = NULL;
9347 err = sync_fileindex(fileindex, fileindex_path);
9348 got_fileindex_free(fileindex);