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>
34 #include "got_compat.h"
36 #include "got_error.h"
37 #include "got_repository.h"
38 #include "got_reference.h"
39 #include "got_object.h"
41 #include "got_cancel.h"
42 #include "got_worktree.h"
43 #include "got_opentemp.h"
46 #include "got_lib_worktree.h"
47 #include "got_lib_sha1.h"
48 #include "got_lib_fileindex.h"
49 #include "got_lib_inflate.h"
50 #include "got_lib_delta.h"
51 #include "got_lib_object.h"
52 #include "got_lib_object_parse.h"
53 #include "got_lib_object_create.h"
54 #include "got_lib_object_idset.h"
55 #include "got_lib_diff.h"
56 #include "got_lib_gotconfig.h"
59 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
62 #define GOT_MERGE_LABEL_MERGED "merged change"
63 #define GOT_MERGE_LABEL_BASE "3-way merge base"
65 static mode_t apply_umask(mode_t);
67 static const struct got_error *
68 create_meta_file(const char *path_got, const char *name, const char *content)
70 const struct got_error *err = NULL;
73 if (asprintf(&path, "%s/%s", path_got, name) == -1)
74 return got_error_from_errno("asprintf");
76 err = got_path_create_file(path, content);
81 static const struct got_error *
82 update_meta_file(const char *path_got, const char *name, const char *content)
84 const struct got_error *err = NULL;
89 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
90 err = got_error_from_errno("asprintf");
95 err = got_opentemp_named(&tmppath, &tmpfile, path, "");
100 int len = fprintf(tmpfile, "%s\n", content);
101 if (len != strlen(content) + 1) {
102 err = got_error_from_errno2("fprintf", tmppath);
107 if (rename(tmppath, path) != 0) {
108 err = got_error_from_errno3("rename", tmppath, path);
114 if (fclose(tmpfile) == EOF && err == NULL)
115 err = got_error_from_errno2("fclose", tmppath);
120 static const struct got_error *
121 write_head_ref(const char *path_got, struct got_reference *head_ref)
123 const struct got_error *err = NULL;
126 if (got_ref_is_symbolic(head_ref)) {
127 refstr = got_ref_to_str(head_ref);
129 return got_error_from_errno("got_ref_to_str");
131 refstr = strdup(got_ref_get_name(head_ref));
133 return got_error_from_errno("strdup");
135 err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
140 const struct got_error *
141 got_worktree_init(const char *path, struct got_reference *head_ref,
142 const char *prefix, struct got_repository *repo)
144 const struct got_error *err = NULL;
145 struct got_object_id *commit_id = NULL;
147 uint32_t uuid_status;
149 char *path_got = NULL;
150 char *formatstr = NULL;
151 char *absprefix = NULL;
152 char *basestr = NULL;
153 char *uuidstr = NULL;
155 if (strcmp(path, got_repo_get_path(repo)) == 0) {
156 err = got_error(GOT_ERR_WORKTREE_REPO);
160 err = got_ref_resolve(&commit_id, repo, head_ref);
163 err = got_object_get_type(&obj_type, repo, commit_id);
166 if (obj_type != GOT_OBJ_TYPE_COMMIT)
167 return got_error(GOT_ERR_OBJ_TYPE);
169 if (!got_path_is_absolute(prefix)) {
170 if (asprintf(&absprefix, "/%s", prefix) == -1)
171 return got_error_from_errno("asprintf");
174 /* Create top-level directory (may already exist). */
175 if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
176 err = got_error_from_errno2("mkdir", path);
180 /* Create .got directory (may already exist). */
181 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
182 err = got_error_from_errno("asprintf");
185 if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
186 err = got_error_from_errno2("mkdir", path_got);
190 /* Create an empty lock file. */
191 err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
195 /* Create an empty file index. */
196 err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
200 /* Write the HEAD reference. */
201 err = write_head_ref(path_got, head_ref);
205 /* Record our base commit. */
206 err = got_object_id_str(&basestr, commit_id);
209 err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
213 /* Store path to repository. */
214 err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
215 got_repo_get_path(repo));
219 /* Store in-repository path prefix. */
220 err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
221 absprefix ? absprefix : prefix);
226 uuid_create(&uuid, &uuid_status);
227 if (uuid_status != uuid_s_ok) {
228 err = got_error_uuid(uuid_status, "uuid_create");
231 uuid_to_string(&uuid, &uuidstr, &uuid_status);
232 if (uuid_status != uuid_s_ok) {
233 err = got_error_uuid(uuid_status, "uuid_to_string");
236 err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
240 /* Stamp work tree with format file. */
241 if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
242 err = got_error_from_errno("asprintf");
245 err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
259 const struct got_error *
260 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
261 const char *path_prefix)
263 char *absprefix = NULL;
265 if (!got_path_is_absolute(path_prefix)) {
266 if (asprintf(&absprefix, "/%s", path_prefix) == -1)
267 return got_error_from_errno("asprintf");
269 *match = (strcmp(absprefix ? absprefix : path_prefix,
270 worktree->path_prefix) == 0);
276 got_worktree_get_head_ref_name(struct got_worktree *worktree)
278 return worktree->head_ref_name;
281 const struct got_error *
282 got_worktree_set_head_ref(struct got_worktree *worktree,
283 struct got_reference *head_ref)
285 const struct got_error *err = NULL;
286 char *path_got = NULL, *head_ref_name = NULL;
288 if (asprintf(&path_got, "%s/%s", worktree->root_path,
289 GOT_WORKTREE_GOT_DIR) == -1) {
290 err = got_error_from_errno("asprintf");
295 head_ref_name = strdup(got_ref_get_name(head_ref));
296 if (head_ref_name == NULL) {
297 err = got_error_from_errno("strdup");
301 err = write_head_ref(path_got, head_ref);
305 free(worktree->head_ref_name);
306 worktree->head_ref_name = head_ref_name;
314 struct got_object_id *
315 got_worktree_get_base_commit_id(struct got_worktree *worktree)
317 return worktree->base_commit_id;
320 const struct got_error *
321 got_worktree_set_base_commit_id(struct got_worktree *worktree,
322 struct got_repository *repo, struct got_object_id *commit_id)
324 const struct got_error *err;
325 struct got_object *obj = NULL;
327 char *path_got = NULL;
329 if (asprintf(&path_got, "%s/%s", worktree->root_path,
330 GOT_WORKTREE_GOT_DIR) == -1) {
331 err = got_error_from_errno("asprintf");
336 err = got_object_open(&obj, repo, commit_id);
340 if (obj->type != GOT_OBJ_TYPE_COMMIT) {
341 err = got_error(GOT_ERR_OBJ_TYPE);
345 /* Record our base commit. */
346 err = got_object_id_str(&id_str, commit_id);
349 err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
353 free(worktree->base_commit_id);
354 worktree->base_commit_id = got_object_id_dup(commit_id);
355 if (worktree->base_commit_id == NULL) {
356 err = got_error_from_errno("got_object_id_dup");
361 got_object_close(obj);
367 const struct got_gotconfig *
368 got_worktree_get_gotconfig(struct got_worktree *worktree)
370 return worktree->gotconfig;
373 static const struct got_error *
374 lock_worktree(struct got_worktree *worktree, int operation)
376 if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
377 return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
378 : got_error_from_errno2("flock",
379 got_worktree_get_root_path(worktree)));
383 static const struct got_error *
384 add_dir_on_disk(struct got_worktree *worktree, const char *path)
386 const struct got_error *err = NULL;
389 if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
390 return got_error_from_errno("asprintf");
392 err = got_path_mkdir(abspath);
393 if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
396 if (lstat(abspath, &sb) == -1) {
397 err = got_error_from_errno2("lstat", abspath);
398 } else if (!S_ISDIR(sb.st_mode)) {
399 /* TODO directory is obstructed; do something */
400 err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
407 static const struct got_error *
408 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
410 const struct got_error *err = NULL;
413 size_t flen1 = 0, flen2 = 0;
418 flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
419 if (flen1 == 0 && ferror(f1)) {
420 err = got_error_from_errno("fread");
423 flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
424 if (flen2 == 0 && ferror(f2)) {
425 err = got_error_from_errno("fread");
432 } else if (flen2 == 0) {
436 } else if (flen1 == flen2) {
437 if (memcmp(fbuf1, fbuf2, flen2) != 0) {
450 static const struct got_error *
451 check_files_equal(int *same, FILE *f1, FILE *f2)
458 if (fstat(fileno(f1), &sb) != 0)
459 return got_error_from_errno("fstat");
462 if (fstat(fileno(f2), &sb) != 0)
463 return got_error_from_errno("fstat");
466 if (size1 != size2) {
471 if (fseek(f1, 0L, SEEK_SET) == -1)
472 return got_ferror(f1, GOT_ERR_IO);
473 if (fseek(f2, 0L, SEEK_SET) == -1)
474 return got_ferror(f2, GOT_ERR_IO);
476 return check_file_contents_equal(same, f1, f2);
479 static const struct got_error *
480 copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
488 if (fseek(f, 0L, SEEK_SET) == -1)
489 return got_ferror(f, GOT_ERR_IO);
492 flen = fread(fbuf, 1, sizeof(fbuf), f);
495 return got_error_from_errno("fread");
499 outlen = write(outfd, fbuf, flen);
501 return got_error_from_errno("write");
503 return got_error(GOT_ERR_IO);
510 static const struct got_error *
511 merge_binary_file(int *overlapcnt, int merged_fd,
512 FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
513 const char *label_deriv, const char *label_orig, const char *label_deriv2,
514 const char *ondisk_path)
516 const struct got_error *err = NULL;
517 int same_content, changed_deriv, changed_deriv2;
518 int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
519 off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
520 char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
521 char *base_path_orig = NULL, *base_path_deriv = NULL;
522 char *base_path_deriv2 = NULL;
526 err = check_files_equal(&same_content, f_deriv, f_deriv2);
531 return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
533 err = check_files_equal(&same_content, f_deriv, f_orig);
536 changed_deriv = !same_content;
537 err = check_files_equal(&same_content, f_deriv2, f_orig);
540 changed_deriv2 = !same_content;
542 if (changed_deriv && changed_deriv2) {
544 if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
545 err = got_error_from_errno("asprintf");
548 if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
549 err = got_error_from_errno("asprintf");
552 if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
553 err = got_error_from_errno("asprintf");
556 err = got_opentemp_named_fd(&path_orig, &fd_orig,
560 err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
561 base_path_deriv, "");
564 err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
565 base_path_deriv2, "");
568 err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
571 err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
574 err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
577 if (dprintf(merged_fd, "Binary files differ and cannot be "
578 "merged automatically:\n") < 0) {
579 err = got_error_from_errno("dprintf");
582 if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
583 GOT_DIFF_CONFLICT_MARKER_BEGIN,
584 label_deriv ? " " : "",
585 label_deriv ? label_deriv : "",
587 err = got_error_from_errno("dprintf");
591 if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
592 GOT_DIFF_CONFLICT_MARKER_ORIG,
593 label_orig ? " " : "",
594 label_orig ? label_orig : "",
596 err = got_error_from_errno("dprintf");
600 if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
601 GOT_DIFF_CONFLICT_MARKER_SEP,
603 GOT_DIFF_CONFLICT_MARKER_END,
604 label_deriv2 ? " " : "",
605 label_deriv2 ? label_deriv2 : "") < 0) {
606 err = got_error_from_errno("dprintf");
609 } else if (changed_deriv)
610 err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
611 else if (changed_deriv2)
612 err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
614 if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
616 err = got_error_from_errno2("unlink", path_orig);
617 if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
618 err = got_error_from_errno2("close", path_orig);
619 if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
620 err = got_error_from_errno2("close", path_deriv);
621 if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
622 err = got_error_from_errno2("close", path_deriv2);
626 free(base_path_orig);
627 free(base_path_deriv);
628 free(base_path_deriv2);
633 * Perform a 3-way merge where the file f_orig acts as the common
634 * ancestor, the file f_deriv acts as the first derived version,
635 * and the file f_deriv2 acts as the second derived version.
636 * The merge result will be written to a new file at ondisk_path; any
637 * existing file at this path will be replaced.
639 static const struct got_error *
640 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
641 FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
642 const char *path, uint16_t st_mode,
643 const char *label_orig, const char *label_deriv, const char *label_deriv2,
644 enum got_diff_algorithm diff_algo, struct got_repository *repo,
645 got_worktree_checkout_cb progress_cb, void *progress_arg)
647 const struct got_error *err = NULL;
649 FILE *f_merged = NULL;
650 char *merged_path = NULL, *base_path = NULL;
654 *local_changes_subsumed = 0;
656 err = got_path_dirname(&parent, ondisk_path);
660 if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
661 err = got_error_from_errno("asprintf");
665 err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path, "");
669 err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
670 f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
672 if (err->code != GOT_ERR_FILE_BINARY)
674 err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
675 f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
681 err = (*progress_cb)(progress_arg,
682 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
686 if (fsync(merged_fd) != 0) {
687 err = got_error_from_errno("fsync");
691 f_merged = fdopen(merged_fd, "r");
692 if (f_merged == NULL) {
693 err = got_error_from_errno("fdopen");
698 /* Check if a clean merge has subsumed all local changes. */
699 if (overlapcnt == 0) {
700 err = check_files_equal(local_changes_subsumed, f_deriv,
706 if (fchmod(fileno(f_merged), apply_umask(st_mode)) != 0) {
707 err = got_error_from_errno2("fchmod", merged_path);
711 if (rename(merged_path, ondisk_path) != 0) {
712 err = got_error_from_errno3("rename", merged_path,
721 if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
722 err = got_error_from_errno("close");
723 if (f_merged && fclose(f_merged) == EOF && err == NULL)
724 err = got_error_from_errno("fclose");
731 static const struct got_error *
732 update_symlink(const char *ondisk_path, const char *target_path,
735 /* This is not atomic but matches what 'ln -sf' does. */
736 if (unlink(ondisk_path) == -1)
737 return got_error_from_errno2("unlink", ondisk_path);
738 if (symlink(target_path, ondisk_path) == -1)
739 return got_error_from_errno3("symlink", target_path,
745 * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
746 * in the work tree with a file that contains conflict markers and the
747 * conflicting target paths of the original version, a "derived version"
748 * of a symlink from an incoming change, and a local version of the symlink.
750 * The original versions's target path can be NULL if it is not available,
751 * such as if both derived versions added a new symlink at the same path.
753 * The incoming derived symlink target is NULL in case the incoming change
754 * has deleted this symlink.
756 static const struct got_error *
757 install_symlink_conflict(const char *deriv_target,
758 struct got_object_id *deriv_base_commit_id, const char *orig_target,
759 const char *label_orig, const char *local_target, const char *ondisk_path)
761 const struct got_error *err;
762 char *id_str = NULL, *label_deriv = NULL, *path = NULL;
765 err = got_object_id_str(&id_str, deriv_base_commit_id);
767 return got_error_from_errno("asprintf");
769 if (asprintf(&label_deriv, "%s: commit %s",
770 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
771 err = got_error_from_errno("asprintf");
775 err = got_opentemp_named(&path, &f, "got-symlink-conflict", "");
779 if (fchmod(fileno(f), apply_umask(GOT_DEFAULT_FILE_MODE)) == -1) {
780 err = got_error_from_errno2("fchmod", path);
784 if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
785 GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
786 deriv_target ? deriv_target : "(symlink was deleted)",
787 orig_target ? label_orig : "",
788 orig_target ? "\n" : "",
789 orig_target ? orig_target : "",
790 orig_target ? "\n" : "",
791 GOT_DIFF_CONFLICT_MARKER_SEP,
792 local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
793 err = got_error_from_errno2("fprintf", path);
797 if (unlink(ondisk_path) == -1) {
798 err = got_error_from_errno2("unlink", ondisk_path);
801 if (rename(path, ondisk_path) == -1) {
802 err = got_error_from_errno3("rename", path, ondisk_path);
806 if (f != NULL && fclose(f) == EOF && err == NULL)
807 err = got_error_from_errno2("fclose", path);
814 /* forward declaration */
815 static const struct got_error *
816 merge_blob(int *, struct got_worktree *, struct got_blob_object *,
817 const char *, const char *, uint16_t, const char *,
818 struct got_blob_object *, struct got_object_id *,
819 struct got_repository *, got_worktree_checkout_cb, void *);
822 * Merge a symlink into the work tree, where blob_orig acts as the common
823 * ancestor, deriv_target is the link target of the first derived version,
824 * and the symlink on disk acts as the second derived version.
825 * Assume that contents of both blobs represent symlinks.
827 static const struct got_error *
828 merge_symlink(struct got_worktree *worktree,
829 struct got_blob_object *blob_orig, const char *ondisk_path,
830 const char *path, const char *label_orig, const char *deriv_target,
831 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
832 got_worktree_checkout_cb progress_cb, void *progress_arg)
834 const struct got_error *err = NULL;
835 char *ancestor_target = NULL;
837 ssize_t ondisk_len, deriv_len;
838 char ondisk_target[PATH_MAX];
839 int have_local_change = 0;
840 int have_incoming_change = 0;
842 if (lstat(ondisk_path, &sb) == -1)
843 return got_error_from_errno2("lstat", ondisk_path);
845 ondisk_len = readlink(ondisk_path, ondisk_target,
846 sizeof(ondisk_target));
847 if (ondisk_len == -1) {
848 err = got_error_from_errno2("readlink",
852 ondisk_target[ondisk_len] = '\0';
855 err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
860 if (ancestor_target == NULL ||
861 (ondisk_len != strlen(ancestor_target) ||
862 memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
863 have_local_change = 1;
865 deriv_len = strlen(deriv_target);
866 if (ancestor_target == NULL ||
867 (deriv_len != strlen(ancestor_target) ||
868 memcmp(deriv_target, ancestor_target, deriv_len) != 0))
869 have_incoming_change = 1;
871 if (!have_local_change && !have_incoming_change) {
872 if (ancestor_target) {
873 /* Both sides made the same change. */
874 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
876 } else if (deriv_len == ondisk_len &&
877 memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
878 /* Both sides added the same symlink. */
879 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
882 /* Both sides added symlinks which don't match. */
883 err = install_symlink_conflict(deriv_target,
884 deriv_base_commit_id, ancestor_target,
885 label_orig, ondisk_target, ondisk_path);
888 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
891 } else if (!have_local_change && have_incoming_change) {
892 /* Apply the incoming change. */
893 err = update_symlink(ondisk_path, deriv_target,
894 strlen(deriv_target));
897 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
898 } else if (have_local_change && have_incoming_change) {
899 if (deriv_len == ondisk_len &&
900 memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
901 /* Both sides made the same change. */
902 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
905 err = install_symlink_conflict(deriv_target,
906 deriv_base_commit_id, ancestor_target, label_orig,
907 ondisk_target, ondisk_path);
910 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
916 free(ancestor_target);
920 static const struct got_error *
921 dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
923 const struct got_error *err = NULL;
924 char target_path[PATH_MAX];
933 return got_error_from_errno("got_opentemp");
934 target_len = readlink(ondisk_path, target_path, sizeof(target_path));
935 if (target_len == -1) {
936 err = got_error_from_errno2("readlink", ondisk_path);
939 n = fwrite(target_path, 1, target_len, f);
940 if (n != target_len) {
941 err = got_ferror(f, GOT_ERR_IO);
944 if (fflush(f) == EOF) {
945 err = got_error_from_errno("fflush");
948 if (fseek(f, 0L, SEEK_SET) == -1) {
949 err = got_ferror(f, GOT_ERR_IO);
961 * Perform a 3-way merge where blob_orig acts as the common ancestor,
962 * blob_deriv acts as the first derived version, and the file on disk
963 * acts as the second derived version.
965 static const struct got_error *
966 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
967 struct got_blob_object *blob_orig, const char *ondisk_path,
968 const char *path, uint16_t st_mode, const char *label_orig,
969 struct got_blob_object *blob_deriv,
970 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
971 got_worktree_checkout_cb progress_cb, void *progress_arg)
973 const struct got_error *err = NULL;
974 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
975 char *blob_orig_path = NULL;
976 char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
977 char *label_deriv = NULL, *parent = NULL;
979 *local_changes_subsumed = 0;
981 err = got_path_dirname(&parent, ondisk_path);
986 if (asprintf(&base_path, "%s/got-merge-blob-orig",
988 err = got_error_from_errno("asprintf");
993 err = got_opentemp_named(&blob_orig_path, &f_orig,
997 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
1004 * No common ancestor exists. This is an "add vs add" conflict
1005 * and we simply use an empty ancestor file to make both files
1006 * appear in the merged result in their entirety.
1008 f_orig = got_opentemp();
1009 if (f_orig == NULL) {
1010 err = got_error_from_errno("got_opentemp");
1015 if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1016 err = got_error_from_errno("asprintf");
1021 err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path, "");
1024 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1029 err = got_object_id_str(&id_str, deriv_base_commit_id);
1032 if (asprintf(&label_deriv, "%s: commit %s",
1033 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1034 err = got_error_from_errno("asprintf");
1039 * In order the run a 3-way merge with a symlink we copy the symlink's
1040 * target path into a temporary file and use that file with diff3.
1042 if (S_ISLNK(st_mode)) {
1043 err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1048 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1050 err = got_error_from_errno2("open", ondisk_path);
1053 f_deriv2 = fdopen(fd, "r");
1054 if (f_deriv2 == NULL) {
1055 err = got_error_from_errno2("fdopen", ondisk_path);
1061 err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1062 f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1063 NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1065 if (f_orig && fclose(f_orig) == EOF && err == NULL)
1066 err = got_error_from_errno("fclose");
1067 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1068 err = got_error_from_errno("fclose");
1069 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1070 err = got_error_from_errno("fclose");
1072 if (blob_orig_path) {
1073 unlink(blob_orig_path);
1074 free(blob_orig_path);
1076 if (blob_deriv_path) {
1077 unlink(blob_deriv_path);
1078 free(blob_deriv_path);
1086 static const struct got_error *
1087 create_fileindex_entry(struct got_fileindex_entry **new_iep,
1088 struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1089 int wt_fd, const char *path, struct got_object_id *blob_id)
1091 const struct got_error *err = NULL;
1092 struct got_fileindex_entry *new_ie;
1096 err = got_fileindex_entry_alloc(&new_ie, path);
1100 err = got_fileindex_entry_update(new_ie, wt_fd, path,
1101 blob_id->sha1, base_commit_id->sha1, 1);
1105 err = got_fileindex_entry_add(fileindex, new_ie);
1108 got_fileindex_entry_free(new_ie);
1115 get_ondisk_perms(int executable, mode_t st_mode)
1117 mode_t xbits = S_IXUSR;
1120 /* Map read bits to execute bits. */
1121 if (st_mode & S_IRGRP)
1123 if (st_mode & S_IROTH)
1125 return st_mode | xbits;
1132 apply_umask(mode_t mode)
1141 /* forward declaration */
1142 static const struct got_error *
1143 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1144 const char *path, mode_t te_mode, mode_t st_mode,
1145 struct got_blob_object *blob, int restoring_missing_file,
1146 int reverting_versioned_file, int installing_bad_symlink,
1147 int path_is_unversioned, struct got_repository *repo,
1148 got_worktree_checkout_cb progress_cb, void *progress_arg);
1151 * This function assumes that the provided symlink target points at a
1152 * safe location in the work tree!
1154 static const struct got_error *
1155 replace_existing_symlink(int *did_something, const char *ondisk_path,
1156 const char *target_path, size_t target_len)
1158 const struct got_error *err = NULL;
1160 char etarget[PATH_MAX];
1166 * "Bad" symlinks (those pointing outside the work tree or into the
1167 * .got directory) are installed in the work tree as a regular file
1168 * which contains the bad symlink target path.
1169 * The new symlink target has already been checked for safety by our
1170 * caller. If we can successfully open a regular file then we simply
1171 * replace this file with a symlink below.
1173 fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1175 if (!got_err_open_nofollow_on_symlink())
1176 return got_error_from_errno2("open", ondisk_path);
1178 /* We are updating an existing on-disk symlink. */
1179 elen = readlink(ondisk_path, etarget, sizeof(etarget));
1181 return got_error_from_errno2("readlink", ondisk_path);
1183 if (elen == target_len &&
1184 memcmp(etarget, target_path, target_len) == 0)
1185 return NULL; /* nothing to do */
1189 err = update_symlink(ondisk_path, target_path, target_len);
1190 if (fd != -1 && close(fd) == -1 && err == NULL)
1191 err = got_error_from_errno2("close", ondisk_path);
1195 static const struct got_error *
1196 is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1197 size_t target_len, const char *ondisk_path, const char *wtroot_path)
1199 const struct got_error *err = NULL;
1200 char canonpath[PATH_MAX];
1201 char *path_got = NULL;
1203 *is_bad_symlink = 0;
1205 if (target_len >= sizeof(canonpath)) {
1206 *is_bad_symlink = 1;
1211 * We do not use realpath(3) to resolve the symlink's target
1212 * path because we don't want to resolve symlinks recursively.
1213 * Instead we make the path absolute and then canonicalize it.
1214 * Relative symlink target lookup should begin at the directory
1215 * in which the blob object is being installed.
1217 if (!got_path_is_absolute(target_path)) {
1218 char *abspath, *parent;
1219 err = got_path_dirname(&parent, ondisk_path);
1222 if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1224 return got_error_from_errno("asprintf");
1227 if (strlen(abspath) >= sizeof(canonpath)) {
1228 err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1232 err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1237 err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1242 /* Only allow symlinks pointing at paths within the work tree. */
1243 if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1244 *is_bad_symlink = 1;
1248 /* Do not allow symlinks pointing into the .got directory. */
1249 if (asprintf(&path_got, "%s/%s", wtroot_path,
1250 GOT_WORKTREE_GOT_DIR) == -1)
1251 return got_error_from_errno("asprintf");
1252 if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1253 *is_bad_symlink = 1;
1259 static const struct got_error *
1260 install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1261 const char *ondisk_path, const char *path, struct got_blob_object *blob,
1262 int restoring_missing_file, int reverting_versioned_file,
1263 int path_is_unversioned, int allow_bad_symlinks,
1264 struct got_repository *repo,
1265 got_worktree_checkout_cb progress_cb, void *progress_arg)
1267 const struct got_error *err = NULL;
1268 char target_path[PATH_MAX];
1269 size_t len, target_len = 0;
1270 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1271 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1273 *is_bad_symlink = 0;
1276 * Blob object content specifies the target path of the link.
1277 * If a symbolic link cannot be installed we instead create
1278 * a regular file which contains the link target path stored
1279 * in the blob object.
1282 err = got_object_blob_read_block(&len, blob);
1286 if (len + target_len >= sizeof(target_path)) {
1287 /* Path too long; install as a regular file. */
1288 *is_bad_symlink = 1;
1289 got_object_blob_rewind(blob);
1290 return install_blob(worktree, ondisk_path, path,
1291 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1292 restoring_missing_file, reverting_versioned_file,
1293 1, path_is_unversioned, repo, progress_cb,
1297 /* Skip blob object header first time around. */
1298 memcpy(target_path + target_len, buf + hdrlen,
1300 target_len += len - hdrlen;
1304 target_path[target_len] = '\0';
1306 err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1307 ondisk_path, worktree->root_path);
1311 if (*is_bad_symlink && !allow_bad_symlinks) {
1312 /* install as a regular file */
1313 got_object_blob_rewind(blob);
1314 err = install_blob(worktree, ondisk_path, path,
1315 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1316 restoring_missing_file, reverting_versioned_file, 1,
1317 path_is_unversioned, repo, progress_cb, progress_arg);
1321 if (symlink(target_path, ondisk_path) == -1) {
1322 if (errno == EEXIST) {
1323 int symlink_replaced;
1324 if (path_is_unversioned) {
1325 err = (*progress_cb)(progress_arg,
1326 GOT_STATUS_UNVERSIONED, path);
1329 err = replace_existing_symlink(&symlink_replaced,
1330 ondisk_path, target_path, target_len);
1334 if (symlink_replaced) {
1335 err = (*progress_cb)(progress_arg,
1336 reverting_versioned_file ?
1338 GOT_STATUS_UPDATE, path);
1340 err = (*progress_cb)(progress_arg,
1341 GOT_STATUS_EXISTS, path);
1344 return err; /* Nothing else to do. */
1347 if (errno == ENOENT) {
1349 err = got_path_dirname(&parent, ondisk_path);
1352 err = add_dir_on_disk(worktree, parent);
1357 * Retry, and fall through to error handling
1358 * below if this second attempt fails.
1360 if (symlink(target_path, ondisk_path) != -1) {
1361 err = NULL; /* success */
1366 /* Handle errors from first or second creation attempt. */
1367 if (errno == ENAMETOOLONG) {
1368 /* bad target path; install as a regular file */
1369 *is_bad_symlink = 1;
1370 got_object_blob_rewind(blob);
1371 err = install_blob(worktree, ondisk_path, path,
1372 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1373 restoring_missing_file, reverting_versioned_file, 1,
1374 path_is_unversioned, repo,
1375 progress_cb, progress_arg);
1376 } else if (errno == ENOTDIR) {
1377 err = got_error_path(ondisk_path,
1378 GOT_ERR_FILE_OBSTRUCTED);
1380 err = got_error_from_errno3("symlink",
1381 target_path, ondisk_path);
1383 } else if (progress_cb)
1384 err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1385 GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1389 static const struct got_error *
1390 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1391 const char *path, mode_t te_mode, mode_t st_mode,
1392 struct got_blob_object *blob, int restoring_missing_file,
1393 int reverting_versioned_file, int installing_bad_symlink,
1394 int path_is_unversioned, struct got_repository *repo,
1395 got_worktree_checkout_cb progress_cb, void *progress_arg)
1397 const struct got_error *err = NULL;
1401 char *tmppath = NULL;
1404 mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1405 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1408 if (errno == ENOENT) {
1410 err = got_path_dirname(&parent, path);
1413 err = add_dir_on_disk(worktree, parent);
1417 fd = open(ondisk_path,
1418 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1421 return got_error_from_errno2("open",
1423 } else if (errno == EEXIST) {
1424 if (path_is_unversioned) {
1425 err = (*progress_cb)(progress_arg,
1426 GOT_STATUS_UNVERSIONED, path);
1429 if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1430 !S_ISREG(st_mode) && !installing_bad_symlink) {
1431 /* TODO file is obstructed; do something */
1432 err = got_error_path(ondisk_path,
1433 GOT_ERR_FILE_OBSTRUCTED);
1436 err = got_opentemp_named_fd(&tmppath, &fd,
1442 if (fchmod(fd, apply_umask(mode)) == -1) {
1443 err = got_error_from_errno2("fchmod",
1449 return got_error_from_errno2("open", ondisk_path);
1453 if (restoring_missing_file)
1454 err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1456 else if (reverting_versioned_file)
1457 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1460 err = (*progress_cb)(progress_arg,
1461 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1466 hdrlen = got_object_blob_get_hdrlen(blob);
1468 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1469 err = got_object_blob_read_block(&len, blob);
1473 /* Skip blob object header first time around. */
1474 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1476 err = got_error_from_errno("write");
1478 } else if (outlen != len - hdrlen) {
1479 err = got_error(GOT_ERR_IO);
1486 if (fsync(fd) != 0) {
1487 err = got_error_from_errno("fsync");
1492 if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1493 err = got_error_from_errno2("unlink", ondisk_path);
1496 if (rename(tmppath, ondisk_path) != 0) {
1497 err = got_error_from_errno3("rename", tmppath,
1506 if (fd != -1 && close(fd) == -1 && err == NULL)
1507 err = got_error_from_errno("close");
1508 if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1509 err = got_error_from_errno2("unlink", tmppath);
1514 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1515 static const struct got_error *
1516 get_modified_file_content_status(unsigned char *status, FILE *f)
1518 const struct got_error *err = NULL;
1519 const char *markers[3] = {
1520 GOT_DIFF_CONFLICT_MARKER_BEGIN,
1521 GOT_DIFF_CONFLICT_MARKER_SEP,
1522 GOT_DIFF_CONFLICT_MARKER_END
1526 size_t linesize = 0;
1529 while (*status == GOT_STATUS_MODIFY) {
1530 linelen = getline(&line, &linesize, f);
1531 if (linelen == -1) {
1534 err = got_ferror(f, GOT_ERR_IO);
1538 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1539 if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1541 *status = GOT_STATUS_CONFLICT;
1552 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1554 mode_t ie_mode = got_fileindex_perms_to_st(ie);
1555 return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1559 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1561 return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1562 ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1563 ie->mtime_sec == sb->st_mtim.tv_sec &&
1564 ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1565 ie->size == (sb->st_size & 0xffffffff) &&
1566 !xbit_differs(ie, sb->st_mode));
1569 static unsigned char
1570 get_staged_status(struct got_fileindex_entry *ie)
1572 switch (got_fileindex_entry_stage_get(ie)) {
1573 case GOT_FILEIDX_STAGE_ADD:
1574 return GOT_STATUS_ADD;
1575 case GOT_FILEIDX_STAGE_DELETE:
1576 return GOT_STATUS_DELETE;
1577 case GOT_FILEIDX_STAGE_MODIFY:
1578 return GOT_STATUS_MODIFY;
1580 return GOT_STATUS_NO_CHANGE;
1584 static const struct got_error *
1585 get_symlink_modification_status(unsigned char *status,
1586 struct got_fileindex_entry *ie, const char *abspath,
1587 int dirfd, const char *de_name, struct got_blob_object *blob)
1589 const struct got_error *err = NULL;
1590 char target_path[PATH_MAX];
1591 char etarget[PATH_MAX];
1593 size_t len, target_len = 0;
1594 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1595 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1597 *status = GOT_STATUS_NO_CHANGE;
1599 /* Blob object content specifies the target path of the link. */
1601 err = got_object_blob_read_block(&len, blob);
1604 if (len + target_len >= sizeof(target_path)) {
1606 * Should not happen. The blob contents were OK
1607 * when this symlink was installed.
1609 return got_error(GOT_ERR_NO_SPACE);
1612 /* Skip blob object header first time around. */
1613 memcpy(target_path + target_len, buf + hdrlen,
1615 target_len += len - hdrlen;
1619 target_path[target_len] = '\0';
1622 elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1624 return got_error_from_errno2("readlinkat", abspath);
1626 elen = readlink(abspath, etarget, sizeof(etarget));
1628 return got_error_from_errno2("readlink", abspath);
1631 if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1632 *status = GOT_STATUS_MODIFY;
1637 static const struct got_error *
1638 get_file_status(unsigned char *status, struct stat *sb,
1639 struct got_fileindex_entry *ie, const char *abspath,
1640 int dirfd, const char *de_name, struct got_repository *repo)
1642 const struct got_error *err = NULL;
1643 struct got_object_id id;
1645 int fd = -1, fd1 = -1;
1648 struct got_blob_object *blob = NULL;
1650 unsigned char staged_status = get_staged_status(ie);
1652 *status = GOT_STATUS_NO_CHANGE;
1653 memset(sb, 0, sizeof(*sb));
1656 * Whenever the caller provides a directory descriptor and a
1657 * directory entry name for the file, use them! This prevents
1658 * race conditions if filesystem paths change beneath our feet.
1661 if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1662 if (errno == ENOENT) {
1663 if (got_fileindex_entry_has_file_on_disk(ie))
1664 *status = GOT_STATUS_MISSING;
1666 *status = GOT_STATUS_DELETE;
1669 err = got_error_from_errno2("fstatat", abspath);
1673 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1674 if (fd == -1 && errno != ENOENT &&
1675 !got_err_open_nofollow_on_symlink())
1676 return got_error_from_errno2("open", abspath);
1677 else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1678 if (lstat(abspath, sb) == -1)
1679 return got_error_from_errno2("lstat", abspath);
1680 } else if (fd == -1 || fstat(fd, sb) == -1) {
1681 if (errno == ENOENT) {
1682 if (got_fileindex_entry_has_file_on_disk(ie))
1683 *status = GOT_STATUS_MISSING;
1685 *status = GOT_STATUS_DELETE;
1688 err = got_error_from_errno2("fstat", abspath);
1693 if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1694 *status = GOT_STATUS_OBSTRUCTED;
1698 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1699 *status = GOT_STATUS_DELETE;
1701 } else if (!got_fileindex_entry_has_blob(ie) &&
1702 staged_status != GOT_STATUS_ADD) {
1703 *status = GOT_STATUS_ADD;
1707 if (!stat_info_differs(ie, sb))
1710 if (S_ISLNK(sb->st_mode) &&
1711 got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1712 *status = GOT_STATUS_MODIFY;
1716 if (staged_status == GOT_STATUS_MODIFY ||
1717 staged_status == GOT_STATUS_ADD)
1718 got_fileindex_entry_get_staged_blob_id(&id, ie);
1720 got_fileindex_entry_get_blob_id(&id, ie);
1722 fd1 = got_opentempfd();
1724 err = got_error_from_errno("got_opentempfd");
1727 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1731 if (S_ISLNK(sb->st_mode)) {
1732 err = get_symlink_modification_status(status, ie,
1733 abspath, dirfd, de_name, blob);
1738 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1740 err = got_error_from_errno2("openat", abspath);
1745 f = fdopen(fd, "r");
1747 err = got_error_from_errno2("fdopen", abspath);
1751 hdrlen = got_object_blob_get_hdrlen(blob);
1753 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1754 err = got_object_blob_read_block(&blen, blob);
1757 /* Skip length of blob object header first time around. */
1758 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1759 if (flen == 0 && ferror(f)) {
1760 err = got_error_from_errno("fread");
1763 if (blen - hdrlen == 0) {
1765 *status = GOT_STATUS_MODIFY;
1767 } else if (flen == 0) {
1768 if (blen - hdrlen != 0)
1769 *status = GOT_STATUS_MODIFY;
1771 } else if (blen - hdrlen == flen) {
1772 /* Skip blob object header first time around. */
1773 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1774 *status = GOT_STATUS_MODIFY;
1778 *status = GOT_STATUS_MODIFY;
1784 if (*status == GOT_STATUS_MODIFY) {
1786 err = get_modified_file_content_status(status, f);
1787 } else if (xbit_differs(ie, sb->st_mode))
1788 *status = GOT_STATUS_MODE_CHANGE;
1790 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1791 err = got_error_from_errno("close");
1793 got_object_blob_close(blob);
1794 if (f != NULL && fclose(f) == EOF && err == NULL)
1795 err = got_error_from_errno2("fclose", abspath);
1796 if (fd != -1 && close(fd) == -1 && err == NULL)
1797 err = got_error_from_errno2("close", abspath);
1802 * Update timestamps in the file index if a file is unmodified and
1803 * we had to run a full content comparison to find out.
1805 static const struct got_error *
1806 sync_timestamps(int wt_fd, const char *path, unsigned char status,
1807 struct got_fileindex_entry *ie, struct stat *sb)
1809 if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1810 return got_fileindex_entry_update(ie, wt_fd, path,
1811 ie->blob_sha1, ie->commit_sha1, 1);
1816 static const struct got_error *
1817 update_blob(struct got_worktree *worktree,
1818 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1819 struct got_tree_entry *te, const char *path,
1820 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1823 const struct got_error *err = NULL;
1824 struct got_blob_object *blob = NULL;
1825 char *ondisk_path = NULL;
1826 unsigned char status = GOT_STATUS_NO_CHANGE;
1828 int fd1 = -1, fd2 = -1;
1830 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1831 return got_error_from_errno("asprintf");
1834 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1835 err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1838 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1842 if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1843 sb.st_mode = got_fileindex_perms_to_st(ie);
1845 if (stat(ondisk_path, &sb) == -1) {
1846 if (errno != ENOENT) {
1847 err = got_error_from_errno2("stat",
1851 sb.st_mode = GOT_DEFAULT_FILE_MODE;
1852 status = GOT_STATUS_UNVERSIONED;
1854 if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1855 status = GOT_STATUS_UNVERSIONED;
1857 status = GOT_STATUS_OBSTRUCTED;
1861 if (status == GOT_STATUS_OBSTRUCTED) {
1863 got_fileindex_entry_mark_skipped(ie);
1864 err = (*progress_cb)(progress_arg, status, path);
1867 if (status == GOT_STATUS_CONFLICT) {
1869 got_fileindex_entry_mark_skipped(ie);
1870 err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1875 if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1876 (S_ISLNK(te->mode) ||
1877 (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1879 * This is a regular file or an installed bad symlink.
1880 * If the file index indicates that this file is already
1881 * up-to-date with respect to the repository we can skip
1882 * updating contents of this file.
1884 if (got_fileindex_entry_has_commit(ie) &&
1885 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1886 SHA1_DIGEST_LENGTH) == 0) {
1888 err = sync_timestamps(worktree->root_fd,
1889 path, status, ie, &sb);
1892 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1896 if (got_fileindex_entry_has_blob(ie) &&
1897 memcmp(ie->blob_sha1, te->id.sha1,
1898 SHA1_DIGEST_LENGTH) == 0) {
1899 /* Different commit but the same blob. */
1900 err = sync_timestamps(worktree->root_fd,
1901 path, status, ie, &sb);
1904 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1910 fd1 = got_opentempfd();
1912 err = got_error_from_errno("got_opentempfd");
1915 err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1919 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1920 int update_timestamps;
1921 struct got_blob_object *blob2 = NULL;
1922 char *label_orig = NULL;
1923 if (got_fileindex_entry_has_blob(ie)) {
1924 fd2 = got_opentempfd();
1926 err = got_error_from_errno("got_opentempfd");
1929 struct got_object_id id2;
1930 got_fileindex_entry_get_blob_id(&id2, ie);
1931 err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
1936 if (got_fileindex_entry_has_commit(ie)) {
1937 char id_str[SHA1_DIGEST_STRING_LENGTH];
1938 if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1939 sizeof(id_str)) == NULL) {
1940 err = got_error_path(id_str,
1941 GOT_ERR_BAD_OBJ_ID_STR);
1944 if (asprintf(&label_orig, "%s: commit %s",
1945 GOT_MERGE_LABEL_BASE, id_str) == -1) {
1946 err = got_error_from_errno("asprintf");
1950 if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1952 err = got_object_blob_read_to_str(&link_target, blob);
1955 err = merge_symlink(worktree, blob2, ondisk_path, path,
1956 label_orig, link_target, worktree->base_commit_id,
1957 repo, progress_cb, progress_arg);
1960 err = merge_blob(&update_timestamps, worktree, blob2,
1961 ondisk_path, path, sb.st_mode, label_orig, blob,
1962 worktree->base_commit_id, repo,
1963 progress_cb, progress_arg);
1966 if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
1967 err = got_error_from_errno("close");
1971 got_object_blob_close(blob2);
1975 * Do not update timestamps of files with local changes.
1976 * Otherwise, a future status walk would treat them as
1977 * unmodified files again.
1979 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1980 blob->id.sha1, worktree->base_commit_id->sha1,
1982 } else if (status == GOT_STATUS_MODE_CHANGE) {
1983 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1984 blob->id.sha1, worktree->base_commit_id->sha1, 0);
1985 } else if (status == GOT_STATUS_DELETE) {
1986 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1989 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1990 blob->id.sha1, worktree->base_commit_id->sha1, 0);
1994 int is_bad_symlink = 0;
1995 if (S_ISLNK(te->mode)) {
1996 err = install_symlink(&is_bad_symlink, worktree,
1997 ondisk_path, path, blob,
1998 status == GOT_STATUS_MISSING, 0,
1999 status == GOT_STATUS_UNVERSIONED, 0,
2000 repo, progress_cb, progress_arg);
2002 err = install_blob(worktree, ondisk_path, path,
2003 te->mode, sb.st_mode, blob,
2004 status == GOT_STATUS_MISSING, 0, 0,
2005 status == GOT_STATUS_UNVERSIONED, repo,
2006 progress_cb, progress_arg);
2012 err = got_fileindex_entry_update(ie,
2013 worktree->root_fd, path, blob->id.sha1,
2014 worktree->base_commit_id->sha1, 1);
2016 err = create_fileindex_entry(&ie, fileindex,
2017 worktree->base_commit_id, worktree->root_fd, path,
2023 if (is_bad_symlink) {
2024 got_fileindex_entry_filetype_set(ie,
2025 GOT_FILEIDX_MODE_BAD_SYMLINK);
2029 if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2030 err = got_error_from_errno("close");
2033 got_object_blob_close(blob);
2039 static const struct got_error *
2040 remove_ondisk_file(const char *root_path, const char *path)
2042 const struct got_error *err = NULL;
2043 char *ondisk_path = NULL, *parent = NULL;
2045 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2046 return got_error_from_errno("asprintf");
2048 if (unlink(ondisk_path) == -1) {
2049 if (errno != ENOENT)
2050 err = got_error_from_errno2("unlink", ondisk_path);
2052 size_t root_len = strlen(root_path);
2053 err = got_path_dirname(&parent, ondisk_path);
2056 while (got_path_cmp(parent, root_path,
2057 strlen(parent), root_len) != 0) {
2059 ondisk_path = parent;
2061 if (rmdir(ondisk_path) == -1) {
2062 if (errno != ENOTEMPTY)
2063 err = got_error_from_errno2("rmdir",
2067 err = got_path_dirname(&parent, ondisk_path);
2078 static const struct got_error *
2079 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2080 struct got_fileindex_entry *ie, struct got_repository *repo,
2081 got_worktree_checkout_cb progress_cb, void *progress_arg)
2083 const struct got_error *err = NULL;
2084 unsigned char status;
2088 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2089 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2091 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2093 return got_error_from_errno("asprintf");
2095 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2099 if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2100 char ondisk_target[PATH_MAX];
2101 ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2102 sizeof(ondisk_target));
2103 if (ondisk_len == -1) {
2104 err = got_error_from_errno2("readlink", ondisk_path);
2107 ondisk_target[ondisk_len] = '\0';
2108 err = install_symlink_conflict(NULL, worktree->base_commit_id,
2109 NULL, NULL, /* XXX pass common ancestor info? */
2110 ondisk_target, ondisk_path);
2113 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2118 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2119 status == GOT_STATUS_ADD) {
2120 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2124 * Preserve the working file and change the deleted blob's
2125 * entry into a schedule-add entry.
2127 err = got_fileindex_entry_update(ie, worktree->root_fd,
2128 ie->path, NULL, NULL, 0);
2130 err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2133 if (status == GOT_STATUS_NO_CHANGE) {
2134 err = remove_ondisk_file(worktree->root_path, ie->path);
2138 got_fileindex_entry_remove(fileindex, ie);
2145 struct diff_cb_arg {
2146 struct got_fileindex *fileindex;
2147 struct got_worktree *worktree;
2148 struct got_repository *repo;
2149 got_worktree_checkout_cb progress_cb;
2151 got_cancel_cb cancel_cb;
2155 static const struct got_error *
2156 diff_old_new(void *arg, struct got_fileindex_entry *ie,
2157 struct got_tree_entry *te, const char *parent_path)
2159 struct diff_cb_arg *a = arg;
2161 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2162 return got_error(GOT_ERR_CANCELLED);
2164 return update_blob(a->worktree, a->fileindex, ie, te,
2165 ie->path, a->repo, a->progress_cb, a->progress_arg);
2168 static const struct got_error *
2169 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2171 struct diff_cb_arg *a = arg;
2173 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2174 return got_error(GOT_ERR_CANCELLED);
2176 return delete_blob(a->worktree, a->fileindex, ie,
2177 a->repo, a->progress_cb, a->progress_arg);
2180 static const struct got_error *
2181 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2183 struct diff_cb_arg *a = arg;
2184 const struct got_error *err;
2187 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2188 return got_error(GOT_ERR_CANCELLED);
2190 if (got_object_tree_entry_is_submodule(te))
2193 if (asprintf(&path, "%s%s%s", parent_path,
2194 parent_path[0] ? "/" : "", te->name)
2196 return got_error_from_errno("asprintf");
2198 if (S_ISDIR(te->mode))
2199 err = add_dir_on_disk(a->worktree, path);
2201 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2202 a->repo, a->progress_cb, a->progress_arg);
2208 const struct got_error *
2209 got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2211 uint32_t uuid_status;
2213 uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2214 if (uuid_status != uuid_s_ok) {
2216 return got_error_uuid(uuid_status, "uuid_to_string");
2222 static const struct got_error *
2223 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2225 const struct got_error *err = NULL;
2226 char *uuidstr = NULL;
2230 err = got_worktree_get_uuid(&uuidstr, worktree);
2234 if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2235 err = got_error_from_errno("asprintf");
2242 const struct got_error *
2243 got_worktree_get_logmsg_ref_name(char **refname, struct got_worktree *worktree,
2246 return get_ref_name(refname, worktree, prefix);
2249 const struct got_error *
2250 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2252 return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2255 static const struct got_error *
2256 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2258 return get_ref_name(refname, worktree,
2259 GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2262 static const struct got_error *
2263 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2265 return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2268 static const struct got_error *
2269 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2271 return get_ref_name(refname, worktree,
2272 GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2275 static const struct got_error *
2276 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2278 return get_ref_name(refname, worktree,
2279 GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2282 static const struct got_error *
2283 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2285 return get_ref_name(refname, worktree,
2286 GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2289 static const struct got_error *
2290 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2292 return get_ref_name(refname, worktree,
2293 GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2296 static const struct got_error *
2297 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2299 return get_ref_name(refname, worktree,
2300 GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2303 static const struct got_error *
2304 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2306 return get_ref_name(refname, worktree,
2307 GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2310 const struct got_error *
2311 got_worktree_get_histedit_script_path(char **path,
2312 struct got_worktree *worktree)
2314 if (asprintf(path, "%s/%s/%s", worktree->root_path,
2315 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2317 return got_error_from_errno("asprintf");
2322 static const struct got_error *
2323 get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2325 return get_ref_name(refname, worktree,
2326 GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2329 static const struct got_error *
2330 get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2332 return get_ref_name(refname, worktree,
2333 GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2337 * Prevent Git's garbage collector from deleting our base commit by
2338 * setting a reference to our base commit's ID.
2340 static const struct got_error *
2341 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2343 const struct got_error *err = NULL;
2344 struct got_reference *ref = NULL;
2347 err = got_worktree_get_base_ref_name(&refname, worktree);
2351 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2355 err = got_ref_write(ref, repo);
2363 static const struct got_error *
2364 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2366 const struct got_error *err = NULL;
2368 if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2369 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2370 err = got_error_from_errno("asprintf");
2371 *fileindex_path = NULL;
2377 static const struct got_error *
2378 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2379 struct got_worktree *worktree)
2381 const struct got_error *err = NULL;
2384 *fileindex_path = NULL;
2385 *fileindex = got_fileindex_alloc();
2386 if (*fileindex == NULL)
2387 return got_error_from_errno("got_fileindex_alloc");
2389 err = get_fileindex_path(fileindex_path, worktree);
2393 index = fopen(*fileindex_path, "rbe");
2394 if (index == NULL) {
2395 if (errno != ENOENT)
2396 err = got_error_from_errno2("fopen", *fileindex_path);
2398 err = got_fileindex_read(*fileindex, index);
2399 if (fclose(index) == EOF && err == NULL)
2400 err = got_error_from_errno("fclose");
2404 free(*fileindex_path);
2405 *fileindex_path = NULL;
2406 got_fileindex_free(*fileindex);
2412 struct bump_base_commit_id_arg {
2413 struct got_object_id *base_commit_id;
2416 const char *entry_name;
2417 got_worktree_checkout_cb progress_cb;
2421 static const struct got_error *
2422 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2424 const struct got_error *err;
2425 struct bump_base_commit_id_arg *a = arg;
2427 if (a->entry_name) {
2428 if (strcmp(ie->path, a->path) != 0)
2430 } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2433 if (got_fileindex_entry_was_skipped(ie))
2436 if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2437 SHA1_DIGEST_LENGTH) == 0)
2440 if (a->progress_cb) {
2441 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2446 memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2450 /* Bump base commit ID of all files within an updated part of the work tree. */
2451 static const struct got_error *
2452 bump_base_commit_id_everywhere(struct got_worktree *worktree,
2453 struct got_fileindex *fileindex,
2454 got_worktree_checkout_cb progress_cb, void *progress_arg)
2456 struct bump_base_commit_id_arg bbc_arg;
2458 bbc_arg.base_commit_id = worktree->base_commit_id;
2459 bbc_arg.entry_name = NULL;
2461 bbc_arg.path_len = 0;
2462 bbc_arg.progress_cb = progress_cb;
2463 bbc_arg.progress_arg = progress_arg;
2465 return got_fileindex_for_each_entry_safe(fileindex,
2466 bump_base_commit_id, &bbc_arg);
2469 static const struct got_error *
2470 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2472 const struct got_error *err = NULL;
2473 char *new_fileindex_path = NULL;
2474 FILE *new_index = NULL;
2475 struct timespec timeout;
2477 err = got_opentemp_named(&new_fileindex_path, &new_index,
2478 fileindex_path, "");
2482 err = got_fileindex_write(fileindex, new_index);
2486 if (rename(new_fileindex_path, fileindex_path) != 0) {
2487 err = got_error_from_errno3("rename", new_fileindex_path,
2489 unlink(new_fileindex_path);
2493 * Sleep for a short amount of time to ensure that files modified after
2494 * this program exits have a different time stamp from the one which
2495 * was recorded in the file index.
2498 timeout.tv_nsec = 1;
2499 nanosleep(&timeout, NULL);
2503 free(new_fileindex_path);
2507 static const struct got_error *
2508 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2509 struct got_object_id **tree_id, const char *wt_relpath,
2510 struct got_commit_object *base_commit, struct got_worktree *worktree,
2511 struct got_repository *repo)
2513 const struct got_error *err = NULL;
2514 struct got_object_id *id = NULL;
2515 char *in_repo_path = NULL;
2516 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2518 *entry_type = GOT_OBJ_TYPE_ANY;
2519 *tree_relpath = NULL;
2522 if (wt_relpath[0] == '\0') {
2523 /* Check out all files within the work tree. */
2524 *entry_type = GOT_OBJ_TYPE_TREE;
2525 *tree_relpath = strdup("");
2526 if (*tree_relpath == NULL) {
2527 err = got_error_from_errno("strdup");
2530 err = got_object_id_by_path(tree_id, repo, base_commit,
2531 worktree->path_prefix);
2537 /* Check out a subset of files in the work tree. */
2539 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2540 is_root_wt ? "" : "/", wt_relpath) == -1) {
2541 err = got_error_from_errno("asprintf");
2545 err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2550 in_repo_path = NULL;
2552 err = got_object_get_type(entry_type, repo, id);
2556 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2557 /* Check out a single file. */
2558 if (strchr(wt_relpath, '/') == NULL) {
2559 /* Check out a single file in work tree's root dir. */
2560 in_repo_path = strdup(worktree->path_prefix);
2561 if (in_repo_path == NULL) {
2562 err = got_error_from_errno("strdup");
2565 *tree_relpath = strdup("");
2566 if (*tree_relpath == NULL) {
2567 err = got_error_from_errno("strdup");
2571 /* Check out a single file in a subdirectory. */
2572 err = got_path_dirname(tree_relpath, wt_relpath);
2575 if (asprintf(&in_repo_path, "%s%s%s",
2576 worktree->path_prefix, is_root_wt ? "" : "/",
2577 *tree_relpath) == -1) {
2578 err = got_error_from_errno("asprintf");
2582 err = got_object_id_by_path(tree_id, repo,
2583 base_commit, in_repo_path);
2585 /* Check out all files within a subdirectory. */
2586 *tree_id = got_object_id_dup(id);
2587 if (*tree_id == NULL) {
2588 err = got_error_from_errno("got_object_id_dup");
2591 *tree_relpath = strdup(wt_relpath);
2592 if (*tree_relpath == NULL) {
2593 err = got_error_from_errno("strdup");
2601 *entry_type = GOT_OBJ_TYPE_ANY;
2602 free(*tree_relpath);
2603 *tree_relpath = NULL;
2610 static const struct got_error *
2611 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2612 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2613 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2614 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2616 const struct got_error *err = NULL;
2617 struct got_commit_object *commit = NULL;
2618 struct got_tree_object *tree = NULL;
2619 struct got_fileindex_diff_tree_cb diff_cb;
2620 struct diff_cb_arg arg;
2622 err = ref_base_commit(worktree, repo);
2624 if (!(err->code == GOT_ERR_ERRNO &&
2625 (errno == EACCES || errno == EROFS)))
2627 err = (*progress_cb)(progress_arg,
2628 GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2633 err = got_object_open_as_commit(&commit, repo,
2634 worktree->base_commit_id);
2638 err = got_object_open_as_tree(&tree, repo, tree_id);
2643 got_object_tree_find_entry(tree, entry_name) == NULL) {
2644 err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2648 diff_cb.diff_old_new = diff_old_new;
2649 diff_cb.diff_old = diff_old;
2650 diff_cb.diff_new = diff_new;
2651 arg.fileindex = fileindex;
2652 arg.worktree = worktree;
2654 arg.progress_cb = progress_cb;
2655 arg.progress_arg = progress_arg;
2656 arg.cancel_cb = cancel_cb;
2657 arg.cancel_arg = cancel_arg;
2658 err = got_fileindex_diff_tree(fileindex, tree, relpath,
2659 entry_name, repo, &diff_cb, &arg);
2662 got_object_tree_close(tree);
2664 got_object_commit_close(commit);
2668 const struct got_error *
2669 got_worktree_checkout_files(struct got_worktree *worktree,
2670 struct got_pathlist_head *paths, struct got_repository *repo,
2671 got_worktree_checkout_cb progress_cb, void *progress_arg,
2672 got_cancel_cb cancel_cb, void *cancel_arg)
2674 const struct got_error *err = NULL, *sync_err, *unlockerr;
2675 struct got_commit_object *commit = NULL;
2676 struct got_tree_object *tree = NULL;
2677 struct got_fileindex *fileindex = NULL;
2678 char *fileindex_path = NULL;
2679 struct got_pathlist_entry *pe;
2680 struct tree_path_data {
2681 STAILQ_ENTRY(tree_path_data) entry;
2682 struct got_object_id *tree_id;
2687 STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2689 STAILQ_INIT(&tree_paths);
2691 err = lock_worktree(worktree, LOCK_EX);
2695 err = got_object_open_as_commit(&commit, repo,
2696 worktree->base_commit_id);
2700 /* Map all specified paths to in-repository trees. */
2701 TAILQ_FOREACH(pe, paths, entry) {
2702 tpd = malloc(sizeof(*tpd));
2704 err = got_error_from_errno("malloc");
2708 err = find_tree_entry_for_checkout(&tpd->entry_type,
2709 &tpd->relpath, &tpd->tree_id, pe->path, commit,
2716 if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2717 err = got_path_basename(&tpd->entry_name, pe->path);
2725 tpd->entry_name = NULL;
2727 STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2731 * Read the file index.
2732 * Checking out files is supposed to be an idempotent operation.
2733 * If the on-disk file index is incomplete we will try to complete it.
2735 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2739 tpd = STAILQ_FIRST(&tree_paths);
2740 TAILQ_FOREACH(pe, paths, entry) {
2741 struct bump_base_commit_id_arg bbc_arg;
2743 err = checkout_files(worktree, fileindex, tpd->relpath,
2744 tpd->tree_id, tpd->entry_name, repo,
2745 progress_cb, progress_arg, cancel_cb, cancel_arg);
2749 bbc_arg.base_commit_id = worktree->base_commit_id;
2750 bbc_arg.entry_name = tpd->entry_name;
2751 bbc_arg.path = pe->path;
2752 bbc_arg.path_len = pe->path_len;
2753 bbc_arg.progress_cb = progress_cb;
2754 bbc_arg.progress_arg = progress_arg;
2755 err = got_fileindex_for_each_entry_safe(fileindex,
2756 bump_base_commit_id, &bbc_arg);
2760 tpd = STAILQ_NEXT(tpd, entry);
2762 sync_err = sync_fileindex(fileindex, fileindex_path);
2763 if (sync_err && err == NULL)
2766 free(fileindex_path);
2768 got_object_tree_close(tree);
2770 got_object_commit_close(commit);
2772 got_fileindex_free(fileindex);
2773 while (!STAILQ_EMPTY(&tree_paths)) {
2774 tpd = STAILQ_FIRST(&tree_paths);
2775 STAILQ_REMOVE_HEAD(&tree_paths, entry);
2780 unlockerr = lock_worktree(worktree, LOCK_SH);
2781 if (unlockerr && err == NULL)
2786 struct merge_file_cb_arg {
2787 struct got_worktree *worktree;
2788 struct got_fileindex *fileindex;
2789 got_worktree_checkout_cb progress_cb;
2791 got_cancel_cb cancel_cb;
2793 const char *label_orig;
2794 struct got_object_id *commit_id2;
2795 int allow_bad_symlinks;
2798 static const struct got_error *
2799 merge_file_cb(void *arg, struct got_blob_object *blob1,
2800 struct got_blob_object *blob2, FILE *f1, FILE *f2,
2801 struct got_object_id *id1, struct got_object_id *id2,
2802 const char *path1, const char *path2,
2803 mode_t mode1, mode_t mode2, struct got_repository *repo)
2805 static const struct got_error *err = NULL;
2806 struct merge_file_cb_arg *a = arg;
2807 struct got_fileindex_entry *ie;
2808 char *ondisk_path = NULL;
2810 unsigned char status;
2811 int local_changes_subsumed;
2812 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2813 char *id_str = NULL, *label_deriv2 = NULL;
2815 if (blob1 && blob2) {
2816 ie = got_fileindex_entry_get(a->fileindex, path2,
2819 return (*a->progress_cb)(a->progress_arg,
2820 GOT_STATUS_MISSING, path2);
2822 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2824 return got_error_from_errno("asprintf");
2826 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2831 if (status == GOT_STATUS_DELETE) {
2832 err = (*a->progress_cb)(a->progress_arg,
2833 GOT_STATUS_MERGE, path2);
2836 if (status != GOT_STATUS_NO_CHANGE &&
2837 status != GOT_STATUS_MODIFY &&
2838 status != GOT_STATUS_CONFLICT &&
2839 status != GOT_STATUS_ADD) {
2840 err = (*a->progress_cb)(a->progress_arg, status, path2);
2844 if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2846 err = got_object_blob_read_to_str(&link_target2, blob2);
2849 err = merge_symlink(a->worktree, blob1, ondisk_path,
2850 path2, a->label_orig, link_target2, a->commit_id2,
2851 repo, a->progress_cb, a->progress_arg);
2856 f_orig = got_opentemp();
2857 if (f_orig == NULL) {
2858 err = got_error_from_errno("got_opentemp");
2861 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2866 f_deriv2 = got_opentemp();
2867 if (f_deriv2 == NULL)
2869 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2874 fd = open(ondisk_path,
2875 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2877 err = got_error_from_errno2("open",
2881 f_deriv = fdopen(fd, "r");
2882 if (f_deriv == NULL) {
2883 err = got_error_from_errno2("fdopen",
2888 err = got_object_id_str(&id_str, a->commit_id2);
2891 if (asprintf(&label_deriv2, "%s: commit %s",
2892 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2893 err = got_error_from_errno("asprintf");
2896 err = merge_file(&local_changes_subsumed, a->worktree,
2897 f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2898 mode2, a->label_orig, NULL, label_deriv2,
2899 GOT_DIFF_ALGORITHM_PATIENCE, repo,
2900 a->progress_cb, a->progress_arg);
2903 ie = got_fileindex_entry_get(a->fileindex, path1,
2906 return (*a->progress_cb)(a->progress_arg,
2907 GOT_STATUS_MISSING, path1);
2909 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2911 return got_error_from_errno("asprintf");
2913 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2919 case GOT_STATUS_NO_CHANGE:
2920 err = (*a->progress_cb)(a->progress_arg,
2921 GOT_STATUS_DELETE, path1);
2924 err = remove_ondisk_file(a->worktree->root_path, path1);
2928 got_fileindex_entry_mark_deleted_from_disk(ie);
2930 case GOT_STATUS_DELETE:
2931 case GOT_STATUS_MISSING:
2932 err = (*a->progress_cb)(a->progress_arg,
2933 GOT_STATUS_DELETE, path1);
2937 got_fileindex_entry_mark_deleted_from_disk(ie);
2939 case GOT_STATUS_ADD: {
2940 struct got_object_id *id;
2944 * Delete the added file only if its content already
2945 * exists in the repository.
2947 err = got_object_blob_file_create(&id, &blob1_f,
2948 &blob1_size, path1);
2951 if (got_object_id_cmp(id, id1) == 0) {
2952 err = (*a->progress_cb)(a->progress_arg,
2953 GOT_STATUS_DELETE, path1);
2956 err = remove_ondisk_file(a->worktree->root_path,
2961 got_fileindex_entry_remove(a->fileindex,
2964 err = (*a->progress_cb)(a->progress_arg,
2965 GOT_STATUS_CANNOT_DELETE, path1);
2967 if (fclose(blob1_f) == EOF && err == NULL)
2968 err = got_error_from_errno("fclose");
2974 case GOT_STATUS_MODIFY:
2975 case GOT_STATUS_CONFLICT:
2976 err = (*a->progress_cb)(a->progress_arg,
2977 GOT_STATUS_CANNOT_DELETE, path1);
2981 case GOT_STATUS_OBSTRUCTED:
2982 err = (*a->progress_cb)(a->progress_arg, status, path1);
2990 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2992 return got_error_from_errno("asprintf");
2993 ie = got_fileindex_entry_get(a->fileindex, path2,
2996 err = get_file_status(&status, &sb, ie, ondisk_path,
3000 if (status != GOT_STATUS_NO_CHANGE &&
3001 status != GOT_STATUS_MODIFY &&
3002 status != GOT_STATUS_CONFLICT &&
3003 status != GOT_STATUS_ADD) {
3004 err = (*a->progress_cb)(a->progress_arg,
3008 if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3010 err = got_object_blob_read_to_str(&link_target2,
3014 err = merge_symlink(a->worktree, NULL,
3015 ondisk_path, path2, a->label_orig,
3016 link_target2, a->commit_id2, repo,
3017 a->progress_cb, a->progress_arg);
3019 } else if (S_ISREG(sb.st_mode)) {
3020 err = merge_blob(&local_changes_subsumed,
3021 a->worktree, NULL, ondisk_path, path2,
3022 sb.st_mode, a->label_orig, blob2,
3023 a->commit_id2, repo, a->progress_cb,
3026 err = got_error_path(ondisk_path,
3027 GOT_ERR_FILE_OBSTRUCTED);
3031 if (status == GOT_STATUS_DELETE) {
3032 err = got_fileindex_entry_update(ie,
3033 a->worktree->root_fd, path2, blob2->id.sha1,
3034 a->worktree->base_commit_id->sha1, 0);
3039 int is_bad_symlink = 0;
3040 sb.st_mode = GOT_DEFAULT_FILE_MODE;
3041 if (S_ISLNK(mode2)) {
3042 err = install_symlink(&is_bad_symlink,
3043 a->worktree, ondisk_path, path2, blob2, 0,
3044 0, 1, a->allow_bad_symlinks, repo,
3045 a->progress_cb, a->progress_arg);
3047 err = install_blob(a->worktree, ondisk_path, path2,
3048 mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3049 a->progress_cb, a->progress_arg);
3053 err = got_fileindex_entry_alloc(&ie, path2);
3056 err = got_fileindex_entry_update(ie,
3057 a->worktree->root_fd, path2, NULL, NULL, 1);
3059 got_fileindex_entry_free(ie);
3062 err = got_fileindex_entry_add(a->fileindex, ie);
3064 got_fileindex_entry_free(ie);
3067 if (is_bad_symlink) {
3068 got_fileindex_entry_filetype_set(ie,
3069 GOT_FILEIDX_MODE_BAD_SYMLINK);
3074 if (f_orig && fclose(f_orig) == EOF && err == NULL)
3075 err = got_error_from_errno("fclose");
3076 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3077 err = got_error_from_errno("fclose");
3078 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3079 err = got_error_from_errno("fclose");
3086 static const struct got_error *
3087 check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3089 struct got_worktree *worktree = arg;
3091 /* Reject merges into a work tree with mixed base commits. */
3092 if (got_fileindex_entry_has_commit(ie) &&
3093 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3094 SHA1_DIGEST_LENGTH) != 0)
3095 return got_error(GOT_ERR_MIXED_COMMITS);
3100 struct check_merge_conflicts_arg {
3101 struct got_worktree *worktree;
3102 struct got_fileindex *fileindex;
3103 struct got_repository *repo;
3106 static const struct got_error *
3107 check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3108 struct got_blob_object *blob2, FILE *f1, FILE *f2,
3109 struct got_object_id *id1, struct got_object_id *id2,
3110 const char *path1, const char *path2,
3111 mode_t mode1, mode_t mode2, struct got_repository *repo)
3113 const struct got_error *err = NULL;
3114 struct check_merge_conflicts_arg *a = arg;
3115 unsigned char status;
3117 struct got_fileindex_entry *ie;
3118 const char *path = path2 ? path2 : path1;
3119 struct got_object_id *id = id2 ? id2 : id1;
3125 ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3129 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3131 return got_error_from_errno("asprintf");
3133 /* Reject merges into a work tree with conflicted files. */
3134 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3138 if (status == GOT_STATUS_CONFLICT)
3139 return got_error(GOT_ERR_CONFLICTS);
3144 static const struct got_error *
3145 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3146 const char *fileindex_path, struct got_object_id *commit_id1,
3147 struct got_object_id *commit_id2, struct got_repository *repo,
3148 got_worktree_checkout_cb progress_cb, void *progress_arg,
3149 got_cancel_cb cancel_cb, void *cancel_arg)
3151 const struct got_error *err = NULL, *sync_err;
3152 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3153 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3154 struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3155 struct check_merge_conflicts_arg cmc_arg;
3156 struct merge_file_cb_arg arg;
3157 char *label_orig = NULL;
3158 FILE *f1 = NULL, *f2 = NULL;
3159 int fd1 = -1, fd2 = -1;
3162 err = got_object_open_as_commit(&commit1, repo, commit_id1);
3165 err = got_object_id_by_path(&tree_id1, repo, commit1,
3166 worktree->path_prefix);
3167 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3173 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3177 err = got_object_id_str(&id_str, commit_id1);
3181 if (asprintf(&label_orig, "%s: commit %s",
3182 GOT_MERGE_LABEL_BASE, id_str) == -1) {
3183 err = got_error_from_errno("asprintf");
3189 f1 = got_opentemp();
3191 err = got_error_from_errno("got_opentemp");
3196 err = got_object_open_as_commit(&commit2, repo, commit_id2);
3200 err = got_object_id_by_path(&tree_id2, repo, commit2,
3201 worktree->path_prefix);
3205 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3209 f2 = got_opentemp();
3211 err = got_error_from_errno("got_opentemp");
3215 fd1 = got_opentempfd();
3217 err = got_error_from_errno("got_opentempfd");
3221 fd2 = got_opentempfd();
3223 err = got_error_from_errno("got_opentempfd");
3227 cmc_arg.worktree = worktree;
3228 cmc_arg.fileindex = fileindex;
3229 cmc_arg.repo = repo;
3230 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3231 check_merge_conflicts, &cmc_arg, 0);
3235 arg.worktree = worktree;
3236 arg.fileindex = fileindex;
3237 arg.progress_cb = progress_cb;
3238 arg.progress_arg = progress_arg;
3239 arg.cancel_cb = cancel_cb;
3240 arg.cancel_arg = cancel_arg;
3241 arg.label_orig = label_orig;
3242 arg.commit_id2 = commit_id2;
3243 arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3244 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3245 merge_file_cb, &arg, 1);
3246 sync_err = sync_fileindex(fileindex, fileindex_path);
3247 if (sync_err && err == NULL)
3251 got_object_commit_close(commit1);
3253 got_object_commit_close(commit2);
3255 got_object_tree_close(tree1);
3257 got_object_tree_close(tree2);
3258 if (f1 && fclose(f1) == EOF && err == NULL)
3259 err = got_error_from_errno("fclose");
3260 if (f2 && fclose(f2) == EOF && err == NULL)
3261 err = got_error_from_errno("fclose");
3262 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3263 err = got_error_from_errno("close");
3264 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3265 err = got_error_from_errno("close");
3270 const struct got_error *
3271 got_worktree_merge_files(struct got_worktree *worktree,
3272 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3273 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3274 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3276 const struct got_error *err, *unlockerr;
3277 char *fileindex_path = NULL;
3278 struct got_fileindex *fileindex = NULL;
3280 err = lock_worktree(worktree, LOCK_EX);
3284 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3288 err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3293 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3294 commit_id2, repo, progress_cb, progress_arg,
3295 cancel_cb, cancel_arg);
3298 got_fileindex_free(fileindex);
3299 free(fileindex_path);
3300 unlockerr = lock_worktree(worktree, LOCK_SH);
3301 if (unlockerr && err == NULL)
3306 struct diff_dir_cb_arg {
3307 struct got_fileindex *fileindex;
3308 struct got_worktree *worktree;
3309 const char *status_path;
3310 size_t status_path_len;
3311 struct got_repository *repo;
3312 got_worktree_status_cb status_cb;
3314 got_cancel_cb cancel_cb;
3316 /* A pathlist containing per-directory pathlists of ignore patterns. */
3317 struct got_pathlist_head *ignores;
3318 int report_unchanged;
3322 static const struct got_error *
3323 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3324 int dirfd, const char *de_name,
3325 got_worktree_status_cb status_cb, void *status_arg,
3326 struct got_repository *repo, int report_unchanged)
3328 const struct got_error *err = NULL;
3329 unsigned char status = GOT_STATUS_NO_CHANGE;
3330 unsigned char staged_status = get_staged_status(ie);
3332 struct got_object_id blob_id, commit_id, staged_blob_id;
3333 struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3334 struct got_object_id *staged_blob_idp = NULL;
3336 err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3340 if (status == GOT_STATUS_NO_CHANGE &&
3341 staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3344 if (got_fileindex_entry_has_blob(ie))
3345 blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
3346 if (got_fileindex_entry_has_commit(ie))
3347 commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
3348 if (staged_status == GOT_STATUS_ADD ||
3349 staged_status == GOT_STATUS_MODIFY) {
3350 staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
3351 &staged_blob_id, ie);
3354 return (*status_cb)(status_arg, status, staged_status,
3355 ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3358 static const struct got_error *
3359 status_old_new(void *arg, struct got_fileindex_entry *ie,
3360 struct dirent *de, const char *parent_path, int dirfd)
3362 const struct got_error *err = NULL;
3363 struct diff_dir_cb_arg *a = arg;
3366 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3367 return got_error(GOT_ERR_CANCELLED);
3369 if (got_path_cmp(parent_path, a->status_path,
3370 strlen(parent_path), a->status_path_len) != 0 &&
3371 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3374 if (parent_path[0]) {
3375 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3376 parent_path, de->d_name) == -1)
3377 return got_error_from_errno("asprintf");
3379 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3381 return got_error_from_errno("asprintf");
3384 err = report_file_status(ie, abspath, dirfd, de->d_name,
3385 a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3390 static const struct got_error *
3391 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3393 struct diff_dir_cb_arg *a = arg;
3394 struct got_object_id blob_id, commit_id;
3395 unsigned char status;
3397 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3398 return got_error(GOT_ERR_CANCELLED);
3400 if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3403 got_fileindex_entry_get_blob_id(&blob_id, ie);
3404 got_fileindex_entry_get_commit_id(&commit_id, ie);
3405 if (got_fileindex_entry_has_file_on_disk(ie))
3406 status = GOT_STATUS_MISSING;
3408 status = GOT_STATUS_DELETE;
3409 return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3410 ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3414 free_ignores(struct got_pathlist_head *ignores)
3416 struct got_pathlist_entry *pe;
3418 TAILQ_FOREACH(pe, ignores, entry) {
3419 struct got_pathlist_head *ignorelist = pe->data;
3421 got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3423 got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
3426 static const struct got_error *
3427 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3429 const struct got_error *err = NULL;
3430 struct got_pathlist_entry *pe = NULL;
3431 struct got_pathlist_head *ignorelist;
3432 char *line = NULL, *pattern, *dirpath = NULL;
3433 size_t linesize = 0;
3436 ignorelist = calloc(1, sizeof(*ignorelist));
3437 if (ignorelist == NULL)
3438 return got_error_from_errno("calloc");
3439 TAILQ_INIT(ignorelist);
3441 while ((linelen = getline(&line, &linesize, f)) != -1) {
3442 if (linelen > 0 && line[linelen - 1] == '\n')
3443 line[linelen - 1] = '\0';
3445 /* Git's ignores may contain comments. */
3449 /* Git's negated patterns are not (yet?) supported. */
3453 if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3455 err = got_error_from_errno("asprintf");
3458 err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3463 err = got_error_from_errno("getline");
3467 dirpath = strdup(path);
3468 if (dirpath == NULL) {
3469 err = got_error_from_errno("strdup");
3472 err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3475 if (err || pe == NULL) {
3477 got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3483 match_ignores(struct got_pathlist_head *ignores, const char *path)
3485 struct got_pathlist_entry *pe;
3487 /* Handle patterns which match in all directories. */
3488 TAILQ_FOREACH(pe, ignores, entry) {
3489 struct got_pathlist_head *ignorelist = pe->data;
3490 struct got_pathlist_entry *pi;
3492 TAILQ_FOREACH(pi, ignorelist, entry) {
3493 const char *p, *pattern = pi->path;
3495 if (strncmp(pattern, "**/", 3) != 0)
3500 if (fnmatch(pattern, p,
3501 FNM_PATHNAME | FNM_LEADING_DIR)) {
3502 /* Retry in next directory. */
3503 while (*p && *p != '/')
3515 * The ignores pathlist contains ignore lists from children before
3516 * parents, so we can find the most specific ignorelist by walking
3517 * ignores backwards.
3519 pe = TAILQ_LAST(ignores, got_pathlist_head);
3521 if (got_path_is_child(path, pe->path, pe->path_len)) {
3522 struct got_pathlist_head *ignorelist = pe->data;
3523 struct got_pathlist_entry *pi;
3524 TAILQ_FOREACH(pi, ignorelist, entry) {
3525 const char *pattern = pi->path;
3526 int flags = FNM_LEADING_DIR;
3527 if (strstr(pattern, "/**/") == NULL)
3528 flags |= FNM_PATHNAME;
3529 if (fnmatch(pattern, path, flags))
3534 pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3540 static const struct got_error *
3541 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3542 const char *path, int dirfd, const char *ignores_filename)
3544 const struct got_error *err = NULL;
3547 FILE *ignoresfile = NULL;
3549 if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3550 path[0] ? "/" : "", ignores_filename) == -1)
3551 return got_error_from_errno("asprintf");
3554 fd = openat(dirfd, ignores_filename,
3555 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3557 if (errno != ENOENT && errno != EACCES)
3558 err = got_error_from_errno2("openat",
3561 ignoresfile = fdopen(fd, "r");
3562 if (ignoresfile == NULL)
3563 err = got_error_from_errno2("fdopen",
3567 err = read_ignores(ignores, path, ignoresfile);
3571 ignoresfile = fopen(ignorespath, "re");
3572 if (ignoresfile == NULL) {
3573 if (errno != ENOENT && errno != EACCES)
3574 err = got_error_from_errno2("fopen",
3577 err = read_ignores(ignores, path, ignoresfile);
3580 if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3581 err = got_error_from_errno2("fclose", path);
3582 if (fd != -1 && close(fd) == -1 && err == NULL)
3583 err = got_error_from_errno2("close", path);
3588 static const struct got_error *
3589 status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3592 const struct got_error *err = NULL;
3593 struct diff_dir_cb_arg *a = arg;
3599 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3600 return got_error(GOT_ERR_CANCELLED);
3602 if (parent_path[0]) {
3603 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3604 return got_error_from_errno("asprintf");
3609 if (de->d_type == DT_DIR) {
3610 if (!a->no_ignores && ignore != NULL &&
3611 match_ignores(a->ignores, path))
3613 } else if (!match_ignores(a->ignores, path) &&
3614 got_path_is_child(path, a->status_path, a->status_path_len))
3615 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3616 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3622 static const struct got_error *
3623 status_traverse(void *arg, const char *path, int dirfd)
3625 const struct got_error *err = NULL;
3626 struct diff_dir_cb_arg *a = arg;
3631 err = add_ignores(a->ignores, a->worktree->root_path,
3632 path, dirfd, ".cvsignore");
3636 err = add_ignores(a->ignores, a->worktree->root_path, path,
3637 dirfd, ".gitignore");
3642 static const struct got_error *
3643 report_single_file_status(const char *path, const char *ondisk_path,
3644 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3645 void *status_arg, struct got_repository *repo, int report_unchanged,
3646 struct got_pathlist_head *ignores, int no_ignores)
3648 struct got_fileindex_entry *ie;
3651 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3653 return report_file_status(ie, ondisk_path, -1, NULL,
3654 status_cb, status_arg, repo, report_unchanged);
3656 if (lstat(ondisk_path, &sb) == -1) {
3657 if (errno != ENOENT)
3658 return got_error_from_errno2("lstat", ondisk_path);
3659 return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3660 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3663 if (!no_ignores && match_ignores(ignores, path))
3666 if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3667 return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3668 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3673 static const struct got_error *
3674 add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3675 const char *root_path, const char *path)
3677 const struct got_error *err;
3678 char *parent_path, *next_parent_path = NULL;
3680 err = add_ignores(ignores, root_path, "", -1,
3685 err = add_ignores(ignores, root_path, "", -1,
3690 err = got_path_dirname(&parent_path, path);
3692 if (err->code == GOT_ERR_BAD_PATH)
3693 return NULL; /* cannot traverse parent */
3697 err = add_ignores(ignores, root_path, parent_path, -1,
3701 err = add_ignores(ignores, root_path, parent_path, -1,
3705 err = got_path_dirname(&next_parent_path, parent_path);
3707 if (err->code == GOT_ERR_BAD_PATH)
3708 err = NULL; /* traversed everything */
3711 if (got_path_is_root_dir(parent_path))
3714 parent_path = next_parent_path;
3715 next_parent_path = NULL;
3719 free(next_parent_path);
3723 static const struct got_error *
3724 worktree_status(struct got_worktree *worktree, const char *path,
3725 struct got_fileindex *fileindex, struct got_repository *repo,
3726 got_worktree_status_cb status_cb, void *status_arg,
3727 got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3728 int report_unchanged)
3730 const struct got_error *err = NULL;
3732 struct got_fileindex_diff_dir_cb fdiff_cb;
3733 struct diff_dir_cb_arg arg;
3734 char *ondisk_path = NULL;
3735 struct got_pathlist_head ignores;
3736 struct got_fileindex_entry *ie;
3738 TAILQ_INIT(&ignores);
3740 if (asprintf(&ondisk_path, "%s%s%s",
3741 worktree->root_path, path[0] ? "/" : "", path) == -1)
3742 return got_error_from_errno("asprintf");
3744 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3746 err = report_single_file_status(path, ondisk_path,
3747 fileindex, status_cb, status_arg, repo,
3748 report_unchanged, &ignores, no_ignores);
3752 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3754 if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3755 !got_err_open_nofollow_on_symlink())
3756 err = got_error_from_errno2("open", ondisk_path);
3759 err = add_ignores_from_parent_paths(&ignores,
3760 worktree->root_path, ondisk_path);
3764 err = report_single_file_status(path, ondisk_path,
3765 fileindex, status_cb, status_arg, repo,
3766 report_unchanged, &ignores, no_ignores);
3769 fdiff_cb.diff_old_new = status_old_new;
3770 fdiff_cb.diff_old = status_old;
3771 fdiff_cb.diff_new = status_new;
3772 fdiff_cb.diff_traverse = status_traverse;
3773 arg.fileindex = fileindex;
3774 arg.worktree = worktree;
3775 arg.status_path = path;
3776 arg.status_path_len = strlen(path);
3778 arg.status_cb = status_cb;
3779 arg.status_arg = status_arg;
3780 arg.cancel_cb = cancel_cb;
3781 arg.cancel_arg = cancel_arg;
3782 arg.report_unchanged = report_unchanged;
3783 arg.no_ignores = no_ignores;
3785 err = add_ignores_from_parent_paths(&ignores,
3786 worktree->root_path, path);
3790 arg.ignores = &ignores;
3791 err = got_fileindex_diff_dir(fileindex, fd,
3792 worktree->root_path, path, repo, &fdiff_cb, &arg);
3795 free_ignores(&ignores);
3796 if (fd != -1 && close(fd) == -1 && err == NULL)
3797 err = got_error_from_errno("close");
3802 const struct got_error *
3803 got_worktree_status(struct got_worktree *worktree,
3804 struct got_pathlist_head *paths, struct got_repository *repo,
3805 int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3806 got_cancel_cb cancel_cb, void *cancel_arg)
3808 const struct got_error *err = NULL;
3809 char *fileindex_path = NULL;
3810 struct got_fileindex *fileindex = NULL;
3811 struct got_pathlist_entry *pe;
3813 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3817 TAILQ_FOREACH(pe, paths, entry) {
3818 err = worktree_status(worktree, pe->path, fileindex, repo,
3819 status_cb, status_arg, cancel_cb, cancel_arg,
3824 free(fileindex_path);
3825 got_fileindex_free(fileindex);
3829 const struct got_error *
3830 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3833 const struct got_error *err = NULL;
3834 char *resolved = NULL, *cwd = NULL, *path = NULL;
3837 char *abspath = NULL;
3838 char canonpath[PATH_MAX];
3842 cwd = getcwd(NULL, 0);
3844 return got_error_from_errno("getcwd");
3846 if (lstat(arg, &sb) == -1) {
3847 if (errno != ENOENT) {
3848 err = got_error_from_errno2("lstat", arg);
3853 if (S_ISLNK(sb.st_mode)) {
3855 * We cannot use realpath(3) with symlinks since we want to
3856 * operate on the symlink itself.
3857 * But we can make the path absolute, assuming it is relative
3858 * to the current working directory, and then canonicalize it.
3860 if (!got_path_is_absolute(arg)) {
3861 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3862 err = got_error_from_errno("asprintf");
3867 err = got_canonpath(abspath ? abspath : arg, canonpath,
3871 resolved = strdup(canonpath);
3872 if (resolved == NULL) {
3873 err = got_error_from_errno("strdup");
3877 resolved = realpath(arg, NULL);
3878 if (resolved == NULL) {
3879 if (errno != ENOENT) {
3880 err = got_error_from_errno2("realpath", arg);
3883 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3884 err = got_error_from_errno("asprintf");
3887 err = got_canonpath(abspath, canonpath,
3891 resolved = strdup(canonpath);
3892 if (resolved == NULL) {
3893 err = got_error_from_errno("strdup");
3899 if (strncmp(got_worktree_get_root_path(worktree), resolved,
3900 strlen(got_worktree_get_root_path(worktree)))) {
3901 err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3905 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3906 err = got_path_skip_common_ancestor(&path,
3907 got_worktree_get_root_path(worktree), resolved);
3913 err = got_error_from_errno("strdup");
3918 /* XXX status walk can't deal with trailing slash! */
3920 while (len > 0 && path[len - 1] == '/') {
3921 path[len - 1] = '\0';
3935 struct schedule_addition_args {
3936 struct got_worktree *worktree;
3937 struct got_fileindex *fileindex;
3938 got_worktree_checkout_cb progress_cb;
3940 struct got_repository *repo;
3943 static const struct got_error *
3944 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3945 const char *relpath, struct got_object_id *blob_id,
3946 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3947 int dirfd, const char *de_name)
3949 struct schedule_addition_args *a = arg;
3950 const struct got_error *err = NULL;
3951 struct got_fileindex_entry *ie;
3955 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3957 return got_error_from_errno("asprintf");
3959 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3961 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3965 /* Re-adding an existing entry is a no-op. */
3966 if (status == GOT_STATUS_ADD)
3968 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3973 if (status != GOT_STATUS_UNVERSIONED) {
3974 if (status == GOT_STATUS_NONEXISTENT)
3975 err = got_error_set_errno(ENOENT, ondisk_path);
3977 err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3981 err = got_fileindex_entry_alloc(&ie, relpath);
3984 err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3985 relpath, NULL, NULL, 1);
3987 got_fileindex_entry_free(ie);
3990 err = got_fileindex_entry_add(a->fileindex, ie);
3992 got_fileindex_entry_free(ie);
3999 if (status == GOT_STATUS_ADD)
4001 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4004 const struct got_error *
4005 got_worktree_schedule_add(struct got_worktree *worktree,
4006 struct got_pathlist_head *paths,
4007 got_worktree_checkout_cb progress_cb, void *progress_arg,
4008 struct got_repository *repo, int no_ignores)
4010 struct got_fileindex *fileindex = NULL;
4011 char *fileindex_path = NULL;
4012 const struct got_error *err = NULL, *sync_err, *unlockerr;
4013 struct got_pathlist_entry *pe;
4014 struct schedule_addition_args saa;
4016 err = lock_worktree(worktree, LOCK_EX);
4020 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4024 saa.worktree = worktree;
4025 saa.fileindex = fileindex;
4026 saa.progress_cb = progress_cb;
4027 saa.progress_arg = progress_arg;
4030 TAILQ_FOREACH(pe, paths, entry) {
4031 err = worktree_status(worktree, pe->path, fileindex, repo,
4032 schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4036 sync_err = sync_fileindex(fileindex, fileindex_path);
4037 if (sync_err && err == NULL)
4040 free(fileindex_path);
4042 got_fileindex_free(fileindex);
4043 unlockerr = lock_worktree(worktree, LOCK_SH);
4044 if (unlockerr && err == NULL)
4049 struct schedule_deletion_args {
4050 struct got_worktree *worktree;
4051 struct got_fileindex *fileindex;
4052 got_worktree_delete_cb progress_cb;
4054 struct got_repository *repo;
4055 int delete_local_mods;
4057 int ignore_missing_paths;
4058 const char *status_codes;
4061 static const struct got_error *
4062 schedule_for_deletion(void *arg, unsigned char status,
4063 unsigned char staged_status, const char *relpath,
4064 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4065 struct got_object_id *commit_id, int dirfd, const char *de_name)
4067 struct schedule_deletion_args *a = arg;
4068 const struct got_error *err = NULL;
4069 struct got_fileindex_entry *ie = NULL;
4073 if (status == GOT_STATUS_NONEXISTENT) {
4074 if (a->ignore_missing_paths)
4076 return got_error_set_errno(ENOENT, relpath);
4079 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4081 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4083 staged_status = get_staged_status(ie);
4084 if (staged_status != GOT_STATUS_NO_CHANGE) {
4085 if (staged_status == GOT_STATUS_DELETE)
4087 return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4090 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4092 return got_error_from_errno("asprintf");
4094 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4099 if (a->status_codes) {
4100 size_t ncodes = strlen(a->status_codes);
4102 for (i = 0; i < ncodes ; i++) {
4103 if (status == a->status_codes[i])
4107 /* Do not delete files in non-matching status. */
4111 if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4112 a->status_codes[i] != GOT_STATUS_MISSING) {
4113 static char msg[64];
4114 snprintf(msg, sizeof(msg),
4115 "invalid status code '%c'", a->status_codes[i]);
4116 err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4121 if (status != GOT_STATUS_NO_CHANGE) {
4122 if (status == GOT_STATUS_DELETE)
4124 if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4125 err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4128 if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4129 err = got_error_set_errno(ENOENT, relpath);
4132 if (status != GOT_STATUS_MODIFY &&
4133 status != GOT_STATUS_MISSING) {
4134 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4139 if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4143 if (unlinkat(dirfd, de_name, 0) == -1) {
4144 err = got_error_from_errno2("unlinkat",
4148 } else if (unlink(ondisk_path) == -1) {
4149 err = got_error_from_errno2("unlink", ondisk_path);
4153 root_len = strlen(a->worktree->root_path);
4156 err = got_path_dirname(&parent, ondisk_path);
4160 ondisk_path = parent;
4161 if (rmdir(ondisk_path) == -1) {
4162 if (errno != ENOTEMPTY)
4163 err = got_error_from_errno2("rmdir",
4167 } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4168 strlen(ondisk_path), root_len) != 0);
4171 got_fileindex_entry_mark_deleted_from_disk(ie);
4176 if (status == GOT_STATUS_DELETE)
4178 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4179 staged_status, relpath);
4182 const struct got_error *
4183 got_worktree_schedule_delete(struct got_worktree *worktree,
4184 struct got_pathlist_head *paths, int delete_local_mods,
4185 const char *status_codes,
4186 got_worktree_delete_cb progress_cb, void *progress_arg,
4187 struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4189 struct got_fileindex *fileindex = NULL;
4190 char *fileindex_path = NULL;
4191 const struct got_error *err = NULL, *sync_err, *unlockerr;
4192 struct got_pathlist_entry *pe;
4193 struct schedule_deletion_args sda;
4195 err = lock_worktree(worktree, LOCK_EX);
4199 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4203 sda.worktree = worktree;
4204 sda.fileindex = fileindex;
4205 sda.progress_cb = progress_cb;
4206 sda.progress_arg = progress_arg;
4208 sda.delete_local_mods = delete_local_mods;
4209 sda.keep_on_disk = keep_on_disk;
4210 sda.ignore_missing_paths = ignore_missing_paths;
4211 sda.status_codes = status_codes;
4213 TAILQ_FOREACH(pe, paths, entry) {
4214 err = worktree_status(worktree, pe->path, fileindex, repo,
4215 schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4219 sync_err = sync_fileindex(fileindex, fileindex_path);
4220 if (sync_err && err == NULL)
4223 free(fileindex_path);
4225 got_fileindex_free(fileindex);
4226 unlockerr = lock_worktree(worktree, LOCK_SH);
4227 if (unlockerr && err == NULL)
4232 static const struct got_error *
4233 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4235 const struct got_error *err = NULL;
4237 size_t linesize = 0, n;
4240 linelen = getline(&line, &linesize, infile);
4241 if (linelen == -1) {
4242 if (ferror(infile)) {
4243 err = got_error_from_errno("getline");
4249 n = fwrite(line, 1, linelen, outfile);
4251 err = got_ferror(outfile, GOT_ERR_IO);
4256 n = fwrite(line, 1, linelen, rejectfile);
4258 err = got_ferror(rejectfile, GOT_ERR_IO);
4265 static const struct got_error *
4266 skip_one_line(FILE *f)
4269 size_t linesize = 0;
4272 linelen = getline(&line, &linesize, f);
4273 if (linelen == -1) {
4275 return got_error_from_errno("getline");
4282 static const struct got_error *
4283 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4284 int start_old, int end_old, int start_new, int end_new,
4285 FILE *outfile, FILE *rejectfile)
4287 const struct got_error *err;
4289 /* Copy old file's lines leading up to patch. */
4290 while (!feof(f1) && *line_cur1 < start_old) {
4291 err = copy_one_line(f1, outfile, NULL);
4296 /* Skip new file's lines leading up to patch. */
4297 while (!feof(f2) && *line_cur2 < start_new) {
4299 err = copy_one_line(f2, NULL, rejectfile);
4301 err = skip_one_line(f2);
4306 /* Copy patched lines. */
4307 while (!feof(f2) && *line_cur2 <= end_new) {
4308 err = copy_one_line(f2, outfile, NULL);
4313 /* Skip over old file's replaced lines. */
4314 while (!feof(f1) && *line_cur1 <= end_old) {
4316 err = copy_one_line(f1, NULL, rejectfile);
4318 err = skip_one_line(f1);
4327 static const struct got_error *
4328 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4329 FILE *outfile, FILE *rejectfile)
4331 const struct got_error *err;
4334 /* Copy old file's lines until EOF. */
4336 err = copy_one_line(f1, outfile, NULL);
4343 /* Copy new file's lines until EOF. */
4345 err = copy_one_line(f2, NULL, rejectfile);
4355 static const struct got_error *
4356 apply_or_reject_change(int *choice, int *nchunks_used,
4357 struct diff_result *diff_result, int n,
4358 const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4359 FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4360 got_worktree_patch_cb patch_cb, void *patch_arg)
4362 const struct got_error *err = NULL;
4363 struct diff_chunk_context cc = {};
4364 int start_old, end_old, start_new, end_new;
4366 struct diff_output_unidiff_state *diff_state;
4367 struct diff_input_info diff_info;
4370 *choice = GOT_PATCH_CHOICE_NONE;
4372 /* Get changed line numbers without context lines for copy_change(). */
4373 diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4374 start_old = cc.left.start;
4375 end_old = cc.left.end;
4376 start_new = cc.right.start;
4377 end_new = cc.right.end;
4379 /* Get the same change with context lines for display. */
4380 memset(&cc, 0, sizeof(cc));
4381 diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4383 memset(&diff_info, 0, sizeof(diff_info));
4384 diff_info.left_path = relpath;
4385 diff_info.right_path = relpath;
4387 diff_state = diff_output_unidiff_state_alloc();
4388 if (diff_state == NULL)
4389 return got_error_set_errno(ENOMEM,
4390 "diff_output_unidiff_state_alloc");
4392 hunkfile = got_opentemp();
4393 if (hunkfile == NULL) {
4394 err = got_error_from_errno("got_opentemp");
4398 rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4400 if (rc != DIFF_RC_OK) {
4401 err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4405 if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4406 err = got_ferror(hunkfile, GOT_ERR_IO);
4410 err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4411 hunkfile, changeno, nchanges);
4416 case GOT_PATCH_CHOICE_YES:
4417 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4418 end_old, start_new, end_new, outfile, rejectfile);
4420 case GOT_PATCH_CHOICE_NO:
4421 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4422 end_old, start_new, end_new, rejectfile, outfile);
4424 case GOT_PATCH_CHOICE_QUIT:
4427 err = got_error(GOT_ERR_PATCH_CHOICE);
4431 diff_output_unidiff_state_free(diff_state);
4432 if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4433 err = got_error_from_errno("fclose");
4437 struct revert_file_args {
4438 struct got_worktree *worktree;
4439 struct got_fileindex *fileindex;
4440 got_worktree_checkout_cb progress_cb;
4442 got_worktree_patch_cb patch_cb;
4444 struct got_repository *repo;
4445 int unlink_added_files;
4448 static const struct got_error *
4449 create_patched_content(char **path_outfile, int reverse_patch,
4450 struct got_object_id *blob_id, const char *path2,
4451 int dirfd2, const char *de_name2,
4452 const char *relpath, struct got_repository *repo,
4453 got_worktree_patch_cb patch_cb, void *patch_arg)
4455 const struct got_error *err, *free_err;
4456 struct got_blob_object *blob = NULL;
4457 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4458 int fd = -1, fd2 = -1;
4459 char link_target[PATH_MAX];
4460 ssize_t link_len = 0;
4461 char *path1 = NULL, *id_str = NULL;
4463 struct got_diffreg_result *diffreg_result = NULL;
4464 int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4465 int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4467 *path_outfile = NULL;
4469 err = got_object_id_str(&id_str, blob_id);
4474 fd2 = openat(dirfd2, de_name2,
4475 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4477 if (!got_err_open_nofollow_on_symlink()) {
4478 err = got_error_from_errno2("openat", path2);
4481 link_len = readlinkat(dirfd2, de_name2,
4482 link_target, sizeof(link_target));
4483 if (link_len == -1) {
4484 return got_error_from_errno2("readlinkat",
4487 sb2.st_mode = S_IFLNK;
4488 sb2.st_size = link_len;
4491 fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4493 if (!got_err_open_nofollow_on_symlink()) {
4494 err = got_error_from_errno2("open", path2);
4497 link_len = readlink(path2, link_target,
4498 sizeof(link_target));
4500 return got_error_from_errno2("readlink", path2);
4501 sb2.st_mode = S_IFLNK;
4502 sb2.st_size = link_len;
4506 if (fstat(fd2, &sb2) == -1) {
4507 err = got_error_from_errno2("fstat", path2);
4511 f2 = fdopen(fd2, "r");
4513 err = got_error_from_errno2("fdopen", path2);
4519 f2 = got_opentemp();
4521 err = got_error_from_errno2("got_opentemp", path2);
4524 n = fwrite(link_target, 1, link_len, f2);
4525 if (n != link_len) {
4526 err = got_ferror(f2, GOT_ERR_IO);
4529 if (fflush(f2) == EOF) {
4530 err = got_error_from_errno("fflush");
4536 fd = got_opentempfd();
4538 err = got_error_from_errno("got_opentempfd");
4542 err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4546 err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4550 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4554 err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4555 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4559 err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4564 if (fseek(f1, 0L, SEEK_SET) == -1)
4565 return got_ferror(f1, GOT_ERR_IO);
4566 if (fseek(f2, 0L, SEEK_SET) == -1)
4567 return got_ferror(f2, GOT_ERR_IO);
4569 /* Count the number of actual changes in the diff result. */
4570 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4571 struct diff_chunk_context cc = {};
4572 diff_chunk_context_load_change(&cc, &nchunks_used,
4573 diffreg_result->result, n, 0);
4576 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4578 err = apply_or_reject_change(&choice, &nchunks_used,
4579 diffreg_result->result, n, relpath, f1, f2,
4580 &line_cur1, &line_cur2,
4581 reverse_patch ? NULL : outfile,
4582 reverse_patch ? outfile : NULL,
4583 ++i, nchanges, patch_cb, patch_arg);
4586 if (choice == GOT_PATCH_CHOICE_YES)
4588 else if (choice == GOT_PATCH_CHOICE_QUIT)
4592 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4593 reverse_patch ? NULL : outfile,
4594 reverse_patch ? outfile : NULL);
4598 if (!S_ISLNK(sb2.st_mode)) {
4601 mode = apply_umask(sb2.st_mode);
4602 if (fchmod(fileno(outfile), mode) == -1) {
4603 err = got_error_from_errno2("fchmod", path2);
4610 if (fd != -1 && close(fd) == -1 && err == NULL)
4611 err = got_error_from_errno("close");
4613 got_object_blob_close(blob);
4614 free_err = got_diffreg_result_free(diffreg_result);
4617 if (f1 && fclose(f1) == EOF && err == NULL)
4618 err = got_error_from_errno2("fclose", path1);
4619 if (f2 && fclose(f2) == EOF && err == NULL)
4620 err = got_error_from_errno2("fclose", path2);
4621 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4622 err = got_error_from_errno2("close", path2);
4623 if (outfile && fclose(outfile) == EOF && err == NULL)
4624 err = got_error_from_errno2("fclose", *path_outfile);
4625 if (path1 && unlink(path1) == -1 && err == NULL)
4626 err = got_error_from_errno2("unlink", path1);
4627 if (err || !have_content) {
4628 if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4629 err = got_error_from_errno2("unlink", *path_outfile);
4630 free(*path_outfile);
4631 *path_outfile = NULL;
4637 static const struct got_error *
4638 revert_file(void *arg, unsigned char status, unsigned char staged_status,
4639 const char *relpath, struct got_object_id *blob_id,
4640 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4641 int dirfd, const char *de_name)
4643 struct revert_file_args *a = arg;
4644 const struct got_error *err = NULL;
4645 char *parent_path = NULL;
4646 struct got_fileindex_entry *ie;
4647 struct got_commit_object *base_commit = NULL;
4648 struct got_tree_object *tree = NULL;
4649 struct got_object_id *tree_id = NULL;
4650 const struct got_tree_entry *te = NULL;
4651 char *tree_path = NULL, *te_name;
4652 char *ondisk_path = NULL, *path_content = NULL;
4653 struct got_blob_object *blob = NULL;
4656 /* Reverting a staged deletion is a no-op. */
4657 if (status == GOT_STATUS_DELETE &&
4658 staged_status != GOT_STATUS_NO_CHANGE)
4661 if (status == GOT_STATUS_UNVERSIONED)
4662 return (*a->progress_cb)(a->progress_arg,
4663 GOT_STATUS_UNVERSIONED, relpath);
4665 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4667 return got_error_path(relpath, GOT_ERR_BAD_PATH);
4669 /* Construct in-repository path of tree which contains this blob. */
4670 err = got_path_dirname(&parent_path, ie->path);
4672 if (err->code != GOT_ERR_BAD_PATH)
4674 parent_path = strdup("/");
4675 if (parent_path == NULL) {
4676 err = got_error_from_errno("strdup");
4680 if (got_path_is_root_dir(a->worktree->path_prefix)) {
4681 tree_path = strdup(parent_path);
4682 if (tree_path == NULL) {
4683 err = got_error_from_errno("strdup");
4687 if (got_path_is_root_dir(parent_path)) {
4688 tree_path = strdup(a->worktree->path_prefix);
4689 if (tree_path == NULL) {
4690 err = got_error_from_errno("strdup");
4694 if (asprintf(&tree_path, "%s/%s",
4695 a->worktree->path_prefix, parent_path) == -1) {
4696 err = got_error_from_errno("asprintf");
4702 err = got_object_open_as_commit(&base_commit, a->repo,
4703 a->worktree->base_commit_id);
4707 err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4709 if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4710 (status == GOT_STATUS_ADD ||
4711 staged_status == GOT_STATUS_ADD)))
4714 err = got_object_open_as_tree(&tree, a->repo, tree_id);
4718 err = got_path_basename(&te_name, ie->path);
4722 te = got_object_tree_find_entry(tree, te_name);
4724 if (te == NULL && status != GOT_STATUS_ADD &&
4725 staged_status != GOT_STATUS_ADD) {
4726 err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4732 case GOT_STATUS_ADD:
4734 int choice = GOT_PATCH_CHOICE_NONE;
4735 err = (*a->patch_cb)(&choice, a->patch_arg,
4736 status, ie->path, NULL, 1, 1);
4739 if (choice != GOT_PATCH_CHOICE_YES)
4742 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4746 got_fileindex_entry_remove(a->fileindex, ie);
4747 if (a->unlink_added_files) {
4748 if (asprintf(&ondisk_path, "%s/%s",
4749 got_worktree_get_root_path(a->worktree),
4751 err = got_error_from_errno("asprintf");
4754 if (unlink(ondisk_path) == -1) {
4755 err = got_error_from_errno2("unlink",
4761 case GOT_STATUS_DELETE:
4763 int choice = GOT_PATCH_CHOICE_NONE;
4764 err = (*a->patch_cb)(&choice, a->patch_arg,
4765 status, ie->path, NULL, 1, 1);
4768 if (choice != GOT_PATCH_CHOICE_YES)
4772 case GOT_STATUS_MODIFY:
4773 case GOT_STATUS_MODE_CHANGE:
4774 case GOT_STATUS_CONFLICT:
4775 case GOT_STATUS_MISSING: {
4776 struct got_object_id id;
4777 if (staged_status == GOT_STATUS_ADD ||
4778 staged_status == GOT_STATUS_MODIFY)
4779 got_fileindex_entry_get_staged_blob_id(&id, ie);
4781 got_fileindex_entry_get_blob_id(&id, ie);
4782 fd = got_opentempfd();
4784 err = got_error_from_errno("got_opentempfd");
4788 err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4792 if (asprintf(&ondisk_path, "%s/%s",
4793 got_worktree_get_root_path(a->worktree), relpath) == -1) {
4794 err = got_error_from_errno("asprintf");
4798 if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4799 status == GOT_STATUS_CONFLICT)) {
4800 int is_bad_symlink = 0;
4801 err = create_patched_content(&path_content, 1, &id,
4802 ondisk_path, dirfd, de_name, ie->path, a->repo,
4803 a->patch_cb, a->patch_arg);
4804 if (err || path_content == NULL)
4806 if (te && S_ISLNK(te->mode)) {
4807 if (unlink(path_content) == -1) {
4808 err = got_error_from_errno2("unlink",
4812 err = install_symlink(&is_bad_symlink,
4813 a->worktree, ondisk_path, ie->path,
4814 blob, 0, 1, 0, 0, a->repo,
4815 a->progress_cb, a->progress_arg);
4817 if (rename(path_content, ondisk_path) == -1) {
4818 err = got_error_from_errno3("rename",
4819 path_content, ondisk_path);
4824 int is_bad_symlink = 0;
4825 if (te && S_ISLNK(te->mode)) {
4826 err = install_symlink(&is_bad_symlink,
4827 a->worktree, ondisk_path, ie->path,
4828 blob, 0, 1, 0, 0, a->repo,
4829 a->progress_cb, a->progress_arg);
4831 err = install_blob(a->worktree, ondisk_path,
4833 te ? te->mode : GOT_DEFAULT_FILE_MODE,
4834 got_fileindex_perms_to_st(ie), blob,
4835 0, 1, 0, 0, a->repo,
4836 a->progress_cb, a->progress_arg);
4840 if (status == GOT_STATUS_DELETE ||
4841 status == GOT_STATUS_MODE_CHANGE) {
4842 err = got_fileindex_entry_update(ie,
4843 a->worktree->root_fd, relpath,
4845 a->worktree->base_commit_id->sha1, 1);
4849 if (is_bad_symlink) {
4850 got_fileindex_entry_filetype_set(ie,
4851 GOT_FILEIDX_MODE_BAD_SYMLINK);
4864 if (fd != -1 && close(fd) == -1 && err == NULL)
4865 err = got_error_from_errno("close");
4867 got_object_blob_close(blob);
4869 got_object_tree_close(tree);
4872 got_object_commit_close(base_commit);
4876 const struct got_error *
4877 got_worktree_revert(struct got_worktree *worktree,
4878 struct got_pathlist_head *paths,
4879 got_worktree_checkout_cb progress_cb, void *progress_arg,
4880 got_worktree_patch_cb patch_cb, void *patch_arg,
4881 struct got_repository *repo)
4883 struct got_fileindex *fileindex = NULL;
4884 char *fileindex_path = NULL;
4885 const struct got_error *err = NULL, *unlockerr = NULL;
4886 const struct got_error *sync_err = NULL;
4887 struct got_pathlist_entry *pe;
4888 struct revert_file_args rfa;
4890 err = lock_worktree(worktree, LOCK_EX);
4894 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4898 rfa.worktree = worktree;
4899 rfa.fileindex = fileindex;
4900 rfa.progress_cb = progress_cb;
4901 rfa.progress_arg = progress_arg;
4902 rfa.patch_cb = patch_cb;
4903 rfa.patch_arg = patch_arg;
4905 rfa.unlink_added_files = 0;
4906 TAILQ_FOREACH(pe, paths, entry) {
4907 err = worktree_status(worktree, pe->path, fileindex, repo,
4908 revert_file, &rfa, NULL, NULL, 1, 0);
4912 sync_err = sync_fileindex(fileindex, fileindex_path);
4913 if (sync_err && err == NULL)
4916 free(fileindex_path);
4918 got_fileindex_free(fileindex);
4919 unlockerr = lock_worktree(worktree, LOCK_SH);
4920 if (unlockerr && err == NULL)
4926 free_commitable(struct got_commitable *ct)
4929 free(ct->in_repo_path);
4930 free(ct->ondisk_path);
4932 free(ct->base_blob_id);
4933 free(ct->staged_blob_id);
4934 free(ct->base_commit_id);
4938 struct collect_commitables_arg {
4939 struct got_pathlist_head *commitable_paths;
4940 struct got_repository *repo;
4941 struct got_worktree *worktree;
4942 struct got_fileindex *fileindex;
4943 int have_staged_files;
4944 int allow_bad_symlinks;
4945 int diff_header_shown;
4952 * Create a file which contains the target path of a symlink so we can feed
4953 * it as content to the diff engine.
4955 static const struct got_error *
4956 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4957 const char *abspath)
4959 const struct got_error *err = NULL;
4960 char target_path[PATH_MAX];
4961 ssize_t target_len, outlen;
4966 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4967 if (target_len == -1)
4968 return got_error_from_errno2("readlinkat", abspath);
4970 target_len = readlink(abspath, target_path, PATH_MAX);
4971 if (target_len == -1)
4972 return got_error_from_errno2("readlink", abspath);
4975 *fd = got_opentempfd();
4977 return got_error_from_errno("got_opentempfd");
4979 outlen = write(*fd, target_path, target_len);
4981 err = got_error_from_errno("got_opentempfd");
4985 if (lseek(*fd, 0, SEEK_SET) == -1) {
4986 err = got_error_from_errno2("lseek", abspath);
4997 static const struct got_error *
4998 append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
4999 FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5000 int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5002 const struct got_error *err = NULL;
5003 struct got_blob_object *blob1 = NULL;
5004 int fd = -1, fd1 = -1, fd2 = -1;
5005 FILE *ondisk_file = NULL;
5006 char *label1 = NULL;
5010 char *id_str = NULL;
5012 memset(&sb, 0, sizeof(sb));
5015 if (ct->staged_status != GOT_STATUS_MODIFY &&
5016 ct->staged_status != GOT_STATUS_ADD &&
5017 ct->staged_status != GOT_STATUS_DELETE)
5020 if (ct->status != GOT_STATUS_MODIFY &&
5021 ct->status != GOT_STATUS_ADD &&
5022 ct->status != GOT_STATUS_DELETE)
5026 err = got_opentemp_truncate(f1);
5028 return got_error_from_errno("got_opentemp_truncate");
5029 err = got_opentemp_truncate(f2);
5031 return got_error_from_errno("got_opentemp_truncate");
5033 if (!*diff_header_shown) {
5034 err = got_object_id_str(&id_str, worktree->base_commit_id);
5037 fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5038 got_worktree_get_root_path(worktree));
5039 fprintf(diff_outfile, "commit - %s\n", id_str);
5040 fprintf(diff_outfile, "path + %s%s\n",
5041 got_worktree_get_root_path(worktree),
5042 diff_staged ? " (staged changes)" : "");
5043 *diff_header_shown = 1;
5047 const char *label1 = NULL, *label2 = NULL;
5048 switch (ct->staged_status) {
5049 case GOT_STATUS_MODIFY:
5053 case GOT_STATUS_ADD:
5056 case GOT_STATUS_DELETE:
5060 return got_error(GOT_ERR_FILE_STATUS);
5062 fd1 = got_opentempfd();
5064 err = got_error_from_errno("got_opentempfd");
5067 fd2 = got_opentempfd();
5069 err = got_error_from_errno("got_opentempfd");
5072 err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5073 fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5074 label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5075 NULL, repo, diff_outfile);
5079 fd1 = got_opentempfd();
5081 err = got_error_from_errno("got_opentempfd");
5085 if (ct->status != GOT_STATUS_ADD) {
5086 err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5092 if (ct->status != GOT_STATUS_DELETE) {
5094 fd = openat(dirfd, de_name,
5095 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5097 if (!got_err_open_nofollow_on_symlink()) {
5098 err = got_error_from_errno2("openat",
5102 err = get_symlink_target_file(&fd, dirfd,
5103 de_name, ct->ondisk_path);
5108 fd = open(ct->ondisk_path,
5109 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5111 if (!got_err_open_nofollow_on_symlink()) {
5112 err = got_error_from_errno2("open",
5116 err = get_symlink_target_file(&fd, dirfd,
5117 de_name, ct->ondisk_path);
5122 if (fstatat(fd, ct->ondisk_path, &sb,
5123 AT_SYMLINK_NOFOLLOW) == -1) {
5124 err = got_error_from_errno2("fstatat", ct->ondisk_path);
5127 ondisk_file = fdopen(fd, "r");
5128 if (ondisk_file == NULL) {
5129 err = got_error_from_errno2("fdopen", ct->ondisk_path);
5137 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5143 err = got_diff_blob_file(blob1, f1, size1, label1,
5144 ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5145 GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
5147 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5148 err = got_error_from_errno("close");
5149 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5150 err = got_error_from_errno("close");
5152 got_object_blob_close(blob1);
5153 if (fd != -1 && close(fd) == -1 && err == NULL)
5154 err = got_error_from_errno("close");
5155 if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5156 err = got_error_from_errno("fclose");
5160 static const struct got_error *
5161 collect_commitables(void *arg, unsigned char status,
5162 unsigned char staged_status, const char *relpath,
5163 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5164 struct got_object_id *commit_id, int dirfd, const char *de_name)
5166 struct collect_commitables_arg *a = arg;
5167 const struct got_error *err = NULL;
5168 struct got_commitable *ct = NULL;
5169 struct got_pathlist_entry *new = NULL;
5170 char *parent_path = NULL, *path = NULL;
5173 if (a->have_staged_files) {
5174 if (staged_status != GOT_STATUS_MODIFY &&
5175 staged_status != GOT_STATUS_ADD &&
5176 staged_status != GOT_STATUS_DELETE)
5179 if (status == GOT_STATUS_CONFLICT)
5180 return got_error(GOT_ERR_COMMIT_CONFLICT);
5182 if (status != GOT_STATUS_MODIFY &&
5183 status != GOT_STATUS_MODE_CHANGE &&
5184 status != GOT_STATUS_ADD &&
5185 status != GOT_STATUS_DELETE)
5189 if (asprintf(&path, "/%s", relpath) == -1) {
5190 err = got_error_from_errno("asprintf");
5193 if (strcmp(path, "/") == 0) {
5194 parent_path = strdup("");
5195 if (parent_path == NULL)
5196 return got_error_from_errno("strdup");
5198 err = got_path_dirname(&parent_path, path);
5203 ct = calloc(1, sizeof(*ct));
5205 err = got_error_from_errno("calloc");
5209 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5211 err = got_error_from_errno("asprintf");
5215 if (staged_status == GOT_STATUS_ADD ||
5216 staged_status == GOT_STATUS_MODIFY) {
5217 struct got_fileindex_entry *ie;
5218 ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5219 switch (got_fileindex_entry_staged_filetype_get(ie)) {
5220 case GOT_FILEIDX_MODE_REGULAR_FILE:
5221 case GOT_FILEIDX_MODE_BAD_SYMLINK:
5224 case GOT_FILEIDX_MODE_SYMLINK:
5228 err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5231 ct->mode |= got_fileindex_entry_perms_get(ie);
5232 } else if (status != GOT_STATUS_DELETE &&
5233 staged_status != GOT_STATUS_DELETE) {
5235 if (fstatat(dirfd, de_name, &sb,
5236 AT_SYMLINK_NOFOLLOW) == -1) {
5237 err = got_error_from_errno2("fstatat",
5241 } else if (lstat(ct->ondisk_path, &sb) == -1) {
5242 err = got_error_from_errno2("lstat", ct->ondisk_path);
5245 ct->mode = sb.st_mode;
5248 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5249 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5251 err = got_error_from_errno("asprintf");
5255 if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5256 status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5258 char target_path[PATH_MAX];
5260 target_len = readlink(ct->ondisk_path, target_path,
5261 sizeof(target_path));
5262 if (target_len == -1) {
5263 err = got_error_from_errno2("readlink",
5267 err = is_bad_symlink_target(&is_bad_symlink, target_path,
5268 target_len, ct->ondisk_path, a->worktree->root_path);
5271 if (is_bad_symlink) {
5272 err = got_error_path(ct->ondisk_path,
5273 GOT_ERR_BAD_SYMLINK);
5279 ct->status = status;
5280 ct->staged_status = staged_status;
5281 ct->blob_id = NULL; /* will be filled in when blob gets created */
5282 if (ct->status != GOT_STATUS_ADD &&
5283 ct->staged_status != GOT_STATUS_ADD) {
5284 ct->base_blob_id = got_object_id_dup(blob_id);
5285 if (ct->base_blob_id == NULL) {
5286 err = got_error_from_errno("got_object_id_dup");
5289 ct->base_commit_id = got_object_id_dup(commit_id);
5290 if (ct->base_commit_id == NULL) {
5291 err = got_error_from_errno("got_object_id_dup");
5295 if (ct->staged_status == GOT_STATUS_ADD ||
5296 ct->staged_status == GOT_STATUS_MODIFY) {
5297 ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5298 if (ct->staged_blob_id == NULL) {
5299 err = got_error_from_errno("got_object_id_dup");
5303 ct->path = strdup(path);
5304 if (ct->path == NULL) {
5305 err = got_error_from_errno("strdup");
5308 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5312 if (a->diff_outfile && ct && new != NULL) {
5313 err = append_ct_diff(ct, &a->diff_header_shown,
5314 a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5315 a->have_staged_files, a->repo, a->worktree);
5320 if (ct && (err || new == NULL))
5321 free_commitable(ct);
5327 static const struct got_error *write_tree(struct got_object_id **, int *,
5328 struct got_tree_object *, const char *, struct got_pathlist_head *,
5329 got_worktree_status_cb status_cb, void *status_arg,
5330 struct got_repository *);
5332 static const struct got_error *
5333 write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5334 struct got_tree_entry *te, const char *parent_path,
5335 struct got_pathlist_head *commitable_paths,
5336 got_worktree_status_cb status_cb, void *status_arg,
5337 struct got_repository *repo)
5339 const struct got_error *err = NULL;
5340 struct got_tree_object *subtree;
5343 if (asprintf(&subpath, "%s%s%s", parent_path,
5344 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5345 return got_error_from_errno("asprintf");
5347 err = got_object_open_as_tree(&subtree, repo, &te->id);
5351 err = write_tree(new_subtree_id, nentries, subtree, subpath,
5352 commitable_paths, status_cb, status_arg, repo);
5353 got_object_tree_close(subtree);
5358 static const struct got_error *
5359 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5361 const struct got_error *err = NULL;
5362 char *ct_parent_path = NULL;
5366 if (strchr(ct->in_repo_path, '/') == NULL) {
5367 *match = got_path_is_root_dir(path);
5371 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5374 *match = (strcmp(path, ct_parent_path) == 0);
5375 free(ct_parent_path);
5380 get_ct_file_mode(struct got_commitable *ct)
5382 if (S_ISLNK(ct->mode))
5385 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5388 static const struct got_error *
5389 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5390 struct got_tree_entry *te, struct got_commitable *ct)
5392 const struct got_error *err = NULL;
5396 err = got_object_tree_entry_dup(new_te, te);
5400 (*new_te)->mode = get_ct_file_mode(ct);
5402 if (ct->staged_status == GOT_STATUS_MODIFY)
5403 memcpy(&(*new_te)->id, ct->staged_blob_id,
5404 sizeof((*new_te)->id));
5406 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5408 if (err && *new_te) {
5415 static const struct got_error *
5416 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5417 struct got_commitable *ct)
5419 const struct got_error *err = NULL;
5420 char *ct_name = NULL;
5424 *new_te = calloc(1, sizeof(**new_te));
5425 if (*new_te == NULL)
5426 return got_error_from_errno("calloc");
5428 err = got_path_basename(&ct_name, ct->path);
5431 if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5432 sizeof((*new_te)->name)) {
5433 err = got_error(GOT_ERR_NO_SPACE);
5437 (*new_te)->mode = get_ct_file_mode(ct);
5439 if (ct->staged_status == GOT_STATUS_ADD)
5440 memcpy(&(*new_te)->id, ct->staged_blob_id,
5441 sizeof((*new_te)->id));
5443 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5446 if (err && *new_te) {
5453 static const struct got_error *
5454 insert_tree_entry(struct got_tree_entry *new_te,
5455 struct got_pathlist_head *paths)
5457 const struct got_error *err = NULL;
5458 struct got_pathlist_entry *new_pe;
5460 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5464 return got_error(GOT_ERR_TREE_DUP_ENTRY);
5468 static const struct got_error *
5469 report_ct_status(struct got_commitable *ct,
5470 got_worktree_status_cb status_cb, void *status_arg)
5472 const char *ct_path = ct->path;
5473 unsigned char status;
5475 if (status_cb == NULL) /* no commit progress output desired */
5478 while (ct_path[0] == '/')
5481 if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5482 status = ct->staged_status;
5484 status = ct->status;
5486 return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5487 ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5490 static const struct got_error *
5491 match_modified_subtree(int *modified, struct got_tree_entry *te,
5492 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5494 const struct got_error *err = NULL;
5495 struct got_pathlist_entry *pe;
5500 if (asprintf(&te_path, "%s%s%s", base_tree_path,
5501 got_path_is_root_dir(base_tree_path) ? "" : "/",
5503 return got_error_from_errno("asprintf");
5505 TAILQ_FOREACH(pe, commitable_paths, entry) {
5506 struct got_commitable *ct = pe->data;
5507 *modified = got_path_is_child(ct->in_repo_path, te_path,
5517 static const struct got_error *
5518 match_deleted_or_modified_ct(struct got_commitable **ctp,
5519 struct got_tree_entry *te, const char *base_tree_path,
5520 struct got_pathlist_head *commitable_paths)
5522 const struct got_error *err = NULL;
5523 struct got_pathlist_entry *pe;
5527 TAILQ_FOREACH(pe, commitable_paths, entry) {
5528 struct got_commitable *ct = pe->data;
5529 char *ct_name = NULL;
5532 if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5533 if (ct->status != GOT_STATUS_MODIFY &&
5534 ct->status != GOT_STATUS_MODE_CHANGE &&
5535 ct->status != GOT_STATUS_DELETE)
5538 if (ct->staged_status != GOT_STATUS_MODIFY &&
5539 ct->staged_status != GOT_STATUS_DELETE)
5543 if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5546 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5552 err = got_path_basename(&ct_name, pe->path);
5556 if (strcmp(te->name, ct_name) != 0) {
5569 static const struct got_error *
5570 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5571 const char *child_path, const char *path_base_tree,
5572 struct got_pathlist_head *commitable_paths,
5573 got_worktree_status_cb status_cb, void *status_arg,
5574 struct got_repository *repo)
5576 const struct got_error *err = NULL;
5577 struct got_tree_entry *new_te;
5579 struct got_object_id *id = NULL;
5584 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5585 got_path_is_root_dir(path_base_tree) ? "" : "/",
5587 return got_error_from_errno("asprintf");
5589 new_te = calloc(1, sizeof(*new_te));
5591 return got_error_from_errno("calloc");
5592 new_te->mode = S_IFDIR;
5594 if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5595 sizeof(new_te->name)) {
5596 err = got_error(GOT_ERR_NO_SPACE);
5599 err = write_tree(&id, &nentries, NULL, subtree_path,
5600 commitable_paths, status_cb, status_arg, repo);
5605 memcpy(&new_te->id, id, sizeof(new_te->id));
5614 static const struct got_error *
5615 write_tree(struct got_object_id **new_tree_id, int *nentries,
5616 struct got_tree_object *base_tree, const char *path_base_tree,
5617 struct got_pathlist_head *commitable_paths,
5618 got_worktree_status_cb status_cb, void *status_arg,
5619 struct got_repository *repo)
5621 const struct got_error *err = NULL;
5622 struct got_pathlist_head paths;
5623 struct got_tree_entry *te, *new_te = NULL;
5624 struct got_pathlist_entry *pe;
5629 /* Insert, and recurse into, newly added entries first. */
5630 TAILQ_FOREACH(pe, commitable_paths, entry) {
5631 struct got_commitable *ct = pe->data;
5632 char *child_path = NULL, *slash;
5634 if ((ct->status != GOT_STATUS_ADD &&
5635 ct->staged_status != GOT_STATUS_ADD) ||
5636 (ct->flags & GOT_COMMITABLE_ADDED))
5639 if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5640 strlen(path_base_tree)))
5643 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5648 slash = strchr(child_path, '/');
5649 if (slash == NULL) {
5650 err = alloc_added_blob_tree_entry(&new_te, ct);
5653 err = report_ct_status(ct, status_cb, status_arg);
5656 ct->flags |= GOT_COMMITABLE_ADDED;
5657 err = insert_tree_entry(new_te, &paths);
5662 *slash = '\0'; /* trim trailing path components */
5663 if (base_tree == NULL ||
5664 got_object_tree_find_entry(base_tree, child_path)
5666 err = make_subtree_for_added_blob(&new_te,
5667 child_path, path_base_tree,
5668 commitable_paths, status_cb, status_arg,
5672 err = insert_tree_entry(new_te, &paths);
5681 int i, nbase_entries;
5682 /* Handle modified and deleted entries. */
5683 nbase_entries = got_object_tree_get_nentries(base_tree);
5684 for (i = 0; i < nbase_entries; i++) {
5685 struct got_commitable *ct = NULL;
5687 te = got_object_tree_get_entry(base_tree, i);
5688 if (got_object_tree_entry_is_submodule(te)) {
5689 /* Entry is a submodule; just copy it. */
5690 err = got_object_tree_entry_dup(&new_te, te);
5693 err = insert_tree_entry(new_te, &paths);
5700 if (S_ISDIR(te->mode)) {
5702 err = got_object_tree_entry_dup(&new_te, te);
5705 err = match_modified_subtree(&modified, te,
5706 path_base_tree, commitable_paths);
5709 /* Avoid recursion into unmodified subtrees. */
5711 struct got_object_id *new_id;
5713 err = write_subtree(&new_id,
5715 path_base_tree, commitable_paths,
5716 status_cb, status_arg, repo);
5719 if (nsubentries == 0) {
5720 /* All entries were deleted. */
5724 memcpy(&new_te->id, new_id,
5725 sizeof(new_te->id));
5728 err = insert_tree_entry(new_te, &paths);
5735 err = match_deleted_or_modified_ct(&ct, te,
5736 path_base_tree, commitable_paths);
5740 /* NB: Deleted entries get dropped here. */
5741 if (ct->status == GOT_STATUS_MODIFY ||
5742 ct->status == GOT_STATUS_MODE_CHANGE ||
5743 ct->staged_status == GOT_STATUS_MODIFY) {
5744 err = alloc_modified_blob_tree_entry(
5748 err = insert_tree_entry(new_te, &paths);
5753 err = report_ct_status(ct, status_cb,
5758 /* Entry is unchanged; just copy it. */
5759 err = got_object_tree_entry_dup(&new_te, te);
5762 err = insert_tree_entry(new_te, &paths);
5770 /* Write new list of entries; deleted entries have been dropped. */
5771 err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5773 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
5777 static const struct got_error *
5778 update_fileindex_after_commit(struct got_worktree *worktree,
5779 struct got_pathlist_head *commitable_paths,
5780 struct got_object_id *new_base_commit_id,
5781 struct got_fileindex *fileindex, int have_staged_files)
5783 const struct got_error *err = NULL;
5784 struct got_pathlist_entry *pe;
5785 char *relpath = NULL;
5787 TAILQ_FOREACH(pe, commitable_paths, entry) {
5788 struct got_fileindex_entry *ie;
5789 struct got_commitable *ct = pe->data;
5791 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5793 err = got_path_skip_common_ancestor(&relpath,
5794 worktree->root_path, ct->ondisk_path);
5799 if (ct->status == GOT_STATUS_DELETE ||
5800 ct->staged_status == GOT_STATUS_DELETE) {
5801 got_fileindex_entry_remove(fileindex, ie);
5802 } else if (ct->staged_status == GOT_STATUS_ADD ||
5803 ct->staged_status == GOT_STATUS_MODIFY) {
5804 got_fileindex_entry_stage_set(ie,
5805 GOT_FILEIDX_STAGE_NONE);
5806 got_fileindex_entry_staged_filetype_set(ie, 0);
5808 err = got_fileindex_entry_update(ie,
5809 worktree->root_fd, relpath,
5810 ct->staged_blob_id->sha1,
5811 new_base_commit_id->sha1,
5812 !have_staged_files);
5814 err = got_fileindex_entry_update(ie,
5815 worktree->root_fd, relpath,
5817 new_base_commit_id->sha1,
5818 !have_staged_files);
5820 err = got_fileindex_entry_alloc(&ie, pe->path);
5823 err = got_fileindex_entry_update(ie,
5824 worktree->root_fd, relpath, ct->blob_id->sha1,
5825 new_base_commit_id->sha1, 1);
5827 got_fileindex_entry_free(ie);
5830 err = got_fileindex_entry_add(fileindex, ie);
5832 got_fileindex_entry_free(ie);
5845 static const struct got_error *
5846 check_out_of_date(const char *in_repo_path, unsigned char status,
5847 unsigned char staged_status, struct got_object_id *base_blob_id,
5848 struct got_object_id *base_commit_id,
5849 struct got_object_id *head_commit_id, struct got_repository *repo,
5852 const struct got_error *err = NULL;
5853 struct got_commit_object *commit = NULL;
5854 struct got_object_id *id = NULL;
5856 if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5857 /* Trivial case: base commit == head commit */
5858 if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5861 * Ensure file content which local changes were based
5862 * on matches file content in the branch head.
5864 err = got_object_open_as_commit(&commit, repo, head_commit_id);
5867 err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5869 if (err->code == GOT_ERR_NO_TREE_ENTRY)
5870 err = got_error(ood_errcode);
5872 } else if (got_object_id_cmp(id, base_blob_id) != 0)
5873 err = got_error(ood_errcode);
5875 /* Require that added files don't exist in the branch head. */
5876 err = got_object_open_as_commit(&commit, repo, head_commit_id);
5879 err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5880 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5882 err = id ? got_error(ood_errcode) : NULL;
5887 got_object_commit_close(commit);
5891 static const struct got_error *
5892 commit_worktree(struct got_object_id **new_commit_id,
5893 struct got_pathlist_head *commitable_paths,
5894 struct got_object_id *head_commit_id,
5895 struct got_object_id *parent_id2,
5896 struct got_worktree *worktree,
5897 const char *author, const char *committer, char *diff_path,
5898 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5899 got_worktree_status_cb status_cb, void *status_arg,
5900 struct got_repository *repo)
5902 const struct got_error *err = NULL, *unlockerr = NULL;
5903 struct got_pathlist_entry *pe;
5904 const char *head_ref_name = NULL;
5905 struct got_commit_object *head_commit = NULL;
5906 struct got_reference *head_ref2 = NULL;
5907 struct got_object_id *head_commit_id2 = NULL;
5908 struct got_tree_object *head_tree = NULL;
5909 struct got_object_id *new_tree_id = NULL;
5910 int nentries, nparents = 0;
5911 struct got_object_id_queue parent_ids;
5912 struct got_object_qid *pid = NULL;
5913 char *logmsg = NULL;
5916 *new_commit_id = NULL;
5918 STAILQ_INIT(&parent_ids);
5920 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5924 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5928 if (commit_msg_cb != NULL) {
5929 err = commit_msg_cb(commitable_paths, diff_path,
5930 &logmsg, commit_arg);
5935 if (logmsg == NULL || strlen(logmsg) == 0) {
5936 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5940 /* Create blobs from added and modified files and record their IDs. */
5941 TAILQ_FOREACH(pe, commitable_paths, entry) {
5942 struct got_commitable *ct = pe->data;
5945 /* Blobs for staged files already exist. */
5946 if (ct->staged_status == GOT_STATUS_ADD ||
5947 ct->staged_status == GOT_STATUS_MODIFY)
5950 if (ct->status != GOT_STATUS_ADD &&
5951 ct->status != GOT_STATUS_MODIFY &&
5952 ct->status != GOT_STATUS_MODE_CHANGE)
5955 if (asprintf(&ondisk_path, "%s/%s",
5956 worktree->root_path, pe->path) == -1) {
5957 err = got_error_from_errno("asprintf");
5960 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5966 /* Recursively write new tree objects. */
5967 err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5968 commitable_paths, status_cb, status_arg, repo);
5972 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5975 STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5978 err = got_object_qid_alloc(&pid, parent_id2);
5981 STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5984 timestamp = time(NULL);
5985 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5986 nparents, author, timestamp, committer, timestamp, logmsg, repo);
5992 /* Check if a concurrent commit to our branch has occurred. */
5993 head_ref_name = got_worktree_get_head_ref_name(worktree);
5994 if (head_ref_name == NULL) {
5995 err = got_error_from_errno("got_worktree_get_head_ref_name");
5998 /* Lock the reference here to prevent concurrent modification. */
5999 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6002 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6005 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6006 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6009 /* Update branch head in repository. */
6010 err = got_ref_change_ref(head_ref2, *new_commit_id);
6013 err = got_ref_write(head_ref2, repo);
6017 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6021 err = ref_base_commit(worktree, repo);
6025 got_object_id_queue_free(&parent_ids);
6027 got_object_tree_close(head_tree);
6029 got_object_commit_close(head_commit);
6030 free(head_commit_id2);
6032 unlockerr = got_ref_unlock(head_ref2);
6033 if (unlockerr && err == NULL)
6035 got_ref_close(head_ref2);
6040 static const struct got_error *
6041 check_path_is_commitable(const char *path,
6042 struct got_pathlist_head *commitable_paths)
6044 struct got_pathlist_entry *cpe = NULL;
6045 size_t path_len = strlen(path);
6047 TAILQ_FOREACH(cpe, commitable_paths, entry) {
6048 struct got_commitable *ct = cpe->data;
6049 const char *ct_path = ct->path;
6051 while (ct_path[0] == '/')
6054 if (strcmp(path, ct_path) == 0 ||
6055 got_path_is_child(ct_path, path, path_len))
6060 return got_error_path(path, GOT_ERR_BAD_PATH);
6065 static const struct got_error *
6066 check_staged_file(void *arg, struct got_fileindex_entry *ie)
6068 int *have_staged_files = arg;
6070 if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6071 *have_staged_files = 1;
6072 return got_error(GOT_ERR_CANCELLED);
6078 static const struct got_error *
6079 check_non_staged_files(struct got_fileindex *fileindex,
6080 struct got_pathlist_head *paths)
6082 struct got_pathlist_entry *pe;
6083 struct got_fileindex_entry *ie;
6085 TAILQ_FOREACH(pe, paths, entry) {
6086 if (pe->path[0] == '\0')
6088 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6090 return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6091 if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6092 return got_error_path(pe->path,
6093 GOT_ERR_FILE_NOT_STAGED);
6099 const struct got_error *
6100 got_worktree_commit(struct got_object_id **new_commit_id,
6101 struct got_worktree *worktree, struct got_pathlist_head *paths,
6102 const char *author, const char *committer, int allow_bad_symlinks,
6103 int show_diff, got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6104 got_worktree_status_cb status_cb, void *status_arg,
6105 struct got_repository *repo)
6107 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6108 struct got_fileindex *fileindex = NULL;
6109 char *fileindex_path = NULL;
6110 struct got_pathlist_head commitable_paths;
6111 struct collect_commitables_arg cc_arg;
6112 struct got_pathlist_entry *pe;
6113 struct got_reference *head_ref = NULL;
6114 struct got_object_id *head_commit_id = NULL;
6115 char *diff_path = NULL;
6116 int have_staged_files = 0;
6118 *new_commit_id = NULL;
6120 memset(&cc_arg, 0, sizeof(cc_arg));
6121 TAILQ_INIT(&commitable_paths);
6123 err = lock_worktree(worktree, LOCK_EX);
6127 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6131 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6135 err = open_fileindex(&fileindex, &fileindex_path, worktree);
6139 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6140 &have_staged_files);
6141 if (err && err->code != GOT_ERR_CANCELLED)
6143 if (have_staged_files) {
6144 err = check_non_staged_files(fileindex, paths);
6149 cc_arg.commitable_paths = &commitable_paths;
6150 cc_arg.worktree = worktree;
6151 cc_arg.fileindex = fileindex;
6153 cc_arg.have_staged_files = have_staged_files;
6154 cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6155 cc_arg.diff_header_shown = 0;
6157 err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6158 GOT_TMPDIR_STR "/got", ".diff");
6161 cc_arg.f1 = got_opentemp();
6162 if (cc_arg.f1 == NULL) {
6163 err = got_error_from_errno("got_opentemp");
6166 cc_arg.f2 = got_opentemp();
6167 if (cc_arg.f2 == NULL) {
6168 err = got_error_from_errno("got_opentemp");
6173 TAILQ_FOREACH(pe, paths, entry) {
6174 err = worktree_status(worktree, pe->path, fileindex, repo,
6175 collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6181 if (fflush(cc_arg.diff_outfile) == EOF) {
6182 err = got_error_from_errno("fflush");
6187 if (TAILQ_EMPTY(&commitable_paths)) {
6188 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6192 TAILQ_FOREACH(pe, paths, entry) {
6193 err = check_path_is_commitable(pe->path, &commitable_paths);
6198 TAILQ_FOREACH(pe, &commitable_paths, entry) {
6199 struct got_commitable *ct = pe->data;
6200 const char *ct_path = ct->in_repo_path;
6202 while (ct_path[0] == '/')
6204 err = check_out_of_date(ct_path, ct->status,
6205 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6206 head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6212 err = commit_worktree(new_commit_id, &commitable_paths,
6213 head_commit_id, NULL, worktree, author, committer,
6214 (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6215 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6219 err = update_fileindex_after_commit(worktree, &commitable_paths,
6220 *new_commit_id, fileindex, have_staged_files);
6221 sync_err = sync_fileindex(fileindex, fileindex_path);
6222 if (sync_err && err == NULL)
6226 got_fileindex_free(fileindex);
6227 free(fileindex_path);
6228 unlockerr = lock_worktree(worktree, LOCK_SH);
6229 if (unlockerr && err == NULL)
6231 TAILQ_FOREACH(pe, &commitable_paths, entry) {
6232 struct got_commitable *ct = pe->data;
6234 free_commitable(ct);
6236 got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6237 if (diff_path && unlink(diff_path) == -1 && err == NULL)
6238 err = got_error_from_errno2("unlink", diff_path);
6240 if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6242 err = got_error_from_errno("fclose");
6247 got_commitable_get_path(struct got_commitable *ct)
6253 got_commitable_get_status(struct got_commitable *ct)
6258 struct check_rebase_ok_arg {
6259 struct got_worktree *worktree;
6260 struct got_repository *repo;
6263 static const struct got_error *
6264 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6266 const struct got_error *err = NULL;
6267 struct check_rebase_ok_arg *a = arg;
6268 unsigned char status;
6272 /* Reject rebase of a work tree with mixed base commits. */
6273 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6274 SHA1_DIGEST_LENGTH))
6275 return got_error(GOT_ERR_MIXED_COMMITS);
6277 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6279 return got_error_from_errno("asprintf");
6281 /* Reject rebase of a work tree with modified or staged files. */
6282 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6287 if (status != GOT_STATUS_NO_CHANGE)
6288 return got_error(GOT_ERR_MODIFIED);
6289 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6290 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6295 const struct got_error *
6296 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6297 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6298 struct got_worktree *worktree, struct got_reference *branch,
6299 struct got_repository *repo)
6301 const struct got_error *err = NULL;
6302 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6303 char *branch_ref_name = NULL;
6304 char *fileindex_path = NULL;
6305 struct check_rebase_ok_arg ok_arg;
6306 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6307 struct got_object_id *wt_branch_tip = NULL;
6309 *new_base_branch_ref = NULL;
6313 err = lock_worktree(worktree, LOCK_EX);
6317 err = open_fileindex(fileindex, &fileindex_path, worktree);
6321 ok_arg.worktree = worktree;
6323 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6328 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6332 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6336 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6340 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6345 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6348 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6349 err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6353 err = got_ref_alloc_symref(new_base_branch_ref,
6354 new_base_branch_ref_name, wt_branch);
6357 err = got_ref_write(*new_base_branch_ref, repo);
6361 /* TODO Lock original branch's ref while rebasing? */
6363 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6367 err = got_ref_write(branch_ref, repo);
6371 err = got_ref_alloc(tmp_branch, tmp_branch_name,
6372 worktree->base_commit_id);
6375 err = got_ref_write(*tmp_branch, repo);
6379 err = got_worktree_set_head_ref(worktree, *tmp_branch);
6383 free(fileindex_path);
6384 free(tmp_branch_name);
6385 free(new_base_branch_ref_name);
6386 free(branch_ref_name);
6388 got_ref_close(branch_ref);
6390 got_ref_close(wt_branch);
6391 free(wt_branch_tip);
6393 if (*new_base_branch_ref) {
6394 got_ref_close(*new_base_branch_ref);
6395 *new_base_branch_ref = NULL;
6398 got_ref_close(*tmp_branch);
6402 got_fileindex_free(*fileindex);
6405 lock_worktree(worktree, LOCK_SH);
6410 const struct got_error *
6411 got_worktree_rebase_continue(struct got_object_id **commit_id,
6412 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6413 struct got_reference **branch, struct got_fileindex **fileindex,
6414 struct got_worktree *worktree, struct got_repository *repo)
6416 const struct got_error *err;
6417 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6418 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6419 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6420 char *fileindex_path = NULL;
6421 int have_staged_files = 0;
6424 *new_base_branch = NULL;
6429 err = lock_worktree(worktree, LOCK_EX);
6433 err = open_fileindex(fileindex, &fileindex_path, worktree);
6437 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6438 &have_staged_files);
6439 if (err && err->code != GOT_ERR_CANCELLED)
6441 if (have_staged_files) {
6442 err = got_error(GOT_ERR_STAGED_PATHS);
6446 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6450 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6454 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6458 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6462 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6466 err = got_ref_open(branch, repo,
6467 got_ref_get_symref_target(branch_ref), 0);
6471 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6475 err = got_ref_resolve(commit_id, repo, commit_ref);
6479 err = got_ref_open(new_base_branch, repo,
6480 new_base_branch_ref_name, 0);
6484 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6488 free(commit_ref_name);
6489 free(branch_ref_name);
6490 free(fileindex_path);
6492 got_ref_close(commit_ref);
6494 got_ref_close(branch_ref);
6499 got_ref_close(*tmp_branch);
6502 if (*new_base_branch) {
6503 got_ref_close(*new_base_branch);
6504 *new_base_branch = NULL;
6507 got_ref_close(*branch);
6511 got_fileindex_free(*fileindex);
6514 lock_worktree(worktree, LOCK_SH);
6519 const struct got_error *
6520 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6522 const struct got_error *err;
6523 char *tmp_branch_name = NULL;
6525 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6529 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6530 free(tmp_branch_name);
6534 static const struct got_error *
6535 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6536 const char *diff_path, char **logmsg, void *arg)
6542 static const struct got_error *
6543 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6544 const char *path, struct got_object_id *blob_id,
6545 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6546 int dirfd, const char *de_name)
6551 struct collect_merged_paths_arg {
6552 got_worktree_checkout_cb progress_cb;
6554 struct got_pathlist_head *merged_paths;
6557 static const struct got_error *
6558 collect_merged_paths(void *arg, unsigned char status, const char *path)
6560 const struct got_error *err;
6561 struct collect_merged_paths_arg *a = arg;
6563 struct got_pathlist_entry *new;
6565 err = (*a->progress_cb)(a->progress_arg, status, path);
6569 if (status != GOT_STATUS_MERGE &&
6570 status != GOT_STATUS_ADD &&
6571 status != GOT_STATUS_DELETE &&
6572 status != GOT_STATUS_CONFLICT)
6577 return got_error_from_errno("strdup");
6579 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6580 if (err || new == NULL)
6585 static const struct got_error *
6586 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6587 int is_rebase, struct got_repository *repo)
6589 const struct got_error *err;
6590 struct got_reference *commit_ref = NULL;
6592 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6594 if (err->code != GOT_ERR_NOT_REF)
6596 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6599 err = got_ref_write(commit_ref, repo);
6602 } else if (is_rebase) {
6603 struct got_object_id *stored_id;
6606 err = got_ref_resolve(&stored_id, repo, commit_ref);
6609 cmp = got_object_id_cmp(commit_id, stored_id);
6612 err = got_error(GOT_ERR_REBASE_COMMITID);
6618 got_ref_close(commit_ref);
6622 static const struct got_error *
6623 rebase_merge_files(struct got_pathlist_head *merged_paths,
6624 const char *commit_ref_name, struct got_worktree *worktree,
6625 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6626 struct got_object_id *commit_id, struct got_repository *repo,
6627 got_worktree_checkout_cb progress_cb, void *progress_arg,
6628 got_cancel_cb cancel_cb, void *cancel_arg)
6630 const struct got_error *err;
6631 struct got_reference *commit_ref = NULL;
6632 struct collect_merged_paths_arg cmp_arg;
6633 char *fileindex_path;
6635 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6637 err = get_fileindex_path(&fileindex_path, worktree);
6641 cmp_arg.progress_cb = progress_cb;
6642 cmp_arg.progress_arg = progress_arg;
6643 cmp_arg.merged_paths = merged_paths;
6644 err = merge_files(worktree, fileindex, fileindex_path,
6645 parent_commit_id, commit_id, repo, collect_merged_paths,
6646 &cmp_arg, cancel_cb, cancel_arg);
6648 got_ref_close(commit_ref);
6652 const struct got_error *
6653 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6654 struct got_worktree *worktree, struct got_fileindex *fileindex,
6655 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6656 struct got_repository *repo,
6657 got_worktree_checkout_cb progress_cb, void *progress_arg,
6658 got_cancel_cb cancel_cb, void *cancel_arg)
6660 const struct got_error *err;
6661 char *commit_ref_name;
6663 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6667 err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6671 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6672 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6673 progress_arg, cancel_cb, cancel_arg);
6675 free(commit_ref_name);
6679 const struct got_error *
6680 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6681 struct got_worktree *worktree, struct got_fileindex *fileindex,
6682 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6683 struct got_repository *repo,
6684 got_worktree_checkout_cb progress_cb, void *progress_arg,
6685 got_cancel_cb cancel_cb, void *cancel_arg)
6687 const struct got_error *err;
6688 char *commit_ref_name;
6690 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6694 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6698 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6699 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6700 progress_arg, cancel_cb, cancel_arg);
6702 free(commit_ref_name);
6706 static const struct got_error *
6707 rebase_commit(struct got_object_id **new_commit_id,
6708 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6709 struct got_worktree *worktree, struct got_fileindex *fileindex,
6710 struct got_reference *tmp_branch, const char *committer,
6711 struct got_commit_object *orig_commit, const char *new_logmsg,
6712 struct got_repository *repo)
6714 const struct got_error *err, *sync_err;
6715 struct got_pathlist_head commitable_paths;
6716 struct collect_commitables_arg cc_arg;
6717 char *fileindex_path = NULL;
6718 struct got_reference *head_ref = NULL;
6719 struct got_object_id *head_commit_id = NULL;
6720 char *logmsg = NULL;
6722 memset(&cc_arg, 0, sizeof(cc_arg));
6723 TAILQ_INIT(&commitable_paths);
6724 *new_commit_id = NULL;
6726 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6728 err = get_fileindex_path(&fileindex_path, worktree);
6732 cc_arg.commitable_paths = &commitable_paths;
6733 cc_arg.worktree = worktree;
6735 cc_arg.have_staged_files = 0;
6737 * If possible get the status of individual files directly to
6738 * avoid crawling the entire work tree once per rebased commit.
6740 * Ideally, merged_paths would contain a list of commitables
6741 * we could use so we could skip worktree_status() entirely.
6742 * However, we would then need carefully keep track of cumulative
6743 * effects of operations such as file additions and deletions
6744 * in 'got histedit -f' (folding multiple commits into one),
6745 * and this extra complexity is not really worth it.
6748 struct got_pathlist_entry *pe;
6749 TAILQ_FOREACH(pe, merged_paths, entry) {
6750 err = worktree_status(worktree, pe->path, fileindex,
6751 repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6757 err = worktree_status(worktree, "", fileindex, repo,
6758 collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6763 if (TAILQ_EMPTY(&commitable_paths)) {
6764 /* No-op change; commit will be elided. */
6765 err = got_ref_delete(commit_ref, repo);
6768 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6772 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6776 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6781 logmsg = strdup(new_logmsg);
6782 if (logmsg == NULL) {
6783 err = got_error_from_errno("strdup");
6787 err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6792 /* NB: commit_worktree will call free(logmsg) */
6793 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6794 NULL, worktree, got_object_commit_get_author(orig_commit),
6795 committer ? committer :
6796 got_object_commit_get_committer(orig_commit), NULL,
6797 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6801 err = got_ref_change_ref(tmp_branch, *new_commit_id);
6805 err = got_ref_delete(commit_ref, repo);
6809 err = update_fileindex_after_commit(worktree, &commitable_paths,
6810 *new_commit_id, fileindex, 0);
6811 sync_err = sync_fileindex(fileindex, fileindex_path);
6812 if (sync_err && err == NULL)
6815 free(fileindex_path);
6816 free(head_commit_id);
6818 got_ref_close(head_ref);
6820 free(*new_commit_id);
6821 *new_commit_id = NULL;
6826 const struct got_error *
6827 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6828 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6829 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6830 const char *committer, struct got_commit_object *orig_commit,
6831 struct got_object_id *orig_commit_id, struct got_repository *repo)
6833 const struct got_error *err;
6834 char *commit_ref_name;
6835 struct got_reference *commit_ref = NULL;
6836 struct got_object_id *commit_id = NULL;
6838 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6842 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6845 err = got_ref_resolve(&commit_id, repo, commit_ref);
6848 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6849 err = got_error(GOT_ERR_REBASE_COMMITID);
6853 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6854 worktree, fileindex, tmp_branch, committer, orig_commit,
6858 got_ref_close(commit_ref);
6859 free(commit_ref_name);
6864 const struct got_error *
6865 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6866 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6867 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6868 const char *committer, struct got_commit_object *orig_commit,
6869 struct got_object_id *orig_commit_id, const char *new_logmsg,
6870 struct got_repository *repo)
6872 const struct got_error *err;
6873 char *commit_ref_name;
6874 struct got_reference *commit_ref = NULL;
6876 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6880 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6884 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6885 worktree, fileindex, tmp_branch, committer, orig_commit,
6889 got_ref_close(commit_ref);
6890 free(commit_ref_name);
6894 const struct got_error *
6895 got_worktree_rebase_postpone(struct got_worktree *worktree,
6896 struct got_fileindex *fileindex)
6899 got_fileindex_free(fileindex);
6900 return lock_worktree(worktree, LOCK_SH);
6903 static const struct got_error *
6904 delete_ref(const char *name, struct got_repository *repo)
6906 const struct got_error *err;
6907 struct got_reference *ref;
6909 err = got_ref_open(&ref, repo, name, 0);
6911 if (err->code == GOT_ERR_NOT_REF)
6916 err = got_ref_delete(ref, repo);
6921 static const struct got_error *
6922 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6924 const struct got_error *err;
6925 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6926 char *branch_ref_name = NULL, *commit_ref_name = NULL;
6928 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6931 err = delete_ref(tmp_branch_name, repo);
6935 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6938 err = delete_ref(new_base_branch_ref_name, repo);
6942 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6945 err = delete_ref(branch_ref_name, repo);
6949 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6952 err = delete_ref(commit_ref_name, repo);
6957 free(tmp_branch_name);
6958 free(new_base_branch_ref_name);
6959 free(branch_ref_name);
6960 free(commit_ref_name);
6964 static const struct got_error *
6965 create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6966 struct got_object_id *new_commit_id, struct got_repository *repo)
6968 const struct got_error *err;
6969 struct got_reference *ref = NULL;
6970 struct got_object_id *old_commit_id = NULL;
6971 const char *branch_name = NULL;
6972 char *new_id_str = NULL;
6973 char *refname = NULL;
6975 branch_name = got_ref_get_name(branch);
6976 if (strncmp(branch_name, "refs/heads/", 11) != 0)
6977 return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6980 err = got_object_id_str(&new_id_str, new_commit_id);
6984 if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6985 new_id_str) == -1) {
6986 err = got_error_from_errno("asprintf");
6990 err = got_ref_resolve(&old_commit_id, repo, branch);
6994 err = got_ref_alloc(&ref, refname, old_commit_id);
6998 err = got_ref_write(ref, repo);
7002 free(old_commit_id);
7008 const struct got_error *
7009 got_worktree_rebase_complete(struct got_worktree *worktree,
7010 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7011 struct got_reference *rebased_branch, struct got_repository *repo,
7014 const struct got_error *err, *unlockerr, *sync_err;
7015 struct got_object_id *new_head_commit_id = NULL;
7016 char *fileindex_path = NULL;
7018 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7022 if (create_backup) {
7023 err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7024 rebased_branch, new_head_commit_id, repo);
7029 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7033 err = got_ref_write(rebased_branch, repo);
7037 err = got_worktree_set_head_ref(worktree, rebased_branch);
7041 err = delete_rebase_refs(worktree, repo);
7045 err = get_fileindex_path(&fileindex_path, worktree);
7048 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7049 sync_err = sync_fileindex(fileindex, fileindex_path);
7050 if (sync_err && err == NULL)
7053 got_fileindex_free(fileindex);
7054 free(fileindex_path);
7055 free(new_head_commit_id);
7056 unlockerr = lock_worktree(worktree, LOCK_SH);
7057 if (unlockerr && err == NULL)
7062 const struct got_error *
7063 got_worktree_rebase_abort(struct got_worktree *worktree,
7064 struct got_fileindex *fileindex, struct got_repository *repo,
7065 struct got_reference *new_base_branch,
7066 got_worktree_checkout_cb progress_cb, void *progress_arg)
7068 const struct got_error *err, *unlockerr, *sync_err;
7069 struct got_reference *resolved = NULL;
7070 struct got_object_id *commit_id = NULL;
7071 struct got_commit_object *commit = NULL;
7072 char *fileindex_path = NULL;
7073 struct revert_file_args rfa;
7074 struct got_object_id *tree_id = NULL;
7076 err = lock_worktree(worktree, LOCK_EX);
7080 err = got_object_open_as_commit(&commit, repo,
7081 worktree->base_commit_id);
7085 err = got_ref_open(&resolved, repo,
7086 got_ref_get_symref_target(new_base_branch), 0);
7090 err = got_worktree_set_head_ref(worktree, resolved);
7095 * XXX commits to the base branch could have happened while
7096 * we were busy rebasing; should we store the original commit ID
7097 * when rebase begins and read it back here?
7099 err = got_ref_resolve(&commit_id, repo, resolved);
7103 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7107 err = got_object_id_by_path(&tree_id, repo, commit,
7108 worktree->path_prefix);
7112 err = delete_rebase_refs(worktree, repo);
7116 err = get_fileindex_path(&fileindex_path, worktree);
7120 rfa.worktree = worktree;
7121 rfa.fileindex = fileindex;
7122 rfa.progress_cb = progress_cb;
7123 rfa.progress_arg = progress_arg;
7124 rfa.patch_cb = NULL;
7125 rfa.patch_arg = NULL;
7127 rfa.unlink_added_files = 0;
7128 err = worktree_status(worktree, "", fileindex, repo,
7129 revert_file, &rfa, NULL, NULL, 1, 0);
7133 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7134 repo, progress_cb, progress_arg, NULL, NULL);
7136 sync_err = sync_fileindex(fileindex, fileindex_path);
7137 if (sync_err && err == NULL)
7140 got_ref_close(resolved);
7144 got_object_commit_close(commit);
7146 got_fileindex_free(fileindex);
7147 free(fileindex_path);
7149 unlockerr = lock_worktree(worktree, LOCK_SH);
7150 if (unlockerr && err == NULL)
7155 const struct got_error *
7156 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7157 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7158 struct got_fileindex **fileindex, struct got_worktree *worktree,
7159 struct got_repository *repo)
7161 const struct got_error *err = NULL;
7162 char *tmp_branch_name = NULL;
7163 char *branch_ref_name = NULL;
7164 char *base_commit_ref_name = NULL;
7165 char *fileindex_path = NULL;
7166 struct check_rebase_ok_arg ok_arg;
7167 struct got_reference *wt_branch = NULL;
7168 struct got_reference *base_commit_ref = NULL;
7172 *base_commit_id = NULL;
7175 err = lock_worktree(worktree, LOCK_EX);
7179 err = open_fileindex(fileindex, &fileindex_path, worktree);
7183 ok_arg.worktree = worktree;
7185 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7190 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7194 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7198 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7203 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7208 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7212 err = got_ref_write(*branch_ref, repo);
7216 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7217 worktree->base_commit_id);
7220 err = got_ref_write(base_commit_ref, repo);
7223 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
7224 if (*base_commit_id == NULL) {
7225 err = got_error_from_errno("got_object_id_dup");
7229 err = got_ref_alloc(tmp_branch, tmp_branch_name,
7230 worktree->base_commit_id);
7233 err = got_ref_write(*tmp_branch, repo);
7237 err = got_worktree_set_head_ref(worktree, *tmp_branch);
7241 free(fileindex_path);
7242 free(tmp_branch_name);
7243 free(branch_ref_name);
7244 free(base_commit_ref_name);
7246 got_ref_close(wt_branch);
7249 got_ref_close(*branch_ref);
7253 got_ref_close(*tmp_branch);
7256 free(*base_commit_id);
7258 got_fileindex_free(*fileindex);
7261 lock_worktree(worktree, LOCK_SH);
7266 const struct got_error *
7267 got_worktree_histedit_postpone(struct got_worktree *worktree,
7268 struct got_fileindex *fileindex)
7271 got_fileindex_free(fileindex);
7272 return lock_worktree(worktree, LOCK_SH);
7275 const struct got_error *
7276 got_worktree_histedit_in_progress(int *in_progress,
7277 struct got_worktree *worktree)
7279 const struct got_error *err;
7280 char *tmp_branch_name = NULL;
7282 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7286 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7287 free(tmp_branch_name);
7291 const struct got_error *
7292 got_worktree_histedit_continue(struct got_object_id **commit_id,
7293 struct got_reference **tmp_branch, struct got_reference **branch_ref,
7294 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7295 struct got_worktree *worktree, struct got_repository *repo)
7297 const struct got_error *err;
7298 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7299 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7300 struct got_reference *commit_ref = NULL;
7301 struct got_reference *base_commit_ref = NULL;
7302 char *fileindex_path = NULL;
7303 int have_staged_files = 0;
7307 *base_commit_id = NULL;
7310 err = lock_worktree(worktree, LOCK_EX);
7314 err = open_fileindex(fileindex, &fileindex_path, worktree);
7318 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7319 &have_staged_files);
7320 if (err && err->code != GOT_ERR_CANCELLED)
7322 if (have_staged_files) {
7323 err = got_error(GOT_ERR_STAGED_PATHS);
7327 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7331 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7335 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7339 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7344 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7348 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7351 err = got_ref_resolve(commit_id, repo, commit_ref);
7355 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7358 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7362 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7366 free(commit_ref_name);
7367 free(branch_ref_name);
7368 free(fileindex_path);
7370 got_ref_close(commit_ref);
7371 if (base_commit_ref)
7372 got_ref_close(base_commit_ref);
7376 free(*base_commit_id);
7377 *base_commit_id = NULL;
7379 got_ref_close(*tmp_branch);
7383 got_fileindex_free(*fileindex);
7386 lock_worktree(worktree, LOCK_EX);
7391 static const struct got_error *
7392 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7394 const struct got_error *err;
7395 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7396 char *branch_ref_name = NULL, *commit_ref_name = NULL;
7398 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7401 err = delete_ref(tmp_branch_name, repo);
7405 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7409 err = delete_ref(base_commit_ref_name, repo);
7413 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7416 err = delete_ref(branch_ref_name, repo);
7420 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7423 err = delete_ref(commit_ref_name, repo);
7427 free(tmp_branch_name);
7428 free(base_commit_ref_name);
7429 free(branch_ref_name);
7430 free(commit_ref_name);
7434 const struct got_error *
7435 got_worktree_histedit_abort(struct got_worktree *worktree,
7436 struct got_fileindex *fileindex, struct got_repository *repo,
7437 struct got_reference *branch, struct got_object_id *base_commit_id,
7438 got_worktree_checkout_cb progress_cb, void *progress_arg)
7440 const struct got_error *err, *unlockerr, *sync_err;
7441 struct got_reference *resolved = NULL;
7442 char *fileindex_path = NULL;
7443 struct got_commit_object *commit = NULL;
7444 struct got_object_id *tree_id = NULL;
7445 struct revert_file_args rfa;
7447 err = lock_worktree(worktree, LOCK_EX);
7451 err = got_object_open_as_commit(&commit, repo,
7452 worktree->base_commit_id);
7456 err = got_ref_open(&resolved, repo,
7457 got_ref_get_symref_target(branch), 0);
7461 err = got_worktree_set_head_ref(worktree, resolved);
7465 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7469 err = got_object_id_by_path(&tree_id, repo, commit,
7470 worktree->path_prefix);
7474 err = delete_histedit_refs(worktree, repo);
7478 err = get_fileindex_path(&fileindex_path, worktree);
7482 rfa.worktree = worktree;
7483 rfa.fileindex = fileindex;
7484 rfa.progress_cb = progress_cb;
7485 rfa.progress_arg = progress_arg;
7486 rfa.patch_cb = NULL;
7487 rfa.patch_arg = NULL;
7489 rfa.unlink_added_files = 0;
7490 err = worktree_status(worktree, "", fileindex, repo,
7491 revert_file, &rfa, NULL, NULL, 1, 0);
7495 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7496 repo, progress_cb, progress_arg, NULL, NULL);
7498 sync_err = sync_fileindex(fileindex, fileindex_path);
7499 if (sync_err && err == NULL)
7502 got_ref_close(resolved);
7504 free(fileindex_path);
7506 unlockerr = lock_worktree(worktree, LOCK_SH);
7507 if (unlockerr && err == NULL)
7512 const struct got_error *
7513 got_worktree_histedit_complete(struct got_worktree *worktree,
7514 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7515 struct got_reference *edited_branch, struct got_repository *repo)
7517 const struct got_error *err, *unlockerr, *sync_err;
7518 struct got_object_id *new_head_commit_id = NULL;
7519 struct got_reference *resolved = NULL;
7520 char *fileindex_path = NULL;
7522 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7526 err = got_ref_open(&resolved, repo,
7527 got_ref_get_symref_target(edited_branch), 0);
7531 err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7532 resolved, new_head_commit_id, repo);
7536 err = got_ref_change_ref(resolved, new_head_commit_id);
7540 err = got_ref_write(resolved, repo);
7544 err = got_worktree_set_head_ref(worktree, resolved);
7548 err = delete_histedit_refs(worktree, repo);
7552 err = get_fileindex_path(&fileindex_path, worktree);
7555 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7556 sync_err = sync_fileindex(fileindex, fileindex_path);
7557 if (sync_err && err == NULL)
7560 got_fileindex_free(fileindex);
7561 free(fileindex_path);
7562 free(new_head_commit_id);
7563 unlockerr = lock_worktree(worktree, LOCK_SH);
7564 if (unlockerr && err == NULL)
7569 const struct got_error *
7570 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7571 struct got_object_id *commit_id, struct got_repository *repo)
7573 const struct got_error *err;
7574 char *commit_ref_name;
7576 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7580 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7584 err = delete_ref(commit_ref_name, repo);
7586 free(commit_ref_name);
7590 const struct got_error *
7591 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7592 struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7593 struct got_worktree *worktree, const char *refname,
7594 struct got_repository *repo)
7596 const struct got_error *err = NULL;
7597 char *fileindex_path = NULL;
7598 struct check_rebase_ok_arg ok_arg;
7602 *base_branch_ref = NULL;
7604 err = lock_worktree(worktree, LOCK_EX);
7608 if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7609 err = got_error_msg(GOT_ERR_SAME_BRANCH,
7610 "cannot integrate a branch into itself; "
7611 "update -b or different branch name required");
7615 err = open_fileindex(fileindex, &fileindex_path, worktree);
7619 /* Preconditions are the same as for rebase. */
7620 ok_arg.worktree = worktree;
7622 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7627 err = got_ref_open(branch_ref, repo, refname, 1);
7631 err = got_ref_open(base_branch_ref, repo,
7632 got_worktree_get_head_ref_name(worktree), 1);
7636 got_ref_close(*branch_ref);
7639 if (*base_branch_ref) {
7640 got_ref_close(*base_branch_ref);
7641 *base_branch_ref = NULL;
7644 got_fileindex_free(*fileindex);
7647 lock_worktree(worktree, LOCK_SH);
7652 const struct got_error *
7653 got_worktree_integrate_continue(struct got_worktree *worktree,
7654 struct got_fileindex *fileindex, struct got_repository *repo,
7655 struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7656 got_worktree_checkout_cb progress_cb, void *progress_arg,
7657 got_cancel_cb cancel_cb, void *cancel_arg)
7659 const struct got_error *err = NULL, *sync_err, *unlockerr;
7660 char *fileindex_path = NULL;
7661 struct got_object_id *tree_id = NULL, *commit_id = NULL;
7662 struct got_commit_object *commit = NULL;
7664 err = get_fileindex_path(&fileindex_path, worktree);
7668 err = got_ref_resolve(&commit_id, repo, branch_ref);
7672 err = got_object_open_as_commit(&commit, repo, commit_id);
7676 err = got_object_id_by_path(&tree_id, repo, commit,
7677 worktree->path_prefix);
7681 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7685 err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7686 progress_cb, progress_arg, cancel_cb, cancel_arg);
7690 err = got_ref_change_ref(base_branch_ref, commit_id);
7694 err = got_ref_write(base_branch_ref, repo);
7698 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7700 sync_err = sync_fileindex(fileindex, fileindex_path);
7701 if (sync_err && err == NULL)
7705 unlockerr = got_ref_unlock(branch_ref);
7706 if (unlockerr && err == NULL)
7708 got_ref_close(branch_ref);
7710 unlockerr = got_ref_unlock(base_branch_ref);
7711 if (unlockerr && err == NULL)
7713 got_ref_close(base_branch_ref);
7715 got_fileindex_free(fileindex);
7716 free(fileindex_path);
7719 got_object_commit_close(commit);
7721 unlockerr = lock_worktree(worktree, LOCK_SH);
7722 if (unlockerr && err == NULL)
7727 const struct got_error *
7728 got_worktree_integrate_abort(struct got_worktree *worktree,
7729 struct got_fileindex *fileindex, struct got_repository *repo,
7730 struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7732 const struct got_error *err = NULL, *unlockerr = NULL;
7734 got_fileindex_free(fileindex);
7736 err = lock_worktree(worktree, LOCK_SH);
7738 unlockerr = got_ref_unlock(branch_ref);
7739 if (unlockerr && err == NULL)
7741 got_ref_close(branch_ref);
7743 unlockerr = got_ref_unlock(base_branch_ref);
7744 if (unlockerr && err == NULL)
7746 got_ref_close(base_branch_ref);
7751 const struct got_error *
7752 got_worktree_merge_postpone(struct got_worktree *worktree,
7753 struct got_fileindex *fileindex)
7755 const struct got_error *err, *sync_err;
7756 char *fileindex_path = NULL;
7758 err = get_fileindex_path(&fileindex_path, worktree);
7762 sync_err = sync_fileindex(fileindex, fileindex_path);
7764 err = lock_worktree(worktree, LOCK_SH);
7765 if (sync_err && err == NULL)
7768 got_fileindex_free(fileindex);
7769 free(fileindex_path);
7773 static const struct got_error *
7774 delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7776 const struct got_error *err;
7777 char *branch_refname = NULL, *commit_refname = NULL;
7779 err = get_merge_branch_ref_name(&branch_refname, worktree);
7782 err = delete_ref(branch_refname, repo);
7786 err = get_merge_commit_ref_name(&commit_refname, worktree);
7789 err = delete_ref(commit_refname, repo);
7794 free(branch_refname);
7795 free(commit_refname);
7799 struct merge_commit_msg_arg {
7800 struct got_worktree *worktree;
7801 const char *branch_name;
7804 static const struct got_error *
7805 merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7806 const char *diff_path, char **logmsg, void *arg)
7808 struct merge_commit_msg_arg *a = arg;
7810 if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7811 got_worktree_get_head_ref_name(a->worktree)) == -1)
7812 return got_error_from_errno("asprintf");
7818 const struct got_error *
7819 got_worktree_merge_branch(struct got_worktree *worktree,
7820 struct got_fileindex *fileindex,
7821 struct got_object_id *yca_commit_id,
7822 struct got_object_id *branch_tip,
7823 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7824 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7826 const struct got_error *err;
7827 char *fileindex_path = NULL;
7829 err = get_fileindex_path(&fileindex_path, worktree);
7833 err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7838 err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7839 branch_tip, repo, progress_cb, progress_arg,
7840 cancel_cb, cancel_arg);
7842 free(fileindex_path);
7846 const struct got_error *
7847 got_worktree_merge_commit(struct got_object_id **new_commit_id,
7848 struct got_worktree *worktree, struct got_fileindex *fileindex,
7849 const char *author, const char *committer, int allow_bad_symlinks,
7850 struct got_object_id *branch_tip, const char *branch_name,
7851 struct got_repository *repo,
7852 got_worktree_status_cb status_cb, void *status_arg)
7855 const struct got_error *err = NULL, *sync_err;
7856 struct got_pathlist_head commitable_paths;
7857 struct collect_commitables_arg cc_arg;
7858 struct got_pathlist_entry *pe;
7859 struct got_reference *head_ref = NULL;
7860 struct got_object_id *head_commit_id = NULL;
7861 int have_staged_files = 0;
7862 struct merge_commit_msg_arg mcm_arg;
7863 char *fileindex_path = NULL;
7865 memset(&cc_arg, 0, sizeof(cc_arg));
7866 *new_commit_id = NULL;
7868 TAILQ_INIT(&commitable_paths);
7870 err = get_fileindex_path(&fileindex_path, worktree);
7874 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7878 err = got_ref_resolve(&head_commit_id, repo, head_ref);
7882 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7883 &have_staged_files);
7884 if (err && err->code != GOT_ERR_CANCELLED)
7886 if (have_staged_files) {
7887 err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7891 cc_arg.commitable_paths = &commitable_paths;
7892 cc_arg.worktree = worktree;
7893 cc_arg.fileindex = fileindex;
7895 cc_arg.have_staged_files = have_staged_files;
7896 cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7897 err = worktree_status(worktree, "", fileindex, repo,
7898 collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7902 if (TAILQ_EMPTY(&commitable_paths)) {
7903 err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7904 "merge of %s cannot proceed", branch_name);
7908 TAILQ_FOREACH(pe, &commitable_paths, entry) {
7909 struct got_commitable *ct = pe->data;
7910 const char *ct_path = ct->in_repo_path;
7912 while (ct_path[0] == '/')
7914 err = check_out_of_date(ct_path, ct->status,
7915 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7916 head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7922 mcm_arg.worktree = worktree;
7923 mcm_arg.branch_name = branch_name;
7924 err = commit_worktree(new_commit_id, &commitable_paths,
7925 head_commit_id, branch_tip, worktree, author, committer, NULL,
7926 merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7930 err = update_fileindex_after_commit(worktree, &commitable_paths,
7931 *new_commit_id, fileindex, have_staged_files);
7932 sync_err = sync_fileindex(fileindex, fileindex_path);
7933 if (sync_err && err == NULL)
7936 TAILQ_FOREACH(pe, &commitable_paths, entry) {
7937 struct got_commitable *ct = pe->data;
7939 free_commitable(ct);
7941 got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
7942 free(fileindex_path);
7946 const struct got_error *
7947 got_worktree_merge_complete(struct got_worktree *worktree,
7948 struct got_fileindex *fileindex, struct got_repository *repo)
7950 const struct got_error *err, *unlockerr, *sync_err;
7951 char *fileindex_path = NULL;
7953 err = delete_merge_refs(worktree, repo);
7957 err = get_fileindex_path(&fileindex_path, worktree);
7960 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7961 sync_err = sync_fileindex(fileindex, fileindex_path);
7962 if (sync_err && err == NULL)
7965 got_fileindex_free(fileindex);
7966 free(fileindex_path);
7967 unlockerr = lock_worktree(worktree, LOCK_SH);
7968 if (unlockerr && err == NULL)
7973 const struct got_error *
7974 got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7975 struct got_repository *repo)
7977 const struct got_error *err;
7978 char *branch_refname = NULL;
7979 struct got_reference *branch_ref = NULL;
7983 err = get_merge_branch_ref_name(&branch_refname, worktree);
7986 err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7987 free(branch_refname);
7989 if (err->code != GOT_ERR_NOT_REF)
7997 const struct got_error *got_worktree_merge_prepare(
7998 struct got_fileindex **fileindex, struct got_worktree *worktree,
7999 struct got_reference *branch, struct got_repository *repo)
8001 const struct got_error *err = NULL;
8002 char *fileindex_path = NULL;
8003 char *branch_refname = NULL, *commit_refname = NULL;
8004 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8005 struct got_reference *commit_ref = NULL;
8006 struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8007 struct check_rebase_ok_arg ok_arg;
8011 err = lock_worktree(worktree, LOCK_EX);
8015 err = open_fileindex(fileindex, &fileindex_path, worktree);
8019 /* Preconditions are the same as for rebase. */
8020 ok_arg.worktree = worktree;
8022 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8027 err = get_merge_branch_ref_name(&branch_refname, worktree);
8031 err = get_merge_commit_ref_name(&commit_refname, worktree);
8035 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8040 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8044 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8045 err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8049 err = got_ref_resolve(&branch_tip, repo, branch);
8053 err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8056 err = got_ref_write(branch_ref, repo);
8060 err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8063 err = got_ref_write(commit_ref, repo);
8068 free(branch_refname);
8069 free(commit_refname);
8070 free(fileindex_path);
8072 got_ref_close(branch_ref);
8074 got_ref_close(commit_ref);
8076 got_ref_close(wt_branch);
8077 free(wt_branch_tip);
8080 got_fileindex_free(*fileindex);
8083 lock_worktree(worktree, LOCK_SH);
8088 const struct got_error *
8089 got_worktree_merge_continue(char **branch_name,
8090 struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8091 struct got_worktree *worktree, struct got_repository *repo)
8093 const struct got_error *err;
8094 char *commit_refname = NULL, *branch_refname = NULL;
8095 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8096 char *fileindex_path = NULL;
8097 int have_staged_files = 0;
8099 *branch_name = NULL;
8103 err = lock_worktree(worktree, LOCK_EX);
8107 err = open_fileindex(fileindex, &fileindex_path, worktree);
8111 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8112 &have_staged_files);
8113 if (err && err->code != GOT_ERR_CANCELLED)
8115 if (have_staged_files) {
8116 err = got_error(GOT_ERR_STAGED_PATHS);
8120 err = get_merge_branch_ref_name(&branch_refname, worktree);
8124 err = get_merge_commit_ref_name(&commit_refname, worktree);
8128 err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8132 if (!got_ref_is_symbolic(branch_ref)) {
8133 err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8134 "%s is not a symbolic reference",
8135 got_ref_get_name(branch_ref));
8138 *branch_name = strdup(got_ref_get_symref_target(branch_ref));
8139 if (*branch_name == NULL) {
8140 err = got_error_from_errno("strdup");
8144 err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8148 err = got_ref_resolve(branch_tip, repo, commit_ref);
8152 free(commit_refname);
8153 free(branch_refname);
8154 free(fileindex_path);
8156 got_ref_close(commit_ref);
8158 got_ref_close(branch_ref);
8162 *branch_name = NULL;
8167 got_fileindex_free(*fileindex);
8170 lock_worktree(worktree, LOCK_SH);
8175 const struct got_error *
8176 got_worktree_merge_abort(struct got_worktree *worktree,
8177 struct got_fileindex *fileindex, struct got_repository *repo,
8178 got_worktree_checkout_cb progress_cb, void *progress_arg)
8180 const struct got_error *err, *unlockerr, *sync_err;
8181 struct got_object_id *commit_id = NULL;
8182 struct got_commit_object *commit = NULL;
8183 char *fileindex_path = NULL;
8184 struct revert_file_args rfa;
8185 struct got_object_id *tree_id = NULL;
8187 err = got_object_open_as_commit(&commit, repo,
8188 worktree->base_commit_id);
8192 err = got_object_id_by_path(&tree_id, repo, commit,
8193 worktree->path_prefix);
8197 err = delete_merge_refs(worktree, repo);
8201 err = get_fileindex_path(&fileindex_path, worktree);
8205 rfa.worktree = worktree;
8206 rfa.fileindex = fileindex;
8207 rfa.progress_cb = progress_cb;
8208 rfa.progress_arg = progress_arg;
8209 rfa.patch_cb = NULL;
8210 rfa.patch_arg = NULL;
8212 rfa.unlink_added_files = 1;
8213 err = worktree_status(worktree, "", fileindex, repo,
8214 revert_file, &rfa, NULL, NULL, 1, 0);
8218 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8219 repo, progress_cb, progress_arg, NULL, NULL);
8221 sync_err = sync_fileindex(fileindex, fileindex_path);
8222 if (sync_err && err == NULL)
8228 got_object_commit_close(commit);
8230 got_fileindex_free(fileindex);
8231 free(fileindex_path);
8233 unlockerr = lock_worktree(worktree, LOCK_SH);
8234 if (unlockerr && err == NULL)
8239 struct check_stage_ok_arg {
8240 struct got_object_id *head_commit_id;
8241 struct got_worktree *worktree;
8242 struct got_fileindex *fileindex;
8243 struct got_repository *repo;
8247 static const struct got_error *
8248 check_stage_ok(void *arg, unsigned char status,
8249 unsigned char staged_status, const char *relpath,
8250 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8251 struct got_object_id *commit_id, int dirfd, const char *de_name)
8253 struct check_stage_ok_arg *a = arg;
8254 const struct got_error *err = NULL;
8255 struct got_fileindex_entry *ie;
8256 struct got_object_id base_commit_id;
8257 struct got_object_id *base_commit_idp = NULL;
8258 char *in_repo_path = NULL, *p;
8260 if (status == GOT_STATUS_UNVERSIONED ||
8261 status == GOT_STATUS_NO_CHANGE)
8263 if (status == GOT_STATUS_NONEXISTENT)
8264 return got_error_set_errno(ENOENT, relpath);
8266 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8268 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8270 if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8271 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8273 return got_error_from_errno("asprintf");
8275 if (got_fileindex_entry_has_commit(ie)) {
8276 base_commit_idp = got_fileindex_entry_get_commit_id(
8277 &base_commit_id, ie);
8280 if (status == GOT_STATUS_CONFLICT) {
8281 err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8283 } else if (status != GOT_STATUS_ADD &&
8284 status != GOT_STATUS_MODIFY &&
8285 status != GOT_STATUS_DELETE) {
8286 err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8290 a->have_changes = 1;
8295 err = check_out_of_date(p, status, staged_status,
8296 blob_id, base_commit_idp, a->head_commit_id, a->repo,
8297 GOT_ERR_STAGE_OUT_OF_DATE);
8303 struct stage_path_arg {
8304 struct got_worktree *worktree;
8305 struct got_fileindex *fileindex;
8306 struct got_repository *repo;
8307 got_worktree_status_cb status_cb;
8309 got_worktree_patch_cb patch_cb;
8311 int staged_something;
8312 int allow_bad_symlinks;
8315 static const struct got_error *
8316 stage_path(void *arg, unsigned char status,
8317 unsigned char staged_status, const char *relpath,
8318 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8319 struct got_object_id *commit_id, int dirfd, const char *de_name)
8321 struct stage_path_arg *a = arg;
8322 const struct got_error *err = NULL;
8323 struct got_fileindex_entry *ie;
8324 char *ondisk_path = NULL, *path_content = NULL;
8326 struct got_object_id *new_staged_blob_id = NULL;
8329 if (status == GOT_STATUS_UNVERSIONED)
8332 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8334 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8336 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8338 return got_error_from_errno("asprintf");
8341 case GOT_STATUS_ADD:
8342 case GOT_STATUS_MODIFY:
8343 /* XXX could sb.st_mode be passed in by our caller? */
8344 if (lstat(ondisk_path, &sb) == -1) {
8345 err = got_error_from_errno2("lstat", ondisk_path);
8349 if (status == GOT_STATUS_ADD) {
8350 int choice = GOT_PATCH_CHOICE_NONE;
8351 err = (*a->patch_cb)(&choice, a->patch_arg,
8352 status, ie->path, NULL, 1, 1);
8355 if (choice != GOT_PATCH_CHOICE_YES)
8358 err = create_patched_content(&path_content, 0,
8359 staged_blob_id ? staged_blob_id : blob_id,
8360 ondisk_path, dirfd, de_name, ie->path,
8361 a->repo, a->patch_cb, a->patch_arg);
8362 if (err || path_content == NULL)
8366 err = got_object_blob_create(&new_staged_blob_id,
8367 path_content ? path_content : ondisk_path, a->repo);
8370 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8371 SHA1_DIGEST_LENGTH);
8372 if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8373 stage = GOT_FILEIDX_STAGE_ADD;
8375 stage = GOT_FILEIDX_STAGE_MODIFY;
8376 got_fileindex_entry_stage_set(ie, stage);
8377 if (S_ISLNK(sb.st_mode)) {
8378 int is_bad_symlink = 0;
8379 if (!a->allow_bad_symlinks) {
8380 char target_path[PATH_MAX];
8382 target_len = readlink(ondisk_path, target_path,
8383 sizeof(target_path));
8384 if (target_len == -1) {
8385 err = got_error_from_errno2("readlink",
8389 err = is_bad_symlink_target(&is_bad_symlink,
8390 target_path, target_len, ondisk_path,
8391 a->worktree->root_path);
8394 if (is_bad_symlink) {
8395 err = got_error_path(ondisk_path,
8396 GOT_ERR_BAD_SYMLINK);
8401 got_fileindex_entry_staged_filetype_set(ie,
8402 GOT_FILEIDX_MODE_BAD_SYMLINK);
8404 got_fileindex_entry_staged_filetype_set(ie,
8405 GOT_FILEIDX_MODE_SYMLINK);
8407 got_fileindex_entry_staged_filetype_set(ie,
8408 GOT_FILEIDX_MODE_REGULAR_FILE);
8410 a->staged_something = 1;
8411 if (a->status_cb == NULL)
8413 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8414 get_staged_status(ie), relpath, blob_id,
8415 new_staged_blob_id, NULL, dirfd, de_name);
8419 * When staging the reverse of the staged diff,
8420 * implicitly unstage the file.
8422 if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8423 sizeof(ie->blob_sha1)) == 0) {
8424 got_fileindex_entry_stage_set(ie,
8425 GOT_FILEIDX_STAGE_NONE);
8428 case GOT_STATUS_DELETE:
8429 if (staged_status == GOT_STATUS_DELETE)
8432 int choice = GOT_PATCH_CHOICE_NONE;
8433 err = (*a->patch_cb)(&choice, a->patch_arg, status,
8434 ie->path, NULL, 1, 1);
8437 if (choice == GOT_PATCH_CHOICE_NO)
8439 if (choice != GOT_PATCH_CHOICE_YES) {
8440 err = got_error(GOT_ERR_PATCH_CHOICE);
8444 stage = GOT_FILEIDX_STAGE_DELETE;
8445 got_fileindex_entry_stage_set(ie, stage);
8446 a->staged_something = 1;
8447 if (a->status_cb == NULL)
8449 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8450 get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8453 case GOT_STATUS_NO_CHANGE:
8455 case GOT_STATUS_CONFLICT:
8456 err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8458 case GOT_STATUS_NONEXISTENT:
8459 err = got_error_set_errno(ENOENT, relpath);
8462 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8466 if (path_content && unlink(path_content) == -1 && err == NULL)
8467 err = got_error_from_errno2("unlink", path_content);
8470 free(new_staged_blob_id);
8474 const struct got_error *
8475 got_worktree_stage(struct got_worktree *worktree,
8476 struct got_pathlist_head *paths,
8477 got_worktree_status_cb status_cb, void *status_arg,
8478 got_worktree_patch_cb patch_cb, void *patch_arg,
8479 int allow_bad_symlinks, struct got_repository *repo)
8481 const struct got_error *err = NULL, *sync_err, *unlockerr;
8482 struct got_pathlist_entry *pe;
8483 struct got_fileindex *fileindex = NULL;
8484 char *fileindex_path = NULL;
8485 struct got_reference *head_ref = NULL;
8486 struct got_object_id *head_commit_id = NULL;
8487 struct check_stage_ok_arg oka;
8488 struct stage_path_arg spa;
8490 err = lock_worktree(worktree, LOCK_EX);
8494 err = got_ref_open(&head_ref, repo,
8495 got_worktree_get_head_ref_name(worktree), 0);
8498 err = got_ref_resolve(&head_commit_id, repo, head_ref);
8501 err = open_fileindex(&fileindex, &fileindex_path, worktree);
8505 /* Check pre-conditions before staging anything. */
8506 oka.head_commit_id = head_commit_id;
8507 oka.worktree = worktree;
8508 oka.fileindex = fileindex;
8510 oka.have_changes = 0;
8511 TAILQ_FOREACH(pe, paths, entry) {
8512 err = worktree_status(worktree, pe->path, fileindex, repo,
8513 check_stage_ok, &oka, NULL, NULL, 1, 0);
8517 if (!oka.have_changes) {
8518 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8522 spa.worktree = worktree;
8523 spa.fileindex = fileindex;
8525 spa.patch_cb = patch_cb;
8526 spa.patch_arg = patch_arg;
8527 spa.status_cb = status_cb;
8528 spa.status_arg = status_arg;
8529 spa.staged_something = 0;
8530 spa.allow_bad_symlinks = allow_bad_symlinks;
8531 TAILQ_FOREACH(pe, paths, entry) {
8532 err = worktree_status(worktree, pe->path, fileindex, repo,
8533 stage_path, &spa, NULL, NULL, 1, 0);
8537 if (!spa.staged_something) {
8538 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8542 sync_err = sync_fileindex(fileindex, fileindex_path);
8543 if (sync_err && err == NULL)
8547 got_ref_close(head_ref);
8548 free(head_commit_id);
8549 free(fileindex_path);
8551 got_fileindex_free(fileindex);
8552 unlockerr = lock_worktree(worktree, LOCK_SH);
8553 if (unlockerr && err == NULL)
8558 struct unstage_path_arg {
8559 struct got_worktree *worktree;
8560 struct got_fileindex *fileindex;
8561 struct got_repository *repo;
8562 got_worktree_checkout_cb progress_cb;
8564 got_worktree_patch_cb patch_cb;
8568 static const struct got_error *
8569 create_unstaged_content(char **path_unstaged_content,
8570 char **path_new_staged_content, struct got_object_id *blob_id,
8571 struct got_object_id *staged_blob_id, const char *relpath,
8572 struct got_repository *repo,
8573 got_worktree_patch_cb patch_cb, void *patch_arg)
8575 const struct got_error *err, *free_err;
8576 struct got_blob_object *blob = NULL, *staged_blob = NULL;
8577 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8578 char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8579 struct got_diffreg_result *diffreg_result = NULL;
8580 int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8581 int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8582 int fd1 = -1, fd2 = -1;
8584 *path_unstaged_content = NULL;
8585 *path_new_staged_content = NULL;
8587 err = got_object_id_str(&label1, blob_id);
8591 fd1 = got_opentempfd();
8593 err = got_error_from_errno("got_opentempfd");
8596 fd2 = got_opentempfd();
8598 err = got_error_from_errno("got_opentempfd");
8602 err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8606 err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
8610 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8614 err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8619 err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
8623 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8627 err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8628 path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8632 err = got_opentemp_named(path_unstaged_content, &outfile,
8633 "got-unstaged-content", "");
8636 err = got_opentemp_named(path_new_staged_content, &rejectfile,
8637 "got-new-staged-content", "");
8641 if (fseek(f1, 0L, SEEK_SET) == -1) {
8642 err = got_ferror(f1, GOT_ERR_IO);
8645 if (fseek(f2, 0L, SEEK_SET) == -1) {
8646 err = got_ferror(f2, GOT_ERR_IO);
8649 /* Count the number of actual changes in the diff result. */
8650 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8651 struct diff_chunk_context cc = {};
8652 diff_chunk_context_load_change(&cc, &nchunks_used,
8653 diffreg_result->result, n, 0);
8656 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8658 err = apply_or_reject_change(&choice, &nchunks_used,
8659 diffreg_result->result, n, relpath, f1, f2,
8660 &line_cur1, &line_cur2,
8661 outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8664 if (choice == GOT_PATCH_CHOICE_YES)
8667 have_rejected_content = 1;
8668 if (choice == GOT_PATCH_CHOICE_QUIT)
8671 if (have_content || have_rejected_content)
8672 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8673 outfile, rejectfile);
8676 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8677 err = got_error_from_errno("close");
8679 got_object_blob_close(blob);
8680 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8681 err = got_error_from_errno("close");
8683 got_object_blob_close(staged_blob);
8684 free_err = got_diffreg_result_free(diffreg_result);
8685 if (free_err && err == NULL)
8687 if (f1 && fclose(f1) == EOF && err == NULL)
8688 err = got_error_from_errno2("fclose", path1);
8689 if (f2 && fclose(f2) == EOF && err == NULL)
8690 err = got_error_from_errno2("fclose", path2);
8691 if (outfile && fclose(outfile) == EOF && err == NULL)
8692 err = got_error_from_errno2("fclose", *path_unstaged_content);
8693 if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8694 err = got_error_from_errno2("fclose", *path_new_staged_content);
8695 if (path1 && unlink(path1) == -1 && err == NULL)
8696 err = got_error_from_errno2("unlink", path1);
8697 if (path2 && unlink(path2) == -1 && err == NULL)
8698 err = got_error_from_errno2("unlink", path2);
8699 if (err || !have_content) {
8700 if (*path_unstaged_content &&
8701 unlink(*path_unstaged_content) == -1 && err == NULL)
8702 err = got_error_from_errno2("unlink",
8703 *path_unstaged_content);
8704 free(*path_unstaged_content);
8705 *path_unstaged_content = NULL;
8707 if (err || !have_content || !have_rejected_content) {
8708 if (*path_new_staged_content &&
8709 unlink(*path_new_staged_content) == -1 && err == NULL)
8710 err = got_error_from_errno2("unlink",
8711 *path_new_staged_content);
8712 free(*path_new_staged_content);
8713 *path_new_staged_content = NULL;
8720 static const struct got_error *
8721 unstage_hunks(struct got_object_id *staged_blob_id,
8722 struct got_blob_object *blob_base,
8723 struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8724 const char *ondisk_path, const char *label_orig,
8725 struct got_worktree *worktree, struct got_repository *repo,
8726 got_worktree_patch_cb patch_cb, void *patch_arg,
8727 got_worktree_checkout_cb progress_cb, void *progress_arg)
8729 const struct got_error *err = NULL;
8730 char *path_unstaged_content = NULL;
8731 char *path_new_staged_content = NULL;
8732 char *parent = NULL, *base_path = NULL;
8733 char *blob_base_path = NULL;
8734 struct got_object_id *new_staged_blob_id = NULL;
8735 FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8738 err = create_unstaged_content(&path_unstaged_content,
8739 &path_new_staged_content, blob_id, staged_blob_id,
8740 ie->path, repo, patch_cb, patch_arg);
8744 if (path_unstaged_content == NULL)
8747 if (path_new_staged_content) {
8748 err = got_object_blob_create(&new_staged_blob_id,
8749 path_new_staged_content, repo);
8754 f = fopen(path_unstaged_content, "re");
8756 err = got_error_from_errno2("fopen",
8757 path_unstaged_content);
8760 if (fstat(fileno(f), &sb) == -1) {
8761 err = got_error_from_errno2("fstat", path_unstaged_content);
8764 if (got_fileindex_entry_staged_filetype_get(ie) ==
8765 GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8766 char link_target[PATH_MAX];
8768 r = fread(link_target, 1, sizeof(link_target), f);
8769 if (r == 0 && ferror(f)) {
8770 err = got_error_from_errno("fread");
8773 if (r >= sizeof(link_target)) { /* should not happen */
8774 err = got_error(GOT_ERR_NO_SPACE);
8777 link_target[r] = '\0';
8778 err = merge_symlink(worktree, blob_base,
8779 ondisk_path, ie->path, label_orig, link_target,
8780 worktree->base_commit_id, repo, progress_cb,
8783 int local_changes_subsumed;
8785 err = got_path_dirname(&parent, ondisk_path);
8789 if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8791 err = got_error_from_errno("asprintf");
8796 err = got_opentemp_named(&blob_base_path, &f_base,
8800 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8806 * In order the run a 3-way merge with a symlink we copy the symlink's
8807 * target path into a temporary file and use that file with diff3.
8809 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8810 err = dump_symlink_target_path_to_file(&f_deriv2,
8816 fd = open(ondisk_path,
8817 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8819 err = got_error_from_errno2("open", ondisk_path);
8822 f_deriv2 = fdopen(fd, "r");
8823 if (f_deriv2 == NULL) {
8824 err = got_error_from_errno2("fdopen", ondisk_path);
8830 err = merge_file(&local_changes_subsumed, worktree,
8831 f_base, f, f_deriv2, ondisk_path, ie->path,
8832 got_fileindex_perms_to_st(ie),
8833 label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8834 repo, progress_cb, progress_arg);
8839 if (new_staged_blob_id) {
8840 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8841 SHA1_DIGEST_LENGTH);
8843 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8844 got_fileindex_entry_staged_filetype_set(ie, 0);
8847 free(new_staged_blob_id);
8848 if (path_unstaged_content &&
8849 unlink(path_unstaged_content) == -1 && err == NULL)
8850 err = got_error_from_errno2("unlink", path_unstaged_content);
8851 if (path_new_staged_content &&
8852 unlink(path_new_staged_content) == -1 && err == NULL)
8853 err = got_error_from_errno2("unlink", path_new_staged_content);
8854 if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8855 err = got_error_from_errno2("unlink", blob_base_path);
8856 if (f_base && fclose(f_base) == EOF && err == NULL)
8857 err = got_error_from_errno2("fclose", path_unstaged_content);
8858 if (f && fclose(f) == EOF && err == NULL)
8859 err = got_error_from_errno2("fclose", path_unstaged_content);
8860 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8861 err = got_error_from_errno2("fclose", ondisk_path);
8862 free(path_unstaged_content);
8863 free(path_new_staged_content);
8864 free(blob_base_path);
8870 static const struct got_error *
8871 unstage_path(void *arg, unsigned char status,
8872 unsigned char staged_status, const char *relpath,
8873 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8874 struct got_object_id *commit_id, int dirfd, const char *de_name)
8876 const struct got_error *err = NULL;
8877 struct unstage_path_arg *a = arg;
8878 struct got_fileindex_entry *ie;
8879 struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8880 char *ondisk_path = NULL;
8881 char *id_str = NULL, *label_orig = NULL;
8882 int local_changes_subsumed;
8884 int fd1 = -1, fd2 = -1;
8886 if (staged_status != GOT_STATUS_ADD &&
8887 staged_status != GOT_STATUS_MODIFY &&
8888 staged_status != GOT_STATUS_DELETE)
8891 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8893 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8895 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8897 return got_error_from_errno("asprintf");
8899 err = got_object_id_str(&id_str,
8900 commit_id ? commit_id : a->worktree->base_commit_id);
8903 if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8905 err = got_error_from_errno("asprintf");
8909 fd1 = got_opentempfd();
8911 err = got_error_from_errno("got_opentempfd");
8914 fd2 = got_opentempfd();
8916 err = got_error_from_errno("got_opentempfd");
8920 switch (staged_status) {
8921 case GOT_STATUS_MODIFY:
8922 err = got_object_open_as_blob(&blob_base, a->repo,
8923 blob_id, 8192, fd1);
8927 case GOT_STATUS_ADD:
8929 if (staged_status == GOT_STATUS_ADD) {
8930 int choice = GOT_PATCH_CHOICE_NONE;
8931 err = (*a->patch_cb)(&choice, a->patch_arg,
8932 staged_status, ie->path, NULL, 1, 1);
8935 if (choice != GOT_PATCH_CHOICE_YES)
8938 err = unstage_hunks(staged_blob_id,
8939 blob_base, blob_id, ie, ondisk_path,
8940 label_orig, a->worktree, a->repo,
8941 a->patch_cb, a->patch_arg,
8942 a->progress_cb, a->progress_arg);
8943 break; /* Done with this file. */
8946 err = got_object_open_as_blob(&blob_staged, a->repo,
8947 staged_blob_id, 8192, fd2);
8950 switch (got_fileindex_entry_staged_filetype_get(ie)) {
8951 case GOT_FILEIDX_MODE_BAD_SYMLINK:
8952 case GOT_FILEIDX_MODE_REGULAR_FILE:
8953 err = merge_blob(&local_changes_subsumed, a->worktree,
8954 blob_base, ondisk_path, relpath,
8955 got_fileindex_perms_to_st(ie), label_orig,
8956 blob_staged, commit_id ? commit_id :
8957 a->worktree->base_commit_id, a->repo,
8958 a->progress_cb, a->progress_arg);
8960 case GOT_FILEIDX_MODE_SYMLINK:
8961 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8962 char *staged_target;
8963 err = got_object_blob_read_to_str(
8964 &staged_target, blob_staged);
8967 err = merge_symlink(a->worktree, blob_base,
8968 ondisk_path, relpath, label_orig,
8969 staged_target, commit_id ? commit_id :
8970 a->worktree->base_commit_id,
8971 a->repo, a->progress_cb, a->progress_arg);
8972 free(staged_target);
8974 err = merge_blob(&local_changes_subsumed,
8975 a->worktree, blob_base, ondisk_path,
8976 relpath, got_fileindex_perms_to_st(ie),
8977 label_orig, blob_staged,
8978 commit_id ? commit_id :
8979 a->worktree->base_commit_id, a->repo,
8980 a->progress_cb, a->progress_arg);
8984 err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8988 got_fileindex_entry_stage_set(ie,
8989 GOT_FILEIDX_STAGE_NONE);
8990 got_fileindex_entry_staged_filetype_set(ie, 0);
8993 case GOT_STATUS_DELETE:
8995 int choice = GOT_PATCH_CHOICE_NONE;
8996 err = (*a->patch_cb)(&choice, a->patch_arg,
8997 staged_status, ie->path, NULL, 1, 1);
9000 if (choice == GOT_PATCH_CHOICE_NO)
9002 if (choice != GOT_PATCH_CHOICE_YES) {
9003 err = got_error(GOT_ERR_PATCH_CHOICE);
9007 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9008 got_fileindex_entry_staged_filetype_set(ie, 0);
9009 err = get_file_status(&status, &sb, ie, ondisk_path,
9010 dirfd, de_name, a->repo);
9013 err = (*a->progress_cb)(a->progress_arg, status, relpath);
9018 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9019 err = got_error_from_errno("close");
9021 got_object_blob_close(blob_base);
9022 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9023 err = got_error_from_errno("close");
9025 got_object_blob_close(blob_staged);
9031 const struct got_error *
9032 got_worktree_unstage(struct got_worktree *worktree,
9033 struct got_pathlist_head *paths,
9034 got_worktree_checkout_cb progress_cb, void *progress_arg,
9035 got_worktree_patch_cb patch_cb, void *patch_arg,
9036 struct got_repository *repo)
9038 const struct got_error *err = NULL, *sync_err, *unlockerr;
9039 struct got_pathlist_entry *pe;
9040 struct got_fileindex *fileindex = NULL;
9041 char *fileindex_path = NULL;
9042 struct unstage_path_arg upa;
9044 err = lock_worktree(worktree, LOCK_EX);
9048 err = open_fileindex(&fileindex, &fileindex_path, worktree);
9052 upa.worktree = worktree;
9053 upa.fileindex = fileindex;
9055 upa.progress_cb = progress_cb;
9056 upa.progress_arg = progress_arg;
9057 upa.patch_cb = patch_cb;
9058 upa.patch_arg = patch_arg;
9059 TAILQ_FOREACH(pe, paths, entry) {
9060 err = worktree_status(worktree, pe->path, fileindex, repo,
9061 unstage_path, &upa, NULL, NULL, 1, 0);
9066 sync_err = sync_fileindex(fileindex, fileindex_path);
9067 if (sync_err && err == NULL)
9070 free(fileindex_path);
9072 got_fileindex_free(fileindex);
9073 unlockerr = lock_worktree(worktree, LOCK_SH);
9074 if (unlockerr && err == NULL)
9079 struct report_file_info_arg {
9080 struct got_worktree *worktree;
9081 got_worktree_path_info_cb info_cb;
9083 struct got_pathlist_head *paths;
9084 got_cancel_cb cancel_cb;
9088 static const struct got_error *
9089 report_file_info(void *arg, struct got_fileindex_entry *ie)
9091 struct report_file_info_arg *a = arg;
9092 struct got_pathlist_entry *pe;
9093 struct got_object_id blob_id, staged_blob_id, commit_id;
9094 struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9095 struct got_object_id *commit_idp = NULL;
9098 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9099 return got_error(GOT_ERR_CANCELLED);
9101 TAILQ_FOREACH(pe, a->paths, entry) {
9102 if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9103 got_path_is_child(ie->path, pe->path, pe->path_len))
9106 if (pe == NULL) /* not found */
9109 if (got_fileindex_entry_has_blob(ie))
9110 blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
9111 stage = got_fileindex_entry_stage_get(ie);
9112 if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9113 stage == GOT_FILEIDX_STAGE_ADD) {
9114 staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
9115 &staged_blob_id, ie);
9118 if (got_fileindex_entry_has_commit(ie))
9119 commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
9121 return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9122 (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9125 const struct got_error *
9126 got_worktree_path_info(struct got_worktree *worktree,
9127 struct got_pathlist_head *paths,
9128 got_worktree_path_info_cb info_cb, void *info_arg,
9129 got_cancel_cb cancel_cb, void *cancel_arg)
9132 const struct got_error *err = NULL, *unlockerr;
9133 struct got_fileindex *fileindex = NULL;
9134 char *fileindex_path = NULL;
9135 struct report_file_info_arg arg;
9137 err = lock_worktree(worktree, LOCK_SH);
9141 err = open_fileindex(&fileindex, &fileindex_path, worktree);
9145 arg.worktree = worktree;
9146 arg.info_cb = info_cb;
9147 arg.info_arg = info_arg;
9149 arg.cancel_cb = cancel_cb;
9150 arg.cancel_arg = cancel_arg;
9151 err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9154 free(fileindex_path);
9156 got_fileindex_free(fileindex);
9157 unlockerr = lock_worktree(worktree, LOCK_UN);
9158 if (unlockerr && err == NULL)
9163 static const struct got_error *
9164 patch_check_path(const char *p, char **path, unsigned char *status,
9165 unsigned char *staged_status, struct got_fileindex *fileindex,
9166 struct got_worktree *worktree, struct got_repository *repo)
9168 const struct got_error *err;
9169 struct got_fileindex_entry *ie;
9171 char *ondisk_path = NULL;
9173 err = got_worktree_resolve_path(path, worktree, p);
9177 if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9178 *path[0] ? "/" : "", *path) == -1)
9179 return got_error_from_errno("asprintf");
9181 ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9183 *staged_status = get_staged_status(ie);
9184 err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9189 *staged_status = GOT_STATUS_NO_CHANGE;
9190 *status = GOT_STATUS_UNVERSIONED;
9191 if (lstat(ondisk_path, &sb) == -1) {
9192 if (errno != ENOENT) {
9193 err = got_error_from_errno2("lstat",
9197 *status = GOT_STATUS_NONEXISTENT;
9206 static const struct got_error *
9207 patch_can_rm(const char *path, unsigned char status,
9208 unsigned char staged_status)
9210 if (status == GOT_STATUS_NONEXISTENT)
9211 return got_error_set_errno(ENOENT, path);
9212 if (status != GOT_STATUS_NO_CHANGE &&
9213 status != GOT_STATUS_ADD &&
9214 status != GOT_STATUS_MODIFY &&
9215 status != GOT_STATUS_MODE_CHANGE)
9216 return got_error_path(path, GOT_ERR_FILE_STATUS);
9217 if (staged_status == GOT_STATUS_DELETE)
9218 return got_error_path(path, GOT_ERR_FILE_STATUS);
9222 static const struct got_error *
9223 patch_can_add(const char *path, unsigned char status)
9225 if (status != GOT_STATUS_NONEXISTENT)
9226 return got_error_path(path, GOT_ERR_FILE_STATUS);
9230 static const struct got_error *
9231 patch_can_edit(const char *path, unsigned char status,
9232 unsigned char staged_status)
9234 if (status == GOT_STATUS_NONEXISTENT)
9235 return got_error_set_errno(ENOENT, path);
9236 if (status != GOT_STATUS_NO_CHANGE &&
9237 status != GOT_STATUS_ADD &&
9238 status != GOT_STATUS_MODIFY)
9239 return got_error_path(path, GOT_ERR_FILE_STATUS);
9240 if (staged_status == GOT_STATUS_DELETE)
9241 return got_error_path(path, GOT_ERR_FILE_STATUS);
9245 const struct got_error *
9246 got_worktree_patch_prepare(struct got_fileindex **fileindex,
9247 char **fileindex_path, struct got_worktree *worktree)
9249 return open_fileindex(fileindex, fileindex_path, worktree);
9252 const struct got_error *
9253 got_worktree_patch_check_path(const char *old, const char *new,
9254 char **oldpath, char **newpath, struct got_worktree *worktree,
9255 struct got_repository *repo, struct got_fileindex *fileindex)
9257 const struct got_error *err = NULL;
9258 int file_renamed = 0;
9259 unsigned char status_old, staged_status_old;
9260 unsigned char status_new, staged_status_new;
9265 err = patch_check_path(old != NULL ? old : new, oldpath,
9266 &status_old, &staged_status_old, fileindex, worktree, repo);
9270 err = patch_check_path(new != NULL ? new : old, newpath,
9271 &status_new, &staged_status_new, fileindex, worktree, repo);
9275 if (old != NULL && new != NULL && strcmp(old, new) != 0)
9278 if (old != NULL && new == NULL)
9279 err = patch_can_rm(*oldpath, status_old, staged_status_old);
9280 else if (file_renamed) {
9281 err = patch_can_rm(*oldpath, status_old, staged_status_old);
9283 err = patch_can_add(*newpath, status_new);
9284 } else if (old == NULL)
9285 err = patch_can_add(*newpath, status_new);
9287 err = patch_can_edit(*newpath, status_new, staged_status_new);
9299 const struct got_error *
9300 got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9301 struct got_worktree *worktree, struct got_fileindex *fileindex,
9302 got_worktree_checkout_cb progress_cb, void *progress_arg)
9304 struct schedule_addition_args saa;
9306 memset(&saa, 0, sizeof(saa));
9307 saa.worktree = worktree;
9308 saa.fileindex = fileindex;
9309 saa.progress_cb = progress_cb;
9310 saa.progress_arg = progress_arg;
9313 return worktree_status(worktree, path, fileindex, repo,
9314 schedule_addition, &saa, NULL, NULL, 1, 0);
9317 const struct got_error *
9318 got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9319 struct got_worktree *worktree, struct got_fileindex *fileindex,
9320 got_worktree_delete_cb progress_cb, void *progress_arg)
9322 struct schedule_deletion_args sda;
9324 memset(&sda, 0, sizeof(sda));
9325 sda.worktree = worktree;
9326 sda.fileindex = fileindex;
9327 sda.progress_cb = progress_cb;
9328 sda.progress_arg = progress_arg;
9330 sda.delete_local_mods = 0;
9331 sda.keep_on_disk = 0;
9332 sda.ignore_missing_paths = 0;
9333 sda.status_codes = NULL;
9335 return worktree_status(worktree, path, fileindex, repo,
9336 schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9339 const struct got_error *
9340 got_worktree_patch_complete(struct got_fileindex *fileindex,
9341 const char *fileindex_path)
9343 const struct got_error *err = NULL;
9345 err = sync_fileindex(fileindex, fileindex_path);
9346 got_fileindex_free(fileindex);