2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 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 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
19 133d2798 2019-01-08 stsp #include <sys/tree.h>
21 d1f6d47b 2019-02-04 stsp #include <dirent.h>
22 12ce7a6c 2019-08-12 stsp #include <limits.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 303e14b5 2019-09-23 stsp #include <time.h>
28 86c3caaf 2018-03-09 stsp #include <fcntl.h>
29 86c3caaf 2018-03-09 stsp #include <errno.h>
30 86c3caaf 2018-03-09 stsp #include <unistd.h>
31 9d31a1d8 2018-03-11 stsp #include <sha1.h>
32 9d31a1d8 2018-03-11 stsp #include <zlib.h>
33 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
34 512f0d0e 2019-01-02 stsp #include <libgen.h>
35 ec22038e 2019-03-10 stsp #include <uuid.h>
36 7154f6ce 2019-03-27 stsp #include <util.h>
38 86c3caaf 2018-03-09 stsp #include "got_error.h"
39 86c3caaf 2018-03-09 stsp #include "got_repository.h"
40 5261c201 2018-04-01 stsp #include "got_reference.h"
41 9d31a1d8 2018-03-11 stsp #include "got_object.h"
42 1dd54920 2019-05-11 stsp #include "got_path.h"
43 e6209546 2019-08-22 stsp #include "got_cancel.h"
44 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
45 511a516b 2018-05-19 stsp #include "got_opentemp.h"
46 234035bc 2019-06-01 stsp #include "got_diff.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
51 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
52 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
53 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
54 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
55 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
56 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
57 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
60 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
63 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
64 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
66 99724ed4 2018-03-10 stsp static const struct got_error *
67 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
69 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
72 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
73 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
75 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
80 507dc3bb 2018-12-29 stsp static const struct got_error *
81 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
83 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
84 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
85 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
86 507dc3bb 2018-12-29 stsp char *path = NULL;
88 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
89 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
90 507dc3bb 2018-12-29 stsp path = NULL;
94 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
98 507dc3bb 2018-12-29 stsp if (content) {
99 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
100 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
101 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
106 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
107 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
108 2a57020b 2019-02-20 stsp unlink(tmppath);
113 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
114 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
115 230a42bd 2019-05-11 jcs free(tmppath);
116 99724ed4 2018-03-10 stsp return err;
119 09fe317a 2018-03-11 stsp static const struct got_error *
120 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
122 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
123 09fe317a 2018-03-11 stsp char *path;
124 09fe317a 2018-03-11 stsp int fd = -1;
126 09fe317a 2018-03-11 stsp struct stat sb;
128 09fe317a 2018-03-11 stsp *content = NULL;
130 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
131 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
132 09fe317a 2018-03-11 stsp path = NULL;
136 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
137 09fe317a 2018-03-11 stsp if (fd == -1) {
138 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
139 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
141 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
144 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
145 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
146 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
150 e4b9a50c 2019-07-27 stsp if (fstat(fd, &sb) != 0) {
151 e4b9a50c 2019-07-27 stsp err = got_error_from_errno2("fstat", path);
154 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
155 09fe317a 2018-03-11 stsp if (*content == NULL) {
156 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
160 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
161 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
162 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
163 a2e6d162 2019-07-27 stsp got_error_path(path, GOT_ERR_WORKTREE_META));
166 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
167 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
170 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
173 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
174 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
175 09fe317a 2018-03-11 stsp free(path);
177 09fe317a 2018-03-11 stsp free(*content);
178 09fe317a 2018-03-11 stsp *content = NULL;
180 09fe317a 2018-03-11 stsp return err;
183 024e9686 2019-05-14 stsp static const struct got_error *
184 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
186 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
187 024e9686 2019-05-14 stsp char *refstr = NULL;
189 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
190 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
191 024e9686 2019-05-14 stsp if (refstr == NULL)
192 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
194 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
195 024e9686 2019-05-14 stsp if (refstr == NULL)
196 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
198 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
199 024e9686 2019-05-14 stsp free(refstr);
200 024e9686 2019-05-14 stsp return err;
203 86c3caaf 2018-03-09 stsp const struct got_error *
204 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
205 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
207 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
208 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
209 ec22038e 2019-03-10 stsp uuid_t uuid;
210 ec22038e 2019-03-10 stsp uint32_t uuid_status;
211 65596e15 2018-12-24 stsp int obj_type;
212 7ac97322 2018-03-11 stsp char *path_got = NULL;
213 1451e70d 2018-03-10 stsp char *formatstr = NULL;
214 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
215 65596e15 2018-12-24 stsp char *basestr = NULL;
216 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
218 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
219 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
223 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
225 65596e15 2018-12-24 stsp return err;
226 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
228 65596e15 2018-12-24 stsp return err;
229 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
230 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
232 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
233 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
234 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
237 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
238 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
239 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
243 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
244 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
245 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
248 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
249 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
253 056e7441 2018-03-11 stsp /* Create an empty lock file. */
254 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
258 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
259 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
263 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
264 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
268 65596e15 2018-12-24 stsp /* Record our base commit. */
269 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
272 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
276 1451e70d 2018-03-10 stsp /* Store path to repository. */
277 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
278 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
282 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
283 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
284 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
288 ec22038e 2019-03-10 stsp /* Generate UUID. */
289 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
290 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
291 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
294 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
295 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
296 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
299 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
303 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
304 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
305 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
308 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
313 65596e15 2018-12-24 stsp free(commit_id);
314 7ac97322 2018-03-11 stsp free(path_got);
315 1451e70d 2018-03-10 stsp free(formatstr);
316 0bb8a95e 2018-03-12 stsp free(absprefix);
317 65596e15 2018-12-24 stsp free(basestr);
318 ec22038e 2019-03-10 stsp free(uuidstr);
319 86c3caaf 2018-03-09 stsp return err;
322 247140b2 2019-02-05 stsp static const struct got_error *
323 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
325 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
326 7ac97322 2018-03-11 stsp char *path_got;
327 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
328 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
329 056e7441 2018-03-11 stsp char *path_lock = NULL;
330 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
331 6d9d28c3 2018-03-11 stsp int version, fd = -1;
332 6d9d28c3 2018-03-11 stsp const char *errstr;
333 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
334 c442a90d 2019-03-10 stsp uint32_t uuid_status;
336 6d9d28c3 2018-03-11 stsp *worktree = NULL;
338 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
339 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
340 7ac97322 2018-03-11 stsp path_got = NULL;
344 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
345 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
346 056e7441 2018-03-11 stsp path_lock = NULL;
350 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
351 6d9d28c3 2018-03-11 stsp if (fd == -1) {
352 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
353 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
357 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
361 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
362 6d9d28c3 2018-03-11 stsp if (errstr) {
363 a2e6d162 2019-07-27 stsp err = got_error_msg(GOT_ERR_WORKTREE_META,
364 a2e6d162 2019-07-27 stsp "could not parse work tree format version number");
367 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
368 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
372 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
373 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
374 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
377 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
379 7d61d891 2020-07-23 stsp (*worktree)->root_path = realpath(path, NULL);
380 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
381 7d61d891 2020-07-23 stsp err = got_error_from_errno2("realpath", path);
384 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
385 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
389 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
390 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
394 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
395 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
399 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
402 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
403 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
404 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_from_string");
408 c9956ddf 2019-09-08 stsp err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
412 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
413 eaccb85f 2018-12-25 stsp base_commit_id_str);
417 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
418 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
421 eaccb85f 2018-12-25 stsp got_repo_close(repo);
422 7ac97322 2018-03-11 stsp free(path_got);
423 056e7441 2018-03-11 stsp free(path_lock);
424 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
425 c442a90d 2019-03-10 stsp free(uuidstr);
426 bd165944 2019-03-10 stsp free(formatstr);
428 6d9d28c3 2018-03-11 stsp if (fd != -1)
430 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
431 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
432 6d9d28c3 2018-03-11 stsp *worktree = NULL;
434 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
436 6d9d28c3 2018-03-11 stsp return err;
439 247140b2 2019-02-05 stsp const struct got_error *
440 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
442 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
445 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
446 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
447 247140b2 2019-02-05 stsp return err;
448 247140b2 2019-02-05 stsp if (*worktree)
449 247140b2 2019-02-05 stsp return NULL;
450 247140b2 2019-02-05 stsp path = dirname(path);
451 d1542a27 2019-02-05 stsp if (path == NULL)
452 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
453 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
455 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
458 3a6ce05a 2019-02-11 stsp const struct got_error *
459 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
461 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
462 cde76477 2018-03-11 stsp free(worktree->repo_path);
463 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
464 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
465 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
466 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
467 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
468 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
469 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
470 7f11502c 2019-08-28 hiltjo free(worktree->root_path);
471 6d9d28c3 2018-03-11 stsp free(worktree);
472 3a6ce05a 2019-02-11 stsp return err;
475 2fbdb5ae 2018-12-29 stsp const char *
476 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
478 c7f4312f 2019-02-05 stsp return worktree->root_path;
481 c7f4312f 2019-02-05 stsp const char *
482 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
484 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
487 49520a32 2018-12-29 stsp const char *
488 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
490 f609be2e 2018-12-29 stsp return worktree->path_prefix;
493 e5dc7198 2018-12-29 stsp const struct got_error *
494 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
495 e5dc7198 2018-12-29 stsp const char *path_prefix)
497 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
499 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
500 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
501 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
503 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
504 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
505 e5dc7198 2018-12-29 stsp free(absprefix);
506 e5dc7198 2018-12-29 stsp return NULL;
509 bc70eb79 2019-05-09 stsp const char *
510 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
512 36a38700 2019-05-10 stsp return worktree->head_ref_name;
515 024e9686 2019-05-14 stsp const struct got_error *
516 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
517 024e9686 2019-05-14 stsp struct got_reference *head_ref)
519 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
520 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
522 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
523 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
524 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
525 024e9686 2019-05-14 stsp path_got = NULL;
529 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
530 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
531 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
535 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
539 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
540 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
542 024e9686 2019-05-14 stsp free(path_got);
544 024e9686 2019-05-14 stsp free(head_ref_name);
545 024e9686 2019-05-14 stsp return err;
548 b72f483a 2019-02-05 stsp struct got_object_id *
549 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
551 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
554 507dc3bb 2018-12-29 stsp const struct got_error *
555 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
556 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
558 507dc3bb 2018-12-29 stsp const struct got_error *err;
559 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
560 507dc3bb 2018-12-29 stsp char *id_str = NULL;
561 507dc3bb 2018-12-29 stsp char *path_got = NULL;
563 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
564 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
565 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
566 507dc3bb 2018-12-29 stsp path_got = NULL;
570 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
572 507dc3bb 2018-12-29 stsp return err;
574 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
575 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
579 507dc3bb 2018-12-29 stsp /* Record our base commit. */
580 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
583 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
587 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
588 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
589 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
590 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
595 507dc3bb 2018-12-29 stsp got_object_close(obj);
596 507dc3bb 2018-12-29 stsp free(id_str);
597 507dc3bb 2018-12-29 stsp free(path_got);
598 507dc3bb 2018-12-29 stsp return err;
601 9d31a1d8 2018-03-11 stsp static const struct got_error *
602 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
604 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
605 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
606 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
607 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
608 86c3caaf 2018-03-09 stsp return NULL;
611 21908da4 2019-01-13 stsp static const struct got_error *
612 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
614 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
615 4a1ddfc2 2019-01-12 stsp char *abspath;
617 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
618 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
620 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
621 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
622 ddcd8544 2019-03-11 stsp struct stat sb;
623 ddcd8544 2019-03-11 stsp err = NULL;
624 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
625 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
626 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
627 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
628 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
631 4a1ddfc2 2019-01-12 stsp free(abspath);
632 68c76935 2019-02-19 stsp return err;
635 68c76935 2019-02-19 stsp static const struct got_error *
636 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
638 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
639 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
640 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
641 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
646 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
647 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
648 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
651 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
652 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
653 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
656 68c76935 2019-02-19 stsp if (flen1 == 0) {
657 68c76935 2019-02-19 stsp if (flen2 != 0)
660 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
661 68c76935 2019-02-19 stsp if (flen1 != 0)
664 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
665 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
675 68c76935 2019-02-19 stsp return err;
678 68c76935 2019-02-19 stsp static const struct got_error *
679 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
681 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
682 68c76935 2019-02-19 stsp struct stat sb;
683 68c76935 2019-02-19 stsp size_t size1, size2;
684 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
688 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
692 68c76935 2019-02-19 stsp size1 = sb.st_size;
694 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
695 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
698 68c76935 2019-02-19 stsp size2 = sb.st_size;
700 68c76935 2019-02-19 stsp if (size1 != size2) {
702 68c76935 2019-02-19 stsp return NULL;
705 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
706 68c76935 2019-02-19 stsp if (f1 == NULL)
707 60522982 2019-12-15 stsp return got_error_from_errno2("fopen", f1_path);
709 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
710 68c76935 2019-02-19 stsp if (f2 == NULL) {
711 60522982 2019-12-15 stsp err = got_error_from_errno2("fopen", f2_path);
715 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
717 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
718 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
719 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
720 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
722 6353ad76 2019-02-08 stsp return err;
726 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
727 14c901f1 2019-08-08 stsp * the file at deriv_path acts as the first derived version, and the
728 14c901f1 2019-08-08 stsp * file on disk acts as the second derived version.
730 6353ad76 2019-02-08 stsp static const struct got_error *
731 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
732 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
733 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, const char *deriv_path,
734 f69721c3 2019-10-21 stsp const char *label_orig, const char *label_deriv,
735 f69721c3 2019-10-21 stsp struct got_repository *repo,
736 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
738 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
739 6353ad76 2019-02-08 stsp int merged_fd = -1;
740 14c901f1 2019-08-08 stsp FILE *f_orig = NULL;
741 14c901f1 2019-08-08 stsp char *blob_orig_path = NULL;
742 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
743 234035bc 2019-06-01 stsp int overlapcnt = 0;
744 af54ae4a 2019-02-19 stsp char *parent;
745 3b9f0f87 2020-07-23 stsp char *symlink_path = NULL;
746 3b9f0f87 2020-07-23 stsp FILE *symlinkf = NULL;
748 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
750 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
751 af54ae4a 2019-02-19 stsp if (parent == NULL)
752 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
754 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
755 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
757 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
761 af54ae4a 2019-02-19 stsp free(base_path);
762 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
763 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
764 af54ae4a 2019-02-19 stsp base_path = NULL;
768 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
771 46b6ee73 2019-06-04 stsp if (blob_orig) {
772 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
773 46b6ee73 2019-06-04 stsp blob_orig);
778 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
779 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
780 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
785 3b9f0f87 2020-07-23 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
786 3b9f0f87 2020-07-23 stsp * target path into a temporary file and use that file with diff3.
788 3b9f0f87 2020-07-23 stsp if (S_ISLNK(st_mode)) {
789 3b9f0f87 2020-07-23 stsp char target_path[PATH_MAX];
790 3b9f0f87 2020-07-23 stsp ssize_t target_len;
793 3b9f0f87 2020-07-23 stsp free(base_path);
794 3b9f0f87 2020-07-23 stsp if (asprintf(&base_path, "%s/got-symlink-merge",
795 3b9f0f87 2020-07-23 stsp parent) == -1) {
796 3b9f0f87 2020-07-23 stsp err = got_error_from_errno("asprintf");
797 3b9f0f87 2020-07-23 stsp base_path = NULL;
800 3b9f0f87 2020-07-23 stsp err = got_opentemp_named(&symlink_path, &symlinkf, base_path);
803 3b9f0f87 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
804 3b9f0f87 2020-07-23 stsp sizeof(target_path));
805 3b9f0f87 2020-07-23 stsp if (target_len == -1) {
806 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
809 3b9f0f87 2020-07-23 stsp n = fwrite(target_path, 1, target_len, symlinkf);
810 3b9f0f87 2020-07-23 stsp if (n != target_len) {
811 3b9f0f87 2020-07-23 stsp err = got_ferror(symlinkf, GOT_ERR_IO);
814 3b9f0f87 2020-07-23 stsp if (fflush(symlinkf) == EOF) {
815 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("fflush", symlink_path);
820 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
821 3b9f0f87 2020-07-23 stsp blob_orig_path, symlink_path ? symlink_path : ondisk_path,
822 3b9f0f87 2020-07-23 stsp label_deriv, label_orig, NULL);
826 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
827 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
831 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
832 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
836 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
837 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
838 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
839 68c76935 2019-02-19 stsp merged_path);
844 2ad902c0 2019-12-15 stsp if (fchmod(merged_fd, st_mode) != 0) {
845 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
849 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
850 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
851 230a42bd 2019-05-11 jcs ondisk_path);
856 fdcb7daf 2019-12-15 stsp if (merged_path)
857 fdcb7daf 2019-12-15 stsp unlink(merged_path);
859 3b9f0f87 2020-07-23 stsp if (symlink_path) {
860 3b9f0f87 2020-07-23 stsp if (unlink(symlink_path) == -1 && err == NULL)
861 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("unlink", symlink_path);
863 3b9f0f87 2020-07-23 stsp if (symlinkf && fclose(symlinkf) == EOF && err == NULL)
864 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("fclose", symlink_path);
865 3b9f0f87 2020-07-23 stsp free(symlink_path);
866 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
867 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
868 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
869 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
870 6353ad76 2019-02-08 stsp free(merged_path);
871 af54ae4a 2019-02-19 stsp free(base_path);
872 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
873 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
874 46b6ee73 2019-06-04 stsp free(blob_orig_path);
876 af57b12a 2020-07-23 stsp return err;
879 af57b12a 2020-07-23 stsp static const struct got_error *
880 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
881 af57b12a 2020-07-23 stsp size_t target_len)
883 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
884 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
885 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
886 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
887 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
888 af57b12a 2020-07-23 stsp ondisk_path);
889 af57b12a 2020-07-23 stsp return NULL;
893 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
894 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
895 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
896 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
898 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
899 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
901 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
902 993e2a1b 2020-07-23 stsp * has deleted this symlink.
904 11cc08c1 2020-07-23 stsp static const struct got_error *
905 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
906 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
907 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
909 11cc08c1 2020-07-23 stsp const struct got_error *err;
910 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
911 11cc08c1 2020-07-23 stsp FILE *f = NULL;
913 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
915 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
917 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
918 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
919 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
923 11cc08c1 2020-07-23 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict");
927 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
928 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
929 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
930 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
931 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
932 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
933 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
934 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
935 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
936 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
940 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
941 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
944 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
945 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
948 11cc08c1 2020-07-23 stsp if (chmod(ondisk_path, GOT_DEFAULT_FILE_MODE) == -1) {
949 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("chmod", ondisk_path);
953 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
954 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
955 11cc08c1 2020-07-23 stsp free(path);
956 11cc08c1 2020-07-23 stsp free(id_str);
957 11cc08c1 2020-07-23 stsp free(label_deriv);
958 11cc08c1 2020-07-23 stsp return err;
961 d219f183 2020-07-23 stsp /* forward declaration */
962 d219f183 2020-07-23 stsp static const struct got_error *
963 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
964 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
965 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
966 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
969 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
970 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
971 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
972 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
974 af57b12a 2020-07-23 stsp static const struct got_error *
975 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
976 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
977 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
978 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
979 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
981 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
982 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
983 af57b12a 2020-07-23 stsp struct stat sb;
984 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
985 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
986 11cc08c1 2020-07-23 stsp int have_local_change = 0;
987 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
989 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
990 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
992 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
993 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
994 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
995 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
996 af57b12a 2020-07-23 stsp ondisk_path);
999 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
1001 526a746f 2020-07-23 stsp if (blob_orig) {
1002 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
1004 526a746f 2020-07-23 stsp goto done;
1007 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
1008 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
1009 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
1010 11cc08c1 2020-07-23 stsp have_local_change = 1;
1012 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
1013 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
1014 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
1015 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
1016 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
1018 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
1019 11cc08c1 2020-07-23 stsp if (ancestor_target) {
1020 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
1021 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1023 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
1024 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
1025 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
1026 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1029 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
1030 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1031 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
1032 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
1034 11cc08c1 2020-07-23 stsp goto done;
1035 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1038 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
1039 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
1040 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
1041 af57b12a 2020-07-23 stsp strlen(deriv_target));
1043 af57b12a 2020-07-23 stsp goto done;
1044 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1045 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
1046 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
1047 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
1048 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
1049 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1052 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1053 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
1054 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
1056 ea7786be 2020-07-23 stsp goto done;
1057 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1063 af57b12a 2020-07-23 stsp free(ancestor_target);
1064 14c901f1 2019-08-08 stsp return err;
1068 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
1069 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
1070 14c901f1 2019-08-08 stsp * acts as the second derived version.
1072 14c901f1 2019-08-08 stsp static const struct got_error *
1073 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
1074 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
1075 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
1076 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
1077 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1078 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1080 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
1081 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
1082 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
1083 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
1085 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
1087 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
1088 14c901f1 2019-08-08 stsp if (parent == NULL)
1089 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
1091 14c901f1 2019-08-08 stsp free(base_path);
1092 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1093 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1094 14c901f1 2019-08-08 stsp base_path = NULL;
1095 14c901f1 2019-08-08 stsp goto done;
1098 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1100 14c901f1 2019-08-08 stsp goto done;
1101 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1102 14c901f1 2019-08-08 stsp blob_deriv);
1104 14c901f1 2019-08-08 stsp goto done;
1106 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1108 14c901f1 2019-08-08 stsp goto done;
1109 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1110 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1111 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1112 14c901f1 2019-08-08 stsp goto done;
1115 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
1116 f69721c3 2019-10-21 stsp ondisk_path, path, st_mode, blob_deriv_path, label_orig,
1117 f69721c3 2019-10-21 stsp label_deriv, repo, progress_cb, progress_arg);
1119 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
1120 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1121 14c901f1 2019-08-08 stsp free(base_path);
1122 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1123 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1124 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1126 6353ad76 2019-02-08 stsp free(id_str);
1127 818c7501 2019-07-11 stsp free(label_deriv);
1128 4a1ddfc2 2019-01-12 stsp return err;
1131 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1132 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1133 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1134 65b05cec 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_object_id *blob_id)
1136 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1137 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1139 65b05cec 2020-07-23 stsp *new_iep = NULL;
1141 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1143 054041d0 2020-06-24 stsp return err;
1145 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(new_ie, ondisk_path,
1146 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1148 054041d0 2020-06-24 stsp goto done;
1150 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1153 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1155 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1156 13d9040b 2019-03-27 stsp return err;
1159 1ebedb77 2019-10-19 stsp static mode_t
1160 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1162 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1164 1ebedb77 2019-10-19 stsp if (executable) {
1165 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1166 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1167 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1168 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1169 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1170 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1173 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1176 8ba819a3 2020-07-23 stsp /* forward declaration */
1177 13d9040b 2019-03-27 stsp static const struct got_error *
1178 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1179 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1180 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1181 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1182 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1183 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1186 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1187 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1189 8ba819a3 2020-07-23 stsp static const struct got_error *
1190 5a1fbc73 2020-07-23 stsp replace_existing_symlink(const char *ondisk_path, const char *target_path,
1191 5a1fbc73 2020-07-23 stsp size_t target_len)
1193 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1194 5a1fbc73 2020-07-23 stsp ssize_t elen;
1195 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1199 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1200 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1201 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1202 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1203 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1204 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1206 5a1fbc73 2020-07-23 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
1207 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1208 5a1fbc73 2020-07-23 stsp if (errno != ELOOP)
1209 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1211 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1212 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1213 5a1fbc73 2020-07-23 stsp if (elen == -1)
1214 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1216 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1217 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1218 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1221 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1222 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1223 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1224 5a1fbc73 2020-07-23 stsp return err;
1227 3c1ec782 2020-07-23 stsp static const struct got_error *
1228 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1229 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1231 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1232 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1233 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1235 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1237 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1238 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1239 3c1ec782 2020-07-23 stsp return NULL;
1243 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1244 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1245 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1246 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1247 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1249 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1250 3c1ec782 2020-07-23 stsp char *abspath;
1251 3c1ec782 2020-07-23 stsp char *parent = dirname(ondisk_path);
1252 3c1ec782 2020-07-23 stsp if (parent == NULL)
1253 3c1ec782 2020-07-23 stsp return got_error_from_errno2("dirname", ondisk_path);
1254 3c1ec782 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1)
1255 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1256 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1257 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1258 3c1ec782 2020-07-23 stsp free(abspath);
1259 3c1ec782 2020-07-23 stsp return err;
1261 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1262 3c1ec782 2020-07-23 stsp free(abspath);
1264 3c1ec782 2020-07-23 stsp return err;
1266 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1268 3c1ec782 2020-07-23 stsp return err;
1271 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1272 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1273 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1274 3c1ec782 2020-07-23 stsp return NULL;
1277 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1278 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1279 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1280 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1281 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1282 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1284 3c1ec782 2020-07-23 stsp free(path_got);
1285 3c1ec782 2020-07-23 stsp return NULL;
1288 5a1fbc73 2020-07-23 stsp static const struct got_error *
1289 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1290 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1291 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1292 c90c8ce3 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1293 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1295 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1296 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1297 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1298 906c123b 2020-07-23 stsp char *path_got = NULL;
1299 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1300 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1302 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1305 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1306 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1307 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1308 8ba819a3 2020-07-23 stsp * in the blob object.
1311 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1312 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1313 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1314 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1315 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1316 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1317 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1318 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1319 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1320 3b9f0f87 2020-07-23 stsp progress_arg);
1322 8ba819a3 2020-07-23 stsp if (len > 0) {
1323 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1324 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1325 8ba819a3 2020-07-23 stsp len - hdrlen);
1326 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1327 8ba819a3 2020-07-23 stsp hdrlen = 0;
1329 8ba819a3 2020-07-23 stsp } while (len != 0);
1330 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1332 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1333 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1335 3c1ec782 2020-07-23 stsp return err;
1337 3c1ec782 2020-07-23 stsp if (*is_bad_symlink) {
1338 906c123b 2020-07-23 stsp /* install as a regular file */
1339 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1340 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1341 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1342 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1343 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1344 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1345 906c123b 2020-07-23 stsp goto done;
1348 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1349 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1350 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1351 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1352 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1353 c90c8ce3 2020-07-23 stsp goto done;
1355 5a1fbc73 2020-07-23 stsp err = replace_existing_symlink(ondisk_path,
1356 5a1fbc73 2020-07-23 stsp target_path, target_len);
1358 f35fa46a 2020-07-23 stsp goto done;
1359 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1360 5a1fbc73 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1361 6e1eade5 2020-07-23 stsp reverting_versioned_file ?
1362 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_UPDATE,
1365 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1368 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1369 f35fa46a 2020-07-23 stsp char *parent = dirname(ondisk_path);
1370 f35fa46a 2020-07-23 stsp if (parent == NULL) {
1371 f35fa46a 2020-07-23 stsp err = got_error_from_errno2("dirname",
1372 f35fa46a 2020-07-23 stsp ondisk_path);
1373 f35fa46a 2020-07-23 stsp goto done;
1375 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1377 f35fa46a 2020-07-23 stsp goto done;
1379 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1380 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1382 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1383 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1384 f35fa46a 2020-07-23 stsp goto done;
1388 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1389 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1390 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1391 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1392 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1393 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1394 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1395 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1396 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1397 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1398 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1399 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1400 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1402 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1403 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1405 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1406 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1407 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1409 906c123b 2020-07-23 stsp free(path_got);
1410 8ba819a3 2020-07-23 stsp return err;
1413 8ba819a3 2020-07-23 stsp static const struct got_error *
1414 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1415 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1416 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1417 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1418 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1419 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1421 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1422 507dc3bb 2018-12-29 stsp int fd = -1;
1423 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1424 507dc3bb 2018-12-29 stsp int update = 0;
1425 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1427 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1428 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
1429 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1430 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1431 21908da4 2019-01-13 stsp char *parent = dirname(path);
1432 21908da4 2019-01-13 stsp if (parent == NULL)
1433 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
1434 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1436 21908da4 2019-01-13 stsp return err;
1437 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1438 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1439 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1440 21908da4 2019-01-13 stsp if (fd == -1)
1441 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1442 230a42bd 2019-05-11 jcs ondisk_path);
1443 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1444 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1445 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1446 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1447 3b9f0f87 2020-07-23 stsp goto done;
1449 bd6aa359 2020-07-23 stsp if (!S_ISREG(st_mode) && !installing_bad_symlink) {
1450 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1451 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1452 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1453 507dc3bb 2018-12-29 stsp goto done;
1455 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1456 507dc3bb 2018-12-29 stsp ondisk_path);
1458 507dc3bb 2018-12-29 stsp goto done;
1459 507dc3bb 2018-12-29 stsp update = 1;
1462 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1465 bd6aa359 2020-07-23 stsp if (progress_cb) {
1466 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1467 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1469 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1470 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1473 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1474 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1476 bd6aa359 2020-07-23 stsp goto done;
1479 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1481 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1482 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1485 9d31a1d8 2018-03-11 stsp if (len > 0) {
1486 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1487 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1488 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1489 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1490 b87c6f83 2018-12-24 stsp goto done;
1491 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1492 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1493 b87c6f83 2018-12-24 stsp goto done;
1495 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1497 9d31a1d8 2018-03-11 stsp } while (len != 0);
1499 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1500 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1501 816dc654 2019-02-16 stsp goto done;
1504 507dc3bb 2018-12-29 stsp if (update) {
1505 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1506 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1507 230a42bd 2019-05-11 jcs ondisk_path);
1508 2a57020b 2019-02-20 stsp unlink(tmppath);
1509 68ed9ba5 2019-02-10 stsp goto done;
1513 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1514 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1515 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1516 1ebedb77 2019-10-19 stsp goto done;
1520 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1521 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1522 507dc3bb 2018-12-29 stsp free(tmppath);
1523 6353ad76 2019-02-08 stsp return err;
1526 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1527 6353ad76 2019-02-08 stsp static const struct got_error *
1528 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1530 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1531 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1532 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1533 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1534 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1536 7154f6ce 2019-03-27 stsp int i = 0;
1537 7154f6ce 2019-03-27 stsp char *line;
1538 7154f6ce 2019-03-27 stsp size_t len;
1539 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1541 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1542 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1543 7154f6ce 2019-03-27 stsp if (line == NULL) {
1544 7154f6ce 2019-03-27 stsp if (feof(f))
1546 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1550 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1551 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1553 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1559 7154f6ce 2019-03-27 stsp return err;
1562 e2b1e152 2019-07-13 stsp static int
1563 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1565 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1566 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1569 1ebedb77 2019-10-19 stsp static int
1570 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1572 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1573 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1574 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1575 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1576 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1577 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1580 c363b2c1 2019-08-03 stsp static unsigned char
1581 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1583 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1584 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1585 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1586 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1587 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1588 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1589 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1591 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1595 a919d5c4 2020-07-23 stsp static const struct got_error *
1596 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1597 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1598 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1600 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1601 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1602 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1603 a919d5c4 2020-07-23 stsp ssize_t elen;
1604 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1605 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1606 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1608 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1610 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1612 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1614 a919d5c4 2020-07-23 stsp return err;
1615 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1617 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1618 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1620 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1622 a919d5c4 2020-07-23 stsp if (len > 0) {
1623 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1624 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1625 a919d5c4 2020-07-23 stsp len - hdrlen);
1626 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1627 a919d5c4 2020-07-23 stsp hdrlen = 0;
1629 a919d5c4 2020-07-23 stsp } while (len != 0);
1630 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1632 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1633 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1634 a919d5c4 2020-07-23 stsp if (elen == -1)
1635 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1637 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1638 a919d5c4 2020-07-23 stsp if (elen == -1)
1639 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1642 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1643 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1645 a919d5c4 2020-07-23 stsp return NULL;
1648 7154f6ce 2019-03-27 stsp static const struct got_error *
1649 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1650 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1651 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1653 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1654 6353ad76 2019-02-08 stsp struct got_object_id id;
1655 6353ad76 2019-02-08 stsp size_t hdrlen;
1656 1338848f 2019-12-13 stsp int fd = -1;
1657 6353ad76 2019-02-08 stsp FILE *f = NULL;
1658 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1659 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1660 6353ad76 2019-02-08 stsp size_t flen, blen;
1661 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1663 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1666 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1667 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1668 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1670 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1671 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1672 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1673 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1674 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1676 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1677 882ef1b9 2019-12-13 stsp goto done;
1679 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1680 3d35a492 2019-12-13 stsp goto done;
1683 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1684 a919d5c4 2020-07-23 stsp if (fd == -1 && errno != ENOENT && errno != ELOOP)
1685 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1686 a919d5c4 2020-07-23 stsp else if (fd == -1 && errno == ELOOP) {
1687 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1688 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1689 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1690 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1691 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1692 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1694 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1695 3d35a492 2019-12-13 stsp goto done;
1697 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1698 1338848f 2019-12-13 stsp goto done;
1702 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1703 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1704 1338848f 2019-12-13 stsp goto done;
1707 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1708 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1709 1338848f 2019-12-13 stsp goto done;
1710 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1711 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1712 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1713 1338848f 2019-12-13 stsp goto done;
1716 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1717 f179e66d 2020-07-23 stsp goto done;
1719 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1720 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1721 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1722 1338848f 2019-12-13 stsp goto done;
1725 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1726 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1727 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1729 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1731 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1733 1338848f 2019-12-13 stsp goto done;
1735 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1736 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1737 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1738 a919d5c4 2020-07-23 stsp goto done;
1741 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1742 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1743 ab0d4361 2019-12-13 stsp if (fd == -1) {
1744 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1745 ab0d4361 2019-12-13 stsp goto done;
1749 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1750 6353ad76 2019-02-08 stsp if (f == NULL) {
1751 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1752 6353ad76 2019-02-08 stsp goto done;
1755 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1757 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1758 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1760 7154f6ce 2019-03-27 stsp goto done;
1761 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1762 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1763 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1764 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1765 7154f6ce 2019-03-27 stsp goto done;
1767 6353ad76 2019-02-08 stsp if (blen == 0) {
1768 6353ad76 2019-02-08 stsp if (flen != 0)
1769 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1771 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1772 6353ad76 2019-02-08 stsp if (blen != 0)
1773 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1775 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1776 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1777 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1778 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1782 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1785 6353ad76 2019-02-08 stsp hdrlen = 0;
1788 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1789 7154f6ce 2019-03-27 stsp rewind(f);
1790 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1791 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1792 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1795 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1796 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1797 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1798 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1799 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1800 9d31a1d8 2018-03-11 stsp return err;
1804 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1805 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1807 e2b1e152 2019-07-13 stsp static const struct got_error *
1808 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1809 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1811 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1812 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1813 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1815 e2b1e152 2019-07-13 stsp return NULL;
1818 9d31a1d8 2018-03-11 stsp static const struct got_error *
1819 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1820 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1821 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1822 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1823 0584f854 2019-04-06 stsp void *progress_arg)
1825 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1826 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1827 6353ad76 2019-02-08 stsp char *ondisk_path;
1828 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1829 b8f41171 2019-02-10 stsp struct stat sb;
1831 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1832 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1835 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1836 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1837 a76c42e6 2019-08-03 stsp goto done;
1839 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1842 abb4604f 2019-07-27 stsp goto done;
1843 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1844 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1846 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1847 c90c8ce3 2020-07-23 stsp status = GOT_STATUS_UNVERSIONED;
1850 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1851 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1852 b8f41171 2019-02-10 stsp goto done;
1854 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1855 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1857 5036ab18 2020-04-18 stsp goto done;
1860 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1861 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1862 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1863 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1864 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1865 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1867 e2b1e152 2019-07-13 stsp goto done;
1868 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1870 6353ad76 2019-02-08 stsp goto done;
1872 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1873 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1874 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1875 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1876 b8f41171 2019-02-10 stsp goto done;
1880 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1882 6353ad76 2019-02-08 stsp goto done;
1884 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1885 234035bc 2019-06-01 stsp int update_timestamps;
1886 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1887 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1888 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1889 234035bc 2019-06-01 stsp struct got_object_id id2;
1890 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1891 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1893 f69721c3 2019-10-21 stsp goto done;
1895 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1896 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1897 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1898 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1899 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1900 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1901 f69721c3 2019-10-21 stsp goto done;
1903 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1904 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1905 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1906 234035bc 2019-06-01 stsp goto done;
1909 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1910 36bf999c 2020-07-23 stsp char *link_target;
1911 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1913 36bf999c 2020-07-23 stsp goto done;
1914 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1915 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1916 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1917 36bf999c 2020-07-23 stsp free(link_target);
1919 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1920 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1921 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1922 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1924 f69721c3 2019-10-21 stsp free(label_orig);
1925 234035bc 2019-06-01 stsp if (blob2)
1926 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1928 909d120e 2019-09-22 stsp goto done;
1930 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1931 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1932 234035bc 2019-06-01 stsp * unmodified files again.
1934 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1935 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1936 234035bc 2019-06-01 stsp update_timestamps);
1937 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1938 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1939 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1940 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1941 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1943 1ee397ad 2019-07-12 stsp goto done;
1944 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1945 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1947 13d9040b 2019-03-27 stsp goto done;
1949 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1950 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1951 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1952 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
1953 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
1954 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
1955 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
1957 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1958 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
1959 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
1960 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
1961 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
1964 13d9040b 2019-03-27 stsp goto done;
1967 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1968 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 1);
1970 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
1971 054041d0 2020-06-24 stsp worktree->base_commit_id, ondisk_path, path,
1972 054041d0 2020-06-24 stsp &blob->id);
1975 13d9040b 2019-03-27 stsp goto done;
1977 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
1978 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
1979 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
1982 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1984 6353ad76 2019-02-08 stsp free(ondisk_path);
1985 8da9e5f4 2019-01-12 stsp return err;
1988 90285c3b 2019-01-08 stsp static const struct got_error *
1989 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1991 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1992 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1994 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1995 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1997 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1998 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1999 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2001 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
2002 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
2003 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
2004 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2005 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2009 90285c3b 2019-01-08 stsp parent = dirname(parent);
2012 90285c3b 2019-01-08 stsp free(ondisk_path);
2013 90285c3b 2019-01-08 stsp return err;
2016 708d8e67 2019-03-27 stsp static const struct got_error *
2017 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2018 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2019 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2021 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2022 708d8e67 2019-03-27 stsp unsigned char status;
2023 708d8e67 2019-03-27 stsp struct stat sb;
2024 708d8e67 2019-03-27 stsp char *ondisk_path;
2026 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2027 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2029 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2031 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2033 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2035 5a58a424 2020-06-23 stsp goto done;
2037 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2038 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2039 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2040 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2041 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2042 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2043 993e2a1b 2020-07-23 stsp goto done;
2045 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2046 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2047 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2048 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2050 993e2a1b 2020-07-23 stsp goto done;
2051 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2052 993e2a1b 2020-07-23 stsp ie->path);
2053 993e2a1b 2020-07-23 stsp goto done;
2056 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2057 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2058 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2060 5a58a424 2020-06-23 stsp goto done;
2062 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2063 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2065 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
2068 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2070 5a58a424 2020-06-23 stsp goto done;
2071 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2072 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2074 5a58a424 2020-06-23 stsp goto done;
2076 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2079 5a58a424 2020-06-23 stsp free(ondisk_path);
2080 fc6346c4 2019-03-27 stsp return err;
2083 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2084 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2085 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2086 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2087 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2088 8da9e5f4 2019-01-12 stsp void *progress_arg;
2089 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2090 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2093 512f0d0e 2019-01-02 stsp static const struct got_error *
2094 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2095 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2097 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2099 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2100 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2102 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2103 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2106 8da9e5f4 2019-01-12 stsp static const struct got_error *
2107 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2109 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2111 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2112 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2114 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2115 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2118 9d31a1d8 2018-03-11 stsp static const struct got_error *
2119 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2121 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2122 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2123 8da9e5f4 2019-01-12 stsp char *path;
2125 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2126 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2128 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2129 63c5ca5d 2019-08-24 stsp return NULL;
2131 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2132 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2134 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2136 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2137 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2139 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2140 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2142 8da9e5f4 2019-01-12 stsp free(path);
2143 0cd1c46a 2019-03-11 stsp return err;
2146 b2118c49 2020-07-28 stsp const struct got_error *
2147 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2149 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2151 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2152 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2153 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2154 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2157 b2118c49 2020-07-28 stsp return NULL;
2160 818c7501 2019-07-11 stsp static const struct got_error *
2161 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2163 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2164 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2166 517bab73 2019-03-11 stsp *refname = NULL;
2168 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2170 b2118c49 2020-07-28 stsp return err;
2172 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2173 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2174 0647c563 2019-03-11 stsp *refname = NULL;
2176 517bab73 2019-03-11 stsp free(uuidstr);
2177 517bab73 2019-03-11 stsp return err;
2180 818c7501 2019-07-11 stsp const struct got_error *
2181 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2183 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2186 818c7501 2019-07-11 stsp static const struct got_error *
2187 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2189 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2190 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2193 818c7501 2019-07-11 stsp static const struct got_error *
2194 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2196 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2199 818c7501 2019-07-11 stsp static const struct got_error *
2200 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2202 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2203 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2206 818c7501 2019-07-11 stsp static const struct got_error *
2207 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2209 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2210 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2213 0ebf8283 2019-07-24 stsp static const struct got_error *
2214 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2216 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2217 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2220 0ebf8283 2019-07-24 stsp static const struct got_error *
2221 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2223 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2224 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2227 0ebf8283 2019-07-24 stsp static const struct got_error *
2228 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2230 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2231 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2234 0ebf8283 2019-07-24 stsp static const struct got_error *
2235 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2237 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2238 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2241 0ebf8283 2019-07-24 stsp const struct got_error *
2242 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2243 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2245 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2246 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2247 0ebf8283 2019-07-24 stsp *path = NULL;
2248 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2250 0ebf8283 2019-07-24 stsp return NULL;
2254 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2255 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2257 517bab73 2019-03-11 stsp static const struct got_error *
2258 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2260 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2261 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2262 517bab73 2019-03-11 stsp char *refname;
2264 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2266 517bab73 2019-03-11 stsp return err;
2268 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2270 0cd1c46a 2019-03-11 stsp goto done;
2272 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2274 0cd1c46a 2019-03-11 stsp free(refname);
2276 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2277 3e3a69f1 2019-07-25 stsp return err;
2280 3e3a69f1 2019-07-25 stsp static const struct got_error *
2281 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2283 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2285 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2286 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2287 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2288 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2290 9d31a1d8 2018-03-11 stsp return err;
2294 ebf99748 2019-05-09 stsp static const struct got_error *
2295 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2296 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2298 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2299 ebf99748 2019-05-09 stsp FILE *index = NULL;
2301 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2302 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2303 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2304 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2306 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2308 ebf99748 2019-05-09 stsp goto done;
2310 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2311 ebf99748 2019-05-09 stsp if (index == NULL) {
2312 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2313 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2315 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2316 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
2317 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2320 ebf99748 2019-05-09 stsp if (err) {
2321 ebf99748 2019-05-09 stsp free(*fileindex_path);
2322 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2323 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2324 ebf99748 2019-05-09 stsp *fileindex = NULL;
2326 ebf99748 2019-05-09 stsp return err;
2329 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2330 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2331 c932eeeb 2019-05-22 stsp const char *path;
2332 c932eeeb 2019-05-22 stsp size_t path_len;
2333 c932eeeb 2019-05-22 stsp const char *entry_name;
2334 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2335 a484d721 2019-06-10 stsp void *progress_arg;
2338 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2339 c932eeeb 2019-05-22 stsp static const struct got_error *
2340 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2342 1ee397ad 2019-07-12 stsp const struct got_error *err;
2343 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2345 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2346 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2347 c932eeeb 2019-05-22 stsp return NULL;
2348 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2349 102ff934 2019-06-11 stsp return NULL;
2351 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2352 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2353 c932eeeb 2019-05-22 stsp return NULL;
2355 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2356 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2357 edd02c5e 2019-07-11 stsp ie->path);
2359 1ee397ad 2019-07-12 stsp return err;
2361 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2362 c932eeeb 2019-05-22 stsp return NULL;
2365 9c6338c4 2019-06-02 stsp static const struct got_error *
2366 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2368 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2369 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2370 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2371 867630bb 2020-01-17 stsp struct timespec timeout;
2373 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2374 9c6338c4 2019-06-02 stsp fileindex_path);
2376 9c6338c4 2019-06-02 stsp goto done;
2378 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2380 9c6338c4 2019-06-02 stsp goto done;
2382 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2383 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2384 9c6338c4 2019-06-02 stsp fileindex_path);
2385 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2389 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2390 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2391 867630bb 2020-01-17 stsp * was recorded in the file index.
2393 867630bb 2020-01-17 stsp timeout.tv_sec = 0;
2394 867630bb 2020-01-17 stsp timeout.tv_nsec = 1;
2395 867630bb 2020-01-17 stsp nanosleep(&timeout, NULL);
2397 9c6338c4 2019-06-02 stsp if (new_index)
2398 9c6338c4 2019-06-02 stsp fclose(new_index);
2399 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2400 9c6338c4 2019-06-02 stsp return err;
2403 6ced4176 2019-07-12 stsp static const struct got_error *
2404 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2405 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2406 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2408 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2409 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2410 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2411 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2413 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2414 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2415 6ced4176 2019-07-12 stsp *tree_id = NULL;
2417 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2418 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2419 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2420 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2421 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2422 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2423 6ced4176 2019-07-12 stsp goto done;
2425 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2426 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2428 6ced4176 2019-07-12 stsp goto done;
2429 6ced4176 2019-07-12 stsp return NULL;
2432 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2434 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2435 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2436 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2437 6ced4176 2019-07-12 stsp goto done;
2440 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2441 6ced4176 2019-07-12 stsp in_repo_path);
2443 6ced4176 2019-07-12 stsp goto done;
2445 6ced4176 2019-07-12 stsp free(in_repo_path);
2446 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2448 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2450 6ced4176 2019-07-12 stsp goto done;
2452 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2453 6ced4176 2019-07-12 stsp /* Check out a single file. */
2454 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2455 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2456 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2457 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2458 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2459 6ced4176 2019-07-12 stsp goto done;
2461 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2462 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2463 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2464 6ced4176 2019-07-12 stsp goto done;
2467 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2468 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2470 6ced4176 2019-07-12 stsp return err;
2471 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2472 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2473 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2474 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2475 6ced4176 2019-07-12 stsp goto done;
2478 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2479 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2481 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2482 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2483 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2484 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2485 6ced4176 2019-07-12 stsp goto done;
2487 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2488 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2489 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2490 6ced4176 2019-07-12 stsp goto done;
2495 6ced4176 2019-07-12 stsp free(in_repo_path);
2496 6ced4176 2019-07-12 stsp if (err) {
2497 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2498 6ced4176 2019-07-12 stsp free(*tree_relpath);
2499 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2500 6ced4176 2019-07-12 stsp free(*tree_id);
2501 6ced4176 2019-07-12 stsp *tree_id = NULL;
2503 07ed472d 2019-07-12 stsp return err;
2506 07ed472d 2019-07-12 stsp static const struct got_error *
2507 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2508 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2509 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2510 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2512 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2513 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2514 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2515 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2516 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2518 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2519 7f47418f 2019-12-20 stsp if (err) {
2520 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2521 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2522 7f47418f 2019-12-20 stsp goto done;
2523 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2524 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2526 7f47418f 2019-12-20 stsp return err;
2529 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2530 07ed472d 2019-07-12 stsp worktree->base_commit_id);
2532 07ed472d 2019-07-12 stsp goto done;
2534 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2536 07ed472d 2019-07-12 stsp goto done;
2538 07ed472d 2019-07-12 stsp if (entry_name &&
2539 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2540 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2541 07ed472d 2019-07-12 stsp goto done;
2544 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2545 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2546 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2547 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2548 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2549 07ed472d 2019-07-12 stsp arg.repo = repo;
2550 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2551 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2552 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2553 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2554 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2555 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2558 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2559 07ed472d 2019-07-12 stsp if (commit)
2560 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2561 6ced4176 2019-07-12 stsp return err;
2564 9d31a1d8 2018-03-11 stsp const struct got_error *
2565 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2566 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2567 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2568 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2570 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2571 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2572 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2573 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2574 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2575 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2576 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2577 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
2578 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2579 f2ea84fa 2019-07-27 stsp int entry_type;
2580 f2ea84fa 2019-07-27 stsp char *relpath;
2581 f2ea84fa 2019-07-27 stsp char *entry_name;
2582 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2583 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2585 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
2587 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2589 9d31a1d8 2018-03-11 stsp return err;
2591 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2592 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2593 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2594 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2595 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2596 f2ea84fa 2019-07-27 stsp goto done;
2599 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2600 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2601 f2ea84fa 2019-07-27 stsp if (err) {
2602 f2ea84fa 2019-07-27 stsp free(tpd);
2603 6ced4176 2019-07-12 stsp goto done;
2606 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2607 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2608 f2ea84fa 2019-07-27 stsp if (err) {
2609 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2610 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2611 f2ea84fa 2019-07-27 stsp free(tpd);
2612 f2ea84fa 2019-07-27 stsp goto done;
2615 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2617 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2621 51514078 2018-12-25 stsp * Read the file index.
2622 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2623 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2625 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2627 c4cdcb68 2019-04-03 stsp goto done;
2629 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2630 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2631 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2633 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2634 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2635 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2639 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2640 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2641 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2642 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2643 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2644 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2645 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2646 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2650 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2652 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2653 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2654 af12c6b9 2019-06-04 stsp err = sync_err;
2656 9c6338c4 2019-06-02 stsp free(fileindex_path);
2658 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2659 9d31a1d8 2018-03-11 stsp if (commit)
2660 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2661 5ade8233 2019-07-12 stsp if (fileindex)
2662 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2663 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2664 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2665 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2666 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2667 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2668 f2ea84fa 2019-07-27 stsp free(tpd);
2670 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2671 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2672 9d31a1d8 2018-03-11 stsp err = unlockerr;
2673 f8d1f275 2019-02-04 stsp return err;
2676 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2677 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2678 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2679 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2680 234035bc 2019-06-01 stsp void *progress_arg;
2681 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2682 234035bc 2019-06-01 stsp void *cancel_arg;
2683 f69721c3 2019-10-21 stsp const char *label_orig;
2684 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2687 234035bc 2019-06-01 stsp static const struct got_error *
2688 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2689 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2690 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2691 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2693 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2694 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2695 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2696 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2697 234035bc 2019-06-01 stsp struct stat sb;
2698 234035bc 2019-06-01 stsp unsigned char status;
2699 234035bc 2019-06-01 stsp int local_changes_subsumed;
2701 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2702 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2703 d6c87207 2019-08-02 stsp strlen(path2));
2704 1ee397ad 2019-07-12 stsp if (ie == NULL)
2705 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2706 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2708 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2709 234035bc 2019-06-01 stsp path2) == -1)
2710 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2712 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2715 234035bc 2019-06-01 stsp goto done;
2717 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2718 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2719 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2720 234035bc 2019-06-01 stsp goto done;
2722 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2723 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2724 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2725 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2726 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2727 234035bc 2019-06-01 stsp goto done;
2730 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2731 36bf999c 2020-07-23 stsp char *link_target2;
2732 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2734 36bf999c 2020-07-23 stsp goto done;
2735 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2736 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2737 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2738 36bf999c 2020-07-23 stsp free(link_target2);
2740 af57b12a 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2741 af57b12a 2020-07-23 stsp blob1, ondisk_path, path2, sb.st_mode,
2742 af57b12a 2020-07-23 stsp a->label_orig, blob2, a->commit_id2, repo,
2743 af57b12a 2020-07-23 stsp a->progress_cb, a->progress_arg);
2745 234035bc 2019-06-01 stsp } else if (blob1) {
2746 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2747 d6c87207 2019-08-02 stsp strlen(path1));
2748 1ee397ad 2019-07-12 stsp if (ie == NULL)
2749 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2750 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2752 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2753 2b92fad7 2019-06-02 stsp path1) == -1)
2754 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2756 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2759 2b92fad7 2019-06-02 stsp goto done;
2761 2b92fad7 2019-06-02 stsp switch (status) {
2762 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2763 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2764 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2766 1ee397ad 2019-07-12 stsp goto done;
2767 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2769 2b92fad7 2019-06-02 stsp goto done;
2771 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2773 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2774 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2775 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2776 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2778 1ee397ad 2019-07-12 stsp goto done;
2780 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2782 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2783 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2784 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2785 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2786 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2788 1ee397ad 2019-07-12 stsp goto done;
2790 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2791 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2793 1ee397ad 2019-07-12 stsp goto done;
2798 234035bc 2019-06-01 stsp } else if (blob2) {
2799 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2800 234035bc 2019-06-01 stsp path2) == -1)
2801 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2802 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2803 d6c87207 2019-08-02 stsp strlen(path2));
2805 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2806 7f91a133 2019-12-13 stsp -1, NULL, repo);
2808 234035bc 2019-06-01 stsp goto done;
2809 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2810 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2811 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2812 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2813 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2814 1ee397ad 2019-07-12 stsp status, path2);
2815 234035bc 2019-06-01 stsp goto done;
2817 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2818 36bf999c 2020-07-23 stsp char *link_target2;
2819 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2822 36bf999c 2020-07-23 stsp goto done;
2823 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2824 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2825 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2826 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2827 36bf999c 2020-07-23 stsp free(link_target2);
2828 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2829 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2830 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2831 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2832 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2833 526a746f 2020-07-23 stsp a->progress_arg);
2835 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2836 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2839 dfe9fba0 2020-07-23 stsp goto done;
2840 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2841 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2842 054041d0 2020-06-24 stsp ondisk_path, blob2->id.sha1,
2843 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2845 234035bc 2019-06-01 stsp goto done;
2848 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2849 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2850 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2851 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2852 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2853 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
2855 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2856 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2857 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2860 234035bc 2019-06-01 stsp goto done;
2861 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2863 234035bc 2019-06-01 stsp goto done;
2864 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2865 3969253a 2020-03-07 stsp NULL, NULL, 1);
2866 3969253a 2020-03-07 stsp if (err) {
2867 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2868 3969253a 2020-03-07 stsp goto done;
2870 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2871 2b92fad7 2019-06-02 stsp if (err) {
2872 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2873 2b92fad7 2019-06-02 stsp goto done;
2875 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2876 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2877 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2882 234035bc 2019-06-01 stsp free(ondisk_path);
2883 234035bc 2019-06-01 stsp return err;
2886 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2887 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2888 234035bc 2019-06-01 stsp struct got_repository *repo;
2891 234035bc 2019-06-01 stsp static const struct got_error *
2892 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2894 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2895 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2896 234035bc 2019-06-01 stsp unsigned char status;
2897 234035bc 2019-06-01 stsp struct stat sb;
2898 234035bc 2019-06-01 stsp char *ondisk_path;
2900 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2901 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2902 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2903 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2905 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2907 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2909 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2910 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2912 234035bc 2019-06-01 stsp return err;
2913 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2914 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2916 234035bc 2019-06-01 stsp return NULL;
2919 818c7501 2019-07-11 stsp static const struct got_error *
2920 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2921 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2922 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2923 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2924 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2926 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2927 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2928 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2929 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2930 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2932 03415a1a 2019-06-02 stsp if (commit_id1) {
2933 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2934 03415a1a 2019-06-02 stsp worktree->path_prefix);
2935 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
2936 03415a1a 2019-06-02 stsp goto done;
2938 69d57f3d 2020-07-31 stsp if (tree_id1) {
2939 69d57f3d 2020-07-31 stsp char *id_str;
2941 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2943 03415a1a 2019-06-02 stsp goto done;
2945 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
2947 f69721c3 2019-10-21 stsp goto done;
2949 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2950 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2951 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2952 f69721c3 2019-10-21 stsp free(id_str);
2953 f69721c3 2019-10-21 stsp goto done;
2955 f69721c3 2019-10-21 stsp free(id_str);
2958 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2959 234035bc 2019-06-01 stsp worktree->path_prefix);
2961 234035bc 2019-06-01 stsp goto done;
2963 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2965 234035bc 2019-06-01 stsp goto done;
2967 234035bc 2019-06-01 stsp arg.worktree = worktree;
2968 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2969 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2970 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2971 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2972 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2973 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
2974 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2975 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2976 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2977 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2978 af12c6b9 2019-06-04 stsp err = sync_err;
2980 234035bc 2019-06-01 stsp if (tree1)
2981 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2982 234035bc 2019-06-01 stsp if (tree2)
2983 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2984 f69721c3 2019-10-21 stsp free(label_orig);
2985 818c7501 2019-07-11 stsp return err;
2988 818c7501 2019-07-11 stsp const struct got_error *
2989 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2990 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2991 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2992 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2994 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2995 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2996 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2997 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2999 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3001 818c7501 2019-07-11 stsp return err;
3003 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3005 818c7501 2019-07-11 stsp goto done;
3007 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
3008 818c7501 2019-07-11 stsp mok_arg.repo = repo;
3009 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3010 818c7501 2019-07-11 stsp &mok_arg);
3012 818c7501 2019-07-11 stsp goto done;
3014 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3015 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3017 818c7501 2019-07-11 stsp if (fileindex)
3018 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3019 818c7501 2019-07-11 stsp free(fileindex_path);
3020 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3021 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3022 234035bc 2019-06-01 stsp err = unlockerr;
3023 234035bc 2019-06-01 stsp return err;
3026 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3027 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3028 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3029 927df6b7 2019-02-10 stsp const char *status_path;
3030 927df6b7 2019-02-10 stsp size_t status_path_len;
3031 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3032 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3033 f8d1f275 2019-02-04 stsp void *status_arg;
3034 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3035 f8d1f275 2019-02-04 stsp void *cancel_arg;
3036 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3037 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
3038 f2a9dc41 2019-12-13 tracey int report_unchanged;
3039 3143d852 2020-06-25 stsp int no_ignores;
3042 f8d1f275 2019-02-04 stsp static const struct got_error *
3043 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3044 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3045 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3046 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3048 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3049 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3050 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3051 927df6b7 2019-02-10 stsp struct stat sb;
3052 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3053 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3054 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3056 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3058 98eaaa12 2019-08-03 stsp return err;
3060 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3061 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3062 98eaaa12 2019-08-03 stsp return NULL;
3064 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3065 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3066 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3068 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3069 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3070 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3072 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3073 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3074 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3075 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3076 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3079 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3080 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3083 927df6b7 2019-02-10 stsp static const struct got_error *
3084 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3085 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3087 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3088 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3089 f8d1f275 2019-02-04 stsp char *abspath;
3091 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3092 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3094 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3095 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3096 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3097 927df6b7 2019-02-10 stsp return NULL;
3099 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3100 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3101 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3102 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3104 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3105 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3106 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3109 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3110 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3111 f8d1f275 2019-02-04 stsp free(abspath);
3112 9d31a1d8 2018-03-11 stsp return err;
3115 f8d1f275 2019-02-04 stsp static const struct got_error *
3116 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3118 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3119 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3120 2ec1f75b 2019-03-26 stsp unsigned char status;
3122 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3123 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3125 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3126 927df6b7 2019-02-10 stsp return NULL;
3128 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3129 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3130 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3131 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3133 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3134 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3135 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3139 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3141 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3143 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3144 6841da00 2019-08-08 stsp free((char *)pe->path);
3145 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3149 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3151 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3153 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3154 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3155 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3156 6841da00 2019-08-08 stsp free((char *)pe->path);
3158 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3161 6841da00 2019-08-08 stsp static const struct got_error *
3162 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3164 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3165 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3166 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3167 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3168 6841da00 2019-08-08 stsp size_t linesize = 0;
3169 6841da00 2019-08-08 stsp ssize_t linelen;
3171 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3172 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3173 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3174 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3176 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3177 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3178 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3180 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3181 bd8de430 2019-10-04 stsp if (line[0] == '#')
3184 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3185 bd8de430 2019-10-04 stsp if (line[0] == '!')
3188 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3189 6841da00 2019-08-08 stsp line) == -1) {
3190 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3191 6841da00 2019-08-08 stsp goto done;
3193 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3195 6841da00 2019-08-08 stsp goto done;
3197 6841da00 2019-08-08 stsp if (ferror(f)) {
3198 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3199 6841da00 2019-08-08 stsp goto done;
3202 6841da00 2019-08-08 stsp dirpath = strdup(path);
3203 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3204 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3205 6841da00 2019-08-08 stsp goto done;
3207 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3209 6841da00 2019-08-08 stsp free(line);
3210 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3211 6841da00 2019-08-08 stsp free(dirpath);
3212 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3214 6841da00 2019-08-08 stsp return err;
3218 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3220 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3222 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3223 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3224 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3225 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3227 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3228 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3230 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3232 bd8de430 2019-10-04 stsp pattern += 3;
3234 bd8de430 2019-10-04 stsp while (*p) {
3235 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3236 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3237 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3238 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3240 bd8de430 2019-10-04 stsp while (*p == '/')
3250 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3251 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3252 6841da00 2019-08-08 stsp * ignores backwards.
3254 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3255 6841da00 2019-08-08 stsp while (pe) {
3256 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3257 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3258 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3259 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3260 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3261 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3262 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3263 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3264 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3269 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3275 6841da00 2019-08-08 stsp static const struct got_error *
3276 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3277 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3279 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3280 6841da00 2019-08-08 stsp char *ignorespath;
3281 886cec17 2019-12-15 stsp int fd = -1;
3282 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3284 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3285 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3286 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3288 886cec17 2019-12-15 stsp if (dirfd != -1) {
3289 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3290 886cec17 2019-12-15 stsp if (fd == -1) {
3291 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3292 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3293 886cec17 2019-12-15 stsp ignorespath);
3295 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3296 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3297 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3298 886cec17 2019-12-15 stsp ignorespath);
3301 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3305 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3306 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3307 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3308 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3309 886cec17 2019-12-15 stsp ignorespath);
3311 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3314 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3315 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3316 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3317 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3318 6841da00 2019-08-08 stsp free(ignorespath);
3319 6841da00 2019-08-08 stsp return err;
3322 f8d1f275 2019-02-04 stsp static const struct got_error *
3323 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3325 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3326 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3327 f8d1f275 2019-02-04 stsp char *path = NULL;
3329 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3330 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3332 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3333 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3334 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3336 f8d1f275 2019-02-04 stsp path = de->d_name;
3339 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3340 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3341 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
3342 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3343 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3344 f8d1f275 2019-02-04 stsp if (parent_path[0])
3345 f8d1f275 2019-02-04 stsp free(path);
3346 b72f483a 2019-02-05 stsp return err;
3349 347d1d3e 2019-07-12 stsp static const struct got_error *
3350 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3352 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3353 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3355 3143d852 2020-06-25 stsp if (a->no_ignores)
3356 3143d852 2020-06-25 stsp return NULL;
3358 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
3359 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3361 3143d852 2020-06-25 stsp return err;
3363 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
3364 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3366 3143d852 2020-06-25 stsp return err;
3369 3143d852 2020-06-25 stsp static const struct got_error *
3370 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3371 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3372 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
3374 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3375 abb4604f 2019-07-27 stsp struct stat sb;
3377 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3379 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3380 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3382 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3383 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3384 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3385 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3386 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3387 abb4604f 2019-07-27 stsp return NULL;
3390 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3391 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3392 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3394 abb4604f 2019-07-27 stsp return NULL;
3397 3143d852 2020-06-25 stsp static const struct got_error *
3398 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3399 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3401 3143d852 2020-06-25 stsp const struct got_error *err;
3402 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3404 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3405 3143d852 2020-06-25 stsp ".cvsignore");
3407 3143d852 2020-06-25 stsp return err;
3409 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3410 3143d852 2020-06-25 stsp ".gitignore");
3412 3143d852 2020-06-25 stsp return err;
3414 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3415 3143d852 2020-06-25 stsp if (err) {
3416 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3417 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3418 3143d852 2020-06-25 stsp return err;
3420 3143d852 2020-06-25 stsp for (;;) {
3421 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3422 3143d852 2020-06-25 stsp ".cvsignore");
3425 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3426 3143d852 2020-06-25 stsp ".gitignore");
3429 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3430 3143d852 2020-06-25 stsp if (err) {
3431 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3432 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3435 b737c85a 2020-06-26 stsp free(parent_path);
3436 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3437 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3440 b737c85a 2020-06-26 stsp free(parent_path);
3441 b737c85a 2020-06-26 stsp free(next_parent_path);
3442 3143d852 2020-06-25 stsp return err;
3445 abb4604f 2019-07-27 stsp static const struct got_error *
3446 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3447 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3448 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3449 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3450 f2a9dc41 2019-12-13 tracey int report_unchanged)
3452 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3453 6fc93f37 2019-12-13 stsp int fd = -1;
3454 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3455 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3456 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3458 3143d852 2020-06-25 stsp TAILQ_INIT(&arg.ignores);
3460 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3461 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3462 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3464 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3465 6fc93f37 2019-12-13 stsp if (fd == -1) {
3466 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3467 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3468 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3470 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3471 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3472 f2a9dc41 2019-12-13 tracey report_unchanged);
3474 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3475 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3476 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3477 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3478 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3479 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3480 abb4604f 2019-07-27 stsp arg.status_path = path;
3481 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3482 abb4604f 2019-07-27 stsp arg.repo = repo;
3483 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3484 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3485 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3486 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3487 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3488 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3489 022fae89 2019-12-06 tracey if (!no_ignores) {
3490 3143d852 2020-06-25 stsp err = add_ignores_from_parent_paths(&arg.ignores,
3491 3143d852 2020-06-25 stsp worktree->root_path, path);
3493 3143d852 2020-06-25 stsp goto done;
3495 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3496 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3499 3143d852 2020-06-25 stsp free_ignores(&arg.ignores);
3500 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
3501 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3502 927df6b7 2019-02-10 stsp free(ondisk_path);
3503 347d1d3e 2019-07-12 stsp return err;
3506 347d1d3e 2019-07-12 stsp const struct got_error *
3507 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3508 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3509 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
3510 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3512 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3513 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3514 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3515 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3517 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3519 347d1d3e 2019-07-12 stsp return err;
3521 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3522 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3523 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3527 f8d1f275 2019-02-04 stsp free(fileindex_path);
3528 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3529 f8d1f275 2019-02-04 stsp return err;
3532 6c7ab921 2019-03-18 stsp const struct got_error *
3533 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3534 6c7ab921 2019-03-18 stsp const char *arg)
3536 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3537 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3538 6c7ab921 2019-03-18 stsp size_t len;
3539 00bb5ea0 2020-07-23 stsp struct stat sb;
3541 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3543 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3544 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3545 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3547 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3548 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3549 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3550 00bb5ea0 2020-07-23 stsp goto done;
3553 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3555 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3556 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3557 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3558 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3560 00bb5ea0 2020-07-23 stsp char *abspath = NULL;
3561 00bb5ea0 2020-07-23 stsp char canonpath[PATH_MAX];
3562 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3563 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3564 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3565 00bb5ea0 2020-07-23 stsp goto done;
3569 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3570 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3572 d0710d08 2019-07-22 stsp goto done;
3573 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3574 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3575 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3576 00bb5ea0 2020-07-23 stsp goto done;
3579 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3580 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3581 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3582 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3583 00bb5ea0 2020-07-23 stsp goto done;
3585 00bb5ea0 2020-07-23 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
3586 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3587 00bb5ea0 2020-07-23 stsp goto done;
3592 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3593 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3594 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3595 6c7ab921 2019-03-18 stsp goto done;
3598 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3599 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3600 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3602 f6d88e1a 2019-05-29 stsp goto done;
3604 f6d88e1a 2019-05-29 stsp path = strdup("");
3605 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3606 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3607 f6d88e1a 2019-05-29 stsp goto done;
3611 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3612 6c7ab921 2019-03-18 stsp len = strlen(path);
3613 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3614 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3618 6c7ab921 2019-03-18 stsp free(resolved);
3619 d0710d08 2019-07-22 stsp free(cwd);
3620 6c7ab921 2019-03-18 stsp if (err == NULL)
3621 6c7ab921 2019-03-18 stsp *wt_path = path;
3623 6c7ab921 2019-03-18 stsp free(path);
3624 d00136be 2019-03-26 stsp return err;
3627 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3628 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3629 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3630 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3631 4e68cba3 2019-11-23 stsp void *progress_arg;
3632 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3635 4e68cba3 2019-11-23 stsp static const struct got_error *
3636 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3637 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3638 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3639 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3641 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3642 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3643 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3644 6d022e97 2019-08-04 stsp struct stat sb;
3645 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3647 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3648 dbb83fbd 2019-12-12 stsp relpath) == -1)
3649 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3651 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3653 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3654 12463d8b 2019-12-13 stsp de_name, a->repo);
3656 dbb83fbd 2019-12-12 stsp goto done;
3657 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3658 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3659 dbb83fbd 2019-12-12 stsp goto done;
3660 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3662 dbb83fbd 2019-12-12 stsp goto done;
3665 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3666 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3667 dbb83fbd 2019-12-12 stsp goto done;
3670 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3672 4e68cba3 2019-11-23 stsp goto done;
3673 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
3674 3969253a 2020-03-07 stsp if (err) {
3675 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3676 3969253a 2020-03-07 stsp goto done;
3678 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3679 07f5b47a 2019-06-02 stsp if (err) {
3680 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3681 4e68cba3 2019-11-23 stsp goto done;
3684 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3686 dbb83fbd 2019-12-12 stsp return err;
3687 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3688 dbb83fbd 2019-12-12 stsp return NULL;
3689 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3692 d00136be 2019-03-26 stsp const struct got_error *
3693 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3694 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3695 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3696 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3698 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3699 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3700 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3701 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3702 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3704 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3706 d00136be 2019-03-26 stsp return err;
3708 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3710 d00136be 2019-03-26 stsp goto done;
3712 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3713 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3714 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3715 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3716 4e68cba3 2019-11-23 stsp saa.repo = repo;
3718 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3719 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3720 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3724 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3725 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3726 af12c6b9 2019-06-04 stsp err = sync_err;
3728 fb399478 2019-07-12 stsp free(fileindex_path);
3729 d00136be 2019-03-26 stsp if (fileindex)
3730 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3731 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3732 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3733 d00136be 2019-03-26 stsp err = unlockerr;
3734 6c7ab921 2019-03-18 stsp return err;
3737 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3738 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3739 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3740 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3741 f2a9dc41 2019-12-13 tracey void *progress_arg;
3742 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3743 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3744 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3745 766841c2 2020-08-13 stsp const char *status_codes;
3748 f2a9dc41 2019-12-13 tracey static const struct got_error *
3749 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3750 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3751 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3752 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3754 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3755 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3756 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3757 17ed4618 2019-06-02 stsp struct stat sb;
3758 15341bfd 2020-03-05 tracey char *ondisk_path, *parent = NULL;
3760 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3761 17ed4618 2019-06-02 stsp if (ie == NULL)
3762 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3764 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3765 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3766 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3767 9acbc4fa 2019-08-03 stsp return NULL;
3768 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3771 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3772 f2a9dc41 2019-12-13 tracey relpath) == -1)
3773 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3775 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3778 f2a9dc41 2019-12-13 tracey goto done;
3780 766841c2 2020-08-13 stsp if (a->status_codes) {
3781 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
3783 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
3784 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
3787 766841c2 2020-08-13 stsp if (i == ncodes) {
3788 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
3789 766841c2 2020-08-13 stsp free(ondisk_path);
3790 766841c2 2020-08-13 stsp return NULL;
3792 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
3793 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
3794 766841c2 2020-08-13 stsp static char msg[64];
3795 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
3796 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
3797 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
3798 766841c2 2020-08-13 stsp goto done;
3802 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3803 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3804 f2a9dc41 2019-12-13 tracey goto done;
3805 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3806 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3807 f2a9dc41 2019-12-13 tracey goto done;
3809 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3810 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3811 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3812 f2a9dc41 2019-12-13 tracey goto done;
3816 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3817 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3818 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3819 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3820 12463d8b 2019-12-13 stsp ondisk_path);
3821 12463d8b 2019-12-13 stsp goto done;
3823 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3824 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3825 12463d8b 2019-12-13 stsp goto done;
3828 15341bfd 2020-03-05 tracey parent = dirname(ondisk_path);
3830 15341bfd 2020-03-05 tracey if (parent == NULL) {
3831 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", ondisk_path);
3832 15341bfd 2020-03-05 tracey goto done;
3834 15341bfd 2020-03-05 tracey while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3835 15341bfd 2020-03-05 tracey if (rmdir(parent) == -1) {
3836 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3837 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3838 15341bfd 2020-03-05 tracey parent);
3841 15341bfd 2020-03-05 tracey parent = dirname(parent);
3842 15341bfd 2020-03-05 tracey if (parent == NULL) {
3843 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", parent);
3844 15341bfd 2020-03-05 tracey goto done;
3849 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3851 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3852 f2a9dc41 2019-12-13 tracey if (err)
3853 f2a9dc41 2019-12-13 tracey return err;
3854 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3855 f2a9dc41 2019-12-13 tracey return NULL;
3856 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3857 f2a9dc41 2019-12-13 tracey staged_status, relpath);
3860 2ec1f75b 2019-03-26 stsp const struct got_error *
3861 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
3862 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
3863 766841c2 2020-08-13 stsp const char *status_codes,
3864 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
3865 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
3867 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3868 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
3869 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3870 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3871 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3873 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3875 2ec1f75b 2019-03-26 stsp return err;
3877 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3879 2ec1f75b 2019-03-26 stsp goto done;
3881 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3882 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3883 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3884 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3885 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3886 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3887 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
3888 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
3890 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3891 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3892 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3896 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3897 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3898 af12c6b9 2019-06-04 stsp err = sync_err;
3900 fb399478 2019-07-12 stsp free(fileindex_path);
3901 2ec1f75b 2019-03-26 stsp if (fileindex)
3902 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3903 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3904 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3905 2ec1f75b 2019-03-26 stsp err = unlockerr;
3906 33aa809d 2019-08-08 stsp return err;
3909 33aa809d 2019-08-08 stsp static const struct got_error *
3910 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3912 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3913 33aa809d 2019-08-08 stsp char *line = NULL;
3914 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3915 33aa809d 2019-08-08 stsp ssize_t linelen;
3917 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3918 33aa809d 2019-08-08 stsp if (linelen == -1) {
3919 33aa809d 2019-08-08 stsp if (ferror(infile)) {
3920 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
3921 33aa809d 2019-08-08 stsp goto done;
3923 33aa809d 2019-08-08 stsp return NULL;
3925 33aa809d 2019-08-08 stsp if (outfile) {
3926 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
3927 33aa809d 2019-08-08 stsp if (n != linelen) {
3928 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3929 33aa809d 2019-08-08 stsp goto done;
3932 33aa809d 2019-08-08 stsp if (rejectfile) {
3933 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
3934 33aa809d 2019-08-08 stsp if (n != linelen)
3935 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3938 33aa809d 2019-08-08 stsp free(line);
3939 2ec1f75b 2019-03-26 stsp return err;
3942 33aa809d 2019-08-08 stsp static const struct got_error *
3943 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
3945 33aa809d 2019-08-08 stsp char *line = NULL;
3946 33aa809d 2019-08-08 stsp size_t linesize = 0;
3947 33aa809d 2019-08-08 stsp ssize_t linelen;
3949 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
3950 500467ff 2019-09-25 hiltjo if (linelen == -1) {
3951 500467ff 2019-09-25 hiltjo if (ferror(f))
3952 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
3953 500467ff 2019-09-25 hiltjo return NULL;
3955 33aa809d 2019-08-08 stsp free(line);
3956 33aa809d 2019-08-08 stsp return NULL;
3959 33aa809d 2019-08-08 stsp static const struct got_error *
3960 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3961 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
3962 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
3964 33aa809d 2019-08-08 stsp const struct got_error *err;
3966 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
3967 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
3968 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
3970 33aa809d 2019-08-08 stsp return err;
3971 33aa809d 2019-08-08 stsp (*line_cur1)++;
3973 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
3974 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
3975 33aa809d 2019-08-08 stsp if (rejectfile)
3976 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
3978 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
3980 33aa809d 2019-08-08 stsp return err;
3981 33aa809d 2019-08-08 stsp (*line_cur2)++;
3983 33aa809d 2019-08-08 stsp /* Copy patched lines. */
3984 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
3985 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
3987 33aa809d 2019-08-08 stsp return err;
3988 33aa809d 2019-08-08 stsp (*line_cur2)++;
3990 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
3991 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
3992 33aa809d 2019-08-08 stsp if (rejectfile)
3993 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
3995 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
3997 33aa809d 2019-08-08 stsp return err;
3998 33aa809d 2019-08-08 stsp (*line_cur1)++;
4001 f1e81a05 2019-08-10 stsp return NULL;
4004 f1e81a05 2019-08-10 stsp static const struct got_error *
4005 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4006 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4008 f1e81a05 2019-08-10 stsp const struct got_error *err;
4010 f1e81a05 2019-08-10 stsp if (outfile) {
4011 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4012 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4013 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4015 f1e81a05 2019-08-10 stsp return err;
4016 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4019 f1e81a05 2019-08-10 stsp if (rejectfile) {
4020 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4021 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4022 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4024 f1e81a05 2019-08-10 stsp return err;
4025 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4029 33aa809d 2019-08-08 stsp return NULL;
4032 33aa809d 2019-08-08 stsp static const struct got_error *
4033 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
4034 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
4035 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
4036 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
4037 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4039 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4040 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
4041 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
4042 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
4043 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
4044 33aa809d 2019-08-08 stsp long pos1, pos2;
4045 33aa809d 2019-08-08 stsp FILE *hunkfile;
4047 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4049 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
4050 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
4051 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
4053 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
4054 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
4056 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
4057 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
4059 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
4060 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
4061 33aa809d 2019-08-08 stsp goto done;
4063 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
4064 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
4065 33aa809d 2019-08-08 stsp goto done;
4067 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4068 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4069 33aa809d 2019-08-08 stsp goto done;
4072 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4073 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
4075 33aa809d 2019-08-08 stsp goto done;
4077 33aa809d 2019-08-08 stsp switch (*choice) {
4078 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4079 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4080 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4082 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4083 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4084 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4086 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4089 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4093 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4094 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4095 33aa809d 2019-08-08 stsp return err;
4098 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4099 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4100 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4101 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4102 1f1abb7e 2019-08-08 stsp void *progress_arg;
4103 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4104 33aa809d 2019-08-08 stsp void *patch_arg;
4105 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4108 e20a8b6f 2019-06-04 stsp static const struct got_error *
4109 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4110 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4111 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4112 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4113 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4115 33aa809d 2019-08-08 stsp const struct got_error *err;
4116 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4117 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4118 1ebedb77 2019-10-19 stsp int fd2 = -1;
4119 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4120 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4121 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4122 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
4123 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
4124 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
4125 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
4126 33aa809d 2019-08-08 stsp struct got_diff_change *change;
4127 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
4128 33aa809d 2019-08-08 stsp int n = 0;
4130 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4132 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4134 33aa809d 2019-08-08 stsp return err;
4136 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4137 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4138 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4139 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4140 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4141 fa3cef63 2020-07-23 stsp goto done;
4143 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4144 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4145 fa3cef63 2020-07-23 stsp if (link_len == -1)
4146 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4147 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4148 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4151 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4152 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4153 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4154 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4155 fa3cef63 2020-07-23 stsp goto done;
4157 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4158 fa3cef63 2020-07-23 stsp sizeof(link_target));
4159 fa3cef63 2020-07-23 stsp if (link_len == -1)
4160 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4161 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4162 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4165 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4166 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4167 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4168 fa3cef63 2020-07-23 stsp goto done;
4171 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4172 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4173 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4174 fa3cef63 2020-07-23 stsp goto done;
4179 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4180 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4181 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4182 fa3cef63 2020-07-23 stsp goto done;
4184 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4185 fa3cef63 2020-07-23 stsp if (n != link_len) {
4186 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4187 fa3cef63 2020-07-23 stsp goto done;
4189 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4190 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4191 fa3cef63 2020-07-23 stsp goto done;
4193 fa3cef63 2020-07-23 stsp rewind(f2);
4196 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4198 33aa809d 2019-08-08 stsp goto done;
4200 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4202 33aa809d 2019-08-08 stsp goto done;
4204 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4206 33aa809d 2019-08-08 stsp goto done;
4208 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
4209 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
4210 33aa809d 2019-08-08 stsp goto done;
4213 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
4214 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
4216 33aa809d 2019-08-08 stsp goto done;
4218 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4220 33aa809d 2019-08-08 stsp goto done;
4222 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4223 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4224 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4225 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4226 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
4227 33aa809d 2019-08-08 stsp int choice;
4228 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
4229 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
4230 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
4231 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4232 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4233 e635744c 2019-08-08 stsp patch_cb, patch_arg);
4235 33aa809d 2019-08-08 stsp goto done;
4236 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4237 33aa809d 2019-08-08 stsp have_content = 1;
4238 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4241 1ebedb77 2019-10-19 stsp if (have_content) {
4242 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4243 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4244 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4246 1ebedb77 2019-10-19 stsp goto done;
4248 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4249 fa3cef63 2020-07-23 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
4250 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("chmod", path2);
4251 fa3cef63 2020-07-23 stsp goto done;
4256 33aa809d 2019-08-08 stsp free(id_str);
4258 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4259 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4260 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4261 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4262 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4263 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4264 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4265 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4266 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4267 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4268 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4269 33aa809d 2019-08-08 stsp if (err || !have_content) {
4270 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4271 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4272 33aa809d 2019-08-08 stsp free(*path_outfile);
4273 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4275 33aa809d 2019-08-08 stsp free(args);
4277 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
4280 33aa809d 2019-08-08 stsp if (changes)
4281 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
4282 33aa809d 2019-08-08 stsp free(path1);
4283 33aa809d 2019-08-08 stsp return err;
4286 33aa809d 2019-08-08 stsp static const struct got_error *
4287 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4288 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4289 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4290 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4292 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4293 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4294 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4295 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4296 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4297 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4298 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4299 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4300 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4301 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4303 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4304 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4305 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4306 d3bcc3d1 2019-08-08 stsp return NULL;
4308 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4309 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4310 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4312 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4313 65084dad 2019-08-08 stsp if (ie == NULL)
4314 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4316 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4317 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4318 a129376b 2019-03-28 stsp if (err) {
4319 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4320 a129376b 2019-03-28 stsp goto done;
4321 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4322 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4323 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4324 e20a8b6f 2019-06-04 stsp goto done;
4327 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4328 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4329 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4330 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4331 a129376b 2019-03-28 stsp goto done;
4334 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4335 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4336 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4337 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4338 a129376b 2019-03-28 stsp goto done;
4341 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4342 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4343 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4344 a129376b 2019-03-28 stsp goto done;
4349 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4350 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4351 a9fa2909 2019-07-27 stsp if (err) {
4352 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4353 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4354 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4355 a9fa2909 2019-07-27 stsp goto done;
4357 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4359 a9fa2909 2019-07-27 stsp goto done;
4361 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
4362 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
4363 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
4364 a9fa2909 2019-07-27 stsp goto done;
4367 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4368 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4369 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4370 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4371 a9fa2909 2019-07-27 stsp goto done;
4375 a129376b 2019-03-28 stsp switch (status) {
4376 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4377 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4378 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4379 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4380 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4382 33aa809d 2019-08-08 stsp goto done;
4383 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4386 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4387 1f1abb7e 2019-08-08 stsp ie->path);
4389 1ee397ad 2019-07-12 stsp goto done;
4390 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4392 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4393 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4394 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4395 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4396 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4398 33aa809d 2019-08-08 stsp goto done;
4399 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4402 33aa809d 2019-08-08 stsp /* fall through */
4403 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4404 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4405 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4406 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4407 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4408 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4409 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4410 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4411 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4413 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4414 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4415 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4417 65084dad 2019-08-08 stsp goto done;
4419 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4420 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4421 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4422 a129376b 2019-03-28 stsp goto done;
4425 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4426 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4427 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4428 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4429 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4430 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4431 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4433 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4434 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4435 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4436 369fd7e5 2020-07-23 stsp path_content);
4439 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4440 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4441 369fd7e5 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4442 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4444 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4445 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4446 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4447 369fd7e5 2020-07-23 stsp goto done;
4451 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4452 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4453 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4454 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4455 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4456 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4458 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4460 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4461 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4462 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4463 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4466 a129376b 2019-03-28 stsp goto done;
4467 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4468 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4469 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4470 054041d0 2020-06-24 stsp ondisk_path, blob->id.sha1,
4471 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4473 2e1fa222 2020-07-23 stsp goto done;
4475 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4476 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4477 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4486 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4487 33aa809d 2019-08-08 stsp free(path_content);
4488 e20a8b6f 2019-06-04 stsp free(parent_path);
4489 a129376b 2019-03-28 stsp free(tree_path);
4491 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4493 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4494 a129376b 2019-03-28 stsp free(tree_id);
4495 e20a8b6f 2019-06-04 stsp return err;
4498 e20a8b6f 2019-06-04 stsp const struct got_error *
4499 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4500 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4501 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4502 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4503 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4505 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4506 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4507 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4508 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4509 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4510 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4512 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4514 e20a8b6f 2019-06-04 stsp return err;
4516 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4518 e20a8b6f 2019-06-04 stsp goto done;
4520 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4521 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4522 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4523 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4524 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4525 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4526 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4527 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4528 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4529 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4533 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4534 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4535 e20a8b6f 2019-06-04 stsp err = sync_err;
4537 fb399478 2019-07-12 stsp free(fileindex_path);
4538 a129376b 2019-03-28 stsp if (fileindex)
4539 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4540 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4541 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4542 a129376b 2019-03-28 stsp err = unlockerr;
4543 c4296144 2019-05-09 stsp return err;
4546 cf066bf8 2019-05-09 stsp static void
4547 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4549 24519714 2019-05-09 stsp free(ct->path);
4550 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4551 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4552 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4553 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4554 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4555 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4559 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4560 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4561 24519714 2019-05-09 stsp struct got_repository *repo;
4562 24519714 2019-05-09 stsp struct got_worktree *worktree;
4563 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4564 5f8a88c6 2019-08-03 stsp int have_staged_files;
4565 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4568 c4296144 2019-05-09 stsp static const struct got_error *
4569 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
4570 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4571 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4572 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4574 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
4575 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4576 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4577 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4578 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4579 768aea60 2019-05-09 stsp struct stat sb;
4581 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
4582 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4583 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4584 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4585 5f8a88c6 2019-08-03 stsp return NULL;
4587 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4588 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4590 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4591 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4592 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4593 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4594 5f8a88c6 2019-08-03 stsp return NULL;
4597 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4598 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4599 036813ee 2019-05-09 stsp goto done;
4601 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4602 036813ee 2019-05-09 stsp parent_path = strdup("");
4603 69960a46 2019-05-09 stsp if (parent_path == NULL)
4604 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4606 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4608 69960a46 2019-05-09 stsp return err;
4611 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4612 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4613 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4614 c4296144 2019-05-09 stsp goto done;
4617 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4618 768aea60 2019-05-09 stsp relpath) == -1) {
4619 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4620 768aea60 2019-05-09 stsp goto done;
4623 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4624 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4625 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4626 0aeb8099 2020-07-23 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4627 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4628 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4629 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4630 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4632 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4633 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4636 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4637 0aeb8099 2020-07-23 stsp goto done;
4639 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4640 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4641 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4642 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4643 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4644 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4645 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4646 12463d8b 2019-12-13 stsp ct->ondisk_path);
4647 12463d8b 2019-12-13 stsp goto done;
4649 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4650 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4651 768aea60 2019-05-09 stsp goto done;
4653 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4656 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4657 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4658 44d03001 2019-05-09 stsp relpath) == -1) {
4659 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4660 44d03001 2019-05-09 stsp goto done;
4663 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4664 35213c7c 2020-07-23 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4665 35213c7c 2020-07-23 stsp int is_bad_symlink;
4666 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4667 35213c7c 2020-07-23 stsp ssize_t target_len;
4668 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4669 35213c7c 2020-07-23 stsp sizeof(target_path));
4670 35213c7c 2020-07-23 stsp if (target_len == -1) {
4671 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4672 35213c7c 2020-07-23 stsp ct->ondisk_path);
4673 35213c7c 2020-07-23 stsp goto done;
4675 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4676 35213c7c 2020-07-23 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4678 35213c7c 2020-07-23 stsp goto done;
4679 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4680 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4681 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4682 35213c7c 2020-07-23 stsp goto done;
4687 cf066bf8 2019-05-09 stsp ct->status = status;
4688 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4689 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4690 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4691 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4692 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4693 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4694 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4695 b416585c 2019-05-13 stsp goto done;
4697 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4698 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4699 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4700 f0b75401 2019-08-03 stsp goto done;
4703 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4704 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4705 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4706 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4707 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4708 036813ee 2019-05-09 stsp goto done;
4711 24519714 2019-05-09 stsp ct->path = strdup(path);
4712 24519714 2019-05-09 stsp if (ct->path == NULL) {
4713 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4714 24519714 2019-05-09 stsp goto done;
4716 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4718 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4719 ed175427 2019-05-09 stsp free_commitable(ct);
4720 24519714 2019-05-09 stsp free(parent_path);
4721 036813ee 2019-05-09 stsp free(path);
4722 a129376b 2019-03-28 stsp return err;
4725 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4726 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4727 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4728 036813ee 2019-05-09 stsp struct got_repository *);
4730 ed175427 2019-05-09 stsp static const struct got_error *
4731 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4732 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4733 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4734 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4735 afa376bf 2019-05-09 stsp struct got_repository *repo)
4737 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4738 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4739 036813ee 2019-05-09 stsp char *subpath;
4741 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4742 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4743 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4745 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4747 ed175427 2019-05-09 stsp return err;
4749 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4750 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4751 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4752 036813ee 2019-05-09 stsp free(subpath);
4753 036813ee 2019-05-09 stsp return err;
4756 036813ee 2019-05-09 stsp static const struct got_error *
4757 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4759 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4760 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
4762 036813ee 2019-05-09 stsp *match = 0;
4764 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
4765 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
4766 0f63689d 2019-05-10 stsp return NULL;
4769 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
4771 0f63689d 2019-05-10 stsp return err;
4772 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
4773 036813ee 2019-05-09 stsp free(ct_parent_path);
4774 036813ee 2019-05-09 stsp return err;
4777 768aea60 2019-05-09 stsp static mode_t
4778 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
4780 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
4781 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
4783 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
4786 036813ee 2019-05-09 stsp static const struct got_error *
4787 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
4788 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
4790 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4792 036813ee 2019-05-09 stsp *new_te = NULL;
4794 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
4796 036813ee 2019-05-09 stsp goto done;
4798 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4800 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
4801 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4802 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4804 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4806 036813ee 2019-05-09 stsp if (err && *new_te) {
4807 56e0773d 2019-11-28 stsp free(*new_te);
4808 036813ee 2019-05-09 stsp *new_te = NULL;
4810 036813ee 2019-05-09 stsp return err;
4813 036813ee 2019-05-09 stsp static const struct got_error *
4814 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
4815 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
4817 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4818 036813ee 2019-05-09 stsp char *ct_name;
4820 036813ee 2019-05-09 stsp *new_te = NULL;
4822 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
4823 036813ee 2019-05-09 stsp if (*new_te == NULL)
4824 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4826 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
4827 036813ee 2019-05-09 stsp if (ct_name == NULL) {
4828 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
4829 036813ee 2019-05-09 stsp goto done;
4831 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
4832 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
4833 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4834 036813ee 2019-05-09 stsp goto done;
4837 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4839 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
4840 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4841 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4843 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4845 036813ee 2019-05-09 stsp if (err && *new_te) {
4846 56e0773d 2019-11-28 stsp free(*new_te);
4847 036813ee 2019-05-09 stsp *new_te = NULL;
4849 036813ee 2019-05-09 stsp return err;
4852 036813ee 2019-05-09 stsp static const struct got_error *
4853 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
4854 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
4856 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4857 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
4859 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
4861 036813ee 2019-05-09 stsp return err;
4862 036813ee 2019-05-09 stsp if (new_pe == NULL)
4863 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
4864 036813ee 2019-05-09 stsp return NULL;
4867 afa376bf 2019-05-09 stsp static const struct got_error *
4868 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
4869 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
4871 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
4872 5f8a88c6 2019-08-03 stsp unsigned char status;
4874 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
4875 afa376bf 2019-05-09 stsp ct_path++;
4877 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
4878 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
4880 5f8a88c6 2019-08-03 stsp status = ct->status;
4882 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
4883 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
4886 036813ee 2019-05-09 stsp static const struct got_error *
4887 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
4888 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
4890 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
4891 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
4892 44d03001 2019-05-09 stsp char *te_path;
4894 44d03001 2019-05-09 stsp *modified = 0;
4896 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
4897 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
4898 44d03001 2019-05-09 stsp te->name) == -1)
4899 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4901 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4902 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4903 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
4904 44d03001 2019-05-09 stsp strlen(te_path));
4905 44d03001 2019-05-09 stsp if (*modified)
4909 44d03001 2019-05-09 stsp free(te_path);
4910 44d03001 2019-05-09 stsp return err;
4913 44d03001 2019-05-09 stsp static const struct got_error *
4914 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
4915 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
4916 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
4918 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4919 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4921 036813ee 2019-05-09 stsp *ctp = NULL;
4923 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4924 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4925 036813ee 2019-05-09 stsp char *ct_name = NULL;
4926 036813ee 2019-05-09 stsp int path_matches;
4928 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
4929 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
4930 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
4931 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
4934 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
4935 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
4939 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
4942 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
4944 036813ee 2019-05-09 stsp return err;
4945 036813ee 2019-05-09 stsp if (!path_matches)
4948 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
4949 036813ee 2019-05-09 stsp if (ct_name == NULL)
4950 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
4952 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
4955 036813ee 2019-05-09 stsp *ctp = ct;
4959 2b496619 2019-07-10 stsp return err;
4962 2b496619 2019-07-10 stsp static const struct got_error *
4963 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
4964 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
4965 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
4966 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
4967 2b496619 2019-07-10 stsp struct got_repository *repo)
4969 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
4970 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
4971 2b496619 2019-07-10 stsp char *subtree_path;
4972 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
4973 ba580f68 2020-03-22 stsp int nentries;
4975 2b496619 2019-07-10 stsp *new_tep = NULL;
4977 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
4978 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
4979 2b496619 2019-07-10 stsp child_path) == -1)
4980 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
4982 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
4983 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
4984 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
4985 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
4987 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4988 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
4989 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4990 2b496619 2019-07-10 stsp goto done;
4992 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
4993 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
4994 2b496619 2019-07-10 stsp if (err) {
4995 56e0773d 2019-11-28 stsp free(new_te);
4996 2b496619 2019-07-10 stsp goto done;
4998 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5001 2b496619 2019-07-10 stsp free(subtree_path);
5002 2b496619 2019-07-10 stsp if (err == NULL)
5003 2b496619 2019-07-10 stsp *new_tep = new_te;
5004 036813ee 2019-05-09 stsp return err;
5007 036813ee 2019-05-09 stsp static const struct got_error *
5008 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5009 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5010 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5011 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5012 036813ee 2019-05-09 stsp struct got_repository *repo)
5014 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5015 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5016 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5017 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5019 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5020 ba580f68 2020-03-22 stsp *nentries = 0;
5022 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5023 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5024 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5025 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5027 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5028 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5029 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5032 f2b0a8b0 2020-07-31 stsp if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5033 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
5036 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5037 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5039 036813ee 2019-05-09 stsp goto done;
5041 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5042 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5043 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5045 036813ee 2019-05-09 stsp goto done;
5046 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5048 afa376bf 2019-05-09 stsp goto done;
5049 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5050 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5052 2f51b5b3 2019-05-09 stsp goto done;
5053 ba580f68 2020-03-22 stsp (*nentries)++;
5055 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5056 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5057 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5058 2b496619 2019-07-10 stsp == NULL) {
5059 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5060 2b496619 2019-07-10 stsp child_path, path_base_tree,
5061 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5064 2b496619 2019-07-10 stsp goto done;
5065 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5067 2b496619 2019-07-10 stsp goto done;
5068 ba580f68 2020-03-22 stsp (*nentries)++;
5073 2f51b5b3 2019-05-09 stsp if (base_tree) {
5074 56e0773d 2019-11-28 stsp int i, nbase_entries;
5075 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5076 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5077 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5078 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5080 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5081 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5082 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5083 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5085 63c5ca5d 2019-08-24 stsp goto done;
5086 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5088 63c5ca5d 2019-08-24 stsp goto done;
5089 ba580f68 2020-03-22 stsp (*nentries)++;
5093 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5094 44d03001 2019-05-09 stsp int modified;
5095 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5097 036813ee 2019-05-09 stsp goto done;
5098 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5099 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5101 2f51b5b3 2019-05-09 stsp goto done;
5102 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5103 44d03001 2019-05-09 stsp if (modified) {
5104 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5105 ba580f68 2020-03-22 stsp int nsubentries;
5106 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5107 ba580f68 2020-03-22 stsp &nsubentries, te,
5108 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5109 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5111 44d03001 2019-05-09 stsp goto done;
5112 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5113 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5114 ba580f68 2020-03-22 stsp free(new_id);
5117 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5118 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5119 56e0773d 2019-11-28 stsp free(new_id);
5121 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5123 036813ee 2019-05-09 stsp goto done;
5124 ba580f68 2020-03-22 stsp (*nentries)++;
5128 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5129 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5131 f66c734c 2019-09-22 stsp goto done;
5133 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5134 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5135 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5136 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5137 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5138 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5140 2f51b5b3 2019-05-09 stsp goto done;
5141 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5143 2f51b5b3 2019-05-09 stsp goto done;
5144 ba580f68 2020-03-22 stsp (*nentries)++;
5146 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5147 b416585c 2019-05-13 stsp status_arg);
5149 afa376bf 2019-05-09 stsp goto done;
5151 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5152 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5154 2f51b5b3 2019-05-09 stsp goto done;
5155 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5157 2f51b5b3 2019-05-09 stsp goto done;
5158 ba580f68 2020-03-22 stsp (*nentries)++;
5163 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5164 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5166 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5167 2e1fa222 2020-07-23 stsp return err;
5170 2e1fa222 2020-07-23 stsp static const struct got_error *
5171 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
5172 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
5173 72fd46fa 2019-09-06 stsp int have_staged_files)
5175 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5176 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5178 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5179 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5180 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5182 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5184 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5185 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5186 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5187 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5188 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5189 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5190 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5191 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5192 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
5193 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5194 72fd46fa 2019-09-06 stsp !have_staged_files);
5196 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5197 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
5198 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5199 72fd46fa 2019-09-06 stsp !have_staged_files);
5201 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5204 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ct->ondisk_path,
5205 3969253a 2020-03-07 stsp ct->blob_id->sha1, new_base_commit_id->sha1, 1);
5206 3969253a 2020-03-07 stsp if (err) {
5207 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5210 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5211 3969253a 2020-03-07 stsp if (err) {
5212 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5217 d56d26ce 2019-05-10 stsp return err;
5221 d56d26ce 2019-05-10 stsp static const struct got_error *
5222 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5223 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5224 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5225 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5226 735ef5ac 2019-08-03 stsp int ood_errcode)
5228 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5229 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5231 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5232 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5233 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5234 1a36436d 2019-06-10 stsp return NULL;
5236 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5237 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5239 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5240 735ef5ac 2019-08-03 stsp in_repo_path);
5241 9bead371 2019-07-28 stsp if (err) {
5242 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5243 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5244 1a36436d 2019-06-10 stsp goto done;
5245 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5246 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5248 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5249 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5250 735ef5ac 2019-08-03 stsp in_repo_path);
5251 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5252 1a36436d 2019-06-10 stsp goto done;
5253 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5257 1a36436d 2019-06-10 stsp return err;
5260 c4296144 2019-05-09 stsp const struct got_error *
5261 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5262 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5263 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
5264 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5265 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5266 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5267 afa376bf 2019-05-09 stsp struct got_repository *repo)
5269 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5270 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5271 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5272 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5273 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5274 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5275 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5276 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5277 ba580f68 2020-03-22 stsp int nentries;
5278 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5279 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5280 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5282 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5284 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
5286 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5288 588edf97 2019-05-10 stsp goto done;
5290 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5292 588edf97 2019-05-10 stsp goto done;
5294 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5295 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5300 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5301 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5305 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5306 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5307 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5308 cf066bf8 2019-05-09 stsp char *ondisk_path;
5310 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5311 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5312 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5315 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5316 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5317 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5320 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5321 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5322 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5323 cf066bf8 2019-05-09 stsp goto done;
5325 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5326 2e1fa222 2020-07-23 stsp free(ondisk_path);
5328 cf066bf8 2019-05-09 stsp goto done;
5331 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5332 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5333 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5335 036813ee 2019-05-09 stsp goto done;
5337 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5339 de18fc63 2019-05-09 stsp goto done;
5340 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
5341 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5342 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
5343 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
5344 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5345 33ad4cbe 2019-05-12 jcs free(logmsg);
5347 9d40349a 2019-05-09 stsp goto done;
5349 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5350 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5351 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5352 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5353 09f5bd90 2019-05-09 stsp goto done;
5355 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5356 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5358 09f5bd90 2019-05-09 stsp goto done;
5359 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5361 ebf99748 2019-05-09 stsp goto done;
5362 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5363 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5364 09f5bd90 2019-05-09 stsp goto done;
5366 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5367 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5369 f2c16586 2019-05-09 stsp goto done;
5370 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5372 f2c16586 2019-05-09 stsp goto done;
5374 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5376 09f5bd90 2019-05-09 stsp goto done;
5378 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5380 ebf99748 2019-05-09 stsp goto done;
5382 588edf97 2019-05-10 stsp if (head_tree)
5383 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5384 588edf97 2019-05-10 stsp if (head_commit)
5385 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5386 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5387 2f17228e 2019-05-12 stsp if (head_ref2) {
5388 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5389 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5390 2f17228e 2019-05-12 stsp err = unlockerr;
5391 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5393 39cd0ff6 2019-07-12 stsp return err;
5396 5c1e53bc 2019-07-28 stsp static const struct got_error *
5397 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5398 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5400 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5401 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5403 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5404 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5405 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5407 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5408 5c1e53bc 2019-07-28 stsp ct_path++;
5410 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5411 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5415 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5416 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5418 5c1e53bc 2019-07-28 stsp return NULL;
5421 f0b75401 2019-08-03 stsp static const struct got_error *
5422 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5424 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5426 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5427 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5428 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5431 f0b75401 2019-08-03 stsp return NULL;
5434 5f8a88c6 2019-08-03 stsp static const struct got_error *
5435 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5436 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5438 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5439 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5441 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5442 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5444 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5445 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5446 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5447 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5448 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5449 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5452 5f8a88c6 2019-08-03 stsp return NULL;
5455 39cd0ff6 2019-07-12 stsp const struct got_error *
5456 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5457 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5458 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5459 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5460 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5461 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5463 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5464 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5465 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5466 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5467 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5468 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5469 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5470 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5471 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5473 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5475 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5477 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5479 39cd0ff6 2019-07-12 stsp goto done;
5481 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5483 39cd0ff6 2019-07-12 stsp goto done;
5485 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5487 39cd0ff6 2019-07-12 stsp goto done;
5489 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5491 39cd0ff6 2019-07-12 stsp goto done;
5493 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5494 5f8a88c6 2019-08-03 stsp &have_staged_files);
5495 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5496 5f8a88c6 2019-08-03 stsp goto done;
5497 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5498 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5500 5f8a88c6 2019-08-03 stsp goto done;
5503 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5504 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5505 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5506 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5507 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5508 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5509 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5510 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5511 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5513 5c1e53bc 2019-07-28 stsp goto done;
5516 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5517 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5518 39cd0ff6 2019-07-12 stsp goto done;
5521 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5522 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5524 5c1e53bc 2019-07-28 stsp goto done;
5527 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5528 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5529 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5531 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5532 f0b75401 2019-08-03 stsp ct_path++;
5533 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5534 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5535 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5537 b50cabdf 2019-07-12 stsp goto done;
5541 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5542 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
5543 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5545 39cd0ff6 2019-07-12 stsp goto done;
5547 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5548 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
5549 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5550 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5551 39cd0ff6 2019-07-12 stsp err = sync_err;
5553 39cd0ff6 2019-07-12 stsp if (fileindex)
5554 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5555 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5556 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5557 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5558 39cd0ff6 2019-07-12 stsp err = unlockerr;
5559 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5560 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5561 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5563 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5564 c4296144 2019-05-09 stsp return err;
5567 8656d6c4 2019-05-20 stsp const char *
5568 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5570 8656d6c4 2019-05-20 stsp return ct->path;
5573 8656d6c4 2019-05-20 stsp unsigned int
5574 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5576 8656d6c4 2019-05-20 stsp return ct->status;
5579 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5580 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5581 818c7501 2019-07-11 stsp struct got_repository *repo;
5584 818c7501 2019-07-11 stsp static const struct got_error *
5585 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5587 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5588 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5589 818c7501 2019-07-11 stsp unsigned char status;
5590 818c7501 2019-07-11 stsp struct stat sb;
5591 818c7501 2019-07-11 stsp char *ondisk_path;
5593 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5594 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5595 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5596 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5598 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5600 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5602 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5603 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5604 818c7501 2019-07-11 stsp free(ondisk_path);
5606 818c7501 2019-07-11 stsp return err;
5608 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5609 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5610 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5611 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5613 818c7501 2019-07-11 stsp return NULL;
5616 818c7501 2019-07-11 stsp const struct got_error *
5617 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5618 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5619 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5620 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5622 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5623 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5624 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5625 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5626 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5627 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5628 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5630 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5631 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5632 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5634 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5636 818c7501 2019-07-11 stsp return err;
5638 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5640 818c7501 2019-07-11 stsp goto done;
5642 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5643 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5644 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5647 818c7501 2019-07-11 stsp goto done;
5649 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5651 818c7501 2019-07-11 stsp goto done;
5653 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5655 818c7501 2019-07-11 stsp goto done;
5657 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5659 818c7501 2019-07-11 stsp goto done;
5661 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5664 e51d7b55 2020-01-04 stsp goto done;
5666 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5668 818c7501 2019-07-11 stsp goto done;
5669 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5670 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5671 e51d7b55 2020-01-04 stsp goto done;
5674 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5675 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5677 818c7501 2019-07-11 stsp goto done;
5678 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5680 818c7501 2019-07-11 stsp goto done;
5682 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5684 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5686 818c7501 2019-07-11 stsp goto done;
5688 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5690 818c7501 2019-07-11 stsp goto done;
5692 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5693 818c7501 2019-07-11 stsp worktree->base_commit_id);
5695 818c7501 2019-07-11 stsp goto done;
5696 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5698 818c7501 2019-07-11 stsp goto done;
5700 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5702 818c7501 2019-07-11 stsp goto done;
5704 818c7501 2019-07-11 stsp free(fileindex_path);
5705 818c7501 2019-07-11 stsp free(tmp_branch_name);
5706 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5707 818c7501 2019-07-11 stsp free(branch_ref_name);
5708 818c7501 2019-07-11 stsp if (branch_ref)
5709 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5710 818c7501 2019-07-11 stsp if (wt_branch)
5711 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5712 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5713 818c7501 2019-07-11 stsp if (err) {
5714 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5715 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5716 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5718 818c7501 2019-07-11 stsp if (*tmp_branch) {
5719 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5720 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5722 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5723 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5724 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5726 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5728 818c7501 2019-07-11 stsp return err;
5731 818c7501 2019-07-11 stsp const struct got_error *
5732 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
5733 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
5734 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
5735 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
5737 818c7501 2019-07-11 stsp const struct got_error *err;
5738 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
5739 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5740 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
5741 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5742 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5744 818c7501 2019-07-11 stsp *commit_id = NULL;
5745 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
5746 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
5747 3e3a69f1 2019-07-25 stsp *branch = NULL;
5748 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5750 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5752 3e3a69f1 2019-07-25 stsp return err;
5754 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5756 f032f1f7 2019-08-04 stsp goto done;
5758 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5759 f032f1f7 2019-08-04 stsp &have_staged_files);
5760 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5761 f032f1f7 2019-08-04 stsp goto done;
5762 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5763 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5764 3e3a69f1 2019-07-25 stsp goto done;
5767 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5769 f032f1f7 2019-08-04 stsp goto done;
5771 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5773 818c7501 2019-07-11 stsp goto done;
5775 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5777 818c7501 2019-07-11 stsp goto done;
5779 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5781 818c7501 2019-07-11 stsp goto done;
5783 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
5785 818c7501 2019-07-11 stsp goto done;
5787 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
5788 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
5790 818c7501 2019-07-11 stsp goto done;
5792 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5794 818c7501 2019-07-11 stsp goto done;
5796 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5798 818c7501 2019-07-11 stsp goto done;
5800 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
5801 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
5803 818c7501 2019-07-11 stsp goto done;
5805 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5807 818c7501 2019-07-11 stsp goto done;
5809 818c7501 2019-07-11 stsp free(commit_ref_name);
5810 818c7501 2019-07-11 stsp free(branch_ref_name);
5811 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5812 818c7501 2019-07-11 stsp if (commit_ref)
5813 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5814 818c7501 2019-07-11 stsp if (branch_ref)
5815 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5816 818c7501 2019-07-11 stsp if (err) {
5817 818c7501 2019-07-11 stsp free(*commit_id);
5818 818c7501 2019-07-11 stsp *commit_id = NULL;
5819 818c7501 2019-07-11 stsp if (*tmp_branch) {
5820 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5821 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5823 818c7501 2019-07-11 stsp if (*new_base_branch) {
5824 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
5825 818c7501 2019-07-11 stsp *new_base_branch = NULL;
5827 818c7501 2019-07-11 stsp if (*branch) {
5828 818c7501 2019-07-11 stsp got_ref_close(*branch);
5829 818c7501 2019-07-11 stsp *branch = NULL;
5831 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5832 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5833 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5835 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
5837 818c7501 2019-07-11 stsp return err;
5840 818c7501 2019-07-11 stsp const struct got_error *
5841 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
5843 818c7501 2019-07-11 stsp const struct got_error *err;
5844 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
5846 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5848 818c7501 2019-07-11 stsp return err;
5850 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5851 818c7501 2019-07-11 stsp free(tmp_branch_name);
5852 818c7501 2019-07-11 stsp return NULL;
5855 818c7501 2019-07-11 stsp static const struct got_error *
5856 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
5857 818c7501 2019-07-11 stsp char **logmsg, void *arg)
5859 0ebf8283 2019-07-24 stsp *logmsg = arg;
5860 818c7501 2019-07-11 stsp return NULL;
5863 818c7501 2019-07-11 stsp static const struct got_error *
5864 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
5865 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5866 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5867 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5869 818c7501 2019-07-11 stsp return NULL;
5872 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
5873 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
5874 01757395 2019-07-12 stsp void *progress_arg;
5875 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
5878 01757395 2019-07-12 stsp static const struct got_error *
5879 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
5881 01757395 2019-07-12 stsp const struct got_error *err;
5882 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
5884 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
5886 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
5888 01757395 2019-07-12 stsp return err;
5890 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
5891 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
5892 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
5893 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
5894 01757395 2019-07-12 stsp return NULL;
5896 01757395 2019-07-12 stsp p = strdup(path);
5897 01757395 2019-07-12 stsp if (p == NULL)
5898 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
5900 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
5901 01757395 2019-07-12 stsp if (err || new == NULL)
5903 01757395 2019-07-12 stsp return err;
5907 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
5909 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5911 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
5912 01757395 2019-07-12 stsp free((char *)pe->path);
5914 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
5917 0ebf8283 2019-07-24 stsp static const struct got_error *
5918 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
5919 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
5921 818c7501 2019-07-11 stsp const struct got_error *err;
5922 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
5924 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5925 818c7501 2019-07-11 stsp if (err) {
5926 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
5927 818c7501 2019-07-11 stsp goto done;
5928 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
5930 818c7501 2019-07-11 stsp goto done;
5931 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
5933 818c7501 2019-07-11 stsp goto done;
5934 de05890f 2020-03-05 stsp } else if (is_rebase) {
5935 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
5938 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
5940 818c7501 2019-07-11 stsp goto done;
5941 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
5942 818c7501 2019-07-11 stsp free(stored_id);
5943 818c7501 2019-07-11 stsp if (cmp != 0) {
5944 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5945 818c7501 2019-07-11 stsp goto done;
5949 0ebf8283 2019-07-24 stsp if (commit_ref)
5950 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5951 0ebf8283 2019-07-24 stsp return err;
5954 0ebf8283 2019-07-24 stsp static const struct got_error *
5955 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
5956 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
5957 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
5958 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
5959 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5960 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5962 0ebf8283 2019-07-24 stsp const struct got_error *err;
5963 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5964 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
5965 3e3a69f1 2019-07-25 stsp char *fileindex_path;
5967 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5969 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5971 0ebf8283 2019-07-24 stsp return err;
5973 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
5974 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
5975 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
5976 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
5977 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
5978 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
5979 818c7501 2019-07-11 stsp if (commit_ref)
5980 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5981 818c7501 2019-07-11 stsp return err;
5984 818c7501 2019-07-11 stsp const struct got_error *
5985 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
5986 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5987 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5988 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5989 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5990 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5992 0ebf8283 2019-07-24 stsp const struct got_error *err;
5993 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5995 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5997 0ebf8283 2019-07-24 stsp return err;
5999 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6001 0ebf8283 2019-07-24 stsp goto done;
6003 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6004 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6005 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6007 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6008 0ebf8283 2019-07-24 stsp return err;
6011 0ebf8283 2019-07-24 stsp const struct got_error *
6012 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6013 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6014 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6015 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6016 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6017 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6019 0ebf8283 2019-07-24 stsp const struct got_error *err;
6020 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6022 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6024 0ebf8283 2019-07-24 stsp return err;
6026 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6028 0ebf8283 2019-07-24 stsp goto done;
6030 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6031 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6032 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6034 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6035 0ebf8283 2019-07-24 stsp return err;
6038 0ebf8283 2019-07-24 stsp static const struct got_error *
6039 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6040 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6041 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6042 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6043 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6045 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6046 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6047 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6048 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6049 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6050 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6051 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6053 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6054 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6056 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6058 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6060 3e3a69f1 2019-07-25 stsp return err;
6062 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6063 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6064 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6065 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6067 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6068 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6069 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
6070 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6072 01757395 2019-07-12 stsp if (merged_paths) {
6073 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6074 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6075 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6076 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6079 01757395 2019-07-12 stsp goto done;
6082 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6083 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6085 01757395 2019-07-12 stsp goto done;
6088 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6089 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6090 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6092 a0e95631 2019-07-12 stsp goto done;
6093 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6094 a0e95631 2019-07-12 stsp goto done;
6097 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6099 edd02c5e 2019-07-11 stsp goto done;
6101 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6103 818c7501 2019-07-11 stsp goto done;
6105 5943eee2 2019-08-13 stsp if (new_logmsg) {
6106 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6107 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6108 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6109 5943eee2 2019-08-13 stsp goto done;
6112 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6114 5943eee2 2019-08-13 stsp goto done;
6117 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6118 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6119 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
6120 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6121 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6123 a0e95631 2019-07-12 stsp goto done;
6125 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6127 a0e95631 2019-07-12 stsp goto done;
6129 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6131 a0e95631 2019-07-12 stsp goto done;
6133 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
6134 72fd46fa 2019-09-06 stsp fileindex, 0);
6135 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6136 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6137 a0e95631 2019-07-12 stsp err = sync_err;
6139 a0e95631 2019-07-12 stsp free(fileindex_path);
6140 a0e95631 2019-07-12 stsp free(head_commit_id);
6141 a0e95631 2019-07-12 stsp if (head_ref)
6142 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6143 818c7501 2019-07-11 stsp if (err) {
6144 818c7501 2019-07-11 stsp free(*new_commit_id);
6145 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6147 818c7501 2019-07-11 stsp return err;
6150 818c7501 2019-07-11 stsp const struct got_error *
6151 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6152 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6153 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6154 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6155 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6157 0ebf8283 2019-07-24 stsp const struct got_error *err;
6158 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6159 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6160 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6162 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6164 0ebf8283 2019-07-24 stsp return err;
6166 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6168 0ebf8283 2019-07-24 stsp goto done;
6169 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6171 0ebf8283 2019-07-24 stsp goto done;
6172 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6173 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6174 0ebf8283 2019-07-24 stsp goto done;
6177 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6178 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6180 0ebf8283 2019-07-24 stsp if (commit_ref)
6181 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6182 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6183 0ebf8283 2019-07-24 stsp free(commit_id);
6184 0ebf8283 2019-07-24 stsp return err;
6187 0ebf8283 2019-07-24 stsp const struct got_error *
6188 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6189 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6190 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6191 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6192 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6193 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6195 0ebf8283 2019-07-24 stsp const struct got_error *err;
6196 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6197 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6199 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6201 0ebf8283 2019-07-24 stsp return err;
6203 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6205 0ebf8283 2019-07-24 stsp goto done;
6207 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6208 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6210 0ebf8283 2019-07-24 stsp if (commit_ref)
6211 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6212 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6213 0ebf8283 2019-07-24 stsp return err;
6216 0ebf8283 2019-07-24 stsp const struct got_error *
6217 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6218 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6220 3e3a69f1 2019-07-25 stsp if (fileindex)
6221 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6222 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6225 69844fba 2019-07-11 stsp static const struct got_error *
6226 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6228 69844fba 2019-07-11 stsp const struct got_error *err;
6229 69844fba 2019-07-11 stsp struct got_reference *ref;
6231 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6232 69844fba 2019-07-11 stsp if (err) {
6233 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6234 69844fba 2019-07-11 stsp return NULL;
6235 69844fba 2019-07-11 stsp return err;
6238 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6239 69844fba 2019-07-11 stsp got_ref_close(ref);
6240 69844fba 2019-07-11 stsp return err;
6243 69844fba 2019-07-11 stsp static const struct got_error *
6244 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6246 69844fba 2019-07-11 stsp const struct got_error *err;
6247 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6248 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6250 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6252 69844fba 2019-07-11 stsp goto done;
6253 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6255 69844fba 2019-07-11 stsp goto done;
6257 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6259 69844fba 2019-07-11 stsp goto done;
6260 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6262 69844fba 2019-07-11 stsp goto done;
6264 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6266 69844fba 2019-07-11 stsp goto done;
6267 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6269 69844fba 2019-07-11 stsp goto done;
6271 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6273 69844fba 2019-07-11 stsp goto done;
6274 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6276 69844fba 2019-07-11 stsp goto done;
6279 69844fba 2019-07-11 stsp free(tmp_branch_name);
6280 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6281 69844fba 2019-07-11 stsp free(branch_ref_name);
6282 69844fba 2019-07-11 stsp free(commit_ref_name);
6283 69844fba 2019-07-11 stsp return err;
6286 818c7501 2019-07-11 stsp const struct got_error *
6287 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6288 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6289 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6290 818c7501 2019-07-11 stsp struct got_repository *repo)
6292 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
6293 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6295 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6297 818c7501 2019-07-11 stsp return err;
6299 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6301 818c7501 2019-07-11 stsp goto done;
6303 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6305 818c7501 2019-07-11 stsp goto done;
6307 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6309 818c7501 2019-07-11 stsp goto done;
6311 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6313 3e3a69f1 2019-07-25 stsp if (fileindex)
6314 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6315 818c7501 2019-07-11 stsp free(new_head_commit_id);
6316 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6317 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6318 818c7501 2019-07-11 stsp err = unlockerr;
6319 818c7501 2019-07-11 stsp return err;
6322 818c7501 2019-07-11 stsp const struct got_error *
6323 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6324 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6325 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6326 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6328 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6329 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6330 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6331 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6332 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6333 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6335 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6337 818c7501 2019-07-11 stsp return err;
6339 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6340 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6342 818c7501 2019-07-11 stsp goto done;
6344 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6346 818c7501 2019-07-11 stsp goto done;
6349 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6350 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6351 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6353 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6355 818c7501 2019-07-11 stsp goto done;
6357 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6359 818c7501 2019-07-11 stsp goto done;
6361 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6362 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6364 ca355955 2019-07-12 stsp goto done;
6366 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6368 ca355955 2019-07-12 stsp goto done;
6370 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6372 818c7501 2019-07-11 stsp goto done;
6374 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6375 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6376 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6377 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6378 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6379 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6380 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6381 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6382 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6384 1f1abb7e 2019-08-08 stsp goto sync;
6386 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6387 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6389 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6390 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6391 ca355955 2019-07-12 stsp err = sync_err;
6393 818c7501 2019-07-11 stsp got_ref_close(resolved);
6394 a3a2faf2 2019-07-12 stsp free(tree_id);
6395 818c7501 2019-07-11 stsp free(commit_id);
6396 0ebf8283 2019-07-24 stsp if (fileindex)
6397 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6398 0ebf8283 2019-07-24 stsp free(fileindex_path);
6400 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6401 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6402 0ebf8283 2019-07-24 stsp err = unlockerr;
6403 0ebf8283 2019-07-24 stsp return err;
6406 0ebf8283 2019-07-24 stsp const struct got_error *
6407 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6408 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6409 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6410 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6412 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6413 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6414 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6415 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6416 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6417 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6418 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6419 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6421 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6422 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6423 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6424 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6426 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6428 0ebf8283 2019-07-24 stsp return err;
6430 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6432 0ebf8283 2019-07-24 stsp goto done;
6434 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6435 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6436 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6439 0ebf8283 2019-07-24 stsp goto done;
6441 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6443 0ebf8283 2019-07-24 stsp goto done;
6445 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6447 0ebf8283 2019-07-24 stsp goto done;
6449 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6450 0ebf8283 2019-07-24 stsp worktree);
6452 0ebf8283 2019-07-24 stsp goto done;
6454 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6457 0ebf8283 2019-07-24 stsp goto done;
6459 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6461 0ebf8283 2019-07-24 stsp goto done;
6463 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6465 0ebf8283 2019-07-24 stsp goto done;
6467 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6468 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6470 0ebf8283 2019-07-24 stsp goto done;
6471 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6473 0ebf8283 2019-07-24 stsp goto done;
6474 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6475 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6476 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6477 0ebf8283 2019-07-24 stsp goto done;
6480 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6481 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6483 0ebf8283 2019-07-24 stsp goto done;
6484 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6486 0ebf8283 2019-07-24 stsp goto done;
6488 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6490 0ebf8283 2019-07-24 stsp goto done;
6492 0ebf8283 2019-07-24 stsp free(fileindex_path);
6493 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6494 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6495 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6496 0ebf8283 2019-07-24 stsp if (wt_branch)
6497 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6498 0ebf8283 2019-07-24 stsp if (err) {
6499 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6500 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6501 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6503 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6504 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6505 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6507 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6508 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6509 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6510 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6512 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6514 0ebf8283 2019-07-24 stsp return err;
6517 0ebf8283 2019-07-24 stsp const struct got_error *
6518 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6519 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6521 3e3a69f1 2019-07-25 stsp if (fileindex)
6522 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6523 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6526 0ebf8283 2019-07-24 stsp const struct got_error *
6527 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6528 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6530 0ebf8283 2019-07-24 stsp const struct got_error *err;
6531 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6533 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6535 0ebf8283 2019-07-24 stsp return err;
6537 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6538 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6539 0ebf8283 2019-07-24 stsp return NULL;
6542 0ebf8283 2019-07-24 stsp const struct got_error *
6543 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6544 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6545 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6546 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6548 0ebf8283 2019-07-24 stsp const struct got_error *err;
6549 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6550 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6551 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6552 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6553 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6554 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6556 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6557 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6558 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6559 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6561 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6563 3e3a69f1 2019-07-25 stsp return err;
6565 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6567 f032f1f7 2019-08-04 stsp goto done;
6569 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6570 f032f1f7 2019-08-04 stsp &have_staged_files);
6571 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6572 f032f1f7 2019-08-04 stsp goto done;
6573 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6574 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6575 3e3a69f1 2019-07-25 stsp goto done;
6578 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6580 f032f1f7 2019-08-04 stsp goto done;
6582 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6584 0ebf8283 2019-07-24 stsp goto done;
6586 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6588 0ebf8283 2019-07-24 stsp goto done;
6590 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6591 0ebf8283 2019-07-24 stsp worktree);
6593 0ebf8283 2019-07-24 stsp goto done;
6595 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6597 0ebf8283 2019-07-24 stsp goto done;
6599 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6601 0ebf8283 2019-07-24 stsp goto done;
6602 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6604 0ebf8283 2019-07-24 stsp goto done;
6606 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6608 0ebf8283 2019-07-24 stsp goto done;
6609 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6611 0ebf8283 2019-07-24 stsp goto done;
6613 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6615 0ebf8283 2019-07-24 stsp goto done;
6617 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6618 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6619 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6620 0ebf8283 2019-07-24 stsp if (commit_ref)
6621 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6622 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6623 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6624 0ebf8283 2019-07-24 stsp if (err) {
6625 0ebf8283 2019-07-24 stsp free(*commit_id);
6626 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6627 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6628 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6629 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6630 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6631 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6633 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6634 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6635 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6637 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6639 0ebf8283 2019-07-24 stsp return err;
6642 0ebf8283 2019-07-24 stsp static const struct got_error *
6643 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6645 0ebf8283 2019-07-24 stsp const struct got_error *err;
6646 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6647 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6649 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6651 0ebf8283 2019-07-24 stsp goto done;
6652 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6654 0ebf8283 2019-07-24 stsp goto done;
6656 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6657 0ebf8283 2019-07-24 stsp worktree);
6659 0ebf8283 2019-07-24 stsp goto done;
6660 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6662 0ebf8283 2019-07-24 stsp goto done;
6664 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6666 0ebf8283 2019-07-24 stsp goto done;
6667 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
6669 0ebf8283 2019-07-24 stsp goto done;
6671 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6673 0ebf8283 2019-07-24 stsp goto done;
6674 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6676 0ebf8283 2019-07-24 stsp goto done;
6678 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6679 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6680 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6681 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6682 0ebf8283 2019-07-24 stsp return err;
6685 0ebf8283 2019-07-24 stsp const struct got_error *
6686 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
6687 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6688 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
6689 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6691 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
6692 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6693 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6694 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
6695 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6697 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6699 0ebf8283 2019-07-24 stsp return err;
6701 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6702 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
6704 0ebf8283 2019-07-24 stsp goto done;
6706 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6708 0ebf8283 2019-07-24 stsp goto done;
6710 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
6712 0ebf8283 2019-07-24 stsp goto done;
6714 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
6715 0ebf8283 2019-07-24 stsp worktree->path_prefix);
6717 0ebf8283 2019-07-24 stsp goto done;
6719 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6721 0ebf8283 2019-07-24 stsp goto done;
6723 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6725 0ebf8283 2019-07-24 stsp goto done;
6727 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6728 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6729 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6730 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6731 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6732 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6733 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6734 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
6735 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6737 1f1abb7e 2019-08-08 stsp goto sync;
6739 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6740 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
6742 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6743 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
6744 0ebf8283 2019-07-24 stsp err = sync_err;
6746 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
6747 0ebf8283 2019-07-24 stsp free(tree_id);
6748 818c7501 2019-07-11 stsp free(fileindex_path);
6750 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6751 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6752 818c7501 2019-07-11 stsp err = unlockerr;
6753 818c7501 2019-07-11 stsp return err;
6756 0ebf8283 2019-07-24 stsp const struct got_error *
6757 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
6758 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6759 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
6761 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
6762 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
6763 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6765 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6767 0ebf8283 2019-07-24 stsp return err;
6769 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6770 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
6772 0ebf8283 2019-07-24 stsp goto done;
6774 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
6776 0ebf8283 2019-07-24 stsp goto done;
6778 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
6780 0ebf8283 2019-07-24 stsp goto done;
6782 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6784 0ebf8283 2019-07-24 stsp goto done;
6786 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6788 3e3a69f1 2019-07-25 stsp if (fileindex)
6789 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6790 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
6791 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6792 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6793 0ebf8283 2019-07-24 stsp err = unlockerr;
6794 0ebf8283 2019-07-24 stsp return err;
6797 0ebf8283 2019-07-24 stsp const struct got_error *
6798 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
6799 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6801 0ebf8283 2019-07-24 stsp const struct got_error *err;
6802 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6804 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6806 0ebf8283 2019-07-24 stsp return err;
6808 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6810 0ebf8283 2019-07-24 stsp goto done;
6812 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6814 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6815 2822a352 2019-10-15 stsp return err;
6818 2822a352 2019-10-15 stsp const struct got_error *
6819 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
6820 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
6821 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
6822 2822a352 2019-10-15 stsp struct got_repository *repo)
6824 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
6825 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6826 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
6828 2822a352 2019-10-15 stsp *fileindex = NULL;
6829 2822a352 2019-10-15 stsp *branch_ref = NULL;
6830 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6832 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
6834 2822a352 2019-10-15 stsp return err;
6836 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
6837 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
6838 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
6839 2822a352 2019-10-15 stsp "update -b or different branch name required");
6840 2822a352 2019-10-15 stsp goto done;
6843 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6845 2822a352 2019-10-15 stsp goto done;
6847 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
6848 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
6849 2822a352 2019-10-15 stsp ok_arg.repo = repo;
6850 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6853 2822a352 2019-10-15 stsp goto done;
6855 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
6857 2822a352 2019-10-15 stsp goto done;
6859 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
6860 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
6862 2822a352 2019-10-15 stsp if (err) {
6863 2822a352 2019-10-15 stsp if (*branch_ref) {
6864 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
6865 2822a352 2019-10-15 stsp *branch_ref = NULL;
6867 2822a352 2019-10-15 stsp if (*base_branch_ref) {
6868 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
6869 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6871 2822a352 2019-10-15 stsp if (*fileindex) {
6872 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
6873 2822a352 2019-10-15 stsp *fileindex = NULL;
6875 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
6877 0cb83759 2019-08-03 stsp return err;
6880 2822a352 2019-10-15 stsp const struct got_error *
6881 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
6882 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6883 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
6884 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6885 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6887 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6888 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6889 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
6891 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
6893 2822a352 2019-10-15 stsp goto done;
6895 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
6897 2822a352 2019-10-15 stsp goto done;
6899 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
6900 2822a352 2019-10-15 stsp worktree->path_prefix);
6902 2822a352 2019-10-15 stsp goto done;
6904 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6906 2822a352 2019-10-15 stsp goto done;
6908 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
6909 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
6911 2822a352 2019-10-15 stsp goto sync;
6913 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
6915 2822a352 2019-10-15 stsp goto sync;
6917 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
6919 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6920 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
6921 2822a352 2019-10-15 stsp err = sync_err;
6924 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
6925 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6926 2822a352 2019-10-15 stsp err = unlockerr;
6927 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6929 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
6930 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6931 2822a352 2019-10-15 stsp err = unlockerr;
6932 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6934 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
6935 2822a352 2019-10-15 stsp free(fileindex_path);
6936 2822a352 2019-10-15 stsp free(tree_id);
6938 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6939 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6940 2822a352 2019-10-15 stsp err = unlockerr;
6941 2822a352 2019-10-15 stsp return err;
6944 2822a352 2019-10-15 stsp const struct got_error *
6945 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
6946 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6947 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
6949 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
6951 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
6953 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
6955 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
6956 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6957 8b692cd0 2019-10-21 stsp err = unlockerr;
6958 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6960 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
6961 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6962 8b692cd0 2019-10-21 stsp err = unlockerr;
6963 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6965 8b692cd0 2019-10-21 stsp return err;
6968 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
6969 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
6970 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6971 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6972 2db2652d 2019-08-07 stsp struct got_repository *repo;
6973 2db2652d 2019-08-07 stsp int have_changes;
6976 2db2652d 2019-08-07 stsp const struct got_error *
6977 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
6978 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6979 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6980 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6982 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
6983 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
6984 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
6985 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
6986 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
6987 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
6989 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
6990 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
6991 8b13ce36 2019-08-08 stsp return NULL;
6992 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6993 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
6995 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6996 735ef5ac 2019-08-03 stsp if (ie == NULL)
6997 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6999 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7000 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7001 735ef5ac 2019-08-03 stsp relpath) == -1)
7002 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7004 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7005 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7006 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7007 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7010 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7011 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7012 3aa5969e 2019-08-06 stsp goto done;
7013 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7014 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7015 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7016 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7017 735ef5ac 2019-08-03 stsp goto done;
7020 2db2652d 2019-08-07 stsp a->have_changes = 1;
7022 735ef5ac 2019-08-03 stsp p = in_repo_path;
7023 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7025 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7026 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7027 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7029 735ef5ac 2019-08-03 stsp free(in_repo_path);
7030 dc424a06 2019-08-07 stsp return err;
7033 2db2652d 2019-08-07 stsp struct stage_path_arg {
7034 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7035 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7036 2db2652d 2019-08-07 stsp struct got_repository *repo;
7037 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7038 2db2652d 2019-08-07 stsp void *status_arg;
7039 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7040 2db2652d 2019-08-07 stsp void *patch_arg;
7041 7b5dc508 2019-10-28 stsp int staged_something;
7042 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7045 2db2652d 2019-08-07 stsp static const struct got_error *
7046 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7047 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7048 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7049 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7051 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7052 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7053 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7054 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7055 0cb83759 2019-08-03 stsp uint32_t stage;
7056 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7057 0aeb8099 2020-07-23 stsp struct stat sb;
7059 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7060 8b13ce36 2019-08-08 stsp return NULL;
7062 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7063 d3e7c587 2019-08-03 stsp if (ie == NULL)
7064 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7066 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7067 2db2652d 2019-08-07 stsp relpath)== -1)
7068 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7070 0cb83759 2019-08-03 stsp switch (status) {
7071 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7072 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7073 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7074 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7075 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7078 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7079 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7080 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7081 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7082 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7085 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7088 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7089 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7090 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7091 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7092 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7096 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7097 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7100 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7101 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7102 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7103 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7105 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7106 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7107 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7108 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7109 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7110 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7111 35213c7c 2020-07-23 stsp ssize_t target_len;
7112 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7113 35213c7c 2020-07-23 stsp sizeof(target_path));
7114 35213c7c 2020-07-23 stsp if (target_len == -1) {
7115 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7116 35213c7c 2020-07-23 stsp ondisk_path);
7119 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7120 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7121 35213c7c 2020-07-23 stsp a->worktree->root_path);
7124 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7125 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7126 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7130 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7131 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7132 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7134 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7135 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7137 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7138 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7140 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7141 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7143 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7144 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7145 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7147 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7148 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7150 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7151 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7152 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7153 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7156 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7158 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7159 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7163 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
7164 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7165 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7166 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7168 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7169 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7172 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
7174 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
7175 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7177 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
7178 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
7181 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7185 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
7186 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
7187 dc424a06 2019-08-07 stsp free(path_content);
7188 2db2652d 2019-08-07 stsp free(ondisk_path);
7189 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
7190 0ebf8283 2019-07-24 stsp return err;
7193 0cb83759 2019-08-03 stsp const struct got_error *
7194 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
7195 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
7196 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
7197 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7198 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
7200 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7201 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
7202 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7203 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
7204 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
7205 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
7206 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
7207 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
7209 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7211 0cb83759 2019-08-03 stsp return err;
7213 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
7214 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
7216 735ef5ac 2019-08-03 stsp goto done;
7217 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7219 735ef5ac 2019-08-03 stsp goto done;
7220 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7222 0cb83759 2019-08-03 stsp goto done;
7224 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
7225 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
7226 2db2652d 2019-08-07 stsp oka.worktree = worktree;
7227 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
7228 2db2652d 2019-08-07 stsp oka.repo = repo;
7229 2db2652d 2019-08-07 stsp oka.have_changes = 0;
7230 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7231 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7232 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
7234 735ef5ac 2019-08-03 stsp goto done;
7236 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
7237 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7238 2db2652d 2019-08-07 stsp goto done;
7241 2db2652d 2019-08-07 stsp spa.worktree = worktree;
7242 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
7243 2db2652d 2019-08-07 stsp spa.repo = repo;
7244 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
7245 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
7246 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
7247 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
7248 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
7249 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
7250 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7251 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7252 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
7254 2db2652d 2019-08-07 stsp goto done;
7256 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
7257 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7258 7b5dc508 2019-10-28 stsp goto done;
7261 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7262 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
7263 0cb83759 2019-08-03 stsp err = sync_err;
7265 735ef5ac 2019-08-03 stsp if (head_ref)
7266 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
7267 735ef5ac 2019-08-03 stsp free(head_commit_id);
7268 0cb83759 2019-08-03 stsp free(fileindex_path);
7269 0cb83759 2019-08-03 stsp if (fileindex)
7270 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
7271 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7272 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
7273 0cb83759 2019-08-03 stsp err = unlockerr;
7274 0cb83759 2019-08-03 stsp return err;
7277 ad493afc 2019-08-03 stsp struct unstage_path_arg {
7278 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
7279 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
7280 ad493afc 2019-08-03 stsp struct got_repository *repo;
7281 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
7282 ad493afc 2019-08-03 stsp void *progress_arg;
7283 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
7284 2e1f37b0 2019-08-08 stsp void *patch_arg;
7287 2e1f37b0 2019-08-08 stsp static const struct got_error *
7288 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
7289 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
7290 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
7291 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
7292 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
7294 2e1f37b0 2019-08-08 stsp const struct got_error *err;
7295 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
7296 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7297 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7298 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
7299 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
7300 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
7301 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
7302 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
7303 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
7304 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
7306 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7307 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7309 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
7311 2e1f37b0 2019-08-08 stsp return err;
7312 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7314 2e1f37b0 2019-08-08 stsp goto done;
7316 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7318 2e1f37b0 2019-08-08 stsp goto done;
7320 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7322 2e1f37b0 2019-08-08 stsp goto done;
7324 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7326 2e1f37b0 2019-08-08 stsp goto done;
7328 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7330 2e1f37b0 2019-08-08 stsp goto done;
7332 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7334 2e1f37b0 2019-08-08 stsp goto done;
7336 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
7337 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
7338 2e1f37b0 2019-08-08 stsp goto done;
7341 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
7342 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
7343 2e1f37b0 2019-08-08 stsp goto done;
7346 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
7347 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
7349 2e1f37b0 2019-08-08 stsp goto done;
7351 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
7352 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
7354 2e1f37b0 2019-08-08 stsp goto done;
7355 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
7356 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
7358 2e1f37b0 2019-08-08 stsp goto done;
7360 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
7361 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
7362 2e1f37b0 2019-08-08 stsp goto done;
7364 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
7365 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
7366 2e1f37b0 2019-08-08 stsp goto done;
7368 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
7369 2e1f37b0 2019-08-08 stsp int choice;
7370 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
7371 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
7372 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
7373 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
7375 2e1f37b0 2019-08-08 stsp goto done;
7376 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
7377 2e1f37b0 2019-08-08 stsp have_content = 1;
7379 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
7380 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
7383 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
7384 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7385 f1e81a05 2019-08-10 stsp outfile, rejectfile);
7387 2e1f37b0 2019-08-08 stsp free(label1);
7389 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
7390 2e1f37b0 2019-08-08 stsp if (staged_blob)
7391 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
7392 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
7393 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
7394 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
7395 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
7396 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
7397 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
7398 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7399 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
7400 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
7401 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
7402 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
7403 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
7404 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
7405 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
7406 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
7407 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7408 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
7409 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
7410 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7412 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
7413 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
7414 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
7415 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7416 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
7417 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
7418 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7420 2e1f37b0 2019-08-08 stsp free(args);
7422 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
7425 2e1f37b0 2019-08-08 stsp if (changes)
7426 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
7427 2e1f37b0 2019-08-08 stsp free(path1);
7428 2e1f37b0 2019-08-08 stsp free(path2);
7429 fda8017d 2020-07-23 stsp return err;
7432 fda8017d 2020-07-23 stsp static const struct got_error *
7433 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
7434 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
7435 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
7436 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
7437 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
7438 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7439 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7441 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
7442 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
7443 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
7444 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
7445 fda8017d 2020-07-23 stsp FILE *f = NULL;
7446 fda8017d 2020-07-23 stsp struct stat sb;
7448 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
7449 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
7450 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
7452 fda8017d 2020-07-23 stsp return err;
7454 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
7455 fda8017d 2020-07-23 stsp return NULL;
7457 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
7458 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
7459 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
7461 fda8017d 2020-07-23 stsp goto done;
7464 fda8017d 2020-07-23 stsp f = fopen(path_unstaged_content, "r");
7465 fda8017d 2020-07-23 stsp if (f == NULL) {
7466 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
7467 fda8017d 2020-07-23 stsp path_unstaged_content);
7468 fda8017d 2020-07-23 stsp goto done;
7470 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
7471 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
7472 fda8017d 2020-07-23 stsp goto done;
7474 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
7475 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
7476 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
7478 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
7479 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
7480 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
7481 fda8017d 2020-07-23 stsp goto done;
7483 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
7484 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
7485 fda8017d 2020-07-23 stsp goto done;
7487 fda8017d 2020-07-23 stsp link_target[r] = '\0';
7488 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
7489 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
7490 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
7491 fda8017d 2020-07-23 stsp progress_arg);
7493 fda8017d 2020-07-23 stsp int local_changes_subsumed;
7494 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
7495 fda8017d 2020-07-23 stsp blob_base, ondisk_path, ie->path,
7496 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
7497 fda8017d 2020-07-23 stsp path_unstaged_content, label_orig, "unstaged",
7498 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
7501 fda8017d 2020-07-23 stsp goto done;
7503 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
7504 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7505 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
7507 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7509 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
7510 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
7511 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
7512 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
7513 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
7514 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
7515 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
7516 fda8017d 2020-07-23 stsp if (f && fclose(f) != 0 && err == NULL)
7517 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
7518 fda8017d 2020-07-23 stsp free(path_unstaged_content);
7519 fda8017d 2020-07-23 stsp free(path_new_staged_content);
7520 2e1f37b0 2019-08-08 stsp return err;
7523 ad493afc 2019-08-03 stsp static const struct got_error *
7524 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
7525 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
7526 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7527 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7529 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
7530 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
7531 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
7532 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7533 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
7534 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
7535 ad493afc 2019-08-03 stsp int local_changes_subsumed;
7536 9bc94a15 2019-08-03 stsp struct stat sb;
7538 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
7539 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
7540 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
7541 2e1f37b0 2019-08-08 stsp return NULL;
7543 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7544 ad493afc 2019-08-03 stsp if (ie == NULL)
7545 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7547 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7549 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
7551 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
7552 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
7554 f69721c3 2019-10-21 stsp goto done;
7555 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7556 f69721c3 2019-10-21 stsp id_str) == -1) {
7557 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
7558 f69721c3 2019-10-21 stsp goto done;
7561 ad493afc 2019-08-03 stsp switch (staged_status) {
7562 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
7563 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
7564 ad493afc 2019-08-03 stsp blob_id, 8192);
7567 ad493afc 2019-08-03 stsp /* fall through */
7568 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
7569 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7570 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
7571 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7572 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7573 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7576 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
7579 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
7580 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
7581 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
7582 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
7583 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
7584 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
7587 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
7588 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
7591 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
7592 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
7593 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
7594 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
7595 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
7596 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
7597 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
7598 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7599 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
7601 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
7602 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
7603 36bf999c 2020-07-23 stsp char *staged_target;
7604 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
7605 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
7607 36bf999c 2020-07-23 stsp goto done;
7608 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
7609 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
7610 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
7611 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
7612 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
7613 36bf999c 2020-07-23 stsp free(staged_target);
7615 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
7616 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
7617 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
7618 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
7619 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
7620 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7621 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
7625 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
7628 ad493afc 2019-08-03 stsp if (err == NULL)
7629 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
7630 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
7632 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
7633 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7634 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7635 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7636 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7639 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7641 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7642 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7646 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7647 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
7648 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
7651 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
7655 ad493afc 2019-08-03 stsp free(ondisk_path);
7656 ad493afc 2019-08-03 stsp if (blob_base)
7657 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
7658 ad493afc 2019-08-03 stsp if (blob_staged)
7659 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
7660 f69721c3 2019-10-21 stsp free(id_str);
7661 f69721c3 2019-10-21 stsp free(label_orig);
7662 ad493afc 2019-08-03 stsp return err;
7665 ad493afc 2019-08-03 stsp const struct got_error *
7666 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
7667 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
7668 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7669 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7670 ad493afc 2019-08-03 stsp struct got_repository *repo)
7672 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7673 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7674 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7675 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
7676 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
7678 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7680 ad493afc 2019-08-03 stsp return err;
7682 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7684 ad493afc 2019-08-03 stsp goto done;
7686 ad493afc 2019-08-03 stsp upa.worktree = worktree;
7687 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
7688 ad493afc 2019-08-03 stsp upa.repo = repo;
7689 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
7690 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
7691 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
7692 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
7693 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7694 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7695 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
7697 ad493afc 2019-08-03 stsp goto done;
7700 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7701 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
7702 ad493afc 2019-08-03 stsp err = sync_err;
7704 ad493afc 2019-08-03 stsp free(fileindex_path);
7705 ad493afc 2019-08-03 stsp if (fileindex)
7706 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
7707 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7708 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
7709 ad493afc 2019-08-03 stsp err = unlockerr;
7710 ad493afc 2019-08-03 stsp return err;
7713 b2118c49 2020-07-28 stsp struct report_file_info_arg {
7714 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
7715 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
7716 b2118c49 2020-07-28 stsp void *info_arg;
7717 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
7718 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
7719 b2118c49 2020-07-28 stsp void *cancel_arg;
7722 b2118c49 2020-07-28 stsp static const struct got_error *
7723 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
7725 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
7726 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
7727 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
7728 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
7729 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
7730 b2118c49 2020-07-28 stsp int stage;
7732 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
7733 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
7735 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
7736 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
7737 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
7740 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
7741 b2118c49 2020-07-28 stsp return NULL;
7743 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
7744 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
7745 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
7747 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
7748 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
7749 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
7750 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
7751 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
7752 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
7755 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
7756 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
7757 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
7760 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
7761 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
7764 b2118c49 2020-07-28 stsp const struct got_error *
7765 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
7766 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
7767 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
7768 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7771 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
7772 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
7773 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
7774 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
7776 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
7778 b2118c49 2020-07-28 stsp return err;
7780 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7782 b2118c49 2020-07-28 stsp goto done;
7784 b2118c49 2020-07-28 stsp arg.worktree = worktree;
7785 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
7786 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
7787 b2118c49 2020-07-28 stsp arg.paths = paths;
7788 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
7789 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
7790 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
7793 b2118c49 2020-07-28 stsp free(fileindex_path);
7794 b2118c49 2020-07-28 stsp if (fileindex)
7795 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
7796 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
7797 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
7798 b2118c49 2020-07-28 stsp err = unlockerr;
7799 b2118c49 2020-07-28 stsp return err;
