2 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp #include <sys/stat.h>
18 6d9d28c3 2018-03-11 stsp #include <sys/limits.h>
19 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
20 133d2798 2019-01-08 stsp #include <sys/tree.h>
22 d1f6d47b 2019-02-04 stsp #include <dirent.h>
23 f5c49f82 2019-01-06 stsp #include <stddef.h>
24 86c3caaf 2018-03-09 stsp #include <string.h>
25 86c3caaf 2018-03-09 stsp #include <stdio.h>
26 86c3caaf 2018-03-09 stsp #include <stdlib.h>
27 86c3caaf 2018-03-09 stsp #include <fcntl.h>
28 86c3caaf 2018-03-09 stsp #include <errno.h>
29 86c3caaf 2018-03-09 stsp #include <unistd.h>
30 9d31a1d8 2018-03-11 stsp #include <sha1.h>
31 9d31a1d8 2018-03-11 stsp #include <zlib.h>
32 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
33 512f0d0e 2019-01-02 stsp #include <libgen.h>
35 86c3caaf 2018-03-09 stsp #include "got_error.h"
36 86c3caaf 2018-03-09 stsp #include "got_repository.h"
37 5261c201 2018-04-01 stsp #include "got_reference.h"
38 9d31a1d8 2018-03-11 stsp #include "got_object.h"
39 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
40 511a516b 2018-05-19 stsp #include "got_opentemp.h"
42 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
43 718b3ab0 2018-03-17 stsp #include "got_lib_path.h"
44 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
45 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
46 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
49 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
52 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
55 99724ed4 2018-03-10 stsp static const struct got_error *
56 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
58 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
60 99724ed4 2018-03-10 stsp int fd = -1;
62 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
63 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
64 99724ed4 2018-03-10 stsp path = NULL;
68 73a5ef67 2018-03-11 stsp fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
69 99724ed4 2018-03-10 stsp GOT_DEFAULT_FILE_MODE);
70 99724ed4 2018-03-10 stsp if (fd == -1) {
71 99724ed4 2018-03-10 stsp err = got_error_from_errno();
75 99724ed4 2018-03-10 stsp if (content) {
76 99724ed4 2018-03-10 stsp int len = dprintf(fd, "%s\n", content);
77 99724ed4 2018-03-10 stsp if (len != strlen(content) + 1) {
78 99724ed4 2018-03-10 stsp err = got_error_from_errno();
84 99724ed4 2018-03-10 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
85 99724ed4 2018-03-10 stsp err = got_error_from_errno();
90 507dc3bb 2018-12-29 stsp static const struct got_error *
91 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
93 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
94 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
95 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
96 507dc3bb 2018-12-29 stsp char *path = NULL;
98 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
99 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
100 507dc3bb 2018-12-29 stsp path = NULL;
104 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
108 507dc3bb 2018-12-29 stsp if (content) {
109 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
110 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
111 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
116 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
117 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
122 507dc3bb 2018-12-29 stsp free(tmppath);
123 507dc3bb 2018-12-29 stsp fclose(tmpfile);
124 99724ed4 2018-03-10 stsp return err;
127 09fe317a 2018-03-11 stsp static const struct got_error *
128 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
130 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
131 09fe317a 2018-03-11 stsp char *path;
132 09fe317a 2018-03-11 stsp int fd = -1;
134 09fe317a 2018-03-11 stsp struct stat sb;
136 09fe317a 2018-03-11 stsp *content = NULL;
138 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
139 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
140 09fe317a 2018-03-11 stsp path = NULL;
144 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
145 09fe317a 2018-03-11 stsp if (fd == -1) {
146 ef99fdb1 2018-03-11 stsp err = got_error_from_errno();
149 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
150 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
151 73a5ef67 2018-03-11 stsp : got_error_from_errno());
155 09fe317a 2018-03-11 stsp stat(path, &sb);
156 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
157 09fe317a 2018-03-11 stsp if (*content == NULL) {
158 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
162 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
163 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
164 0605801d 2018-03-11 stsp err = (n == -1 ? got_error_from_errno() :
165 0605801d 2018-03-11 stsp got_error(GOT_ERR_WORKTREE_META));
168 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
169 09fe317a 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
172 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
175 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
176 09fe317a 2018-03-11 stsp err = got_error_from_errno();
177 09fe317a 2018-03-11 stsp free(path);
179 09fe317a 2018-03-11 stsp free(*content);
180 09fe317a 2018-03-11 stsp *content = NULL;
182 09fe317a 2018-03-11 stsp return err;
185 86c3caaf 2018-03-09 stsp const struct got_error *
186 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
187 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
189 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
190 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
191 65596e15 2018-12-24 stsp int obj_type;
192 7ac97322 2018-03-11 stsp char *path_got = NULL;
193 08d425ea 2018-12-24 stsp char *refstr = NULL;
194 1451e70d 2018-03-10 stsp char *formatstr = NULL;
195 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
196 65596e15 2018-12-24 stsp char *basestr = NULL;
198 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
200 65596e15 2018-12-24 stsp return err;
201 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
203 65596e15 2018-12-24 stsp return err;
204 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
205 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
207 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
208 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
209 0a585a0d 2018-03-17 stsp return got_error_from_errno();
212 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
213 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
214 86c3caaf 2018-03-09 stsp err = got_error_from_errno();
218 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
219 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
220 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
223 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
224 86c3caaf 2018-03-09 stsp err = got_error_from_errno();
228 056e7441 2018-03-11 stsp /* Create an empty lock file. */
229 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
233 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
234 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
238 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
239 08d425ea 2018-12-24 stsp refstr = got_ref_to_str(head_ref);
240 08d425ea 2018-12-24 stsp if (refstr == NULL) {
241 a1a7858a 2018-12-24 stsp err = got_error_from_errno();
244 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
248 65596e15 2018-12-24 stsp /* Record our base commit. */
249 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
252 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
256 1451e70d 2018-03-10 stsp /* Store path to repository. */
257 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
258 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
262 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
263 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
264 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
268 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
269 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
270 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
273 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
278 65596e15 2018-12-24 stsp free(commit_id);
279 7ac97322 2018-03-11 stsp free(path_got);
280 1451e70d 2018-03-10 stsp free(formatstr);
281 08d425ea 2018-12-24 stsp free(refstr);
282 0bb8a95e 2018-03-12 stsp free(absprefix);
283 65596e15 2018-12-24 stsp free(basestr);
284 86c3caaf 2018-03-09 stsp return err;
287 247140b2 2019-02-05 stsp static const struct got_error *
288 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
290 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
291 7ac97322 2018-03-11 stsp char *path_got;
292 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
293 056e7441 2018-03-11 stsp char *path_lock = NULL;
294 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
295 271d2a38 2018-12-25 stsp char *head_ref_str = NULL;
296 6d9d28c3 2018-03-11 stsp int version, fd = -1;
297 6d9d28c3 2018-03-11 stsp const char *errstr;
298 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
300 6d9d28c3 2018-03-11 stsp *worktree = NULL;
302 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
303 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
304 7ac97322 2018-03-11 stsp path_got = NULL;
308 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
309 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
310 056e7441 2018-03-11 stsp path_lock = NULL;
314 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
315 6d9d28c3 2018-03-11 stsp if (fd == -1) {
316 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
317 73a5ef67 2018-03-11 stsp : got_error_from_errno());
321 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
325 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
326 6d9d28c3 2018-03-11 stsp if (errstr) {
327 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
330 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
331 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
335 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
336 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
337 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
340 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
342 c88eb298 2018-03-11 stsp (*worktree)->root_path = strdup(path);
343 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
344 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
347 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
348 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
352 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
353 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
357 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
358 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
362 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
366 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
367 eaccb85f 2018-12-25 stsp base_commit_id_str);
371 271d2a38 2018-12-25 stsp err = read_meta_file(&head_ref_str, path_got, GOT_WORKTREE_HEAD_REF);
375 271d2a38 2018-12-25 stsp err = got_ref_open(&(*worktree)->head_ref, repo, head_ref_str);
378 eaccb85f 2018-12-25 stsp got_repo_close(repo);
379 7ac97322 2018-03-11 stsp free(path_got);
380 056e7441 2018-03-11 stsp free(path_lock);
381 271d2a38 2018-12-25 stsp free(head_ref_str);
382 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
384 6d9d28c3 2018-03-11 stsp if (fd != -1)
386 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
387 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
388 6d9d28c3 2018-03-11 stsp *worktree = NULL;
390 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
392 6d9d28c3 2018-03-11 stsp return err;
395 247140b2 2019-02-05 stsp const struct got_error *
396 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
398 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
401 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
402 247140b2 2019-02-05 stsp if (err && (err->code != GOT_ERR_ERRNO && errno != ENOENT))
403 247140b2 2019-02-05 stsp return err;
404 247140b2 2019-02-05 stsp if (*worktree)
405 247140b2 2019-02-05 stsp return NULL;
406 247140b2 2019-02-05 stsp path = dirname(path);
407 d1542a27 2019-02-05 stsp if (path == NULL)
408 d1542a27 2019-02-05 stsp return got_error_from_errno();
409 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
411 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
415 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
417 c88eb298 2018-03-11 stsp free(worktree->root_path);
418 cde76477 2018-03-11 stsp free(worktree->repo_path);
419 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
420 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
421 271d2a38 2018-12-25 stsp if (worktree->head_ref)
422 271d2a38 2018-12-25 stsp got_ref_close(worktree->head_ref);
423 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
424 056e7441 2018-03-11 stsp close(worktree->lockfd);
425 6d9d28c3 2018-03-11 stsp free(worktree);
428 2fbdb5ae 2018-12-29 stsp const char *
429 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
431 c7f4312f 2019-02-05 stsp return worktree->root_path;
434 c7f4312f 2019-02-05 stsp const char *
435 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
437 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
440 49520a32 2018-12-29 stsp const char *
441 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
443 f609be2e 2018-12-29 stsp return worktree->path_prefix;
446 e5dc7198 2018-12-29 stsp const struct got_error *
447 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
448 e5dc7198 2018-12-29 stsp const char *path_prefix)
450 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
452 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
453 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
454 e5dc7198 2018-12-29 stsp return got_error_from_errno();
456 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
457 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
458 e5dc7198 2018-12-29 stsp free(absprefix);
459 e5dc7198 2018-12-29 stsp return NULL;
463 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
465 271d2a38 2018-12-25 stsp return got_ref_to_str(worktree->head_ref);
468 be7061eb 2018-12-30 stsp struct got_reference *
469 be7061eb 2018-12-30 stsp got_worktree_get_head_ref(struct got_worktree *worktree)
471 be7061eb 2018-12-30 stsp return got_ref_dup(worktree->head_ref);
474 b72f483a 2019-02-05 stsp struct got_object_id *
475 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
477 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
480 507dc3bb 2018-12-29 stsp const struct got_error *
481 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
482 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
484 507dc3bb 2018-12-29 stsp const struct got_error *err;
485 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
486 507dc3bb 2018-12-29 stsp char *id_str = NULL;
487 507dc3bb 2018-12-29 stsp char *path_got = NULL;
489 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
490 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
491 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
492 507dc3bb 2018-12-29 stsp path_got = NULL;
496 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
498 507dc3bb 2018-12-29 stsp return err;
500 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
501 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
505 507dc3bb 2018-12-29 stsp /* Record our base commit. */
506 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
509 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
513 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
514 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
515 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
516 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
521 507dc3bb 2018-12-29 stsp got_object_close(obj);
522 507dc3bb 2018-12-29 stsp free(id_str);
523 507dc3bb 2018-12-29 stsp free(path_got);
524 507dc3bb 2018-12-29 stsp return err;
527 9d31a1d8 2018-03-11 stsp static const struct got_error *
528 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
530 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
531 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
532 9d31a1d8 2018-03-11 stsp : got_error_from_errno());
533 86c3caaf 2018-03-09 stsp return NULL;
536 9d31a1d8 2018-03-11 stsp static const struct got_error *
537 21908da4 2019-01-13 stsp make_parent_dirs(const char *abspath)
539 21908da4 2019-01-13 stsp const struct got_error *err = NULL;
541 21908da4 2019-01-13 stsp char *parent = dirname(abspath);
542 21908da4 2019-01-13 stsp if (parent == NULL)
543 21908da4 2019-01-13 stsp return NULL;
545 21908da4 2019-01-13 stsp if (mkdir(parent, GOT_DEFAULT_DIR_MODE) == -1) {
546 21908da4 2019-01-13 stsp if (errno == ENOENT) {
547 21908da4 2019-01-13 stsp err = make_parent_dirs(parent);
549 21908da4 2019-01-13 stsp return err;
550 c65fcef2 2019-01-13 stsp if (mkdir(parent, GOT_DEFAULT_DIR_MODE) == -1)
551 c65fcef2 2019-01-13 stsp return got_error_from_errno();
553 c65fcef2 2019-01-13 stsp err = got_error_from_errno();
556 c65fcef2 2019-01-13 stsp return err;
559 21908da4 2019-01-13 stsp static const struct got_error *
560 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
562 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
563 4a1ddfc2 2019-01-12 stsp char *abspath;
565 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
566 4a1ddfc2 2019-01-12 stsp return got_error_from_errno();
568 4a1ddfc2 2019-01-12 stsp /* XXX queue work rather than editing disk directly? */
569 4a1ddfc2 2019-01-12 stsp if (mkdir(abspath, GOT_DEFAULT_DIR_MODE) == -1) {
570 4a1ddfc2 2019-01-12 stsp struct stat sb;
572 21908da4 2019-01-13 stsp if (errno == EEXIST) {
573 21908da4 2019-01-13 stsp if (lstat(abspath, &sb) == -1) {
574 21908da4 2019-01-13 stsp err = got_error_from_errno();
578 21908da4 2019-01-13 stsp if (!S_ISDIR(sb.st_mode)) {
579 21908da4 2019-01-13 stsp /* TODO directory is obstructed; do something */
580 c65fcef2 2019-01-13 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
584 21908da4 2019-01-13 stsp return NULL;
585 c65fcef2 2019-01-13 stsp } else if (errno == ENOENT) {
586 21908da4 2019-01-13 stsp err = make_parent_dirs(abspath);
589 c65fcef2 2019-01-13 stsp if (mkdir(abspath, GOT_DEFAULT_DIR_MODE) == -1)
590 c65fcef2 2019-01-13 stsp err = got_error_from_errno();
592 4a1ddfc2 2019-01-12 stsp err = got_error_from_errno();
596 4a1ddfc2 2019-01-12 stsp free(abspath);
597 6353ad76 2019-02-08 stsp return err;
601 6353ad76 2019-02-08 stsp * Perform a 3-way merge where the file's version in the file index (blob2)
602 6353ad76 2019-02-08 stsp * acts as the common ancestor, the incoming blob (blob1) acts as the first
603 6353ad76 2019-02-08 stsp * derived version, and the file on disk acts as the second derived version.
605 6353ad76 2019-02-08 stsp static const struct got_error *
606 6353ad76 2019-02-08 stsp merge_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
607 6353ad76 2019-02-08 stsp struct got_fileindex_entry *ie, const char *ondisk_path, const char *path,
608 6353ad76 2019-02-08 stsp struct got_blob_object *blob1, struct got_repository *repo,
609 6353ad76 2019-02-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
611 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
612 6353ad76 2019-02-08 stsp int merged_fd = -1;
613 6353ad76 2019-02-08 stsp struct got_blob_object *blob2 = NULL;
614 6353ad76 2019-02-08 stsp FILE *f1 = NULL, *f2 = NULL;
615 6353ad76 2019-02-08 stsp char *blob1_path = NULL, *blob2_path = NULL;
616 6353ad76 2019-02-08 stsp char *merged_path = NULL;
617 6353ad76 2019-02-08 stsp struct got_object_id id2;
618 6353ad76 2019-02-08 stsp char *id_str = NULL;
619 6353ad76 2019-02-08 stsp char *label1 = NULL;
620 6353ad76 2019-02-08 stsp int overlapcnt = 0;
622 6353ad76 2019-02-08 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, "/tmp/got-merged");
624 6353ad76 2019-02-08 stsp return err;
625 6353ad76 2019-02-08 stsp err = got_opentemp_named(&blob1_path, &f1, "/tmp/got-merge-blob1");
628 6353ad76 2019-02-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, f1, blob1);
632 6353ad76 2019-02-08 stsp err = got_opentemp_named(&blob2_path, &f2, "/tmp/got-merge-blob2");
636 6353ad76 2019-02-08 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
637 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
640 6353ad76 2019-02-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, f2, blob2);
644 6353ad76 2019-02-08 stsp err = got_object_id_str(&id_str, worktree->base_commit_id);
647 6353ad76 2019-02-08 stsp if (asprintf(&label1, "commit %s", id_str) == -1) {
648 6353ad76 2019-02-08 stsp err = got_error_from_errno();
652 6353ad76 2019-02-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, blob1_path,
653 6353ad76 2019-02-08 stsp blob2_path, ondisk_path, label1, path);
657 6353ad76 2019-02-08 stsp (*progress_cb)(progress_arg,
658 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
661 6353ad76 2019-02-08 stsp fsync(merged_fd);
663 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
664 6353ad76 2019-02-08 stsp err = got_error_from_errno();
668 6353ad76 2019-02-08 stsp err = got_fileindex_entry_update(ie, ondisk_path,
669 6353ad76 2019-02-08 stsp blob1->id.sha1, worktree->base_commit_id->sha1);
671 6353ad76 2019-02-08 stsp if (merged_fd != -1)
672 6353ad76 2019-02-08 stsp close(merged_fd);
674 6353ad76 2019-02-08 stsp fclose(f1);
676 6353ad76 2019-02-08 stsp fclose(f2);
678 6353ad76 2019-02-08 stsp got_object_blob_close(blob2);
679 6353ad76 2019-02-08 stsp free(merged_path);
680 6353ad76 2019-02-08 stsp if (blob1_path) {
681 6353ad76 2019-02-08 stsp unlink(blob1_path);
682 6353ad76 2019-02-08 stsp free(blob1_path);
684 6353ad76 2019-02-08 stsp if (blob2_path) {
685 6353ad76 2019-02-08 stsp unlink(blob2_path);
686 6353ad76 2019-02-08 stsp free(blob2_path);
688 6353ad76 2019-02-08 stsp free(id_str);
689 6353ad76 2019-02-08 stsp free(label1);
690 4a1ddfc2 2019-01-12 stsp return err;
693 4a1ddfc2 2019-01-12 stsp static const struct got_error *
694 8da9e5f4 2019-01-12 stsp install_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
695 6353ad76 2019-02-08 stsp struct got_fileindex_entry *entry, const char *ondisk_path, const char *path,
696 8da9e5f4 2019-01-12 stsp struct got_blob_object *blob,
697 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
698 8da9e5f4 2019-01-12 stsp void *progress_arg)
700 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
701 507dc3bb 2018-12-29 stsp int fd = -1;
702 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
703 507dc3bb 2018-12-29 stsp int update = 0;
704 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
706 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
707 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
708 9d31a1d8 2018-03-11 stsp if (fd == -1) {
709 21908da4 2019-01-13 stsp if (errno == ENOENT) {
710 21908da4 2019-01-13 stsp char *parent = dirname(path);
711 21908da4 2019-01-13 stsp if (parent == NULL)
712 21908da4 2019-01-13 stsp return got_error_from_errno();
713 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
715 21908da4 2019-01-13 stsp return err;
716 21908da4 2019-01-13 stsp fd = open(ondisk_path,
717 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
718 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
719 21908da4 2019-01-13 stsp if (fd == -1)
720 21908da4 2019-01-13 stsp return got_error_from_errno();
721 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
722 9d31a1d8 2018-03-11 stsp struct stat sb;
723 c34b20a2 2018-03-12 stsp if (lstat(ondisk_path, &sb) == -1) {
724 9d31a1d8 2018-03-11 stsp err = got_error_from_errno();
726 9d31a1d8 2018-03-11 stsp } else if (!S_ISREG(sb.st_mode)) {
727 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
728 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
731 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
732 507dc3bb 2018-12-29 stsp ondisk_path);
735 507dc3bb 2018-12-29 stsp update = 1;
738 7e7c1e4c 2019-01-12 stsp return got_error_from_errno();
741 507dc3bb 2018-12-29 stsp (*progress_cb)(progress_arg,
742 8da9e5f4 2019-01-12 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
744 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
746 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
747 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
750 9d31a1d8 2018-03-11 stsp if (len > 0) {
751 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
752 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
753 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
754 9d31a1d8 2018-03-11 stsp err = got_error_from_errno();
756 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
757 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
760 61d6eaa3 2018-12-24 stsp hdrlen = 0;
762 9d31a1d8 2018-03-11 stsp } while (len != 0);
766 507dc3bb 2018-12-29 stsp if (update) {
767 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
768 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
773 5f9fef37 2019-01-13 stsp if (entry == NULL)
774 5f9fef37 2019-01-13 stsp entry = got_fileindex_entry_get(fileindex, path);
776 51514078 2018-12-25 stsp err = got_fileindex_entry_update(entry, ondisk_path,
777 51514078 2018-12-25 stsp blob->id.sha1, worktree->base_commit_id->sha1);
779 51514078 2018-12-25 stsp err = got_fileindex_entry_alloc(&entry, ondisk_path,
780 8da9e5f4 2019-01-12 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
783 51514078 2018-12-25 stsp err = got_fileindex_entry_add(fileindex, entry);
786 507dc3bb 2018-12-29 stsp if (fd != -1)
788 507dc3bb 2018-12-29 stsp free(tmppath);
789 6353ad76 2019-02-08 stsp return err;
792 6353ad76 2019-02-08 stsp static const struct got_error *
793 6353ad76 2019-02-08 stsp get_file_status(unsigned char *status, struct got_fileindex_entry *ie,
794 6353ad76 2019-02-08 stsp const char *abspath, struct got_repository *repo)
796 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
797 6353ad76 2019-02-08 stsp struct got_object_id id;
798 6353ad76 2019-02-08 stsp size_t hdrlen;
799 6353ad76 2019-02-08 stsp FILE *f = NULL;
800 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
801 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
802 6353ad76 2019-02-08 stsp size_t flen, blen;
803 6353ad76 2019-02-08 stsp struct stat sb;
805 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
807 6353ad76 2019-02-08 stsp if (lstat(abspath, &sb) == -1)
808 6353ad76 2019-02-08 stsp return got_error_from_errno();
810 6353ad76 2019-02-08 stsp if (!S_ISREG(sb.st_mode)) {
811 6353ad76 2019-02-08 stsp *status = GOT_STATUS_OBSTRUCTED;
812 6353ad76 2019-02-08 stsp return NULL;
815 6353ad76 2019-02-08 stsp if (ie->ctime_sec == sb.st_ctime &&
816 6353ad76 2019-02-08 stsp ie->ctime_nsec == sb.st_ctimensec &&
817 6353ad76 2019-02-08 stsp ie->mtime_sec == sb.st_mtime &&
818 6353ad76 2019-02-08 stsp ie->mtime_sec == sb.st_mtime &&
819 6353ad76 2019-02-08 stsp ie->mtime_nsec == sb.st_mtimensec &&
820 6353ad76 2019-02-08 stsp ie->size == (sb.st_size & 0xffffffff))
821 6353ad76 2019-02-08 stsp return NULL;
823 6353ad76 2019-02-08 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
824 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
826 6353ad76 2019-02-08 stsp return err;
828 6353ad76 2019-02-08 stsp f = fopen(abspath, "r");
829 6353ad76 2019-02-08 stsp if (f == NULL) {
830 6353ad76 2019-02-08 stsp err = got_error_from_errno();
833 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
834 6353ad76 2019-02-08 stsp while (1) {
835 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
836 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
839 6353ad76 2019-02-08 stsp flen = fread(fbuf, 1, sizeof(fbuf), f);
840 6353ad76 2019-02-08 stsp if (blen == 0) {
841 6353ad76 2019-02-08 stsp if (flen != 0)
842 6353ad76 2019-02-08 stsp *status = GOT_STATUS_MODIFIY;
844 6353ad76 2019-02-08 stsp } else if (flen == 0) {
845 6353ad76 2019-02-08 stsp if (blen != 0)
846 6353ad76 2019-02-08 stsp *status = GOT_STATUS_MODIFIY;
848 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
849 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
850 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
851 6353ad76 2019-02-08 stsp *status = GOT_STATUS_MODIFIY;
855 6353ad76 2019-02-08 stsp *status = GOT_STATUS_MODIFIY;
858 6353ad76 2019-02-08 stsp hdrlen = 0;
862 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
865 9d31a1d8 2018-03-11 stsp return err;
868 9d31a1d8 2018-03-11 stsp static const struct got_error *
869 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
870 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
871 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
872 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
873 8da9e5f4 2019-01-12 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
875 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
876 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
877 6353ad76 2019-02-08 stsp char *ondisk_path;
878 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
880 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
881 6353ad76 2019-02-08 stsp return got_error_from_errno();
884 8da9e5f4 2019-01-12 stsp if (memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
885 507dc3bb 2018-12-29 stsp SHA1_DIGEST_LENGTH) == 0) {
886 507dc3bb 2018-12-29 stsp (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
890 8da9e5f4 2019-01-12 stsp if (memcmp(ie->blob_sha1,
891 8da9e5f4 2019-01-12 stsp te->id->sha1, SHA1_DIGEST_LENGTH) == 0)
894 6353ad76 2019-02-08 stsp err = get_file_status(&status, ie, ondisk_path, repo);
898 6353ad76 2019-02-08 stsp if (status == GOT_STATUS_OBSTRUCTED) {
899 6353ad76 2019-02-08 stsp (*progress_cb)(progress_arg, status, path);
904 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
908 6353ad76 2019-02-08 stsp if (status == GOT_STATUS_MODIFIY)
909 6353ad76 2019-02-08 stsp err = merge_blob(worktree, fileindex, ie, ondisk_path, path,
910 6353ad76 2019-02-08 stsp blob, repo, progress_cb, progress_arg);
912 6353ad76 2019-02-08 stsp err = install_blob(worktree, fileindex, ie, ondisk_path, path,
913 6353ad76 2019-02-08 stsp blob, repo, progress_cb, progress_arg);
915 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
917 6353ad76 2019-02-08 stsp free(ondisk_path);
918 8da9e5f4 2019-01-12 stsp return err;
921 90285c3b 2019-01-08 stsp static const struct got_error *
922 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
924 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
925 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
927 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
928 90285c3b 2019-01-08 stsp return got_error_from_errno();
930 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
931 c97665ae 2019-01-13 stsp if (errno != ENOENT)
932 c97665ae 2019-01-13 stsp err = got_error_from_errno();
934 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
935 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
936 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
937 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
938 26c4ac4d 2019-01-08 stsp err = got_error_from_errno();
941 90285c3b 2019-01-08 stsp parent = dirname(parent);
944 90285c3b 2019-01-08 stsp free(ondisk_path);
945 90285c3b 2019-01-08 stsp return err;
948 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
949 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
950 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
951 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
952 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
953 8da9e5f4 2019-01-12 stsp void *progress_arg;
954 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
955 8da9e5f4 2019-01-12 stsp void *cancel_arg;
958 512f0d0e 2019-01-02 stsp static const struct got_error *
959 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
960 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
962 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
964 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
965 8da9e5f4 2019-01-12 stsp ie->path, a->repo, a->progress_cb, a->progress_arg,
966 8da9e5f4 2019-01-12 stsp a->cancel_cb, a->cancel_arg);
969 8da9e5f4 2019-01-12 stsp static const struct got_error *
970 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
972 8da9e5f4 2019-01-12 stsp const struct got_error *err;
973 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
975 8da9e5f4 2019-01-12 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE, ie->path);
977 8da9e5f4 2019-01-12 stsp err = remove_ondisk_file(a->worktree->root_path, ie->path);
979 8da9e5f4 2019-01-12 stsp return err;
980 8da9e5f4 2019-01-12 stsp got_fileindex_entry_remove(a->fileindex, ie);
981 8da9e5f4 2019-01-12 stsp return NULL;
984 9d31a1d8 2018-03-11 stsp static const struct got_error *
985 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
987 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
988 8da9e5f4 2019-01-12 stsp const struct got_error *err;
989 8da9e5f4 2019-01-12 stsp char *path;
991 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
992 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
994 8da9e5f4 2019-01-12 stsp return got_error_from_errno();
996 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
997 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
999 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1000 8da9e5f4 2019-01-12 stsp a->repo, a->progress_cb, a->progress_arg,
1001 8da9e5f4 2019-01-12 stsp a->cancel_cb, a->cancel_arg);
1003 8da9e5f4 2019-01-12 stsp free(path);
1004 9d31a1d8 2018-03-11 stsp return err;
1007 9d31a1d8 2018-03-11 stsp const struct got_error *
1008 9d31a1d8 2018-03-11 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1009 93a30277 2018-12-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1010 93a30277 2018-12-24 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1012 a143fb78 2018-12-25 stsp const struct got_error *err = NULL, *unlockerr, *checkout_err = NULL;
1013 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1014 8da9e5f4 2019-01-12 stsp struct got_object_id *tree_id = NULL;
1015 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1016 9d31a1d8 2018-03-11 stsp char *fileindex_path = NULL, *new_fileindex_path = NULL;
1017 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1018 51514078 2018-12-25 stsp FILE *index = NULL, *new_index = NULL;
1019 f44ffd20 2019-02-04 stsp struct got_fileindex_diff_tree_cb diff_cb;
1020 8da9e5f4 2019-01-12 stsp struct diff_cb_arg arg;
1022 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1024 9d31a1d8 2018-03-11 stsp return err;
1026 133d2798 2019-01-08 stsp fileindex = got_fileindex_alloc();
1027 133d2798 2019-01-08 stsp if (fileindex == NULL) {
1028 133d2798 2019-01-08 stsp err = got_error_from_errno();
1029 9d31a1d8 2018-03-11 stsp goto done;
1032 9d31a1d8 2018-03-11 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1033 9d31a1d8 2018-03-11 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1034 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
1035 9d31a1d8 2018-03-11 stsp fileindex_path = NULL;
1036 9d31a1d8 2018-03-11 stsp goto done;
1040 51514078 2018-12-25 stsp * Read the file index.
1041 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1042 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1044 51514078 2018-12-25 stsp index = fopen(fileindex_path, "rb");
1045 51514078 2018-12-25 stsp if (index == NULL) {
1046 cf61d818 2019-01-12 stsp if (errno != ENOENT) {
1047 cf61d818 2019-01-12 stsp err = got_error_from_errno();
1048 cf61d818 2019-01-12 stsp goto done;
1051 cf61d818 2019-01-12 stsp err = got_fileindex_read(fileindex, index);
1052 cf61d818 2019-01-12 stsp fclose(index);
1054 cf61d818 2019-01-12 stsp goto done;
1057 b8bdcc21 2018-12-24 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1058 b8bdcc21 2018-12-24 stsp fileindex_path);
1060 51664889 2018-03-12 stsp goto done;
1062 eaccb85f 2018-12-25 stsp err = got_object_open_as_commit(&commit, repo,
1063 eaccb85f 2018-12-25 stsp worktree->base_commit_id);
1065 9d31a1d8 2018-03-11 stsp goto done;
1067 8da9e5f4 2019-01-12 stsp err = got_object_id_by_path(&tree_id, repo,
1068 8da9e5f4 2019-01-12 stsp worktree->base_commit_id, worktree->path_prefix);
1070 9d31a1d8 2018-03-11 stsp goto done;
1072 8da9e5f4 2019-01-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1074 8da9e5f4 2019-01-12 stsp goto done;
1076 8da9e5f4 2019-01-12 stsp diff_cb.diff_old_new = diff_old_new;
1077 8da9e5f4 2019-01-12 stsp diff_cb.diff_old = diff_old;
1078 8da9e5f4 2019-01-12 stsp diff_cb.diff_new = diff_new;
1079 8da9e5f4 2019-01-12 stsp arg.fileindex = fileindex;
1080 8da9e5f4 2019-01-12 stsp arg.worktree = worktree;
1081 8da9e5f4 2019-01-12 stsp arg.repo = repo;
1082 8da9e5f4 2019-01-12 stsp arg.progress_cb = progress_cb;
1083 8da9e5f4 2019-01-12 stsp arg.progress_arg = progress_arg;
1084 8da9e5f4 2019-01-12 stsp arg.cancel_cb = cancel_cb;
1085 8da9e5f4 2019-01-12 stsp arg.cancel_arg = cancel_arg;
1086 8da9e5f4 2019-01-12 stsp checkout_err = got_fileindex_diff_tree(fileindex, tree, repo,
1087 8da9e5f4 2019-01-12 stsp &diff_cb, &arg);
1089 a143fb78 2018-12-25 stsp /* Try to sync the fileindex back to disk in any case. */
1090 b8bdcc21 2018-12-24 stsp err = got_fileindex_write(fileindex, new_index);
1092 9d31a1d8 2018-03-11 stsp goto done;
1094 9d31a1d8 2018-03-11 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1095 9d31a1d8 2018-03-11 stsp err = got_error_from_errno();
1096 9d31a1d8 2018-03-11 stsp goto done;
1099 9d31a1d8 2018-03-11 stsp free(new_fileindex_path);
1100 9d31a1d8 2018-03-11 stsp new_fileindex_path = NULL;
1104 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1105 9d31a1d8 2018-03-11 stsp if (commit)
1106 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1107 9d31a1d8 2018-03-11 stsp if (new_fileindex_path)
1108 9d31a1d8 2018-03-11 stsp unlink(new_fileindex_path);
1109 b8bdcc21 2018-12-24 stsp if (new_index)
1110 b8bdcc21 2018-12-24 stsp fclose(new_index);
1111 9d31a1d8 2018-03-11 stsp free(new_fileindex_path);
1112 9d31a1d8 2018-03-11 stsp free(fileindex_path);
1113 7426bbfd 2018-12-24 stsp got_fileindex_free(fileindex);
1114 a143fb78 2018-12-25 stsp if (checkout_err)
1115 a143fb78 2018-12-25 stsp err = checkout_err;
1116 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1117 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1118 9d31a1d8 2018-03-11 stsp err = unlockerr;
1119 f8d1f275 2019-02-04 stsp return err;
1122 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
1123 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
1124 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
1125 f8d1f275 2019-02-04 stsp struct got_repository *repo;
1126 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
1127 f8d1f275 2019-02-04 stsp void *status_arg;
1128 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
1129 f8d1f275 2019-02-04 stsp void *cancel_arg;
1132 f8d1f275 2019-02-04 stsp static const struct got_error *
1133 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
1134 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
1136 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
1137 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1138 f8d1f275 2019-02-04 stsp char *abspath;
1139 f8d1f275 2019-02-04 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1141 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
1142 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
1143 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
1144 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1146 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
1147 f8d1f275 2019-02-04 stsp de->d_name) == -1)
1148 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1151 bf96b38c 2019-02-05 stsp err = get_file_status(&status, ie, abspath, a->repo);
1152 b72f483a 2019-02-05 stsp if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
1153 b72f483a 2019-02-05 stsp struct got_object_id id;
1154 b72f483a 2019-02-05 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1155 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, status, ie->path, &id);
1157 f8d1f275 2019-02-04 stsp free(abspath);
1158 9d31a1d8 2018-03-11 stsp return err;
1161 f8d1f275 2019-02-04 stsp static const struct got_error *
1162 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1164 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1165 b72f483a 2019-02-05 stsp struct got_object_id id;
1166 b72f483a 2019-02-05 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1167 b72f483a 2019-02-05 stsp return (*a->status_cb)(a->status_arg, GOT_STATUS_MISSING, ie->path,
1171 f8d1f275 2019-02-04 stsp static const struct got_error *
1172 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
1174 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1175 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1176 f8d1f275 2019-02-04 stsp char *path = NULL;
1178 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
1179 f8d1f275 2019-02-04 stsp return NULL;
1181 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
1182 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
1183 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1185 f8d1f275 2019-02-04 stsp path = de->d_name;
1188 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
1190 f8d1f275 2019-02-04 stsp if (parent_path[0])
1191 f8d1f275 2019-02-04 stsp free(path);
1192 b72f483a 2019-02-05 stsp return err;
1195 f8d1f275 2019-02-04 stsp const struct got_error *
1196 f8d1f275 2019-02-04 stsp got_worktree_status(struct got_worktree *worktree,
1197 f8d1f275 2019-02-04 stsp struct got_repository *repo, got_worktree_status_cb status_cb,
1198 f8d1f275 2019-02-04 stsp void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1200 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
1201 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
1202 f8d1f275 2019-02-04 stsp char *fileindex_path = NULL;
1203 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex = NULL;
1204 f8d1f275 2019-02-04 stsp FILE *index = NULL;
1205 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
1206 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
1208 f8d1f275 2019-02-04 stsp fileindex = got_fileindex_alloc();
1209 f8d1f275 2019-02-04 stsp if (fileindex == NULL) {
1210 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1211 f8d1f275 2019-02-04 stsp goto done;
1214 f8d1f275 2019-02-04 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1215 f8d1f275 2019-02-04 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1216 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1217 f8d1f275 2019-02-04 stsp fileindex_path = NULL;
1218 f8d1f275 2019-02-04 stsp goto done;
1221 f8d1f275 2019-02-04 stsp index = fopen(fileindex_path, "rb");
1222 f8d1f275 2019-02-04 stsp if (index == NULL) {
1223 f8d1f275 2019-02-04 stsp if (errno != ENOENT) {
1224 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1225 f8d1f275 2019-02-04 stsp goto done;
1228 f8d1f275 2019-02-04 stsp err = got_fileindex_read(fileindex, index);
1229 f8d1f275 2019-02-04 stsp fclose(index);
1231 f8d1f275 2019-02-04 stsp goto done;
1234 f8d1f275 2019-02-04 stsp workdir = opendir(worktree->root_path);
1235 c513d110 2019-02-05 stsp if (workdir == NULL) {
1236 c513d110 2019-02-05 stsp err = got_error_from_errno();
1237 c513d110 2019-02-05 stsp goto done;
1239 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old_new = status_old_new;
1240 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old = status_old;
1241 d43a8a88 2019-02-05 stsp fdiff_cb.diff_new = status_new;
1242 f8d1f275 2019-02-04 stsp arg.fileindex = fileindex;
1243 f8d1f275 2019-02-04 stsp arg.worktree = worktree;
1244 f8d1f275 2019-02-04 stsp arg.repo = repo;
1245 f8d1f275 2019-02-04 stsp arg.status_cb = status_cb;
1246 f8d1f275 2019-02-04 stsp arg.status_arg = status_arg;
1247 f8d1f275 2019-02-04 stsp arg.cancel_cb = cancel_cb;
1248 f8d1f275 2019-02-04 stsp arg.cancel_arg = cancel_arg;
1249 c7f4312f 2019-02-05 stsp err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
1250 c7f4312f 2019-02-05 stsp repo, &fdiff_cb, &arg);
1252 f8d1f275 2019-02-04 stsp if (workdir)
1253 f8d1f275 2019-02-04 stsp closedir(workdir);
1254 f8d1f275 2019-02-04 stsp free(fileindex_path);
1255 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
1256 f8d1f275 2019-02-04 stsp return err;
