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_path(path, 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 (fstat(fd, &sb) != 0) {
146 err = got_error_from_errno2("fstat", 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_path(path, GOT_ERR_WORKTREE_META));
161 if ((*content)[sb.st_size - 1] != '\n') {
162 err = got_error_path(path, 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_msg(GOT_ERR_WORKTREE_META,
359 "could not parse work tree format version number");
362 if (version != GOT_WORKTREE_FORMAT_VERSION) {
363 err = got_error(GOT_ERR_WORKTREE_VERS);
367 *worktree = calloc(1, sizeof(**worktree));
368 if (*worktree == NULL) {
369 err = got_error_from_errno("calloc");
372 (*worktree)->lockfd = -1;
374 (*worktree)->root_path = strdup(path);
375 if ((*worktree)->root_path == NULL) {
376 err = got_error_from_errno("strdup");
379 err = read_meta_file(&(*worktree)->repo_path, path_got,
380 GOT_WORKTREE_REPOSITORY);
384 err = read_meta_file(&(*worktree)->path_prefix, path_got,
385 GOT_WORKTREE_PATH_PREFIX);
389 err = read_meta_file(&base_commit_id_str, path_got,
390 GOT_WORKTREE_BASE_COMMIT);
394 err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
397 uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
398 if (uuid_status != uuid_s_ok) {
399 err = got_error_uuid(uuid_status);
403 err = got_repo_open(&repo, (*worktree)->repo_path);
407 err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
412 err = read_meta_file(&(*worktree)->head_ref_name, path_got,
413 GOT_WORKTREE_HEAD_REF);
416 got_repo_close(repo);
419 free(base_commit_id_str);
425 if (*worktree != NULL)
426 got_worktree_close(*worktree);
429 (*worktree)->lockfd = fd;
434 const struct got_error *
435 got_worktree_open(struct got_worktree **worktree, const char *path)
437 const struct got_error *err = NULL;
440 err = open_worktree(worktree, path);
441 if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
445 path = dirname(path);
447 return got_error_from_errno2("dirname", path);
448 } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
450 return got_error(GOT_ERR_NOT_WORKTREE);
453 const struct got_error *
454 got_worktree_close(struct got_worktree *worktree)
456 const struct got_error *err = NULL;
457 free(worktree->root_path);
458 free(worktree->repo_path);
459 free(worktree->path_prefix);
460 free(worktree->base_commit_id);
461 free(worktree->head_ref_name);
462 if (worktree->lockfd != -1)
463 if (close(worktree->lockfd) != 0)
464 err = got_error_from_errno2("close",
465 got_worktree_get_root_path(worktree));
471 got_worktree_get_root_path(struct got_worktree *worktree)
473 return worktree->root_path;
477 got_worktree_get_repo_path(struct got_worktree *worktree)
479 return worktree->repo_path;
483 got_worktree_get_path_prefix(struct got_worktree *worktree)
485 return worktree->path_prefix;
488 const struct got_error *
489 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
490 const char *path_prefix)
492 char *absprefix = NULL;
494 if (!got_path_is_absolute(path_prefix)) {
495 if (asprintf(&absprefix, "/%s", path_prefix) == -1)
496 return got_error_from_errno("asprintf");
498 *match = (strcmp(absprefix ? absprefix : path_prefix,
499 worktree->path_prefix) == 0);
505 got_worktree_get_head_ref_name(struct got_worktree *worktree)
507 return worktree->head_ref_name;
510 const struct got_error *
511 got_worktree_set_head_ref(struct got_worktree *worktree,
512 struct got_reference *head_ref)
514 const struct got_error *err = NULL;
515 char *path_got = NULL, *head_ref_name = NULL;
517 if (asprintf(&path_got, "%s/%s", worktree->root_path,
518 GOT_WORKTREE_GOT_DIR) == -1) {
519 err = got_error_from_errno("asprintf");
524 head_ref_name = strdup(got_ref_get_name(head_ref));
525 if (head_ref_name == NULL) {
526 err = got_error_from_errno("strdup");
530 err = write_head_ref(path_got, head_ref);
534 free(worktree->head_ref_name);
535 worktree->head_ref_name = head_ref_name;
543 struct got_object_id *
544 got_worktree_get_base_commit_id(struct got_worktree *worktree)
546 return worktree->base_commit_id;
549 const struct got_error *
550 got_worktree_set_base_commit_id(struct got_worktree *worktree,
551 struct got_repository *repo, struct got_object_id *commit_id)
553 const struct got_error *err;
554 struct got_object *obj = NULL;
556 char *path_got = NULL;
558 if (asprintf(&path_got, "%s/%s", worktree->root_path,
559 GOT_WORKTREE_GOT_DIR) == -1) {
560 err = got_error_from_errno("asprintf");
565 err = got_object_open(&obj, repo, commit_id);
569 if (obj->type != GOT_OBJ_TYPE_COMMIT) {
570 err = got_error(GOT_ERR_OBJ_TYPE);
574 /* Record our base commit. */
575 err = got_object_id_str(&id_str, commit_id);
578 err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
582 free(worktree->base_commit_id);
583 worktree->base_commit_id = got_object_id_dup(commit_id);
584 if (worktree->base_commit_id == NULL) {
585 err = got_error_from_errno("got_object_id_dup");
590 got_object_close(obj);
596 static const struct got_error *
597 lock_worktree(struct got_worktree *worktree, int operation)
599 if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
600 return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
601 : got_error_from_errno2("flock",
602 got_worktree_get_root_path(worktree)));
606 static const struct got_error *
607 add_dir_on_disk(struct got_worktree *worktree, const char *path)
609 const struct got_error *err = NULL;
612 if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
613 return got_error_from_errno("asprintf");
615 err = got_path_mkdir(abspath);
616 if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
619 if (lstat(abspath, &sb) == -1) {
620 err = got_error_from_errno2("lstat", abspath);
621 } else if (!S_ISDIR(sb.st_mode)) {
622 /* TODO directory is obstructed; do something */
623 err = got_error(GOT_ERR_FILE_OBSTRUCTED);
630 static const struct got_error *
631 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
633 const struct got_error *err = NULL;
636 size_t flen1 = 0, flen2 = 0;
641 flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
642 if (flen1 == 0 && ferror(f1)) {
643 err = got_error_from_errno("fread");
646 flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
647 if (flen2 == 0 && ferror(f2)) {
648 err = got_error_from_errno("fread");
655 } else if (flen2 == 0) {
659 } else if (flen1 == flen2) {
660 if (memcmp(fbuf1, fbuf2, flen2) != 0) {
673 static const struct got_error *
674 check_files_equal(int *same, const char *f1_path, const char *f2_path)
676 const struct got_error *err = NULL;
679 FILE *f1 = NULL, *f2 = NULL;
683 if (lstat(f1_path, &sb) != 0) {
684 err = got_error_from_errno2("lstat", f1_path);
689 if (lstat(f2_path, &sb) != 0) {
690 err = got_error_from_errno2("lstat", f2_path);
695 if (size1 != size2) {
700 f1 = fopen(f1_path, "r");
702 return got_error_from_errno2("open", f1_path);
704 f2 = fopen(f2_path, "r");
706 err = got_error_from_errno2("open", f2_path);
710 err = check_file_contents_equal(same, f1, f2);
712 if (f1 && fclose(f1) != 0 && err == NULL)
713 err = got_error_from_errno("fclose");
714 if (f2 && fclose(f2) != 0 && err == NULL)
715 err = got_error_from_errno("fclose");
721 * Perform a 3-way merge where blob_orig acts as the common ancestor,
722 * the file at deriv_path acts as the first derived version, and the
723 * file on disk acts as the second derived version.
725 static const struct got_error *
726 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
727 struct got_blob_object *blob_orig, const char *ondisk_path,
728 const char *path, uint16_t st_mode, const char *deriv_path,
729 const char *label_deriv, struct got_repository *repo,
730 got_worktree_checkout_cb progress_cb, void *progress_arg)
732 const struct got_error *err = NULL;
735 char *blob_orig_path = NULL;
736 char *merged_path = NULL, *base_path = NULL;
740 *local_changes_subsumed = 0;
742 parent = dirname(ondisk_path);
744 return got_error_from_errno2("dirname", ondisk_path);
746 if (asprintf(&base_path, "%s/got-merged", parent) == -1)
747 return got_error_from_errno("asprintf");
749 err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
754 if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
755 err = got_error_from_errno("asprintf");
760 err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
764 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
770 * If the file has no blob, this is an "add vs add" conflict,
771 * and we simply use an empty ancestor file to make both files
772 * appear in the merged result in their entirety.
776 err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
777 blob_orig_path, ondisk_path, label_deriv, path);
781 err = (*progress_cb)(progress_arg,
782 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
786 if (fsync(merged_fd) != 0) {
787 err = got_error_from_errno("fsync");
791 /* Check if a clean merge has subsumed all local changes. */
792 if (overlapcnt == 0) {
793 err = check_files_equal(local_changes_subsumed, deriv_path,
799 if (chmod(merged_path, st_mode) != 0) {
800 err = got_error_from_errno2("chmod", merged_path);
804 if (rename(merged_path, ondisk_path) != 0) {
805 err = got_error_from_errno3("rename", merged_path,
812 if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
813 err = got_error_from_errno("close");
814 if (f_orig && fclose(f_orig) != 0 && err == NULL)
815 err = got_error_from_errno("fclose");
818 if (blob_orig_path) {
819 unlink(blob_orig_path);
820 free(blob_orig_path);
826 * Perform a 3-way merge where blob_orig acts as the common ancestor,
827 * blob_deriv acts as the first derived version, and the file on disk
828 * acts as the second derived version.
830 static const struct got_error *
831 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
832 struct got_blob_object *blob_orig, const char *ondisk_path,
833 const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
834 struct got_object_id *deriv_base_commit_id,
835 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
838 const struct got_error *err = NULL;
839 FILE *f_deriv = NULL;
840 char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
841 char *label_deriv = NULL, *parent;
843 *local_changes_subsumed = 0;
845 parent = dirname(ondisk_path);
847 return got_error_from_errno2("dirname", ondisk_path);
850 if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
851 err = got_error_from_errno("asprintf");
856 err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
859 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
864 err = got_object_id_str(&id_str, deriv_base_commit_id);
867 if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
868 err = got_error_from_errno("asprintf");
872 err = merge_file(local_changes_subsumed, worktree, blob_orig,
873 ondisk_path, path, st_mode, blob_deriv_path, label_deriv,
874 repo, progress_cb, progress_arg);
876 if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
877 err = got_error_from_errno("fclose");
879 if (blob_deriv_path) {
880 unlink(blob_deriv_path);
881 free(blob_deriv_path);
888 static const struct got_error *
889 update_blob_fileindex_entry(struct got_worktree *worktree,
890 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
891 const char *ondisk_path, const char *path, struct got_blob_object *blob,
892 int update_timestamps)
894 const struct got_error *err = NULL;
897 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
899 err = got_fileindex_entry_update(ie, ondisk_path,
900 blob->id.sha1, worktree->base_commit_id->sha1,
903 struct got_fileindex_entry *new_ie;
904 err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
905 path, blob->id.sha1, worktree->base_commit_id->sha1);
907 err = got_fileindex_entry_add(fileindex, new_ie);
912 static const struct got_error *
913 install_blob(struct got_worktree *worktree, const char *ondisk_path,
914 const char *path, uint16_t te_mode, uint16_t st_mode,
915 struct got_blob_object *blob, int restoring_missing_file,
916 int reverting_versioned_file, struct got_repository *repo,
917 got_worktree_checkout_cb progress_cb, void *progress_arg)
919 const struct got_error *err = NULL;
923 char *tmppath = NULL;
925 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
926 GOT_DEFAULT_FILE_MODE);
928 if (errno == ENOENT) {
929 char *parent = dirname(path);
931 return got_error_from_errno2("dirname", path);
932 err = add_dir_on_disk(worktree, parent);
935 fd = open(ondisk_path,
936 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
937 GOT_DEFAULT_FILE_MODE);
939 return got_error_from_errno2("open",
941 } else if (errno == EEXIST) {
942 if (!S_ISREG(st_mode)) {
943 /* TODO file is obstructed; do something */
944 err = got_error(GOT_ERR_FILE_OBSTRUCTED);
947 err = got_opentemp_named_fd(&tmppath, &fd,
954 return got_error_from_errno2("open", ondisk_path);
957 if (restoring_missing_file)
958 err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
959 else if (reverting_versioned_file)
960 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
962 err = (*progress_cb)(progress_arg,
963 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
967 hdrlen = got_object_blob_get_hdrlen(blob);
969 const uint8_t *buf = got_object_blob_get_read_buf(blob);
970 err = got_object_blob_read_block(&len, blob);
974 /* Skip blob object header first time around. */
975 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
977 err = got_error_from_errno("write");
979 } else if (outlen != len - hdrlen) {
980 err = got_error(GOT_ERR_IO);
987 if (fsync(fd) != 0) {
988 err = got_error_from_errno("fsync");
993 if (rename(tmppath, ondisk_path) != 0) {
994 err = got_error_from_errno3("rename", tmppath,
1001 if (te_mode & S_IXUSR) {
1002 if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
1003 err = got_error_from_errno2("chmod", ondisk_path);
1007 if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
1008 err = got_error_from_errno2("chmod", ondisk_path);
1014 if (fd != -1 && close(fd) != 0 && err == NULL)
1015 err = got_error_from_errno("close");
1020 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1021 static const struct got_error *
1022 get_modified_file_content_status(unsigned char *status, FILE *f)
1024 const struct got_error *err = NULL;
1025 const char *markers[3] = {
1026 GOT_DIFF_CONFLICT_MARKER_BEGIN,
1027 GOT_DIFF_CONFLICT_MARKER_SEP,
1028 GOT_DIFF_CONFLICT_MARKER_END
1033 const char delim[3] = {'\0', '\0', '\0'};
1035 while (*status == GOT_STATUS_MODIFY) {
1036 line = fparseln(f, &len, NULL, delim, 0);
1040 err = got_ferror(f, GOT_ERR_IO);
1044 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1045 if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1047 *status = GOT_STATUS_CONFLICT;
1057 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1059 return !(ie->ctime_sec == sb->st_ctime &&
1060 ie->ctime_nsec == sb->st_ctimensec &&
1061 ie->mtime_sec == sb->st_mtime &&
1062 ie->mtime_nsec == sb->st_mtimensec &&
1063 ie->size == (sb->st_size & 0xffffffff));
1066 static unsigned char
1067 get_staged_status(struct got_fileindex_entry *ie)
1069 switch (got_fileindex_entry_stage_get(ie)) {
1070 case GOT_FILEIDX_STAGE_ADD:
1071 return GOT_STATUS_ADD;
1072 case GOT_FILEIDX_STAGE_DELETE:
1073 return GOT_STATUS_DELETE;
1074 case GOT_FILEIDX_STAGE_MODIFY:
1075 return GOT_STATUS_MODIFY;
1077 return GOT_STATUS_NO_CHANGE;
1081 static const struct got_error *
1082 get_file_status(unsigned char *status, struct stat *sb,
1083 struct got_fileindex_entry *ie, const char *abspath,
1084 struct got_repository *repo)
1086 const struct got_error *err = NULL;
1087 struct got_object_id id;
1091 struct got_blob_object *blob = NULL;
1093 unsigned char staged_status = get_staged_status(ie);
1095 *status = GOT_STATUS_NO_CHANGE;
1097 if (lstat(abspath, sb) == -1) {
1098 if (errno == ENOENT) {
1099 if (got_fileindex_entry_has_file_on_disk(ie))
1100 *status = GOT_STATUS_MISSING;
1102 *status = GOT_STATUS_DELETE;
1105 return got_error_from_errno2("lstat", abspath);
1108 if (!S_ISREG(sb->st_mode)) {
1109 *status = GOT_STATUS_OBSTRUCTED;
1113 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1114 *status = GOT_STATUS_DELETE;
1116 } else if (!got_fileindex_entry_has_blob(ie) &&
1117 staged_status != GOT_STATUS_ADD) {
1118 *status = GOT_STATUS_ADD;
1122 if (!stat_info_differs(ie, sb))
1125 if (staged_status == GOT_STATUS_MODIFY ||
1126 staged_status == GOT_STATUS_ADD)
1127 memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1129 memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1131 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1135 f = fopen(abspath, "r");
1137 err = got_error_from_errno2("fopen", abspath);
1140 hdrlen = got_object_blob_get_hdrlen(blob);
1142 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1143 err = got_object_blob_read_block(&blen, blob);
1146 /* Skip length of blob object header first time around. */
1147 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1148 if (flen == 0 && ferror(f)) {
1149 err = got_error_from_errno("fread");
1154 *status = GOT_STATUS_MODIFY;
1156 } else if (flen == 0) {
1158 *status = GOT_STATUS_MODIFY;
1160 } else if (blen - hdrlen == flen) {
1161 /* Skip blob object header first time around. */
1162 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1163 *status = GOT_STATUS_MODIFY;
1167 *status = GOT_STATUS_MODIFY;
1173 if (*status == GOT_STATUS_MODIFY) {
1175 err = get_modified_file_content_status(status, f);
1179 got_object_blob_close(blob);
1186 * Update timestamps in the file index if a file is unmodified and
1187 * we had to run a full content comparison to find out.
1189 static const struct got_error *
1190 sync_timestamps(char *ondisk_path, unsigned char status,
1191 struct got_fileindex_entry *ie, struct stat *sb)
1193 if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1194 return got_fileindex_entry_update(ie, ondisk_path,
1195 ie->blob_sha1, ie->commit_sha1, 1);
1200 static const struct got_error *
1201 update_blob(struct got_worktree *worktree,
1202 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1203 struct got_tree_entry *te, const char *path,
1204 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1207 const struct got_error *err = NULL;
1208 struct got_blob_object *blob = NULL;
1210 unsigned char status = GOT_STATUS_NO_CHANGE;
1213 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1214 return got_error_from_errno("asprintf");
1217 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1218 err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1221 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1224 if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1225 sb.st_mode = got_fileindex_perms_to_st(ie);
1227 sb.st_mode = GOT_DEFAULT_FILE_MODE;
1229 if (status == GOT_STATUS_OBSTRUCTED) {
1230 err = (*progress_cb)(progress_arg, status, path);
1234 if (ie && status != GOT_STATUS_MISSING) {
1235 if (got_fileindex_entry_has_commit(ie) &&
1236 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1237 SHA1_DIGEST_LENGTH) == 0) {
1238 err = sync_timestamps(ondisk_path, status, ie, &sb);
1241 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1245 if (got_fileindex_entry_has_blob(ie) &&
1246 memcmp(ie->blob_sha1, te->id->sha1,
1247 SHA1_DIGEST_LENGTH) == 0) {
1248 err = sync_timestamps(ondisk_path, status, ie, &sb);
1253 err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1257 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1258 int update_timestamps;
1259 struct got_blob_object *blob2 = NULL;
1260 if (got_fileindex_entry_has_blob(ie)) {
1261 struct got_object_id id2;
1262 memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1263 err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1267 err = merge_blob(&update_timestamps, worktree, blob2,
1268 ondisk_path, path, sb.st_mode, blob,
1269 worktree->base_commit_id, repo,
1270 progress_cb, progress_arg);
1272 got_object_blob_close(blob2);
1274 * Do not update timestamps of files with local changes.
1275 * Otherwise, a future status walk would treat them as
1276 * unmodified files again.
1278 err = got_fileindex_entry_update(ie, ondisk_path,
1279 blob->id.sha1, worktree->base_commit_id->sha1,
1281 } else if (status == GOT_STATUS_DELETE) {
1282 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1285 err = update_blob_fileindex_entry(worktree, fileindex, ie,
1286 ondisk_path, path, blob, 0);
1290 err = install_blob(worktree, ondisk_path, path, te->mode,
1291 sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1292 repo, progress_cb, progress_arg);
1295 err = update_blob_fileindex_entry(worktree, fileindex, ie,
1296 ondisk_path, path, blob, 1);
1300 got_object_blob_close(blob);
1306 static const struct got_error *
1307 remove_ondisk_file(const char *root_path, const char *path)
1309 const struct got_error *err = NULL;
1310 char *ondisk_path = NULL;
1312 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1313 return got_error_from_errno("asprintf");
1315 if (unlink(ondisk_path) == -1) {
1316 if (errno != ENOENT)
1317 err = got_error_from_errno2("unlink", ondisk_path);
1319 char *parent = dirname(ondisk_path);
1320 while (parent && strcmp(parent, root_path) != 0) {
1321 if (rmdir(parent) == -1) {
1322 if (errno != ENOTEMPTY)
1323 err = got_error_from_errno2("rmdir",
1327 parent = dirname(parent);
1334 static const struct got_error *
1335 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1336 struct got_fileindex_entry *ie, struct got_repository *repo,
1337 got_worktree_checkout_cb progress_cb, void *progress_arg)
1339 const struct got_error *err = NULL;
1340 unsigned char status;
1344 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1345 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1347 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1349 return got_error_from_errno("asprintf");
1351 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1355 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1356 status == GOT_STATUS_ADD) {
1357 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1361 * Preserve the working file and change the deleted blob's
1362 * entry into a schedule-add entry.
1364 err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1369 err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1372 if (status == GOT_STATUS_NO_CHANGE) {
1373 err = remove_ondisk_file(worktree->root_path, ie->path);
1377 got_fileindex_entry_remove(fileindex, ie);
1383 struct diff_cb_arg {
1384 struct got_fileindex *fileindex;
1385 struct got_worktree *worktree;
1386 struct got_repository *repo;
1387 got_worktree_checkout_cb progress_cb;
1389 got_worktree_cancel_cb cancel_cb;
1393 static const struct got_error *
1394 diff_old_new(void *arg, struct got_fileindex_entry *ie,
1395 struct got_tree_entry *te, const char *parent_path)
1397 struct diff_cb_arg *a = arg;
1399 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1400 return got_error(GOT_ERR_CANCELLED);
1402 return update_blob(a->worktree, a->fileindex, ie, te,
1403 ie->path, a->repo, a->progress_cb, a->progress_arg);
1406 static const struct got_error *
1407 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1409 struct diff_cb_arg *a = arg;
1411 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1412 return got_error(GOT_ERR_CANCELLED);
1414 return delete_blob(a->worktree, a->fileindex, ie,
1415 a->repo, a->progress_cb, a->progress_arg);
1418 static const struct got_error *
1419 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1421 struct diff_cb_arg *a = arg;
1422 const struct got_error *err;
1425 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1426 return got_error(GOT_ERR_CANCELLED);
1428 if (asprintf(&path, "%s%s%s", parent_path,
1429 parent_path[0] ? "/" : "", te->name)
1431 return got_error_from_errno("asprintf");
1433 if (S_ISDIR(te->mode))
1434 err = add_dir_on_disk(a->worktree, path);
1436 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1437 a->repo, a->progress_cb, a->progress_arg);
1443 static const struct got_error *
1444 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1446 const struct got_error *err = NULL;
1447 char *uuidstr = NULL;
1448 uint32_t uuid_status;
1452 uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1453 if (uuid_status != uuid_s_ok)
1454 return got_error_uuid(uuid_status);
1456 if (asprintf(refname, "%s-%s", prefix, uuidstr)
1458 err = got_error_from_errno("asprintf");
1465 const struct got_error *
1466 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1468 return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1471 static const struct got_error *
1472 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1474 return get_ref_name(refname, worktree,
1475 GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1478 static const struct got_error *
1479 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1481 return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1484 static const struct got_error *
1485 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1487 return get_ref_name(refname, worktree,
1488 GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1491 static const struct got_error *
1492 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1494 return get_ref_name(refname, worktree,
1495 GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1498 static const struct got_error *
1499 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1501 return get_ref_name(refname, worktree,
1502 GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1505 static const struct got_error *
1506 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1508 return get_ref_name(refname, worktree,
1509 GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1512 static const struct got_error *
1513 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1515 return get_ref_name(refname, worktree,
1516 GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1519 static const struct got_error *
1520 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1522 return get_ref_name(refname, worktree,
1523 GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1526 const struct got_error *
1527 got_worktree_get_histedit_script_path(char **path,
1528 struct got_worktree *worktree)
1530 if (asprintf(path, "%s/%s/%s", worktree->root_path,
1531 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1533 return got_error_from_errno("asprintf");
1539 * Prevent Git's garbage collector from deleting our base commit by
1540 * setting a reference to our base commit's ID.
1542 static const struct got_error *
1543 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1545 const struct got_error *err = NULL;
1546 struct got_reference *ref = NULL;
1549 err = got_worktree_get_base_ref_name(&refname, worktree);
1553 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1557 err = got_ref_write(ref, repo);
1565 static const struct got_error *
1566 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1568 const struct got_error *err = NULL;
1570 if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1571 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1572 err = got_error_from_errno("asprintf");
1573 *fileindex_path = NULL;
1579 static const struct got_error *
1580 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1581 struct got_worktree *worktree)
1583 const struct got_error *err = NULL;
1586 *fileindex_path = NULL;
1587 *fileindex = got_fileindex_alloc();
1588 if (*fileindex == NULL)
1589 return got_error_from_errno("got_fileindex_alloc");
1591 err = get_fileindex_path(fileindex_path, worktree);
1595 index = fopen(*fileindex_path, "rb");
1596 if (index == NULL) {
1597 if (errno != ENOENT)
1598 err = got_error_from_errno2("fopen", *fileindex_path);
1600 err = got_fileindex_read(*fileindex, index);
1601 if (fclose(index) != 0 && err == NULL)
1602 err = got_error_from_errno("fclose");
1606 free(*fileindex_path);
1607 *fileindex_path = NULL;
1608 got_fileindex_free(*fileindex);
1614 struct bump_base_commit_id_arg {
1615 struct got_object_id *base_commit_id;
1618 const char *entry_name;
1619 got_worktree_checkout_cb progress_cb;
1623 /* Bump base commit ID of all files within an updated part of the work tree. */
1624 static const struct got_error *
1625 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1627 const struct got_error *err;
1628 struct bump_base_commit_id_arg *a = arg;
1630 if (a->entry_name) {
1631 if (strcmp(ie->path, a->path) != 0)
1633 } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1636 if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1637 SHA1_DIGEST_LENGTH) == 0)
1640 if (a->progress_cb) {
1641 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1646 memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1650 static const struct got_error *
1651 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1653 const struct got_error *err = NULL;
1654 char *new_fileindex_path = NULL;
1655 FILE *new_index = NULL;
1657 err = got_opentemp_named(&new_fileindex_path, &new_index,
1662 err = got_fileindex_write(fileindex, new_index);
1666 if (rename(new_fileindex_path, fileindex_path) != 0) {
1667 err = got_error_from_errno3("rename", new_fileindex_path,
1669 unlink(new_fileindex_path);
1674 free(new_fileindex_path);
1678 static const struct got_error *
1679 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1680 struct got_object_id **tree_id, const char *wt_relpath,
1681 struct got_worktree *worktree, struct got_repository *repo)
1683 const struct got_error *err = NULL;
1684 struct got_object_id *id = NULL;
1685 char *in_repo_path = NULL;
1686 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1688 *entry_type = GOT_OBJ_TYPE_ANY;
1689 *tree_relpath = NULL;
1692 if (wt_relpath[0] == '\0') {
1693 /* Check out all files within the work tree. */
1694 *entry_type = GOT_OBJ_TYPE_TREE;
1695 *tree_relpath = strdup("");
1696 if (*tree_relpath == NULL) {
1697 err = got_error_from_errno("strdup");
1700 err = got_object_id_by_path(tree_id, repo,
1701 worktree->base_commit_id, worktree->path_prefix);
1707 /* Check out a subset of files in the work tree. */
1709 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1710 is_root_wt ? "" : "/", wt_relpath) == -1) {
1711 err = got_error_from_errno("asprintf");
1715 err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1721 in_repo_path = NULL;
1723 err = got_object_get_type(entry_type, repo, id);
1727 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1728 /* Check out a single file. */
1729 if (strchr(wt_relpath, '/') == NULL) {
1730 /* Check out a single file in work tree's root dir. */
1731 in_repo_path = strdup(worktree->path_prefix);
1732 if (in_repo_path == NULL) {
1733 err = got_error_from_errno("strdup");
1736 *tree_relpath = strdup("");
1737 if (*tree_relpath == NULL) {
1738 err = got_error_from_errno("strdup");
1742 /* Check out a single file in a subdirectory. */
1743 err = got_path_dirname(tree_relpath, wt_relpath);
1746 if (asprintf(&in_repo_path, "%s%s%s",
1747 worktree->path_prefix, is_root_wt ? "" : "/",
1748 *tree_relpath) == -1) {
1749 err = got_error_from_errno("asprintf");
1753 err = got_object_id_by_path(tree_id, repo,
1754 worktree->base_commit_id, in_repo_path);
1756 /* Check out all files within a subdirectory. */
1757 *tree_id = got_object_id_dup(id);
1758 if (*tree_id == NULL) {
1759 err = got_error_from_errno("got_object_id_dup");
1762 *tree_relpath = strdup(wt_relpath);
1763 if (*tree_relpath == NULL) {
1764 err = got_error_from_errno("strdup");
1772 *entry_type = GOT_OBJ_TYPE_ANY;
1773 free(*tree_relpath);
1774 *tree_relpath = NULL;
1781 static const struct got_error *
1782 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1783 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1784 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1785 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1787 const struct got_error *err = NULL;
1788 struct got_commit_object *commit = NULL;
1789 struct got_tree_object *tree = NULL;
1790 struct got_fileindex_diff_tree_cb diff_cb;
1791 struct diff_cb_arg arg;
1793 err = ref_base_commit(worktree, repo);
1797 err = got_object_open_as_commit(&commit, repo,
1798 worktree->base_commit_id);
1802 err = got_object_open_as_tree(&tree, repo, tree_id);
1807 got_object_tree_find_entry(tree, entry_name) == NULL) {
1808 err = got_error(GOT_ERR_NO_TREE_ENTRY);
1812 diff_cb.diff_old_new = diff_old_new;
1813 diff_cb.diff_old = diff_old;
1814 diff_cb.diff_new = diff_new;
1815 arg.fileindex = fileindex;
1816 arg.worktree = worktree;
1818 arg.progress_cb = progress_cb;
1819 arg.progress_arg = progress_arg;
1820 arg.cancel_cb = cancel_cb;
1821 arg.cancel_arg = cancel_arg;
1822 err = got_fileindex_diff_tree(fileindex, tree, relpath,
1823 entry_name, repo, &diff_cb, &arg);
1826 got_object_tree_close(tree);
1828 got_object_commit_close(commit);
1832 const struct got_error *
1833 got_worktree_checkout_files(struct got_worktree *worktree,
1834 struct got_pathlist_head *paths, struct got_repository *repo,
1835 got_worktree_checkout_cb progress_cb, void *progress_arg,
1836 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1838 const struct got_error *err = NULL, *sync_err, *unlockerr;
1839 struct got_commit_object *commit = NULL;
1840 struct got_tree_object *tree = NULL;
1841 struct got_fileindex *fileindex = NULL;
1842 char *fileindex_path = NULL;
1843 struct got_pathlist_entry *pe;
1844 struct tree_path_data {
1845 SIMPLEQ_ENTRY(tree_path_data) entry;
1846 struct got_object_id *tree_id;
1851 SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1853 SIMPLEQ_INIT(&tree_paths);
1855 err = lock_worktree(worktree, LOCK_EX);
1859 /* Map all specified paths to in-repository trees. */
1860 TAILQ_FOREACH(pe, paths, entry) {
1861 tpd = malloc(sizeof(*tpd));
1863 err = got_error_from_errno("malloc");
1867 err = find_tree_entry_for_checkout(&tpd->entry_type,
1868 &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1874 if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1875 err = got_path_basename(&tpd->entry_name, pe->path);
1883 tpd->entry_name = NULL;
1885 SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1889 * Read the file index.
1890 * Checking out files is supposed to be an idempotent operation.
1891 * If the on-disk file index is incomplete we will try to complete it.
1893 err = open_fileindex(&fileindex, &fileindex_path, worktree);
1897 tpd = SIMPLEQ_FIRST(&tree_paths);
1898 TAILQ_FOREACH(pe, paths, entry) {
1899 struct bump_base_commit_id_arg bbc_arg;
1901 err = checkout_files(worktree, fileindex, tpd->relpath,
1902 tpd->tree_id, tpd->entry_name, repo,
1903 progress_cb, progress_arg, cancel_cb, cancel_arg);
1907 bbc_arg.base_commit_id = worktree->base_commit_id;
1908 bbc_arg.entry_name = tpd->entry_name;
1909 bbc_arg.path = pe->path;
1910 bbc_arg.path_len = pe->path_len;
1911 bbc_arg.progress_cb = progress_cb;
1912 bbc_arg.progress_arg = progress_arg;
1913 err = got_fileindex_for_each_entry_safe(fileindex,
1914 bump_base_commit_id, &bbc_arg);
1918 tpd = SIMPLEQ_NEXT(tpd, entry);
1920 sync_err = sync_fileindex(fileindex, fileindex_path);
1921 if (sync_err && err == NULL)
1924 free(fileindex_path);
1926 got_object_tree_close(tree);
1928 got_object_commit_close(commit);
1930 got_fileindex_free(fileindex);
1931 while (!SIMPLEQ_EMPTY(&tree_paths)) {
1932 tpd = SIMPLEQ_FIRST(&tree_paths);
1933 SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
1938 unlockerr = lock_worktree(worktree, LOCK_SH);
1939 if (unlockerr && err == NULL)
1944 struct merge_file_cb_arg {
1945 struct got_worktree *worktree;
1946 struct got_fileindex *fileindex;
1947 got_worktree_checkout_cb progress_cb;
1949 got_worktree_cancel_cb cancel_cb;
1951 struct got_object_id *commit_id2;
1954 static const struct got_error *
1955 merge_file_cb(void *arg, struct got_blob_object *blob1,
1956 struct got_blob_object *blob2, struct got_object_id *id1,
1957 struct got_object_id *id2, const char *path1, const char *path2,
1958 struct got_repository *repo)
1960 static const struct got_error *err = NULL;
1961 struct merge_file_cb_arg *a = arg;
1962 struct got_fileindex_entry *ie;
1963 char *ondisk_path = NULL;
1965 unsigned char status;
1966 int local_changes_subsumed;
1968 if (blob1 && blob2) {
1969 ie = got_fileindex_entry_get(a->fileindex, path2,
1972 return (*a->progress_cb)(a->progress_arg,
1973 GOT_STATUS_MISSING, path2);
1975 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1977 return got_error_from_errno("asprintf");
1979 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1983 if (status == GOT_STATUS_DELETE) {
1984 err = (*a->progress_cb)(a->progress_arg,
1985 GOT_STATUS_MERGE, path2);
1988 if (status != GOT_STATUS_NO_CHANGE &&
1989 status != GOT_STATUS_MODIFY &&
1990 status != GOT_STATUS_CONFLICT &&
1991 status != GOT_STATUS_ADD) {
1992 err = (*a->progress_cb)(a->progress_arg, status, path2);
1996 err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1997 ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1998 a->progress_cb, a->progress_arg);
2000 ie = got_fileindex_entry_get(a->fileindex, path1,
2003 return (*a->progress_cb)(a->progress_arg,
2004 GOT_STATUS_MISSING, path2);
2006 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2008 return got_error_from_errno("asprintf");
2010 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2015 case GOT_STATUS_NO_CHANGE:
2016 err = (*a->progress_cb)(a->progress_arg,
2017 GOT_STATUS_DELETE, path1);
2020 err = remove_ondisk_file(a->worktree->root_path, path1);
2024 got_fileindex_entry_mark_deleted_from_disk(ie);
2026 case GOT_STATUS_DELETE:
2027 case GOT_STATUS_MISSING:
2028 err = (*a->progress_cb)(a->progress_arg,
2029 GOT_STATUS_DELETE, path1);
2033 got_fileindex_entry_mark_deleted_from_disk(ie);
2035 case GOT_STATUS_ADD:
2036 case GOT_STATUS_MODIFY:
2037 case GOT_STATUS_CONFLICT:
2038 err = (*a->progress_cb)(a->progress_arg,
2039 GOT_STATUS_CANNOT_DELETE, path1);
2043 case GOT_STATUS_OBSTRUCTED:
2044 err = (*a->progress_cb)(a->progress_arg, status, path1);
2052 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2054 return got_error_from_errno("asprintf");
2055 ie = got_fileindex_entry_get(a->fileindex, path2,
2058 err = get_file_status(&status, &sb, ie, ondisk_path,
2062 if (status != GOT_STATUS_NO_CHANGE &&
2063 status != GOT_STATUS_MODIFY &&
2064 status != GOT_STATUS_CONFLICT &&
2065 status != GOT_STATUS_ADD) {
2066 err = (*a->progress_cb)(a->progress_arg,
2070 err = merge_blob(&local_changes_subsumed, a->worktree,
2071 NULL, ondisk_path, path2, sb.st_mode, blob2,
2072 a->commit_id2, repo,
2073 a->progress_cb, a->progress_arg);
2074 if (status == GOT_STATUS_DELETE) {
2075 err = update_blob_fileindex_entry(a->worktree,
2076 a->fileindex, ie, ondisk_path, ie->path,
2082 sb.st_mode = GOT_DEFAULT_FILE_MODE;
2083 err = install_blob(a->worktree, ondisk_path, path2,
2084 /* XXX get this from parent tree! */
2085 GOT_DEFAULT_FILE_MODE,
2086 sb.st_mode, blob2, 0, 0, repo,
2087 a->progress_cb, a->progress_arg);
2090 err = got_fileindex_entry_alloc(&ie,
2091 ondisk_path, path2, NULL, NULL);
2094 err = got_fileindex_entry_add(a->fileindex, ie);
2096 got_fileindex_entry_free(ie);
2106 struct check_merge_ok_arg {
2107 struct got_worktree *worktree;
2108 struct got_repository *repo;
2111 static const struct got_error *
2112 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2114 const struct got_error *err = NULL;
2115 struct check_merge_ok_arg *a = arg;
2116 unsigned char status;
2120 /* Reject merges into a work tree with mixed base commits. */
2121 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2122 SHA1_DIGEST_LENGTH))
2123 return got_error(GOT_ERR_MIXED_COMMITS);
2125 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2127 return got_error_from_errno("asprintf");
2129 /* Reject merges into a work tree with conflicted files. */
2130 err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2133 if (status == GOT_STATUS_CONFLICT)
2134 return got_error(GOT_ERR_CONFLICTS);
2139 static const struct got_error *
2140 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2141 const char *fileindex_path, struct got_object_id *commit_id1,
2142 struct got_object_id *commit_id2, struct got_repository *repo,
2143 got_worktree_checkout_cb progress_cb, void *progress_arg,
2144 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2146 const struct got_error *err = NULL, *sync_err;
2147 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2148 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2149 struct merge_file_cb_arg arg;
2152 err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2153 worktree->path_prefix);
2157 err = got_object_open_as_tree(&tree1, repo, tree_id1);
2162 err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2163 worktree->path_prefix);
2167 err = got_object_open_as_tree(&tree2, repo, tree_id2);
2171 arg.worktree = worktree;
2172 arg.fileindex = fileindex;
2173 arg.progress_cb = progress_cb;
2174 arg.progress_arg = progress_arg;
2175 arg.cancel_cb = cancel_cb;
2176 arg.cancel_arg = cancel_arg;
2177 arg.commit_id2 = commit_id2;
2178 err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2179 sync_err = sync_fileindex(fileindex, fileindex_path);
2180 if (sync_err && err == NULL)
2184 got_object_tree_close(tree1);
2186 got_object_tree_close(tree2);
2190 const struct got_error *
2191 got_worktree_merge_files(struct got_worktree *worktree,
2192 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2193 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2194 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2196 const struct got_error *err, *unlockerr;
2197 char *fileindex_path = NULL;
2198 struct got_fileindex *fileindex = NULL;
2199 struct check_merge_ok_arg mok_arg;
2201 err = lock_worktree(worktree, LOCK_EX);
2205 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2209 mok_arg.worktree = worktree;
2210 mok_arg.repo = repo;
2211 err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2216 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2217 commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2220 got_fileindex_free(fileindex);
2221 free(fileindex_path);
2222 unlockerr = lock_worktree(worktree, LOCK_SH);
2223 if (unlockerr && err == NULL)
2228 struct diff_dir_cb_arg {
2229 struct got_fileindex *fileindex;
2230 struct got_worktree *worktree;
2231 const char *status_path;
2232 size_t status_path_len;
2233 struct got_repository *repo;
2234 got_worktree_status_cb status_cb;
2236 got_worktree_cancel_cb cancel_cb;
2240 static const struct got_error *
2241 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2242 got_worktree_status_cb status_cb, void *status_arg,
2243 struct got_repository *repo)
2245 const struct got_error *err = NULL;
2246 unsigned char status = GOT_STATUS_NO_CHANGE;
2247 unsigned char staged_status = get_staged_status(ie);
2249 struct got_object_id blob_id, commit_id, staged_blob_id;
2250 struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2251 struct got_object_id *staged_blob_idp = NULL;
2253 err = get_file_status(&status, &sb, ie, abspath, repo);
2257 if (status == GOT_STATUS_NO_CHANGE &&
2258 staged_status == GOT_STATUS_NO_CHANGE)
2261 if (got_fileindex_entry_has_blob(ie)) {
2262 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2263 blob_idp = &blob_id;
2265 if (got_fileindex_entry_has_commit(ie)) {
2266 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2267 commit_idp = &commit_id;
2269 if (staged_status == GOT_STATUS_ADD ||
2270 staged_status == GOT_STATUS_MODIFY) {
2271 memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2272 SHA1_DIGEST_LENGTH);
2273 staged_blob_idp = &staged_blob_id;
2276 return (*status_cb)(status_arg, status, staged_status,
2277 ie->path, blob_idp, staged_blob_idp, commit_idp);
2280 static const struct got_error *
2281 status_old_new(void *arg, struct got_fileindex_entry *ie,
2282 struct dirent *de, const char *parent_path)
2284 const struct got_error *err = NULL;
2285 struct diff_dir_cb_arg *a = arg;
2288 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2289 return got_error(GOT_ERR_CANCELLED);
2291 if (got_path_cmp(parent_path, a->status_path,
2292 strlen(parent_path), a->status_path_len) != 0 &&
2293 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2296 if (parent_path[0]) {
2297 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2298 parent_path, de->d_name) == -1)
2299 return got_error_from_errno("asprintf");
2301 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2303 return got_error_from_errno("asprintf");
2306 err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2312 static const struct got_error *
2313 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2315 struct diff_dir_cb_arg *a = arg;
2316 struct got_object_id blob_id, commit_id;
2317 unsigned char status;
2319 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2320 return got_error(GOT_ERR_CANCELLED);
2322 if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2325 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2326 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2327 if (got_fileindex_entry_has_file_on_disk(ie))
2328 status = GOT_STATUS_MISSING;
2330 status = GOT_STATUS_DELETE;
2331 return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2332 ie->path, &blob_id, NULL, &commit_id);
2335 static const struct got_error *
2336 status_new(void *arg, struct dirent *de, const char *parent_path)
2338 const struct got_error *err = NULL;
2339 struct diff_dir_cb_arg *a = arg;
2342 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2343 return got_error(GOT_ERR_CANCELLED);
2345 if (de->d_type == DT_DIR)
2348 /* XXX ignore symlinks for now */
2349 if (de->d_type == DT_LNK)
2352 if (parent_path[0]) {
2353 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2354 return got_error_from_errno("asprintf");
2359 if (got_path_is_child(path, a->status_path, a->status_path_len))
2360 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2361 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2367 static const struct got_error *
2368 report_single_file_status(const char *path, const char *ondisk_path,
2369 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2370 void *status_arg, struct got_repository *repo)
2372 struct got_fileindex_entry *ie;
2375 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2377 return report_file_status(ie, ondisk_path, status_cb,
2380 if (lstat(ondisk_path, &sb) == -1) {
2381 if (errno != ENOENT)
2382 return got_error_from_errno2("lstat", ondisk_path);
2386 if (S_ISREG(sb.st_mode))
2387 return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2388 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2393 static const struct got_error *
2394 worktree_status(struct got_worktree *worktree, const char *path,
2395 struct got_fileindex *fileindex, struct got_repository *repo,
2396 got_worktree_status_cb status_cb, void *status_arg,
2397 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2399 const struct got_error *err = NULL;
2400 DIR *workdir = NULL;
2401 struct got_fileindex_diff_dir_cb fdiff_cb;
2402 struct diff_dir_cb_arg arg;
2403 char *ondisk_path = NULL;
2405 if (asprintf(&ondisk_path, "%s%s%s",
2406 worktree->root_path, path[0] ? "/" : "", path) == -1)
2407 return got_error_from_errno("asprintf");
2409 workdir = opendir(ondisk_path);
2410 if (workdir == NULL) {
2411 if (errno != ENOTDIR && errno != ENOENT)
2412 err = got_error_from_errno2("opendir", ondisk_path);
2414 err = report_single_file_status(path, ondisk_path,
2415 fileindex, status_cb, status_arg, repo);
2417 fdiff_cb.diff_old_new = status_old_new;
2418 fdiff_cb.diff_old = status_old;
2419 fdiff_cb.diff_new = status_new;
2420 arg.fileindex = fileindex;
2421 arg.worktree = worktree;
2422 arg.status_path = path;
2423 arg.status_path_len = strlen(path);
2425 arg.status_cb = status_cb;
2426 arg.status_arg = status_arg;
2427 arg.cancel_cb = cancel_cb;
2428 arg.cancel_arg = cancel_arg;
2429 err = got_fileindex_diff_dir(fileindex, workdir,
2430 worktree->root_path, path, repo, &fdiff_cb, &arg);
2439 const struct got_error *
2440 got_worktree_status(struct got_worktree *worktree,
2441 struct got_pathlist_head *paths, struct got_repository *repo,
2442 got_worktree_status_cb status_cb, void *status_arg,
2443 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2445 const struct got_error *err = NULL;
2446 char *fileindex_path = NULL;
2447 struct got_fileindex *fileindex = NULL;
2448 struct got_pathlist_entry *pe;
2450 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2454 TAILQ_FOREACH(pe, paths, entry) {
2455 err = worktree_status(worktree, pe->path, fileindex, repo,
2456 status_cb, status_arg, cancel_cb, cancel_arg);
2460 free(fileindex_path);
2461 got_fileindex_free(fileindex);
2465 const struct got_error *
2466 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2469 const struct got_error *err = NULL;
2470 char *resolved, *cwd = NULL, *path = NULL;
2475 resolved = realpath(arg, NULL);
2476 if (resolved == NULL) {
2477 if (errno != ENOENT)
2478 return got_error_from_errno2("realpath", arg);
2479 cwd = getcwd(NULL, 0);
2481 return got_error_from_errno("getcwd");
2482 if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2483 err = got_error_from_errno("asprintf");
2488 if (strncmp(got_worktree_get_root_path(worktree), resolved,
2489 strlen(got_worktree_get_root_path(worktree)))) {
2490 err = got_error(GOT_ERR_BAD_PATH);
2494 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2495 err = got_path_skip_common_ancestor(&path,
2496 got_worktree_get_root_path(worktree), resolved);
2502 err = got_error_from_errno("strdup");
2507 /* XXX status walk can't deal with trailing slash! */
2509 while (len > 0 && path[len - 1] == '/') {
2510 path[len - 1] = '\0';
2523 static const struct got_error *
2524 schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2525 const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2526 struct got_repository *repo)
2528 const struct got_error *err = NULL;
2529 struct got_fileindex_entry *ie;
2530 unsigned char status;
2533 ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2535 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2538 /* Re-adding an existing entry is a no-op. */
2539 if (status == GOT_STATUS_ADD)
2541 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2544 err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2548 err = got_fileindex_entry_add(fileindex, ie);
2550 got_fileindex_entry_free(ie);
2554 return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2557 const struct got_error *
2558 got_worktree_schedule_add(struct got_worktree *worktree,
2559 struct got_pathlist_head *paths,
2560 got_worktree_status_cb status_cb, void *status_arg,
2561 struct got_repository *repo)
2563 struct got_fileindex *fileindex = NULL;
2564 char *fileindex_path = NULL;
2565 const struct got_error *err = NULL, *sync_err, *unlockerr;
2566 struct got_pathlist_entry *pe;
2568 err = lock_worktree(worktree, LOCK_EX);
2572 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2576 TAILQ_FOREACH(pe, paths, entry) {
2578 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2580 return got_error_from_errno("asprintf");
2581 err = schedule_addition(ondisk_path, fileindex, pe->path,
2582 status_cb, status_arg, repo);
2587 sync_err = sync_fileindex(fileindex, fileindex_path);
2588 if (sync_err && err == NULL)
2591 free(fileindex_path);
2593 got_fileindex_free(fileindex);
2594 unlockerr = lock_worktree(worktree, LOCK_SH);
2595 if (unlockerr && err == NULL)
2600 static const struct got_error *
2601 schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2602 const char *relpath, int delete_local_mods,
2603 got_worktree_status_cb status_cb, void *status_arg,
2604 struct got_repository *repo)
2606 const struct got_error *err = NULL;
2607 struct got_fileindex_entry *ie = NULL;
2608 unsigned char status, staged_status;
2611 ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2613 return got_error(GOT_ERR_BAD_PATH);
2615 staged_status = get_staged_status(ie);
2616 if (staged_status != GOT_STATUS_NO_CHANGE) {
2617 if (staged_status == GOT_STATUS_DELETE)
2619 return got_error_path(relpath, GOT_ERR_FILE_STAGED);
2622 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2626 if (status != GOT_STATUS_NO_CHANGE) {
2627 if (status == GOT_STATUS_DELETE)
2629 if (status == GOT_STATUS_MODIFY && !delete_local_mods)
2630 return got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
2631 if (status != GOT_STATUS_MODIFY &&
2632 status != GOT_STATUS_MISSING)
2633 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2636 if (status != GOT_STATUS_MISSING && unlink(ondisk_path) != 0)
2637 return got_error_from_errno2("unlink", ondisk_path);
2639 got_fileindex_entry_mark_deleted_from_disk(ie);
2640 return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2643 const struct got_error *
2644 got_worktree_schedule_delete(struct got_worktree *worktree,
2645 struct got_pathlist_head *paths, int delete_local_mods,
2646 got_worktree_status_cb status_cb, void *status_arg,
2647 struct got_repository *repo)
2649 struct got_fileindex *fileindex = NULL;
2650 char *fileindex_path = NULL;
2651 const struct got_error *err = NULL, *sync_err, *unlockerr;
2652 struct got_pathlist_entry *pe;
2654 err = lock_worktree(worktree, LOCK_EX);
2658 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2662 TAILQ_FOREACH(pe, paths, entry) {
2664 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2666 return got_error_from_errno("asprintf");
2667 err = schedule_for_deletion(ondisk_path, fileindex, pe->path,
2668 delete_local_mods, status_cb, status_arg, repo);
2673 sync_err = sync_fileindex(fileindex, fileindex_path);
2674 if (sync_err && err == NULL)
2677 free(fileindex_path);
2679 got_fileindex_free(fileindex);
2680 unlockerr = lock_worktree(worktree, LOCK_SH);
2681 if (unlockerr && err == NULL)
2686 static const struct got_error *
2687 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
2689 const struct got_error *err = NULL;
2691 size_t linesize = 0, n;
2694 linelen = getline(&line, &linesize, infile);
2695 if (linelen == -1) {
2696 if (ferror(infile)) {
2697 err = got_error_from_errno("getline");
2703 n = fwrite(line, 1, linelen, outfile);
2705 err = got_ferror(outfile, GOT_ERR_IO);
2710 n = fwrite(line, 1, linelen, rejectfile);
2712 err = got_ferror(outfile, GOT_ERR_IO);
2719 static const struct got_error *
2720 skip_one_line(FILE *f)
2723 size_t linesize = 0;
2726 linelen = getline(&line, &linesize, f);
2728 if (linelen == -1 && ferror(f))
2729 return got_error_from_errno("getline");
2733 static const struct got_error *
2734 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
2735 int start_old, int end_old, int start_new, int end_new,
2736 FILE *outfile, FILE *rejectfile)
2738 const struct got_error *err;
2740 /* Copy old file's lines leading up to patch. */
2741 while (!feof(f1) && *line_cur1 < start_old) {
2742 err = copy_one_line(f1, outfile, NULL);
2747 /* Skip new file's lines leading up to patch. */
2748 while (!feof(f2) && *line_cur2 < start_new) {
2750 err = copy_one_line(f2, NULL, rejectfile);
2752 err = skip_one_line(f2);
2757 /* Copy patched lines. */
2758 while (!feof(f2) && *line_cur2 <= end_new) {
2759 err = copy_one_line(f2, outfile, NULL);
2764 /* Skip over old file's replaced lines. */
2765 while (!feof(f1) && *line_cur1 <= end_new) {
2767 err = copy_one_line(f1, NULL, rejectfile);
2769 err = skip_one_line(f1);
2774 /* Copy old file's lines after patch. */
2775 while (!feof(f1) && *line_cur1 <= end_old) {
2776 err = copy_one_line(f1, outfile, rejectfile);
2785 static const struct got_error *
2786 apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
2787 int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
2788 int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
2789 int *line_cur2, FILE *outfile, FILE *rejectfile,
2790 got_worktree_patch_cb patch_cb, void *patch_arg)
2792 const struct got_error *err = NULL;
2793 int start_old = change->cv.a;
2794 int end_old = change->cv.b;
2795 int start_new = change->cv.c;
2796 int end_new = change->cv.d;
2800 *choice = GOT_PATCH_CHOICE_NONE;
2802 hunkfile = got_opentemp();
2803 if (hunkfile == NULL)
2804 return got_error_from_errno("got_opentemp");
2809 /* XXX TODO needs error checking */
2810 got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
2812 if (fseek(f1, pos1, SEEK_SET) == -1) {
2813 err = got_ferror(f1, GOT_ERR_IO);
2816 if (fseek(f2, pos2, SEEK_SET) == -1) {
2817 err = got_ferror(f1, GOT_ERR_IO);
2820 if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
2821 err = got_ferror(hunkfile, GOT_ERR_IO);
2825 err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
2826 hunkfile, n, nchanges);
2831 case GOT_PATCH_CHOICE_YES:
2832 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
2833 end_old, start_new, end_new, outfile, rejectfile);
2835 case GOT_PATCH_CHOICE_NO:
2836 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
2837 end_old, start_new, end_new, rejectfile, outfile);
2839 case GOT_PATCH_CHOICE_QUIT:
2841 /* Copy old file's lines until EOF. */
2843 err = copy_one_line(f1, outfile, NULL);
2850 /* Copy new file's lines until EOF. */
2852 err = copy_one_line(f2, NULL, rejectfile);
2860 err = got_error(GOT_ERR_PATCH_CHOICE);
2864 if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
2865 err = got_error_from_errno("fclose");
2869 struct revert_file_args {
2870 struct got_worktree *worktree;
2871 struct got_fileindex *fileindex;
2872 got_worktree_checkout_cb progress_cb;
2874 got_worktree_patch_cb patch_cb;
2876 struct got_repository *repo;
2879 static const struct got_error *
2880 create_patched_content(char **path_outfile, int reverse_patch,
2881 struct got_object_id *blob_id, const char *path2,
2882 const char *relpath, struct got_repository *repo,
2883 got_worktree_patch_cb patch_cb, void *patch_arg)
2885 const struct got_error *err;
2886 struct got_blob_object *blob = NULL;
2887 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
2888 char *path1 = NULL, *id_str = NULL;
2889 struct stat sb1, sb2;
2890 struct got_diff_changes *changes = NULL;
2891 struct got_diff_state *ds = NULL;
2892 struct got_diff_args *args = NULL;
2893 struct got_diff_change *change;
2894 int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
2897 *path_outfile = NULL;
2899 err = got_object_id_str(&id_str, blob_id);
2903 f2 = fopen(path2, "r");
2905 err = got_error_from_errno2("fopen", path2);
2909 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
2913 err = got_opentemp_named(&path1, &f1, "got-patched-blob");
2917 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
2921 if (stat(path1, &sb1) == -1) {
2922 err = got_error_from_errno2("stat", path1);
2925 if (stat(path2, &sb2) == -1) {
2926 err = got_error_from_errno2("stat", path2);
2930 err = got_diff_files(&changes, &ds, &args, &diff_flags,
2931 f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
2935 err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
2939 if (fseek(f1, 0L, SEEK_SET) == -1)
2940 return got_ferror(f1, GOT_ERR_IO);
2941 if (fseek(f2, 0L, SEEK_SET) == -1)
2942 return got_ferror(f2, GOT_ERR_IO);
2943 SIMPLEQ_FOREACH(change, &changes->entries, entry) {
2945 err = apply_or_reject_change(&choice, change, ++n,
2946 changes->nchanges, ds, args, diff_flags, relpath,
2947 f1, f2, &line_cur1, &line_cur2,
2948 reverse_patch ? NULL : outfile,
2949 reverse_patch ? outfile : NULL,
2950 patch_cb, patch_arg);
2953 if (choice == GOT_PATCH_CHOICE_YES)
2955 else if (choice == GOT_PATCH_CHOICE_QUIT)
2961 got_object_blob_close(blob);
2962 if (f1 && fclose(f1) == EOF && err == NULL)
2963 err = got_error_from_errno2("fclose", path1);
2964 if (f2 && fclose(f2) == EOF && err == NULL)
2965 err = got_error_from_errno2("fclose", path2);
2966 if (outfile && fclose(outfile) == EOF && err == NULL)
2967 err = got_error_from_errno2("fclose", *path_outfile);
2968 if (path1 && unlink(path1) == -1 && err == NULL)
2969 err = got_error_from_errno2("unlink", path1);
2970 if (err || !have_content) {
2971 if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
2972 err = got_error_from_errno2("unlink", *path_outfile);
2973 free(*path_outfile);
2974 *path_outfile = NULL;
2978 got_diff_state_free(ds);
2982 got_diff_free_changes(changes);
2987 static const struct got_error *
2988 revert_file(void *arg, unsigned char status, unsigned char staged_status,
2989 const char *relpath, struct got_object_id *blob_id,
2990 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2992 struct revert_file_args *a = arg;
2993 const struct got_error *err = NULL;
2994 char *parent_path = NULL;
2995 struct got_fileindex_entry *ie;
2996 struct got_tree_object *tree = NULL;
2997 struct got_object_id *tree_id = NULL;
2998 const struct got_tree_entry *te = NULL;
2999 char *tree_path = NULL, *te_name;
3000 char *ondisk_path = NULL, *path_content = NULL;
3001 struct got_blob_object *blob = NULL;
3003 /* Reverting a staged deletion is a no-op. */
3004 if (status == GOT_STATUS_DELETE &&
3005 staged_status != GOT_STATUS_NO_CHANGE)
3008 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3010 return got_error(GOT_ERR_BAD_PATH);
3012 /* Construct in-repository path of tree which contains this blob. */
3013 err = got_path_dirname(&parent_path, ie->path);
3015 if (err->code != GOT_ERR_BAD_PATH)
3017 parent_path = strdup("/");
3018 if (parent_path == NULL) {
3019 err = got_error_from_errno("strdup");
3023 if (got_path_is_root_dir(a->worktree->path_prefix)) {
3024 tree_path = strdup(parent_path);
3025 if (tree_path == NULL) {
3026 err = got_error_from_errno("strdup");
3030 if (got_path_is_root_dir(parent_path)) {
3031 tree_path = strdup(a->worktree->path_prefix);
3032 if (tree_path == NULL) {
3033 err = got_error_from_errno("strdup");
3037 if (asprintf(&tree_path, "%s/%s",
3038 a->worktree->path_prefix, parent_path) == -1) {
3039 err = got_error_from_errno("asprintf");
3045 err = got_object_id_by_path(&tree_id, a->repo,
3046 a->worktree->base_commit_id, tree_path);
3048 if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3049 (status == GOT_STATUS_ADD ||
3050 staged_status == GOT_STATUS_ADD)))
3053 err = got_object_open_as_tree(&tree, a->repo, tree_id);
3057 te_name = basename(ie->path);
3058 if (te_name == NULL) {
3059 err = got_error_from_errno2("basename", ie->path);
3063 te = got_object_tree_find_entry(tree, te_name);
3064 if (te == NULL && status != GOT_STATUS_ADD &&
3065 staged_status != GOT_STATUS_ADD) {
3066 err = got_error(GOT_ERR_NO_TREE_ENTRY);
3072 case GOT_STATUS_ADD:
3074 int choice = GOT_PATCH_CHOICE_NONE;
3075 err = (*a->patch_cb)(&choice, a->patch_arg,
3076 status, ie->path, NULL, 1, 1);
3079 if (choice != GOT_PATCH_CHOICE_YES)
3082 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3086 got_fileindex_entry_remove(a->fileindex, ie);
3088 case GOT_STATUS_DELETE:
3090 int choice = GOT_PATCH_CHOICE_NONE;
3091 err = (*a->patch_cb)(&choice, a->patch_arg,
3092 status, ie->path, NULL, 1, 1);
3095 if (choice != GOT_PATCH_CHOICE_YES)
3099 case GOT_STATUS_MODIFY:
3100 case GOT_STATUS_CONFLICT:
3101 case GOT_STATUS_MISSING: {
3102 struct got_object_id id;
3103 if (staged_status == GOT_STATUS_ADD ||
3104 staged_status == GOT_STATUS_MODIFY) {
3105 memcpy(id.sha1, ie->staged_blob_sha1,
3106 SHA1_DIGEST_LENGTH);
3108 memcpy(id.sha1, ie->blob_sha1,
3109 SHA1_DIGEST_LENGTH);
3110 err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3114 if (asprintf(&ondisk_path, "%s/%s",
3115 got_worktree_get_root_path(a->worktree), relpath) == -1) {
3116 err = got_error_from_errno("asprintf");
3120 if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3121 status == GOT_STATUS_CONFLICT)) {
3122 err = create_patched_content(&path_content, 1, &id,
3123 ondisk_path, ie->path, a->repo,
3124 a->patch_cb, a->patch_arg);
3125 if (err || path_content == NULL)
3127 if (rename(path_content, ondisk_path) == -1) {
3128 err = got_error_from_errno3("rename",
3129 path_content, ondisk_path);
3133 err = install_blob(a->worktree, ondisk_path, ie->path,
3134 te ? te->mode : GOT_DEFAULT_FILE_MODE,
3135 got_fileindex_perms_to_st(ie), blob, 0, 1,
3136 a->repo, a->progress_cb, a->progress_arg);
3139 if (status == GOT_STATUS_DELETE) {
3140 err = update_blob_fileindex_entry(a->worktree,
3141 a->fileindex, ie, ondisk_path, ie->path,
3158 got_object_blob_close(blob);
3160 got_object_tree_close(tree);
3165 const struct got_error *
3166 got_worktree_revert(struct got_worktree *worktree,
3167 struct got_pathlist_head *paths,
3168 got_worktree_checkout_cb progress_cb, void *progress_arg,
3169 got_worktree_patch_cb patch_cb, void *patch_arg,
3170 struct got_repository *repo)
3172 struct got_fileindex *fileindex = NULL;
3173 char *fileindex_path = NULL;
3174 const struct got_error *err = NULL, *unlockerr = NULL;
3175 const struct got_error *sync_err = NULL;
3176 struct got_pathlist_entry *pe;
3177 struct revert_file_args rfa;
3179 err = lock_worktree(worktree, LOCK_EX);
3183 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3187 rfa.worktree = worktree;
3188 rfa.fileindex = fileindex;
3189 rfa.progress_cb = progress_cb;
3190 rfa.progress_arg = progress_arg;
3191 rfa.patch_cb = patch_cb;
3192 rfa.patch_arg = patch_arg;
3194 TAILQ_FOREACH(pe, paths, entry) {
3195 err = worktree_status(worktree, pe->path, fileindex, repo,
3196 revert_file, &rfa, NULL, NULL);
3200 sync_err = sync_fileindex(fileindex, fileindex_path);
3201 if (sync_err && err == NULL)
3204 free(fileindex_path);
3206 got_fileindex_free(fileindex);
3207 unlockerr = lock_worktree(worktree, LOCK_SH);
3208 if (unlockerr && err == NULL)
3214 free_commitable(struct got_commitable *ct)
3217 free(ct->in_repo_path);
3218 free(ct->ondisk_path);
3220 free(ct->base_blob_id);
3221 free(ct->staged_blob_id);
3222 free(ct->base_commit_id);
3226 struct collect_commitables_arg {
3227 struct got_pathlist_head *commitable_paths;
3228 struct got_repository *repo;
3229 struct got_worktree *worktree;
3230 int have_staged_files;
3233 static const struct got_error *
3234 collect_commitables(void *arg, unsigned char status,
3235 unsigned char staged_status, const char *relpath,
3236 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3237 struct got_object_id *commit_id)
3239 struct collect_commitables_arg *a = arg;
3240 const struct got_error *err = NULL;
3241 struct got_commitable *ct = NULL;
3242 struct got_pathlist_entry *new = NULL;
3243 char *parent_path = NULL, *path = NULL;
3246 if (a->have_staged_files) {
3247 if (staged_status != GOT_STATUS_MODIFY &&
3248 staged_status != GOT_STATUS_ADD &&
3249 staged_status != GOT_STATUS_DELETE)
3252 if (status == GOT_STATUS_CONFLICT)
3253 return got_error(GOT_ERR_COMMIT_CONFLICT);
3255 if (status != GOT_STATUS_MODIFY &&
3256 status != GOT_STATUS_ADD &&
3257 status != GOT_STATUS_DELETE)
3261 if (asprintf(&path, "/%s", relpath) == -1) {
3262 err = got_error_from_errno("asprintf");
3265 if (strcmp(path, "/") == 0) {
3266 parent_path = strdup("");
3267 if (parent_path == NULL)
3268 return got_error_from_errno("strdup");
3270 err = got_path_dirname(&parent_path, path);
3275 ct = calloc(1, sizeof(*ct));
3277 err = got_error_from_errno("calloc");
3281 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3283 err = got_error_from_errno("asprintf");
3286 if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3287 sb.st_mode = GOT_DEFAULT_FILE_MODE;
3289 if (lstat(ct->ondisk_path, &sb) != 0) {
3290 err = got_error_from_errno2("lstat", ct->ondisk_path);
3293 ct->mode = sb.st_mode;
3296 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3297 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3299 err = got_error_from_errno("asprintf");
3303 ct->status = status;
3304 ct->staged_status = staged_status;
3305 ct->blob_id = NULL; /* will be filled in when blob gets created */
3306 if (ct->status != GOT_STATUS_ADD &&
3307 ct->staged_status != GOT_STATUS_ADD) {
3308 ct->base_blob_id = got_object_id_dup(blob_id);
3309 if (ct->base_blob_id == NULL) {
3310 err = got_error_from_errno("got_object_id_dup");
3313 ct->base_commit_id = got_object_id_dup(commit_id);
3314 if (ct->base_commit_id == NULL) {
3315 err = got_error_from_errno("got_object_id_dup");
3319 if (ct->staged_status == GOT_STATUS_ADD ||
3320 ct->staged_status == GOT_STATUS_MODIFY) {
3321 ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3322 if (ct->staged_blob_id == NULL) {
3323 err = got_error_from_errno("got_object_id_dup");
3327 ct->path = strdup(path);
3328 if (ct->path == NULL) {
3329 err = got_error_from_errno("strdup");
3332 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3334 if (ct && (err || new == NULL))
3335 free_commitable(ct);
3341 static const struct got_error *write_tree(struct got_object_id **,
3342 struct got_tree_object *, const char *, struct got_pathlist_head *,
3343 got_worktree_status_cb status_cb, void *status_arg,
3344 struct got_repository *);
3346 static const struct got_error *
3347 write_subtree(struct got_object_id **new_subtree_id,
3348 struct got_tree_entry *te, const char *parent_path,
3349 struct got_pathlist_head *commitable_paths,
3350 got_worktree_status_cb status_cb, void *status_arg,
3351 struct got_repository *repo)
3353 const struct got_error *err = NULL;
3354 struct got_tree_object *subtree;
3357 if (asprintf(&subpath, "%s%s%s", parent_path,
3358 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3359 return got_error_from_errno("asprintf");
3361 err = got_object_open_as_tree(&subtree, repo, te->id);
3365 err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3366 status_cb, status_arg, repo);
3367 got_object_tree_close(subtree);
3372 static const struct got_error *
3373 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3375 const struct got_error *err = NULL;
3376 char *ct_parent_path = NULL;
3380 if (strchr(ct->in_repo_path, '/') == NULL) {
3381 *match = got_path_is_root_dir(path);
3385 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3388 *match = (strcmp(path, ct_parent_path) == 0);
3389 free(ct_parent_path);
3394 get_ct_file_mode(struct got_commitable *ct)
3396 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3399 static const struct got_error *
3400 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3401 struct got_tree_entry *te, struct got_commitable *ct)
3403 const struct got_error *err = NULL;
3407 err = got_object_tree_entry_dup(new_te, te);
3411 (*new_te)->mode = get_ct_file_mode(ct);
3413 free((*new_te)->id);
3414 if (ct->staged_status == GOT_STATUS_MODIFY)
3415 (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3417 (*new_te)->id = got_object_id_dup(ct->blob_id);
3418 if ((*new_te)->id == NULL) {
3419 err = got_error_from_errno("got_object_id_dup");
3423 if (err && *new_te) {
3424 got_object_tree_entry_close(*new_te);
3430 static const struct got_error *
3431 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3432 struct got_commitable *ct)
3434 const struct got_error *err = NULL;
3439 *new_te = calloc(1, sizeof(**new_te));
3440 if (*new_te == NULL)
3441 return got_error_from_errno("calloc");
3443 ct_name = basename(ct->path);
3444 if (ct_name == NULL) {
3445 err = got_error_from_errno2("basename", ct->path);
3448 (*new_te)->name = strdup(ct_name);
3449 if ((*new_te)->name == NULL) {
3450 err = got_error_from_errno("strdup");
3454 (*new_te)->mode = get_ct_file_mode(ct);
3456 if (ct->staged_status == GOT_STATUS_ADD)
3457 (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3459 (*new_te)->id = got_object_id_dup(ct->blob_id);
3460 if ((*new_te)->id == NULL) {
3461 err = got_error_from_errno("got_object_id_dup");
3465 if (err && *new_te) {
3466 got_object_tree_entry_close(*new_te);
3472 static const struct got_error *
3473 insert_tree_entry(struct got_tree_entry *new_te,
3474 struct got_pathlist_head *paths)
3476 const struct got_error *err = NULL;
3477 struct got_pathlist_entry *new_pe;
3479 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3483 return got_error(GOT_ERR_TREE_DUP_ENTRY);
3487 static const struct got_error *
3488 report_ct_status(struct got_commitable *ct,
3489 got_worktree_status_cb status_cb, void *status_arg)
3491 const char *ct_path = ct->path;
3492 unsigned char status;
3494 while (ct_path[0] == '/')
3497 if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3498 status = ct->staged_status;
3500 status = ct->status;
3502 return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3503 ct_path, ct->blob_id, NULL, NULL);
3506 static const struct got_error *
3507 match_modified_subtree(int *modified, struct got_tree_entry *te,
3508 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3510 const struct got_error *err = NULL;
3511 struct got_pathlist_entry *pe;
3516 if (asprintf(&te_path, "%s%s%s", base_tree_path,
3517 got_path_is_root_dir(base_tree_path) ? "" : "/",
3519 return got_error_from_errno("asprintf");
3521 TAILQ_FOREACH(pe, commitable_paths, entry) {
3522 struct got_commitable *ct = pe->data;
3523 *modified = got_path_is_child(ct->in_repo_path, te_path,
3533 static const struct got_error *
3534 match_deleted_or_modified_ct(struct got_commitable **ctp,
3535 struct got_tree_entry *te, const char *base_tree_path,
3536 struct got_pathlist_head *commitable_paths)
3538 const struct got_error *err = NULL;
3539 struct got_pathlist_entry *pe;
3543 TAILQ_FOREACH(pe, commitable_paths, entry) {
3544 struct got_commitable *ct = pe->data;
3545 char *ct_name = NULL;
3548 if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3549 if (ct->status != GOT_STATUS_MODIFY &&
3550 ct->status != GOT_STATUS_DELETE)
3553 if (ct->staged_status != GOT_STATUS_MODIFY &&
3554 ct->staged_status != GOT_STATUS_DELETE)
3558 if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3561 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3567 ct_name = basename(pe->path);
3568 if (ct_name == NULL)
3569 return got_error_from_errno2("basename", pe->path);
3571 if (strcmp(te->name, ct_name) != 0)
3581 static const struct got_error *
3582 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3583 const char *child_path, const char *path_base_tree,
3584 struct got_pathlist_head *commitable_paths,
3585 got_worktree_status_cb status_cb, void *status_arg,
3586 struct got_repository *repo)
3588 const struct got_error *err = NULL;
3589 struct got_tree_entry *new_te;
3594 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3595 got_path_is_root_dir(path_base_tree) ? "" : "/",
3597 return got_error_from_errno("asprintf");
3599 new_te = calloc(1, sizeof(*new_te));
3600 new_te->mode = S_IFDIR;
3601 new_te->name = strdup(child_path);
3602 if (new_te->name == NULL) {
3603 err = got_error_from_errno("strdup");
3604 got_object_tree_entry_close(new_te);
3607 err = write_tree(&new_te->id, NULL, subtree_path,
3608 commitable_paths, status_cb, status_arg, repo);
3610 got_object_tree_entry_close(new_te);
3620 static const struct got_error *
3621 write_tree(struct got_object_id **new_tree_id,
3622 struct got_tree_object *base_tree, const char *path_base_tree,
3623 struct got_pathlist_head *commitable_paths,
3624 got_worktree_status_cb status_cb, void *status_arg,
3625 struct got_repository *repo)
3627 const struct got_error *err = NULL;
3628 const struct got_tree_entries *base_entries = NULL;
3629 struct got_pathlist_head paths;
3630 struct got_tree_entries new_tree_entries;
3631 struct got_tree_entry *te, *new_te = NULL;
3632 struct got_pathlist_entry *pe;
3635 new_tree_entries.nentries = 0;
3636 SIMPLEQ_INIT(&new_tree_entries.head);
3638 /* Insert, and recurse into, newly added entries first. */
3639 TAILQ_FOREACH(pe, commitable_paths, entry) {
3640 struct got_commitable *ct = pe->data;
3641 char *child_path = NULL, *slash;
3643 if ((ct->status != GOT_STATUS_ADD &&
3644 ct->staged_status != GOT_STATUS_ADD) ||
3645 (ct->flags & GOT_COMMITABLE_ADDED))
3648 if (!got_path_is_child(pe->path, path_base_tree,
3649 strlen(path_base_tree)))
3652 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3657 slash = strchr(child_path, '/');
3658 if (slash == NULL) {
3659 err = alloc_added_blob_tree_entry(&new_te, ct);
3662 err = report_ct_status(ct, status_cb, status_arg);
3665 ct->flags |= GOT_COMMITABLE_ADDED;
3666 err = insert_tree_entry(new_te, &paths);
3670 *slash = '\0'; /* trim trailing path components */
3671 if (base_tree == NULL ||
3672 got_object_tree_find_entry(base_tree, child_path)
3674 err = make_subtree_for_added_blob(&new_te,
3675 child_path, path_base_tree,
3676 commitable_paths, status_cb, status_arg,
3680 err = insert_tree_entry(new_te, &paths);
3688 /* Handle modified and deleted entries. */
3689 base_entries = got_object_tree_get_entries(base_tree);
3690 SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3691 struct got_commitable *ct = NULL;
3693 if (S_ISDIR(te->mode)) {
3695 err = got_object_tree_entry_dup(&new_te, te);
3698 err = match_modified_subtree(&modified, te,
3699 path_base_tree, commitable_paths);
3702 /* Avoid recursion into unmodified subtrees. */
3705 err = write_subtree(&new_te->id, te,
3706 path_base_tree, commitable_paths,
3707 status_cb, status_arg, repo);
3711 err = insert_tree_entry(new_te, &paths);
3717 err = match_deleted_or_modified_ct(&ct, te,
3718 path_base_tree, commitable_paths);
3720 /* NB: Deleted entries get dropped here. */
3721 if (ct->status == GOT_STATUS_MODIFY ||
3722 ct->staged_status == GOT_STATUS_MODIFY) {
3723 err = alloc_modified_blob_tree_entry(
3727 err = insert_tree_entry(new_te, &paths);
3731 err = report_ct_status(ct, status_cb,
3736 /* Entry is unchanged; just copy it. */
3737 err = got_object_tree_entry_dup(&new_te, te);
3740 err = insert_tree_entry(new_te, &paths);
3747 /* Write new list of entries; deleted entries have been dropped. */
3748 TAILQ_FOREACH(pe, &paths, entry) {
3749 struct got_tree_entry *te = pe->data;
3750 new_tree_entries.nentries++;
3751 SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3753 err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3755 got_object_tree_entries_close(&new_tree_entries);
3756 got_pathlist_free(&paths);
3760 static const struct got_error *
3761 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3762 struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3764 const struct got_error *err = NULL;
3765 struct got_pathlist_entry *pe;
3767 TAILQ_FOREACH(pe, commitable_paths, entry) {
3768 struct got_fileindex_entry *ie;
3769 struct got_commitable *ct = pe->data;
3771 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3773 if (ct->status == GOT_STATUS_DELETE ||
3774 ct->staged_status == GOT_STATUS_DELETE) {
3775 got_fileindex_entry_remove(fileindex, ie);
3776 got_fileindex_entry_free(ie);
3777 } else if (ct->staged_status == GOT_STATUS_ADD ||
3778 ct->staged_status == GOT_STATUS_MODIFY) {
3779 got_fileindex_entry_stage_set(ie,
3780 GOT_FILEIDX_STAGE_NONE);
3781 err = got_fileindex_entry_update(ie,
3782 ct->ondisk_path, ct->staged_blob_id->sha1,
3783 new_base_commit_id->sha1, 1);
3785 err = got_fileindex_entry_update(ie,
3786 ct->ondisk_path, ct->blob_id->sha1,
3787 new_base_commit_id->sha1, 1);
3789 err = got_fileindex_entry_alloc(&ie,
3790 ct->ondisk_path, pe->path, ct->blob_id->sha1,
3791 new_base_commit_id->sha1);
3794 err = got_fileindex_entry_add(fileindex, ie);
3803 static const struct got_error *
3804 check_out_of_date(const char *in_repo_path, unsigned char status,
3805 unsigned char staged_status, struct got_object_id *base_blob_id,
3806 struct got_object_id *base_commit_id,
3807 struct got_object_id *head_commit_id, struct got_repository *repo,
3810 const struct got_error *err = NULL;
3811 struct got_object_id *id = NULL;
3813 if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
3814 /* Trivial case: base commit == head commit */
3815 if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
3818 * Ensure file content which local changes were based
3819 * on matches file content in the branch head.
3821 err = got_object_id_by_path(&id, repo, head_commit_id,
3824 if (err->code == GOT_ERR_NO_TREE_ENTRY)
3825 err = got_error(ood_errcode);
3827 } else if (got_object_id_cmp(id, base_blob_id) != 0)
3828 err = got_error(ood_errcode);
3830 /* Require that added files don't exist in the branch head. */
3831 err = got_object_id_by_path(&id, repo, head_commit_id,
3833 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3835 err = id ? got_error(ood_errcode) : NULL;
3842 const struct got_error *
3843 commit_worktree(struct got_object_id **new_commit_id,
3844 struct got_pathlist_head *commitable_paths,
3845 struct got_object_id *head_commit_id, struct got_worktree *worktree,
3846 const char *author, const char *committer,
3847 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3848 got_worktree_status_cb status_cb, void *status_arg,
3849 struct got_repository *repo)
3851 const struct got_error *err = NULL, *unlockerr = NULL;
3852 struct got_pathlist_entry *pe;
3853 const char *head_ref_name = NULL;
3854 struct got_commit_object *head_commit = NULL;
3855 struct got_reference *head_ref2 = NULL;
3856 struct got_object_id *head_commit_id2 = NULL;
3857 struct got_tree_object *head_tree = NULL;
3858 struct got_object_id *new_tree_id = NULL;
3859 struct got_object_id_queue parent_ids;
3860 struct got_object_qid *pid = NULL;
3861 char *logmsg = NULL;
3863 *new_commit_id = NULL;
3865 SIMPLEQ_INIT(&parent_ids);
3867 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3871 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3875 if (commit_msg_cb != NULL) {
3876 err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3881 if (logmsg == NULL || strlen(logmsg) == 0) {
3882 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3886 /* Create blobs from added and modified files and record their IDs. */
3887 TAILQ_FOREACH(pe, commitable_paths, entry) {
3888 struct got_commitable *ct = pe->data;
3891 /* Blobs for staged files already exist. */
3892 if (ct->staged_status == GOT_STATUS_ADD ||
3893 ct->staged_status == GOT_STATUS_MODIFY)
3896 if (ct->status != GOT_STATUS_ADD &&
3897 ct->status != GOT_STATUS_MODIFY)
3900 if (asprintf(&ondisk_path, "%s/%s",
3901 worktree->root_path, pe->path) == -1) {
3902 err = got_error_from_errno("asprintf");
3905 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3911 /* Recursively write new tree objects. */
3912 err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3913 status_cb, status_arg, repo);
3917 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3920 SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3921 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3922 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3923 got_object_qid_free(pid);
3929 /* Check if a concurrent commit to our branch has occurred. */
3930 head_ref_name = got_worktree_get_head_ref_name(worktree);
3931 if (head_ref_name == NULL) {
3932 err = got_error_from_errno("got_worktree_get_head_ref_name");
3935 /* Lock the reference here to prevent concurrent modification. */
3936 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3939 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3942 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3943 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3946 /* Update branch head in repository. */
3947 err = got_ref_change_ref(head_ref2, *new_commit_id);
3950 err = got_ref_write(head_ref2, repo);
3954 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3958 err = ref_base_commit(worktree, repo);
3963 got_object_tree_close(head_tree);
3965 got_object_commit_close(head_commit);
3966 free(head_commit_id2);
3968 unlockerr = got_ref_unlock(head_ref2);
3969 if (unlockerr && err == NULL)
3971 got_ref_close(head_ref2);
3976 static const struct got_error *
3977 check_path_is_commitable(const char *path,
3978 struct got_pathlist_head *commitable_paths)
3980 struct got_pathlist_entry *cpe = NULL;
3981 size_t path_len = strlen(path);
3983 TAILQ_FOREACH(cpe, commitable_paths, entry) {
3984 struct got_commitable *ct = cpe->data;
3985 const char *ct_path = ct->path;
3987 while (ct_path[0] == '/')
3990 if (strcmp(path, ct_path) == 0 ||
3991 got_path_is_child(ct_path, path, path_len))
3996 return got_error_path(path, GOT_ERR_BAD_PATH);
4001 static const struct got_error *
4002 check_staged_file(void *arg, struct got_fileindex_entry *ie)
4004 int *have_staged_files = arg;
4006 if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4007 *have_staged_files = 1;
4008 return got_error(GOT_ERR_CANCELLED);
4014 static const struct got_error *
4015 check_non_staged_files(struct got_fileindex *fileindex,
4016 struct got_pathlist_head *paths)
4018 struct got_pathlist_entry *pe;
4019 struct got_fileindex_entry *ie;
4021 TAILQ_FOREACH(pe, paths, entry) {
4022 if (pe->path[0] == '\0')
4024 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4026 return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4027 if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4028 return got_error_path(pe->path,
4029 GOT_ERR_FILE_NOT_STAGED);
4035 const struct got_error *
4036 got_worktree_commit(struct got_object_id **new_commit_id,
4037 struct got_worktree *worktree, struct got_pathlist_head *paths,
4038 const char *author, const char *committer,
4039 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4040 got_worktree_status_cb status_cb, void *status_arg,
4041 struct got_repository *repo)
4043 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4044 struct got_fileindex *fileindex = NULL;
4045 char *fileindex_path = NULL;
4046 struct got_pathlist_head commitable_paths;
4047 struct collect_commitables_arg cc_arg;
4048 struct got_pathlist_entry *pe;
4049 struct got_reference *head_ref = NULL;
4050 struct got_object_id *head_commit_id = NULL;
4051 int have_staged_files = 0;
4053 *new_commit_id = NULL;
4055 TAILQ_INIT(&commitable_paths);
4057 err = lock_worktree(worktree, LOCK_EX);
4061 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4065 err = got_ref_resolve(&head_commit_id, repo, head_ref);
4069 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4073 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4074 &have_staged_files);
4075 if (err && err->code != GOT_ERR_CANCELLED)
4077 if (have_staged_files) {
4078 err = check_non_staged_files(fileindex, paths);
4083 cc_arg.commitable_paths = &commitable_paths;
4084 cc_arg.worktree = worktree;
4086 cc_arg.have_staged_files = have_staged_files;
4087 TAILQ_FOREACH(pe, paths, entry) {
4088 err = worktree_status(worktree, pe->path, fileindex, repo,
4089 collect_commitables, &cc_arg, NULL, NULL);
4094 if (TAILQ_EMPTY(&commitable_paths)) {
4095 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4099 TAILQ_FOREACH(pe, paths, entry) {
4100 err = check_path_is_commitable(pe->path, &commitable_paths);
4105 TAILQ_FOREACH(pe, &commitable_paths, entry) {
4106 struct got_commitable *ct = pe->data;
4107 const char *ct_path = ct->in_repo_path;
4109 while (ct_path[0] == '/')
4111 err = check_out_of_date(ct_path, ct->status,
4112 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4113 head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4119 err = commit_worktree(new_commit_id, &commitable_paths,
4120 head_commit_id, worktree, author, committer,
4121 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4125 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4127 sync_err = sync_fileindex(fileindex, fileindex_path);
4128 if (sync_err && err == NULL)
4132 got_fileindex_free(fileindex);
4133 free(fileindex_path);
4134 unlockerr = lock_worktree(worktree, LOCK_SH);
4135 if (unlockerr && err == NULL)
4137 TAILQ_FOREACH(pe, &commitable_paths, entry) {
4138 struct got_commitable *ct = pe->data;
4139 free_commitable(ct);
4141 got_pathlist_free(&commitable_paths);
4146 got_commitable_get_path(struct got_commitable *ct)
4152 got_commitable_get_status(struct got_commitable *ct)
4157 struct check_rebase_ok_arg {
4158 struct got_worktree *worktree;
4159 struct got_repository *repo;
4162 static const struct got_error *
4163 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4165 const struct got_error *err = NULL;
4166 struct check_rebase_ok_arg *a = arg;
4167 unsigned char status;
4171 /* Reject rebase of a work tree with mixed base commits. */
4172 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4173 SHA1_DIGEST_LENGTH))
4174 return got_error(GOT_ERR_MIXED_COMMITS);
4176 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4178 return got_error_from_errno("asprintf");
4180 /* Reject rebase of a work tree with modified or staged files. */
4181 err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
4186 if (status != GOT_STATUS_NO_CHANGE)
4187 return got_error(GOT_ERR_MODIFIED);
4188 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4189 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4194 const struct got_error *
4195 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4196 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4197 struct got_worktree *worktree, struct got_reference *branch,
4198 struct got_repository *repo)
4200 const struct got_error *err = NULL;
4201 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4202 char *branch_ref_name = NULL;
4203 char *fileindex_path = NULL;
4204 struct check_rebase_ok_arg ok_arg;
4205 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4207 *new_base_branch_ref = NULL;
4211 err = lock_worktree(worktree, LOCK_EX);
4215 err = open_fileindex(fileindex, &fileindex_path, worktree);
4219 ok_arg.worktree = worktree;
4221 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4226 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4230 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4234 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4238 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4243 err = got_ref_alloc_symref(new_base_branch_ref,
4244 new_base_branch_ref_name, wt_branch);
4247 err = got_ref_write(*new_base_branch_ref, repo);
4251 /* TODO Lock original branch's ref while rebasing? */
4253 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4257 err = got_ref_write(branch_ref, repo);
4261 err = got_ref_alloc(tmp_branch, tmp_branch_name,
4262 worktree->base_commit_id);
4265 err = got_ref_write(*tmp_branch, repo);
4269 err = got_worktree_set_head_ref(worktree, *tmp_branch);
4273 free(fileindex_path);
4274 free(tmp_branch_name);
4275 free(new_base_branch_ref_name);
4276 free(branch_ref_name);
4278 got_ref_close(branch_ref);
4280 got_ref_close(wt_branch);
4282 if (*new_base_branch_ref) {
4283 got_ref_close(*new_base_branch_ref);
4284 *new_base_branch_ref = NULL;
4287 got_ref_close(*tmp_branch);
4291 got_fileindex_free(*fileindex);
4294 lock_worktree(worktree, LOCK_SH);
4299 const struct got_error *
4300 got_worktree_rebase_continue(struct got_object_id **commit_id,
4301 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4302 struct got_reference **branch, struct got_fileindex **fileindex,
4303 struct got_worktree *worktree, struct got_repository *repo)
4305 const struct got_error *err;
4306 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4307 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4308 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4309 char *fileindex_path = NULL;
4310 int have_staged_files = 0;
4313 *new_base_branch = NULL;
4318 err = lock_worktree(worktree, LOCK_EX);
4322 err = open_fileindex(fileindex, &fileindex_path, worktree);
4326 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4327 &have_staged_files);
4328 if (err && err->code != GOT_ERR_CANCELLED)
4330 if (have_staged_files) {
4331 err = got_error(GOT_ERR_STAGED_PATHS);
4335 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4339 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4343 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4347 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4351 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4355 err = got_ref_open(branch, repo,
4356 got_ref_get_symref_target(branch_ref), 0);
4360 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4364 err = got_ref_resolve(commit_id, repo, commit_ref);
4368 err = got_ref_open(new_base_branch, repo,
4369 new_base_branch_ref_name, 0);
4373 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4377 free(commit_ref_name);
4378 free(branch_ref_name);
4379 free(fileindex_path);
4381 got_ref_close(commit_ref);
4383 got_ref_close(branch_ref);
4388 got_ref_close(*tmp_branch);
4391 if (*new_base_branch) {
4392 got_ref_close(*new_base_branch);
4393 *new_base_branch = NULL;
4396 got_ref_close(*branch);
4400 got_fileindex_free(*fileindex);
4403 lock_worktree(worktree, LOCK_SH);
4408 const struct got_error *
4409 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4411 const struct got_error *err;
4412 char *tmp_branch_name = NULL;
4414 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4418 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4419 free(tmp_branch_name);
4423 static const struct got_error *
4424 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4425 char **logmsg, void *arg)
4431 static const struct got_error *
4432 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4433 const char *path, struct got_object_id *blob_id,
4434 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
4439 struct collect_merged_paths_arg {
4440 got_worktree_checkout_cb progress_cb;
4442 struct got_pathlist_head *merged_paths;
4445 static const struct got_error *
4446 collect_merged_paths(void *arg, unsigned char status, const char *path)
4448 const struct got_error *err;
4449 struct collect_merged_paths_arg *a = arg;
4451 struct got_pathlist_entry *new;
4453 err = (*a->progress_cb)(a->progress_arg, status, path);
4457 if (status != GOT_STATUS_MERGE &&
4458 status != GOT_STATUS_ADD &&
4459 status != GOT_STATUS_DELETE &&
4460 status != GOT_STATUS_CONFLICT)
4465 return got_error_from_errno("strdup");
4467 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4468 if (err || new == NULL)
4474 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4476 struct got_pathlist_entry *pe;
4478 TAILQ_FOREACH(pe, merged_paths, entry)
4479 free((char *)pe->path);
4481 got_pathlist_free(merged_paths);
4484 static const struct got_error *
4485 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4486 struct got_repository *repo)
4488 const struct got_error *err;
4489 struct got_reference *commit_ref = NULL;
4491 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4493 if (err->code != GOT_ERR_NOT_REF)
4495 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4498 err = got_ref_write(commit_ref, repo);
4502 struct got_object_id *stored_id;
4505 err = got_ref_resolve(&stored_id, repo, commit_ref);
4508 cmp = got_object_id_cmp(commit_id, stored_id);
4511 err = got_error(GOT_ERR_REBASE_COMMITID);
4517 got_ref_close(commit_ref);
4521 static const struct got_error *
4522 rebase_merge_files(struct got_pathlist_head *merged_paths,
4523 const char *commit_ref_name, struct got_worktree *worktree,
4524 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4525 struct got_object_id *commit_id, struct got_repository *repo,
4526 got_worktree_checkout_cb progress_cb, void *progress_arg,
4527 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4529 const struct got_error *err;
4530 struct got_reference *commit_ref = NULL;
4531 struct collect_merged_paths_arg cmp_arg;
4532 char *fileindex_path;
4534 /* Work tree is locked/unlocked during rebase preparation/teardown. */
4536 err = get_fileindex_path(&fileindex_path, worktree);
4540 cmp_arg.progress_cb = progress_cb;
4541 cmp_arg.progress_arg = progress_arg;
4542 cmp_arg.merged_paths = merged_paths;
4543 err = merge_files(worktree, fileindex, fileindex_path,
4544 parent_commit_id, commit_id, repo, collect_merged_paths,
4545 &cmp_arg, cancel_cb, cancel_arg);
4547 got_ref_close(commit_ref);
4551 const struct got_error *
4552 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4553 struct got_worktree *worktree, struct got_fileindex *fileindex,
4554 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4555 struct got_repository *repo,
4556 got_worktree_checkout_cb progress_cb, void *progress_arg,
4557 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4559 const struct got_error *err;
4560 char *commit_ref_name;
4562 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4566 err = store_commit_id(commit_ref_name, commit_id, repo);
4570 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4571 fileindex, parent_commit_id, commit_id, repo, progress_cb,
4572 progress_arg, cancel_cb, cancel_arg);
4574 free(commit_ref_name);
4578 const struct got_error *
4579 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4580 struct got_worktree *worktree, struct got_fileindex *fileindex,
4581 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4582 struct got_repository *repo,
4583 got_worktree_checkout_cb progress_cb, void *progress_arg,
4584 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4586 const struct got_error *err;
4587 char *commit_ref_name;
4589 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4593 err = store_commit_id(commit_ref_name, commit_id, repo);
4597 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4598 fileindex, parent_commit_id, commit_id, repo, progress_cb,
4599 progress_arg, cancel_cb, cancel_arg);
4601 free(commit_ref_name);
4605 static const struct got_error *
4606 rebase_commit(struct got_object_id **new_commit_id,
4607 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4608 struct got_worktree *worktree, struct got_fileindex *fileindex,
4609 struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4610 const char *new_logmsg, struct got_repository *repo)
4612 const struct got_error *err, *sync_err;
4613 struct got_pathlist_head commitable_paths;
4614 struct collect_commitables_arg cc_arg;
4615 char *fileindex_path = NULL;
4616 struct got_reference *head_ref = NULL;
4617 struct got_object_id *head_commit_id = NULL;
4618 char *logmsg = NULL;
4620 TAILQ_INIT(&commitable_paths);
4621 *new_commit_id = NULL;
4623 /* Work tree is locked/unlocked during rebase preparation/teardown. */
4625 err = get_fileindex_path(&fileindex_path, worktree);
4629 cc_arg.commitable_paths = &commitable_paths;
4630 cc_arg.worktree = worktree;
4632 cc_arg.have_staged_files = 0;
4634 * If possible get the status of individual files directly to
4635 * avoid crawling the entire work tree once per rebased commit.
4636 * TODO: Ideally, merged_paths would contain a list of commitables
4637 * we could use so we could skip worktree_status() entirely.
4640 struct got_pathlist_entry *pe;
4641 if (TAILQ_EMPTY(merged_paths)) {
4642 err = got_error(GOT_ERR_NO_MERGED_PATHS);
4645 TAILQ_FOREACH(pe, merged_paths, entry) {
4646 err = worktree_status(worktree, pe->path, fileindex,
4647 repo, collect_commitables, &cc_arg, NULL, NULL);
4652 err = worktree_status(worktree, "", fileindex, repo,
4653 collect_commitables, &cc_arg, NULL, NULL);
4658 if (TAILQ_EMPTY(&commitable_paths)) {
4659 /* No-op change; commit will be elided. */
4660 err = got_ref_delete(commit_ref, repo);
4663 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4667 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4671 err = got_ref_resolve(&head_commit_id, repo, head_ref);
4676 logmsg = strdup(new_logmsg);
4678 logmsg = strdup(got_object_commit_get_logmsg(orig_commit));
4680 return got_error_from_errno("strdup");
4682 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4683 worktree, got_object_commit_get_author(orig_commit),
4684 got_object_commit_get_committer(orig_commit),
4685 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4689 err = got_ref_change_ref(tmp_branch, *new_commit_id);
4693 err = got_ref_delete(commit_ref, repo);
4697 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4699 sync_err = sync_fileindex(fileindex, fileindex_path);
4700 if (sync_err && err == NULL)
4703 free(fileindex_path);
4704 free(head_commit_id);
4706 got_ref_close(head_ref);
4708 free(*new_commit_id);
4709 *new_commit_id = NULL;
4714 const struct got_error *
4715 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4716 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4717 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4718 struct got_commit_object *orig_commit,
4719 struct got_object_id *orig_commit_id, struct got_repository *repo)
4721 const struct got_error *err;
4722 char *commit_ref_name;
4723 struct got_reference *commit_ref = NULL;
4724 struct got_object_id *commit_id = NULL;
4726 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4730 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4733 err = got_ref_resolve(&commit_id, repo, commit_ref);
4736 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4737 err = got_error(GOT_ERR_REBASE_COMMITID);
4741 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4742 worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4745 got_ref_close(commit_ref);
4746 free(commit_ref_name);
4751 const struct got_error *
4752 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4753 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4754 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4755 struct got_commit_object *orig_commit,
4756 struct got_object_id *orig_commit_id, const char *new_logmsg,
4757 struct got_repository *repo)
4759 const struct got_error *err;
4760 char *commit_ref_name;
4761 struct got_reference *commit_ref = NULL;
4762 struct got_object_id *commit_id = NULL;
4764 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4768 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4771 err = got_ref_resolve(&commit_id, repo, commit_ref);
4774 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4775 err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4779 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4780 worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4783 got_ref_close(commit_ref);
4784 free(commit_ref_name);
4789 const struct got_error *
4790 got_worktree_rebase_postpone(struct got_worktree *worktree,
4791 struct got_fileindex *fileindex)
4794 got_fileindex_free(fileindex);
4795 return lock_worktree(worktree, LOCK_SH);
4798 static const struct got_error *
4799 delete_ref(const char *name, struct got_repository *repo)
4801 const struct got_error *err;
4802 struct got_reference *ref;
4804 err = got_ref_open(&ref, repo, name, 0);
4806 if (err->code == GOT_ERR_NOT_REF)
4811 err = got_ref_delete(ref, repo);
4816 static const struct got_error *
4817 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4819 const struct got_error *err;
4820 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4821 char *branch_ref_name = NULL, *commit_ref_name = NULL;
4823 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4826 err = delete_ref(tmp_branch_name, repo);
4830 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4833 err = delete_ref(new_base_branch_ref_name, repo);
4837 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4840 err = delete_ref(branch_ref_name, repo);
4844 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4847 err = delete_ref(commit_ref_name, repo);
4852 free(tmp_branch_name);
4853 free(new_base_branch_ref_name);
4854 free(branch_ref_name);
4855 free(commit_ref_name);
4859 const struct got_error *
4860 got_worktree_rebase_complete(struct got_worktree *worktree,
4861 struct got_fileindex *fileindex, struct got_reference *new_base_branch,
4862 struct got_reference *tmp_branch, struct got_reference *rebased_branch,
4863 struct got_repository *repo)
4865 const struct got_error *err, *unlockerr;
4866 struct got_object_id *new_head_commit_id = NULL;
4868 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4872 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
4876 err = got_ref_write(rebased_branch, repo);
4880 err = got_worktree_set_head_ref(worktree, rebased_branch);
4884 err = delete_rebase_refs(worktree, repo);
4887 got_fileindex_free(fileindex);
4888 free(new_head_commit_id);
4889 unlockerr = lock_worktree(worktree, LOCK_SH);
4890 if (unlockerr && err == NULL)
4895 const struct got_error *
4896 got_worktree_rebase_abort(struct got_worktree *worktree,
4897 struct got_fileindex *fileindex, struct got_repository *repo,
4898 struct got_reference *new_base_branch,
4899 got_worktree_checkout_cb progress_cb, void *progress_arg)
4901 const struct got_error *err, *unlockerr, *sync_err;
4902 struct got_reference *resolved = NULL;
4903 struct got_object_id *commit_id = NULL;
4904 char *fileindex_path = NULL;
4905 struct revert_file_args rfa;
4906 struct got_object_id *tree_id = NULL;
4908 err = lock_worktree(worktree, LOCK_EX);
4912 err = got_ref_open(&resolved, repo,
4913 got_ref_get_symref_target(new_base_branch), 0);
4917 err = got_worktree_set_head_ref(worktree, resolved);
4922 * XXX commits to the base branch could have happened while
4923 * we were busy rebasing; should we store the original commit ID
4924 * when rebase begins and read it back here?
4926 err = got_ref_resolve(&commit_id, repo, resolved);
4930 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4934 err = got_object_id_by_path(&tree_id, repo,
4935 worktree->base_commit_id, worktree->path_prefix);
4939 err = delete_rebase_refs(worktree, repo);
4943 err = get_fileindex_path(&fileindex_path, worktree);
4947 rfa.worktree = worktree;
4948 rfa.fileindex = fileindex;
4949 rfa.progress_cb = progress_cb;
4950 rfa.progress_arg = progress_arg;
4951 rfa.patch_cb = NULL;
4952 rfa.patch_arg = NULL;
4954 err = worktree_status(worktree, "", fileindex, repo,
4955 revert_file, &rfa, NULL, NULL);
4959 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4960 repo, progress_cb, progress_arg, NULL, NULL);
4962 sync_err = sync_fileindex(fileindex, fileindex_path);
4963 if (sync_err && err == NULL)
4966 got_ref_close(resolved);
4970 got_fileindex_free(fileindex);
4971 free(fileindex_path);
4973 unlockerr = lock_worktree(worktree, LOCK_SH);
4974 if (unlockerr && err == NULL)
4979 const struct got_error *
4980 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
4981 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
4982 struct got_fileindex **fileindex, struct got_worktree *worktree,
4983 struct got_repository *repo)
4985 const struct got_error *err = NULL;
4986 char *tmp_branch_name = NULL;
4987 char *branch_ref_name = NULL;
4988 char *base_commit_ref_name = NULL;
4989 char *fileindex_path = NULL;
4990 struct check_rebase_ok_arg ok_arg;
4991 struct got_reference *wt_branch = NULL;
4992 struct got_reference *base_commit_ref = NULL;
4996 *base_commit_id = NULL;
4999 err = lock_worktree(worktree, LOCK_EX);
5003 err = open_fileindex(fileindex, &fileindex_path, worktree);
5007 ok_arg.worktree = worktree;
5009 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5014 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5018 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5022 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5027 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5032 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5036 err = got_ref_write(*branch_ref, repo);
5040 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5041 worktree->base_commit_id);
5044 err = got_ref_write(base_commit_ref, repo);
5047 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5048 if (*base_commit_id == NULL) {
5049 err = got_error_from_errno("got_object_id_dup");
5053 err = got_ref_alloc(tmp_branch, tmp_branch_name,
5054 worktree->base_commit_id);
5057 err = got_ref_write(*tmp_branch, repo);
5061 err = got_worktree_set_head_ref(worktree, *tmp_branch);
5065 free(fileindex_path);
5066 free(tmp_branch_name);
5067 free(branch_ref_name);
5068 free(base_commit_ref_name);
5070 got_ref_close(wt_branch);
5073 got_ref_close(*branch_ref);
5077 got_ref_close(*tmp_branch);
5080 free(*base_commit_id);
5082 got_fileindex_free(*fileindex);
5085 lock_worktree(worktree, LOCK_SH);
5090 const struct got_error *
5091 got_worktree_histedit_postpone(struct got_worktree *worktree,
5092 struct got_fileindex *fileindex)
5095 got_fileindex_free(fileindex);
5096 return lock_worktree(worktree, LOCK_SH);
5099 const struct got_error *
5100 got_worktree_histedit_in_progress(int *in_progress,
5101 struct got_worktree *worktree)
5103 const struct got_error *err;
5104 char *tmp_branch_name = NULL;
5106 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5110 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5111 free(tmp_branch_name);
5115 const struct got_error *
5116 got_worktree_histedit_continue(struct got_object_id **commit_id,
5117 struct got_reference **tmp_branch, struct got_reference **branch_ref,
5118 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5119 struct got_worktree *worktree, struct got_repository *repo)
5121 const struct got_error *err;
5122 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5123 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5124 struct got_reference *commit_ref = NULL;
5125 struct got_reference *base_commit_ref = NULL;
5126 char *fileindex_path = NULL;
5127 int have_staged_files = 0;
5131 *base_commit_id = NULL;
5134 err = lock_worktree(worktree, LOCK_EX);
5138 err = open_fileindex(fileindex, &fileindex_path, worktree);
5142 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5143 &have_staged_files);
5144 if (err && err->code != GOT_ERR_CANCELLED)
5146 if (have_staged_files) {
5147 err = got_error(GOT_ERR_STAGED_PATHS);
5151 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5155 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5159 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5163 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5168 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5172 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5175 err = got_ref_resolve(commit_id, repo, commit_ref);
5179 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5182 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5186 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5190 free(commit_ref_name);
5191 free(branch_ref_name);
5192 free(fileindex_path);
5194 got_ref_close(commit_ref);
5195 if (base_commit_ref)
5196 got_ref_close(base_commit_ref);
5200 free(*base_commit_id);
5201 *base_commit_id = NULL;
5203 got_ref_close(*tmp_branch);
5207 got_fileindex_free(*fileindex);
5210 lock_worktree(worktree, LOCK_EX);
5215 static const struct got_error *
5216 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5218 const struct got_error *err;
5219 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5220 char *branch_ref_name = NULL, *commit_ref_name = NULL;
5222 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5225 err = delete_ref(tmp_branch_name, repo);
5229 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5233 err = delete_ref(base_commit_ref_name, repo);
5237 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5240 err = delete_ref(branch_ref_name, repo);
5244 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5247 err = delete_ref(commit_ref_name, repo);
5251 free(tmp_branch_name);
5252 free(base_commit_ref_name);
5253 free(branch_ref_name);
5254 free(commit_ref_name);
5258 const struct got_error *
5259 got_worktree_histedit_abort(struct got_worktree *worktree,
5260 struct got_fileindex *fileindex, struct got_repository *repo,
5261 struct got_reference *branch, struct got_object_id *base_commit_id,
5262 got_worktree_checkout_cb progress_cb, void *progress_arg)
5264 const struct got_error *err, *unlockerr, *sync_err;
5265 struct got_reference *resolved = NULL;
5266 char *fileindex_path = NULL;
5267 struct got_object_id *tree_id = NULL;
5268 struct revert_file_args rfa;
5270 err = lock_worktree(worktree, LOCK_EX);
5274 err = got_ref_open(&resolved, repo,
5275 got_ref_get_symref_target(branch), 0);
5279 err = got_worktree_set_head_ref(worktree, resolved);
5283 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5287 err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5288 worktree->path_prefix);
5292 err = delete_histedit_refs(worktree, repo);
5296 err = get_fileindex_path(&fileindex_path, worktree);
5300 rfa.worktree = worktree;
5301 rfa.fileindex = fileindex;
5302 rfa.progress_cb = progress_cb;
5303 rfa.progress_arg = progress_arg;
5304 rfa.patch_cb = NULL;
5305 rfa.patch_arg = NULL;
5307 err = worktree_status(worktree, "", fileindex, repo,
5308 revert_file, &rfa, NULL, NULL);
5312 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5313 repo, progress_cb, progress_arg, NULL, NULL);
5315 sync_err = sync_fileindex(fileindex, fileindex_path);
5316 if (sync_err && err == NULL)
5319 got_ref_close(resolved);
5321 free(fileindex_path);
5323 unlockerr = lock_worktree(worktree, LOCK_SH);
5324 if (unlockerr && err == NULL)
5329 const struct got_error *
5330 got_worktree_histedit_complete(struct got_worktree *worktree,
5331 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5332 struct got_reference *edited_branch, struct got_repository *repo)
5334 const struct got_error *err, *unlockerr;
5335 struct got_object_id *new_head_commit_id = NULL;
5336 struct got_reference *resolved = NULL;
5338 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5342 err = got_ref_open(&resolved, repo,
5343 got_ref_get_symref_target(edited_branch), 0);
5347 err = got_ref_change_ref(resolved, new_head_commit_id);
5351 err = got_ref_write(resolved, repo);
5355 err = got_worktree_set_head_ref(worktree, resolved);
5359 err = delete_histedit_refs(worktree, repo);
5362 got_fileindex_free(fileindex);
5363 free(new_head_commit_id);
5364 unlockerr = lock_worktree(worktree, LOCK_SH);
5365 if (unlockerr && err == NULL)
5370 const struct got_error *
5371 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5372 struct got_object_id *commit_id, struct got_repository *repo)
5374 const struct got_error *err;
5375 char *commit_ref_name;
5377 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5381 err = store_commit_id(commit_ref_name, commit_id, repo);
5385 err = delete_ref(commit_ref_name, repo);
5387 free(commit_ref_name);
5391 struct check_stage_ok_arg {
5392 struct got_object_id *head_commit_id;
5393 struct got_worktree *worktree;
5394 struct got_fileindex *fileindex;
5395 struct got_repository *repo;
5399 const struct got_error *
5400 check_stage_ok(void *arg, unsigned char status,
5401 unsigned char staged_status, const char *relpath,
5402 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5403 struct got_object_id *commit_id)
5405 struct check_stage_ok_arg *a = arg;
5406 const struct got_error *err = NULL;
5407 struct got_fileindex_entry *ie;
5408 struct got_object_id base_commit_id;
5409 struct got_object_id *base_commit_idp = NULL;
5410 char *in_repo_path = NULL, *p;
5412 if (status == GOT_STATUS_UNVERSIONED)
5415 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5417 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5419 if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
5420 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5422 return got_error_from_errno("asprintf");
5424 if (got_fileindex_entry_has_commit(ie)) {
5425 memcpy(base_commit_id.sha1, ie->commit_sha1,
5426 SHA1_DIGEST_LENGTH);
5427 base_commit_idp = &base_commit_id;
5430 if (status == GOT_STATUS_NO_CHANGE) {
5431 err = got_error_path(ie->path, GOT_ERR_STAGE_NO_CHANGE);
5433 } else if (status == GOT_STATUS_CONFLICT) {
5434 err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
5436 } else if (status != GOT_STATUS_ADD &&
5437 status != GOT_STATUS_MODIFY &&
5438 status != GOT_STATUS_DELETE) {
5439 err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
5443 a->have_changes = 1;
5448 err = check_out_of_date(p, status, staged_status,
5449 blob_id, base_commit_idp, a->head_commit_id, a->repo,
5450 GOT_ERR_STAGE_OUT_OF_DATE);
5456 struct stage_path_arg {
5457 struct got_worktree *worktree;
5458 struct got_fileindex *fileindex;
5459 struct got_repository *repo;
5460 got_worktree_status_cb status_cb;
5462 got_worktree_patch_cb patch_cb;
5466 static const struct got_error *
5467 stage_path(void *arg, unsigned char status,
5468 unsigned char staged_status, const char *relpath,
5469 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5470 struct got_object_id *commit_id)
5472 struct stage_path_arg *a = arg;
5473 const struct got_error *err = NULL;
5474 struct got_fileindex_entry *ie;
5475 char *ondisk_path = NULL, *path_content = NULL;
5477 struct got_object_id *new_staged_blob_id = NULL;
5479 if (status == GOT_STATUS_UNVERSIONED)
5482 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5484 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5486 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
5488 return got_error_from_errno("asprintf");
5491 case GOT_STATUS_ADD:
5492 case GOT_STATUS_MODIFY:
5494 if (status == GOT_STATUS_ADD) {
5495 int choice = GOT_PATCH_CHOICE_NONE;
5496 err = (*a->patch_cb)(&choice, a->patch_arg,
5497 status, ie->path, NULL, 1, 1);
5500 if (choice != GOT_PATCH_CHOICE_YES)
5503 err = create_patched_content(&path_content, 0,
5504 staged_blob_id ? staged_blob_id : blob_id,
5505 ondisk_path, ie->path, a->repo,
5506 a->patch_cb, a->patch_arg);
5507 if (err || path_content == NULL)
5511 err = got_object_blob_create(&new_staged_blob_id,
5512 path_content ? path_content : ondisk_path, a->repo);
5515 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
5516 SHA1_DIGEST_LENGTH);
5517 if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
5518 stage = GOT_FILEIDX_STAGE_ADD;
5520 stage = GOT_FILEIDX_STAGE_MODIFY;
5521 got_fileindex_entry_stage_set(ie, stage);
5522 if (a->status_cb == NULL)
5524 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5525 get_staged_status(ie), relpath, blob_id,
5526 new_staged_blob_id, NULL);
5528 case GOT_STATUS_DELETE:
5529 if (staged_status == GOT_STATUS_DELETE)
5532 int choice = GOT_PATCH_CHOICE_NONE;
5533 err = (*a->patch_cb)(&choice, a->patch_arg, status,
5534 ie->path, NULL, 1, 1);
5537 if (choice == GOT_PATCH_CHOICE_NO)
5539 if (choice != GOT_PATCH_CHOICE_YES) {
5540 err = got_error(GOT_ERR_PATCH_CHOICE);
5544 stage = GOT_FILEIDX_STAGE_DELETE;
5545 got_fileindex_entry_stage_set(ie, stage);
5546 if (a->status_cb == NULL)
5548 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5549 get_staged_status(ie), relpath, NULL, NULL, NULL);
5551 case GOT_STATUS_NO_CHANGE:
5552 err = got_error_path(relpath, GOT_ERR_STAGE_NO_CHANGE);
5554 case GOT_STATUS_CONFLICT:
5555 err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
5558 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
5562 if (path_content && unlink(path_content) == -1 && err == NULL)
5563 err = got_error_from_errno2("unlink", path_content);
5566 free(new_staged_blob_id);
5570 const struct got_error *
5571 got_worktree_stage(struct got_worktree *worktree,
5572 struct got_pathlist_head *paths,
5573 got_worktree_status_cb status_cb, void *status_arg,
5574 got_worktree_patch_cb patch_cb, void *patch_arg,
5575 struct got_repository *repo)
5577 const struct got_error *err = NULL, *sync_err, *unlockerr;
5578 struct got_pathlist_entry *pe;
5579 struct got_fileindex *fileindex = NULL;
5580 char *fileindex_path = NULL;
5581 struct got_reference *head_ref = NULL;
5582 struct got_object_id *head_commit_id = NULL;
5583 struct check_stage_ok_arg oka;
5584 struct stage_path_arg spa;
5586 err = lock_worktree(worktree, LOCK_EX);
5590 err = got_ref_open(&head_ref, repo,
5591 got_worktree_get_head_ref_name(worktree), 0);
5594 err = got_ref_resolve(&head_commit_id, repo, head_ref);
5597 err = open_fileindex(&fileindex, &fileindex_path, worktree);
5601 /* Check pre-conditions before staging anything. */
5602 oka.head_commit_id = head_commit_id;
5603 oka.worktree = worktree;
5604 oka.fileindex = fileindex;
5606 oka.have_changes = 0;
5607 TAILQ_FOREACH(pe, paths, entry) {
5608 err = worktree_status(worktree, pe->path, fileindex, repo,
5609 check_stage_ok, &oka, NULL, NULL);
5613 if (!oka.have_changes) {
5614 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
5618 spa.worktree = worktree;
5619 spa.fileindex = fileindex;
5621 spa.patch_cb = patch_cb;
5622 spa.patch_arg = patch_arg;
5623 spa.status_cb = status_cb;
5624 spa.status_arg = status_arg;
5625 TAILQ_FOREACH(pe, paths, entry) {
5626 err = worktree_status(worktree, pe->path, fileindex, repo,
5627 stage_path, &spa, NULL, NULL);
5632 sync_err = sync_fileindex(fileindex, fileindex_path);
5633 if (sync_err && err == NULL)
5637 got_ref_close(head_ref);
5638 free(head_commit_id);
5639 free(fileindex_path);
5641 got_fileindex_free(fileindex);
5642 unlockerr = lock_worktree(worktree, LOCK_SH);
5643 if (unlockerr && err == NULL)
5648 struct unstage_path_arg {
5649 struct got_worktree *worktree;
5650 struct got_fileindex *fileindex;
5651 struct got_repository *repo;
5652 got_worktree_checkout_cb progress_cb;
5654 got_worktree_patch_cb patch_cb;
5658 static const struct got_error *
5659 create_unstaged_content(char **path_unstaged_content,
5660 char **path_new_staged_content, struct got_object_id *blob_id,
5661 struct got_object_id *staged_blob_id, const char *relpath,
5662 struct got_repository *repo,
5663 got_worktree_patch_cb patch_cb, void *patch_arg)
5665 const struct got_error *err;
5666 struct got_blob_object *blob = NULL, *staged_blob = NULL;
5667 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
5668 char *path1 = NULL, *path2 = NULL, *label1 = NULL;
5669 struct stat sb1, sb2;
5670 struct got_diff_changes *changes = NULL;
5671 struct got_diff_state *ds = NULL;
5672 struct got_diff_args *args = NULL;
5673 struct got_diff_change *change;
5674 int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
5675 int have_content = 0, have_rejected_content = 0;
5677 *path_unstaged_content = NULL;
5678 *path_new_staged_content = NULL;
5680 err = got_object_id_str(&label1, blob_id);
5683 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
5687 err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
5691 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
5695 err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
5699 err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
5703 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
5707 if (stat(path1, &sb1) == -1) {
5708 err = got_error_from_errno2("stat", path1);
5712 if (stat(path2, &sb2) == -1) {
5713 err = got_error_from_errno2("stat", path2);
5717 err = got_diff_files(&changes, &ds, &args, &diff_flags,
5718 f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
5722 err = got_opentemp_named(path_unstaged_content, &outfile,
5723 "got-unstaged-content");
5726 err = got_opentemp_named(path_new_staged_content, &rejectfile,
5727 "got-new-staged-content");
5731 if (fseek(f1, 0L, SEEK_SET) == -1) {
5732 err = got_ferror(f1, GOT_ERR_IO);
5735 if (fseek(f2, 0L, SEEK_SET) == -1) {
5736 err = got_ferror(f2, GOT_ERR_IO);
5739 SIMPLEQ_FOREACH(change, &changes->entries, entry) {
5741 err = apply_or_reject_change(&choice, change, ++n,
5742 changes->nchanges, ds, args, diff_flags, relpath,
5743 f1, f2, &line_cur1, &line_cur2,
5744 outfile, rejectfile, patch_cb, patch_arg);
5747 if (choice == GOT_PATCH_CHOICE_YES)
5750 have_rejected_content = 1;
5751 if (choice == GOT_PATCH_CHOICE_QUIT)
5757 got_object_blob_close(blob);
5759 got_object_blob_close(staged_blob);
5760 if (f1 && fclose(f1) == EOF && err == NULL)
5761 err = got_error_from_errno2("fclose", path1);
5762 if (f2 && fclose(f2) == EOF && err == NULL)
5763 err = got_error_from_errno2("fclose", path2);
5764 if (outfile && fclose(outfile) == EOF && err == NULL)
5765 err = got_error_from_errno2("fclose", *path_unstaged_content);
5766 if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
5767 err = got_error_from_errno2("fclose", *path_new_staged_content);
5768 if (path1 && unlink(path1) == -1 && err == NULL)
5769 err = got_error_from_errno2("unlink", path1);
5770 if (path2 && unlink(path2) == -1 && err == NULL)
5771 err = got_error_from_errno2("unlink", path2);
5772 if (err || !have_content) {
5773 if (*path_unstaged_content &&
5774 unlink(*path_unstaged_content) == -1 && err == NULL)
5775 err = got_error_from_errno2("unlink",
5776 *path_unstaged_content);
5777 free(*path_unstaged_content);
5778 *path_unstaged_content = NULL;
5780 if (err || !have_rejected_content) {
5781 if (*path_new_staged_content &&
5782 unlink(*path_new_staged_content) == -1 && err == NULL)
5783 err = got_error_from_errno2("unlink",
5784 *path_new_staged_content);
5785 free(*path_new_staged_content);
5786 *path_new_staged_content = NULL;
5790 got_diff_state_free(ds);
5794 got_diff_free_changes(changes);
5800 static const struct got_error *
5801 unstage_path(void *arg, unsigned char status,
5802 unsigned char staged_status, const char *relpath,
5803 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5804 struct got_object_id *commit_id)
5806 const struct got_error *err = NULL;
5807 struct unstage_path_arg *a = arg;
5808 struct got_fileindex_entry *ie;
5809 struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
5810 char *ondisk_path = NULL, *path_unstaged_content = NULL;
5811 char *path_new_staged_content = NULL;
5812 int local_changes_subsumed;
5815 if (staged_status != GOT_STATUS_ADD &&
5816 staged_status != GOT_STATUS_MODIFY &&
5817 staged_status != GOT_STATUS_DELETE)
5820 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5822 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5824 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
5826 return got_error_from_errno("asprintf");
5828 switch (staged_status) {
5829 case GOT_STATUS_MODIFY:
5830 err = got_object_open_as_blob(&blob_base, a->repo,
5835 case GOT_STATUS_ADD:
5837 if (staged_status == GOT_STATUS_ADD) {
5838 int choice = GOT_PATCH_CHOICE_NONE;
5839 err = (*a->patch_cb)(&choice, a->patch_arg,
5840 staged_status, ie->path, NULL, 1, 1);
5843 if (choice != GOT_PATCH_CHOICE_YES)
5846 err = create_unstaged_content(
5847 &path_unstaged_content,
5848 &path_new_staged_content, blob_id,
5849 staged_blob_id, ie->path, a->repo,
5850 a->patch_cb, a->patch_arg);
5851 if (err || path_unstaged_content == NULL)
5853 if (path_new_staged_content) {
5854 err = got_object_blob_create(
5856 path_new_staged_content,
5860 memcpy(ie->staged_blob_sha1,
5861 staged_blob_id->sha1,
5862 SHA1_DIGEST_LENGTH);
5864 err = merge_file(&local_changes_subsumed,
5865 a->worktree, blob_base, ondisk_path,
5866 relpath, got_fileindex_perms_to_st(ie),
5867 path_unstaged_content, "unstaged",
5868 a->repo, a->progress_cb, a->progress_arg);
5870 path_new_staged_content == NULL)
5871 got_fileindex_entry_stage_set(ie,
5872 GOT_FILEIDX_STAGE_NONE);
5873 break; /* Done with this file. */
5876 err = got_object_open_as_blob(&blob_staged, a->repo,
5877 staged_blob_id, 8192);
5880 err = merge_blob(&local_changes_subsumed, a->worktree,
5881 blob_base, ondisk_path, relpath,
5882 got_fileindex_perms_to_st(ie), blob_staged,
5883 commit_id ? commit_id : a->worktree->base_commit_id,
5884 a->repo, a->progress_cb, a->progress_arg);
5886 got_fileindex_entry_stage_set(ie,
5887 GOT_FILEIDX_STAGE_NONE);
5889 case GOT_STATUS_DELETE:
5891 int choice = GOT_PATCH_CHOICE_NONE;
5892 err = (*a->patch_cb)(&choice, a->patch_arg,
5893 staged_status, ie->path, NULL, 1, 1);
5896 if (choice == GOT_PATCH_CHOICE_NO)
5898 if (choice != GOT_PATCH_CHOICE_YES) {
5899 err = got_error(GOT_ERR_PATCH_CHOICE);
5903 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
5904 err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
5907 err = (*a->progress_cb)(a->progress_arg, status, relpath);
5912 if (path_unstaged_content &&
5913 unlink(path_unstaged_content) == -1 && err == NULL)
5914 err = got_error_from_errno2("unlink", path_unstaged_content);
5915 if (path_new_staged_content &&
5916 unlink(path_new_staged_content) == -1 && err == NULL)
5917 err = got_error_from_errno2("unlink", path_new_staged_content);
5918 free(path_unstaged_content);
5919 free(path_new_staged_content);
5921 got_object_blob_close(blob_base);
5923 got_object_blob_close(blob_staged);
5927 const struct got_error *
5928 got_worktree_unstage(struct got_worktree *worktree,
5929 struct got_pathlist_head *paths,
5930 got_worktree_checkout_cb progress_cb, void *progress_arg,
5931 got_worktree_patch_cb patch_cb, void *patch_arg,
5932 struct got_repository *repo)
5934 const struct got_error *err = NULL, *sync_err, *unlockerr;
5935 struct got_pathlist_entry *pe;
5936 struct got_fileindex *fileindex = NULL;
5937 char *fileindex_path = NULL;
5938 struct unstage_path_arg upa;
5940 err = lock_worktree(worktree, LOCK_EX);
5944 err = open_fileindex(&fileindex, &fileindex_path, worktree);
5948 upa.worktree = worktree;
5949 upa.fileindex = fileindex;
5951 upa.progress_cb = progress_cb;
5952 upa.progress_arg = progress_arg;
5953 upa.patch_cb = patch_cb;
5954 upa.patch_arg = patch_arg;
5955 TAILQ_FOREACH(pe, paths, entry) {
5956 err = worktree_status(worktree, pe->path, fileindex, repo,
5957 unstage_path, &upa, NULL, NULL);
5962 sync_err = sync_fileindex(fileindex, fileindex_path);
5963 if (sync_err && err == NULL)
5966 free(fileindex_path);
5968 got_fileindex_free(fileindex);
5969 unlockerr = lock_worktree(worktree, LOCK_SH);
5970 if (unlockerr && err == NULL)