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>
34 ec22038e 2019-03-10 stsp #include <uuid.h>
35 7154f6ce 2019-03-27 stsp #include <util.h>
37 86c3caaf 2018-03-09 stsp #include "got_error.h"
38 86c3caaf 2018-03-09 stsp #include "got_repository.h"
39 5261c201 2018-04-01 stsp #include "got_reference.h"
40 9d31a1d8 2018-03-11 stsp #include "got_object.h"
41 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
42 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
45 718b3ab0 2018-03-17 stsp #include "got_lib_path.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
48 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
51 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
52 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
53 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
54 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
57 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
60 99724ed4 2018-03-10 stsp static const struct got_error *
61 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
63 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
65 99724ed4 2018-03-10 stsp int fd = -1;
67 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
68 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
69 99724ed4 2018-03-10 stsp path = NULL;
73 73a5ef67 2018-03-11 stsp fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
74 99724ed4 2018-03-10 stsp GOT_DEFAULT_FILE_MODE);
75 99724ed4 2018-03-10 stsp if (fd == -1) {
76 99724ed4 2018-03-10 stsp err = got_error_from_errno();
80 99724ed4 2018-03-10 stsp if (content) {
81 99724ed4 2018-03-10 stsp int len = dprintf(fd, "%s\n", content);
82 99724ed4 2018-03-10 stsp if (len != strlen(content) + 1) {
83 99724ed4 2018-03-10 stsp err = got_error_from_errno();
89 99724ed4 2018-03-10 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
90 99724ed4 2018-03-10 stsp err = got_error_from_errno();
95 507dc3bb 2018-12-29 stsp static const struct got_error *
96 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
98 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
99 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
100 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
101 507dc3bb 2018-12-29 stsp char *path = NULL;
103 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
104 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
105 507dc3bb 2018-12-29 stsp path = NULL;
109 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
113 507dc3bb 2018-12-29 stsp if (content) {
114 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
115 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
116 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
121 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
122 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
123 2a57020b 2019-02-20 stsp unlink(tmppath);
128 507dc3bb 2018-12-29 stsp free(tmppath);
129 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
130 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
131 99724ed4 2018-03-10 stsp return err;
134 09fe317a 2018-03-11 stsp static const struct got_error *
135 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
137 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
138 09fe317a 2018-03-11 stsp char *path;
139 09fe317a 2018-03-11 stsp int fd = -1;
141 09fe317a 2018-03-11 stsp struct stat sb;
143 09fe317a 2018-03-11 stsp *content = NULL;
145 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
146 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
147 09fe317a 2018-03-11 stsp path = NULL;
151 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
152 09fe317a 2018-03-11 stsp if (fd == -1) {
153 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
154 f02eaa22 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
156 f02eaa22 2019-03-11 stsp err = got_error_from_errno();
159 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
160 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
161 73a5ef67 2018-03-11 stsp : got_error_from_errno());
165 d10c9b58 2019-02-19 stsp if (lstat(path, &sb) != 0) {
166 d10c9b58 2019-02-19 stsp err = got_error_from_errno();
169 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
170 09fe317a 2018-03-11 stsp if (*content == NULL) {
171 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
175 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
176 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
177 0605801d 2018-03-11 stsp err = (n == -1 ? got_error_from_errno() :
178 0605801d 2018-03-11 stsp got_error(GOT_ERR_WORKTREE_META));
181 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
182 09fe317a 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
185 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
188 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
189 09fe317a 2018-03-11 stsp err = got_error_from_errno();
190 09fe317a 2018-03-11 stsp free(path);
192 09fe317a 2018-03-11 stsp free(*content);
193 09fe317a 2018-03-11 stsp *content = NULL;
195 09fe317a 2018-03-11 stsp return err;
198 86c3caaf 2018-03-09 stsp const struct got_error *
199 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
200 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
202 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
203 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
204 ec22038e 2019-03-10 stsp uuid_t uuid;
205 ec22038e 2019-03-10 stsp uint32_t uuid_status;
206 65596e15 2018-12-24 stsp int obj_type;
207 7ac97322 2018-03-11 stsp char *path_got = NULL;
208 08d425ea 2018-12-24 stsp char *refstr = NULL;
209 1451e70d 2018-03-10 stsp char *formatstr = NULL;
210 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
211 65596e15 2018-12-24 stsp char *basestr = NULL;
212 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
214 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
215 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
219 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
221 65596e15 2018-12-24 stsp return err;
222 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
224 65596e15 2018-12-24 stsp return err;
225 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
226 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
228 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
229 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
230 0a585a0d 2018-03-17 stsp return got_error_from_errno();
233 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
234 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
235 86c3caaf 2018-03-09 stsp err = got_error_from_errno();
239 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
240 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
241 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
244 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
245 86c3caaf 2018-03-09 stsp err = got_error_from_errno();
249 056e7441 2018-03-11 stsp /* Create an empty lock file. */
250 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
254 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
255 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
259 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
260 08d425ea 2018-12-24 stsp refstr = got_ref_to_str(head_ref);
261 08d425ea 2018-12-24 stsp if (refstr == NULL) {
262 a1a7858a 2018-12-24 stsp err = got_error_from_errno();
265 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
269 65596e15 2018-12-24 stsp /* Record our base commit. */
270 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
273 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
277 1451e70d 2018-03-10 stsp /* Store path to repository. */
278 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
279 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
283 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
284 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
285 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
289 ec22038e 2019-03-10 stsp /* Generate UUID. */
290 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
291 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
292 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
295 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
296 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
297 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
300 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
304 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
305 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
306 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
309 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
314 65596e15 2018-12-24 stsp free(commit_id);
315 7ac97322 2018-03-11 stsp free(path_got);
316 1451e70d 2018-03-10 stsp free(formatstr);
317 08d425ea 2018-12-24 stsp free(refstr);
318 0bb8a95e 2018-03-12 stsp free(absprefix);
319 65596e15 2018-12-24 stsp free(basestr);
320 ec22038e 2019-03-10 stsp free(uuidstr);
321 86c3caaf 2018-03-09 stsp return err;
324 247140b2 2019-02-05 stsp static const struct got_error *
325 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
327 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
328 7ac97322 2018-03-11 stsp char *path_got;
329 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
330 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
331 056e7441 2018-03-11 stsp char *path_lock = NULL;
332 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
333 271d2a38 2018-12-25 stsp char *head_ref_str = NULL;
334 6d9d28c3 2018-03-11 stsp int version, fd = -1;
335 6d9d28c3 2018-03-11 stsp const char *errstr;
336 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
337 c442a90d 2019-03-10 stsp uint32_t uuid_status;
339 6d9d28c3 2018-03-11 stsp *worktree = NULL;
341 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
342 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
343 7ac97322 2018-03-11 stsp path_got = NULL;
347 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
348 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
349 056e7441 2018-03-11 stsp path_lock = NULL;
353 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
354 6d9d28c3 2018-03-11 stsp if (fd == -1) {
355 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
356 73a5ef67 2018-03-11 stsp : got_error_from_errno());
360 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
364 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
365 6d9d28c3 2018-03-11 stsp if (errstr) {
366 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
369 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
370 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
374 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
375 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
376 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
379 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
381 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
382 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
383 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
386 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
387 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
391 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
392 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
396 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
397 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
401 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
404 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
405 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
406 c442a90d 2019-03-10 stsp err = got_error_uuid(uuid_status);
410 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
414 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
415 eaccb85f 2018-12-25 stsp base_commit_id_str);
419 271d2a38 2018-12-25 stsp err = read_meta_file(&head_ref_str, path_got, GOT_WORKTREE_HEAD_REF);
423 271d2a38 2018-12-25 stsp err = got_ref_open(&(*worktree)->head_ref, repo, head_ref_str);
426 eaccb85f 2018-12-25 stsp got_repo_close(repo);
427 7ac97322 2018-03-11 stsp free(path_got);
428 056e7441 2018-03-11 stsp free(path_lock);
429 271d2a38 2018-12-25 stsp free(head_ref_str);
430 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
431 c442a90d 2019-03-10 stsp free(uuidstr);
432 bd165944 2019-03-10 stsp free(formatstr);
434 6d9d28c3 2018-03-11 stsp if (fd != -1)
436 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
437 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
438 6d9d28c3 2018-03-11 stsp *worktree = NULL;
440 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
442 6d9d28c3 2018-03-11 stsp return err;
445 247140b2 2019-02-05 stsp const struct got_error *
446 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
448 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
451 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
452 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
453 247140b2 2019-02-05 stsp return err;
454 247140b2 2019-02-05 stsp if (*worktree)
455 247140b2 2019-02-05 stsp return NULL;
456 247140b2 2019-02-05 stsp path = dirname(path);
457 d1542a27 2019-02-05 stsp if (path == NULL)
458 d1542a27 2019-02-05 stsp return got_error_from_errno();
459 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
461 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
464 3a6ce05a 2019-02-11 stsp const struct got_error *
465 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
467 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
468 c88eb298 2018-03-11 stsp free(worktree->root_path);
469 cde76477 2018-03-11 stsp free(worktree->repo_path);
470 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
471 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
472 271d2a38 2018-12-25 stsp if (worktree->head_ref)
473 271d2a38 2018-12-25 stsp got_ref_close(worktree->head_ref);
474 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
475 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
476 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
477 6d9d28c3 2018-03-11 stsp free(worktree);
478 3a6ce05a 2019-02-11 stsp return err;
481 2fbdb5ae 2018-12-29 stsp const char *
482 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
484 c7f4312f 2019-02-05 stsp return worktree->root_path;
487 c7f4312f 2019-02-05 stsp const char *
488 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
490 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
493 49520a32 2018-12-29 stsp const char *
494 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
496 f609be2e 2018-12-29 stsp return worktree->path_prefix;
499 e5dc7198 2018-12-29 stsp const struct got_error *
500 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
501 e5dc7198 2018-12-29 stsp const char *path_prefix)
503 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
505 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
506 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
507 e5dc7198 2018-12-29 stsp return got_error_from_errno();
509 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
510 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
511 e5dc7198 2018-12-29 stsp free(absprefix);
512 e5dc7198 2018-12-29 stsp return NULL;
515 bc70eb79 2019-05-09 stsp const char *
516 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
518 bc70eb79 2019-05-09 stsp return got_ref_get_name(worktree->head_ref);
521 be7061eb 2018-12-30 stsp struct got_reference *
522 be7061eb 2018-12-30 stsp got_worktree_get_head_ref(struct got_worktree *worktree)
524 be7061eb 2018-12-30 stsp return got_ref_dup(worktree->head_ref);
527 b72f483a 2019-02-05 stsp struct got_object_id *
528 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
530 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
533 507dc3bb 2018-12-29 stsp const struct got_error *
534 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
535 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
537 507dc3bb 2018-12-29 stsp const struct got_error *err;
538 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
539 507dc3bb 2018-12-29 stsp char *id_str = NULL;
540 507dc3bb 2018-12-29 stsp char *path_got = NULL;
542 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
543 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
544 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
545 507dc3bb 2018-12-29 stsp path_got = NULL;
549 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
551 507dc3bb 2018-12-29 stsp return err;
553 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
554 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
558 507dc3bb 2018-12-29 stsp /* Record our base commit. */
559 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
562 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
566 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
567 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
568 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
569 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
574 507dc3bb 2018-12-29 stsp got_object_close(obj);
575 507dc3bb 2018-12-29 stsp free(id_str);
576 507dc3bb 2018-12-29 stsp free(path_got);
577 507dc3bb 2018-12-29 stsp return err;
580 9d31a1d8 2018-03-11 stsp static const struct got_error *
581 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
583 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
584 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
585 9d31a1d8 2018-03-11 stsp : got_error_from_errno());
586 86c3caaf 2018-03-09 stsp return NULL;
589 21908da4 2019-01-13 stsp static const struct got_error *
590 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
592 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
593 4a1ddfc2 2019-01-12 stsp char *abspath;
595 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
596 4a1ddfc2 2019-01-12 stsp return got_error_from_errno();
598 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
599 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
600 ddcd8544 2019-03-11 stsp struct stat sb;
601 ddcd8544 2019-03-11 stsp err = NULL;
602 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
603 ddcd8544 2019-03-11 stsp err = got_error_from_errno();
604 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
605 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
606 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
609 4a1ddfc2 2019-01-12 stsp free(abspath);
610 68c76935 2019-02-19 stsp return err;
613 68c76935 2019-02-19 stsp static const struct got_error *
614 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
616 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
617 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
618 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
619 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
623 68c76935 2019-02-19 stsp while (1) {
624 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
625 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
626 68c76935 2019-02-19 stsp err = got_error_from_errno();
629 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
630 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
631 68c76935 2019-02-19 stsp err = got_error_from_errno();
634 68c76935 2019-02-19 stsp if (flen1 == 0) {
635 68c76935 2019-02-19 stsp if (flen2 != 0)
638 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
639 68c76935 2019-02-19 stsp if (flen1 != 0)
642 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
643 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
653 68c76935 2019-02-19 stsp return err;
656 68c76935 2019-02-19 stsp static const struct got_error *
657 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
659 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
660 68c76935 2019-02-19 stsp struct stat sb;
661 68c76935 2019-02-19 stsp size_t size1, size2;
662 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
666 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
667 68c76935 2019-02-19 stsp err = got_error_from_errno();
670 68c76935 2019-02-19 stsp size1 = sb.st_size;
672 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
673 68c76935 2019-02-19 stsp err = got_error_from_errno();
676 68c76935 2019-02-19 stsp size2 = sb.st_size;
678 68c76935 2019-02-19 stsp if (size1 != size2) {
680 68c76935 2019-02-19 stsp return NULL;
683 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
684 68c76935 2019-02-19 stsp if (f1 == NULL)
685 68c76935 2019-02-19 stsp return got_error_from_errno();
687 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
688 68c76935 2019-02-19 stsp if (f2 == NULL) {
689 68c76935 2019-02-19 stsp err = got_error_from_errno();
693 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
695 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
696 68c76935 2019-02-19 stsp err = got_error_from_errno();
697 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
698 68c76935 2019-02-19 stsp err = got_error_from_errno();
700 6353ad76 2019-02-08 stsp return err;
704 6353ad76 2019-02-08 stsp * Perform a 3-way merge where the file's version in the file index (blob2)
705 6353ad76 2019-02-08 stsp * acts as the common ancestor, the incoming blob (blob1) acts as the first
706 6353ad76 2019-02-08 stsp * derived version, and the file on disk acts as the second derived version.
708 6353ad76 2019-02-08 stsp static const struct got_error *
709 6353ad76 2019-02-08 stsp merge_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
710 6353ad76 2019-02-08 stsp struct got_fileindex_entry *ie, const char *ondisk_path, const char *path,
711 b8f41171 2019-02-10 stsp uint16_t te_mode, uint16_t st_mode, struct got_blob_object *blob1,
712 b8f41171 2019-02-10 stsp struct got_repository *repo,
713 6353ad76 2019-02-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
715 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
716 6353ad76 2019-02-08 stsp int merged_fd = -1;
717 6353ad76 2019-02-08 stsp struct got_blob_object *blob2 = NULL;
718 6353ad76 2019-02-08 stsp FILE *f1 = NULL, *f2 = NULL;
719 6353ad76 2019-02-08 stsp char *blob1_path = NULL, *blob2_path = NULL;
720 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
721 6353ad76 2019-02-08 stsp char *id_str = NULL;
722 6353ad76 2019-02-08 stsp char *label1 = NULL;
723 68c76935 2019-02-19 stsp int overlapcnt = 0, update_timestamps = 0;
724 af54ae4a 2019-02-19 stsp char *parent;
726 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
727 af54ae4a 2019-02-19 stsp if (parent == NULL)
728 af54ae4a 2019-02-19 stsp return got_error_from_errno();
730 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
731 af54ae4a 2019-02-19 stsp return got_error_from_errno();
733 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
737 af54ae4a 2019-02-19 stsp free(base_path);
738 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merge-blob1", parent) == -1) {
739 af54ae4a 2019-02-19 stsp err = got_error_from_errno();
740 af54ae4a 2019-02-19 stsp base_path = NULL;
744 af54ae4a 2019-02-19 stsp err = got_opentemp_named(&blob1_path, &f1, base_path);
747 6353ad76 2019-02-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, f1, blob1);
751 af54ae4a 2019-02-19 stsp free(base_path);
752 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merge-blob2", parent) == -1) {
753 af54ae4a 2019-02-19 stsp err = got_error_from_errno();
754 af54ae4a 2019-02-19 stsp base_path = NULL;
758 af54ae4a 2019-02-19 stsp err = got_opentemp_named(&blob2_path, &f2, base_path);
761 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie)) {
762 1430b4e0 2019-03-27 stsp struct got_object_id id2;
763 1430b4e0 2019-03-27 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
764 1430b4e0 2019-03-27 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
767 1430b4e0 2019-03-27 stsp err = got_object_blob_dump_to_file(NULL, NULL, f2, blob2);
772 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
773 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
774 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
778 6353ad76 2019-02-08 stsp err = got_object_id_str(&id_str, worktree->base_commit_id);
781 6353ad76 2019-02-08 stsp if (asprintf(&label1, "commit %s", id_str) == -1) {
782 6353ad76 2019-02-08 stsp err = got_error_from_errno();
786 6353ad76 2019-02-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, blob1_path,
787 6353ad76 2019-02-08 stsp blob2_path, ondisk_path, label1, path);
791 6353ad76 2019-02-08 stsp (*progress_cb)(progress_arg,
792 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
795 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
796 816dc654 2019-02-16 stsp err = got_error_from_errno();
800 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
801 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
802 68c76935 2019-02-19 stsp err = check_files_equal(&update_timestamps, blob1_path,
803 68c76935 2019-02-19 stsp merged_path);
808 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
809 70a0c8ec 2019-02-20 stsp err = got_error_from_errno();
813 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
814 6353ad76 2019-02-08 stsp err = got_error_from_errno();
815 2a57020b 2019-02-20 stsp unlink(merged_path);
820 02c07007 2019-02-10 stsp * Do not update timestamps of already modified files. Otherwise,
821 65ad4e61 2019-02-20 stsp * a future status walk would treat them as unmodified files again.
823 6353ad76 2019-02-08 stsp err = got_fileindex_entry_update(ie, ondisk_path,
824 68c76935 2019-02-19 stsp blob1->id.sha1, worktree->base_commit_id->sha1, update_timestamps);
826 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
827 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
828 3a6ce05a 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
829 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
830 3a6ce05a 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
831 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
833 6353ad76 2019-02-08 stsp got_object_blob_close(blob2);
834 6353ad76 2019-02-08 stsp free(merged_path);
835 af54ae4a 2019-02-19 stsp free(base_path);
836 6353ad76 2019-02-08 stsp if (blob1_path) {
837 6353ad76 2019-02-08 stsp unlink(blob1_path);
838 6353ad76 2019-02-08 stsp free(blob1_path);
840 6353ad76 2019-02-08 stsp if (blob2_path) {
841 6353ad76 2019-02-08 stsp unlink(blob2_path);
842 6353ad76 2019-02-08 stsp free(blob2_path);
844 6353ad76 2019-02-08 stsp free(id_str);
845 6353ad76 2019-02-08 stsp free(label1);
846 4a1ddfc2 2019-01-12 stsp return err;
849 4a1ddfc2 2019-01-12 stsp static const struct got_error *
850 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
851 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
852 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
853 13d9040b 2019-03-27 stsp int update_timestamps)
855 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
857 13d9040b 2019-03-27 stsp if (ie == NULL)
858 13d9040b 2019-03-27 stsp ie = got_fileindex_entry_get(fileindex, path);
860 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
861 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
862 13d9040b 2019-03-27 stsp update_timestamps);
864 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
865 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
866 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
868 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
870 13d9040b 2019-03-27 stsp return err;
873 13d9040b 2019-03-27 stsp static const struct got_error *
874 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
875 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
876 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
877 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
878 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
880 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
881 507dc3bb 2018-12-29 stsp int fd = -1;
882 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
883 507dc3bb 2018-12-29 stsp int update = 0;
884 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
886 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
887 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
888 9d31a1d8 2018-03-11 stsp if (fd == -1) {
889 21908da4 2019-01-13 stsp if (errno == ENOENT) {
890 21908da4 2019-01-13 stsp char *parent = dirname(path);
891 21908da4 2019-01-13 stsp if (parent == NULL)
892 21908da4 2019-01-13 stsp return got_error_from_errno();
893 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
895 21908da4 2019-01-13 stsp return err;
896 21908da4 2019-01-13 stsp fd = open(ondisk_path,
897 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
898 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
899 21908da4 2019-01-13 stsp if (fd == -1)
900 21908da4 2019-01-13 stsp return got_error_from_errno();
901 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
902 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
903 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
904 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
907 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
908 507dc3bb 2018-12-29 stsp ondisk_path);
911 507dc3bb 2018-12-29 stsp update = 1;
914 7e7c1e4c 2019-01-12 stsp return got_error_from_errno();
917 a378724f 2019-02-10 stsp if (restoring_missing_file)
918 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
919 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
920 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
922 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg,
923 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
925 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
927 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
928 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
931 9d31a1d8 2018-03-11 stsp if (len > 0) {
932 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
933 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
934 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
935 9d31a1d8 2018-03-11 stsp err = got_error_from_errno();
937 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
938 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
941 61d6eaa3 2018-12-24 stsp hdrlen = 0;
943 9d31a1d8 2018-03-11 stsp } while (len != 0);
945 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
946 816dc654 2019-02-16 stsp err = got_error_from_errno();
950 507dc3bb 2018-12-29 stsp if (update) {
951 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
952 68ed9ba5 2019-02-10 stsp err = got_error_from_errno();
953 2a57020b 2019-02-20 stsp unlink(tmppath);
958 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
959 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
960 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
964 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
965 68ed9ba5 2019-02-10 stsp err = got_error_from_errno();
971 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
972 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
973 507dc3bb 2018-12-29 stsp free(tmppath);
974 6353ad76 2019-02-08 stsp return err;
977 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
978 6353ad76 2019-02-08 stsp static const struct got_error *
979 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
981 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
982 7154f6ce 2019-03-27 stsp const char *markers[3] = {
983 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
984 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
985 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
988 7154f6ce 2019-03-27 stsp char *line;
989 7154f6ce 2019-03-27 stsp size_t len;
990 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
992 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
993 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
994 7154f6ce 2019-03-27 stsp if (line == NULL) {
995 7154f6ce 2019-03-27 stsp if (feof(f))
997 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1001 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1002 7154f6ce 2019-03-27 stsp if (markers[i] == GOT_DIFF_CONFLICT_MARKER_END)
1003 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1009 7154f6ce 2019-03-27 stsp return err;
1012 7154f6ce 2019-03-27 stsp static const struct got_error *
1013 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1014 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1015 b8f41171 2019-02-10 stsp struct got_repository *repo)
1017 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1018 6353ad76 2019-02-08 stsp struct got_object_id id;
1019 6353ad76 2019-02-08 stsp size_t hdrlen;
1020 6353ad76 2019-02-08 stsp FILE *f = NULL;
1021 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1022 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1023 6353ad76 2019-02-08 stsp size_t flen, blen;
1025 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1027 b8f41171 2019-02-10 stsp if (lstat(abspath, sb) == -1) {
1028 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1030 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1031 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_MISSING;
1033 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1034 b8f41171 2019-02-10 stsp sb->st_mode =
1035 b8f41171 2019-02-10 stsp ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1036 b8f41171 2019-02-10 stsp & (S_IRWXU | S_IRWXG | S_IRWXO));
1038 b8f41171 2019-02-10 stsp sb->st_mode = GOT_DEFAULT_FILE_MODE;
1039 a378724f 2019-02-10 stsp return NULL;
1041 6353ad76 2019-02-08 stsp return got_error_from_errno();
1044 b8f41171 2019-02-10 stsp if (!S_ISREG(sb->st_mode)) {
1045 6353ad76 2019-02-08 stsp *status = GOT_STATUS_OBSTRUCTED;
1046 6353ad76 2019-02-08 stsp return NULL;
1049 b8f41171 2019-02-10 stsp if (ie == NULL)
1050 d00136be 2019-03-26 stsp return NULL;
1052 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1053 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1054 2ec1f75b 2019-03-26 stsp return NULL;
1055 2ec1f75b 2019-03-26 stsp } else if (!got_fileindex_entry_has_blob(ie)) {
1056 d00136be 2019-03-26 stsp *status = GOT_STATUS_ADD;
1057 b8f41171 2019-02-10 stsp return NULL;
1060 b8f41171 2019-02-10 stsp if (ie->ctime_sec == sb->st_ctime &&
1061 b8f41171 2019-02-10 stsp ie->ctime_nsec == sb->st_ctimensec &&
1062 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1063 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1064 b8f41171 2019-02-10 stsp ie->mtime_nsec == sb->st_mtimensec &&
1065 b8f41171 2019-02-10 stsp ie->size == (sb->st_size & 0xffffffff))
1066 6353ad76 2019-02-08 stsp return NULL;
1068 6353ad76 2019-02-08 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1069 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1071 6353ad76 2019-02-08 stsp return err;
1073 6353ad76 2019-02-08 stsp f = fopen(abspath, "r");
1074 6353ad76 2019-02-08 stsp if (f == NULL) {
1075 6353ad76 2019-02-08 stsp err = got_error_from_errno();
1076 6353ad76 2019-02-08 stsp goto done;
1078 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1079 6353ad76 2019-02-08 stsp while (1) {
1080 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1081 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1083 7154f6ce 2019-03-27 stsp goto done;
1084 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1085 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1086 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1087 80c5c120 2019-02-19 stsp err = got_error_from_errno();
1088 7154f6ce 2019-03-27 stsp goto done;
1090 6353ad76 2019-02-08 stsp if (blen == 0) {
1091 6353ad76 2019-02-08 stsp if (flen != 0)
1092 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1094 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1095 6353ad76 2019-02-08 stsp if (blen != 0)
1096 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1098 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1099 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1100 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1101 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1105 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1108 6353ad76 2019-02-08 stsp hdrlen = 0;
1111 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1112 7154f6ce 2019-03-27 stsp rewind(f);
1113 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1117 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1119 6353ad76 2019-02-08 stsp fclose(f);
1120 9d31a1d8 2018-03-11 stsp return err;
1123 9d31a1d8 2018-03-11 stsp static const struct got_error *
1124 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1125 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1126 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1127 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1128 0584f854 2019-04-06 stsp void *progress_arg)
1130 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1131 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1132 6353ad76 2019-02-08 stsp char *ondisk_path;
1133 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1134 b8f41171 2019-02-10 stsp struct stat sb;
1136 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1137 6353ad76 2019-02-08 stsp return got_error_from_errno();
1139 b8f41171 2019-02-10 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1141 b8f41171 2019-02-10 stsp goto done;
1143 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1144 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, status, path);
1145 b8f41171 2019-02-10 stsp goto done;
1148 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1149 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1150 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1151 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1152 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1154 6353ad76 2019-02-08 stsp goto done;
1156 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1157 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1158 1430b4e0 2019-03-27 stsp SHA1_DIGEST_LENGTH) == 0)
1159 b8f41171 2019-02-10 stsp goto done;
1162 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1164 6353ad76 2019-02-08 stsp goto done;
1166 1430b4e0 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD)
1167 6353ad76 2019-02-08 stsp err = merge_blob(worktree, fileindex, ie, ondisk_path, path,
1168 b8f41171 2019-02-10 stsp te->mode, sb.st_mode, blob, repo, progress_cb,
1169 b8f41171 2019-02-10 stsp progress_arg);
1170 13d9040b 2019-03-27 stsp else if (status == GOT_STATUS_DELETE) {
1171 13d9040b 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1172 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1173 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1175 13d9040b 2019-03-27 stsp goto done;
1177 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1178 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1179 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1181 13d9040b 2019-03-27 stsp goto done;
1182 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1183 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1185 13d9040b 2019-03-27 stsp goto done;
1187 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1189 6353ad76 2019-02-08 stsp free(ondisk_path);
1190 8da9e5f4 2019-01-12 stsp return err;
1193 90285c3b 2019-01-08 stsp static const struct got_error *
1194 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1196 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1197 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1199 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1200 90285c3b 2019-01-08 stsp return got_error_from_errno();
1202 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1203 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1204 c97665ae 2019-01-13 stsp err = got_error_from_errno();
1206 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1207 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1208 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1209 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1210 26c4ac4d 2019-01-08 stsp err = got_error_from_errno();
1213 90285c3b 2019-01-08 stsp parent = dirname(parent);
1216 90285c3b 2019-01-08 stsp free(ondisk_path);
1217 90285c3b 2019-01-08 stsp return err;
1220 708d8e67 2019-03-27 stsp static const struct got_error *
1221 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1222 708d8e67 2019-03-27 stsp struct got_fileindex_entry *ie, const char *parent_path,
1223 708d8e67 2019-03-27 stsp struct got_repository *repo,
1224 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1226 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1227 708d8e67 2019-03-27 stsp unsigned char status;
1228 708d8e67 2019-03-27 stsp struct stat sb;
1229 708d8e67 2019-03-27 stsp char *ondisk_path;
1231 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1233 708d8e67 2019-03-27 stsp return got_error_from_errno();
1235 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1237 708d8e67 2019-03-27 stsp return err;
1239 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1240 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1241 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1243 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1244 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1246 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1249 708d8e67 2019-03-27 stsp return err;
1251 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1252 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1253 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1255 fc6346c4 2019-03-27 stsp return err;
1257 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1260 fc6346c4 2019-03-27 stsp return err;
1263 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1264 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1265 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1266 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1267 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1268 8da9e5f4 2019-01-12 stsp void *progress_arg;
1269 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1270 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1273 512f0d0e 2019-01-02 stsp static const struct got_error *
1274 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1275 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1277 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1279 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1280 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1282 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1283 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1286 8da9e5f4 2019-01-12 stsp static const struct got_error *
1287 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1289 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1291 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1292 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1294 708d8e67 2019-03-27 stsp return delete_blob(a->worktree, a->fileindex, ie, parent_path,
1295 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1298 9d31a1d8 2018-03-11 stsp static const struct got_error *
1299 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1301 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1302 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1303 8da9e5f4 2019-01-12 stsp char *path;
1305 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1306 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1308 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1309 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1311 8da9e5f4 2019-01-12 stsp return got_error_from_errno();
1313 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1314 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1316 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1317 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1319 8da9e5f4 2019-01-12 stsp free(path);
1320 0cd1c46a 2019-03-11 stsp return err;
1323 517bab73 2019-03-11 stsp const struct got_error *
1324 517bab73 2019-03-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1326 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1327 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1328 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1330 517bab73 2019-03-11 stsp *refname = NULL;
1332 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1333 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1334 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1336 0647c563 2019-03-11 stsp if (asprintf(refname, "%s-%s", GOT_WORKTREE_BASE_REF_PREFIX, uuidstr)
1338 0cd1c46a 2019-03-11 stsp err = got_error_from_errno();
1339 0647c563 2019-03-11 stsp *refname = NULL;
1341 517bab73 2019-03-11 stsp free(uuidstr);
1342 517bab73 2019-03-11 stsp return err;
1346 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1347 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1349 517bab73 2019-03-11 stsp static const struct got_error *
1350 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1352 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1353 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1354 517bab73 2019-03-11 stsp char *refname;
1356 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1358 517bab73 2019-03-11 stsp return err;
1360 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1362 0cd1c46a 2019-03-11 stsp goto done;
1364 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1366 0cd1c46a 2019-03-11 stsp free(refname);
1368 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1369 9d31a1d8 2018-03-11 stsp return err;
1372 ebf99748 2019-05-09 stsp static const struct got_error *
1373 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1374 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1376 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1377 ebf99748 2019-05-09 stsp FILE *index = NULL;
1379 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1380 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1381 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1382 ebf99748 2019-05-09 stsp return got_error_from_errno();
1384 ebf99748 2019-05-09 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1385 ebf99748 2019-05-09 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1386 ebf99748 2019-05-09 stsp err = got_error_from_errno();
1387 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1388 ebf99748 2019-05-09 stsp goto done;
1391 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1392 ebf99748 2019-05-09 stsp if (index == NULL) {
1393 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1394 ebf99748 2019-05-09 stsp err = got_error_from_errno();
1396 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1397 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1398 ebf99748 2019-05-09 stsp err = got_error_from_errno();
1401 ebf99748 2019-05-09 stsp if (err) {
1402 ebf99748 2019-05-09 stsp free(*fileindex_path);
1403 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1404 ebf99748 2019-05-09 stsp free(*fileindex);
1405 ebf99748 2019-05-09 stsp *fileindex = NULL;
1407 ebf99748 2019-05-09 stsp return err;
1410 9d31a1d8 2018-03-11 stsp const struct got_error *
1411 c4cdcb68 2019-04-03 stsp got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1412 93a30277 2018-12-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1413 93a30277 2018-12-24 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1415 a143fb78 2018-12-25 stsp const struct got_error *err = NULL, *unlockerr, *checkout_err = NULL;
1416 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1417 8da9e5f4 2019-01-12 stsp struct got_object_id *tree_id = NULL;
1418 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1419 9d31a1d8 2018-03-11 stsp char *fileindex_path = NULL, *new_fileindex_path = NULL;
1420 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1421 ebf99748 2019-05-09 stsp FILE *new_index = NULL;
1422 f44ffd20 2019-02-04 stsp struct got_fileindex_diff_tree_cb diff_cb;
1423 8da9e5f4 2019-01-12 stsp struct diff_cb_arg arg;
1424 c4cdcb68 2019-04-03 stsp char *relpath = NULL, *entry_name = NULL;
1426 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1428 9d31a1d8 2018-03-11 stsp return err;
1431 51514078 2018-12-25 stsp * Read the file index.
1432 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1433 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1435 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1437 ebf99748 2019-05-09 stsp goto done;
1439 b8bdcc21 2018-12-24 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1440 b8bdcc21 2018-12-24 stsp fileindex_path);
1442 51664889 2018-03-12 stsp goto done;
1444 0cd1c46a 2019-03-11 stsp err = ref_base_commit(worktree, repo);
1446 0cd1c46a 2019-03-11 stsp goto done;
1448 eaccb85f 2018-12-25 stsp err = got_object_open_as_commit(&commit, repo,
1449 eaccb85f 2018-12-25 stsp worktree->base_commit_id);
1451 9d31a1d8 2018-03-11 stsp goto done;
1453 c4cdcb68 2019-04-03 stsp if (path[0]) {
1454 c4cdcb68 2019-04-03 stsp char *tree_path;
1455 c4cdcb68 2019-04-03 stsp int obj_type;
1456 c4cdcb68 2019-04-03 stsp relpath = strdup(path);
1457 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1458 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1459 c4cdcb68 2019-04-03 stsp goto done;
1461 c4cdcb68 2019-04-03 stsp if (asprintf(&tree_path, "%s%s%s", worktree->path_prefix,
1462 c4cdcb68 2019-04-03 stsp got_path_is_root_dir(worktree->path_prefix) ? "" : "/",
1463 c4cdcb68 2019-04-03 stsp path) == -1) {
1464 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1465 c4cdcb68 2019-04-03 stsp goto done;
1467 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1468 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, tree_path);
1469 c4cdcb68 2019-04-03 stsp free(tree_path);
1471 c4cdcb68 2019-04-03 stsp goto done;
1472 c4cdcb68 2019-04-03 stsp err = got_object_get_type(&obj_type, repo, tree_id);
1474 c4cdcb68 2019-04-03 stsp goto done;
1475 c4cdcb68 2019-04-03 stsp if (obj_type == GOT_OBJ_TYPE_BLOB) {
1476 c4cdcb68 2019-04-03 stsp /* Split provided path into parent dir + entry name. */
1477 c4cdcb68 2019-04-03 stsp if (strchr(path, '/') == NULL) {
1478 c4cdcb68 2019-04-03 stsp relpath = strdup("");
1479 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1480 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1481 c4cdcb68 2019-04-03 stsp goto done;
1483 c4cdcb68 2019-04-03 stsp tree_path = strdup(worktree->path_prefix);
1484 c4cdcb68 2019-04-03 stsp if (tree_path == NULL) {
1485 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1486 c4cdcb68 2019-04-03 stsp goto done;
1489 c4cdcb68 2019-04-03 stsp err = got_path_dirname(&relpath, path);
1491 c4cdcb68 2019-04-03 stsp goto done;
1492 c4cdcb68 2019-04-03 stsp if (asprintf(&tree_path, "%s%s%s",
1493 c4cdcb68 2019-04-03 stsp worktree->path_prefix,
1494 c4cdcb68 2019-04-03 stsp got_path_is_root_dir(
1495 c4cdcb68 2019-04-03 stsp worktree->path_prefix) ? "" : "/",
1496 c4cdcb68 2019-04-03 stsp relpath) == -1) {
1497 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1498 c4cdcb68 2019-04-03 stsp goto done;
1501 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1502 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, tree_path);
1503 c4cdcb68 2019-04-03 stsp free(tree_path);
1505 c4cdcb68 2019-04-03 stsp goto done;
1506 c4cdcb68 2019-04-03 stsp entry_name = basename(path);
1507 c4cdcb68 2019-04-03 stsp if (entry_name == NULL) {
1508 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1509 c4cdcb68 2019-04-03 stsp goto done;
1513 c4cdcb68 2019-04-03 stsp relpath = strdup("");
1514 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1515 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1516 c4cdcb68 2019-04-03 stsp goto done;
1518 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1519 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, worktree->path_prefix);
1521 c4cdcb68 2019-04-03 stsp goto done;
1524 8da9e5f4 2019-01-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1526 c4cdcb68 2019-04-03 stsp goto done;
1528 c4cdcb68 2019-04-03 stsp if (entry_name &&
1529 c4cdcb68 2019-04-03 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1530 c4cdcb68 2019-04-03 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1531 8da9e5f4 2019-01-12 stsp goto done;
1534 8da9e5f4 2019-01-12 stsp diff_cb.diff_old_new = diff_old_new;
1535 8da9e5f4 2019-01-12 stsp diff_cb.diff_old = diff_old;
1536 8da9e5f4 2019-01-12 stsp diff_cb.diff_new = diff_new;
1537 8da9e5f4 2019-01-12 stsp arg.fileindex = fileindex;
1538 8da9e5f4 2019-01-12 stsp arg.worktree = worktree;
1539 8da9e5f4 2019-01-12 stsp arg.repo = repo;
1540 8da9e5f4 2019-01-12 stsp arg.progress_cb = progress_cb;
1541 8da9e5f4 2019-01-12 stsp arg.progress_arg = progress_arg;
1542 8da9e5f4 2019-01-12 stsp arg.cancel_cb = cancel_cb;
1543 8da9e5f4 2019-01-12 stsp arg.cancel_arg = cancel_arg;
1544 c4cdcb68 2019-04-03 stsp checkout_err = got_fileindex_diff_tree(fileindex, tree, relpath,
1545 c4cdcb68 2019-04-03 stsp entry_name, repo, &diff_cb, &arg);
1547 a143fb78 2018-12-25 stsp /* Try to sync the fileindex back to disk in any case. */
1548 b8bdcc21 2018-12-24 stsp err = got_fileindex_write(fileindex, new_index);
1550 9d31a1d8 2018-03-11 stsp goto done;
1552 9d31a1d8 2018-03-11 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1553 9d31a1d8 2018-03-11 stsp err = got_error_from_errno();
1554 2a57020b 2019-02-20 stsp unlink(new_fileindex_path);
1555 9d31a1d8 2018-03-11 stsp goto done;
1558 9d31a1d8 2018-03-11 stsp free(new_fileindex_path);
1559 9d31a1d8 2018-03-11 stsp new_fileindex_path = NULL;
1562 c4cdcb68 2019-04-03 stsp free(relpath);
1564 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1565 9d31a1d8 2018-03-11 stsp if (commit)
1566 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1567 9d31a1d8 2018-03-11 stsp if (new_fileindex_path)
1568 9d31a1d8 2018-03-11 stsp unlink(new_fileindex_path);
1569 b8bdcc21 2018-12-24 stsp if (new_index)
1570 b8bdcc21 2018-12-24 stsp fclose(new_index);
1571 9d31a1d8 2018-03-11 stsp free(new_fileindex_path);
1572 9d31a1d8 2018-03-11 stsp free(fileindex_path);
1573 7426bbfd 2018-12-24 stsp got_fileindex_free(fileindex);
1574 a143fb78 2018-12-25 stsp if (checkout_err)
1575 a143fb78 2018-12-25 stsp err = checkout_err;
1576 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1577 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1578 9d31a1d8 2018-03-11 stsp err = unlockerr;
1579 f8d1f275 2019-02-04 stsp return err;
1582 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
1583 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
1584 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
1585 927df6b7 2019-02-10 stsp const char *status_path;
1586 927df6b7 2019-02-10 stsp size_t status_path_len;
1587 f8d1f275 2019-02-04 stsp struct got_repository *repo;
1588 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
1589 f8d1f275 2019-02-04 stsp void *status_arg;
1590 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
1591 f8d1f275 2019-02-04 stsp void *cancel_arg;
1594 f8d1f275 2019-02-04 stsp static const struct got_error *
1595 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
1596 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
1597 927df6b7 2019-02-10 stsp struct got_repository *repo)
1599 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
1600 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1601 927df6b7 2019-02-10 stsp struct stat sb;
1602 927df6b7 2019-02-10 stsp struct got_object_id id;
1604 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
1605 927df6b7 2019-02-10 stsp if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
1606 927df6b7 2019-02-10 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1607 927df6b7 2019-02-10 stsp err = (*status_cb)(status_arg, status, ie->path, &id);
1609 927df6b7 2019-02-10 stsp return err;
1612 927df6b7 2019-02-10 stsp static const struct got_error *
1613 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
1614 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
1616 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
1617 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1618 f8d1f275 2019-02-04 stsp char *abspath;
1620 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1621 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1623 927df6b7 2019-02-10 stsp if (got_path_cmp(parent_path, a->status_path) != 0 &&
1624 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
1625 927df6b7 2019-02-10 stsp return NULL;
1627 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
1628 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
1629 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
1630 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1632 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
1633 f8d1f275 2019-02-04 stsp de->d_name) == -1)
1634 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1637 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
1639 f8d1f275 2019-02-04 stsp free(abspath);
1640 9d31a1d8 2018-03-11 stsp return err;
1643 f8d1f275 2019-02-04 stsp static const struct got_error *
1644 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1646 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1647 b72f483a 2019-02-05 stsp struct got_object_id id;
1648 2ec1f75b 2019-03-26 stsp unsigned char status;
1650 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1651 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1653 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
1654 927df6b7 2019-02-10 stsp return NULL;
1656 b72f483a 2019-02-05 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1657 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1658 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
1660 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
1661 2ec1f75b 2019-03-26 stsp return (*a->status_cb)(a->status_arg, status, ie->path, &id);
1664 f8d1f275 2019-02-04 stsp static const struct got_error *
1665 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
1667 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1668 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1669 f8d1f275 2019-02-04 stsp char *path = NULL;
1671 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1672 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1674 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
1675 2c201a36 2019-02-10 stsp return NULL;
1677 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
1678 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
1679 f8d1f275 2019-02-04 stsp return NULL;
1681 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
1682 927df6b7 2019-02-10 stsp return NULL;
1684 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
1685 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
1686 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1688 f8d1f275 2019-02-04 stsp path = de->d_name;
1691 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
1693 f8d1f275 2019-02-04 stsp if (parent_path[0])
1694 f8d1f275 2019-02-04 stsp free(path);
1695 b72f483a 2019-02-05 stsp return err;
1698 f8d1f275 2019-02-04 stsp const struct got_error *
1699 927df6b7 2019-02-10 stsp got_worktree_status(struct got_worktree *worktree, const char *path,
1700 f8d1f275 2019-02-04 stsp struct got_repository *repo, got_worktree_status_cb status_cb,
1701 f8d1f275 2019-02-04 stsp void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1703 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
1704 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
1705 f8d1f275 2019-02-04 stsp char *fileindex_path = NULL;
1706 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex = NULL;
1707 f8d1f275 2019-02-04 stsp FILE *index = NULL;
1708 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
1709 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
1710 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
1712 f8d1f275 2019-02-04 stsp fileindex = got_fileindex_alloc();
1713 f8d1f275 2019-02-04 stsp if (fileindex == NULL) {
1714 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1715 f8d1f275 2019-02-04 stsp goto done;
1718 f8d1f275 2019-02-04 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1719 f8d1f275 2019-02-04 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1720 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1721 f8d1f275 2019-02-04 stsp fileindex_path = NULL;
1722 f8d1f275 2019-02-04 stsp goto done;
1725 f8d1f275 2019-02-04 stsp index = fopen(fileindex_path, "rb");
1726 f8d1f275 2019-02-04 stsp if (index == NULL) {
1727 f8d1f275 2019-02-04 stsp if (errno != ENOENT) {
1728 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1729 f8d1f275 2019-02-04 stsp goto done;
1732 f8d1f275 2019-02-04 stsp err = got_fileindex_read(fileindex, index);
1733 f8d1f275 2019-02-04 stsp fclose(index);
1735 f8d1f275 2019-02-04 stsp goto done;
1738 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
1739 927df6b7 2019-02-10 stsp worktree->root_path, path[0] ? "/" : "", path) == -1) {
1740 c513d110 2019-02-05 stsp err = got_error_from_errno();
1741 c513d110 2019-02-05 stsp goto done;
1743 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
1744 927df6b7 2019-02-10 stsp if (workdir == NULL) {
1745 2ec1f75b 2019-03-26 stsp if (errno == ENOTDIR || errno == ENOENT) {
1746 927df6b7 2019-02-10 stsp struct got_fileindex_entry *ie;
1747 927df6b7 2019-02-10 stsp ie = got_fileindex_entry_get(fileindex, path);
1748 927df6b7 2019-02-10 stsp if (ie == NULL) {
1749 927df6b7 2019-02-10 stsp err = got_error(GOT_ERR_BAD_PATH);
1750 927df6b7 2019-02-10 stsp goto done;
1752 927df6b7 2019-02-10 stsp err = report_file_status(ie, ondisk_path,
1753 927df6b7 2019-02-10 stsp status_cb, status_arg, repo);
1754 927df6b7 2019-02-10 stsp goto done;
1756 927df6b7 2019-02-10 stsp err = got_error_from_errno();
1757 927df6b7 2019-02-10 stsp goto done;
1760 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old_new = status_old_new;
1761 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old = status_old;
1762 d43a8a88 2019-02-05 stsp fdiff_cb.diff_new = status_new;
1763 f8d1f275 2019-02-04 stsp arg.fileindex = fileindex;
1764 f8d1f275 2019-02-04 stsp arg.worktree = worktree;
1765 927df6b7 2019-02-10 stsp arg.status_path = path;
1766 927df6b7 2019-02-10 stsp arg.status_path_len = strlen(path);
1767 f8d1f275 2019-02-04 stsp arg.repo = repo;
1768 f8d1f275 2019-02-04 stsp arg.status_cb = status_cb;
1769 f8d1f275 2019-02-04 stsp arg.status_arg = status_arg;
1770 f8d1f275 2019-02-04 stsp arg.cancel_cb = cancel_cb;
1771 f8d1f275 2019-02-04 stsp arg.cancel_arg = cancel_arg;
1772 c7f4312f 2019-02-05 stsp err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
1773 927df6b7 2019-02-10 stsp path, repo, &fdiff_cb, &arg);
1775 f8d1f275 2019-02-04 stsp if (workdir)
1776 f8d1f275 2019-02-04 stsp closedir(workdir);
1777 927df6b7 2019-02-10 stsp free(ondisk_path);
1778 f8d1f275 2019-02-04 stsp free(fileindex_path);
1779 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
1780 f8d1f275 2019-02-04 stsp return err;
1783 6c7ab921 2019-03-18 stsp const struct got_error *
1784 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
1785 6c7ab921 2019-03-18 stsp const char *arg)
1787 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
1788 6c7ab921 2019-03-18 stsp char *resolved, *path = NULL;
1789 6c7ab921 2019-03-18 stsp size_t len;
1791 6c7ab921 2019-03-18 stsp *wt_path = NULL;
1793 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
1794 6c7ab921 2019-03-18 stsp if (resolved == NULL)
1795 6c7ab921 2019-03-18 stsp return got_error_from_errno();
1797 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
1798 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
1799 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
1800 6c7ab921 2019-03-18 stsp goto done;
1803 c4cdcb68 2019-04-03 stsp path = strdup(resolved +
1804 c4cdcb68 2019-04-03 stsp strlen(got_worktree_get_root_path(worktree)) + 1 /* skip '/' */);
1805 6c7ab921 2019-03-18 stsp if (path == NULL) {
1806 6c7ab921 2019-03-18 stsp err = got_error_from_errno();
1807 6c7ab921 2019-03-18 stsp goto done;
1810 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
1811 6c7ab921 2019-03-18 stsp len = strlen(path);
1812 6c7ab921 2019-03-18 stsp while (path[len - 1] == '/') {
1813 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
1817 6c7ab921 2019-03-18 stsp free(resolved);
1818 6c7ab921 2019-03-18 stsp if (err == NULL)
1819 6c7ab921 2019-03-18 stsp *wt_path = path;
1821 6c7ab921 2019-03-18 stsp free(path);
1822 d00136be 2019-03-26 stsp return err;
1825 d00136be 2019-03-26 stsp const struct got_error *
1826 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
1827 031a5338 2019-03-26 stsp const char *ondisk_path, got_worktree_status_cb status_cb, void *status_arg,
1828 031a5338 2019-03-26 stsp struct got_repository *repo)
1830 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
1831 d00136be 2019-03-26 stsp struct got_fileindex_entry *ie = NULL;
1832 031a5338 2019-03-26 stsp char *relpath, *fileindex_path = NULL, *new_fileindex_path = NULL;
1833 d00136be 2019-03-26 stsp FILE *index = NULL, *new_index = NULL;
1834 d00136be 2019-03-26 stsp const struct got_error *err = NULL, *unlockerr = NULL;
1835 031a5338 2019-03-26 stsp int ie_added = 0;
1837 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
1839 d00136be 2019-03-26 stsp return err;
1841 031a5338 2019-03-26 stsp err = got_path_skip_common_ancestor(&relpath,
1842 d00136be 2019-03-26 stsp got_worktree_get_root_path(worktree), ondisk_path);
1844 d00136be 2019-03-26 stsp goto done;
1846 d00136be 2019-03-26 stsp fileindex = got_fileindex_alloc();
1847 d00136be 2019-03-26 stsp if (fileindex == NULL) {
1848 d00136be 2019-03-26 stsp err = got_error_from_errno();
1849 d00136be 2019-03-26 stsp goto done;
1852 d00136be 2019-03-26 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1853 d00136be 2019-03-26 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1854 d00136be 2019-03-26 stsp err = got_error_from_errno();
1855 d00136be 2019-03-26 stsp fileindex_path = NULL;
1856 d00136be 2019-03-26 stsp goto done;
1859 d00136be 2019-03-26 stsp index = fopen(fileindex_path, "rb");
1860 d00136be 2019-03-26 stsp if (index == NULL) {
1861 d00136be 2019-03-26 stsp err = got_error_from_errno();
1862 d00136be 2019-03-26 stsp goto done;
1865 d00136be 2019-03-26 stsp err = got_fileindex_read(fileindex, index);
1867 d00136be 2019-03-26 stsp goto done;
1869 5c99ca9f 2019-03-27 stsp if (got_fileindex_entry_get(fileindex, relpath) != NULL) {
1870 5c99ca9f 2019-03-27 stsp err = got_error_set_errno(EEXIST);
1871 5c99ca9f 2019-03-27 stsp goto done;
1874 5c99ca9f 2019-03-27 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
1876 5c99ca9f 2019-03-27 stsp goto done;
1878 d00136be 2019-03-26 stsp err = got_fileindex_entry_add(fileindex, ie);
1880 d00136be 2019-03-26 stsp goto done;
1881 031a5338 2019-03-26 stsp ie_added = 1; /* now owned by fileindex; don't free separately */
1883 d00136be 2019-03-26 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1884 d00136be 2019-03-26 stsp fileindex_path);
1886 d00136be 2019-03-26 stsp goto done;
1888 d00136be 2019-03-26 stsp err = got_fileindex_write(fileindex, new_index);
1890 d00136be 2019-03-26 stsp goto done;
1892 d00136be 2019-03-26 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1893 d00136be 2019-03-26 stsp err = got_error_from_errno();
1894 d00136be 2019-03-26 stsp goto done;
1897 d00136be 2019-03-26 stsp free(new_fileindex_path);
1898 d00136be 2019-03-26 stsp new_fileindex_path = NULL;
1900 031a5338 2019-03-26 stsp err = report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
1902 d00136be 2019-03-26 stsp if (index) {
1903 d00136be 2019-03-26 stsp if (fclose(index) != 0 && err == NULL)
1904 d00136be 2019-03-26 stsp err = got_error_from_errno();
1906 d00136be 2019-03-26 stsp if (new_fileindex_path) {
1907 d00136be 2019-03-26 stsp if (unlink(new_fileindex_path) != 0 && err == NULL)
1908 d00136be 2019-03-26 stsp err = got_error_from_errno();
1909 d00136be 2019-03-26 stsp free(new_fileindex_path);
1911 5c99ca9f 2019-03-27 stsp if (ie && !ie_added)
1912 d00136be 2019-03-26 stsp got_fileindex_entry_free(ie);
1913 d00136be 2019-03-26 stsp if (fileindex)
1914 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
1915 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1916 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
1917 d00136be 2019-03-26 stsp err = unlockerr;
1918 031a5338 2019-03-26 stsp free(relpath);
1919 6c7ab921 2019-03-18 stsp return err;
1922 2ec1f75b 2019-03-26 stsp const struct got_error *
1923 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
1924 2ec1f75b 2019-03-26 stsp const char *ondisk_path, int delete_local_mods,
1925 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
1926 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
1928 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
1929 2ec1f75b 2019-03-26 stsp struct got_fileindex_entry *ie = NULL;
1930 2ec1f75b 2019-03-26 stsp char *relpath, *fileindex_path = NULL, *new_fileindex_path = NULL;
1931 2ec1f75b 2019-03-26 stsp FILE *index = NULL, *new_index = NULL;
1932 2ec1f75b 2019-03-26 stsp const struct got_error *err = NULL, *unlockerr = NULL;
1933 2ec1f75b 2019-03-26 stsp unsigned char status;
1934 2ec1f75b 2019-03-26 stsp struct stat sb;
1936 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
1938 2ec1f75b 2019-03-26 stsp return err;
1940 2ec1f75b 2019-03-26 stsp err = got_path_skip_common_ancestor(&relpath,
1941 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(worktree), ondisk_path);
1943 2ec1f75b 2019-03-26 stsp goto done;
1945 2ec1f75b 2019-03-26 stsp fileindex = got_fileindex_alloc();
1946 2ec1f75b 2019-03-26 stsp if (fileindex == NULL) {
1947 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1948 2ec1f75b 2019-03-26 stsp goto done;
1951 2ec1f75b 2019-03-26 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1952 2ec1f75b 2019-03-26 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1953 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1954 2ec1f75b 2019-03-26 stsp fileindex_path = NULL;
1955 2ec1f75b 2019-03-26 stsp goto done;
1958 2ec1f75b 2019-03-26 stsp index = fopen(fileindex_path, "rb");
1959 2ec1f75b 2019-03-26 stsp if (index == NULL) {
1960 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1961 2ec1f75b 2019-03-26 stsp goto done;
1964 2ec1f75b 2019-03-26 stsp err = got_fileindex_read(fileindex, index);
1966 2ec1f75b 2019-03-26 stsp goto done;
1968 2ec1f75b 2019-03-26 stsp ie = got_fileindex_entry_get(fileindex, relpath);
1969 2ec1f75b 2019-03-26 stsp if (ie == NULL) {
1970 2ec1f75b 2019-03-26 stsp err = got_error(GOT_ERR_BAD_PATH);
1971 2ec1f75b 2019-03-26 stsp goto done;
1974 2ec1f75b 2019-03-26 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1976 2ec1f75b 2019-03-26 stsp goto done;
1978 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_NO_CHANGE) {
1979 71a29355 2019-03-27 stsp if (status == GOT_STATUS_DELETE) {
1980 71a29355 2019-03-27 stsp err = got_error_set_errno(ENOENT);
1981 71a29355 2019-03-27 stsp goto done;
1983 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY) {
1984 2ec1f75b 2019-03-26 stsp err = got_error(GOT_ERR_FILE_STATUS);
1985 2ec1f75b 2019-03-26 stsp goto done;
1987 2ec1f75b 2019-03-26 stsp if (!delete_local_mods) {
1988 2ec1f75b 2019-03-26 stsp err = got_error(GOT_ERR_FILE_MODIFIED);
1989 2ec1f75b 2019-03-26 stsp goto done;
1993 2ec1f75b 2019-03-26 stsp if (unlink(ondisk_path) != 0) {
1994 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1995 2ec1f75b 2019-03-26 stsp goto done;
1998 2ec1f75b 2019-03-26 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2000 2ec1f75b 2019-03-26 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2001 2ec1f75b 2019-03-26 stsp fileindex_path);
2003 2ec1f75b 2019-03-26 stsp goto done;
2005 2ec1f75b 2019-03-26 stsp err = got_fileindex_write(fileindex, new_index);
2007 2ec1f75b 2019-03-26 stsp goto done;
2009 2ec1f75b 2019-03-26 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2010 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
2011 2ec1f75b 2019-03-26 stsp goto done;
2014 2ec1f75b 2019-03-26 stsp free(new_fileindex_path);
2015 2ec1f75b 2019-03-26 stsp new_fileindex_path = NULL;
2017 2ec1f75b 2019-03-26 stsp err = report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2019 2ec1f75b 2019-03-26 stsp free(relpath);
2020 2ec1f75b 2019-03-26 stsp if (index) {
2021 2ec1f75b 2019-03-26 stsp if (fclose(index) != 0 && err == NULL)
2022 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
2024 2ec1f75b 2019-03-26 stsp if (new_fileindex_path) {
2025 2ec1f75b 2019-03-26 stsp if (unlink(new_fileindex_path) != 0 && err == NULL)
2026 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
2027 2ec1f75b 2019-03-26 stsp free(new_fileindex_path);
2029 2ec1f75b 2019-03-26 stsp if (fileindex)
2030 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2031 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2032 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2033 2ec1f75b 2019-03-26 stsp err = unlockerr;
2034 2ec1f75b 2019-03-26 stsp return err;
2037 a129376b 2019-03-28 stsp const struct got_error *
2038 a129376b 2019-03-28 stsp got_worktree_revert(struct got_worktree *worktree,
2039 a129376b 2019-03-28 stsp const char *ondisk_path,
2040 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2041 a129376b 2019-03-28 stsp struct got_repository *repo)
2043 a129376b 2019-03-28 stsp struct got_fileindex *fileindex = NULL;
2044 a129376b 2019-03-28 stsp struct got_fileindex_entry *ie = NULL;
2045 a129376b 2019-03-28 stsp char *relpath, *fileindex_path = NULL, *new_fileindex_path = NULL;
2046 a129376b 2019-03-28 stsp char *tree_path = NULL, *parent_path, *te_name;
2047 a129376b 2019-03-28 stsp FILE *index = NULL, *new_index = NULL;
2048 a129376b 2019-03-28 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2049 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
2050 a129376b 2019-03-28 stsp struct got_object_id id, *tree_id = NULL;
2051 a129376b 2019-03-28 stsp const struct got_tree_entry *te;
2052 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
2053 a129376b 2019-03-28 stsp unsigned char status;
2054 a129376b 2019-03-28 stsp struct stat sb;
2056 a129376b 2019-03-28 stsp err = lock_worktree(worktree, LOCK_EX);
2058 a129376b 2019-03-28 stsp return err;
2060 a129376b 2019-03-28 stsp err = got_path_skip_common_ancestor(&relpath,
2061 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree), ondisk_path);
2063 a129376b 2019-03-28 stsp goto done;
2065 a129376b 2019-03-28 stsp fileindex = got_fileindex_alloc();
2066 a129376b 2019-03-28 stsp if (fileindex == NULL) {
2067 a129376b 2019-03-28 stsp err = got_error_from_errno();
2068 a129376b 2019-03-28 stsp goto done;
2071 a129376b 2019-03-28 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2072 a129376b 2019-03-28 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2073 a129376b 2019-03-28 stsp err = got_error_from_errno();
2074 a129376b 2019-03-28 stsp fileindex_path = NULL;
2075 a129376b 2019-03-28 stsp goto done;
2078 a129376b 2019-03-28 stsp index = fopen(fileindex_path, "rb");
2079 a129376b 2019-03-28 stsp if (index == NULL) {
2080 a129376b 2019-03-28 stsp err = got_error_from_errno();
2081 a129376b 2019-03-28 stsp goto done;
2084 a129376b 2019-03-28 stsp err = got_fileindex_read(fileindex, index);
2086 a129376b 2019-03-28 stsp goto done;
2088 a129376b 2019-03-28 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2089 a129376b 2019-03-28 stsp if (ie == NULL) {
2090 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_BAD_PATH);
2091 a129376b 2019-03-28 stsp goto done;
2094 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
2095 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
2096 a129376b 2019-03-28 stsp if (err) {
2097 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
2098 a129376b 2019-03-28 stsp goto done;
2099 a129376b 2019-03-28 stsp parent_path = "/";
2101 a129376b 2019-03-28 stsp if (got_path_is_root_dir(worktree->path_prefix)) {
2102 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
2103 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2104 a129376b 2019-03-28 stsp err = got_error_from_errno();
2105 a129376b 2019-03-28 stsp goto done;
2108 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
2109 a129376b 2019-03-28 stsp tree_path = strdup(worktree->path_prefix);
2110 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2111 a129376b 2019-03-28 stsp err = got_error_from_errno();
2112 a129376b 2019-03-28 stsp goto done;
2115 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
2116 a129376b 2019-03-28 stsp worktree->path_prefix, parent_path) == -1) {
2117 a129376b 2019-03-28 stsp err = got_error_from_errno();
2118 a129376b 2019-03-28 stsp goto done;
2123 a129376b 2019-03-28 stsp err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2124 a129376b 2019-03-28 stsp tree_path);
2126 a129376b 2019-03-28 stsp goto done;
2128 a129376b 2019-03-28 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2130 a129376b 2019-03-28 stsp goto done;
2132 a129376b 2019-03-28 stsp te_name = basename(ie->path);
2133 a129376b 2019-03-28 stsp if (te_name == NULL) {
2134 a129376b 2019-03-28 stsp err = got_error_from_errno();
2135 a129376b 2019-03-28 stsp goto done;
2138 a129376b 2019-03-28 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2140 a129376b 2019-03-28 stsp goto done;
2142 a129376b 2019-03-28 stsp te = got_object_tree_find_entry(tree, te_name);
2143 a129376b 2019-03-28 stsp if (te == NULL && status != GOT_STATUS_ADD) {
2144 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2145 a129376b 2019-03-28 stsp goto done;
2148 a129376b 2019-03-28 stsp switch (status) {
2149 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
2150 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2151 a129376b 2019-03-28 stsp got_fileindex_entry_remove(fileindex, ie);
2153 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
2154 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
2155 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
2156 a129376b 2019-03-28 stsp case GOT_STATUS_MISSING:
2157 a129376b 2019-03-28 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2158 a129376b 2019-03-28 stsp err = got_object_open_as_blob(&blob, repo, &id, 8192);
2160 a129376b 2019-03-28 stsp goto done;
2161 a129376b 2019-03-28 stsp err = install_blob(worktree, ondisk_path, ie->path,
2162 a129376b 2019-03-28 stsp te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2163 a129376b 2019-03-28 stsp progress_arg);
2165 a129376b 2019-03-28 stsp goto done;
2166 a129376b 2019-03-28 stsp if (status == GOT_STATUS_DELETE) {
2167 a129376b 2019-03-28 stsp err = update_blob_fileindex_entry(worktree,
2168 a129376b 2019-03-28 stsp fileindex, ie, ondisk_path, ie->path, blob, 1);
2170 a129376b 2019-03-28 stsp goto done;
2174 a129376b 2019-03-28 stsp goto done;
2177 a129376b 2019-03-28 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2178 a129376b 2019-03-28 stsp fileindex_path);
2180 a129376b 2019-03-28 stsp goto done;
2182 a129376b 2019-03-28 stsp err = got_fileindex_write(fileindex, new_index);
2184 a129376b 2019-03-28 stsp goto done;
2186 a129376b 2019-03-28 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2187 a129376b 2019-03-28 stsp err = got_error_from_errno();
2188 a129376b 2019-03-28 stsp goto done;
2191 a129376b 2019-03-28 stsp free(new_fileindex_path);
2192 a129376b 2019-03-28 stsp new_fileindex_path = NULL;
2194 a129376b 2019-03-28 stsp free(relpath);
2195 a129376b 2019-03-28 stsp free(tree_path);
2197 a129376b 2019-03-28 stsp got_object_blob_close(blob);
2199 a129376b 2019-03-28 stsp got_object_tree_close(tree);
2200 a129376b 2019-03-28 stsp free(tree_id);
2201 a129376b 2019-03-28 stsp if (index) {
2202 a129376b 2019-03-28 stsp if (fclose(index) != 0 && err == NULL)
2203 a129376b 2019-03-28 stsp err = got_error_from_errno();
2205 a129376b 2019-03-28 stsp if (new_fileindex_path) {
2206 a129376b 2019-03-28 stsp if (unlink(new_fileindex_path) != 0 && err == NULL)
2207 a129376b 2019-03-28 stsp err = got_error_from_errno();
2208 a129376b 2019-03-28 stsp free(new_fileindex_path);
2210 a129376b 2019-03-28 stsp if (fileindex)
2211 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
2212 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2213 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
2214 a129376b 2019-03-28 stsp err = unlockerr;
2215 c4296144 2019-05-09 stsp return err;
2218 ed175427 2019-05-09 stsp struct commitable {
2219 24519714 2019-05-09 stsp char *path;
2220 44d03001 2019-05-09 stsp char *in_repo_path;
2221 768aea60 2019-05-09 stsp char *ondisk_path;
2222 cf066bf8 2019-05-09 stsp unsigned char status;
2223 cf066bf8 2019-05-09 stsp struct got_object_id *id;
2224 ca2503ea 2019-05-09 stsp struct got_object_id *base_id;
2225 768aea60 2019-05-09 stsp mode_t mode;
2228 cf066bf8 2019-05-09 stsp static void
2229 ed175427 2019-05-09 stsp free_commitable(struct commitable *ct)
2231 24519714 2019-05-09 stsp free(ct->path);
2232 44d03001 2019-05-09 stsp free(ct->in_repo_path);
2233 768aea60 2019-05-09 stsp free(ct->ondisk_path);
2234 cf066bf8 2019-05-09 stsp free(ct->id);
2235 ca2503ea 2019-05-09 stsp free(ct->base_id);
2239 ed175427 2019-05-09 stsp struct collect_commitables_arg {
2240 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
2241 24519714 2019-05-09 stsp struct got_repository *repo;
2242 24519714 2019-05-09 stsp struct got_worktree *worktree;
2245 c4296144 2019-05-09 stsp static const struct got_error *
2246 036813ee 2019-05-09 stsp collect_commitables(void *arg, unsigned char status, const char *relpath,
2247 c4296144 2019-05-09 stsp struct got_object_id *id)
2249 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
2250 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
2251 ed175427 2019-05-09 stsp struct commitable *ct = NULL;
2252 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
2253 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
2254 768aea60 2019-05-09 stsp struct stat sb;
2256 c4296144 2019-05-09 stsp if (status == GOT_STATUS_CONFLICT)
2257 c4296144 2019-05-09 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
2259 c4296144 2019-05-09 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2260 c4296144 2019-05-09 stsp status != GOT_STATUS_DELETE)
2261 c4296144 2019-05-09 stsp return NULL;
2263 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
2264 036813ee 2019-05-09 stsp err = got_error_from_errno();
2265 036813ee 2019-05-09 stsp goto done;
2267 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
2268 036813ee 2019-05-09 stsp parent_path = strdup("");
2269 69960a46 2019-05-09 stsp if (parent_path == NULL)
2270 69960a46 2019-05-09 stsp return got_error_from_errno();
2272 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
2274 69960a46 2019-05-09 stsp return err;
2277 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
2278 cf066bf8 2019-05-09 stsp if (ct == NULL) {
2279 c4296144 2019-05-09 stsp err = got_error_from_errno();
2280 c4296144 2019-05-09 stsp goto done;
2283 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2284 768aea60 2019-05-09 stsp relpath) == -1) {
2285 768aea60 2019-05-09 stsp err = got_error_from_errno();
2286 768aea60 2019-05-09 stsp goto done;
2288 768aea60 2019-05-09 stsp if (status == GOT_STATUS_DELETE) {
2289 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2291 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
2292 768aea60 2019-05-09 stsp err = got_error_from_errno();
2293 768aea60 2019-05-09 stsp goto done;
2295 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
2298 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2299 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2300 44d03001 2019-05-09 stsp relpath) == -1) {
2301 44d03001 2019-05-09 stsp err = got_error_from_errno();
2302 44d03001 2019-05-09 stsp goto done;
2305 cf066bf8 2019-05-09 stsp ct->status = status;
2306 036813ee 2019-05-09 stsp ct->id = NULL; /* will be filled in when blob gets created */
2307 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD) {
2308 036813ee 2019-05-09 stsp ct->base_id = got_object_id_dup(id);
2309 036813ee 2019-05-09 stsp if (ct->base_id == NULL) {
2310 036813ee 2019-05-09 stsp err = got_error_from_errno();
2311 036813ee 2019-05-09 stsp goto done;
2314 24519714 2019-05-09 stsp ct->path = strdup(path);
2315 24519714 2019-05-09 stsp if (ct->path == NULL) {
2316 24519714 2019-05-09 stsp err = got_error_from_errno();
2317 24519714 2019-05-09 stsp goto done;
2319 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2321 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
2322 ed175427 2019-05-09 stsp free_commitable(ct);
2323 24519714 2019-05-09 stsp free(parent_path);
2324 036813ee 2019-05-09 stsp free(path);
2325 a129376b 2019-03-28 stsp return err;
2328 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
2329 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
2330 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2331 036813ee 2019-05-09 stsp struct got_repository *);
2333 ed175427 2019-05-09 stsp static const struct got_error *
2334 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
2335 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
2336 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2337 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2338 afa376bf 2019-05-09 stsp struct got_repository *repo)
2340 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
2341 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
2342 036813ee 2019-05-09 stsp char *subpath;
2344 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
2345 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2346 036813ee 2019-05-09 stsp return got_error_from_errno();
2348 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
2350 ed175427 2019-05-09 stsp return err;
2352 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2353 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2354 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
2355 036813ee 2019-05-09 stsp free(subpath);
2356 036813ee 2019-05-09 stsp return err;
2359 036813ee 2019-05-09 stsp static const struct got_error *
2360 036813ee 2019-05-09 stsp match_ct_parent_path(int *match, struct commitable *ct, const char *path)
2362 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2363 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
2365 036813ee 2019-05-09 stsp *match = 0;
2367 036813ee 2019-05-09 stsp if (strchr(ct->path, '/') == NULL) {
2368 036813ee 2019-05-09 stsp ct_parent_path = strdup("/");
2369 036813ee 2019-05-09 stsp if (ct_parent_path == NULL)
2370 036813ee 2019-05-09 stsp return got_error_from_errno();
2372 036813ee 2019-05-09 stsp err = got_path_dirname(&ct_parent_path, ct->path);
2374 036813ee 2019-05-09 stsp return err;
2377 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
2378 036813ee 2019-05-09 stsp free(ct_parent_path);
2379 036813ee 2019-05-09 stsp return err;
2382 768aea60 2019-05-09 stsp static mode_t
2383 768aea60 2019-05-09 stsp get_ct_file_mode(struct commitable *ct)
2385 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2388 036813ee 2019-05-09 stsp static const struct got_error *
2389 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2390 036813ee 2019-05-09 stsp struct got_tree_entry *te, struct commitable *ct)
2392 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2394 036813ee 2019-05-09 stsp *new_te = NULL;
2396 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
2398 036813ee 2019-05-09 stsp goto done;
2400 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2402 036813ee 2019-05-09 stsp free((*new_te)->id);
2403 036813ee 2019-05-09 stsp (*new_te)->id = got_object_id_dup(ct->id);
2404 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2405 036813ee 2019-05-09 stsp err = got_error_from_errno();
2406 036813ee 2019-05-09 stsp goto done;
2409 036813ee 2019-05-09 stsp if (err && *new_te) {
2410 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2411 036813ee 2019-05-09 stsp *new_te = NULL;
2413 036813ee 2019-05-09 stsp return err;
2416 036813ee 2019-05-09 stsp static const struct got_error *
2417 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2418 036813ee 2019-05-09 stsp struct commitable *ct)
2420 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2421 036813ee 2019-05-09 stsp char *ct_name;
2423 036813ee 2019-05-09 stsp *new_te = NULL;
2425 036813ee 2019-05-09 stsp *new_te = calloc(1, sizeof(*new_te));
2426 036813ee 2019-05-09 stsp if (*new_te == NULL)
2427 036813ee 2019-05-09 stsp return got_error_from_errno();
2429 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
2430 036813ee 2019-05-09 stsp if (ct_name == NULL) {
2431 036813ee 2019-05-09 stsp err = got_error_from_errno();
2432 036813ee 2019-05-09 stsp goto done;
2434 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
2435 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
2436 036813ee 2019-05-09 stsp err = got_error_from_errno();
2437 036813ee 2019-05-09 stsp goto done;
2440 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2442 036813ee 2019-05-09 stsp (*new_te)->id = got_object_id_dup(ct->id);
2443 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2444 036813ee 2019-05-09 stsp err = got_error_from_errno();
2445 036813ee 2019-05-09 stsp goto done;
2448 036813ee 2019-05-09 stsp if (err && *new_te) {
2449 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2450 036813ee 2019-05-09 stsp *new_te = NULL;
2452 036813ee 2019-05-09 stsp return err;
2455 036813ee 2019-05-09 stsp static const struct got_error *
2456 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
2457 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
2459 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2460 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
2462 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2464 036813ee 2019-05-09 stsp return err;
2465 036813ee 2019-05-09 stsp if (new_pe == NULL)
2466 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
2467 036813ee 2019-05-09 stsp return NULL;
2470 afa376bf 2019-05-09 stsp static const struct got_error *
2471 afa376bf 2019-05-09 stsp report_ct_status(struct commitable *ct,
2472 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
2474 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
2475 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
2476 afa376bf 2019-05-09 stsp ct_path++;
2477 afa376bf 2019-05-09 stsp return (*status_cb)(status_arg, ct->status, ct_path, ct->id);
2480 036813ee 2019-05-09 stsp static const struct got_error *
2481 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
2482 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2484 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
2485 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
2486 44d03001 2019-05-09 stsp char *te_path;
2488 44d03001 2019-05-09 stsp *modified = 0;
2490 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
2491 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
2492 44d03001 2019-05-09 stsp te->name) == -1)
2493 44d03001 2019-05-09 stsp return got_error_from_errno();
2495 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2496 44d03001 2019-05-09 stsp struct commitable *ct = pe->data;
2497 44d03001 2019-05-09 stsp char *ct_path;
2499 44d03001 2019-05-09 stsp if (asprintf(&ct_path, "%s%s%s", base_tree_path,
2500 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
2501 44d03001 2019-05-09 stsp te->name) == -1) {
2502 44d03001 2019-05-09 stsp err = got_error_from_errno();
2506 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
2507 44d03001 2019-05-09 stsp strlen(te_path));
2508 44d03001 2019-05-09 stsp if (*modified)
2512 44d03001 2019-05-09 stsp free(te_path);
2513 44d03001 2019-05-09 stsp return err;
2516 44d03001 2019-05-09 stsp static const struct got_error *
2517 036813ee 2019-05-09 stsp match_deleted_or_modified_ct(struct commitable **ctp,
2518 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
2519 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
2521 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2522 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2524 036813ee 2019-05-09 stsp *ctp = NULL;
2526 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2527 036813ee 2019-05-09 stsp struct commitable *ct = pe->data;
2528 036813ee 2019-05-09 stsp char *ct_name = NULL;
2529 036813ee 2019-05-09 stsp int path_matches;
2531 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_MODIFY &&
2532 036813ee 2019-05-09 stsp ct->status != GOT_STATUS_DELETE)
2535 036813ee 2019-05-09 stsp if (got_object_id_cmp(ct->base_id, te->id) != 0)
2538 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
2540 036813ee 2019-05-09 stsp return err;
2541 036813ee 2019-05-09 stsp if (!path_matches)
2544 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
2545 036813ee 2019-05-09 stsp if (ct_name == NULL)
2546 036813ee 2019-05-09 stsp return got_error_from_errno();
2548 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
2551 036813ee 2019-05-09 stsp *ctp = ct;
2555 036813ee 2019-05-09 stsp return err;
2558 036813ee 2019-05-09 stsp static const struct got_error *
2559 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
2560 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
2561 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2562 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2563 036813ee 2019-05-09 stsp struct got_repository *repo)
2565 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2566 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
2567 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
2568 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
2569 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
2570 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2572 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
2573 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
2574 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
2576 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
2577 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2578 036813ee 2019-05-09 stsp struct commitable *ct = pe->data;
2579 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
2581 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD)
2584 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
2585 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
2588 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
2589 036813ee 2019-05-09 stsp pe->path);
2591 036813ee 2019-05-09 stsp goto done;
2593 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
2594 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
2595 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
2597 036813ee 2019-05-09 stsp goto done;
2598 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
2600 afa376bf 2019-05-09 stsp goto done;
2602 2f51b5b3 2019-05-09 stsp char *subtree_path;
2603 baa7dcfa 2019-05-09 stsp struct got_pathlist_entry *pe2;
2604 baa7dcfa 2019-05-09 stsp int visited = 0;
2606 2f51b5b3 2019-05-09 stsp *slash = '\0'; /* trim trailing path components */
2608 2f51b5b3 2019-05-09 stsp new_te = calloc(1, sizeof(*new_te));
2609 768aea60 2019-05-09 stsp new_te->mode = S_IFDIR;
2610 2f51b5b3 2019-05-09 stsp new_te->name = strdup(child_path);
2611 2f51b5b3 2019-05-09 stsp if (new_te->name == NULL) {
2612 2f51b5b3 2019-05-09 stsp got_object_tree_entry_close(new_te);
2613 2f51b5b3 2019-05-09 stsp err = got_error_from_errno();
2614 ed175427 2019-05-09 stsp goto done;
2616 baa7dcfa 2019-05-09 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
2617 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
2618 2f51b5b3 2019-05-09 stsp child_path) == -1) {
2619 2f51b5b3 2019-05-09 stsp err = got_error_from_errno();
2620 2f51b5b3 2019-05-09 stsp goto done;
2622 baa7dcfa 2019-05-09 stsp TAILQ_FOREACH(pe2, &paths, entry) {
2623 baa7dcfa 2019-05-09 stsp if (got_path_cmp(subtree_path, pe2->path) != 0)
2625 baa7dcfa 2019-05-09 stsp visited = 1;
2628 baa7dcfa 2019-05-09 stsp if (visited)
2631 baa7dcfa 2019-05-09 stsp err = write_tree(&new_te->id, NULL, subtree_path,
2632 afa376bf 2019-05-09 stsp commitable_paths, status_cb, status_arg, repo);
2633 2f51b5b3 2019-05-09 stsp free(subtree_path);
2635 036813ee 2019-05-09 stsp goto done;
2637 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2639 2f51b5b3 2019-05-09 stsp goto done;
2642 2f51b5b3 2019-05-09 stsp if (base_tree) {
2643 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
2644 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
2645 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
2646 2f51b5b3 2019-05-09 stsp struct commitable *ct = NULL;
2648 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
2649 44d03001 2019-05-09 stsp int modified;
2650 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
2652 036813ee 2019-05-09 stsp goto done;
2653 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
2654 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
2656 2f51b5b3 2019-05-09 stsp goto done;
2657 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
2658 44d03001 2019-05-09 stsp if (modified) {
2659 44d03001 2019-05-09 stsp free(new_te->id);
2660 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
2661 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
2662 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
2664 44d03001 2019-05-09 stsp goto done;
2666 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2668 036813ee 2019-05-09 stsp goto done;
2672 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
2673 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
2675 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
2676 2f51b5b3 2019-05-09 stsp if (ct->status == GOT_STATUS_MODIFY) {
2677 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
2678 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
2680 2f51b5b3 2019-05-09 stsp goto done;
2681 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2683 2f51b5b3 2019-05-09 stsp goto done;
2685 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
2687 afa376bf 2019-05-09 stsp goto done;
2689 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
2690 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
2692 2f51b5b3 2019-05-09 stsp goto done;
2693 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2695 2f51b5b3 2019-05-09 stsp goto done;
2700 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
2701 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
2702 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
2703 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
2704 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
2706 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
2708 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
2709 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
2710 ed175427 2019-05-09 stsp return err;
2713 ebf99748 2019-05-09 stsp static const struct got_error *
2714 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
2715 ebf99748 2019-05-09 stsp struct got_object_id *new_base_commit_id, struct got_worktree *worktree)
2717 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2718 ebf99748 2019-05-09 stsp char *fileindex_path = NULL, *new_fileindex_path = NULL;
2719 ebf99748 2019-05-09 stsp struct got_fileindex *fileindex = NULL;
2720 ebf99748 2019-05-09 stsp FILE *new_index = NULL;
2721 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
2723 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2725 ebf99748 2019-05-09 stsp return err;
2727 ebf99748 2019-05-09 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2728 ebf99748 2019-05-09 stsp fileindex_path);
2730 ebf99748 2019-05-09 stsp goto done;
2732 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2733 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
2734 ebf99748 2019-05-09 stsp struct commitable *ct = pe->data;
2736 ebf99748 2019-05-09 stsp ie = got_fileindex_entry_get(fileindex, pe->path);
2738 ebf99748 2019-05-09 stsp if (ct->status == GOT_STATUS_DELETE) {
2739 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
2740 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
2742 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
2743 768aea60 2019-05-09 stsp ct->ondisk_path, ct->id->sha1,
2744 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
2746 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
2747 768aea60 2019-05-09 stsp ct->ondisk_path, pe->path, ct->id->sha1,
2748 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
2750 ebf99748 2019-05-09 stsp goto done;
2751 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
2753 ebf99748 2019-05-09 stsp goto done;
2757 ebf99748 2019-05-09 stsp err = got_fileindex_write(fileindex, new_index);
2759 ebf99748 2019-05-09 stsp goto done;
2761 ebf99748 2019-05-09 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2762 ebf99748 2019-05-09 stsp err = got_error_from_errno();
2763 ebf99748 2019-05-09 stsp unlink(new_fileindex_path);
2764 ebf99748 2019-05-09 stsp goto done;
2767 ebf99748 2019-05-09 stsp free(new_fileindex_path);
2768 ebf99748 2019-05-09 stsp new_fileindex_path = NULL;
2771 ebf99748 2019-05-09 stsp if (new_fileindex_path)
2772 ebf99748 2019-05-09 stsp unlink(new_fileindex_path);
2773 ebf99748 2019-05-09 stsp if (new_index)
2774 ebf99748 2019-05-09 stsp fclose(new_index);
2775 ebf99748 2019-05-09 stsp free(new_fileindex_path);
2776 ebf99748 2019-05-09 stsp free(fileindex_path);
2777 ebf99748 2019-05-09 stsp got_fileindex_free(fileindex);
2778 ebf99748 2019-05-09 stsp return err;
2781 c4296144 2019-05-09 stsp const struct got_error *
2782 c4296144 2019-05-09 stsp got_worktree_commit(struct got_object_id **new_commit_id,
2783 c4296144 2019-05-09 stsp struct got_worktree *worktree, const char *ondisk_path,
2784 afa376bf 2019-05-09 stsp const char *author, const char *committer, const char *logmsg,
2785 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2786 afa376bf 2019-05-09 stsp struct got_repository *repo)
2788 c4296144 2019-05-09 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2789 ed175427 2019-05-09 stsp struct collect_commitables_arg cc_arg;
2790 036813ee 2019-05-09 stsp struct got_pathlist_head commitable_paths;
2791 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
2792 bc70eb79 2019-05-09 stsp char *relpath = NULL;
2793 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
2794 c4296144 2019-05-09 stsp struct got_commit_object *base_commit = NULL;
2795 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id = NULL;
2796 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
2797 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
2798 c4296144 2019-05-09 stsp struct got_tree_object *base_tree = NULL;
2799 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
2800 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
2801 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
2803 c4296144 2019-05-09 stsp *new_commit_id = NULL;
2805 036813ee 2019-05-09 stsp TAILQ_INIT(&commitable_paths);
2806 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
2808 c4296144 2019-05-09 stsp if (ondisk_path) {
2809 c4296144 2019-05-09 stsp err = got_path_skip_common_ancestor(&relpath,
2810 c4296144 2019-05-09 stsp worktree->root_path, ondisk_path);
2812 c4296144 2019-05-09 stsp return err;
2815 c4296144 2019-05-09 stsp err = lock_worktree(worktree, LOCK_EX);
2817 c4296144 2019-05-09 stsp goto done;
2819 09f5bd90 2019-05-09 stsp /* XXX should re-read head ref here now that work tree is locked */
2820 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id, repo, worktree->head_ref);
2822 09f5bd90 2019-05-09 stsp goto done;
2824 036813ee 2019-05-09 stsp cc_arg.commitable_paths = &commitable_paths;
2825 24519714 2019-05-09 stsp cc_arg.worktree = worktree;
2826 24519714 2019-05-09 stsp cc_arg.repo = repo;
2827 675c7539 2019-05-09 stsp err = got_worktree_status(worktree, relpath ? relpath : "",
2828 ed175427 2019-05-09 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
2830 675c7539 2019-05-09 stsp goto done;
2832 de18fc63 2019-05-09 stsp /* TODO: out-of-dateness check */
2834 675c7539 2019-05-09 stsp /* TODO: collect commit message if not specified */
2836 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
2837 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
2838 ed175427 2019-05-09 stsp struct commitable *ct = pe->data;
2839 cf066bf8 2019-05-09 stsp char *ondisk_path;
2841 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
2842 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
2845 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
2846 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
2847 cf066bf8 2019-05-09 stsp err = got_error_from_errno();
2848 cf066bf8 2019-05-09 stsp goto done;
2850 a7055788 2019-05-09 stsp err = got_object_blob_create(&ct->id, ondisk_path, repo);
2851 a7055788 2019-05-09 stsp free(ondisk_path);
2853 cf066bf8 2019-05-09 stsp goto done;
2856 c4296144 2019-05-09 stsp err = got_object_open_as_commit(&base_commit, repo,
2857 c4296144 2019-05-09 stsp worktree->base_commit_id);
2859 c4296144 2019-05-09 stsp goto done;
2860 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&base_tree, repo, base_commit->tree_id);
2862 c4296144 2019-05-09 stsp goto done;
2864 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
2865 afa376bf 2019-05-09 stsp err = write_tree(&new_tree_id, base_tree, "/", &commitable_paths,
2866 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2868 036813ee 2019-05-09 stsp goto done;
2870 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
2872 de18fc63 2019-05-09 stsp goto done;
2873 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
2874 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
2875 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
2876 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
2878 9d40349a 2019-05-09 stsp goto done;
2880 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
2881 09f5bd90 2019-05-09 stsp /* XXX ideally we'd lock the reference file here to avoid a race */
2882 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
2883 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
2884 09f5bd90 2019-05-09 stsp err = got_error_from_errno();
2885 09f5bd90 2019-05-09 stsp goto done;
2887 bc70eb79 2019-05-09 stsp err = got_ref_open(&head_ref2, repo, head_ref_name);
2889 09f5bd90 2019-05-09 stsp goto done;
2890 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
2892 ebf99748 2019-05-09 stsp goto done;
2893 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
2894 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
2895 09f5bd90 2019-05-09 stsp goto done;
2897 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
2898 f2c16586 2019-05-09 stsp err = got_ref_change_ref(worktree->head_ref, *new_commit_id);
2900 f2c16586 2019-05-09 stsp goto done;
2901 f2c16586 2019-05-09 stsp err = got_ref_write(worktree->head_ref, repo);
2903 f2c16586 2019-05-09 stsp goto done;
2904 09f5bd90 2019-05-09 stsp /* XXX race has ended here */
2906 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
2908 09f5bd90 2019-05-09 stsp goto done;
2910 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
2912 ebf99748 2019-05-09 stsp goto done;
2914 ebf99748 2019-05-09 stsp err = update_fileindex_after_commit(&commitable_paths,
2915 ebf99748 2019-05-09 stsp *new_commit_id, worktree);
2917 ebf99748 2019-05-09 stsp goto done;
2919 c4296144 2019-05-09 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2920 c4296144 2019-05-09 stsp if (unlockerr && err == NULL)
2921 c4296144 2019-05-09 stsp err = unlockerr;
2922 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
2923 ed175427 2019-05-09 stsp struct commitable *ct = pe->data;
2924 ed175427 2019-05-09 stsp free_commitable(ct);
2926 036813ee 2019-05-09 stsp got_pathlist_free(&commitable_paths);
2927 ef2a1e11 2019-05-09 stsp if (base_tree)
2928 ef2a1e11 2019-05-09 stsp got_object_tree_close(base_tree);
2929 036813ee 2019-05-09 stsp if (base_commit)
2930 036813ee 2019-05-09 stsp got_object_commit_close(base_commit);
2931 c4296144 2019-05-09 stsp free(relpath);
2932 09f5bd90 2019-05-09 stsp free(head_commit_id);
2933 09f5bd90 2019-05-09 stsp free(head_commit_id2);
2934 09f5bd90 2019-05-09 stsp if (head_ref2)
2935 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
2936 c4296144 2019-05-09 stsp return err;
