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 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
124 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
125 99724ed4 2018-03-10 stsp return err;
128 09fe317a 2018-03-11 stsp static const struct got_error *
129 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
131 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
132 09fe317a 2018-03-11 stsp char *path;
133 09fe317a 2018-03-11 stsp int fd = -1;
135 09fe317a 2018-03-11 stsp struct stat sb;
137 09fe317a 2018-03-11 stsp *content = NULL;
139 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
140 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
141 09fe317a 2018-03-11 stsp path = NULL;
145 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
146 09fe317a 2018-03-11 stsp if (fd == -1) {
147 ef99fdb1 2018-03-11 stsp err = got_error_from_errno();
150 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
151 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
152 73a5ef67 2018-03-11 stsp : got_error_from_errno());
156 d10c9b58 2019-02-19 stsp if (lstat(path, &sb) != 0) {
157 d10c9b58 2019-02-19 stsp err = got_error_from_errno();
160 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
161 09fe317a 2018-03-11 stsp if (*content == NULL) {
162 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
166 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
167 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
168 0605801d 2018-03-11 stsp err = (n == -1 ? got_error_from_errno() :
169 0605801d 2018-03-11 stsp got_error(GOT_ERR_WORKTREE_META));
172 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
173 09fe317a 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
176 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
179 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
180 09fe317a 2018-03-11 stsp err = got_error_from_errno();
181 09fe317a 2018-03-11 stsp free(path);
183 09fe317a 2018-03-11 stsp free(*content);
184 09fe317a 2018-03-11 stsp *content = NULL;
186 09fe317a 2018-03-11 stsp return err;
189 86c3caaf 2018-03-09 stsp const struct got_error *
190 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
191 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
193 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
194 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
195 65596e15 2018-12-24 stsp int obj_type;
196 7ac97322 2018-03-11 stsp char *path_got = NULL;
197 08d425ea 2018-12-24 stsp char *refstr = NULL;
198 1451e70d 2018-03-10 stsp char *formatstr = NULL;
199 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
200 65596e15 2018-12-24 stsp char *basestr = NULL;
202 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
204 65596e15 2018-12-24 stsp return err;
205 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
207 65596e15 2018-12-24 stsp return err;
208 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
209 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
211 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
212 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
213 0a585a0d 2018-03-17 stsp return got_error_from_errno();
216 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
217 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
218 86c3caaf 2018-03-09 stsp err = got_error_from_errno();
222 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
223 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
224 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
227 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
228 86c3caaf 2018-03-09 stsp err = got_error_from_errno();
232 056e7441 2018-03-11 stsp /* Create an empty lock file. */
233 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
237 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
238 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
242 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
243 08d425ea 2018-12-24 stsp refstr = got_ref_to_str(head_ref);
244 08d425ea 2018-12-24 stsp if (refstr == NULL) {
245 a1a7858a 2018-12-24 stsp err = got_error_from_errno();
248 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
252 65596e15 2018-12-24 stsp /* Record our base commit. */
253 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
256 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
260 1451e70d 2018-03-10 stsp /* Store path to repository. */
261 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
262 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
266 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
267 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
268 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
272 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
273 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
274 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
277 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
282 65596e15 2018-12-24 stsp free(commit_id);
283 7ac97322 2018-03-11 stsp free(path_got);
284 1451e70d 2018-03-10 stsp free(formatstr);
285 08d425ea 2018-12-24 stsp free(refstr);
286 0bb8a95e 2018-03-12 stsp free(absprefix);
287 65596e15 2018-12-24 stsp free(basestr);
288 86c3caaf 2018-03-09 stsp return err;
291 247140b2 2019-02-05 stsp static const struct got_error *
292 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
294 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
295 7ac97322 2018-03-11 stsp char *path_got;
296 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
297 056e7441 2018-03-11 stsp char *path_lock = NULL;
298 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
299 271d2a38 2018-12-25 stsp char *head_ref_str = NULL;
300 6d9d28c3 2018-03-11 stsp int version, fd = -1;
301 6d9d28c3 2018-03-11 stsp const char *errstr;
302 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
304 6d9d28c3 2018-03-11 stsp *worktree = NULL;
306 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
307 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
308 7ac97322 2018-03-11 stsp path_got = NULL;
312 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
313 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
314 056e7441 2018-03-11 stsp path_lock = NULL;
318 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
319 6d9d28c3 2018-03-11 stsp if (fd == -1) {
320 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
321 73a5ef67 2018-03-11 stsp : got_error_from_errno());
325 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
329 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
330 6d9d28c3 2018-03-11 stsp if (errstr) {
331 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
334 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
335 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
339 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
340 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
341 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
344 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
346 c88eb298 2018-03-11 stsp (*worktree)->root_path = strdup(path);
347 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
348 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
351 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
352 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
356 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
357 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
361 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
362 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
366 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
370 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
371 eaccb85f 2018-12-25 stsp base_commit_id_str);
375 271d2a38 2018-12-25 stsp err = read_meta_file(&head_ref_str, path_got, GOT_WORKTREE_HEAD_REF);
379 271d2a38 2018-12-25 stsp err = got_ref_open(&(*worktree)->head_ref, repo, head_ref_str);
382 eaccb85f 2018-12-25 stsp got_repo_close(repo);
383 7ac97322 2018-03-11 stsp free(path_got);
384 056e7441 2018-03-11 stsp free(path_lock);
385 271d2a38 2018-12-25 stsp free(head_ref_str);
386 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
388 6d9d28c3 2018-03-11 stsp if (fd != -1)
390 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
391 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
392 6d9d28c3 2018-03-11 stsp *worktree = NULL;
394 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
396 6d9d28c3 2018-03-11 stsp return err;
399 247140b2 2019-02-05 stsp const struct got_error *
400 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
402 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
405 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
406 247140b2 2019-02-05 stsp if (err && (err->code != GOT_ERR_ERRNO && errno != ENOENT))
407 247140b2 2019-02-05 stsp return err;
408 247140b2 2019-02-05 stsp if (*worktree)
409 247140b2 2019-02-05 stsp return NULL;
410 247140b2 2019-02-05 stsp path = dirname(path);
411 d1542a27 2019-02-05 stsp if (path == NULL)
412 d1542a27 2019-02-05 stsp return got_error_from_errno();
413 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
415 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
418 3a6ce05a 2019-02-11 stsp const struct got_error *
419 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
421 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
422 c88eb298 2018-03-11 stsp free(worktree->root_path);
423 cde76477 2018-03-11 stsp free(worktree->repo_path);
424 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
425 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
426 271d2a38 2018-12-25 stsp if (worktree->head_ref)
427 271d2a38 2018-12-25 stsp got_ref_close(worktree->head_ref);
428 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
429 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
430 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
431 6d9d28c3 2018-03-11 stsp free(worktree);
432 3a6ce05a 2019-02-11 stsp return err;
435 2fbdb5ae 2018-12-29 stsp const char *
436 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
438 c7f4312f 2019-02-05 stsp return worktree->root_path;
441 c7f4312f 2019-02-05 stsp const char *
442 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
444 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
447 49520a32 2018-12-29 stsp const char *
448 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
450 f609be2e 2018-12-29 stsp return worktree->path_prefix;
453 e5dc7198 2018-12-29 stsp const struct got_error *
454 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
455 e5dc7198 2018-12-29 stsp const char *path_prefix)
457 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
459 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
460 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
461 e5dc7198 2018-12-29 stsp return got_error_from_errno();
463 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
464 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
465 e5dc7198 2018-12-29 stsp free(absprefix);
466 e5dc7198 2018-12-29 stsp return NULL;
470 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
472 271d2a38 2018-12-25 stsp return got_ref_to_str(worktree->head_ref);
475 be7061eb 2018-12-30 stsp struct got_reference *
476 be7061eb 2018-12-30 stsp got_worktree_get_head_ref(struct got_worktree *worktree)
478 be7061eb 2018-12-30 stsp return got_ref_dup(worktree->head_ref);
481 b72f483a 2019-02-05 stsp struct got_object_id *
482 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
484 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
487 507dc3bb 2018-12-29 stsp const struct got_error *
488 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
489 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
491 507dc3bb 2018-12-29 stsp const struct got_error *err;
492 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
493 507dc3bb 2018-12-29 stsp char *id_str = NULL;
494 507dc3bb 2018-12-29 stsp char *path_got = NULL;
496 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
497 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
498 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
499 507dc3bb 2018-12-29 stsp path_got = NULL;
503 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
505 507dc3bb 2018-12-29 stsp return err;
507 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
508 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
512 507dc3bb 2018-12-29 stsp /* Record our base commit. */
513 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
516 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
520 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
521 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
522 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
523 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
528 507dc3bb 2018-12-29 stsp got_object_close(obj);
529 507dc3bb 2018-12-29 stsp free(id_str);
530 507dc3bb 2018-12-29 stsp free(path_got);
531 507dc3bb 2018-12-29 stsp return err;
534 9d31a1d8 2018-03-11 stsp static const struct got_error *
535 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
537 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
538 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
539 9d31a1d8 2018-03-11 stsp : got_error_from_errno());
540 86c3caaf 2018-03-09 stsp return NULL;
543 9d31a1d8 2018-03-11 stsp static const struct got_error *
544 21908da4 2019-01-13 stsp make_parent_dirs(const char *abspath)
546 21908da4 2019-01-13 stsp const struct got_error *err = NULL;
548 21908da4 2019-01-13 stsp char *parent = dirname(abspath);
549 21908da4 2019-01-13 stsp if (parent == NULL)
550 21908da4 2019-01-13 stsp return NULL;
552 21908da4 2019-01-13 stsp if (mkdir(parent, GOT_DEFAULT_DIR_MODE) == -1) {
553 21908da4 2019-01-13 stsp if (errno == ENOENT) {
554 21908da4 2019-01-13 stsp err = make_parent_dirs(parent);
556 21908da4 2019-01-13 stsp return err;
557 c65fcef2 2019-01-13 stsp if (mkdir(parent, GOT_DEFAULT_DIR_MODE) == -1)
558 c65fcef2 2019-01-13 stsp return got_error_from_errno();
560 c65fcef2 2019-01-13 stsp err = got_error_from_errno();
563 c65fcef2 2019-01-13 stsp return err;
566 21908da4 2019-01-13 stsp static const struct got_error *
567 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
569 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
570 4a1ddfc2 2019-01-12 stsp char *abspath;
572 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
573 4a1ddfc2 2019-01-12 stsp return got_error_from_errno();
575 4a1ddfc2 2019-01-12 stsp /* XXX queue work rather than editing disk directly? */
576 4a1ddfc2 2019-01-12 stsp if (mkdir(abspath, GOT_DEFAULT_DIR_MODE) == -1) {
577 4a1ddfc2 2019-01-12 stsp struct stat sb;
579 21908da4 2019-01-13 stsp if (errno == EEXIST) {
580 21908da4 2019-01-13 stsp if (lstat(abspath, &sb) == -1) {
581 21908da4 2019-01-13 stsp err = got_error_from_errno();
585 21908da4 2019-01-13 stsp if (!S_ISDIR(sb.st_mode)) {
586 21908da4 2019-01-13 stsp /* TODO directory is obstructed; do something */
587 c65fcef2 2019-01-13 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
591 21908da4 2019-01-13 stsp return NULL;
592 c65fcef2 2019-01-13 stsp } else if (errno == ENOENT) {
593 21908da4 2019-01-13 stsp err = make_parent_dirs(abspath);
596 c65fcef2 2019-01-13 stsp if (mkdir(abspath, GOT_DEFAULT_DIR_MODE) == -1)
597 c65fcef2 2019-01-13 stsp err = got_error_from_errno();
599 4a1ddfc2 2019-01-12 stsp err = got_error_from_errno();
603 4a1ddfc2 2019-01-12 stsp free(abspath);
604 68c76935 2019-02-19 stsp return err;
607 68c76935 2019-02-19 stsp static const struct got_error *
608 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
610 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
611 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
612 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
613 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
617 68c76935 2019-02-19 stsp while (1) {
618 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
619 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
620 68c76935 2019-02-19 stsp err = got_error_from_errno();
623 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
624 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
625 68c76935 2019-02-19 stsp err = got_error_from_errno();
628 68c76935 2019-02-19 stsp if (flen1 == 0) {
629 68c76935 2019-02-19 stsp if (flen2 != 0)
632 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
633 68c76935 2019-02-19 stsp if (flen1 != 0)
636 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
637 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
647 68c76935 2019-02-19 stsp return err;
650 68c76935 2019-02-19 stsp static const struct got_error *
651 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
653 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
654 68c76935 2019-02-19 stsp struct stat sb;
655 68c76935 2019-02-19 stsp size_t size1, size2;
656 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
660 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
661 68c76935 2019-02-19 stsp err = got_error_from_errno();
664 68c76935 2019-02-19 stsp size1 = sb.st_size;
666 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
667 68c76935 2019-02-19 stsp err = got_error_from_errno();
670 68c76935 2019-02-19 stsp size2 = sb.st_size;
672 68c76935 2019-02-19 stsp if (size1 != size2) {
674 68c76935 2019-02-19 stsp return NULL;
677 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
678 68c76935 2019-02-19 stsp if (f1 == NULL)
679 68c76935 2019-02-19 stsp return got_error_from_errno();
681 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
682 68c76935 2019-02-19 stsp if (f2 == NULL) {
683 68c76935 2019-02-19 stsp err = got_error_from_errno();
687 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
689 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
690 68c76935 2019-02-19 stsp err = got_error_from_errno();
691 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
692 68c76935 2019-02-19 stsp err = got_error_from_errno();
694 6353ad76 2019-02-08 stsp return err;
698 6353ad76 2019-02-08 stsp * Perform a 3-way merge where the file's version in the file index (blob2)
699 6353ad76 2019-02-08 stsp * acts as the common ancestor, the incoming blob (blob1) acts as the first
700 6353ad76 2019-02-08 stsp * derived version, and the file on disk acts as the second derived version.
702 6353ad76 2019-02-08 stsp static const struct got_error *
703 6353ad76 2019-02-08 stsp merge_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
704 6353ad76 2019-02-08 stsp struct got_fileindex_entry *ie, const char *ondisk_path, const char *path,
705 b8f41171 2019-02-10 stsp uint16_t te_mode, uint16_t st_mode, struct got_blob_object *blob1,
706 b8f41171 2019-02-10 stsp struct got_repository *repo,
707 6353ad76 2019-02-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
709 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
710 6353ad76 2019-02-08 stsp int merged_fd = -1;
711 6353ad76 2019-02-08 stsp struct got_blob_object *blob2 = NULL;
712 6353ad76 2019-02-08 stsp FILE *f1 = NULL, *f2 = NULL;
713 6353ad76 2019-02-08 stsp char *blob1_path = NULL, *blob2_path = NULL;
714 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
715 6353ad76 2019-02-08 stsp struct got_object_id id2;
716 6353ad76 2019-02-08 stsp char *id_str = NULL;
717 6353ad76 2019-02-08 stsp char *label1 = NULL;
718 68c76935 2019-02-19 stsp int overlapcnt = 0, update_timestamps = 0;
719 af54ae4a 2019-02-19 stsp char *parent;
721 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
722 af54ae4a 2019-02-19 stsp if (parent == NULL)
723 af54ae4a 2019-02-19 stsp return got_error_from_errno();
725 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
726 af54ae4a 2019-02-19 stsp return got_error_from_errno();
728 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
732 af54ae4a 2019-02-19 stsp free(base_path);
733 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merge-blob1", parent) == -1) {
734 af54ae4a 2019-02-19 stsp err = got_error_from_errno();
735 af54ae4a 2019-02-19 stsp base_path = NULL;
739 af54ae4a 2019-02-19 stsp err = got_opentemp_named(&blob1_path, &f1, base_path);
742 6353ad76 2019-02-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, f1, blob1);
746 af54ae4a 2019-02-19 stsp free(base_path);
747 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merge-blob2", parent) == -1) {
748 af54ae4a 2019-02-19 stsp err = got_error_from_errno();
749 af54ae4a 2019-02-19 stsp base_path = NULL;
753 af54ae4a 2019-02-19 stsp err = got_opentemp_named(&blob2_path, &f2, base_path);
757 6353ad76 2019-02-08 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
758 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
761 6353ad76 2019-02-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, f2, blob2);
765 6353ad76 2019-02-08 stsp err = got_object_id_str(&id_str, worktree->base_commit_id);
768 6353ad76 2019-02-08 stsp if (asprintf(&label1, "commit %s", id_str) == -1) {
769 6353ad76 2019-02-08 stsp err = got_error_from_errno();
773 6353ad76 2019-02-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, blob1_path,
774 6353ad76 2019-02-08 stsp blob2_path, ondisk_path, label1, path);
778 6353ad76 2019-02-08 stsp (*progress_cb)(progress_arg,
779 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
782 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
783 816dc654 2019-02-16 stsp err = got_error_from_errno();
787 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
788 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
789 68c76935 2019-02-19 stsp err = check_files_equal(&update_timestamps, blob1_path,
790 68c76935 2019-02-19 stsp merged_path);
795 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
796 6353ad76 2019-02-08 stsp err = got_error_from_errno();
801 02c07007 2019-02-10 stsp * Do not update timestamps of already modified files. Otherwise,
802 65ad4e61 2019-02-20 stsp * a future status walk would treat them as unmodified files again.
804 6353ad76 2019-02-08 stsp err = got_fileindex_entry_update(ie, ondisk_path,
805 68c76935 2019-02-19 stsp blob1->id.sha1, worktree->base_commit_id->sha1, update_timestamps);
807 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
808 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
809 3a6ce05a 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
810 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
811 3a6ce05a 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
812 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
814 6353ad76 2019-02-08 stsp got_object_blob_close(blob2);
815 6353ad76 2019-02-08 stsp free(merged_path);
816 af54ae4a 2019-02-19 stsp free(base_path);
817 6353ad76 2019-02-08 stsp if (blob1_path) {
818 6353ad76 2019-02-08 stsp unlink(blob1_path);
819 6353ad76 2019-02-08 stsp free(blob1_path);
821 6353ad76 2019-02-08 stsp if (blob2_path) {
822 6353ad76 2019-02-08 stsp unlink(blob2_path);
823 6353ad76 2019-02-08 stsp free(blob2_path);
825 6353ad76 2019-02-08 stsp free(id_str);
826 6353ad76 2019-02-08 stsp free(label1);
827 4a1ddfc2 2019-01-12 stsp return err;
830 4a1ddfc2 2019-01-12 stsp static const struct got_error *
831 8da9e5f4 2019-01-12 stsp install_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
832 6353ad76 2019-02-08 stsp struct got_fileindex_entry *entry, const char *ondisk_path, const char *path,
833 b8f41171 2019-02-10 stsp uint16_t te_mode, uint16_t st_mode, struct got_blob_object *blob,
834 b8f41171 2019-02-10 stsp int restoring_missing_file, struct got_repository *repo,
835 b8f41171 2019-02-10 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
837 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
838 507dc3bb 2018-12-29 stsp int fd = -1;
839 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
840 507dc3bb 2018-12-29 stsp int update = 0;
841 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
843 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
844 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
845 9d31a1d8 2018-03-11 stsp if (fd == -1) {
846 21908da4 2019-01-13 stsp if (errno == ENOENT) {
847 21908da4 2019-01-13 stsp char *parent = dirname(path);
848 21908da4 2019-01-13 stsp if (parent == NULL)
849 21908da4 2019-01-13 stsp return got_error_from_errno();
850 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
852 21908da4 2019-01-13 stsp return err;
853 21908da4 2019-01-13 stsp fd = open(ondisk_path,
854 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
855 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
856 21908da4 2019-01-13 stsp if (fd == -1)
857 21908da4 2019-01-13 stsp return got_error_from_errno();
858 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
859 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
860 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
861 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
864 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
865 507dc3bb 2018-12-29 stsp ondisk_path);
868 507dc3bb 2018-12-29 stsp update = 1;
871 7e7c1e4c 2019-01-12 stsp return got_error_from_errno();
874 a378724f 2019-02-10 stsp if (restoring_missing_file)
875 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
877 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg,
878 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
880 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
882 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
883 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
886 9d31a1d8 2018-03-11 stsp if (len > 0) {
887 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
888 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
889 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
890 9d31a1d8 2018-03-11 stsp err = got_error_from_errno();
892 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
893 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
896 61d6eaa3 2018-12-24 stsp hdrlen = 0;
898 9d31a1d8 2018-03-11 stsp } while (len != 0);
900 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
901 816dc654 2019-02-16 stsp err = got_error_from_errno();
905 507dc3bb 2018-12-29 stsp if (update) {
906 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
907 68ed9ba5 2019-02-10 stsp err = got_error_from_errno();
912 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
913 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
914 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
918 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
919 68ed9ba5 2019-02-10 stsp err = got_error_from_errno();
924 5f9fef37 2019-01-13 stsp if (entry == NULL)
925 5f9fef37 2019-01-13 stsp entry = got_fileindex_entry_get(fileindex, path);
927 51514078 2018-12-25 stsp err = got_fileindex_entry_update(entry, ondisk_path,
928 02c07007 2019-02-10 stsp blob->id.sha1, worktree->base_commit_id->sha1, 1);
930 51514078 2018-12-25 stsp err = got_fileindex_entry_alloc(&entry, ondisk_path,
931 8da9e5f4 2019-01-12 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
934 51514078 2018-12-25 stsp err = got_fileindex_entry_add(fileindex, entry);
937 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
938 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
939 507dc3bb 2018-12-29 stsp free(tmppath);
940 6353ad76 2019-02-08 stsp return err;
943 6353ad76 2019-02-08 stsp static const struct got_error *
944 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
945 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
946 b8f41171 2019-02-10 stsp struct got_repository *repo)
948 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
949 6353ad76 2019-02-08 stsp struct got_object_id id;
950 6353ad76 2019-02-08 stsp size_t hdrlen;
951 6353ad76 2019-02-08 stsp FILE *f = NULL;
952 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
953 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
954 6353ad76 2019-02-08 stsp size_t flen, blen;
956 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
958 b8f41171 2019-02-10 stsp if (lstat(abspath, sb) == -1) {
959 a378724f 2019-02-10 stsp if (errno == ENOENT) {
961 b8f41171 2019-02-10 stsp *status = GOT_STATUS_MISSING;
962 b8f41171 2019-02-10 stsp sb->st_mode =
963 b8f41171 2019-02-10 stsp ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
964 b8f41171 2019-02-10 stsp & (S_IRWXU | S_IRWXG | S_IRWXO));
966 b8f41171 2019-02-10 stsp sb->st_mode = GOT_DEFAULT_FILE_MODE;
967 a378724f 2019-02-10 stsp return NULL;
969 6353ad76 2019-02-08 stsp return got_error_from_errno();
972 b8f41171 2019-02-10 stsp if (!S_ISREG(sb->st_mode)) {
973 6353ad76 2019-02-08 stsp *status = GOT_STATUS_OBSTRUCTED;
974 6353ad76 2019-02-08 stsp return NULL;
977 b8f41171 2019-02-10 stsp if (ie == NULL)
978 b8f41171 2019-02-10 stsp return NULL;
980 b8f41171 2019-02-10 stsp if (ie->ctime_sec == sb->st_ctime &&
981 b8f41171 2019-02-10 stsp ie->ctime_nsec == sb->st_ctimensec &&
982 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
983 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
984 b8f41171 2019-02-10 stsp ie->mtime_nsec == sb->st_mtimensec &&
985 b8f41171 2019-02-10 stsp ie->size == (sb->st_size & 0xffffffff))
986 6353ad76 2019-02-08 stsp return NULL;
988 6353ad76 2019-02-08 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
989 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
991 6353ad76 2019-02-08 stsp return err;
993 6353ad76 2019-02-08 stsp f = fopen(abspath, "r");
994 6353ad76 2019-02-08 stsp if (f == NULL) {
995 6353ad76 2019-02-08 stsp err = got_error_from_errno();
998 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
999 6353ad76 2019-02-08 stsp while (1) {
1000 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1001 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1004 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1005 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1006 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1007 80c5c120 2019-02-19 stsp err = got_error_from_errno();
1010 6353ad76 2019-02-08 stsp if (blen == 0) {
1011 6353ad76 2019-02-08 stsp if (flen != 0)
1012 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1014 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1015 6353ad76 2019-02-08 stsp if (blen != 0)
1016 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1018 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1019 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1020 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1021 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1025 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1028 6353ad76 2019-02-08 stsp hdrlen = 0;
1032 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1034 6353ad76 2019-02-08 stsp fclose(f);
1035 9d31a1d8 2018-03-11 stsp return err;
1038 9d31a1d8 2018-03-11 stsp static const struct got_error *
1039 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1040 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1041 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1042 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1043 8da9e5f4 2019-01-12 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1045 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1046 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1047 6353ad76 2019-02-08 stsp char *ondisk_path;
1048 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1049 b8f41171 2019-02-10 stsp struct stat sb;
1051 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1052 6353ad76 2019-02-08 stsp return got_error_from_errno();
1054 b8f41171 2019-02-10 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1056 b8f41171 2019-02-10 stsp goto done;
1058 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1059 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, status, path);
1060 b8f41171 2019-02-10 stsp goto done;
1063 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1064 b8f41171 2019-02-10 stsp if (memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1065 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1066 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1068 6353ad76 2019-02-08 stsp goto done;
1070 b8f41171 2019-02-10 stsp if (memcmp(ie->blob_sha1,
1071 b8f41171 2019-02-10 stsp te->id->sha1, SHA1_DIGEST_LENGTH) == 0)
1072 b8f41171 2019-02-10 stsp goto done;
1075 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1077 6353ad76 2019-02-08 stsp goto done;
1079 276262e8 2019-02-08 stsp if (status == GOT_STATUS_MODIFY)
1080 6353ad76 2019-02-08 stsp err = merge_blob(worktree, fileindex, ie, ondisk_path, path,
1081 b8f41171 2019-02-10 stsp te->mode, sb.st_mode, blob, repo, progress_cb,
1082 b8f41171 2019-02-10 stsp progress_arg);
1084 6353ad76 2019-02-08 stsp err = install_blob(worktree, fileindex, ie, ondisk_path, path,
1085 b8f41171 2019-02-10 stsp te->mode, sb.st_mode, blob, status == GOT_STATUS_MISSING,
1086 b8f41171 2019-02-10 stsp repo, progress_cb, progress_arg);
1088 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1090 6353ad76 2019-02-08 stsp free(ondisk_path);
1091 8da9e5f4 2019-01-12 stsp return err;
1094 90285c3b 2019-01-08 stsp static const struct got_error *
1095 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1097 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1098 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1100 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1101 90285c3b 2019-01-08 stsp return got_error_from_errno();
1103 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1104 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1105 c97665ae 2019-01-13 stsp err = got_error_from_errno();
1107 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1108 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1109 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1110 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1111 26c4ac4d 2019-01-08 stsp err = got_error_from_errno();
1114 90285c3b 2019-01-08 stsp parent = dirname(parent);
1117 90285c3b 2019-01-08 stsp free(ondisk_path);
1118 90285c3b 2019-01-08 stsp return err;
1121 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1122 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1123 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1124 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1125 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1126 8da9e5f4 2019-01-12 stsp void *progress_arg;
1127 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1128 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1131 512f0d0e 2019-01-02 stsp static const struct got_error *
1132 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1133 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1135 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1137 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1138 8da9e5f4 2019-01-12 stsp ie->path, a->repo, a->progress_cb, a->progress_arg,
1139 8da9e5f4 2019-01-12 stsp a->cancel_cb, a->cancel_arg);
1142 8da9e5f4 2019-01-12 stsp static const struct got_error *
1143 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1145 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1146 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1148 8da9e5f4 2019-01-12 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE, ie->path);
1150 8da9e5f4 2019-01-12 stsp err = remove_ondisk_file(a->worktree->root_path, ie->path);
1152 8da9e5f4 2019-01-12 stsp return err;
1153 8da9e5f4 2019-01-12 stsp got_fileindex_entry_remove(a->fileindex, ie);
1154 8da9e5f4 2019-01-12 stsp return NULL;
1157 9d31a1d8 2018-03-11 stsp static const struct got_error *
1158 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1160 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1161 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1162 8da9e5f4 2019-01-12 stsp char *path;
1164 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1165 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1167 8da9e5f4 2019-01-12 stsp return got_error_from_errno();
1169 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1170 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1172 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1173 8da9e5f4 2019-01-12 stsp a->repo, a->progress_cb, a->progress_arg,
1174 8da9e5f4 2019-01-12 stsp a->cancel_cb, a->cancel_arg);
1176 8da9e5f4 2019-01-12 stsp free(path);
1177 9d31a1d8 2018-03-11 stsp return err;
1180 9d31a1d8 2018-03-11 stsp const struct got_error *
1181 9d31a1d8 2018-03-11 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1182 93a30277 2018-12-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1183 93a30277 2018-12-24 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1185 a143fb78 2018-12-25 stsp const struct got_error *err = NULL, *unlockerr, *checkout_err = NULL;
1186 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1187 8da9e5f4 2019-01-12 stsp struct got_object_id *tree_id = NULL;
1188 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1189 9d31a1d8 2018-03-11 stsp char *fileindex_path = NULL, *new_fileindex_path = NULL;
1190 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1191 51514078 2018-12-25 stsp FILE *index = NULL, *new_index = NULL;
1192 f44ffd20 2019-02-04 stsp struct got_fileindex_diff_tree_cb diff_cb;
1193 8da9e5f4 2019-01-12 stsp struct diff_cb_arg arg;
1195 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1197 9d31a1d8 2018-03-11 stsp return err;
1199 133d2798 2019-01-08 stsp fileindex = got_fileindex_alloc();
1200 133d2798 2019-01-08 stsp if (fileindex == NULL) {
1201 133d2798 2019-01-08 stsp err = got_error_from_errno();
1202 9d31a1d8 2018-03-11 stsp goto done;
1205 9d31a1d8 2018-03-11 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1206 9d31a1d8 2018-03-11 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1207 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
1208 9d31a1d8 2018-03-11 stsp fileindex_path = NULL;
1209 9d31a1d8 2018-03-11 stsp goto done;
1213 51514078 2018-12-25 stsp * Read the file index.
1214 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1215 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1217 51514078 2018-12-25 stsp index = fopen(fileindex_path, "rb");
1218 51514078 2018-12-25 stsp if (index == NULL) {
1219 cf61d818 2019-01-12 stsp if (errno != ENOENT) {
1220 cf61d818 2019-01-12 stsp err = got_error_from_errno();
1221 cf61d818 2019-01-12 stsp goto done;
1224 cf61d818 2019-01-12 stsp err = got_fileindex_read(fileindex, index);
1225 cf61d818 2019-01-12 stsp fclose(index);
1227 cf61d818 2019-01-12 stsp goto done;
1230 b8bdcc21 2018-12-24 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1231 b8bdcc21 2018-12-24 stsp fileindex_path);
1233 51664889 2018-03-12 stsp goto done;
1235 eaccb85f 2018-12-25 stsp err = got_object_open_as_commit(&commit, repo,
1236 eaccb85f 2018-12-25 stsp worktree->base_commit_id);
1238 9d31a1d8 2018-03-11 stsp goto done;
1240 8da9e5f4 2019-01-12 stsp err = got_object_id_by_path(&tree_id, repo,
1241 8da9e5f4 2019-01-12 stsp worktree->base_commit_id, worktree->path_prefix);
1243 9d31a1d8 2018-03-11 stsp goto done;
1245 8da9e5f4 2019-01-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1247 8da9e5f4 2019-01-12 stsp goto done;
1249 8da9e5f4 2019-01-12 stsp diff_cb.diff_old_new = diff_old_new;
1250 8da9e5f4 2019-01-12 stsp diff_cb.diff_old = diff_old;
1251 8da9e5f4 2019-01-12 stsp diff_cb.diff_new = diff_new;
1252 8da9e5f4 2019-01-12 stsp arg.fileindex = fileindex;
1253 8da9e5f4 2019-01-12 stsp arg.worktree = worktree;
1254 8da9e5f4 2019-01-12 stsp arg.repo = repo;
1255 8da9e5f4 2019-01-12 stsp arg.progress_cb = progress_cb;
1256 8da9e5f4 2019-01-12 stsp arg.progress_arg = progress_arg;
1257 8da9e5f4 2019-01-12 stsp arg.cancel_cb = cancel_cb;
1258 8da9e5f4 2019-01-12 stsp arg.cancel_arg = cancel_arg;
1259 8da9e5f4 2019-01-12 stsp checkout_err = got_fileindex_diff_tree(fileindex, tree, repo,
1260 8da9e5f4 2019-01-12 stsp &diff_cb, &arg);
1262 a143fb78 2018-12-25 stsp /* Try to sync the fileindex back to disk in any case. */
1263 b8bdcc21 2018-12-24 stsp err = got_fileindex_write(fileindex, new_index);
1265 9d31a1d8 2018-03-11 stsp goto done;
1267 9d31a1d8 2018-03-11 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1268 9d31a1d8 2018-03-11 stsp err = got_error_from_errno();
1269 9d31a1d8 2018-03-11 stsp goto done;
1272 9d31a1d8 2018-03-11 stsp free(new_fileindex_path);
1273 9d31a1d8 2018-03-11 stsp new_fileindex_path = NULL;
1277 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1278 9d31a1d8 2018-03-11 stsp if (commit)
1279 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1280 9d31a1d8 2018-03-11 stsp if (new_fileindex_path)
1281 9d31a1d8 2018-03-11 stsp unlink(new_fileindex_path);
1282 b8bdcc21 2018-12-24 stsp if (new_index)
1283 b8bdcc21 2018-12-24 stsp fclose(new_index);
1284 9d31a1d8 2018-03-11 stsp free(new_fileindex_path);
1285 9d31a1d8 2018-03-11 stsp free(fileindex_path);
1286 7426bbfd 2018-12-24 stsp got_fileindex_free(fileindex);
1287 a143fb78 2018-12-25 stsp if (checkout_err)
1288 a143fb78 2018-12-25 stsp err = checkout_err;
1289 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1290 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1291 9d31a1d8 2018-03-11 stsp err = unlockerr;
1292 f8d1f275 2019-02-04 stsp return err;
1295 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
1296 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
1297 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
1298 927df6b7 2019-02-10 stsp const char *status_path;
1299 927df6b7 2019-02-10 stsp size_t status_path_len;
1300 f8d1f275 2019-02-04 stsp struct got_repository *repo;
1301 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
1302 f8d1f275 2019-02-04 stsp void *status_arg;
1303 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
1304 f8d1f275 2019-02-04 stsp void *cancel_arg;
1307 f8d1f275 2019-02-04 stsp static const struct got_error *
1308 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
1309 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
1310 927df6b7 2019-02-10 stsp struct got_repository *repo)
1312 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
1313 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1314 927df6b7 2019-02-10 stsp struct stat sb;
1315 927df6b7 2019-02-10 stsp struct got_object_id id;
1317 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
1318 927df6b7 2019-02-10 stsp if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
1319 927df6b7 2019-02-10 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1320 927df6b7 2019-02-10 stsp err = (*status_cb)(status_arg, status, ie->path, &id);
1322 927df6b7 2019-02-10 stsp return err;
1325 927df6b7 2019-02-10 stsp static const struct got_error *
1326 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
1327 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
1329 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
1330 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1331 f8d1f275 2019-02-04 stsp char *abspath;
1333 927df6b7 2019-02-10 stsp if (got_path_cmp(parent_path, a->status_path) != 0 &&
1334 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
1335 927df6b7 2019-02-10 stsp return NULL;
1337 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
1338 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
1339 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
1340 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1342 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
1343 f8d1f275 2019-02-04 stsp de->d_name) == -1)
1344 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1347 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
1349 f8d1f275 2019-02-04 stsp free(abspath);
1350 9d31a1d8 2018-03-11 stsp return err;
1353 f8d1f275 2019-02-04 stsp static const struct got_error *
1354 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1356 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1357 b72f483a 2019-02-05 stsp struct got_object_id id;
1359 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
1360 927df6b7 2019-02-10 stsp return NULL;
1362 b72f483a 2019-02-05 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1363 b72f483a 2019-02-05 stsp return (*a->status_cb)(a->status_arg, GOT_STATUS_MISSING, ie->path,
1367 f8d1f275 2019-02-04 stsp static const struct got_error *
1368 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
1370 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1371 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1372 f8d1f275 2019-02-04 stsp char *path = NULL;
1374 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
1375 2c201a36 2019-02-10 stsp return NULL;
1377 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
1378 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
1379 f8d1f275 2019-02-04 stsp return NULL;
1381 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
1382 927df6b7 2019-02-10 stsp return NULL;
1384 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
1385 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
1386 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1388 f8d1f275 2019-02-04 stsp path = de->d_name;
1391 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
1393 f8d1f275 2019-02-04 stsp if (parent_path[0])
1394 f8d1f275 2019-02-04 stsp free(path);
1395 b72f483a 2019-02-05 stsp return err;
1398 f8d1f275 2019-02-04 stsp const struct got_error *
1399 927df6b7 2019-02-10 stsp got_worktree_status(struct got_worktree *worktree, const char *path,
1400 f8d1f275 2019-02-04 stsp struct got_repository *repo, got_worktree_status_cb status_cb,
1401 f8d1f275 2019-02-04 stsp void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1403 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
1404 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
1405 f8d1f275 2019-02-04 stsp char *fileindex_path = NULL;
1406 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex = NULL;
1407 f8d1f275 2019-02-04 stsp FILE *index = NULL;
1408 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
1409 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
1410 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
1412 f8d1f275 2019-02-04 stsp fileindex = got_fileindex_alloc();
1413 f8d1f275 2019-02-04 stsp if (fileindex == NULL) {
1414 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1415 f8d1f275 2019-02-04 stsp goto done;
1418 f8d1f275 2019-02-04 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1419 f8d1f275 2019-02-04 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1420 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1421 f8d1f275 2019-02-04 stsp fileindex_path = NULL;
1422 f8d1f275 2019-02-04 stsp goto done;
1425 f8d1f275 2019-02-04 stsp index = fopen(fileindex_path, "rb");
1426 f8d1f275 2019-02-04 stsp if (index == NULL) {
1427 f8d1f275 2019-02-04 stsp if (errno != ENOENT) {
1428 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1429 f8d1f275 2019-02-04 stsp goto done;
1432 f8d1f275 2019-02-04 stsp err = got_fileindex_read(fileindex, index);
1433 f8d1f275 2019-02-04 stsp fclose(index);
1435 f8d1f275 2019-02-04 stsp goto done;
1438 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
1439 927df6b7 2019-02-10 stsp worktree->root_path, path[0] ? "/" : "", path) == -1) {
1440 c513d110 2019-02-05 stsp err = got_error_from_errno();
1441 c513d110 2019-02-05 stsp goto done;
1443 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
1444 927df6b7 2019-02-10 stsp if (workdir == NULL) {
1445 927df6b7 2019-02-10 stsp if (errno == ENOTDIR) {
1446 927df6b7 2019-02-10 stsp struct got_fileindex_entry *ie;
1447 927df6b7 2019-02-10 stsp ie = got_fileindex_entry_get(fileindex, path);
1448 927df6b7 2019-02-10 stsp if (ie == NULL) {
1449 927df6b7 2019-02-10 stsp err = got_error(GOT_ERR_BAD_PATH);
1450 927df6b7 2019-02-10 stsp goto done;
1452 927df6b7 2019-02-10 stsp err = report_file_status(ie, ondisk_path,
1453 927df6b7 2019-02-10 stsp status_cb, status_arg, repo);
1454 927df6b7 2019-02-10 stsp goto done;
1456 927df6b7 2019-02-10 stsp err = got_error_from_errno();
1457 927df6b7 2019-02-10 stsp goto done;
1460 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old_new = status_old_new;
1461 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old = status_old;
1462 d43a8a88 2019-02-05 stsp fdiff_cb.diff_new = status_new;
1463 f8d1f275 2019-02-04 stsp arg.fileindex = fileindex;
1464 f8d1f275 2019-02-04 stsp arg.worktree = worktree;
1465 927df6b7 2019-02-10 stsp arg.status_path = path;
1466 927df6b7 2019-02-10 stsp arg.status_path_len = strlen(path);
1467 f8d1f275 2019-02-04 stsp arg.repo = repo;
1468 f8d1f275 2019-02-04 stsp arg.status_cb = status_cb;
1469 f8d1f275 2019-02-04 stsp arg.status_arg = status_arg;
1470 f8d1f275 2019-02-04 stsp arg.cancel_cb = cancel_cb;
1471 f8d1f275 2019-02-04 stsp arg.cancel_arg = cancel_arg;
1472 c7f4312f 2019-02-05 stsp err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
1473 927df6b7 2019-02-10 stsp path, repo, &fdiff_cb, &arg);
1475 f8d1f275 2019-02-04 stsp if (workdir)
1476 f8d1f275 2019-02-04 stsp closedir(workdir);
1477 927df6b7 2019-02-10 stsp free(ondisk_path);
1478 f8d1f275 2019-02-04 stsp free(fileindex_path);
1479 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
1480 f8d1f275 2019-02-04 stsp return err;
