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 6d9d28c3 2018-03-11 stsp int version, fd = -1;
334 6d9d28c3 2018-03-11 stsp const char *errstr;
335 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
336 c442a90d 2019-03-10 stsp uint32_t uuid_status;
338 6d9d28c3 2018-03-11 stsp *worktree = NULL;
340 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
341 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
342 7ac97322 2018-03-11 stsp path_got = NULL;
346 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
347 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
348 056e7441 2018-03-11 stsp path_lock = NULL;
352 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
353 6d9d28c3 2018-03-11 stsp if (fd == -1) {
354 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
355 73a5ef67 2018-03-11 stsp : got_error_from_errno());
359 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
363 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
364 6d9d28c3 2018-03-11 stsp if (errstr) {
365 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
368 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
369 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
373 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
374 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
375 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
378 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
380 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
381 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
382 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
385 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
386 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
390 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
391 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
395 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
396 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
400 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
403 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
404 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
405 c442a90d 2019-03-10 stsp err = got_error_uuid(uuid_status);
409 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
413 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
414 eaccb85f 2018-12-25 stsp base_commit_id_str);
418 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
419 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
422 eaccb85f 2018-12-25 stsp got_repo_close(repo);
423 7ac97322 2018-03-11 stsp free(path_got);
424 056e7441 2018-03-11 stsp free(path_lock);
425 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
426 c442a90d 2019-03-10 stsp free(uuidstr);
427 bd165944 2019-03-10 stsp free(formatstr);
429 6d9d28c3 2018-03-11 stsp if (fd != -1)
431 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
432 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
433 6d9d28c3 2018-03-11 stsp *worktree = NULL;
435 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
437 6d9d28c3 2018-03-11 stsp return err;
440 247140b2 2019-02-05 stsp const struct got_error *
441 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
443 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
446 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
447 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
448 247140b2 2019-02-05 stsp return err;
449 247140b2 2019-02-05 stsp if (*worktree)
450 247140b2 2019-02-05 stsp return NULL;
451 247140b2 2019-02-05 stsp path = dirname(path);
452 d1542a27 2019-02-05 stsp if (path == NULL)
453 d1542a27 2019-02-05 stsp return got_error_from_errno();
454 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
456 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
459 3a6ce05a 2019-02-11 stsp const struct got_error *
460 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
462 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
463 c88eb298 2018-03-11 stsp free(worktree->root_path);
464 cde76477 2018-03-11 stsp free(worktree->repo_path);
465 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
466 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
467 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
468 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
469 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
470 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
471 6d9d28c3 2018-03-11 stsp free(worktree);
472 3a6ce05a 2019-02-11 stsp return err;
475 2fbdb5ae 2018-12-29 stsp const char *
476 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
478 c7f4312f 2019-02-05 stsp return worktree->root_path;
481 c7f4312f 2019-02-05 stsp const char *
482 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
484 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
487 49520a32 2018-12-29 stsp const char *
488 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
490 f609be2e 2018-12-29 stsp return worktree->path_prefix;
493 e5dc7198 2018-12-29 stsp const struct got_error *
494 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
495 e5dc7198 2018-12-29 stsp const char *path_prefix)
497 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
499 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
500 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
501 e5dc7198 2018-12-29 stsp return got_error_from_errno();
503 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
504 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
505 e5dc7198 2018-12-29 stsp free(absprefix);
506 e5dc7198 2018-12-29 stsp return NULL;
509 bc70eb79 2019-05-09 stsp const char *
510 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
512 36a38700 2019-05-10 stsp return worktree->head_ref_name;
515 b72f483a 2019-02-05 stsp struct got_object_id *
516 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
518 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
521 507dc3bb 2018-12-29 stsp const struct got_error *
522 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
523 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
525 507dc3bb 2018-12-29 stsp const struct got_error *err;
526 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
527 507dc3bb 2018-12-29 stsp char *id_str = NULL;
528 507dc3bb 2018-12-29 stsp char *path_got = NULL;
530 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
531 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
532 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
533 507dc3bb 2018-12-29 stsp path_got = NULL;
537 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
539 507dc3bb 2018-12-29 stsp return err;
541 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
542 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
546 507dc3bb 2018-12-29 stsp /* Record our base commit. */
547 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
550 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
554 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
555 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
556 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
557 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
562 507dc3bb 2018-12-29 stsp got_object_close(obj);
563 507dc3bb 2018-12-29 stsp free(id_str);
564 507dc3bb 2018-12-29 stsp free(path_got);
565 507dc3bb 2018-12-29 stsp return err;
568 9d31a1d8 2018-03-11 stsp static const struct got_error *
569 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
571 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
572 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
573 9d31a1d8 2018-03-11 stsp : got_error_from_errno());
574 86c3caaf 2018-03-09 stsp return NULL;
577 21908da4 2019-01-13 stsp static const struct got_error *
578 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
580 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
581 4a1ddfc2 2019-01-12 stsp char *abspath;
583 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
584 4a1ddfc2 2019-01-12 stsp return got_error_from_errno();
586 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
587 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
588 ddcd8544 2019-03-11 stsp struct stat sb;
589 ddcd8544 2019-03-11 stsp err = NULL;
590 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
591 ddcd8544 2019-03-11 stsp err = got_error_from_errno();
592 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
593 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
594 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
597 4a1ddfc2 2019-01-12 stsp free(abspath);
598 68c76935 2019-02-19 stsp return err;
601 68c76935 2019-02-19 stsp static const struct got_error *
602 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
604 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
605 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
606 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
607 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
611 68c76935 2019-02-19 stsp while (1) {
612 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
613 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
614 68c76935 2019-02-19 stsp err = got_error_from_errno();
617 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
618 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
619 68c76935 2019-02-19 stsp err = got_error_from_errno();
622 68c76935 2019-02-19 stsp if (flen1 == 0) {
623 68c76935 2019-02-19 stsp if (flen2 != 0)
626 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
627 68c76935 2019-02-19 stsp if (flen1 != 0)
630 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
631 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
641 68c76935 2019-02-19 stsp return err;
644 68c76935 2019-02-19 stsp static const struct got_error *
645 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
647 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
648 68c76935 2019-02-19 stsp struct stat sb;
649 68c76935 2019-02-19 stsp size_t size1, size2;
650 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
654 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
655 68c76935 2019-02-19 stsp err = got_error_from_errno();
658 68c76935 2019-02-19 stsp size1 = sb.st_size;
660 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
661 68c76935 2019-02-19 stsp err = got_error_from_errno();
664 68c76935 2019-02-19 stsp size2 = sb.st_size;
666 68c76935 2019-02-19 stsp if (size1 != size2) {
668 68c76935 2019-02-19 stsp return NULL;
671 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
672 68c76935 2019-02-19 stsp if (f1 == NULL)
673 68c76935 2019-02-19 stsp return got_error_from_errno();
675 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
676 68c76935 2019-02-19 stsp if (f2 == NULL) {
677 68c76935 2019-02-19 stsp err = got_error_from_errno();
681 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
683 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
684 68c76935 2019-02-19 stsp err = got_error_from_errno();
685 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
686 68c76935 2019-02-19 stsp err = got_error_from_errno();
688 6353ad76 2019-02-08 stsp return err;
692 6353ad76 2019-02-08 stsp * Perform a 3-way merge where the file's version in the file index (blob2)
693 6353ad76 2019-02-08 stsp * acts as the common ancestor, the incoming blob (blob1) acts as the first
694 6353ad76 2019-02-08 stsp * derived version, and the file on disk acts as the second derived version.
696 6353ad76 2019-02-08 stsp static const struct got_error *
697 6353ad76 2019-02-08 stsp merge_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
698 6353ad76 2019-02-08 stsp struct got_fileindex_entry *ie, const char *ondisk_path, const char *path,
699 b8f41171 2019-02-10 stsp uint16_t te_mode, uint16_t st_mode, struct got_blob_object *blob1,
700 b8f41171 2019-02-10 stsp struct got_repository *repo,
701 6353ad76 2019-02-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
703 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
704 6353ad76 2019-02-08 stsp int merged_fd = -1;
705 6353ad76 2019-02-08 stsp struct got_blob_object *blob2 = NULL;
706 6353ad76 2019-02-08 stsp FILE *f1 = NULL, *f2 = NULL;
707 6353ad76 2019-02-08 stsp char *blob1_path = NULL, *blob2_path = NULL;
708 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
709 6353ad76 2019-02-08 stsp char *id_str = NULL;
710 6353ad76 2019-02-08 stsp char *label1 = NULL;
711 68c76935 2019-02-19 stsp int overlapcnt = 0, update_timestamps = 0;
712 af54ae4a 2019-02-19 stsp char *parent;
714 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
715 af54ae4a 2019-02-19 stsp if (parent == NULL)
716 af54ae4a 2019-02-19 stsp return got_error_from_errno();
718 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
719 af54ae4a 2019-02-19 stsp return got_error_from_errno();
721 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
725 af54ae4a 2019-02-19 stsp free(base_path);
726 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merge-blob1", parent) == -1) {
727 af54ae4a 2019-02-19 stsp err = got_error_from_errno();
728 af54ae4a 2019-02-19 stsp base_path = NULL;
732 af54ae4a 2019-02-19 stsp err = got_opentemp_named(&blob1_path, &f1, base_path);
735 6353ad76 2019-02-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, f1, blob1);
739 af54ae4a 2019-02-19 stsp free(base_path);
740 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merge-blob2", parent) == -1) {
741 af54ae4a 2019-02-19 stsp err = got_error_from_errno();
742 af54ae4a 2019-02-19 stsp base_path = NULL;
746 af54ae4a 2019-02-19 stsp err = got_opentemp_named(&blob2_path, &f2, base_path);
749 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie)) {
750 1430b4e0 2019-03-27 stsp struct got_object_id id2;
751 1430b4e0 2019-03-27 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
752 1430b4e0 2019-03-27 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
755 1430b4e0 2019-03-27 stsp err = got_object_blob_dump_to_file(NULL, NULL, f2, blob2);
760 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
761 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
762 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
766 6353ad76 2019-02-08 stsp err = got_object_id_str(&id_str, worktree->base_commit_id);
769 6353ad76 2019-02-08 stsp if (asprintf(&label1, "commit %s", id_str) == -1) {
770 6353ad76 2019-02-08 stsp err = got_error_from_errno();
774 6353ad76 2019-02-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, blob1_path,
775 6353ad76 2019-02-08 stsp blob2_path, ondisk_path, label1, path);
779 6353ad76 2019-02-08 stsp (*progress_cb)(progress_arg,
780 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
783 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
784 816dc654 2019-02-16 stsp err = got_error_from_errno();
788 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
789 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
790 68c76935 2019-02-19 stsp err = check_files_equal(&update_timestamps, blob1_path,
791 68c76935 2019-02-19 stsp merged_path);
796 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
797 70a0c8ec 2019-02-20 stsp err = got_error_from_errno();
801 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
802 6353ad76 2019-02-08 stsp err = got_error_from_errno();
803 2a57020b 2019-02-20 stsp unlink(merged_path);
808 02c07007 2019-02-10 stsp * Do not update timestamps of already modified files. Otherwise,
809 65ad4e61 2019-02-20 stsp * a future status walk would treat them as unmodified files again.
811 6353ad76 2019-02-08 stsp err = got_fileindex_entry_update(ie, ondisk_path,
812 68c76935 2019-02-19 stsp blob1->id.sha1, worktree->base_commit_id->sha1, update_timestamps);
814 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
815 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
816 3a6ce05a 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
817 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
818 3a6ce05a 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
819 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
821 6353ad76 2019-02-08 stsp got_object_blob_close(blob2);
822 6353ad76 2019-02-08 stsp free(merged_path);
823 af54ae4a 2019-02-19 stsp free(base_path);
824 6353ad76 2019-02-08 stsp if (blob1_path) {
825 6353ad76 2019-02-08 stsp unlink(blob1_path);
826 6353ad76 2019-02-08 stsp free(blob1_path);
828 6353ad76 2019-02-08 stsp if (blob2_path) {
829 6353ad76 2019-02-08 stsp unlink(blob2_path);
830 6353ad76 2019-02-08 stsp free(blob2_path);
832 6353ad76 2019-02-08 stsp free(id_str);
833 6353ad76 2019-02-08 stsp free(label1);
834 4a1ddfc2 2019-01-12 stsp return err;
837 4a1ddfc2 2019-01-12 stsp static const struct got_error *
838 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
839 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
840 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
841 13d9040b 2019-03-27 stsp int update_timestamps)
843 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
845 13d9040b 2019-03-27 stsp if (ie == NULL)
846 13d9040b 2019-03-27 stsp ie = got_fileindex_entry_get(fileindex, path);
848 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
849 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
850 13d9040b 2019-03-27 stsp update_timestamps);
852 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
853 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
854 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
856 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
858 13d9040b 2019-03-27 stsp return err;
861 13d9040b 2019-03-27 stsp static const struct got_error *
862 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
863 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
864 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
865 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
866 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
868 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
869 507dc3bb 2018-12-29 stsp int fd = -1;
870 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
871 507dc3bb 2018-12-29 stsp int update = 0;
872 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
874 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
875 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
876 9d31a1d8 2018-03-11 stsp if (fd == -1) {
877 21908da4 2019-01-13 stsp if (errno == ENOENT) {
878 21908da4 2019-01-13 stsp char *parent = dirname(path);
879 21908da4 2019-01-13 stsp if (parent == NULL)
880 21908da4 2019-01-13 stsp return got_error_from_errno();
881 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
883 21908da4 2019-01-13 stsp return err;
884 21908da4 2019-01-13 stsp fd = open(ondisk_path,
885 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
886 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
887 21908da4 2019-01-13 stsp if (fd == -1)
888 21908da4 2019-01-13 stsp return got_error_from_errno();
889 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
890 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
891 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
892 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
895 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
896 507dc3bb 2018-12-29 stsp ondisk_path);
899 507dc3bb 2018-12-29 stsp update = 1;
902 7e7c1e4c 2019-01-12 stsp return got_error_from_errno();
905 a378724f 2019-02-10 stsp if (restoring_missing_file)
906 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
907 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
908 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
910 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg,
911 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
913 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
915 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
916 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
919 9d31a1d8 2018-03-11 stsp if (len > 0) {
920 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
921 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
922 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
923 9d31a1d8 2018-03-11 stsp err = got_error_from_errno();
925 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
926 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
929 61d6eaa3 2018-12-24 stsp hdrlen = 0;
931 9d31a1d8 2018-03-11 stsp } while (len != 0);
933 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
934 816dc654 2019-02-16 stsp err = got_error_from_errno();
938 507dc3bb 2018-12-29 stsp if (update) {
939 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
940 68ed9ba5 2019-02-10 stsp err = got_error_from_errno();
941 2a57020b 2019-02-20 stsp unlink(tmppath);
946 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
947 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
948 507dc3bb 2018-12-29 stsp err = got_error_from_errno();
952 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
953 68ed9ba5 2019-02-10 stsp err = got_error_from_errno();
959 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
960 3a6ce05a 2019-02-11 stsp err = got_error_from_errno();
961 507dc3bb 2018-12-29 stsp free(tmppath);
962 6353ad76 2019-02-08 stsp return err;
965 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
966 6353ad76 2019-02-08 stsp static const struct got_error *
967 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
969 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
970 7154f6ce 2019-03-27 stsp const char *markers[3] = {
971 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
972 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
973 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
976 7154f6ce 2019-03-27 stsp char *line;
977 7154f6ce 2019-03-27 stsp size_t len;
978 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
980 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
981 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
982 7154f6ce 2019-03-27 stsp if (line == NULL) {
983 7154f6ce 2019-03-27 stsp if (feof(f))
985 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
989 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
990 7154f6ce 2019-03-27 stsp if (markers[i] == GOT_DIFF_CONFLICT_MARKER_END)
991 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
997 7154f6ce 2019-03-27 stsp return err;
1000 7154f6ce 2019-03-27 stsp static const struct got_error *
1001 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1002 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1003 b8f41171 2019-02-10 stsp struct got_repository *repo)
1005 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1006 6353ad76 2019-02-08 stsp struct got_object_id id;
1007 6353ad76 2019-02-08 stsp size_t hdrlen;
1008 6353ad76 2019-02-08 stsp FILE *f = NULL;
1009 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1010 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1011 6353ad76 2019-02-08 stsp size_t flen, blen;
1013 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1015 b8f41171 2019-02-10 stsp if (lstat(abspath, sb) == -1) {
1016 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1018 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1019 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_MISSING;
1021 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1022 b8f41171 2019-02-10 stsp sb->st_mode =
1023 b8f41171 2019-02-10 stsp ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1024 b8f41171 2019-02-10 stsp & (S_IRWXU | S_IRWXG | S_IRWXO));
1026 b8f41171 2019-02-10 stsp sb->st_mode = GOT_DEFAULT_FILE_MODE;
1027 a378724f 2019-02-10 stsp return NULL;
1029 6353ad76 2019-02-08 stsp return got_error_from_errno();
1032 b8f41171 2019-02-10 stsp if (!S_ISREG(sb->st_mode)) {
1033 6353ad76 2019-02-08 stsp *status = GOT_STATUS_OBSTRUCTED;
1034 6353ad76 2019-02-08 stsp return NULL;
1037 b8f41171 2019-02-10 stsp if (ie == NULL)
1038 d00136be 2019-03-26 stsp return NULL;
1040 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1041 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1042 2ec1f75b 2019-03-26 stsp return NULL;
1043 2ec1f75b 2019-03-26 stsp } else if (!got_fileindex_entry_has_blob(ie)) {
1044 d00136be 2019-03-26 stsp *status = GOT_STATUS_ADD;
1045 b8f41171 2019-02-10 stsp return NULL;
1048 b8f41171 2019-02-10 stsp if (ie->ctime_sec == sb->st_ctime &&
1049 b8f41171 2019-02-10 stsp ie->ctime_nsec == sb->st_ctimensec &&
1050 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1051 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1052 b8f41171 2019-02-10 stsp ie->mtime_nsec == sb->st_mtimensec &&
1053 b8f41171 2019-02-10 stsp ie->size == (sb->st_size & 0xffffffff))
1054 6353ad76 2019-02-08 stsp return NULL;
1056 6353ad76 2019-02-08 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1057 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1059 6353ad76 2019-02-08 stsp return err;
1061 6353ad76 2019-02-08 stsp f = fopen(abspath, "r");
1062 6353ad76 2019-02-08 stsp if (f == NULL) {
1063 6353ad76 2019-02-08 stsp err = got_error_from_errno();
1064 6353ad76 2019-02-08 stsp goto done;
1066 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1067 6353ad76 2019-02-08 stsp while (1) {
1068 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1069 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1071 7154f6ce 2019-03-27 stsp goto done;
1072 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1073 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1074 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1075 80c5c120 2019-02-19 stsp err = got_error_from_errno();
1076 7154f6ce 2019-03-27 stsp goto done;
1078 6353ad76 2019-02-08 stsp if (blen == 0) {
1079 6353ad76 2019-02-08 stsp if (flen != 0)
1080 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1082 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1083 6353ad76 2019-02-08 stsp if (blen != 0)
1084 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1086 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1087 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1088 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1089 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1093 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1096 6353ad76 2019-02-08 stsp hdrlen = 0;
1099 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1100 7154f6ce 2019-03-27 stsp rewind(f);
1101 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1105 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1107 6353ad76 2019-02-08 stsp fclose(f);
1108 9d31a1d8 2018-03-11 stsp return err;
1111 9d31a1d8 2018-03-11 stsp static const struct got_error *
1112 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1113 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1114 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1115 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1116 0584f854 2019-04-06 stsp void *progress_arg)
1118 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1119 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1120 6353ad76 2019-02-08 stsp char *ondisk_path;
1121 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1122 b8f41171 2019-02-10 stsp struct stat sb;
1124 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1125 6353ad76 2019-02-08 stsp return got_error_from_errno();
1127 b8f41171 2019-02-10 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1129 b8f41171 2019-02-10 stsp goto done;
1131 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1132 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, status, path);
1133 b8f41171 2019-02-10 stsp goto done;
1136 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1137 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1138 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1139 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1140 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1142 6353ad76 2019-02-08 stsp goto done;
1144 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1145 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1146 1430b4e0 2019-03-27 stsp SHA1_DIGEST_LENGTH) == 0)
1147 b8f41171 2019-02-10 stsp goto done;
1150 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1152 6353ad76 2019-02-08 stsp goto done;
1154 1430b4e0 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD)
1155 6353ad76 2019-02-08 stsp err = merge_blob(worktree, fileindex, ie, ondisk_path, path,
1156 b8f41171 2019-02-10 stsp te->mode, sb.st_mode, blob, repo, progress_cb,
1157 b8f41171 2019-02-10 stsp progress_arg);
1158 13d9040b 2019-03-27 stsp else if (status == GOT_STATUS_DELETE) {
1159 13d9040b 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1160 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1161 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1163 13d9040b 2019-03-27 stsp goto done;
1165 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1166 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1167 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1169 13d9040b 2019-03-27 stsp goto done;
1170 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1171 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1173 13d9040b 2019-03-27 stsp goto done;
1175 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1177 6353ad76 2019-02-08 stsp free(ondisk_path);
1178 8da9e5f4 2019-01-12 stsp return err;
1181 90285c3b 2019-01-08 stsp static const struct got_error *
1182 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1184 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1185 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1187 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1188 90285c3b 2019-01-08 stsp return got_error_from_errno();
1190 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1191 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1192 c97665ae 2019-01-13 stsp err = got_error_from_errno();
1194 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1195 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1196 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1197 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1198 26c4ac4d 2019-01-08 stsp err = got_error_from_errno();
1201 90285c3b 2019-01-08 stsp parent = dirname(parent);
1204 90285c3b 2019-01-08 stsp free(ondisk_path);
1205 90285c3b 2019-01-08 stsp return err;
1208 708d8e67 2019-03-27 stsp static const struct got_error *
1209 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1210 708d8e67 2019-03-27 stsp struct got_fileindex_entry *ie, const char *parent_path,
1211 708d8e67 2019-03-27 stsp struct got_repository *repo,
1212 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1214 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1215 708d8e67 2019-03-27 stsp unsigned char status;
1216 708d8e67 2019-03-27 stsp struct stat sb;
1217 708d8e67 2019-03-27 stsp char *ondisk_path;
1219 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1221 708d8e67 2019-03-27 stsp return got_error_from_errno();
1223 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1225 708d8e67 2019-03-27 stsp return err;
1227 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1228 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1229 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1231 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1232 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1234 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1237 708d8e67 2019-03-27 stsp return err;
1239 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1240 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1241 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1243 fc6346c4 2019-03-27 stsp return err;
1245 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1248 fc6346c4 2019-03-27 stsp return err;
1251 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1252 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1253 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1254 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1255 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1256 8da9e5f4 2019-01-12 stsp void *progress_arg;
1257 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1258 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1261 512f0d0e 2019-01-02 stsp static const struct got_error *
1262 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1263 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1265 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1267 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1268 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1270 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1271 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1274 8da9e5f4 2019-01-12 stsp static const struct got_error *
1275 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, 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 708d8e67 2019-03-27 stsp return delete_blob(a->worktree, a->fileindex, ie, parent_path,
1283 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1286 9d31a1d8 2018-03-11 stsp static const struct got_error *
1287 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1289 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1290 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1291 8da9e5f4 2019-01-12 stsp char *path;
1293 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1294 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1296 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1297 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1299 8da9e5f4 2019-01-12 stsp return got_error_from_errno();
1301 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1302 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1304 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1305 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1307 8da9e5f4 2019-01-12 stsp free(path);
1308 0cd1c46a 2019-03-11 stsp return err;
1311 517bab73 2019-03-11 stsp const struct got_error *
1312 517bab73 2019-03-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1314 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1315 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1316 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1318 517bab73 2019-03-11 stsp *refname = NULL;
1320 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1321 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1322 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1324 0647c563 2019-03-11 stsp if (asprintf(refname, "%s-%s", GOT_WORKTREE_BASE_REF_PREFIX, uuidstr)
1326 0cd1c46a 2019-03-11 stsp err = got_error_from_errno();
1327 0647c563 2019-03-11 stsp *refname = NULL;
1329 517bab73 2019-03-11 stsp free(uuidstr);
1330 517bab73 2019-03-11 stsp return err;
1334 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1335 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1337 517bab73 2019-03-11 stsp static const struct got_error *
1338 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1340 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1341 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1342 517bab73 2019-03-11 stsp char *refname;
1344 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1346 517bab73 2019-03-11 stsp return err;
1348 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1350 0cd1c46a 2019-03-11 stsp goto done;
1352 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1354 0cd1c46a 2019-03-11 stsp free(refname);
1356 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1357 9d31a1d8 2018-03-11 stsp return err;
1360 ebf99748 2019-05-09 stsp static const struct got_error *
1361 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1362 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1364 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1365 ebf99748 2019-05-09 stsp FILE *index = NULL;
1367 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1368 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1369 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1370 ebf99748 2019-05-09 stsp return got_error_from_errno();
1372 ebf99748 2019-05-09 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1373 ebf99748 2019-05-09 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1374 ebf99748 2019-05-09 stsp err = got_error_from_errno();
1375 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1376 ebf99748 2019-05-09 stsp goto done;
1379 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1380 ebf99748 2019-05-09 stsp if (index == NULL) {
1381 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1382 ebf99748 2019-05-09 stsp err = got_error_from_errno();
1384 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1385 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1386 ebf99748 2019-05-09 stsp err = got_error_from_errno();
1389 ebf99748 2019-05-09 stsp if (err) {
1390 ebf99748 2019-05-09 stsp free(*fileindex_path);
1391 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1392 ebf99748 2019-05-09 stsp free(*fileindex);
1393 ebf99748 2019-05-09 stsp *fileindex = NULL;
1395 ebf99748 2019-05-09 stsp return err;
1398 9d31a1d8 2018-03-11 stsp const struct got_error *
1399 c4cdcb68 2019-04-03 stsp got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1400 93a30277 2018-12-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1401 93a30277 2018-12-24 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1403 a143fb78 2018-12-25 stsp const struct got_error *err = NULL, *unlockerr, *checkout_err = NULL;
1404 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1405 8da9e5f4 2019-01-12 stsp struct got_object_id *tree_id = NULL;
1406 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1407 9d31a1d8 2018-03-11 stsp char *fileindex_path = NULL, *new_fileindex_path = NULL;
1408 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1409 ebf99748 2019-05-09 stsp FILE *new_index = NULL;
1410 f44ffd20 2019-02-04 stsp struct got_fileindex_diff_tree_cb diff_cb;
1411 8da9e5f4 2019-01-12 stsp struct diff_cb_arg arg;
1412 c4cdcb68 2019-04-03 stsp char *relpath = NULL, *entry_name = NULL;
1414 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1416 9d31a1d8 2018-03-11 stsp return err;
1419 51514078 2018-12-25 stsp * Read the file index.
1420 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1421 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1423 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1425 ebf99748 2019-05-09 stsp goto done;
1427 b8bdcc21 2018-12-24 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1428 b8bdcc21 2018-12-24 stsp fileindex_path);
1430 51664889 2018-03-12 stsp goto done;
1432 0cd1c46a 2019-03-11 stsp err = ref_base_commit(worktree, repo);
1434 0cd1c46a 2019-03-11 stsp goto done;
1436 eaccb85f 2018-12-25 stsp err = got_object_open_as_commit(&commit, repo,
1437 eaccb85f 2018-12-25 stsp worktree->base_commit_id);
1439 9d31a1d8 2018-03-11 stsp goto done;
1441 c4cdcb68 2019-04-03 stsp if (path[0]) {
1442 c4cdcb68 2019-04-03 stsp char *tree_path;
1443 c4cdcb68 2019-04-03 stsp int obj_type;
1444 c4cdcb68 2019-04-03 stsp relpath = strdup(path);
1445 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1446 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1447 c4cdcb68 2019-04-03 stsp goto done;
1449 c4cdcb68 2019-04-03 stsp if (asprintf(&tree_path, "%s%s%s", worktree->path_prefix,
1450 c4cdcb68 2019-04-03 stsp got_path_is_root_dir(worktree->path_prefix) ? "" : "/",
1451 c4cdcb68 2019-04-03 stsp path) == -1) {
1452 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1453 c4cdcb68 2019-04-03 stsp goto done;
1455 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1456 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, tree_path);
1457 c4cdcb68 2019-04-03 stsp free(tree_path);
1459 c4cdcb68 2019-04-03 stsp goto done;
1460 c4cdcb68 2019-04-03 stsp err = got_object_get_type(&obj_type, repo, tree_id);
1462 c4cdcb68 2019-04-03 stsp goto done;
1463 c4cdcb68 2019-04-03 stsp if (obj_type == GOT_OBJ_TYPE_BLOB) {
1464 c4cdcb68 2019-04-03 stsp /* Split provided path into parent dir + entry name. */
1465 c4cdcb68 2019-04-03 stsp if (strchr(path, '/') == NULL) {
1466 c4cdcb68 2019-04-03 stsp relpath = strdup("");
1467 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1468 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1469 c4cdcb68 2019-04-03 stsp goto done;
1471 c4cdcb68 2019-04-03 stsp tree_path = strdup(worktree->path_prefix);
1472 c4cdcb68 2019-04-03 stsp if (tree_path == NULL) {
1473 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1474 c4cdcb68 2019-04-03 stsp goto done;
1477 c4cdcb68 2019-04-03 stsp err = got_path_dirname(&relpath, path);
1479 c4cdcb68 2019-04-03 stsp goto done;
1480 c4cdcb68 2019-04-03 stsp if (asprintf(&tree_path, "%s%s%s",
1481 c4cdcb68 2019-04-03 stsp worktree->path_prefix,
1482 c4cdcb68 2019-04-03 stsp got_path_is_root_dir(
1483 c4cdcb68 2019-04-03 stsp worktree->path_prefix) ? "" : "/",
1484 c4cdcb68 2019-04-03 stsp relpath) == -1) {
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_object_id_by_path(&tree_id, repo,
1490 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, tree_path);
1491 c4cdcb68 2019-04-03 stsp free(tree_path);
1493 c4cdcb68 2019-04-03 stsp goto done;
1494 c4cdcb68 2019-04-03 stsp entry_name = basename(path);
1495 c4cdcb68 2019-04-03 stsp if (entry_name == NULL) {
1496 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1497 c4cdcb68 2019-04-03 stsp goto done;
1501 c4cdcb68 2019-04-03 stsp relpath = strdup("");
1502 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1503 c4cdcb68 2019-04-03 stsp err = got_error_from_errno();
1504 c4cdcb68 2019-04-03 stsp goto done;
1506 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1507 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, worktree->path_prefix);
1509 c4cdcb68 2019-04-03 stsp goto done;
1512 8da9e5f4 2019-01-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1514 c4cdcb68 2019-04-03 stsp goto done;
1516 c4cdcb68 2019-04-03 stsp if (entry_name &&
1517 c4cdcb68 2019-04-03 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1518 c4cdcb68 2019-04-03 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1519 8da9e5f4 2019-01-12 stsp goto done;
1522 8da9e5f4 2019-01-12 stsp diff_cb.diff_old_new = diff_old_new;
1523 8da9e5f4 2019-01-12 stsp diff_cb.diff_old = diff_old;
1524 8da9e5f4 2019-01-12 stsp diff_cb.diff_new = diff_new;
1525 8da9e5f4 2019-01-12 stsp arg.fileindex = fileindex;
1526 8da9e5f4 2019-01-12 stsp arg.worktree = worktree;
1527 8da9e5f4 2019-01-12 stsp arg.repo = repo;
1528 8da9e5f4 2019-01-12 stsp arg.progress_cb = progress_cb;
1529 8da9e5f4 2019-01-12 stsp arg.progress_arg = progress_arg;
1530 8da9e5f4 2019-01-12 stsp arg.cancel_cb = cancel_cb;
1531 8da9e5f4 2019-01-12 stsp arg.cancel_arg = cancel_arg;
1532 c4cdcb68 2019-04-03 stsp checkout_err = got_fileindex_diff_tree(fileindex, tree, relpath,
1533 c4cdcb68 2019-04-03 stsp entry_name, repo, &diff_cb, &arg);
1535 a143fb78 2018-12-25 stsp /* Try to sync the fileindex back to disk in any case. */
1536 b8bdcc21 2018-12-24 stsp err = got_fileindex_write(fileindex, new_index);
1538 9d31a1d8 2018-03-11 stsp goto done;
1540 9d31a1d8 2018-03-11 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1541 9d31a1d8 2018-03-11 stsp err = got_error_from_errno();
1542 2a57020b 2019-02-20 stsp unlink(new_fileindex_path);
1543 9d31a1d8 2018-03-11 stsp goto done;
1546 9d31a1d8 2018-03-11 stsp free(new_fileindex_path);
1547 9d31a1d8 2018-03-11 stsp new_fileindex_path = NULL;
1550 c4cdcb68 2019-04-03 stsp free(relpath);
1552 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1553 9d31a1d8 2018-03-11 stsp if (commit)
1554 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1555 9d31a1d8 2018-03-11 stsp if (new_fileindex_path)
1556 9d31a1d8 2018-03-11 stsp unlink(new_fileindex_path);
1557 b8bdcc21 2018-12-24 stsp if (new_index)
1558 b8bdcc21 2018-12-24 stsp fclose(new_index);
1559 9d31a1d8 2018-03-11 stsp free(new_fileindex_path);
1560 9d31a1d8 2018-03-11 stsp free(fileindex_path);
1561 7426bbfd 2018-12-24 stsp got_fileindex_free(fileindex);
1562 a143fb78 2018-12-25 stsp if (checkout_err)
1563 a143fb78 2018-12-25 stsp err = checkout_err;
1564 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1565 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1566 9d31a1d8 2018-03-11 stsp err = unlockerr;
1567 f8d1f275 2019-02-04 stsp return err;
1570 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
1571 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
1572 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
1573 927df6b7 2019-02-10 stsp const char *status_path;
1574 927df6b7 2019-02-10 stsp size_t status_path_len;
1575 f8d1f275 2019-02-04 stsp struct got_repository *repo;
1576 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
1577 f8d1f275 2019-02-04 stsp void *status_arg;
1578 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
1579 f8d1f275 2019-02-04 stsp void *cancel_arg;
1582 f8d1f275 2019-02-04 stsp static const struct got_error *
1583 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
1584 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
1585 927df6b7 2019-02-10 stsp struct got_repository *repo)
1587 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
1588 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1589 927df6b7 2019-02-10 stsp struct stat sb;
1590 927df6b7 2019-02-10 stsp struct got_object_id id;
1592 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
1593 927df6b7 2019-02-10 stsp if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
1594 927df6b7 2019-02-10 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1595 927df6b7 2019-02-10 stsp err = (*status_cb)(status_arg, status, ie->path, &id);
1597 927df6b7 2019-02-10 stsp return err;
1600 927df6b7 2019-02-10 stsp static const struct got_error *
1601 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
1602 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
1604 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
1605 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1606 f8d1f275 2019-02-04 stsp char *abspath;
1608 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1609 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1611 927df6b7 2019-02-10 stsp if (got_path_cmp(parent_path, a->status_path) != 0 &&
1612 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
1613 927df6b7 2019-02-10 stsp return NULL;
1615 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
1616 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
1617 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
1618 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1620 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
1621 f8d1f275 2019-02-04 stsp de->d_name) == -1)
1622 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1625 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
1627 f8d1f275 2019-02-04 stsp free(abspath);
1628 9d31a1d8 2018-03-11 stsp return err;
1631 f8d1f275 2019-02-04 stsp static const struct got_error *
1632 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1634 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1635 b72f483a 2019-02-05 stsp struct got_object_id id;
1636 2ec1f75b 2019-03-26 stsp unsigned char status;
1638 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1639 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1641 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
1642 927df6b7 2019-02-10 stsp return NULL;
1644 b72f483a 2019-02-05 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1645 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1646 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
1648 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
1649 2ec1f75b 2019-03-26 stsp return (*a->status_cb)(a->status_arg, status, ie->path, &id);
1652 f8d1f275 2019-02-04 stsp static const struct got_error *
1653 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
1655 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
1656 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1657 f8d1f275 2019-02-04 stsp char *path = NULL;
1659 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1660 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1662 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
1663 2c201a36 2019-02-10 stsp return NULL;
1665 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
1666 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
1667 f8d1f275 2019-02-04 stsp return NULL;
1669 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
1670 927df6b7 2019-02-10 stsp return NULL;
1672 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
1673 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
1674 f8d1f275 2019-02-04 stsp return got_error_from_errno();
1676 f8d1f275 2019-02-04 stsp path = de->d_name;
1679 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
1681 f8d1f275 2019-02-04 stsp if (parent_path[0])
1682 f8d1f275 2019-02-04 stsp free(path);
1683 b72f483a 2019-02-05 stsp return err;
1686 f8d1f275 2019-02-04 stsp const struct got_error *
1687 927df6b7 2019-02-10 stsp got_worktree_status(struct got_worktree *worktree, const char *path,
1688 f8d1f275 2019-02-04 stsp struct got_repository *repo, got_worktree_status_cb status_cb,
1689 f8d1f275 2019-02-04 stsp void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1691 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
1692 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
1693 f8d1f275 2019-02-04 stsp char *fileindex_path = NULL;
1694 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex = NULL;
1695 f8d1f275 2019-02-04 stsp FILE *index = NULL;
1696 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
1697 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
1698 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
1700 f8d1f275 2019-02-04 stsp fileindex = got_fileindex_alloc();
1701 f8d1f275 2019-02-04 stsp if (fileindex == NULL) {
1702 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1703 f8d1f275 2019-02-04 stsp goto done;
1706 f8d1f275 2019-02-04 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1707 f8d1f275 2019-02-04 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1708 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1709 f8d1f275 2019-02-04 stsp fileindex_path = NULL;
1710 f8d1f275 2019-02-04 stsp goto done;
1713 f8d1f275 2019-02-04 stsp index = fopen(fileindex_path, "rb");
1714 f8d1f275 2019-02-04 stsp if (index == NULL) {
1715 f8d1f275 2019-02-04 stsp if (errno != ENOENT) {
1716 f8d1f275 2019-02-04 stsp err = got_error_from_errno();
1717 f8d1f275 2019-02-04 stsp goto done;
1720 f8d1f275 2019-02-04 stsp err = got_fileindex_read(fileindex, index);
1721 f8d1f275 2019-02-04 stsp fclose(index);
1723 f8d1f275 2019-02-04 stsp goto done;
1726 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
1727 927df6b7 2019-02-10 stsp worktree->root_path, path[0] ? "/" : "", path) == -1) {
1728 c513d110 2019-02-05 stsp err = got_error_from_errno();
1729 c513d110 2019-02-05 stsp goto done;
1731 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
1732 927df6b7 2019-02-10 stsp if (workdir == NULL) {
1733 2ec1f75b 2019-03-26 stsp if (errno == ENOTDIR || errno == ENOENT) {
1734 927df6b7 2019-02-10 stsp struct got_fileindex_entry *ie;
1735 927df6b7 2019-02-10 stsp ie = got_fileindex_entry_get(fileindex, path);
1736 927df6b7 2019-02-10 stsp if (ie == NULL) {
1737 927df6b7 2019-02-10 stsp err = got_error(GOT_ERR_BAD_PATH);
1738 927df6b7 2019-02-10 stsp goto done;
1740 927df6b7 2019-02-10 stsp err = report_file_status(ie, ondisk_path,
1741 927df6b7 2019-02-10 stsp status_cb, status_arg, repo);
1742 927df6b7 2019-02-10 stsp goto done;
1744 927df6b7 2019-02-10 stsp err = got_error_from_errno();
1745 927df6b7 2019-02-10 stsp goto done;
1748 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old_new = status_old_new;
1749 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old = status_old;
1750 d43a8a88 2019-02-05 stsp fdiff_cb.diff_new = status_new;
1751 f8d1f275 2019-02-04 stsp arg.fileindex = fileindex;
1752 f8d1f275 2019-02-04 stsp arg.worktree = worktree;
1753 927df6b7 2019-02-10 stsp arg.status_path = path;
1754 927df6b7 2019-02-10 stsp arg.status_path_len = strlen(path);
1755 f8d1f275 2019-02-04 stsp arg.repo = repo;
1756 f8d1f275 2019-02-04 stsp arg.status_cb = status_cb;
1757 f8d1f275 2019-02-04 stsp arg.status_arg = status_arg;
1758 f8d1f275 2019-02-04 stsp arg.cancel_cb = cancel_cb;
1759 f8d1f275 2019-02-04 stsp arg.cancel_arg = cancel_arg;
1760 c7f4312f 2019-02-05 stsp err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
1761 927df6b7 2019-02-10 stsp path, repo, &fdiff_cb, &arg);
1763 f8d1f275 2019-02-04 stsp if (workdir)
1764 f8d1f275 2019-02-04 stsp closedir(workdir);
1765 927df6b7 2019-02-10 stsp free(ondisk_path);
1766 f8d1f275 2019-02-04 stsp free(fileindex_path);
1767 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
1768 f8d1f275 2019-02-04 stsp return err;
1771 6c7ab921 2019-03-18 stsp const struct got_error *
1772 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
1773 6c7ab921 2019-03-18 stsp const char *arg)
1775 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
1776 6c7ab921 2019-03-18 stsp char *resolved, *path = NULL;
1777 6c7ab921 2019-03-18 stsp size_t len;
1779 6c7ab921 2019-03-18 stsp *wt_path = NULL;
1781 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
1782 6c7ab921 2019-03-18 stsp if (resolved == NULL)
1783 6c7ab921 2019-03-18 stsp return got_error_from_errno();
1785 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
1786 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
1787 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
1788 6c7ab921 2019-03-18 stsp goto done;
1791 c4cdcb68 2019-04-03 stsp path = strdup(resolved +
1792 c4cdcb68 2019-04-03 stsp strlen(got_worktree_get_root_path(worktree)) + 1 /* skip '/' */);
1793 6c7ab921 2019-03-18 stsp if (path == NULL) {
1794 6c7ab921 2019-03-18 stsp err = got_error_from_errno();
1795 6c7ab921 2019-03-18 stsp goto done;
1798 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
1799 6c7ab921 2019-03-18 stsp len = strlen(path);
1800 6c7ab921 2019-03-18 stsp while (path[len - 1] == '/') {
1801 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
1805 6c7ab921 2019-03-18 stsp free(resolved);
1806 6c7ab921 2019-03-18 stsp if (err == NULL)
1807 6c7ab921 2019-03-18 stsp *wt_path = path;
1809 6c7ab921 2019-03-18 stsp free(path);
1810 d00136be 2019-03-26 stsp return err;
1813 d00136be 2019-03-26 stsp const struct got_error *
1814 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
1815 031a5338 2019-03-26 stsp const char *ondisk_path, got_worktree_status_cb status_cb, void *status_arg,
1816 031a5338 2019-03-26 stsp struct got_repository *repo)
1818 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
1819 d00136be 2019-03-26 stsp struct got_fileindex_entry *ie = NULL;
1820 031a5338 2019-03-26 stsp char *relpath, *fileindex_path = NULL, *new_fileindex_path = NULL;
1821 d00136be 2019-03-26 stsp FILE *index = NULL, *new_index = NULL;
1822 d00136be 2019-03-26 stsp const struct got_error *err = NULL, *unlockerr = NULL;
1823 031a5338 2019-03-26 stsp int ie_added = 0;
1825 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
1827 d00136be 2019-03-26 stsp return err;
1829 031a5338 2019-03-26 stsp err = got_path_skip_common_ancestor(&relpath,
1830 d00136be 2019-03-26 stsp got_worktree_get_root_path(worktree), ondisk_path);
1832 d00136be 2019-03-26 stsp goto done;
1834 d00136be 2019-03-26 stsp fileindex = got_fileindex_alloc();
1835 d00136be 2019-03-26 stsp if (fileindex == NULL) {
1836 d00136be 2019-03-26 stsp err = got_error_from_errno();
1837 d00136be 2019-03-26 stsp goto done;
1840 d00136be 2019-03-26 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1841 d00136be 2019-03-26 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1842 d00136be 2019-03-26 stsp err = got_error_from_errno();
1843 d00136be 2019-03-26 stsp fileindex_path = NULL;
1844 d00136be 2019-03-26 stsp goto done;
1847 d00136be 2019-03-26 stsp index = fopen(fileindex_path, "rb");
1848 d00136be 2019-03-26 stsp if (index == NULL) {
1849 d00136be 2019-03-26 stsp err = got_error_from_errno();
1850 d00136be 2019-03-26 stsp goto done;
1853 d00136be 2019-03-26 stsp err = got_fileindex_read(fileindex, index);
1855 d00136be 2019-03-26 stsp goto done;
1857 5c99ca9f 2019-03-27 stsp if (got_fileindex_entry_get(fileindex, relpath) != NULL) {
1858 5c99ca9f 2019-03-27 stsp err = got_error_set_errno(EEXIST);
1859 5c99ca9f 2019-03-27 stsp goto done;
1862 5c99ca9f 2019-03-27 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
1864 5c99ca9f 2019-03-27 stsp goto done;
1866 d00136be 2019-03-26 stsp err = got_fileindex_entry_add(fileindex, ie);
1868 d00136be 2019-03-26 stsp goto done;
1869 031a5338 2019-03-26 stsp ie_added = 1; /* now owned by fileindex; don't free separately */
1871 d00136be 2019-03-26 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1872 d00136be 2019-03-26 stsp fileindex_path);
1874 d00136be 2019-03-26 stsp goto done;
1876 d00136be 2019-03-26 stsp err = got_fileindex_write(fileindex, new_index);
1878 d00136be 2019-03-26 stsp goto done;
1880 d00136be 2019-03-26 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1881 d00136be 2019-03-26 stsp err = got_error_from_errno();
1882 d00136be 2019-03-26 stsp goto done;
1885 d00136be 2019-03-26 stsp free(new_fileindex_path);
1886 d00136be 2019-03-26 stsp new_fileindex_path = NULL;
1888 031a5338 2019-03-26 stsp err = report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
1890 d00136be 2019-03-26 stsp if (index) {
1891 d00136be 2019-03-26 stsp if (fclose(index) != 0 && err == NULL)
1892 d00136be 2019-03-26 stsp err = got_error_from_errno();
1894 d00136be 2019-03-26 stsp if (new_fileindex_path) {
1895 d00136be 2019-03-26 stsp if (unlink(new_fileindex_path) != 0 && err == NULL)
1896 d00136be 2019-03-26 stsp err = got_error_from_errno();
1897 d00136be 2019-03-26 stsp free(new_fileindex_path);
1899 5c99ca9f 2019-03-27 stsp if (ie && !ie_added)
1900 d00136be 2019-03-26 stsp got_fileindex_entry_free(ie);
1901 d00136be 2019-03-26 stsp if (fileindex)
1902 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
1903 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1904 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
1905 d00136be 2019-03-26 stsp err = unlockerr;
1906 031a5338 2019-03-26 stsp free(relpath);
1907 6c7ab921 2019-03-18 stsp return err;
1910 2ec1f75b 2019-03-26 stsp const struct got_error *
1911 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
1912 2ec1f75b 2019-03-26 stsp const char *ondisk_path, int delete_local_mods,
1913 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
1914 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
1916 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
1917 2ec1f75b 2019-03-26 stsp struct got_fileindex_entry *ie = NULL;
1918 2ec1f75b 2019-03-26 stsp char *relpath, *fileindex_path = NULL, *new_fileindex_path = NULL;
1919 2ec1f75b 2019-03-26 stsp FILE *index = NULL, *new_index = NULL;
1920 2ec1f75b 2019-03-26 stsp const struct got_error *err = NULL, *unlockerr = NULL;
1921 2ec1f75b 2019-03-26 stsp unsigned char status;
1922 2ec1f75b 2019-03-26 stsp struct stat sb;
1924 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
1926 2ec1f75b 2019-03-26 stsp return err;
1928 2ec1f75b 2019-03-26 stsp err = got_path_skip_common_ancestor(&relpath,
1929 2ec1f75b 2019-03-26 stsp got_worktree_get_root_path(worktree), ondisk_path);
1931 2ec1f75b 2019-03-26 stsp goto done;
1933 2ec1f75b 2019-03-26 stsp fileindex = got_fileindex_alloc();
1934 2ec1f75b 2019-03-26 stsp if (fileindex == NULL) {
1935 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1936 2ec1f75b 2019-03-26 stsp goto done;
1939 2ec1f75b 2019-03-26 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
1940 2ec1f75b 2019-03-26 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1941 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1942 2ec1f75b 2019-03-26 stsp fileindex_path = NULL;
1943 2ec1f75b 2019-03-26 stsp goto done;
1946 2ec1f75b 2019-03-26 stsp index = fopen(fileindex_path, "rb");
1947 2ec1f75b 2019-03-26 stsp if (index == NULL) {
1948 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1949 2ec1f75b 2019-03-26 stsp goto done;
1952 2ec1f75b 2019-03-26 stsp err = got_fileindex_read(fileindex, index);
1954 2ec1f75b 2019-03-26 stsp goto done;
1956 2ec1f75b 2019-03-26 stsp ie = got_fileindex_entry_get(fileindex, relpath);
1957 2ec1f75b 2019-03-26 stsp if (ie == NULL) {
1958 2ec1f75b 2019-03-26 stsp err = got_error(GOT_ERR_BAD_PATH);
1959 2ec1f75b 2019-03-26 stsp goto done;
1962 2ec1f75b 2019-03-26 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1964 2ec1f75b 2019-03-26 stsp goto done;
1966 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_NO_CHANGE) {
1967 71a29355 2019-03-27 stsp if (status == GOT_STATUS_DELETE) {
1968 71a29355 2019-03-27 stsp err = got_error_set_errno(ENOENT);
1969 71a29355 2019-03-27 stsp goto done;
1971 2ec1f75b 2019-03-26 stsp if (status != GOT_STATUS_MODIFY) {
1972 2ec1f75b 2019-03-26 stsp err = got_error(GOT_ERR_FILE_STATUS);
1973 2ec1f75b 2019-03-26 stsp goto done;
1975 2ec1f75b 2019-03-26 stsp if (!delete_local_mods) {
1976 2ec1f75b 2019-03-26 stsp err = got_error(GOT_ERR_FILE_MODIFIED);
1977 2ec1f75b 2019-03-26 stsp goto done;
1981 2ec1f75b 2019-03-26 stsp if (unlink(ondisk_path) != 0) {
1982 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1983 2ec1f75b 2019-03-26 stsp goto done;
1986 2ec1f75b 2019-03-26 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1988 2ec1f75b 2019-03-26 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1989 2ec1f75b 2019-03-26 stsp fileindex_path);
1991 2ec1f75b 2019-03-26 stsp goto done;
1993 2ec1f75b 2019-03-26 stsp err = got_fileindex_write(fileindex, new_index);
1995 2ec1f75b 2019-03-26 stsp goto done;
1997 2ec1f75b 2019-03-26 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1998 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
1999 2ec1f75b 2019-03-26 stsp goto done;
2002 2ec1f75b 2019-03-26 stsp free(new_fileindex_path);
2003 2ec1f75b 2019-03-26 stsp new_fileindex_path = NULL;
2005 2ec1f75b 2019-03-26 stsp err = report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2007 2ec1f75b 2019-03-26 stsp free(relpath);
2008 2ec1f75b 2019-03-26 stsp if (index) {
2009 2ec1f75b 2019-03-26 stsp if (fclose(index) != 0 && err == NULL)
2010 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
2012 2ec1f75b 2019-03-26 stsp if (new_fileindex_path) {
2013 2ec1f75b 2019-03-26 stsp if (unlink(new_fileindex_path) != 0 && err == NULL)
2014 2ec1f75b 2019-03-26 stsp err = got_error_from_errno();
2015 2ec1f75b 2019-03-26 stsp free(new_fileindex_path);
2017 2ec1f75b 2019-03-26 stsp if (fileindex)
2018 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2019 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2020 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2021 2ec1f75b 2019-03-26 stsp err = unlockerr;
2022 2ec1f75b 2019-03-26 stsp return err;
2025 a129376b 2019-03-28 stsp const struct got_error *
2026 a129376b 2019-03-28 stsp got_worktree_revert(struct got_worktree *worktree,
2027 a129376b 2019-03-28 stsp const char *ondisk_path,
2028 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2029 a129376b 2019-03-28 stsp struct got_repository *repo)
2031 a129376b 2019-03-28 stsp struct got_fileindex *fileindex = NULL;
2032 a129376b 2019-03-28 stsp struct got_fileindex_entry *ie = NULL;
2033 a129376b 2019-03-28 stsp char *relpath, *fileindex_path = NULL, *new_fileindex_path = NULL;
2034 a129376b 2019-03-28 stsp char *tree_path = NULL, *parent_path, *te_name;
2035 a129376b 2019-03-28 stsp FILE *index = NULL, *new_index = NULL;
2036 a129376b 2019-03-28 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2037 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
2038 a129376b 2019-03-28 stsp struct got_object_id id, *tree_id = NULL;
2039 a129376b 2019-03-28 stsp const struct got_tree_entry *te;
2040 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
2041 a129376b 2019-03-28 stsp unsigned char status;
2042 a129376b 2019-03-28 stsp struct stat sb;
2044 a129376b 2019-03-28 stsp err = lock_worktree(worktree, LOCK_EX);
2046 a129376b 2019-03-28 stsp return err;
2048 a129376b 2019-03-28 stsp err = got_path_skip_common_ancestor(&relpath,
2049 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree), ondisk_path);
2051 a129376b 2019-03-28 stsp goto done;
2053 a129376b 2019-03-28 stsp fileindex = got_fileindex_alloc();
2054 a129376b 2019-03-28 stsp if (fileindex == NULL) {
2055 a129376b 2019-03-28 stsp err = got_error_from_errno();
2056 a129376b 2019-03-28 stsp goto done;
2059 a129376b 2019-03-28 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2060 a129376b 2019-03-28 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2061 a129376b 2019-03-28 stsp err = got_error_from_errno();
2062 a129376b 2019-03-28 stsp fileindex_path = NULL;
2063 a129376b 2019-03-28 stsp goto done;
2066 a129376b 2019-03-28 stsp index = fopen(fileindex_path, "rb");
2067 a129376b 2019-03-28 stsp if (index == NULL) {
2068 a129376b 2019-03-28 stsp err = got_error_from_errno();
2069 a129376b 2019-03-28 stsp goto done;
2072 a129376b 2019-03-28 stsp err = got_fileindex_read(fileindex, index);
2074 a129376b 2019-03-28 stsp goto done;
2076 a129376b 2019-03-28 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2077 a129376b 2019-03-28 stsp if (ie == NULL) {
2078 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_BAD_PATH);
2079 a129376b 2019-03-28 stsp goto done;
2082 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
2083 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
2084 a129376b 2019-03-28 stsp if (err) {
2085 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
2086 a129376b 2019-03-28 stsp goto done;
2087 a129376b 2019-03-28 stsp parent_path = "/";
2089 a129376b 2019-03-28 stsp if (got_path_is_root_dir(worktree->path_prefix)) {
2090 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
2091 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2092 a129376b 2019-03-28 stsp err = got_error_from_errno();
2093 a129376b 2019-03-28 stsp goto done;
2096 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
2097 a129376b 2019-03-28 stsp tree_path = strdup(worktree->path_prefix);
2098 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2099 a129376b 2019-03-28 stsp err = got_error_from_errno();
2100 a129376b 2019-03-28 stsp goto done;
2103 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
2104 a129376b 2019-03-28 stsp worktree->path_prefix, parent_path) == -1) {
2105 a129376b 2019-03-28 stsp err = got_error_from_errno();
2106 a129376b 2019-03-28 stsp goto done;
2111 a129376b 2019-03-28 stsp err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2112 a129376b 2019-03-28 stsp tree_path);
2114 a129376b 2019-03-28 stsp goto done;
2116 a129376b 2019-03-28 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2118 a129376b 2019-03-28 stsp goto done;
2120 a129376b 2019-03-28 stsp te_name = basename(ie->path);
2121 a129376b 2019-03-28 stsp if (te_name == NULL) {
2122 a129376b 2019-03-28 stsp err = got_error_from_errno();
2123 a129376b 2019-03-28 stsp goto done;
2126 a129376b 2019-03-28 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2128 a129376b 2019-03-28 stsp goto done;
2130 a129376b 2019-03-28 stsp te = got_object_tree_find_entry(tree, te_name);
2131 a129376b 2019-03-28 stsp if (te == NULL && status != GOT_STATUS_ADD) {
2132 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2133 a129376b 2019-03-28 stsp goto done;
2136 a129376b 2019-03-28 stsp switch (status) {
2137 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
2138 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2139 a129376b 2019-03-28 stsp got_fileindex_entry_remove(fileindex, ie);
2141 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
2142 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
2143 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
2144 a129376b 2019-03-28 stsp case GOT_STATUS_MISSING:
2145 a129376b 2019-03-28 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2146 a129376b 2019-03-28 stsp err = got_object_open_as_blob(&blob, repo, &id, 8192);
2148 a129376b 2019-03-28 stsp goto done;
2149 a129376b 2019-03-28 stsp err = install_blob(worktree, ondisk_path, ie->path,
2150 a129376b 2019-03-28 stsp te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2151 a129376b 2019-03-28 stsp progress_arg);
2153 a129376b 2019-03-28 stsp goto done;
2154 a129376b 2019-03-28 stsp if (status == GOT_STATUS_DELETE) {
2155 a129376b 2019-03-28 stsp err = update_blob_fileindex_entry(worktree,
2156 a129376b 2019-03-28 stsp fileindex, ie, ondisk_path, ie->path, blob, 1);
2158 a129376b 2019-03-28 stsp goto done;
2162 a129376b 2019-03-28 stsp goto done;
2165 a129376b 2019-03-28 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2166 a129376b 2019-03-28 stsp fileindex_path);
2168 a129376b 2019-03-28 stsp goto done;
2170 a129376b 2019-03-28 stsp err = got_fileindex_write(fileindex, new_index);
2172 a129376b 2019-03-28 stsp goto done;
2174 a129376b 2019-03-28 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2175 a129376b 2019-03-28 stsp err = got_error_from_errno();
2176 a129376b 2019-03-28 stsp goto done;
2179 a129376b 2019-03-28 stsp free(new_fileindex_path);
2180 a129376b 2019-03-28 stsp new_fileindex_path = NULL;
2182 a129376b 2019-03-28 stsp free(relpath);
2183 a129376b 2019-03-28 stsp free(tree_path);
2185 a129376b 2019-03-28 stsp got_object_blob_close(blob);
2187 a129376b 2019-03-28 stsp got_object_tree_close(tree);
2188 a129376b 2019-03-28 stsp free(tree_id);
2189 a129376b 2019-03-28 stsp if (index) {
2190 a129376b 2019-03-28 stsp if (fclose(index) != 0 && err == NULL)
2191 a129376b 2019-03-28 stsp err = got_error_from_errno();
2193 a129376b 2019-03-28 stsp if (new_fileindex_path) {
2194 a129376b 2019-03-28 stsp if (unlink(new_fileindex_path) != 0 && err == NULL)
2195 a129376b 2019-03-28 stsp err = got_error_from_errno();
2196 a129376b 2019-03-28 stsp free(new_fileindex_path);
2198 a129376b 2019-03-28 stsp if (fileindex)
2199 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
2200 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2201 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
2202 a129376b 2019-03-28 stsp err = unlockerr;
2203 c4296144 2019-05-09 stsp return err;
2206 ed175427 2019-05-09 stsp struct commitable {
2207 24519714 2019-05-09 stsp char *path;
2208 44d03001 2019-05-09 stsp char *in_repo_path;
2209 768aea60 2019-05-09 stsp char *ondisk_path;
2210 cf066bf8 2019-05-09 stsp unsigned char status;
2211 e75eb4da 2019-05-10 stsp struct got_object_id *blob_id;
2212 ca2503ea 2019-05-09 stsp struct got_object_id *base_id;
2213 768aea60 2019-05-09 stsp mode_t mode;
2216 cf066bf8 2019-05-09 stsp static void
2217 ed175427 2019-05-09 stsp free_commitable(struct commitable *ct)
2219 24519714 2019-05-09 stsp free(ct->path);
2220 44d03001 2019-05-09 stsp free(ct->in_repo_path);
2221 768aea60 2019-05-09 stsp free(ct->ondisk_path);
2222 e75eb4da 2019-05-10 stsp free(ct->blob_id);
2223 ca2503ea 2019-05-09 stsp free(ct->base_id);
2227 ed175427 2019-05-09 stsp struct collect_commitables_arg {
2228 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
2229 24519714 2019-05-09 stsp struct got_repository *repo;
2230 24519714 2019-05-09 stsp struct got_worktree *worktree;
2233 c4296144 2019-05-09 stsp static const struct got_error *
2234 036813ee 2019-05-09 stsp collect_commitables(void *arg, unsigned char status, const char *relpath,
2235 c4296144 2019-05-09 stsp struct got_object_id *id)
2237 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
2238 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
2239 ed175427 2019-05-09 stsp struct commitable *ct = NULL;
2240 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
2241 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
2242 768aea60 2019-05-09 stsp struct stat sb;
2244 c4296144 2019-05-09 stsp if (status == GOT_STATUS_CONFLICT)
2245 c4296144 2019-05-09 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
2247 c4296144 2019-05-09 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2248 c4296144 2019-05-09 stsp status != GOT_STATUS_DELETE)
2249 c4296144 2019-05-09 stsp return NULL;
2251 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
2252 036813ee 2019-05-09 stsp err = got_error_from_errno();
2253 036813ee 2019-05-09 stsp goto done;
2255 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
2256 036813ee 2019-05-09 stsp parent_path = strdup("");
2257 69960a46 2019-05-09 stsp if (parent_path == NULL)
2258 69960a46 2019-05-09 stsp return got_error_from_errno();
2260 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
2262 69960a46 2019-05-09 stsp return err;
2265 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
2266 cf066bf8 2019-05-09 stsp if (ct == NULL) {
2267 c4296144 2019-05-09 stsp err = got_error_from_errno();
2268 c4296144 2019-05-09 stsp goto done;
2271 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2272 768aea60 2019-05-09 stsp relpath) == -1) {
2273 768aea60 2019-05-09 stsp err = got_error_from_errno();
2274 768aea60 2019-05-09 stsp goto done;
2276 768aea60 2019-05-09 stsp if (status == GOT_STATUS_DELETE) {
2277 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2279 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
2280 768aea60 2019-05-09 stsp err = got_error_from_errno();
2281 768aea60 2019-05-09 stsp goto done;
2283 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
2286 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2287 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2288 44d03001 2019-05-09 stsp relpath) == -1) {
2289 44d03001 2019-05-09 stsp err = got_error_from_errno();
2290 44d03001 2019-05-09 stsp goto done;
2293 cf066bf8 2019-05-09 stsp ct->status = status;
2294 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
2295 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD) {
2296 036813ee 2019-05-09 stsp ct->base_id = got_object_id_dup(id);
2297 036813ee 2019-05-09 stsp if (ct->base_id == NULL) {
2298 036813ee 2019-05-09 stsp err = got_error_from_errno();
2299 036813ee 2019-05-09 stsp goto done;
2302 24519714 2019-05-09 stsp ct->path = strdup(path);
2303 24519714 2019-05-09 stsp if (ct->path == NULL) {
2304 24519714 2019-05-09 stsp err = got_error_from_errno();
2305 24519714 2019-05-09 stsp goto done;
2307 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2309 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
2310 ed175427 2019-05-09 stsp free_commitable(ct);
2311 24519714 2019-05-09 stsp free(parent_path);
2312 036813ee 2019-05-09 stsp free(path);
2313 a129376b 2019-03-28 stsp return err;
2316 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
2317 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
2318 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2319 036813ee 2019-05-09 stsp struct got_repository *);
2321 ed175427 2019-05-09 stsp static const struct got_error *
2322 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
2323 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
2324 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2325 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2326 afa376bf 2019-05-09 stsp struct got_repository *repo)
2328 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
2329 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
2330 036813ee 2019-05-09 stsp char *subpath;
2332 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
2333 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2334 036813ee 2019-05-09 stsp return got_error_from_errno();
2336 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
2338 ed175427 2019-05-09 stsp return err;
2340 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2341 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2342 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
2343 036813ee 2019-05-09 stsp free(subpath);
2344 036813ee 2019-05-09 stsp return err;
2347 036813ee 2019-05-09 stsp static const struct got_error *
2348 036813ee 2019-05-09 stsp match_ct_parent_path(int *match, struct commitable *ct, const char *path)
2350 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2351 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
2353 036813ee 2019-05-09 stsp *match = 0;
2355 036813ee 2019-05-09 stsp if (strchr(ct->path, '/') == NULL) {
2356 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
2357 0f63689d 2019-05-10 stsp return NULL;
2360 0f63689d 2019-05-10 stsp err = got_path_dirname(&ct_parent_path, ct->path);
2362 0f63689d 2019-05-10 stsp return err;
2363 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
2364 036813ee 2019-05-09 stsp free(ct_parent_path);
2365 036813ee 2019-05-09 stsp return err;
2368 768aea60 2019-05-09 stsp static mode_t
2369 768aea60 2019-05-09 stsp get_ct_file_mode(struct commitable *ct)
2371 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2374 036813ee 2019-05-09 stsp static const struct got_error *
2375 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2376 036813ee 2019-05-09 stsp struct got_tree_entry *te, struct commitable *ct)
2378 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2380 036813ee 2019-05-09 stsp *new_te = NULL;
2382 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
2384 036813ee 2019-05-09 stsp goto done;
2386 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2388 036813ee 2019-05-09 stsp free((*new_te)->id);
2389 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2390 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2391 036813ee 2019-05-09 stsp err = got_error_from_errno();
2392 036813ee 2019-05-09 stsp goto done;
2395 036813ee 2019-05-09 stsp if (err && *new_te) {
2396 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2397 036813ee 2019-05-09 stsp *new_te = NULL;
2399 036813ee 2019-05-09 stsp return err;
2402 036813ee 2019-05-09 stsp static const struct got_error *
2403 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2404 036813ee 2019-05-09 stsp struct commitable *ct)
2406 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2407 036813ee 2019-05-09 stsp char *ct_name;
2409 036813ee 2019-05-09 stsp *new_te = NULL;
2411 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
2412 036813ee 2019-05-09 stsp if (*new_te == NULL)
2413 036813ee 2019-05-09 stsp return got_error_from_errno();
2415 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
2416 036813ee 2019-05-09 stsp if (ct_name == NULL) {
2417 036813ee 2019-05-09 stsp err = got_error_from_errno();
2418 036813ee 2019-05-09 stsp goto done;
2420 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
2421 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
2422 036813ee 2019-05-09 stsp err = got_error_from_errno();
2423 036813ee 2019-05-09 stsp goto done;
2426 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2428 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2429 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2430 036813ee 2019-05-09 stsp err = got_error_from_errno();
2431 036813ee 2019-05-09 stsp goto done;
2434 036813ee 2019-05-09 stsp if (err && *new_te) {
2435 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2436 036813ee 2019-05-09 stsp *new_te = NULL;
2438 036813ee 2019-05-09 stsp return err;
2441 036813ee 2019-05-09 stsp static const struct got_error *
2442 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
2443 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
2445 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2446 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
2448 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2450 036813ee 2019-05-09 stsp return err;
2451 036813ee 2019-05-09 stsp if (new_pe == NULL)
2452 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
2453 036813ee 2019-05-09 stsp return NULL;
2456 afa376bf 2019-05-09 stsp static const struct got_error *
2457 afa376bf 2019-05-09 stsp report_ct_status(struct commitable *ct,
2458 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
2460 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
2461 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
2462 afa376bf 2019-05-09 stsp ct_path++;
2463 e75eb4da 2019-05-10 stsp return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id);
2466 036813ee 2019-05-09 stsp static const struct got_error *
2467 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
2468 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2470 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
2471 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
2472 44d03001 2019-05-09 stsp char *te_path;
2474 44d03001 2019-05-09 stsp *modified = 0;
2476 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
2477 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
2478 44d03001 2019-05-09 stsp te->name) == -1)
2479 44d03001 2019-05-09 stsp return got_error_from_errno();
2481 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2482 44d03001 2019-05-09 stsp struct commitable *ct = pe->data;
2483 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
2484 44d03001 2019-05-09 stsp strlen(te_path));
2485 44d03001 2019-05-09 stsp if (*modified)
2489 44d03001 2019-05-09 stsp free(te_path);
2490 44d03001 2019-05-09 stsp return err;
2493 44d03001 2019-05-09 stsp static const struct got_error *
2494 036813ee 2019-05-09 stsp match_deleted_or_modified_ct(struct commitable **ctp,
2495 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
2496 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
2498 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2499 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2501 036813ee 2019-05-09 stsp *ctp = NULL;
2503 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2504 036813ee 2019-05-09 stsp struct commitable *ct = pe->data;
2505 036813ee 2019-05-09 stsp char *ct_name = NULL;
2506 036813ee 2019-05-09 stsp int path_matches;
2508 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_MODIFY &&
2509 036813ee 2019-05-09 stsp ct->status != GOT_STATUS_DELETE)
2512 036813ee 2019-05-09 stsp if (got_object_id_cmp(ct->base_id, te->id) != 0)
2515 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
2517 036813ee 2019-05-09 stsp return err;
2518 036813ee 2019-05-09 stsp if (!path_matches)
2521 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
2522 036813ee 2019-05-09 stsp if (ct_name == NULL)
2523 036813ee 2019-05-09 stsp return got_error_from_errno();
2525 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
2528 036813ee 2019-05-09 stsp *ctp = ct;
2532 036813ee 2019-05-09 stsp return err;
2535 036813ee 2019-05-09 stsp static const struct got_error *
2536 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
2537 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
2538 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2539 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2540 036813ee 2019-05-09 stsp struct got_repository *repo)
2542 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2543 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
2544 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
2545 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
2546 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
2547 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2549 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
2550 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
2551 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
2553 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
2554 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2555 036813ee 2019-05-09 stsp struct commitable *ct = pe->data;
2556 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
2558 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD)
2561 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
2562 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
2565 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
2566 036813ee 2019-05-09 stsp pe->path);
2568 036813ee 2019-05-09 stsp goto done;
2570 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
2571 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
2572 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
2574 036813ee 2019-05-09 stsp goto done;
2575 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
2577 afa376bf 2019-05-09 stsp goto done;
2579 2f51b5b3 2019-05-09 stsp char *subtree_path;
2580 baa7dcfa 2019-05-09 stsp struct got_pathlist_entry *pe2;
2581 baa7dcfa 2019-05-09 stsp int visited = 0;
2583 2f51b5b3 2019-05-09 stsp *slash = '\0'; /* trim trailing path components */
2584 baa7dcfa 2019-05-09 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
2585 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
2586 2f51b5b3 2019-05-09 stsp child_path) == -1) {
2587 2f51b5b3 2019-05-09 stsp err = got_error_from_errno();
2588 2f51b5b3 2019-05-09 stsp goto done;
2590 baa7dcfa 2019-05-09 stsp TAILQ_FOREACH(pe2, &paths, entry) {
2591 baa7dcfa 2019-05-09 stsp if (got_path_cmp(subtree_path, pe2->path) != 0)
2593 baa7dcfa 2019-05-09 stsp visited = 1;
2596 ce0de6b6 2019-05-10 stsp if (visited) {
2597 ce0de6b6 2019-05-10 stsp free(subtree_path);
2601 9ba0479c 2019-05-10 stsp new_te = calloc(1, sizeof(*new_te));
2602 9ba0479c 2019-05-10 stsp new_te->mode = S_IFDIR;
2603 9ba0479c 2019-05-10 stsp new_te->name = strdup(child_path);
2604 9ba0479c 2019-05-10 stsp if (new_te->name == NULL) {
2605 9ba0479c 2019-05-10 stsp err = got_error_from_errno();
2606 9ba0479c 2019-05-10 stsp got_object_tree_entry_close(new_te);
2607 9ba0479c 2019-05-10 stsp new_te = NULL;
2608 9ba0479c 2019-05-10 stsp goto done;
2610 baa7dcfa 2019-05-09 stsp err = write_tree(&new_te->id, NULL, subtree_path,
2611 afa376bf 2019-05-09 stsp commitable_paths, status_cb, status_arg, repo);
2612 2f51b5b3 2019-05-09 stsp free(subtree_path);
2613 9ba0479c 2019-05-10 stsp if (err) {
2614 9ba0479c 2019-05-10 stsp got_object_tree_entry_close(new_te);
2615 9ba0479c 2019-05-10 stsp new_te = NULL;
2616 036813ee 2019-05-09 stsp goto done;
2619 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2621 2f51b5b3 2019-05-09 stsp goto done;
2624 2f51b5b3 2019-05-09 stsp if (base_tree) {
2625 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
2626 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
2627 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
2628 2f51b5b3 2019-05-09 stsp struct commitable *ct = NULL;
2630 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
2631 44d03001 2019-05-09 stsp int modified;
2632 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
2634 036813ee 2019-05-09 stsp goto done;
2635 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
2636 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
2638 2f51b5b3 2019-05-09 stsp goto done;
2639 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
2640 44d03001 2019-05-09 stsp if (modified) {
2641 44d03001 2019-05-09 stsp free(new_te->id);
2642 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
2643 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
2644 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
2646 44d03001 2019-05-09 stsp goto done;
2648 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2650 036813ee 2019-05-09 stsp goto done;
2654 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
2655 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
2657 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
2658 2f51b5b3 2019-05-09 stsp if (ct->status == GOT_STATUS_MODIFY) {
2659 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
2660 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
2662 2f51b5b3 2019-05-09 stsp goto done;
2663 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2665 2f51b5b3 2019-05-09 stsp goto done;
2667 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
2669 afa376bf 2019-05-09 stsp goto done;
2671 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
2672 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
2674 2f51b5b3 2019-05-09 stsp goto done;
2675 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2677 2f51b5b3 2019-05-09 stsp goto done;
2682 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
2683 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
2684 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
2685 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
2686 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
2688 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
2690 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
2691 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
2692 ed175427 2019-05-09 stsp return err;
2695 ebf99748 2019-05-09 stsp static const struct got_error *
2696 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
2697 ebf99748 2019-05-09 stsp struct got_object_id *new_base_commit_id, struct got_worktree *worktree)
2699 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2700 ebf99748 2019-05-09 stsp char *fileindex_path = NULL, *new_fileindex_path = NULL;
2701 ebf99748 2019-05-09 stsp struct got_fileindex *fileindex = NULL;
2702 ebf99748 2019-05-09 stsp FILE *new_index = NULL;
2703 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
2705 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2707 ebf99748 2019-05-09 stsp return err;
2709 ebf99748 2019-05-09 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2710 ebf99748 2019-05-09 stsp fileindex_path);
2712 ebf99748 2019-05-09 stsp goto done;
2714 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2715 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
2716 ebf99748 2019-05-09 stsp struct commitable *ct = pe->data;
2718 ebf99748 2019-05-09 stsp ie = got_fileindex_entry_get(fileindex, pe->path);
2720 ebf99748 2019-05-09 stsp if (ct->status == GOT_STATUS_DELETE) {
2721 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
2722 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
2724 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
2725 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
2726 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
2728 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
2729 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
2730 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
2732 ebf99748 2019-05-09 stsp goto done;
2733 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
2735 ebf99748 2019-05-09 stsp goto done;
2739 ebf99748 2019-05-09 stsp err = got_fileindex_write(fileindex, new_index);
2741 ebf99748 2019-05-09 stsp goto done;
2743 ebf99748 2019-05-09 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2744 ebf99748 2019-05-09 stsp err = got_error_from_errno();
2745 ebf99748 2019-05-09 stsp unlink(new_fileindex_path);
2746 ebf99748 2019-05-09 stsp goto done;
2749 ebf99748 2019-05-09 stsp free(new_fileindex_path);
2750 ebf99748 2019-05-09 stsp new_fileindex_path = NULL;
2753 ebf99748 2019-05-09 stsp if (new_fileindex_path)
2754 ebf99748 2019-05-09 stsp unlink(new_fileindex_path);
2755 ebf99748 2019-05-09 stsp if (new_index)
2756 ebf99748 2019-05-09 stsp fclose(new_index);
2757 ebf99748 2019-05-09 stsp free(new_fileindex_path);
2758 ebf99748 2019-05-09 stsp free(fileindex_path);
2759 ebf99748 2019-05-09 stsp got_fileindex_free(fileindex);
2760 d56d26ce 2019-05-10 stsp return err;
2763 d56d26ce 2019-05-10 stsp static const struct got_error *
2764 d56d26ce 2019-05-10 stsp check_ct_out_of_date(struct commitable *ct, struct got_repository *repo,
2765 d56d26ce 2019-05-10 stsp struct got_object_id *head_commit_id)
2767 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
2768 d56d26ce 2019-05-10 stsp struct got_object_id *id_in_head;
2771 1251a9e5 2019-05-10 stsp * XXX This should probably be checking each commit from
2772 1251a9e5 2019-05-10 stsp * worktree's base_commit -> head and verify that the
2773 1251a9e5 2019-05-10 stsp * same blob exists in each of these commits.
2774 1251a9e5 2019-05-10 stsp * Removals+additions within this line of history could mean
2775 1251a9e5 2019-05-10 stsp * that renames have occured in which case we should really
2776 1251a9e5 2019-05-10 stsp * be forcing the user to run an update...
2778 d56d26ce 2019-05-10 stsp err = got_object_id_by_path(&id_in_head, repo,
2779 d56d26ce 2019-05-10 stsp head_commit_id, ct->in_repo_path);
2780 d56d26ce 2019-05-10 stsp if (err) {
2781 d56d26ce 2019-05-10 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY)
2782 d56d26ce 2019-05-10 stsp return err;
2783 d56d26ce 2019-05-10 stsp if (ct->status != GOT_STATUS_ADD)
2784 d56d26ce 2019-05-10 stsp return got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
2785 d56d26ce 2019-05-10 stsp err = NULL;
2786 d56d26ce 2019-05-10 stsp id_in_head = NULL;
2789 d56d26ce 2019-05-10 stsp if (id_in_head && got_object_id_cmp(id_in_head, ct->base_id) != 0)
2790 d56d26ce 2019-05-10 stsp err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
2792 d56d26ce 2019-05-10 stsp free(id_in_head);
2793 ebf99748 2019-05-09 stsp return err;
2796 c4296144 2019-05-09 stsp const struct got_error *
2797 c4296144 2019-05-09 stsp got_worktree_commit(struct got_object_id **new_commit_id,
2798 c4296144 2019-05-09 stsp struct got_worktree *worktree, const char *ondisk_path,
2799 afa376bf 2019-05-09 stsp const char *author, const char *committer, const char *logmsg,
2800 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2801 afa376bf 2019-05-09 stsp struct got_repository *repo)
2803 c4296144 2019-05-09 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2804 ed175427 2019-05-09 stsp struct collect_commitables_arg cc_arg;
2805 036813ee 2019-05-09 stsp struct got_pathlist_head commitable_paths;
2806 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
2807 bc70eb79 2019-05-09 stsp char *relpath = NULL;
2808 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
2809 36a38700 2019-05-10 stsp struct got_reference *head_ref = NULL;
2810 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
2811 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id = NULL;
2812 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
2813 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
2814 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
2815 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
2816 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
2817 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
2819 c4296144 2019-05-09 stsp *new_commit_id = NULL;
2821 036813ee 2019-05-09 stsp TAILQ_INIT(&commitable_paths);
2822 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
2824 c4296144 2019-05-09 stsp if (ondisk_path) {
2825 c4296144 2019-05-09 stsp err = got_path_skip_common_ancestor(&relpath,
2826 c4296144 2019-05-09 stsp worktree->root_path, ondisk_path);
2828 c4296144 2019-05-09 stsp return err;
2831 c4296144 2019-05-09 stsp err = lock_worktree(worktree, LOCK_EX);
2833 c4296144 2019-05-09 stsp goto done;
2835 36a38700 2019-05-10 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name);
2837 36a38700 2019-05-10 stsp goto done;
2838 36a38700 2019-05-10 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
2840 09f5bd90 2019-05-09 stsp goto done;
2842 036813ee 2019-05-09 stsp cc_arg.commitable_paths = &commitable_paths;
2843 24519714 2019-05-09 stsp cc_arg.worktree = worktree;
2844 24519714 2019-05-09 stsp cc_arg.repo = repo;
2845 675c7539 2019-05-09 stsp err = got_worktree_status(worktree, relpath ? relpath : "",
2846 ed175427 2019-05-09 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
2848 675c7539 2019-05-09 stsp goto done;
2850 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
2852 588edf97 2019-05-10 stsp goto done;
2854 819f385b 2019-05-10 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
2855 819f385b 2019-05-10 stsp struct commitable *ct = pe->data;
2856 d56d26ce 2019-05-10 stsp err = check_ct_out_of_date(ct, repo, head_commit_id);
2858 819f385b 2019-05-10 stsp goto done;
2861 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
2863 588edf97 2019-05-10 stsp goto done;
2865 675c7539 2019-05-09 stsp /* TODO: collect commit message if not specified */
2867 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
2868 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
2869 ed175427 2019-05-09 stsp struct commitable *ct = pe->data;
2870 cf066bf8 2019-05-09 stsp char *ondisk_path;
2872 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
2873 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
2876 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
2877 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
2878 cf066bf8 2019-05-09 stsp err = got_error_from_errno();
2879 cf066bf8 2019-05-09 stsp goto done;
2881 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
2882 a7055788 2019-05-09 stsp free(ondisk_path);
2884 cf066bf8 2019-05-09 stsp goto done;
2887 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
2888 588edf97 2019-05-10 stsp err = write_tree(&new_tree_id, head_tree, "/", &commitable_paths,
2889 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2891 036813ee 2019-05-09 stsp goto done;
2893 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
2895 de18fc63 2019-05-09 stsp goto done;
2896 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
2897 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
2898 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
2899 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
2901 9d40349a 2019-05-09 stsp goto done;
2903 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
2904 09f5bd90 2019-05-09 stsp /* XXX ideally we'd lock the reference file here to avoid a race */
2905 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
2906 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
2907 09f5bd90 2019-05-09 stsp err = got_error_from_errno();
2908 09f5bd90 2019-05-09 stsp goto done;
2910 bc70eb79 2019-05-09 stsp err = got_ref_open(&head_ref2, repo, head_ref_name);
2912 09f5bd90 2019-05-09 stsp goto done;
2913 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
2915 ebf99748 2019-05-09 stsp goto done;
2916 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
2917 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
2918 09f5bd90 2019-05-09 stsp goto done;
2920 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
2921 36a38700 2019-05-10 stsp err = got_ref_change_ref(head_ref, *new_commit_id);
2923 f2c16586 2019-05-09 stsp goto done;
2924 36a38700 2019-05-10 stsp err = got_ref_write(head_ref, repo);
2926 f2c16586 2019-05-09 stsp goto done;
2927 09f5bd90 2019-05-09 stsp /* XXX race has ended here */
2929 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
2931 09f5bd90 2019-05-09 stsp goto done;
2933 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
2935 ebf99748 2019-05-09 stsp goto done;
2937 ebf99748 2019-05-09 stsp err = update_fileindex_after_commit(&commitable_paths,
2938 ebf99748 2019-05-09 stsp *new_commit_id, worktree);
2940 ebf99748 2019-05-09 stsp goto done;
2942 c4296144 2019-05-09 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2943 c4296144 2019-05-09 stsp if (unlockerr && err == NULL)
2944 c4296144 2019-05-09 stsp err = unlockerr;
2945 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
2946 ed175427 2019-05-09 stsp struct commitable *ct = pe->data;
2947 ed175427 2019-05-09 stsp free_commitable(ct);
2949 036813ee 2019-05-09 stsp got_pathlist_free(&commitable_paths);
2950 588edf97 2019-05-10 stsp if (head_tree)
2951 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
2952 588edf97 2019-05-10 stsp if (head_commit)
2953 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
2954 c4296144 2019-05-09 stsp free(relpath);
2955 09f5bd90 2019-05-09 stsp free(head_commit_id);
2956 09f5bd90 2019-05-09 stsp free(head_commit_id2);
2957 36a38700 2019-05-10 stsp if (head_ref)
2958 36a38700 2019-05-10 stsp got_ref_close(head_ref);
2959 09f5bd90 2019-05-09 stsp if (head_ref2)
2960 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
2961 c4296144 2019-05-09 stsp return err;
