2 * Copyright (c) 2018, 2019, 2020 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, mode_t te_mode, mode_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;
1746 struct timespec timeout;
1748 err = got_opentemp_named(&new_fileindex_path, &new_index,
1753 err = got_fileindex_write(fileindex, new_index);
1757 if (rename(new_fileindex_path, fileindex_path) != 0) {
1758 err = got_error_from_errno3("rename", new_fileindex_path,
1760 unlink(new_fileindex_path);
1764 * Sleep for a short amount of time to ensure that files modified after
1765 * this program exits have a different time stamp from the one which
1766 * was recorded in the file index.
1769 timeout.tv_nsec = 1;
1770 nanosleep(&timeout, NULL);
1774 free(new_fileindex_path);
1778 static const struct got_error *
1779 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1780 struct got_object_id **tree_id, const char *wt_relpath,
1781 struct got_worktree *worktree, struct got_repository *repo)
1783 const struct got_error *err = NULL;
1784 struct got_object_id *id = NULL;
1785 char *in_repo_path = NULL;
1786 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1788 *entry_type = GOT_OBJ_TYPE_ANY;
1789 *tree_relpath = NULL;
1792 if (wt_relpath[0] == '\0') {
1793 /* Check out all files within the work tree. */
1794 *entry_type = GOT_OBJ_TYPE_TREE;
1795 *tree_relpath = strdup("");
1796 if (*tree_relpath == NULL) {
1797 err = got_error_from_errno("strdup");
1800 err = got_object_id_by_path(tree_id, repo,
1801 worktree->base_commit_id, worktree->path_prefix);
1807 /* Check out a subset of files in the work tree. */
1809 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1810 is_root_wt ? "" : "/", wt_relpath) == -1) {
1811 err = got_error_from_errno("asprintf");
1815 err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1821 in_repo_path = NULL;
1823 err = got_object_get_type(entry_type, repo, id);
1827 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1828 /* Check out a single file. */
1829 if (strchr(wt_relpath, '/') == NULL) {
1830 /* Check out a single file in work tree's root dir. */
1831 in_repo_path = strdup(worktree->path_prefix);
1832 if (in_repo_path == NULL) {
1833 err = got_error_from_errno("strdup");
1836 *tree_relpath = strdup("");
1837 if (*tree_relpath == NULL) {
1838 err = got_error_from_errno("strdup");
1842 /* Check out a single file in a subdirectory. */
1843 err = got_path_dirname(tree_relpath, wt_relpath);
1846 if (asprintf(&in_repo_path, "%s%s%s",
1847 worktree->path_prefix, is_root_wt ? "" : "/",
1848 *tree_relpath) == -1) {
1849 err = got_error_from_errno("asprintf");
1853 err = got_object_id_by_path(tree_id, repo,
1854 worktree->base_commit_id, in_repo_path);
1856 /* Check out all files within a subdirectory. */
1857 *tree_id = got_object_id_dup(id);
1858 if (*tree_id == NULL) {
1859 err = got_error_from_errno("got_object_id_dup");
1862 *tree_relpath = strdup(wt_relpath);
1863 if (*tree_relpath == NULL) {
1864 err = got_error_from_errno("strdup");
1872 *entry_type = GOT_OBJ_TYPE_ANY;
1873 free(*tree_relpath);
1874 *tree_relpath = NULL;
1881 static const struct got_error *
1882 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1883 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1884 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1885 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1887 const struct got_error *err = NULL;
1888 struct got_commit_object *commit = NULL;
1889 struct got_tree_object *tree = NULL;
1890 struct got_fileindex_diff_tree_cb diff_cb;
1891 struct diff_cb_arg arg;
1893 err = ref_base_commit(worktree, repo);
1895 if (!(err->code == GOT_ERR_ERRNO && errno == EACCES))
1897 err = (*progress_cb)(progress_arg,
1898 GOT_STATUS_BASE_REF_ERR, worktree->root_path);
1903 err = got_object_open_as_commit(&commit, repo,
1904 worktree->base_commit_id);
1908 err = got_object_open_as_tree(&tree, repo, tree_id);
1913 got_object_tree_find_entry(tree, entry_name) == NULL) {
1914 err = got_error(GOT_ERR_NO_TREE_ENTRY);
1918 diff_cb.diff_old_new = diff_old_new;
1919 diff_cb.diff_old = diff_old;
1920 diff_cb.diff_new = diff_new;
1921 arg.fileindex = fileindex;
1922 arg.worktree = worktree;
1924 arg.progress_cb = progress_cb;
1925 arg.progress_arg = progress_arg;
1926 arg.cancel_cb = cancel_cb;
1927 arg.cancel_arg = cancel_arg;
1928 err = got_fileindex_diff_tree(fileindex, tree, relpath,
1929 entry_name, repo, &diff_cb, &arg);
1932 got_object_tree_close(tree);
1934 got_object_commit_close(commit);
1938 const struct got_error *
1939 got_worktree_checkout_files(struct got_worktree *worktree,
1940 struct got_pathlist_head *paths, struct got_repository *repo,
1941 got_worktree_checkout_cb progress_cb, void *progress_arg,
1942 got_cancel_cb cancel_cb, void *cancel_arg)
1944 const struct got_error *err = NULL, *sync_err, *unlockerr;
1945 struct got_commit_object *commit = NULL;
1946 struct got_tree_object *tree = NULL;
1947 struct got_fileindex *fileindex = NULL;
1948 char *fileindex_path = NULL;
1949 struct got_pathlist_entry *pe;
1950 struct tree_path_data {
1951 SIMPLEQ_ENTRY(tree_path_data) entry;
1952 struct got_object_id *tree_id;
1957 SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1959 SIMPLEQ_INIT(&tree_paths);
1961 err = lock_worktree(worktree, LOCK_EX);
1965 /* Map all specified paths to in-repository trees. */
1966 TAILQ_FOREACH(pe, paths, entry) {
1967 tpd = malloc(sizeof(*tpd));
1969 err = got_error_from_errno("malloc");
1973 err = find_tree_entry_for_checkout(&tpd->entry_type,
1974 &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1980 if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1981 err = got_path_basename(&tpd->entry_name, pe->path);
1989 tpd->entry_name = NULL;
1991 SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1995 * Read the file index.
1996 * Checking out files is supposed to be an idempotent operation.
1997 * If the on-disk file index is incomplete we will try to complete it.
1999 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2003 tpd = SIMPLEQ_FIRST(&tree_paths);
2004 TAILQ_FOREACH(pe, paths, entry) {
2005 struct bump_base_commit_id_arg bbc_arg;
2007 err = checkout_files(worktree, fileindex, tpd->relpath,
2008 tpd->tree_id, tpd->entry_name, repo,
2009 progress_cb, progress_arg, cancel_cb, cancel_arg);
2013 bbc_arg.base_commit_id = worktree->base_commit_id;
2014 bbc_arg.entry_name = tpd->entry_name;
2015 bbc_arg.path = pe->path;
2016 bbc_arg.path_len = pe->path_len;
2017 bbc_arg.progress_cb = progress_cb;
2018 bbc_arg.progress_arg = progress_arg;
2019 err = got_fileindex_for_each_entry_safe(fileindex,
2020 bump_base_commit_id, &bbc_arg);
2024 tpd = SIMPLEQ_NEXT(tpd, entry);
2026 sync_err = sync_fileindex(fileindex, fileindex_path);
2027 if (sync_err && err == NULL)
2030 free(fileindex_path);
2032 got_object_tree_close(tree);
2034 got_object_commit_close(commit);
2036 got_fileindex_free(fileindex);
2037 while (!SIMPLEQ_EMPTY(&tree_paths)) {
2038 tpd = SIMPLEQ_FIRST(&tree_paths);
2039 SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2044 unlockerr = lock_worktree(worktree, LOCK_SH);
2045 if (unlockerr && err == NULL)
2050 struct merge_file_cb_arg {
2051 struct got_worktree *worktree;
2052 struct got_fileindex *fileindex;
2053 got_worktree_checkout_cb progress_cb;
2055 got_cancel_cb cancel_cb;
2057 const char *label_orig;
2058 struct got_object_id *commit_id2;
2061 static const struct got_error *
2062 merge_file_cb(void *arg, struct got_blob_object *blob1,
2063 struct got_blob_object *blob2, struct got_object_id *id1,
2064 struct got_object_id *id2, const char *path1, const char *path2,
2065 mode_t mode1, mode_t mode2, struct got_repository *repo)
2067 static const struct got_error *err = NULL;
2068 struct merge_file_cb_arg *a = arg;
2069 struct got_fileindex_entry *ie;
2070 char *ondisk_path = NULL;
2072 unsigned char status;
2073 int local_changes_subsumed;
2075 if (blob1 && blob2) {
2076 ie = got_fileindex_entry_get(a->fileindex, path2,
2079 return (*a->progress_cb)(a->progress_arg,
2080 GOT_STATUS_MISSING, path2);
2082 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2084 return got_error_from_errno("asprintf");
2086 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2091 if (status == GOT_STATUS_DELETE) {
2092 err = (*a->progress_cb)(a->progress_arg,
2093 GOT_STATUS_MERGE, path2);
2096 if (status != GOT_STATUS_NO_CHANGE &&
2097 status != GOT_STATUS_MODIFY &&
2098 status != GOT_STATUS_CONFLICT &&
2099 status != GOT_STATUS_ADD) {
2100 err = (*a->progress_cb)(a->progress_arg, status, path2);
2104 err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2105 ondisk_path, path2, sb.st_mode, a->label_orig, blob2,
2106 a->commit_id2, repo, a->progress_cb, a->progress_arg);
2108 ie = got_fileindex_entry_get(a->fileindex, path1,
2111 return (*a->progress_cb)(a->progress_arg,
2112 GOT_STATUS_MISSING, path2);
2114 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2116 return got_error_from_errno("asprintf");
2118 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2124 case GOT_STATUS_NO_CHANGE:
2125 err = (*a->progress_cb)(a->progress_arg,
2126 GOT_STATUS_DELETE, path1);
2129 err = remove_ondisk_file(a->worktree->root_path, path1);
2133 got_fileindex_entry_mark_deleted_from_disk(ie);
2135 case GOT_STATUS_DELETE:
2136 case GOT_STATUS_MISSING:
2137 err = (*a->progress_cb)(a->progress_arg,
2138 GOT_STATUS_DELETE, path1);
2142 got_fileindex_entry_mark_deleted_from_disk(ie);
2144 case GOT_STATUS_ADD:
2145 case GOT_STATUS_MODIFY:
2146 case GOT_STATUS_CONFLICT:
2147 err = (*a->progress_cb)(a->progress_arg,
2148 GOT_STATUS_CANNOT_DELETE, path1);
2152 case GOT_STATUS_OBSTRUCTED:
2153 err = (*a->progress_cb)(a->progress_arg, status, path1);
2161 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2163 return got_error_from_errno("asprintf");
2164 ie = got_fileindex_entry_get(a->fileindex, path2,
2167 err = get_file_status(&status, &sb, ie, ondisk_path,
2171 if (status != GOT_STATUS_NO_CHANGE &&
2172 status != GOT_STATUS_MODIFY &&
2173 status != GOT_STATUS_CONFLICT &&
2174 status != GOT_STATUS_ADD) {
2175 err = (*a->progress_cb)(a->progress_arg,
2179 err = merge_blob(&local_changes_subsumed, a->worktree,
2180 NULL, ondisk_path, path2, sb.st_mode,
2181 a->label_orig, blob2, a->commit_id2, repo,
2184 if (status == GOT_STATUS_DELETE) {
2185 err = update_blob_fileindex_entry(a->worktree,
2186 a->fileindex, ie, ondisk_path, ie->path,
2192 sb.st_mode = GOT_DEFAULT_FILE_MODE;
2193 err = install_blob(a->worktree, ondisk_path, path2,
2194 /* XXX get this from parent tree! */
2195 GOT_DEFAULT_FILE_MODE,
2196 sb.st_mode, blob2, 0, 0, repo,
2197 a->progress_cb, a->progress_arg);
2200 err = got_fileindex_entry_alloc(&ie,
2201 ondisk_path, path2, NULL, NULL);
2204 err = got_fileindex_entry_add(a->fileindex, ie);
2206 got_fileindex_entry_free(ie);
2216 struct check_merge_ok_arg {
2217 struct got_worktree *worktree;
2218 struct got_repository *repo;
2221 static const struct got_error *
2222 check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2224 const struct got_error *err = NULL;
2225 struct check_merge_ok_arg *a = arg;
2226 unsigned char status;
2230 /* Reject merges into a work tree with mixed base commits. */
2231 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2232 SHA1_DIGEST_LENGTH))
2233 return got_error(GOT_ERR_MIXED_COMMITS);
2235 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2237 return got_error_from_errno("asprintf");
2239 /* Reject merges into a work tree with conflicted files. */
2240 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2243 if (status == GOT_STATUS_CONFLICT)
2244 return got_error(GOT_ERR_CONFLICTS);
2249 static const struct got_error *
2250 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2251 const char *fileindex_path, struct got_object_id *commit_id1,
2252 struct got_object_id *commit_id2, struct got_repository *repo,
2253 got_worktree_checkout_cb progress_cb, void *progress_arg,
2254 got_cancel_cb cancel_cb, void *cancel_arg)
2256 const struct got_error *err = NULL, *sync_err;
2257 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2258 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2259 struct merge_file_cb_arg arg;
2260 char *label_orig = NULL;
2265 err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2266 worktree->path_prefix);
2270 err = got_object_open_as_tree(&tree1, repo, tree_id1);
2274 err = got_object_id_str(&id_str, commit_id1);
2278 if (asprintf(&label_orig, "%s: commit %s",
2279 GOT_MERGE_LABEL_BASE, id_str) == -1) {
2280 err = got_error_from_errno("asprintf");
2287 err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2288 worktree->path_prefix);
2292 err = got_object_open_as_tree(&tree2, repo, tree_id2);
2296 arg.worktree = worktree;
2297 arg.fileindex = fileindex;
2298 arg.progress_cb = progress_cb;
2299 arg.progress_arg = progress_arg;
2300 arg.cancel_cb = cancel_cb;
2301 arg.cancel_arg = cancel_arg;
2302 arg.label_orig = label_orig;
2303 arg.commit_id2 = commit_id2;
2304 err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2305 sync_err = sync_fileindex(fileindex, fileindex_path);
2306 if (sync_err && err == NULL)
2310 got_object_tree_close(tree1);
2312 got_object_tree_close(tree2);
2317 const struct got_error *
2318 got_worktree_merge_files(struct got_worktree *worktree,
2319 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2320 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2321 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2323 const struct got_error *err, *unlockerr;
2324 char *fileindex_path = NULL;
2325 struct got_fileindex *fileindex = NULL;
2326 struct check_merge_ok_arg mok_arg;
2328 err = lock_worktree(worktree, LOCK_EX);
2332 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2336 mok_arg.worktree = worktree;
2337 mok_arg.repo = repo;
2338 err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2343 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2344 commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2347 got_fileindex_free(fileindex);
2348 free(fileindex_path);
2349 unlockerr = lock_worktree(worktree, LOCK_SH);
2350 if (unlockerr && err == NULL)
2355 struct diff_dir_cb_arg {
2356 struct got_fileindex *fileindex;
2357 struct got_worktree *worktree;
2358 const char *status_path;
2359 size_t status_path_len;
2360 struct got_repository *repo;
2361 got_worktree_status_cb status_cb;
2363 got_cancel_cb cancel_cb;
2365 /* A pathlist containing per-directory pathlists of ignore patterns. */
2366 struct got_pathlist_head ignores;
2367 int report_unchanged;
2370 static const struct got_error *
2371 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2372 int dirfd, const char *de_name,
2373 got_worktree_status_cb status_cb, void *status_arg,
2374 struct got_repository *repo, int report_unchanged)
2376 const struct got_error *err = NULL;
2377 unsigned char status = GOT_STATUS_NO_CHANGE;
2378 unsigned char staged_status = get_staged_status(ie);
2380 struct got_object_id blob_id, commit_id, staged_blob_id;
2381 struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2382 struct got_object_id *staged_blob_idp = NULL;
2384 err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
2388 if (status == GOT_STATUS_NO_CHANGE &&
2389 staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
2392 if (got_fileindex_entry_has_blob(ie)) {
2393 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2394 blob_idp = &blob_id;
2396 if (got_fileindex_entry_has_commit(ie)) {
2397 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2398 commit_idp = &commit_id;
2400 if (staged_status == GOT_STATUS_ADD ||
2401 staged_status == GOT_STATUS_MODIFY) {
2402 memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2403 SHA1_DIGEST_LENGTH);
2404 staged_blob_idp = &staged_blob_id;
2407 return (*status_cb)(status_arg, status, staged_status,
2408 ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
2411 static const struct got_error *
2412 status_old_new(void *arg, struct got_fileindex_entry *ie,
2413 struct dirent *de, const char *parent_path, int dirfd)
2415 const struct got_error *err = NULL;
2416 struct diff_dir_cb_arg *a = arg;
2419 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2420 return got_error(GOT_ERR_CANCELLED);
2422 if (got_path_cmp(parent_path, a->status_path,
2423 strlen(parent_path), a->status_path_len) != 0 &&
2424 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2427 if (parent_path[0]) {
2428 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2429 parent_path, de->d_name) == -1)
2430 return got_error_from_errno("asprintf");
2432 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2434 return got_error_from_errno("asprintf");
2437 err = report_file_status(ie, abspath, dirfd, de->d_name,
2438 a->status_cb, a->status_arg, a->repo, a->report_unchanged);
2443 static const struct got_error *
2444 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2446 struct diff_dir_cb_arg *a = arg;
2447 struct got_object_id blob_id, commit_id;
2448 unsigned char status;
2450 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2451 return got_error(GOT_ERR_CANCELLED);
2453 if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2456 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2457 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2458 if (got_fileindex_entry_has_file_on_disk(ie))
2459 status = GOT_STATUS_MISSING;
2461 status = GOT_STATUS_DELETE;
2462 return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2463 ie->path, &blob_id, NULL, &commit_id, -1, NULL);
2467 free_ignorelist(struct got_pathlist_head *ignorelist)
2469 struct got_pathlist_entry *pe;
2471 TAILQ_FOREACH(pe, ignorelist, entry)
2472 free((char *)pe->path);
2473 got_pathlist_free(ignorelist);
2477 free_ignores(struct got_pathlist_head *ignores)
2479 struct got_pathlist_entry *pe;
2481 TAILQ_FOREACH(pe, ignores, entry) {
2482 struct got_pathlist_head *ignorelist = pe->data;
2483 free_ignorelist(ignorelist);
2484 free((char *)pe->path);
2486 got_pathlist_free(ignores);
2489 static const struct got_error *
2490 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2492 const struct got_error *err = NULL;
2493 struct got_pathlist_entry *pe = NULL;
2494 struct got_pathlist_head *ignorelist;
2495 char *line = NULL, *pattern, *dirpath = NULL;
2496 size_t linesize = 0;
2499 ignorelist = calloc(1, sizeof(*ignorelist));
2500 if (ignorelist == NULL)
2501 return got_error_from_errno("calloc");
2502 TAILQ_INIT(ignorelist);
2504 while ((linelen = getline(&line, &linesize, f)) != -1) {
2505 if (linelen > 0 && line[linelen - 1] == '\n')
2506 line[linelen - 1] = '\0';
2508 /* Git's ignores may contain comments. */
2512 /* Git's negated patterns are not (yet?) supported. */
2516 if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2518 err = got_error_from_errno("asprintf");
2521 err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2526 err = got_error_from_errno("getline");
2530 dirpath = strdup(path);
2531 if (dirpath == NULL) {
2532 err = got_error_from_errno("strdup");
2535 err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2538 if (err || pe == NULL) {
2540 free_ignorelist(ignorelist);
2546 match_ignores(struct got_pathlist_head *ignores, const char *path)
2548 struct got_pathlist_entry *pe;
2550 /* Handle patterns which match in all directories. */
2551 TAILQ_FOREACH(pe, ignores, entry) {
2552 struct got_pathlist_head *ignorelist = pe->data;
2553 struct got_pathlist_entry *pi;
2555 TAILQ_FOREACH(pi, ignorelist, entry) {
2556 const char *p, *pattern = pi->path;
2558 if (strncmp(pattern, "**/", 3) != 0)
2563 if (fnmatch(pattern, p,
2564 FNM_PATHNAME | FNM_LEADING_DIR)) {
2565 /* Retry in next directory. */
2566 while (*p && *p != '/')
2578 * The ignores pathlist contains ignore lists from children before
2579 * parents, so we can find the most specific ignorelist by walking
2580 * ignores backwards.
2582 pe = TAILQ_LAST(ignores, got_pathlist_head);
2584 if (got_path_is_child(path, pe->path, pe->path_len)) {
2585 struct got_pathlist_head *ignorelist = pe->data;
2586 struct got_pathlist_entry *pi;
2587 TAILQ_FOREACH(pi, ignorelist, entry) {
2588 const char *pattern = pi->path;
2589 int flags = FNM_LEADING_DIR;
2590 if (strstr(pattern, "/**/") == NULL)
2591 flags |= FNM_PATHNAME;
2592 if (fnmatch(pattern, path, flags))
2597 pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2603 static const struct got_error *
2604 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2605 const char *path, int dirfd, const char *ignores_filename)
2607 const struct got_error *err = NULL;
2610 FILE *ignoresfile = NULL;
2612 if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2613 path[0] ? "/" : "", ignores_filename) == -1)
2614 return got_error_from_errno("asprintf");
2617 fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
2619 if (errno != ENOENT && errno != EACCES)
2620 err = got_error_from_errno2("openat",
2623 ignoresfile = fdopen(fd, "r");
2624 if (ignoresfile == NULL)
2625 err = got_error_from_errno2("fdopen",
2629 err = read_ignores(ignores, path, ignoresfile);
2633 ignoresfile = fopen(ignorespath, "r");
2634 if (ignoresfile == NULL) {
2635 if (errno != ENOENT && errno != EACCES)
2636 err = got_error_from_errno2("fopen",
2639 err = read_ignores(ignores, path, ignoresfile);
2642 if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2643 err = got_error_from_errno2("fclose", path);
2644 if (fd != -1 && close(fd) == -1 && err == NULL)
2645 err = got_error_from_errno2("close", path);
2650 static const struct got_error *
2651 status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
2653 const struct got_error *err = NULL;
2654 struct diff_dir_cb_arg *a = arg;
2657 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2658 return got_error(GOT_ERR_CANCELLED);
2660 /* XXX ignore symlinks for now */
2661 if (de->d_type == DT_LNK)
2664 if (parent_path[0]) {
2665 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2666 return got_error_from_errno("asprintf");
2671 if (de->d_type == DT_DIR) {
2672 int subdirfd = openat(dirfd, de->d_name,
2673 O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2674 if (subdirfd == -1) {
2675 if (errno != ENOENT && errno != EACCES)
2676 err = got_error_from_errno2("openat", path);
2678 err = add_ignores(&a->ignores, a->worktree->root_path,
2679 path, subdirfd, ".cvsignore");
2681 err = add_ignores(&a->ignores,
2682 a->worktree->root_path, path,
2683 subdirfd, ".gitignore");
2684 if (close(subdirfd) == -1 && err == NULL)
2685 err = got_error_from_errno2("close", path);
2687 } else if (got_path_is_child(path, a->status_path, a->status_path_len)
2688 && !match_ignores(&a->ignores, path))
2689 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2690 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2696 static const struct got_error *
2697 report_single_file_status(const char *path, const char *ondisk_path,
2698 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2699 void *status_arg, struct got_repository *repo, int report_unchanged)
2701 struct got_fileindex_entry *ie;
2704 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2706 return report_file_status(ie, ondisk_path, -1, NULL,
2707 status_cb, status_arg, repo, report_unchanged);
2709 if (lstat(ondisk_path, &sb) == -1) {
2710 if (errno != ENOENT)
2711 return got_error_from_errno2("lstat", ondisk_path);
2712 return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2713 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2717 if (S_ISREG(sb.st_mode))
2718 return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2719 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2724 static const struct got_error *
2725 worktree_status(struct got_worktree *worktree, const char *path,
2726 struct got_fileindex *fileindex, struct got_repository *repo,
2727 got_worktree_status_cb status_cb, void *status_arg,
2728 got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
2729 int report_unchanged)
2731 const struct got_error *err = NULL;
2733 struct got_fileindex_diff_dir_cb fdiff_cb;
2734 struct diff_dir_cb_arg arg;
2735 char *ondisk_path = NULL;
2737 if (asprintf(&ondisk_path, "%s%s%s",
2738 worktree->root_path, path[0] ? "/" : "", path) == -1)
2739 return got_error_from_errno("asprintf");
2741 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2743 if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2744 err = got_error_from_errno2("open", ondisk_path);
2746 err = report_single_file_status(path, ondisk_path,
2747 fileindex, status_cb, status_arg, repo,
2750 fdiff_cb.diff_old_new = status_old_new;
2751 fdiff_cb.diff_old = status_old;
2752 fdiff_cb.diff_new = status_new;
2753 arg.fileindex = fileindex;
2754 arg.worktree = worktree;
2755 arg.status_path = path;
2756 arg.status_path_len = strlen(path);
2758 arg.status_cb = status_cb;
2759 arg.status_arg = status_arg;
2760 arg.cancel_cb = cancel_cb;
2761 arg.cancel_arg = cancel_arg;
2762 arg.report_unchanged = report_unchanged;
2763 TAILQ_INIT(&arg.ignores);
2765 err = add_ignores(&arg.ignores, worktree->root_path,
2766 path, fd, ".cvsignore");
2768 err = add_ignores(&arg.ignores,
2769 worktree->root_path, path, fd,
2773 err = got_fileindex_diff_dir(fileindex, fd,
2774 worktree->root_path, path, repo, &fdiff_cb, &arg);
2775 free_ignores(&arg.ignores);
2778 if (fd != -1 && close(fd) != 0 && err == NULL)
2779 err = got_error_from_errno("close");
2784 const struct got_error *
2785 got_worktree_status(struct got_worktree *worktree,
2786 struct got_pathlist_head *paths, struct got_repository *repo,
2787 got_worktree_status_cb status_cb, void *status_arg,
2788 got_cancel_cb cancel_cb, void *cancel_arg)
2790 const struct got_error *err = NULL;
2791 char *fileindex_path = NULL;
2792 struct got_fileindex *fileindex = NULL;
2793 struct got_pathlist_entry *pe;
2795 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2799 TAILQ_FOREACH(pe, paths, entry) {
2800 err = worktree_status(worktree, pe->path, fileindex, repo,
2801 status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
2805 free(fileindex_path);
2806 got_fileindex_free(fileindex);
2810 const struct got_error *
2811 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2814 const struct got_error *err = NULL;
2815 char *resolved, *cwd = NULL, *path = NULL;
2820 resolved = realpath(arg, NULL);
2821 if (resolved == NULL) {
2822 if (errno != ENOENT)
2823 return got_error_from_errno2("realpath", arg);
2824 cwd = getcwd(NULL, 0);
2826 return got_error_from_errno("getcwd");
2827 if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2828 err = got_error_from_errno("asprintf");
2833 if (strncmp(got_worktree_get_root_path(worktree), resolved,
2834 strlen(got_worktree_get_root_path(worktree)))) {
2835 err = got_error(GOT_ERR_BAD_PATH);
2839 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2840 err = got_path_skip_common_ancestor(&path,
2841 got_worktree_get_root_path(worktree), resolved);
2847 err = got_error_from_errno("strdup");
2852 /* XXX status walk can't deal with trailing slash! */
2854 while (len > 0 && path[len - 1] == '/') {
2855 path[len - 1] = '\0';
2868 struct schedule_addition_args {
2869 struct got_worktree *worktree;
2870 struct got_fileindex *fileindex;
2871 got_worktree_checkout_cb progress_cb;
2873 struct got_repository *repo;
2876 static const struct got_error *
2877 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
2878 const char *relpath, struct got_object_id *blob_id,
2879 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2880 int dirfd, const char *de_name)
2882 struct schedule_addition_args *a = arg;
2883 const struct got_error *err = NULL;
2884 struct got_fileindex_entry *ie;
2888 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2890 return got_error_from_errno("asprintf");
2892 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2894 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
2898 /* Re-adding an existing entry is a no-op. */
2899 if (status == GOT_STATUS_ADD)
2901 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
2906 if (status != GOT_STATUS_UNVERSIONED) {
2907 err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
2911 err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2915 err = got_fileindex_entry_add(a->fileindex, ie);
2917 got_fileindex_entry_free(ie);
2924 if (status == GOT_STATUS_ADD)
2926 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
2929 const struct got_error *
2930 got_worktree_schedule_add(struct got_worktree *worktree,
2931 struct got_pathlist_head *paths,
2932 got_worktree_checkout_cb progress_cb, void *progress_arg,
2933 struct got_repository *repo, int no_ignores)
2935 struct got_fileindex *fileindex = NULL;
2936 char *fileindex_path = NULL;
2937 const struct got_error *err = NULL, *sync_err, *unlockerr;
2938 struct got_pathlist_entry *pe;
2939 struct schedule_addition_args saa;
2941 err = lock_worktree(worktree, LOCK_EX);
2945 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2949 saa.worktree = worktree;
2950 saa.fileindex = fileindex;
2951 saa.progress_cb = progress_cb;
2952 saa.progress_arg = progress_arg;
2955 TAILQ_FOREACH(pe, paths, entry) {
2956 err = worktree_status(worktree, pe->path, fileindex, repo,
2957 schedule_addition, &saa, NULL, NULL, no_ignores, 0);
2961 sync_err = sync_fileindex(fileindex, fileindex_path);
2962 if (sync_err && err == NULL)
2965 free(fileindex_path);
2967 got_fileindex_free(fileindex);
2968 unlockerr = lock_worktree(worktree, LOCK_SH);
2969 if (unlockerr && err == NULL)
2974 struct schedule_deletion_args {
2975 struct got_worktree *worktree;
2976 struct got_fileindex *fileindex;
2977 got_worktree_delete_cb progress_cb;
2979 struct got_repository *repo;
2980 int delete_local_mods;
2984 static const struct got_error *
2985 schedule_for_deletion(void *arg, unsigned char status,
2986 unsigned char staged_status, const char *relpath,
2987 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
2988 struct got_object_id *commit_id, int dirfd, const char *de_name)
2990 struct schedule_deletion_args *a = arg;
2991 const struct got_error *err = NULL;
2992 struct got_fileindex_entry *ie = NULL;
2996 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2998 return got_error(GOT_ERR_BAD_PATH);
3000 staged_status = get_staged_status(ie);
3001 if (staged_status != GOT_STATUS_NO_CHANGE) {
3002 if (staged_status == GOT_STATUS_DELETE)
3004 return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3007 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3009 return got_error_from_errno("asprintf");
3011 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3016 if (status != GOT_STATUS_NO_CHANGE) {
3017 if (status == GOT_STATUS_DELETE)
3019 if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3020 err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3023 if (status != GOT_STATUS_MODIFY &&
3024 status != GOT_STATUS_MISSING) {
3025 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3030 if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3032 if (unlinkat(dirfd, de_name, 0) != 0) {
3033 err = got_error_from_errno2("unlinkat",
3037 } else if (unlink(ondisk_path) != 0) {
3038 err = got_error_from_errno2("unlink", ondisk_path);
3043 got_fileindex_entry_mark_deleted_from_disk(ie);
3048 if (status == GOT_STATUS_DELETE)
3050 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3051 staged_status, relpath);
3054 const struct got_error *
3055 got_worktree_schedule_delete(struct got_worktree *worktree,
3056 struct got_pathlist_head *paths, int delete_local_mods,
3057 got_worktree_delete_cb progress_cb, void *progress_arg,
3058 struct got_repository *repo, int keep_on_disk)
3060 struct got_fileindex *fileindex = NULL;
3061 char *fileindex_path = NULL;
3062 const struct got_error *err = NULL, *sync_err, *unlockerr;
3063 struct got_pathlist_entry *pe;
3064 struct schedule_deletion_args sda;
3066 err = lock_worktree(worktree, LOCK_EX);
3070 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3074 sda.worktree = worktree;
3075 sda.fileindex = fileindex;
3076 sda.progress_cb = progress_cb;
3077 sda.progress_arg = progress_arg;
3079 sda.delete_local_mods = delete_local_mods;
3080 sda.keep_on_disk = keep_on_disk;
3082 TAILQ_FOREACH(pe, paths, entry) {
3083 err = worktree_status(worktree, pe->path, fileindex, repo,
3084 schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3088 sync_err = sync_fileindex(fileindex, fileindex_path);
3089 if (sync_err && err == NULL)
3092 free(fileindex_path);
3094 got_fileindex_free(fileindex);
3095 unlockerr = lock_worktree(worktree, LOCK_SH);
3096 if (unlockerr && err == NULL)
3101 static const struct got_error *
3102 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3104 const struct got_error *err = NULL;
3106 size_t linesize = 0, n;
3109 linelen = getline(&line, &linesize, infile);
3110 if (linelen == -1) {
3111 if (ferror(infile)) {
3112 err = got_error_from_errno("getline");
3118 n = fwrite(line, 1, linelen, outfile);
3120 err = got_ferror(outfile, GOT_ERR_IO);
3125 n = fwrite(line, 1, linelen, rejectfile);
3127 err = got_ferror(outfile, GOT_ERR_IO);
3134 static const struct got_error *
3135 skip_one_line(FILE *f)
3138 size_t linesize = 0;
3141 linelen = getline(&line, &linesize, f);
3142 if (linelen == -1) {
3144 return got_error_from_errno("getline");
3151 static const struct got_error *
3152 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3153 int start_old, int end_old, int start_new, int end_new,
3154 FILE *outfile, FILE *rejectfile)
3156 const struct got_error *err;
3158 /* Copy old file's lines leading up to patch. */
3159 while (!feof(f1) && *line_cur1 < start_old) {
3160 err = copy_one_line(f1, outfile, NULL);
3165 /* Skip new file's lines leading up to patch. */
3166 while (!feof(f2) && *line_cur2 < start_new) {
3168 err = copy_one_line(f2, NULL, rejectfile);
3170 err = skip_one_line(f2);
3175 /* Copy patched lines. */
3176 while (!feof(f2) && *line_cur2 <= end_new) {
3177 err = copy_one_line(f2, outfile, NULL);
3182 /* Skip over old file's replaced lines. */
3183 while (!feof(f1) && *line_cur1 <= end_old) {
3185 err = copy_one_line(f1, NULL, rejectfile);
3187 err = skip_one_line(f1);
3196 static const struct got_error *
3197 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3198 FILE *outfile, FILE *rejectfile)
3200 const struct got_error *err;
3203 /* Copy old file's lines until EOF. */
3205 err = copy_one_line(f1, outfile, NULL);
3212 /* Copy new file's lines until EOF. */
3214 err = copy_one_line(f2, NULL, rejectfile);
3224 static const struct got_error *
3225 apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3226 int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3227 int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3228 int *line_cur2, FILE *outfile, FILE *rejectfile,
3229 got_worktree_patch_cb patch_cb, void *patch_arg)
3231 const struct got_error *err = NULL;
3232 int start_old = change->cv.a;
3233 int end_old = change->cv.b;
3234 int start_new = change->cv.c;
3235 int end_new = change->cv.d;
3239 *choice = GOT_PATCH_CHOICE_NONE;
3241 hunkfile = got_opentemp();
3242 if (hunkfile == NULL)
3243 return got_error_from_errno("got_opentemp");
3248 /* XXX TODO needs error checking */
3249 got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3251 if (fseek(f1, pos1, SEEK_SET) == -1) {
3252 err = got_ferror(f1, GOT_ERR_IO);
3255 if (fseek(f2, pos2, SEEK_SET) == -1) {
3256 err = got_ferror(f1, GOT_ERR_IO);
3259 if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3260 err = got_ferror(hunkfile, GOT_ERR_IO);
3264 err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3265 hunkfile, n, nchanges);
3270 case GOT_PATCH_CHOICE_YES:
3271 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3272 end_old, start_new, end_new, outfile, rejectfile);
3274 case GOT_PATCH_CHOICE_NO:
3275 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3276 end_old, start_new, end_new, rejectfile, outfile);
3278 case GOT_PATCH_CHOICE_QUIT:
3281 err = got_error(GOT_ERR_PATCH_CHOICE);
3285 if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3286 err = got_error_from_errno("fclose");
3290 struct revert_file_args {
3291 struct got_worktree *worktree;
3292 struct got_fileindex *fileindex;
3293 got_worktree_checkout_cb progress_cb;
3295 got_worktree_patch_cb patch_cb;
3297 struct got_repository *repo;
3300 static const struct got_error *
3301 create_patched_content(char **path_outfile, int reverse_patch,
3302 struct got_object_id *blob_id, const char *path2,
3303 int dirfd2, const char *de_name2,
3304 const char *relpath, struct got_repository *repo,
3305 got_worktree_patch_cb patch_cb, void *patch_arg)
3307 const struct got_error *err;
3308 struct got_blob_object *blob = NULL;
3309 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3311 char *path1 = NULL, *id_str = NULL;
3312 struct stat sb1, sb2;
3313 struct got_diff_changes *changes = NULL;
3314 struct got_diff_state *ds = NULL;
3315 struct got_diff_args *args = NULL;
3316 struct got_diff_change *change;
3317 int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3320 *path_outfile = NULL;
3322 err = got_object_id_str(&id_str, blob_id);
3327 fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
3329 err = got_error_from_errno2("openat", path2);
3333 fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3335 err = got_error_from_errno2("open", path2);
3339 if (fstat(fd2, &sb2) == -1) {
3340 err = got_error_from_errno2("fstat", path2);
3344 f2 = fdopen(fd2, "r");
3346 err = got_error_from_errno2("fdopen", path2);
3351 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3355 err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3359 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3363 if (stat(path1, &sb1) == -1) {
3364 err = got_error_from_errno2("stat", path1);
3368 err = got_diff_files(&changes, &ds, &args, &diff_flags,
3369 f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3373 err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3377 if (fseek(f1, 0L, SEEK_SET) == -1)
3378 return got_ferror(f1, GOT_ERR_IO);
3379 if (fseek(f2, 0L, SEEK_SET) == -1)
3380 return got_ferror(f2, GOT_ERR_IO);
3381 SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3383 err = apply_or_reject_change(&choice, change, ++n,
3384 changes->nchanges, ds, args, diff_flags, relpath,
3385 f1, f2, &line_cur1, &line_cur2,
3386 reverse_patch ? NULL : outfile,
3387 reverse_patch ? outfile : NULL,
3388 patch_cb, patch_arg);
3391 if (choice == GOT_PATCH_CHOICE_YES)
3393 else if (choice == GOT_PATCH_CHOICE_QUIT)
3397 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3398 reverse_patch ? NULL : outfile,
3399 reverse_patch ? outfile : NULL);
3403 if (chmod(*path_outfile, sb2.st_mode) == -1) {
3404 err = got_error_from_errno2("chmod", path2);
3411 got_object_blob_close(blob);
3412 if (f1 && fclose(f1) == EOF && err == NULL)
3413 err = got_error_from_errno2("fclose", path1);
3414 if (f2 && fclose(f2) == EOF && err == NULL)
3415 err = got_error_from_errno2("fclose", path2);
3416 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3417 err = got_error_from_errno2("close", path2);
3418 if (outfile && fclose(outfile) == EOF && err == NULL)
3419 err = got_error_from_errno2("fclose", *path_outfile);
3420 if (path1 && unlink(path1) == -1 && err == NULL)
3421 err = got_error_from_errno2("unlink", path1);
3422 if (err || !have_content) {
3423 if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3424 err = got_error_from_errno2("unlink", *path_outfile);
3425 free(*path_outfile);
3426 *path_outfile = NULL;
3430 got_diff_state_free(ds);
3434 got_diff_free_changes(changes);
3439 static const struct got_error *
3440 revert_file(void *arg, unsigned char status, unsigned char staged_status,
3441 const char *relpath, struct got_object_id *blob_id,
3442 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3443 int dirfd, const char *de_name)
3445 struct revert_file_args *a = arg;
3446 const struct got_error *err = NULL;
3447 char *parent_path = NULL;
3448 struct got_fileindex_entry *ie;
3449 struct got_tree_object *tree = NULL;
3450 struct got_object_id *tree_id = NULL;
3451 const struct got_tree_entry *te = NULL;
3452 char *tree_path = NULL, *te_name;
3453 char *ondisk_path = NULL, *path_content = NULL;
3454 struct got_blob_object *blob = NULL;
3456 /* Reverting a staged deletion is a no-op. */
3457 if (status == GOT_STATUS_DELETE &&
3458 staged_status != GOT_STATUS_NO_CHANGE)
3461 if (status == GOT_STATUS_UNVERSIONED)
3462 return (*a->progress_cb)(a->progress_arg,
3463 GOT_STATUS_UNVERSIONED, relpath);
3465 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3467 return got_error(GOT_ERR_BAD_PATH);
3469 /* Construct in-repository path of tree which contains this blob. */
3470 err = got_path_dirname(&parent_path, ie->path);
3472 if (err->code != GOT_ERR_BAD_PATH)
3474 parent_path = strdup("/");
3475 if (parent_path == NULL) {
3476 err = got_error_from_errno("strdup");
3480 if (got_path_is_root_dir(a->worktree->path_prefix)) {
3481 tree_path = strdup(parent_path);
3482 if (tree_path == NULL) {
3483 err = got_error_from_errno("strdup");
3487 if (got_path_is_root_dir(parent_path)) {
3488 tree_path = strdup(a->worktree->path_prefix);
3489 if (tree_path == NULL) {
3490 err = got_error_from_errno("strdup");
3494 if (asprintf(&tree_path, "%s/%s",
3495 a->worktree->path_prefix, parent_path) == -1) {
3496 err = got_error_from_errno("asprintf");
3502 err = got_object_id_by_path(&tree_id, a->repo,
3503 a->worktree->base_commit_id, tree_path);
3505 if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3506 (status == GOT_STATUS_ADD ||
3507 staged_status == GOT_STATUS_ADD)))
3510 err = got_object_open_as_tree(&tree, a->repo, tree_id);
3514 te_name = basename(ie->path);
3515 if (te_name == NULL) {
3516 err = got_error_from_errno2("basename", ie->path);
3520 te = got_object_tree_find_entry(tree, te_name);
3521 if (te == NULL && status != GOT_STATUS_ADD &&
3522 staged_status != GOT_STATUS_ADD) {
3523 err = got_error(GOT_ERR_NO_TREE_ENTRY);
3529 case GOT_STATUS_ADD:
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)
3539 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3543 got_fileindex_entry_remove(a->fileindex, ie);
3545 case GOT_STATUS_DELETE:
3547 int choice = GOT_PATCH_CHOICE_NONE;
3548 err = (*a->patch_cb)(&choice, a->patch_arg,
3549 status, ie->path, NULL, 1, 1);
3552 if (choice != GOT_PATCH_CHOICE_YES)
3556 case GOT_STATUS_MODIFY:
3557 case GOT_STATUS_MODE_CHANGE:
3558 case GOT_STATUS_CONFLICT:
3559 case GOT_STATUS_MISSING: {
3560 struct got_object_id id;
3561 if (staged_status == GOT_STATUS_ADD ||
3562 staged_status == GOT_STATUS_MODIFY) {
3563 memcpy(id.sha1, ie->staged_blob_sha1,
3564 SHA1_DIGEST_LENGTH);
3566 memcpy(id.sha1, ie->blob_sha1,
3567 SHA1_DIGEST_LENGTH);
3568 err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3572 if (asprintf(&ondisk_path, "%s/%s",
3573 got_worktree_get_root_path(a->worktree), relpath) == -1) {
3574 err = got_error_from_errno("asprintf");
3578 if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3579 status == GOT_STATUS_CONFLICT)) {
3580 err = create_patched_content(&path_content, 1, &id,
3581 ondisk_path, dirfd, de_name, ie->path, a->repo,
3582 a->patch_cb, a->patch_arg);
3583 if (err || path_content == NULL)
3585 if (rename(path_content, ondisk_path) == -1) {
3586 err = got_error_from_errno3("rename",
3587 path_content, ondisk_path);
3591 err = install_blob(a->worktree, ondisk_path, ie->path,
3592 te ? te->mode : GOT_DEFAULT_FILE_MODE,
3593 got_fileindex_perms_to_st(ie), blob, 0, 1,
3594 a->repo, a->progress_cb, a->progress_arg);
3597 if (status == GOT_STATUS_DELETE ||
3598 status == GOT_STATUS_MODE_CHANGE) {
3599 err = update_blob_fileindex_entry(a->worktree,
3600 a->fileindex, ie, ondisk_path, ie->path,
3617 got_object_blob_close(blob);
3619 got_object_tree_close(tree);
3624 const struct got_error *
3625 got_worktree_revert(struct got_worktree *worktree,
3626 struct got_pathlist_head *paths,
3627 got_worktree_checkout_cb progress_cb, void *progress_arg,
3628 got_worktree_patch_cb patch_cb, void *patch_arg,
3629 struct got_repository *repo)
3631 struct got_fileindex *fileindex = NULL;
3632 char *fileindex_path = NULL;
3633 const struct got_error *err = NULL, *unlockerr = NULL;
3634 const struct got_error *sync_err = NULL;
3635 struct got_pathlist_entry *pe;
3636 struct revert_file_args rfa;
3638 err = lock_worktree(worktree, LOCK_EX);
3642 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3646 rfa.worktree = worktree;
3647 rfa.fileindex = fileindex;
3648 rfa.progress_cb = progress_cb;
3649 rfa.progress_arg = progress_arg;
3650 rfa.patch_cb = patch_cb;
3651 rfa.patch_arg = patch_arg;
3653 TAILQ_FOREACH(pe, paths, entry) {
3654 err = worktree_status(worktree, pe->path, fileindex, repo,
3655 revert_file, &rfa, NULL, NULL, 0, 0);
3659 sync_err = sync_fileindex(fileindex, fileindex_path);
3660 if (sync_err && err == NULL)
3663 free(fileindex_path);
3665 got_fileindex_free(fileindex);
3666 unlockerr = lock_worktree(worktree, LOCK_SH);
3667 if (unlockerr && err == NULL)
3673 free_commitable(struct got_commitable *ct)
3676 free(ct->in_repo_path);
3677 free(ct->ondisk_path);
3679 free(ct->base_blob_id);
3680 free(ct->staged_blob_id);
3681 free(ct->base_commit_id);
3685 struct collect_commitables_arg {
3686 struct got_pathlist_head *commitable_paths;
3687 struct got_repository *repo;
3688 struct got_worktree *worktree;
3689 int have_staged_files;
3692 static const struct got_error *
3693 collect_commitables(void *arg, unsigned char status,
3694 unsigned char staged_status, const char *relpath,
3695 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3696 struct got_object_id *commit_id, int dirfd, const char *de_name)
3698 struct collect_commitables_arg *a = arg;
3699 const struct got_error *err = NULL;
3700 struct got_commitable *ct = NULL;
3701 struct got_pathlist_entry *new = NULL;
3702 char *parent_path = NULL, *path = NULL;
3705 if (a->have_staged_files) {
3706 if (staged_status != GOT_STATUS_MODIFY &&
3707 staged_status != GOT_STATUS_ADD &&
3708 staged_status != GOT_STATUS_DELETE)
3711 if (status == GOT_STATUS_CONFLICT)
3712 return got_error(GOT_ERR_COMMIT_CONFLICT);
3714 if (status != GOT_STATUS_MODIFY &&
3715 status != GOT_STATUS_MODE_CHANGE &&
3716 status != GOT_STATUS_ADD &&
3717 status != GOT_STATUS_DELETE)
3721 if (asprintf(&path, "/%s", relpath) == -1) {
3722 err = got_error_from_errno("asprintf");
3725 if (strcmp(path, "/") == 0) {
3726 parent_path = strdup("");
3727 if (parent_path == NULL)
3728 return got_error_from_errno("strdup");
3730 err = got_path_dirname(&parent_path, path);
3735 ct = calloc(1, sizeof(*ct));
3737 err = got_error_from_errno("calloc");
3741 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3743 err = got_error_from_errno("asprintf");
3746 if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3747 sb.st_mode = GOT_DEFAULT_FILE_MODE;
3750 if (fstatat(dirfd, de_name, &sb,
3751 AT_SYMLINK_NOFOLLOW) == -1) {
3752 err = got_error_from_errno2("fstatat",
3756 } else if (lstat(ct->ondisk_path, &sb) == -1) {
3757 err = got_error_from_errno2("lstat", ct->ondisk_path);
3760 ct->mode = sb.st_mode;
3763 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3764 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3766 err = got_error_from_errno("asprintf");
3770 ct->status = status;
3771 ct->staged_status = staged_status;
3772 ct->blob_id = NULL; /* will be filled in when blob gets created */
3773 if (ct->status != GOT_STATUS_ADD &&
3774 ct->staged_status != GOT_STATUS_ADD) {
3775 ct->base_blob_id = got_object_id_dup(blob_id);
3776 if (ct->base_blob_id == NULL) {
3777 err = got_error_from_errno("got_object_id_dup");
3780 ct->base_commit_id = got_object_id_dup(commit_id);
3781 if (ct->base_commit_id == NULL) {
3782 err = got_error_from_errno("got_object_id_dup");
3786 if (ct->staged_status == GOT_STATUS_ADD ||
3787 ct->staged_status == GOT_STATUS_MODIFY) {
3788 ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3789 if (ct->staged_blob_id == NULL) {
3790 err = got_error_from_errno("got_object_id_dup");
3794 ct->path = strdup(path);
3795 if (ct->path == NULL) {
3796 err = got_error_from_errno("strdup");
3799 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3801 if (ct && (err || new == NULL))
3802 free_commitable(ct);
3808 static const struct got_error *write_tree(struct got_object_id **,
3809 struct got_tree_object *, const char *, struct got_pathlist_head *,
3810 got_worktree_status_cb status_cb, void *status_arg,
3811 struct got_repository *);
3813 static const struct got_error *
3814 write_subtree(struct got_object_id **new_subtree_id,
3815 struct got_tree_entry *te, const char *parent_path,
3816 struct got_pathlist_head *commitable_paths,
3817 got_worktree_status_cb status_cb, void *status_arg,
3818 struct got_repository *repo)
3820 const struct got_error *err = NULL;
3821 struct got_tree_object *subtree;
3824 if (asprintf(&subpath, "%s%s%s", parent_path,
3825 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3826 return got_error_from_errno("asprintf");
3828 err = got_object_open_as_tree(&subtree, repo, &te->id);
3832 err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3833 status_cb, status_arg, repo);
3834 got_object_tree_close(subtree);
3839 static const struct got_error *
3840 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3842 const struct got_error *err = NULL;
3843 char *ct_parent_path = NULL;
3847 if (strchr(ct->in_repo_path, '/') == NULL) {
3848 *match = got_path_is_root_dir(path);
3852 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3855 *match = (strcmp(path, ct_parent_path) == 0);
3856 free(ct_parent_path);
3861 get_ct_file_mode(struct got_commitable *ct)
3863 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3866 static const struct got_error *
3867 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3868 struct got_tree_entry *te, struct got_commitable *ct)
3870 const struct got_error *err = NULL;
3874 err = got_object_tree_entry_dup(new_te, te);
3878 (*new_te)->mode = get_ct_file_mode(ct);
3880 if (ct->staged_status == GOT_STATUS_MODIFY)
3881 memcpy(&(*new_te)->id, ct->staged_blob_id,
3882 sizeof((*new_te)->id));
3884 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3886 if (err && *new_te) {
3893 static const struct got_error *
3894 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3895 struct got_commitable *ct)
3897 const struct got_error *err = NULL;
3902 *new_te = calloc(1, sizeof(**new_te));
3903 if (*new_te == NULL)
3904 return got_error_from_errno("calloc");
3906 ct_name = basename(ct->path);
3907 if (ct_name == NULL) {
3908 err = got_error_from_errno2("basename", ct->path);
3911 if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
3912 sizeof((*new_te)->name)) {
3913 err = got_error(GOT_ERR_NO_SPACE);
3917 (*new_te)->mode = get_ct_file_mode(ct);
3919 if (ct->staged_status == GOT_STATUS_ADD)
3920 memcpy(&(*new_te)->id, ct->staged_blob_id,
3921 sizeof((*new_te)->id));
3923 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3925 if (err && *new_te) {
3932 static const struct got_error *
3933 insert_tree_entry(struct got_tree_entry *new_te,
3934 struct got_pathlist_head *paths)
3936 const struct got_error *err = NULL;
3937 struct got_pathlist_entry *new_pe;
3939 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3943 return got_error(GOT_ERR_TREE_DUP_ENTRY);
3947 static const struct got_error *
3948 report_ct_status(struct got_commitable *ct,
3949 got_worktree_status_cb status_cb, void *status_arg)
3951 const char *ct_path = ct->path;
3952 unsigned char status;
3954 while (ct_path[0] == '/')
3957 if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3958 status = ct->staged_status;
3960 status = ct->status;
3962 return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3963 ct_path, ct->blob_id, NULL, NULL, -1, NULL);
3966 static const struct got_error *
3967 match_modified_subtree(int *modified, struct got_tree_entry *te,
3968 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3970 const struct got_error *err = NULL;
3971 struct got_pathlist_entry *pe;
3976 if (asprintf(&te_path, "%s%s%s", base_tree_path,
3977 got_path_is_root_dir(base_tree_path) ? "" : "/",
3979 return got_error_from_errno("asprintf");
3981 TAILQ_FOREACH(pe, commitable_paths, entry) {
3982 struct got_commitable *ct = pe->data;
3983 *modified = got_path_is_child(ct->in_repo_path, te_path,
3993 static const struct got_error *
3994 match_deleted_or_modified_ct(struct got_commitable **ctp,
3995 struct got_tree_entry *te, const char *base_tree_path,
3996 struct got_pathlist_head *commitable_paths)
3998 const struct got_error *err = NULL;
3999 struct got_pathlist_entry *pe;
4003 TAILQ_FOREACH(pe, commitable_paths, entry) {
4004 struct got_commitable *ct = pe->data;
4005 char *ct_name = NULL;
4008 if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
4009 if (ct->status != GOT_STATUS_MODIFY &&
4010 ct->status != GOT_STATUS_MODE_CHANGE &&
4011 ct->status != GOT_STATUS_DELETE)
4014 if (ct->staged_status != GOT_STATUS_MODIFY &&
4015 ct->staged_status != GOT_STATUS_DELETE)
4019 if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
4022 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
4028 ct_name = basename(pe->path);
4029 if (ct_name == NULL)
4030 return got_error_from_errno2("basename", pe->path);
4032 if (strcmp(te->name, ct_name) != 0)
4042 static const struct got_error *
4043 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
4044 const char *child_path, const char *path_base_tree,
4045 struct got_pathlist_head *commitable_paths,
4046 got_worktree_status_cb status_cb, void *status_arg,
4047 struct got_repository *repo)
4049 const struct got_error *err = NULL;
4050 struct got_tree_entry *new_te;
4052 struct got_object_id *id = NULL;
4056 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
4057 got_path_is_root_dir(path_base_tree) ? "" : "/",
4059 return got_error_from_errno("asprintf");
4061 new_te = calloc(1, sizeof(*new_te));
4063 return got_error_from_errno("calloc");
4064 new_te->mode = S_IFDIR;
4066 if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4067 sizeof(new_te->name)) {
4068 err = got_error(GOT_ERR_NO_SPACE);
4071 err = write_tree(&id, NULL, subtree_path,
4072 commitable_paths, status_cb, status_arg, repo);
4077 memcpy(&new_te->id, id, sizeof(new_te->id));
4086 static const struct got_error *
4087 write_tree(struct got_object_id **new_tree_id,
4088 struct got_tree_object *base_tree, const char *path_base_tree,
4089 struct got_pathlist_head *commitable_paths,
4090 got_worktree_status_cb status_cb, void *status_arg,
4091 struct got_repository *repo)
4093 const struct got_error *err = NULL;
4094 struct got_pathlist_head paths;
4095 struct got_tree_entry *te, *new_te = NULL;
4096 struct got_pathlist_entry *pe;
4101 /* Insert, and recurse into, newly added entries first. */
4102 TAILQ_FOREACH(pe, commitable_paths, entry) {
4103 struct got_commitable *ct = pe->data;
4104 char *child_path = NULL, *slash;
4106 if ((ct->status != GOT_STATUS_ADD &&
4107 ct->staged_status != GOT_STATUS_ADD) ||
4108 (ct->flags & GOT_COMMITABLE_ADDED))
4111 if (!got_path_is_child(pe->path, path_base_tree,
4112 strlen(path_base_tree)))
4115 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4120 slash = strchr(child_path, '/');
4121 if (slash == NULL) {
4122 err = alloc_added_blob_tree_entry(&new_te, ct);
4125 err = report_ct_status(ct, status_cb, status_arg);
4128 ct->flags |= GOT_COMMITABLE_ADDED;
4129 err = insert_tree_entry(new_te, &paths);
4134 *slash = '\0'; /* trim trailing path components */
4135 if (base_tree == NULL ||
4136 got_object_tree_find_entry(base_tree, child_path)
4138 err = make_subtree_for_added_blob(&new_te,
4139 child_path, path_base_tree,
4140 commitable_paths, status_cb, status_arg,
4144 err = insert_tree_entry(new_te, &paths);
4153 int i, nbase_entries;
4154 /* Handle modified and deleted entries. */
4155 nbase_entries = got_object_tree_get_nentries(base_tree);
4156 for (i = 0; i < nbase_entries; i++) {
4157 struct got_commitable *ct = NULL;
4159 te = got_object_tree_get_entry(base_tree, i);
4160 if (got_object_tree_entry_is_submodule(te)) {
4161 /* Entry is a submodule; just copy it. */
4162 err = got_object_tree_entry_dup(&new_te, te);
4165 err = insert_tree_entry(new_te, &paths);
4172 if (S_ISDIR(te->mode)) {
4174 err = got_object_tree_entry_dup(&new_te, te);
4177 err = match_modified_subtree(&modified, te,
4178 path_base_tree, commitable_paths);
4181 /* Avoid recursion into unmodified subtrees. */
4183 struct got_object_id *new_id;
4184 err = write_subtree(&new_id, te,
4185 path_base_tree, commitable_paths,
4186 status_cb, status_arg, repo);
4189 memcpy(&new_te->id, new_id,
4190 sizeof(new_te->id));
4193 err = insert_tree_entry(new_te, &paths);
4200 err = match_deleted_or_modified_ct(&ct, te,
4201 path_base_tree, commitable_paths);
4205 /* NB: Deleted entries get dropped here. */
4206 if (ct->status == GOT_STATUS_MODIFY ||
4207 ct->status == GOT_STATUS_MODE_CHANGE ||
4208 ct->staged_status == GOT_STATUS_MODIFY) {
4209 err = alloc_modified_blob_tree_entry(
4213 err = insert_tree_entry(new_te, &paths);
4218 err = report_ct_status(ct, status_cb,
4223 /* Entry is unchanged; just copy it. */
4224 err = got_object_tree_entry_dup(&new_te, te);
4227 err = insert_tree_entry(new_te, &paths);
4235 /* Write new list of entries; deleted entries have been dropped. */
4236 err = got_object_tree_create(new_tree_id, &paths, nentries, repo);
4238 got_pathlist_free(&paths);
4242 static const struct got_error *
4243 update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4244 struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4245 int have_staged_files)
4247 const struct got_error *err = NULL;
4248 struct got_pathlist_entry *pe;
4250 TAILQ_FOREACH(pe, commitable_paths, entry) {
4251 struct got_fileindex_entry *ie;
4252 struct got_commitable *ct = pe->data;
4254 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4256 if (ct->status == GOT_STATUS_DELETE ||
4257 ct->staged_status == GOT_STATUS_DELETE) {
4258 got_fileindex_entry_remove(fileindex, ie);
4259 got_fileindex_entry_free(ie);
4260 } else if (ct->staged_status == GOT_STATUS_ADD ||
4261 ct->staged_status == GOT_STATUS_MODIFY) {
4262 got_fileindex_entry_stage_set(ie,
4263 GOT_FILEIDX_STAGE_NONE);
4264 err = got_fileindex_entry_update(ie,
4265 ct->ondisk_path, ct->staged_blob_id->sha1,
4266 new_base_commit_id->sha1,
4267 !have_staged_files);
4269 err = got_fileindex_entry_update(ie,
4270 ct->ondisk_path, ct->blob_id->sha1,
4271 new_base_commit_id->sha1,
4272 !have_staged_files);
4274 err = got_fileindex_entry_alloc(&ie,
4275 ct->ondisk_path, pe->path, ct->blob_id->sha1,
4276 new_base_commit_id->sha1);
4279 err = got_fileindex_entry_add(fileindex, ie);
4288 static const struct got_error *
4289 check_out_of_date(const char *in_repo_path, unsigned char status,
4290 unsigned char staged_status, struct got_object_id *base_blob_id,
4291 struct got_object_id *base_commit_id,
4292 struct got_object_id *head_commit_id, struct got_repository *repo,
4295 const struct got_error *err = NULL;
4296 struct got_object_id *id = NULL;
4298 if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4299 /* Trivial case: base commit == head commit */
4300 if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4303 * Ensure file content which local changes were based
4304 * on matches file content in the branch head.
4306 err = got_object_id_by_path(&id, repo, head_commit_id,
4309 if (err->code == GOT_ERR_NO_TREE_ENTRY)
4310 err = got_error(ood_errcode);
4312 } else if (got_object_id_cmp(id, base_blob_id) != 0)
4313 err = got_error(ood_errcode);
4315 /* Require that added files don't exist in the branch head. */
4316 err = got_object_id_by_path(&id, repo, head_commit_id,
4318 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4320 err = id ? got_error(ood_errcode) : NULL;
4327 const struct got_error *
4328 commit_worktree(struct got_object_id **new_commit_id,
4329 struct got_pathlist_head *commitable_paths,
4330 struct got_object_id *head_commit_id, struct got_worktree *worktree,
4331 const char *author, const char *committer,
4332 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4333 got_worktree_status_cb status_cb, void *status_arg,
4334 struct got_repository *repo)
4336 const struct got_error *err = NULL, *unlockerr = NULL;
4337 struct got_pathlist_entry *pe;
4338 const char *head_ref_name = NULL;
4339 struct got_commit_object *head_commit = NULL;
4340 struct got_reference *head_ref2 = NULL;
4341 struct got_object_id *head_commit_id2 = NULL;
4342 struct got_tree_object *head_tree = NULL;
4343 struct got_object_id *new_tree_id = NULL;
4344 struct got_object_id_queue parent_ids;
4345 struct got_object_qid *pid = NULL;
4346 char *logmsg = NULL;
4348 *new_commit_id = NULL;
4350 SIMPLEQ_INIT(&parent_ids);
4352 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4356 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4360 if (commit_msg_cb != NULL) {
4361 err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4366 if (logmsg == NULL || strlen(logmsg) == 0) {
4367 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4371 /* Create blobs from added and modified files and record their IDs. */
4372 TAILQ_FOREACH(pe, commitable_paths, entry) {
4373 struct got_commitable *ct = pe->data;
4376 /* Blobs for staged files already exist. */
4377 if (ct->staged_status == GOT_STATUS_ADD ||
4378 ct->staged_status == GOT_STATUS_MODIFY)
4381 if (ct->status != GOT_STATUS_ADD &&
4382 ct->status != GOT_STATUS_MODIFY &&
4383 ct->status != GOT_STATUS_MODE_CHANGE)
4386 if (asprintf(&ondisk_path, "%s/%s",
4387 worktree->root_path, pe->path) == -1) {
4388 err = got_error_from_errno("asprintf");
4391 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4397 /* Recursively write new tree objects. */
4398 err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4399 status_cb, status_arg, repo);
4403 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4406 SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4407 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4408 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4409 got_object_qid_free(pid);
4415 /* Check if a concurrent commit to our branch has occurred. */
4416 head_ref_name = got_worktree_get_head_ref_name(worktree);
4417 if (head_ref_name == NULL) {
4418 err = got_error_from_errno("got_worktree_get_head_ref_name");
4421 /* Lock the reference here to prevent concurrent modification. */
4422 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4425 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4428 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4429 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4432 /* Update branch head in repository. */
4433 err = got_ref_change_ref(head_ref2, *new_commit_id);
4436 err = got_ref_write(head_ref2, repo);
4440 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4444 err = ref_base_commit(worktree, repo);
4449 got_object_tree_close(head_tree);
4451 got_object_commit_close(head_commit);
4452 free(head_commit_id2);
4454 unlockerr = got_ref_unlock(head_ref2);
4455 if (unlockerr && err == NULL)
4457 got_ref_close(head_ref2);
4462 static const struct got_error *
4463 check_path_is_commitable(const char *path,
4464 struct got_pathlist_head *commitable_paths)
4466 struct got_pathlist_entry *cpe = NULL;
4467 size_t path_len = strlen(path);
4469 TAILQ_FOREACH(cpe, commitable_paths, entry) {
4470 struct got_commitable *ct = cpe->data;
4471 const char *ct_path = ct->path;
4473 while (ct_path[0] == '/')
4476 if (strcmp(path, ct_path) == 0 ||
4477 got_path_is_child(ct_path, path, path_len))
4482 return got_error_path(path, GOT_ERR_BAD_PATH);
4487 static const struct got_error *
4488 check_staged_file(void *arg, struct got_fileindex_entry *ie)
4490 int *have_staged_files = arg;
4492 if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4493 *have_staged_files = 1;
4494 return got_error(GOT_ERR_CANCELLED);
4500 static const struct got_error *
4501 check_non_staged_files(struct got_fileindex *fileindex,
4502 struct got_pathlist_head *paths)
4504 struct got_pathlist_entry *pe;
4505 struct got_fileindex_entry *ie;
4507 TAILQ_FOREACH(pe, paths, entry) {
4508 if (pe->path[0] == '\0')
4510 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4512 return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4513 if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4514 return got_error_path(pe->path,
4515 GOT_ERR_FILE_NOT_STAGED);
4521 const struct got_error *
4522 got_worktree_commit(struct got_object_id **new_commit_id,
4523 struct got_worktree *worktree, struct got_pathlist_head *paths,
4524 const char *author, const char *committer,
4525 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4526 got_worktree_status_cb status_cb, void *status_arg,
4527 struct got_repository *repo)
4529 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4530 struct got_fileindex *fileindex = NULL;
4531 char *fileindex_path = NULL;
4532 struct got_pathlist_head commitable_paths;
4533 struct collect_commitables_arg cc_arg;
4534 struct got_pathlist_entry *pe;
4535 struct got_reference *head_ref = NULL;
4536 struct got_object_id *head_commit_id = NULL;
4537 int have_staged_files = 0;
4539 *new_commit_id = NULL;
4541 TAILQ_INIT(&commitable_paths);
4543 err = lock_worktree(worktree, LOCK_EX);
4547 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4551 err = got_ref_resolve(&head_commit_id, repo, head_ref);
4555 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4559 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4560 &have_staged_files);
4561 if (err && err->code != GOT_ERR_CANCELLED)
4563 if (have_staged_files) {
4564 err = check_non_staged_files(fileindex, paths);
4569 cc_arg.commitable_paths = &commitable_paths;
4570 cc_arg.worktree = worktree;
4572 cc_arg.have_staged_files = have_staged_files;
4573 TAILQ_FOREACH(pe, paths, entry) {
4574 err = worktree_status(worktree, pe->path, fileindex, repo,
4575 collect_commitables, &cc_arg, NULL, NULL, 0, 0);
4580 if (TAILQ_EMPTY(&commitable_paths)) {
4581 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4585 TAILQ_FOREACH(pe, paths, entry) {
4586 err = check_path_is_commitable(pe->path, &commitable_paths);
4591 TAILQ_FOREACH(pe, &commitable_paths, entry) {
4592 struct got_commitable *ct = pe->data;
4593 const char *ct_path = ct->in_repo_path;
4595 while (ct_path[0] == '/')
4597 err = check_out_of_date(ct_path, ct->status,
4598 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4599 head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4605 err = commit_worktree(new_commit_id, &commitable_paths,
4606 head_commit_id, worktree, author, committer,
4607 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4611 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4612 fileindex, have_staged_files);
4613 sync_err = sync_fileindex(fileindex, fileindex_path);
4614 if (sync_err && err == NULL)
4618 got_fileindex_free(fileindex);
4619 free(fileindex_path);
4620 unlockerr = lock_worktree(worktree, LOCK_SH);
4621 if (unlockerr && err == NULL)
4623 TAILQ_FOREACH(pe, &commitable_paths, entry) {
4624 struct got_commitable *ct = pe->data;
4625 free_commitable(ct);
4627 got_pathlist_free(&commitable_paths);
4632 got_commitable_get_path(struct got_commitable *ct)
4638 got_commitable_get_status(struct got_commitable *ct)
4643 struct check_rebase_ok_arg {
4644 struct got_worktree *worktree;
4645 struct got_repository *repo;
4648 static const struct got_error *
4649 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4651 const struct got_error *err = NULL;
4652 struct check_rebase_ok_arg *a = arg;
4653 unsigned char status;
4657 /* Reject rebase of a work tree with mixed base commits. */
4658 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4659 SHA1_DIGEST_LENGTH))
4660 return got_error(GOT_ERR_MIXED_COMMITS);
4662 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4664 return got_error_from_errno("asprintf");
4666 /* Reject rebase of a work tree with modified or staged files. */
4667 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
4672 if (status != GOT_STATUS_NO_CHANGE)
4673 return got_error(GOT_ERR_MODIFIED);
4674 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4675 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4680 const struct got_error *
4681 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4682 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4683 struct got_worktree *worktree, struct got_reference *branch,
4684 struct got_repository *repo)
4686 const struct got_error *err = NULL;
4687 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4688 char *branch_ref_name = NULL;
4689 char *fileindex_path = NULL;
4690 struct check_rebase_ok_arg ok_arg;
4691 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4692 struct got_object_id *wt_branch_tip = NULL;
4694 *new_base_branch_ref = NULL;
4698 err = lock_worktree(worktree, LOCK_EX);
4702 err = open_fileindex(fileindex, &fileindex_path, worktree);
4706 ok_arg.worktree = worktree;
4708 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4713 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4717 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4721 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4725 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4730 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
4733 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
4734 err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
4738 err = got_ref_alloc_symref(new_base_branch_ref,
4739 new_base_branch_ref_name, wt_branch);
4742 err = got_ref_write(*new_base_branch_ref, repo);
4746 /* TODO Lock original branch's ref while rebasing? */
4748 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4752 err = got_ref_write(branch_ref, repo);
4756 err = got_ref_alloc(tmp_branch, tmp_branch_name,
4757 worktree->base_commit_id);
4760 err = got_ref_write(*tmp_branch, repo);
4764 err = got_worktree_set_head_ref(worktree, *tmp_branch);
4768 free(fileindex_path);
4769 free(tmp_branch_name);
4770 free(new_base_branch_ref_name);
4771 free(branch_ref_name);
4773 got_ref_close(branch_ref);
4775 got_ref_close(wt_branch);
4776 free(wt_branch_tip);
4778 if (*new_base_branch_ref) {
4779 got_ref_close(*new_base_branch_ref);
4780 *new_base_branch_ref = NULL;
4783 got_ref_close(*tmp_branch);
4787 got_fileindex_free(*fileindex);
4790 lock_worktree(worktree, LOCK_SH);
4795 const struct got_error *
4796 got_worktree_rebase_continue(struct got_object_id **commit_id,
4797 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4798 struct got_reference **branch, struct got_fileindex **fileindex,
4799 struct got_worktree *worktree, struct got_repository *repo)
4801 const struct got_error *err;
4802 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4803 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4804 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4805 char *fileindex_path = NULL;
4806 int have_staged_files = 0;
4809 *new_base_branch = NULL;
4814 err = lock_worktree(worktree, LOCK_EX);
4818 err = open_fileindex(fileindex, &fileindex_path, worktree);
4822 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4823 &have_staged_files);
4824 if (err && err->code != GOT_ERR_CANCELLED)
4826 if (have_staged_files) {
4827 err = got_error(GOT_ERR_STAGED_PATHS);
4831 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4835 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4839 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4843 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4847 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4851 err = got_ref_open(branch, repo,
4852 got_ref_get_symref_target(branch_ref), 0);
4856 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4860 err = got_ref_resolve(commit_id, repo, commit_ref);
4864 err = got_ref_open(new_base_branch, repo,
4865 new_base_branch_ref_name, 0);
4869 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4873 free(commit_ref_name);
4874 free(branch_ref_name);
4875 free(fileindex_path);
4877 got_ref_close(commit_ref);
4879 got_ref_close(branch_ref);
4884 got_ref_close(*tmp_branch);
4887 if (*new_base_branch) {
4888 got_ref_close(*new_base_branch);
4889 *new_base_branch = NULL;
4892 got_ref_close(*branch);
4896 got_fileindex_free(*fileindex);
4899 lock_worktree(worktree, LOCK_SH);
4904 const struct got_error *
4905 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4907 const struct got_error *err;
4908 char *tmp_branch_name = NULL;
4910 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4914 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4915 free(tmp_branch_name);
4919 static const struct got_error *
4920 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4921 char **logmsg, void *arg)
4927 static const struct got_error *
4928 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4929 const char *path, struct got_object_id *blob_id,
4930 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4931 int dirfd, const char *de_name)
4936 struct collect_merged_paths_arg {
4937 got_worktree_checkout_cb progress_cb;
4939 struct got_pathlist_head *merged_paths;
4942 static const struct got_error *
4943 collect_merged_paths(void *arg, unsigned char status, const char *path)
4945 const struct got_error *err;
4946 struct collect_merged_paths_arg *a = arg;
4948 struct got_pathlist_entry *new;
4950 err = (*a->progress_cb)(a->progress_arg, status, path);
4954 if (status != GOT_STATUS_MERGE &&
4955 status != GOT_STATUS_ADD &&
4956 status != GOT_STATUS_DELETE &&
4957 status != GOT_STATUS_CONFLICT)
4962 return got_error_from_errno("strdup");
4964 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4965 if (err || new == NULL)
4971 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4973 struct got_pathlist_entry *pe;
4975 TAILQ_FOREACH(pe, merged_paths, entry)
4976 free((char *)pe->path);
4978 got_pathlist_free(merged_paths);
4981 static const struct got_error *
4982 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4983 struct got_repository *repo)
4985 const struct got_error *err;
4986 struct got_reference *commit_ref = NULL;
4988 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4990 if (err->code != GOT_ERR_NOT_REF)
4992 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4995 err = got_ref_write(commit_ref, repo);
4999 struct got_object_id *stored_id;
5002 err = got_ref_resolve(&stored_id, repo, commit_ref);
5005 cmp = got_object_id_cmp(commit_id, stored_id);
5008 err = got_error(GOT_ERR_REBASE_COMMITID);
5014 got_ref_close(commit_ref);
5018 static const struct got_error *
5019 rebase_merge_files(struct got_pathlist_head *merged_paths,
5020 const char *commit_ref_name, struct got_worktree *worktree,
5021 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
5022 struct got_object_id *commit_id, struct got_repository *repo,
5023 got_worktree_checkout_cb progress_cb, void *progress_arg,
5024 got_cancel_cb cancel_cb, void *cancel_arg)
5026 const struct got_error *err;
5027 struct got_reference *commit_ref = NULL;
5028 struct collect_merged_paths_arg cmp_arg;
5029 char *fileindex_path;
5031 /* Work tree is locked/unlocked during rebase preparation/teardown. */
5033 err = get_fileindex_path(&fileindex_path, worktree);
5037 cmp_arg.progress_cb = progress_cb;
5038 cmp_arg.progress_arg = progress_arg;
5039 cmp_arg.merged_paths = merged_paths;
5040 err = merge_files(worktree, fileindex, fileindex_path,
5041 parent_commit_id, commit_id, repo, collect_merged_paths,
5042 &cmp_arg, cancel_cb, cancel_arg);
5044 got_ref_close(commit_ref);
5048 const struct got_error *
5049 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
5050 struct got_worktree *worktree, struct got_fileindex *fileindex,
5051 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5052 struct got_repository *repo,
5053 got_worktree_checkout_cb progress_cb, void *progress_arg,
5054 got_cancel_cb cancel_cb, void *cancel_arg)
5056 const struct got_error *err;
5057 char *commit_ref_name;
5059 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5063 err = store_commit_id(commit_ref_name, commit_id, repo);
5067 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5068 fileindex, parent_commit_id, commit_id, repo, progress_cb,
5069 progress_arg, cancel_cb, cancel_arg);
5071 free(commit_ref_name);
5075 const struct got_error *
5076 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
5077 struct got_worktree *worktree, struct got_fileindex *fileindex,
5078 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5079 struct got_repository *repo,
5080 got_worktree_checkout_cb progress_cb, void *progress_arg,
5081 got_cancel_cb cancel_cb, void *cancel_arg)
5083 const struct got_error *err;
5084 char *commit_ref_name;
5086 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5090 err = store_commit_id(commit_ref_name, commit_id, repo);
5094 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5095 fileindex, parent_commit_id, commit_id, repo, progress_cb,
5096 progress_arg, cancel_cb, cancel_arg);
5098 free(commit_ref_name);
5102 static const struct got_error *
5103 rebase_commit(struct got_object_id **new_commit_id,
5104 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
5105 struct got_worktree *worktree, struct got_fileindex *fileindex,
5106 struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
5107 const char *new_logmsg, struct got_repository *repo)
5109 const struct got_error *err, *sync_err;
5110 struct got_pathlist_head commitable_paths;
5111 struct collect_commitables_arg cc_arg;
5112 char *fileindex_path = NULL;
5113 struct got_reference *head_ref = NULL;
5114 struct got_object_id *head_commit_id = NULL;
5115 char *logmsg = NULL;
5117 TAILQ_INIT(&commitable_paths);
5118 *new_commit_id = NULL;
5120 /* Work tree is locked/unlocked during rebase preparation/teardown. */
5122 err = get_fileindex_path(&fileindex_path, worktree);
5126 cc_arg.commitable_paths = &commitable_paths;
5127 cc_arg.worktree = worktree;
5129 cc_arg.have_staged_files = 0;
5131 * If possible get the status of individual files directly to
5132 * avoid crawling the entire work tree once per rebased commit.
5133 * TODO: Ideally, merged_paths would contain a list of commitables
5134 * we could use so we could skip worktree_status() entirely.
5137 struct got_pathlist_entry *pe;
5138 if (TAILQ_EMPTY(merged_paths)) {
5139 err = got_error(GOT_ERR_NO_MERGED_PATHS);
5142 TAILQ_FOREACH(pe, merged_paths, entry) {
5143 err = worktree_status(worktree, pe->path, fileindex,
5144 repo, collect_commitables, &cc_arg, NULL, NULL, 0,
5150 err = worktree_status(worktree, "", fileindex, repo,
5151 collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5156 if (TAILQ_EMPTY(&commitable_paths)) {
5157 /* No-op change; commit will be elided. */
5158 err = got_ref_delete(commit_ref, repo);
5161 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5165 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5169 err = got_ref_resolve(&head_commit_id, repo, head_ref);
5174 logmsg = strdup(new_logmsg);
5175 if (logmsg == NULL) {
5176 err = got_error_from_errno("strdup");
5180 err = got_object_commit_get_logmsg(&logmsg, orig_commit);
5185 /* NB: commit_worktree will call free(logmsg) */
5186 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
5187 worktree, got_object_commit_get_author(orig_commit),
5188 got_object_commit_get_committer(orig_commit),
5189 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5193 err = got_ref_change_ref(tmp_branch, *new_commit_id);
5197 err = got_ref_delete(commit_ref, repo);
5201 err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5203 sync_err = sync_fileindex(fileindex, fileindex_path);
5204 if (sync_err && err == NULL)
5207 free(fileindex_path);
5208 free(head_commit_id);
5210 got_ref_close(head_ref);
5212 free(*new_commit_id);
5213 *new_commit_id = NULL;
5218 const struct got_error *
5219 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5220 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5221 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5222 struct got_commit_object *orig_commit,
5223 struct got_object_id *orig_commit_id, struct got_repository *repo)
5225 const struct got_error *err;
5226 char *commit_ref_name;
5227 struct got_reference *commit_ref = NULL;
5228 struct got_object_id *commit_id = NULL;
5230 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5234 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5237 err = got_ref_resolve(&commit_id, repo, commit_ref);
5240 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5241 err = got_error(GOT_ERR_REBASE_COMMITID);
5245 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5246 worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5249 got_ref_close(commit_ref);
5250 free(commit_ref_name);
5255 const struct got_error *
5256 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5257 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5258 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5259 struct got_commit_object *orig_commit,
5260 struct got_object_id *orig_commit_id, const char *new_logmsg,
5261 struct got_repository *repo)
5263 const struct got_error *err;
5264 char *commit_ref_name;
5265 struct got_reference *commit_ref = NULL;
5266 struct got_object_id *commit_id = NULL;
5268 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5272 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5275 err = got_ref_resolve(&commit_id, repo, commit_ref);
5278 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5279 err = got_error(GOT_ERR_HISTEDIT_COMMITID);
5283 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5284 worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5287 got_ref_close(commit_ref);
5288 free(commit_ref_name);
5293 const struct got_error *
5294 got_worktree_rebase_postpone(struct got_worktree *worktree,
5295 struct got_fileindex *fileindex)
5298 got_fileindex_free(fileindex);
5299 return lock_worktree(worktree, LOCK_SH);
5302 static const struct got_error *
5303 delete_ref(const char *name, struct got_repository *repo)
5305 const struct got_error *err;
5306 struct got_reference *ref;
5308 err = got_ref_open(&ref, repo, name, 0);
5310 if (err->code == GOT_ERR_NOT_REF)
5315 err = got_ref_delete(ref, repo);
5320 static const struct got_error *
5321 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5323 const struct got_error *err;
5324 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5325 char *branch_ref_name = NULL, *commit_ref_name = NULL;
5327 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5330 err = delete_ref(tmp_branch_name, repo);
5334 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5337 err = delete_ref(new_base_branch_ref_name, repo);
5341 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5344 err = delete_ref(branch_ref_name, repo);
5348 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5351 err = delete_ref(commit_ref_name, repo);
5356 free(tmp_branch_name);
5357 free(new_base_branch_ref_name);
5358 free(branch_ref_name);
5359 free(commit_ref_name);
5363 const struct got_error *
5364 got_worktree_rebase_complete(struct got_worktree *worktree,
5365 struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5366 struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5367 struct got_repository *repo)
5369 const struct got_error *err, *unlockerr;
5370 struct got_object_id *new_head_commit_id = NULL;
5372 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5376 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5380 err = got_ref_write(rebased_branch, repo);
5384 err = got_worktree_set_head_ref(worktree, rebased_branch);
5388 err = delete_rebase_refs(worktree, repo);
5391 got_fileindex_free(fileindex);
5392 free(new_head_commit_id);
5393 unlockerr = lock_worktree(worktree, LOCK_SH);
5394 if (unlockerr && err == NULL)
5399 const struct got_error *
5400 got_worktree_rebase_abort(struct got_worktree *worktree,
5401 struct got_fileindex *fileindex, struct got_repository *repo,
5402 struct got_reference *new_base_branch,
5403 got_worktree_checkout_cb progress_cb, void *progress_arg)
5405 const struct got_error *err, *unlockerr, *sync_err;
5406 struct got_reference *resolved = NULL;
5407 struct got_object_id *commit_id = NULL;
5408 char *fileindex_path = NULL;
5409 struct revert_file_args rfa;
5410 struct got_object_id *tree_id = NULL;
5412 err = lock_worktree(worktree, LOCK_EX);
5416 err = got_ref_open(&resolved, repo,
5417 got_ref_get_symref_target(new_base_branch), 0);
5421 err = got_worktree_set_head_ref(worktree, resolved);
5426 * XXX commits to the base branch could have happened while
5427 * we were busy rebasing; should we store the original commit ID
5428 * when rebase begins and read it back here?
5430 err = got_ref_resolve(&commit_id, repo, resolved);
5434 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5438 err = got_object_id_by_path(&tree_id, repo,
5439 worktree->base_commit_id, worktree->path_prefix);
5443 err = delete_rebase_refs(worktree, repo);
5447 err = get_fileindex_path(&fileindex_path, worktree);
5451 rfa.worktree = worktree;
5452 rfa.fileindex = fileindex;
5453 rfa.progress_cb = progress_cb;
5454 rfa.progress_arg = progress_arg;
5455 rfa.patch_cb = NULL;
5456 rfa.patch_arg = NULL;
5458 err = worktree_status(worktree, "", fileindex, repo,
5459 revert_file, &rfa, NULL, NULL, 0, 0);
5463 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5464 repo, progress_cb, progress_arg, NULL, NULL);
5466 sync_err = sync_fileindex(fileindex, fileindex_path);
5467 if (sync_err && err == NULL)
5470 got_ref_close(resolved);
5474 got_fileindex_free(fileindex);
5475 free(fileindex_path);
5477 unlockerr = lock_worktree(worktree, LOCK_SH);
5478 if (unlockerr && err == NULL)
5483 const struct got_error *
5484 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5485 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5486 struct got_fileindex **fileindex, struct got_worktree *worktree,
5487 struct got_repository *repo)
5489 const struct got_error *err = NULL;
5490 char *tmp_branch_name = NULL;
5491 char *branch_ref_name = NULL;
5492 char *base_commit_ref_name = NULL;
5493 char *fileindex_path = NULL;
5494 struct check_rebase_ok_arg ok_arg;
5495 struct got_reference *wt_branch = NULL;
5496 struct got_reference *base_commit_ref = NULL;
5500 *base_commit_id = NULL;
5503 err = lock_worktree(worktree, LOCK_EX);
5507 err = open_fileindex(fileindex, &fileindex_path, worktree);
5511 ok_arg.worktree = worktree;
5513 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5518 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5522 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5526 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5531 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5536 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5540 err = got_ref_write(*branch_ref, repo);
5544 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5545 worktree->base_commit_id);
5548 err = got_ref_write(base_commit_ref, repo);
5551 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5552 if (*base_commit_id == NULL) {
5553 err = got_error_from_errno("got_object_id_dup");
5557 err = got_ref_alloc(tmp_branch, tmp_branch_name,
5558 worktree->base_commit_id);
5561 err = got_ref_write(*tmp_branch, repo);
5565 err = got_worktree_set_head_ref(worktree, *tmp_branch);
5569 free(fileindex_path);
5570 free(tmp_branch_name);
5571 free(branch_ref_name);
5572 free(base_commit_ref_name);
5574 got_ref_close(wt_branch);
5577 got_ref_close(*branch_ref);
5581 got_ref_close(*tmp_branch);
5584 free(*base_commit_id);
5586 got_fileindex_free(*fileindex);
5589 lock_worktree(worktree, LOCK_SH);
5594 const struct got_error *
5595 got_worktree_histedit_postpone(struct got_worktree *worktree,
5596 struct got_fileindex *fileindex)
5599 got_fileindex_free(fileindex);
5600 return lock_worktree(worktree, LOCK_SH);
5603 const struct got_error *
5604 got_worktree_histedit_in_progress(int *in_progress,
5605 struct got_worktree *worktree)
5607 const struct got_error *err;
5608 char *tmp_branch_name = NULL;
5610 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5614 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5615 free(tmp_branch_name);
5619 const struct got_error *
5620 got_worktree_histedit_continue(struct got_object_id **commit_id,
5621 struct got_reference **tmp_branch, struct got_reference **branch_ref,
5622 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5623 struct got_worktree *worktree, struct got_repository *repo)
5625 const struct got_error *err;
5626 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5627 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5628 struct got_reference *commit_ref = NULL;
5629 struct got_reference *base_commit_ref = NULL;
5630 char *fileindex_path = NULL;
5631 int have_staged_files = 0;
5635 *base_commit_id = NULL;
5638 err = lock_worktree(worktree, LOCK_EX);
5642 err = open_fileindex(fileindex, &fileindex_path, worktree);
5646 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5647 &have_staged_files);
5648 if (err && err->code != GOT_ERR_CANCELLED)
5650 if (have_staged_files) {
5651 err = got_error(GOT_ERR_STAGED_PATHS);
5655 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5659 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5663 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5667 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5672 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5676 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5679 err = got_ref_resolve(commit_id, repo, commit_ref);
5683 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5686 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5690 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5694 free(commit_ref_name);
5695 free(branch_ref_name);
5696 free(fileindex_path);
5698 got_ref_close(commit_ref);
5699 if (base_commit_ref)
5700 got_ref_close(base_commit_ref);
5704 free(*base_commit_id);
5705 *base_commit_id = NULL;
5707 got_ref_close(*tmp_branch);
5711 got_fileindex_free(*fileindex);
5714 lock_worktree(worktree, LOCK_EX);
5719 static const struct got_error *
5720 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5722 const struct got_error *err;
5723 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5724 char *branch_ref_name = NULL, *commit_ref_name = NULL;
5726 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5729 err = delete_ref(tmp_branch_name, repo);
5733 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5737 err = delete_ref(base_commit_ref_name, repo);
5741 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5744 err = delete_ref(branch_ref_name, repo);
5748 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5751 err = delete_ref(commit_ref_name, repo);
5755 free(tmp_branch_name);
5756 free(base_commit_ref_name);
5757 free(branch_ref_name);
5758 free(commit_ref_name);
5762 const struct got_error *
5763 got_worktree_histedit_abort(struct got_worktree *worktree,
5764 struct got_fileindex *fileindex, struct got_repository *repo,
5765 struct got_reference *branch, struct got_object_id *base_commit_id,
5766 got_worktree_checkout_cb progress_cb, void *progress_arg)
5768 const struct got_error *err, *unlockerr, *sync_err;
5769 struct got_reference *resolved = NULL;
5770 char *fileindex_path = NULL;
5771 struct got_object_id *tree_id = NULL;
5772 struct revert_file_args rfa;
5774 err = lock_worktree(worktree, LOCK_EX);
5778 err = got_ref_open(&resolved, repo,
5779 got_ref_get_symref_target(branch), 0);
5783 err = got_worktree_set_head_ref(worktree, resolved);
5787 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5791 err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5792 worktree->path_prefix);
5796 err = delete_histedit_refs(worktree, repo);
5800 err = get_fileindex_path(&fileindex_path, worktree);
5804 rfa.worktree = worktree;
5805 rfa.fileindex = fileindex;
5806 rfa.progress_cb = progress_cb;
5807 rfa.progress_arg = progress_arg;
5808 rfa.patch_cb = NULL;
5809 rfa.patch_arg = NULL;
5811 err = worktree_status(worktree, "", fileindex, repo,
5812 revert_file, &rfa, NULL, NULL, 0, 0);
5816 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5817 repo, progress_cb, progress_arg, NULL, NULL);
5819 sync_err = sync_fileindex(fileindex, fileindex_path);
5820 if (sync_err && err == NULL)
5823 got_ref_close(resolved);
5825 free(fileindex_path);
5827 unlockerr = lock_worktree(worktree, LOCK_SH);
5828 if (unlockerr && err == NULL)
5833 const struct got_error *
5834 got_worktree_histedit_complete(struct got_worktree *worktree,
5835 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5836 struct got_reference *edited_branch, struct got_repository *repo)
5838 const struct got_error *err, *unlockerr;
5839 struct got_object_id *new_head_commit_id = NULL;
5840 struct got_reference *resolved = NULL;
5842 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5846 err = got_ref_open(&resolved, repo,
5847 got_ref_get_symref_target(edited_branch), 0);
5851 err = got_ref_change_ref(resolved, new_head_commit_id);
5855 err = got_ref_write(resolved, repo);
5859 err = got_worktree_set_head_ref(worktree, resolved);
5863 err = delete_histedit_refs(worktree, repo);
5866 got_fileindex_free(fileindex);
5867 free(new_head_commit_id);
5868 unlockerr = lock_worktree(worktree, LOCK_SH);
5869 if (unlockerr && err == NULL)
5874 const struct got_error *
5875 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5876 struct got_object_id *commit_id, struct got_repository *repo)
5878 const struct got_error *err;
5879 char *commit_ref_name;
5881 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5885 err = store_commit_id(commit_ref_name, commit_id, repo);
5889 err = delete_ref(commit_ref_name, repo);
5891 free(commit_ref_name);
5895 const struct got_error *
5896 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
5897 struct got_reference **branch_ref, struct got_reference **base_branch_ref,
5898 struct got_worktree *worktree, const char *refname,
5899 struct got_repository *repo)
5901 const struct got_error *err = NULL;
5902 char *fileindex_path = NULL;
5903 struct check_rebase_ok_arg ok_arg;
5907 *base_branch_ref = NULL;
5909 err = lock_worktree(worktree, LOCK_EX);
5913 if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
5914 err = got_error_msg(GOT_ERR_SAME_BRANCH,
5915 "cannot integrate a branch into itself; "
5916 "update -b or different branch name required");
5920 err = open_fileindex(fileindex, &fileindex_path, worktree);
5924 /* Preconditions are the same as for rebase. */
5925 ok_arg.worktree = worktree;
5927 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5932 err = got_ref_open(branch_ref, repo, refname, 1);
5936 err = got_ref_open(base_branch_ref, repo,
5937 got_worktree_get_head_ref_name(worktree), 1);
5941 got_ref_close(*branch_ref);
5944 if (*base_branch_ref) {
5945 got_ref_close(*base_branch_ref);
5946 *base_branch_ref = NULL;
5949 got_fileindex_free(*fileindex);
5952 lock_worktree(worktree, LOCK_SH);
5957 const struct got_error *
5958 got_worktree_integrate_continue(struct got_worktree *worktree,
5959 struct got_fileindex *fileindex, struct got_repository *repo,
5960 struct got_reference *branch_ref, struct got_reference *base_branch_ref,
5961 got_worktree_checkout_cb progress_cb, void *progress_arg,
5962 got_cancel_cb cancel_cb, void *cancel_arg)
5964 const struct got_error *err = NULL, *sync_err, *unlockerr;
5965 char *fileindex_path = NULL;
5966 struct got_object_id *tree_id = NULL, *commit_id = NULL;
5968 err = get_fileindex_path(&fileindex_path, worktree);
5972 err = got_ref_resolve(&commit_id, repo, branch_ref);
5976 err = got_object_id_by_path(&tree_id, repo, commit_id,
5977 worktree->path_prefix);
5981 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5985 err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
5986 progress_cb, progress_arg, cancel_cb, cancel_arg);
5990 err = got_ref_change_ref(base_branch_ref, commit_id);
5994 err = got_ref_write(base_branch_ref, repo);
5996 sync_err = sync_fileindex(fileindex, fileindex_path);
5997 if (sync_err && err == NULL)
6001 unlockerr = got_ref_unlock(branch_ref);
6002 if (unlockerr && err == NULL)
6004 got_ref_close(branch_ref);
6006 unlockerr = got_ref_unlock(base_branch_ref);
6007 if (unlockerr && err == NULL)
6009 got_ref_close(base_branch_ref);
6011 got_fileindex_free(fileindex);
6012 free(fileindex_path);
6015 unlockerr = lock_worktree(worktree, LOCK_SH);
6016 if (unlockerr && err == NULL)
6021 const struct got_error *
6022 got_worktree_integrate_abort(struct got_worktree *worktree,
6023 struct got_fileindex *fileindex, struct got_repository *repo,
6024 struct got_reference *branch_ref, struct got_reference *base_branch_ref)
6026 const struct got_error *err = NULL, *unlockerr = NULL;
6028 got_fileindex_free(fileindex);
6030 err = lock_worktree(worktree, LOCK_SH);
6032 unlockerr = got_ref_unlock(branch_ref);
6033 if (unlockerr && err == NULL)
6035 got_ref_close(branch_ref);
6037 unlockerr = got_ref_unlock(base_branch_ref);
6038 if (unlockerr && err == NULL)
6040 got_ref_close(base_branch_ref);
6045 struct check_stage_ok_arg {
6046 struct got_object_id *head_commit_id;
6047 struct got_worktree *worktree;
6048 struct got_fileindex *fileindex;
6049 struct got_repository *repo;
6053 const struct got_error *
6054 check_stage_ok(void *arg, unsigned char status,
6055 unsigned char staged_status, const char *relpath,
6056 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6057 struct got_object_id *commit_id, int dirfd, const char *de_name)
6059 struct check_stage_ok_arg *a = arg;
6060 const struct got_error *err = NULL;
6061 struct got_fileindex_entry *ie;
6062 struct got_object_id base_commit_id;
6063 struct got_object_id *base_commit_idp = NULL;
6064 char *in_repo_path = NULL, *p;
6066 if (status == GOT_STATUS_UNVERSIONED ||
6067 status == GOT_STATUS_NO_CHANGE)
6069 if (status == GOT_STATUS_NONEXISTENT)
6070 return got_error_set_errno(ENOENT, relpath);
6072 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6074 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6076 if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
6077 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
6079 return got_error_from_errno("asprintf");
6081 if (got_fileindex_entry_has_commit(ie)) {
6082 memcpy(base_commit_id.sha1, ie->commit_sha1,
6083 SHA1_DIGEST_LENGTH);
6084 base_commit_idp = &base_commit_id;
6087 if (status == GOT_STATUS_CONFLICT) {
6088 err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
6090 } else if (status != GOT_STATUS_ADD &&
6091 status != GOT_STATUS_MODIFY &&
6092 status != GOT_STATUS_DELETE) {
6093 err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
6097 a->have_changes = 1;
6102 err = check_out_of_date(p, status, staged_status,
6103 blob_id, base_commit_idp, a->head_commit_id, a->repo,
6104 GOT_ERR_STAGE_OUT_OF_DATE);
6110 struct stage_path_arg {
6111 struct got_worktree *worktree;
6112 struct got_fileindex *fileindex;
6113 struct got_repository *repo;
6114 got_worktree_status_cb status_cb;
6116 got_worktree_patch_cb patch_cb;
6118 int staged_something;
6121 static const struct got_error *
6122 stage_path(void *arg, unsigned char status,
6123 unsigned char staged_status, const char *relpath,
6124 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6125 struct got_object_id *commit_id, int dirfd, const char *de_name)
6127 struct stage_path_arg *a = arg;
6128 const struct got_error *err = NULL;
6129 struct got_fileindex_entry *ie;
6130 char *ondisk_path = NULL, *path_content = NULL;
6132 struct got_object_id *new_staged_blob_id = NULL;
6134 if (status == GOT_STATUS_UNVERSIONED)
6137 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6139 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6141 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
6143 return got_error_from_errno("asprintf");
6146 case GOT_STATUS_ADD:
6147 case GOT_STATUS_MODIFY:
6149 if (status == GOT_STATUS_ADD) {
6150 int choice = GOT_PATCH_CHOICE_NONE;
6151 err = (*a->patch_cb)(&choice, a->patch_arg,
6152 status, ie->path, NULL, 1, 1);
6155 if (choice != GOT_PATCH_CHOICE_YES)
6158 err = create_patched_content(&path_content, 0,
6159 staged_blob_id ? staged_blob_id : blob_id,
6160 ondisk_path, dirfd, de_name, ie->path,
6161 a->repo, a->patch_cb, a->patch_arg);
6162 if (err || path_content == NULL)
6166 err = got_object_blob_create(&new_staged_blob_id,
6167 path_content ? path_content : ondisk_path, a->repo);
6170 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
6171 SHA1_DIGEST_LENGTH);
6172 if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
6173 stage = GOT_FILEIDX_STAGE_ADD;
6175 stage = GOT_FILEIDX_STAGE_MODIFY;
6176 got_fileindex_entry_stage_set(ie, stage);
6177 a->staged_something = 1;
6178 if (a->status_cb == NULL)
6180 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6181 get_staged_status(ie), relpath, blob_id,
6182 new_staged_blob_id, NULL, dirfd, de_name);
6184 case GOT_STATUS_DELETE:
6185 if (staged_status == GOT_STATUS_DELETE)
6188 int choice = GOT_PATCH_CHOICE_NONE;
6189 err = (*a->patch_cb)(&choice, a->patch_arg, status,
6190 ie->path, NULL, 1, 1);
6193 if (choice == GOT_PATCH_CHOICE_NO)
6195 if (choice != GOT_PATCH_CHOICE_YES) {
6196 err = got_error(GOT_ERR_PATCH_CHOICE);
6200 stage = GOT_FILEIDX_STAGE_DELETE;
6201 got_fileindex_entry_stage_set(ie, stage);
6202 a->staged_something = 1;
6203 if (a->status_cb == NULL)
6205 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6206 get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
6209 case GOT_STATUS_NO_CHANGE:
6211 case GOT_STATUS_CONFLICT:
6212 err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6214 case GOT_STATUS_NONEXISTENT:
6215 err = got_error_set_errno(ENOENT, relpath);
6218 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6222 if (path_content && unlink(path_content) == -1 && err == NULL)
6223 err = got_error_from_errno2("unlink", path_content);
6226 free(new_staged_blob_id);
6230 const struct got_error *
6231 got_worktree_stage(struct got_worktree *worktree,
6232 struct got_pathlist_head *paths,
6233 got_worktree_status_cb status_cb, void *status_arg,
6234 got_worktree_patch_cb patch_cb, void *patch_arg,
6235 struct got_repository *repo)
6237 const struct got_error *err = NULL, *sync_err, *unlockerr;
6238 struct got_pathlist_entry *pe;
6239 struct got_fileindex *fileindex = NULL;
6240 char *fileindex_path = NULL;
6241 struct got_reference *head_ref = NULL;
6242 struct got_object_id *head_commit_id = NULL;
6243 struct check_stage_ok_arg oka;
6244 struct stage_path_arg spa;
6246 err = lock_worktree(worktree, LOCK_EX);
6250 err = got_ref_open(&head_ref, repo,
6251 got_worktree_get_head_ref_name(worktree), 0);
6254 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6257 err = open_fileindex(&fileindex, &fileindex_path, worktree);
6261 /* Check pre-conditions before staging anything. */
6262 oka.head_commit_id = head_commit_id;
6263 oka.worktree = worktree;
6264 oka.fileindex = fileindex;
6266 oka.have_changes = 0;
6267 TAILQ_FOREACH(pe, paths, entry) {
6268 err = worktree_status(worktree, pe->path, fileindex, repo,
6269 check_stage_ok, &oka, NULL, NULL, 0, 0);
6273 if (!oka.have_changes) {
6274 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6278 spa.worktree = worktree;
6279 spa.fileindex = fileindex;
6281 spa.patch_cb = patch_cb;
6282 spa.patch_arg = patch_arg;
6283 spa.status_cb = status_cb;
6284 spa.status_arg = status_arg;
6285 spa.staged_something = 0;
6286 TAILQ_FOREACH(pe, paths, entry) {
6287 err = worktree_status(worktree, pe->path, fileindex, repo,
6288 stage_path, &spa, NULL, NULL, 0, 0);
6292 if (!spa.staged_something) {
6293 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6297 sync_err = sync_fileindex(fileindex, fileindex_path);
6298 if (sync_err && err == NULL)
6302 got_ref_close(head_ref);
6303 free(head_commit_id);
6304 free(fileindex_path);
6306 got_fileindex_free(fileindex);
6307 unlockerr = lock_worktree(worktree, LOCK_SH);
6308 if (unlockerr && err == NULL)
6313 struct unstage_path_arg {
6314 struct got_worktree *worktree;
6315 struct got_fileindex *fileindex;
6316 struct got_repository *repo;
6317 got_worktree_checkout_cb progress_cb;
6319 got_worktree_patch_cb patch_cb;
6323 static const struct got_error *
6324 create_unstaged_content(char **path_unstaged_content,
6325 char **path_new_staged_content, struct got_object_id *blob_id,
6326 struct got_object_id *staged_blob_id, const char *relpath,
6327 struct got_repository *repo,
6328 got_worktree_patch_cb patch_cb, void *patch_arg)
6330 const struct got_error *err;
6331 struct got_blob_object *blob = NULL, *staged_blob = NULL;
6332 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6333 char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6334 struct stat sb1, sb2;
6335 struct got_diff_changes *changes = NULL;
6336 struct got_diff_state *ds = NULL;
6337 struct got_diff_args *args = NULL;
6338 struct got_diff_change *change;
6339 int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6340 int have_content = 0, have_rejected_content = 0;
6342 *path_unstaged_content = NULL;
6343 *path_new_staged_content = NULL;
6345 err = got_object_id_str(&label1, blob_id);
6348 err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6352 err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6356 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6360 err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6364 err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6368 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6372 if (stat(path1, &sb1) == -1) {
6373 err = got_error_from_errno2("stat", path1);
6377 if (stat(path2, &sb2) == -1) {
6378 err = got_error_from_errno2("stat", path2);
6382 err = got_diff_files(&changes, &ds, &args, &diff_flags,
6383 f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6387 err = got_opentemp_named(path_unstaged_content, &outfile,
6388 "got-unstaged-content");
6391 err = got_opentemp_named(path_new_staged_content, &rejectfile,
6392 "got-new-staged-content");
6396 if (fseek(f1, 0L, SEEK_SET) == -1) {
6397 err = got_ferror(f1, GOT_ERR_IO);
6400 if (fseek(f2, 0L, SEEK_SET) == -1) {
6401 err = got_ferror(f2, GOT_ERR_IO);
6404 SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6406 err = apply_or_reject_change(&choice, change, ++n,
6407 changes->nchanges, ds, args, diff_flags, relpath,
6408 f1, f2, &line_cur1, &line_cur2,
6409 outfile, rejectfile, patch_cb, patch_arg);
6412 if (choice == GOT_PATCH_CHOICE_YES)
6415 have_rejected_content = 1;
6416 if (choice == GOT_PATCH_CHOICE_QUIT)
6419 if (have_content || have_rejected_content)
6420 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6421 outfile, rejectfile);
6425 got_object_blob_close(blob);
6427 got_object_blob_close(staged_blob);
6428 if (f1 && fclose(f1) == EOF && err == NULL)
6429 err = got_error_from_errno2("fclose", path1);
6430 if (f2 && fclose(f2) == EOF && err == NULL)
6431 err = got_error_from_errno2("fclose", path2);
6432 if (outfile && fclose(outfile) == EOF && err == NULL)
6433 err = got_error_from_errno2("fclose", *path_unstaged_content);
6434 if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6435 err = got_error_from_errno2("fclose", *path_new_staged_content);
6436 if (path1 && unlink(path1) == -1 && err == NULL)
6437 err = got_error_from_errno2("unlink", path1);
6438 if (path2 && unlink(path2) == -1 && err == NULL)
6439 err = got_error_from_errno2("unlink", path2);
6440 if (err || !have_content) {
6441 if (*path_unstaged_content &&
6442 unlink(*path_unstaged_content) == -1 && err == NULL)
6443 err = got_error_from_errno2("unlink",
6444 *path_unstaged_content);
6445 free(*path_unstaged_content);
6446 *path_unstaged_content = NULL;
6448 if (err || !have_rejected_content) {
6449 if (*path_new_staged_content &&
6450 unlink(*path_new_staged_content) == -1 && err == NULL)
6451 err = got_error_from_errno2("unlink",
6452 *path_new_staged_content);
6453 free(*path_new_staged_content);
6454 *path_new_staged_content = NULL;
6458 got_diff_state_free(ds);
6462 got_diff_free_changes(changes);
6468 static const struct got_error *
6469 unstage_path(void *arg, unsigned char status,
6470 unsigned char staged_status, const char *relpath,
6471 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6472 struct got_object_id *commit_id, int dirfd, const char *de_name)
6474 const struct got_error *err = NULL;
6475 struct unstage_path_arg *a = arg;
6476 struct got_fileindex_entry *ie;
6477 struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6478 char *ondisk_path = NULL, *path_unstaged_content = NULL;
6479 char *path_new_staged_content = NULL;
6480 char *id_str = NULL, *label_orig = NULL;
6481 int local_changes_subsumed;
6484 if (staged_status != GOT_STATUS_ADD &&
6485 staged_status != GOT_STATUS_MODIFY &&
6486 staged_status != GOT_STATUS_DELETE)
6489 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6491 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6493 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6495 return got_error_from_errno("asprintf");
6497 err = got_object_id_str(&id_str,
6498 commit_id ? commit_id : a->worktree->base_commit_id);
6501 if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
6503 err = got_error_from_errno("asprintf");
6507 switch (staged_status) {
6508 case GOT_STATUS_MODIFY:
6509 err = got_object_open_as_blob(&blob_base, a->repo,
6514 case GOT_STATUS_ADD:
6516 if (staged_status == GOT_STATUS_ADD) {
6517 int choice = GOT_PATCH_CHOICE_NONE;
6518 err = (*a->patch_cb)(&choice, a->patch_arg,
6519 staged_status, ie->path, NULL, 1, 1);
6522 if (choice != GOT_PATCH_CHOICE_YES)
6525 err = create_unstaged_content(
6526 &path_unstaged_content,
6527 &path_new_staged_content, blob_id,
6528 staged_blob_id, ie->path, a->repo,
6529 a->patch_cb, a->patch_arg);
6530 if (err || path_unstaged_content == NULL)
6532 if (path_new_staged_content) {
6533 err = got_object_blob_create(
6535 path_new_staged_content,
6539 memcpy(ie->staged_blob_sha1,
6540 staged_blob_id->sha1,
6541 SHA1_DIGEST_LENGTH);
6543 err = merge_file(&local_changes_subsumed,
6544 a->worktree, blob_base, ondisk_path,
6545 relpath, got_fileindex_perms_to_st(ie),
6546 path_unstaged_content, label_orig,
6547 "unstaged", a->repo, a->progress_cb,
6550 path_new_staged_content == NULL)
6551 got_fileindex_entry_stage_set(ie,
6552 GOT_FILEIDX_STAGE_NONE);
6553 break; /* Done with this file. */
6556 err = got_object_open_as_blob(&blob_staged, a->repo,
6557 staged_blob_id, 8192);
6560 err = merge_blob(&local_changes_subsumed, a->worktree,
6561 blob_base, ondisk_path, relpath,
6562 got_fileindex_perms_to_st(ie), label_orig, blob_staged,
6563 commit_id ? commit_id : a->worktree->base_commit_id,
6564 a->repo, a->progress_cb, a->progress_arg);
6566 got_fileindex_entry_stage_set(ie,
6567 GOT_FILEIDX_STAGE_NONE);
6569 case GOT_STATUS_DELETE:
6571 int choice = GOT_PATCH_CHOICE_NONE;
6572 err = (*a->patch_cb)(&choice, a->patch_arg,
6573 staged_status, ie->path, NULL, 1, 1);
6576 if (choice == GOT_PATCH_CHOICE_NO)
6578 if (choice != GOT_PATCH_CHOICE_YES) {
6579 err = got_error(GOT_ERR_PATCH_CHOICE);
6583 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6584 err = get_file_status(&status, &sb, ie, ondisk_path,
6585 dirfd, de_name, a->repo);
6588 err = (*a->progress_cb)(a->progress_arg, status, relpath);
6593 if (path_unstaged_content &&
6594 unlink(path_unstaged_content) == -1 && err == NULL)
6595 err = got_error_from_errno2("unlink", path_unstaged_content);
6596 if (path_new_staged_content &&
6597 unlink(path_new_staged_content) == -1 && err == NULL)
6598 err = got_error_from_errno2("unlink", path_new_staged_content);
6599 free(path_unstaged_content);
6600 free(path_new_staged_content);
6602 got_object_blob_close(blob_base);
6604 got_object_blob_close(blob_staged);
6610 const struct got_error *
6611 got_worktree_unstage(struct got_worktree *worktree,
6612 struct got_pathlist_head *paths,
6613 got_worktree_checkout_cb progress_cb, void *progress_arg,
6614 got_worktree_patch_cb patch_cb, void *patch_arg,
6615 struct got_repository *repo)
6617 const struct got_error *err = NULL, *sync_err, *unlockerr;
6618 struct got_pathlist_entry *pe;
6619 struct got_fileindex *fileindex = NULL;
6620 char *fileindex_path = NULL;
6621 struct unstage_path_arg upa;
6623 err = lock_worktree(worktree, LOCK_EX);
6627 err = open_fileindex(&fileindex, &fileindex_path, worktree);
6631 upa.worktree = worktree;
6632 upa.fileindex = fileindex;
6634 upa.progress_cb = progress_cb;
6635 upa.progress_arg = progress_arg;
6636 upa.patch_cb = patch_cb;
6637 upa.patch_arg = patch_arg;
6638 TAILQ_FOREACH(pe, paths, entry) {
6639 err = worktree_status(worktree, pe->path, fileindex, repo,
6640 unstage_path, &upa, NULL, NULL, 0, 0);
6645 sync_err = sync_fileindex(fileindex, fileindex_path);
6646 if (sync_err && err == NULL)
6649 free(fileindex_path);
6651 got_fileindex_free(fileindex);
6652 unlockerr = lock_worktree(worktree, LOCK_SH);
6653 if (unlockerr && err == NULL)