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 1dd54920 2019-05-11 stsp #include "got_path.h"
42 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
43 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 234035bc 2019-06-01 stsp #include "got_diff.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
49 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
51 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
52 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
53 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
54 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
55 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
58 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 99724ed4 2018-03-10 stsp static const struct got_error *
62 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
64 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
66 99724ed4 2018-03-10 stsp int fd = -1;
68 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
69 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
70 99724ed4 2018-03-10 stsp path = NULL;
74 73a5ef67 2018-03-11 stsp fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
75 99724ed4 2018-03-10 stsp GOT_DEFAULT_FILE_MODE);
76 99724ed4 2018-03-10 stsp if (fd == -1) {
77 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
81 99724ed4 2018-03-10 stsp if (content) {
82 99724ed4 2018-03-10 stsp int len = dprintf(fd, "%s\n", content);
83 99724ed4 2018-03-10 stsp if (len != strlen(content) + 1) {
84 638f9024 2019-05-13 stsp err = got_error_from_errno("dprintf");
90 99724ed4 2018-03-10 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
91 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
96 507dc3bb 2018-12-29 stsp static const struct got_error *
97 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
99 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
100 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
101 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
102 507dc3bb 2018-12-29 stsp char *path = NULL;
104 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
105 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
106 507dc3bb 2018-12-29 stsp path = NULL;
110 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
114 507dc3bb 2018-12-29 stsp if (content) {
115 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
116 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
117 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
122 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
123 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
124 2a57020b 2019-02-20 stsp unlink(tmppath);
129 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
130 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
131 230a42bd 2019-05-11 jcs free(tmppath);
132 99724ed4 2018-03-10 stsp return err;
135 09fe317a 2018-03-11 stsp static const struct got_error *
136 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
138 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
139 09fe317a 2018-03-11 stsp char *path;
140 09fe317a 2018-03-11 stsp int fd = -1;
142 09fe317a 2018-03-11 stsp struct stat sb;
144 09fe317a 2018-03-11 stsp *content = NULL;
146 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
147 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
148 09fe317a 2018-03-11 stsp path = NULL;
152 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
153 09fe317a 2018-03-11 stsp if (fd == -1) {
154 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
155 f02eaa22 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
157 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
160 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
161 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
162 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
166 d10c9b58 2019-02-19 stsp if (lstat(path, &sb) != 0) {
167 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", path);
170 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
171 09fe317a 2018-03-11 stsp if (*content == NULL) {
172 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
176 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
177 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
178 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
179 0605801d 2018-03-11 stsp got_error(GOT_ERR_WORKTREE_META));
182 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
183 09fe317a 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
186 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
189 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
190 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
191 09fe317a 2018-03-11 stsp free(path);
193 09fe317a 2018-03-11 stsp free(*content);
194 09fe317a 2018-03-11 stsp *content = NULL;
196 09fe317a 2018-03-11 stsp return err;
199 024e9686 2019-05-14 stsp static const struct got_error *
200 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
202 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
203 024e9686 2019-05-14 stsp char *refstr = NULL;
205 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
206 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
207 024e9686 2019-05-14 stsp if (refstr == NULL)
208 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
210 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
211 024e9686 2019-05-14 stsp if (refstr == NULL)
212 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
214 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
215 024e9686 2019-05-14 stsp free(refstr);
216 024e9686 2019-05-14 stsp return err;
219 86c3caaf 2018-03-09 stsp const struct got_error *
220 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
221 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
223 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
224 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
225 ec22038e 2019-03-10 stsp uuid_t uuid;
226 ec22038e 2019-03-10 stsp uint32_t uuid_status;
227 65596e15 2018-12-24 stsp int obj_type;
228 7ac97322 2018-03-11 stsp char *path_got = NULL;
229 1451e70d 2018-03-10 stsp char *formatstr = NULL;
230 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
231 65596e15 2018-12-24 stsp char *basestr = NULL;
232 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
234 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
235 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
239 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
241 65596e15 2018-12-24 stsp return err;
242 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
244 65596e15 2018-12-24 stsp return err;
245 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
246 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
248 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
249 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
250 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
253 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
254 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
255 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
259 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
260 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
261 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
264 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
265 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
269 056e7441 2018-03-11 stsp /* Create an empty lock file. */
270 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
274 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
275 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
279 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
280 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
284 65596e15 2018-12-24 stsp /* Record our base commit. */
285 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
288 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
292 1451e70d 2018-03-10 stsp /* Store path to repository. */
293 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
294 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
298 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
299 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
300 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
304 ec22038e 2019-03-10 stsp /* Generate UUID. */
305 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
306 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
307 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
310 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
311 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
312 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
315 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
319 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
320 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
321 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
324 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
329 65596e15 2018-12-24 stsp free(commit_id);
330 7ac97322 2018-03-11 stsp free(path_got);
331 1451e70d 2018-03-10 stsp free(formatstr);
332 0bb8a95e 2018-03-12 stsp free(absprefix);
333 65596e15 2018-12-24 stsp free(basestr);
334 ec22038e 2019-03-10 stsp free(uuidstr);
335 86c3caaf 2018-03-09 stsp return err;
338 247140b2 2019-02-05 stsp static const struct got_error *
339 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
341 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
342 7ac97322 2018-03-11 stsp char *path_got;
343 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
344 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
345 056e7441 2018-03-11 stsp char *path_lock = NULL;
346 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
347 6d9d28c3 2018-03-11 stsp int version, fd = -1;
348 6d9d28c3 2018-03-11 stsp const char *errstr;
349 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
350 c442a90d 2019-03-10 stsp uint32_t uuid_status;
352 6d9d28c3 2018-03-11 stsp *worktree = NULL;
354 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
355 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
356 7ac97322 2018-03-11 stsp path_got = NULL;
360 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
361 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
362 056e7441 2018-03-11 stsp path_lock = NULL;
366 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
367 6d9d28c3 2018-03-11 stsp if (fd == -1) {
368 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
369 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
373 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
377 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
378 6d9d28c3 2018-03-11 stsp if (errstr) {
379 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
382 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
383 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
387 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
388 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
389 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
392 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
394 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
395 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
396 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
399 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
400 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
404 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
405 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
409 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
410 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
414 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
417 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
418 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
419 c442a90d 2019-03-10 stsp err = got_error_uuid(uuid_status);
423 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
427 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
428 eaccb85f 2018-12-25 stsp base_commit_id_str);
432 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
433 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
436 eaccb85f 2018-12-25 stsp got_repo_close(repo);
437 7ac97322 2018-03-11 stsp free(path_got);
438 056e7441 2018-03-11 stsp free(path_lock);
439 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
440 c442a90d 2019-03-10 stsp free(uuidstr);
441 bd165944 2019-03-10 stsp free(formatstr);
443 6d9d28c3 2018-03-11 stsp if (fd != -1)
445 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
446 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
447 6d9d28c3 2018-03-11 stsp *worktree = NULL;
449 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
451 6d9d28c3 2018-03-11 stsp return err;
454 247140b2 2019-02-05 stsp const struct got_error *
455 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
457 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
460 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
461 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
462 247140b2 2019-02-05 stsp return err;
463 247140b2 2019-02-05 stsp if (*worktree)
464 247140b2 2019-02-05 stsp return NULL;
465 247140b2 2019-02-05 stsp path = dirname(path);
466 d1542a27 2019-02-05 stsp if (path == NULL)
467 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
468 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
470 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
473 3a6ce05a 2019-02-11 stsp const struct got_error *
474 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
476 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
477 c88eb298 2018-03-11 stsp free(worktree->root_path);
478 cde76477 2018-03-11 stsp free(worktree->repo_path);
479 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
480 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
481 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
482 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
483 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
484 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
485 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
486 6d9d28c3 2018-03-11 stsp free(worktree);
487 3a6ce05a 2019-02-11 stsp return err;
490 2fbdb5ae 2018-12-29 stsp const char *
491 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
493 c7f4312f 2019-02-05 stsp return worktree->root_path;
496 c7f4312f 2019-02-05 stsp const char *
497 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
499 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
502 49520a32 2018-12-29 stsp const char *
503 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
505 f609be2e 2018-12-29 stsp return worktree->path_prefix;
508 e5dc7198 2018-12-29 stsp const struct got_error *
509 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
510 e5dc7198 2018-12-29 stsp const char *path_prefix)
512 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
514 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
515 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
516 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
518 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
519 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
520 e5dc7198 2018-12-29 stsp free(absprefix);
521 e5dc7198 2018-12-29 stsp return NULL;
524 bc70eb79 2019-05-09 stsp const char *
525 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
527 36a38700 2019-05-10 stsp return worktree->head_ref_name;
530 024e9686 2019-05-14 stsp const struct got_error *
531 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
532 024e9686 2019-05-14 stsp struct got_reference *head_ref)
534 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
535 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
537 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
538 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
539 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
540 024e9686 2019-05-14 stsp path_got = NULL;
544 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
545 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
546 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
550 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
554 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
555 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
557 024e9686 2019-05-14 stsp free(path_got);
559 024e9686 2019-05-14 stsp free(head_ref_name);
560 024e9686 2019-05-14 stsp return err;
563 b72f483a 2019-02-05 stsp struct got_object_id *
564 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
566 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
569 507dc3bb 2018-12-29 stsp const struct got_error *
570 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
571 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
573 507dc3bb 2018-12-29 stsp const struct got_error *err;
574 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
575 507dc3bb 2018-12-29 stsp char *id_str = NULL;
576 507dc3bb 2018-12-29 stsp char *path_got = NULL;
578 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
579 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
580 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
581 507dc3bb 2018-12-29 stsp path_got = NULL;
585 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
587 507dc3bb 2018-12-29 stsp return err;
589 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
590 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
594 507dc3bb 2018-12-29 stsp /* Record our base commit. */
595 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
598 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
602 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
603 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
604 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
605 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
610 507dc3bb 2018-12-29 stsp got_object_close(obj);
611 507dc3bb 2018-12-29 stsp free(id_str);
612 507dc3bb 2018-12-29 stsp free(path_got);
613 507dc3bb 2018-12-29 stsp return err;
616 9d31a1d8 2018-03-11 stsp static const struct got_error *
617 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
619 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
620 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
621 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
622 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
623 86c3caaf 2018-03-09 stsp return NULL;
626 21908da4 2019-01-13 stsp static const struct got_error *
627 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
629 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
630 4a1ddfc2 2019-01-12 stsp char *abspath;
632 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
633 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
635 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
636 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
637 ddcd8544 2019-03-11 stsp struct stat sb;
638 ddcd8544 2019-03-11 stsp err = NULL;
639 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
640 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
641 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
642 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
643 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
646 4a1ddfc2 2019-01-12 stsp free(abspath);
647 68c76935 2019-02-19 stsp return err;
650 68c76935 2019-02-19 stsp static const struct got_error *
651 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
653 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
654 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
655 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
656 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
661 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
662 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
663 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
666 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
667 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
668 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
671 68c76935 2019-02-19 stsp if (flen1 == 0) {
672 68c76935 2019-02-19 stsp if (flen2 != 0)
675 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
676 68c76935 2019-02-19 stsp if (flen1 != 0)
679 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
680 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
690 68c76935 2019-02-19 stsp return err;
693 68c76935 2019-02-19 stsp static const struct got_error *
694 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
696 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
697 68c76935 2019-02-19 stsp struct stat sb;
698 68c76935 2019-02-19 stsp size_t size1, size2;
699 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
703 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
704 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
707 68c76935 2019-02-19 stsp size1 = sb.st_size;
709 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
710 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
713 68c76935 2019-02-19 stsp size2 = sb.st_size;
715 68c76935 2019-02-19 stsp if (size1 != size2) {
717 68c76935 2019-02-19 stsp return NULL;
720 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
721 68c76935 2019-02-19 stsp if (f1 == NULL)
722 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
724 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
725 68c76935 2019-02-19 stsp if (f2 == NULL) {
726 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", f2_path);
730 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
732 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
733 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
734 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
735 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
737 6353ad76 2019-02-08 stsp return err;
741 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
742 46b6ee73 2019-06-04 stsp * blob_deriv acts as the first derived version, and the file on disk
743 234035bc 2019-06-01 stsp * acts as the second derived version.
745 6353ad76 2019-02-08 stsp static const struct got_error *
746 234035bc 2019-06-01 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
747 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
748 46b6ee73 2019-06-04 stsp const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
749 234035bc 2019-06-01 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
750 234035bc 2019-06-01 stsp void *progress_arg)
752 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
753 6353ad76 2019-02-08 stsp int merged_fd = -1;
754 46b6ee73 2019-06-04 stsp FILE *f_deriv = NULL, *f_orig = NULL;
755 46b6ee73 2019-06-04 stsp char *blob_deriv_path = NULL, *blob_orig_path = NULL;
756 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
757 6353ad76 2019-02-08 stsp char *id_str = NULL;
758 6353ad76 2019-02-08 stsp char *label1 = NULL;
759 234035bc 2019-06-01 stsp int overlapcnt = 0;
760 af54ae4a 2019-02-19 stsp char *parent;
762 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
764 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
765 af54ae4a 2019-02-19 stsp if (parent == NULL)
766 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
768 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
769 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
771 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
775 af54ae4a 2019-02-19 stsp free(base_path);
776 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
777 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
778 af54ae4a 2019-02-19 stsp base_path = NULL;
782 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
785 46b6ee73 2019-06-04 stsp err = got_object_blob_dump_to_file(NULL, NULL, f_deriv, blob_deriv);
789 af54ae4a 2019-02-19 stsp free(base_path);
790 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
791 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
792 af54ae4a 2019-02-19 stsp base_path = NULL;
796 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
799 46b6ee73 2019-06-04 stsp if (blob_orig) {
800 46b6ee73 2019-06-04 stsp err = got_object_blob_dump_to_file(NULL, NULL, f_orig,
801 46b6ee73 2019-06-04 stsp blob_orig);
806 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
807 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
808 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
812 6353ad76 2019-02-08 stsp err = got_object_id_str(&id_str, worktree->base_commit_id);
815 6353ad76 2019-02-08 stsp if (asprintf(&label1, "commit %s", id_str) == -1) {
816 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
820 46b6ee73 2019-06-04 stsp err = got_merge_diff3(&overlapcnt, merged_fd, blob_deriv_path,
821 46b6ee73 2019-06-04 stsp blob_orig_path, ondisk_path, label1, path);
825 6353ad76 2019-02-08 stsp (*progress_cb)(progress_arg,
826 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
828 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
829 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
833 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
834 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
835 46b6ee73 2019-06-04 stsp err = check_files_equal(local_changes_subsumed, blob_deriv_path,
836 68c76935 2019-02-19 stsp merged_path);
841 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
842 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
846 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
847 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
848 230a42bd 2019-05-11 jcs ondisk_path);
849 2a57020b 2019-02-20 stsp unlink(merged_path);
854 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
855 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
856 46b6ee73 2019-06-04 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
857 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
858 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
859 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
860 6353ad76 2019-02-08 stsp free(merged_path);
861 af54ae4a 2019-02-19 stsp free(base_path);
862 46b6ee73 2019-06-04 stsp if (blob_deriv_path) {
863 46b6ee73 2019-06-04 stsp unlink(blob_deriv_path);
864 46b6ee73 2019-06-04 stsp free(blob_deriv_path);
866 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
867 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
868 46b6ee73 2019-06-04 stsp free(blob_orig_path);
870 6353ad76 2019-02-08 stsp free(id_str);
871 6353ad76 2019-02-08 stsp free(label1);
872 4a1ddfc2 2019-01-12 stsp return err;
875 4a1ddfc2 2019-01-12 stsp static const struct got_error *
876 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
877 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
878 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
879 13d9040b 2019-03-27 stsp int update_timestamps)
881 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
883 13d9040b 2019-03-27 stsp if (ie == NULL)
884 13d9040b 2019-03-27 stsp ie = got_fileindex_entry_get(fileindex, path);
886 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
887 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
888 13d9040b 2019-03-27 stsp update_timestamps);
890 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
891 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
892 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
894 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
896 13d9040b 2019-03-27 stsp return err;
899 13d9040b 2019-03-27 stsp static const struct got_error *
900 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
901 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
902 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
903 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
904 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
906 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
907 507dc3bb 2018-12-29 stsp int fd = -1;
908 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
909 507dc3bb 2018-12-29 stsp int update = 0;
910 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
912 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
913 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
914 9d31a1d8 2018-03-11 stsp if (fd == -1) {
915 21908da4 2019-01-13 stsp if (errno == ENOENT) {
916 21908da4 2019-01-13 stsp char *parent = dirname(path);
917 21908da4 2019-01-13 stsp if (parent == NULL)
918 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
919 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
921 21908da4 2019-01-13 stsp return err;
922 21908da4 2019-01-13 stsp fd = open(ondisk_path,
923 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
924 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
925 21908da4 2019-01-13 stsp if (fd == -1)
926 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
927 230a42bd 2019-05-11 jcs ondisk_path);
928 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
929 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
930 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
931 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
934 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
935 507dc3bb 2018-12-29 stsp ondisk_path);
938 507dc3bb 2018-12-29 stsp update = 1;
941 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
944 a378724f 2019-02-10 stsp if (restoring_missing_file)
945 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
946 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
947 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
949 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg,
950 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
952 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
954 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
955 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
958 9d31a1d8 2018-03-11 stsp if (len > 0) {
959 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
960 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
961 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
962 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
964 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
965 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
968 61d6eaa3 2018-12-24 stsp hdrlen = 0;
970 9d31a1d8 2018-03-11 stsp } while (len != 0);
972 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
973 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
977 507dc3bb 2018-12-29 stsp if (update) {
978 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
979 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
980 230a42bd 2019-05-11 jcs ondisk_path);
981 2a57020b 2019-02-20 stsp unlink(tmppath);
986 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
987 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
988 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
992 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
993 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
999 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1000 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1001 507dc3bb 2018-12-29 stsp free(tmppath);
1002 6353ad76 2019-02-08 stsp return err;
1005 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1006 6353ad76 2019-02-08 stsp static const struct got_error *
1007 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1009 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1010 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1011 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1012 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1013 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1015 7154f6ce 2019-03-27 stsp int i = 0;
1016 7154f6ce 2019-03-27 stsp char *line;
1017 7154f6ce 2019-03-27 stsp size_t len;
1018 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1020 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1021 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1022 7154f6ce 2019-03-27 stsp if (line == NULL) {
1023 7154f6ce 2019-03-27 stsp if (feof(f))
1025 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1029 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1030 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1032 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1038 7154f6ce 2019-03-27 stsp return err;
1041 7154f6ce 2019-03-27 stsp static const struct got_error *
1042 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1043 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1044 b8f41171 2019-02-10 stsp struct got_repository *repo)
1046 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1047 6353ad76 2019-02-08 stsp struct got_object_id id;
1048 6353ad76 2019-02-08 stsp size_t hdrlen;
1049 6353ad76 2019-02-08 stsp FILE *f = NULL;
1050 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1051 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1052 6353ad76 2019-02-08 stsp size_t flen, blen;
1054 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1056 b8f41171 2019-02-10 stsp if (lstat(abspath, sb) == -1) {
1057 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1059 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1060 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_MISSING;
1062 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1063 b8f41171 2019-02-10 stsp sb->st_mode =
1064 b8f41171 2019-02-10 stsp ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1065 b8f41171 2019-02-10 stsp & (S_IRWXU | S_IRWXG | S_IRWXO));
1067 b8f41171 2019-02-10 stsp sb->st_mode = GOT_DEFAULT_FILE_MODE;
1068 a378724f 2019-02-10 stsp return NULL;
1070 638f9024 2019-05-13 stsp return got_error_from_errno2("lstat", abspath);
1073 b8f41171 2019-02-10 stsp if (!S_ISREG(sb->st_mode)) {
1074 6353ad76 2019-02-08 stsp *status = GOT_STATUS_OBSTRUCTED;
1075 6353ad76 2019-02-08 stsp return NULL;
1078 b8f41171 2019-02-10 stsp if (ie == NULL)
1079 d00136be 2019-03-26 stsp return NULL;
1081 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1082 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1083 2ec1f75b 2019-03-26 stsp return NULL;
1084 2ec1f75b 2019-03-26 stsp } else if (!got_fileindex_entry_has_blob(ie)) {
1085 d00136be 2019-03-26 stsp *status = GOT_STATUS_ADD;
1086 b8f41171 2019-02-10 stsp return NULL;
1089 b8f41171 2019-02-10 stsp if (ie->ctime_sec == sb->st_ctime &&
1090 b8f41171 2019-02-10 stsp ie->ctime_nsec == sb->st_ctimensec &&
1091 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1092 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1093 b8f41171 2019-02-10 stsp ie->mtime_nsec == sb->st_mtimensec &&
1094 b8f41171 2019-02-10 stsp ie->size == (sb->st_size & 0xffffffff))
1095 6353ad76 2019-02-08 stsp return NULL;
1097 6353ad76 2019-02-08 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1098 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1100 6353ad76 2019-02-08 stsp return err;
1102 6353ad76 2019-02-08 stsp f = fopen(abspath, "r");
1103 6353ad76 2019-02-08 stsp if (f == NULL) {
1104 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1105 6353ad76 2019-02-08 stsp goto done;
1107 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1109 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1110 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1112 7154f6ce 2019-03-27 stsp goto done;
1113 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1114 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1115 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1116 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1117 7154f6ce 2019-03-27 stsp goto done;
1119 6353ad76 2019-02-08 stsp if (blen == 0) {
1120 6353ad76 2019-02-08 stsp if (flen != 0)
1121 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1123 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1124 6353ad76 2019-02-08 stsp if (blen != 0)
1125 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1127 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1128 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1129 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1130 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1134 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1137 6353ad76 2019-02-08 stsp hdrlen = 0;
1140 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1141 7154f6ce 2019-03-27 stsp rewind(f);
1142 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1146 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1148 6353ad76 2019-02-08 stsp fclose(f);
1149 9d31a1d8 2018-03-11 stsp return err;
1152 9d31a1d8 2018-03-11 stsp static const struct got_error *
1153 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1154 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1155 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1156 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1157 0584f854 2019-04-06 stsp void *progress_arg)
1159 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1160 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1161 6353ad76 2019-02-08 stsp char *ondisk_path;
1162 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1163 b8f41171 2019-02-10 stsp struct stat sb;
1165 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1166 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1168 b8f41171 2019-02-10 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1170 b8f41171 2019-02-10 stsp goto done;
1172 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1173 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, status, path);
1174 b8f41171 2019-02-10 stsp goto done;
1177 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1178 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1179 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1180 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1181 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1183 6353ad76 2019-02-08 stsp goto done;
1185 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1186 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1187 1430b4e0 2019-03-27 stsp SHA1_DIGEST_LENGTH) == 0)
1188 b8f41171 2019-02-10 stsp goto done;
1191 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1193 6353ad76 2019-02-08 stsp goto done;
1195 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1196 234035bc 2019-06-01 stsp int update_timestamps;
1197 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1198 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1199 234035bc 2019-06-01 stsp struct got_object_id id2;
1200 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1201 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1203 234035bc 2019-06-01 stsp goto done;
1205 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1206 234035bc 2019-06-01 stsp ondisk_path, path, sb.st_mode, blob, repo,
1207 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1208 234035bc 2019-06-01 stsp if (blob2)
1209 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1211 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1212 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1213 234035bc 2019-06-01 stsp * unmodified files again.
1215 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1216 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1217 234035bc 2019-06-01 stsp update_timestamps);
1218 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1219 13d9040b 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1220 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1221 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1223 13d9040b 2019-03-27 stsp goto done;
1225 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1226 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1227 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1229 13d9040b 2019-03-27 stsp goto done;
1230 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1231 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1233 13d9040b 2019-03-27 stsp goto done;
1235 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1237 6353ad76 2019-02-08 stsp free(ondisk_path);
1238 8da9e5f4 2019-01-12 stsp return err;
1241 90285c3b 2019-01-08 stsp static const struct got_error *
1242 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1244 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1245 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1247 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1248 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1250 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1251 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1252 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1254 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1255 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1256 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1257 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1258 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1262 90285c3b 2019-01-08 stsp parent = dirname(parent);
1265 90285c3b 2019-01-08 stsp free(ondisk_path);
1266 90285c3b 2019-01-08 stsp return err;
1269 708d8e67 2019-03-27 stsp static const struct got_error *
1270 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1271 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1272 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1274 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1275 708d8e67 2019-03-27 stsp unsigned char status;
1276 708d8e67 2019-03-27 stsp struct stat sb;
1277 708d8e67 2019-03-27 stsp char *ondisk_path;
1279 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1281 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1283 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1285 708d8e67 2019-03-27 stsp return err;
1287 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1288 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1289 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1291 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1292 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1294 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1297 708d8e67 2019-03-27 stsp return err;
1299 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1300 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1301 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1303 fc6346c4 2019-03-27 stsp return err;
1305 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1308 fc6346c4 2019-03-27 stsp return err;
1311 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1312 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1313 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1314 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1315 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1316 8da9e5f4 2019-01-12 stsp void *progress_arg;
1317 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1318 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1321 512f0d0e 2019-01-02 stsp static const struct got_error *
1322 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1323 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1325 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1327 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1328 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1330 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1331 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1334 8da9e5f4 2019-01-12 stsp static const struct got_error *
1335 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1337 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1339 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1340 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1342 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1343 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1346 9d31a1d8 2018-03-11 stsp static const struct got_error *
1347 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1349 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1350 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1351 8da9e5f4 2019-01-12 stsp char *path;
1353 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1354 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1356 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1357 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1359 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1361 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1362 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1364 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1365 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1367 8da9e5f4 2019-01-12 stsp free(path);
1368 0cd1c46a 2019-03-11 stsp return err;
1371 517bab73 2019-03-11 stsp const struct got_error *
1372 517bab73 2019-03-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1374 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1375 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1376 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1378 517bab73 2019-03-11 stsp *refname = NULL;
1380 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1381 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1382 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1384 0647c563 2019-03-11 stsp if (asprintf(refname, "%s-%s", GOT_WORKTREE_BASE_REF_PREFIX, uuidstr)
1386 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1387 0647c563 2019-03-11 stsp *refname = NULL;
1389 517bab73 2019-03-11 stsp free(uuidstr);
1390 517bab73 2019-03-11 stsp return err;
1394 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1395 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1397 517bab73 2019-03-11 stsp static const struct got_error *
1398 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1400 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1401 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1402 517bab73 2019-03-11 stsp char *refname;
1404 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1406 517bab73 2019-03-11 stsp return err;
1408 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1410 0cd1c46a 2019-03-11 stsp goto done;
1412 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1414 0cd1c46a 2019-03-11 stsp free(refname);
1416 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1417 9d31a1d8 2018-03-11 stsp return err;
1420 ebf99748 2019-05-09 stsp static const struct got_error *
1421 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1422 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1424 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1425 ebf99748 2019-05-09 stsp FILE *index = NULL;
1427 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1428 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1429 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1430 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1432 ebf99748 2019-05-09 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1433 ebf99748 2019-05-09 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1434 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1435 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1436 ebf99748 2019-05-09 stsp goto done;
1439 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1440 ebf99748 2019-05-09 stsp if (index == NULL) {
1441 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1442 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1444 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1445 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1446 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1449 ebf99748 2019-05-09 stsp if (err) {
1450 ebf99748 2019-05-09 stsp free(*fileindex_path);
1451 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1452 ebf99748 2019-05-09 stsp free(*fileindex);
1453 ebf99748 2019-05-09 stsp *fileindex = NULL;
1455 ebf99748 2019-05-09 stsp return err;
1458 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1459 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1460 c932eeeb 2019-05-22 stsp const char *path;
1461 c932eeeb 2019-05-22 stsp size_t path_len;
1462 c932eeeb 2019-05-22 stsp const char *entry_name;
1465 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1466 c932eeeb 2019-05-22 stsp static const struct got_error *
1467 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1469 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1471 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1472 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1473 c932eeeb 2019-05-22 stsp return NULL;
1474 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1475 c932eeeb 2019-05-22 stsp return NULL;
1477 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1478 c932eeeb 2019-05-22 stsp return NULL;
1481 9c6338c4 2019-06-02 stsp static const struct got_error *
1482 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1484 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1485 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1486 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1488 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1489 9c6338c4 2019-06-02 stsp fileindex_path);
1491 9c6338c4 2019-06-02 stsp goto done;
1493 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1495 9c6338c4 2019-06-02 stsp goto done;
1497 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1498 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1499 9c6338c4 2019-06-02 stsp fileindex_path);
1500 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1503 9c6338c4 2019-06-02 stsp if (new_index)
1504 9c6338c4 2019-06-02 stsp fclose(new_index);
1505 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1506 9c6338c4 2019-06-02 stsp return err;
1509 9d31a1d8 2018-03-11 stsp const struct got_error *
1510 c4cdcb68 2019-04-03 stsp got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1511 93a30277 2018-12-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1512 93a30277 2018-12-24 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1514 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1515 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1516 8da9e5f4 2019-01-12 stsp struct got_object_id *tree_id = NULL;
1517 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1518 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1519 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1520 f44ffd20 2019-02-04 stsp struct got_fileindex_diff_tree_cb diff_cb;
1521 8da9e5f4 2019-01-12 stsp struct diff_cb_arg arg;
1522 c4cdcb68 2019-04-03 stsp char *relpath = NULL, *entry_name = NULL;
1523 af12c6b9 2019-06-04 stsp struct bump_base_commit_id_arg bbc_arg;
1525 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1527 9d31a1d8 2018-03-11 stsp return err;
1530 51514078 2018-12-25 stsp * Read the file index.
1531 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1532 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1534 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1536 ebf99748 2019-05-09 stsp goto done;
1538 0cd1c46a 2019-03-11 stsp err = ref_base_commit(worktree, repo);
1540 0cd1c46a 2019-03-11 stsp goto done;
1542 eaccb85f 2018-12-25 stsp err = got_object_open_as_commit(&commit, repo,
1543 eaccb85f 2018-12-25 stsp worktree->base_commit_id);
1545 9d31a1d8 2018-03-11 stsp goto done;
1547 c4cdcb68 2019-04-03 stsp if (path[0]) {
1548 c4cdcb68 2019-04-03 stsp char *tree_path;
1549 c4cdcb68 2019-04-03 stsp int obj_type;
1550 c4cdcb68 2019-04-03 stsp relpath = strdup(path);
1551 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1552 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1553 c4cdcb68 2019-04-03 stsp goto done;
1555 c4cdcb68 2019-04-03 stsp if (asprintf(&tree_path, "%s%s%s", worktree->path_prefix,
1556 c4cdcb68 2019-04-03 stsp got_path_is_root_dir(worktree->path_prefix) ? "" : "/",
1557 c4cdcb68 2019-04-03 stsp path) == -1) {
1558 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1559 c4cdcb68 2019-04-03 stsp goto done;
1561 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1562 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, tree_path);
1563 c4cdcb68 2019-04-03 stsp free(tree_path);
1565 c4cdcb68 2019-04-03 stsp goto done;
1566 c4cdcb68 2019-04-03 stsp err = got_object_get_type(&obj_type, repo, tree_id);
1568 c4cdcb68 2019-04-03 stsp goto done;
1569 c4cdcb68 2019-04-03 stsp if (obj_type == GOT_OBJ_TYPE_BLOB) {
1570 c4cdcb68 2019-04-03 stsp /* Split provided path into parent dir + entry name. */
1571 c4cdcb68 2019-04-03 stsp if (strchr(path, '/') == NULL) {
1572 c4cdcb68 2019-04-03 stsp relpath = strdup("");
1573 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1574 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1575 c4cdcb68 2019-04-03 stsp goto done;
1577 c4cdcb68 2019-04-03 stsp tree_path = strdup(worktree->path_prefix);
1578 c4cdcb68 2019-04-03 stsp if (tree_path == NULL) {
1579 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1580 c4cdcb68 2019-04-03 stsp goto done;
1583 c4cdcb68 2019-04-03 stsp err = got_path_dirname(&relpath, path);
1585 c4cdcb68 2019-04-03 stsp goto done;
1586 c4cdcb68 2019-04-03 stsp if (asprintf(&tree_path, "%s%s%s",
1587 c4cdcb68 2019-04-03 stsp worktree->path_prefix,
1588 c4cdcb68 2019-04-03 stsp got_path_is_root_dir(
1589 c4cdcb68 2019-04-03 stsp worktree->path_prefix) ? "" : "/",
1590 c4cdcb68 2019-04-03 stsp relpath) == -1) {
1591 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1592 c4cdcb68 2019-04-03 stsp goto done;
1595 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1596 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, tree_path);
1597 c4cdcb68 2019-04-03 stsp free(tree_path);
1599 c4cdcb68 2019-04-03 stsp goto done;
1600 c4cdcb68 2019-04-03 stsp entry_name = basename(path);
1601 c4cdcb68 2019-04-03 stsp if (entry_name == NULL) {
1602 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", path);
1603 c4cdcb68 2019-04-03 stsp goto done;
1607 c4cdcb68 2019-04-03 stsp relpath = strdup("");
1608 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1609 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1610 c4cdcb68 2019-04-03 stsp goto done;
1612 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1613 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, worktree->path_prefix);
1615 c4cdcb68 2019-04-03 stsp goto done;
1618 8da9e5f4 2019-01-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1620 c4cdcb68 2019-04-03 stsp goto done;
1622 c4cdcb68 2019-04-03 stsp if (entry_name &&
1623 c4cdcb68 2019-04-03 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1624 c4cdcb68 2019-04-03 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1625 8da9e5f4 2019-01-12 stsp goto done;
1628 8da9e5f4 2019-01-12 stsp diff_cb.diff_old_new = diff_old_new;
1629 8da9e5f4 2019-01-12 stsp diff_cb.diff_old = diff_old;
1630 8da9e5f4 2019-01-12 stsp diff_cb.diff_new = diff_new;
1631 8da9e5f4 2019-01-12 stsp arg.fileindex = fileindex;
1632 8da9e5f4 2019-01-12 stsp arg.worktree = worktree;
1633 8da9e5f4 2019-01-12 stsp arg.repo = repo;
1634 8da9e5f4 2019-01-12 stsp arg.progress_cb = progress_cb;
1635 8da9e5f4 2019-01-12 stsp arg.progress_arg = progress_arg;
1636 8da9e5f4 2019-01-12 stsp arg.cancel_cb = cancel_cb;
1637 8da9e5f4 2019-01-12 stsp arg.cancel_arg = cancel_arg;
1638 af12c6b9 2019-06-04 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1639 c4cdcb68 2019-04-03 stsp entry_name, repo, &diff_cb, &arg);
1641 af12c6b9 2019-06-04 stsp goto sync;
1643 af12c6b9 2019-06-04 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1644 af12c6b9 2019-06-04 stsp bbc_arg.entry_name = entry_name;
1645 af12c6b9 2019-06-04 stsp bbc_arg.path = path;
1646 af12c6b9 2019-06-04 stsp bbc_arg.path_len = strlen(path);
1647 af12c6b9 2019-06-04 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1648 af12c6b9 2019-06-04 stsp bump_base_commit_id, &bbc_arg);
1650 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1651 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1652 af12c6b9 2019-06-04 stsp err = sync_err;
1654 9c6338c4 2019-06-02 stsp free(fileindex_path);
1655 c4cdcb68 2019-04-03 stsp free(relpath);
1657 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1658 9d31a1d8 2018-03-11 stsp if (commit)
1659 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1660 7426bbfd 2018-12-24 stsp got_fileindex_free(fileindex);
1661 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1662 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1663 9d31a1d8 2018-03-11 stsp err = unlockerr;
1664 f8d1f275 2019-02-04 stsp return err;
1667 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1668 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1669 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1670 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
1671 234035bc 2019-06-01 stsp void *progress_arg;
1672 234035bc 2019-06-01 stsp got_worktree_cancel_cb cancel_cb;
1673 234035bc 2019-06-01 stsp void *cancel_arg;
1676 234035bc 2019-06-01 stsp static const struct got_error *
1677 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
1678 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
1679 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
1680 234035bc 2019-06-01 stsp struct got_repository *repo)
1682 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
1683 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
1684 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
1685 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
1686 234035bc 2019-06-01 stsp struct stat sb;
1687 234035bc 2019-06-01 stsp unsigned char status;
1688 234035bc 2019-06-01 stsp int local_changes_subsumed;
1690 234035bc 2019-06-01 stsp if (blob1 && blob2) {
1691 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1692 234035bc 2019-06-01 stsp if (ie == NULL) {
1693 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1695 234035bc 2019-06-01 stsp return NULL;
1698 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1699 234035bc 2019-06-01 stsp path2) == -1)
1700 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1702 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1704 234035bc 2019-06-01 stsp goto done;
1706 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1707 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_MERGE,
1709 234035bc 2019-06-01 stsp goto done;
1711 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1712 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1713 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1714 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1715 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, status, path2);
1716 234035bc 2019-06-01 stsp goto done;
1719 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1720 234035bc 2019-06-01 stsp ondisk_path, path2, sb.st_mode, blob2, repo,
1721 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1722 234035bc 2019-06-01 stsp } else if (blob1) {
1723 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path1);
1724 234035bc 2019-06-01 stsp if (ie == NULL) {
1725 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1727 234035bc 2019-06-01 stsp return NULL;
1730 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1731 2b92fad7 2019-06-02 stsp path1) == -1)
1732 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
1734 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1736 2b92fad7 2019-06-02 stsp goto done;
1738 2b92fad7 2019-06-02 stsp switch (status) {
1739 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
1740 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1742 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
1744 2b92fad7 2019-06-02 stsp goto done;
1746 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1748 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
1749 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
1750 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1753 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1755 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
1756 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
1757 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
1758 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg,
1759 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
1761 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
1762 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg, status, path1);
1767 234035bc 2019-06-01 stsp } else if (blob2) {
1768 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1769 234035bc 2019-06-01 stsp path2) == -1)
1770 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1771 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1773 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
1776 234035bc 2019-06-01 stsp goto done;
1777 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1778 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1779 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1780 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1781 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, status,
1783 234035bc 2019-06-01 stsp goto done;
1785 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
1786 234035bc 2019-06-01 stsp NULL, ondisk_path, path2, sb.st_mode, blob2, repo,
1787 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1788 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1789 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
1790 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
1791 234035bc 2019-06-01 stsp blob2, 0);
1793 234035bc 2019-06-01 stsp goto done;
1796 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1797 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
1798 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
1799 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
1800 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
1801 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1803 234035bc 2019-06-01 stsp goto done;
1804 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
1805 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
1807 234035bc 2019-06-01 stsp goto done;
1808 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
1809 2b92fad7 2019-06-02 stsp if (err) {
1810 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
1811 2b92fad7 2019-06-02 stsp goto done;
1816 234035bc 2019-06-01 stsp free(ondisk_path);
1817 234035bc 2019-06-01 stsp return err;
1820 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
1821 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1822 234035bc 2019-06-01 stsp struct got_repository *repo;
1825 234035bc 2019-06-01 stsp static const struct got_error *
1826 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
1828 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
1829 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
1830 234035bc 2019-06-01 stsp unsigned char status;
1831 234035bc 2019-06-01 stsp struct stat sb;
1832 234035bc 2019-06-01 stsp char *ondisk_path;
1834 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
1835 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
1836 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
1837 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
1839 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
1841 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1843 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
1844 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
1846 234035bc 2019-06-01 stsp return err;
1847 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
1848 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
1850 234035bc 2019-06-01 stsp return NULL;
1853 234035bc 2019-06-01 stsp const struct got_error *
1854 234035bc 2019-06-01 stsp got_worktree_merge_files(struct got_worktree *worktree,
1855 234035bc 2019-06-01 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
1856 234035bc 2019-06-01 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1857 234035bc 2019-06-01 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1859 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1860 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
1861 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1862 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
1863 234035bc 2019-06-01 stsp char *fileindex_path = NULL;
1864 234035bc 2019-06-01 stsp struct got_fileindex *fileindex = NULL;
1865 234035bc 2019-06-01 stsp struct check_merge_ok_arg mok_arg;
1867 234035bc 2019-06-01 stsp err = lock_worktree(worktree, LOCK_EX);
1869 234035bc 2019-06-01 stsp return err;
1871 234035bc 2019-06-01 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1873 234035bc 2019-06-01 stsp goto done;
1875 234035bc 2019-06-01 stsp mok_arg.worktree = worktree;
1876 234035bc 2019-06-01 stsp mok_arg.repo = repo;
1877 234035bc 2019-06-01 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
1878 234035bc 2019-06-01 stsp &mok_arg);
1880 234035bc 2019-06-01 stsp goto done;
1882 03415a1a 2019-06-02 stsp if (commit_id1) {
1883 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
1884 03415a1a 2019-06-02 stsp worktree->path_prefix);
1886 03415a1a 2019-06-02 stsp goto done;
1888 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1890 03415a1a 2019-06-02 stsp goto done;
1893 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
1894 234035bc 2019-06-01 stsp worktree->path_prefix);
1896 234035bc 2019-06-01 stsp goto done;
1898 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1900 234035bc 2019-06-01 stsp goto done;
1902 234035bc 2019-06-01 stsp arg.worktree = worktree;
1903 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
1904 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
1905 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
1906 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
1907 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
1908 234035bc 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg);
1909 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1910 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1911 af12c6b9 2019-06-04 stsp err = sync_err;
1913 234035bc 2019-06-01 stsp got_fileindex_free(fileindex);
1914 234035bc 2019-06-01 stsp if (tree1)
1915 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
1916 234035bc 2019-06-01 stsp if (tree2)
1917 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
1919 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1920 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
1921 234035bc 2019-06-01 stsp err = unlockerr;
1922 234035bc 2019-06-01 stsp return err;
1925 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
1926 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
1927 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
1928 927df6b7 2019-02-10 stsp const char *status_path;
1929 927df6b7 2019-02-10 stsp size_t status_path_len;
1930 f8d1f275 2019-02-04 stsp struct got_repository *repo;
1931 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
1932 f8d1f275 2019-02-04 stsp void *status_arg;
1933 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
1934 f8d1f275 2019-02-04 stsp void *cancel_arg;
1937 f8d1f275 2019-02-04 stsp static const struct got_error *
1938 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
1939 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
1940 927df6b7 2019-02-10 stsp struct got_repository *repo)
1942 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
1943 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1944 927df6b7 2019-02-10 stsp struct stat sb;
1945 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
1947 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
1948 927df6b7 2019-02-10 stsp if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
1949 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1950 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
1951 016a88dd 2019-05-13 stsp err = (*status_cb)(status_arg, status, ie->path, &blob_id,
1952 016a88dd 2019-05-13 stsp &commit_id);
1954 927df6b7 2019-02-10 stsp return err;
1957 927df6b7 2019-02-10 stsp static const struct got_error *
1958 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
1959 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
1961 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
1962 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1963 f8d1f275 2019-02-04 stsp char *abspath;
1965 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1966 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1968 927df6b7 2019-02-10 stsp if (got_path_cmp(parent_path, a->status_path) != 0 &&
1969 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
1970 927df6b7 2019-02-10 stsp return NULL;
1972 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
1973 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
1974 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
1975 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1977 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
1978 f8d1f275 2019-02-04 stsp de->d_name) == -1)
1979 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1982 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
1984 f8d1f275 2019-02-04 stsp free(abspath);
1985 9d31a1d8 2018-03-11 stsp return err;
1988 f8d1f275 2019-02-04 stsp static const struct got_error *
1989 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1991 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
1992 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
1993 2ec1f75b 2019-03-26 stsp unsigned char status;
1995 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1996 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1998 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
1999 927df6b7 2019-02-10 stsp return NULL;
2001 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2002 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2003 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2004 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2006 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2007 016a88dd 2019-05-13 stsp return (*a->status_cb)(a->status_arg, status, ie->path, &blob_id,
2008 016a88dd 2019-05-13 stsp &commit_id);
2011 f8d1f275 2019-02-04 stsp static const struct got_error *
2012 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2014 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2015 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2016 f8d1f275 2019-02-04 stsp char *path = NULL;
2018 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2019 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2021 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
2022 2c201a36 2019-02-10 stsp return NULL;
2024 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2025 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2026 f8d1f275 2019-02-04 stsp return NULL;
2028 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2029 927df6b7 2019-02-10 stsp return NULL;
2031 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2032 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2033 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2035 f8d1f275 2019-02-04 stsp path = de->d_name;
2038 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
2039 016a88dd 2019-05-13 stsp NULL, NULL);
2040 f8d1f275 2019-02-04 stsp if (parent_path[0])
2041 f8d1f275 2019-02-04 stsp free(path);
2042 b72f483a 2019-02-05 stsp return err;
2045 f8d1f275 2019-02-04 stsp const struct got_error *
2046 927df6b7 2019-02-10 stsp got_worktree_status(struct got_worktree *worktree, const char *path,
2047 f8d1f275 2019-02-04 stsp struct got_repository *repo, got_worktree_status_cb status_cb,
2048 f8d1f275 2019-02-04 stsp void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2050 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2051 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2052 f8d1f275 2019-02-04 stsp char *fileindex_path = NULL;
2053 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex = NULL;
2054 f8d1f275 2019-02-04 stsp FILE *index = NULL;
2055 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2056 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2057 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2059 f8d1f275 2019-02-04 stsp fileindex = got_fileindex_alloc();
2060 f8d1f275 2019-02-04 stsp if (fileindex == NULL) {
2061 638f9024 2019-05-13 stsp err = got_error_from_errno("got_fileindex_alloc");
2062 f8d1f275 2019-02-04 stsp goto done;
2065 f8d1f275 2019-02-04 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2066 f8d1f275 2019-02-04 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2067 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2068 f8d1f275 2019-02-04 stsp fileindex_path = NULL;
2069 f8d1f275 2019-02-04 stsp goto done;
2072 f8d1f275 2019-02-04 stsp index = fopen(fileindex_path, "rb");
2073 f8d1f275 2019-02-04 stsp if (index == NULL) {
2074 f8d1f275 2019-02-04 stsp if (errno != ENOENT) {
2075 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", fileindex_path);
2076 f8d1f275 2019-02-04 stsp goto done;
2079 f8d1f275 2019-02-04 stsp err = got_fileindex_read(fileindex, index);
2080 f8d1f275 2019-02-04 stsp fclose(index);
2082 f8d1f275 2019-02-04 stsp goto done;
2085 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2086 927df6b7 2019-02-10 stsp worktree->root_path, path[0] ? "/" : "", path) == -1) {
2087 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2088 c513d110 2019-02-05 stsp goto done;
2090 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2091 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2092 2ec1f75b 2019-03-26 stsp if (errno == ENOTDIR || errno == ENOENT) {
2093 927df6b7 2019-02-10 stsp struct got_fileindex_entry *ie;
2094 927df6b7 2019-02-10 stsp ie = got_fileindex_entry_get(fileindex, path);
2095 927df6b7 2019-02-10 stsp if (ie == NULL) {
2096 927df6b7 2019-02-10 stsp err = got_error(GOT_ERR_BAD_PATH);
2097 927df6b7 2019-02-10 stsp goto done;
2099 927df6b7 2019-02-10 stsp err = report_file_status(ie, ondisk_path,
2100 927df6b7 2019-02-10 stsp status_cb, status_arg, repo);
2101 927df6b7 2019-02-10 stsp goto done;
2103 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2104 927df6b7 2019-02-10 stsp goto done;
2107 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old_new = status_old_new;
2108 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old = status_old;
2109 d43a8a88 2019-02-05 stsp fdiff_cb.diff_new = status_new;
2110 f8d1f275 2019-02-04 stsp arg.fileindex = fileindex;
2111 f8d1f275 2019-02-04 stsp arg.worktree = worktree;
2112 927df6b7 2019-02-10 stsp arg.status_path = path;
2113 927df6b7 2019-02-10 stsp arg.status_path_len = strlen(path);
2114 f8d1f275 2019-02-04 stsp arg.repo = repo;
2115 f8d1f275 2019-02-04 stsp arg.status_cb = status_cb;
2116 f8d1f275 2019-02-04 stsp arg.status_arg = status_arg;
2117 f8d1f275 2019-02-04 stsp arg.cancel_cb = cancel_cb;
2118 f8d1f275 2019-02-04 stsp arg.cancel_arg = cancel_arg;
2119 c7f4312f 2019-02-05 stsp err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
2120 927df6b7 2019-02-10 stsp path, repo, &fdiff_cb, &arg);
2122 f8d1f275 2019-02-04 stsp if (workdir)
2123 f8d1f275 2019-02-04 stsp closedir(workdir);
2124 927df6b7 2019-02-10 stsp free(ondisk_path);
2125 f8d1f275 2019-02-04 stsp free(fileindex_path);
2126 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2127 f8d1f275 2019-02-04 stsp return err;
2130 6c7ab921 2019-03-18 stsp const struct got_error *
2131 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2132 6c7ab921 2019-03-18 stsp const char *arg)
2134 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2135 6c7ab921 2019-03-18 stsp char *resolved, *path = NULL;
2136 6c7ab921 2019-03-18 stsp size_t len;
2138 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2140 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2141 6c7ab921 2019-03-18 stsp if (resolved == NULL)
2142 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", arg);
2144 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2145 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2146 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2147 6c7ab921 2019-03-18 stsp goto done;
2150 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2151 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2152 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2154 f6d88e1a 2019-05-29 stsp goto done;
2156 f6d88e1a 2019-05-29 stsp path = strdup("");
2157 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2158 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2159 f6d88e1a 2019-05-29 stsp goto done;
2163 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2164 6c7ab921 2019-03-18 stsp len = strlen(path);
2165 6c7ab921 2019-03-18 stsp while (path[len - 1] == '/') {
2166 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2170 6c7ab921 2019-03-18 stsp free(resolved);
2171 6c7ab921 2019-03-18 stsp if (err == NULL)
2172 6c7ab921 2019-03-18 stsp *wt_path = path;
2174 6c7ab921 2019-03-18 stsp free(path);
2175 d00136be 2019-03-26 stsp return err;
2178 07f5b47a 2019-06-02 stsp static const struct got_error *
2179 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2180 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2181 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2183 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2184 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2186 07f5b47a 2019-06-02 stsp /* Re-adding an existing entry is a no-op. */
2187 07f5b47a 2019-06-02 stsp if (got_fileindex_entry_get(fileindex, relpath) != NULL)
2188 07f5b47a 2019-06-02 stsp return NULL;
2190 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2192 07f5b47a 2019-06-02 stsp return err;
2194 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2195 07f5b47a 2019-06-02 stsp if (err) {
2196 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2197 07f5b47a 2019-06-02 stsp return err;
2200 07f5b47a 2019-06-02 stsp return report_file_status(ie, relpath, status_cb, status_arg, repo);
2203 d00136be 2019-03-26 stsp const struct got_error *
2204 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2205 1dd54920 2019-05-11 stsp struct got_pathlist_head *ondisk_paths,
2206 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2207 031a5338 2019-03-26 stsp struct got_repository *repo)
2209 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2210 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2211 9c6338c4 2019-06-02 stsp FILE *index = NULL;
2212 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2213 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2215 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2217 d00136be 2019-03-26 stsp return err;
2220 d00136be 2019-03-26 stsp fileindex = got_fileindex_alloc();
2221 d00136be 2019-03-26 stsp if (fileindex == NULL) {
2222 638f9024 2019-05-13 stsp err = got_error_from_errno("got_fileindex_alloc");
2223 d00136be 2019-03-26 stsp goto done;
2226 d00136be 2019-03-26 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2227 d00136be 2019-03-26 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2228 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2229 d00136be 2019-03-26 stsp fileindex_path = NULL;
2230 d00136be 2019-03-26 stsp goto done;
2233 d00136be 2019-03-26 stsp index = fopen(fileindex_path, "rb");
2234 d00136be 2019-03-26 stsp if (index == NULL) {
2235 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", fileindex_path);
2236 d00136be 2019-03-26 stsp goto done;
2239 d00136be 2019-03-26 stsp err = got_fileindex_read(fileindex, index);
2241 d00136be 2019-03-26 stsp goto done;
2243 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2244 1dd54920 2019-05-11 stsp char *relpath;
2245 1dd54920 2019-05-11 stsp err = got_path_skip_common_ancestor(&relpath,
2246 1dd54920 2019-05-11 stsp got_worktree_get_root_path(worktree), pe->path);
2249 07f5b47a 2019-06-02 stsp err = schedule_addition(pe->path, fileindex, relpath,
2250 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2251 1dd54920 2019-05-11 stsp free(relpath);
2255 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2256 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2257 af12c6b9 2019-06-04 stsp err = sync_err;
2259 d00136be 2019-03-26 stsp if (index) {
2260 d00136be 2019-03-26 stsp if (fclose(index) != 0 && err == NULL)
2261 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2263 d00136be 2019-03-26 stsp if (fileindex)
2264 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2265 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2266 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2267 d00136be 2019-03-26 stsp err = unlockerr;
2268 6c7ab921 2019-03-18 stsp return err;
2271 17ed4618 2019-06-02 stsp static const struct got_error *
2272 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2273 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2274 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2275 17ed4618 2019-06-02 stsp struct got_repository *repo)
2277 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2278 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2279 17ed4618 2019-06-02 stsp unsigned char status;
2280 17ed4618 2019-06-02 stsp struct stat sb;
2282 17ed4618 2019-06-02 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2283 17ed4618 2019-06-02 stsp if (ie == NULL)
2284 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2286 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2288 17ed4618 2019-06-02 stsp return err;
2290 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2291 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2292 17ed4618 2019-06-02 stsp return got_error_set_errno(ENOENT, ondisk_path);
2293 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_MODIFY)
2294 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_STATUS);
2295 17ed4618 2019-06-02 stsp if (!delete_local_mods)
2296 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_MODIFIED);
2299 17ed4618 2019-06-02 stsp if (unlink(ondisk_path) != 0)
2300 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2302 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2303 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2306 2ec1f75b 2019-03-26 stsp const struct got_error *
2307 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2308 17ed4618 2019-06-02 stsp struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2309 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2310 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2312 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2313 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2314 9c6338c4 2019-06-02 stsp FILE *index = NULL;
2315 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2316 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2318 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2320 2ec1f75b 2019-03-26 stsp return err;
2322 2ec1f75b 2019-03-26 stsp fileindex = got_fileindex_alloc();
2323 2ec1f75b 2019-03-26 stsp if (fileindex == NULL) {
2324 638f9024 2019-05-13 stsp err = got_error_from_errno("got_fileindex_alloc");
2325 2ec1f75b 2019-03-26 stsp goto done;
2328 2ec1f75b 2019-03-26 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2329 2ec1f75b 2019-03-26 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2330 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2331 2ec1f75b 2019-03-26 stsp fileindex_path = NULL;
2332 2ec1f75b 2019-03-26 stsp goto done;
2335 2ec1f75b 2019-03-26 stsp index = fopen(fileindex_path, "rb");
2336 2ec1f75b 2019-03-26 stsp if (index == NULL) {
2337 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", fileindex_path);
2338 2ec1f75b 2019-03-26 stsp goto done;
2341 2ec1f75b 2019-03-26 stsp err = got_fileindex_read(fileindex, index);
2343 2ec1f75b 2019-03-26 stsp goto done;
2345 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2346 17ed4618 2019-06-02 stsp char *relpath;
2347 17ed4618 2019-06-02 stsp err = got_path_skip_common_ancestor(&relpath,
2348 17ed4618 2019-06-02 stsp got_worktree_get_root_path(worktree), pe->path);
2351 17ed4618 2019-06-02 stsp err = schedule_for_deletion(pe->path, fileindex, relpath,
2352 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2353 17ed4618 2019-06-02 stsp free(relpath);
2357 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2358 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2359 af12c6b9 2019-06-04 stsp err = sync_err;
2361 2ec1f75b 2019-03-26 stsp if (index) {
2362 2ec1f75b 2019-03-26 stsp if (fclose(index) != 0 && err == NULL)
2363 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2365 2ec1f75b 2019-03-26 stsp if (fileindex)
2366 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2367 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2368 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2369 2ec1f75b 2019-03-26 stsp err = unlockerr;
2370 2ec1f75b 2019-03-26 stsp return err;
2373 e20a8b6f 2019-06-04 stsp static const struct got_error *
2374 e20a8b6f 2019-06-04 stsp revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2375 a129376b 2019-03-28 stsp const char *ondisk_path,
2376 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2377 a129376b 2019-03-28 stsp struct got_repository *repo)
2379 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
2380 e20a8b6f 2019-06-04 stsp char *relpath = NULL, *parent_path = NULL;
2381 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
2382 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
2383 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
2384 a129376b 2019-03-28 stsp const struct got_tree_entry *te;
2385 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
2386 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
2387 a129376b 2019-03-28 stsp unsigned char status;
2388 a129376b 2019-03-28 stsp struct stat sb;
2390 a129376b 2019-03-28 stsp err = got_path_skip_common_ancestor(&relpath,
2391 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree), ondisk_path);
2393 a129376b 2019-03-28 stsp goto done;
2395 a129376b 2019-03-28 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2396 a129376b 2019-03-28 stsp if (ie == NULL) {
2397 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_BAD_PATH);
2398 a129376b 2019-03-28 stsp goto done;
2401 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
2402 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
2403 a129376b 2019-03-28 stsp if (err) {
2404 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
2405 a129376b 2019-03-28 stsp goto done;
2406 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
2407 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
2408 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
2409 e20a8b6f 2019-06-04 stsp goto done;
2412 a129376b 2019-03-28 stsp if (got_path_is_root_dir(worktree->path_prefix)) {
2413 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
2414 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2415 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2416 a129376b 2019-03-28 stsp goto done;
2419 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
2420 a129376b 2019-03-28 stsp tree_path = strdup(worktree->path_prefix);
2421 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2422 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2423 a129376b 2019-03-28 stsp goto done;
2426 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
2427 a129376b 2019-03-28 stsp worktree->path_prefix, parent_path) == -1) {
2428 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2429 a129376b 2019-03-28 stsp goto done;
2434 a129376b 2019-03-28 stsp err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2435 a129376b 2019-03-28 stsp tree_path);
2437 a129376b 2019-03-28 stsp goto done;
2439 a129376b 2019-03-28 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2441 a129376b 2019-03-28 stsp goto done;
2443 a129376b 2019-03-28 stsp te_name = basename(ie->path);
2444 a129376b 2019-03-28 stsp if (te_name == NULL) {
2445 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ie->path);
2446 a129376b 2019-03-28 stsp goto done;
2449 a129376b 2019-03-28 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2451 a129376b 2019-03-28 stsp goto done;
2453 a129376b 2019-03-28 stsp te = got_object_tree_find_entry(tree, te_name);
2454 a129376b 2019-03-28 stsp if (te == NULL && status != GOT_STATUS_ADD) {
2455 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2456 a129376b 2019-03-28 stsp goto done;
2459 a129376b 2019-03-28 stsp switch (status) {
2460 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
2461 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2462 a129376b 2019-03-28 stsp got_fileindex_entry_remove(fileindex, ie);
2464 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
2465 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
2466 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
2467 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
2468 e20a8b6f 2019-06-04 stsp struct got_object_id id;
2469 a129376b 2019-03-28 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2470 a129376b 2019-03-28 stsp err = got_object_open_as_blob(&blob, repo, &id, 8192);
2472 a129376b 2019-03-28 stsp goto done;
2473 a129376b 2019-03-28 stsp err = install_blob(worktree, ondisk_path, ie->path,
2474 a129376b 2019-03-28 stsp te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2475 a129376b 2019-03-28 stsp progress_arg);
2477 a129376b 2019-03-28 stsp goto done;
2478 a129376b 2019-03-28 stsp if (status == GOT_STATUS_DELETE) {
2479 a129376b 2019-03-28 stsp err = update_blob_fileindex_entry(worktree,
2480 a129376b 2019-03-28 stsp fileindex, ie, ondisk_path, ie->path, blob, 1);
2482 a129376b 2019-03-28 stsp goto done;
2487 a129376b 2019-03-28 stsp goto done;
2490 a129376b 2019-03-28 stsp free(relpath);
2491 e20a8b6f 2019-06-04 stsp free(parent_path);
2492 a129376b 2019-03-28 stsp free(tree_path);
2494 a129376b 2019-03-28 stsp got_object_blob_close(blob);
2496 a129376b 2019-03-28 stsp got_object_tree_close(tree);
2497 a129376b 2019-03-28 stsp free(tree_id);
2498 e20a8b6f 2019-06-04 stsp return err;
2501 e20a8b6f 2019-06-04 stsp const struct got_error *
2502 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
2503 e20a8b6f 2019-06-04 stsp struct got_pathlist_head *ondisk_paths,
2504 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2505 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
2507 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
2508 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
2509 e20a8b6f 2019-06-04 stsp FILE *index = NULL;
2510 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2511 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
2512 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
2514 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
2516 e20a8b6f 2019-06-04 stsp return err;
2518 e20a8b6f 2019-06-04 stsp fileindex = got_fileindex_alloc();
2519 e20a8b6f 2019-06-04 stsp if (fileindex == NULL) {
2520 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("got_fileindex_alloc");
2521 e20a8b6f 2019-06-04 stsp goto done;
2524 e20a8b6f 2019-06-04 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2525 e20a8b6f 2019-06-04 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2526 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("asprintf");
2527 e20a8b6f 2019-06-04 stsp fileindex_path = NULL;
2528 e20a8b6f 2019-06-04 stsp goto done;
2531 e20a8b6f 2019-06-04 stsp index = fopen(fileindex_path, "rb");
2532 e20a8b6f 2019-06-04 stsp if (index == NULL) {
2533 e20a8b6f 2019-06-04 stsp err = got_error_from_errno2("fopen", fileindex_path);
2534 e20a8b6f 2019-06-04 stsp goto done;
2537 e20a8b6f 2019-06-04 stsp err = got_fileindex_read(fileindex, index);
2539 e20a8b6f 2019-06-04 stsp goto done;
2541 e20a8b6f 2019-06-04 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2542 e20a8b6f 2019-06-04 stsp err = revert_file(worktree, fileindex, pe->path,
2543 e20a8b6f 2019-06-04 stsp progress_cb, progress_arg, repo);
2547 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2548 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
2549 e20a8b6f 2019-06-04 stsp err = sync_err;
2551 a129376b 2019-03-28 stsp if (index) {
2552 a129376b 2019-03-28 stsp if (fclose(index) != 0 && err == NULL)
2553 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2555 a129376b 2019-03-28 stsp if (fileindex)
2556 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
2557 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2558 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
2559 a129376b 2019-03-28 stsp err = unlockerr;
2560 c4296144 2019-05-09 stsp return err;
2563 cf066bf8 2019-05-09 stsp static void
2564 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
2566 24519714 2019-05-09 stsp free(ct->path);
2567 44d03001 2019-05-09 stsp free(ct->in_repo_path);
2568 768aea60 2019-05-09 stsp free(ct->ondisk_path);
2569 e75eb4da 2019-05-10 stsp free(ct->blob_id);
2570 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
2571 b416585c 2019-05-13 stsp free(ct->base_commit_id);
2575 ed175427 2019-05-09 stsp struct collect_commitables_arg {
2576 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
2577 24519714 2019-05-09 stsp struct got_repository *repo;
2578 24519714 2019-05-09 stsp struct got_worktree *worktree;
2581 c4296144 2019-05-09 stsp static const struct got_error *
2582 036813ee 2019-05-09 stsp collect_commitables(void *arg, unsigned char status, const char *relpath,
2583 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
2585 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
2586 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
2587 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
2588 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
2589 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
2590 768aea60 2019-05-09 stsp struct stat sb;
2592 c4296144 2019-05-09 stsp if (status == GOT_STATUS_CONFLICT)
2593 c4296144 2019-05-09 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
2595 c4296144 2019-05-09 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2596 c4296144 2019-05-09 stsp status != GOT_STATUS_DELETE)
2597 c4296144 2019-05-09 stsp return NULL;
2599 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
2600 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2601 036813ee 2019-05-09 stsp goto done;
2603 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
2604 036813ee 2019-05-09 stsp parent_path = strdup("");
2605 69960a46 2019-05-09 stsp if (parent_path == NULL)
2606 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2608 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
2610 69960a46 2019-05-09 stsp return err;
2613 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
2614 cf066bf8 2019-05-09 stsp if (ct == NULL) {
2615 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
2616 c4296144 2019-05-09 stsp goto done;
2619 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2620 768aea60 2019-05-09 stsp relpath) == -1) {
2621 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2622 768aea60 2019-05-09 stsp goto done;
2624 768aea60 2019-05-09 stsp if (status == GOT_STATUS_DELETE) {
2625 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2627 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
2628 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
2629 768aea60 2019-05-09 stsp goto done;
2631 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
2634 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2635 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2636 44d03001 2019-05-09 stsp relpath) == -1) {
2637 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2638 44d03001 2019-05-09 stsp goto done;
2641 cf066bf8 2019-05-09 stsp ct->status = status;
2642 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
2643 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD) {
2644 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
2645 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
2646 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2647 b416585c 2019-05-13 stsp goto done;
2649 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
2650 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
2651 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2652 036813ee 2019-05-09 stsp goto done;
2655 24519714 2019-05-09 stsp ct->path = strdup(path);
2656 24519714 2019-05-09 stsp if (ct->path == NULL) {
2657 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2658 24519714 2019-05-09 stsp goto done;
2660 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2662 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
2663 ed175427 2019-05-09 stsp free_commitable(ct);
2664 24519714 2019-05-09 stsp free(parent_path);
2665 036813ee 2019-05-09 stsp free(path);
2666 a129376b 2019-03-28 stsp return err;
2669 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
2670 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
2671 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2672 036813ee 2019-05-09 stsp struct got_repository *);
2674 ed175427 2019-05-09 stsp static const struct got_error *
2675 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
2676 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
2677 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2678 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2679 afa376bf 2019-05-09 stsp struct got_repository *repo)
2681 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
2682 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
2683 036813ee 2019-05-09 stsp char *subpath;
2685 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
2686 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2687 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2689 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
2691 ed175427 2019-05-09 stsp return err;
2693 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2694 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2695 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
2696 036813ee 2019-05-09 stsp free(subpath);
2697 036813ee 2019-05-09 stsp return err;
2700 036813ee 2019-05-09 stsp static const struct got_error *
2701 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2703 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2704 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
2706 036813ee 2019-05-09 stsp *match = 0;
2708 036813ee 2019-05-09 stsp if (strchr(ct->path, '/') == NULL) {
2709 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
2710 0f63689d 2019-05-10 stsp return NULL;
2713 0f63689d 2019-05-10 stsp err = got_path_dirname(&ct_parent_path, ct->path);
2715 0f63689d 2019-05-10 stsp return err;
2716 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
2717 036813ee 2019-05-09 stsp free(ct_parent_path);
2718 036813ee 2019-05-09 stsp return err;
2721 768aea60 2019-05-09 stsp static mode_t
2722 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
2724 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2727 036813ee 2019-05-09 stsp static const struct got_error *
2728 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2729 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
2731 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2733 036813ee 2019-05-09 stsp *new_te = NULL;
2735 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
2737 036813ee 2019-05-09 stsp goto done;
2739 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2741 036813ee 2019-05-09 stsp free((*new_te)->id);
2742 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2743 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2744 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2745 036813ee 2019-05-09 stsp goto done;
2748 036813ee 2019-05-09 stsp if (err && *new_te) {
2749 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2750 036813ee 2019-05-09 stsp *new_te = NULL;
2752 036813ee 2019-05-09 stsp return err;
2755 036813ee 2019-05-09 stsp static const struct got_error *
2756 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2757 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
2759 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2760 036813ee 2019-05-09 stsp char *ct_name;
2762 036813ee 2019-05-09 stsp *new_te = NULL;
2764 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
2765 036813ee 2019-05-09 stsp if (*new_te == NULL)
2766 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
2768 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
2769 036813ee 2019-05-09 stsp if (ct_name == NULL) {
2770 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
2771 036813ee 2019-05-09 stsp goto done;
2773 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
2774 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
2775 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2776 036813ee 2019-05-09 stsp goto done;
2779 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2781 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2782 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2783 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2784 036813ee 2019-05-09 stsp goto done;
2787 036813ee 2019-05-09 stsp if (err && *new_te) {
2788 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2789 036813ee 2019-05-09 stsp *new_te = NULL;
2791 036813ee 2019-05-09 stsp return err;
2794 036813ee 2019-05-09 stsp static const struct got_error *
2795 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
2796 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
2798 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2799 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
2801 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2803 036813ee 2019-05-09 stsp return err;
2804 036813ee 2019-05-09 stsp if (new_pe == NULL)
2805 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
2806 036813ee 2019-05-09 stsp return NULL;
2809 afa376bf 2019-05-09 stsp static const struct got_error *
2810 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
2811 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
2813 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
2814 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
2815 afa376bf 2019-05-09 stsp ct_path++;
2816 016a88dd 2019-05-13 stsp return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id, NULL);
2819 036813ee 2019-05-09 stsp static const struct got_error *
2820 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
2821 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2823 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
2824 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
2825 44d03001 2019-05-09 stsp char *te_path;
2827 44d03001 2019-05-09 stsp *modified = 0;
2829 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
2830 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
2831 44d03001 2019-05-09 stsp te->name) == -1)
2832 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2834 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2835 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2836 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
2837 44d03001 2019-05-09 stsp strlen(te_path));
2838 44d03001 2019-05-09 stsp if (*modified)
2842 44d03001 2019-05-09 stsp free(te_path);
2843 44d03001 2019-05-09 stsp return err;
2846 44d03001 2019-05-09 stsp static const struct got_error *
2847 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
2848 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
2849 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
2851 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2852 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2854 036813ee 2019-05-09 stsp *ctp = NULL;
2856 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2857 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2858 036813ee 2019-05-09 stsp char *ct_name = NULL;
2859 036813ee 2019-05-09 stsp int path_matches;
2861 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_MODIFY &&
2862 036813ee 2019-05-09 stsp ct->status != GOT_STATUS_DELETE)
2865 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
2868 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
2870 036813ee 2019-05-09 stsp return err;
2871 036813ee 2019-05-09 stsp if (!path_matches)
2874 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
2875 036813ee 2019-05-09 stsp if (ct_name == NULL)
2876 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
2878 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
2881 036813ee 2019-05-09 stsp *ctp = ct;
2885 036813ee 2019-05-09 stsp return err;
2888 036813ee 2019-05-09 stsp static const struct got_error *
2889 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
2890 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
2891 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2892 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2893 036813ee 2019-05-09 stsp struct got_repository *repo)
2895 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2896 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
2897 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
2898 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
2899 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
2900 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2902 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
2903 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
2904 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
2906 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
2907 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2908 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2909 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
2911 a3df2849 2019-05-20 stsp if (ct->status != GOT_STATUS_ADD ||
2912 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
2915 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
2916 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
2919 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
2920 036813ee 2019-05-09 stsp pe->path);
2922 036813ee 2019-05-09 stsp goto done;
2924 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
2925 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
2926 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
2928 036813ee 2019-05-09 stsp goto done;
2929 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
2931 afa376bf 2019-05-09 stsp goto done;
2932 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
2934 2f51b5b3 2019-05-09 stsp char *subtree_path;
2936 2f51b5b3 2019-05-09 stsp *slash = '\0'; /* trim trailing path components */
2937 baa7dcfa 2019-05-09 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
2938 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
2939 2f51b5b3 2019-05-09 stsp child_path) == -1) {
2940 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2941 2f51b5b3 2019-05-09 stsp goto done;
2944 9ba0479c 2019-05-10 stsp new_te = calloc(1, sizeof(*new_te));
2945 9ba0479c 2019-05-10 stsp new_te->mode = S_IFDIR;
2946 9ba0479c 2019-05-10 stsp new_te->name = strdup(child_path);
2947 9ba0479c 2019-05-10 stsp if (new_te->name == NULL) {
2948 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2949 9ba0479c 2019-05-10 stsp got_object_tree_entry_close(new_te);
2950 9ba0479c 2019-05-10 stsp new_te = NULL;
2951 9ba0479c 2019-05-10 stsp goto done;
2953 baa7dcfa 2019-05-09 stsp err = write_tree(&new_te->id, NULL, subtree_path,
2954 afa376bf 2019-05-09 stsp commitable_paths, status_cb, status_arg, repo);
2955 2f51b5b3 2019-05-09 stsp free(subtree_path);
2956 9ba0479c 2019-05-10 stsp if (err) {
2957 9ba0479c 2019-05-10 stsp got_object_tree_entry_close(new_te);
2958 9ba0479c 2019-05-10 stsp new_te = NULL;
2959 036813ee 2019-05-09 stsp goto done;
2962 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2964 2f51b5b3 2019-05-09 stsp goto done;
2967 2f51b5b3 2019-05-09 stsp if (base_tree) {
2968 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
2969 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
2970 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
2971 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
2973 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
2974 44d03001 2019-05-09 stsp int modified;
2975 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
2977 036813ee 2019-05-09 stsp goto done;
2978 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
2979 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
2981 2f51b5b3 2019-05-09 stsp goto done;
2982 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
2983 44d03001 2019-05-09 stsp if (modified) {
2984 44d03001 2019-05-09 stsp free(new_te->id);
2985 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
2986 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
2987 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
2989 44d03001 2019-05-09 stsp goto done;
2991 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
2993 036813ee 2019-05-09 stsp goto done;
2997 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
2998 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
3000 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
3001 2f51b5b3 2019-05-09 stsp if (ct->status == GOT_STATUS_MODIFY) {
3002 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
3003 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
3005 2f51b5b3 2019-05-09 stsp goto done;
3006 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3008 2f51b5b3 2019-05-09 stsp goto done;
3010 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
3011 b416585c 2019-05-13 stsp status_arg);
3013 afa376bf 2019-05-09 stsp goto done;
3015 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
3016 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3018 2f51b5b3 2019-05-09 stsp goto done;
3019 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3021 2f51b5b3 2019-05-09 stsp goto done;
3026 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
3027 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
3028 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
3029 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
3030 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3032 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3034 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
3035 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
3036 ed175427 2019-05-09 stsp return err;
3039 ebf99748 2019-05-09 stsp static const struct got_error *
3040 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3041 ebf99748 2019-05-09 stsp struct got_object_id *new_base_commit_id, struct got_worktree *worktree)
3043 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err;
3044 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3045 ebf99748 2019-05-09 stsp struct got_fileindex *fileindex = NULL;
3046 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
3048 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3050 ebf99748 2019-05-09 stsp return err;
3052 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3053 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
3054 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3056 ebf99748 2019-05-09 stsp ie = got_fileindex_entry_get(fileindex, pe->path);
3058 ebf99748 2019-05-09 stsp if (ct->status == GOT_STATUS_DELETE) {
3059 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
3060 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
3062 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
3063 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
3064 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
3066 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
3067 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
3068 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
3071 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
3076 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3077 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3078 af12c6b9 2019-06-04 stsp err = sync_err;
3079 ebf99748 2019-05-09 stsp free(fileindex_path);
3080 ebf99748 2019-05-09 stsp got_fileindex_free(fileindex);
3081 d56d26ce 2019-05-10 stsp return err;
3084 d56d26ce 2019-05-10 stsp static const struct got_error *
3085 33ad4cbe 2019-05-12 jcs check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3086 d56d26ce 2019-05-10 stsp struct got_object_id *head_commit_id)
3088 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
3089 d56d26ce 2019-05-10 stsp struct got_object_id *id_in_head;
3092 b416585c 2019-05-13 stsp * Require that modified/deleted files are based on the branch head.
3093 b416585c 2019-05-13 stsp * This requirement could be relaxed to force less update operations
3094 b416585c 2019-05-13 stsp * on users but, for now, we want to play it safe and see how it goes.
3096 b416585c 2019-05-13 stsp * If this check is relaxed, it must still ensure that no modifications
3097 b416585c 2019-05-13 stsp * were made to files *and their parents* in commits between the file's
3098 b416585c 2019-05-13 stsp * base commit and the branch head. Otherwise, tree conflicts will not
3099 b416585c 2019-05-13 stsp * be detected reliably.
3101 b416585c 2019-05-13 stsp if (ct->status != GOT_STATUS_ADD) {
3102 b416585c 2019-05-13 stsp if (got_object_id_cmp(ct->base_commit_id, head_commit_id) != 0)
3103 b416585c 2019-05-13 stsp return got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3104 b416585c 2019-05-13 stsp return NULL;
3107 b416585c 2019-05-13 stsp /* Require that added files don't exist in the branch head. */
3108 b416585c 2019-05-13 stsp err = got_object_id_by_path(&id_in_head, repo, head_commit_id,
3109 b416585c 2019-05-13 stsp ct->in_repo_path);
3110 b416585c 2019-05-13 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3111 b416585c 2019-05-13 stsp return err;
3112 b416585c 2019-05-13 stsp if (id_in_head) {
3113 b416585c 2019-05-13 stsp free(id_in_head);
3114 b416585c 2019-05-13 stsp return got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3117 d56d26ce 2019-05-10 stsp free(id_in_head);
3118 b416585c 2019-05-13 stsp return NULL;
3121 c4296144 2019-05-09 stsp const struct got_error *
3122 c4296144 2019-05-09 stsp got_worktree_commit(struct got_object_id **new_commit_id,
3123 c4296144 2019-05-09 stsp struct got_worktree *worktree, const char *ondisk_path,
3124 33ad4cbe 2019-05-12 jcs const char *author, const char *committer,
3125 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3126 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3127 afa376bf 2019-05-09 stsp struct got_repository *repo)
3129 c4296144 2019-05-09 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3130 ed175427 2019-05-09 stsp struct collect_commitables_arg cc_arg;
3131 036813ee 2019-05-09 stsp struct got_pathlist_head commitable_paths;
3132 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
3133 bc70eb79 2019-05-09 stsp char *relpath = NULL;
3134 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
3135 36a38700 2019-05-10 stsp struct got_reference *head_ref = NULL;
3136 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
3137 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id = NULL;
3138 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
3139 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
3140 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
3141 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
3142 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
3143 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
3144 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
3146 c4296144 2019-05-09 stsp *new_commit_id = NULL;
3148 036813ee 2019-05-09 stsp TAILQ_INIT(&commitable_paths);
3149 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
3151 c4296144 2019-05-09 stsp if (ondisk_path) {
3152 c4296144 2019-05-09 stsp err = got_path_skip_common_ancestor(&relpath,
3153 c4296144 2019-05-09 stsp worktree->root_path, ondisk_path);
3155 c4296144 2019-05-09 stsp return err;
3158 c4296144 2019-05-09 stsp err = lock_worktree(worktree, LOCK_EX);
3160 c4296144 2019-05-09 stsp goto done;
3162 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3164 36a38700 2019-05-10 stsp goto done;
3165 36a38700 2019-05-10 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
3167 09f5bd90 2019-05-09 stsp goto done;
3169 036813ee 2019-05-09 stsp cc_arg.commitable_paths = &commitable_paths;
3170 24519714 2019-05-09 stsp cc_arg.worktree = worktree;
3171 24519714 2019-05-09 stsp cc_arg.repo = repo;
3172 675c7539 2019-05-09 stsp err = got_worktree_status(worktree, relpath ? relpath : "",
3173 ed175427 2019-05-09 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
3175 675c7539 2019-05-09 stsp goto done;
3177 33ad4cbe 2019-05-12 jcs if (TAILQ_EMPTY(&commitable_paths)) {
3178 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3182 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3184 588edf97 2019-05-10 stsp goto done;
3186 819f385b 2019-05-10 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3187 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3188 d56d26ce 2019-05-10 stsp err = check_ct_out_of_date(ct, repo, head_commit_id);
3190 819f385b 2019-05-10 stsp goto done;
3193 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3195 588edf97 2019-05-10 stsp goto done;
3197 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
3198 33ad4cbe 2019-05-12 jcs err = commit_msg_cb(&commitable_paths, &logmsg, commit_arg);
3203 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
3204 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3208 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
3209 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3210 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3211 cf066bf8 2019-05-09 stsp char *ondisk_path;
3213 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
3214 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
3217 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
3218 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
3219 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3220 cf066bf8 2019-05-09 stsp goto done;
3222 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3223 a7055788 2019-05-09 stsp free(ondisk_path);
3225 cf066bf8 2019-05-09 stsp goto done;
3228 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
3229 588edf97 2019-05-10 stsp err = write_tree(&new_tree_id, head_tree, "/", &commitable_paths,
3230 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3232 036813ee 2019-05-09 stsp goto done;
3234 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3236 de18fc63 2019-05-09 stsp goto done;
3237 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3238 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3239 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3240 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
3241 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
3242 33ad4cbe 2019-05-12 jcs free(logmsg);
3244 9d40349a 2019-05-09 stsp goto done;
3246 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
3247 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
3248 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
3249 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
3250 09f5bd90 2019-05-09 stsp goto done;
3252 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
3253 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3255 09f5bd90 2019-05-09 stsp goto done;
3256 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3258 ebf99748 2019-05-09 stsp goto done;
3259 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3260 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3261 09f5bd90 2019-05-09 stsp goto done;
3263 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
3264 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
3266 f2c16586 2019-05-09 stsp goto done;
3267 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
3269 f2c16586 2019-05-09 stsp goto done;
3271 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3273 09f5bd90 2019-05-09 stsp goto done;
3275 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
3277 ebf99748 2019-05-09 stsp goto done;
3279 ebf99748 2019-05-09 stsp err = update_fileindex_after_commit(&commitable_paths,
3280 ebf99748 2019-05-09 stsp *new_commit_id, worktree);
3282 ebf99748 2019-05-09 stsp goto done;
3284 c4296144 2019-05-09 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3285 c4296144 2019-05-09 stsp if (unlockerr && err == NULL)
3286 c4296144 2019-05-09 stsp err = unlockerr;
3287 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3288 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3289 ed175427 2019-05-09 stsp free_commitable(ct);
3291 036813ee 2019-05-09 stsp got_pathlist_free(&commitable_paths);
3292 588edf97 2019-05-10 stsp if (head_tree)
3293 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
3294 588edf97 2019-05-10 stsp if (head_commit)
3295 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
3296 c4296144 2019-05-09 stsp free(relpath);
3297 09f5bd90 2019-05-09 stsp free(head_commit_id);
3298 09f5bd90 2019-05-09 stsp free(head_commit_id2);
3299 36a38700 2019-05-10 stsp if (head_ref)
3300 36a38700 2019-05-10 stsp got_ref_close(head_ref);
3301 2f17228e 2019-05-12 stsp if (head_ref2) {
3302 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
3303 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
3304 2f17228e 2019-05-12 stsp err = unlockerr;
3305 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
3307 c4296144 2019-05-09 stsp return err;
3310 8656d6c4 2019-05-20 stsp const char *
3311 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
3313 8656d6c4 2019-05-20 stsp return ct->path;
3316 8656d6c4 2019-05-20 stsp unsigned int
3317 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
3319 8656d6c4 2019-05-20 stsp return ct->status;
