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/queue.h>
38 #include "got_error.h"
39 #include "got_repository.h"
40 #include "got_reference.h"
41 #include "got_object.h"
43 #include "got_cancel.h"
44 #include "got_worktree.h"
45 #include "got_opentemp.h"
48 #include "got_lib_worktree.h"
49 #include "got_lib_sha1.h"
50 #include "got_lib_fileindex.h"
51 #include "got_lib_inflate.h"
52 #include "got_lib_delta.h"
53 #include "got_lib_object.h"
54 #include "got_lib_object_parse.h"
55 #include "got_lib_object_create.h"
56 #include "got_lib_object_idset.h"
57 #include "got_lib_diff.h"
60 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
63 #define GOT_MERGE_LABEL_MERGED "merged change"
64 #define GOT_MERGE_LABEL_BASE "3-way merge base"
66 static const struct got_error *
67 create_meta_file(const char *path_got, const char *name, const char *content)
69 const struct got_error *err = NULL;
72 if (asprintf(&path, "%s/%s", path_got, name) == -1)
73 return got_error_from_errno("asprintf");
75 err = got_path_create_file(path, content);
80 static const struct got_error *
81 update_meta_file(const char *path_got, const char *name, const char *content)
83 const struct got_error *err = NULL;
88 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
89 err = got_error_from_errno("asprintf");
94 err = got_opentemp_named(&tmppath, &tmpfile, path);
99 int len = fprintf(tmpfile, "%s\n", content);
100 if (len != strlen(content) + 1) {
101 err = got_error_from_errno2("fprintf", tmppath);
106 if (rename(tmppath, path) != 0) {
107 err = got_error_from_errno3("rename", tmppath, path);
113 if (fclose(tmpfile) != 0 && err == NULL)
114 err = got_error_from_errno2("fclose", tmppath);
119 static const struct got_error *
120 read_meta_file(char **content, const char *path_got, const char *name)
122 const struct got_error *err = NULL;
130 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
131 err = got_error_from_errno("asprintf");
136 fd = open(path, O_RDONLY | O_NOFOLLOW);
139 err = got_error_path(path, GOT_ERR_WORKTREE_META);
141 err = got_error_from_errno2("open", path);
144 if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
145 err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
146 : got_error_from_errno2("flock", path));
150 if (fstat(fd, &sb) != 0) {
151 err = got_error_from_errno2("fstat", path);
154 *content = calloc(1, sb.st_size);
155 if (*content == NULL) {
156 err = got_error_from_errno("calloc");
160 n = read(fd, *content, sb.st_size);
161 if (n != sb.st_size) {
162 err = (n == -1 ? got_error_from_errno2("read", path) :
163 got_error_path(path, GOT_ERR_WORKTREE_META));
166 if ((*content)[sb.st_size - 1] != '\n') {
167 err = got_error_path(path, GOT_ERR_WORKTREE_META);
170 (*content)[sb.st_size - 1] = '\0';
173 if (fd != -1 && close(fd) == -1 && err == NULL)
174 err = got_error_from_errno2("close", path_got);
183 static const struct got_error *
184 write_head_ref(const char *path_got, struct got_reference *head_ref)
186 const struct got_error *err = NULL;
189 if (got_ref_is_symbolic(head_ref)) {
190 refstr = got_ref_to_str(head_ref);
192 return got_error_from_errno("got_ref_to_str");
194 refstr = strdup(got_ref_get_name(head_ref));
196 return got_error_from_errno("strdup");
198 err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
203 const struct got_error *
204 got_worktree_init(const char *path, struct got_reference *head_ref,
205 const char *prefix, struct got_repository *repo)
207 const struct got_error *err = NULL;
208 struct got_object_id *commit_id = NULL;
210 uint32_t uuid_status;
212 char *path_got = NULL;
213 char *formatstr = NULL;
214 char *absprefix = NULL;
215 char *basestr = NULL;
216 char *uuidstr = NULL;
218 if (strcmp(path, got_repo_get_path(repo)) == 0) {
219 err = got_error(GOT_ERR_WORKTREE_REPO);
223 err = got_ref_resolve(&commit_id, repo, head_ref);
226 err = got_object_get_type(&obj_type, repo, commit_id);
229 if (obj_type != GOT_OBJ_TYPE_COMMIT)
230 return got_error(GOT_ERR_OBJ_TYPE);
232 if (!got_path_is_absolute(prefix)) {
233 if (asprintf(&absprefix, "/%s", prefix) == -1)
234 return got_error_from_errno("asprintf");
237 /* Create top-level directory (may already exist). */
238 if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
239 err = got_error_from_errno2("mkdir", path);
243 /* Create .got directory (may already exist). */
244 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
245 err = got_error_from_errno("asprintf");
248 if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
249 err = got_error_from_errno2("mkdir", path_got);
253 /* Create an empty lock file. */
254 err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
258 /* Create an empty file index. */
259 err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
263 /* Write the HEAD reference. */
264 err = write_head_ref(path_got, head_ref);
268 /* Record our base commit. */
269 err = got_object_id_str(&basestr, commit_id);
272 err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
276 /* Store path to repository. */
277 err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
278 got_repo_get_path(repo));
282 /* Store in-repository path prefix. */
283 err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
284 absprefix ? absprefix : prefix);
289 uuid_create(&uuid, &uuid_status);
290 if (uuid_status != uuid_s_ok) {
291 err = got_error_uuid(uuid_status, "uuid_create");
294 uuid_to_string(&uuid, &uuidstr, &uuid_status);
295 if (uuid_status != uuid_s_ok) {
296 err = got_error_uuid(uuid_status, "uuid_to_string");
299 err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
303 /* Stamp work tree with format file. */
304 if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
305 err = got_error_from_errno("asprintf");
308 err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
322 static const struct got_error *
323 open_worktree(struct got_worktree **worktree, const char *path)
325 const struct got_error *err = NULL;
327 char *formatstr = NULL;
328 char *uuidstr = NULL;
329 char *path_lock = NULL;
330 char *base_commit_id_str = NULL;
331 int version, fd = -1;
333 struct got_repository *repo = NULL;
334 uint32_t uuid_status;
338 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
339 err = got_error_from_errno("asprintf");
344 if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
345 err = got_error_from_errno("asprintf");
350 fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
352 err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
353 : got_error_from_errno2("open", path_lock));
357 err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
361 version = strtonum(formatstr, 1, INT_MAX, &errstr);
363 err = got_error_msg(GOT_ERR_WORKTREE_META,
364 "could not parse work tree format version number");
367 if (version != GOT_WORKTREE_FORMAT_VERSION) {
368 err = got_error(GOT_ERR_WORKTREE_VERS);
372 *worktree = calloc(1, sizeof(**worktree));
373 if (*worktree == NULL) {
374 err = got_error_from_errno("calloc");
377 (*worktree)->lockfd = -1;
379 (*worktree)->root_path = strdup(path);
380 if ((*worktree)->root_path == NULL) {
381 err = got_error_from_errno("strdup");
384 err = read_meta_file(&(*worktree)->repo_path, path_got,
385 GOT_WORKTREE_REPOSITORY);
389 err = read_meta_file(&(*worktree)->path_prefix, path_got,
390 GOT_WORKTREE_PATH_PREFIX);
394 err = read_meta_file(&base_commit_id_str, path_got,
395 GOT_WORKTREE_BASE_COMMIT);
399 err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
402 uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
403 if (uuid_status != uuid_s_ok) {
404 err = got_error_uuid(uuid_status, "uuid_from_string");
408 err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
412 err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
417 err = read_meta_file(&(*worktree)->head_ref_name, path_got,
418 GOT_WORKTREE_HEAD_REF);
421 got_repo_close(repo);
424 free(base_commit_id_str);
430 if (*worktree != NULL)
431 got_worktree_close(*worktree);
434 (*worktree)->lockfd = fd;
439 const struct got_error *
440 got_worktree_open(struct got_worktree **worktree, const char *path)
442 const struct got_error *err = NULL;
445 err = open_worktree(worktree, path);
446 if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
450 path = dirname(path);
452 return got_error_from_errno2("dirname", path);
453 } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
455 return got_error(GOT_ERR_NOT_WORKTREE);
458 const struct got_error *
459 got_worktree_close(struct got_worktree *worktree)
461 const struct got_error *err = NULL;
462 free(worktree->repo_path);
463 free(worktree->path_prefix);
464 free(worktree->base_commit_id);
465 free(worktree->head_ref_name);
466 if (worktree->lockfd != -1)
467 if (close(worktree->lockfd) != 0)
468 err = got_error_from_errno2("close",
469 got_worktree_get_root_path(worktree));
470 free(worktree->root_path);
476 got_worktree_get_root_path(struct got_worktree *worktree)
478 return worktree->root_path;
482 got_worktree_get_repo_path(struct got_worktree *worktree)
484 return worktree->repo_path;
488 got_worktree_get_path_prefix(struct got_worktree *worktree)
490 return worktree->path_prefix;
493 const struct got_error *
494 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
495 const char *path_prefix)
497 char *absprefix = NULL;
499 if (!got_path_is_absolute(path_prefix)) {
500 if (asprintf(&absprefix, "/%s", path_prefix) == -1)
501 return got_error_from_errno("asprintf");
503 *match = (strcmp(absprefix ? absprefix : path_prefix,
504 worktree->path_prefix) == 0);
510 got_worktree_get_head_ref_name(struct got_worktree *worktree)
512 return worktree->head_ref_name;
515 const struct got_error *
516 got_worktree_set_head_ref(struct got_worktree *worktree,
517 struct got_reference *head_ref)
519 const struct got_error *err = NULL;
520 char *path_got = NULL, *head_ref_name = NULL;
522 if (asprintf(&path_got, "%s/%s", worktree->root_path,
523 GOT_WORKTREE_GOT_DIR) == -1) {
524 err = got_error_from_errno("asprintf");
529 head_ref_name = strdup(got_ref_get_name(head_ref));
530 if (head_ref_name == NULL) {
531 err = got_error_from_errno("strdup");
535 err = write_head_ref(path_got, head_ref);
539 free(worktree->head_ref_name);
540 worktree->head_ref_name = head_ref_name;
548 struct got_object_id *
549 got_worktree_get_base_commit_id(struct got_worktree *worktree)
551 return worktree->base_commit_id;
554 const struct got_error *
555 got_worktree_set_base_commit_id(struct got_worktree *worktree,
556 struct got_repository *repo, struct got_object_id *commit_id)
558 const struct got_error *err;
559 struct got_object *obj = NULL;
561 char *path_got = NULL;
563 if (asprintf(&path_got, "%s/%s", worktree->root_path,
564 GOT_WORKTREE_GOT_DIR) == -1) {
565 err = got_error_from_errno("asprintf");
570 err = got_object_open(&obj, repo, commit_id);
574 if (obj->type != GOT_OBJ_TYPE_COMMIT) {
575 err = got_error(GOT_ERR_OBJ_TYPE);
579 /* Record our base commit. */
580 err = got_object_id_str(&id_str, commit_id);
583 err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
587 free(worktree->base_commit_id);
588 worktree->base_commit_id = got_object_id_dup(commit_id);
589 if (worktree->base_commit_id == NULL) {
590 err = got_error_from_errno("got_object_id_dup");
595 got_object_close(obj);
601 static const struct got_error *
602 lock_worktree(struct got_worktree *worktree, int operation)
604 if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
605 return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
606 : got_error_from_errno2("flock",
607 got_worktree_get_root_path(worktree)));
611 static const struct got_error *
612 add_dir_on_disk(struct got_worktree *worktree, const char *path)
614 const struct got_error *err = NULL;
617 if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
618 return got_error_from_errno("asprintf");
620 err = got_path_mkdir(abspath);
621 if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
624 if (lstat(abspath, &sb) == -1) {
625 err = got_error_from_errno2("lstat", abspath);
626 } else if (!S_ISDIR(sb.st_mode)) {
627 /* TODO directory is obstructed; do something */
628 err = got_error(GOT_ERR_FILE_OBSTRUCTED);
635 static const struct got_error *
636 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
638 const struct got_error *err = NULL;
641 size_t flen1 = 0, flen2 = 0;
646 flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
647 if (flen1 == 0 && ferror(f1)) {
648 err = got_error_from_errno("fread");
651 flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
652 if (flen2 == 0 && ferror(f2)) {
653 err = got_error_from_errno("fread");
660 } else if (flen2 == 0) {
664 } else if (flen1 == flen2) {
665 if (memcmp(fbuf1, fbuf2, flen2) != 0) {
678 static const struct got_error *
679 check_files_equal(int *same, const char *f1_path, const char *f2_path)
681 const struct got_error *err = NULL;
684 FILE *f1 = NULL, *f2 = NULL;
688 if (lstat(f1_path, &sb) != 0) {
689 err = got_error_from_errno2("lstat", f1_path);
694 if (lstat(f2_path, &sb) != 0) {
695 err = got_error_from_errno2("lstat", f2_path);
700 if (size1 != size2) {
705 f1 = fopen(f1_path, "r");
707 return got_error_from_errno2("fopen", f1_path);
709 f2 = fopen(f2_path, "r");
711 err = got_error_from_errno2("fopen", f2_path);
715 err = check_file_contents_equal(same, f1, f2);
717 if (f1 && fclose(f1) != 0 && err == NULL)
718 err = got_error_from_errno("fclose");
719 if (f2 && fclose(f2) != 0 && err == NULL)
720 err = got_error_from_errno("fclose");
726 * Perform a 3-way merge where blob_orig acts as the common ancestor,
727 * the file at deriv_path acts as the first derived version, and the
728 * file on disk acts as the second derived version.
730 static const struct got_error *
731 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
732 struct got_blob_object *blob_orig, const char *ondisk_path,
733 const char *path, uint16_t st_mode, const char *deriv_path,
734 const char *label_orig, const char *label_deriv,
735 struct got_repository *repo,
736 got_worktree_checkout_cb progress_cb, void *progress_arg)
738 const struct got_error *err = NULL;
741 char *blob_orig_path = NULL;
742 char *merged_path = NULL, *base_path = NULL;
746 *local_changes_subsumed = 0;
748 parent = dirname(ondisk_path);
750 return got_error_from_errno2("dirname", ondisk_path);
752 if (asprintf(&base_path, "%s/got-merged", parent) == -1)
753 return got_error_from_errno("asprintf");
755 err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
760 if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
761 err = got_error_from_errno("asprintf");
766 err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
770 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
776 * If the file has no blob, this is an "add vs add" conflict,
777 * and we simply use an empty ancestor file to make both files
778 * appear in the merged result in their entirety.
782 err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
783 blob_orig_path, ondisk_path, label_deriv, label_orig, NULL);
787 err = (*progress_cb)(progress_arg,
788 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
792 if (fsync(merged_fd) != 0) {
793 err = got_error_from_errno("fsync");
797 /* Check if a clean merge has subsumed all local changes. */
798 if (overlapcnt == 0) {
799 err = check_files_equal(local_changes_subsumed, deriv_path,
805 if (fchmod(merged_fd, st_mode) != 0) {
806 err = got_error_from_errno2("fchmod", merged_path);
810 if (rename(merged_path, ondisk_path) != 0) {
811 err = got_error_from_errno3("rename", merged_path,
820 if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
821 err = got_error_from_errno("close");
822 if (f_orig && fclose(f_orig) != 0 && err == NULL)
823 err = got_error_from_errno("fclose");
826 if (blob_orig_path) {
827 unlink(blob_orig_path);
828 free(blob_orig_path);
834 * Perform a 3-way merge where blob_orig acts as the common ancestor,
835 * blob_deriv acts as the first derived version, and the file on disk
836 * acts as the second derived version.
838 static const struct got_error *
839 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
840 struct got_blob_object *blob_orig, const char *ondisk_path,
841 const char *path, uint16_t st_mode, const char *label_orig,
842 struct got_blob_object *blob_deriv,
843 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
844 got_worktree_checkout_cb progress_cb, void *progress_arg)
846 const struct got_error *err = NULL;
847 FILE *f_deriv = NULL;
848 char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
849 char *label_deriv = NULL, *parent;
851 *local_changes_subsumed = 0;
853 parent = dirname(ondisk_path);
855 return got_error_from_errno2("dirname", ondisk_path);
858 if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
859 err = got_error_from_errno("asprintf");
864 err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
867 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
872 err = got_object_id_str(&id_str, deriv_base_commit_id);
875 if (asprintf(&label_deriv, "%s: commit %s",
876 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
877 err = got_error_from_errno("asprintf");
881 err = merge_file(local_changes_subsumed, worktree, blob_orig,
882 ondisk_path, path, st_mode, blob_deriv_path, label_orig,
883 label_deriv, repo, progress_cb, progress_arg);
885 if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
886 err = got_error_from_errno("fclose");
888 if (blob_deriv_path) {
889 unlink(blob_deriv_path);
890 free(blob_deriv_path);
897 static const struct got_error *
898 update_blob_fileindex_entry(struct got_worktree *worktree,
899 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
900 const char *ondisk_path, const char *path, struct got_blob_object *blob,
901 int update_timestamps)
903 const struct got_error *err = NULL;
906 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
908 err = got_fileindex_entry_update(ie, ondisk_path,
909 blob->id.sha1, worktree->base_commit_id->sha1,
912 struct got_fileindex_entry *new_ie;
913 err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
914 path, blob->id.sha1, worktree->base_commit_id->sha1);
916 err = got_fileindex_entry_add(fileindex, new_ie);
922 get_ondisk_perms(int executable, mode_t st_mode)
924 mode_t xbits = S_IXUSR;
927 /* Map read bits to execute bits. */
928 if (st_mode & S_IRGRP)
930 if (st_mode & S_IROTH)
932 return st_mode | xbits;
935 return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
938 static const struct got_error *
939 install_blob(struct got_worktree *worktree, const char *ondisk_path,
940 const char *path, uint16_t te_mode, uint16_t st_mode,
941 struct got_blob_object *blob, int restoring_missing_file,
942 int reverting_versioned_file, struct got_repository *repo,
943 got_worktree_checkout_cb progress_cb, void *progress_arg)
945 const struct got_error *err = NULL;
949 char *tmppath = NULL;
951 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
952 GOT_DEFAULT_FILE_MODE);
954 if (errno == ENOENT) {
955 char *parent = dirname(path);
957 return got_error_from_errno2("dirname", path);
958 err = add_dir_on_disk(worktree, parent);
961 fd = open(ondisk_path,
962 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
963 GOT_DEFAULT_FILE_MODE);
965 return got_error_from_errno2("open",
967 } else if (errno == EEXIST) {
968 if (!S_ISREG(st_mode)) {
969 /* TODO file is obstructed; do something */
970 err = got_error(GOT_ERR_FILE_OBSTRUCTED);
973 err = got_opentemp_named_fd(&tmppath, &fd,
980 return got_error_from_errno2("open", ondisk_path);
983 if (restoring_missing_file)
984 err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
985 else if (reverting_versioned_file)
986 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
988 err = (*progress_cb)(progress_arg,
989 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
993 hdrlen = got_object_blob_get_hdrlen(blob);
995 const uint8_t *buf = got_object_blob_get_read_buf(blob);
996 err = got_object_blob_read_block(&len, blob);
1000 /* Skip blob object header first time around. */
1001 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1003 err = got_error_from_errno("write");
1005 } else if (outlen != len - hdrlen) {
1006 err = got_error(GOT_ERR_IO);
1013 if (fsync(fd) != 0) {
1014 err = got_error_from_errno("fsync");
1019 if (rename(tmppath, ondisk_path) != 0) {
1020 err = got_error_from_errno3("rename", tmppath,
1027 if (chmod(ondisk_path,
1028 get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1029 err = got_error_from_errno2("chmod", ondisk_path);
1034 if (fd != -1 && close(fd) != 0 && err == NULL)
1035 err = got_error_from_errno("close");
1040 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1041 static const struct got_error *
1042 get_modified_file_content_status(unsigned char *status, FILE *f)
1044 const struct got_error *err = NULL;
1045 const char *markers[3] = {
1046 GOT_DIFF_CONFLICT_MARKER_BEGIN,
1047 GOT_DIFF_CONFLICT_MARKER_SEP,
1048 GOT_DIFF_CONFLICT_MARKER_END
1053 const char delim[3] = {'\0', '\0', '\0'};
1055 while (*status == GOT_STATUS_MODIFY) {
1056 line = fparseln(f, &len, NULL, delim, 0);
1060 err = got_ferror(f, GOT_ERR_IO);
1064 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1065 if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1067 *status = GOT_STATUS_CONFLICT;
1077 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1079 mode_t ie_mode = got_fileindex_perms_to_st(ie);
1080 return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1084 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1086 return !(ie->ctime_sec == sb->st_ctime &&
1087 ie->ctime_nsec == sb->st_ctimensec &&
1088 ie->mtime_sec == sb->st_mtime &&
1089 ie->mtime_nsec == sb->st_mtimensec &&
1090 ie->size == (sb->st_size & 0xffffffff) &&
1091 !xbit_differs(ie, sb->st_mode));
1094 static unsigned char
1095 get_staged_status(struct got_fileindex_entry *ie)
1097 switch (got_fileindex_entry_stage_get(ie)) {
1098 case GOT_FILEIDX_STAGE_ADD:
1099 return GOT_STATUS_ADD;
1100 case GOT_FILEIDX_STAGE_DELETE:
1101 return GOT_STATUS_DELETE;
1102 case GOT_FILEIDX_STAGE_MODIFY:
1103 return GOT_STATUS_MODIFY;
1105 return GOT_STATUS_NO_CHANGE;
1109 static const struct got_error *
1110 get_file_status(unsigned char *status, struct stat *sb,
1111 struct got_fileindex_entry *ie, const char *abspath,
1112 int dirfd, const char *de_name, struct got_repository *repo)
1114 const struct got_error *err = NULL;
1115 struct got_object_id id;
1120 struct got_blob_object *blob = NULL;
1122 unsigned char staged_status = get_staged_status(ie);
1124 *status = GOT_STATUS_NO_CHANGE;
1127 * Whenever the caller provides a directory descriptor and a
1128 * directory entry name for the file, use them! This prevents
1129 * race conditions if filesystem paths change beneath our feet.
1132 if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1133 if (errno == ENOENT) {
1134 if (got_fileindex_entry_has_file_on_disk(ie))
1135 *status = GOT_STATUS_MISSING;
1137 *status = GOT_STATUS_DELETE;
1140 err = got_error_from_errno2("fstatat", abspath);
1144 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1145 if (fd == -1 && errno != ENOENT)
1146 return got_error_from_errno2("open", abspath);
1147 if (fd == -1 || fstat(fd, sb) == -1) {
1148 if (errno == ENOENT) {
1149 if (got_fileindex_entry_has_file_on_disk(ie))
1150 *status = GOT_STATUS_MISSING;
1152 *status = GOT_STATUS_DELETE;
1155 err = got_error_from_errno2("fstat", abspath);
1160 if (!S_ISREG(sb->st_mode)) {
1161 *status = GOT_STATUS_OBSTRUCTED;
1165 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1166 *status = GOT_STATUS_DELETE;
1168 } else if (!got_fileindex_entry_has_blob(ie) &&
1169 staged_status != GOT_STATUS_ADD) {
1170 *status = GOT_STATUS_ADD;
1174 if (!stat_info_differs(ie, sb))
1177 if (staged_status == GOT_STATUS_MODIFY ||
1178 staged_status == GOT_STATUS_ADD)
1179 memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1181 memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1183 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1188 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1190 err = got_error_from_errno2("openat", abspath);
1195 f = fdopen(fd, "r");
1197 err = got_error_from_errno2("fdopen", abspath);
1201 hdrlen = got_object_blob_get_hdrlen(blob);
1203 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1204 err = got_object_blob_read_block(&blen, blob);
1207 /* Skip length of blob object header first time around. */
1208 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1209 if (flen == 0 && ferror(f)) {
1210 err = got_error_from_errno("fread");
1215 *status = GOT_STATUS_MODIFY;
1217 } else if (flen == 0) {
1219 *status = GOT_STATUS_MODIFY;
1221 } else if (blen - hdrlen == flen) {
1222 /* Skip blob object header first time around. */
1223 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1224 *status = GOT_STATUS_MODIFY;
1228 *status = GOT_STATUS_MODIFY;
1234 if (*status == GOT_STATUS_MODIFY) {
1236 err = get_modified_file_content_status(status, f);
1237 } else if (xbit_differs(ie, sb->st_mode))
1238 *status = GOT_STATUS_MODE_CHANGE;
1241 got_object_blob_close(blob);
1242 if (f != NULL && fclose(f) == EOF && err == NULL)
1243 err = got_error_from_errno2("fclose", abspath);
1244 if (fd != -1 && close(fd) == -1 && err == NULL)
1245 err = got_error_from_errno2("close", abspath);
1250 * Update timestamps in the file index if a file is unmodified and
1251 * we had to run a full content comparison to find out.
1253 static const struct got_error *
1254 sync_timestamps(char *ondisk_path, unsigned char status,
1255 struct got_fileindex_entry *ie, struct stat *sb)
1257 if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1258 return got_fileindex_entry_update(ie, ondisk_path,
1259 ie->blob_sha1, ie->commit_sha1, 1);
1264 static const struct got_error *
1265 update_blob(struct got_worktree *worktree,
1266 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1267 struct got_tree_entry *te, const char *path,
1268 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1271 const struct got_error *err = NULL;
1272 struct got_blob_object *blob = NULL;
1274 unsigned char status = GOT_STATUS_NO_CHANGE;
1277 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1278 return got_error_from_errno("asprintf");
1281 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1282 err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1285 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1289 if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1290 sb.st_mode = got_fileindex_perms_to_st(ie);
1292 sb.st_mode = GOT_DEFAULT_FILE_MODE;
1294 if (status == GOT_STATUS_OBSTRUCTED) {
1295 err = (*progress_cb)(progress_arg, status, path);
1299 if (ie && status != GOT_STATUS_MISSING &&
1300 (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1301 if (got_fileindex_entry_has_commit(ie) &&
1302 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1303 SHA1_DIGEST_LENGTH) == 0) {
1304 err = sync_timestamps(ondisk_path, status, ie, &sb);
1307 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1311 if (got_fileindex_entry_has_blob(ie) &&
1312 memcmp(ie->blob_sha1, te->id.sha1,
1313 SHA1_DIGEST_LENGTH) == 0) {
1314 err = sync_timestamps(ondisk_path, status, ie, &sb);
1319 err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1323 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1324 int update_timestamps;
1325 struct got_blob_object *blob2 = NULL;
1326 char *label_orig = NULL;
1327 if (got_fileindex_entry_has_blob(ie)) {
1328 struct got_object_id id2;
1329 memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1330 err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1334 if (got_fileindex_entry_has_commit(ie)) {
1335 char id_str[SHA1_DIGEST_STRING_LENGTH];
1336 if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1337 sizeof(id_str)) == NULL) {
1338 err = got_error_path(id_str,
1339 GOT_ERR_BAD_OBJ_ID_STR);
1342 if (asprintf(&label_orig, "%s: commit %s",
1343 GOT_MERGE_LABEL_BASE, id_str) == -1) {
1344 err = got_error_from_errno("asprintf");
1348 err = merge_blob(&update_timestamps, worktree, blob2,
1349 ondisk_path, path, sb.st_mode, label_orig, blob,
1350 worktree->base_commit_id, repo,
1351 progress_cb, progress_arg);
1354 got_object_blob_close(blob2);
1358 * Do not update timestamps of files with local changes.
1359 * Otherwise, a future status walk would treat them as
1360 * unmodified files again.
1362 err = got_fileindex_entry_update(ie, ondisk_path,
1363 blob->id.sha1, worktree->base_commit_id->sha1,
1365 } else if (status == GOT_STATUS_MODE_CHANGE) {
1366 err = got_fileindex_entry_update(ie, ondisk_path,
1367 blob->id.sha1, worktree->base_commit_id->sha1, 0);
1368 } else if (status == GOT_STATUS_DELETE) {
1369 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1372 err = update_blob_fileindex_entry(worktree, fileindex, ie,
1373 ondisk_path, path, blob, 0);
1377 err = install_blob(worktree, ondisk_path, path, te->mode,
1378 sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1379 repo, progress_cb, progress_arg);
1382 err = update_blob_fileindex_entry(worktree, fileindex, ie,
1383 ondisk_path, path, blob, 1);
1387 got_object_blob_close(blob);
1393 static const struct got_error *
1394 remove_ondisk_file(const char *root_path, const char *path)
1396 const struct got_error *err = NULL;
1397 char *ondisk_path = NULL;
1399 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1400 return got_error_from_errno("asprintf");
1402 if (unlink(ondisk_path) == -1) {
1403 if (errno != ENOENT)
1404 err = got_error_from_errno2("unlink", ondisk_path);
1406 char *parent = dirname(ondisk_path);
1407 while (parent && strcmp(parent, root_path) != 0) {
1408 if (rmdir(parent) == -1) {
1409 if (errno != ENOTEMPTY)
1410 err = got_error_from_errno2("rmdir",
1414 parent = dirname(parent);
1421 static const struct got_error *
1422 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1423 struct got_fileindex_entry *ie, struct got_repository *repo,
1424 got_worktree_checkout_cb progress_cb, void *progress_arg)
1426 const struct got_error *err = NULL;
1427 unsigned char status;
1431 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1432 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1434 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1436 return got_error_from_errno("asprintf");
1438 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
1442 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1443 status == GOT_STATUS_ADD) {
1444 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1448 * Preserve the working file and change the deleted blob's
1449 * entry into a schedule-add entry.
1451 err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1456 err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1459 if (status == GOT_STATUS_NO_CHANGE) {
1460 err = remove_ondisk_file(worktree->root_path, ie->path);
1464 got_fileindex_entry_remove(fileindex, ie);
1470 struct diff_cb_arg {
1471 struct got_fileindex *fileindex;
1472 struct got_worktree *worktree;
1473 struct got_repository *repo;
1474 got_worktree_checkout_cb progress_cb;
1476 got_cancel_cb cancel_cb;
1480 static const struct got_error *
1481 diff_old_new(void *arg, struct got_fileindex_entry *ie,
1482 struct got_tree_entry *te, const char *parent_path)
1484 struct diff_cb_arg *a = arg;
1486 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1487 return got_error(GOT_ERR_CANCELLED);
1489 return update_blob(a->worktree, a->fileindex, ie, te,
1490 ie->path, a->repo, a->progress_cb, a->progress_arg);
1493 static const struct got_error *
1494 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1496 struct diff_cb_arg *a = arg;
1498 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1499 return got_error(GOT_ERR_CANCELLED);
1501 return delete_blob(a->worktree, a->fileindex, ie,
1502 a->repo, a->progress_cb, a->progress_arg);
1505 static const struct got_error *
1506 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1508 struct diff_cb_arg *a = arg;
1509 const struct got_error *err;
1512 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1513 return got_error(GOT_ERR_CANCELLED);
1515 if (got_object_tree_entry_is_submodule(te))
1518 if (asprintf(&path, "%s%s%s", parent_path,
1519 parent_path[0] ? "/" : "", te->name)
1521 return got_error_from_errno("asprintf");
1523 if (S_ISDIR(te->mode))
1524 err = add_dir_on_disk(a->worktree, path);
1526 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1527 a->repo, a->progress_cb, a->progress_arg);
1533 static const struct got_error *
1534 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1536 const struct got_error *err = NULL;
1537 char *uuidstr = NULL;
1538 uint32_t uuid_status;
1542 uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1543 if (uuid_status != uuid_s_ok)
1544 return got_error_uuid(uuid_status, "uuid_to_string");
1546 if (asprintf(refname, "%s-%s", prefix, uuidstr)
1548 err = got_error_from_errno("asprintf");
1555 const struct got_error *
1556 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1558 return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1561 static const struct got_error *
1562 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1564 return get_ref_name(refname, worktree,
1565 GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1568 static const struct got_error *
1569 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1571 return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1574 static const struct got_error *
1575 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1577 return get_ref_name(refname, worktree,
1578 GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1581 static const struct got_error *
1582 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1584 return get_ref_name(refname, worktree,
1585 GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1588 static const struct got_error *
1589 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1591 return get_ref_name(refname, worktree,
1592 GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1595 static const struct got_error *
1596 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1598 return get_ref_name(refname, worktree,
1599 GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1602 static const struct got_error *
1603 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1605 return get_ref_name(refname, worktree,
1606 GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1609 static const struct got_error *
1610 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1612 return get_ref_name(refname, worktree,
1613 GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1616 const struct got_error *
1617 got_worktree_get_histedit_script_path(char **path,
1618 struct got_worktree *worktree)
1620 if (asprintf(path, "%s/%s/%s", worktree->root_path,
1621 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1623 return got_error_from_errno("asprintf");
1629 * Prevent Git's garbage collector from deleting our base commit by
1630 * setting a reference to our base commit's ID.
1632 static const struct got_error *
1633 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1635 const struct got_error *err = NULL;
1636 struct got_reference *ref = NULL;
1639 err = got_worktree_get_base_ref_name(&refname, worktree);
1643 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1647 err = got_ref_write(ref, repo);
1655 static const struct got_error *
1656 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1658 const struct got_error *err = NULL;
1660 if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1661 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1662 err = got_error_from_errno("asprintf");
1663 *fileindex_path = NULL;
1669 static const struct got_error *
1670 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1671 struct got_worktree *worktree)
1673 const struct got_error *err = NULL;
1676 *fileindex_path = NULL;
1677 *fileindex = got_fileindex_alloc();
1678 if (*fileindex == NULL)
1679 return got_error_from_errno("got_fileindex_alloc");
1681 err = get_fileindex_path(fileindex_path, worktree);
1685 index = fopen(*fileindex_path, "rb");
1686 if (index == NULL) {
1687 if (errno != ENOENT)
1688 err = got_error_from_errno2("fopen", *fileindex_path);
1690 err = got_fileindex_read(*fileindex, index);
1691 if (fclose(index) != 0 && err == NULL)
1692 err = got_error_from_errno("fclose");
1696 free(*fileindex_path);
1697 *fileindex_path = NULL;
1698 got_fileindex_free(*fileindex);
1704 struct bump_base_commit_id_arg {
1705 struct got_object_id *base_commit_id;
1708 const char *entry_name;
1709 got_worktree_checkout_cb progress_cb;
1713 /* Bump base commit ID of all files within an updated part of the work tree. */
1714 static const struct got_error *
1715 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1717 const struct got_error *err;
1718 struct bump_base_commit_id_arg *a = arg;
1720 if (a->entry_name) {
1721 if (strcmp(ie->path, a->path) != 0)
1723 } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1726 if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1727 SHA1_DIGEST_LENGTH) == 0)
1730 if (a->progress_cb) {
1731 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1736 memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1740 static const struct got_error *
1741 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1743 const struct got_error *err = NULL;
1744 char *new_fileindex_path = NULL;
1745 FILE *new_index = NULL;
1747 err = got_opentemp_named(&new_fileindex_path, &new_index,
1752 err = got_fileindex_write(fileindex, new_index);
1756 if (rename(new_fileindex_path, fileindex_path) != 0) {
1757 err = got_error_from_errno3("rename", new_fileindex_path,
1759 unlink(new_fileindex_path);
1764 free(new_fileindex_path);
1768 static const struct got_error *
1769 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1770 struct got_object_id **tree_id, const char *wt_relpath,
1771 struct got_worktree *worktree, struct got_repository *repo)
1773 const struct got_error *err = NULL;
1774 struct got_object_id *id = NULL;
1775 char *in_repo_path = NULL;
1776 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1778 *entry_type = GOT_OBJ_TYPE_ANY;
1779 *tree_relpath = NULL;
1782 if (wt_relpath[0] == '\0') {
1783 /* Check out all files within the work tree. */
1784 *entry_type = GOT_OBJ_TYPE_TREE;
1785 *tree_relpath = strdup("");
1786 if (*tree_relpath == NULL) {
1787 err = got_error_from_errno("strdup");
1790 err = got_object_id_by_path(tree_id, repo,
1791 worktree->base_commit_id, worktree->path_prefix);
1797 /* Check out a subset of files in the work tree. */
1799 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1800 is_root_wt ? "" : "/", wt_relpath) == -1) {
1801 err = got_error_from_errno("asprintf");
1805 err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1811 in_repo_path = NULL;
1813 err = got_object_get_type(entry_type, repo, id);
1817 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1818 /* Check out a single file. */
1819 if (strchr(wt_relpath, '/') == NULL) {
1820 /* Check out a single file in work tree's root dir. */
1821 in_repo_path = strdup(worktree->path_prefix);
1822 if (in_repo_path == NULL) {
1823 err = got_error_from_errno("strdup");
1826 *tree_relpath = strdup("");
1827 if (*tree_relpath == NULL) {
1828 err = got_error_from_errno("strdup");
1832 /* Check out a single file in a subdirectory. */
1833 err = got_path_dirname(tree_relpath, wt_relpath);
1836 if (asprintf(&in_repo_path, "%s%s%s",
1837 worktree->path_prefix, is_root_wt ? "" : "/",
1838 *tree_relpath) == -1) {
1839 err = got_error_from_errno("asprintf");
1843 err = got_object_id_by_path(tree_id, repo,
1844 worktree->base_commit_id, in_repo_path);
1846 /* Check out all files within a subdirectory. */
1847 *tree_id = got_object_id_dup(id);
1848 if (*tree_id == NULL) {
1849 err = got_error_from_errno("got_object_id_dup");
1852 *tree_relpath = strdup(wt_relpath);
1853 if (*tree_relpath == NULL) {
1854 err = got_error_from_errno("strdup");
1862 *entry_type = GOT_OBJ_TYPE_ANY;
1863 free(*tree_relpath);
1864 *tree_relpath = NULL;
1871 static const struct got_error *
1872 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1873 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1874 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1875 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1877 const struct got_error *err = NULL;
1878 struct got_commit_object *commit = NULL;
1879 struct got_tree_object *tree = NULL;
1880 struct got_fileindex_diff_tree_cb diff_cb;
1881 struct diff_cb_arg arg;
1883 err = ref_base_commit(worktree, repo);
1887 err = got_object_open_as_commit(&commit, repo,
1888 worktree->base_commit_id);
1892 err = got_object_open_as_tree(&tree, repo, tree_id);
1897 got_object_tree_find_entry(tree, entry_name) == NULL) {
1898 err = got_error(GOT_ERR_NO_TREE_ENTRY);
1902 diff_cb.diff_old_new = diff_old_new;
1903 diff_cb.diff_old = diff_old;
1904 diff_cb.diff_new = diff_new;
1905 arg.fileindex = fileindex;
1906 arg.worktree = worktree;
1908 arg.progress_cb = progress_cb;
1909 arg.progress_arg = progress_arg;
1910 arg.cancel_cb = cancel_cb;
1911 arg.cancel_arg = cancel_arg;
1912 err = got_fileindex_diff_tree(fileindex, tree, relpath,
1913 entry_name, repo, &diff_cb, &arg);
1916 got_object_tree_close(tree);
1918 got_object_commit_close(commit);
1922 const struct got_error *
1923 got_worktree_checkout_files(struct got_worktree *worktree,
1924 struct got_pathlist_head *paths, struct got_repository *repo,
1925 got_worktree_checkout_cb progress_cb, void *progress_arg,
1926 got_cancel_cb cancel_cb, void *cancel_arg)
1928 const struct got_error *err = NULL, *sync_err, *unlockerr;
1929 struct got_commit_object *commit = NULL;
1930 struct got_tree_object *tree = NULL;
1931 struct got_fileindex *fileindex = NULL;
1932 char *fileindex_path = NULL;
1933 struct got_pathlist_entry *pe;
1934 struct tree_path_data {
1935 SIMPLEQ_ENTRY(tree_path_data) entry;
1936 struct got_object_id *tree_id;
1941 SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1943 SIMPLEQ_INIT(&tree_paths);
1945 err = lock_worktree(worktree, LOCK_EX);
1949 /* Map all specified paths to in-repository trees. */
1950 TAILQ_FOREACH(pe, paths, entry) {
1951 tpd = malloc(sizeof(*tpd));
1953 err = got_error_from_errno("malloc");
1957 err = find_tree_entry_for_checkout(&tpd->entry_type,
1958 &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1964 if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1965 err = got_path_basename(&tpd->entry_name, pe->path);
1973 tpd->entry_name = NULL;
1975 SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1979 * Read the file index.
1980 * Checking out files is supposed to be an idempotent operation.
1981 * If the on-disk file index is incomplete we will try to complete it.
1983 err = open_fileindex(&fileindex, &fileindex_path, worktree);
1987 tpd = SIMPLEQ_FIRST(&tree_paths);
1988 TAILQ_FOREACH(pe, paths, entry) {
1989 struct bump_base_commit_id_arg bbc_arg;
1991 err = checkout_files(worktree, fileindex, tpd->relpath,
1992 tpd->tree_id, tpd->entry_name, repo,
1993 progress_cb, progress_arg, cancel_cb, cancel_arg);
1997 bbc_arg.base_commit_id = worktree->base_commit_id;
1998 bbc_arg.entry_name = tpd->entry_name;
1999 bbc_arg.path = pe->path;
2000 bbc_arg.path_len = pe->path_len;
2001 bbc_arg.progress_cb = progress_cb;
2002 bbc_arg.progress_arg = progress_arg;
2003 err = got_fileindex_for_each_entry_safe(fileindex,
2004 bump_base_commit_id, &bbc_arg);
2008 tpd = SIMPLEQ_NEXT(tpd, entry);
2010 sync_err = sync_fileindex(fileindex, fileindex_path);
2011 if (sync_err && err == NULL)
2014 free(fileindex_path);
2016 got_object_tree_close(tree);
2018 got_object_commit_close(commit);
2020 got_fileindex_free(fileindex);
2021 while (!SIMPLEQ_EMPTY(&tree_paths)) {
2022 tpd = SIMPLEQ_FIRST(&tree_paths);
2023 SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2028 unlockerr = lock_worktree(worktree, LOCK_SH);
2029 if (unlockerr && err == NULL)
2034 struct merge_file_cb_arg {
2035 struct got_worktree *worktree;
2036 struct got_fileindex *fileindex;
2037 got_worktree_checkout_cb progress_cb;
2039 got_cancel_cb cancel_cb;
2041 const char *label_orig;
2042 struct got_object_id *commit_id2;
2045 static const struct got_error *
2046 merge_file_cb(void *arg, struct got_blob_object *blob1,
2047 struct got_blob_object *blob2, struct got_object_id *id1,
2048 struct got_object_id *id2, const char *path1, const char *path2,
2049 mode_t mode1, mode_t mode2, struct got_repository *repo)
2051 static const struct got_error *err = NULL;
2052 struct merge_file_cb_arg *a = arg;
2053 struct got_fileindex_entry *ie;
2054 char *ondisk_path = NULL;
2056 unsigned char status;
2057 int local_changes_subsumed;
2059 if (blob1 && blob2) {
2060 ie = got_fileindex_entry_get(a->fileindex, path2,
2063 return (*a->progress_cb)(a->progress_arg,
2064 GOT_STATUS_MISSING, path2);
2066 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2068 return got_error_from_errno("asprintf");
2070 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2075 if (status == GOT_STATUS_DELETE) {
2076 err = (*a->progress_cb)(a->progress_arg,
2077 GOT_STATUS_MERGE, path2);
2080 if (status != GOT_STATUS_NO_CHANGE &&
2081 status != GOT_STATUS_MODIFY &&
2082 status != GOT_STATUS_CONFLICT &&
2083 status != GOT_STATUS_ADD) {
2084 err = (*a->progress_cb)(a->progress_arg, status, path2);
2088 err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2089 ondisk_path, path2, sb.st_mode, a->label_orig, blob2,
2090 a->commit_id2, repo, a->progress_cb, a->progress_arg);
2092 ie = got_fileindex_entry_get(a->fileindex, path1,
2095 return (*a->progress_cb)(a->progress_arg,
2096 GOT_STATUS_MISSING, path2);
2098 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2100 return got_error_from_errno("asprintf");
2102 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2108 case GOT_STATUS_NO_CHANGE:
2109 err = (*a->progress_cb)(a->progress_arg,
2110 GOT_STATUS_DELETE, path1);
2113 err = remove_ondisk_file(a->worktree->root_path, path1);
2117 got_fileindex_entry_mark_deleted_from_disk(ie);
2119 case GOT_STATUS_DELETE:
2120 case GOT_STATUS_MISSING:
2121 err = (*a->progress_cb)(a->progress_arg,
2122 GOT_STATUS_DELETE, path1);
2126 got_fileindex_entry_mark_deleted_from_disk(ie);
2128 case GOT_STATUS_ADD:
2129 case GOT_STATUS_MODIFY:
2130 case GOT_STATUS_CONFLICT:
2131 err = (*a->progress_cb)(a->progress_arg,
2132 GOT_STATUS_CANNOT_DELETE, path1);
2136 case GOT_STATUS_OBSTRUCTED:
2137 err = (*a->progress_cb)(a->progress_arg, status, path1);
2145 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2147 return got_error_from_errno("asprintf");
2148 ie = got_fileindex_entry_get(a->fileindex, path2,
2151 err = get_file_status(&status, &sb, ie, ondisk_path,
2155 if (status != GOT_STATUS_NO_CHANGE &&
2156 status != GOT_STATUS_MODIFY &&
2157 status != GOT_STATUS_CONFLICT &&
2158 status != GOT_STATUS_ADD) {
2159 err = (*a->progress_cb)(a->progress_arg,
2163 err = merge_blob(&local_changes_subsumed, a->worktree,
2164 NULL, ondisk_path, path2, sb.st_mode,
2165 a->label_orig, blob2, a->commit_id2, repo,
2168 if (status == GOT_STATUS_DELETE) {
2169 err = update_blob_fileindex_entry(a->worktree,
2170 a->fileindex, ie, ondisk_path, ie->path,
2176 sb.st_mode = GOT_DEFAULT_FILE_MODE;
2177 err = install_blob(a->worktree, ondisk_path, path2,
2178 /* XXX get this from parent tree! */
2179 GOT_DEFAULT_FILE_MODE,
2180 sb.st_mode, blob2, 0, 0, repo,
2181 a->progress_cb, a->progress_arg);
2184 err = got_fileindex_entry_alloc(&ie,
2185 ondisk_path, path2, NULL, NULL);
2188 err = got_fileindex_entry_add(a->fileindex, ie);
2190 got_fileindex_entry_free(ie);
2200 struct check_merge_ok_arg {
2201 struct got_worktree *worktree;
2202 struct got_repository *repo;
2205 static const struct got_error *
2206 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2208 const struct got_error *err = NULL;
2209 struct check_merge_ok_arg *a = arg;
2210 unsigned char status;
2214 /* Reject merges into a work tree with mixed base commits. */
2215 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2216 SHA1_DIGEST_LENGTH))
2217 return got_error(GOT_ERR_MIXED_COMMITS);
2219 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2221 return got_error_from_errno("asprintf");
2223 /* Reject merges into a work tree with conflicted files. */
2224 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2227 if (status == GOT_STATUS_CONFLICT)
2228 return got_error(GOT_ERR_CONFLICTS);
2233 static const struct got_error *
2234 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2235 const char *fileindex_path, struct got_object_id *commit_id1,
2236 struct got_object_id *commit_id2, struct got_repository *repo,
2237 got_worktree_checkout_cb progress_cb, void *progress_arg,
2238 got_cancel_cb cancel_cb, void *cancel_arg)
2240 const struct got_error *err = NULL, *sync_err;
2241 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2242 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2243 struct merge_file_cb_arg arg;
2244 char *label_orig = NULL;
2249 err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2250 worktree->path_prefix);
2254 err = got_object_open_as_tree(&tree1, repo, tree_id1);
2258 err = got_object_id_str(&id_str, commit_id1);
2262 if (asprintf(&label_orig, "%s: commit %s",
2263 GOT_MERGE_LABEL_BASE, id_str) == -1) {
2264 err = got_error_from_errno("asprintf");
2271 err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2272 worktree->path_prefix);
2276 err = got_object_open_as_tree(&tree2, repo, tree_id2);
2280 arg.worktree = worktree;
2281 arg.fileindex = fileindex;
2282 arg.progress_cb = progress_cb;
2283 arg.progress_arg = progress_arg;
2284 arg.cancel_cb = cancel_cb;
2285 arg.cancel_arg = cancel_arg;
2286 arg.label_orig = label_orig;
2287 arg.commit_id2 = commit_id2;
2288 err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2289 sync_err = sync_fileindex(fileindex, fileindex_path);
2290 if (sync_err && err == NULL)
2294 got_object_tree_close(tree1);
2296 got_object_tree_close(tree2);
2301 const struct got_error *
2302 got_worktree_merge_files(struct got_worktree *worktree,
2303 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2304 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2305 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2307 const struct got_error *err, *unlockerr;
2308 char *fileindex_path = NULL;
2309 struct got_fileindex *fileindex = NULL;
2310 struct check_merge_ok_arg mok_arg;
2312 err = lock_worktree(worktree, LOCK_EX);
2316 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2320 mok_arg.worktree = worktree;
2321 mok_arg.repo = repo;
2322 err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2327 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2328 commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2331 got_fileindex_free(fileindex);
2332 free(fileindex_path);
2333 unlockerr = lock_worktree(worktree, LOCK_SH);
2334 if (unlockerr && err == NULL)
2339 struct diff_dir_cb_arg {
2340 struct got_fileindex *fileindex;
2341 struct got_worktree *worktree;
2342 const char *status_path;
2343 size_t status_path_len;
2344 struct got_repository *repo;
2345 got_worktree_status_cb status_cb;
2347 got_cancel_cb cancel_cb;
2349 /* A pathlist containing per-directory pathlists of ignore patterns. */
2350 struct got_pathlist_head ignores;
2351 int report_unchanged;
2354 static const struct got_error *
2355 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2356 int dirfd, const char *de_name,
2357 got_worktree_status_cb status_cb, void *status_arg,
2358 struct got_repository *repo, int report_unchanged)
2360 const struct got_error *err = NULL;
2361 unsigned char status = GOT_STATUS_NO_CHANGE;
2362 unsigned char staged_status = get_staged_status(ie);
2364 struct got_object_id blob_id, commit_id, staged_blob_id;
2365 struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2366 struct got_object_id *staged_blob_idp = NULL;
2368 err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
2372 if (status == GOT_STATUS_NO_CHANGE &&
2373 staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
2376 if (got_fileindex_entry_has_blob(ie)) {
2377 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2378 blob_idp = &blob_id;
2380 if (got_fileindex_entry_has_commit(ie)) {
2381 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2382 commit_idp = &commit_id;
2384 if (staged_status == GOT_STATUS_ADD ||
2385 staged_status == GOT_STATUS_MODIFY) {
2386 memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2387 SHA1_DIGEST_LENGTH);
2388 staged_blob_idp = &staged_blob_id;
2391 return (*status_cb)(status_arg, status, staged_status,
2392 ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
2395 static const struct got_error *
2396 status_old_new(void *arg, struct got_fileindex_entry *ie,
2397 struct dirent *de, const char *parent_path, int dirfd)
2399 const struct got_error *err = NULL;
2400 struct diff_dir_cb_arg *a = arg;
2403 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2404 return got_error(GOT_ERR_CANCELLED);
2406 if (got_path_cmp(parent_path, a->status_path,
2407 strlen(parent_path), a->status_path_len) != 0 &&
2408 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2411 if (parent_path[0]) {
2412 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2413 parent_path, de->d_name) == -1)
2414 return got_error_from_errno("asprintf");
2416 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2418 return got_error_from_errno("asprintf");
2421 err = report_file_status(ie, abspath, dirfd, de->d_name,
2422 a->status_cb, a->status_arg, a->repo, a->report_unchanged);
2427 static const struct got_error *
2428 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2430 struct diff_dir_cb_arg *a = arg;
2431 struct got_object_id blob_id, commit_id;
2432 unsigned char status;
2434 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2435 return got_error(GOT_ERR_CANCELLED);
2437 if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2440 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2441 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2442 if (got_fileindex_entry_has_file_on_disk(ie))
2443 status = GOT_STATUS_MISSING;
2445 status = GOT_STATUS_DELETE;
2446 return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2447 ie->path, &blob_id, NULL, &commit_id, -1, NULL);
2451 free_ignorelist(struct got_pathlist_head *ignorelist)
2453 struct got_pathlist_entry *pe;
2455 TAILQ_FOREACH(pe, ignorelist, entry)
2456 free((char *)pe->path);
2457 got_pathlist_free(ignorelist);
2461 free_ignores(struct got_pathlist_head *ignores)
2463 struct got_pathlist_entry *pe;
2465 TAILQ_FOREACH(pe, ignores, entry) {
2466 struct got_pathlist_head *ignorelist = pe->data;
2467 free_ignorelist(ignorelist);
2468 free((char *)pe->path);
2470 got_pathlist_free(ignores);
2473 static const struct got_error *
2474 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2476 const struct got_error *err = NULL;
2477 struct got_pathlist_entry *pe = NULL;
2478 struct got_pathlist_head *ignorelist;
2479 char *line = NULL, *pattern, *dirpath = NULL;
2480 size_t linesize = 0;
2483 ignorelist = calloc(1, sizeof(*ignorelist));
2484 if (ignorelist == NULL)
2485 return got_error_from_errno("calloc");
2486 TAILQ_INIT(ignorelist);
2488 while ((linelen = getline(&line, &linesize, f)) != -1) {
2489 if (linelen > 0 && line[linelen - 1] == '\n')
2490 line[linelen - 1] = '\0';
2492 /* Git's ignores may contain comments. */
2496 /* Git's negated patterns are not (yet?) supported. */
2500 if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2502 err = got_error_from_errno("asprintf");
2505 err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2510 err = got_error_from_errno("getline");
2514 dirpath = strdup(path);
2515 if (dirpath == NULL) {
2516 err = got_error_from_errno("strdup");
2519 err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2522 if (err || pe == NULL) {
2524 free_ignorelist(ignorelist);
2530 match_ignores(struct got_pathlist_head *ignores, const char *path)
2532 struct got_pathlist_entry *pe;
2534 /* Handle patterns which match in all directories. */
2535 TAILQ_FOREACH(pe, ignores, entry) {
2536 struct got_pathlist_head *ignorelist = pe->data;
2537 struct got_pathlist_entry *pi;
2539 TAILQ_FOREACH(pi, ignorelist, entry) {
2540 const char *p, *pattern = pi->path;
2542 if (strncmp(pattern, "**/", 3) != 0)
2547 if (fnmatch(pattern, p,
2548 FNM_PATHNAME | FNM_LEADING_DIR)) {
2549 /* Retry in next directory. */
2550 while (*p && *p != '/')
2562 * The ignores pathlist contains ignore lists from children before
2563 * parents, so we can find the most specific ignorelist by walking
2564 * ignores backwards.
2566 pe = TAILQ_LAST(ignores, got_pathlist_head);
2568 if (got_path_is_child(path, pe->path, pe->path_len)) {
2569 struct got_pathlist_head *ignorelist = pe->data;
2570 struct got_pathlist_entry *pi;
2571 TAILQ_FOREACH(pi, ignorelist, entry) {
2572 const char *pattern = pi->path;
2573 int flags = FNM_LEADING_DIR;
2574 if (strstr(pattern, "/**/") == NULL)
2575 flags |= FNM_PATHNAME;
2576 if (fnmatch(pattern, path, flags))
2581 pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2587 static const struct got_error *
2588 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2589 const char *path, int dirfd, const char *ignores_filename)
2591 const struct got_error *err = NULL;
2594 FILE *ignoresfile = NULL;
2596 if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2597 path[0] ? "/" : "", ignores_filename) == -1)
2598 return got_error_from_errno("asprintf");
2601 fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
2603 if (errno != ENOENT && errno != EACCES)
2604 err = got_error_from_errno2("openat",
2607 ignoresfile = fdopen(fd, "r");
2608 if (ignoresfile == NULL)
2609 err = got_error_from_errno2("fdopen",
2613 err = read_ignores(ignores, path, ignoresfile);
2617 ignoresfile = fopen(ignorespath, "r");
2618 if (ignoresfile == NULL) {
2619 if (errno != ENOENT && errno != EACCES)
2620 err = got_error_from_errno2("fopen",
2623 err = read_ignores(ignores, path, ignoresfile);
2626 if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2627 err = got_error_from_errno2("fclose", path);
2628 if (fd != -1 && close(fd) == -1 && err == NULL)
2629 err = got_error_from_errno2("close", path);
2634 static const struct got_error *
2635 status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
2637 const struct got_error *err = NULL;
2638 struct diff_dir_cb_arg *a = arg;
2641 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2642 return got_error(GOT_ERR_CANCELLED);
2644 /* XXX ignore symlinks for now */
2645 if (de->d_type == DT_LNK)
2648 if (parent_path[0]) {
2649 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2650 return got_error_from_errno("asprintf");
2655 if (de->d_type == DT_DIR) {
2656 int subdirfd = openat(dirfd, de->d_name,
2657 O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2658 if (subdirfd == -1) {
2659 if (errno != ENOENT && errno != EACCES)
2660 err = got_error_from_errno2("openat", path);
2662 err = add_ignores(&a->ignores, a->worktree->root_path,
2663 path, subdirfd, ".cvsignore");
2665 err = add_ignores(&a->ignores,
2666 a->worktree->root_path, path,
2667 subdirfd, ".gitignore");
2668 if (close(subdirfd) == -1 && err == NULL)
2669 err = got_error_from_errno2("close", path);
2671 } else if (got_path_is_child(path, a->status_path, a->status_path_len)
2672 && !match_ignores(&a->ignores, path))
2673 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2674 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2680 static const struct got_error *
2681 report_single_file_status(const char *path, const char *ondisk_path,
2682 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2683 void *status_arg, struct got_repository *repo, int report_unchanged)
2685 struct got_fileindex_entry *ie;
2688 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2690 return report_file_status(ie, ondisk_path, -1, NULL,
2691 status_cb, status_arg, repo, report_unchanged);
2693 if (lstat(ondisk_path, &sb) == -1) {
2694 if (errno != ENOENT)
2695 return got_error_from_errno2("lstat", ondisk_path);
2696 return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2697 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2701 if (S_ISREG(sb.st_mode))
2702 return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2703 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2708 static const struct got_error *
2709 worktree_status(struct got_worktree *worktree, const char *path,
2710 struct got_fileindex *fileindex, struct got_repository *repo,
2711 got_worktree_status_cb status_cb, void *status_arg,
2712 got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
2713 int report_unchanged)
2715 const struct got_error *err = NULL;
2717 struct got_fileindex_diff_dir_cb fdiff_cb;
2718 struct diff_dir_cb_arg arg;
2719 char *ondisk_path = NULL;
2721 if (asprintf(&ondisk_path, "%s%s%s",
2722 worktree->root_path, path[0] ? "/" : "", path) == -1)
2723 return got_error_from_errno("asprintf");
2725 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2727 if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2728 err = got_error_from_errno2("open", ondisk_path);
2730 err = report_single_file_status(path, ondisk_path,
2731 fileindex, status_cb, status_arg, repo,
2734 fdiff_cb.diff_old_new = status_old_new;
2735 fdiff_cb.diff_old = status_old;
2736 fdiff_cb.diff_new = status_new;
2737 arg.fileindex = fileindex;
2738 arg.worktree = worktree;
2739 arg.status_path = path;
2740 arg.status_path_len = strlen(path);
2742 arg.status_cb = status_cb;
2743 arg.status_arg = status_arg;
2744 arg.cancel_cb = cancel_cb;
2745 arg.cancel_arg = cancel_arg;
2746 arg.report_unchanged = report_unchanged;
2747 TAILQ_INIT(&arg.ignores);
2749 err = add_ignores(&arg.ignores, worktree->root_path,
2750 path, fd, ".cvsignore");
2752 err = add_ignores(&arg.ignores,
2753 worktree->root_path, path, fd,
2757 err = got_fileindex_diff_dir(fileindex, fd,
2758 worktree->root_path, path, repo, &fdiff_cb, &arg);
2759 free_ignores(&arg.ignores);
2762 if (fd != -1 && close(fd) != 0 && err == NULL)
2763 err = got_error_from_errno("close");
2768 const struct got_error *
2769 got_worktree_status(struct got_worktree *worktree,
2770 struct got_pathlist_head *paths, struct got_repository *repo,
2771 got_worktree_status_cb status_cb, void *status_arg,
2772 got_cancel_cb cancel_cb, void *cancel_arg)
2774 const struct got_error *err = NULL;
2775 char *fileindex_path = NULL;
2776 struct got_fileindex *fileindex = NULL;
2777 struct got_pathlist_entry *pe;
2779 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2783 TAILQ_FOREACH(pe, paths, entry) {
2784 err = worktree_status(worktree, pe->path, fileindex, repo,
2785 status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
2789 free(fileindex_path);
2790 got_fileindex_free(fileindex);
2794 const struct got_error *
2795 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2798 const struct got_error *err = NULL;
2799 char *resolved, *cwd = NULL, *path = NULL;
2804 resolved = realpath(arg, NULL);
2805 if (resolved == NULL) {
2806 if (errno != ENOENT)
2807 return got_error_from_errno2("realpath", arg);
2808 cwd = getcwd(NULL, 0);
2810 return got_error_from_errno("getcwd");
2811 if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2812 err = got_error_from_errno("asprintf");
2817 if (strncmp(got_worktree_get_root_path(worktree), resolved,
2818 strlen(got_worktree_get_root_path(worktree)))) {
2819 err = got_error(GOT_ERR_BAD_PATH);
2823 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2824 err = got_path_skip_common_ancestor(&path,
2825 got_worktree_get_root_path(worktree), resolved);
2831 err = got_error_from_errno("strdup");
2836 /* XXX status walk can't deal with trailing slash! */
2838 while (len > 0 && path[len - 1] == '/') {
2839 path[len - 1] = '\0';
2852 struct schedule_addition_args {
2853 struct got_worktree *worktree;
2854 struct got_fileindex *fileindex;
2855 got_worktree_checkout_cb progress_cb;
2857 struct got_repository *repo;
2860 static const struct got_error *
2861 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
2862 const char *relpath, struct got_object_id *blob_id,
2863 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2864 int dirfd, const char *de_name)
2866 struct schedule_addition_args *a = arg;
2867 const struct got_error *err = NULL;
2868 struct got_fileindex_entry *ie;
2872 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2874 return got_error_from_errno("asprintf");
2876 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2878 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
2882 /* Re-adding an existing entry is a no-op. */
2883 if (status == GOT_STATUS_ADD)
2885 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
2890 if (status != GOT_STATUS_UNVERSIONED) {
2891 err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
2895 err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2899 err = got_fileindex_entry_add(a->fileindex, ie);
2901 got_fileindex_entry_free(ie);
2908 if (status == GOT_STATUS_ADD)
2910 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
2913 const struct got_error *
2914 got_worktree_schedule_add(struct got_worktree *worktree,
2915 struct got_pathlist_head *paths,
2916 got_worktree_checkout_cb progress_cb, void *progress_arg,
2917 struct got_repository *repo, int no_ignores)
2919 struct got_fileindex *fileindex = NULL;
2920 char *fileindex_path = NULL;
2921 const struct got_error *err = NULL, *sync_err, *unlockerr;
2922 struct got_pathlist_entry *pe;
2923 struct schedule_addition_args saa;
2925 err = lock_worktree(worktree, LOCK_EX);
2929 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2933 saa.worktree = worktree;
2934 saa.fileindex = fileindex;
2935 saa.progress_cb = progress_cb;
2936 saa.progress_arg = progress_arg;
2939 TAILQ_FOREACH(pe, paths, entry) {
2940 err = worktree_status(worktree, pe->path, fileindex, repo,
2941 schedule_addition, &saa, NULL, NULL, no_ignores, 0);
2945 sync_err = sync_fileindex(fileindex, fileindex_path);
2946 if (sync_err && err == NULL)
2949 free(fileindex_path);
2951 got_fileindex_free(fileindex);
2952 unlockerr = lock_worktree(worktree, LOCK_SH);
2953 if (unlockerr && err == NULL)
2958 struct schedule_deletion_args {
2959 struct got_worktree *worktree;
2960 struct got_fileindex *fileindex;
2961 got_worktree_delete_cb progress_cb;
2963 struct got_repository *repo;
2964 int delete_local_mods;
2968 static const struct got_error *
2969 schedule_for_deletion(void *arg, unsigned char status,
2970 unsigned char staged_status, const char *relpath,
2971 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
2972 struct got_object_id *commit_id, int dirfd, const char *de_name)
2974 struct schedule_deletion_args *a = arg;
2975 const struct got_error *err = NULL;
2976 struct got_fileindex_entry *ie = NULL;
2980 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2982 return got_error(GOT_ERR_BAD_PATH);
2984 staged_status = get_staged_status(ie);
2985 if (staged_status != GOT_STATUS_NO_CHANGE) {
2986 if (staged_status == GOT_STATUS_DELETE)
2988 return got_error_path(relpath, GOT_ERR_FILE_STAGED);
2991 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2993 return got_error_from_errno("asprintf");
2995 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3000 if (status != GOT_STATUS_NO_CHANGE) {
3001 if (status == GOT_STATUS_DELETE)
3003 if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3004 err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3007 if (status != GOT_STATUS_MODIFY &&
3008 status != GOT_STATUS_MISSING) {
3009 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3014 if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3016 if (unlinkat(dirfd, de_name, 0) != 0) {
3017 err = got_error_from_errno2("unlinkat",
3021 } else if (unlink(ondisk_path) != 0) {
3022 err = got_error_from_errno2("unlink", ondisk_path);
3027 got_fileindex_entry_mark_deleted_from_disk(ie);
3032 if (status == GOT_STATUS_DELETE)
3034 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3035 staged_status, relpath);
3038 const struct got_error *
3039 got_worktree_schedule_delete(struct got_worktree *worktree,
3040 struct got_pathlist_head *paths, int delete_local_mods,
3041 got_worktree_delete_cb progress_cb, void *progress_arg,
3042 struct got_repository *repo, int keep_on_disk)
3044 struct got_fileindex *fileindex = NULL;
3045 char *fileindex_path = NULL;
3046 const struct got_error *err = NULL, *sync_err, *unlockerr;
3047 struct got_pathlist_entry *pe;
3048 struct schedule_deletion_args sda;
3050 err = lock_worktree(worktree, LOCK_EX);
3054 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3058 sda.worktree = worktree;
3059 sda.fileindex = fileindex;
3060 sda.progress_cb = progress_cb;
3061 sda.progress_arg = progress_arg;
3063 sda.delete_local_mods = delete_local_mods;
3064 sda.keep_on_disk = keep_on_disk;
3066 TAILQ_FOREACH(pe, paths, entry) {
3067 err = worktree_status(worktree, pe->path, fileindex, repo,
3068 schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3072 sync_err = sync_fileindex(fileindex, fileindex_path);
3073 if (sync_err && err == NULL)
3076 free(fileindex_path);
3078 got_fileindex_free(fileindex);
3079 unlockerr = lock_worktree(worktree, LOCK_SH);
3080 if (unlockerr && err == NULL)
3085 static const struct got_error *
3086 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3088 const struct got_error *err = NULL;
3090 size_t linesize = 0, n;
3093 linelen = getline(&line, &linesize, infile);
3094 if (linelen == -1) {
3095 if (ferror(infile)) {
3096 err = got_error_from_errno("getline");
3102 n = fwrite(line, 1, linelen, outfile);
3104 err = got_ferror(outfile, GOT_ERR_IO);
3109 n = fwrite(line, 1, linelen, rejectfile);
3111 err = got_ferror(outfile, GOT_ERR_IO);
3118 static const struct got_error *
3119 skip_one_line(FILE *f)
3122 size_t linesize = 0;
3125 linelen = getline(&line, &linesize, f);
3126 if (linelen == -1) {
3128 return got_error_from_errno("getline");
3135 static const struct got_error *
3136 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3137 int start_old, int end_old, int start_new, int end_new,
3138 FILE *outfile, FILE *rejectfile)
3140 const struct got_error *err;
3142 /* Copy old file's lines leading up to patch. */
3143 while (!feof(f1) && *line_cur1 < start_old) {
3144 err = copy_one_line(f1, outfile, NULL);
3149 /* Skip new file's lines leading up to patch. */
3150 while (!feof(f2) && *line_cur2 < start_new) {
3152 err = copy_one_line(f2, NULL, rejectfile);
3154 err = skip_one_line(f2);
3159 /* Copy patched lines. */
3160 while (!feof(f2) && *line_cur2 <= end_new) {
3161 err = copy_one_line(f2, outfile, NULL);
3166 /* Skip over old file's replaced lines. */
3167 while (!feof(f1) && *line_cur1 <= end_old) {
3169 err = copy_one_line(f1, NULL, rejectfile);
3171 err = skip_one_line(f1);
3180 static const struct got_error *
3181 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3182 FILE *outfile, FILE *rejectfile)
3184 const struct got_error *err;
3187 /* Copy old file's lines until EOF. */
3189 err = copy_one_line(f1, outfile, NULL);
3196 /* Copy new file's lines until EOF. */
3198 err = copy_one_line(f2, NULL, rejectfile);
3208 static const struct got_error *
3209 apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3210 int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3211 int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3212 int *line_cur2, FILE *outfile, FILE *rejectfile,
3213 got_worktree_patch_cb patch_cb, void *patch_arg)
3215 const struct got_error *err = NULL;
3216 int start_old = change->cv.a;
3217 int end_old = change->cv.b;
3218 int start_new = change->cv.c;
3219 int end_new = change->cv.d;
3223 *choice = GOT_PATCH_CHOICE_NONE;
3225 hunkfile = got_opentemp();
3226 if (hunkfile == NULL)
3227 return got_error_from_errno("got_opentemp");
3232 /* XXX TODO needs error checking */
3233 got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3235 if (fseek(f1, pos1, SEEK_SET) == -1) {
3236 err = got_ferror(f1, GOT_ERR_IO);
3239 if (fseek(f2, pos2, SEEK_SET) == -1) {
3240 err = got_ferror(f1, GOT_ERR_IO);
3243 if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3244 err = got_ferror(hunkfile, GOT_ERR_IO);
3248 err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3249 hunkfile, n, nchanges);
3254 case GOT_PATCH_CHOICE_YES:
3255 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3256 end_old, start_new, end_new, outfile, rejectfile);
3258 case GOT_PATCH_CHOICE_NO:
3259 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3260 end_old, start_new, end_new, rejectfile, outfile);
3262 case GOT_PATCH_CHOICE_QUIT:
3265 err = got_error(GOT_ERR_PATCH_CHOICE);
3269 if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3270 err = got_error_from_errno("fclose");
3274 struct revert_file_args {
3275 struct got_worktree *worktree;
3276 struct got_fileindex *fileindex;
3277 got_worktree_checkout_cb progress_cb;
3279 got_worktree_patch_cb patch_cb;
3281 struct got_repository *repo;
3284 static const struct got_error *
3285 create_patched_content(char **path_outfile, int reverse_patch,
3286 struct got_object_id *blob_id, const char *path2,
3287 int dirfd2, const char *de_name2,
3288 const char *relpath, struct got_repository *repo,
3289 got_worktree_patch_cb patch_cb, void *patch_arg)
3291 const struct got_error *err;
3292 struct got_blob_object *blob = NULL;
3293 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3295 char *path1 = NULL, *id_str = NULL;
3296 struct stat sb1, sb2;
3297 struct got_diff_changes *changes = NULL;
3298 struct got_diff_state *ds = NULL;
3299 struct got_diff_args *args = NULL;
3300 struct got_diff_change *change;
3301 int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3304 *path_outfile = NULL;
3306 err = got_object_id_str(&id_str, blob_id);
3311 fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
3313 err = got_error_from_errno2("openat", path2);
3317 fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3319 err = got_error_from_errno2("open", path2);
3323 if (fstat(fd2, &sb2) == -1) {
3324 err = got_error_from_errno2("fstat", path2);
3328 f2 = fdopen(fd2, "r");
3330 err = got_error_from_errno2("fdopen", path2);
3335 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3339 err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3343 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3347 if (stat(path1, &sb1) == -1) {
3348 err = got_error_from_errno2("stat", path1);
3352 err = got_diff_files(&changes, &ds, &args, &diff_flags,
3353 f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3357 err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3361 if (fseek(f1, 0L, SEEK_SET) == -1)
3362 return got_ferror(f1, GOT_ERR_IO);
3363 if (fseek(f2, 0L, SEEK_SET) == -1)
3364 return got_ferror(f2, GOT_ERR_IO);
3365 SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3367 err = apply_or_reject_change(&choice, change, ++n,
3368 changes->nchanges, ds, args, diff_flags, relpath,
3369 f1, f2, &line_cur1, &line_cur2,
3370 reverse_patch ? NULL : outfile,
3371 reverse_patch ? outfile : NULL,
3372 patch_cb, patch_arg);
3375 if (choice == GOT_PATCH_CHOICE_YES)
3377 else if (choice == GOT_PATCH_CHOICE_QUIT)
3381 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3382 reverse_patch ? NULL : outfile,
3383 reverse_patch ? outfile : NULL);
3387 if (chmod(*path_outfile, sb2.st_mode) == -1) {
3388 err = got_error_from_errno2("chmod", path2);
3395 got_object_blob_close(blob);
3396 if (f1 && fclose(f1) == EOF && err == NULL)
3397 err = got_error_from_errno2("fclose", path1);
3398 if (f2 && fclose(f2) == EOF && err == NULL)
3399 err = got_error_from_errno2("fclose", path2);
3400 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3401 err = got_error_from_errno2("close", path2);
3402 if (outfile && fclose(outfile) == EOF && err == NULL)
3403 err = got_error_from_errno2("fclose", *path_outfile);
3404 if (path1 && unlink(path1) == -1 && err == NULL)
3405 err = got_error_from_errno2("unlink", path1);
3406 if (err || !have_content) {
3407 if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3408 err = got_error_from_errno2("unlink", *path_outfile);
3409 free(*path_outfile);
3410 *path_outfile = NULL;
3414 got_diff_state_free(ds);
3418 got_diff_free_changes(changes);
3423 static const struct got_error *
3424 revert_file(void *arg, unsigned char status, unsigned char staged_status,
3425 const char *relpath, struct got_object_id *blob_id,
3426 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3427 int dirfd, const char *de_name)
3429 struct revert_file_args *a = arg;
3430 const struct got_error *err = NULL;
3431 char *parent_path = NULL;
3432 struct got_fileindex_entry *ie;
3433 struct got_tree_object *tree = NULL;
3434 struct got_object_id *tree_id = NULL;
3435 const struct got_tree_entry *te = NULL;
3436 char *tree_path = NULL, *te_name;
3437 char *ondisk_path = NULL, *path_content = NULL;
3438 struct got_blob_object *blob = NULL;
3440 /* Reverting a staged deletion is a no-op. */
3441 if (status == GOT_STATUS_DELETE &&
3442 staged_status != GOT_STATUS_NO_CHANGE)
3445 if (status == GOT_STATUS_UNVERSIONED)
3446 return (*a->progress_cb)(a->progress_arg,
3447 GOT_STATUS_UNVERSIONED, relpath);
3449 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3451 return got_error(GOT_ERR_BAD_PATH);
3453 /* Construct in-repository path of tree which contains this blob. */
3454 err = got_path_dirname(&parent_path, ie->path);
3456 if (err->code != GOT_ERR_BAD_PATH)
3458 parent_path = strdup("/");
3459 if (parent_path == NULL) {
3460 err = got_error_from_errno("strdup");
3464 if (got_path_is_root_dir(a->worktree->path_prefix)) {
3465 tree_path = strdup(parent_path);
3466 if (tree_path == NULL) {
3467 err = got_error_from_errno("strdup");
3471 if (got_path_is_root_dir(parent_path)) {
3472 tree_path = strdup(a->worktree->path_prefix);
3473 if (tree_path == NULL) {
3474 err = got_error_from_errno("strdup");
3478 if (asprintf(&tree_path, "%s/%s",
3479 a->worktree->path_prefix, parent_path) == -1) {
3480 err = got_error_from_errno("asprintf");
3486 err = got_object_id_by_path(&tree_id, a->repo,
3487 a->worktree->base_commit_id, tree_path);
3489 if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3490 (status == GOT_STATUS_ADD ||
3491 staged_status == GOT_STATUS_ADD)))
3494 err = got_object_open_as_tree(&tree, a->repo, tree_id);
3498 te_name = basename(ie->path);
3499 if (te_name == NULL) {
3500 err = got_error_from_errno2("basename", ie->path);
3504 te = got_object_tree_find_entry(tree, te_name);
3505 if (te == NULL && status != GOT_STATUS_ADD &&
3506 staged_status != GOT_STATUS_ADD) {
3507 err = got_error(GOT_ERR_NO_TREE_ENTRY);
3513 case GOT_STATUS_ADD:
3515 int choice = GOT_PATCH_CHOICE_NONE;
3516 err = (*a->patch_cb)(&choice, a->patch_arg,
3517 status, ie->path, NULL, 1, 1);
3520 if (choice != GOT_PATCH_CHOICE_YES)
3523 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3527 got_fileindex_entry_remove(a->fileindex, ie);
3529 case GOT_STATUS_DELETE:
3531 int choice = GOT_PATCH_CHOICE_NONE;
3532 err = (*a->patch_cb)(&choice, a->patch_arg,
3533 status, ie->path, NULL, 1, 1);
3536 if (choice != GOT_PATCH_CHOICE_YES)
3540 case GOT_STATUS_MODIFY:
3541 case GOT_STATUS_MODE_CHANGE:
3542 case GOT_STATUS_CONFLICT:
3543 case GOT_STATUS_MISSING: {
3544 struct got_object_id id;
3545 if (staged_status == GOT_STATUS_ADD ||
3546 staged_status == GOT_STATUS_MODIFY) {
3547 memcpy(id.sha1, ie->staged_blob_sha1,
3548 SHA1_DIGEST_LENGTH);
3550 memcpy(id.sha1, ie->blob_sha1,
3551 SHA1_DIGEST_LENGTH);
3552 err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3556 if (asprintf(&ondisk_path, "%s/%s",
3557 got_worktree_get_root_path(a->worktree), relpath) == -1) {
3558 err = got_error_from_errno("asprintf");
3562 if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3563 status == GOT_STATUS_CONFLICT)) {
3564 err = create_patched_content(&path_content, 1, &id,
3565 ondisk_path, dirfd, de_name, ie->path, a->repo,
3566 a->patch_cb, a->patch_arg);
3567 if (err || path_content == NULL)
3569 if (rename(path_content, ondisk_path) == -1) {
3570 err = got_error_from_errno3("rename",
3571 path_content, ondisk_path);
3575 err = install_blob(a->worktree, ondisk_path, ie->path,
3576 te ? te->mode : GOT_DEFAULT_FILE_MODE,
3577 got_fileindex_perms_to_st(ie), blob, 0, 1,
3578 a->repo, a->progress_cb, a->progress_arg);
3581 if (status == GOT_STATUS_DELETE ||
3582 status == GOT_STATUS_MODE_CHANGE) {
3583 err = update_blob_fileindex_entry(a->worktree,
3584 a->fileindex, ie, ondisk_path, ie->path,
3601 got_object_blob_close(blob);
3603 got_object_tree_close(tree);
3608 const struct got_error *
3609 got_worktree_revert(struct got_worktree *worktree,
3610 struct got_pathlist_head *paths,
3611 got_worktree_checkout_cb progress_cb, void *progress_arg,
3612 got_worktree_patch_cb patch_cb, void *patch_arg,
3613 struct got_repository *repo)
3615 struct got_fileindex *fileindex = NULL;
3616 char *fileindex_path = NULL;
3617 const struct got_error *err = NULL, *unlockerr = NULL;
3618 const struct got_error *sync_err = NULL;
3619 struct got_pathlist_entry *pe;
3620 struct revert_file_args rfa;
3622 err = lock_worktree(worktree, LOCK_EX);
3626 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3630 rfa.worktree = worktree;
3631 rfa.fileindex = fileindex;
3632 rfa.progress_cb = progress_cb;
3633 rfa.progress_arg = progress_arg;
3634 rfa.patch_cb = patch_cb;
3635 rfa.patch_arg = patch_arg;
3637 TAILQ_FOREACH(pe, paths, entry) {
3638 err = worktree_status(worktree, pe->path, fileindex, repo,
3639 revert_file, &rfa, NULL, NULL, 0, 0);
3643 sync_err = sync_fileindex(fileindex, fileindex_path);
3644 if (sync_err && err == NULL)
3647 free(fileindex_path);
3649 got_fileindex_free(fileindex);
3650 unlockerr = lock_worktree(worktree, LOCK_SH);
3651 if (unlockerr && err == NULL)
3657 free_commitable(struct got_commitable *ct)
3660 free(ct->in_repo_path);
3661 free(ct->ondisk_path);
3663 free(ct->base_blob_id);
3664 free(ct->staged_blob_id);
3665 free(ct->base_commit_id);
3669 struct collect_commitables_arg {
3670 struct got_pathlist_head *commitable_paths;
3671 struct got_repository *repo;
3672 struct got_worktree *worktree;
3673 int have_staged_files;
3676 static const struct got_error *
3677 collect_commitables(void *arg, unsigned char status,
3678 unsigned char staged_status, const char *relpath,
3679 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3680 struct got_object_id *commit_id, int dirfd, const char *de_name)
3682 struct collect_commitables_arg *a = arg;
3683 const struct got_error *err = NULL;
3684 struct got_commitable *ct = NULL;
3685 struct got_pathlist_entry *new = NULL;
3686 char *parent_path = NULL, *path = NULL;
3689 if (a->have_staged_files) {
3690 if (staged_status != GOT_STATUS_MODIFY &&
3691 staged_status != GOT_STATUS_ADD &&
3692 staged_status != GOT_STATUS_DELETE)
3695 if (status == GOT_STATUS_CONFLICT)
3696 return got_error(GOT_ERR_COMMIT_CONFLICT);
3698 if (status != GOT_STATUS_MODIFY &&
3699 status != GOT_STATUS_MODE_CHANGE &&
3700 status != GOT_STATUS_ADD &&
3701 status != GOT_STATUS_DELETE)
3705 if (asprintf(&path, "/%s", relpath) == -1) {
3706 err = got_error_from_errno("asprintf");
3709 if (strcmp(path, "/") == 0) {
3710 parent_path = strdup("");
3711 if (parent_path == NULL)
3712 return got_error_from_errno("strdup");
3714 err = got_path_dirname(&parent_path, path);
3719 ct = calloc(1, sizeof(*ct));
3721 err = got_error_from_errno("calloc");
3725 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3727 err = got_error_from_errno("asprintf");
3730 if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3731 sb.st_mode = GOT_DEFAULT_FILE_MODE;
3734 if (fstatat(dirfd, de_name, &sb,
3735 AT_SYMLINK_NOFOLLOW) == -1) {
3736 err = got_error_from_errno2("fstatat",
3740 } else if (lstat(ct->ondisk_path, &sb) == -1) {
3741 err = got_error_from_errno2("lstat", ct->ondisk_path);
3744 ct->mode = sb.st_mode;
3747 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3748 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3750 err = got_error_from_errno("asprintf");
3754 ct->status = status;
3755 ct->staged_status = staged_status;
3756 ct->blob_id = NULL; /* will be filled in when blob gets created */
3757 if (ct->status != GOT_STATUS_ADD &&
3758 ct->staged_status != GOT_STATUS_ADD) {
3759 ct->base_blob_id = got_object_id_dup(blob_id);
3760 if (ct->base_blob_id == NULL) {
3761 err = got_error_from_errno("got_object_id_dup");
3764 ct->base_commit_id = got_object_id_dup(commit_id);
3765 if (ct->base_commit_id == NULL) {
3766 err = got_error_from_errno("got_object_id_dup");
3770 if (ct->staged_status == GOT_STATUS_ADD ||
3771 ct->staged_status == GOT_STATUS_MODIFY) {
3772 ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3773 if (ct->staged_blob_id == NULL) {
3774 err = got_error_from_errno("got_object_id_dup");
3778 ct->path = strdup(path);
3779 if (ct->path == NULL) {
3780 err = got_error_from_errno("strdup");
3783 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3785 if (ct && (err || new == NULL))
3786 free_commitable(ct);
3792 static const struct got_error *write_tree(struct got_object_id **,
3793 struct got_tree_object *, const char *, struct got_pathlist_head *,
3794 got_worktree_status_cb status_cb, void *status_arg,
3795 struct got_repository *);
3797 static const struct got_error *
3798 write_subtree(struct got_object_id **new_subtree_id,
3799 struct got_tree_entry *te, const char *parent_path,
3800 struct got_pathlist_head *commitable_paths,
3801 got_worktree_status_cb status_cb, void *status_arg,
3802 struct got_repository *repo)
3804 const struct got_error *err = NULL;
3805 struct got_tree_object *subtree;
3808 if (asprintf(&subpath, "%s%s%s", parent_path,
3809 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3810 return got_error_from_errno("asprintf");
3812 err = got_object_open_as_tree(&subtree, repo, &te->id);
3816 err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3817 status_cb, status_arg, repo);
3818 got_object_tree_close(subtree);
3823 static const struct got_error *
3824 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3826 const struct got_error *err = NULL;
3827 char *ct_parent_path = NULL;
3831 if (strchr(ct->in_repo_path, '/') == NULL) {
3832 *match = got_path_is_root_dir(path);
3836 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3839 *match = (strcmp(path, ct_parent_path) == 0);
3840 free(ct_parent_path);
3845 get_ct_file_mode(struct got_commitable *ct)
3847 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3850 static const struct got_error *
3851 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3852 struct got_tree_entry *te, struct got_commitable *ct)
3854 const struct got_error *err = NULL;
3858 err = got_object_tree_entry_dup(new_te, te);
3862 (*new_te)->mode = get_ct_file_mode(ct);
3864 if (ct->staged_status == GOT_STATUS_MODIFY)
3865 memcpy(&(*new_te)->id, ct->staged_blob_id,
3866 sizeof((*new_te)->id));
3868 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3870 if (err && *new_te) {
3877 static const struct got_error *
3878 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3879 struct got_commitable *ct)
3881 const struct got_error *err = NULL;
3886 *new_te = calloc(1, sizeof(**new_te));
3887 if (*new_te == NULL)
3888 return got_error_from_errno("calloc");
3890 ct_name = basename(ct->path);
3891 if (ct_name == NULL) {
3892 err = got_error_from_errno2("basename", ct->path);
3895 if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
3896 sizeof((*new_te)->name)) {
3897 err = got_error(GOT_ERR_NO_SPACE);
3901 (*new_te)->mode = get_ct_file_mode(ct);
3903 if (ct->staged_status == GOT_STATUS_ADD)
3904 memcpy(&(*new_te)->id, ct->staged_blob_id,
3905 sizeof((*new_te)->id));
3907 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3909 if (err && *new_te) {
3916 static const struct got_error *
3917 insert_tree_entry(struct got_tree_entry *new_te,
3918 struct got_pathlist_head *paths)
3920 const struct got_error *err = NULL;
3921 struct got_pathlist_entry *new_pe;
3923 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3927 return got_error(GOT_ERR_TREE_DUP_ENTRY);
3931 static const struct got_error *
3932 report_ct_status(struct got_commitable *ct,
3933 got_worktree_status_cb status_cb, void *status_arg)
3935 const char *ct_path = ct->path;
3936 unsigned char status;
3938 while (ct_path[0] == '/')
3941 if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3942 status = ct->staged_status;
3944 status = ct->status;
3946 return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3947 ct_path, ct->blob_id, NULL, NULL, -1, NULL);
3950 static const struct got_error *
3951 match_modified_subtree(int *modified, struct got_tree_entry *te,
3952 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3954 const struct got_error *err = NULL;
3955 struct got_pathlist_entry *pe;
3960 if (asprintf(&te_path, "%s%s%s", base_tree_path,
3961 got_path_is_root_dir(base_tree_path) ? "" : "/",
3963 return got_error_from_errno("asprintf");
3965 TAILQ_FOREACH(pe, commitable_paths, entry) {
3966 struct got_commitable *ct = pe->data;
3967 *modified = got_path_is_child(ct->in_repo_path, te_path,
3977 static const struct got_error *
3978 match_deleted_or_modified_ct(struct got_commitable **ctp,
3979 struct got_tree_entry *te, const char *base_tree_path,
3980 struct got_pathlist_head *commitable_paths)
3982 const struct got_error *err = NULL;
3983 struct got_pathlist_entry *pe;
3987 TAILQ_FOREACH(pe, commitable_paths, entry) {
3988 struct got_commitable *ct = pe->data;
3989 char *ct_name = NULL;
3992 if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3993 if (ct->status != GOT_STATUS_MODIFY &&
3994 ct->status != GOT_STATUS_MODE_CHANGE &&
3995 ct->status != GOT_STATUS_DELETE)
3998 if (ct->staged_status != GOT_STATUS_MODIFY &&
3999 ct->staged_status != GOT_STATUS_DELETE)
4003 if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
4006 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
4012 ct_name = basename(pe->path);
4013 if (ct_name == NULL)
4014 return got_error_from_errno2("basename", pe->path);
4016 if (strcmp(te->name, ct_name) != 0)
4026 static const struct got_error *
4027 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
4028 const char *child_path, const char *path_base_tree,
4029 struct got_pathlist_head *commitable_paths,
4030 got_worktree_status_cb status_cb, void *status_arg,
4031 struct got_repository *repo)
4033 const struct got_error *err = NULL;
4034 struct got_tree_entry *new_te;
4036 struct got_object_id *id = NULL;
4040 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
4041 got_path_is_root_dir(path_base_tree) ? "" : "/",
4043 return got_error_from_errno("asprintf");
4045 new_te = calloc(1, sizeof(*new_te));
4047 return got_error_from_errno("calloc");
4048 new_te->mode = S_IFDIR;
4050 if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4051 sizeof(new_te->name)) {
4052 err = got_error(GOT_ERR_NO_SPACE);
4055 err = write_tree(&id, NULL, subtree_path,
4056 commitable_paths, status_cb, status_arg, repo);
4061 memcpy(&new_te->id, id, sizeof(new_te->id));
4070 static const struct got_error *
4071 write_tree(struct got_object_id **new_tree_id,
4072 struct got_tree_object *base_tree, const char *path_base_tree,
4073 struct got_pathlist_head *commitable_paths,
4074 got_worktree_status_cb status_cb, void *status_arg,
4075 struct got_repository *repo)
4077 const struct got_error *err = NULL;
4078 struct got_pathlist_head paths;
4079 struct got_tree_entry *te, *new_te = NULL;
4080 struct got_pathlist_entry *pe;
4085 /* Insert, and recurse into, newly added entries first. */
4086 TAILQ_FOREACH(pe, commitable_paths, entry) {
4087 struct got_commitable *ct = pe->data;
4088 char *child_path = NULL, *slash;
4090 if ((ct->status != GOT_STATUS_ADD &&
4091 ct->staged_status != GOT_STATUS_ADD) ||
4092 (ct->flags & GOT_COMMITABLE_ADDED))
4095 if (!got_path_is_child(pe->path, path_base_tree,
4096 strlen(path_base_tree)))
4099 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4104 slash = strchr(child_path, '/');
4105 if (slash == NULL) {
4106 err = alloc_added_blob_tree_entry(&new_te, ct);
4109 err = report_ct_status(ct, status_cb, status_arg);
4112 ct->flags |= GOT_COMMITABLE_ADDED;
4113 err = insert_tree_entry(new_te, &paths);
4118 *slash = '\0'; /* trim trailing path components */
4119 if (base_tree == NULL ||
4120 got_object_tree_find_entry(base_tree, child_path)
4122 err = make_subtree_for_added_blob(&new_te,
4123 child_path, path_base_tree,
4124 commitable_paths, status_cb, status_arg,
4128 err = insert_tree_entry(new_te, &paths);
4137 int i, nbase_entries;
4138 /* Handle modified and deleted entries. */
4139 nbase_entries = got_object_tree_get_nentries(base_tree);
4140 for (i = 0; i < nbase_entries; i++) {
4141 struct got_commitable *ct = NULL;
4143 te = got_object_tree_get_entry(base_tree, i);
4144 if (got_object_tree_entry_is_submodule(te)) {
4145 /* Entry is a submodule; just copy it. */
4146 err = got_object_tree_entry_dup(&new_te, te);
4149 err = insert_tree_entry(new_te, &paths);
4156 if (S_ISDIR(te->mode)) {
4158 err = got_object_tree_entry_dup(&new_te, te);
4161 err = match_modified_subtree(&modified, te,
4162 path_base_tree, commitable_paths);
4165 /* Avoid recursion into unmodified subtrees. */
4167 struct got_object_id *new_id;
4168 err = write_subtree(&new_id, te,
4169 path_base_tree, commitable_paths,
4170 status_cb, status_arg, repo);
4173 memcpy(&new_te->id, new_id,
4174 sizeof(new_te->id));
4177 err = insert_tree_entry(new_te, &paths);
4184 err = match_deleted_or_modified_ct(&ct, te,
4185 path_base_tree, commitable_paths);
4189 /* NB: Deleted entries get dropped here. */
4190 if (ct->status == GOT_STATUS_MODIFY ||
4191 ct->status == GOT_STATUS_MODE_CHANGE ||
4192 ct->staged_status == GOT_STATUS_MODIFY) {
4193 err = alloc_modified_blob_tree_entry(
4197 err = insert_tree_entry(new_te, &paths);
4202 err = report_ct_status(ct, status_cb,
4207 /* Entry is unchanged; just copy it. */
4208 err = got_object_tree_entry_dup(&new_te, te);
4211 err = insert_tree_entry(new_te, &paths);
4219 /* Write new list of entries; deleted entries have been dropped. */
4220 err = got_object_tree_create(new_tree_id, &paths, nentries, repo);
4222 got_pathlist_free(&paths);
4226 static const struct got_error *
4227 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4228 struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4229 int have_staged_files)
4231 const struct got_error *err = NULL;
4232 struct got_pathlist_entry *pe;
4234 TAILQ_FOREACH(pe, commitable_paths, entry) {
4235 struct got_fileindex_entry *ie;
4236 struct got_commitable *ct = pe->data;
4238 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4240 if (ct->status == GOT_STATUS_DELETE ||
4241 ct->staged_status == GOT_STATUS_DELETE) {
4242 got_fileindex_entry_remove(fileindex, ie);
4243 got_fileindex_entry_free(ie);
4244 } else if (ct->staged_status == GOT_STATUS_ADD ||
4245 ct->staged_status == GOT_STATUS_MODIFY) {
4246 got_fileindex_entry_stage_set(ie,
4247 GOT_FILEIDX_STAGE_NONE);
4248 err = got_fileindex_entry_update(ie,
4249 ct->ondisk_path, ct->staged_blob_id->sha1,
4250 new_base_commit_id->sha1,
4251 !have_staged_files);
4253 err = got_fileindex_entry_update(ie,
4254 ct->ondisk_path, ct->blob_id->sha1,
4255 new_base_commit_id->sha1,
4256 !have_staged_files);
4258 err = got_fileindex_entry_alloc(&ie,
4259 ct->ondisk_path, pe->path, ct->blob_id->sha1,
4260 new_base_commit_id->sha1);
4263 err = got_fileindex_entry_add(fileindex, ie);
4272 static const struct got_error *
4273 check_out_of_date(const char *in_repo_path, unsigned char status,
4274 unsigned char staged_status, struct got_object_id *base_blob_id,
4275 struct got_object_id *base_commit_id,
4276 struct got_object_id *head_commit_id, struct got_repository *repo,
4279 const struct got_error *err = NULL;
4280 struct got_object_id *id = NULL;
4282 if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4283 /* Trivial case: base commit == head commit */
4284 if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4287 * Ensure file content which local changes were based
4288 * on matches file content in the branch head.
4290 err = got_object_id_by_path(&id, repo, head_commit_id,
4293 if (err->code == GOT_ERR_NO_TREE_ENTRY)
4294 err = got_error(ood_errcode);
4296 } else if (got_object_id_cmp(id, base_blob_id) != 0)
4297 err = got_error(ood_errcode);
4299 /* Require that added files don't exist in the branch head. */
4300 err = got_object_id_by_path(&id, repo, head_commit_id,
4302 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4304 err = id ? got_error(ood_errcode) : NULL;
4311 const struct got_error *
4312 commit_worktree(struct got_object_id **new_commit_id,
4313 struct got_pathlist_head *commitable_paths,
4314 struct got_object_id *head_commit_id, struct got_worktree *worktree,
4315 const char *author, const char *committer,
4316 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4317 got_worktree_status_cb status_cb, void *status_arg,
4318 struct got_repository *repo)
4320 const struct got_error *err = NULL, *unlockerr = NULL;
4321 struct got_pathlist_entry *pe;
4322 const char *head_ref_name = NULL;
4323 struct got_commit_object *head_commit = NULL;
4324 struct got_reference *head_ref2 = NULL;
4325 struct got_object_id *head_commit_id2 = NULL;
4326 struct got_tree_object *head_tree = NULL;
4327 struct got_object_id *new_tree_id = NULL;
4328 struct got_object_id_queue parent_ids;
4329 struct got_object_qid *pid = NULL;
4330 char *logmsg = NULL;
4332 *new_commit_id = NULL;
4334 SIMPLEQ_INIT(&parent_ids);
4336 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4340 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4344 if (commit_msg_cb != NULL) {
4345 err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4350 if (logmsg == NULL || strlen(logmsg) == 0) {
4351 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4355 /* Create blobs from added and modified files and record their IDs. */
4356 TAILQ_FOREACH(pe, commitable_paths, entry) {
4357 struct got_commitable *ct = pe->data;
4360 /* Blobs for staged files already exist. */
4361 if (ct->staged_status == GOT_STATUS_ADD ||
4362 ct->staged_status == GOT_STATUS_MODIFY)
4365 if (ct->status != GOT_STATUS_ADD &&
4366 ct->status != GOT_STATUS_MODIFY &&
4367 ct->status != GOT_STATUS_MODE_CHANGE)
4370 if (asprintf(&ondisk_path, "%s/%s",
4371 worktree->root_path, pe->path) == -1) {
4372 err = got_error_from_errno("asprintf");
4375 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4381 /* Recursively write new tree objects. */
4382 err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4383 status_cb, status_arg, repo);
4387 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4390 SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4391 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4392 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4393 got_object_qid_free(pid);
4399 /* Check if a concurrent commit to our branch has occurred. */
4400 head_ref_name = got_worktree_get_head_ref_name(worktree);
4401 if (head_ref_name == NULL) {
4402 err = got_error_from_errno("got_worktree_get_head_ref_name");
4405 /* Lock the reference here to prevent concurrent modification. */
4406 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4409 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4412 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4413 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4416 /* Update branch head in repository. */
4417 err = got_ref_change_ref(head_ref2, *new_commit_id);
4420 err = got_ref_write(head_ref2, repo);
4424 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4428 err = ref_base_commit(worktree, repo);
4433 got_object_tree_close(head_tree);
4435 got_object_commit_close(head_commit);
4436 free(head_commit_id2);
4438 unlockerr = got_ref_unlock(head_ref2);
4439 if (unlockerr && err == NULL)
4441 got_ref_close(head_ref2);
4446 static const struct got_error *
4447 check_path_is_commitable(const char *path,
4448 struct got_pathlist_head *commitable_paths)
4450 struct got_pathlist_entry *cpe = NULL;
4451 size_t path_len = strlen(path);
4453 TAILQ_FOREACH(cpe, commitable_paths, entry) {
4454 struct got_commitable *ct = cpe->data;
4455 const char *ct_path = ct->path;
4457 while (ct_path[0] == '/')
4460 if (strcmp(path, ct_path) == 0 ||
4461 got_path_is_child(ct_path, path, path_len))
4466 return got_error_path(path, GOT_ERR_BAD_PATH);
4471 static const struct got_error *
4472 check_staged_file(void *arg, struct got_fileindex_entry *ie)
4474 int *have_staged_files = arg;
4476 if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4477 *have_staged_files = 1;
4478 return got_error(GOT_ERR_CANCELLED);
4484 static const struct got_error *
4485 check_non_staged_files(struct got_fileindex *fileindex,
4486 struct got_pathlist_head *paths)
4488 struct got_pathlist_entry *pe;
4489 struct got_fileindex_entry *ie;
4491 TAILQ_FOREACH(pe, paths, entry) {
4492 if (pe->path[0] == '\0')
4494 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4496 return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4497 if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4498 return got_error_path(pe->path,
4499 GOT_ERR_FILE_NOT_STAGED);
4505 const struct got_error *
4506 got_worktree_commit(struct got_object_id **new_commit_id,
4507 struct got_worktree *worktree, struct got_pathlist_head *paths,
4508 const char *author, const char *committer,
4509 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4510 got_worktree_status_cb status_cb, void *status_arg,
4511 struct got_repository *repo)
4513 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4514 struct got_fileindex *fileindex = NULL;
4515 char *fileindex_path = NULL;
4516 struct got_pathlist_head commitable_paths;
4517 struct collect_commitables_arg cc_arg;
4518 struct got_pathlist_entry *pe;
4519 struct got_reference *head_ref = NULL;
4520 struct got_object_id *head_commit_id = NULL;
4521 int have_staged_files = 0;
4523 *new_commit_id = NULL;
4525 TAILQ_INIT(&commitable_paths);
4527 err = lock_worktree(worktree, LOCK_EX);
4531 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4535 err = got_ref_resolve(&head_commit_id, repo, head_ref);
4539 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4543 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4544 &have_staged_files);
4545 if (err && err->code != GOT_ERR_CANCELLED)
4547 if (have_staged_files) {
4548 err = check_non_staged_files(fileindex, paths);
4553 cc_arg.commitable_paths = &commitable_paths;
4554 cc_arg.worktree = worktree;
4556 cc_arg.have_staged_files = have_staged_files;
4557 TAILQ_FOREACH(pe, paths, entry) {
4558 err = worktree_status(worktree, pe->path, fileindex, repo,
4559 collect_commitables, &cc_arg, NULL, NULL, 0, 0);
4564 if (TAILQ_EMPTY(&commitable_paths)) {
4565 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4569 TAILQ_FOREACH(pe, paths, entry) {
4570 err = check_path_is_commitable(pe->path, &commitable_paths);
4575 TAILQ_FOREACH(pe, &commitable_paths, entry) {
4576 struct got_commitable *ct = pe->data;
4577 const char *ct_path = ct->in_repo_path;
4579 while (ct_path[0] == '/')
4581 err = check_out_of_date(ct_path, ct->status,
4582 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4583 head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4589 err = commit_worktree(new_commit_id, &commitable_paths,
4590 head_commit_id, worktree, author, committer,
4591 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4595 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4596 fileindex, have_staged_files);
4597 sync_err = sync_fileindex(fileindex, fileindex_path);
4598 if (sync_err && err == NULL)
4602 got_fileindex_free(fileindex);
4603 free(fileindex_path);
4604 unlockerr = lock_worktree(worktree, LOCK_SH);
4605 if (unlockerr && err == NULL)
4607 TAILQ_FOREACH(pe, &commitable_paths, entry) {
4608 struct got_commitable *ct = pe->data;
4609 free_commitable(ct);
4611 got_pathlist_free(&commitable_paths);
4616 got_commitable_get_path(struct got_commitable *ct)
4622 got_commitable_get_status(struct got_commitable *ct)
4627 struct check_rebase_ok_arg {
4628 struct got_worktree *worktree;
4629 struct got_repository *repo;
4632 static const struct got_error *
4633 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4635 const struct got_error *err = NULL;
4636 struct check_rebase_ok_arg *a = arg;
4637 unsigned char status;
4641 /* Reject rebase of a work tree with mixed base commits. */
4642 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4643 SHA1_DIGEST_LENGTH))
4644 return got_error(GOT_ERR_MIXED_COMMITS);
4646 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4648 return got_error_from_errno("asprintf");
4650 /* Reject rebase of a work tree with modified or staged files. */
4651 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
4656 if (status != GOT_STATUS_NO_CHANGE)
4657 return got_error(GOT_ERR_MODIFIED);
4658 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4659 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4664 const struct got_error *
4665 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4666 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4667 struct got_worktree *worktree, struct got_reference *branch,
4668 struct got_repository *repo)
4670 const struct got_error *err = NULL;
4671 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4672 char *branch_ref_name = NULL;
4673 char *fileindex_path = NULL;
4674 struct check_rebase_ok_arg ok_arg;
4675 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4677 *new_base_branch_ref = NULL;
4681 err = lock_worktree(worktree, LOCK_EX);
4685 err = open_fileindex(fileindex, &fileindex_path, worktree);
4689 ok_arg.worktree = worktree;
4691 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4696 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4700 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4704 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4708 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4713 err = got_ref_alloc_symref(new_base_branch_ref,
4714 new_base_branch_ref_name, wt_branch);
4717 err = got_ref_write(*new_base_branch_ref, repo);
4721 /* TODO Lock original branch's ref while rebasing? */
4723 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4727 err = got_ref_write(branch_ref, repo);
4731 err = got_ref_alloc(tmp_branch, tmp_branch_name,
4732 worktree->base_commit_id);
4735 err = got_ref_write(*tmp_branch, repo);
4739 err = got_worktree_set_head_ref(worktree, *tmp_branch);
4743 free(fileindex_path);
4744 free(tmp_branch_name);
4745 free(new_base_branch_ref_name);
4746 free(branch_ref_name);
4748 got_ref_close(branch_ref);
4750 got_ref_close(wt_branch);
4752 if (*new_base_branch_ref) {
4753 got_ref_close(*new_base_branch_ref);
4754 *new_base_branch_ref = NULL;
4757 got_ref_close(*tmp_branch);
4761 got_fileindex_free(*fileindex);
4764 lock_worktree(worktree, LOCK_SH);
4769 const struct got_error *
4770 got_worktree_rebase_continue(struct got_object_id **commit_id,
4771 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4772 struct got_reference **branch, struct got_fileindex **fileindex,
4773 struct got_worktree *worktree, struct got_repository *repo)
4775 const struct got_error *err;
4776 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4777 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4778 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4779 char *fileindex_path = NULL;
4780 int have_staged_files = 0;
4783 *new_base_branch = NULL;
4788 err = lock_worktree(worktree, LOCK_EX);
4792 err = open_fileindex(fileindex, &fileindex_path, worktree);
4796 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4797 &have_staged_files);
4798 if (err && err->code != GOT_ERR_CANCELLED)
4800 if (have_staged_files) {
4801 err = got_error(GOT_ERR_STAGED_PATHS);
4805 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4809 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4813 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4817 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4821 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4825 err = got_ref_open(branch, repo,
4826 got_ref_get_symref_target(branch_ref), 0);
4830 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4834 err = got_ref_resolve(commit_id, repo, commit_ref);
4838 err = got_ref_open(new_base_branch, repo,
4839 new_base_branch_ref_name, 0);
4843 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4847 free(commit_ref_name);
4848 free(branch_ref_name);
4849 free(fileindex_path);
4851 got_ref_close(commit_ref);
4853 got_ref_close(branch_ref);
4858 got_ref_close(*tmp_branch);
4861 if (*new_base_branch) {
4862 got_ref_close(*new_base_branch);
4863 *new_base_branch = NULL;
4866 got_ref_close(*branch);
4870 got_fileindex_free(*fileindex);
4873 lock_worktree(worktree, LOCK_SH);
4878 const struct got_error *
4879 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4881 const struct got_error *err;
4882 char *tmp_branch_name = NULL;
4884 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4888 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4889 free(tmp_branch_name);
4893 static const struct got_error *
4894 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4895 char **logmsg, void *arg)
4901 static const struct got_error *
4902 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4903 const char *path, struct got_object_id *blob_id,
4904 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4905 int dirfd, const char *de_name)
4910 struct collect_merged_paths_arg {
4911 got_worktree_checkout_cb progress_cb;
4913 struct got_pathlist_head *merged_paths;
4916 static const struct got_error *
4917 collect_merged_paths(void *arg, unsigned char status, const char *path)
4919 const struct got_error *err;
4920 struct collect_merged_paths_arg *a = arg;
4922 struct got_pathlist_entry *new;
4924 err = (*a->progress_cb)(a->progress_arg, status, path);
4928 if (status != GOT_STATUS_MERGE &&
4929 status != GOT_STATUS_ADD &&
4930 status != GOT_STATUS_DELETE &&
4931 status != GOT_STATUS_CONFLICT)
4936 return got_error_from_errno("strdup");
4938 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4939 if (err || new == NULL)
4945 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4947 struct got_pathlist_entry *pe;
4949 TAILQ_FOREACH(pe, merged_paths, entry)
4950 free((char *)pe->path);
4952 got_pathlist_free(merged_paths);
4955 static const struct got_error *
4956 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4957 struct got_repository *repo)
4959 const struct got_error *err;
4960 struct got_reference *commit_ref = NULL;
4962 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4964 if (err->code != GOT_ERR_NOT_REF)
4966 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4969 err = got_ref_write(commit_ref, repo);
4973 struct got_object_id *stored_id;
4976 err = got_ref_resolve(&stored_id, repo, commit_ref);
4979 cmp = got_object_id_cmp(commit_id, stored_id);
4982 err = got_error(GOT_ERR_REBASE_COMMITID);
4988 got_ref_close(commit_ref);
4992 static const struct got_error *
4993 rebase_merge_files(struct got_pathlist_head *merged_paths,
4994 const char *commit_ref_name, struct got_worktree *worktree,
4995 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4996 struct got_object_id *commit_id, struct got_repository *repo,
4997 got_worktree_checkout_cb progress_cb, void *progress_arg,
4998 got_cancel_cb cancel_cb, void *cancel_arg)
5000 const struct got_error *err;
5001 struct got_reference *commit_ref = NULL;
5002 struct collect_merged_paths_arg cmp_arg;
5003 char *fileindex_path;
5005 /* Work tree is locked/unlocked during rebase preparation/teardown. */
5007 err = get_fileindex_path(&fileindex_path, worktree);
5011 cmp_arg.progress_cb = progress_cb;
5012 cmp_arg.progress_arg = progress_arg;
5013 cmp_arg.merged_paths = merged_paths;
5014 err = merge_files(worktree, fileindex, fileindex_path,
5015 parent_commit_id, commit_id, repo, collect_merged_paths,
5016 &cmp_arg, cancel_cb, cancel_arg);
5018 got_ref_close(commit_ref);
5022 const struct got_error *
5023 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
5024 struct got_worktree *worktree, struct got_fileindex *fileindex,
5025 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5026 struct got_repository *repo,
5027 got_worktree_checkout_cb progress_cb, void *progress_arg,
5028 got_cancel_cb cancel_cb, void *cancel_arg)
5030 const struct got_error *err;
5031 char *commit_ref_name;
5033 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5037 err = store_commit_id(commit_ref_name, commit_id, repo);
5041 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5042 fileindex, parent_commit_id, commit_id, repo, progress_cb,
5043 progress_arg, cancel_cb, cancel_arg);
5045 free(commit_ref_name);
5049 const struct got_error *
5050 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
5051 struct got_worktree *worktree, struct got_fileindex *fileindex,
5052 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5053 struct got_repository *repo,
5054 got_worktree_checkout_cb progress_cb, void *progress_arg,
5055 got_cancel_cb cancel_cb, void *cancel_arg)
5057 const struct got_error *err;
5058 char *commit_ref_name;
5060 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5064 err = store_commit_id(commit_ref_name, commit_id, repo);
5068 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5069 fileindex, parent_commit_id, commit_id, repo, progress_cb,
5070 progress_arg, cancel_cb, cancel_arg);
5072 free(commit_ref_name);
5076 static const struct got_error *
5077 rebase_commit(struct got_object_id **new_commit_id,
5078 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
5079 struct got_worktree *worktree, struct got_fileindex *fileindex,
5080 struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
5081 const char *new_logmsg, struct got_repository *repo)
5083 const struct got_error *err, *sync_err;
5084 struct got_pathlist_head commitable_paths;
5085 struct collect_commitables_arg cc_arg;
5086 char *fileindex_path = NULL;
5087 struct got_reference *head_ref = NULL;
5088 struct got_object_id *head_commit_id = NULL;
5089 char *logmsg = NULL;
5091 TAILQ_INIT(&commitable_paths);
5092 *new_commit_id = NULL;
5094 /* Work tree is locked/unlocked during rebase preparation/teardown. */
5096 err = get_fileindex_path(&fileindex_path, worktree);
5100 cc_arg.commitable_paths = &commitable_paths;
5101 cc_arg.worktree = worktree;
5103 cc_arg.have_staged_files = 0;
5105 * If possible get the status of individual files directly to
5106 * avoid crawling the entire work tree once per rebased commit.
5107 * TODO: Ideally, merged_paths would contain a list of commitables
5108 * we could use so we could skip worktree_status() entirely.
5111 struct got_pathlist_entry *pe;
5112 if (TAILQ_EMPTY(merged_paths)) {
5113 err = got_error(GOT_ERR_NO_MERGED_PATHS);
5116 TAILQ_FOREACH(pe, merged_paths, entry) {
5117 err = worktree_status(worktree, pe->path, fileindex,
5118 repo, collect_commitables, &cc_arg, NULL, NULL, 0,
5124 err = worktree_status(worktree, "", fileindex, repo,
5125 collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5130 if (TAILQ_EMPTY(&commitable_paths)) {
5131 /* No-op change; commit will be elided. */
5132 err = got_ref_delete(commit_ref, repo);
5135 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5139 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5143 err = got_ref_resolve(&head_commit_id, repo, head_ref);
5148 logmsg = strdup(new_logmsg);
5149 if (logmsg == NULL) {
5150 err = got_error_from_errno("strdup");
5154 err = got_object_commit_get_logmsg(&logmsg, orig_commit);
5159 /* NB: commit_worktree will call free(logmsg) */
5160 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
5161 worktree, got_object_commit_get_author(orig_commit),
5162 got_object_commit_get_committer(orig_commit),
5163 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5167 err = got_ref_change_ref(tmp_branch, *new_commit_id);
5171 err = got_ref_delete(commit_ref, repo);
5175 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5177 sync_err = sync_fileindex(fileindex, fileindex_path);
5178 if (sync_err && err == NULL)
5181 free(fileindex_path);
5182 free(head_commit_id);
5184 got_ref_close(head_ref);
5186 free(*new_commit_id);
5187 *new_commit_id = NULL;
5192 const struct got_error *
5193 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5194 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5195 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5196 struct got_commit_object *orig_commit,
5197 struct got_object_id *orig_commit_id, struct got_repository *repo)
5199 const struct got_error *err;
5200 char *commit_ref_name;
5201 struct got_reference *commit_ref = NULL;
5202 struct got_object_id *commit_id = NULL;
5204 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5208 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5211 err = got_ref_resolve(&commit_id, repo, commit_ref);
5214 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5215 err = got_error(GOT_ERR_REBASE_COMMITID);
5219 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5220 worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5223 got_ref_close(commit_ref);
5224 free(commit_ref_name);
5229 const struct got_error *
5230 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5231 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5232 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5233 struct got_commit_object *orig_commit,
5234 struct got_object_id *orig_commit_id, const char *new_logmsg,
5235 struct got_repository *repo)
5237 const struct got_error *err;
5238 char *commit_ref_name;
5239 struct got_reference *commit_ref = NULL;
5240 struct got_object_id *commit_id = NULL;
5242 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5246 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5249 err = got_ref_resolve(&commit_id, repo, commit_ref);
5252 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5253 err = got_error(GOT_ERR_HISTEDIT_COMMITID);
5257 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5258 worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5261 got_ref_close(commit_ref);
5262 free(commit_ref_name);
5267 const struct got_error *
5268 got_worktree_rebase_postpone(struct got_worktree *worktree,
5269 struct got_fileindex *fileindex)
5272 got_fileindex_free(fileindex);
5273 return lock_worktree(worktree, LOCK_SH);
5276 static const struct got_error *
5277 delete_ref(const char *name, struct got_repository *repo)
5279 const struct got_error *err;
5280 struct got_reference *ref;
5282 err = got_ref_open(&ref, repo, name, 0);
5284 if (err->code == GOT_ERR_NOT_REF)
5289 err = got_ref_delete(ref, repo);
5294 static const struct got_error *
5295 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5297 const struct got_error *err;
5298 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5299 char *branch_ref_name = NULL, *commit_ref_name = NULL;
5301 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5304 err = delete_ref(tmp_branch_name, repo);
5308 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5311 err = delete_ref(new_base_branch_ref_name, repo);
5315 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5318 err = delete_ref(branch_ref_name, repo);
5322 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5325 err = delete_ref(commit_ref_name, repo);
5330 free(tmp_branch_name);
5331 free(new_base_branch_ref_name);
5332 free(branch_ref_name);
5333 free(commit_ref_name);
5337 const struct got_error *
5338 got_worktree_rebase_complete(struct got_worktree *worktree,
5339 struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5340 struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5341 struct got_repository *repo)
5343 const struct got_error *err, *unlockerr;
5344 struct got_object_id *new_head_commit_id = NULL;
5346 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5350 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5354 err = got_ref_write(rebased_branch, repo);
5358 err = got_worktree_set_head_ref(worktree, rebased_branch);
5362 err = delete_rebase_refs(worktree, repo);
5365 got_fileindex_free(fileindex);
5366 free(new_head_commit_id);
5367 unlockerr = lock_worktree(worktree, LOCK_SH);
5368 if (unlockerr && err == NULL)
5373 const struct got_error *
5374 got_worktree_rebase_abort(struct got_worktree *worktree,
5375 struct got_fileindex *fileindex, struct got_repository *repo,
5376 struct got_reference *new_base_branch,
5377 got_worktree_checkout_cb progress_cb, void *progress_arg)
5379 const struct got_error *err, *unlockerr, *sync_err;
5380 struct got_reference *resolved = NULL;
5381 struct got_object_id *commit_id = NULL;
5382 char *fileindex_path = NULL;
5383 struct revert_file_args rfa;
5384 struct got_object_id *tree_id = NULL;
5386 err = lock_worktree(worktree, LOCK_EX);
5390 err = got_ref_open(&resolved, repo,
5391 got_ref_get_symref_target(new_base_branch), 0);
5395 err = got_worktree_set_head_ref(worktree, resolved);
5400 * XXX commits to the base branch could have happened while
5401 * we were busy rebasing; should we store the original commit ID
5402 * when rebase begins and read it back here?
5404 err = got_ref_resolve(&commit_id, repo, resolved);
5408 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5412 err = got_object_id_by_path(&tree_id, repo,
5413 worktree->base_commit_id, worktree->path_prefix);
5417 err = delete_rebase_refs(worktree, repo);
5421 err = get_fileindex_path(&fileindex_path, worktree);
5425 rfa.worktree = worktree;
5426 rfa.fileindex = fileindex;
5427 rfa.progress_cb = progress_cb;
5428 rfa.progress_arg = progress_arg;
5429 rfa.patch_cb = NULL;
5430 rfa.patch_arg = NULL;
5432 err = worktree_status(worktree, "", fileindex, repo,
5433 revert_file, &rfa, NULL, NULL, 0, 0);
5437 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5438 repo, progress_cb, progress_arg, NULL, NULL);
5440 sync_err = sync_fileindex(fileindex, fileindex_path);
5441 if (sync_err && err == NULL)
5444 got_ref_close(resolved);
5448 got_fileindex_free(fileindex);
5449 free(fileindex_path);
5451 unlockerr = lock_worktree(worktree, LOCK_SH);
5452 if (unlockerr && err == NULL)
5457 const struct got_error *
5458 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5459 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5460 struct got_fileindex **fileindex, struct got_worktree *worktree,
5461 struct got_repository *repo)
5463 const struct got_error *err = NULL;
5464 char *tmp_branch_name = NULL;
5465 char *branch_ref_name = NULL;
5466 char *base_commit_ref_name = NULL;
5467 char *fileindex_path = NULL;
5468 struct check_rebase_ok_arg ok_arg;
5469 struct got_reference *wt_branch = NULL;
5470 struct got_reference *base_commit_ref = NULL;
5474 *base_commit_id = NULL;
5477 err = lock_worktree(worktree, LOCK_EX);
5481 err = open_fileindex(fileindex, &fileindex_path, worktree);
5485 ok_arg.worktree = worktree;
5487 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5492 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5496 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5500 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5505 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5510 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5514 err = got_ref_write(*branch_ref, repo);
5518 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5519 worktree->base_commit_id);
5522 err = got_ref_write(base_commit_ref, repo);
5525 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5526 if (*base_commit_id == NULL) {
5527 err = got_error_from_errno("got_object_id_dup");
5531 err = got_ref_alloc(tmp_branch, tmp_branch_name,
5532 worktree->base_commit_id);
5535 err = got_ref_write(*tmp_branch, repo);
5539 err = got_worktree_set_head_ref(worktree, *tmp_branch);
5543 free(fileindex_path);
5544 free(tmp_branch_name);
5545 free(branch_ref_name);
5546 free(base_commit_ref_name);
5548 got_ref_close(wt_branch);
5551 got_ref_close(*branch_ref);
5555 got_ref_close(*tmp_branch);
5558 free(*base_commit_id);
5560 got_fileindex_free(*fileindex);
5563 lock_worktree(worktree, LOCK_SH);
5568 const struct got_error *
5569 got_worktree_histedit_postpone(struct got_worktree *worktree,
5570 struct got_fileindex *fileindex)
5573 got_fileindex_free(fileindex);
5574 return lock_worktree(worktree, LOCK_SH);
5577 const struct got_error *
5578 got_worktree_histedit_in_progress(int *in_progress,
5579 struct got_worktree *worktree)
5581 const struct got_error *err;
5582 char *tmp_branch_name = NULL;
5584 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5588 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5589 free(tmp_branch_name);
5593 const struct got_error *
5594 got_worktree_histedit_continue(struct got_object_id **commit_id,
5595 struct got_reference **tmp_branch, struct got_reference **branch_ref,
5596 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5597 struct got_worktree *worktree, struct got_repository *repo)
5599 const struct got_error *err;
5600 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5601 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5602 struct got_reference *commit_ref = NULL;
5603 struct got_reference *base_commit_ref = NULL;
5604 char *fileindex_path = NULL;
5605 int have_staged_files = 0;
5609 *base_commit_id = NULL;
5612 err = lock_worktree(worktree, LOCK_EX);
5616 err = open_fileindex(fileindex, &fileindex_path, worktree);
5620 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5621 &have_staged_files);
5622 if (err && err->code != GOT_ERR_CANCELLED)
5624 if (have_staged_files) {
5625 err = got_error(GOT_ERR_STAGED_PATHS);
5629 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5633 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5637 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5641 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5646 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5650 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5653 err = got_ref_resolve(commit_id, repo, commit_ref);
5657 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5660 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5664 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5668 free(commit_ref_name);
5669 free(branch_ref_name);
5670 free(fileindex_path);
5672 got_ref_close(commit_ref);
5673 if (base_commit_ref)
5674 got_ref_close(base_commit_ref);
5678 free(*base_commit_id);
5679 *base_commit_id = NULL;
5681 got_ref_close(*tmp_branch);
5685 got_fileindex_free(*fileindex);
5688 lock_worktree(worktree, LOCK_EX);
5693 static const struct got_error *
5694 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5696 const struct got_error *err;
5697 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5698 char *branch_ref_name = NULL, *commit_ref_name = NULL;
5700 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5703 err = delete_ref(tmp_branch_name, repo);
5707 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5711 err = delete_ref(base_commit_ref_name, repo);
5715 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5718 err = delete_ref(branch_ref_name, repo);
5722 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5725 err = delete_ref(commit_ref_name, repo);
5729 free(tmp_branch_name);
5730 free(base_commit_ref_name);
5731 free(branch_ref_name);
5732 free(commit_ref_name);
5736 const struct got_error *
5737 got_worktree_histedit_abort(struct got_worktree *worktree,
5738 struct got_fileindex *fileindex, struct got_repository *repo,
5739 struct got_reference *branch, struct got_object_id *base_commit_id,
5740 got_worktree_checkout_cb progress_cb, void *progress_arg)
5742 const struct got_error *err, *unlockerr, *sync_err;
5743 struct got_reference *resolved = NULL;
5744 char *fileindex_path = NULL;
5745 struct got_object_id *tree_id = NULL;
5746 struct revert_file_args rfa;
5748 err = lock_worktree(worktree, LOCK_EX);
5752 err = got_ref_open(&resolved, repo,
5753 got_ref_get_symref_target(branch), 0);
5757 err = got_worktree_set_head_ref(worktree, resolved);
5761 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5765 err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5766 worktree->path_prefix);
5770 err = delete_histedit_refs(worktree, repo);
5774 err = get_fileindex_path(&fileindex_path, worktree);
5778 rfa.worktree = worktree;
5779 rfa.fileindex = fileindex;
5780 rfa.progress_cb = progress_cb;
5781 rfa.progress_arg = progress_arg;
5782 rfa.patch_cb = NULL;
5783 rfa.patch_arg = NULL;
5785 err = worktree_status(worktree, "", fileindex, repo,
5786 revert_file, &rfa, NULL, NULL, 0, 0);
5790 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5791 repo, progress_cb, progress_arg, NULL, NULL);
5793 sync_err = sync_fileindex(fileindex, fileindex_path);
5794 if (sync_err && err == NULL)
5797 got_ref_close(resolved);
5799 free(fileindex_path);
5801 unlockerr = lock_worktree(worktree, LOCK_SH);
5802 if (unlockerr && err == NULL)
5807 const struct got_error *
5808 got_worktree_histedit_complete(struct got_worktree *worktree,
5809 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5810 struct got_reference *edited_branch, struct got_repository *repo)
5812 const struct got_error *err, *unlockerr;
5813 struct got_object_id *new_head_commit_id = NULL;
5814 struct got_reference *resolved = NULL;
5816 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5820 err = got_ref_open(&resolved, repo,
5821 got_ref_get_symref_target(edited_branch), 0);
5825 err = got_ref_change_ref(resolved, new_head_commit_id);
5829 err = got_ref_write(resolved, repo);
5833 err = got_worktree_set_head_ref(worktree, resolved);
5837 err = delete_histedit_refs(worktree, repo);
5840 got_fileindex_free(fileindex);
5841 free(new_head_commit_id);
5842 unlockerr = lock_worktree(worktree, LOCK_SH);
5843 if (unlockerr && err == NULL)
5848 const struct got_error *
5849 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5850 struct got_object_id *commit_id, struct got_repository *repo)
5852 const struct got_error *err;
5853 char *commit_ref_name;
5855 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5859 err = store_commit_id(commit_ref_name, commit_id, repo);
5863 err = delete_ref(commit_ref_name, repo);
5865 free(commit_ref_name);
5869 const struct got_error *
5870 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
5871 struct got_reference **branch_ref, struct got_reference **base_branch_ref,
5872 struct got_worktree *worktree, const char *refname,
5873 struct got_repository *repo)
5875 const struct got_error *err = NULL;
5876 char *fileindex_path = NULL;
5877 struct check_rebase_ok_arg ok_arg;
5881 *base_branch_ref = NULL;
5883 err = lock_worktree(worktree, LOCK_EX);
5887 if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
5888 err = got_error_msg(GOT_ERR_SAME_BRANCH,
5889 "cannot integrate a branch into itself; "
5890 "update -b or different branch name required");
5894 err = open_fileindex(fileindex, &fileindex_path, worktree);
5898 /* Preconditions are the same as for rebase. */
5899 ok_arg.worktree = worktree;
5901 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5906 err = got_ref_open(branch_ref, repo, refname, 1);
5910 err = got_ref_open(base_branch_ref, repo,
5911 got_worktree_get_head_ref_name(worktree), 1);
5915 got_ref_close(*branch_ref);
5918 if (*base_branch_ref) {
5919 got_ref_close(*base_branch_ref);
5920 *base_branch_ref = NULL;
5923 got_fileindex_free(*fileindex);
5926 lock_worktree(worktree, LOCK_SH);
5931 const struct got_error *
5932 got_worktree_integrate_continue(struct got_worktree *worktree,
5933 struct got_fileindex *fileindex, struct got_repository *repo,
5934 struct got_reference *branch_ref, struct got_reference *base_branch_ref,
5935 got_worktree_checkout_cb progress_cb, void *progress_arg,
5936 got_cancel_cb cancel_cb, void *cancel_arg)
5938 const struct got_error *err = NULL, *sync_err, *unlockerr;
5939 char *fileindex_path = NULL;
5940 struct got_object_id *tree_id = NULL, *commit_id = NULL;
5942 err = get_fileindex_path(&fileindex_path, worktree);
5946 err = got_ref_resolve(&commit_id, repo, branch_ref);
5950 err = got_object_id_by_path(&tree_id, repo, commit_id,
5951 worktree->path_prefix);
5955 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5959 err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
5960 progress_cb, progress_arg, cancel_cb, cancel_arg);
5964 err = got_ref_change_ref(base_branch_ref, commit_id);
5968 err = got_ref_write(base_branch_ref, repo);
5970 sync_err = sync_fileindex(fileindex, fileindex_path);
5971 if (sync_err && err == NULL)
5975 unlockerr = got_ref_unlock(branch_ref);
5976 if (unlockerr && err == NULL)
5978 got_ref_close(branch_ref);
5980 unlockerr = got_ref_unlock(base_branch_ref);
5981 if (unlockerr && err == NULL)
5983 got_ref_close(base_branch_ref);
5985 got_fileindex_free(fileindex);
5986 free(fileindex_path);
5989 unlockerr = lock_worktree(worktree, LOCK_SH);
5990 if (unlockerr && err == NULL)
5995 const struct got_error *
5996 got_worktree_integrate_abort(struct got_worktree *worktree,
5997 struct got_fileindex *fileindex, struct got_repository *repo,
5998 struct got_reference *branch_ref, struct got_reference *base_branch_ref)
6000 const struct got_error *err = NULL, *unlockerr = NULL;
6002 got_fileindex_free(fileindex);
6004 err = lock_worktree(worktree, LOCK_SH);
6006 unlockerr = got_ref_unlock(branch_ref);
6007 if (unlockerr && err == NULL)
6009 got_ref_close(branch_ref);
6011 unlockerr = got_ref_unlock(base_branch_ref);
6012 if (unlockerr && err == NULL)
6014 got_ref_close(base_branch_ref);
6019 struct check_stage_ok_arg {
6020 struct got_object_id *head_commit_id;
6021 struct got_worktree *worktree;
6022 struct got_fileindex *fileindex;
6023 struct got_repository *repo;
6027 const struct got_error *
6028 check_stage_ok(void *arg, unsigned char status,
6029 unsigned char staged_status, const char *relpath,
6030 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6031 struct got_object_id *commit_id, int dirfd, const char *de_name)
6033 struct check_stage_ok_arg *a = arg;
6034 const struct got_error *err = NULL;
6035 struct got_fileindex_entry *ie;
6036 struct got_object_id base_commit_id;
6037 struct got_object_id *base_commit_idp = NULL;
6038 char *in_repo_path = NULL, *p;
6040 if (status == GOT_STATUS_UNVERSIONED ||
6041 status == GOT_STATUS_NO_CHANGE)
6043 if (status == GOT_STATUS_NONEXISTENT)
6044 return got_error_set_errno(ENOENT, relpath);
6046 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6048 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6050 if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
6051 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
6053 return got_error_from_errno("asprintf");
6055 if (got_fileindex_entry_has_commit(ie)) {
6056 memcpy(base_commit_id.sha1, ie->commit_sha1,
6057 SHA1_DIGEST_LENGTH);
6058 base_commit_idp = &base_commit_id;
6061 if (status == GOT_STATUS_CONFLICT) {
6062 err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
6064 } else if (status != GOT_STATUS_ADD &&
6065 status != GOT_STATUS_MODIFY &&
6066 status != GOT_STATUS_DELETE) {
6067 err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
6071 a->have_changes = 1;
6076 err = check_out_of_date(p, status, staged_status,
6077 blob_id, base_commit_idp, a->head_commit_id, a->repo,
6078 GOT_ERR_STAGE_OUT_OF_DATE);
6084 struct stage_path_arg {
6085 struct got_worktree *worktree;
6086 struct got_fileindex *fileindex;
6087 struct got_repository *repo;
6088 got_worktree_status_cb status_cb;
6090 got_worktree_patch_cb patch_cb;
6092 int staged_something;
6095 static const struct got_error *
6096 stage_path(void *arg, unsigned char status,
6097 unsigned char staged_status, const char *relpath,
6098 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6099 struct got_object_id *commit_id, int dirfd, const char *de_name)
6101 struct stage_path_arg *a = arg;
6102 const struct got_error *err = NULL;
6103 struct got_fileindex_entry *ie;
6104 char *ondisk_path = NULL, *path_content = NULL;
6106 struct got_object_id *new_staged_blob_id = NULL;
6108 if (status == GOT_STATUS_UNVERSIONED)
6111 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6113 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6115 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
6117 return got_error_from_errno("asprintf");
6120 case GOT_STATUS_ADD:
6121 case GOT_STATUS_MODIFY:
6123 if (status == GOT_STATUS_ADD) {
6124 int choice = GOT_PATCH_CHOICE_NONE;
6125 err = (*a->patch_cb)(&choice, a->patch_arg,
6126 status, ie->path, NULL, 1, 1);
6129 if (choice != GOT_PATCH_CHOICE_YES)
6132 err = create_patched_content(&path_content, 0,
6133 staged_blob_id ? staged_blob_id : blob_id,
6134 ondisk_path, dirfd, de_name, ie->path,
6135 a->repo, a->patch_cb, a->patch_arg);
6136 if (err || path_content == NULL)
6140 err = got_object_blob_create(&new_staged_blob_id,
6141 path_content ? path_content : ondisk_path, a->repo);
6144 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
6145 SHA1_DIGEST_LENGTH);
6146 if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
6147 stage = GOT_FILEIDX_STAGE_ADD;
6149 stage = GOT_FILEIDX_STAGE_MODIFY;
6150 got_fileindex_entry_stage_set(ie, stage);
6151 a->staged_something = 1;
6152 if (a->status_cb == NULL)
6154 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6155 get_staged_status(ie), relpath, blob_id,
6156 new_staged_blob_id, NULL, dirfd, de_name);
6158 case GOT_STATUS_DELETE:
6159 if (staged_status == GOT_STATUS_DELETE)
6162 int choice = GOT_PATCH_CHOICE_NONE;
6163 err = (*a->patch_cb)(&choice, a->patch_arg, status,
6164 ie->path, NULL, 1, 1);
6167 if (choice == GOT_PATCH_CHOICE_NO)
6169 if (choice != GOT_PATCH_CHOICE_YES) {
6170 err = got_error(GOT_ERR_PATCH_CHOICE);
6174 stage = GOT_FILEIDX_STAGE_DELETE;
6175 got_fileindex_entry_stage_set(ie, stage);
6176 a->staged_something = 1;
6177 if (a->status_cb == NULL)
6179 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6180 get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
6183 case GOT_STATUS_NO_CHANGE:
6185 case GOT_STATUS_CONFLICT:
6186 err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6188 case GOT_STATUS_NONEXISTENT:
6189 err = got_error_set_errno(ENOENT, relpath);
6192 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6196 if (path_content && unlink(path_content) == -1 && err == NULL)
6197 err = got_error_from_errno2("unlink", path_content);
6200 free(new_staged_blob_id);
6204 const struct got_error *
6205 got_worktree_stage(struct got_worktree *worktree,
6206 struct got_pathlist_head *paths,
6207 got_worktree_status_cb status_cb, void *status_arg,
6208 got_worktree_patch_cb patch_cb, void *patch_arg,
6209 struct got_repository *repo)
6211 const struct got_error *err = NULL, *sync_err, *unlockerr;
6212 struct got_pathlist_entry *pe;
6213 struct got_fileindex *fileindex = NULL;
6214 char *fileindex_path = NULL;
6215 struct got_reference *head_ref = NULL;
6216 struct got_object_id *head_commit_id = NULL;
6217 struct check_stage_ok_arg oka;
6218 struct stage_path_arg spa;
6220 err = lock_worktree(worktree, LOCK_EX);
6224 err = got_ref_open(&head_ref, repo,
6225 got_worktree_get_head_ref_name(worktree), 0);
6228 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6231 err = open_fileindex(&fileindex, &fileindex_path, worktree);
6235 /* Check pre-conditions before staging anything. */
6236 oka.head_commit_id = head_commit_id;
6237 oka.worktree = worktree;
6238 oka.fileindex = fileindex;
6240 oka.have_changes = 0;
6241 TAILQ_FOREACH(pe, paths, entry) {
6242 err = worktree_status(worktree, pe->path, fileindex, repo,
6243 check_stage_ok, &oka, NULL, NULL, 0, 0);
6247 if (!oka.have_changes) {
6248 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6252 spa.worktree = worktree;
6253 spa.fileindex = fileindex;
6255 spa.patch_cb = patch_cb;
6256 spa.patch_arg = patch_arg;
6257 spa.status_cb = status_cb;
6258 spa.status_arg = status_arg;
6259 spa.staged_something = 0;
6260 TAILQ_FOREACH(pe, paths, entry) {
6261 err = worktree_status(worktree, pe->path, fileindex, repo,
6262 stage_path, &spa, NULL, NULL, 0, 0);
6266 if (!spa.staged_something) {
6267 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6271 sync_err = sync_fileindex(fileindex, fileindex_path);
6272 if (sync_err && err == NULL)
6276 got_ref_close(head_ref);
6277 free(head_commit_id);
6278 free(fileindex_path);
6280 got_fileindex_free(fileindex);
6281 unlockerr = lock_worktree(worktree, LOCK_SH);
6282 if (unlockerr && err == NULL)
6287 struct unstage_path_arg {
6288 struct got_worktree *worktree;
6289 struct got_fileindex *fileindex;
6290 struct got_repository *repo;
6291 got_worktree_checkout_cb progress_cb;
6293 got_worktree_patch_cb patch_cb;
6297 static const struct got_error *
6298 create_unstaged_content(char **path_unstaged_content,
6299 char **path_new_staged_content, struct got_object_id *blob_id,
6300 struct got_object_id *staged_blob_id, const char *relpath,
6301 struct got_repository *repo,
6302 got_worktree_patch_cb patch_cb, void *patch_arg)
6304 const struct got_error *err;
6305 struct got_blob_object *blob = NULL, *staged_blob = NULL;
6306 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6307 char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6308 struct stat sb1, sb2;
6309 struct got_diff_changes *changes = NULL;
6310 struct got_diff_state *ds = NULL;
6311 struct got_diff_args *args = NULL;
6312 struct got_diff_change *change;
6313 int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6314 int have_content = 0, have_rejected_content = 0;
6316 *path_unstaged_content = NULL;
6317 *path_new_staged_content = NULL;
6319 err = got_object_id_str(&label1, blob_id);
6322 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6326 err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6330 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6334 err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6338 err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6342 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6346 if (stat(path1, &sb1) == -1) {
6347 err = got_error_from_errno2("stat", path1);
6351 if (stat(path2, &sb2) == -1) {
6352 err = got_error_from_errno2("stat", path2);
6356 err = got_diff_files(&changes, &ds, &args, &diff_flags,
6357 f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6361 err = got_opentemp_named(path_unstaged_content, &outfile,
6362 "got-unstaged-content");
6365 err = got_opentemp_named(path_new_staged_content, &rejectfile,
6366 "got-new-staged-content");
6370 if (fseek(f1, 0L, SEEK_SET) == -1) {
6371 err = got_ferror(f1, GOT_ERR_IO);
6374 if (fseek(f2, 0L, SEEK_SET) == -1) {
6375 err = got_ferror(f2, GOT_ERR_IO);
6378 SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6380 err = apply_or_reject_change(&choice, change, ++n,
6381 changes->nchanges, ds, args, diff_flags, relpath,
6382 f1, f2, &line_cur1, &line_cur2,
6383 outfile, rejectfile, patch_cb, patch_arg);
6386 if (choice == GOT_PATCH_CHOICE_YES)
6389 have_rejected_content = 1;
6390 if (choice == GOT_PATCH_CHOICE_QUIT)
6393 if (have_content || have_rejected_content)
6394 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6395 outfile, rejectfile);
6399 got_object_blob_close(blob);
6401 got_object_blob_close(staged_blob);
6402 if (f1 && fclose(f1) == EOF && err == NULL)
6403 err = got_error_from_errno2("fclose", path1);
6404 if (f2 && fclose(f2) == EOF && err == NULL)
6405 err = got_error_from_errno2("fclose", path2);
6406 if (outfile && fclose(outfile) == EOF && err == NULL)
6407 err = got_error_from_errno2("fclose", *path_unstaged_content);
6408 if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6409 err = got_error_from_errno2("fclose", *path_new_staged_content);
6410 if (path1 && unlink(path1) == -1 && err == NULL)
6411 err = got_error_from_errno2("unlink", path1);
6412 if (path2 && unlink(path2) == -1 && err == NULL)
6413 err = got_error_from_errno2("unlink", path2);
6414 if (err || !have_content) {
6415 if (*path_unstaged_content &&
6416 unlink(*path_unstaged_content) == -1 && err == NULL)
6417 err = got_error_from_errno2("unlink",
6418 *path_unstaged_content);
6419 free(*path_unstaged_content);
6420 *path_unstaged_content = NULL;
6422 if (err || !have_rejected_content) {
6423 if (*path_new_staged_content &&
6424 unlink(*path_new_staged_content) == -1 && err == NULL)
6425 err = got_error_from_errno2("unlink",
6426 *path_new_staged_content);
6427 free(*path_new_staged_content);
6428 *path_new_staged_content = NULL;
6432 got_diff_state_free(ds);
6436 got_diff_free_changes(changes);
6442 static const struct got_error *
6443 unstage_path(void *arg, unsigned char status,
6444 unsigned char staged_status, const char *relpath,
6445 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6446 struct got_object_id *commit_id, int dirfd, const char *de_name)
6448 const struct got_error *err = NULL;
6449 struct unstage_path_arg *a = arg;
6450 struct got_fileindex_entry *ie;
6451 struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6452 char *ondisk_path = NULL, *path_unstaged_content = NULL;
6453 char *path_new_staged_content = NULL;
6454 char *id_str = NULL, *label_orig = NULL;
6455 int local_changes_subsumed;
6458 if (staged_status != GOT_STATUS_ADD &&
6459 staged_status != GOT_STATUS_MODIFY &&
6460 staged_status != GOT_STATUS_DELETE)
6463 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6465 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6467 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6469 return got_error_from_errno("asprintf");
6471 err = got_object_id_str(&id_str,
6472 commit_id ? commit_id : a->worktree->base_commit_id);
6475 if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
6477 err = got_error_from_errno("asprintf");
6481 switch (staged_status) {
6482 case GOT_STATUS_MODIFY:
6483 err = got_object_open_as_blob(&blob_base, a->repo,
6488 case GOT_STATUS_ADD:
6490 if (staged_status == GOT_STATUS_ADD) {
6491 int choice = GOT_PATCH_CHOICE_NONE;
6492 err = (*a->patch_cb)(&choice, a->patch_arg,
6493 staged_status, ie->path, NULL, 1, 1);
6496 if (choice != GOT_PATCH_CHOICE_YES)
6499 err = create_unstaged_content(
6500 &path_unstaged_content,
6501 &path_new_staged_content, blob_id,
6502 staged_blob_id, ie->path, a->repo,
6503 a->patch_cb, a->patch_arg);
6504 if (err || path_unstaged_content == NULL)
6506 if (path_new_staged_content) {
6507 err = got_object_blob_create(
6509 path_new_staged_content,
6513 memcpy(ie->staged_blob_sha1,
6514 staged_blob_id->sha1,
6515 SHA1_DIGEST_LENGTH);
6517 err = merge_file(&local_changes_subsumed,
6518 a->worktree, blob_base, ondisk_path,
6519 relpath, got_fileindex_perms_to_st(ie),
6520 path_unstaged_content, label_orig,
6521 "unstaged", a->repo, a->progress_cb,
6524 path_new_staged_content == NULL)
6525 got_fileindex_entry_stage_set(ie,
6526 GOT_FILEIDX_STAGE_NONE);
6527 break; /* Done with this file. */
6530 err = got_object_open_as_blob(&blob_staged, a->repo,
6531 staged_blob_id, 8192);
6534 err = merge_blob(&local_changes_subsumed, a->worktree,
6535 blob_base, ondisk_path, relpath,
6536 got_fileindex_perms_to_st(ie), label_orig, blob_staged,
6537 commit_id ? commit_id : a->worktree->base_commit_id,
6538 a->repo, a->progress_cb, a->progress_arg);
6540 got_fileindex_entry_stage_set(ie,
6541 GOT_FILEIDX_STAGE_NONE);
6543 case GOT_STATUS_DELETE:
6545 int choice = GOT_PATCH_CHOICE_NONE;
6546 err = (*a->patch_cb)(&choice, a->patch_arg,
6547 staged_status, ie->path, NULL, 1, 1);
6550 if (choice == GOT_PATCH_CHOICE_NO)
6552 if (choice != GOT_PATCH_CHOICE_YES) {
6553 err = got_error(GOT_ERR_PATCH_CHOICE);
6557 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6558 err = get_file_status(&status, &sb, ie, ondisk_path,
6559 dirfd, de_name, a->repo);
6562 err = (*a->progress_cb)(a->progress_arg, status, relpath);
6567 if (path_unstaged_content &&
6568 unlink(path_unstaged_content) == -1 && err == NULL)
6569 err = got_error_from_errno2("unlink", path_unstaged_content);
6570 if (path_new_staged_content &&
6571 unlink(path_new_staged_content) == -1 && err == NULL)
6572 err = got_error_from_errno2("unlink", path_new_staged_content);
6573 free(path_unstaged_content);
6574 free(path_new_staged_content);
6576 got_object_blob_close(blob_base);
6578 got_object_blob_close(blob_staged);
6584 const struct got_error *
6585 got_worktree_unstage(struct got_worktree *worktree,
6586 struct got_pathlist_head *paths,
6587 got_worktree_checkout_cb progress_cb, void *progress_arg,
6588 got_worktree_patch_cb patch_cb, void *patch_arg,
6589 struct got_repository *repo)
6591 const struct got_error *err = NULL, *sync_err, *unlockerr;
6592 struct got_pathlist_entry *pe;
6593 struct got_fileindex *fileindex = NULL;
6594 char *fileindex_path = NULL;
6595 struct unstage_path_arg upa;
6597 err = lock_worktree(worktree, LOCK_EX);
6601 err = open_fileindex(&fileindex, &fileindex_path, worktree);
6605 upa.worktree = worktree;
6606 upa.fileindex = fileindex;
6608 upa.progress_cb = progress_cb;
6609 upa.progress_arg = progress_arg;
6610 upa.patch_cb = patch_cb;
6611 upa.patch_arg = patch_arg;
6612 TAILQ_FOREACH(pe, paths, entry) {
6613 err = worktree_status(worktree, pe->path, fileindex, repo,
6614 unstage_path, &upa, NULL, NULL, 0, 0);
6619 sync_err = sync_fileindex(fileindex, fileindex_path);
6620 if (sync_err && err == NULL)
6623 free(fileindex_path);
6625 got_fileindex_free(fileindex);
6626 unlockerr = lock_worktree(worktree, LOCK_SH);
6627 if (unlockerr && err == NULL)