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 11cc08c1 2020-07-23 stsp if (fprintf(f, "%s: Could not install symbolic link because of merge "
928 11cc08c1 2020-07-23 stsp "conflict.\nln(1) may be used to fix the situation. If this is "
929 11cc08c1 2020-07-23 stsp "intended to be a\nregular file instead then its expected "
930 11cc08c1 2020-07-23 stsp "contents may be filled in.\nThe following conflicting symlink "
931 11cc08c1 2020-07-23 stsp "target paths were found:\n"
932 11cc08c1 2020-07-23 stsp "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n", getprogname(),
933 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
934 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
935 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
936 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
937 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
938 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
939 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
940 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
941 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
945 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
946 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
949 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
950 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
953 11cc08c1 2020-07-23 stsp if (chmod(ondisk_path, GOT_DEFAULT_FILE_MODE) == -1) {
954 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("chmod", ondisk_path);
958 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
959 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
960 11cc08c1 2020-07-23 stsp free(path);
961 11cc08c1 2020-07-23 stsp free(id_str);
962 11cc08c1 2020-07-23 stsp free(label_deriv);
963 11cc08c1 2020-07-23 stsp return err;
966 d219f183 2020-07-23 stsp /* forward declaration */
967 d219f183 2020-07-23 stsp static const struct got_error *
968 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
969 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
970 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
971 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
974 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
975 af57b12a 2020-07-23 stsp * ancestor, blob_deriv acts as the first derived version, and the symlink
976 af57b12a 2020-07-23 stsp * on disk acts as the second derived version.
977 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
979 af57b12a 2020-07-23 stsp static const struct got_error *
980 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
981 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
982 af57b12a 2020-07-23 stsp const char *path, uint16_t st_mode, const char *label_orig,
983 af57b12a 2020-07-23 stsp struct got_blob_object *blob_deriv,
984 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
985 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
987 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
988 af57b12a 2020-07-23 stsp char *ancestor_target = NULL, *deriv_target = NULL;
989 af57b12a 2020-07-23 stsp struct stat sb;
990 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
991 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
992 11cc08c1 2020-07-23 stsp int have_local_change = 0;
993 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
995 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
996 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
998 af57b12a 2020-07-23 stsp if (!S_ISLNK(sb.st_mode)) {
1000 d219f183 2020-07-23 stsp * If there is a regular file on disk, merge the symlink
1001 d219f183 2020-07-23 stsp * target path into this file, which will usually cause
1002 d219f183 2020-07-23 stsp * a merge conflict.
1004 d219f183 2020-07-23 stsp if (S_ISREG(sb.st_mode)) {
1005 d219f183 2020-07-23 stsp int local_changes_subsumed;
1006 d219f183 2020-07-23 stsp return merge_blob(&local_changes_subsumed, worktree,
1007 d219f183 2020-07-23 stsp NULL, ondisk_path, path, sb.st_mode, label_orig,
1008 d219f183 2020-07-23 stsp blob_deriv, deriv_base_commit_id,
1009 d219f183 2020-07-23 stsp repo, progress_cb, progress_arg);
1012 af57b12a 2020-07-23 stsp /* TODO symlink is obstructed; do something */
1013 af57b12a 2020-07-23 stsp return got_error_path(ondisk_path, GOT_ERR_FILE_OBSTRUCTED);
1016 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
1017 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
1018 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
1019 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
1020 af57b12a 2020-07-23 stsp ondisk_path);
1021 af57b12a 2020-07-23 stsp goto done;
1023 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
1025 526a746f 2020-07-23 stsp if (blob_orig) {
1026 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
1028 526a746f 2020-07-23 stsp goto done;
1031 af57b12a 2020-07-23 stsp err = got_object_blob_read_to_str(&deriv_target, blob_deriv);
1033 af57b12a 2020-07-23 stsp goto done;
1035 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
1036 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
1037 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
1038 11cc08c1 2020-07-23 stsp have_local_change = 1;
1040 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
1041 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
1042 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
1043 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
1044 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
1046 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
1047 11cc08c1 2020-07-23 stsp if (ancestor_target) {
1048 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
1049 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1051 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
1052 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
1053 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
1054 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1057 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
1058 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1059 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
1060 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
1062 11cc08c1 2020-07-23 stsp goto done;
1063 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1066 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
1067 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
1068 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
1069 af57b12a 2020-07-23 stsp strlen(deriv_target));
1071 af57b12a 2020-07-23 stsp goto done;
1072 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1073 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
1074 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1075 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
1076 11cc08c1 2020-07-23 stsp ondisk_target, ondisk_path);
1078 11cc08c1 2020-07-23 stsp goto done;
1079 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1084 af57b12a 2020-07-23 stsp free(ancestor_target);
1085 af57b12a 2020-07-23 stsp free(deriv_target);
1086 14c901f1 2019-08-08 stsp return err;
1090 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
1091 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
1092 14c901f1 2019-08-08 stsp * acts as the second derived version.
1094 14c901f1 2019-08-08 stsp static const struct got_error *
1095 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
1096 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
1097 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
1098 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
1099 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1100 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1102 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
1103 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
1104 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
1105 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
1107 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
1109 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
1110 14c901f1 2019-08-08 stsp if (parent == NULL)
1111 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
1113 14c901f1 2019-08-08 stsp free(base_path);
1114 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1115 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1116 14c901f1 2019-08-08 stsp base_path = NULL;
1117 14c901f1 2019-08-08 stsp goto done;
1120 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1122 14c901f1 2019-08-08 stsp goto done;
1123 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1124 14c901f1 2019-08-08 stsp blob_deriv);
1126 14c901f1 2019-08-08 stsp goto done;
1128 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1130 14c901f1 2019-08-08 stsp goto done;
1131 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1132 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1133 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1134 14c901f1 2019-08-08 stsp goto done;
1137 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
1138 f69721c3 2019-10-21 stsp ondisk_path, path, st_mode, blob_deriv_path, label_orig,
1139 f69721c3 2019-10-21 stsp label_deriv, repo, progress_cb, progress_arg);
1141 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
1142 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1143 14c901f1 2019-08-08 stsp free(base_path);
1144 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1145 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1146 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1148 6353ad76 2019-02-08 stsp free(id_str);
1149 818c7501 2019-07-11 stsp free(label_deriv);
1150 4a1ddfc2 2019-01-12 stsp return err;
1153 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1154 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1155 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1156 65b05cec 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_object_id *blob_id)
1158 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1159 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1161 65b05cec 2020-07-23 stsp *new_iep = NULL;
1163 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1165 054041d0 2020-06-24 stsp return err;
1167 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(new_ie, ondisk_path,
1168 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1170 054041d0 2020-06-24 stsp goto done;
1172 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1175 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1177 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1178 13d9040b 2019-03-27 stsp return err;
1181 1ebedb77 2019-10-19 stsp static mode_t
1182 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1184 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1186 1ebedb77 2019-10-19 stsp if (executable) {
1187 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1188 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1189 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1190 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1191 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1192 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1195 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1198 8ba819a3 2020-07-23 stsp /* forward declaration */
1199 13d9040b 2019-03-27 stsp static const struct got_error *
1200 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1201 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1202 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1203 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1204 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1205 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1208 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1209 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1211 8ba819a3 2020-07-23 stsp static const struct got_error *
1212 5a1fbc73 2020-07-23 stsp replace_existing_symlink(const char *ondisk_path, const char *target_path,
1213 5a1fbc73 2020-07-23 stsp size_t target_len)
1215 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1216 5a1fbc73 2020-07-23 stsp ssize_t elen;
1217 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1221 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1222 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1223 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1224 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1225 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1226 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1228 5a1fbc73 2020-07-23 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
1229 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1230 5a1fbc73 2020-07-23 stsp if (errno != ELOOP)
1231 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1233 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1234 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1235 5a1fbc73 2020-07-23 stsp if (elen == -1)
1236 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1238 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1239 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1240 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1243 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1244 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1245 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1246 5a1fbc73 2020-07-23 stsp return err;
1249 5a1fbc73 2020-07-23 stsp static const struct got_error *
1250 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1251 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1252 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1253 c90c8ce3 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1254 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1256 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1257 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1258 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1259 8ba819a3 2020-07-23 stsp char *resolved_path = NULL, *abspath = NULL;
1260 906c123b 2020-07-23 stsp char *path_got = NULL;
1261 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1262 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1264 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1267 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1268 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1269 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1270 8ba819a3 2020-07-23 stsp * in the blob object.
1273 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1274 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1275 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1276 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1277 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1278 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1279 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1280 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1281 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1282 3b9f0f87 2020-07-23 stsp progress_arg);
1284 8ba819a3 2020-07-23 stsp if (len > 0) {
1285 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1286 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1287 8ba819a3 2020-07-23 stsp len - hdrlen);
1288 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1289 8ba819a3 2020-07-23 stsp hdrlen = 0;
1291 8ba819a3 2020-07-23 stsp } while (len != 0);
1292 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1295 8ba819a3 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1296 8ba819a3 2020-07-23 stsp * in which the blob object is being installed.
1298 8ba819a3 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1299 8ba819a3 2020-07-23 stsp char *parent = dirname(ondisk_path);
1300 ef68ca6f 2020-07-23 stsp if (parent == NULL) {
1301 ef68ca6f 2020-07-23 stsp err = got_error_from_errno2("dirname", ondisk_path);
1302 ef68ca6f 2020-07-23 stsp goto done;
1304 8ba819a3 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1305 8ba819a3 2020-07-23 stsp err = got_error_from_errno("asprintf");
1306 8ba819a3 2020-07-23 stsp goto done;
1311 8ba819a3 2020-07-23 stsp * unveil(2) restricts our view of paths in the filesystem.
1312 8ba819a3 2020-07-23 stsp * ENOENT will occur if a link target path does not exist or
1313 8ba819a3 2020-07-23 stsp * if it points outside our unveiled path space.
1315 8ba819a3 2020-07-23 stsp resolved_path = realpath(abspath ? abspath : target_path, NULL);
1316 8ba819a3 2020-07-23 stsp if (resolved_path == NULL) {
1317 b15bc87b 2020-07-23 stsp if (errno != ENOENT) {
1318 b15bc87b 2020-07-23 stsp err = got_error_from_errno2("realpath", target_path);
1319 b15bc87b 2020-07-23 stsp goto done;
1323 8ba819a3 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1324 0ab20ee9 2020-07-23 stsp if (!got_path_is_child(resolved_path ? resolved_path : (abspath ?
1325 0ab20ee9 2020-07-23 stsp abspath : target_path), worktree->root_path,
1326 0ab20ee9 2020-07-23 stsp strlen(worktree->root_path))) {
1327 8ba819a3 2020-07-23 stsp /* install as a regular file */
1328 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1329 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1330 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1331 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1332 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1333 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1334 8ba819a3 2020-07-23 stsp goto done;
1337 906c123b 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1338 906c123b 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
1339 906c123b 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1) {
1340 906c123b 2020-07-23 stsp err = got_error_from_errno("asprintf");
1341 906c123b 2020-07-23 stsp goto done;
1343 906c123b 2020-07-23 stsp if (got_path_is_child(resolved_path ? resolved_path : (abspath ?
1344 906c123b 2020-07-23 stsp abspath : target_path), path_got, strlen(path_got))) {
1345 906c123b 2020-07-23 stsp /* install as a regular file */
1346 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1347 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1348 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1349 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1350 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1351 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1352 906c123b 2020-07-23 stsp goto done;
1355 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1356 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1357 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1358 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1359 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1360 c90c8ce3 2020-07-23 stsp goto done;
1362 5a1fbc73 2020-07-23 stsp err = replace_existing_symlink(ondisk_path,
1363 5a1fbc73 2020-07-23 stsp target_path, target_len);
1365 f35fa46a 2020-07-23 stsp goto done;
1366 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1367 5a1fbc73 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1368 6e1eade5 2020-07-23 stsp reverting_versioned_file ?
1369 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_UPDATE,
1372 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1375 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1376 f35fa46a 2020-07-23 stsp char *parent = dirname(ondisk_path);
1377 f35fa46a 2020-07-23 stsp if (parent == NULL) {
1378 f35fa46a 2020-07-23 stsp err = got_error_from_errno2("dirname",
1379 f35fa46a 2020-07-23 stsp ondisk_path);
1380 f35fa46a 2020-07-23 stsp goto done;
1382 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1384 f35fa46a 2020-07-23 stsp goto done;
1386 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1387 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1389 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1390 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1391 f35fa46a 2020-07-23 stsp goto done;
1395 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1396 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1397 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1398 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1399 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1400 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1401 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1402 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1403 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1404 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1405 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1406 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1407 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1409 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1410 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1412 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1413 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1414 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1416 8ba819a3 2020-07-23 stsp free(resolved_path);
1417 8ba819a3 2020-07-23 stsp free(abspath);
1418 906c123b 2020-07-23 stsp free(path_got);
1419 8ba819a3 2020-07-23 stsp return err;
1422 8ba819a3 2020-07-23 stsp static const struct got_error *
1423 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1424 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1425 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1426 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1427 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1428 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1430 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1431 507dc3bb 2018-12-29 stsp int fd = -1;
1432 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1433 507dc3bb 2018-12-29 stsp int update = 0;
1434 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1436 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1437 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
1438 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1439 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1440 21908da4 2019-01-13 stsp char *parent = dirname(path);
1441 21908da4 2019-01-13 stsp if (parent == NULL)
1442 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
1443 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1445 21908da4 2019-01-13 stsp return err;
1446 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1447 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1448 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1449 21908da4 2019-01-13 stsp if (fd == -1)
1450 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1451 230a42bd 2019-05-11 jcs ondisk_path);
1452 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1453 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1454 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1455 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1456 3b9f0f87 2020-07-23 stsp goto done;
1458 bd6aa359 2020-07-23 stsp if (!S_ISREG(st_mode) && !installing_bad_symlink) {
1459 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1460 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1461 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1462 507dc3bb 2018-12-29 stsp goto done;
1464 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1465 507dc3bb 2018-12-29 stsp ondisk_path);
1467 507dc3bb 2018-12-29 stsp goto done;
1468 507dc3bb 2018-12-29 stsp update = 1;
1471 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1474 bd6aa359 2020-07-23 stsp if (progress_cb) {
1475 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1476 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1478 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1479 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1482 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1483 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1485 bd6aa359 2020-07-23 stsp goto done;
1488 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1490 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1491 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1494 9d31a1d8 2018-03-11 stsp if (len > 0) {
1495 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1496 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1497 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1498 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1499 b87c6f83 2018-12-24 stsp goto done;
1500 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1501 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1502 b87c6f83 2018-12-24 stsp goto done;
1504 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1506 9d31a1d8 2018-03-11 stsp } while (len != 0);
1508 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1509 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1510 816dc654 2019-02-16 stsp goto done;
1513 507dc3bb 2018-12-29 stsp if (update) {
1514 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1515 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1516 230a42bd 2019-05-11 jcs ondisk_path);
1517 2a57020b 2019-02-20 stsp unlink(tmppath);
1518 68ed9ba5 2019-02-10 stsp goto done;
1522 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1523 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1524 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1525 1ebedb77 2019-10-19 stsp goto done;
1529 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1530 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1531 507dc3bb 2018-12-29 stsp free(tmppath);
1532 6353ad76 2019-02-08 stsp return err;
1535 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1536 6353ad76 2019-02-08 stsp static const struct got_error *
1537 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1539 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1540 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1541 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1542 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1543 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1545 7154f6ce 2019-03-27 stsp int i = 0;
1546 7154f6ce 2019-03-27 stsp char *line;
1547 7154f6ce 2019-03-27 stsp size_t len;
1548 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1550 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1551 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1552 7154f6ce 2019-03-27 stsp if (line == NULL) {
1553 7154f6ce 2019-03-27 stsp if (feof(f))
1555 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1559 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1560 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1562 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1568 7154f6ce 2019-03-27 stsp return err;
1571 e2b1e152 2019-07-13 stsp static int
1572 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1574 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1575 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1578 1ebedb77 2019-10-19 stsp static int
1579 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1581 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1582 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1583 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1584 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1585 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1586 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1589 c363b2c1 2019-08-03 stsp static unsigned char
1590 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1592 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1593 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1594 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1595 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1596 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1597 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1598 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1600 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1604 a919d5c4 2020-07-23 stsp static const struct got_error *
1605 a919d5c4 2020-07-23 stsp get_symlink_status(unsigned char *status, struct stat *sb,
1606 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1607 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1609 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1610 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1611 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1612 a919d5c4 2020-07-23 stsp ssize_t elen;
1613 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1614 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1615 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1617 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1619 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1621 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1623 a919d5c4 2020-07-23 stsp return err;
1624 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1626 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1627 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1629 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1631 a919d5c4 2020-07-23 stsp if (len > 0) {
1632 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1633 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1634 a919d5c4 2020-07-23 stsp len - hdrlen);
1635 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1636 a919d5c4 2020-07-23 stsp hdrlen = 0;
1638 a919d5c4 2020-07-23 stsp } while (len != 0);
1639 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1641 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1642 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1643 a919d5c4 2020-07-23 stsp if (elen == -1)
1644 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1646 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1647 a919d5c4 2020-07-23 stsp if (elen == -1)
1648 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1651 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1652 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1654 a919d5c4 2020-07-23 stsp return NULL;
1657 7154f6ce 2019-03-27 stsp static const struct got_error *
1658 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1659 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1660 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1662 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1663 6353ad76 2019-02-08 stsp struct got_object_id id;
1664 6353ad76 2019-02-08 stsp size_t hdrlen;
1665 1338848f 2019-12-13 stsp int fd = -1;
1666 6353ad76 2019-02-08 stsp FILE *f = NULL;
1667 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1668 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1669 6353ad76 2019-02-08 stsp size_t flen, blen;
1670 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1672 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1675 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1676 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1677 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1679 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1680 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1681 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1682 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1683 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1685 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1686 882ef1b9 2019-12-13 stsp goto done;
1688 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1689 3d35a492 2019-12-13 stsp goto done;
1692 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1693 a919d5c4 2020-07-23 stsp if (fd == -1 && errno != ENOENT && errno != ELOOP)
1694 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1695 a919d5c4 2020-07-23 stsp else if (fd == -1 && errno == ELOOP) {
1696 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1697 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1698 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1699 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1700 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1701 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1703 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1704 3d35a492 2019-12-13 stsp goto done;
1706 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1707 1338848f 2019-12-13 stsp goto done;
1711 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1712 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1713 1338848f 2019-12-13 stsp goto done;
1716 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1717 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1718 1338848f 2019-12-13 stsp goto done;
1719 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1720 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1721 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1722 1338848f 2019-12-13 stsp goto done;
1725 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1726 1338848f 2019-12-13 stsp goto done;
1728 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1729 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1730 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1732 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1734 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1736 1338848f 2019-12-13 stsp goto done;
1738 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1739 a919d5c4 2020-07-23 stsp /* Staging changes to symlinks is not yet(?) supported. */
1740 a919d5c4 2020-07-23 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
1741 a919d5c4 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_FILE_STATUS);
1742 a919d5c4 2020-07-23 stsp goto done;
1744 a919d5c4 2020-07-23 stsp err = get_symlink_status(status, sb, ie, abspath, dirfd,
1745 a919d5c4 2020-07-23 stsp de_name, blob);
1746 a919d5c4 2020-07-23 stsp goto done;
1750 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1751 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1752 ab0d4361 2019-12-13 stsp if (fd == -1) {
1753 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1754 ab0d4361 2019-12-13 stsp goto done;
1758 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1759 6353ad76 2019-02-08 stsp if (f == NULL) {
1760 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1761 6353ad76 2019-02-08 stsp goto done;
1764 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1766 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1767 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1769 7154f6ce 2019-03-27 stsp goto done;
1770 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1771 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1772 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1773 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1774 7154f6ce 2019-03-27 stsp goto done;
1776 6353ad76 2019-02-08 stsp if (blen == 0) {
1777 6353ad76 2019-02-08 stsp if (flen != 0)
1778 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1780 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1781 6353ad76 2019-02-08 stsp if (blen != 0)
1782 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1784 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1785 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1786 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1787 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1791 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1794 6353ad76 2019-02-08 stsp hdrlen = 0;
1797 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1798 7154f6ce 2019-03-27 stsp rewind(f);
1799 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1800 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1801 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1804 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1805 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1806 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1807 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1808 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1809 9d31a1d8 2018-03-11 stsp return err;
1813 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1814 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1816 e2b1e152 2019-07-13 stsp static const struct got_error *
1817 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1818 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1820 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1821 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1822 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1824 e2b1e152 2019-07-13 stsp return NULL;
1827 9d31a1d8 2018-03-11 stsp static const struct got_error *
1828 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1829 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1830 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1831 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1832 0584f854 2019-04-06 stsp void *progress_arg)
1834 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1835 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1836 6353ad76 2019-02-08 stsp char *ondisk_path;
1837 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1838 b8f41171 2019-02-10 stsp struct stat sb;
1840 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1841 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1844 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1845 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1846 a76c42e6 2019-08-03 stsp goto done;
1848 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1851 abb4604f 2019-07-27 stsp goto done;
1852 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1853 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1855 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1856 c90c8ce3 2020-07-23 stsp status = GOT_STATUS_UNVERSIONED;
1859 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1860 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1861 b8f41171 2019-02-10 stsp goto done;
1863 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1864 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1866 5036ab18 2020-04-18 stsp goto done;
1869 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1870 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1871 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1872 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1873 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1874 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1876 e2b1e152 2019-07-13 stsp goto done;
1877 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1879 6353ad76 2019-02-08 stsp goto done;
1881 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1882 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1883 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1884 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1885 b8f41171 2019-02-10 stsp goto done;
1889 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1891 6353ad76 2019-02-08 stsp goto done;
1893 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1894 234035bc 2019-06-01 stsp int update_timestamps;
1895 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1896 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1897 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1898 234035bc 2019-06-01 stsp struct got_object_id id2;
1899 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1900 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1902 f69721c3 2019-10-21 stsp goto done;
1904 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1905 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1906 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1907 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1908 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1909 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1910 f69721c3 2019-10-21 stsp goto done;
1912 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1913 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1914 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1915 234035bc 2019-06-01 stsp goto done;
1918 993e2a1b 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1919 993e2a1b 2020-07-23 stsp err = merge_symlink(worktree, blob2,
1920 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig,
1921 993e2a1b 2020-07-23 stsp blob, worktree->base_commit_id, repo,
1922 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1924 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1925 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1926 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1927 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1929 f69721c3 2019-10-21 stsp free(label_orig);
1930 234035bc 2019-06-01 stsp if (blob2)
1931 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1933 909d120e 2019-09-22 stsp goto done;
1935 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1936 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1937 234035bc 2019-06-01 stsp * unmodified files again.
1939 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1940 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1941 234035bc 2019-06-01 stsp update_timestamps);
1942 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1943 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1944 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1945 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1946 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1948 1ee397ad 2019-07-12 stsp goto done;
1949 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1950 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1952 13d9040b 2019-03-27 stsp goto done;
1954 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
1955 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
1956 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
1957 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
1958 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
1959 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
1960 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
1962 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1963 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
1964 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
1965 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
1966 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
1969 13d9040b 2019-03-27 stsp goto done;
1972 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1973 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 1);
1975 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
1976 054041d0 2020-06-24 stsp worktree->base_commit_id, ondisk_path, path,
1977 054041d0 2020-06-24 stsp &blob->id);
1980 13d9040b 2019-03-27 stsp goto done;
1982 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
1983 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
1984 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
1987 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1989 6353ad76 2019-02-08 stsp free(ondisk_path);
1990 8da9e5f4 2019-01-12 stsp return err;
1993 90285c3b 2019-01-08 stsp static const struct got_error *
1994 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1996 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1997 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1999 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2000 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2002 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2003 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2004 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2006 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
2007 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
2008 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
2009 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2010 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2014 90285c3b 2019-01-08 stsp parent = dirname(parent);
2017 90285c3b 2019-01-08 stsp free(ondisk_path);
2018 90285c3b 2019-01-08 stsp return err;
2021 708d8e67 2019-03-27 stsp static const struct got_error *
2022 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2023 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2024 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2026 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2027 708d8e67 2019-03-27 stsp unsigned char status;
2028 708d8e67 2019-03-27 stsp struct stat sb;
2029 708d8e67 2019-03-27 stsp char *ondisk_path;
2031 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2032 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2034 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2036 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2038 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2040 5a58a424 2020-06-23 stsp goto done;
2042 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2043 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2044 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2045 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2046 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2047 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2048 993e2a1b 2020-07-23 stsp goto done;
2050 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2051 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2052 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2053 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2055 993e2a1b 2020-07-23 stsp goto done;
2056 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2057 993e2a1b 2020-07-23 stsp ie->path);
2058 993e2a1b 2020-07-23 stsp goto done;
2061 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2062 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2063 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2065 5a58a424 2020-06-23 stsp goto done;
2067 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2068 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2070 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
2073 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2075 5a58a424 2020-06-23 stsp goto done;
2076 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2077 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2079 5a58a424 2020-06-23 stsp goto done;
2081 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2084 5a58a424 2020-06-23 stsp free(ondisk_path);
2085 fc6346c4 2019-03-27 stsp return err;
2088 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2089 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2090 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2091 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2092 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2093 8da9e5f4 2019-01-12 stsp void *progress_arg;
2094 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2095 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2098 512f0d0e 2019-01-02 stsp static const struct got_error *
2099 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2100 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2102 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2104 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2105 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2107 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2108 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2111 8da9e5f4 2019-01-12 stsp static const struct got_error *
2112 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2114 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2116 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2117 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2119 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2120 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2123 9d31a1d8 2018-03-11 stsp static const struct got_error *
2124 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2126 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2127 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2128 8da9e5f4 2019-01-12 stsp char *path;
2130 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2131 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2133 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2134 63c5ca5d 2019-08-24 stsp return NULL;
2136 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2137 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2139 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2141 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2142 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2144 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2145 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2147 8da9e5f4 2019-01-12 stsp free(path);
2148 0cd1c46a 2019-03-11 stsp return err;
2151 818c7501 2019-07-11 stsp static const struct got_error *
2152 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2154 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2155 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2156 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
2158 517bab73 2019-03-11 stsp *refname = NULL;
2160 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
2161 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
2162 cc483380 2019-09-01 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2164 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
2166 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2167 0647c563 2019-03-11 stsp *refname = NULL;
2169 517bab73 2019-03-11 stsp free(uuidstr);
2170 517bab73 2019-03-11 stsp return err;
2173 818c7501 2019-07-11 stsp const struct got_error *
2174 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2176 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2179 818c7501 2019-07-11 stsp static const struct got_error *
2180 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2182 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2183 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2186 818c7501 2019-07-11 stsp static const struct got_error *
2187 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2189 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2192 818c7501 2019-07-11 stsp static const struct got_error *
2193 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2195 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2196 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2199 818c7501 2019-07-11 stsp static const struct got_error *
2200 818c7501 2019-07-11 stsp get_rebase_commit_ref_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_COMMIT_REF_PREFIX);
2206 0ebf8283 2019-07-24 stsp static const struct got_error *
2207 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2209 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2210 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2213 0ebf8283 2019-07-24 stsp static const struct got_error *
2214 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_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_BRANCH_REF_PREFIX);
2220 0ebf8283 2019-07-24 stsp static const struct got_error *
2221 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_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_BASE_COMMIT_REF_PREFIX);
2227 0ebf8283 2019-07-24 stsp static const struct got_error *
2228 0ebf8283 2019-07-24 stsp get_histedit_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_COMMIT_REF_PREFIX);
2234 0ebf8283 2019-07-24 stsp const struct got_error *
2235 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2236 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2238 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2239 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2240 0ebf8283 2019-07-24 stsp *path = NULL;
2241 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2243 0ebf8283 2019-07-24 stsp return NULL;
2247 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2248 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2250 517bab73 2019-03-11 stsp static const struct got_error *
2251 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2253 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2254 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2255 517bab73 2019-03-11 stsp char *refname;
2257 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2259 517bab73 2019-03-11 stsp return err;
2261 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2263 0cd1c46a 2019-03-11 stsp goto done;
2265 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2267 0cd1c46a 2019-03-11 stsp free(refname);
2269 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2270 3e3a69f1 2019-07-25 stsp return err;
2273 3e3a69f1 2019-07-25 stsp static const struct got_error *
2274 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2276 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2278 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2279 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2280 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2281 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2283 9d31a1d8 2018-03-11 stsp return err;
2287 ebf99748 2019-05-09 stsp static const struct got_error *
2288 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2289 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2291 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2292 ebf99748 2019-05-09 stsp FILE *index = NULL;
2294 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2295 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2296 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2297 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2299 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2301 ebf99748 2019-05-09 stsp goto done;
2303 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2304 ebf99748 2019-05-09 stsp if (index == NULL) {
2305 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2306 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2308 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2309 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
2310 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2313 ebf99748 2019-05-09 stsp if (err) {
2314 ebf99748 2019-05-09 stsp free(*fileindex_path);
2315 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2316 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2317 ebf99748 2019-05-09 stsp *fileindex = NULL;
2319 ebf99748 2019-05-09 stsp return err;
2322 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2323 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2324 c932eeeb 2019-05-22 stsp const char *path;
2325 c932eeeb 2019-05-22 stsp size_t path_len;
2326 c932eeeb 2019-05-22 stsp const char *entry_name;
2327 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2328 a484d721 2019-06-10 stsp void *progress_arg;
2331 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2332 c932eeeb 2019-05-22 stsp static const struct got_error *
2333 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2335 1ee397ad 2019-07-12 stsp const struct got_error *err;
2336 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2338 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2339 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2340 c932eeeb 2019-05-22 stsp return NULL;
2341 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2342 102ff934 2019-06-11 stsp return NULL;
2344 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2345 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2346 c932eeeb 2019-05-22 stsp return NULL;
2348 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2349 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2350 edd02c5e 2019-07-11 stsp ie->path);
2352 1ee397ad 2019-07-12 stsp return err;
2354 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2355 c932eeeb 2019-05-22 stsp return NULL;
2358 9c6338c4 2019-06-02 stsp static const struct got_error *
2359 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2361 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2362 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2363 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2364 867630bb 2020-01-17 stsp struct timespec timeout;
2366 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2367 9c6338c4 2019-06-02 stsp fileindex_path);
2369 9c6338c4 2019-06-02 stsp goto done;
2371 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2373 9c6338c4 2019-06-02 stsp goto done;
2375 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2376 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2377 9c6338c4 2019-06-02 stsp fileindex_path);
2378 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2382 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2383 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2384 867630bb 2020-01-17 stsp * was recorded in the file index.
2386 867630bb 2020-01-17 stsp timeout.tv_sec = 0;
2387 867630bb 2020-01-17 stsp timeout.tv_nsec = 1;
2388 867630bb 2020-01-17 stsp nanosleep(&timeout, NULL);
2390 9c6338c4 2019-06-02 stsp if (new_index)
2391 9c6338c4 2019-06-02 stsp fclose(new_index);
2392 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2393 9c6338c4 2019-06-02 stsp return err;
2396 6ced4176 2019-07-12 stsp static const struct got_error *
2397 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2398 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2399 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2401 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2402 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2403 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2404 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2406 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2407 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2408 6ced4176 2019-07-12 stsp *tree_id = NULL;
2410 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2411 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2412 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2413 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2414 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2415 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2416 6ced4176 2019-07-12 stsp goto done;
2418 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2419 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2421 6ced4176 2019-07-12 stsp goto done;
2422 6ced4176 2019-07-12 stsp return NULL;
2425 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2427 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2428 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2429 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2430 6ced4176 2019-07-12 stsp goto done;
2433 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2434 6ced4176 2019-07-12 stsp in_repo_path);
2436 6ced4176 2019-07-12 stsp goto done;
2438 6ced4176 2019-07-12 stsp free(in_repo_path);
2439 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2441 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2443 6ced4176 2019-07-12 stsp goto done;
2445 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2446 6ced4176 2019-07-12 stsp /* Check out a single file. */
2447 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2448 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2449 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2450 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2451 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2452 6ced4176 2019-07-12 stsp goto done;
2454 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2455 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2456 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2457 6ced4176 2019-07-12 stsp goto done;
2460 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2461 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2463 6ced4176 2019-07-12 stsp return err;
2464 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2465 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2466 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2467 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2468 6ced4176 2019-07-12 stsp goto done;
2471 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2472 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2474 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2475 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2476 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2477 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2478 6ced4176 2019-07-12 stsp goto done;
2480 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2481 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2482 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2483 6ced4176 2019-07-12 stsp goto done;
2488 6ced4176 2019-07-12 stsp free(in_repo_path);
2489 6ced4176 2019-07-12 stsp if (err) {
2490 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2491 6ced4176 2019-07-12 stsp free(*tree_relpath);
2492 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2493 6ced4176 2019-07-12 stsp free(*tree_id);
2494 6ced4176 2019-07-12 stsp *tree_id = NULL;
2496 07ed472d 2019-07-12 stsp return err;
2499 07ed472d 2019-07-12 stsp static const struct got_error *
2500 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2501 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2502 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2503 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2505 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2506 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2507 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2508 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2509 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2511 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2512 7f47418f 2019-12-20 stsp if (err) {
2513 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2514 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2515 7f47418f 2019-12-20 stsp goto done;
2516 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2517 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2519 7f47418f 2019-12-20 stsp return err;
2522 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2523 07ed472d 2019-07-12 stsp worktree->base_commit_id);
2525 07ed472d 2019-07-12 stsp goto done;
2527 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2529 07ed472d 2019-07-12 stsp goto done;
2531 07ed472d 2019-07-12 stsp if (entry_name &&
2532 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2533 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2534 07ed472d 2019-07-12 stsp goto done;
2537 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2538 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2539 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2540 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2541 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2542 07ed472d 2019-07-12 stsp arg.repo = repo;
2543 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2544 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2545 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2546 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2547 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2548 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2551 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2552 07ed472d 2019-07-12 stsp if (commit)
2553 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2554 6ced4176 2019-07-12 stsp return err;
2557 9d31a1d8 2018-03-11 stsp const struct got_error *
2558 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2559 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2560 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2561 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2563 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2564 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2565 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2566 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2567 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2568 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2569 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2570 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
2571 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2572 f2ea84fa 2019-07-27 stsp int entry_type;
2573 f2ea84fa 2019-07-27 stsp char *relpath;
2574 f2ea84fa 2019-07-27 stsp char *entry_name;
2575 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2576 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2578 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
2580 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2582 9d31a1d8 2018-03-11 stsp return err;
2584 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2585 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2586 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2587 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2588 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2589 f2ea84fa 2019-07-27 stsp goto done;
2592 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2593 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2594 f2ea84fa 2019-07-27 stsp if (err) {
2595 f2ea84fa 2019-07-27 stsp free(tpd);
2596 6ced4176 2019-07-12 stsp goto done;
2599 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2600 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2601 f2ea84fa 2019-07-27 stsp if (err) {
2602 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2603 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2604 f2ea84fa 2019-07-27 stsp free(tpd);
2605 f2ea84fa 2019-07-27 stsp goto done;
2608 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2610 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2614 51514078 2018-12-25 stsp * Read the file index.
2615 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2616 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2618 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2620 c4cdcb68 2019-04-03 stsp goto done;
2622 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2623 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2624 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2626 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2627 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2628 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2632 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2633 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2634 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2635 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2636 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2637 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2638 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2639 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2643 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2645 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2646 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2647 af12c6b9 2019-06-04 stsp err = sync_err;
2649 9c6338c4 2019-06-02 stsp free(fileindex_path);
2651 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2652 9d31a1d8 2018-03-11 stsp if (commit)
2653 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2654 5ade8233 2019-07-12 stsp if (fileindex)
2655 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2656 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2657 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2658 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2659 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2660 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2661 f2ea84fa 2019-07-27 stsp free(tpd);
2663 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2664 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2665 9d31a1d8 2018-03-11 stsp err = unlockerr;
2666 f8d1f275 2019-02-04 stsp return err;
2669 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2670 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2671 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2672 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2673 234035bc 2019-06-01 stsp void *progress_arg;
2674 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2675 234035bc 2019-06-01 stsp void *cancel_arg;
2676 f69721c3 2019-10-21 stsp const char *label_orig;
2677 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2680 234035bc 2019-06-01 stsp static const struct got_error *
2681 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2682 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2683 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2684 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2686 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2687 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2688 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2689 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2690 234035bc 2019-06-01 stsp struct stat sb;
2691 234035bc 2019-06-01 stsp unsigned char status;
2692 234035bc 2019-06-01 stsp int local_changes_subsumed;
2694 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2695 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2696 d6c87207 2019-08-02 stsp strlen(path2));
2697 1ee397ad 2019-07-12 stsp if (ie == NULL)
2698 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2699 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2701 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2702 234035bc 2019-06-01 stsp path2) == -1)
2703 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2705 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2708 234035bc 2019-06-01 stsp goto done;
2710 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2711 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2712 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2713 234035bc 2019-06-01 stsp goto done;
2715 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2716 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2717 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2718 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2719 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2720 234035bc 2019-06-01 stsp goto done;
2723 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2724 af57b12a 2020-07-23 stsp err = merge_symlink(a->worktree, blob1,
2725 af57b12a 2020-07-23 stsp ondisk_path, path2, sb.st_mode, a->label_orig,
2726 af57b12a 2020-07-23 stsp blob2, a->commit_id2, repo, a->progress_cb,
2727 af57b12a 2020-07-23 stsp a->progress_arg);
2729 af57b12a 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2730 af57b12a 2020-07-23 stsp blob1, ondisk_path, path2, sb.st_mode,
2731 af57b12a 2020-07-23 stsp a->label_orig, blob2, a->commit_id2, repo,
2732 af57b12a 2020-07-23 stsp a->progress_cb, a->progress_arg);
2734 234035bc 2019-06-01 stsp } else if (blob1) {
2735 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2736 d6c87207 2019-08-02 stsp strlen(path1));
2737 1ee397ad 2019-07-12 stsp if (ie == NULL)
2738 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2739 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2741 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2742 2b92fad7 2019-06-02 stsp path1) == -1)
2743 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2745 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2748 2b92fad7 2019-06-02 stsp goto done;
2750 2b92fad7 2019-06-02 stsp switch (status) {
2751 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2752 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2753 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2755 1ee397ad 2019-07-12 stsp goto done;
2756 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2758 2b92fad7 2019-06-02 stsp goto done;
2760 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2762 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2763 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2764 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2765 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2767 1ee397ad 2019-07-12 stsp goto done;
2769 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2771 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2772 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2773 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2774 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2775 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2777 1ee397ad 2019-07-12 stsp goto done;
2779 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2780 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2782 1ee397ad 2019-07-12 stsp goto done;
2787 234035bc 2019-06-01 stsp } else if (blob2) {
2788 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2789 234035bc 2019-06-01 stsp path2) == -1)
2790 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2791 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2792 d6c87207 2019-08-02 stsp strlen(path2));
2794 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2795 7f91a133 2019-12-13 stsp -1, NULL, repo);
2797 234035bc 2019-06-01 stsp goto done;
2798 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2799 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2800 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2801 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2802 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2803 1ee397ad 2019-07-12 stsp status, path2);
2804 234035bc 2019-06-01 stsp goto done;
2806 526a746f 2020-07-23 stsp if (S_ISLNK(mode2)) {
2807 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2808 526a746f 2020-07-23 stsp ondisk_path, path2, sb.st_mode,
2809 526a746f 2020-07-23 stsp a->label_orig, blob2, a->commit_id2,
2810 526a746f 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2812 526a746f 2020-07-23 stsp goto done;
2814 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2815 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2816 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2817 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2818 526a746f 2020-07-23 stsp a->progress_arg);
2820 526a746f 2020-07-23 stsp goto done;
2822 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2823 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2824 054041d0 2020-06-24 stsp ondisk_path, blob2->id.sha1,
2825 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2827 234035bc 2019-06-01 stsp goto done;
2830 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2831 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2832 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2833 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2834 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2835 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
2837 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2838 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2839 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2842 234035bc 2019-06-01 stsp goto done;
2843 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2845 234035bc 2019-06-01 stsp goto done;
2846 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2847 3969253a 2020-03-07 stsp NULL, NULL, 1);
2848 3969253a 2020-03-07 stsp if (err) {
2849 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2850 3969253a 2020-03-07 stsp goto done;
2852 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2853 2b92fad7 2019-06-02 stsp if (err) {
2854 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2855 2b92fad7 2019-06-02 stsp goto done;
2857 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2858 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2859 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2864 234035bc 2019-06-01 stsp free(ondisk_path);
2865 234035bc 2019-06-01 stsp return err;
2868 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2869 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2870 234035bc 2019-06-01 stsp struct got_repository *repo;
2873 234035bc 2019-06-01 stsp static const struct got_error *
2874 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2876 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2877 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2878 234035bc 2019-06-01 stsp unsigned char status;
2879 234035bc 2019-06-01 stsp struct stat sb;
2880 234035bc 2019-06-01 stsp char *ondisk_path;
2882 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2883 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2884 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2885 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2887 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2889 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2891 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2892 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2894 234035bc 2019-06-01 stsp return err;
2895 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2896 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2898 234035bc 2019-06-01 stsp return NULL;
2901 818c7501 2019-07-11 stsp static const struct got_error *
2902 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2903 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2904 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2905 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2906 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2908 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2909 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2910 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2911 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2912 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2914 03415a1a 2019-06-02 stsp if (commit_id1) {
2915 f69721c3 2019-10-21 stsp char *id_str;
2917 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2918 03415a1a 2019-06-02 stsp worktree->path_prefix);
2920 03415a1a 2019-06-02 stsp goto done;
2922 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2924 03415a1a 2019-06-02 stsp goto done;
2926 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
2928 f69721c3 2019-10-21 stsp goto done;
2930 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2931 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2932 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2933 f69721c3 2019-10-21 stsp free(id_str);
2934 f69721c3 2019-10-21 stsp goto done;
2936 f69721c3 2019-10-21 stsp free(id_str);
2939 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2940 234035bc 2019-06-01 stsp worktree->path_prefix);
2942 234035bc 2019-06-01 stsp goto done;
2944 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2946 234035bc 2019-06-01 stsp goto done;
2948 234035bc 2019-06-01 stsp arg.worktree = worktree;
2949 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2950 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2951 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2952 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2953 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2954 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
2955 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2956 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2957 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2958 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2959 af12c6b9 2019-06-04 stsp err = sync_err;
2961 234035bc 2019-06-01 stsp if (tree1)
2962 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2963 234035bc 2019-06-01 stsp if (tree2)
2964 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2965 f69721c3 2019-10-21 stsp free(label_orig);
2966 818c7501 2019-07-11 stsp return err;
2969 818c7501 2019-07-11 stsp const struct got_error *
2970 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2971 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2972 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2973 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2975 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2976 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2977 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2978 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2980 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2982 818c7501 2019-07-11 stsp return err;
2984 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2986 818c7501 2019-07-11 stsp goto done;
2988 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2989 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2990 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2991 818c7501 2019-07-11 stsp &mok_arg);
2993 818c7501 2019-07-11 stsp goto done;
2995 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2996 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2998 818c7501 2019-07-11 stsp if (fileindex)
2999 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3000 818c7501 2019-07-11 stsp free(fileindex_path);
3001 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3002 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3003 234035bc 2019-06-01 stsp err = unlockerr;
3004 234035bc 2019-06-01 stsp return err;
3007 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3008 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3009 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3010 927df6b7 2019-02-10 stsp const char *status_path;
3011 927df6b7 2019-02-10 stsp size_t status_path_len;
3012 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3013 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3014 f8d1f275 2019-02-04 stsp void *status_arg;
3015 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3016 f8d1f275 2019-02-04 stsp void *cancel_arg;
3017 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3018 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
3019 f2a9dc41 2019-12-13 tracey int report_unchanged;
3020 3143d852 2020-06-25 stsp int no_ignores;
3023 f8d1f275 2019-02-04 stsp static const struct got_error *
3024 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3025 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3026 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3027 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3029 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3030 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3031 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3032 927df6b7 2019-02-10 stsp struct stat sb;
3033 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3034 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3035 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3037 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3039 98eaaa12 2019-08-03 stsp return err;
3041 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3042 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3043 98eaaa12 2019-08-03 stsp return NULL;
3045 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3046 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3047 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3049 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3050 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3051 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3053 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3054 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3055 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3056 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3057 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3060 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3061 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3064 927df6b7 2019-02-10 stsp static const struct got_error *
3065 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3066 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3068 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3069 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3070 f8d1f275 2019-02-04 stsp char *abspath;
3072 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3073 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3075 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3076 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3077 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3078 927df6b7 2019-02-10 stsp return NULL;
3080 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3081 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3082 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3083 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3085 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3086 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3087 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3090 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3091 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3092 f8d1f275 2019-02-04 stsp free(abspath);
3093 9d31a1d8 2018-03-11 stsp return err;
3096 f8d1f275 2019-02-04 stsp static const struct got_error *
3097 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3099 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3100 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3101 2ec1f75b 2019-03-26 stsp unsigned char status;
3103 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3104 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3106 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3107 927df6b7 2019-02-10 stsp return NULL;
3109 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3110 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3111 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3112 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3114 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3115 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3116 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3120 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3122 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3124 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3125 6841da00 2019-08-08 stsp free((char *)pe->path);
3126 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3130 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3132 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3134 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3135 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3136 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3137 6841da00 2019-08-08 stsp free((char *)pe->path);
3139 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3142 6841da00 2019-08-08 stsp static const struct got_error *
3143 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3145 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3146 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3147 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3148 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3149 6841da00 2019-08-08 stsp size_t linesize = 0;
3150 6841da00 2019-08-08 stsp ssize_t linelen;
3152 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3153 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3154 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3155 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3157 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3158 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3159 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3161 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3162 bd8de430 2019-10-04 stsp if (line[0] == '#')
3165 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3166 bd8de430 2019-10-04 stsp if (line[0] == '!')
3169 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3170 6841da00 2019-08-08 stsp line) == -1) {
3171 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3172 6841da00 2019-08-08 stsp goto done;
3174 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3176 6841da00 2019-08-08 stsp goto done;
3178 6841da00 2019-08-08 stsp if (ferror(f)) {
3179 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3180 6841da00 2019-08-08 stsp goto done;
3183 6841da00 2019-08-08 stsp dirpath = strdup(path);
3184 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3185 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3186 6841da00 2019-08-08 stsp goto done;
3188 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3190 6841da00 2019-08-08 stsp free(line);
3191 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3192 6841da00 2019-08-08 stsp free(dirpath);
3193 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3195 6841da00 2019-08-08 stsp return err;
3199 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3201 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3203 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3204 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3205 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3206 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3208 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3209 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3211 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3213 bd8de430 2019-10-04 stsp pattern += 3;
3215 bd8de430 2019-10-04 stsp while (*p) {
3216 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3217 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3218 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3219 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3221 bd8de430 2019-10-04 stsp while (*p == '/')
3231 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3232 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3233 6841da00 2019-08-08 stsp * ignores backwards.
3235 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3236 6841da00 2019-08-08 stsp while (pe) {
3237 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3238 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3239 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3240 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3241 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3242 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3243 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3244 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3245 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3250 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3256 6841da00 2019-08-08 stsp static const struct got_error *
3257 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3258 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3260 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3261 6841da00 2019-08-08 stsp char *ignorespath;
3262 886cec17 2019-12-15 stsp int fd = -1;
3263 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3265 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3266 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3267 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3269 886cec17 2019-12-15 stsp if (dirfd != -1) {
3270 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3271 886cec17 2019-12-15 stsp if (fd == -1) {
3272 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3273 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3274 886cec17 2019-12-15 stsp ignorespath);
3276 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3277 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3278 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3279 886cec17 2019-12-15 stsp ignorespath);
3282 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3286 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3287 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3288 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3289 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3290 886cec17 2019-12-15 stsp ignorespath);
3292 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3295 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3296 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3297 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3298 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3299 6841da00 2019-08-08 stsp free(ignorespath);
3300 6841da00 2019-08-08 stsp return err;
3303 f8d1f275 2019-02-04 stsp static const struct got_error *
3304 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3306 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3307 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3308 f8d1f275 2019-02-04 stsp char *path = NULL;
3310 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3311 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3313 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3314 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3315 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3317 f8d1f275 2019-02-04 stsp path = de->d_name;
3320 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3321 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3322 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
3323 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3324 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3325 f8d1f275 2019-02-04 stsp if (parent_path[0])
3326 f8d1f275 2019-02-04 stsp free(path);
3327 b72f483a 2019-02-05 stsp return err;
3330 347d1d3e 2019-07-12 stsp static const struct got_error *
3331 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3333 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3334 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3336 3143d852 2020-06-25 stsp if (a->no_ignores)
3337 3143d852 2020-06-25 stsp return NULL;
3339 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
3340 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3342 3143d852 2020-06-25 stsp return err;
3344 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
3345 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3347 3143d852 2020-06-25 stsp return err;
3350 3143d852 2020-06-25 stsp static const struct got_error *
3351 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3352 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3353 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
3355 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3356 abb4604f 2019-07-27 stsp struct stat sb;
3358 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3360 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3361 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3363 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3364 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3365 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3366 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3367 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3368 abb4604f 2019-07-27 stsp return NULL;
3371 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3372 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3373 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3375 abb4604f 2019-07-27 stsp return NULL;
3378 3143d852 2020-06-25 stsp static const struct got_error *
3379 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3380 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3382 3143d852 2020-06-25 stsp const struct got_error *err;
3383 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3385 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3386 3143d852 2020-06-25 stsp ".cvsignore");
3388 3143d852 2020-06-25 stsp return err;
3390 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3391 3143d852 2020-06-25 stsp ".gitignore");
3393 3143d852 2020-06-25 stsp return err;
3395 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3396 3143d852 2020-06-25 stsp if (err) {
3397 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3398 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3399 3143d852 2020-06-25 stsp return err;
3401 3143d852 2020-06-25 stsp for (;;) {
3402 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3403 3143d852 2020-06-25 stsp ".cvsignore");
3406 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3407 3143d852 2020-06-25 stsp ".gitignore");
3410 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3411 3143d852 2020-06-25 stsp if (err) {
3412 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3413 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3416 b737c85a 2020-06-26 stsp free(parent_path);
3417 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3418 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3421 b737c85a 2020-06-26 stsp free(parent_path);
3422 b737c85a 2020-06-26 stsp free(next_parent_path);
3423 3143d852 2020-06-25 stsp return err;
3426 abb4604f 2019-07-27 stsp static const struct got_error *
3427 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3428 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3429 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3430 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3431 f2a9dc41 2019-12-13 tracey int report_unchanged)
3433 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3434 6fc93f37 2019-12-13 stsp int fd = -1;
3435 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3436 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3437 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3439 3143d852 2020-06-25 stsp TAILQ_INIT(&arg.ignores);
3441 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3442 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3443 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3445 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3446 6fc93f37 2019-12-13 stsp if (fd == -1) {
3447 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3448 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3449 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3451 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3452 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3453 f2a9dc41 2019-12-13 tracey report_unchanged);
3455 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3456 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3457 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3458 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3459 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3460 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3461 abb4604f 2019-07-27 stsp arg.status_path = path;
3462 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3463 abb4604f 2019-07-27 stsp arg.repo = repo;
3464 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3465 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3466 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3467 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3468 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3469 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3470 022fae89 2019-12-06 tracey if (!no_ignores) {
3471 3143d852 2020-06-25 stsp err = add_ignores_from_parent_paths(&arg.ignores,
3472 3143d852 2020-06-25 stsp worktree->root_path, path);
3474 3143d852 2020-06-25 stsp goto done;
3476 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3477 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3480 3143d852 2020-06-25 stsp free_ignores(&arg.ignores);
3481 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
3482 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3483 927df6b7 2019-02-10 stsp free(ondisk_path);
3484 347d1d3e 2019-07-12 stsp return err;
3487 347d1d3e 2019-07-12 stsp const struct got_error *
3488 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3489 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3490 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
3491 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3493 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3494 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3495 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3496 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3498 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3500 347d1d3e 2019-07-12 stsp return err;
3502 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3503 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3504 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3508 f8d1f275 2019-02-04 stsp free(fileindex_path);
3509 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3510 f8d1f275 2019-02-04 stsp return err;
3513 6c7ab921 2019-03-18 stsp const struct got_error *
3514 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3515 6c7ab921 2019-03-18 stsp const char *arg)
3517 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3518 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3519 6c7ab921 2019-03-18 stsp size_t len;
3520 00bb5ea0 2020-07-23 stsp struct stat sb;
3522 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3524 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3525 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3526 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3528 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3529 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3530 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3531 00bb5ea0 2020-07-23 stsp goto done;
3534 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3536 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3537 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3538 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3539 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3541 00bb5ea0 2020-07-23 stsp char *abspath = NULL;
3542 00bb5ea0 2020-07-23 stsp char canonpath[PATH_MAX];
3543 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3544 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3545 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3546 00bb5ea0 2020-07-23 stsp goto done;
3550 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3551 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3553 d0710d08 2019-07-22 stsp goto done;
3554 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3555 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3556 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3557 00bb5ea0 2020-07-23 stsp goto done;
3560 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3561 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3562 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3563 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3564 00bb5ea0 2020-07-23 stsp goto done;
3566 00bb5ea0 2020-07-23 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
3567 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3568 00bb5ea0 2020-07-23 stsp goto done;
3573 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3574 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3575 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3576 6c7ab921 2019-03-18 stsp goto done;
3579 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3580 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3581 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3583 f6d88e1a 2019-05-29 stsp goto done;
3585 f6d88e1a 2019-05-29 stsp path = strdup("");
3586 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3587 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3588 f6d88e1a 2019-05-29 stsp goto done;
3592 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3593 6c7ab921 2019-03-18 stsp len = strlen(path);
3594 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3595 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3599 6c7ab921 2019-03-18 stsp free(resolved);
3600 d0710d08 2019-07-22 stsp free(cwd);
3601 6c7ab921 2019-03-18 stsp if (err == NULL)
3602 6c7ab921 2019-03-18 stsp *wt_path = path;
3604 6c7ab921 2019-03-18 stsp free(path);
3605 d00136be 2019-03-26 stsp return err;
3608 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3609 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3610 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3611 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3612 4e68cba3 2019-11-23 stsp void *progress_arg;
3613 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3616 4e68cba3 2019-11-23 stsp static const struct got_error *
3617 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3618 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3619 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3620 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3622 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3623 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3624 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3625 6d022e97 2019-08-04 stsp struct stat sb;
3626 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3628 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3629 dbb83fbd 2019-12-12 stsp relpath) == -1)
3630 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3632 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3634 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3635 12463d8b 2019-12-13 stsp de_name, a->repo);
3637 dbb83fbd 2019-12-12 stsp goto done;
3638 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3639 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3640 dbb83fbd 2019-12-12 stsp goto done;
3641 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3643 dbb83fbd 2019-12-12 stsp goto done;
3646 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3647 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3648 dbb83fbd 2019-12-12 stsp goto done;
3651 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3653 4e68cba3 2019-11-23 stsp goto done;
3654 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
3655 3969253a 2020-03-07 stsp if (err) {
3656 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3657 3969253a 2020-03-07 stsp goto done;
3659 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3660 07f5b47a 2019-06-02 stsp if (err) {
3661 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3662 4e68cba3 2019-11-23 stsp goto done;
3665 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3667 dbb83fbd 2019-12-12 stsp return err;
3668 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3669 dbb83fbd 2019-12-12 stsp return NULL;
3670 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3673 d00136be 2019-03-26 stsp const struct got_error *
3674 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3675 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3676 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3677 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3679 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3680 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3681 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3682 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3683 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3685 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3687 d00136be 2019-03-26 stsp return err;
3689 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3691 d00136be 2019-03-26 stsp goto done;
3693 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3694 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3695 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3696 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3697 4e68cba3 2019-11-23 stsp saa.repo = repo;
3699 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3700 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3701 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3705 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3706 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3707 af12c6b9 2019-06-04 stsp err = sync_err;
3709 fb399478 2019-07-12 stsp free(fileindex_path);
3710 d00136be 2019-03-26 stsp if (fileindex)
3711 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3712 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3713 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3714 d00136be 2019-03-26 stsp err = unlockerr;
3715 6c7ab921 2019-03-18 stsp return err;
3718 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3719 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3720 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3721 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3722 f2a9dc41 2019-12-13 tracey void *progress_arg;
3723 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3724 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3725 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3728 f2a9dc41 2019-12-13 tracey static const struct got_error *
3729 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3730 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3731 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3732 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3734 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3735 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3736 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3737 17ed4618 2019-06-02 stsp struct stat sb;
3738 15341bfd 2020-03-05 tracey char *ondisk_path, *parent = NULL;
3740 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3741 17ed4618 2019-06-02 stsp if (ie == NULL)
3742 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3744 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3745 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3746 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3747 9acbc4fa 2019-08-03 stsp return NULL;
3748 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3751 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3752 f2a9dc41 2019-12-13 tracey relpath) == -1)
3753 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3755 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3758 f2a9dc41 2019-12-13 tracey goto done;
3760 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3761 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3762 f2a9dc41 2019-12-13 tracey goto done;
3763 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3764 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3765 f2a9dc41 2019-12-13 tracey goto done;
3767 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3768 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3769 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3770 f2a9dc41 2019-12-13 tracey goto done;
3774 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3775 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3776 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3777 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3778 12463d8b 2019-12-13 stsp ondisk_path);
3779 12463d8b 2019-12-13 stsp goto done;
3781 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3782 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3783 12463d8b 2019-12-13 stsp goto done;
3786 15341bfd 2020-03-05 tracey parent = dirname(ondisk_path);
3788 15341bfd 2020-03-05 tracey if (parent == NULL) {
3789 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", ondisk_path);
3790 15341bfd 2020-03-05 tracey goto done;
3792 15341bfd 2020-03-05 tracey while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3793 15341bfd 2020-03-05 tracey if (rmdir(parent) == -1) {
3794 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3795 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3796 15341bfd 2020-03-05 tracey parent);
3799 15341bfd 2020-03-05 tracey parent = dirname(parent);
3800 15341bfd 2020-03-05 tracey if (parent == NULL) {
3801 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", parent);
3802 15341bfd 2020-03-05 tracey goto done;
3807 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3809 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3810 f2a9dc41 2019-12-13 tracey if (err)
3811 f2a9dc41 2019-12-13 tracey return err;
3812 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3813 f2a9dc41 2019-12-13 tracey return NULL;
3814 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3815 f2a9dc41 2019-12-13 tracey staged_status, relpath);
3818 2ec1f75b 2019-03-26 stsp const struct got_error *
3819 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
3820 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
3821 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
3822 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
3824 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3825 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
3826 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3827 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3828 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3830 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3832 2ec1f75b 2019-03-26 stsp return err;
3834 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3836 2ec1f75b 2019-03-26 stsp goto done;
3838 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3839 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3840 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3841 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3842 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3843 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3844 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
3846 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3847 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3848 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3852 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3853 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3854 af12c6b9 2019-06-04 stsp err = sync_err;
3856 fb399478 2019-07-12 stsp free(fileindex_path);
3857 2ec1f75b 2019-03-26 stsp if (fileindex)
3858 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3859 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3860 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3861 2ec1f75b 2019-03-26 stsp err = unlockerr;
3862 33aa809d 2019-08-08 stsp return err;
3865 33aa809d 2019-08-08 stsp static const struct got_error *
3866 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3868 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3869 33aa809d 2019-08-08 stsp char *line = NULL;
3870 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3871 33aa809d 2019-08-08 stsp ssize_t linelen;
3873 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3874 33aa809d 2019-08-08 stsp if (linelen == -1) {
3875 33aa809d 2019-08-08 stsp if (ferror(infile)) {
3876 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
3877 33aa809d 2019-08-08 stsp goto done;
3879 33aa809d 2019-08-08 stsp return NULL;
3881 33aa809d 2019-08-08 stsp if (outfile) {
3882 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
3883 33aa809d 2019-08-08 stsp if (n != linelen) {
3884 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3885 33aa809d 2019-08-08 stsp goto done;
3888 33aa809d 2019-08-08 stsp if (rejectfile) {
3889 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
3890 33aa809d 2019-08-08 stsp if (n != linelen)
3891 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3894 33aa809d 2019-08-08 stsp free(line);
3895 2ec1f75b 2019-03-26 stsp return err;
3898 33aa809d 2019-08-08 stsp static const struct got_error *
3899 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
3901 33aa809d 2019-08-08 stsp char *line = NULL;
3902 33aa809d 2019-08-08 stsp size_t linesize = 0;
3903 33aa809d 2019-08-08 stsp ssize_t linelen;
3905 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
3906 500467ff 2019-09-25 hiltjo if (linelen == -1) {
3907 500467ff 2019-09-25 hiltjo if (ferror(f))
3908 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
3909 500467ff 2019-09-25 hiltjo return NULL;
3911 33aa809d 2019-08-08 stsp free(line);
3912 33aa809d 2019-08-08 stsp return NULL;
3915 33aa809d 2019-08-08 stsp static const struct got_error *
3916 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3917 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
3918 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
3920 33aa809d 2019-08-08 stsp const struct got_error *err;
3922 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
3923 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
3924 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
3926 33aa809d 2019-08-08 stsp return err;
3927 33aa809d 2019-08-08 stsp (*line_cur1)++;
3929 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
3930 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
3931 33aa809d 2019-08-08 stsp if (rejectfile)
3932 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
3934 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
3936 33aa809d 2019-08-08 stsp return err;
3937 33aa809d 2019-08-08 stsp (*line_cur2)++;
3939 33aa809d 2019-08-08 stsp /* Copy patched lines. */
3940 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
3941 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
3943 33aa809d 2019-08-08 stsp return err;
3944 33aa809d 2019-08-08 stsp (*line_cur2)++;
3946 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
3947 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
3948 33aa809d 2019-08-08 stsp if (rejectfile)
3949 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
3951 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
3953 33aa809d 2019-08-08 stsp return err;
3954 33aa809d 2019-08-08 stsp (*line_cur1)++;
3957 f1e81a05 2019-08-10 stsp return NULL;
3960 f1e81a05 2019-08-10 stsp static const struct got_error *
3961 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3962 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
3964 f1e81a05 2019-08-10 stsp const struct got_error *err;
3966 f1e81a05 2019-08-10 stsp if (outfile) {
3967 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
3968 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
3969 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
3971 f1e81a05 2019-08-10 stsp return err;
3972 f1e81a05 2019-08-10 stsp (*line_cur1)++;
3975 f1e81a05 2019-08-10 stsp if (rejectfile) {
3976 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
3977 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
3978 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
3980 f1e81a05 2019-08-10 stsp return err;
3981 f1e81a05 2019-08-10 stsp (*line_cur2)++;
3985 33aa809d 2019-08-08 stsp return NULL;
3988 33aa809d 2019-08-08 stsp static const struct got_error *
3989 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3990 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3991 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3992 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
3993 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3995 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3996 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
3997 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
3998 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
3999 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
4000 33aa809d 2019-08-08 stsp long pos1, pos2;
4001 33aa809d 2019-08-08 stsp FILE *hunkfile;
4003 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4005 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
4006 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
4007 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
4009 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
4010 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
4012 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
4013 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
4015 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
4016 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
4017 33aa809d 2019-08-08 stsp goto done;
4019 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
4020 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
4021 33aa809d 2019-08-08 stsp goto done;
4023 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4024 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4025 33aa809d 2019-08-08 stsp goto done;
4028 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4029 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
4031 33aa809d 2019-08-08 stsp goto done;
4033 33aa809d 2019-08-08 stsp switch (*choice) {
4034 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4035 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4036 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4038 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4039 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4040 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4042 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4045 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4049 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4050 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4051 33aa809d 2019-08-08 stsp return err;
4054 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4055 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4056 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4057 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4058 1f1abb7e 2019-08-08 stsp void *progress_arg;
4059 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4060 33aa809d 2019-08-08 stsp void *patch_arg;
4061 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4064 e20a8b6f 2019-06-04 stsp static const struct got_error *
4065 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4066 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4067 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4068 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4069 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4071 33aa809d 2019-08-08 stsp const struct got_error *err;
4072 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4073 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4074 1ebedb77 2019-10-19 stsp int fd2 = -1;
4075 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4076 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
4077 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
4078 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
4079 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
4080 33aa809d 2019-08-08 stsp struct got_diff_change *change;
4081 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
4082 33aa809d 2019-08-08 stsp int n = 0;
4084 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4086 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4088 33aa809d 2019-08-08 stsp return err;
4090 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4091 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4092 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4093 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", path2);
4094 12463d8b 2019-12-13 stsp goto done;
4097 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4098 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4099 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", path2);
4100 12463d8b 2019-12-13 stsp goto done;
4103 1ebedb77 2019-10-19 stsp if (fstat(fd2, &sb2) == -1) {
4104 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("fstat", path2);
4105 1ebedb77 2019-10-19 stsp goto done;
4108 1ebedb77 2019-10-19 stsp f2 = fdopen(fd2, "r");
4109 33aa809d 2019-08-08 stsp if (f2 == NULL) {
4110 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", path2);
4111 33aa809d 2019-08-08 stsp goto done;
4115 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4117 33aa809d 2019-08-08 stsp goto done;
4119 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4121 33aa809d 2019-08-08 stsp goto done;
4123 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4125 33aa809d 2019-08-08 stsp goto done;
4127 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
4128 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
4129 33aa809d 2019-08-08 stsp goto done;
4132 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
4133 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
4135 33aa809d 2019-08-08 stsp goto done;
4137 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4139 33aa809d 2019-08-08 stsp goto done;
4141 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4142 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4143 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4144 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4145 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
4146 33aa809d 2019-08-08 stsp int choice;
4147 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
4148 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
4149 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
4150 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4151 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4152 e635744c 2019-08-08 stsp patch_cb, patch_arg);
4154 33aa809d 2019-08-08 stsp goto done;
4155 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4156 33aa809d 2019-08-08 stsp have_content = 1;
4157 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4160 1ebedb77 2019-10-19 stsp if (have_content) {
4161 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4162 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4163 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4165 1ebedb77 2019-10-19 stsp goto done;
4167 1ebedb77 2019-10-19 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
4168 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", path2);
4169 1ebedb77 2019-10-19 stsp goto done;
4173 33aa809d 2019-08-08 stsp free(id_str);
4175 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4176 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4177 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4178 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4179 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4180 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4181 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4182 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4183 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4184 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4185 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4186 33aa809d 2019-08-08 stsp if (err || !have_content) {
4187 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4188 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4189 33aa809d 2019-08-08 stsp free(*path_outfile);
4190 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4192 33aa809d 2019-08-08 stsp free(args);
4194 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
4197 33aa809d 2019-08-08 stsp if (changes)
4198 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
4199 33aa809d 2019-08-08 stsp free(path1);
4200 33aa809d 2019-08-08 stsp return err;
4203 33aa809d 2019-08-08 stsp static const struct got_error *
4204 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4205 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4206 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4207 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4209 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4210 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4211 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4212 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4213 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4214 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4215 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4216 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4217 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4218 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4220 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4221 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4222 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4223 d3bcc3d1 2019-08-08 stsp return NULL;
4225 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4226 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4227 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4229 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4230 65084dad 2019-08-08 stsp if (ie == NULL)
4231 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4233 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4234 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4235 a129376b 2019-03-28 stsp if (err) {
4236 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4237 a129376b 2019-03-28 stsp goto done;
4238 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4239 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4240 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4241 e20a8b6f 2019-06-04 stsp goto done;
4244 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4245 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4246 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4247 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4248 a129376b 2019-03-28 stsp goto done;
4251 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4252 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4253 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4254 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4255 a129376b 2019-03-28 stsp goto done;
4258 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4259 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4260 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4261 a129376b 2019-03-28 stsp goto done;
4266 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4267 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4268 a9fa2909 2019-07-27 stsp if (err) {
4269 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4270 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4271 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4272 a9fa2909 2019-07-27 stsp goto done;
4274 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4276 a9fa2909 2019-07-27 stsp goto done;
4278 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
4279 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
4280 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
4281 a9fa2909 2019-07-27 stsp goto done;
4284 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4285 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4286 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4287 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
4288 a9fa2909 2019-07-27 stsp goto done;
4292 a129376b 2019-03-28 stsp switch (status) {
4293 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4294 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4295 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4296 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4297 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4299 33aa809d 2019-08-08 stsp goto done;
4300 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4303 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4304 1f1abb7e 2019-08-08 stsp ie->path);
4306 1ee397ad 2019-07-12 stsp goto done;
4307 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4309 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4310 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4311 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4312 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4313 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4315 33aa809d 2019-08-08 stsp goto done;
4316 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4319 33aa809d 2019-08-08 stsp /* fall through */
4320 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4321 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4322 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4323 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4324 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4325 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4326 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4327 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4328 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4330 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4331 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4332 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4334 65084dad 2019-08-08 stsp goto done;
4336 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4337 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4338 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4339 a129376b 2019-03-28 stsp goto done;
4342 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4343 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4344 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4345 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4346 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4347 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4349 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
4350 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
4351 33aa809d 2019-08-08 stsp path_content, ondisk_path);
4352 33aa809d 2019-08-08 stsp goto done;
4355 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4356 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4357 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4358 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4359 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4360 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4362 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4364 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4365 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4366 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4367 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4370 a129376b 2019-03-28 stsp goto done;
4371 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4372 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4373 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4374 054041d0 2020-06-24 stsp ondisk_path, blob->id.sha1,
4375 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4377 2e1fa222 2020-07-23 stsp goto done;
4379 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4380 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4381 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4390 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4391 33aa809d 2019-08-08 stsp free(path_content);
4392 e20a8b6f 2019-06-04 stsp free(parent_path);
4393 a129376b 2019-03-28 stsp free(tree_path);
4395 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4397 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4398 a129376b 2019-03-28 stsp free(tree_id);
4399 e20a8b6f 2019-06-04 stsp return err;
4402 e20a8b6f 2019-06-04 stsp const struct got_error *
4403 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4404 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4405 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4406 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4407 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4409 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4410 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4411 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4412 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4413 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4414 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4416 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4418 e20a8b6f 2019-06-04 stsp return err;
4420 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4422 e20a8b6f 2019-06-04 stsp goto done;
4424 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4425 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4426 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4427 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4428 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4429 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4430 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4431 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4432 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4433 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4437 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4438 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4439 e20a8b6f 2019-06-04 stsp err = sync_err;
4441 fb399478 2019-07-12 stsp free(fileindex_path);
4442 a129376b 2019-03-28 stsp if (fileindex)
4443 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4444 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4445 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4446 a129376b 2019-03-28 stsp err = unlockerr;
4447 c4296144 2019-05-09 stsp return err;
4450 cf066bf8 2019-05-09 stsp static void
4451 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4453 24519714 2019-05-09 stsp free(ct->path);
4454 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4455 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4456 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4457 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4458 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4459 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4463 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4464 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4465 24519714 2019-05-09 stsp struct got_repository *repo;
4466 24519714 2019-05-09 stsp struct got_worktree *worktree;
4467 5f8a88c6 2019-08-03 stsp int have_staged_files;
4470 c4296144 2019-05-09 stsp static const struct got_error *
4471 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
4472 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4473 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4474 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4476 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
4477 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4478 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4479 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4480 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4481 768aea60 2019-05-09 stsp struct stat sb;
4483 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
4484 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4485 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4486 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4487 5f8a88c6 2019-08-03 stsp return NULL;
4489 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4490 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4492 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4493 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4494 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4495 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4496 5f8a88c6 2019-08-03 stsp return NULL;
4499 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4500 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4501 036813ee 2019-05-09 stsp goto done;
4503 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4504 036813ee 2019-05-09 stsp parent_path = strdup("");
4505 69960a46 2019-05-09 stsp if (parent_path == NULL)
4506 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4508 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4510 69960a46 2019-05-09 stsp return err;
4513 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4514 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4515 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4516 c4296144 2019-05-09 stsp goto done;
4519 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4520 768aea60 2019-05-09 stsp relpath) == -1) {
4521 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4522 768aea60 2019-05-09 stsp goto done;
4524 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
4525 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
4527 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4528 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4529 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4530 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4531 12463d8b 2019-12-13 stsp ct->ondisk_path);
4532 12463d8b 2019-12-13 stsp goto done;
4534 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4535 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4536 768aea60 2019-05-09 stsp goto done;
4538 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4541 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4542 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4543 44d03001 2019-05-09 stsp relpath) == -1) {
4544 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4545 44d03001 2019-05-09 stsp goto done;
4548 cf066bf8 2019-05-09 stsp ct->status = status;
4549 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4550 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4551 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4552 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4553 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4554 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4555 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4556 b416585c 2019-05-13 stsp goto done;
4558 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4559 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4560 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4561 f0b75401 2019-08-03 stsp goto done;
4564 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4565 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4566 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4567 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4568 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4569 036813ee 2019-05-09 stsp goto done;
4572 24519714 2019-05-09 stsp ct->path = strdup(path);
4573 24519714 2019-05-09 stsp if (ct->path == NULL) {
4574 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4575 24519714 2019-05-09 stsp goto done;
4577 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4579 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4580 ed175427 2019-05-09 stsp free_commitable(ct);
4581 24519714 2019-05-09 stsp free(parent_path);
4582 036813ee 2019-05-09 stsp free(path);
4583 a129376b 2019-03-28 stsp return err;
4586 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4587 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4588 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4589 036813ee 2019-05-09 stsp struct got_repository *);
4591 ed175427 2019-05-09 stsp static const struct got_error *
4592 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4593 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4594 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4595 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4596 afa376bf 2019-05-09 stsp struct got_repository *repo)
4598 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4599 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4600 036813ee 2019-05-09 stsp char *subpath;
4602 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4603 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4604 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4606 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4608 ed175427 2019-05-09 stsp return err;
4610 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4611 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4612 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4613 036813ee 2019-05-09 stsp free(subpath);
4614 036813ee 2019-05-09 stsp return err;
4617 036813ee 2019-05-09 stsp static const struct got_error *
4618 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4620 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4621 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
4623 036813ee 2019-05-09 stsp *match = 0;
4625 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
4626 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
4627 0f63689d 2019-05-10 stsp return NULL;
4630 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
4632 0f63689d 2019-05-10 stsp return err;
4633 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
4634 036813ee 2019-05-09 stsp free(ct_parent_path);
4635 036813ee 2019-05-09 stsp return err;
4638 768aea60 2019-05-09 stsp static mode_t
4639 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
4641 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
4642 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
4644 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
4647 036813ee 2019-05-09 stsp static const struct got_error *
4648 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
4649 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
4651 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4653 036813ee 2019-05-09 stsp *new_te = NULL;
4655 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
4657 036813ee 2019-05-09 stsp goto done;
4659 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4661 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
4662 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4663 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4665 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4667 036813ee 2019-05-09 stsp if (err && *new_te) {
4668 56e0773d 2019-11-28 stsp free(*new_te);
4669 036813ee 2019-05-09 stsp *new_te = NULL;
4671 036813ee 2019-05-09 stsp return err;
4674 036813ee 2019-05-09 stsp static const struct got_error *
4675 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
4676 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
4678 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4679 036813ee 2019-05-09 stsp char *ct_name;
4681 036813ee 2019-05-09 stsp *new_te = NULL;
4683 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
4684 036813ee 2019-05-09 stsp if (*new_te == NULL)
4685 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4687 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
4688 036813ee 2019-05-09 stsp if (ct_name == NULL) {
4689 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
4690 036813ee 2019-05-09 stsp goto done;
4692 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
4693 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
4694 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4695 036813ee 2019-05-09 stsp goto done;
4698 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4700 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
4701 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4702 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4704 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4706 036813ee 2019-05-09 stsp if (err && *new_te) {
4707 56e0773d 2019-11-28 stsp free(*new_te);
4708 036813ee 2019-05-09 stsp *new_te = NULL;
4710 036813ee 2019-05-09 stsp return err;
4713 036813ee 2019-05-09 stsp static const struct got_error *
4714 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
4715 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
4717 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4718 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
4720 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
4722 036813ee 2019-05-09 stsp return err;
4723 036813ee 2019-05-09 stsp if (new_pe == NULL)
4724 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
4725 036813ee 2019-05-09 stsp return NULL;
4728 afa376bf 2019-05-09 stsp static const struct got_error *
4729 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
4730 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
4732 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
4733 5f8a88c6 2019-08-03 stsp unsigned char status;
4735 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
4736 afa376bf 2019-05-09 stsp ct_path++;
4738 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
4739 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
4741 5f8a88c6 2019-08-03 stsp status = ct->status;
4743 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
4744 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
4747 036813ee 2019-05-09 stsp static const struct got_error *
4748 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
4749 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
4751 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
4752 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
4753 44d03001 2019-05-09 stsp char *te_path;
4755 44d03001 2019-05-09 stsp *modified = 0;
4757 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
4758 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
4759 44d03001 2019-05-09 stsp te->name) == -1)
4760 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4762 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4763 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4764 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
4765 44d03001 2019-05-09 stsp strlen(te_path));
4766 44d03001 2019-05-09 stsp if (*modified)
4770 44d03001 2019-05-09 stsp free(te_path);
4771 44d03001 2019-05-09 stsp return err;
4774 44d03001 2019-05-09 stsp static const struct got_error *
4775 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
4776 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
4777 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
4779 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4780 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4782 036813ee 2019-05-09 stsp *ctp = NULL;
4784 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4785 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4786 036813ee 2019-05-09 stsp char *ct_name = NULL;
4787 036813ee 2019-05-09 stsp int path_matches;
4789 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
4790 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
4791 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
4792 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
4795 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
4796 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
4800 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
4803 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
4805 036813ee 2019-05-09 stsp return err;
4806 036813ee 2019-05-09 stsp if (!path_matches)
4809 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
4810 036813ee 2019-05-09 stsp if (ct_name == NULL)
4811 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
4813 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
4816 036813ee 2019-05-09 stsp *ctp = ct;
4820 2b496619 2019-07-10 stsp return err;
4823 2b496619 2019-07-10 stsp static const struct got_error *
4824 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
4825 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
4826 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
4827 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
4828 2b496619 2019-07-10 stsp struct got_repository *repo)
4830 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
4831 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
4832 2b496619 2019-07-10 stsp char *subtree_path;
4833 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
4834 ba580f68 2020-03-22 stsp int nentries;
4836 2b496619 2019-07-10 stsp *new_tep = NULL;
4838 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
4839 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
4840 2b496619 2019-07-10 stsp child_path) == -1)
4841 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
4843 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
4844 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
4845 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
4846 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
4848 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4849 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
4850 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4851 2b496619 2019-07-10 stsp goto done;
4853 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
4854 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
4855 2b496619 2019-07-10 stsp if (err) {
4856 56e0773d 2019-11-28 stsp free(new_te);
4857 2b496619 2019-07-10 stsp goto done;
4859 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
4862 2b496619 2019-07-10 stsp free(subtree_path);
4863 2b496619 2019-07-10 stsp if (err == NULL)
4864 2b496619 2019-07-10 stsp *new_tep = new_te;
4865 036813ee 2019-05-09 stsp return err;
4868 036813ee 2019-05-09 stsp static const struct got_error *
4869 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
4870 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
4871 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4872 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4873 036813ee 2019-05-09 stsp struct got_repository *repo)
4875 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4876 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
4877 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
4878 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4880 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
4881 ba580f68 2020-03-22 stsp *nentries = 0;
4883 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
4884 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4885 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4886 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
4888 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
4889 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
4890 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
4893 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
4894 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
4897 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4898 036813ee 2019-05-09 stsp pe->path);
4900 036813ee 2019-05-09 stsp goto done;
4902 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
4903 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
4904 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
4906 036813ee 2019-05-09 stsp goto done;
4907 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
4909 afa376bf 2019-05-09 stsp goto done;
4910 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
4911 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4913 2f51b5b3 2019-05-09 stsp goto done;
4914 ba580f68 2020-03-22 stsp (*nentries)++;
4916 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
4917 2b496619 2019-07-10 stsp if (base_tree == NULL ||
4918 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
4919 2b496619 2019-07-10 stsp == NULL) {
4920 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
4921 2b496619 2019-07-10 stsp child_path, path_base_tree,
4922 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
4925 2b496619 2019-07-10 stsp goto done;
4926 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4928 2b496619 2019-07-10 stsp goto done;
4929 ba580f68 2020-03-22 stsp (*nentries)++;
4934 2f51b5b3 2019-05-09 stsp if (base_tree) {
4935 56e0773d 2019-11-28 stsp int i, nbase_entries;
4936 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
4937 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
4938 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
4939 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4941 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
4942 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
4943 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
4944 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
4946 63c5ca5d 2019-08-24 stsp goto done;
4947 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
4949 63c5ca5d 2019-08-24 stsp goto done;
4950 ba580f68 2020-03-22 stsp (*nentries)++;
4954 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
4955 44d03001 2019-05-09 stsp int modified;
4956 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4958 036813ee 2019-05-09 stsp goto done;
4959 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
4960 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
4962 2f51b5b3 2019-05-09 stsp goto done;
4963 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
4964 44d03001 2019-05-09 stsp if (modified) {
4965 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
4966 ba580f68 2020-03-22 stsp int nsubentries;
4967 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
4968 ba580f68 2020-03-22 stsp &nsubentries, te,
4969 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
4970 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
4972 44d03001 2019-05-09 stsp goto done;
4973 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
4974 ba580f68 2020-03-22 stsp /* All entries were deleted. */
4975 ba580f68 2020-03-22 stsp free(new_id);
4978 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
4979 56e0773d 2019-11-28 stsp sizeof(new_te->id));
4980 56e0773d 2019-11-28 stsp free(new_id);
4982 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4984 036813ee 2019-05-09 stsp goto done;
4985 ba580f68 2020-03-22 stsp (*nentries)++;
4989 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
4990 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
4992 f66c734c 2019-09-22 stsp goto done;
4994 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
4995 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
4996 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
4997 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4998 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
4999 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5001 2f51b5b3 2019-05-09 stsp goto done;
5002 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5004 2f51b5b3 2019-05-09 stsp goto done;
5005 ba580f68 2020-03-22 stsp (*nentries)++;
5007 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5008 b416585c 2019-05-13 stsp status_arg);
5010 afa376bf 2019-05-09 stsp goto done;
5012 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5013 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5015 2f51b5b3 2019-05-09 stsp goto done;
5016 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5018 2f51b5b3 2019-05-09 stsp goto done;
5019 ba580f68 2020-03-22 stsp (*nentries)++;
5024 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5025 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5027 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5028 ed175427 2019-05-09 stsp return err;
5031 ebf99748 2019-05-09 stsp static const struct got_error *
5032 2e1fa222 2020-07-23 stsp reinstall_symlink_after_commit(int *is_bad_symlink, struct got_commitable *ct,
5033 2e1fa222 2020-07-23 stsp struct got_object_id *new_base_commit_id, struct got_worktree *worktree,
5034 2e1fa222 2020-07-23 stsp struct got_repository *repo)
5036 2e1fa222 2020-07-23 stsp const struct got_error *err = NULL;
5037 2e1fa222 2020-07-23 stsp struct got_blob_object *blob = NULL;
5038 2e1fa222 2020-07-23 stsp struct got_object_id *tree_id = NULL;
5039 2e1fa222 2020-07-23 stsp char *tree_path = NULL;
5040 2e1fa222 2020-07-23 stsp struct got_tree_object *tree = NULL;
5041 2e1fa222 2020-07-23 stsp struct got_tree_entry *te;
5042 2e1fa222 2020-07-23 stsp char *entry_name;
5044 2e1fa222 2020-07-23 stsp err = got_object_open_as_blob(&blob, repo, ct->blob_id, PATH_MAX);
5046 2e1fa222 2020-07-23 stsp return err;
5048 2e1fa222 2020-07-23 stsp err = got_path_dirname(&tree_path, ct->in_repo_path);
5049 2e1fa222 2020-07-23 stsp if (err) {
5050 2e1fa222 2020-07-23 stsp if (err->code != GOT_ERR_BAD_PATH)
5051 2e1fa222 2020-07-23 stsp goto done;
5052 2e1fa222 2020-07-23 stsp err = got_object_id_by_path(&tree_id, repo,
5053 2e1fa222 2020-07-23 stsp new_base_commit_id, "");
5055 2e1fa222 2020-07-23 stsp goto done;
5057 2e1fa222 2020-07-23 stsp err = got_object_id_by_path(&tree_id, repo,
5058 2e1fa222 2020-07-23 stsp new_base_commit_id, tree_path);
5060 2e1fa222 2020-07-23 stsp goto done;
5063 2e1fa222 2020-07-23 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
5065 2e1fa222 2020-07-23 stsp goto done;
5067 2e1fa222 2020-07-23 stsp entry_name = basename(ct->path);
5068 2e1fa222 2020-07-23 stsp if (entry_name == NULL) {
5069 2e1fa222 2020-07-23 stsp err = got_error_from_errno2("basename", ct->path);
5070 2e1fa222 2020-07-23 stsp goto done;
5073 2e1fa222 2020-07-23 stsp te = got_object_tree_find_entry(tree, entry_name);
5074 2e1fa222 2020-07-23 stsp if (te == NULL) {
5075 2e1fa222 2020-07-23 stsp err = got_error_path(ct->path, GOT_ERR_NO_TREE_ENTRY);
5076 2e1fa222 2020-07-23 stsp goto done;
5079 2e1fa222 2020-07-23 stsp err = install_symlink(is_bad_symlink, worktree, ct->ondisk_path,
5080 c90c8ce3 2020-07-23 stsp ct->path, blob, 0, 0, 0, repo, NULL, NULL);
5083 2e1fa222 2020-07-23 stsp got_object_blob_close(blob);
5085 2e1fa222 2020-07-23 stsp got_object_tree_close(tree);
5086 2e1fa222 2020-07-23 stsp free(tree_id);
5087 2e1fa222 2020-07-23 stsp free(tree_path);
5088 2e1fa222 2020-07-23 stsp return err;
5092 2e1fa222 2020-07-23 stsp * After comitting a symlink we have a chance to convert "bad" symlinks
5093 2e1fa222 2020-07-23 stsp * (those which point outside the work tree or into .got) to regular files.
5094 2e1fa222 2020-07-23 stsp * This way, the post-commit work tree state matches a fresh checkout of
5095 2e1fa222 2020-07-23 stsp * the tree which was just committed. We also mark such newly committed
5096 2e1fa222 2020-07-23 stsp * symlinks as "bad" in the work tree's fileindex.
5098 2e1fa222 2020-07-23 stsp static const struct got_error *
5099 2e1fa222 2020-07-23 stsp reinstall_symlinks_after_commit(struct got_pathlist_head *commitable_paths,
5100 2e1fa222 2020-07-23 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
5101 2e1fa222 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo)
5103 2e1fa222 2020-07-23 stsp const struct got_error *err = NULL;
5104 2e1fa222 2020-07-23 stsp struct got_pathlist_entry *pe;
5106 2e1fa222 2020-07-23 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5107 2e1fa222 2020-07-23 stsp struct got_commitable *ct = pe->data;
5108 2e1fa222 2020-07-23 stsp struct got_fileindex_entry *ie;
5109 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
5111 2e1fa222 2020-07-23 stsp if (!S_ISLNK(get_ct_file_mode(ct)))
5114 2e1fa222 2020-07-23 stsp err = reinstall_symlink_after_commit(&is_bad_symlink,
5115 2e1fa222 2020-07-23 stsp ct, new_base_commit_id, worktree, repo);
5118 2e1fa222 2020-07-23 stsp ie = got_fileindex_entry_get(fileindex, ct->path,
5119 2e1fa222 2020-07-23 stsp strlen(ct->path));
5120 2e1fa222 2020-07-23 stsp if (ie && is_bad_symlink) {
5121 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
5122 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
5126 2e1fa222 2020-07-23 stsp return err;
5129 2e1fa222 2020-07-23 stsp static const struct got_error *
5130 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
5131 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
5132 72fd46fa 2019-09-06 stsp int have_staged_files)
5134 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5135 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5137 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5138 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5139 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5141 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5143 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5144 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5145 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5146 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5147 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5148 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5149 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5150 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5151 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
5152 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5153 72fd46fa 2019-09-06 stsp !have_staged_files);
5155 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5156 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
5157 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5158 72fd46fa 2019-09-06 stsp !have_staged_files);
5160 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5163 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ct->ondisk_path,
5164 3969253a 2020-03-07 stsp ct->blob_id->sha1, new_base_commit_id->sha1, 1);
5165 3969253a 2020-03-07 stsp if (err) {
5166 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5169 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5170 3969253a 2020-03-07 stsp if (err) {
5171 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5176 d56d26ce 2019-05-10 stsp return err;
5180 d56d26ce 2019-05-10 stsp static const struct got_error *
5181 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5182 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5183 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5184 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5185 735ef5ac 2019-08-03 stsp int ood_errcode)
5187 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5188 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5190 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5191 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5192 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5193 1a36436d 2019-06-10 stsp return NULL;
5195 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5196 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5198 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5199 735ef5ac 2019-08-03 stsp in_repo_path);
5200 9bead371 2019-07-28 stsp if (err) {
5201 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5202 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5203 1a36436d 2019-06-10 stsp goto done;
5204 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5205 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5207 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5208 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5209 735ef5ac 2019-08-03 stsp in_repo_path);
5210 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5211 1a36436d 2019-06-10 stsp goto done;
5212 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5216 1a36436d 2019-06-10 stsp return err;
5219 c4296144 2019-05-09 stsp const struct got_error *
5220 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5221 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5222 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
5223 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5224 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5225 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5226 afa376bf 2019-05-09 stsp struct got_repository *repo)
5228 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5229 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5230 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5231 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5232 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5233 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5234 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5235 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5236 ba580f68 2020-03-22 stsp int nentries;
5237 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5238 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5239 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5241 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5243 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
5245 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5247 588edf97 2019-05-10 stsp goto done;
5249 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5251 588edf97 2019-05-10 stsp goto done;
5253 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5254 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5259 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5260 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5264 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5265 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5266 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5267 cf066bf8 2019-05-09 stsp char *ondisk_path;
5269 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5270 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5271 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5274 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5275 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5276 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5279 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5280 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5281 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5282 cf066bf8 2019-05-09 stsp goto done;
5284 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5285 2e1fa222 2020-07-23 stsp free(ondisk_path);
5287 cf066bf8 2019-05-09 stsp goto done;
5290 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5291 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5292 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5294 036813ee 2019-05-09 stsp goto done;
5296 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5298 de18fc63 2019-05-09 stsp goto done;
5299 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
5300 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5301 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
5302 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
5303 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5304 33ad4cbe 2019-05-12 jcs free(logmsg);
5306 9d40349a 2019-05-09 stsp goto done;
5308 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5309 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5310 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5311 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5312 09f5bd90 2019-05-09 stsp goto done;
5314 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5315 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5317 09f5bd90 2019-05-09 stsp goto done;
5318 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5320 ebf99748 2019-05-09 stsp goto done;
5321 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5322 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5323 09f5bd90 2019-05-09 stsp goto done;
5325 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5326 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5328 f2c16586 2019-05-09 stsp goto done;
5329 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5331 f2c16586 2019-05-09 stsp goto done;
5333 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5335 09f5bd90 2019-05-09 stsp goto done;
5337 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5339 ebf99748 2019-05-09 stsp goto done;
5341 588edf97 2019-05-10 stsp if (head_tree)
5342 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5343 588edf97 2019-05-10 stsp if (head_commit)
5344 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5345 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5346 2f17228e 2019-05-12 stsp if (head_ref2) {
5347 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5348 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5349 2f17228e 2019-05-12 stsp err = unlockerr;
5350 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5352 39cd0ff6 2019-07-12 stsp return err;
5355 5c1e53bc 2019-07-28 stsp static const struct got_error *
5356 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5357 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5359 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5360 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5362 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5363 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5364 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5366 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5367 5c1e53bc 2019-07-28 stsp ct_path++;
5369 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5370 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5374 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5375 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5377 5c1e53bc 2019-07-28 stsp return NULL;
5380 f0b75401 2019-08-03 stsp static const struct got_error *
5381 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5383 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5385 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5386 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5387 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5390 f0b75401 2019-08-03 stsp return NULL;
5393 5f8a88c6 2019-08-03 stsp static const struct got_error *
5394 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5395 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5397 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5398 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5400 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5401 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5403 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5404 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5405 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5406 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5407 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5408 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5411 5f8a88c6 2019-08-03 stsp return NULL;
5414 39cd0ff6 2019-07-12 stsp const struct got_error *
5415 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5416 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5417 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
5418 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5419 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5420 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5422 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5423 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5424 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5425 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5426 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5427 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5428 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5429 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5430 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5432 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5434 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5436 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5438 39cd0ff6 2019-07-12 stsp goto done;
5440 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5442 39cd0ff6 2019-07-12 stsp goto done;
5444 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5446 39cd0ff6 2019-07-12 stsp goto done;
5448 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5450 39cd0ff6 2019-07-12 stsp goto done;
5452 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5453 5f8a88c6 2019-08-03 stsp &have_staged_files);
5454 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5455 5f8a88c6 2019-08-03 stsp goto done;
5456 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5457 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5459 5f8a88c6 2019-08-03 stsp goto done;
5462 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5463 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5464 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5465 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5466 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5467 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5468 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5470 5c1e53bc 2019-07-28 stsp goto done;
5473 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5474 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5475 39cd0ff6 2019-07-12 stsp goto done;
5478 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5479 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5481 5c1e53bc 2019-07-28 stsp goto done;
5484 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5485 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5486 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5488 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5489 f0b75401 2019-08-03 stsp ct_path++;
5490 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5491 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5492 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5494 b50cabdf 2019-07-12 stsp goto done;
5498 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5499 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
5500 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5502 39cd0ff6 2019-07-12 stsp goto done;
5504 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5505 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
5506 2e1fa222 2020-07-23 stsp if (err == NULL) {
5507 2e1fa222 2020-07-23 stsp err = reinstall_symlinks_after_commit(&commitable_paths,
5508 2e1fa222 2020-07-23 stsp *new_commit_id, fileindex, worktree, repo);
5510 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5511 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5512 39cd0ff6 2019-07-12 stsp err = sync_err;
5514 39cd0ff6 2019-07-12 stsp if (fileindex)
5515 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5516 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5517 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5518 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5519 39cd0ff6 2019-07-12 stsp err = unlockerr;
5520 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5521 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5522 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5524 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5525 c4296144 2019-05-09 stsp return err;
5528 8656d6c4 2019-05-20 stsp const char *
5529 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5531 8656d6c4 2019-05-20 stsp return ct->path;
5534 8656d6c4 2019-05-20 stsp unsigned int
5535 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5537 8656d6c4 2019-05-20 stsp return ct->status;
5540 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5541 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5542 818c7501 2019-07-11 stsp struct got_repository *repo;
5545 818c7501 2019-07-11 stsp static const struct got_error *
5546 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5548 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5549 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5550 818c7501 2019-07-11 stsp unsigned char status;
5551 818c7501 2019-07-11 stsp struct stat sb;
5552 818c7501 2019-07-11 stsp char *ondisk_path;
5554 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5555 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5556 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5557 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5559 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5561 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5563 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5564 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5565 818c7501 2019-07-11 stsp free(ondisk_path);
5567 818c7501 2019-07-11 stsp return err;
5569 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5570 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5571 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5572 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5574 818c7501 2019-07-11 stsp return NULL;
5577 818c7501 2019-07-11 stsp const struct got_error *
5578 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5579 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5580 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5581 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5583 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5584 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5585 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5586 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5587 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5588 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5589 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5591 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5592 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5593 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5595 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5597 818c7501 2019-07-11 stsp return err;
5599 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5601 818c7501 2019-07-11 stsp goto done;
5603 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5604 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5605 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5608 818c7501 2019-07-11 stsp goto done;
5610 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5612 818c7501 2019-07-11 stsp goto done;
5614 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5616 818c7501 2019-07-11 stsp goto done;
5618 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5620 818c7501 2019-07-11 stsp goto done;
5622 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5625 e51d7b55 2020-01-04 stsp goto done;
5627 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5629 818c7501 2019-07-11 stsp goto done;
5630 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5631 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5632 e51d7b55 2020-01-04 stsp goto done;
5635 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5636 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5638 818c7501 2019-07-11 stsp goto done;
5639 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5641 818c7501 2019-07-11 stsp goto done;
5643 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5645 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5647 818c7501 2019-07-11 stsp goto done;
5649 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5651 818c7501 2019-07-11 stsp goto done;
5653 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5654 818c7501 2019-07-11 stsp worktree->base_commit_id);
5656 818c7501 2019-07-11 stsp goto done;
5657 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5659 818c7501 2019-07-11 stsp goto done;
5661 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5663 818c7501 2019-07-11 stsp goto done;
5665 818c7501 2019-07-11 stsp free(fileindex_path);
5666 818c7501 2019-07-11 stsp free(tmp_branch_name);
5667 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5668 818c7501 2019-07-11 stsp free(branch_ref_name);
5669 818c7501 2019-07-11 stsp if (branch_ref)
5670 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5671 818c7501 2019-07-11 stsp if (wt_branch)
5672 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5673 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5674 818c7501 2019-07-11 stsp if (err) {
5675 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5676 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5677 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5679 818c7501 2019-07-11 stsp if (*tmp_branch) {
5680 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5681 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5683 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5684 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5685 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5687 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5689 818c7501 2019-07-11 stsp return err;
5692 818c7501 2019-07-11 stsp const struct got_error *
5693 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
5694 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
5695 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
5696 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
5698 818c7501 2019-07-11 stsp const struct got_error *err;
5699 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
5700 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5701 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
5702 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5703 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5705 818c7501 2019-07-11 stsp *commit_id = NULL;
5706 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
5707 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
5708 3e3a69f1 2019-07-25 stsp *branch = NULL;
5709 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5711 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5713 3e3a69f1 2019-07-25 stsp return err;
5715 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5717 f032f1f7 2019-08-04 stsp goto done;
5719 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5720 f032f1f7 2019-08-04 stsp &have_staged_files);
5721 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5722 f032f1f7 2019-08-04 stsp goto done;
5723 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5724 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5725 3e3a69f1 2019-07-25 stsp goto done;
5728 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5730 f032f1f7 2019-08-04 stsp goto done;
5732 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5734 818c7501 2019-07-11 stsp goto done;
5736 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5738 818c7501 2019-07-11 stsp goto done;
5740 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5742 818c7501 2019-07-11 stsp goto done;
5744 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
5746 818c7501 2019-07-11 stsp goto done;
5748 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
5749 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
5751 818c7501 2019-07-11 stsp goto done;
5753 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5755 818c7501 2019-07-11 stsp goto done;
5757 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5759 818c7501 2019-07-11 stsp goto done;
5761 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
5762 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
5764 818c7501 2019-07-11 stsp goto done;
5766 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5768 818c7501 2019-07-11 stsp goto done;
5770 818c7501 2019-07-11 stsp free(commit_ref_name);
5771 818c7501 2019-07-11 stsp free(branch_ref_name);
5772 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5773 818c7501 2019-07-11 stsp if (commit_ref)
5774 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5775 818c7501 2019-07-11 stsp if (branch_ref)
5776 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5777 818c7501 2019-07-11 stsp if (err) {
5778 818c7501 2019-07-11 stsp free(*commit_id);
5779 818c7501 2019-07-11 stsp *commit_id = NULL;
5780 818c7501 2019-07-11 stsp if (*tmp_branch) {
5781 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5782 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5784 818c7501 2019-07-11 stsp if (*new_base_branch) {
5785 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
5786 818c7501 2019-07-11 stsp *new_base_branch = NULL;
5788 818c7501 2019-07-11 stsp if (*branch) {
5789 818c7501 2019-07-11 stsp got_ref_close(*branch);
5790 818c7501 2019-07-11 stsp *branch = NULL;
5792 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5793 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5794 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5796 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
5798 818c7501 2019-07-11 stsp return err;
5801 818c7501 2019-07-11 stsp const struct got_error *
5802 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
5804 818c7501 2019-07-11 stsp const struct got_error *err;
5805 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
5807 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5809 818c7501 2019-07-11 stsp return err;
5811 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5812 818c7501 2019-07-11 stsp free(tmp_branch_name);
5813 818c7501 2019-07-11 stsp return NULL;
5816 818c7501 2019-07-11 stsp static const struct got_error *
5817 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
5818 818c7501 2019-07-11 stsp char **logmsg, void *arg)
5820 0ebf8283 2019-07-24 stsp *logmsg = arg;
5821 818c7501 2019-07-11 stsp return NULL;
5824 818c7501 2019-07-11 stsp static const struct got_error *
5825 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
5826 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5827 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5828 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5830 818c7501 2019-07-11 stsp return NULL;
5833 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
5834 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
5835 01757395 2019-07-12 stsp void *progress_arg;
5836 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
5839 01757395 2019-07-12 stsp static const struct got_error *
5840 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
5842 01757395 2019-07-12 stsp const struct got_error *err;
5843 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
5845 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
5847 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
5849 01757395 2019-07-12 stsp return err;
5851 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
5852 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
5853 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
5854 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
5855 01757395 2019-07-12 stsp return NULL;
5857 01757395 2019-07-12 stsp p = strdup(path);
5858 01757395 2019-07-12 stsp if (p == NULL)
5859 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
5861 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
5862 01757395 2019-07-12 stsp if (err || new == NULL)
5864 01757395 2019-07-12 stsp return err;
5868 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
5870 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5872 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
5873 01757395 2019-07-12 stsp free((char *)pe->path);
5875 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
5878 0ebf8283 2019-07-24 stsp static const struct got_error *
5879 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
5880 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
5882 818c7501 2019-07-11 stsp const struct got_error *err;
5883 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
5885 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5886 818c7501 2019-07-11 stsp if (err) {
5887 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
5888 818c7501 2019-07-11 stsp goto done;
5889 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
5891 818c7501 2019-07-11 stsp goto done;
5892 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
5894 818c7501 2019-07-11 stsp goto done;
5895 de05890f 2020-03-05 stsp } else if (is_rebase) {
5896 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
5899 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
5901 818c7501 2019-07-11 stsp goto done;
5902 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
5903 818c7501 2019-07-11 stsp free(stored_id);
5904 818c7501 2019-07-11 stsp if (cmp != 0) {
5905 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5906 818c7501 2019-07-11 stsp goto done;
5910 0ebf8283 2019-07-24 stsp if (commit_ref)
5911 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5912 0ebf8283 2019-07-24 stsp return err;
5915 0ebf8283 2019-07-24 stsp static const struct got_error *
5916 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
5917 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
5918 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
5919 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
5920 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5921 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5923 0ebf8283 2019-07-24 stsp const struct got_error *err;
5924 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5925 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
5926 3e3a69f1 2019-07-25 stsp char *fileindex_path;
5928 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5930 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5932 0ebf8283 2019-07-24 stsp return err;
5934 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
5935 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
5936 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
5937 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
5938 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
5939 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
5940 818c7501 2019-07-11 stsp if (commit_ref)
5941 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5942 818c7501 2019-07-11 stsp return err;
5945 818c7501 2019-07-11 stsp const struct got_error *
5946 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
5947 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5948 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5949 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5950 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5951 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5953 0ebf8283 2019-07-24 stsp const struct got_error *err;
5954 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5956 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5958 0ebf8283 2019-07-24 stsp return err;
5960 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
5962 0ebf8283 2019-07-24 stsp goto done;
5964 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5965 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5966 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5968 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5969 0ebf8283 2019-07-24 stsp return err;
5972 0ebf8283 2019-07-24 stsp const struct got_error *
5973 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
5974 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5975 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5976 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5977 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5978 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5980 0ebf8283 2019-07-24 stsp const struct got_error *err;
5981 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5983 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5985 0ebf8283 2019-07-24 stsp return err;
5987 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
5989 0ebf8283 2019-07-24 stsp goto done;
5991 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5992 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5993 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5995 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5996 0ebf8283 2019-07-24 stsp return err;
5999 0ebf8283 2019-07-24 stsp static const struct got_error *
6000 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6001 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6002 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6003 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6004 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6006 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6007 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6008 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6009 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6010 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6011 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6012 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6014 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6015 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6017 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6019 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6021 3e3a69f1 2019-07-25 stsp return err;
6023 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6024 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6025 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6026 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6028 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6029 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6030 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
6031 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6033 01757395 2019-07-12 stsp if (merged_paths) {
6034 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6035 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6036 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6037 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6040 01757395 2019-07-12 stsp goto done;
6043 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6044 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6046 01757395 2019-07-12 stsp goto done;
6049 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6050 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6051 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6053 a0e95631 2019-07-12 stsp goto done;
6054 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6055 a0e95631 2019-07-12 stsp goto done;
6058 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6060 edd02c5e 2019-07-11 stsp goto done;
6062 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6064 818c7501 2019-07-11 stsp goto done;
6066 5943eee2 2019-08-13 stsp if (new_logmsg) {
6067 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6068 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6069 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6070 5943eee2 2019-08-13 stsp goto done;
6073 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6075 5943eee2 2019-08-13 stsp goto done;
6078 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6079 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6080 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
6081 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6082 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6084 a0e95631 2019-07-12 stsp goto done;
6086 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6088 a0e95631 2019-07-12 stsp goto done;
6090 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6092 a0e95631 2019-07-12 stsp goto done;
6094 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
6095 72fd46fa 2019-09-06 stsp fileindex, 0);
6096 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6097 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6098 a0e95631 2019-07-12 stsp err = sync_err;
6100 a0e95631 2019-07-12 stsp free(fileindex_path);
6101 a0e95631 2019-07-12 stsp free(head_commit_id);
6102 a0e95631 2019-07-12 stsp if (head_ref)
6103 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6104 818c7501 2019-07-11 stsp if (err) {
6105 818c7501 2019-07-11 stsp free(*new_commit_id);
6106 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6108 818c7501 2019-07-11 stsp return err;
6111 818c7501 2019-07-11 stsp const struct got_error *
6112 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6113 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6114 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6115 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6116 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6118 0ebf8283 2019-07-24 stsp const struct got_error *err;
6119 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6120 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6121 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6123 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6125 0ebf8283 2019-07-24 stsp return err;
6127 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6129 0ebf8283 2019-07-24 stsp goto done;
6130 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6132 0ebf8283 2019-07-24 stsp goto done;
6133 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6134 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6135 0ebf8283 2019-07-24 stsp goto done;
6138 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6139 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6141 0ebf8283 2019-07-24 stsp if (commit_ref)
6142 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6143 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6144 0ebf8283 2019-07-24 stsp free(commit_id);
6145 0ebf8283 2019-07-24 stsp return err;
6148 0ebf8283 2019-07-24 stsp const struct got_error *
6149 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6150 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6151 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6152 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6153 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6154 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6156 0ebf8283 2019-07-24 stsp const struct got_error *err;
6157 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6158 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6160 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6162 0ebf8283 2019-07-24 stsp return err;
6164 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6166 0ebf8283 2019-07-24 stsp goto done;
6168 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6169 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6171 0ebf8283 2019-07-24 stsp if (commit_ref)
6172 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6173 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6174 0ebf8283 2019-07-24 stsp return err;
6177 0ebf8283 2019-07-24 stsp const struct got_error *
6178 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6179 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6181 3e3a69f1 2019-07-25 stsp if (fileindex)
6182 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6183 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6186 69844fba 2019-07-11 stsp static const struct got_error *
6187 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6189 69844fba 2019-07-11 stsp const struct got_error *err;
6190 69844fba 2019-07-11 stsp struct got_reference *ref;
6192 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6193 69844fba 2019-07-11 stsp if (err) {
6194 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6195 69844fba 2019-07-11 stsp return NULL;
6196 69844fba 2019-07-11 stsp return err;
6199 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6200 69844fba 2019-07-11 stsp got_ref_close(ref);
6201 69844fba 2019-07-11 stsp return err;
6204 69844fba 2019-07-11 stsp static const struct got_error *
6205 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6207 69844fba 2019-07-11 stsp const struct got_error *err;
6208 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6209 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6211 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6213 69844fba 2019-07-11 stsp goto done;
6214 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6216 69844fba 2019-07-11 stsp goto done;
6218 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6220 69844fba 2019-07-11 stsp goto done;
6221 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6223 69844fba 2019-07-11 stsp goto done;
6225 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6227 69844fba 2019-07-11 stsp goto done;
6228 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6230 69844fba 2019-07-11 stsp goto done;
6232 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6234 69844fba 2019-07-11 stsp goto done;
6235 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6237 69844fba 2019-07-11 stsp goto done;
6240 69844fba 2019-07-11 stsp free(tmp_branch_name);
6241 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6242 69844fba 2019-07-11 stsp free(branch_ref_name);
6243 69844fba 2019-07-11 stsp free(commit_ref_name);
6244 69844fba 2019-07-11 stsp return err;
6247 818c7501 2019-07-11 stsp const struct got_error *
6248 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6249 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6250 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6251 818c7501 2019-07-11 stsp struct got_repository *repo)
6253 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
6254 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6256 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6258 818c7501 2019-07-11 stsp return err;
6260 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6262 818c7501 2019-07-11 stsp goto done;
6264 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6266 818c7501 2019-07-11 stsp goto done;
6268 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6270 818c7501 2019-07-11 stsp goto done;
6272 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6274 3e3a69f1 2019-07-25 stsp if (fileindex)
6275 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6276 818c7501 2019-07-11 stsp free(new_head_commit_id);
6277 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6278 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6279 818c7501 2019-07-11 stsp err = unlockerr;
6280 818c7501 2019-07-11 stsp return err;
6283 818c7501 2019-07-11 stsp const struct got_error *
6284 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6285 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6286 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6287 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6289 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6290 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6291 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6292 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6293 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6294 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6296 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6298 818c7501 2019-07-11 stsp return err;
6300 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6301 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6303 818c7501 2019-07-11 stsp goto done;
6305 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6307 818c7501 2019-07-11 stsp goto done;
6310 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6311 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6312 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6314 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6316 818c7501 2019-07-11 stsp goto done;
6318 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6320 818c7501 2019-07-11 stsp goto done;
6322 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6323 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6325 ca355955 2019-07-12 stsp goto done;
6327 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6329 ca355955 2019-07-12 stsp goto done;
6331 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6333 818c7501 2019-07-11 stsp goto done;
6335 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6336 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6337 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6338 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6339 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6340 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6341 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6342 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6343 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6345 1f1abb7e 2019-08-08 stsp goto sync;
6347 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6348 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6350 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6351 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6352 ca355955 2019-07-12 stsp err = sync_err;
6354 818c7501 2019-07-11 stsp got_ref_close(resolved);
6355 a3a2faf2 2019-07-12 stsp free(tree_id);
6356 818c7501 2019-07-11 stsp free(commit_id);
6357 0ebf8283 2019-07-24 stsp if (fileindex)
6358 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6359 0ebf8283 2019-07-24 stsp free(fileindex_path);
6361 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6362 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6363 0ebf8283 2019-07-24 stsp err = unlockerr;
6364 0ebf8283 2019-07-24 stsp return err;
6367 0ebf8283 2019-07-24 stsp const struct got_error *
6368 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6369 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6370 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6371 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6373 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6374 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6375 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6376 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6377 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6378 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6379 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6380 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6382 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6383 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6384 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6385 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6387 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6389 0ebf8283 2019-07-24 stsp return err;
6391 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6393 0ebf8283 2019-07-24 stsp goto done;
6395 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6396 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6397 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6400 0ebf8283 2019-07-24 stsp goto done;
6402 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6404 0ebf8283 2019-07-24 stsp goto done;
6406 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6408 0ebf8283 2019-07-24 stsp goto done;
6410 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6411 0ebf8283 2019-07-24 stsp worktree);
6413 0ebf8283 2019-07-24 stsp goto done;
6415 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6418 0ebf8283 2019-07-24 stsp goto done;
6420 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6422 0ebf8283 2019-07-24 stsp goto done;
6424 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6426 0ebf8283 2019-07-24 stsp goto done;
6428 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6429 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6431 0ebf8283 2019-07-24 stsp goto done;
6432 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6434 0ebf8283 2019-07-24 stsp goto done;
6435 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6436 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6437 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6438 0ebf8283 2019-07-24 stsp goto done;
6441 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6442 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6444 0ebf8283 2019-07-24 stsp goto done;
6445 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6447 0ebf8283 2019-07-24 stsp goto done;
6449 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6451 0ebf8283 2019-07-24 stsp goto done;
6453 0ebf8283 2019-07-24 stsp free(fileindex_path);
6454 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6455 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6456 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6457 0ebf8283 2019-07-24 stsp if (wt_branch)
6458 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6459 0ebf8283 2019-07-24 stsp if (err) {
6460 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6461 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6462 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6464 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6465 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6466 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6468 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6469 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6470 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6471 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6473 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6475 0ebf8283 2019-07-24 stsp return err;
6478 0ebf8283 2019-07-24 stsp const struct got_error *
6479 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6480 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6482 3e3a69f1 2019-07-25 stsp if (fileindex)
6483 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6484 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6487 0ebf8283 2019-07-24 stsp const struct got_error *
6488 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6489 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6491 0ebf8283 2019-07-24 stsp const struct got_error *err;
6492 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6494 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6496 0ebf8283 2019-07-24 stsp return err;
6498 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6499 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6500 0ebf8283 2019-07-24 stsp return NULL;
6503 0ebf8283 2019-07-24 stsp const struct got_error *
6504 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6505 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6506 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6507 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6509 0ebf8283 2019-07-24 stsp const struct got_error *err;
6510 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6511 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6512 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6513 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6514 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6515 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6517 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6518 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6519 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6520 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6522 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6524 3e3a69f1 2019-07-25 stsp return err;
6526 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6528 f032f1f7 2019-08-04 stsp goto done;
6530 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6531 f032f1f7 2019-08-04 stsp &have_staged_files);
6532 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6533 f032f1f7 2019-08-04 stsp goto done;
6534 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6535 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6536 3e3a69f1 2019-07-25 stsp goto done;
6539 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6541 f032f1f7 2019-08-04 stsp goto done;
6543 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6545 0ebf8283 2019-07-24 stsp goto done;
6547 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6549 0ebf8283 2019-07-24 stsp goto done;
6551 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6552 0ebf8283 2019-07-24 stsp worktree);
6554 0ebf8283 2019-07-24 stsp goto done;
6556 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6558 0ebf8283 2019-07-24 stsp goto done;
6560 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6562 0ebf8283 2019-07-24 stsp goto done;
6563 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6565 0ebf8283 2019-07-24 stsp goto done;
6567 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6569 0ebf8283 2019-07-24 stsp goto done;
6570 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6572 0ebf8283 2019-07-24 stsp goto done;
6574 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6576 0ebf8283 2019-07-24 stsp goto done;
6578 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6579 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6580 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6581 0ebf8283 2019-07-24 stsp if (commit_ref)
6582 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6583 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6584 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6585 0ebf8283 2019-07-24 stsp if (err) {
6586 0ebf8283 2019-07-24 stsp free(*commit_id);
6587 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6588 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6589 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6590 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6591 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6592 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6594 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6595 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6596 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6598 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6600 0ebf8283 2019-07-24 stsp return err;
6603 0ebf8283 2019-07-24 stsp static const struct got_error *
6604 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6606 0ebf8283 2019-07-24 stsp const struct got_error *err;
6607 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6608 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6610 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6612 0ebf8283 2019-07-24 stsp goto done;
6613 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6615 0ebf8283 2019-07-24 stsp goto done;
6617 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6618 0ebf8283 2019-07-24 stsp worktree);
6620 0ebf8283 2019-07-24 stsp goto done;
6621 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6623 0ebf8283 2019-07-24 stsp goto done;
6625 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6627 0ebf8283 2019-07-24 stsp goto done;
6628 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
6630 0ebf8283 2019-07-24 stsp goto done;
6632 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6634 0ebf8283 2019-07-24 stsp goto done;
6635 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6637 0ebf8283 2019-07-24 stsp goto done;
6639 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6640 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6641 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6642 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6643 0ebf8283 2019-07-24 stsp return err;
6646 0ebf8283 2019-07-24 stsp const struct got_error *
6647 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
6648 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6649 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
6650 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6652 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
6653 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6654 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6655 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
6656 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6658 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6660 0ebf8283 2019-07-24 stsp return err;
6662 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6663 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
6665 0ebf8283 2019-07-24 stsp goto done;
6667 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6669 0ebf8283 2019-07-24 stsp goto done;
6671 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
6673 0ebf8283 2019-07-24 stsp goto done;
6675 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
6676 0ebf8283 2019-07-24 stsp worktree->path_prefix);
6678 0ebf8283 2019-07-24 stsp goto done;
6680 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6682 0ebf8283 2019-07-24 stsp goto done;
6684 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6686 0ebf8283 2019-07-24 stsp goto done;
6688 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6689 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6690 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6691 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6692 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6693 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6694 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6695 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
6696 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6698 1f1abb7e 2019-08-08 stsp goto sync;
6700 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6701 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
6703 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6704 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
6705 0ebf8283 2019-07-24 stsp err = sync_err;
6707 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
6708 0ebf8283 2019-07-24 stsp free(tree_id);
6709 818c7501 2019-07-11 stsp free(fileindex_path);
6711 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6712 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6713 818c7501 2019-07-11 stsp err = unlockerr;
6714 818c7501 2019-07-11 stsp return err;
6717 0ebf8283 2019-07-24 stsp const struct got_error *
6718 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
6719 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6720 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
6722 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
6723 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
6724 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6726 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6728 0ebf8283 2019-07-24 stsp return err;
6730 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6731 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
6733 0ebf8283 2019-07-24 stsp goto done;
6735 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
6737 0ebf8283 2019-07-24 stsp goto done;
6739 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
6741 0ebf8283 2019-07-24 stsp goto done;
6743 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6745 0ebf8283 2019-07-24 stsp goto done;
6747 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6749 3e3a69f1 2019-07-25 stsp if (fileindex)
6750 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6751 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
6752 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6753 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6754 0ebf8283 2019-07-24 stsp err = unlockerr;
6755 0ebf8283 2019-07-24 stsp return err;
6758 0ebf8283 2019-07-24 stsp const struct got_error *
6759 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
6760 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6762 0ebf8283 2019-07-24 stsp const struct got_error *err;
6763 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6765 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6767 0ebf8283 2019-07-24 stsp return err;
6769 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6771 0ebf8283 2019-07-24 stsp goto done;
6773 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6775 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6776 2822a352 2019-10-15 stsp return err;
6779 2822a352 2019-10-15 stsp const struct got_error *
6780 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
6781 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
6782 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
6783 2822a352 2019-10-15 stsp struct got_repository *repo)
6785 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
6786 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6787 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
6789 2822a352 2019-10-15 stsp *fileindex = NULL;
6790 2822a352 2019-10-15 stsp *branch_ref = NULL;
6791 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6793 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
6795 2822a352 2019-10-15 stsp return err;
6797 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
6798 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
6799 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
6800 2822a352 2019-10-15 stsp "update -b or different branch name required");
6801 2822a352 2019-10-15 stsp goto done;
6804 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6806 2822a352 2019-10-15 stsp goto done;
6808 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
6809 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
6810 2822a352 2019-10-15 stsp ok_arg.repo = repo;
6811 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6814 2822a352 2019-10-15 stsp goto done;
6816 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
6818 2822a352 2019-10-15 stsp goto done;
6820 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
6821 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
6823 2822a352 2019-10-15 stsp if (err) {
6824 2822a352 2019-10-15 stsp if (*branch_ref) {
6825 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
6826 2822a352 2019-10-15 stsp *branch_ref = NULL;
6828 2822a352 2019-10-15 stsp if (*base_branch_ref) {
6829 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
6830 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6832 2822a352 2019-10-15 stsp if (*fileindex) {
6833 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
6834 2822a352 2019-10-15 stsp *fileindex = NULL;
6836 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
6838 0cb83759 2019-08-03 stsp return err;
6841 2822a352 2019-10-15 stsp const struct got_error *
6842 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
6843 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6844 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
6845 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6846 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6848 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6849 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6850 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
6852 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
6854 2822a352 2019-10-15 stsp goto done;
6856 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
6858 2822a352 2019-10-15 stsp goto done;
6860 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
6861 2822a352 2019-10-15 stsp worktree->path_prefix);
6863 2822a352 2019-10-15 stsp goto done;
6865 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6867 2822a352 2019-10-15 stsp goto done;
6869 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
6870 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
6872 2822a352 2019-10-15 stsp goto sync;
6874 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
6876 2822a352 2019-10-15 stsp goto sync;
6878 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
6880 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6881 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
6882 2822a352 2019-10-15 stsp err = sync_err;
6885 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
6886 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6887 2822a352 2019-10-15 stsp err = unlockerr;
6888 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6890 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
6891 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6892 2822a352 2019-10-15 stsp err = unlockerr;
6893 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6895 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
6896 2822a352 2019-10-15 stsp free(fileindex_path);
6897 2822a352 2019-10-15 stsp free(tree_id);
6899 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6900 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6901 2822a352 2019-10-15 stsp err = unlockerr;
6902 2822a352 2019-10-15 stsp return err;
6905 2822a352 2019-10-15 stsp const struct got_error *
6906 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
6907 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6908 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
6910 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
6912 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
6914 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
6916 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
6917 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6918 8b692cd0 2019-10-21 stsp err = unlockerr;
6919 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6921 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
6922 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6923 8b692cd0 2019-10-21 stsp err = unlockerr;
6924 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6926 8b692cd0 2019-10-21 stsp return err;
6929 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
6930 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
6931 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6932 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6933 2db2652d 2019-08-07 stsp struct got_repository *repo;
6934 2db2652d 2019-08-07 stsp int have_changes;
6937 2db2652d 2019-08-07 stsp const struct got_error *
6938 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
6939 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6940 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6941 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6943 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
6944 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
6945 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
6946 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
6947 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
6948 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
6950 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
6951 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
6952 8b13ce36 2019-08-08 stsp return NULL;
6953 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6954 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
6956 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6957 735ef5ac 2019-08-03 stsp if (ie == NULL)
6958 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6960 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
6961 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
6962 735ef5ac 2019-08-03 stsp relpath) == -1)
6963 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
6965 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
6966 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
6967 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6968 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
6971 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
6972 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
6973 3aa5969e 2019-08-06 stsp goto done;
6974 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
6975 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
6976 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
6977 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
6978 735ef5ac 2019-08-03 stsp goto done;
6981 2db2652d 2019-08-07 stsp a->have_changes = 1;
6983 735ef5ac 2019-08-03 stsp p = in_repo_path;
6984 735ef5ac 2019-08-03 stsp while (p[0] == '/')
6986 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
6987 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
6988 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
6990 735ef5ac 2019-08-03 stsp free(in_repo_path);
6991 dc424a06 2019-08-07 stsp return err;
6994 2db2652d 2019-08-07 stsp struct stage_path_arg {
6995 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6996 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6997 2db2652d 2019-08-07 stsp struct got_repository *repo;
6998 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
6999 2db2652d 2019-08-07 stsp void *status_arg;
7000 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7001 2db2652d 2019-08-07 stsp void *patch_arg;
7002 7b5dc508 2019-10-28 stsp int staged_something;
7005 2db2652d 2019-08-07 stsp static const struct got_error *
7006 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7007 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7008 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7009 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7011 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7012 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7013 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7014 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7015 0cb83759 2019-08-03 stsp uint32_t stage;
7016 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7018 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7019 8b13ce36 2019-08-08 stsp return NULL;
7021 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7022 d3e7c587 2019-08-03 stsp if (ie == NULL)
7023 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7025 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7026 2db2652d 2019-08-07 stsp relpath)== -1)
7027 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7029 0cb83759 2019-08-03 stsp switch (status) {
7030 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7031 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7032 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7033 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7034 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7035 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7036 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7039 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7042 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7043 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7044 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7045 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7046 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7050 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7051 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7054 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7055 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7056 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7057 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7059 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7060 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7061 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7062 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7064 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7065 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7066 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7068 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7069 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7071 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7072 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7073 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7074 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7077 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7079 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7080 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7084 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
7085 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7086 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7087 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7089 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7090 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7093 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
7095 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
7096 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7098 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
7099 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
7102 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7106 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
7107 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
7108 dc424a06 2019-08-07 stsp free(path_content);
7109 2db2652d 2019-08-07 stsp free(ondisk_path);
7110 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
7111 0ebf8283 2019-07-24 stsp return err;
7114 0cb83759 2019-08-03 stsp const struct got_error *
7115 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
7116 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
7117 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
7118 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7119 1e71573e 2019-08-03 stsp struct got_repository *repo)
7121 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7122 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
7123 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7124 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
7125 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
7126 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
7127 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
7128 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
7130 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7132 0cb83759 2019-08-03 stsp return err;
7134 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
7135 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
7137 735ef5ac 2019-08-03 stsp goto done;
7138 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7140 735ef5ac 2019-08-03 stsp goto done;
7141 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7143 0cb83759 2019-08-03 stsp goto done;
7145 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
7146 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
7147 2db2652d 2019-08-07 stsp oka.worktree = worktree;
7148 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
7149 2db2652d 2019-08-07 stsp oka.repo = repo;
7150 2db2652d 2019-08-07 stsp oka.have_changes = 0;
7151 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7152 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7153 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
7155 735ef5ac 2019-08-03 stsp goto done;
7157 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
7158 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7159 2db2652d 2019-08-07 stsp goto done;
7162 2db2652d 2019-08-07 stsp spa.worktree = worktree;
7163 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
7164 2db2652d 2019-08-07 stsp spa.repo = repo;
7165 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
7166 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
7167 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
7168 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
7169 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
7170 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7171 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7172 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
7174 2db2652d 2019-08-07 stsp goto done;
7176 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
7177 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7178 7b5dc508 2019-10-28 stsp goto done;
7181 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7182 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
7183 0cb83759 2019-08-03 stsp err = sync_err;
7185 735ef5ac 2019-08-03 stsp if (head_ref)
7186 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
7187 735ef5ac 2019-08-03 stsp free(head_commit_id);
7188 0cb83759 2019-08-03 stsp free(fileindex_path);
7189 0cb83759 2019-08-03 stsp if (fileindex)
7190 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
7191 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7192 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
7193 0cb83759 2019-08-03 stsp err = unlockerr;
7194 0cb83759 2019-08-03 stsp return err;
7197 ad493afc 2019-08-03 stsp struct unstage_path_arg {
7198 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
7199 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
7200 ad493afc 2019-08-03 stsp struct got_repository *repo;
7201 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
7202 ad493afc 2019-08-03 stsp void *progress_arg;
7203 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
7204 2e1f37b0 2019-08-08 stsp void *patch_arg;
7207 2e1f37b0 2019-08-08 stsp static const struct got_error *
7208 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
7209 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
7210 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
7211 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
7212 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
7214 2e1f37b0 2019-08-08 stsp const struct got_error *err;
7215 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
7216 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7217 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7218 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
7219 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
7220 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
7221 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
7222 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
7223 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
7224 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
7226 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7227 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7229 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
7231 2e1f37b0 2019-08-08 stsp return err;
7232 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7234 2e1f37b0 2019-08-08 stsp goto done;
7236 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7238 2e1f37b0 2019-08-08 stsp goto done;
7240 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7242 2e1f37b0 2019-08-08 stsp goto done;
7244 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7246 2e1f37b0 2019-08-08 stsp goto done;
7248 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7250 2e1f37b0 2019-08-08 stsp goto done;
7252 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7254 2e1f37b0 2019-08-08 stsp goto done;
7256 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
7257 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
7258 2e1f37b0 2019-08-08 stsp goto done;
7261 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
7262 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
7263 2e1f37b0 2019-08-08 stsp goto done;
7266 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
7267 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
7269 2e1f37b0 2019-08-08 stsp goto done;
7271 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
7272 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
7274 2e1f37b0 2019-08-08 stsp goto done;
7275 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
7276 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
7278 2e1f37b0 2019-08-08 stsp goto done;
7280 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
7281 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
7282 2e1f37b0 2019-08-08 stsp goto done;
7284 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
7285 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
7286 2e1f37b0 2019-08-08 stsp goto done;
7288 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
7289 2e1f37b0 2019-08-08 stsp int choice;
7290 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
7291 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
7292 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
7293 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
7295 2e1f37b0 2019-08-08 stsp goto done;
7296 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
7297 2e1f37b0 2019-08-08 stsp have_content = 1;
7299 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
7300 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
7303 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
7304 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7305 f1e81a05 2019-08-10 stsp outfile, rejectfile);
7307 2e1f37b0 2019-08-08 stsp free(label1);
7309 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
7310 2e1f37b0 2019-08-08 stsp if (staged_blob)
7311 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
7312 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
7313 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
7314 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
7315 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
7316 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
7317 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
7318 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7319 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
7320 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
7321 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
7322 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
7323 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
7324 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
7325 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
7326 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
7327 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7328 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
7329 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
7330 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7332 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
7333 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
7334 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
7335 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7336 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
7337 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
7338 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7340 2e1f37b0 2019-08-08 stsp free(args);
7342 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
7345 2e1f37b0 2019-08-08 stsp if (changes)
7346 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
7347 2e1f37b0 2019-08-08 stsp free(path1);
7348 2e1f37b0 2019-08-08 stsp free(path2);
7349 2e1f37b0 2019-08-08 stsp return err;
7352 ad493afc 2019-08-03 stsp static const struct got_error *
7353 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
7354 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
7355 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7356 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7358 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
7359 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
7360 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
7361 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7362 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
7363 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
7364 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
7365 ad493afc 2019-08-03 stsp int local_changes_subsumed;
7366 9bc94a15 2019-08-03 stsp struct stat sb;
7368 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
7369 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
7370 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
7371 2e1f37b0 2019-08-08 stsp return NULL;
7373 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7374 ad493afc 2019-08-03 stsp if (ie == NULL)
7375 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7377 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7379 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
7381 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
7382 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
7384 f69721c3 2019-10-21 stsp goto done;
7385 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7386 f69721c3 2019-10-21 stsp id_str) == -1) {
7387 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
7388 f69721c3 2019-10-21 stsp goto done;
7391 ad493afc 2019-08-03 stsp switch (staged_status) {
7392 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
7393 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
7394 ad493afc 2019-08-03 stsp blob_id, 8192);
7397 ad493afc 2019-08-03 stsp /* fall through */
7398 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
7399 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7400 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
7401 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7402 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7403 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7406 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
7409 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
7410 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
7411 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
7412 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
7413 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
7414 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
7416 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
7417 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
7418 2e1f37b0 2019-08-08 stsp &staged_blob_id,
7419 2e1f37b0 2019-08-08 stsp path_new_staged_content,
7423 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
7424 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
7425 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
7427 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
7428 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
7429 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
7430 f69721c3 2019-10-21 stsp path_unstaged_content, label_orig,
7431 f69721c3 2019-10-21 stsp "unstaged", a->repo, a->progress_cb,
7432 f69721c3 2019-10-21 stsp a->progress_arg);
7433 2e1f37b0 2019-08-08 stsp if (err == NULL &&
7434 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
7435 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
7436 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
7437 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
7440 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
7441 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
7444 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
7445 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
7446 f69721c3 2019-10-21 stsp got_fileindex_perms_to_st(ie), label_orig, blob_staged,
7447 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
7448 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
7449 ad493afc 2019-08-03 stsp if (err == NULL)
7450 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
7451 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
7453 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
7454 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7455 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7456 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7457 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7460 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7462 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7463 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7467 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7468 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
7469 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
7472 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
7476 ad493afc 2019-08-03 stsp free(ondisk_path);
7477 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
7478 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
7479 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
7480 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
7481 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
7482 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
7483 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
7484 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
7485 ad493afc 2019-08-03 stsp if (blob_base)
7486 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
7487 ad493afc 2019-08-03 stsp if (blob_staged)
7488 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
7489 f69721c3 2019-10-21 stsp free(id_str);
7490 f69721c3 2019-10-21 stsp free(label_orig);
7491 ad493afc 2019-08-03 stsp return err;
7494 ad493afc 2019-08-03 stsp const struct got_error *
7495 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
7496 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
7497 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7498 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7499 ad493afc 2019-08-03 stsp struct got_repository *repo)
7501 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7502 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7503 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7504 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
7505 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
7507 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7509 ad493afc 2019-08-03 stsp return err;
7511 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7513 ad493afc 2019-08-03 stsp goto done;
7515 ad493afc 2019-08-03 stsp upa.worktree = worktree;
7516 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
7517 ad493afc 2019-08-03 stsp upa.repo = repo;
7518 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
7519 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
7520 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
7521 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
7522 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7523 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7524 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
7526 ad493afc 2019-08-03 stsp goto done;
7529 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7530 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
7531 ad493afc 2019-08-03 stsp err = sync_err;
7533 ad493afc 2019-08-03 stsp free(fileindex_path);
7534 ad493afc 2019-08-03 stsp if (fileindex)
7535 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
7536 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7537 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
7538 ad493afc 2019-08-03 stsp err = unlockerr;
7539 ad493afc 2019-08-03 stsp return err;
