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 err = (*progress_cb)(progress_arg,
807 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
811 if (fsync(merged_fd) != 0) {
812 err = got_error_from_errno("fsync");
816 /* Check if a clean merge has subsumed all local changes. */
817 if (overlapcnt == 0) {
818 err = check_files_equal(local_changes_subsumed, blob_deriv_path,
824 if (chmod(merged_path, st_mode) != 0) {
825 err = got_error_from_errno2("chmod", merged_path);
829 if (rename(merged_path, ondisk_path) != 0) {
830 err = got_error_from_errno3("rename", merged_path,
837 if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
838 err = got_error_from_errno("close");
839 if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
840 err = got_error_from_errno("fclose");
841 if (f_orig && fclose(f_orig) != 0 && err == NULL)
842 err = got_error_from_errno("fclose");
845 if (blob_deriv_path) {
846 unlink(blob_deriv_path);
847 free(blob_deriv_path);
849 if (blob_orig_path) {
850 unlink(blob_orig_path);
851 free(blob_orig_path);
858 static const struct got_error *
859 update_blob_fileindex_entry(struct got_worktree *worktree,
860 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
861 const char *ondisk_path, const char *path, struct got_blob_object *blob,
862 int update_timestamps)
864 const struct got_error *err = NULL;
867 ie = got_fileindex_entry_get(fileindex, path);
869 err = got_fileindex_entry_update(ie, ondisk_path,
870 blob->id.sha1, worktree->base_commit_id->sha1,
873 struct got_fileindex_entry *new_ie;
874 err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
875 path, blob->id.sha1, worktree->base_commit_id->sha1);
877 err = got_fileindex_entry_add(fileindex, new_ie);
882 static const struct got_error *
883 install_blob(struct got_worktree *worktree, const char *ondisk_path,
884 const char *path, uint16_t te_mode, uint16_t st_mode,
885 struct got_blob_object *blob, int restoring_missing_file,
886 int reverting_versioned_file, struct got_repository *repo,
887 got_worktree_checkout_cb progress_cb, void *progress_arg)
889 const struct got_error *err = NULL;
893 char *tmppath = NULL;
895 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
896 GOT_DEFAULT_FILE_MODE);
898 if (errno == ENOENT) {
899 char *parent = dirname(path);
901 return got_error_from_errno2("dirname", path);
902 err = add_dir_on_disk(worktree, parent);
905 fd = open(ondisk_path,
906 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
907 GOT_DEFAULT_FILE_MODE);
909 return got_error_from_errno2("open",
911 } else if (errno == EEXIST) {
912 if (!S_ISREG(st_mode)) {
913 /* TODO file is obstructed; do something */
914 err = got_error(GOT_ERR_FILE_OBSTRUCTED);
917 err = got_opentemp_named_fd(&tmppath, &fd,
924 return got_error_from_errno2("open", ondisk_path);
927 if (restoring_missing_file)
928 err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
929 else if (reverting_versioned_file)
930 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
932 err = (*progress_cb)(progress_arg,
933 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
937 hdrlen = got_object_blob_get_hdrlen(blob);
939 const uint8_t *buf = got_object_blob_get_read_buf(blob);
940 err = got_object_blob_read_block(&len, blob);
944 /* Skip blob object header first time around. */
945 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
947 err = got_error_from_errno("write");
949 } else if (outlen != len - hdrlen) {
950 err = got_error(GOT_ERR_IO);
957 if (fsync(fd) != 0) {
958 err = got_error_from_errno("fsync");
963 if (rename(tmppath, ondisk_path) != 0) {
964 err = got_error_from_errno3("rename", tmppath,
971 if (te_mode & S_IXUSR) {
972 if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
973 err = got_error_from_errno2("chmod", ondisk_path);
977 if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
978 err = got_error_from_errno2("chmod", ondisk_path);
984 if (fd != -1 && close(fd) != 0 && err == NULL)
985 err = got_error_from_errno("close");
990 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
991 static const struct got_error *
992 get_modified_file_content_status(unsigned char *status, FILE *f)
994 const struct got_error *err = NULL;
995 const char *markers[3] = {
996 GOT_DIFF_CONFLICT_MARKER_BEGIN,
997 GOT_DIFF_CONFLICT_MARKER_SEP,
998 GOT_DIFF_CONFLICT_MARKER_END
1003 const char delim[3] = {'\0', '\0', '\0'};
1005 while (*status == GOT_STATUS_MODIFY) {
1006 line = fparseln(f, &len, NULL, delim, 0);
1010 err = got_ferror(f, GOT_ERR_IO);
1014 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1015 if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1017 *status = GOT_STATUS_CONFLICT;
1027 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1029 return !(ie->ctime_sec == sb->st_ctime &&
1030 ie->ctime_nsec == sb->st_ctimensec &&
1031 ie->mtime_sec == sb->st_mtime &&
1032 ie->mtime_nsec == sb->st_mtimensec &&
1033 ie->size == (sb->st_size & 0xffffffff));
1036 static const struct got_error *
1037 get_file_status(unsigned char *status, struct stat *sb,
1038 struct got_fileindex_entry *ie, const char *abspath,
1039 struct got_repository *repo)
1041 const struct got_error *err = NULL;
1042 struct got_object_id id;
1046 struct got_blob_object *blob = NULL;
1049 *status = GOT_STATUS_NO_CHANGE;
1051 if (lstat(abspath, sb) == -1) {
1052 if (errno == ENOENT) {
1054 if (got_fileindex_entry_has_file_on_disk(ie))
1055 *status = GOT_STATUS_MISSING;
1057 *status = GOT_STATUS_DELETE;
1059 ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1060 & (S_IRWXU | S_IRWXG | S_IRWXO));
1062 sb->st_mode = GOT_DEFAULT_FILE_MODE;
1065 return got_error_from_errno2("lstat", abspath);
1068 if (!S_ISREG(sb->st_mode)) {
1069 *status = GOT_STATUS_OBSTRUCTED;
1076 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1077 *status = GOT_STATUS_DELETE;
1079 } else if (!got_fileindex_entry_has_blob(ie)) {
1080 *status = GOT_STATUS_ADD;
1084 if (!stat_info_differs(ie, sb))
1087 memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1088 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1092 f = fopen(abspath, "r");
1094 err = got_error_from_errno2("fopen", abspath);
1097 hdrlen = got_object_blob_get_hdrlen(blob);
1099 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1100 err = got_object_blob_read_block(&blen, blob);
1103 /* Skip length of blob object header first time around. */
1104 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1105 if (flen == 0 && ferror(f)) {
1106 err = got_error_from_errno("fread");
1111 *status = GOT_STATUS_MODIFY;
1113 } else if (flen == 0) {
1115 *status = GOT_STATUS_MODIFY;
1117 } else if (blen - hdrlen == flen) {
1118 /* Skip blob object header first time around. */
1119 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1120 *status = GOT_STATUS_MODIFY;
1124 *status = GOT_STATUS_MODIFY;
1130 if (*status == GOT_STATUS_MODIFY) {
1132 err = get_modified_file_content_status(status, f);
1136 got_object_blob_close(blob);
1143 * Update timestamps in the file index if a file is unmodified and
1144 * we had to run a full content comparison to find out.
1146 static const struct got_error *
1147 sync_timestamps(char *ondisk_path, unsigned char status,
1148 struct got_fileindex_entry *ie, struct stat *sb)
1150 if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1151 return got_fileindex_entry_update(ie, ondisk_path,
1152 ie->blob_sha1, ie->commit_sha1, 1);
1157 static const struct got_error *
1158 update_blob(struct got_worktree *worktree,
1159 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1160 struct got_tree_entry *te, const char *path,
1161 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1164 const struct got_error *err = NULL;
1165 struct got_blob_object *blob = NULL;
1167 unsigned char status = GOT_STATUS_NO_CHANGE;
1170 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1171 return got_error_from_errno("asprintf");
1173 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1177 if (status == GOT_STATUS_OBSTRUCTED) {
1178 err = (*progress_cb)(progress_arg, status, path);
1182 if (ie && status != GOT_STATUS_MISSING) {
1183 if (got_fileindex_entry_has_commit(ie) &&
1184 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1185 SHA1_DIGEST_LENGTH) == 0) {
1186 err = sync_timestamps(ondisk_path, status, ie, &sb);
1189 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1193 if (got_fileindex_entry_has_blob(ie) &&
1194 memcmp(ie->blob_sha1, te->id->sha1,
1195 SHA1_DIGEST_LENGTH) == 0) {
1196 err = sync_timestamps(ondisk_path, status, ie, &sb);
1201 err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1205 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1206 int update_timestamps;
1207 struct got_blob_object *blob2 = NULL;
1208 if (got_fileindex_entry_has_blob(ie)) {
1209 struct got_object_id id2;
1210 memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1211 err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1215 err = merge_blob(&update_timestamps, worktree, blob2,
1216 ondisk_path, path, sb.st_mode, blob,
1217 worktree->base_commit_id, repo,
1218 progress_cb, progress_arg);
1220 got_object_blob_close(blob2);
1222 * Do not update timestamps of files with local changes.
1223 * Otherwise, a future status walk would treat them as
1224 * unmodified files again.
1226 err = got_fileindex_entry_update(ie, ondisk_path,
1227 blob->id.sha1, worktree->base_commit_id->sha1,
1229 } else if (status == GOT_STATUS_DELETE) {
1230 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1233 err = update_blob_fileindex_entry(worktree, fileindex, ie,
1234 ondisk_path, path, blob, 0);
1238 err = install_blob(worktree, ondisk_path, path, te->mode,
1239 sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1240 repo, progress_cb, progress_arg);
1243 err = update_blob_fileindex_entry(worktree, fileindex, ie,
1244 ondisk_path, path, blob, 1);
1248 got_object_blob_close(blob);
1254 static const struct got_error *
1255 remove_ondisk_file(const char *root_path, const char *path)
1257 const struct got_error *err = NULL;
1258 char *ondisk_path = NULL;
1260 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1261 return got_error_from_errno("asprintf");
1263 if (unlink(ondisk_path) == -1) {
1264 if (errno != ENOENT)
1265 err = got_error_from_errno2("unlink", ondisk_path);
1267 char *parent = dirname(ondisk_path);
1268 while (parent && strcmp(parent, root_path) != 0) {
1269 if (rmdir(parent) == -1) {
1270 if (errno != ENOTEMPTY)
1271 err = got_error_from_errno2("rmdir",
1275 parent = dirname(parent);
1282 static const struct got_error *
1283 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1284 struct got_fileindex_entry *ie, struct got_repository *repo,
1285 got_worktree_checkout_cb progress_cb, void *progress_arg)
1287 const struct got_error *err = NULL;
1288 unsigned char status;
1292 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1294 return got_error_from_errno("asprintf");
1296 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1300 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1301 status == GOT_STATUS_ADD) {
1302 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1306 * Preserve the working file and change the deleted blob's
1307 * entry into a schedule-add entry.
1309 err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1314 err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1317 if (status == GOT_STATUS_NO_CHANGE) {
1318 err = remove_ondisk_file(worktree->root_path, ie->path);
1322 got_fileindex_entry_remove(fileindex, ie);
1328 struct diff_cb_arg {
1329 struct got_fileindex *fileindex;
1330 struct got_worktree *worktree;
1331 struct got_repository *repo;
1332 got_worktree_checkout_cb progress_cb;
1334 got_worktree_cancel_cb cancel_cb;
1338 static const struct got_error *
1339 diff_old_new(void *arg, struct got_fileindex_entry *ie,
1340 struct got_tree_entry *te, const char *parent_path)
1342 struct diff_cb_arg *a = arg;
1344 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1345 return got_error(GOT_ERR_CANCELLED);
1347 return update_blob(a->worktree, a->fileindex, ie, te,
1348 ie->path, a->repo, a->progress_cb, a->progress_arg);
1351 static const struct got_error *
1352 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1354 struct diff_cb_arg *a = arg;
1356 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1357 return got_error(GOT_ERR_CANCELLED);
1359 return delete_blob(a->worktree, a->fileindex, ie,
1360 a->repo, a->progress_cb, a->progress_arg);
1363 static const struct got_error *
1364 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1366 struct diff_cb_arg *a = arg;
1367 const struct got_error *err;
1370 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1371 return got_error(GOT_ERR_CANCELLED);
1373 if (asprintf(&path, "%s%s%s", parent_path,
1374 parent_path[0] ? "/" : "", te->name)
1376 return got_error_from_errno("asprintf");
1378 if (S_ISDIR(te->mode))
1379 err = add_dir_on_disk(a->worktree, path);
1381 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1382 a->repo, a->progress_cb, a->progress_arg);
1388 static const struct got_error *
1389 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1391 const struct got_error *err = NULL;
1392 char *uuidstr = NULL;
1393 uint32_t uuid_status;
1397 uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1398 if (uuid_status != uuid_s_ok)
1399 return got_error_uuid(uuid_status);
1401 if (asprintf(refname, "%s-%s", prefix, uuidstr)
1403 err = got_error_from_errno("asprintf");
1410 const struct got_error *
1411 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1413 return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1416 static const struct got_error *
1417 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1419 return get_ref_name(refname, worktree,
1420 GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1423 static const struct got_error *
1424 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1426 return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1429 static const struct got_error *
1430 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1432 return get_ref_name(refname, worktree,
1433 GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1436 static const struct got_error *
1437 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1439 return get_ref_name(refname, worktree,
1440 GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1443 static const struct got_error *
1444 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1446 return get_ref_name(refname, worktree,
1447 GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1450 static const struct got_error *
1451 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1453 return get_ref_name(refname, worktree,
1454 GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1457 static const struct got_error *
1458 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1460 return get_ref_name(refname, worktree,
1461 GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1464 static const struct got_error *
1465 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1467 return get_ref_name(refname, worktree,
1468 GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1471 const struct got_error *
1472 got_worktree_get_histedit_list_path(char **path, struct got_worktree *worktree)
1474 if (asprintf(path, "%s/%s/%s", worktree->root_path,
1475 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_LIST) == -1) {
1477 return got_error_from_errno("asprintf");
1483 * Prevent Git's garbage collector from deleting our base commit by
1484 * setting a reference to our base commit's ID.
1486 static const struct got_error *
1487 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1489 const struct got_error *err = NULL;
1490 struct got_reference *ref = NULL;
1493 err = got_worktree_get_base_ref_name(&refname, worktree);
1497 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1501 err = got_ref_write(ref, repo);
1509 static const struct got_error *
1510 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1512 const struct got_error *err = NULL;
1514 if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1515 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1516 err = got_error_from_errno("asprintf");
1517 *fileindex_path = NULL;
1523 static const struct got_error *
1524 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1525 struct got_worktree *worktree)
1527 const struct got_error *err = NULL;
1530 *fileindex_path = NULL;
1531 *fileindex = got_fileindex_alloc();
1532 if (*fileindex == NULL)
1533 return got_error_from_errno("got_fileindex_alloc");
1535 err = get_fileindex_path(fileindex_path, worktree);
1539 index = fopen(*fileindex_path, "rb");
1540 if (index == NULL) {
1541 if (errno != ENOENT)
1542 err = got_error_from_errno2("fopen", *fileindex_path);
1544 err = got_fileindex_read(*fileindex, index);
1545 if (fclose(index) != 0 && err == NULL)
1546 err = got_error_from_errno("fclose");
1550 free(*fileindex_path);
1551 *fileindex_path = NULL;
1552 got_fileindex_free(*fileindex);
1558 struct bump_base_commit_id_arg {
1559 struct got_object_id *base_commit_id;
1562 const char *entry_name;
1563 got_worktree_checkout_cb progress_cb;
1567 /* Bump base commit ID of all files within an updated part of the work tree. */
1568 static const struct got_error *
1569 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1571 const struct got_error *err;
1572 struct bump_base_commit_id_arg *a = arg;
1574 if (a->entry_name) {
1575 if (strcmp(ie->path, a->path) != 0)
1577 } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1580 if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1581 SHA1_DIGEST_LENGTH) == 0)
1584 if (a->progress_cb) {
1585 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1590 memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1594 static const struct got_error *
1595 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1597 const struct got_error *err = NULL;
1598 char *new_fileindex_path = NULL;
1599 FILE *new_index = NULL;
1601 err = got_opentemp_named(&new_fileindex_path, &new_index,
1606 err = got_fileindex_write(fileindex, new_index);
1610 if (rename(new_fileindex_path, fileindex_path) != 0) {
1611 err = got_error_from_errno3("rename", new_fileindex_path,
1613 unlink(new_fileindex_path);
1618 free(new_fileindex_path);
1622 static const struct got_error *
1623 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1624 struct got_object_id **tree_id, const char *wt_relpath,
1625 struct got_worktree *worktree, struct got_repository *repo)
1627 const struct got_error *err = NULL;
1628 struct got_object_id *id = NULL;
1629 char *in_repo_path = NULL;
1630 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1632 *entry_type = GOT_OBJ_TYPE_ANY;
1633 *tree_relpath = NULL;
1636 if (wt_relpath[0] == '\0') {
1637 /* Check out all files within the work tree. */
1638 *entry_type = GOT_OBJ_TYPE_TREE;
1639 *tree_relpath = strdup("");
1640 if (*tree_relpath == NULL) {
1641 err = got_error_from_errno("strdup");
1644 err = got_object_id_by_path(tree_id, repo,
1645 worktree->base_commit_id, worktree->path_prefix);
1651 /* Check out a subset of files in the work tree. */
1653 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1654 is_root_wt ? "" : "/", wt_relpath) == -1) {
1655 err = got_error_from_errno("asprintf");
1659 err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1665 in_repo_path = NULL;
1667 err = got_object_get_type(entry_type, repo, id);
1671 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1672 /* Check out a single file. */
1673 if (strchr(wt_relpath, '/') == NULL) {
1674 /* Check out a single file in work tree's root dir. */
1675 in_repo_path = strdup(worktree->path_prefix);
1676 if (in_repo_path == NULL) {
1677 err = got_error_from_errno("strdup");
1680 *tree_relpath = strdup("");
1681 if (*tree_relpath == NULL) {
1682 err = got_error_from_errno("strdup");
1686 /* Check out a single file in a subdirectory. */
1687 err = got_path_dirname(tree_relpath, wt_relpath);
1690 if (asprintf(&in_repo_path, "%s%s%s",
1691 worktree->path_prefix, is_root_wt ? "" : "/",
1692 *tree_relpath) == -1) {
1693 err = got_error_from_errno("asprintf");
1697 err = got_object_id_by_path(tree_id, repo,
1698 worktree->base_commit_id, in_repo_path);
1700 /* Check out all files within a subdirectory. */
1701 *tree_id = got_object_id_dup(id);
1702 if (*tree_id == NULL) {
1703 err = got_error_from_errno("got_object_id_dup");
1706 *tree_relpath = strdup(wt_relpath);
1707 if (*tree_relpath == NULL) {
1708 err = got_error_from_errno("strdup");
1716 *entry_type = GOT_OBJ_TYPE_ANY;
1717 free(*tree_relpath);
1718 *tree_relpath = NULL;
1725 static const struct got_error *
1726 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1727 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1728 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1729 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1731 const struct got_error *err = NULL;
1732 struct got_commit_object *commit = NULL;
1733 struct got_tree_object *tree = NULL;
1734 struct got_fileindex_diff_tree_cb diff_cb;
1735 struct diff_cb_arg arg;
1737 err = ref_base_commit(worktree, repo);
1741 err = got_object_open_as_commit(&commit, repo,
1742 worktree->base_commit_id);
1746 err = got_object_open_as_tree(&tree, repo, tree_id);
1751 got_object_tree_find_entry(tree, entry_name) == NULL) {
1752 err = got_error(GOT_ERR_NO_TREE_ENTRY);
1756 diff_cb.diff_old_new = diff_old_new;
1757 diff_cb.diff_old = diff_old;
1758 diff_cb.diff_new = diff_new;
1759 arg.fileindex = fileindex;
1760 arg.worktree = worktree;
1762 arg.progress_cb = progress_cb;
1763 arg.progress_arg = progress_arg;
1764 arg.cancel_cb = cancel_cb;
1765 arg.cancel_arg = cancel_arg;
1766 err = got_fileindex_diff_tree(fileindex, tree, relpath,
1767 entry_name, repo, &diff_cb, &arg);
1770 got_object_tree_close(tree);
1772 got_object_commit_close(commit);
1776 const struct got_error *
1777 got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1778 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1779 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1781 const struct got_error *err = NULL, *sync_err, *unlockerr;
1782 struct got_commit_object *commit = NULL;
1783 struct got_object_id *tree_id = NULL;
1784 struct got_tree_object *tree = NULL;
1785 struct got_fileindex *fileindex = NULL;
1786 char *fileindex_path = NULL;
1787 char *relpath = NULL, *entry_name = NULL;
1790 err = lock_worktree(worktree, LOCK_EX);
1794 err = find_tree_entry_for_checkout(&entry_type, &relpath, &tree_id,
1795 path, worktree, repo);
1799 if (entry_type == GOT_OBJ_TYPE_BLOB) {
1800 entry_name = basename(path);
1801 if (entry_name == NULL) {
1802 err = got_error_from_errno2("basename", path);
1808 * Read the file index.
1809 * Checking out files is supposed to be an idempotent operation.
1810 * If the on-disk file index is incomplete we will try to complete it.
1812 err = open_fileindex(&fileindex, &fileindex_path, worktree);
1816 err = checkout_files(worktree, fileindex, relpath, tree_id, entry_name,
1817 repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
1819 struct bump_base_commit_id_arg bbc_arg;
1820 bbc_arg.base_commit_id = worktree->base_commit_id;
1821 bbc_arg.entry_name = entry_name;
1822 bbc_arg.path = path;
1823 bbc_arg.path_len = strlen(path);
1824 bbc_arg.progress_cb = progress_cb;
1825 bbc_arg.progress_arg = progress_arg;
1826 err = got_fileindex_for_each_entry_safe(fileindex,
1827 bump_base_commit_id, &bbc_arg);
1829 sync_err = sync_fileindex(fileindex, fileindex_path);
1830 if (sync_err && err == NULL)
1833 free(fileindex_path);
1836 got_object_tree_close(tree);
1838 got_object_commit_close(commit);
1840 got_fileindex_free(fileindex);
1841 unlockerr = lock_worktree(worktree, LOCK_SH);
1842 if (unlockerr && err == NULL)
1847 struct merge_file_cb_arg {
1848 struct got_worktree *worktree;
1849 struct got_fileindex *fileindex;
1850 got_worktree_checkout_cb progress_cb;
1852 got_worktree_cancel_cb cancel_cb;
1854 struct got_object_id *commit_id2;
1857 static const struct got_error *
1858 merge_file_cb(void *arg, struct got_blob_object *blob1,
1859 struct got_blob_object *blob2, struct got_object_id *id1,
1860 struct got_object_id *id2, const char *path1, const char *path2,
1861 struct got_repository *repo)
1863 static const struct got_error *err = NULL;
1864 struct merge_file_cb_arg *a = arg;
1865 struct got_fileindex_entry *ie;
1866 char *ondisk_path = NULL;
1868 unsigned char status;
1869 int local_changes_subsumed;
1871 if (blob1 && blob2) {
1872 ie = got_fileindex_entry_get(a->fileindex, path2);
1874 return (*a->progress_cb)(a->progress_arg,
1875 GOT_STATUS_MISSING, path2);
1877 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1879 return got_error_from_errno("asprintf");
1881 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1885 if (status == GOT_STATUS_DELETE) {
1886 err = (*a->progress_cb)(a->progress_arg,
1887 GOT_STATUS_MERGE, path2);
1890 if (status != GOT_STATUS_NO_CHANGE &&
1891 status != GOT_STATUS_MODIFY &&
1892 status != GOT_STATUS_CONFLICT &&
1893 status != GOT_STATUS_ADD) {
1894 err = (*a->progress_cb)(a->progress_arg, status, path2);
1898 err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1899 ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1900 a->progress_cb, a->progress_arg);
1902 ie = got_fileindex_entry_get(a->fileindex, path1);
1904 return (*a->progress_cb)(a->progress_arg,
1905 GOT_STATUS_MISSING, path2);
1907 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1909 return got_error_from_errno("asprintf");
1911 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1916 case GOT_STATUS_NO_CHANGE:
1917 err = (*a->progress_cb)(a->progress_arg,
1918 GOT_STATUS_DELETE, path1);
1921 err = remove_ondisk_file(a->worktree->root_path, path1);
1925 got_fileindex_entry_mark_deleted_from_disk(ie);
1927 case GOT_STATUS_DELETE:
1928 case GOT_STATUS_MISSING:
1929 err = (*a->progress_cb)(a->progress_arg,
1930 GOT_STATUS_DELETE, path1);
1934 got_fileindex_entry_mark_deleted_from_disk(ie);
1936 case GOT_STATUS_ADD:
1937 case GOT_STATUS_MODIFY:
1938 case GOT_STATUS_CONFLICT:
1939 err = (*a->progress_cb)(a->progress_arg,
1940 GOT_STATUS_CANNOT_DELETE, path1);
1944 case GOT_STATUS_OBSTRUCTED:
1945 err = (*a->progress_cb)(a->progress_arg, status, path1);
1953 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1955 return got_error_from_errno("asprintf");
1956 ie = got_fileindex_entry_get(a->fileindex, path2);
1958 err = get_file_status(&status, &sb, ie, ondisk_path,
1962 if (status != GOT_STATUS_NO_CHANGE &&
1963 status != GOT_STATUS_MODIFY &&
1964 status != GOT_STATUS_CONFLICT &&
1965 status != GOT_STATUS_ADD) {
1966 err = (*a->progress_cb)(a->progress_arg,
1970 err = merge_blob(&local_changes_subsumed, a->worktree,
1971 NULL, ondisk_path, path2, sb.st_mode, blob2,
1972 a->commit_id2, repo,
1973 a->progress_cb, a->progress_arg);
1974 if (status == GOT_STATUS_DELETE) {
1975 err = update_blob_fileindex_entry(a->worktree,
1976 a->fileindex, ie, ondisk_path, ie->path,
1982 sb.st_mode = GOT_DEFAULT_FILE_MODE;
1983 err = install_blob(a->worktree, ondisk_path, path2,
1984 /* XXX get this from parent tree! */
1985 GOT_DEFAULT_FILE_MODE,
1986 sb.st_mode, blob2, 0, 0, repo,
1987 a->progress_cb, a->progress_arg);
1990 err = got_fileindex_entry_alloc(&ie,
1991 ondisk_path, path2, NULL, NULL);
1994 err = got_fileindex_entry_add(a->fileindex, ie);
1996 got_fileindex_entry_free(ie);
2006 struct check_merge_ok_arg {
2007 struct got_worktree *worktree;
2008 struct got_repository *repo;
2011 static const struct got_error *
2012 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2014 const struct got_error *err = NULL;
2015 struct check_merge_ok_arg *a = arg;
2016 unsigned char status;
2020 /* Reject merges into a work tree with mixed base commits. */
2021 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2022 SHA1_DIGEST_LENGTH))
2023 return got_error(GOT_ERR_MIXED_COMMITS);
2025 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2027 return got_error_from_errno("asprintf");
2029 /* Reject merges into a work tree with conflicted files. */
2030 err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2033 if (status == GOT_STATUS_CONFLICT)
2034 return got_error(GOT_ERR_CONFLICTS);
2039 static const struct got_error *
2040 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2041 const char *fileindex_path, struct got_object_id *commit_id1,
2042 struct got_object_id *commit_id2, struct got_repository *repo,
2043 got_worktree_checkout_cb progress_cb, void *progress_arg,
2044 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2046 const struct got_error *err = NULL, *sync_err;
2047 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2048 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2049 struct merge_file_cb_arg arg;
2052 err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2053 worktree->path_prefix);
2057 err = got_object_open_as_tree(&tree1, repo, tree_id1);
2062 err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2063 worktree->path_prefix);
2067 err = got_object_open_as_tree(&tree2, repo, tree_id2);
2071 arg.worktree = worktree;
2072 arg.fileindex = fileindex;
2073 arg.progress_cb = progress_cb;
2074 arg.progress_arg = progress_arg;
2075 arg.cancel_cb = cancel_cb;
2076 arg.cancel_arg = cancel_arg;
2077 arg.commit_id2 = commit_id2;
2078 err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg);
2079 sync_err = sync_fileindex(fileindex, fileindex_path);
2080 if (sync_err && err == NULL)
2084 got_object_tree_close(tree1);
2086 got_object_tree_close(tree2);
2090 const struct got_error *
2091 got_worktree_merge_files(struct got_worktree *worktree,
2092 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2093 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2094 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2096 const struct got_error *err, *unlockerr;
2097 char *fileindex_path = NULL;
2098 struct got_fileindex *fileindex = NULL;
2099 struct check_merge_ok_arg mok_arg;
2101 err = lock_worktree(worktree, LOCK_EX);
2105 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2109 mok_arg.worktree = worktree;
2110 mok_arg.repo = repo;
2111 err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2116 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2117 commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2120 got_fileindex_free(fileindex);
2121 free(fileindex_path);
2122 unlockerr = lock_worktree(worktree, LOCK_SH);
2123 if (unlockerr && err == NULL)
2128 struct diff_dir_cb_arg {
2129 struct got_fileindex *fileindex;
2130 struct got_worktree *worktree;
2131 const char *status_path;
2132 size_t status_path_len;
2133 struct got_repository *repo;
2134 got_worktree_status_cb status_cb;
2136 got_worktree_cancel_cb cancel_cb;
2140 static const struct got_error *
2141 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2142 got_worktree_status_cb status_cb, void *status_arg,
2143 struct got_repository *repo)
2145 const struct got_error *err = NULL;
2146 unsigned char status = GOT_STATUS_NO_CHANGE;
2148 struct got_object_id blob_id, commit_id;
2150 err = get_file_status(&status, &sb, ie, abspath, repo);
2151 if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
2152 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2153 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2154 err = (*status_cb)(status_arg, status, ie->path, &blob_id,
2160 static const struct got_error *
2161 status_old_new(void *arg, struct got_fileindex_entry *ie,
2162 struct dirent *de, const char *parent_path)
2164 const struct got_error *err = NULL;
2165 struct diff_dir_cb_arg *a = arg;
2168 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2169 return got_error(GOT_ERR_CANCELLED);
2171 if (got_path_cmp(parent_path, a->status_path) != 0 &&
2172 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2175 if (parent_path[0]) {
2176 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2177 parent_path, de->d_name) == -1)
2178 return got_error_from_errno("asprintf");
2180 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2182 return got_error_from_errno("asprintf");
2185 err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2191 static const struct got_error *
2192 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2194 struct diff_dir_cb_arg *a = arg;
2195 struct got_object_id blob_id, commit_id;
2196 unsigned char status;
2198 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2199 return got_error(GOT_ERR_CANCELLED);
2201 if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2204 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2205 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2206 if (got_fileindex_entry_has_file_on_disk(ie))
2207 status = GOT_STATUS_MISSING;
2209 status = GOT_STATUS_DELETE;
2210 return (*a->status_cb)(a->status_arg, status, ie->path, &blob_id,
2214 static const struct got_error *
2215 status_new(void *arg, struct dirent *de, const char *parent_path)
2217 const struct got_error *err = NULL;
2218 struct diff_dir_cb_arg *a = arg;
2221 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2222 return got_error(GOT_ERR_CANCELLED);
2224 if (de->d_type == DT_DIR)
2227 /* XXX ignore symlinks for now */
2228 if (de->d_type == DT_LNK)
2231 if (parent_path[0]) {
2232 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2233 return got_error_from_errno("asprintf");
2238 if (got_path_is_child(path, a->status_path, a->status_path_len))
2239 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2246 static const struct got_error *
2247 worktree_status(struct got_worktree *worktree, const char *path,
2248 struct got_fileindex *fileindex, struct got_repository *repo,
2249 got_worktree_status_cb status_cb, void *status_arg,
2250 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2252 const struct got_error *err = NULL;
2253 DIR *workdir = NULL;
2254 struct got_fileindex_diff_dir_cb fdiff_cb;
2255 struct diff_dir_cb_arg arg;
2256 char *ondisk_path = NULL;
2258 if (asprintf(&ondisk_path, "%s%s%s",
2259 worktree->root_path, path[0] ? "/" : "", path) == -1) {
2260 err = got_error_from_errno("asprintf");
2263 workdir = opendir(ondisk_path);
2264 if (workdir == NULL) {
2265 if (errno == ENOTDIR || errno == ENOENT) {
2266 struct got_fileindex_entry *ie;
2267 ie = got_fileindex_entry_get(fileindex, path);
2269 err = got_error(GOT_ERR_BAD_PATH);
2272 err = report_file_status(ie, ondisk_path,
2273 status_cb, status_arg, repo);
2276 err = got_error_from_errno2("opendir", ondisk_path);
2280 fdiff_cb.diff_old_new = status_old_new;
2281 fdiff_cb.diff_old = status_old;
2282 fdiff_cb.diff_new = status_new;
2283 arg.fileindex = fileindex;
2284 arg.worktree = worktree;
2285 arg.status_path = path;
2286 arg.status_path_len = strlen(path);
2288 arg.status_cb = status_cb;
2289 arg.status_arg = status_arg;
2290 arg.cancel_cb = cancel_cb;
2291 arg.cancel_arg = cancel_arg;
2292 err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
2293 path, repo, &fdiff_cb, &arg);
2301 const struct got_error *
2302 got_worktree_status(struct got_worktree *worktree, const char *path,
2303 struct got_repository *repo, got_worktree_status_cb status_cb,
2304 void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2306 const struct got_error *err = NULL;
2307 char *fileindex_path = NULL;
2308 struct got_fileindex *fileindex = NULL;
2310 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2314 err = worktree_status(worktree, path, fileindex, repo,
2315 status_cb, status_arg, cancel_cb, cancel_arg);
2316 free(fileindex_path);
2317 got_fileindex_free(fileindex);
2321 const struct got_error *
2322 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2325 const struct got_error *err = NULL;
2326 char *resolved, *cwd = NULL, *path = NULL;
2331 resolved = realpath(arg, NULL);
2332 if (resolved == NULL) {
2333 if (errno != ENOENT)
2334 return got_error_from_errno2("realpath", arg);
2335 cwd = getcwd(NULL, 0);
2337 return got_error_from_errno("getcwd");
2338 if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2339 err = got_error_from_errno("asprintf");
2344 if (strncmp(got_worktree_get_root_path(worktree), resolved,
2345 strlen(got_worktree_get_root_path(worktree)))) {
2346 err = got_error(GOT_ERR_BAD_PATH);
2350 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2351 err = got_path_skip_common_ancestor(&path,
2352 got_worktree_get_root_path(worktree), resolved);
2358 err = got_error_from_errno("strdup");
2363 /* XXX status walk can't deal with trailing slash! */
2365 while (path[len - 1] == '/') {
2366 path[len - 1] = '\0';
2379 static const struct got_error *
2380 schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2381 const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2382 struct got_repository *repo)
2384 const struct got_error *err = NULL;
2385 struct got_fileindex_entry *ie;
2387 /* Re-adding an existing entry is a no-op. */
2388 if (got_fileindex_entry_get(fileindex, relpath) != NULL)
2391 err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2395 err = got_fileindex_entry_add(fileindex, ie);
2397 got_fileindex_entry_free(ie);
2401 return report_file_status(ie, relpath, status_cb, status_arg, repo);
2404 const struct got_error *
2405 got_worktree_schedule_add(struct got_worktree *worktree,
2406 struct got_pathlist_head *ondisk_paths,
2407 got_worktree_status_cb status_cb, void *status_arg,
2408 struct got_repository *repo)
2410 struct got_fileindex *fileindex = NULL;
2411 char *fileindex_path = NULL;
2412 const struct got_error *err = NULL, *sync_err, *unlockerr;
2413 struct got_pathlist_entry *pe;
2415 err = lock_worktree(worktree, LOCK_EX);
2419 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2423 TAILQ_FOREACH(pe, ondisk_paths, entry) {
2425 err = got_path_skip_common_ancestor(&relpath,
2426 got_worktree_get_root_path(worktree), pe->path);
2429 err = schedule_addition(pe->path, fileindex, relpath,
2430 status_cb, status_arg, repo);
2435 sync_err = sync_fileindex(fileindex, fileindex_path);
2436 if (sync_err && err == NULL)
2439 free(fileindex_path);
2441 got_fileindex_free(fileindex);
2442 unlockerr = lock_worktree(worktree, LOCK_SH);
2443 if (unlockerr && err == NULL)
2448 static const struct got_error *
2449 schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2450 const char *relpath, int delete_local_mods,
2451 got_worktree_status_cb status_cb, void *status_arg,
2452 struct got_repository *repo)
2454 const struct got_error *err = NULL;
2455 struct got_fileindex_entry *ie = NULL;
2456 unsigned char status;
2459 ie = got_fileindex_entry_get(fileindex, relpath);
2461 return got_error(GOT_ERR_BAD_PATH);
2463 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2467 if (status != GOT_STATUS_NO_CHANGE) {
2468 if (status == GOT_STATUS_DELETE)
2469 return got_error_set_errno(ENOENT, ondisk_path);
2470 if (status != GOT_STATUS_MODIFY)
2471 return got_error(GOT_ERR_FILE_STATUS);
2472 if (!delete_local_mods)
2473 return got_error(GOT_ERR_FILE_MODIFIED);
2476 if (unlink(ondisk_path) != 0)
2477 return got_error_from_errno2("unlink", ondisk_path);
2479 got_fileindex_entry_mark_deleted_from_disk(ie);
2480 return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2483 const struct got_error *
2484 got_worktree_schedule_delete(struct got_worktree *worktree,
2485 struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2486 got_worktree_status_cb status_cb, void *status_arg,
2487 struct got_repository *repo)
2489 struct got_fileindex *fileindex = NULL;
2490 char *fileindex_path = NULL;
2491 const struct got_error *err = NULL, *sync_err, *unlockerr;
2492 struct got_pathlist_entry *pe;
2494 err = lock_worktree(worktree, LOCK_EX);
2498 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2502 TAILQ_FOREACH(pe, ondisk_paths, entry) {
2504 err = got_path_skip_common_ancestor(&relpath,
2505 got_worktree_get_root_path(worktree), pe->path);
2508 err = schedule_for_deletion(pe->path, fileindex, relpath,
2509 delete_local_mods, status_cb, status_arg, repo);
2514 sync_err = sync_fileindex(fileindex, fileindex_path);
2515 if (sync_err && err == NULL)
2518 free(fileindex_path);
2520 got_fileindex_free(fileindex);
2521 unlockerr = lock_worktree(worktree, LOCK_SH);
2522 if (unlockerr && err == NULL)
2527 static const struct got_error *
2528 revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2529 const char *ondisk_path,
2530 got_worktree_checkout_cb progress_cb, void *progress_arg,
2531 struct got_repository *repo)
2533 const struct got_error *err = NULL;
2534 char *relpath = NULL, *parent_path = NULL;
2535 struct got_fileindex_entry *ie;
2536 struct got_tree_object *tree = NULL;
2537 struct got_object_id *tree_id = NULL;
2538 const struct got_tree_entry *te;
2539 char *tree_path = NULL, *te_name;
2540 struct got_blob_object *blob = NULL;
2541 unsigned char status;
2544 err = got_path_skip_common_ancestor(&relpath,
2545 got_worktree_get_root_path(worktree), ondisk_path);
2549 ie = got_fileindex_entry_get(fileindex, relpath);
2551 err = got_error(GOT_ERR_BAD_PATH);
2555 /* Construct in-repository path of tree which contains this blob. */
2556 err = got_path_dirname(&parent_path, ie->path);
2558 if (err->code != GOT_ERR_BAD_PATH)
2560 parent_path = strdup("/");
2561 if (parent_path == NULL) {
2562 err = got_error_from_errno("strdup");
2566 if (got_path_is_root_dir(worktree->path_prefix)) {
2567 tree_path = strdup(parent_path);
2568 if (tree_path == NULL) {
2569 err = got_error_from_errno("strdup");
2573 if (got_path_is_root_dir(parent_path)) {
2574 tree_path = strdup(worktree->path_prefix);
2575 if (tree_path == NULL) {
2576 err = got_error_from_errno("strdup");
2580 if (asprintf(&tree_path, "%s/%s",
2581 worktree->path_prefix, parent_path) == -1) {
2582 err = got_error_from_errno("asprintf");
2588 err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2593 err = got_object_open_as_tree(&tree, repo, tree_id);
2597 te_name = basename(ie->path);
2598 if (te_name == NULL) {
2599 err = got_error_from_errno2("basename", ie->path);
2603 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2607 te = got_object_tree_find_entry(tree, te_name);
2608 if (te == NULL && status != GOT_STATUS_ADD) {
2609 err = got_error(GOT_ERR_NO_TREE_ENTRY);
2614 case GOT_STATUS_ADD:
2615 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2618 got_fileindex_entry_remove(fileindex, ie);
2620 case GOT_STATUS_DELETE:
2621 case GOT_STATUS_MODIFY:
2622 case GOT_STATUS_CONFLICT:
2623 case GOT_STATUS_MISSING: {
2624 struct got_object_id id;
2625 memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2626 err = got_object_open_as_blob(&blob, repo, &id, 8192);
2629 err = install_blob(worktree, ondisk_path, ie->path,
2630 te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2634 if (status == GOT_STATUS_DELETE) {
2635 err = update_blob_fileindex_entry(worktree,
2636 fileindex, ie, ondisk_path, ie->path, blob, 1);
2650 got_object_blob_close(blob);
2652 got_object_tree_close(tree);
2657 const struct got_error *
2658 got_worktree_revert(struct got_worktree *worktree,
2659 struct got_pathlist_head *ondisk_paths,
2660 got_worktree_checkout_cb progress_cb, void *progress_arg,
2661 struct got_repository *repo)
2663 struct got_fileindex *fileindex = NULL;
2664 char *fileindex_path = NULL;
2665 const struct got_error *err = NULL, *unlockerr = NULL;
2666 const struct got_error *sync_err = NULL;
2667 struct got_pathlist_entry *pe;
2669 err = lock_worktree(worktree, LOCK_EX);
2673 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2677 TAILQ_FOREACH(pe, ondisk_paths, entry) {
2678 err = revert_file(worktree, fileindex, pe->path,
2679 progress_cb, progress_arg, repo);
2683 sync_err = sync_fileindex(fileindex, fileindex_path);
2684 if (sync_err && err == NULL)
2687 free(fileindex_path);
2689 got_fileindex_free(fileindex);
2690 unlockerr = lock_worktree(worktree, LOCK_SH);
2691 if (unlockerr && err == NULL)
2697 free_commitable(struct got_commitable *ct)
2700 free(ct->in_repo_path);
2701 free(ct->ondisk_path);
2703 free(ct->base_blob_id);
2704 free(ct->base_commit_id);
2708 struct collect_commitables_arg {
2709 struct got_pathlist_head *commitable_paths;
2710 struct got_repository *repo;
2711 struct got_worktree *worktree;
2714 static const struct got_error *
2715 collect_commitables(void *arg, unsigned char status, const char *relpath,
2716 struct got_object_id *blob_id, struct got_object_id *commit_id)
2718 struct collect_commitables_arg *a = arg;
2719 const struct got_error *err = NULL;
2720 struct got_commitable *ct = NULL;
2721 struct got_pathlist_entry *new = NULL;
2722 char *parent_path = NULL, *path = NULL;
2725 if (status == GOT_STATUS_CONFLICT)
2726 return got_error(GOT_ERR_COMMIT_CONFLICT);
2728 if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2729 status != GOT_STATUS_DELETE)
2732 if (asprintf(&path, "/%s", relpath) == -1) {
2733 err = got_error_from_errno("asprintf");
2736 if (strcmp(path, "/") == 0) {
2737 parent_path = strdup("");
2738 if (parent_path == NULL)
2739 return got_error_from_errno("strdup");
2741 err = got_path_dirname(&parent_path, path);
2746 ct = calloc(1, sizeof(*ct));
2748 err = got_error_from_errno("calloc");
2752 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2754 err = got_error_from_errno("asprintf");
2757 if (status == GOT_STATUS_DELETE) {
2758 sb.st_mode = GOT_DEFAULT_FILE_MODE;
2760 if (lstat(ct->ondisk_path, &sb) != 0) {
2761 err = got_error_from_errno2("lstat", ct->ondisk_path);
2764 ct->mode = sb.st_mode;
2767 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2768 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2770 err = got_error_from_errno("asprintf");
2774 ct->status = status;
2775 ct->blob_id = NULL; /* will be filled in when blob gets created */
2776 if (ct->status != GOT_STATUS_ADD) {
2777 ct->base_blob_id = got_object_id_dup(blob_id);
2778 if (ct->base_blob_id == NULL) {
2779 err = got_error_from_errno("got_object_id_dup");
2782 ct->base_commit_id = got_object_id_dup(commit_id);
2783 if (ct->base_commit_id == NULL) {
2784 err = got_error_from_errno("got_object_id_dup");
2788 ct->path = strdup(path);
2789 if (ct->path == NULL) {
2790 err = got_error_from_errno("strdup");
2793 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2795 if (ct && (err || new == NULL))
2796 free_commitable(ct);
2802 static const struct got_error *write_tree(struct got_object_id **,
2803 struct got_tree_object *, const char *, struct got_pathlist_head *,
2804 got_worktree_status_cb status_cb, void *status_arg,
2805 struct got_repository *);
2807 static const struct got_error *
2808 write_subtree(struct got_object_id **new_subtree_id,
2809 struct got_tree_entry *te, const char *parent_path,
2810 struct got_pathlist_head *commitable_paths,
2811 got_worktree_status_cb status_cb, void *status_arg,
2812 struct got_repository *repo)
2814 const struct got_error *err = NULL;
2815 struct got_tree_object *subtree;
2818 if (asprintf(&subpath, "%s%s%s", parent_path,
2819 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2820 return got_error_from_errno("asprintf");
2822 err = got_object_open_as_tree(&subtree, repo, te->id);
2826 err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2827 status_cb, status_arg, repo);
2828 got_object_tree_close(subtree);
2833 static const struct got_error *
2834 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2836 const struct got_error *err = NULL;
2837 char *ct_parent_path = NULL;
2841 if (strchr(ct->in_repo_path, '/') == NULL) {
2842 *match = got_path_is_root_dir(path);
2846 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
2849 *match = (strcmp(path, ct_parent_path) == 0);
2850 free(ct_parent_path);
2855 get_ct_file_mode(struct got_commitable *ct)
2857 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2860 static const struct got_error *
2861 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2862 struct got_tree_entry *te, struct got_commitable *ct)
2864 const struct got_error *err = NULL;
2868 err = got_object_tree_entry_dup(new_te, te);
2872 (*new_te)->mode = get_ct_file_mode(ct);
2874 free((*new_te)->id);
2875 (*new_te)->id = got_object_id_dup(ct->blob_id);
2876 if ((*new_te)->id == NULL) {
2877 err = got_error_from_errno("got_object_id_dup");
2881 if (err && *new_te) {
2882 got_object_tree_entry_close(*new_te);
2888 static const struct got_error *
2889 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2890 struct got_commitable *ct)
2892 const struct got_error *err = NULL;
2897 *new_te = calloc(1, sizeof(**new_te));
2898 if (*new_te == NULL)
2899 return got_error_from_errno("calloc");
2901 ct_name = basename(ct->path);
2902 if (ct_name == NULL) {
2903 err = got_error_from_errno2("basename", ct->path);
2906 (*new_te)->name = strdup(ct_name);
2907 if ((*new_te)->name == NULL) {
2908 err = got_error_from_errno("strdup");
2912 (*new_te)->mode = get_ct_file_mode(ct);
2914 (*new_te)->id = got_object_id_dup(ct->blob_id);
2915 if ((*new_te)->id == NULL) {
2916 err = got_error_from_errno("got_object_id_dup");
2920 if (err && *new_te) {
2921 got_object_tree_entry_close(*new_te);
2927 static const struct got_error *
2928 insert_tree_entry(struct got_tree_entry *new_te,
2929 struct got_pathlist_head *paths)
2931 const struct got_error *err = NULL;
2932 struct got_pathlist_entry *new_pe;
2934 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2938 return got_error(GOT_ERR_TREE_DUP_ENTRY);
2942 static const struct got_error *
2943 report_ct_status(struct got_commitable *ct,
2944 got_worktree_status_cb status_cb, void *status_arg)
2946 const char *ct_path = ct->path;
2947 while (ct_path[0] == '/')
2949 return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id, NULL);
2952 static const struct got_error *
2953 match_modified_subtree(int *modified, struct got_tree_entry *te,
2954 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2956 const struct got_error *err = NULL;
2957 struct got_pathlist_entry *pe;
2962 if (asprintf(&te_path, "%s%s%s", base_tree_path,
2963 got_path_is_root_dir(base_tree_path) ? "" : "/",
2965 return got_error_from_errno("asprintf");
2967 TAILQ_FOREACH(pe, commitable_paths, entry) {
2968 struct got_commitable *ct = pe->data;
2969 *modified = got_path_is_child(ct->in_repo_path, te_path,
2979 static const struct got_error *
2980 match_deleted_or_modified_ct(struct got_commitable **ctp,
2981 struct got_tree_entry *te, const char *base_tree_path,
2982 struct got_pathlist_head *commitable_paths)
2984 const struct got_error *err = NULL;
2985 struct got_pathlist_entry *pe;
2989 TAILQ_FOREACH(pe, commitable_paths, entry) {
2990 struct got_commitable *ct = pe->data;
2991 char *ct_name = NULL;
2994 if (ct->status != GOT_STATUS_MODIFY &&
2995 ct->status != GOT_STATUS_DELETE)
2998 if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3001 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3007 ct_name = basename(pe->path);
3008 if (ct_name == NULL)
3009 return got_error_from_errno2("basename", pe->path);
3011 if (strcmp(te->name, ct_name) != 0)
3021 static const struct got_error *
3022 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3023 const char *child_path, const char *path_base_tree,
3024 struct got_pathlist_head *commitable_paths,
3025 got_worktree_status_cb status_cb, void *status_arg,
3026 struct got_repository *repo)
3028 const struct got_error *err = NULL;
3029 struct got_tree_entry *new_te;
3034 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3035 got_path_is_root_dir(path_base_tree) ? "" : "/",
3037 return got_error_from_errno("asprintf");
3039 new_te = calloc(1, sizeof(*new_te));
3040 new_te->mode = S_IFDIR;
3041 new_te->name = strdup(child_path);
3042 if (new_te->name == NULL) {
3043 err = got_error_from_errno("strdup");
3044 got_object_tree_entry_close(new_te);
3047 err = write_tree(&new_te->id, NULL, subtree_path,
3048 commitable_paths, status_cb, status_arg, repo);
3050 got_object_tree_entry_close(new_te);
3060 static const struct got_error *
3061 write_tree(struct got_object_id **new_tree_id,
3062 struct got_tree_object *base_tree, const char *path_base_tree,
3063 struct got_pathlist_head *commitable_paths,
3064 got_worktree_status_cb status_cb, void *status_arg,
3065 struct got_repository *repo)
3067 const struct got_error *err = NULL;
3068 const struct got_tree_entries *base_entries = NULL;
3069 struct got_pathlist_head paths;
3070 struct got_tree_entries new_tree_entries;
3071 struct got_tree_entry *te, *new_te = NULL;
3072 struct got_pathlist_entry *pe;
3075 new_tree_entries.nentries = 0;
3076 SIMPLEQ_INIT(&new_tree_entries.head);
3078 /* Insert, and recurse into, newly added entries first. */
3079 TAILQ_FOREACH(pe, commitable_paths, entry) {
3080 struct got_commitable *ct = pe->data;
3081 char *child_path = NULL, *slash;
3083 if (ct->status != GOT_STATUS_ADD ||
3084 (ct->flags & GOT_COMMITABLE_ADDED))
3087 if (!got_path_is_child(pe->path, path_base_tree,
3088 strlen(path_base_tree)))
3091 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3096 slash = strchr(child_path, '/');
3097 if (slash == NULL) {
3098 err = alloc_added_blob_tree_entry(&new_te, ct);
3101 err = report_ct_status(ct, status_cb, status_arg);
3104 ct->flags |= GOT_COMMITABLE_ADDED;
3105 err = insert_tree_entry(new_te, &paths);
3109 *slash = '\0'; /* trim trailing path components */
3110 if (base_tree == NULL ||
3111 got_object_tree_find_entry(base_tree, child_path)
3113 err = make_subtree_for_added_blob(&new_te,
3114 child_path, path_base_tree,
3115 commitable_paths, status_cb, status_arg,
3119 err = insert_tree_entry(new_te, &paths);
3127 /* Handle modified and deleted entries. */
3128 base_entries = got_object_tree_get_entries(base_tree);
3129 SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3130 struct got_commitable *ct = NULL;
3132 if (S_ISDIR(te->mode)) {
3134 err = got_object_tree_entry_dup(&new_te, te);
3137 err = match_modified_subtree(&modified, te,
3138 path_base_tree, commitable_paths);
3141 /* Avoid recursion into unmodified subtrees. */
3144 err = write_subtree(&new_te->id, te,
3145 path_base_tree, commitable_paths,
3146 status_cb, status_arg, repo);
3150 err = insert_tree_entry(new_te, &paths);
3156 err = match_deleted_or_modified_ct(&ct, te,
3157 path_base_tree, commitable_paths);
3159 /* NB: Deleted entries get dropped here. */
3160 if (ct->status == GOT_STATUS_MODIFY) {
3161 err = alloc_modified_blob_tree_entry(
3165 err = insert_tree_entry(new_te, &paths);
3169 err = report_ct_status(ct, status_cb,
3174 /* Entry is unchanged; just copy it. */
3175 err = got_object_tree_entry_dup(&new_te, te);
3178 err = insert_tree_entry(new_te, &paths);
3185 /* Write new list of entries; deleted entries have been dropped. */
3186 TAILQ_FOREACH(pe, &paths, entry) {
3187 struct got_tree_entry *te = pe->data;
3188 new_tree_entries.nentries++;
3189 SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3191 err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3193 got_object_tree_entries_close(&new_tree_entries);
3194 got_pathlist_free(&paths);
3198 static const struct got_error *
3199 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3200 struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3202 const struct got_error *err = NULL;
3203 struct got_pathlist_entry *pe;
3205 TAILQ_FOREACH(pe, commitable_paths, entry) {
3206 struct got_fileindex_entry *ie;
3207 struct got_commitable *ct = pe->data;
3209 ie = got_fileindex_entry_get(fileindex, pe->path);
3211 if (ct->status == GOT_STATUS_DELETE) {
3212 got_fileindex_entry_remove(fileindex, ie);
3213 got_fileindex_entry_free(ie);
3215 err = got_fileindex_entry_update(ie,
3216 ct->ondisk_path, ct->blob_id->sha1,
3217 new_base_commit_id->sha1, 1);
3219 err = got_fileindex_entry_alloc(&ie,
3220 ct->ondisk_path, pe->path, ct->blob_id->sha1,
3221 new_base_commit_id->sha1);
3224 err = got_fileindex_entry_add(fileindex, ie);
3232 static const struct got_error *
3233 check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3234 struct got_object_id *head_commit_id)
3236 const struct got_error *err = NULL;
3237 struct got_object_id *id_in_head = NULL, *id = NULL;
3238 struct got_commit_object *commit = NULL;
3240 const char *ct_path = ct->in_repo_path;
3242 while (ct_path[0] == '/')
3246 * Ensure that no modifications were made to files *and their parents*
3247 * in commits between the file's base commit and the branch head.
3249 * Checking the parents is important for detecting conflicting tree
3250 * configurations (files or parent folders might have been moved,
3251 * deleted, added again, etc.). Such changes need to be merged with
3252 * local changes before a commit can occur.
3254 * The implication is that the file's (parent) entry in the root
3255 * directory must have the same ID in all relevant commits.
3257 if (ct->status != GOT_STATUS_ADD) {
3258 struct got_object_qid *pid;
3260 struct got_object_id *root_entry_id = NULL;
3262 /* Trivial case: base commit == head commit */
3263 if (got_object_id_cmp(ct->base_commit_id, head_commit_id) == 0)
3266 /* Compute the path to the root directory's entry. */
3267 path = strdup(ct_path);
3269 err = got_error_from_errno("strdup");
3272 slash = strchr(path, '/');
3276 err = got_object_open_as_commit(&commit, repo, head_commit_id);
3280 err = got_object_id_by_path(&root_entry_id, repo,
3281 head_commit_id, path);
3285 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3287 struct got_commit_object *pcommit;
3289 err = got_object_id_by_path(&id, repo, pid->id, path);
3291 if (err->code != GOT_ERR_NO_TREE_ENTRY)
3297 err = got_object_id_by_path(&id, repo, pid->id, path);
3301 if (got_object_id_cmp(id, root_entry_id) != 0) {
3302 err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3306 if (got_object_id_cmp(pid->id, ct->base_commit_id) == 0)
3307 break; /* all relevant commits scanned */
3309 err = got_object_open_as_commit(&pcommit, repo,
3314 got_object_commit_close(commit);
3316 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(
3320 /* Require that added files don't exist in the branch head. */
3321 err = got_object_id_by_path(&id_in_head, repo, head_commit_id,
3323 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3325 err = id_in_head ? got_error(GOT_ERR_COMMIT_OUT_OF_DATE) : NULL;
3329 got_object_commit_close(commit);
3336 const struct got_error *
3337 commit_worktree(struct got_object_id **new_commit_id,
3338 struct got_pathlist_head *commitable_paths,
3339 struct got_object_id *head_commit_id, struct got_worktree *worktree,
3340 const char *ondisk_path, const char *author, const char *committer,
3341 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3342 got_worktree_status_cb status_cb, void *status_arg,
3343 struct got_repository *repo)
3345 const struct got_error *err = NULL, *unlockerr = NULL;
3346 struct got_pathlist_entry *pe;
3347 const char *head_ref_name = NULL;
3348 struct got_commit_object *head_commit = NULL;
3349 struct got_reference *head_ref2 = NULL;
3350 struct got_object_id *head_commit_id2 = NULL;
3351 struct got_tree_object *head_tree = NULL;
3352 struct got_object_id *new_tree_id = NULL;
3353 struct got_object_id_queue parent_ids;
3354 struct got_object_qid *pid = NULL;
3355 char *logmsg = NULL;
3357 *new_commit_id = NULL;
3359 SIMPLEQ_INIT(&parent_ids);
3361 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3365 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3369 if (commit_msg_cb != NULL) {
3370 err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3375 if (logmsg == NULL || strlen(logmsg) == 0) {
3376 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3380 /* Create blobs from added and modified files and record their IDs. */
3381 TAILQ_FOREACH(pe, commitable_paths, entry) {
3382 struct got_commitable *ct = pe->data;
3385 if (ct->status != GOT_STATUS_ADD &&
3386 ct->status != GOT_STATUS_MODIFY)
3389 if (asprintf(&ondisk_path, "%s/%s",
3390 worktree->root_path, pe->path) == -1) {
3391 err = got_error_from_errno("asprintf");
3394 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3400 /* Recursively write new tree objects. */
3401 err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3402 status_cb, status_arg, repo);
3406 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3409 SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3410 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3411 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3412 got_object_qid_free(pid);
3418 /* Check if a concurrent commit to our branch has occurred. */
3419 head_ref_name = got_worktree_get_head_ref_name(worktree);
3420 if (head_ref_name == NULL) {
3421 err = got_error_from_errno("got_worktree_get_head_ref_name");
3424 /* Lock the reference here to prevent concurrent modification. */
3425 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3428 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3431 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3432 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3435 /* Update branch head in repository. */
3436 err = got_ref_change_ref(head_ref2, *new_commit_id);
3439 err = got_ref_write(head_ref2, repo);
3443 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3447 err = ref_base_commit(worktree, repo);
3452 got_object_tree_close(head_tree);
3454 got_object_commit_close(head_commit);
3455 free(head_commit_id2);
3457 unlockerr = got_ref_unlock(head_ref2);
3458 if (unlockerr && err == NULL)
3460 got_ref_close(head_ref2);
3465 const struct got_error *
3466 got_worktree_commit(struct got_object_id **new_commit_id,
3467 struct got_worktree *worktree, const char *ondisk_path,
3468 const char *author, const char *committer,
3469 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3470 got_worktree_status_cb status_cb, void *status_arg,
3471 struct got_repository *repo)
3473 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3474 struct got_fileindex *fileindex = NULL;
3475 char *fileindex_path = NULL, *relpath = NULL;
3476 struct got_pathlist_head commitable_paths;
3477 struct collect_commitables_arg cc_arg;
3478 struct got_pathlist_entry *pe;
3479 struct got_reference *head_ref = NULL;
3480 struct got_object_id *head_commit_id = NULL;
3482 *new_commit_id = NULL;
3484 TAILQ_INIT(&commitable_paths);
3486 err = lock_worktree(worktree, LOCK_EX);
3490 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3494 err = got_ref_resolve(&head_commit_id, repo, head_ref);
3499 if (strcmp(ondisk_path, worktree->root_path) == 0) {
3500 relpath = strdup("");
3501 if (relpath == NULL) {
3502 err = got_error_from_errno("strdup");
3506 err = got_path_skip_common_ancestor(&relpath,
3507 worktree->root_path, ondisk_path);
3513 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3517 cc_arg.commitable_paths = &commitable_paths;
3518 cc_arg.worktree = worktree;
3520 err = worktree_status(worktree, relpath ? relpath : "",
3521 fileindex, repo, collect_commitables, &cc_arg, NULL, NULL);
3525 if (TAILQ_EMPTY(&commitable_paths)) {
3526 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3530 TAILQ_FOREACH(pe, &commitable_paths, entry) {
3531 struct got_commitable *ct = pe->data;
3532 err = check_ct_out_of_date(ct, repo, head_commit_id);
3537 err = commit_worktree(new_commit_id, &commitable_paths,
3538 head_commit_id, worktree, ondisk_path, author, committer,
3539 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3543 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3545 sync_err = sync_fileindex(fileindex, fileindex_path);
3546 if (sync_err && err == NULL)
3550 got_fileindex_free(fileindex);
3551 free(fileindex_path);
3553 unlockerr = lock_worktree(worktree, LOCK_SH);
3554 if (unlockerr && err == NULL)
3556 TAILQ_FOREACH(pe, &commitable_paths, entry) {
3557 struct got_commitable *ct = pe->data;
3558 free_commitable(ct);
3560 got_pathlist_free(&commitable_paths);
3565 got_commitable_get_path(struct got_commitable *ct)
3571 got_commitable_get_status(struct got_commitable *ct)
3576 struct check_rebase_ok_arg {
3577 struct got_worktree *worktree;
3578 struct got_repository *repo;
3579 int rebase_in_progress;
3582 static const struct got_error *
3583 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3585 const struct got_error *err = NULL;
3586 struct check_rebase_ok_arg *a = arg;
3587 unsigned char status;
3591 if (!a->rebase_in_progress) {
3592 /* Reject rebase of a work tree with mixed base commits. */
3593 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3594 SHA1_DIGEST_LENGTH))
3595 return got_error(GOT_ERR_MIXED_COMMITS);
3598 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3600 return got_error_from_errno("asprintf");
3602 /* Reject rebase of a work tree with modified or conflicted files. */
3603 err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3608 if (a->rebase_in_progress) {
3609 if (status == GOT_STATUS_CONFLICT)
3610 return got_error(GOT_ERR_CONFLICTS);
3611 } else if (status != GOT_STATUS_NO_CHANGE)
3612 return got_error(GOT_ERR_MODIFIED);
3617 const struct got_error *
3618 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3619 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
3620 struct got_worktree *worktree, struct got_reference *branch,
3621 struct got_repository *repo)
3623 const struct got_error *err = NULL;
3624 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3625 char *branch_ref_name = NULL;
3626 char *fileindex_path = NULL;
3627 struct check_rebase_ok_arg ok_arg;
3628 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3630 *new_base_branch_ref = NULL;
3634 err = lock_worktree(worktree, LOCK_EX);
3638 err = open_fileindex(fileindex, &fileindex_path, worktree);
3642 ok_arg.worktree = worktree;
3644 ok_arg.rebase_in_progress = 0;
3645 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
3650 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3654 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3658 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3662 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3667 err = got_ref_alloc_symref(new_base_branch_ref,
3668 new_base_branch_ref_name, wt_branch);
3671 err = got_ref_write(*new_base_branch_ref, repo);
3675 /* TODO Lock original branch's ref while rebasing? */
3677 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3681 err = got_ref_write(branch_ref, repo);
3685 err = got_ref_alloc(tmp_branch, tmp_branch_name,
3686 worktree->base_commit_id);
3689 err = got_ref_write(*tmp_branch, repo);
3693 err = got_worktree_set_head_ref(worktree, *tmp_branch);
3697 free(fileindex_path);
3698 free(tmp_branch_name);
3699 free(new_base_branch_ref_name);
3700 free(branch_ref_name);
3702 got_ref_close(branch_ref);
3704 got_ref_close(wt_branch);
3706 if (*new_base_branch_ref) {
3707 got_ref_close(*new_base_branch_ref);
3708 *new_base_branch_ref = NULL;
3711 got_ref_close(*tmp_branch);
3715 got_fileindex_free(*fileindex);
3718 lock_worktree(worktree, LOCK_SH);
3723 const struct got_error *
3724 got_worktree_rebase_continue(struct got_object_id **commit_id,
3725 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3726 struct got_reference **branch, struct got_fileindex **fileindex,
3727 struct got_worktree *worktree, struct got_repository *repo)
3729 const struct got_error *err;
3730 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3731 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3732 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3733 char *fileindex_path = NULL;
3736 *new_base_branch = NULL;
3741 err = lock_worktree(worktree, LOCK_EX);
3745 err = open_fileindex(fileindex, &fileindex_path, worktree);
3749 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3753 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3757 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3761 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3765 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
3769 err = got_ref_open(branch, repo,
3770 got_ref_get_symref_target(branch_ref), 0);
3774 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3778 err = got_ref_resolve(commit_id, repo, commit_ref);
3782 err = got_ref_open(new_base_branch, repo,
3783 new_base_branch_ref_name, 0);
3787 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
3791 free(commit_ref_name);
3792 free(branch_ref_name);
3793 free(fileindex_path);
3795 got_ref_close(commit_ref);
3797 got_ref_close(branch_ref);
3802 got_ref_close(*tmp_branch);
3805 if (*new_base_branch) {
3806 got_ref_close(*new_base_branch);
3807 *new_base_branch = NULL;
3810 got_ref_close(*branch);
3814 got_fileindex_free(*fileindex);
3817 lock_worktree(worktree, LOCK_SH);
3822 const struct got_error *
3823 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
3825 const struct got_error *err;
3826 char *tmp_branch_name = NULL;
3828 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3832 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
3833 free(tmp_branch_name);
3837 static const struct got_error *
3838 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
3839 char **logmsg, void *arg)
3845 static const struct got_error *
3846 rebase_status(void *arg, unsigned char status, const char *path,
3847 struct got_object_id *blob_id, struct got_object_id *commit_id)
3852 struct collect_merged_paths_arg {
3853 got_worktree_checkout_cb progress_cb;
3855 struct got_pathlist_head *merged_paths;
3858 static const struct got_error *
3859 collect_merged_paths(void *arg, unsigned char status, const char *path)
3861 const struct got_error *err;
3862 struct collect_merged_paths_arg *a = arg;
3864 struct got_pathlist_entry *new;
3866 err = (*a->progress_cb)(a->progress_arg, status, path);
3870 if (status != GOT_STATUS_MERGE &&
3871 status != GOT_STATUS_ADD &&
3872 status != GOT_STATUS_DELETE &&
3873 status != GOT_STATUS_CONFLICT)
3878 return got_error_from_errno("strdup");
3880 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
3881 if (err || new == NULL)
3887 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
3889 struct got_pathlist_entry *pe;
3891 TAILQ_FOREACH(pe, merged_paths, entry)
3892 free((char *)pe->path);
3894 got_pathlist_free(merged_paths);
3897 static const struct got_error *
3898 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
3899 struct got_repository *repo)
3901 const struct got_error *err;
3902 struct got_reference *commit_ref = NULL;
3904 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3906 if (err->code != GOT_ERR_NOT_REF)
3908 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
3911 err = got_ref_write(commit_ref, repo);
3915 struct got_object_id *stored_id;
3918 err = got_ref_resolve(&stored_id, repo, commit_ref);
3921 cmp = got_object_id_cmp(commit_id, stored_id);
3924 err = got_error(GOT_ERR_REBASE_COMMITID);
3930 got_ref_close(commit_ref);
3934 static const struct got_error *
3935 rebase_merge_files(struct got_pathlist_head *merged_paths,
3936 const char *commit_ref_name, struct got_worktree *worktree,
3937 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
3938 struct got_object_id *commit_id, struct got_repository *repo,
3939 got_worktree_checkout_cb progress_cb, void *progress_arg,
3940 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3942 const struct got_error *err;
3943 struct got_reference *commit_ref = NULL;
3944 struct collect_merged_paths_arg cmp_arg;
3945 char *fileindex_path;
3947 /* Work tree is locked/unlocked during rebase preparation/teardown. */
3949 err = get_fileindex_path(&fileindex_path, worktree);
3953 cmp_arg.progress_cb = progress_cb;
3954 cmp_arg.progress_arg = progress_arg;
3955 cmp_arg.merged_paths = merged_paths;
3956 err = merge_files(worktree, fileindex, fileindex_path,
3957 parent_commit_id, commit_id, repo, collect_merged_paths,
3958 &cmp_arg, cancel_cb, cancel_arg);
3960 got_ref_close(commit_ref);
3964 const struct got_error *
3965 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
3966 struct got_worktree *worktree, struct got_fileindex *fileindex,
3967 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
3968 struct got_repository *repo,
3969 got_worktree_checkout_cb progress_cb, void *progress_arg,
3970 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3972 const struct got_error *err;
3973 char *commit_ref_name;
3975 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3979 err = store_commit_id(commit_ref_name, commit_id, repo);
3983 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
3984 fileindex, parent_commit_id, commit_id, repo, progress_cb,
3985 progress_arg, cancel_cb, cancel_arg);
3987 free(commit_ref_name);
3991 const struct got_error *
3992 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
3993 struct got_worktree *worktree, struct got_fileindex *fileindex,
3994 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
3995 struct got_repository *repo,
3996 got_worktree_checkout_cb progress_cb, void *progress_arg,
3997 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3999 const struct got_error *err;
4000 char *commit_ref_name;
4002 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4006 err = store_commit_id(commit_ref_name, commit_id, repo);
4010 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4011 fileindex, parent_commit_id, commit_id, repo, progress_cb,
4012 progress_arg, cancel_cb, cancel_arg);
4014 free(commit_ref_name);
4018 static const struct got_error *
4019 rebase_commit(struct got_object_id **new_commit_id,
4020 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4021 struct got_worktree *worktree, struct got_fileindex *fileindex,
4022 struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4023 const char *new_logmsg, struct got_repository *repo)
4025 const struct got_error *err, *sync_err;
4026 struct got_pathlist_head commitable_paths;
4027 struct collect_commitables_arg cc_arg;
4028 char *fileindex_path = NULL;
4029 struct got_reference *head_ref = NULL;
4030 struct got_object_id *head_commit_id = NULL;
4031 char *logmsg = NULL;
4033 TAILQ_INIT(&commitable_paths);
4034 *new_commit_id = NULL;
4036 /* Work tree is locked/unlocked during rebase preparation/teardown. */
4038 err = get_fileindex_path(&fileindex_path, worktree);
4042 cc_arg.commitable_paths = &commitable_paths;
4043 cc_arg.worktree = worktree;
4046 * If possible get the status of individual files directly to
4047 * avoid crawling the entire work tree once per rebased commit.
4048 * TODO: Ideally, merged_paths would contain a list of commitables
4049 * we could use so we could skip worktree_status() entirely.
4052 struct got_pathlist_entry *pe;
4053 if (TAILQ_EMPTY(merged_paths)) {
4054 err = got_error(GOT_ERR_NO_MERGED_PATHS);
4057 TAILQ_FOREACH(pe, merged_paths, entry) {
4058 err = worktree_status(worktree, pe->path, fileindex,
4059 repo, collect_commitables, &cc_arg, NULL, NULL);
4064 err = worktree_status(worktree, "", fileindex, repo,
4065 collect_commitables, &cc_arg, NULL, NULL);
4070 if (TAILQ_EMPTY(&commitable_paths)) {
4071 /* No-op change; commit will be elided. */
4072 err = got_ref_delete(commit_ref, repo);
4075 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4079 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4083 err = got_ref_resolve(&head_commit_id, repo, head_ref);
4088 logmsg = strdup(new_logmsg);
4090 logmsg = strdup(got_object_commit_get_logmsg(orig_commit));
4092 return got_error_from_errno("strdup");
4094 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4095 worktree, NULL, got_object_commit_get_author(orig_commit),
4096 got_object_commit_get_committer(orig_commit),
4097 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4101 err = got_ref_change_ref(tmp_branch, *new_commit_id);
4105 err = got_ref_delete(commit_ref, repo);
4109 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4111 sync_err = sync_fileindex(fileindex, fileindex_path);
4112 if (sync_err && err == NULL)
4115 free(fileindex_path);
4116 free(head_commit_id);
4118 got_ref_close(head_ref);
4120 free(*new_commit_id);
4121 *new_commit_id = NULL;
4126 const struct got_error *
4127 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4128 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4129 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4130 struct got_commit_object *orig_commit,
4131 struct got_object_id *orig_commit_id, struct got_repository *repo)
4133 const struct got_error *err;
4134 char *commit_ref_name;
4135 struct got_reference *commit_ref = NULL;
4136 struct got_object_id *commit_id = NULL;
4138 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4142 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4145 err = got_ref_resolve(&commit_id, repo, commit_ref);
4148 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4149 err = got_error(GOT_ERR_REBASE_COMMITID);
4153 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4154 worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4157 got_ref_close(commit_ref);
4158 free(commit_ref_name);
4163 const struct got_error *
4164 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4165 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4166 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4167 struct got_commit_object *orig_commit,
4168 struct got_object_id *orig_commit_id, const char *new_logmsg,
4169 struct got_repository *repo)
4171 const struct got_error *err;
4172 char *commit_ref_name;
4173 struct got_reference *commit_ref = NULL;
4174 struct got_object_id *commit_id = NULL;
4176 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4180 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4183 err = got_ref_resolve(&commit_id, repo, commit_ref);
4186 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4187 err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4191 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4192 worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4195 got_ref_close(commit_ref);
4196 free(commit_ref_name);
4201 const struct got_error *
4202 got_worktree_rebase_postpone(struct got_worktree *worktree,
4203 struct got_fileindex *fileindex)
4206 got_fileindex_free(fileindex);
4207 return lock_worktree(worktree, LOCK_SH);
4210 static const struct got_error *
4211 delete_ref(const char *name, struct got_repository *repo)
4213 const struct got_error *err;
4214 struct got_reference *ref;
4216 err = got_ref_open(&ref, repo, name, 0);
4218 if (err->code == GOT_ERR_NOT_REF)
4223 err = got_ref_delete(ref, repo);
4228 static const struct got_error *
4229 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4231 const struct got_error *err;
4232 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4233 char *branch_ref_name = NULL, *commit_ref_name = NULL;
4235 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4238 err = delete_ref(tmp_branch_name, repo);
4242 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4245 err = delete_ref(new_base_branch_ref_name, repo);
4249 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4252 err = delete_ref(branch_ref_name, repo);
4256 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4259 err = delete_ref(commit_ref_name, repo);
4264 free(tmp_branch_name);
4265 free(new_base_branch_ref_name);
4266 free(branch_ref_name);
4267 free(commit_ref_name);
4271 const struct got_error *
4272 got_worktree_rebase_complete(struct got_worktree *worktree,
4273 struct got_fileindex *fileindex, struct got_reference *new_base_branch,
4274 struct got_reference *tmp_branch, struct got_reference *rebased_branch,
4275 struct got_repository *repo)
4277 const struct got_error *err, *unlockerr;
4278 struct got_object_id *new_head_commit_id = NULL;
4280 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4284 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
4288 err = got_ref_write(rebased_branch, repo);
4292 err = got_worktree_set_head_ref(worktree, rebased_branch);
4296 err = delete_rebase_refs(worktree, repo);
4299 got_fileindex_free(fileindex);
4300 free(new_head_commit_id);
4301 unlockerr = lock_worktree(worktree, LOCK_SH);
4302 if (unlockerr && err == NULL)
4307 struct collect_revertible_paths_arg {
4308 struct got_pathlist_head *revertible_paths;
4309 struct got_worktree *worktree;
4312 static const struct got_error *
4313 collect_revertible_paths(void *arg, unsigned char status, const char *relpath,
4314 struct got_object_id *blob_id, struct got_object_id *commit_id)
4316 struct collect_revertible_paths_arg *a = arg;
4317 const struct got_error *err = NULL;
4318 struct got_pathlist_entry *new = NULL;
4321 if (status != GOT_STATUS_ADD &&
4322 status != GOT_STATUS_DELETE &&
4323 status != GOT_STATUS_MODIFY &&
4324 status != GOT_STATUS_CONFLICT &&
4325 status != GOT_STATUS_MISSING)
4328 if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
4329 return got_error_from_errno("asprintf");
4331 err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
4332 if (err || new == NULL)
4337 const struct got_error *
4338 got_worktree_rebase_abort(struct got_worktree *worktree,
4339 struct got_fileindex *fileindex, struct got_repository *repo,
4340 struct got_reference *new_base_branch,
4341 got_worktree_checkout_cb progress_cb, void *progress_arg)
4343 const struct got_error *err, *unlockerr, *sync_err;
4344 struct got_reference *resolved = NULL;
4345 struct got_object_id *commit_id = NULL;
4346 char *fileindex_path = NULL;
4347 struct got_pathlist_head revertible_paths;
4348 struct got_pathlist_entry *pe;
4349 struct collect_revertible_paths_arg crp_arg;
4350 struct got_object_id *tree_id = NULL;
4352 TAILQ_INIT(&revertible_paths);
4354 err = lock_worktree(worktree, LOCK_EX);
4358 err = got_ref_open(&resolved, repo,
4359 got_ref_get_symref_target(new_base_branch), 0);
4363 err = got_worktree_set_head_ref(worktree, resolved);
4368 * XXX commits to the base branch could have happened while
4369 * we were busy rebasing; should we store the original commit ID
4370 * when rebase begins and read it back here?
4372 err = got_ref_resolve(&commit_id, repo, resolved);
4376 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4380 err = got_object_id_by_path(&tree_id, repo,
4381 worktree->base_commit_id, worktree->path_prefix);
4385 err = delete_rebase_refs(worktree, repo);
4389 err = get_fileindex_path(&fileindex_path, worktree);
4393 crp_arg.revertible_paths = &revertible_paths;
4394 crp_arg.worktree = worktree;
4395 err = worktree_status(worktree, "", fileindex, repo,
4396 collect_revertible_paths, &crp_arg, NULL, NULL);
4400 TAILQ_FOREACH(pe, &revertible_paths, entry) {
4401 err = revert_file(worktree, fileindex, pe->path,
4402 progress_cb, progress_arg, repo);
4407 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4408 repo, progress_cb, progress_arg, NULL, NULL);
4410 sync_err = sync_fileindex(fileindex, fileindex_path);
4411 if (sync_err && err == NULL)
4414 got_ref_close(resolved);
4418 got_fileindex_free(fileindex);
4419 free(fileindex_path);
4420 TAILQ_FOREACH(pe, &revertible_paths, entry)
4421 free((char *)pe->path);
4422 got_pathlist_free(&revertible_paths);
4424 unlockerr = lock_worktree(worktree, LOCK_SH);
4425 if (unlockerr && err == NULL)
4430 const struct got_error *
4431 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
4432 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
4433 struct got_fileindex **fileindex, struct got_worktree *worktree,
4434 struct got_repository *repo)
4436 const struct got_error *err = NULL;
4437 char *tmp_branch_name = NULL;
4438 char *branch_ref_name = NULL;
4439 char *base_commit_ref_name = NULL;
4440 char *fileindex_path = NULL;
4441 struct check_rebase_ok_arg ok_arg;
4442 struct got_reference *wt_branch = NULL;
4443 struct got_reference *base_commit_ref = NULL;
4447 *base_commit_id = NULL;
4450 err = lock_worktree(worktree, LOCK_EX);
4454 err = open_fileindex(fileindex, &fileindex_path, worktree);
4458 ok_arg.worktree = worktree;
4460 ok_arg.rebase_in_progress = 0;
4461 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4466 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4470 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4474 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4479 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4484 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
4488 err = got_ref_write(*branch_ref, repo);
4492 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
4493 worktree->base_commit_id);
4496 err = got_ref_write(base_commit_ref, repo);
4499 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
4500 if (*base_commit_id == NULL) {
4501 err = got_error_from_errno("got_object_id_dup");
4505 err = got_ref_alloc(tmp_branch, tmp_branch_name,
4506 worktree->base_commit_id);
4509 err = got_ref_write(*tmp_branch, repo);
4513 err = got_worktree_set_head_ref(worktree, *tmp_branch);
4517 free(fileindex_path);
4518 free(tmp_branch_name);
4519 free(branch_ref_name);
4520 free(base_commit_ref_name);
4522 got_ref_close(wt_branch);
4525 got_ref_close(*branch_ref);
4529 got_ref_close(*tmp_branch);
4532 free(*base_commit_id);
4534 got_fileindex_free(*fileindex);
4537 lock_worktree(worktree, LOCK_SH);
4542 const struct got_error *
4543 got_worktree_histedit_postpone(struct got_worktree *worktree,
4544 struct got_fileindex *fileindex)
4547 got_fileindex_free(fileindex);
4548 return lock_worktree(worktree, LOCK_SH);
4551 const struct got_error *
4552 got_worktree_histedit_in_progress(int *in_progress,
4553 struct got_worktree *worktree)
4555 const struct got_error *err;
4556 char *tmp_branch_name = NULL;
4558 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4562 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4563 free(tmp_branch_name);
4567 const struct got_error *
4568 got_worktree_histedit_continue(struct got_object_id **commit_id,
4569 struct got_reference **tmp_branch, struct got_reference **branch_ref,
4570 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
4571 struct got_worktree *worktree, struct got_repository *repo)
4573 const struct got_error *err;
4574 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
4575 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4576 struct got_reference *commit_ref = NULL;
4577 struct got_reference *base_commit_ref = NULL;
4578 char *fileindex_path = NULL;
4582 *base_commit_id = NULL;
4585 err = lock_worktree(worktree, LOCK_EX);
4589 err = open_fileindex(fileindex, &fileindex_path, worktree);
4593 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4597 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4601 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4605 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4610 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
4614 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4617 err = got_ref_resolve(commit_id, repo, commit_ref);
4621 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
4624 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
4628 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4632 free(commit_ref_name);
4633 free(branch_ref_name);
4634 free(fileindex_path);
4636 got_ref_close(commit_ref);
4637 if (base_commit_ref)
4638 got_ref_close(base_commit_ref);
4642 free(*base_commit_id);
4643 *base_commit_id = NULL;
4645 got_ref_close(*tmp_branch);
4649 got_fileindex_free(*fileindex);
4652 lock_worktree(worktree, LOCK_EX);
4657 static const struct got_error *
4658 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
4660 const struct got_error *err;
4661 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
4662 char *branch_ref_name = NULL, *commit_ref_name = NULL;
4664 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4667 err = delete_ref(tmp_branch_name, repo);
4671 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4675 err = delete_ref(base_commit_ref_name, repo);
4679 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4682 err = delete_ref(branch_ref_name, repo);
4686 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4689 err = delete_ref(commit_ref_name, repo);
4693 free(tmp_branch_name);
4694 free(base_commit_ref_name);
4695 free(branch_ref_name);
4696 free(commit_ref_name);
4700 const struct got_error *
4701 got_worktree_histedit_abort(struct got_worktree *worktree,
4702 struct got_fileindex *fileindex, struct got_repository *repo,
4703 struct got_reference *branch, struct got_object_id *base_commit_id,
4704 got_worktree_checkout_cb progress_cb, void *progress_arg)
4706 const struct got_error *err, *unlockerr, *sync_err;
4707 struct got_reference *resolved = NULL;
4708 char *fileindex_path = NULL;
4709 struct got_pathlist_head revertible_paths;
4710 struct got_pathlist_entry *pe;
4711 struct collect_revertible_paths_arg crp_arg;
4712 struct got_object_id *tree_id = NULL;
4714 TAILQ_INIT(&revertible_paths);
4716 err = lock_worktree(worktree, LOCK_EX);
4720 err = got_ref_open(&resolved, repo,
4721 got_ref_get_symref_target(branch), 0);
4725 err = got_worktree_set_head_ref(worktree, resolved);
4729 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
4733 err = got_object_id_by_path(&tree_id, repo, base_commit_id,
4734 worktree->path_prefix);
4738 err = delete_histedit_refs(worktree, repo);
4742 err = get_fileindex_path(&fileindex_path, worktree);
4746 crp_arg.revertible_paths = &revertible_paths;
4747 crp_arg.worktree = worktree;
4748 err = worktree_status(worktree, "", fileindex, repo,
4749 collect_revertible_paths, &crp_arg, NULL, NULL);
4753 TAILQ_FOREACH(pe, &revertible_paths, entry) {
4754 err = revert_file(worktree, fileindex, pe->path,
4755 progress_cb, progress_arg, repo);
4760 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4761 repo, progress_cb, progress_arg, NULL, NULL);
4763 sync_err = sync_fileindex(fileindex, fileindex_path);
4764 if (sync_err && err == NULL)
4767 got_ref_close(resolved);
4769 free(fileindex_path);
4770 TAILQ_FOREACH(pe, &revertible_paths, entry)
4771 free((char *)pe->path);
4772 got_pathlist_free(&revertible_paths);
4774 unlockerr = lock_worktree(worktree, LOCK_SH);
4775 if (unlockerr && err == NULL)
4780 const struct got_error *
4781 got_worktree_histedit_complete(struct got_worktree *worktree,
4782 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4783 struct got_reference *edited_branch, struct got_repository *repo)
4785 const struct got_error *err, *unlockerr;
4786 struct got_object_id *new_head_commit_id = NULL;
4787 struct got_reference *resolved = NULL;
4789 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4793 err = got_ref_open(&resolved, repo,
4794 got_ref_get_symref_target(edited_branch), 0);
4798 err = got_ref_change_ref(resolved, new_head_commit_id);
4802 err = got_ref_write(resolved, repo);
4806 err = got_worktree_set_head_ref(worktree, resolved);
4810 err = delete_histedit_refs(worktree, repo);
4813 got_fileindex_free(fileindex);
4814 free(new_head_commit_id);
4815 unlockerr = lock_worktree(worktree, LOCK_SH);
4816 if (unlockerr && err == NULL)
4821 const struct got_error *
4822 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
4823 struct got_object_id *commit_id, struct got_repository *repo)
4825 const struct got_error *err;
4826 char *commit_ref_name;
4828 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4832 err = store_commit_id(commit_ref_name, commit_id, repo);
4836 err = delete_ref(commit_ref_name, repo);
4838 free(commit_ref_name);