2 * Copyright (c) 2018, 2019 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/limits.h>
19 #include <sys/queue.h>
37 #include "got_error.h"
38 #include "got_repository.h"
39 #include "got_reference.h"
40 #include "got_object.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"
58 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 static const struct got_error *
62 create_meta_file(const char *path_got, const char *name, const char *content)
64 const struct got_error *err = NULL;
67 if (asprintf(&path, "%s/%s", path_got, name) == -1)
68 return got_error_from_errno("asprintf");
70 err = got_path_create_file(path, content);
75 static const struct got_error *
76 update_meta_file(const char *path_got, const char *name, const char *content)
78 const struct got_error *err = NULL;
83 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
84 err = got_error_from_errno("asprintf");
89 err = got_opentemp_named(&tmppath, &tmpfile, path);
94 int len = fprintf(tmpfile, "%s\n", content);
95 if (len != strlen(content) + 1) {
96 err = got_error_from_errno2("fprintf", tmppath);
101 if (rename(tmppath, path) != 0) {
102 err = got_error_from_errno3("rename", tmppath, path);
108 if (fclose(tmpfile) != 0 && err == NULL)
109 err = got_error_from_errno2("fclose", tmppath);
114 static const struct got_error *
115 read_meta_file(char **content, const char *path_got, const char *name)
117 const struct got_error *err = NULL;
125 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
126 err = got_error_from_errno("asprintf");
131 fd = open(path, O_RDONLY | O_NOFOLLOW);
134 err = got_error(GOT_ERR_WORKTREE_META);
136 err = got_error_from_errno2("open", path);
139 if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
140 err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
141 : got_error_from_errno2("flock", path));
145 if (lstat(path, &sb) != 0) {
146 err = got_error_from_errno2("lstat", path);
149 *content = calloc(1, sb.st_size);
150 if (*content == NULL) {
151 err = got_error_from_errno("calloc");
155 n = read(fd, *content, sb.st_size);
156 if (n != sb.st_size) {
157 err = (n == -1 ? got_error_from_errno2("read", path) :
158 got_error(GOT_ERR_WORKTREE_META));
161 if ((*content)[sb.st_size - 1] != '\n') {
162 err = got_error(GOT_ERR_WORKTREE_META);
165 (*content)[sb.st_size - 1] = '\0';
168 if (fd != -1 && close(fd) == -1 && err == NULL)
169 err = got_error_from_errno2("close", path_got);
178 static const struct got_error *
179 write_head_ref(const char *path_got, struct got_reference *head_ref)
181 const struct got_error *err = NULL;
184 if (got_ref_is_symbolic(head_ref)) {
185 refstr = got_ref_to_str(head_ref);
187 return got_error_from_errno("got_ref_to_str");
189 refstr = strdup(got_ref_get_name(head_ref));
191 return got_error_from_errno("strdup");
193 err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
198 const struct got_error *
199 got_worktree_init(const char *path, struct got_reference *head_ref,
200 const char *prefix, struct got_repository *repo)
202 const struct got_error *err = NULL;
203 struct got_object_id *commit_id = NULL;
205 uint32_t uuid_status;
207 char *path_got = NULL;
208 char *formatstr = NULL;
209 char *absprefix = NULL;
210 char *basestr = NULL;
211 char *uuidstr = NULL;
213 if (strcmp(path, got_repo_get_path(repo)) == 0) {
214 err = got_error(GOT_ERR_WORKTREE_REPO);
218 err = got_ref_resolve(&commit_id, repo, head_ref);
221 err = got_object_get_type(&obj_type, repo, commit_id);
224 if (obj_type != GOT_OBJ_TYPE_COMMIT)
225 return got_error(GOT_ERR_OBJ_TYPE);
227 if (!got_path_is_absolute(prefix)) {
228 if (asprintf(&absprefix, "/%s", prefix) == -1)
229 return got_error_from_errno("asprintf");
232 /* Create top-level directory (may already exist). */
233 if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
234 err = got_error_from_errno2("mkdir", path);
238 /* Create .got directory (may already exist). */
239 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
240 err = got_error_from_errno("asprintf");
243 if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
244 err = got_error_from_errno2("mkdir", path_got);
248 /* Create an empty lock file. */
249 err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
253 /* Create an empty file index. */
254 err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
258 /* Write the HEAD reference. */
259 err = write_head_ref(path_got, head_ref);
263 /* Record our base commit. */
264 err = got_object_id_str(&basestr, commit_id);
267 err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
271 /* Store path to repository. */
272 err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
273 got_repo_get_path(repo));
277 /* Store in-repository path prefix. */
278 err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
279 absprefix ? absprefix : prefix);
284 uuid_create(&uuid, &uuid_status);
285 if (uuid_status != uuid_s_ok) {
286 err = got_error_uuid(uuid_status);
289 uuid_to_string(&uuid, &uuidstr, &uuid_status);
290 if (uuid_status != uuid_s_ok) {
291 err = got_error_uuid(uuid_status);
294 err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
298 /* Stamp work tree with format file. */
299 if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
300 err = got_error_from_errno("asprintf");
303 err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
317 static const struct got_error *
318 open_worktree(struct got_worktree **worktree, const char *path)
320 const struct got_error *err = NULL;
322 char *formatstr = NULL;
323 char *uuidstr = NULL;
324 char *path_lock = NULL;
325 char *base_commit_id_str = NULL;
326 int version, fd = -1;
328 struct got_repository *repo = NULL;
329 uint32_t uuid_status;
333 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
334 err = got_error_from_errno("asprintf");
339 if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
340 err = got_error_from_errno("asprintf");
345 fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
347 err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
348 : got_error_from_errno2("open", path_lock));
352 err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
356 version = strtonum(formatstr, 1, INT_MAX, &errstr);
358 err = got_error(GOT_ERR_WORKTREE_META);
361 if (version != GOT_WORKTREE_FORMAT_VERSION) {
362 err = got_error(GOT_ERR_WORKTREE_VERS);
366 *worktree = calloc(1, sizeof(**worktree));
367 if (*worktree == NULL) {
368 err = got_error_from_errno("calloc");
371 (*worktree)->lockfd = -1;
373 (*worktree)->root_path = strdup(path);
374 if ((*worktree)->root_path == NULL) {
375 err = got_error_from_errno("strdup");
378 err = read_meta_file(&(*worktree)->repo_path, path_got,
379 GOT_WORKTREE_REPOSITORY);
383 err = read_meta_file(&(*worktree)->path_prefix, path_got,
384 GOT_WORKTREE_PATH_PREFIX);
388 err = read_meta_file(&base_commit_id_str, path_got,
389 GOT_WORKTREE_BASE_COMMIT);
393 err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
396 uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
397 if (uuid_status != uuid_s_ok) {
398 err = got_error_uuid(uuid_status);
402 err = got_repo_open(&repo, (*worktree)->repo_path);
406 err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
411 err = read_meta_file(&(*worktree)->head_ref_name, path_got,
412 GOT_WORKTREE_HEAD_REF);
415 got_repo_close(repo);
418 free(base_commit_id_str);
424 if (*worktree != NULL)
425 got_worktree_close(*worktree);
428 (*worktree)->lockfd = fd;
433 const struct got_error *
434 got_worktree_open(struct got_worktree **worktree, const char *path)
436 const struct got_error *err = NULL;
439 err = open_worktree(worktree, path);
440 if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
444 path = dirname(path);
446 return got_error_from_errno2("dirname", path);
447 } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
449 return got_error(GOT_ERR_NOT_WORKTREE);
452 const struct got_error *
453 got_worktree_close(struct got_worktree *worktree)
455 const struct got_error *err = NULL;
456 free(worktree->root_path);
457 free(worktree->repo_path);
458 free(worktree->path_prefix);
459 free(worktree->base_commit_id);
460 free(worktree->head_ref_name);
461 if (worktree->lockfd != -1)
462 if (close(worktree->lockfd) != 0)
463 err = got_error_from_errno2("close",
464 got_worktree_get_root_path(worktree));
470 got_worktree_get_root_path(struct got_worktree *worktree)
472 return worktree->root_path;
476 got_worktree_get_repo_path(struct got_worktree *worktree)
478 return worktree->repo_path;
482 got_worktree_get_path_prefix(struct got_worktree *worktree)
484 return worktree->path_prefix;
487 const struct got_error *
488 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
489 const char *path_prefix)
491 char *absprefix = NULL;
493 if (!got_path_is_absolute(path_prefix)) {
494 if (asprintf(&absprefix, "/%s", path_prefix) == -1)
495 return got_error_from_errno("asprintf");
497 *match = (strcmp(absprefix ? absprefix : path_prefix,
498 worktree->path_prefix) == 0);
504 got_worktree_get_head_ref_name(struct got_worktree *worktree)
506 return worktree->head_ref_name;
509 const struct got_error *
510 got_worktree_set_head_ref(struct got_worktree *worktree,
511 struct got_reference *head_ref)
513 const struct got_error *err = NULL;
514 char *path_got = NULL, *head_ref_name = NULL;
516 if (asprintf(&path_got, "%s/%s", worktree->root_path,
517 GOT_WORKTREE_GOT_DIR) == -1) {
518 err = got_error_from_errno("asprintf");
523 head_ref_name = strdup(got_ref_get_name(head_ref));
524 if (head_ref_name == NULL) {
525 err = got_error_from_errno("strdup");
529 err = write_head_ref(path_got, head_ref);
533 free(worktree->head_ref_name);
534 worktree->head_ref_name = head_ref_name;
542 struct got_object_id *
543 got_worktree_get_base_commit_id(struct got_worktree *worktree)
545 return worktree->base_commit_id;
548 const struct got_error *
549 got_worktree_set_base_commit_id(struct got_worktree *worktree,
550 struct got_repository *repo, struct got_object_id *commit_id)
552 const struct got_error *err;
553 struct got_object *obj = NULL;
555 char *path_got = NULL;
557 if (asprintf(&path_got, "%s/%s", worktree->root_path,
558 GOT_WORKTREE_GOT_DIR) == -1) {
559 err = got_error_from_errno("asprintf");
564 err = got_object_open(&obj, repo, commit_id);
568 if (obj->type != GOT_OBJ_TYPE_COMMIT) {
569 err = got_error(GOT_ERR_OBJ_TYPE);
573 /* Record our base commit. */
574 err = got_object_id_str(&id_str, commit_id);
577 err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
581 free(worktree->base_commit_id);
582 worktree->base_commit_id = got_object_id_dup(commit_id);
583 if (worktree->base_commit_id == NULL) {
584 err = got_error_from_errno("got_object_id_dup");
589 got_object_close(obj);
595 static const struct got_error *
596 lock_worktree(struct got_worktree *worktree, int operation)
598 if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
599 return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
600 : got_error_from_errno2("flock",
601 got_worktree_get_root_path(worktree)));
605 static const struct got_error *
606 add_dir_on_disk(struct got_worktree *worktree, const char *path)
608 const struct got_error *err = NULL;
611 if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
612 return got_error_from_errno("asprintf");
614 err = got_path_mkdir(abspath);
615 if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
618 if (lstat(abspath, &sb) == -1) {
619 err = got_error_from_errno2("lstat", abspath);
620 } else if (!S_ISDIR(sb.st_mode)) {
621 /* TODO directory is obstructed; do something */
622 err = got_error(GOT_ERR_FILE_OBSTRUCTED);
629 static const struct got_error *
630 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
632 const struct got_error *err = NULL;
635 size_t flen1 = 0, flen2 = 0;
640 flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
641 if (flen1 == 0 && ferror(f1)) {
642 err = got_error_from_errno("fread");
645 flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
646 if (flen2 == 0 && ferror(f2)) {
647 err = got_error_from_errno("fread");
654 } else if (flen2 == 0) {
658 } else if (flen1 == flen2) {
659 if (memcmp(fbuf1, fbuf2, flen2) != 0) {
672 static const struct got_error *
673 check_files_equal(int *same, const char *f1_path, const char *f2_path)
675 const struct got_error *err = NULL;
678 FILE *f1 = NULL, *f2 = NULL;
682 if (lstat(f1_path, &sb) != 0) {
683 err = got_error_from_errno2("lstat", f1_path);
688 if (lstat(f2_path, &sb) != 0) {
689 err = got_error_from_errno2("lstat", f2_path);
694 if (size1 != size2) {
699 f1 = fopen(f1_path, "r");
701 return got_error_from_errno2("open", f1_path);
703 f2 = fopen(f2_path, "r");
705 err = got_error_from_errno2("open", f2_path);
709 err = check_file_contents_equal(same, f1, f2);
711 if (f1 && fclose(f1) != 0 && err == NULL)
712 err = got_error_from_errno("fclose");
713 if (f2 && fclose(f2) != 0 && err == NULL)
714 err = got_error_from_errno("fclose");
720 * Perform a 3-way merge where blob_orig acts as the common ancestor,
721 * blob_deriv acts as the first derived version, and the file on disk
722 * acts as the second derived version.
724 static const struct got_error *
725 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
726 struct got_blob_object *blob_orig, const char *ondisk_path,
727 const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
728 struct got_object_id *deriv_base_commit_id,
729 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
732 const struct got_error *err = NULL;
734 FILE *f_deriv = NULL, *f_orig = NULL;
735 char *blob_deriv_path = NULL, *blob_orig_path = NULL;
736 char *merged_path = NULL, *base_path = NULL;
738 char *label_deriv = NULL;
742 *local_changes_subsumed = 0;
744 parent = dirname(ondisk_path);
746 return got_error_from_errno2("dirname", ondisk_path);
748 if (asprintf(&base_path, "%s/got-merged", parent) == -1)
749 return got_error_from_errno("asprintf");
751 err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
756 if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
757 err = got_error_from_errno("asprintf");
762 err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
765 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
771 if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
772 err = got_error_from_errno("asprintf");
777 err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
781 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
787 * If the file has no blob, this is an "add vs add" conflict,
788 * and we simply use an empty ancestor file to make both files
789 * appear in the merged result in their entirety.
793 err = got_object_id_str(&id_str, deriv_base_commit_id);
796 if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
797 err = got_error_from_errno("asprintf");
801 err = got_merge_diff3(&overlapcnt, merged_fd, blob_deriv_path,
802 blob_orig_path, ondisk_path, label_deriv, path);
806 (*progress_cb)(progress_arg,
807 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
809 if (fsync(merged_fd) != 0) {
810 err = got_error_from_errno("fsync");
814 /* Check if a clean merge has subsumed all local changes. */
815 if (overlapcnt == 0) {
816 err = check_files_equal(local_changes_subsumed, blob_deriv_path,
822 if (chmod(merged_path, st_mode) != 0) {
823 err = got_error_from_errno2("chmod", merged_path);
827 if (rename(merged_path, ondisk_path) != 0) {
828 err = got_error_from_errno3("rename", merged_path,
835 if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
836 err = got_error_from_errno("close");
837 if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
838 err = got_error_from_errno("fclose");
839 if (f_orig && fclose(f_orig) != 0 && err == NULL)
840 err = got_error_from_errno("fclose");
843 if (blob_deriv_path) {
844 unlink(blob_deriv_path);
845 free(blob_deriv_path);
847 if (blob_orig_path) {
848 unlink(blob_orig_path);
849 free(blob_orig_path);
856 static const struct got_error *
857 update_blob_fileindex_entry(struct got_worktree *worktree,
858 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
859 const char *ondisk_path, const char *path, struct got_blob_object *blob,
860 int update_timestamps)
862 const struct got_error *err = NULL;
865 ie = got_fileindex_entry_get(fileindex, path);
867 err = got_fileindex_entry_update(ie, ondisk_path,
868 blob->id.sha1, worktree->base_commit_id->sha1,
871 struct got_fileindex_entry *new_ie;
872 err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
873 path, blob->id.sha1, worktree->base_commit_id->sha1);
875 err = got_fileindex_entry_add(fileindex, new_ie);
880 static const struct got_error *
881 install_blob(struct got_worktree *worktree, const char *ondisk_path,
882 const char *path, uint16_t te_mode, uint16_t st_mode,
883 struct got_blob_object *blob, int restoring_missing_file,
884 int reverting_versioned_file, struct got_repository *repo,
885 got_worktree_checkout_cb progress_cb, void *progress_arg)
887 const struct got_error *err = NULL;
891 char *tmppath = NULL;
893 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
894 GOT_DEFAULT_FILE_MODE);
896 if (errno == ENOENT) {
897 char *parent = dirname(path);
899 return got_error_from_errno2("dirname", path);
900 err = add_dir_on_disk(worktree, parent);
903 fd = open(ondisk_path,
904 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
905 GOT_DEFAULT_FILE_MODE);
907 return got_error_from_errno2("open",
909 } else if (errno == EEXIST) {
910 if (!S_ISREG(st_mode)) {
911 /* TODO file is obstructed; do something */
912 err = got_error(GOT_ERR_FILE_OBSTRUCTED);
915 err = got_opentemp_named_fd(&tmppath, &fd,
922 return got_error_from_errno2("open", ondisk_path);
925 if (restoring_missing_file)
926 (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
927 else if (reverting_versioned_file)
928 (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
930 (*progress_cb)(progress_arg,
931 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
933 hdrlen = got_object_blob_get_hdrlen(blob);
935 const uint8_t *buf = got_object_blob_get_read_buf(blob);
936 err = got_object_blob_read_block(&len, blob);
940 /* Skip blob object header first time around. */
941 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
943 err = got_error_from_errno("write");
945 } else if (outlen != len - hdrlen) {
946 err = got_error(GOT_ERR_IO);
953 if (fsync(fd) != 0) {
954 err = got_error_from_errno("fsync");
959 if (rename(tmppath, ondisk_path) != 0) {
960 err = got_error_from_errno3("rename", tmppath,
967 if (te_mode & S_IXUSR) {
968 if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
969 err = got_error_from_errno2("chmod", ondisk_path);
973 if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
974 err = got_error_from_errno2("chmod", ondisk_path);
980 if (fd != -1 && close(fd) != 0 && err == NULL)
981 err = got_error_from_errno("close");
986 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
987 static const struct got_error *
988 get_modified_file_content_status(unsigned char *status, FILE *f)
990 const struct got_error *err = NULL;
991 const char *markers[3] = {
992 GOT_DIFF_CONFLICT_MARKER_BEGIN,
993 GOT_DIFF_CONFLICT_MARKER_SEP,
994 GOT_DIFF_CONFLICT_MARKER_END
999 const char delim[3] = {'\0', '\0', '\0'};
1001 while (*status == GOT_STATUS_MODIFY) {
1002 line = fparseln(f, &len, NULL, delim, 0);
1006 err = got_ferror(f, GOT_ERR_IO);
1010 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1011 if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1013 *status = GOT_STATUS_CONFLICT;
1022 static const struct got_error *
1023 get_file_status(unsigned char *status, struct stat *sb,
1024 struct got_fileindex_entry *ie, const char *abspath,
1025 struct got_repository *repo)
1027 const struct got_error *err = NULL;
1028 struct got_object_id id;
1032 struct got_blob_object *blob = NULL;
1035 *status = GOT_STATUS_NO_CHANGE;
1037 if (lstat(abspath, sb) == -1) {
1038 if (errno == ENOENT) {
1040 if (got_fileindex_entry_has_file_on_disk(ie))
1041 *status = GOT_STATUS_MISSING;
1043 *status = GOT_STATUS_DELETE;
1045 ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1046 & (S_IRWXU | S_IRWXG | S_IRWXO));
1048 sb->st_mode = GOT_DEFAULT_FILE_MODE;
1051 return got_error_from_errno2("lstat", abspath);
1054 if (!S_ISREG(sb->st_mode)) {
1055 *status = GOT_STATUS_OBSTRUCTED;
1062 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1063 *status = GOT_STATUS_DELETE;
1065 } else if (!got_fileindex_entry_has_blob(ie)) {
1066 *status = GOT_STATUS_ADD;
1070 if (ie->ctime_sec == sb->st_ctime &&
1071 ie->ctime_nsec == sb->st_ctimensec &&
1072 ie->mtime_sec == sb->st_mtime &&
1073 ie->mtime_sec == sb->st_mtime &&
1074 ie->mtime_nsec == sb->st_mtimensec &&
1075 ie->size == (sb->st_size & 0xffffffff))
1078 memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1079 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1083 f = fopen(abspath, "r");
1085 err = got_error_from_errno2("fopen", abspath);
1088 hdrlen = got_object_blob_get_hdrlen(blob);
1090 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1091 err = got_object_blob_read_block(&blen, blob);
1094 /* Skip length of blob object header first time around. */
1095 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1096 if (flen == 0 && ferror(f)) {
1097 err = got_error_from_errno("fread");
1102 *status = GOT_STATUS_MODIFY;
1104 } else if (flen == 0) {
1106 *status = GOT_STATUS_MODIFY;
1108 } else if (blen - hdrlen == flen) {
1109 /* Skip blob object header first time around. */
1110 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1111 *status = GOT_STATUS_MODIFY;
1115 *status = GOT_STATUS_MODIFY;
1121 if (*status == GOT_STATUS_MODIFY) {
1123 err = get_modified_file_content_status(status, f);
1127 got_object_blob_close(blob);
1133 static const struct got_error *
1134 update_blob(struct got_worktree *worktree,
1135 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1136 struct got_tree_entry *te, const char *path,
1137 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1140 const struct got_error *err = NULL;
1141 struct got_blob_object *blob = NULL;
1143 unsigned char status = GOT_STATUS_NO_CHANGE;
1146 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1147 return got_error_from_errno("asprintf");
1149 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1153 if (status == GOT_STATUS_OBSTRUCTED) {
1154 (*progress_cb)(progress_arg, status, path);
1158 if (ie && status != GOT_STATUS_MISSING) {
1159 if (got_fileindex_entry_has_commit(ie) &&
1160 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1161 SHA1_DIGEST_LENGTH) == 0) {
1162 (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1166 if (got_fileindex_entry_has_blob(ie) &&
1167 memcmp(ie->blob_sha1, te->id->sha1,
1168 SHA1_DIGEST_LENGTH) == 0)
1172 err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1176 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1177 int update_timestamps;
1178 struct got_blob_object *blob2 = NULL;
1179 if (got_fileindex_entry_has_blob(ie)) {
1180 struct got_object_id id2;
1181 memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1182 err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1186 err = merge_blob(&update_timestamps, worktree, blob2,
1187 ondisk_path, path, sb.st_mode, blob,
1188 worktree->base_commit_id, repo,
1189 progress_cb, progress_arg);
1191 got_object_blob_close(blob2);
1193 * Do not update timestamps of files with local changes.
1194 * Otherwise, a future status walk would treat them as
1195 * unmodified files again.
1197 err = got_fileindex_entry_update(ie, ondisk_path,
1198 blob->id.sha1, worktree->base_commit_id->sha1,
1200 } else if (status == GOT_STATUS_DELETE) {
1201 (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1202 err = update_blob_fileindex_entry(worktree, fileindex, ie,
1203 ondisk_path, path, blob, 0);
1207 err = install_blob(worktree, ondisk_path, path, te->mode,
1208 sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1209 repo, progress_cb, progress_arg);
1212 err = update_blob_fileindex_entry(worktree, fileindex, ie,
1213 ondisk_path, path, blob, 1);
1217 got_object_blob_close(blob);
1223 static const struct got_error *
1224 remove_ondisk_file(const char *root_path, const char *path)
1226 const struct got_error *err = NULL;
1227 char *ondisk_path = NULL;
1229 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1230 return got_error_from_errno("asprintf");
1232 if (unlink(ondisk_path) == -1) {
1233 if (errno != ENOENT)
1234 err = got_error_from_errno2("unlink", ondisk_path);
1236 char *parent = dirname(ondisk_path);
1237 while (parent && strcmp(parent, root_path) != 0) {
1238 if (rmdir(parent) == -1) {
1239 if (errno != ENOTEMPTY)
1240 err = got_error_from_errno2("rmdir",
1244 parent = dirname(parent);
1251 static const struct got_error *
1252 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1253 struct got_fileindex_entry *ie, struct got_repository *repo,
1254 got_worktree_checkout_cb progress_cb, void *progress_arg)
1256 const struct got_error *err = NULL;
1257 unsigned char status;
1261 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1263 return got_error_from_errno("asprintf");
1265 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1269 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1270 status == GOT_STATUS_ADD) {
1271 (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1273 * Preserve the working file and change the deleted blob's
1274 * entry into a schedule-add entry.
1276 err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1281 (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1282 if (status == GOT_STATUS_NO_CHANGE) {
1283 err = remove_ondisk_file(worktree->root_path, ie->path);
1287 got_fileindex_entry_remove(fileindex, ie);
1293 struct diff_cb_arg {
1294 struct got_fileindex *fileindex;
1295 struct got_worktree *worktree;
1296 struct got_repository *repo;
1297 got_worktree_checkout_cb progress_cb;
1299 got_worktree_cancel_cb cancel_cb;
1303 static const struct got_error *
1304 diff_old_new(void *arg, struct got_fileindex_entry *ie,
1305 struct got_tree_entry *te, const char *parent_path)
1307 struct diff_cb_arg *a = arg;
1309 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1310 return got_error(GOT_ERR_CANCELLED);
1312 return update_blob(a->worktree, a->fileindex, ie, te,
1313 ie->path, a->repo, a->progress_cb, a->progress_arg);
1316 static const struct got_error *
1317 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1319 struct diff_cb_arg *a = arg;
1321 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1322 return got_error(GOT_ERR_CANCELLED);
1324 return delete_blob(a->worktree, a->fileindex, ie,
1325 a->repo, a->progress_cb, a->progress_arg);
1328 static const struct got_error *
1329 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1331 struct diff_cb_arg *a = arg;
1332 const struct got_error *err;
1335 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1336 return got_error(GOT_ERR_CANCELLED);
1338 if (asprintf(&path, "%s%s%s", parent_path,
1339 parent_path[0] ? "/" : "", te->name)
1341 return got_error_from_errno("asprintf");
1343 if (S_ISDIR(te->mode))
1344 err = add_dir_on_disk(a->worktree, path);
1346 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1347 a->repo, a->progress_cb, a->progress_arg);
1353 static const struct got_error *
1354 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1356 const struct got_error *err = NULL;
1357 char *uuidstr = NULL;
1358 uint32_t uuid_status;
1362 uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1363 if (uuid_status != uuid_s_ok)
1364 return got_error_uuid(uuid_status);
1366 if (asprintf(refname, "%s-%s", prefix, uuidstr)
1368 err = got_error_from_errno("asprintf");
1375 const struct got_error *
1376 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1378 return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1381 static const struct got_error *
1382 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1384 return get_ref_name(refname, worktree,
1385 GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1388 static const struct got_error *
1389 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1391 return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1394 static const struct got_error *
1395 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1397 return get_ref_name(refname, worktree,
1398 GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1401 static const struct got_error *
1402 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1404 return get_ref_name(refname, worktree,
1405 GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1410 * Prevent Git's garbage collector from deleting our base commit by
1411 * setting a reference to our base commit's ID.
1413 static const struct got_error *
1414 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1416 const struct got_error *err = NULL;
1417 struct got_reference *ref = NULL;
1420 err = got_worktree_get_base_ref_name(&refname, worktree);
1424 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1428 err = got_ref_write(ref, repo);
1436 static const struct got_error *
1437 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1438 struct got_worktree *worktree)
1440 const struct got_error *err = NULL;
1443 *fileindex_path = NULL;
1444 *fileindex = got_fileindex_alloc();
1445 if (*fileindex == NULL)
1446 return got_error_from_errno("got_fileindex_alloc");
1448 if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1449 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1450 err = got_error_from_errno("asprintf");
1451 *fileindex_path = NULL;
1455 index = fopen(*fileindex_path, "rb");
1456 if (index == NULL) {
1457 if (errno != ENOENT)
1458 err = got_error_from_errno2("fopen", *fileindex_path);
1460 err = got_fileindex_read(*fileindex, index);
1461 if (fclose(index) != 0 && err == NULL)
1462 err = got_error_from_errno("fclose");
1466 free(*fileindex_path);
1467 *fileindex_path = NULL;
1468 got_fileindex_free(*fileindex);
1474 struct bump_base_commit_id_arg {
1475 struct got_object_id *base_commit_id;
1478 const char *entry_name;
1479 got_worktree_checkout_cb progress_cb;
1483 /* Bump base commit ID of all files within an updated part of the work tree. */
1484 static const struct got_error *
1485 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1487 struct bump_base_commit_id_arg *a = arg;
1489 if (a->entry_name) {
1490 if (strcmp(ie->path, a->path) != 0)
1492 } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1495 if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1496 SHA1_DIGEST_LENGTH) == 0)
1500 (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1502 memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1506 static const struct got_error *
1507 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1509 const struct got_error *err = NULL;
1510 char *new_fileindex_path = NULL;
1511 FILE *new_index = NULL;
1513 err = got_opentemp_named(&new_fileindex_path, &new_index,
1518 err = got_fileindex_write(fileindex, new_index);
1522 if (rename(new_fileindex_path, fileindex_path) != 0) {
1523 err = got_error_from_errno3("rename", new_fileindex_path,
1525 unlink(new_fileindex_path);
1530 free(new_fileindex_path);
1534 static const struct got_error *
1535 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1536 struct got_object_id **tree_id, const char *wt_relpath,
1537 struct got_worktree *worktree, struct got_repository *repo)
1539 const struct got_error *err = NULL;
1540 struct got_object_id *id = NULL;
1541 char *in_repo_path = NULL;
1542 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1544 *entry_type = GOT_OBJ_TYPE_ANY;
1545 *tree_relpath = NULL;
1548 if (wt_relpath[0] == '\0') {
1549 /* Check out all files within the work tree. */
1550 *entry_type = GOT_OBJ_TYPE_TREE;
1551 *tree_relpath = strdup("");
1552 if (*tree_relpath == NULL) {
1553 err = got_error_from_errno("strdup");
1556 err = got_object_id_by_path(tree_id, repo,
1557 worktree->base_commit_id, worktree->path_prefix);
1563 /* Check out a subset of files in the work tree. */
1565 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1566 is_root_wt ? "" : "/", wt_relpath) == -1) {
1567 err = got_error_from_errno("asprintf");
1571 err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1577 in_repo_path = NULL;
1579 err = got_object_get_type(entry_type, repo, id);
1583 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1584 /* Check out a single file. */
1585 if (strchr(wt_relpath, '/') == NULL) {
1586 /* Check out a single file in work tree's root dir. */
1587 in_repo_path = strdup(worktree->path_prefix);
1588 if (in_repo_path == NULL) {
1589 err = got_error_from_errno("strdup");
1592 *tree_relpath = strdup("");
1593 if (*tree_relpath == NULL) {
1594 err = got_error_from_errno("strdup");
1598 /* Check out a single file in a subdirectory. */
1599 err = got_path_dirname(tree_relpath, wt_relpath);
1602 if (asprintf(&in_repo_path, "%s%s%s",
1603 worktree->path_prefix, is_root_wt ? "" : "/",
1604 *tree_relpath) == -1) {
1605 err = got_error_from_errno("asprintf");
1609 err = got_object_id_by_path(tree_id, repo,
1610 worktree->base_commit_id, in_repo_path);
1612 /* Check out all files within a subdirectory. */
1613 *tree_id = got_object_id_dup(id);
1614 if (*tree_id == NULL) {
1615 err = got_error_from_errno("got_object_id_dup");
1618 *tree_relpath = strdup(wt_relpath);
1619 if (*tree_relpath == NULL) {
1620 err = got_error_from_errno("strdup");
1628 *entry_type = GOT_OBJ_TYPE_ANY;
1629 free(*tree_relpath);
1630 *tree_relpath = NULL;
1637 static const struct got_error *
1638 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1639 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1640 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1641 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1643 const struct got_error *err = NULL;
1644 struct got_commit_object *commit = NULL;
1645 struct got_tree_object *tree = NULL;
1646 struct got_fileindex_diff_tree_cb diff_cb;
1647 struct diff_cb_arg arg;
1649 err = ref_base_commit(worktree, repo);
1653 err = got_object_open_as_commit(&commit, repo,
1654 worktree->base_commit_id);
1658 err = got_object_open_as_tree(&tree, repo, tree_id);
1663 got_object_tree_find_entry(tree, entry_name) == NULL) {
1664 err = got_error(GOT_ERR_NO_TREE_ENTRY);
1668 diff_cb.diff_old_new = diff_old_new;
1669 diff_cb.diff_old = diff_old;
1670 diff_cb.diff_new = diff_new;
1671 arg.fileindex = fileindex;
1672 arg.worktree = worktree;
1674 arg.progress_cb = progress_cb;
1675 arg.progress_arg = progress_arg;
1676 arg.cancel_cb = cancel_cb;
1677 arg.cancel_arg = cancel_arg;
1678 err = got_fileindex_diff_tree(fileindex, tree, relpath,
1679 entry_name, repo, &diff_cb, &arg);
1682 got_object_tree_close(tree);
1684 got_object_commit_close(commit);
1688 const struct got_error *
1689 got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1690 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1691 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1693 const struct got_error *err = NULL, *sync_err, *unlockerr;
1694 struct got_commit_object *commit = NULL;
1695 struct got_object_id *tree_id = NULL;
1696 struct got_tree_object *tree = NULL;
1697 struct got_fileindex *fileindex = NULL;
1698 char *fileindex_path = NULL;
1699 char *relpath = NULL, *entry_name = NULL;
1702 err = lock_worktree(worktree, LOCK_EX);
1706 err = find_tree_entry_for_checkout(&entry_type, &relpath, &tree_id,
1707 path, worktree, repo);
1711 if (entry_type == GOT_OBJ_TYPE_BLOB) {
1712 entry_name = basename(path);
1713 if (entry_name == NULL) {
1714 err = got_error_from_errno2("basename", path);
1720 * Read the file index.
1721 * Checking out files is supposed to be an idempotent operation.
1722 * If the on-disk file index is incomplete we will try to complete it.
1724 err = open_fileindex(&fileindex, &fileindex_path, worktree);
1728 err = checkout_files(worktree, fileindex, relpath, tree_id, entry_name,
1729 repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
1731 struct bump_base_commit_id_arg bbc_arg;
1732 bbc_arg.base_commit_id = worktree->base_commit_id;
1733 bbc_arg.entry_name = entry_name;
1734 bbc_arg.path = path;
1735 bbc_arg.path_len = strlen(path);
1736 bbc_arg.progress_cb = progress_cb;
1737 bbc_arg.progress_arg = progress_arg;
1738 err = got_fileindex_for_each_entry_safe(fileindex,
1739 bump_base_commit_id, &bbc_arg);
1741 sync_err = sync_fileindex(fileindex, fileindex_path);
1742 if (sync_err && err == NULL)
1745 free(fileindex_path);
1748 got_object_tree_close(tree);
1750 got_object_commit_close(commit);
1752 got_fileindex_free(fileindex);
1753 unlockerr = lock_worktree(worktree, LOCK_SH);
1754 if (unlockerr && err == NULL)
1759 struct merge_file_cb_arg {
1760 struct got_worktree *worktree;
1761 struct got_fileindex *fileindex;
1762 got_worktree_checkout_cb progress_cb;
1764 got_worktree_cancel_cb cancel_cb;
1766 struct got_object_id *commit_id2;
1769 static const struct got_error *
1770 merge_file_cb(void *arg, struct got_blob_object *blob1,
1771 struct got_blob_object *blob2, struct got_object_id *id1,
1772 struct got_object_id *id2, const char *path1, const char *path2,
1773 struct got_repository *repo)
1775 static const struct got_error *err = NULL;
1776 struct merge_file_cb_arg *a = arg;
1777 struct got_fileindex_entry *ie;
1778 char *ondisk_path = NULL;
1780 unsigned char status;
1781 int local_changes_subsumed;
1783 if (blob1 && blob2) {
1784 ie = got_fileindex_entry_get(a->fileindex, path2);
1786 (*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1791 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1793 return got_error_from_errno("asprintf");
1795 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1799 if (status == GOT_STATUS_DELETE) {
1800 (*a->progress_cb)(a->progress_arg, GOT_STATUS_MERGE,
1804 if (status != GOT_STATUS_NO_CHANGE &&
1805 status != GOT_STATUS_MODIFY &&
1806 status != GOT_STATUS_CONFLICT &&
1807 status != GOT_STATUS_ADD) {
1808 (*a->progress_cb)(a->progress_arg, status, path2);
1812 err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1813 ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1814 a->progress_cb, a->progress_arg);
1816 ie = got_fileindex_entry_get(a->fileindex, path1);
1818 (*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1823 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1825 return got_error_from_errno("asprintf");
1827 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1832 case GOT_STATUS_NO_CHANGE:
1833 (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1835 err = remove_ondisk_file(a->worktree->root_path, path1);
1839 got_fileindex_entry_mark_deleted_from_disk(ie);
1841 case GOT_STATUS_DELETE:
1842 case GOT_STATUS_MISSING:
1843 (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1846 got_fileindex_entry_mark_deleted_from_disk(ie);
1848 case GOT_STATUS_ADD:
1849 case GOT_STATUS_MODIFY:
1850 case GOT_STATUS_CONFLICT:
1851 (*a->progress_cb)(a->progress_arg,
1852 GOT_STATUS_CANNOT_DELETE, path1);
1854 case GOT_STATUS_OBSTRUCTED:
1855 (*a->progress_cb)(a->progress_arg, status, path1);
1861 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1863 return got_error_from_errno("asprintf");
1864 ie = got_fileindex_entry_get(a->fileindex, path2);
1866 err = get_file_status(&status, &sb, ie, ondisk_path,
1870 if (status != GOT_STATUS_NO_CHANGE &&
1871 status != GOT_STATUS_MODIFY &&
1872 status != GOT_STATUS_CONFLICT &&
1873 status != GOT_STATUS_ADD) {
1874 (*a->progress_cb)(a->progress_arg, status,
1878 err = merge_blob(&local_changes_subsumed, a->worktree,
1879 NULL, ondisk_path, path2, sb.st_mode, blob2,
1880 a->commit_id2, repo,
1881 a->progress_cb, a->progress_arg);
1882 if (status == GOT_STATUS_DELETE) {
1883 err = update_blob_fileindex_entry(a->worktree,
1884 a->fileindex, ie, ondisk_path, ie->path,
1890 sb.st_mode = GOT_DEFAULT_FILE_MODE;
1891 err = install_blob(a->worktree, ondisk_path, path2,
1892 /* XXX get this from parent tree! */
1893 GOT_DEFAULT_FILE_MODE,
1894 sb.st_mode, blob2, 0, 0, repo,
1895 a->progress_cb, a->progress_arg);
1898 err = got_fileindex_entry_alloc(&ie,
1899 ondisk_path, path2, NULL, NULL);
1902 err = got_fileindex_entry_add(a->fileindex, ie);
1904 got_fileindex_entry_free(ie);
1914 struct check_merge_ok_arg {
1915 struct got_worktree *worktree;
1916 struct got_repository *repo;
1919 static const struct got_error *
1920 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
1922 const struct got_error *err = NULL;
1923 struct check_merge_ok_arg *a = arg;
1924 unsigned char status;
1928 /* Reject merges into a work tree with mixed base commits. */
1929 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
1930 SHA1_DIGEST_LENGTH))
1931 return got_error(GOT_ERR_MIXED_COMMITS);
1933 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
1935 return got_error_from_errno("asprintf");
1937 /* Reject merges into a work tree with conflicted files. */
1938 err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
1941 if (status == GOT_STATUS_CONFLICT)
1942 return got_error(GOT_ERR_CONFLICTS);
1947 static const struct got_error *
1948 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1949 const char *fileindex_path, struct got_object_id *commit_id1,
1950 struct got_object_id *commit_id2, struct got_repository *repo,
1951 got_worktree_checkout_cb progress_cb, void *progress_arg,
1952 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1954 const struct got_error *err = NULL, *sync_err;
1955 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
1956 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1957 struct merge_file_cb_arg arg;
1960 err = got_object_id_by_path(&tree_id1, repo, commit_id1,
1961 worktree->path_prefix);
1965 err = got_object_open_as_tree(&tree1, repo, tree_id1);
1970 err = got_object_id_by_path(&tree_id2, repo, commit_id2,
1971 worktree->path_prefix);
1975 err = got_object_open_as_tree(&tree2, repo, tree_id2);
1979 arg.worktree = worktree;
1980 arg.fileindex = fileindex;
1981 arg.progress_cb = progress_cb;
1982 arg.progress_arg = progress_arg;
1983 arg.cancel_cb = cancel_cb;
1984 arg.cancel_arg = cancel_arg;
1985 arg.commit_id2 = commit_id2;
1986 err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg);
1987 sync_err = sync_fileindex(fileindex, fileindex_path);
1988 if (sync_err && err == NULL)
1992 got_object_tree_close(tree1);
1994 got_object_tree_close(tree2);
1998 const struct got_error *
1999 got_worktree_merge_files(struct got_worktree *worktree,
2000 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2001 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2002 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2004 const struct got_error *err, *unlockerr;
2005 char *fileindex_path = NULL;
2006 struct got_fileindex *fileindex = NULL;
2007 struct check_merge_ok_arg mok_arg;
2009 err = lock_worktree(worktree, LOCK_EX);
2013 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2017 mok_arg.worktree = worktree;
2018 mok_arg.repo = repo;
2019 err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2024 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2025 commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2028 got_fileindex_free(fileindex);
2029 free(fileindex_path);
2030 unlockerr = lock_worktree(worktree, LOCK_SH);
2031 if (unlockerr && err == NULL)
2036 struct diff_dir_cb_arg {
2037 struct got_fileindex *fileindex;
2038 struct got_worktree *worktree;
2039 const char *status_path;
2040 size_t status_path_len;
2041 struct got_repository *repo;
2042 got_worktree_status_cb status_cb;
2044 got_worktree_cancel_cb cancel_cb;
2048 static const struct got_error *
2049 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2050 got_worktree_status_cb status_cb, void *status_arg,
2051 struct got_repository *repo)
2053 const struct got_error *err = NULL;
2054 unsigned char status = GOT_STATUS_NO_CHANGE;
2056 struct got_object_id blob_id, commit_id;
2058 err = get_file_status(&status, &sb, ie, abspath, repo);
2059 if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
2060 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2061 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2062 err = (*status_cb)(status_arg, status, ie->path, &blob_id,
2068 static const struct got_error *
2069 status_old_new(void *arg, struct got_fileindex_entry *ie,
2070 struct dirent *de, const char *parent_path)
2072 const struct got_error *err = NULL;
2073 struct diff_dir_cb_arg *a = arg;
2076 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2077 return got_error(GOT_ERR_CANCELLED);
2079 if (got_path_cmp(parent_path, a->status_path) != 0 &&
2080 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2083 if (parent_path[0]) {
2084 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2085 parent_path, de->d_name) == -1)
2086 return got_error_from_errno("asprintf");
2088 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2090 return got_error_from_errno("asprintf");
2093 err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2099 static const struct got_error *
2100 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2102 struct diff_dir_cb_arg *a = arg;
2103 struct got_object_id blob_id, commit_id;
2104 unsigned char status;
2106 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2107 return got_error(GOT_ERR_CANCELLED);
2109 if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2112 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2113 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2114 if (got_fileindex_entry_has_file_on_disk(ie))
2115 status = GOT_STATUS_MISSING;
2117 status = GOT_STATUS_DELETE;
2118 return (*a->status_cb)(a->status_arg, status, ie->path, &blob_id,
2122 static const struct got_error *
2123 status_new(void *arg, struct dirent *de, const char *parent_path)
2125 const struct got_error *err = NULL;
2126 struct diff_dir_cb_arg *a = arg;
2129 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2130 return got_error(GOT_ERR_CANCELLED);
2132 if (de->d_type == DT_DIR)
2135 /* XXX ignore symlinks for now */
2136 if (de->d_type == DT_LNK)
2139 if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2142 if (parent_path[0]) {
2143 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2144 return got_error_from_errno("asprintf");
2149 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
2156 static const struct got_error *
2157 worktree_status(struct got_worktree *worktree, const char *path,
2158 struct got_fileindex *fileindex, struct got_repository *repo,
2159 got_worktree_status_cb status_cb, void *status_arg,
2160 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2162 const struct got_error *err = NULL;
2163 DIR *workdir = NULL;
2164 struct got_fileindex_diff_dir_cb fdiff_cb;
2165 struct diff_dir_cb_arg arg;
2166 char *ondisk_path = NULL;
2168 if (asprintf(&ondisk_path, "%s%s%s",
2169 worktree->root_path, path[0] ? "/" : "", path) == -1) {
2170 err = got_error_from_errno("asprintf");
2173 workdir = opendir(ondisk_path);
2174 if (workdir == NULL) {
2175 if (errno == ENOTDIR || errno == ENOENT) {
2176 struct got_fileindex_entry *ie;
2177 ie = got_fileindex_entry_get(fileindex, path);
2179 err = got_error(GOT_ERR_BAD_PATH);
2182 err = report_file_status(ie, ondisk_path,
2183 status_cb, status_arg, repo);
2186 err = got_error_from_errno2("opendir", ondisk_path);
2190 fdiff_cb.diff_old_new = status_old_new;
2191 fdiff_cb.diff_old = status_old;
2192 fdiff_cb.diff_new = status_new;
2193 arg.fileindex = fileindex;
2194 arg.worktree = worktree;
2195 arg.status_path = path;
2196 arg.status_path_len = strlen(path);
2198 arg.status_cb = status_cb;
2199 arg.status_arg = status_arg;
2200 arg.cancel_cb = cancel_cb;
2201 arg.cancel_arg = cancel_arg;
2202 err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
2203 path, repo, &fdiff_cb, &arg);
2211 const struct got_error *
2212 got_worktree_status(struct got_worktree *worktree, const char *path,
2213 struct got_repository *repo, got_worktree_status_cb status_cb,
2214 void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2216 const struct got_error *err = NULL;
2217 char *fileindex_path = NULL;
2218 struct got_fileindex *fileindex = NULL;
2220 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2224 err = worktree_status(worktree, path, fileindex, repo,
2225 status_cb, status_arg, cancel_cb, cancel_arg);
2226 free(fileindex_path);
2227 got_fileindex_free(fileindex);
2231 const struct got_error *
2232 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2235 const struct got_error *err = NULL;
2236 char *resolved, *path = NULL;
2241 resolved = realpath(arg, NULL);
2242 if (resolved == NULL)
2243 return got_error_from_errno2("realpath", arg);
2245 if (strncmp(got_worktree_get_root_path(worktree), resolved,
2246 strlen(got_worktree_get_root_path(worktree)))) {
2247 err = got_error(GOT_ERR_BAD_PATH);
2251 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2252 err = got_path_skip_common_ancestor(&path,
2253 got_worktree_get_root_path(worktree), resolved);
2259 err = got_error_from_errno("strdup");
2264 /* XXX status walk can't deal with trailing slash! */
2266 while (path[len - 1] == '/') {
2267 path[len - 1] = '\0';
2279 static const struct got_error *
2280 schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2281 const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2282 struct got_repository *repo)
2284 const struct got_error *err = NULL;
2285 struct got_fileindex_entry *ie;
2287 /* Re-adding an existing entry is a no-op. */
2288 if (got_fileindex_entry_get(fileindex, relpath) != NULL)
2291 err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2295 err = got_fileindex_entry_add(fileindex, ie);
2297 got_fileindex_entry_free(ie);
2301 return report_file_status(ie, relpath, status_cb, status_arg, repo);
2304 const struct got_error *
2305 got_worktree_schedule_add(struct got_worktree *worktree,
2306 struct got_pathlist_head *ondisk_paths,
2307 got_worktree_status_cb status_cb, void *status_arg,
2308 struct got_repository *repo)
2310 struct got_fileindex *fileindex = NULL;
2311 char *fileindex_path = NULL;
2312 const struct got_error *err = NULL, *sync_err, *unlockerr;
2313 struct got_pathlist_entry *pe;
2315 err = lock_worktree(worktree, LOCK_EX);
2319 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2323 TAILQ_FOREACH(pe, ondisk_paths, entry) {
2325 err = got_path_skip_common_ancestor(&relpath,
2326 got_worktree_get_root_path(worktree), pe->path);
2329 err = schedule_addition(pe->path, fileindex, relpath,
2330 status_cb, status_arg, repo);
2335 sync_err = sync_fileindex(fileindex, fileindex_path);
2336 if (sync_err && err == NULL)
2339 free(fileindex_path);
2341 got_fileindex_free(fileindex);
2342 unlockerr = lock_worktree(worktree, LOCK_SH);
2343 if (unlockerr && err == NULL)
2348 static const struct got_error *
2349 schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2350 const char *relpath, int delete_local_mods,
2351 got_worktree_status_cb status_cb, void *status_arg,
2352 struct got_repository *repo)
2354 const struct got_error *err = NULL;
2355 struct got_fileindex_entry *ie = NULL;
2356 unsigned char status;
2359 ie = got_fileindex_entry_get(fileindex, relpath);
2361 return got_error(GOT_ERR_BAD_PATH);
2363 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2367 if (status != GOT_STATUS_NO_CHANGE) {
2368 if (status == GOT_STATUS_DELETE)
2369 return got_error_set_errno(ENOENT, ondisk_path);
2370 if (status != GOT_STATUS_MODIFY)
2371 return got_error(GOT_ERR_FILE_STATUS);
2372 if (!delete_local_mods)
2373 return got_error(GOT_ERR_FILE_MODIFIED);
2376 if (unlink(ondisk_path) != 0)
2377 return got_error_from_errno2("unlink", ondisk_path);
2379 got_fileindex_entry_mark_deleted_from_disk(ie);
2380 return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2383 const struct got_error *
2384 got_worktree_schedule_delete(struct got_worktree *worktree,
2385 struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2386 got_worktree_status_cb status_cb, void *status_arg,
2387 struct got_repository *repo)
2389 struct got_fileindex *fileindex = NULL;
2390 char *fileindex_path = NULL;
2391 const struct got_error *err = NULL, *sync_err, *unlockerr;
2392 struct got_pathlist_entry *pe;
2394 err = lock_worktree(worktree, LOCK_EX);
2398 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2402 TAILQ_FOREACH(pe, ondisk_paths, entry) {
2404 err = got_path_skip_common_ancestor(&relpath,
2405 got_worktree_get_root_path(worktree), pe->path);
2408 err = schedule_for_deletion(pe->path, fileindex, relpath,
2409 delete_local_mods, status_cb, status_arg, repo);
2414 sync_err = sync_fileindex(fileindex, fileindex_path);
2415 if (sync_err && err == NULL)
2418 free(fileindex_path);
2420 got_fileindex_free(fileindex);
2421 unlockerr = lock_worktree(worktree, LOCK_SH);
2422 if (unlockerr && err == NULL)
2427 static const struct got_error *
2428 revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2429 const char *ondisk_path,
2430 got_worktree_checkout_cb progress_cb, void *progress_arg,
2431 struct got_repository *repo)
2433 const struct got_error *err = NULL;
2434 char *relpath = NULL, *parent_path = NULL;
2435 struct got_fileindex_entry *ie;
2436 struct got_tree_object *tree = NULL;
2437 struct got_object_id *tree_id = NULL;
2438 const struct got_tree_entry *te;
2439 char *tree_path = NULL, *te_name;
2440 struct got_blob_object *blob = NULL;
2441 unsigned char status;
2444 err = got_path_skip_common_ancestor(&relpath,
2445 got_worktree_get_root_path(worktree), ondisk_path);
2449 ie = got_fileindex_entry_get(fileindex, relpath);
2451 err = got_error(GOT_ERR_BAD_PATH);
2455 /* Construct in-repository path of tree which contains this blob. */
2456 err = got_path_dirname(&parent_path, ie->path);
2458 if (err->code != GOT_ERR_BAD_PATH)
2460 parent_path = strdup("/");
2461 if (parent_path == NULL) {
2462 err = got_error_from_errno("strdup");
2466 if (got_path_is_root_dir(worktree->path_prefix)) {
2467 tree_path = strdup(parent_path);
2468 if (tree_path == NULL) {
2469 err = got_error_from_errno("strdup");
2473 if (got_path_is_root_dir(parent_path)) {
2474 tree_path = strdup(worktree->path_prefix);
2475 if (tree_path == NULL) {
2476 err = got_error_from_errno("strdup");
2480 if (asprintf(&tree_path, "%s/%s",
2481 worktree->path_prefix, parent_path) == -1) {
2482 err = got_error_from_errno("asprintf");
2488 err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2493 err = got_object_open_as_tree(&tree, repo, tree_id);
2497 te_name = basename(ie->path);
2498 if (te_name == NULL) {
2499 err = got_error_from_errno2("basename", ie->path);
2503 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2507 te = got_object_tree_find_entry(tree, te_name);
2508 if (te == NULL && status != GOT_STATUS_ADD) {
2509 err = got_error(GOT_ERR_NO_TREE_ENTRY);
2514 case GOT_STATUS_ADD:
2515 (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2516 got_fileindex_entry_remove(fileindex, ie);
2518 case GOT_STATUS_DELETE:
2519 case GOT_STATUS_MODIFY:
2520 case GOT_STATUS_CONFLICT:
2521 case GOT_STATUS_MISSING: {
2522 struct got_object_id id;
2523 memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2524 err = got_object_open_as_blob(&blob, repo, &id, 8192);
2527 err = install_blob(worktree, ondisk_path, ie->path,
2528 te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2532 if (status == GOT_STATUS_DELETE) {
2533 err = update_blob_fileindex_entry(worktree,
2534 fileindex, ie, ondisk_path, ie->path, blob, 1);
2548 got_object_blob_close(blob);
2550 got_object_tree_close(tree);
2555 const struct got_error *
2556 got_worktree_revert(struct got_worktree *worktree,
2557 struct got_pathlist_head *ondisk_paths,
2558 got_worktree_checkout_cb progress_cb, void *progress_arg,
2559 struct got_repository *repo)
2561 struct got_fileindex *fileindex = NULL;
2562 char *fileindex_path = NULL;
2563 const struct got_error *err = NULL, *unlockerr = NULL;
2564 const struct got_error *sync_err = NULL;
2565 struct got_pathlist_entry *pe;
2567 err = lock_worktree(worktree, LOCK_EX);
2571 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2575 TAILQ_FOREACH(pe, ondisk_paths, entry) {
2576 err = revert_file(worktree, fileindex, pe->path,
2577 progress_cb, progress_arg, repo);
2581 sync_err = sync_fileindex(fileindex, fileindex_path);
2582 if (sync_err && err == NULL)
2585 free(fileindex_path);
2587 got_fileindex_free(fileindex);
2588 unlockerr = lock_worktree(worktree, LOCK_SH);
2589 if (unlockerr && err == NULL)
2595 free_commitable(struct got_commitable *ct)
2598 free(ct->in_repo_path);
2599 free(ct->ondisk_path);
2601 free(ct->base_blob_id);
2602 free(ct->base_commit_id);
2606 struct collect_commitables_arg {
2607 struct got_pathlist_head *commitable_paths;
2608 struct got_repository *repo;
2609 struct got_worktree *worktree;
2612 static const struct got_error *
2613 collect_commitables(void *arg, unsigned char status, const char *relpath,
2614 struct got_object_id *blob_id, struct got_object_id *commit_id)
2616 struct collect_commitables_arg *a = arg;
2617 const struct got_error *err = NULL;
2618 struct got_commitable *ct = NULL;
2619 struct got_pathlist_entry *new = NULL;
2620 char *parent_path = NULL, *path = NULL;
2623 if (status == GOT_STATUS_CONFLICT)
2624 return got_error(GOT_ERR_COMMIT_CONFLICT);
2626 if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2627 status != GOT_STATUS_DELETE)
2630 if (asprintf(&path, "/%s", relpath) == -1) {
2631 err = got_error_from_errno("asprintf");
2634 if (strcmp(path, "/") == 0) {
2635 parent_path = strdup("");
2636 if (parent_path == NULL)
2637 return got_error_from_errno("strdup");
2639 err = got_path_dirname(&parent_path, path);
2644 ct = calloc(1, sizeof(*ct));
2646 err = got_error_from_errno("calloc");
2650 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2652 err = got_error_from_errno("asprintf");
2655 if (status == GOT_STATUS_DELETE) {
2656 sb.st_mode = GOT_DEFAULT_FILE_MODE;
2658 if (lstat(ct->ondisk_path, &sb) != 0) {
2659 err = got_error_from_errno2("lstat", ct->ondisk_path);
2662 ct->mode = sb.st_mode;
2665 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2666 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2668 err = got_error_from_errno("asprintf");
2672 ct->status = status;
2673 ct->blob_id = NULL; /* will be filled in when blob gets created */
2674 if (ct->status != GOT_STATUS_ADD) {
2675 ct->base_blob_id = got_object_id_dup(blob_id);
2676 if (ct->base_blob_id == NULL) {
2677 err = got_error_from_errno("got_object_id_dup");
2680 ct->base_commit_id = got_object_id_dup(commit_id);
2681 if (ct->base_commit_id == NULL) {
2682 err = got_error_from_errno("got_object_id_dup");
2686 ct->path = strdup(path);
2687 if (ct->path == NULL) {
2688 err = got_error_from_errno("strdup");
2691 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2693 if (ct && (err || new == NULL))
2694 free_commitable(ct);
2700 static const struct got_error *write_tree(struct got_object_id **,
2701 struct got_tree_object *, const char *, struct got_pathlist_head *,
2702 got_worktree_status_cb status_cb, void *status_arg,
2703 struct got_repository *);
2705 static const struct got_error *
2706 write_subtree(struct got_object_id **new_subtree_id,
2707 struct got_tree_entry *te, const char *parent_path,
2708 struct got_pathlist_head *commitable_paths,
2709 got_worktree_status_cb status_cb, void *status_arg,
2710 struct got_repository *repo)
2712 const struct got_error *err = NULL;
2713 struct got_tree_object *subtree;
2716 if (asprintf(&subpath, "%s%s%s", parent_path,
2717 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2718 return got_error_from_errno("asprintf");
2720 err = got_object_open_as_tree(&subtree, repo, te->id);
2724 err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2725 status_cb, status_arg, repo);
2726 got_object_tree_close(subtree);
2731 static const struct got_error *
2732 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2734 const struct got_error *err = NULL;
2735 char *ct_parent_path = NULL;
2739 if (strchr(ct->path, '/') == NULL) {
2740 *match = got_path_is_root_dir(path);
2744 err = got_path_dirname(&ct_parent_path, ct->path);
2747 *match = (strcmp(path, ct_parent_path) == 0);
2748 free(ct_parent_path);
2753 get_ct_file_mode(struct got_commitable *ct)
2755 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2758 static const struct got_error *
2759 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2760 struct got_tree_entry *te, struct got_commitable *ct)
2762 const struct got_error *err = NULL;
2766 err = got_object_tree_entry_dup(new_te, te);
2770 (*new_te)->mode = get_ct_file_mode(ct);
2772 free((*new_te)->id);
2773 (*new_te)->id = got_object_id_dup(ct->blob_id);
2774 if ((*new_te)->id == NULL) {
2775 err = got_error_from_errno("got_object_id_dup");
2779 if (err && *new_te) {
2780 got_object_tree_entry_close(*new_te);
2786 static const struct got_error *
2787 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2788 struct got_commitable *ct)
2790 const struct got_error *err = NULL;
2795 *new_te = calloc(1, sizeof(**new_te));
2796 if (*new_te == NULL)
2797 return got_error_from_errno("calloc");
2799 ct_name = basename(ct->path);
2800 if (ct_name == NULL) {
2801 err = got_error_from_errno2("basename", ct->path);
2804 (*new_te)->name = strdup(ct_name);
2805 if ((*new_te)->name == NULL) {
2806 err = got_error_from_errno("strdup");
2810 (*new_te)->mode = get_ct_file_mode(ct);
2812 (*new_te)->id = got_object_id_dup(ct->blob_id);
2813 if ((*new_te)->id == NULL) {
2814 err = got_error_from_errno("got_object_id_dup");
2818 if (err && *new_te) {
2819 got_object_tree_entry_close(*new_te);
2825 static const struct got_error *
2826 insert_tree_entry(struct got_tree_entry *new_te,
2827 struct got_pathlist_head *paths)
2829 const struct got_error *err = NULL;
2830 struct got_pathlist_entry *new_pe;
2832 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2836 return got_error(GOT_ERR_TREE_DUP_ENTRY);
2840 static const struct got_error *
2841 report_ct_status(struct got_commitable *ct,
2842 got_worktree_status_cb status_cb, void *status_arg)
2844 const char *ct_path = ct->path;
2845 while (ct_path[0] == '/')
2847 return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id, NULL);
2850 static const struct got_error *
2851 match_modified_subtree(int *modified, struct got_tree_entry *te,
2852 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2854 const struct got_error *err = NULL;
2855 struct got_pathlist_entry *pe;
2860 if (asprintf(&te_path, "%s%s%s", base_tree_path,
2861 got_path_is_root_dir(base_tree_path) ? "" : "/",
2863 return got_error_from_errno("asprintf");
2865 TAILQ_FOREACH(pe, commitable_paths, entry) {
2866 struct got_commitable *ct = pe->data;
2867 *modified = got_path_is_child(ct->in_repo_path, te_path,
2877 static const struct got_error *
2878 match_deleted_or_modified_ct(struct got_commitable **ctp,
2879 struct got_tree_entry *te, const char *base_tree_path,
2880 struct got_pathlist_head *commitable_paths)
2882 const struct got_error *err = NULL;
2883 struct got_pathlist_entry *pe;
2887 TAILQ_FOREACH(pe, commitable_paths, entry) {
2888 struct got_commitable *ct = pe->data;
2889 char *ct_name = NULL;
2892 if (ct->status != GOT_STATUS_MODIFY &&
2893 ct->status != GOT_STATUS_DELETE)
2896 if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
2899 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
2905 ct_name = basename(pe->path);
2906 if (ct_name == NULL)
2907 return got_error_from_errno2("basename", pe->path);
2909 if (strcmp(te->name, ct_name) != 0)
2919 static const struct got_error *
2920 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
2921 const char *child_path, const char *path_base_tree,
2922 struct got_pathlist_head *commitable_paths,
2923 got_worktree_status_cb status_cb, void *status_arg,
2924 struct got_repository *repo)
2926 const struct got_error *err = NULL;
2927 struct got_tree_entry *new_te;
2932 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
2933 got_path_is_root_dir(path_base_tree) ? "" : "/",
2935 return got_error_from_errno("asprintf");
2937 new_te = calloc(1, sizeof(*new_te));
2938 new_te->mode = S_IFDIR;
2939 new_te->name = strdup(child_path);
2940 if (new_te->name == NULL) {
2941 err = got_error_from_errno("strdup");
2942 got_object_tree_entry_close(new_te);
2945 err = write_tree(&new_te->id, NULL, subtree_path,
2946 commitable_paths, status_cb, status_arg, repo);
2948 got_object_tree_entry_close(new_te);
2958 static const struct got_error *
2959 write_tree(struct got_object_id **new_tree_id,
2960 struct got_tree_object *base_tree, const char *path_base_tree,
2961 struct got_pathlist_head *commitable_paths,
2962 got_worktree_status_cb status_cb, void *status_arg,
2963 struct got_repository *repo)
2965 const struct got_error *err = NULL;
2966 const struct got_tree_entries *base_entries = NULL;
2967 struct got_pathlist_head paths;
2968 struct got_tree_entries new_tree_entries;
2969 struct got_tree_entry *te, *new_te = NULL;
2970 struct got_pathlist_entry *pe;
2973 new_tree_entries.nentries = 0;
2974 SIMPLEQ_INIT(&new_tree_entries.head);
2976 /* Insert, and recurse into, newly added entries first. */
2977 TAILQ_FOREACH(pe, commitable_paths, entry) {
2978 struct got_commitable *ct = pe->data;
2979 char *child_path = NULL, *slash;
2981 if (ct->status != GOT_STATUS_ADD ||
2982 (ct->flags & GOT_COMMITABLE_ADDED))
2985 if (!got_path_is_child(pe->path, path_base_tree,
2986 strlen(path_base_tree)))
2989 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
2994 slash = strchr(child_path, '/');
2995 if (slash == NULL) {
2996 err = alloc_added_blob_tree_entry(&new_te, ct);
2999 err = report_ct_status(ct, status_cb, status_arg);
3002 ct->flags |= GOT_COMMITABLE_ADDED;
3003 err = insert_tree_entry(new_te, &paths);
3007 *slash = '\0'; /* trim trailing path components */
3008 if (base_tree == NULL ||
3009 got_object_tree_find_entry(base_tree, child_path)
3011 err = make_subtree_for_added_blob(&new_te,
3012 child_path, path_base_tree,
3013 commitable_paths, status_cb, status_arg,
3017 err = insert_tree_entry(new_te, &paths);
3025 /* Handle modified and deleted entries. */
3026 base_entries = got_object_tree_get_entries(base_tree);
3027 SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3028 struct got_commitable *ct = NULL;
3030 if (S_ISDIR(te->mode)) {
3032 err = got_object_tree_entry_dup(&new_te, te);
3035 err = match_modified_subtree(&modified, te,
3036 path_base_tree, commitable_paths);
3039 /* Avoid recursion into unmodified subtrees. */
3042 err = write_subtree(&new_te->id, te,
3043 path_base_tree, commitable_paths,
3044 status_cb, status_arg, repo);
3048 err = insert_tree_entry(new_te, &paths);
3054 err = match_deleted_or_modified_ct(&ct, te,
3055 path_base_tree, commitable_paths);
3057 /* NB: Deleted entries get dropped here. */
3058 if (ct->status == GOT_STATUS_MODIFY) {
3059 err = alloc_modified_blob_tree_entry(
3063 err = insert_tree_entry(new_te, &paths);
3067 err = report_ct_status(ct, status_cb,
3072 /* Entry is unchanged; just copy it. */
3073 err = got_object_tree_entry_dup(&new_te, te);
3076 err = insert_tree_entry(new_te, &paths);
3083 /* Write new list of entries; deleted entries have been dropped. */
3084 TAILQ_FOREACH(pe, &paths, entry) {
3085 struct got_tree_entry *te = pe->data;
3086 new_tree_entries.nentries++;
3087 SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3089 err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3091 got_object_tree_entries_close(&new_tree_entries);
3092 got_pathlist_free(&paths);
3096 static const struct got_error *
3097 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3098 struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3100 const struct got_error *err = NULL;
3101 struct got_pathlist_entry *pe;
3103 TAILQ_FOREACH(pe, commitable_paths, entry) {
3104 struct got_fileindex_entry *ie;
3105 struct got_commitable *ct = pe->data;
3107 ie = got_fileindex_entry_get(fileindex, pe->path);
3109 if (ct->status == GOT_STATUS_DELETE) {
3110 got_fileindex_entry_remove(fileindex, ie);
3111 got_fileindex_entry_free(ie);
3113 err = got_fileindex_entry_update(ie,
3114 ct->ondisk_path, ct->blob_id->sha1,
3115 new_base_commit_id->sha1, 1);
3117 err = got_fileindex_entry_alloc(&ie,
3118 ct->ondisk_path, pe->path, ct->blob_id->sha1,
3119 new_base_commit_id->sha1);
3122 err = got_fileindex_entry_add(fileindex, ie);
3130 static const struct got_error *
3131 check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3132 struct got_object_id *head_commit_id)
3134 const struct got_error *err = NULL;
3135 struct got_object_id *id_in_head = NULL, *id = NULL;
3136 struct got_commit_object *commit = NULL;
3138 const char *ct_path = ct->in_repo_path;
3140 while (ct_path[0] == '/')
3144 * Ensure that no modifications were made to files *and their parents*
3145 * in commits between the file's base commit and the branch head.
3147 * Checking the parents is important for detecting conflicting tree
3148 * configurations (files or parent folders might have been moved,
3149 * deleted, added again, etc.). Such changes need to be merged with
3150 * local changes before a commit can occur.
3152 * The implication is that the file's (parent) entry in the root
3153 * directory must have the same ID in all relevant commits.
3155 if (ct->status != GOT_STATUS_ADD) {
3156 struct got_object_qid *pid;
3158 struct got_object_id *root_entry_id = NULL;
3160 /* Trivial case: base commit == head commit */
3161 if (got_object_id_cmp(ct->base_commit_id, head_commit_id) == 0)
3164 /* Compute the path to the root directory's entry. */
3165 path = strdup(ct_path);
3167 err = got_error_from_errno("strdup");
3170 slash = strchr(path, '/');
3174 err = got_object_open_as_commit(&commit, repo, head_commit_id);
3178 err = got_object_id_by_path(&root_entry_id, repo,
3179 head_commit_id, path);
3183 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3185 struct got_commit_object *pcommit;
3187 err = got_object_id_by_path(&id, repo, pid->id, path);
3189 if (err->code != GOT_ERR_NO_TREE_ENTRY)
3195 err = got_object_id_by_path(&id, repo, pid->id, path);
3199 if (got_object_id_cmp(id, root_entry_id) != 0) {
3200 err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3204 if (got_object_id_cmp(pid->id, ct->base_commit_id) == 0)
3205 break; /* all relevant commits scanned */
3207 err = got_object_open_as_commit(&pcommit, repo,
3212 got_object_commit_close(commit);
3214 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(
3218 /* Require that added files don't exist in the branch head. */
3219 err = got_object_id_by_path(&id_in_head, repo, head_commit_id,
3221 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3223 err = id_in_head ? got_error(GOT_ERR_COMMIT_OUT_OF_DATE) : NULL;
3227 got_object_commit_close(commit);
3234 const struct got_error *
3235 commit_worktree(struct got_object_id **new_commit_id,
3236 struct got_pathlist_head *commitable_paths,
3237 struct got_object_id *head_commit_id, struct got_worktree *worktree,
3238 const char *ondisk_path, const char *author, const char *committer,
3239 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3240 got_worktree_status_cb status_cb, void *status_arg,
3241 struct got_repository *repo)
3243 const struct got_error *err = NULL, *unlockerr = NULL;
3244 struct got_pathlist_entry *pe;
3245 const char *head_ref_name = NULL;
3246 struct got_commit_object *head_commit = NULL;
3247 struct got_reference *head_ref2 = NULL;
3248 struct got_object_id *head_commit_id2 = NULL;
3249 struct got_tree_object *head_tree = NULL;
3250 struct got_object_id *new_tree_id = NULL;
3251 struct got_object_id_queue parent_ids;
3252 struct got_object_qid *pid = NULL;
3253 char *logmsg = NULL;
3255 *new_commit_id = NULL;
3257 SIMPLEQ_INIT(&parent_ids);
3259 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3263 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3267 if (commit_msg_cb != NULL) {
3268 err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3273 if (logmsg == NULL || strlen(logmsg) == 0) {
3274 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3278 /* Create blobs from added and modified files and record their IDs. */
3279 TAILQ_FOREACH(pe, commitable_paths, entry) {
3280 struct got_commitable *ct = pe->data;
3283 if (ct->status != GOT_STATUS_ADD &&
3284 ct->status != GOT_STATUS_MODIFY)
3287 if (asprintf(&ondisk_path, "%s/%s",
3288 worktree->root_path, pe->path) == -1) {
3289 err = got_error_from_errno("asprintf");
3292 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3298 /* Recursively write new tree objects. */
3299 err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3300 status_cb, status_arg, repo);
3304 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3307 SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3308 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3309 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3310 got_object_qid_free(pid);
3316 /* Check if a concurrent commit to our branch has occurred. */
3317 head_ref_name = got_worktree_get_head_ref_name(worktree);
3318 if (head_ref_name == NULL) {
3319 err = got_error_from_errno("got_worktree_get_head_ref_name");
3322 /* Lock the reference here to prevent concurrent modification. */
3323 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3326 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3329 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3330 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3333 /* Update branch head in repository. */
3334 err = got_ref_change_ref(head_ref2, *new_commit_id);
3337 err = got_ref_write(head_ref2, repo);
3341 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3345 err = ref_base_commit(worktree, repo);
3350 got_object_tree_close(head_tree);
3352 got_object_commit_close(head_commit);
3353 free(head_commit_id2);
3355 unlockerr = got_ref_unlock(head_ref2);
3356 if (unlockerr && err == NULL)
3358 got_ref_close(head_ref2);
3363 const struct got_error *
3364 got_worktree_commit(struct got_object_id **new_commit_id,
3365 struct got_worktree *worktree, const char *ondisk_path,
3366 const char *author, const char *committer,
3367 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3368 got_worktree_status_cb status_cb, void *status_arg,
3369 struct got_repository *repo)
3371 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3372 struct got_fileindex *fileindex = NULL;
3373 char *fileindex_path = NULL, *relpath = NULL;
3374 struct got_pathlist_head commitable_paths;
3375 struct collect_commitables_arg cc_arg;
3376 struct got_pathlist_entry *pe;
3377 struct got_reference *head_ref = NULL;
3378 struct got_object_id *head_commit_id = NULL;
3380 *new_commit_id = NULL;
3382 TAILQ_INIT(&commitable_paths);
3384 err = lock_worktree(worktree, LOCK_EX);
3388 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3392 err = got_ref_resolve(&head_commit_id, repo, head_ref);
3397 err = got_path_skip_common_ancestor(&relpath,
3398 worktree->root_path, ondisk_path);
3403 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3407 cc_arg.commitable_paths = &commitable_paths;
3408 cc_arg.worktree = worktree;
3410 err = worktree_status(worktree, relpath ? relpath : "",
3411 fileindex, repo, collect_commitables, &cc_arg, NULL, NULL);
3415 if (TAILQ_EMPTY(&commitable_paths)) {
3416 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3420 TAILQ_FOREACH(pe, &commitable_paths, entry) {
3421 struct got_commitable *ct = pe->data;
3422 err = check_ct_out_of_date(ct, repo, head_commit_id);
3427 err = commit_worktree(new_commit_id, &commitable_paths,
3428 head_commit_id, worktree, ondisk_path, author, committer,
3429 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3433 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3435 sync_err = sync_fileindex(fileindex, fileindex_path);
3436 if (sync_err && err == NULL)
3440 got_fileindex_free(fileindex);
3441 free(fileindex_path);
3443 unlockerr = lock_worktree(worktree, LOCK_SH);
3444 if (unlockerr && err == NULL)
3446 TAILQ_FOREACH(pe, &commitable_paths, entry) {
3447 struct got_commitable *ct = pe->data;
3448 free_commitable(ct);
3450 got_pathlist_free(&commitable_paths);
3455 got_commitable_get_path(struct got_commitable *ct)
3461 got_commitable_get_status(struct got_commitable *ct)
3466 struct check_rebase_ok_arg {
3467 struct got_worktree *worktree;
3468 struct got_repository *repo;
3469 int rebase_in_progress;
3472 static const struct got_error *
3473 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3475 const struct got_error *err = NULL;
3476 struct check_rebase_ok_arg *a = arg;
3477 unsigned char status;
3481 if (!a->rebase_in_progress) {
3482 /* Reject rebase of a work tree with mixed base commits. */
3483 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3484 SHA1_DIGEST_LENGTH))
3485 return got_error(GOT_ERR_MIXED_COMMITS);
3488 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3490 return got_error_from_errno("asprintf");
3492 /* Reject rebase of a work tree with modified or conflicted files. */
3493 err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3498 if (a->rebase_in_progress) {
3499 if (status == GOT_STATUS_CONFLICT)
3500 return got_error(GOT_ERR_CONFLICTS);
3501 } else if (status != GOT_STATUS_NO_CHANGE)
3502 return got_error(GOT_ERR_MODIFIED);
3507 const struct got_error *
3508 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3509 struct got_reference **tmp_branch, struct got_worktree *worktree,
3510 struct got_reference *branch, struct got_repository *repo)
3512 const struct got_error *err = NULL;
3513 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3514 char *branch_ref_name = NULL;
3515 struct got_fileindex *fileindex = NULL;
3516 char *fileindex_path = NULL;
3517 struct check_rebase_ok_arg ok_arg;
3518 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3520 *new_base_branch_ref = NULL;
3523 err = lock_worktree(worktree, LOCK_EX);
3527 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3531 ok_arg.worktree = worktree;
3533 ok_arg.rebase_in_progress = 0;
3534 err = got_fileindex_for_each_entry_safe(fileindex, check_rebase_ok,
3539 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3543 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3547 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3551 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3556 err = got_ref_alloc_symref(new_base_branch_ref,
3557 new_base_branch_ref_name, wt_branch);
3560 err = got_ref_write(*new_base_branch_ref, repo);
3564 /* TODO Lock original branch's ref while rebasing? */
3566 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3570 err = got_ref_write(branch_ref, repo);
3574 err = got_ref_alloc(tmp_branch, tmp_branch_name,
3575 worktree->base_commit_id);
3578 err = got_ref_write(*tmp_branch, repo);
3582 err = got_worktree_set_head_ref(worktree, *tmp_branch);
3586 free(fileindex_path);
3588 got_fileindex_free(fileindex);
3589 free(tmp_branch_name);
3590 free(new_base_branch_ref_name);
3591 free(branch_ref_name);
3593 got_ref_close(branch_ref);
3595 got_ref_close(wt_branch);
3597 if (*new_base_branch_ref) {
3598 got_ref_close(*new_base_branch_ref);
3599 *new_base_branch_ref = NULL;
3602 got_ref_close(*tmp_branch);
3605 lock_worktree(worktree, LOCK_SH);
3610 const struct got_error *
3611 got_worktree_rebase_continue(struct got_object_id **commit_id,
3612 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3613 struct got_reference **branch, struct got_worktree *worktree,
3614 struct got_repository *repo)
3616 const struct got_error *err;
3617 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3618 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3619 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3623 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3627 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3631 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3635 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3639 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
3643 err = got_ref_open(branch, repo,
3644 got_ref_get_symref_target(branch_ref), 0);
3648 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3652 err = got_ref_resolve(commit_id, repo, commit_ref);
3656 err = got_ref_open(new_base_branch, repo,
3657 new_base_branch_ref_name, 0);
3661 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
3665 free(commit_ref_name);
3666 free(branch_ref_name);
3668 got_ref_close(commit_ref);
3670 got_ref_close(branch_ref);
3675 got_ref_close(*tmp_branch);
3678 if (*new_base_branch) {
3679 got_ref_close(*new_base_branch);
3680 *new_base_branch = NULL;
3683 got_ref_close(*branch);
3690 const struct got_error *
3691 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
3693 const struct got_error *err;
3694 char *tmp_branch_name = NULL;
3696 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3700 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
3701 free(tmp_branch_name);
3705 static const struct got_error *
3706 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
3707 char **logmsg, void *arg)
3709 struct got_commit_object *commit = arg;
3711 *logmsg = strdup(got_object_commit_get_logmsg(commit));
3712 if (*logmsg == NULL)
3713 return got_error_from_errno("strdup");
3718 static const struct got_error *
3719 rebase_status(void *arg, unsigned char status, const char *path,
3720 struct got_object_id *blob_id, struct got_object_id *commit_id)
3725 const struct got_error *
3726 got_worktree_rebase_merge_files(struct got_worktree *worktree,
3727 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
3728 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3729 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3731 const struct got_error *err;
3732 struct got_fileindex *fileindex;
3733 char *fileindex_path, *commit_ref_name = NULL;
3734 struct got_reference *commit_ref = NULL;
3736 /* Work tree is locked/unlocked during rebase preparation/teardown. */
3738 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3742 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3745 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3747 if (err->code != GOT_ERR_NOT_REF)
3749 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
3752 err = got_ref_write(commit_ref, repo);
3756 struct got_object_id *stored_id;
3759 err = got_ref_resolve(&stored_id, repo, commit_ref);
3762 cmp = got_object_id_cmp(commit_id, stored_id);
3765 err = got_error(GOT_ERR_REBASE_COMMITID);
3770 err = merge_files(worktree, fileindex, fileindex_path,
3771 parent_commit_id, commit_id, repo, progress_cb, progress_arg,
3772 cancel_cb, cancel_arg);
3774 got_fileindex_free(fileindex);
3775 free(fileindex_path);
3777 got_ref_close(commit_ref);
3781 const struct got_error *
3782 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
3783 struct got_worktree *worktree, struct got_reference *tmp_branch,
3784 struct got_commit_object *orig_commit,
3785 struct got_object_id *orig_commit_id, struct got_repository *repo)
3787 const struct got_error *err, *sync_err;
3788 struct got_pathlist_head commitable_paths;
3789 struct collect_commitables_arg cc_arg;
3790 struct got_fileindex *fileindex = NULL;
3791 char *fileindex_path = NULL, *commit_ref_name = NULL;
3792 struct got_reference *head_ref = NULL;
3793 struct got_object_id *head_commit_id = NULL;
3794 struct got_reference *commit_ref = NULL;
3795 struct got_object_id *commit_id = NULL;
3797 TAILQ_INIT(&commitable_paths);
3799 /* Work tree is locked/unlocked during rebase preparation/teardown. */
3801 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3804 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3807 err = got_ref_resolve(&commit_id, repo, commit_ref);
3810 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
3811 err = got_error(GOT_ERR_REBASE_COMMITID);
3815 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3819 cc_arg.commitable_paths = &commitable_paths;
3820 cc_arg.worktree = worktree;
3822 err = worktree_status(worktree, "", fileindex, repo,
3823 collect_commitables, &cc_arg, NULL, NULL);
3827 if (TAILQ_EMPTY(&commitable_paths)) {
3828 /* No-op change; commit will be elided. */
3829 err = got_ref_delete(commit_ref, repo);
3832 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3836 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3840 err = got_ref_resolve(&head_commit_id, repo, head_ref);
3844 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
3845 worktree, NULL, got_object_commit_get_author(orig_commit),
3846 got_object_commit_get_committer(orig_commit),
3847 collect_rebase_commit_msg, orig_commit,
3848 rebase_status, NULL, repo);
3852 err = got_ref_change_ref(tmp_branch, *new_commit_id);
3856 err = got_ref_delete(commit_ref, repo);
3860 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3862 sync_err = sync_fileindex(fileindex, fileindex_path);
3863 if (sync_err && err == NULL)
3867 got_fileindex_free(fileindex);
3868 free(fileindex_path);
3869 free(commit_ref_name);
3871 got_ref_close(commit_ref);
3872 free(head_commit_id);
3874 got_ref_close(head_ref);
3876 free(*new_commit_id);
3877 *new_commit_id = NULL;
3882 const struct got_error *
3883 got_worktree_rebase_postpone(struct got_worktree *worktree)
3885 return lock_worktree(worktree, LOCK_SH);
3888 static const struct got_error *
3889 delete_ref(const char *name, struct got_repository *repo)
3891 const struct got_error *err;
3892 struct got_reference *ref;
3894 err = got_ref_open(&ref, repo, name, 0);
3896 if (err->code == GOT_ERR_NOT_REF)
3901 err = got_ref_delete(ref, repo);
3906 static const struct got_error *
3907 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
3909 const struct got_error *err;
3910 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3911 char *branch_ref_name = NULL, *commit_ref_name = NULL;
3913 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3916 err = delete_ref(tmp_branch_name, repo);
3920 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3923 err = delete_ref(new_base_branch_ref_name, repo);
3927 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3930 err = delete_ref(branch_ref_name, repo);
3934 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3937 err = delete_ref(commit_ref_name, repo);
3942 free(tmp_branch_name);
3943 free(new_base_branch_ref_name);
3944 free(branch_ref_name);
3945 free(commit_ref_name);
3949 const struct got_error *
3950 got_worktree_rebase_complete(struct got_worktree *worktree,
3951 struct got_reference *new_base_branch, struct got_reference *tmp_branch,
3952 struct got_reference *rebased_branch,
3953 struct got_repository *repo)
3955 const struct got_error *err, *unlockerr;
3956 struct got_object_id *new_head_commit_id = NULL;
3958 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
3962 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
3966 err = got_ref_write(rebased_branch, repo);
3970 err = got_worktree_set_head_ref(worktree, rebased_branch);
3974 err = delete_rebase_refs(worktree, repo);
3976 free(new_head_commit_id);
3977 unlockerr = lock_worktree(worktree, LOCK_SH);
3978 if (unlockerr && err == NULL)
3983 struct collect_revertible_paths_arg {
3984 struct got_pathlist_head *revertible_paths;
3985 struct got_worktree *worktree;
3988 static const struct got_error *
3989 collect_revertible_paths(void *arg, unsigned char status, const char *relpath,
3990 struct got_object_id *blob_id, struct got_object_id *commit_id)
3992 struct collect_revertible_paths_arg *a = arg;
3993 const struct got_error *err = NULL;
3994 struct got_pathlist_entry *new = NULL;
3997 if (status != GOT_STATUS_ADD &&
3998 status != GOT_STATUS_DELETE &&
3999 status != GOT_STATUS_MODIFY &&
4000 status != GOT_STATUS_CONFLICT &&
4001 status != GOT_STATUS_MISSING)
4004 if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
4005 return got_error_from_errno("asprintf");
4007 err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
4008 if (err || new == NULL)
4013 const struct got_error *
4014 got_worktree_rebase_abort(struct got_worktree *worktree,
4015 struct got_repository *repo, struct got_reference *new_base_branch,
4016 got_worktree_checkout_cb progress_cb, void *progress_arg)
4018 const struct got_error *err, *unlockerr, *sync_err;
4019 struct got_reference *resolved = NULL;
4020 struct got_object_id *commit_id = NULL;
4021 struct got_fileindex *fileindex = NULL;
4022 char *fileindex_path = NULL;
4023 struct got_pathlist_head revertible_paths;
4024 struct got_pathlist_entry *pe;
4025 struct collect_revertible_paths_arg crp_arg;
4026 struct got_object_id *tree_id = NULL;
4028 TAILQ_INIT(&revertible_paths);
4030 err = lock_worktree(worktree, LOCK_EX);
4034 err = got_ref_open(&resolved, repo,
4035 got_ref_get_symref_target(new_base_branch), 0);
4039 err = got_worktree_set_head_ref(worktree, resolved);
4044 * XXX commits to the base branch could have happened while
4045 * we were busy rebasing; should we store the original commit ID
4046 * when rebase begins and read it back here?
4048 err = got_ref_resolve(&commit_id, repo, resolved);
4052 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4056 err = got_object_id_by_path(&tree_id, repo,
4057 worktree->base_commit_id, worktree->path_prefix);
4061 err = delete_rebase_refs(worktree, repo);
4065 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4069 crp_arg.revertible_paths = &revertible_paths;
4070 crp_arg.worktree = worktree;
4071 err = worktree_status(worktree, "", fileindex, repo,
4072 collect_revertible_paths, &crp_arg, NULL, NULL);
4076 TAILQ_FOREACH(pe, &revertible_paths, entry) {
4077 err = revert_file(worktree, fileindex, pe->path,
4078 progress_cb, progress_arg, repo);
4083 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4084 repo, progress_cb, progress_arg, NULL, NULL);
4086 sync_err = sync_fileindex(fileindex, fileindex_path);
4087 if (sync_err && err == NULL)
4090 got_ref_close(resolved);
4094 got_fileindex_free(fileindex);
4095 free(fileindex_path);
4096 TAILQ_FOREACH(pe, &revertible_paths, entry)
4097 free((char *)pe->path);
4098 got_pathlist_free(&revertible_paths);
4100 unlockerr = lock_worktree(worktree, LOCK_SH);
4101 if (unlockerr && err == NULL)