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 revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2688 const char *ondisk_path,
2689 got_worktree_checkout_cb progress_cb, void *progress_arg,
2690 struct got_repository *repo)
2692 const struct got_error *err = NULL;
2693 char *relpath = NULL, *parent_path = NULL;
2694 struct got_fileindex_entry *ie;
2695 struct got_tree_object *tree = NULL;
2696 struct got_object_id *tree_id = NULL;
2697 const struct got_tree_entry *te = NULL;
2698 char *tree_path = NULL, *te_name;
2699 struct got_blob_object *blob = NULL;
2700 unsigned char status, staged_status;
2703 err = got_path_skip_common_ancestor(&relpath,
2704 got_worktree_get_root_path(worktree), ondisk_path);
2708 ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2710 err = got_error(GOT_ERR_BAD_PATH);
2714 /* Construct in-repository path of tree which contains this blob. */
2715 err = got_path_dirname(&parent_path, ie->path);
2717 if (err->code != GOT_ERR_BAD_PATH)
2719 parent_path = strdup("/");
2720 if (parent_path == NULL) {
2721 err = got_error_from_errno("strdup");
2725 if (got_path_is_root_dir(worktree->path_prefix)) {
2726 tree_path = strdup(parent_path);
2727 if (tree_path == NULL) {
2728 err = got_error_from_errno("strdup");
2732 if (got_path_is_root_dir(parent_path)) {
2733 tree_path = strdup(worktree->path_prefix);
2734 if (tree_path == NULL) {
2735 err = got_error_from_errno("strdup");
2739 if (asprintf(&tree_path, "%s/%s",
2740 worktree->path_prefix, parent_path) == -1) {
2741 err = got_error_from_errno("asprintf");
2747 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2750 if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
2751 sb.st_mode = got_fileindex_perms_to_st(ie);
2753 staged_status = get_staged_status(ie);
2754 if (status == GOT_STATUS_DELETE &&
2755 staged_status != GOT_STATUS_NO_CHANGE) {
2756 err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2760 err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2763 if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
2764 (status == GOT_STATUS_ADD ||
2765 staged_status == GOT_STATUS_ADD)))
2768 err = got_object_open_as_tree(&tree, repo, tree_id);
2772 te_name = basename(ie->path);
2773 if (te_name == NULL) {
2774 err = got_error_from_errno2("basename", ie->path);
2778 te = got_object_tree_find_entry(tree, te_name);
2779 if (te == NULL && status != GOT_STATUS_ADD &&
2780 staged_status != GOT_STATUS_ADD) {
2781 err = got_error(GOT_ERR_NO_TREE_ENTRY);
2787 case GOT_STATUS_ADD:
2788 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2791 got_fileindex_entry_remove(fileindex, ie);
2793 case GOT_STATUS_DELETE:
2794 case GOT_STATUS_MODIFY:
2795 case GOT_STATUS_CONFLICT:
2796 case GOT_STATUS_MISSING: {
2797 struct got_object_id id;
2798 if (staged_status == GOT_STATUS_ADD ||
2799 staged_status == GOT_STATUS_MODIFY) {
2800 memcpy(id.sha1, ie->staged_blob_sha1,
2801 SHA1_DIGEST_LENGTH);
2803 memcpy(id.sha1, ie->blob_sha1,
2804 SHA1_DIGEST_LENGTH);
2805 err = got_object_open_as_blob(&blob, repo, &id, 8192);
2808 err = install_blob(worktree, ondisk_path, ie->path,
2809 te ? te->mode : GOT_DEFAULT_FILE_MODE, sb.st_mode,
2810 blob, 0, 1, repo, progress_cb, progress_arg);
2813 if (status == GOT_STATUS_DELETE) {
2814 err = update_blob_fileindex_entry(worktree,
2815 fileindex, ie, ondisk_path, ie->path, blob, 1);
2829 got_object_blob_close(blob);
2831 got_object_tree_close(tree);
2836 const struct got_error *
2837 got_worktree_revert(struct got_worktree *worktree,
2838 struct got_pathlist_head *ondisk_paths,
2839 got_worktree_checkout_cb progress_cb, void *progress_arg,
2840 struct got_repository *repo)
2842 struct got_fileindex *fileindex = NULL;
2843 char *fileindex_path = NULL;
2844 const struct got_error *err = NULL, *unlockerr = NULL;
2845 const struct got_error *sync_err = NULL;
2846 struct got_pathlist_entry *pe;
2848 err = lock_worktree(worktree, LOCK_EX);
2852 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2856 TAILQ_FOREACH(pe, ondisk_paths, entry) {
2858 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2860 return got_error_from_errno("asprintf");
2861 err = revert_file(worktree, fileindex, ondisk_path,
2862 progress_cb, progress_arg, repo);
2867 sync_err = sync_fileindex(fileindex, fileindex_path);
2868 if (sync_err && err == NULL)
2871 free(fileindex_path);
2873 got_fileindex_free(fileindex);
2874 unlockerr = lock_worktree(worktree, LOCK_SH);
2875 if (unlockerr && err == NULL)
2881 free_commitable(struct got_commitable *ct)
2884 free(ct->in_repo_path);
2885 free(ct->ondisk_path);
2887 free(ct->base_blob_id);
2888 free(ct->staged_blob_id);
2889 free(ct->base_commit_id);
2893 struct collect_commitables_arg {
2894 struct got_pathlist_head *commitable_paths;
2895 struct got_repository *repo;
2896 struct got_worktree *worktree;
2897 int have_staged_files;
2900 static const struct got_error *
2901 collect_commitables(void *arg, unsigned char status,
2902 unsigned char staged_status, const char *relpath,
2903 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
2904 struct got_object_id *commit_id)
2906 struct collect_commitables_arg *a = arg;
2907 const struct got_error *err = NULL;
2908 struct got_commitable *ct = NULL;
2909 struct got_pathlist_entry *new = NULL;
2910 char *parent_path = NULL, *path = NULL;
2913 if (a->have_staged_files) {
2914 if (staged_status != GOT_STATUS_MODIFY &&
2915 staged_status != GOT_STATUS_ADD &&
2916 staged_status != GOT_STATUS_DELETE)
2919 if (status == GOT_STATUS_CONFLICT)
2920 return got_error(GOT_ERR_COMMIT_CONFLICT);
2922 if (status != GOT_STATUS_MODIFY &&
2923 status != GOT_STATUS_ADD &&
2924 status != GOT_STATUS_DELETE)
2928 if (asprintf(&path, "/%s", relpath) == -1) {
2929 err = got_error_from_errno("asprintf");
2932 if (strcmp(path, "/") == 0) {
2933 parent_path = strdup("");
2934 if (parent_path == NULL)
2935 return got_error_from_errno("strdup");
2937 err = got_path_dirname(&parent_path, path);
2942 ct = calloc(1, sizeof(*ct));
2944 err = got_error_from_errno("calloc");
2948 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2950 err = got_error_from_errno("asprintf");
2953 if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
2954 sb.st_mode = GOT_DEFAULT_FILE_MODE;
2956 if (lstat(ct->ondisk_path, &sb) != 0) {
2957 err = got_error_from_errno2("lstat", ct->ondisk_path);
2960 ct->mode = sb.st_mode;
2963 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2964 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2966 err = got_error_from_errno("asprintf");
2970 ct->status = status;
2971 ct->staged_status = staged_status;
2972 ct->blob_id = NULL; /* will be filled in when blob gets created */
2973 if (ct->status != GOT_STATUS_ADD &&
2974 ct->staged_status != GOT_STATUS_ADD) {
2975 ct->base_blob_id = got_object_id_dup(blob_id);
2976 if (ct->base_blob_id == NULL) {
2977 err = got_error_from_errno("got_object_id_dup");
2980 ct->base_commit_id = got_object_id_dup(commit_id);
2981 if (ct->base_commit_id == NULL) {
2982 err = got_error_from_errno("got_object_id_dup");
2986 if (ct->staged_status == GOT_STATUS_ADD ||
2987 ct->staged_status == GOT_STATUS_MODIFY) {
2988 ct->staged_blob_id = got_object_id_dup(staged_blob_id);
2989 if (ct->staged_blob_id == NULL) {
2990 err = got_error_from_errno("got_object_id_dup");
2994 ct->path = strdup(path);
2995 if (ct->path == NULL) {
2996 err = got_error_from_errno("strdup");
2999 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3001 if (ct && (err || new == NULL))
3002 free_commitable(ct);
3008 static const struct got_error *write_tree(struct got_object_id **,
3009 struct got_tree_object *, const char *, struct got_pathlist_head *,
3010 got_worktree_status_cb status_cb, void *status_arg,
3011 struct got_repository *);
3013 static const struct got_error *
3014 write_subtree(struct got_object_id **new_subtree_id,
3015 struct got_tree_entry *te, const char *parent_path,
3016 struct got_pathlist_head *commitable_paths,
3017 got_worktree_status_cb status_cb, void *status_arg,
3018 struct got_repository *repo)
3020 const struct got_error *err = NULL;
3021 struct got_tree_object *subtree;
3024 if (asprintf(&subpath, "%s%s%s", parent_path,
3025 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3026 return got_error_from_errno("asprintf");
3028 err = got_object_open_as_tree(&subtree, repo, te->id);
3032 err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3033 status_cb, status_arg, repo);
3034 got_object_tree_close(subtree);
3039 static const struct got_error *
3040 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3042 const struct got_error *err = NULL;
3043 char *ct_parent_path = NULL;
3047 if (strchr(ct->in_repo_path, '/') == NULL) {
3048 *match = got_path_is_root_dir(path);
3052 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3055 *match = (strcmp(path, ct_parent_path) == 0);
3056 free(ct_parent_path);
3061 get_ct_file_mode(struct got_commitable *ct)
3063 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3066 static const struct got_error *
3067 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3068 struct got_tree_entry *te, struct got_commitable *ct)
3070 const struct got_error *err = NULL;
3074 err = got_object_tree_entry_dup(new_te, te);
3078 (*new_te)->mode = get_ct_file_mode(ct);
3080 free((*new_te)->id);
3081 if (ct->staged_status == GOT_STATUS_MODIFY)
3082 (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3084 (*new_te)->id = got_object_id_dup(ct->blob_id);
3085 if ((*new_te)->id == NULL) {
3086 err = got_error_from_errno("got_object_id_dup");
3090 if (err && *new_te) {
3091 got_object_tree_entry_close(*new_te);
3097 static const struct got_error *
3098 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3099 struct got_commitable *ct)
3101 const struct got_error *err = NULL;
3106 *new_te = calloc(1, sizeof(**new_te));
3107 if (*new_te == NULL)
3108 return got_error_from_errno("calloc");
3110 ct_name = basename(ct->path);
3111 if (ct_name == NULL) {
3112 err = got_error_from_errno2("basename", ct->path);
3115 (*new_te)->name = strdup(ct_name);
3116 if ((*new_te)->name == NULL) {
3117 err = got_error_from_errno("strdup");
3121 (*new_te)->mode = get_ct_file_mode(ct);
3123 if (ct->staged_status == GOT_STATUS_ADD)
3124 (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3126 (*new_te)->id = got_object_id_dup(ct->blob_id);
3127 if ((*new_te)->id == NULL) {
3128 err = got_error_from_errno("got_object_id_dup");
3132 if (err && *new_te) {
3133 got_object_tree_entry_close(*new_te);
3139 static const struct got_error *
3140 insert_tree_entry(struct got_tree_entry *new_te,
3141 struct got_pathlist_head *paths)
3143 const struct got_error *err = NULL;
3144 struct got_pathlist_entry *new_pe;
3146 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3150 return got_error(GOT_ERR_TREE_DUP_ENTRY);
3154 static const struct got_error *
3155 report_ct_status(struct got_commitable *ct,
3156 got_worktree_status_cb status_cb, void *status_arg)
3158 const char *ct_path = ct->path;
3159 unsigned char status;
3161 while (ct_path[0] == '/')
3164 if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3165 status = ct->staged_status;
3167 status = ct->status;
3169 return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3170 ct_path, ct->blob_id, NULL, NULL);
3173 static const struct got_error *
3174 match_modified_subtree(int *modified, struct got_tree_entry *te,
3175 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3177 const struct got_error *err = NULL;
3178 struct got_pathlist_entry *pe;
3183 if (asprintf(&te_path, "%s%s%s", base_tree_path,
3184 got_path_is_root_dir(base_tree_path) ? "" : "/",
3186 return got_error_from_errno("asprintf");
3188 TAILQ_FOREACH(pe, commitable_paths, entry) {
3189 struct got_commitable *ct = pe->data;
3190 *modified = got_path_is_child(ct->in_repo_path, te_path,
3200 static const struct got_error *
3201 match_deleted_or_modified_ct(struct got_commitable **ctp,
3202 struct got_tree_entry *te, const char *base_tree_path,
3203 struct got_pathlist_head *commitable_paths)
3205 const struct got_error *err = NULL;
3206 struct got_pathlist_entry *pe;
3210 TAILQ_FOREACH(pe, commitable_paths, entry) {
3211 struct got_commitable *ct = pe->data;
3212 char *ct_name = NULL;
3215 if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3216 if (ct->status != GOT_STATUS_MODIFY &&
3217 ct->status != GOT_STATUS_DELETE)
3220 if (ct->staged_status != GOT_STATUS_MODIFY &&
3221 ct->staged_status != GOT_STATUS_DELETE)
3225 if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3228 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3234 ct_name = basename(pe->path);
3235 if (ct_name == NULL)
3236 return got_error_from_errno2("basename", pe->path);
3238 if (strcmp(te->name, ct_name) != 0)
3248 static const struct got_error *
3249 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3250 const char *child_path, const char *path_base_tree,
3251 struct got_pathlist_head *commitable_paths,
3252 got_worktree_status_cb status_cb, void *status_arg,
3253 struct got_repository *repo)
3255 const struct got_error *err = NULL;
3256 struct got_tree_entry *new_te;
3261 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3262 got_path_is_root_dir(path_base_tree) ? "" : "/",
3264 return got_error_from_errno("asprintf");
3266 new_te = calloc(1, sizeof(*new_te));
3267 new_te->mode = S_IFDIR;
3268 new_te->name = strdup(child_path);
3269 if (new_te->name == NULL) {
3270 err = got_error_from_errno("strdup");
3271 got_object_tree_entry_close(new_te);
3274 err = write_tree(&new_te->id, NULL, subtree_path,
3275 commitable_paths, status_cb, status_arg, repo);
3277 got_object_tree_entry_close(new_te);
3287 static const struct got_error *
3288 write_tree(struct got_object_id **new_tree_id,
3289 struct got_tree_object *base_tree, const char *path_base_tree,
3290 struct got_pathlist_head *commitable_paths,
3291 got_worktree_status_cb status_cb, void *status_arg,
3292 struct got_repository *repo)
3294 const struct got_error *err = NULL;
3295 const struct got_tree_entries *base_entries = NULL;
3296 struct got_pathlist_head paths;
3297 struct got_tree_entries new_tree_entries;
3298 struct got_tree_entry *te, *new_te = NULL;
3299 struct got_pathlist_entry *pe;
3302 new_tree_entries.nentries = 0;
3303 SIMPLEQ_INIT(&new_tree_entries.head);
3305 /* Insert, and recurse into, newly added entries first. */
3306 TAILQ_FOREACH(pe, commitable_paths, entry) {
3307 struct got_commitable *ct = pe->data;
3308 char *child_path = NULL, *slash;
3310 if ((ct->status != GOT_STATUS_ADD &&
3311 ct->staged_status != GOT_STATUS_ADD) ||
3312 (ct->flags & GOT_COMMITABLE_ADDED))
3315 if (!got_path_is_child(pe->path, path_base_tree,
3316 strlen(path_base_tree)))
3319 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3324 slash = strchr(child_path, '/');
3325 if (slash == NULL) {
3326 err = alloc_added_blob_tree_entry(&new_te, ct);
3329 err = report_ct_status(ct, status_cb, status_arg);
3332 ct->flags |= GOT_COMMITABLE_ADDED;
3333 err = insert_tree_entry(new_te, &paths);
3337 *slash = '\0'; /* trim trailing path components */
3338 if (base_tree == NULL ||
3339 got_object_tree_find_entry(base_tree, child_path)
3341 err = make_subtree_for_added_blob(&new_te,
3342 child_path, path_base_tree,
3343 commitable_paths, status_cb, status_arg,
3347 err = insert_tree_entry(new_te, &paths);
3355 /* Handle modified and deleted entries. */
3356 base_entries = got_object_tree_get_entries(base_tree);
3357 SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3358 struct got_commitable *ct = NULL;
3360 if (S_ISDIR(te->mode)) {
3362 err = got_object_tree_entry_dup(&new_te, te);
3365 err = match_modified_subtree(&modified, te,
3366 path_base_tree, commitable_paths);
3369 /* Avoid recursion into unmodified subtrees. */
3372 err = write_subtree(&new_te->id, te,
3373 path_base_tree, commitable_paths,
3374 status_cb, status_arg, repo);
3378 err = insert_tree_entry(new_te, &paths);
3384 err = match_deleted_or_modified_ct(&ct, te,
3385 path_base_tree, commitable_paths);
3387 /* NB: Deleted entries get dropped here. */
3388 if (ct->status == GOT_STATUS_MODIFY ||
3389 ct->staged_status == GOT_STATUS_MODIFY) {
3390 err = alloc_modified_blob_tree_entry(
3394 err = insert_tree_entry(new_te, &paths);
3398 err = report_ct_status(ct, status_cb,
3403 /* Entry is unchanged; just copy it. */
3404 err = got_object_tree_entry_dup(&new_te, te);
3407 err = insert_tree_entry(new_te, &paths);
3414 /* Write new list of entries; deleted entries have been dropped. */
3415 TAILQ_FOREACH(pe, &paths, entry) {
3416 struct got_tree_entry *te = pe->data;
3417 new_tree_entries.nentries++;
3418 SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3420 err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3422 got_object_tree_entries_close(&new_tree_entries);
3423 got_pathlist_free(&paths);
3427 static const struct got_error *
3428 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3429 struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3431 const struct got_error *err = NULL;
3432 struct got_pathlist_entry *pe;
3434 TAILQ_FOREACH(pe, commitable_paths, entry) {
3435 struct got_fileindex_entry *ie;
3436 struct got_commitable *ct = pe->data;
3438 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3440 if (ct->status == GOT_STATUS_DELETE ||
3441 ct->staged_status == GOT_STATUS_DELETE) {
3442 got_fileindex_entry_remove(fileindex, ie);
3443 got_fileindex_entry_free(ie);
3444 } else if (ct->staged_status == GOT_STATUS_ADD ||
3445 ct->staged_status == GOT_STATUS_MODIFY) {
3446 got_fileindex_entry_stage_set(ie,
3447 GOT_FILEIDX_STAGE_NONE);
3448 err = got_fileindex_entry_update(ie,
3449 ct->ondisk_path, ct->staged_blob_id->sha1,
3450 new_base_commit_id->sha1, 1);
3452 err = got_fileindex_entry_update(ie,
3453 ct->ondisk_path, ct->blob_id->sha1,
3454 new_base_commit_id->sha1, 1);
3456 err = got_fileindex_entry_alloc(&ie,
3457 ct->ondisk_path, pe->path, ct->blob_id->sha1,
3458 new_base_commit_id->sha1);
3461 err = got_fileindex_entry_add(fileindex, ie);
3470 static const struct got_error *
3471 check_out_of_date(const char *in_repo_path, unsigned char status,
3472 unsigned char staged_status, struct got_object_id *base_blob_id,
3473 struct got_object_id *base_commit_id,
3474 struct got_object_id *head_commit_id, struct got_repository *repo,
3477 const struct got_error *err = NULL;
3478 struct got_object_id *id = NULL;
3480 if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
3481 /* Trivial case: base commit == head commit */
3482 if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
3485 * Ensure file content which local changes were based
3486 * on matches file content in the branch head.
3488 err = got_object_id_by_path(&id, repo, head_commit_id,
3491 if (err->code == GOT_ERR_NO_TREE_ENTRY)
3492 err = got_error(ood_errcode);
3494 } else if (got_object_id_cmp(id, base_blob_id) != 0)
3495 err = got_error(ood_errcode);
3497 /* Require that added files don't exist in the branch head. */
3498 err = got_object_id_by_path(&id, repo, head_commit_id,
3500 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3502 err = id ? got_error(ood_errcode) : NULL;
3509 const struct got_error *
3510 commit_worktree(struct got_object_id **new_commit_id,
3511 struct got_pathlist_head *commitable_paths,
3512 struct got_object_id *head_commit_id, struct got_worktree *worktree,
3513 const char *author, const char *committer,
3514 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3515 got_worktree_status_cb status_cb, void *status_arg,
3516 struct got_repository *repo)
3518 const struct got_error *err = NULL, *unlockerr = NULL;
3519 struct got_pathlist_entry *pe;
3520 const char *head_ref_name = NULL;
3521 struct got_commit_object *head_commit = NULL;
3522 struct got_reference *head_ref2 = NULL;
3523 struct got_object_id *head_commit_id2 = NULL;
3524 struct got_tree_object *head_tree = NULL;
3525 struct got_object_id *new_tree_id = NULL;
3526 struct got_object_id_queue parent_ids;
3527 struct got_object_qid *pid = NULL;
3528 char *logmsg = NULL;
3530 *new_commit_id = NULL;
3532 SIMPLEQ_INIT(&parent_ids);
3534 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3538 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3542 if (commit_msg_cb != NULL) {
3543 err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3548 if (logmsg == NULL || strlen(logmsg) == 0) {
3549 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3553 /* Create blobs from added and modified files and record their IDs. */
3554 TAILQ_FOREACH(pe, commitable_paths, entry) {
3555 struct got_commitable *ct = pe->data;
3558 /* Blobs for staged files already exist. */
3559 if (ct->staged_status == GOT_STATUS_ADD ||
3560 ct->staged_status == GOT_STATUS_MODIFY)
3563 if (ct->status != GOT_STATUS_ADD &&
3564 ct->status != GOT_STATUS_MODIFY)
3567 if (asprintf(&ondisk_path, "%s/%s",
3568 worktree->root_path, pe->path) == -1) {
3569 err = got_error_from_errno("asprintf");
3572 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3578 /* Recursively write new tree objects. */
3579 err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3580 status_cb, status_arg, repo);
3584 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3587 SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3588 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3589 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3590 got_object_qid_free(pid);
3596 /* Check if a concurrent commit to our branch has occurred. */
3597 head_ref_name = got_worktree_get_head_ref_name(worktree);
3598 if (head_ref_name == NULL) {
3599 err = got_error_from_errno("got_worktree_get_head_ref_name");
3602 /* Lock the reference here to prevent concurrent modification. */
3603 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3606 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3609 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3610 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3613 /* Update branch head in repository. */
3614 err = got_ref_change_ref(head_ref2, *new_commit_id);
3617 err = got_ref_write(head_ref2, repo);
3621 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3625 err = ref_base_commit(worktree, repo);
3630 got_object_tree_close(head_tree);
3632 got_object_commit_close(head_commit);
3633 free(head_commit_id2);
3635 unlockerr = got_ref_unlock(head_ref2);
3636 if (unlockerr && err == NULL)
3638 got_ref_close(head_ref2);
3643 static const struct got_error *
3644 check_path_is_commitable(const char *path,
3645 struct got_pathlist_head *commitable_paths)
3647 struct got_pathlist_entry *cpe = NULL;
3648 size_t path_len = strlen(path);
3650 TAILQ_FOREACH(cpe, commitable_paths, entry) {
3651 struct got_commitable *ct = cpe->data;
3652 const char *ct_path = ct->path;
3654 while (ct_path[0] == '/')
3657 if (strcmp(path, ct_path) == 0 ||
3658 got_path_is_child(ct_path, path, path_len))
3663 return got_error_path(path, GOT_ERR_BAD_PATH);
3668 static const struct got_error *
3669 check_staged_file(void *arg, struct got_fileindex_entry *ie)
3671 int *have_staged_files = arg;
3673 if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
3674 *have_staged_files = 1;
3675 return got_error(GOT_ERR_CANCELLED);
3681 static const struct got_error *
3682 check_non_staged_files(struct got_fileindex *fileindex,
3683 struct got_pathlist_head *paths)
3685 struct got_pathlist_entry *pe;
3686 struct got_fileindex_entry *ie;
3688 TAILQ_FOREACH(pe, paths, entry) {
3689 if (pe->path[0] == '\0')
3691 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3693 return got_error_path(pe->path, GOT_ERR_BAD_PATH);
3694 if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
3695 return got_error_path(pe->path,
3696 GOT_ERR_FILE_NOT_STAGED);
3702 const struct got_error *
3703 got_worktree_commit(struct got_object_id **new_commit_id,
3704 struct got_worktree *worktree, struct got_pathlist_head *paths,
3705 const char *author, const char *committer,
3706 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3707 got_worktree_status_cb status_cb, void *status_arg,
3708 struct got_repository *repo)
3710 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3711 struct got_fileindex *fileindex = NULL;
3712 char *fileindex_path = NULL;
3713 struct got_pathlist_head commitable_paths;
3714 struct collect_commitables_arg cc_arg;
3715 struct got_pathlist_entry *pe;
3716 struct got_reference *head_ref = NULL;
3717 struct got_object_id *head_commit_id = NULL;
3718 int have_staged_files = 0;
3720 *new_commit_id = NULL;
3722 TAILQ_INIT(&commitable_paths);
3724 err = lock_worktree(worktree, LOCK_EX);
3728 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3732 err = got_ref_resolve(&head_commit_id, repo, head_ref);
3736 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3740 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
3741 &have_staged_files);
3742 if (err && err->code != GOT_ERR_CANCELLED)
3744 if (have_staged_files) {
3745 err = check_non_staged_files(fileindex, paths);
3750 cc_arg.commitable_paths = &commitable_paths;
3751 cc_arg.worktree = worktree;
3753 cc_arg.have_staged_files = have_staged_files;
3754 TAILQ_FOREACH(pe, paths, entry) {
3755 err = worktree_status(worktree, pe->path, fileindex, repo,
3756 collect_commitables, &cc_arg, NULL, NULL);
3761 if (TAILQ_EMPTY(&commitable_paths)) {
3762 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3766 TAILQ_FOREACH(pe, paths, entry) {
3767 err = check_path_is_commitable(pe->path, &commitable_paths);
3772 TAILQ_FOREACH(pe, &commitable_paths, entry) {
3773 struct got_commitable *ct = pe->data;
3774 const char *ct_path = ct->in_repo_path;
3776 while (ct_path[0] == '/')
3778 err = check_out_of_date(ct_path, ct->status,
3779 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
3780 head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
3786 err = commit_worktree(new_commit_id, &commitable_paths,
3787 head_commit_id, worktree, author, committer,
3788 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3792 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3794 sync_err = sync_fileindex(fileindex, fileindex_path);
3795 if (sync_err && err == NULL)
3799 got_fileindex_free(fileindex);
3800 free(fileindex_path);
3801 unlockerr = lock_worktree(worktree, LOCK_SH);
3802 if (unlockerr && err == NULL)
3804 TAILQ_FOREACH(pe, &commitable_paths, entry) {
3805 struct got_commitable *ct = pe->data;
3806 free_commitable(ct);
3808 got_pathlist_free(&commitable_paths);
3813 got_commitable_get_path(struct got_commitable *ct)
3819 got_commitable_get_status(struct got_commitable *ct)
3824 struct check_rebase_ok_arg {
3825 struct got_worktree *worktree;
3826 struct got_repository *repo;
3829 static const struct got_error *
3830 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3832 const struct got_error *err = NULL;
3833 struct check_rebase_ok_arg *a = arg;
3834 unsigned char status;
3838 /* Reject rebase of a work tree with mixed base commits. */
3839 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3840 SHA1_DIGEST_LENGTH))
3841 return got_error(GOT_ERR_MIXED_COMMITS);
3843 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3845 return got_error_from_errno("asprintf");
3847 /* Reject rebase of a work tree with modified or staged files. */
3848 err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3853 if (status != GOT_STATUS_NO_CHANGE)
3854 return got_error(GOT_ERR_MODIFIED);
3855 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
3856 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
3861 const struct got_error *
3862 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3863 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
3864 struct got_worktree *worktree, struct got_reference *branch,
3865 struct got_repository *repo)
3867 const struct got_error *err = NULL;
3868 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3869 char *branch_ref_name = NULL;
3870 char *fileindex_path = NULL;
3871 struct check_rebase_ok_arg ok_arg;
3872 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3874 *new_base_branch_ref = NULL;
3878 err = lock_worktree(worktree, LOCK_EX);
3882 err = open_fileindex(fileindex, &fileindex_path, worktree);
3886 ok_arg.worktree = worktree;
3888 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
3893 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3897 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3901 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3905 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3910 err = got_ref_alloc_symref(new_base_branch_ref,
3911 new_base_branch_ref_name, wt_branch);
3914 err = got_ref_write(*new_base_branch_ref, repo);
3918 /* TODO Lock original branch's ref while rebasing? */
3920 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3924 err = got_ref_write(branch_ref, repo);
3928 err = got_ref_alloc(tmp_branch, tmp_branch_name,
3929 worktree->base_commit_id);
3932 err = got_ref_write(*tmp_branch, repo);
3936 err = got_worktree_set_head_ref(worktree, *tmp_branch);
3940 free(fileindex_path);
3941 free(tmp_branch_name);
3942 free(new_base_branch_ref_name);
3943 free(branch_ref_name);
3945 got_ref_close(branch_ref);
3947 got_ref_close(wt_branch);
3949 if (*new_base_branch_ref) {
3950 got_ref_close(*new_base_branch_ref);
3951 *new_base_branch_ref = NULL;
3954 got_ref_close(*tmp_branch);
3958 got_fileindex_free(*fileindex);
3961 lock_worktree(worktree, LOCK_SH);
3966 const struct got_error *
3967 got_worktree_rebase_continue(struct got_object_id **commit_id,
3968 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3969 struct got_reference **branch, struct got_fileindex **fileindex,
3970 struct got_worktree *worktree, struct got_repository *repo)
3972 const struct got_error *err;
3973 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3974 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3975 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3976 char *fileindex_path = NULL;
3977 int have_staged_files = 0;
3980 *new_base_branch = NULL;
3985 err = lock_worktree(worktree, LOCK_EX);
3989 err = open_fileindex(fileindex, &fileindex_path, worktree);
3993 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
3994 &have_staged_files);
3995 if (err && err->code != GOT_ERR_CANCELLED)
3997 if (have_staged_files) {
3998 err = got_error(GOT_ERR_STAGED_PATHS);
4002 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4006 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4010 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4014 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4018 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4022 err = got_ref_open(branch, repo,
4023 got_ref_get_symref_target(branch_ref), 0);
4027 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4031 err = got_ref_resolve(commit_id, repo, commit_ref);
4035 err = got_ref_open(new_base_branch, repo,
4036 new_base_branch_ref_name, 0);
4040 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4044 free(commit_ref_name);
4045 free(branch_ref_name);
4046 free(fileindex_path);
4048 got_ref_close(commit_ref);
4050 got_ref_close(branch_ref);
4055 got_ref_close(*tmp_branch);
4058 if (*new_base_branch) {
4059 got_ref_close(*new_base_branch);
4060 *new_base_branch = NULL;
4063 got_ref_close(*branch);
4067 got_fileindex_free(*fileindex);
4070 lock_worktree(worktree, LOCK_SH);
4075 const struct got_error *
4076 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4078 const struct got_error *err;
4079 char *tmp_branch_name = NULL;
4081 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4085 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4086 free(tmp_branch_name);
4090 static const struct got_error *
4091 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4092 char **logmsg, void *arg)
4098 static const struct got_error *
4099 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4100 const char *path, struct got_object_id *blob_id,
4101 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
4106 struct collect_merged_paths_arg {
4107 got_worktree_checkout_cb progress_cb;
4109 struct got_pathlist_head *merged_paths;
4112 static const struct got_error *
4113 collect_merged_paths(void *arg, unsigned char status, const char *path)
4115 const struct got_error *err;
4116 struct collect_merged_paths_arg *a = arg;
4118 struct got_pathlist_entry *new;
4120 err = (*a->progress_cb)(a->progress_arg, status, path);
4124 if (status != GOT_STATUS_MERGE &&
4125 status != GOT_STATUS_ADD &&
4126 status != GOT_STATUS_DELETE &&
4127 status != GOT_STATUS_CONFLICT)
4132 return got_error_from_errno("strdup");
4134 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4135 if (err || new == NULL)
4141 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4143 struct got_pathlist_entry *pe;
4145 TAILQ_FOREACH(pe, merged_paths, entry)
4146 free((char *)pe->path);
4148 got_pathlist_free(merged_paths);
4151 static const struct got_error *
4152 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4153 struct got_repository *repo)
4155 const struct got_error *err;
4156 struct got_reference *commit_ref = NULL;
4158 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4160 if (err->code != GOT_ERR_NOT_REF)
4162 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4165 err = got_ref_write(commit_ref, repo);
4169 struct got_object_id *stored_id;
4172 err = got_ref_resolve(&stored_id, repo, commit_ref);
4175 cmp = got_object_id_cmp(commit_id, stored_id);
4178 err = got_error(GOT_ERR_REBASE_COMMITID);
4184 got_ref_close(commit_ref);
4188 static const struct got_error *
4189 rebase_merge_files(struct got_pathlist_head *merged_paths,
4190 const char *commit_ref_name, struct got_worktree *worktree,
4191 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4192 struct got_object_id *commit_id, struct got_repository *repo,
4193 got_worktree_checkout_cb progress_cb, void *progress_arg,
4194 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4196 const struct got_error *err;
4197 struct got_reference *commit_ref = NULL;
4198 struct collect_merged_paths_arg cmp_arg;
4199 char *fileindex_path;
4201 /* Work tree is locked/unlocked during rebase preparation/teardown. */
4203 err = get_fileindex_path(&fileindex_path, worktree);
4207 cmp_arg.progress_cb = progress_cb;
4208 cmp_arg.progress_arg = progress_arg;
4209 cmp_arg.merged_paths = merged_paths;
4210 err = merge_files(worktree, fileindex, fileindex_path,
4211 parent_commit_id, commit_id, repo, collect_merged_paths,
4212 &cmp_arg, cancel_cb, cancel_arg);
4214 got_ref_close(commit_ref);
4218 const struct got_error *
4219 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4220 struct got_worktree *worktree, struct got_fileindex *fileindex,
4221 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4222 struct got_repository *repo,
4223 got_worktree_checkout_cb progress_cb, void *progress_arg,
4224 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4226 const struct got_error *err;
4227 char *commit_ref_name;
4229 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4233 err = store_commit_id(commit_ref_name, commit_id, repo);
4237 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4238 fileindex, parent_commit_id, commit_id, repo, progress_cb,
4239 progress_arg, cancel_cb, cancel_arg);
4241 free(commit_ref_name);
4245 const struct got_error *
4246 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4247 struct got_worktree *worktree, struct got_fileindex *fileindex,
4248 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4249 struct got_repository *repo,
4250 got_worktree_checkout_cb progress_cb, void *progress_arg,
4251 got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4253 const struct got_error *err;
4254 char *commit_ref_name;
4256 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4260 err = store_commit_id(commit_ref_name, commit_id, repo);
4264 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4265 fileindex, parent_commit_id, commit_id, repo, progress_cb,
4266 progress_arg, cancel_cb, cancel_arg);
4268 free(commit_ref_name);
4272 static const struct got_error *
4273 rebase_commit(struct got_object_id **new_commit_id,
4274 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4275 struct got_worktree *worktree, struct got_fileindex *fileindex,
4276 struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4277 const char *new_logmsg, struct got_repository *repo)
4279 const struct got_error *err, *sync_err;
4280 struct got_pathlist_head commitable_paths;
4281 struct collect_commitables_arg cc_arg;
4282 char *fileindex_path = NULL;
4283 struct got_reference *head_ref = NULL;
4284 struct got_object_id *head_commit_id = NULL;
4285 char *logmsg = NULL;
4287 TAILQ_INIT(&commitable_paths);
4288 *new_commit_id = NULL;
4290 /* Work tree is locked/unlocked during rebase preparation/teardown. */
4292 err = get_fileindex_path(&fileindex_path, worktree);
4296 cc_arg.commitable_paths = &commitable_paths;
4297 cc_arg.worktree = worktree;
4299 cc_arg.have_staged_files = 0;
4301 * If possible get the status of individual files directly to
4302 * avoid crawling the entire work tree once per rebased commit.
4303 * TODO: Ideally, merged_paths would contain a list of commitables
4304 * we could use so we could skip worktree_status() entirely.
4307 struct got_pathlist_entry *pe;
4308 if (TAILQ_EMPTY(merged_paths)) {
4309 err = got_error(GOT_ERR_NO_MERGED_PATHS);
4312 TAILQ_FOREACH(pe, merged_paths, entry) {
4313 err = worktree_status(worktree, pe->path, fileindex,
4314 repo, collect_commitables, &cc_arg, NULL, NULL);
4319 err = worktree_status(worktree, "", fileindex, repo,
4320 collect_commitables, &cc_arg, NULL, NULL);
4325 if (TAILQ_EMPTY(&commitable_paths)) {
4326 /* No-op change; commit will be elided. */
4327 err = got_ref_delete(commit_ref, repo);
4330 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4334 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4338 err = got_ref_resolve(&head_commit_id, repo, head_ref);
4343 logmsg = strdup(new_logmsg);
4345 logmsg = strdup(got_object_commit_get_logmsg(orig_commit));
4347 return got_error_from_errno("strdup");
4349 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4350 worktree, got_object_commit_get_author(orig_commit),
4351 got_object_commit_get_committer(orig_commit),
4352 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4356 err = got_ref_change_ref(tmp_branch, *new_commit_id);
4360 err = got_ref_delete(commit_ref, repo);
4364 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4366 sync_err = sync_fileindex(fileindex, fileindex_path);
4367 if (sync_err && err == NULL)
4370 free(fileindex_path);
4371 free(head_commit_id);
4373 got_ref_close(head_ref);
4375 free(*new_commit_id);
4376 *new_commit_id = NULL;
4381 const struct got_error *
4382 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4383 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4384 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4385 struct got_commit_object *orig_commit,
4386 struct got_object_id *orig_commit_id, struct got_repository *repo)
4388 const struct got_error *err;
4389 char *commit_ref_name;
4390 struct got_reference *commit_ref = NULL;
4391 struct got_object_id *commit_id = NULL;
4393 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4397 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4400 err = got_ref_resolve(&commit_id, repo, commit_ref);
4403 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4404 err = got_error(GOT_ERR_REBASE_COMMITID);
4408 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4409 worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4412 got_ref_close(commit_ref);
4413 free(commit_ref_name);
4418 const struct got_error *
4419 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4420 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4421 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4422 struct got_commit_object *orig_commit,
4423 struct got_object_id *orig_commit_id, const char *new_logmsg,
4424 struct got_repository *repo)
4426 const struct got_error *err;
4427 char *commit_ref_name;
4428 struct got_reference *commit_ref = NULL;
4429 struct got_object_id *commit_id = NULL;
4431 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4435 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4438 err = got_ref_resolve(&commit_id, repo, commit_ref);
4441 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4442 err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4446 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4447 worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4450 got_ref_close(commit_ref);
4451 free(commit_ref_name);
4456 const struct got_error *
4457 got_worktree_rebase_postpone(struct got_worktree *worktree,
4458 struct got_fileindex *fileindex)
4461 got_fileindex_free(fileindex);
4462 return lock_worktree(worktree, LOCK_SH);
4465 static const struct got_error *
4466 delete_ref(const char *name, struct got_repository *repo)
4468 const struct got_error *err;
4469 struct got_reference *ref;
4471 err = got_ref_open(&ref, repo, name, 0);
4473 if (err->code == GOT_ERR_NOT_REF)
4478 err = got_ref_delete(ref, repo);
4483 static const struct got_error *
4484 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4486 const struct got_error *err;
4487 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4488 char *branch_ref_name = NULL, *commit_ref_name = NULL;
4490 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4493 err = delete_ref(tmp_branch_name, repo);
4497 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4500 err = delete_ref(new_base_branch_ref_name, repo);
4504 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4507 err = delete_ref(branch_ref_name, repo);
4511 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4514 err = delete_ref(commit_ref_name, repo);
4519 free(tmp_branch_name);
4520 free(new_base_branch_ref_name);
4521 free(branch_ref_name);
4522 free(commit_ref_name);
4526 const struct got_error *
4527 got_worktree_rebase_complete(struct got_worktree *worktree,
4528 struct got_fileindex *fileindex, struct got_reference *new_base_branch,
4529 struct got_reference *tmp_branch, struct got_reference *rebased_branch,
4530 struct got_repository *repo)
4532 const struct got_error *err, *unlockerr;
4533 struct got_object_id *new_head_commit_id = NULL;
4535 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4539 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
4543 err = got_ref_write(rebased_branch, repo);
4547 err = got_worktree_set_head_ref(worktree, rebased_branch);
4551 err = delete_rebase_refs(worktree, repo);
4554 got_fileindex_free(fileindex);
4555 free(new_head_commit_id);
4556 unlockerr = lock_worktree(worktree, LOCK_SH);
4557 if (unlockerr && err == NULL)
4562 struct collect_revertible_paths_arg {
4563 struct got_pathlist_head *revertible_paths;
4564 struct got_worktree *worktree;
4567 static const struct got_error *
4568 collect_revertible_paths(void *arg, unsigned char status,
4569 unsigned char staged_status, const char *relpath,
4570 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4571 struct got_object_id *commit_id)
4573 struct collect_revertible_paths_arg *a = arg;
4574 const struct got_error *err = NULL;
4575 struct got_pathlist_entry *new = NULL;
4578 if (status != GOT_STATUS_ADD &&
4579 status != GOT_STATUS_DELETE &&
4580 status != GOT_STATUS_MODIFY &&
4581 status != GOT_STATUS_CONFLICT &&
4582 status != GOT_STATUS_MISSING)
4585 if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
4586 return got_error_from_errno("asprintf");
4588 err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
4589 if (err || new == NULL)
4594 const struct got_error *
4595 got_worktree_rebase_abort(struct got_worktree *worktree,
4596 struct got_fileindex *fileindex, struct got_repository *repo,
4597 struct got_reference *new_base_branch,
4598 got_worktree_checkout_cb progress_cb, void *progress_arg)
4600 const struct got_error *err, *unlockerr, *sync_err;
4601 struct got_reference *resolved = NULL;
4602 struct got_object_id *commit_id = NULL;
4603 char *fileindex_path = NULL;
4604 struct got_pathlist_head revertible_paths;
4605 struct got_pathlist_entry *pe;
4606 struct collect_revertible_paths_arg crp_arg;
4607 struct got_object_id *tree_id = NULL;
4609 TAILQ_INIT(&revertible_paths);
4611 err = lock_worktree(worktree, LOCK_EX);
4615 err = got_ref_open(&resolved, repo,
4616 got_ref_get_symref_target(new_base_branch), 0);
4620 err = got_worktree_set_head_ref(worktree, resolved);
4625 * XXX commits to the base branch could have happened while
4626 * we were busy rebasing; should we store the original commit ID
4627 * when rebase begins and read it back here?
4629 err = got_ref_resolve(&commit_id, repo, resolved);
4633 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4637 err = got_object_id_by_path(&tree_id, repo,
4638 worktree->base_commit_id, worktree->path_prefix);
4642 err = delete_rebase_refs(worktree, repo);
4646 err = get_fileindex_path(&fileindex_path, worktree);
4650 crp_arg.revertible_paths = &revertible_paths;
4651 crp_arg.worktree = worktree;
4652 err = worktree_status(worktree, "", fileindex, repo,
4653 collect_revertible_paths, &crp_arg, NULL, NULL);
4657 TAILQ_FOREACH(pe, &revertible_paths, entry) {
4658 err = revert_file(worktree, fileindex, pe->path,
4659 progress_cb, progress_arg, repo);
4664 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4665 repo, progress_cb, progress_arg, NULL, NULL);
4667 sync_err = sync_fileindex(fileindex, fileindex_path);
4668 if (sync_err && err == NULL)
4671 got_ref_close(resolved);
4675 got_fileindex_free(fileindex);
4676 free(fileindex_path);
4677 TAILQ_FOREACH(pe, &revertible_paths, entry)
4678 free((char *)pe->path);
4679 got_pathlist_free(&revertible_paths);
4681 unlockerr = lock_worktree(worktree, LOCK_SH);
4682 if (unlockerr && err == NULL)
4687 const struct got_error *
4688 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
4689 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
4690 struct got_fileindex **fileindex, struct got_worktree *worktree,
4691 struct got_repository *repo)
4693 const struct got_error *err = NULL;
4694 char *tmp_branch_name = NULL;
4695 char *branch_ref_name = NULL;
4696 char *base_commit_ref_name = NULL;
4697 char *fileindex_path = NULL;
4698 struct check_rebase_ok_arg ok_arg;
4699 struct got_reference *wt_branch = NULL;
4700 struct got_reference *base_commit_ref = NULL;
4704 *base_commit_id = NULL;
4707 err = lock_worktree(worktree, LOCK_EX);
4711 err = open_fileindex(fileindex, &fileindex_path, worktree);
4715 ok_arg.worktree = worktree;
4717 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4722 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4726 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4730 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4735 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4740 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
4744 err = got_ref_write(*branch_ref, repo);
4748 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
4749 worktree->base_commit_id);
4752 err = got_ref_write(base_commit_ref, repo);
4755 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
4756 if (*base_commit_id == NULL) {
4757 err = got_error_from_errno("got_object_id_dup");
4761 err = got_ref_alloc(tmp_branch, tmp_branch_name,
4762 worktree->base_commit_id);
4765 err = got_ref_write(*tmp_branch, repo);
4769 err = got_worktree_set_head_ref(worktree, *tmp_branch);
4773 free(fileindex_path);
4774 free(tmp_branch_name);
4775 free(branch_ref_name);
4776 free(base_commit_ref_name);
4778 got_ref_close(wt_branch);
4781 got_ref_close(*branch_ref);
4785 got_ref_close(*tmp_branch);
4788 free(*base_commit_id);
4790 got_fileindex_free(*fileindex);
4793 lock_worktree(worktree, LOCK_SH);
4798 const struct got_error *
4799 got_worktree_histedit_postpone(struct got_worktree *worktree,
4800 struct got_fileindex *fileindex)
4803 got_fileindex_free(fileindex);
4804 return lock_worktree(worktree, LOCK_SH);
4807 const struct got_error *
4808 got_worktree_histedit_in_progress(int *in_progress,
4809 struct got_worktree *worktree)
4811 const struct got_error *err;
4812 char *tmp_branch_name = NULL;
4814 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4818 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4819 free(tmp_branch_name);
4823 const struct got_error *
4824 got_worktree_histedit_continue(struct got_object_id **commit_id,
4825 struct got_reference **tmp_branch, struct got_reference **branch_ref,
4826 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
4827 struct got_worktree *worktree, struct got_repository *repo)
4829 const struct got_error *err;
4830 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
4831 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4832 struct got_reference *commit_ref = NULL;
4833 struct got_reference *base_commit_ref = NULL;
4834 char *fileindex_path = NULL;
4835 int have_staged_files = 0;
4839 *base_commit_id = NULL;
4842 err = lock_worktree(worktree, LOCK_EX);
4846 err = open_fileindex(fileindex, &fileindex_path, worktree);
4850 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4851 &have_staged_files);
4852 if (err && err->code != GOT_ERR_CANCELLED)
4854 if (have_staged_files) {
4855 err = got_error(GOT_ERR_STAGED_PATHS);
4859 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4863 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4867 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4871 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4876 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
4880 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4883 err = got_ref_resolve(commit_id, repo, commit_ref);
4887 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
4890 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
4894 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4898 free(commit_ref_name);
4899 free(branch_ref_name);
4900 free(fileindex_path);
4902 got_ref_close(commit_ref);
4903 if (base_commit_ref)
4904 got_ref_close(base_commit_ref);
4908 free(*base_commit_id);
4909 *base_commit_id = NULL;
4911 got_ref_close(*tmp_branch);
4915 got_fileindex_free(*fileindex);
4918 lock_worktree(worktree, LOCK_EX);
4923 static const struct got_error *
4924 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
4926 const struct got_error *err;
4927 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
4928 char *branch_ref_name = NULL, *commit_ref_name = NULL;
4930 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4933 err = delete_ref(tmp_branch_name, repo);
4937 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4941 err = delete_ref(base_commit_ref_name, repo);
4945 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4948 err = delete_ref(branch_ref_name, repo);
4952 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4955 err = delete_ref(commit_ref_name, repo);
4959 free(tmp_branch_name);
4960 free(base_commit_ref_name);
4961 free(branch_ref_name);
4962 free(commit_ref_name);
4966 const struct got_error *
4967 got_worktree_histedit_abort(struct got_worktree *worktree,
4968 struct got_fileindex *fileindex, struct got_repository *repo,
4969 struct got_reference *branch, struct got_object_id *base_commit_id,
4970 got_worktree_checkout_cb progress_cb, void *progress_arg)
4972 const struct got_error *err, *unlockerr, *sync_err;
4973 struct got_reference *resolved = NULL;
4974 char *fileindex_path = NULL;
4975 struct got_pathlist_head revertible_paths;
4976 struct got_pathlist_entry *pe;
4977 struct collect_revertible_paths_arg crp_arg;
4978 struct got_object_id *tree_id = NULL;
4980 TAILQ_INIT(&revertible_paths);
4982 err = lock_worktree(worktree, LOCK_EX);
4986 err = got_ref_open(&resolved, repo,
4987 got_ref_get_symref_target(branch), 0);
4991 err = got_worktree_set_head_ref(worktree, resolved);
4995 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
4999 err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5000 worktree->path_prefix);
5004 err = delete_histedit_refs(worktree, repo);
5008 err = get_fileindex_path(&fileindex_path, worktree);
5012 crp_arg.revertible_paths = &revertible_paths;
5013 crp_arg.worktree = worktree;
5014 err = worktree_status(worktree, "", fileindex, repo,
5015 collect_revertible_paths, &crp_arg, NULL, NULL);
5019 TAILQ_FOREACH(pe, &revertible_paths, entry) {
5020 err = revert_file(worktree, fileindex, pe->path,
5021 progress_cb, progress_arg, repo);
5026 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5027 repo, progress_cb, progress_arg, NULL, NULL);
5029 sync_err = sync_fileindex(fileindex, fileindex_path);
5030 if (sync_err && err == NULL)
5033 got_ref_close(resolved);
5035 free(fileindex_path);
5036 TAILQ_FOREACH(pe, &revertible_paths, entry)
5037 free((char *)pe->path);
5038 got_pathlist_free(&revertible_paths);
5040 unlockerr = lock_worktree(worktree, LOCK_SH);
5041 if (unlockerr && err == NULL)
5046 const struct got_error *
5047 got_worktree_histedit_complete(struct got_worktree *worktree,
5048 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5049 struct got_reference *edited_branch, struct got_repository *repo)
5051 const struct got_error *err, *unlockerr;
5052 struct got_object_id *new_head_commit_id = NULL;
5053 struct got_reference *resolved = NULL;
5055 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5059 err = got_ref_open(&resolved, repo,
5060 got_ref_get_symref_target(edited_branch), 0);
5064 err = got_ref_change_ref(resolved, new_head_commit_id);
5068 err = got_ref_write(resolved, repo);
5072 err = got_worktree_set_head_ref(worktree, resolved);
5076 err = delete_histedit_refs(worktree, repo);
5079 got_fileindex_free(fileindex);
5080 free(new_head_commit_id);
5081 unlockerr = lock_worktree(worktree, LOCK_SH);
5082 if (unlockerr && err == NULL)
5087 const struct got_error *
5088 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5089 struct got_object_id *commit_id, struct got_repository *repo)
5091 const struct got_error *err;
5092 char *commit_ref_name;
5094 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5098 err = store_commit_id(commit_ref_name, commit_id, repo);
5102 err = delete_ref(commit_ref_name, repo);
5104 free(commit_ref_name);
5108 struct check_stage_ok_arg {
5109 struct got_object_id *head_commit_id;
5110 struct got_worktree *worktree;
5111 struct got_fileindex *fileindex;
5112 struct got_repository *repo;
5116 const struct got_error *
5117 check_stage_ok(void *arg, unsigned char status,
5118 unsigned char staged_status, const char *relpath,
5119 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5120 struct got_object_id *commit_id)
5122 struct check_stage_ok_arg *a = arg;
5123 const struct got_error *err = NULL;
5124 struct got_fileindex_entry *ie;
5125 struct got_object_id base_commit_id;
5126 struct got_object_id *base_commit_idp = NULL;
5127 char *in_repo_path = NULL, *p;
5129 if (status == GOT_STATUS_UNVERSIONED)
5132 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5134 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5136 if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
5137 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5139 return got_error_from_errno("asprintf");
5141 if (got_fileindex_entry_has_commit(ie)) {
5142 memcpy(base_commit_id.sha1, ie->commit_sha1,
5143 SHA1_DIGEST_LENGTH);
5144 base_commit_idp = &base_commit_id;
5147 if (status == GOT_STATUS_NO_CHANGE) {
5148 err = got_error_path(ie->path, GOT_ERR_STAGE_NO_CHANGE);
5150 } else if (status == GOT_STATUS_CONFLICT) {
5151 err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
5153 } else if (status != GOT_STATUS_ADD &&
5154 status != GOT_STATUS_MODIFY &&
5155 status != GOT_STATUS_DELETE) {
5156 err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
5160 a->have_changes = 1;
5165 err = check_out_of_date(p, status, staged_status,
5166 blob_id, base_commit_idp, a->head_commit_id, a->repo,
5167 GOT_ERR_STAGE_OUT_OF_DATE);
5173 static const struct got_error *
5174 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
5176 const struct got_error *err = NULL;
5178 size_t linesize = 0, n;
5181 linelen = getline(&line, &linesize, infile);
5182 if (linelen == -1) {
5183 if (ferror(infile)) {
5184 err = got_error_from_errno("getline");
5190 n = fwrite(line, 1, linelen, outfile);
5192 err = got_ferror(outfile, GOT_ERR_IO);
5197 n = fwrite(line, 1, linelen, rejectfile);
5199 err = got_ferror(outfile, GOT_ERR_IO);
5206 static const struct got_error *
5207 skip_one_line(FILE *f)
5210 size_t linesize = 0;
5213 linelen = getline(&line, &linesize, f);
5215 if (linelen == -1 && ferror(f))
5216 return got_error_from_errno("getline");
5220 static const struct got_error *
5221 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
5222 int start_old, int end_old, int start_new, int end_new,
5223 FILE *outfile, FILE *rejectfile)
5225 const struct got_error *err;
5227 /* Copy old file's lines leading up to patch. */
5228 while (!feof(f1) && *line_cur1 < start_old) {
5229 err = copy_one_line(f1, outfile, NULL);
5234 /* Skip new file's lines leading up to patch. */
5235 while (!feof(f2) && *line_cur2 < start_new) {
5237 err = copy_one_line(f2, NULL, rejectfile);
5239 err = skip_one_line(f2);
5244 /* Copy patched lines. */
5245 while (!feof(f2) && *line_cur2 <= end_new) {
5246 err = copy_one_line(f2, outfile, NULL);
5251 /* Skip over old file's replaced lines. */
5252 while (!feof(f1) && *line_cur1 <= end_new) {
5254 err = copy_one_line(f1, NULL, rejectfile);
5256 err = skip_one_line(f1);
5261 /* Copy old file's lines after patch. */
5262 while (!feof(f1) && *line_cur1 <= end_old) {
5263 err = copy_one_line(f1, outfile, rejectfile);
5272 static const struct got_error *
5273 apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
5274 int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
5275 int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
5276 int *line_cur2, FILE *outfile, FILE *rejectfile,
5277 got_worktree_patch_cb patch_cb, void *patch_arg)
5279 const struct got_error *err = NULL;
5280 int start_old = change->cv.a;
5281 int end_old = change->cv.b;
5282 int start_new = change->cv.c;
5283 int end_new = change->cv.d;
5287 *choice = GOT_PATCH_CHOICE_NONE;
5289 hunkfile = got_opentemp();
5290 if (hunkfile == NULL)
5291 return got_error_from_errno("got_opentemp");
5296 /* XXX TODO needs error checking */
5297 got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
5299 if (fseek(f1, pos1, SEEK_SET) == -1) {
5300 err = got_ferror(f1, GOT_ERR_IO);
5303 if (fseek(f2, pos2, SEEK_SET) == -1) {
5304 err = got_ferror(f1, GOT_ERR_IO);
5307 if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
5308 err = got_ferror(hunkfile, GOT_ERR_IO);
5312 err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
5313 hunkfile, n, nchanges);
5318 case GOT_PATCH_CHOICE_YES:
5319 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
5320 end_old, start_new, end_new, outfile, rejectfile);
5322 case GOT_PATCH_CHOICE_NO:
5323 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
5324 end_old, start_new, end_new, rejectfile, outfile);
5326 case GOT_PATCH_CHOICE_QUIT:
5328 /* Copy old file's lines until EOF. */
5330 err = copy_one_line(f1, outfile, NULL);
5337 /* Copy new file's lines until EOF. */
5339 err = copy_one_line(f2, NULL, rejectfile);
5347 err = got_error(GOT_ERR_PATCH_CHOICE);
5351 if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
5352 err = got_error_from_errno("fclose");
5356 static const struct got_error *
5357 create_staged_content(char **path_outfile, struct got_object_id *blob_id,
5358 const char *path2, const char *relpath, struct got_repository *repo,
5359 got_worktree_patch_cb patch_cb, void *patch_arg)
5361 const struct got_error *err;
5362 struct got_blob_object *blob = NULL;
5363 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5364 char *path1 = NULL, *id_str = NULL;
5365 struct stat sb1, sb2;
5366 struct got_diff_changes *changes = NULL;
5367 struct got_diff_state *ds = NULL;
5368 struct got_diff_args *args = NULL;
5369 struct got_diff_change *change;
5370 int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
5373 *path_outfile = NULL;
5375 err = got_object_id_str(&id_str, blob_id);
5379 f2 = fopen(path2, "r");
5381 err = got_error_from_errno2("fopen", path2);
5385 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
5389 err = got_opentemp_named(&path1, &f1, "got-stage-blob");
5393 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
5397 if (stat(path1, &sb1) == -1) {
5398 err = got_error_from_errno2("stat", path1);
5401 if (stat(path2, &sb2) == -1) {
5402 err = got_error_from_errno2("stat", path2);
5406 err = got_diff_files(&changes, &ds, &args, &diff_flags,
5407 f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
5411 err = got_opentemp_named(path_outfile, &outfile, "got-stage-content");
5415 if (fseek(f1, 0L, SEEK_SET) == -1)
5416 return got_ferror(f1, GOT_ERR_IO);
5417 if (fseek(f2, 0L, SEEK_SET) == -1)
5418 return got_ferror(f2, GOT_ERR_IO);
5419 SIMPLEQ_FOREACH(change, &changes->entries, entry) {
5421 err = apply_or_reject_change(&choice, change, ++n,
5422 changes->nchanges, ds, args, diff_flags, relpath,
5423 f1, f2, &line_cur1, &line_cur2,
5424 outfile, NULL, patch_cb, patch_arg);
5427 if (choice == GOT_PATCH_CHOICE_YES)
5429 else if (choice == GOT_PATCH_CHOICE_QUIT)
5435 got_object_blob_close(blob);
5436 if (f1 && fclose(f1) == EOF && err == NULL)
5437 err = got_error_from_errno2("fclose", path1);
5438 if (f2 && fclose(f2) == EOF && err == NULL)
5439 err = got_error_from_errno2("fclose", path2);
5440 if (outfile && fclose(outfile) == EOF && err == NULL)
5441 err = got_error_from_errno2("fclose", *path_outfile);
5442 if (path1 && unlink(path1) == -1 && err == NULL)
5443 err = got_error_from_errno2("unlink", path1);
5444 if (err || !have_content) {
5445 if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
5446 err = got_error_from_errno2("unlink", *path_outfile);
5447 free(*path_outfile);
5448 *path_outfile = NULL;
5452 got_diff_state_free(ds);
5456 got_diff_free_changes(changes);
5461 struct stage_path_arg {
5462 struct got_worktree *worktree;
5463 struct got_fileindex *fileindex;
5464 struct got_repository *repo;
5465 got_worktree_status_cb status_cb;
5467 got_worktree_patch_cb patch_cb;
5471 static const struct got_error *
5472 stage_path(void *arg, unsigned char status,
5473 unsigned char staged_status, const char *relpath,
5474 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5475 struct got_object_id *commit_id)
5477 struct stage_path_arg *a = arg;
5478 const struct got_error *err = NULL;
5479 struct got_fileindex_entry *ie;
5480 char *ondisk_path = NULL, *path_content = NULL;
5483 if (status == GOT_STATUS_UNVERSIONED)
5486 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5488 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5490 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
5492 return got_error_from_errno("asprintf");
5495 case GOT_STATUS_ADD:
5496 case GOT_STATUS_MODIFY:
5498 if (status == GOT_STATUS_ADD) {
5499 int choice = GOT_PATCH_CHOICE_NONE;
5500 err = (*a->patch_cb)(&choice, a->patch_arg,
5501 status, ie->path, NULL, 1, 1);
5504 if (choice != GOT_PATCH_CHOICE_YES)
5507 err = create_staged_content(&path_content,
5508 blob_id, ondisk_path, ie->path, a->repo,
5509 a->patch_cb, a->patch_arg);
5510 if (err || path_content == NULL)
5514 err = got_object_blob_create(&staged_blob_id,
5515 path_content ? path_content : ondisk_path, a->repo);
5518 memcpy(ie->staged_blob_sha1, staged_blob_id->sha1,
5519 SHA1_DIGEST_LENGTH);
5520 if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
5521 stage = GOT_FILEIDX_STAGE_ADD;
5523 stage = GOT_FILEIDX_STAGE_MODIFY;
5524 got_fileindex_entry_stage_set(ie, stage);
5525 if (a->status_cb == NULL)
5527 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5528 get_staged_status(ie), relpath, blob_id,
5529 staged_blob_id, NULL);
5531 case GOT_STATUS_DELETE:
5532 if (staged_status == GOT_STATUS_DELETE)
5535 int choice = GOT_PATCH_CHOICE_NONE;
5536 err = (*a->patch_cb)(&choice, a->patch_arg, status,
5537 ie->path, NULL, 1, 1);
5540 if (choice == GOT_PATCH_CHOICE_NO)
5542 if (choice != GOT_PATCH_CHOICE_YES) {
5543 err = got_error(GOT_ERR_PATCH_CHOICE);
5547 stage = GOT_FILEIDX_STAGE_DELETE;
5548 got_fileindex_entry_stage_set(ie, stage);
5549 if (a->status_cb == NULL)
5551 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5552 get_staged_status(ie), relpath, NULL, NULL, NULL);
5554 case GOT_STATUS_NO_CHANGE:
5555 err = got_error_path(relpath, GOT_ERR_STAGE_NO_CHANGE);
5557 case GOT_STATUS_CONFLICT:
5558 err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
5561 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
5565 if (path_content && unlink(path_content) == -1 && err == NULL)
5566 err = got_error_from_errno2("unlink", path_content);
5572 const struct got_error *
5573 got_worktree_stage(struct got_worktree *worktree,
5574 struct got_pathlist_head *paths,
5575 got_worktree_status_cb status_cb, void *status_arg,
5576 got_worktree_patch_cb patch_cb, void *patch_arg,
5577 struct got_repository *repo)
5579 const struct got_error *err = NULL, *sync_err, *unlockerr;
5580 struct got_pathlist_entry *pe;
5581 struct got_fileindex *fileindex = NULL;
5582 char *fileindex_path = NULL;
5583 struct got_reference *head_ref = NULL;
5584 struct got_object_id *head_commit_id = NULL;
5585 struct check_stage_ok_arg oka;
5586 struct stage_path_arg spa;
5588 err = lock_worktree(worktree, LOCK_EX);
5592 err = got_ref_open(&head_ref, repo,
5593 got_worktree_get_head_ref_name(worktree), 0);
5596 err = got_ref_resolve(&head_commit_id, repo, head_ref);
5599 err = open_fileindex(&fileindex, &fileindex_path, worktree);
5603 /* Check pre-conditions before staging anything. */
5604 oka.head_commit_id = head_commit_id;
5605 oka.worktree = worktree;
5606 oka.fileindex = fileindex;
5608 oka.have_changes = 0;
5609 TAILQ_FOREACH(pe, paths, entry) {
5610 err = worktree_status(worktree, pe->path, fileindex, repo,
5611 check_stage_ok, &oka, NULL, NULL);
5615 if (!oka.have_changes) {
5616 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
5620 spa.worktree = worktree;
5621 spa.fileindex = fileindex;
5623 spa.patch_cb = patch_cb;
5624 spa.patch_arg = patch_arg;
5625 spa.status_cb = status_cb;
5626 spa.status_arg = status_arg;
5627 TAILQ_FOREACH(pe, paths, entry) {
5628 err = worktree_status(worktree, pe->path, fileindex, repo,
5629 stage_path, &spa, NULL, NULL);
5634 sync_err = sync_fileindex(fileindex, fileindex_path);
5635 if (sync_err && err == NULL)
5639 got_ref_close(head_ref);
5640 free(head_commit_id);
5641 free(fileindex_path);
5643 got_fileindex_free(fileindex);
5644 unlockerr = lock_worktree(worktree, LOCK_SH);
5645 if (unlockerr && err == NULL)
5650 struct unstage_path_arg {
5651 struct got_worktree *worktree;
5652 struct got_fileindex *fileindex;
5653 struct got_repository *repo;
5654 got_worktree_checkout_cb progress_cb;
5656 got_worktree_patch_cb patch_cb;
5660 static const struct got_error *
5661 create_unstaged_content(char **path_unstaged_content,
5662 char **path_new_staged_content, struct got_object_id *blob_id,
5663 struct got_object_id *staged_blob_id, const char *relpath,
5664 struct got_repository *repo,
5665 got_worktree_patch_cb patch_cb, void *patch_arg)
5667 const struct got_error *err;
5668 struct got_blob_object *blob = NULL, *staged_blob = NULL;
5669 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
5670 char *path1 = NULL, *path2 = NULL, *label1 = NULL;
5671 struct stat sb1, sb2;
5672 struct got_diff_changes *changes = NULL;
5673 struct got_diff_state *ds = NULL;
5674 struct got_diff_args *args = NULL;
5675 struct got_diff_change *change;
5676 int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
5677 int have_content = 0, have_rejected_content = 0;
5679 *path_unstaged_content = NULL;
5680 *path_new_staged_content = NULL;
5682 err = got_object_id_str(&label1, blob_id);
5685 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
5689 err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
5693 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
5697 err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
5701 err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
5705 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
5709 if (stat(path1, &sb1) == -1) {
5710 err = got_error_from_errno2("stat", path1);
5714 if (stat(path2, &sb2) == -1) {
5715 err = got_error_from_errno2("stat", path2);
5719 err = got_diff_files(&changes, &ds, &args, &diff_flags,
5720 f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
5724 err = got_opentemp_named(path_unstaged_content, &outfile,
5725 "got-unstaged-content");
5728 err = got_opentemp_named(path_new_staged_content, &rejectfile,
5729 "got-new-staged-content");
5733 if (fseek(f1, 0L, SEEK_SET) == -1) {
5734 err = got_ferror(f1, GOT_ERR_IO);
5737 if (fseek(f2, 0L, SEEK_SET) == -1) {
5738 err = got_ferror(f2, GOT_ERR_IO);
5741 SIMPLEQ_FOREACH(change, &changes->entries, entry) {
5743 err = apply_or_reject_change(&choice, change, ++n,
5744 changes->nchanges, ds, args, diff_flags, relpath,
5745 f1, f2, &line_cur1, &line_cur2,
5746 outfile, rejectfile, patch_cb, patch_arg);
5749 if (choice == GOT_PATCH_CHOICE_YES)
5752 have_rejected_content = 1;
5753 if (choice == GOT_PATCH_CHOICE_QUIT)
5759 got_object_blob_close(blob);
5761 got_object_blob_close(staged_blob);
5762 if (f1 && fclose(f1) == EOF && err == NULL)
5763 err = got_error_from_errno2("fclose", path1);
5764 if (f2 && fclose(f2) == EOF && err == NULL)
5765 err = got_error_from_errno2("fclose", path2);
5766 if (outfile && fclose(outfile) == EOF && err == NULL)
5767 err = got_error_from_errno2("fclose", *path_unstaged_content);
5768 if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
5769 err = got_error_from_errno2("fclose", *path_new_staged_content);
5770 if (path1 && unlink(path1) == -1 && err == NULL)
5771 err = got_error_from_errno2("unlink", path1);
5772 if (path2 && unlink(path2) == -1 && err == NULL)
5773 err = got_error_from_errno2("unlink", path2);
5774 if (err || !have_content) {
5775 if (*path_unstaged_content &&
5776 unlink(*path_unstaged_content) == -1 && err == NULL)
5777 err = got_error_from_errno2("unlink",
5778 *path_unstaged_content);
5779 free(*path_unstaged_content);
5780 *path_unstaged_content = NULL;
5782 if (err || !have_rejected_content) {
5783 if (*path_new_staged_content &&
5784 unlink(*path_new_staged_content) == -1 && err == NULL)
5785 err = got_error_from_errno2("unlink",
5786 *path_new_staged_content);
5787 free(*path_new_staged_content);
5788 *path_new_staged_content = NULL;
5792 got_diff_state_free(ds);
5796 got_diff_free_changes(changes);
5802 static const struct got_error *
5803 unstage_path(void *arg, unsigned char status,
5804 unsigned char staged_status, const char *relpath,
5805 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5806 struct got_object_id *commit_id)
5808 const struct got_error *err = NULL;
5809 struct unstage_path_arg *a = arg;
5810 struct got_fileindex_entry *ie;
5811 struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
5812 char *ondisk_path = NULL, *path_unstaged_content = NULL;
5813 char *path_new_staged_content = NULL;
5814 int local_changes_subsumed;
5817 if (staged_status != GOT_STATUS_ADD &&
5818 staged_status != GOT_STATUS_MODIFY &&
5819 staged_status != GOT_STATUS_DELETE)
5822 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5824 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5826 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
5828 return got_error_from_errno("asprintf");
5830 switch (staged_status) {
5831 case GOT_STATUS_MODIFY:
5832 err = got_object_open_as_blob(&blob_base, a->repo,
5837 case GOT_STATUS_ADD:
5839 if (staged_status == GOT_STATUS_ADD) {
5840 int choice = GOT_PATCH_CHOICE_NONE;
5841 err = (*a->patch_cb)(&choice, a->patch_arg,
5842 staged_status, ie->path, NULL, 1, 1);
5845 if (choice != GOT_PATCH_CHOICE_YES)
5848 err = create_unstaged_content(
5849 &path_unstaged_content,
5850 &path_new_staged_content, blob_id,
5851 staged_blob_id, ie->path, a->repo,
5852 a->patch_cb, a->patch_arg);
5853 if (err || path_unstaged_content == NULL)
5855 if (path_new_staged_content) {
5856 err = got_object_blob_create(
5858 path_new_staged_content,
5862 memcpy(ie->staged_blob_sha1,
5863 staged_blob_id->sha1,
5864 SHA1_DIGEST_LENGTH);
5866 err = merge_file(&local_changes_subsumed,
5867 a->worktree, blob_base, ondisk_path,
5868 relpath, got_fileindex_perms_to_st(ie),
5869 path_unstaged_content, "unstaged",
5870 a->repo, a->progress_cb, a->progress_arg);
5872 path_new_staged_content == NULL)
5873 got_fileindex_entry_stage_set(ie,
5874 GOT_FILEIDX_STAGE_NONE);
5875 break; /* Done with this file. */
5878 err = got_object_open_as_blob(&blob_staged, a->repo,
5879 staged_blob_id, 8192);
5882 err = merge_blob(&local_changes_subsumed, a->worktree,
5883 blob_base, ondisk_path, relpath,
5884 got_fileindex_perms_to_st(ie), blob_staged,
5885 commit_id ? commit_id : a->worktree->base_commit_id,
5886 a->repo, a->progress_cb, a->progress_arg);
5888 got_fileindex_entry_stage_set(ie,
5889 GOT_FILEIDX_STAGE_NONE);
5891 case GOT_STATUS_DELETE:
5893 int choice = GOT_PATCH_CHOICE_NONE;
5894 err = (*a->patch_cb)(&choice, a->patch_arg,
5895 staged_status, ie->path, NULL, 1, 1);
5898 if (choice == GOT_PATCH_CHOICE_NO)
5900 if (choice != GOT_PATCH_CHOICE_YES) {
5901 err = got_error(GOT_ERR_PATCH_CHOICE);
5905 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
5906 err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
5909 err = (*a->progress_cb)(a->progress_arg, status, relpath);
5914 if (path_unstaged_content &&
5915 unlink(path_unstaged_content) == -1 && err == NULL)
5916 err = got_error_from_errno2("unlink", path_unstaged_content);
5917 if (path_new_staged_content &&
5918 unlink(path_new_staged_content) == -1 && err == NULL)
5919 err = got_error_from_errno2("unlink", path_new_staged_content);
5920 free(path_unstaged_content);
5921 free(path_new_staged_content);
5923 got_object_blob_close(blob_base);
5925 got_object_blob_close(blob_staged);
5929 const struct got_error *
5930 got_worktree_unstage(struct got_worktree *worktree,
5931 struct got_pathlist_head *paths,
5932 got_worktree_checkout_cb progress_cb, void *progress_arg,
5933 got_worktree_patch_cb patch_cb, void *patch_arg,
5934 struct got_repository *repo)
5936 const struct got_error *err = NULL, *sync_err, *unlockerr;
5937 struct got_pathlist_entry *pe;
5938 struct got_fileindex *fileindex = NULL;
5939 char *fileindex_path = NULL;
5940 struct unstage_path_arg upa;
5942 err = lock_worktree(worktree, LOCK_EX);
5946 err = open_fileindex(&fileindex, &fileindex_path, worktree);
5950 upa.worktree = worktree;
5951 upa.fileindex = fileindex;
5953 upa.progress_cb = progress_cb;
5954 upa.progress_arg = progress_arg;
5955 upa.patch_cb = patch_cb;
5956 upa.patch_arg = patch_arg;
5957 TAILQ_FOREACH(pe, paths, entry) {
5958 err = worktree_status(worktree, pe->path, fileindex, repo,
5959 unstage_path, &upa, NULL, NULL);
5964 sync_err = sync_fileindex(fileindex, fileindex_path);
5965 if (sync_err && err == NULL)
5968 free(fileindex_path);
5970 got_fileindex_free(fileindex);
5971 unlockerr = lock_worktree(worktree, LOCK_SH);
5972 if (unlockerr && err == NULL)