2 * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 #include <sys/limits.h>
19 #include <sys/queue.h>
37 #include "got_error.h"
38 #include "got_repository.h"
39 #include "got_reference.h"
40 #include "got_object.h"
41 #include "got_worktree.h"
42 #include "got_opentemp.h"
44 #include "got_lib_worktree.h"
45 #include "got_lib_path.h"
46 #include "got_lib_sha1.h"
47 #include "got_lib_fileindex.h"
48 #include "got_lib_inflate.h"
49 #include "got_lib_delta.h"
50 #include "got_lib_object.h"
51 #include "got_lib_diff.h"
54 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
57 static const struct got_error *
58 create_meta_file(const char *path_got, const char *name, const char *content)
60 const struct got_error *err = NULL;
64 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
65 err = got_error_from_errno();
70 fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
71 GOT_DEFAULT_FILE_MODE);
73 err = got_error_from_errno();
78 int len = dprintf(fd, "%s\n", content);
79 if (len != strlen(content) + 1) {
80 err = got_error_from_errno();
86 if (fd != -1 && close(fd) == -1 && err == NULL)
87 err = got_error_from_errno();
92 static const struct got_error *
93 update_meta_file(const char *path_got, const char *name, const char *content)
95 const struct got_error *err = NULL;
100 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
101 err = got_error_from_errno();
106 err = got_opentemp_named(&tmppath, &tmpfile, path);
111 int len = fprintf(tmpfile, "%s\n", content);
112 if (len != strlen(content) + 1) {
113 err = got_error_from_errno();
118 if (rename(tmppath, path) != 0) {
119 err = got_error_from_errno();
126 if (fclose(tmpfile) != 0 && err == NULL)
127 err = got_error_from_errno();
131 static const struct got_error *
132 read_meta_file(char **content, const char *path_got, const char *name)
134 const struct got_error *err = NULL;
142 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
143 err = got_error_from_errno();
148 fd = open(path, O_RDONLY | O_NOFOLLOW);
151 err = got_error(GOT_ERR_WORKTREE_META);
153 err = got_error_from_errno();
156 if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
157 err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
158 : got_error_from_errno());
162 if (lstat(path, &sb) != 0) {
163 err = got_error_from_errno();
166 *content = calloc(1, sb.st_size);
167 if (*content == NULL) {
168 err = got_error_from_errno();
172 n = read(fd, *content, sb.st_size);
173 if (n != sb.st_size) {
174 err = (n == -1 ? got_error_from_errno() :
175 got_error(GOT_ERR_WORKTREE_META));
178 if ((*content)[sb.st_size - 1] != '\n') {
179 err = got_error(GOT_ERR_WORKTREE_META);
182 (*content)[sb.st_size - 1] = '\0';
185 if (fd != -1 && close(fd) == -1 && err == NULL)
186 err = got_error_from_errno();
195 const struct got_error *
196 got_worktree_init(const char *path, struct got_reference *head_ref,
197 const char *prefix, struct got_repository *repo)
199 const struct got_error *err = NULL;
200 struct got_object_id *commit_id = NULL;
202 uint32_t uuid_status;
204 char *path_got = NULL;
206 char *formatstr = NULL;
207 char *absprefix = NULL;
208 char *basestr = NULL;
209 char *uuidstr = NULL;
211 if (strcmp(path, got_repo_get_path(repo)) == 0) {
212 err = got_error(GOT_ERR_WORKTREE_REPO);
216 err = got_ref_resolve(&commit_id, repo, head_ref);
219 err = got_object_get_type(&obj_type, repo, commit_id);
222 if (obj_type != GOT_OBJ_TYPE_COMMIT)
223 return got_error(GOT_ERR_OBJ_TYPE);
225 if (!got_path_is_absolute(prefix)) {
226 if (asprintf(&absprefix, "/%s", prefix) == -1)
227 return got_error_from_errno();
230 /* Create top-level directory (may already exist). */
231 if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
232 err = got_error_from_errno();
236 /* Create .got directory (may already exist). */
237 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
238 err = got_error_from_errno();
241 if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
242 err = got_error_from_errno();
246 /* Create an empty lock file. */
247 err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
251 /* Create an empty file index. */
252 err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
256 /* Write the HEAD reference. */
257 refstr = got_ref_to_str(head_ref);
258 if (refstr == NULL) {
259 err = got_error_from_errno();
262 err = create_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
266 /* Record our base commit. */
267 err = got_object_id_str(&basestr, commit_id);
270 err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
274 /* Store path to repository. */
275 err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
276 got_repo_get_path(repo));
280 /* Store in-repository path prefix. */
281 err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
282 absprefix ? absprefix : prefix);
287 uuid_create(&uuid, &uuid_status);
288 if (uuid_status != uuid_s_ok) {
289 err = got_error_uuid(uuid_status);
292 uuid_to_string(&uuid, &uuidstr, &uuid_status);
293 if (uuid_status != uuid_s_ok) {
294 err = got_error_uuid(uuid_status);
297 err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
301 /* Stamp work tree with format file. */
302 if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
303 err = got_error_from_errno();
306 err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
321 static const struct got_error *
322 open_worktree(struct got_worktree **worktree, const char *path)
324 const struct got_error *err = NULL;
326 char *formatstr = NULL;
327 char *uuidstr = NULL;
328 char *path_lock = NULL;
329 char *base_commit_id_str = NULL;
330 char *head_ref_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();
344 if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
345 err = got_error_from_errno();
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_errno());
357 err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
361 version = strtonum(formatstr, 1, INT_MAX, &errstr);
363 err = got_error(GOT_ERR_WORKTREE_META);
366 if (version != GOT_WORKTREE_FORMAT_VERSION) {
367 err = got_error(GOT_ERR_WORKTREE_VERS);
371 *worktree = calloc(1, sizeof(**worktree));
372 if (*worktree == NULL) {
373 err = got_error_from_errno();
376 (*worktree)->lockfd = -1;
378 (*worktree)->root_path = strdup(path);
379 if ((*worktree)->root_path == NULL) {
380 err = got_error_from_errno();
383 err = read_meta_file(&(*worktree)->repo_path, path_got,
384 GOT_WORKTREE_REPOSITORY);
388 err = read_meta_file(&(*worktree)->path_prefix, path_got,
389 GOT_WORKTREE_PATH_PREFIX);
393 err = read_meta_file(&base_commit_id_str, path_got,
394 GOT_WORKTREE_BASE_COMMIT);
398 err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
401 uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
402 if (uuid_status != uuid_s_ok) {
403 err = got_error_uuid(uuid_status);
407 err = got_repo_open(&repo, (*worktree)->repo_path);
411 err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
416 err = read_meta_file(&head_ref_str, path_got, GOT_WORKTREE_HEAD_REF);
420 err = got_ref_open(&(*worktree)->head_ref, repo, head_ref_str);
423 got_repo_close(repo);
427 free(base_commit_id_str);
433 if (*worktree != NULL)
434 got_worktree_close(*worktree);
437 (*worktree)->lockfd = fd;
442 const struct got_error *
443 got_worktree_open(struct got_worktree **worktree, const char *path)
445 const struct got_error *err = NULL;
448 err = open_worktree(worktree, path);
449 if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
453 path = dirname(path);
455 return got_error_from_errno();
456 } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
458 return got_error(GOT_ERR_NOT_WORKTREE);
461 const struct got_error *
462 got_worktree_close(struct got_worktree *worktree)
464 const struct got_error *err = NULL;
465 free(worktree->root_path);
466 free(worktree->repo_path);
467 free(worktree->path_prefix);
468 free(worktree->base_commit_id);
469 if (worktree->head_ref)
470 got_ref_close(worktree->head_ref);
471 if (worktree->lockfd != -1)
472 if (close(worktree->lockfd) != 0)
473 err = got_error_from_errno();
479 got_worktree_get_root_path(struct got_worktree *worktree)
481 return worktree->root_path;
485 got_worktree_get_repo_path(struct got_worktree *worktree)
487 return worktree->repo_path;
491 got_worktree_get_path_prefix(struct got_worktree *worktree)
493 return worktree->path_prefix;
496 const struct got_error *
497 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
498 const char *path_prefix)
500 char *absprefix = NULL;
502 if (!got_path_is_absolute(path_prefix)) {
503 if (asprintf(&absprefix, "/%s", path_prefix) == -1)
504 return got_error_from_errno();
506 *match = (strcmp(absprefix ? absprefix : path_prefix,
507 worktree->path_prefix) == 0);
513 got_worktree_get_head_ref_name(struct got_worktree *worktree)
515 return got_ref_to_str(worktree->head_ref);
518 struct got_reference *
519 got_worktree_get_head_ref(struct got_worktree *worktree)
521 return got_ref_dup(worktree->head_ref);
524 struct got_object_id *
525 got_worktree_get_base_commit_id(struct got_worktree *worktree)
527 return worktree->base_commit_id;
530 const struct got_error *
531 got_worktree_set_base_commit_id(struct got_worktree *worktree,
532 struct got_repository *repo, struct got_object_id *commit_id)
534 const struct got_error *err;
535 struct got_object *obj = NULL;
537 char *path_got = NULL;
539 if (asprintf(&path_got, "%s/%s", worktree->root_path,
540 GOT_WORKTREE_GOT_DIR) == -1) {
541 err = got_error_from_errno();
546 err = got_object_open(&obj, repo, commit_id);
550 if (obj->type != GOT_OBJ_TYPE_COMMIT) {
551 err = got_error(GOT_ERR_OBJ_TYPE);
555 /* Record our base commit. */
556 err = got_object_id_str(&id_str, commit_id);
559 err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
563 free(worktree->base_commit_id);
564 worktree->base_commit_id = got_object_id_dup(commit_id);
565 if (worktree->base_commit_id == NULL) {
566 err = got_error_from_errno();
571 got_object_close(obj);
577 static const struct got_error *
578 lock_worktree(struct got_worktree *worktree, int operation)
580 if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
581 return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
582 : got_error_from_errno());
586 static const struct got_error *
587 add_dir_on_disk(struct got_worktree *worktree, const char *path)
589 const struct got_error *err = NULL;
592 if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
593 return got_error_from_errno();
595 err = got_path_mkdir(abspath);
596 if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
599 if (lstat(abspath, &sb) == -1) {
600 err = got_error_from_errno();
601 } else if (!S_ISDIR(sb.st_mode)) {
602 /* TODO directory is obstructed; do something */
603 err = got_error(GOT_ERR_FILE_OBSTRUCTED);
610 static const struct got_error *
611 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
613 const struct got_error *err = NULL;
616 size_t flen1 = 0, flen2 = 0;
621 flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
622 if (flen1 == 0 && ferror(f1)) {
623 err = got_error_from_errno();
626 flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
627 if (flen2 == 0 && ferror(f2)) {
628 err = got_error_from_errno();
635 } else if (flen2 == 0) {
639 } else if (flen1 == flen2) {
640 if (memcmp(fbuf1, fbuf2, flen2) != 0) {
653 static const struct got_error *
654 check_files_equal(int *same, const char *f1_path, const char *f2_path)
656 const struct got_error *err = NULL;
659 FILE *f1 = NULL, *f2 = NULL;
663 if (lstat(f1_path, &sb) != 0) {
664 err = got_error_from_errno();
669 if (lstat(f2_path, &sb) != 0) {
670 err = got_error_from_errno();
675 if (size1 != size2) {
680 f1 = fopen(f1_path, "r");
682 return got_error_from_errno();
684 f2 = fopen(f2_path, "r");
686 err = got_error_from_errno();
690 err = check_file_contents_equal(same, f1, f2);
692 if (f1 && fclose(f1) != 0 && err == NULL)
693 err = got_error_from_errno();
694 if (f2 && fclose(f2) != 0 && err == NULL)
695 err = got_error_from_errno();
701 * Perform a 3-way merge where the file's version in the file index (blob2)
702 * acts as the common ancestor, the incoming blob (blob1) acts as the first
703 * derived version, and the file on disk acts as the second derived version.
705 static const struct got_error *
706 merge_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
707 struct got_fileindex_entry *ie, const char *ondisk_path, const char *path,
708 uint16_t te_mode, uint16_t st_mode, struct got_blob_object *blob1,
709 struct got_repository *repo,
710 got_worktree_checkout_cb progress_cb, void *progress_arg)
712 const struct got_error *err = NULL;
714 struct got_blob_object *blob2 = NULL;
715 FILE *f1 = NULL, *f2 = NULL;
716 char *blob1_path = NULL, *blob2_path = NULL;
717 char *merged_path = NULL, *base_path = NULL;
720 int overlapcnt = 0, update_timestamps = 0;
723 parent = dirname(ondisk_path);
725 return got_error_from_errno();
727 if (asprintf(&base_path, "%s/got-merged", parent) == -1)
728 return got_error_from_errno();
730 err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
735 if (asprintf(&base_path, "%s/got-merge-blob1", parent) == -1) {
736 err = got_error_from_errno();
741 err = got_opentemp_named(&blob1_path, &f1, base_path);
744 err = got_object_blob_dump_to_file(NULL, NULL, f1, blob1);
749 if (asprintf(&base_path, "%s/got-merge-blob2", parent) == -1) {
750 err = got_error_from_errno();
755 err = got_opentemp_named(&blob2_path, &f2, base_path);
758 if (got_fileindex_entry_has_blob(ie)) {
759 struct got_object_id id2;
760 memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
761 err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
764 err = got_object_blob_dump_to_file(NULL, NULL, f2, blob2);
769 * If the file has no blob, this is an "add vs add" conflict,
770 * and we simply use an empty ancestor file to make both files
771 * appear in the merged result in their entirety.
775 err = got_object_id_str(&id_str, worktree->base_commit_id);
778 if (asprintf(&label1, "commit %s", id_str) == -1) {
779 err = got_error_from_errno();
783 err = got_merge_diff3(&overlapcnt, merged_fd, blob1_path,
784 blob2_path, ondisk_path, label1, path);
788 (*progress_cb)(progress_arg,
789 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
792 if (fsync(merged_fd) != 0) {
793 err = got_error_from_errno();
797 /* Check if a clean merge has subsumed all local changes. */
798 if (overlapcnt == 0) {
799 err = check_files_equal(&update_timestamps, blob1_path,
805 if (chmod(merged_path, st_mode) != 0) {
806 err = got_error_from_errno();
810 if (rename(merged_path, ondisk_path) != 0) {
811 err = got_error_from_errno();
817 * Do not update timestamps of already modified files. Otherwise,
818 * a future status walk would treat them as unmodified files again.
820 err = got_fileindex_entry_update(ie, ondisk_path,
821 blob1->id.sha1, worktree->base_commit_id->sha1, update_timestamps);
823 if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
824 err = got_error_from_errno();
825 if (f1 && fclose(f1) != 0 && err == NULL)
826 err = got_error_from_errno();
827 if (f2 && fclose(f2) != 0 && err == NULL)
828 err = got_error_from_errno();
830 got_object_blob_close(blob2);
846 static const struct got_error *
847 install_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
848 struct got_fileindex_entry *entry, const char *ondisk_path, const char *path,
849 uint16_t te_mode, uint16_t st_mode, struct got_blob_object *blob,
850 int restoring_missing_file, struct got_repository *repo,
851 got_worktree_checkout_cb progress_cb, void *progress_arg)
853 const struct got_error *err = NULL;
857 char *tmppath = NULL;
859 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
860 GOT_DEFAULT_FILE_MODE);
862 if (errno == ENOENT) {
863 char *parent = dirname(path);
865 return got_error_from_errno();
866 err = add_dir_on_disk(worktree, parent);
869 fd = open(ondisk_path,
870 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
871 GOT_DEFAULT_FILE_MODE);
873 return got_error_from_errno();
874 } else if (errno == EEXIST) {
875 if (!S_ISREG(st_mode)) {
876 /* TODO file is obstructed; do something */
877 err = got_error(GOT_ERR_FILE_OBSTRUCTED);
880 err = got_opentemp_named_fd(&tmppath, &fd,
887 return got_error_from_errno();
890 if (restoring_missing_file)
891 (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
893 (*progress_cb)(progress_arg,
894 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
896 hdrlen = got_object_blob_get_hdrlen(blob);
898 const uint8_t *buf = got_object_blob_get_read_buf(blob);
899 err = got_object_blob_read_block(&len, blob);
903 /* Skip blob object header first time around. */
904 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
906 err = got_error_from_errno();
908 } else if (outlen != len - hdrlen) {
909 err = got_error(GOT_ERR_IO);
916 if (fsync(fd) != 0) {
917 err = got_error_from_errno();
922 if (rename(tmppath, ondisk_path) != 0) {
923 err = got_error_from_errno();
929 if (te_mode & S_IXUSR) {
930 if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
931 err = got_error_from_errno();
935 if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
936 err = got_error_from_errno();
942 entry = got_fileindex_entry_get(fileindex, path);
944 err = got_fileindex_entry_update(entry, ondisk_path,
945 blob->id.sha1, worktree->base_commit_id->sha1, 1);
947 err = got_fileindex_entry_alloc(&entry, ondisk_path,
948 path, blob->id.sha1, worktree->base_commit_id->sha1);
951 err = got_fileindex_entry_add(fileindex, entry);
954 if (fd != -1 && close(fd) != 0 && err == NULL)
955 err = got_error_from_errno();
960 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
961 static const struct got_error *
962 get_modified_file_content_status(unsigned char *status, FILE *f)
964 const struct got_error *err = NULL;
965 const char *markers[3] = {
966 GOT_DIFF_CONFLICT_MARKER_BEGIN,
967 GOT_DIFF_CONFLICT_MARKER_SEP,
968 GOT_DIFF_CONFLICT_MARKER_END
973 const char delim[3] = {'\0', '\0', '\0'};
975 while (*status == GOT_STATUS_MODIFY) {
976 line = fparseln(f, &len, NULL, delim, 0);
980 err = got_ferror(f, GOT_ERR_IO);
984 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
985 if (markers[i] == GOT_DIFF_CONFLICT_MARKER_END)
986 *status = GOT_STATUS_CONFLICT;
995 static const struct got_error *
996 get_file_status(unsigned char *status, struct stat *sb,
997 struct got_fileindex_entry *ie, const char *abspath,
998 struct got_repository *repo)
1000 const struct got_error *err = NULL;
1001 struct got_object_id id;
1005 struct got_blob_object *blob = NULL;
1008 *status = GOT_STATUS_NO_CHANGE;
1010 if (lstat(abspath, sb) == -1) {
1011 if (errno == ENOENT) {
1013 if (got_fileindex_entry_has_file_on_disk(ie))
1014 *status = GOT_STATUS_MISSING;
1016 *status = GOT_STATUS_DELETE;
1018 ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1019 & (S_IRWXU | S_IRWXG | S_IRWXO));
1021 sb->st_mode = GOT_DEFAULT_FILE_MODE;
1024 return got_error_from_errno();
1027 if (!S_ISREG(sb->st_mode)) {
1028 *status = GOT_STATUS_OBSTRUCTED;
1035 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1036 *status = GOT_STATUS_DELETE;
1038 } else if (!got_fileindex_entry_has_blob(ie)) {
1039 *status = GOT_STATUS_ADD;
1043 if (ie->ctime_sec == sb->st_ctime &&
1044 ie->ctime_nsec == sb->st_ctimensec &&
1045 ie->mtime_sec == sb->st_mtime &&
1046 ie->mtime_sec == sb->st_mtime &&
1047 ie->mtime_nsec == sb->st_mtimensec &&
1048 ie->size == (sb->st_size & 0xffffffff))
1051 memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1052 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1056 f = fopen(abspath, "r");
1058 err = got_error_from_errno();
1061 hdrlen = got_object_blob_get_hdrlen(blob);
1063 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1064 err = got_object_blob_read_block(&blen, blob);
1067 /* Skip length of blob object header first time around. */
1068 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1069 if (flen == 0 && ferror(f)) {
1070 err = got_error_from_errno();
1075 *status = GOT_STATUS_MODIFY;
1077 } else if (flen == 0) {
1079 *status = GOT_STATUS_MODIFY;
1081 } else if (blen - hdrlen == flen) {
1082 /* Skip blob object header first time around. */
1083 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1084 *status = GOT_STATUS_MODIFY;
1088 *status = GOT_STATUS_MODIFY;
1094 if (*status == GOT_STATUS_MODIFY) {
1096 err = get_modified_file_content_status(status, f);
1100 got_object_blob_close(blob);
1106 static const struct got_error *
1107 update_blob(struct got_worktree *worktree,
1108 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1109 struct got_tree_entry *te, const char *path,
1110 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1111 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1113 const struct got_error *err = NULL;
1114 struct got_blob_object *blob = NULL;
1116 unsigned char status = GOT_STATUS_NO_CHANGE;
1119 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1120 return got_error_from_errno();
1122 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1126 if (status == GOT_STATUS_OBSTRUCTED) {
1127 (*progress_cb)(progress_arg, status, path);
1131 if (ie && status != GOT_STATUS_MISSING) {
1132 if (got_fileindex_entry_has_commit(ie) &&
1133 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1134 SHA1_DIGEST_LENGTH) == 0) {
1135 (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1139 if (got_fileindex_entry_has_blob(ie) &&
1140 memcmp(ie->blob_sha1, te->id->sha1,
1141 SHA1_DIGEST_LENGTH) == 0)
1145 err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1149 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD)
1150 err = merge_blob(worktree, fileindex, ie, ondisk_path, path,
1151 te->mode, sb.st_mode, blob, repo, progress_cb,
1154 err = install_blob(worktree, fileindex, ie, ondisk_path, path,
1155 te->mode, sb.st_mode, blob, status == GOT_STATUS_MISSING,
1156 repo, progress_cb, progress_arg);
1158 got_object_blob_close(blob);
1164 static const struct got_error *
1165 remove_ondisk_file(const char *root_path, const char *path)
1167 const struct got_error *err = NULL;
1168 char *ondisk_path = NULL;
1170 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1171 return got_error_from_errno();
1173 if (unlink(ondisk_path) == -1) {
1174 if (errno != ENOENT)
1175 err = got_error_from_errno();
1177 char *parent = dirname(ondisk_path);
1178 while (parent && strcmp(parent, root_path) != 0) {
1179 if (rmdir(parent) == -1) {
1180 if (errno != ENOTEMPTY)
1181 err = got_error_from_errno();
1184 parent = dirname(parent);
1191 struct diff_cb_arg {
1192 struct got_fileindex *fileindex;
1193 struct got_worktree *worktree;
1194 struct got_repository *repo;
1195 got_worktree_checkout_cb progress_cb;
1197 got_worktree_cancel_cb cancel_cb;
1201 static const struct got_error *
1202 diff_old_new(void *arg, struct got_fileindex_entry *ie,
1203 struct got_tree_entry *te, const char *parent_path)
1205 struct diff_cb_arg *a = arg;
1207 return update_blob(a->worktree, a->fileindex, ie, te,
1208 ie->path, a->repo, a->progress_cb, a->progress_arg,
1209 a->cancel_cb, a->cancel_arg);
1212 static const struct got_error *
1213 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1215 const struct got_error *err;
1216 struct diff_cb_arg *a = arg;
1218 (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE, ie->path);
1220 err = remove_ondisk_file(a->worktree->root_path, ie->path);
1223 got_fileindex_entry_remove(a->fileindex, ie);
1227 static const struct got_error *
1228 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1230 struct diff_cb_arg *a = arg;
1231 const struct got_error *err;
1234 if (asprintf(&path, "%s%s%s", parent_path,
1235 parent_path[0] ? "/" : "", te->name)
1237 return got_error_from_errno();
1239 if (S_ISDIR(te->mode))
1240 err = add_dir_on_disk(a->worktree, path);
1242 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1243 a->repo, a->progress_cb, a->progress_arg,
1244 a->cancel_cb, a->cancel_arg);
1250 const struct got_error *
1251 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1253 const struct got_error *err = NULL;
1254 char *uuidstr = NULL;
1255 uint32_t uuid_status;
1259 uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1260 if (uuid_status != uuid_s_ok)
1261 return got_error_uuid(uuid_status);
1263 if (asprintf(refname, "%s-%s", GOT_WORKTREE_BASE_REF_PREFIX, uuidstr)
1265 err = got_error_from_errno();
1273 * Prevent Git's garbage collector from deleting our base commit by
1274 * setting a reference to our base commit's ID.
1276 static const struct got_error *
1277 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1279 const struct got_error *err = NULL;
1280 struct got_reference *ref = NULL;
1283 err = got_worktree_get_base_ref_name(&refname, worktree);
1287 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1291 err = got_ref_write(ref, repo);
1300 const struct got_error *
1301 got_worktree_checkout_files(struct got_worktree *worktree,
1302 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1303 void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1305 const struct got_error *err = NULL, *unlockerr, *checkout_err = NULL;
1306 struct got_commit_object *commit = NULL;
1307 struct got_object_id *tree_id = NULL;
1308 struct got_tree_object *tree = NULL;
1309 char *fileindex_path = NULL, *new_fileindex_path = NULL;
1310 struct got_fileindex *fileindex = NULL;
1311 FILE *index = NULL, *new_index = NULL;
1312 struct got_fileindex_diff_tree_cb diff_cb;
1313 struct diff_cb_arg arg;
1315 err = lock_worktree(worktree, LOCK_EX);
1319 fileindex = got_fileindex_alloc();
1320 if (fileindex == NULL) {
1321 err = got_error_from_errno();
1325 if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1326 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1327 err = got_error_from_errno();
1328 fileindex_path = NULL;
1333 * Read the file index.
1334 * Checking out files is supposed to be an idempotent operation.
1335 * If the on-disk file index is incomplete we will try to complete it.
1337 index = fopen(fileindex_path, "rb");
1338 if (index == NULL) {
1339 if (errno != ENOENT) {
1340 err = got_error_from_errno();
1344 err = got_fileindex_read(fileindex, index);
1350 err = got_opentemp_named(&new_fileindex_path, &new_index,
1355 err = ref_base_commit(worktree, repo);
1359 err = got_object_open_as_commit(&commit, repo,
1360 worktree->base_commit_id);
1364 err = got_object_id_by_path(&tree_id, repo,
1365 worktree->base_commit_id, worktree->path_prefix);
1369 err = got_object_open_as_tree(&tree, repo, tree_id);
1373 diff_cb.diff_old_new = diff_old_new;
1374 diff_cb.diff_old = diff_old;
1375 diff_cb.diff_new = diff_new;
1376 arg.fileindex = fileindex;
1377 arg.worktree = worktree;
1379 arg.progress_cb = progress_cb;
1380 arg.progress_arg = progress_arg;
1381 arg.cancel_cb = cancel_cb;
1382 arg.cancel_arg = cancel_arg;
1383 checkout_err = got_fileindex_diff_tree(fileindex, tree, repo,
1386 /* Try to sync the fileindex back to disk in any case. */
1387 err = got_fileindex_write(fileindex, new_index);
1391 if (rename(new_fileindex_path, fileindex_path) != 0) {
1392 err = got_error_from_errno();
1393 unlink(new_fileindex_path);
1397 free(new_fileindex_path);
1398 new_fileindex_path = NULL;
1402 got_object_tree_close(tree);
1404 got_object_commit_close(commit);
1405 if (new_fileindex_path)
1406 unlink(new_fileindex_path);
1409 free(new_fileindex_path);
1410 free(fileindex_path);
1411 got_fileindex_free(fileindex);
1414 unlockerr = lock_worktree(worktree, LOCK_SH);
1415 if (unlockerr && err == NULL)
1420 struct diff_dir_cb_arg {
1421 struct got_fileindex *fileindex;
1422 struct got_worktree *worktree;
1423 const char *status_path;
1424 size_t status_path_len;
1425 struct got_repository *repo;
1426 got_worktree_status_cb status_cb;
1428 got_worktree_cancel_cb cancel_cb;
1432 static const struct got_error *
1433 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
1434 got_worktree_status_cb status_cb, void *status_arg,
1435 struct got_repository *repo)
1437 const struct got_error *err = NULL;
1438 unsigned char status = GOT_STATUS_NO_CHANGE;
1440 struct got_object_id id;
1442 err = get_file_status(&status, &sb, ie, abspath, repo);
1443 if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
1444 memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1445 err = (*status_cb)(status_arg, status, ie->path, &id);
1450 static const struct got_error *
1451 status_old_new(void *arg, struct got_fileindex_entry *ie,
1452 struct dirent *de, const char *parent_path)
1454 const struct got_error *err = NULL;
1455 struct diff_dir_cb_arg *a = arg;
1458 if (got_path_cmp(parent_path, a->status_path) != 0 &&
1459 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
1462 if (parent_path[0]) {
1463 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
1464 parent_path, de->d_name) == -1)
1465 return got_error_from_errno();
1467 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
1469 return got_error_from_errno();
1472 err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
1478 static const struct got_error *
1479 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1481 struct diff_dir_cb_arg *a = arg;
1482 struct got_object_id id;
1483 unsigned char status;
1485 if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
1488 memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1489 if (got_fileindex_entry_has_file_on_disk(ie))
1490 status = GOT_STATUS_MISSING;
1492 status = GOT_STATUS_DELETE;
1493 return (*a->status_cb)(a->status_arg, status, ie->path, &id);
1496 static const struct got_error *
1497 status_new(void *arg, struct dirent *de, const char *parent_path)
1499 const struct got_error *err = NULL;
1500 struct diff_dir_cb_arg *a = arg;
1503 if (de->d_type == DT_DIR)
1506 /* XXX ignore symlinks for now */
1507 if (de->d_type == DT_LNK)
1510 if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
1513 if (parent_path[0]) {
1514 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
1515 return got_error_from_errno();
1520 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
1527 const struct got_error *
1528 got_worktree_status(struct got_worktree *worktree, const char *path,
1529 struct got_repository *repo, got_worktree_status_cb status_cb,
1530 void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1532 const struct got_error *err = NULL;
1533 DIR *workdir = NULL;
1534 char *fileindex_path = NULL;
1535 struct got_fileindex *fileindex = NULL;
1537 struct got_fileindex_diff_dir_cb fdiff_cb;
1538 struct diff_dir_cb_arg arg;
1539 char *ondisk_path = NULL;
1541 fileindex = got_fileindex_alloc();
1542 if (fileindex == NULL) {
1543 err = got_error_from_errno();
1547 if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1548 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1549 err = got_error_from_errno();
1550 fileindex_path = NULL;
1554 index = fopen(fileindex_path, "rb");
1555 if (index == NULL) {
1556 if (errno != ENOENT) {
1557 err = got_error_from_errno();
1561 err = got_fileindex_read(fileindex, index);
1567 if (asprintf(&ondisk_path, "%s%s%s",
1568 worktree->root_path, path[0] ? "/" : "", path) == -1) {
1569 err = got_error_from_errno();
1572 workdir = opendir(ondisk_path);
1573 if (workdir == NULL) {
1574 if (errno == ENOTDIR || errno == ENOENT) {
1575 struct got_fileindex_entry *ie;
1576 ie = got_fileindex_entry_get(fileindex, path);
1578 err = got_error(GOT_ERR_BAD_PATH);
1581 err = report_file_status(ie, ondisk_path,
1582 status_cb, status_arg, repo);
1585 err = got_error_from_errno();
1589 fdiff_cb.diff_old_new = status_old_new;
1590 fdiff_cb.diff_old = status_old;
1591 fdiff_cb.diff_new = status_new;
1592 arg.fileindex = fileindex;
1593 arg.worktree = worktree;
1594 arg.status_path = path;
1595 arg.status_path_len = strlen(path);
1597 arg.status_cb = status_cb;
1598 arg.status_arg = status_arg;
1599 arg.cancel_cb = cancel_cb;
1600 arg.cancel_arg = cancel_arg;
1601 err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
1602 path, repo, &fdiff_cb, &arg);
1607 free(fileindex_path);
1608 got_fileindex_free(fileindex);
1612 const struct got_error *
1613 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
1616 const struct got_error *err = NULL;
1617 char *resolved, *path = NULL;
1622 resolved = realpath(arg, NULL);
1623 if (resolved == NULL)
1624 return got_error_from_errno();
1626 if (strncmp(got_worktree_get_root_path(worktree), resolved,
1627 strlen(got_worktree_get_root_path(worktree)))) {
1628 err = got_error(GOT_ERR_BAD_PATH);
1632 path = strdup(resolved + strlen(got_worktree_get_root_path(worktree)));
1634 err = got_error_from_errno();
1638 /* XXX status walk can't deal with trailing slash! */
1640 while (path[len - 1] == '/') {
1641 path[len - 1] = '\0';
1653 const struct got_error *
1654 got_worktree_schedule_add(struct got_worktree *worktree,
1655 const char *ondisk_path, got_worktree_status_cb status_cb, void *status_arg,
1656 struct got_repository *repo)
1658 struct got_fileindex *fileindex = NULL;
1659 struct got_fileindex_entry *ie = NULL;
1660 char *relpath, *fileindex_path = NULL, *new_fileindex_path = NULL;
1661 FILE *index = NULL, *new_index = NULL;
1662 const struct got_error *err = NULL, *unlockerr = NULL;
1665 err = lock_worktree(worktree, LOCK_EX);
1669 err = got_path_skip_common_ancestor(&relpath,
1670 got_worktree_get_root_path(worktree), ondisk_path);
1674 fileindex = got_fileindex_alloc();
1675 if (fileindex == NULL) {
1676 err = got_error_from_errno();
1680 if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1681 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1682 err = got_error_from_errno();
1683 fileindex_path = NULL;
1687 index = fopen(fileindex_path, "rb");
1688 if (index == NULL) {
1689 err = got_error_from_errno();
1693 err = got_fileindex_read(fileindex, index);
1697 if (got_fileindex_entry_get(fileindex, relpath) != NULL) {
1698 err = got_error_set_errno(EEXIST);
1702 err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
1706 err = got_fileindex_entry_add(fileindex, ie);
1709 ie_added = 1; /* now owned by fileindex; don't free separately */
1711 err = got_opentemp_named(&new_fileindex_path, &new_index,
1716 err = got_fileindex_write(fileindex, new_index);
1720 if (rename(new_fileindex_path, fileindex_path) != 0) {
1721 err = got_error_from_errno();
1725 free(new_fileindex_path);
1726 new_fileindex_path = NULL;
1728 err = report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
1731 if (fclose(index) != 0 && err == NULL)
1732 err = got_error_from_errno();
1734 if (new_fileindex_path) {
1735 if (unlink(new_fileindex_path) != 0 && err == NULL)
1736 err = got_error_from_errno();
1737 free(new_fileindex_path);
1739 if (ie && !ie_added)
1740 got_fileindex_entry_free(ie);
1742 got_fileindex_free(fileindex);
1743 unlockerr = lock_worktree(worktree, LOCK_SH);
1744 if (unlockerr && err == NULL)
1750 const struct got_error *
1751 got_worktree_schedule_delete(struct got_worktree *worktree,
1752 const char *ondisk_path, int delete_local_mods,
1753 got_worktree_status_cb status_cb, void *status_arg,
1754 struct got_repository *repo)
1756 struct got_fileindex *fileindex = NULL;
1757 struct got_fileindex_entry *ie = NULL;
1758 char *relpath, *fileindex_path = NULL, *new_fileindex_path = NULL;
1759 FILE *index = NULL, *new_index = NULL;
1760 const struct got_error *err = NULL, *unlockerr = NULL;
1761 unsigned char status;
1764 err = lock_worktree(worktree, LOCK_EX);
1768 err = got_path_skip_common_ancestor(&relpath,
1769 got_worktree_get_root_path(worktree), ondisk_path);
1773 fileindex = got_fileindex_alloc();
1774 if (fileindex == NULL) {
1775 err = got_error_from_errno();
1779 if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1780 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1781 err = got_error_from_errno();
1782 fileindex_path = NULL;
1786 index = fopen(fileindex_path, "rb");
1787 if (index == NULL) {
1788 err = got_error_from_errno();
1792 err = got_fileindex_read(fileindex, index);
1796 ie = got_fileindex_entry_get(fileindex, relpath);
1798 err = got_error(GOT_ERR_BAD_PATH);
1802 err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1806 if (status != GOT_STATUS_NO_CHANGE) {
1807 if (status == GOT_STATUS_DELETE) {
1808 err = got_error_set_errno(ENOENT);
1811 if (status != GOT_STATUS_MODIFY) {
1812 err = got_error(GOT_ERR_FILE_STATUS);
1815 if (!delete_local_mods) {
1816 err = got_error(GOT_ERR_FILE_MODIFIED);
1821 if (unlink(ondisk_path) != 0) {
1822 err = got_error_from_errno();
1826 got_fileindex_entry_mark_deleted_from_disk(ie);
1828 err = got_opentemp_named(&new_fileindex_path, &new_index,
1833 err = got_fileindex_write(fileindex, new_index);
1837 if (rename(new_fileindex_path, fileindex_path) != 0) {
1838 err = got_error_from_errno();
1842 free(new_fileindex_path);
1843 new_fileindex_path = NULL;
1845 err = report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
1849 if (fclose(index) != 0 && err == NULL)
1850 err = got_error_from_errno();
1852 if (new_fileindex_path) {
1853 if (unlink(new_fileindex_path) != 0 && err == NULL)
1854 err = got_error_from_errno();
1855 free(new_fileindex_path);
1858 got_fileindex_free(fileindex);
1859 unlockerr = lock_worktree(worktree, LOCK_SH);
1860 if (unlockerr && err == NULL)