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;
746 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
748 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
749 af54ae4a 2019-02-19 stsp if (parent == NULL)
750 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
752 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
753 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
755 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
759 af54ae4a 2019-02-19 stsp free(base_path);
760 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
761 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
762 af54ae4a 2019-02-19 stsp base_path = NULL;
766 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
769 46b6ee73 2019-06-04 stsp if (blob_orig) {
770 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
771 46b6ee73 2019-06-04 stsp blob_orig);
776 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
777 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
778 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
782 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
783 f69721c3 2019-10-21 stsp blob_orig_path, ondisk_path, label_deriv, label_orig, NULL);
787 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
788 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
792 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
793 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
797 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
798 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
799 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
800 68c76935 2019-02-19 stsp merged_path);
805 2ad902c0 2019-12-15 stsp if (fchmod(merged_fd, st_mode) != 0) {
806 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
810 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
811 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
812 230a42bd 2019-05-11 jcs ondisk_path);
817 fdcb7daf 2019-12-15 stsp if (merged_path)
818 fdcb7daf 2019-12-15 stsp unlink(merged_path);
820 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
821 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
822 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
823 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
824 6353ad76 2019-02-08 stsp free(merged_path);
825 af54ae4a 2019-02-19 stsp free(base_path);
826 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
827 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
828 46b6ee73 2019-06-04 stsp free(blob_orig_path);
830 af57b12a 2020-07-23 stsp return err;
833 af57b12a 2020-07-23 stsp static const struct got_error *
834 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
835 af57b12a 2020-07-23 stsp size_t target_len)
837 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
838 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
839 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
840 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
841 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
842 af57b12a 2020-07-23 stsp ondisk_path);
843 af57b12a 2020-07-23 stsp return NULL;
847 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
848 af57b12a 2020-07-23 stsp * ancestor, blob_deriv acts as the first derived version, and the symlink
849 af57b12a 2020-07-23 stsp * on disk acts as the second derived version.
850 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
852 af57b12a 2020-07-23 stsp static const struct got_error *
853 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
854 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
855 af57b12a 2020-07-23 stsp const char *path, uint16_t st_mode, const char *label_orig,
856 af57b12a 2020-07-23 stsp struct got_blob_object *blob_deriv,
857 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
858 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
860 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
861 af57b12a 2020-07-23 stsp char *ancestor_target = NULL, *deriv_target = NULL;
862 af57b12a 2020-07-23 stsp struct stat sb;
863 af57b12a 2020-07-23 stsp ssize_t ondisk_len;
864 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
866 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
867 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
869 af57b12a 2020-07-23 stsp if (!S_ISLNK(sb.st_mode)) {
870 af57b12a 2020-07-23 stsp /* TODO symlink is obstructed; do something */
871 af57b12a 2020-07-23 stsp return got_error_path(ondisk_path, GOT_ERR_FILE_OBSTRUCTED);
874 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
875 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
876 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
877 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
878 af57b12a 2020-07-23 stsp ondisk_path);
882 af57b12a 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
886 af57b12a 2020-07-23 stsp err = got_object_blob_read_to_str(&deriv_target, blob_deriv);
890 af57b12a 2020-07-23 stsp if (ondisk_len != strlen(ancestor_target) ||
891 af57b12a 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0) {
893 af57b12a 2020-07-23 stsp * The symlink has changed on-disk (second derived version).
894 af57b12a 2020-07-23 stsp * Keep that change and discard the incoming change (first
895 af57b12a 2020-07-23 stsp * derived version).
896 af57b12a 2020-07-23 stsp * TODO: Need tree-conflict resolution to handle this.
898 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_OBSTRUCTED,
900 af57b12a 2020-07-23 stsp } else if (ondisk_len == strlen(deriv_target) &&
901 af57b12a 2020-07-23 stsp memcmp(ondisk_target, deriv_target, ondisk_len) == 0) {
902 af57b12a 2020-07-23 stsp /* Both versions made the same change. */
903 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
905 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
906 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
907 af57b12a 2020-07-23 stsp strlen(deriv_target));
910 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
913 af57b12a 2020-07-23 stsp free(ancestor_target);
914 af57b12a 2020-07-23 stsp free(deriv_target);
915 14c901f1 2019-08-08 stsp return err;
919 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
920 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
921 14c901f1 2019-08-08 stsp * acts as the second derived version.
923 14c901f1 2019-08-08 stsp static const struct got_error *
924 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
925 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
926 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
927 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
928 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
929 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
931 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
932 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
933 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
934 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
936 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
938 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
939 14c901f1 2019-08-08 stsp if (parent == NULL)
940 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
942 14c901f1 2019-08-08 stsp free(base_path);
943 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
944 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
945 14c901f1 2019-08-08 stsp base_path = NULL;
949 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
952 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
953 14c901f1 2019-08-08 stsp blob_deriv);
957 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
960 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
961 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
962 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
966 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
967 f69721c3 2019-10-21 stsp ondisk_path, path, st_mode, blob_deriv_path, label_orig,
968 f69721c3 2019-10-21 stsp label_deriv, repo, progress_cb, progress_arg);
970 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
971 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
972 14c901f1 2019-08-08 stsp free(base_path);
973 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
974 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
975 14c901f1 2019-08-08 stsp free(blob_deriv_path);
977 6353ad76 2019-02-08 stsp free(id_str);
978 818c7501 2019-07-11 stsp free(label_deriv);
979 4a1ddfc2 2019-01-12 stsp return err;
982 4a1ddfc2 2019-01-12 stsp static const struct got_error *
983 054041d0 2020-06-24 stsp create_fileindex_entry(struct got_fileindex *fileindex,
984 054041d0 2020-06-24 stsp struct got_object_id *base_commit_id, const char *ondisk_path,
985 054041d0 2020-06-24 stsp const char *path, struct got_object_id *blob_id)
987 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
988 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
990 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
992 054041d0 2020-06-24 stsp return err;
994 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(new_ie, ondisk_path,
995 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
999 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1002 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1003 13d9040b 2019-03-27 stsp return err;
1006 1ebedb77 2019-10-19 stsp static mode_t
1007 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1009 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1011 1ebedb77 2019-10-19 stsp if (executable) {
1012 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1013 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1014 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1015 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1016 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1017 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1020 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1023 8ba819a3 2020-07-23 stsp /* forward declaration */
1024 13d9040b 2019-03-27 stsp static const struct got_error *
1025 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1026 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1027 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1028 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1029 bd6aa359 2020-07-23 stsp struct got_repository *repo,
1030 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1032 8ba819a3 2020-07-23 stsp static const struct got_error *
1033 8ba819a3 2020-07-23 stsp install_symlink(struct got_worktree *worktree, const char *ondisk_path,
1034 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1035 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1036 8ba819a3 2020-07-23 stsp int reverting_versioned_file, struct got_repository *repo,
1037 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1039 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1040 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1041 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1042 8ba819a3 2020-07-23 stsp char *resolved_path = NULL, *abspath = NULL;
1043 906c123b 2020-07-23 stsp char *path_got = NULL;
1044 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1045 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1048 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1049 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1050 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1051 8ba819a3 2020-07-23 stsp * in the blob object.
1054 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1055 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1056 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1057 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1058 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1059 8ba819a3 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, st_mode, blob,
1060 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1061 bd6aa359 2020-07-23 stsp 1, repo, progress_cb, progress_arg);
1063 8ba819a3 2020-07-23 stsp if (len > 0) {
1064 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1065 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1066 8ba819a3 2020-07-23 stsp len - hdrlen);
1067 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1068 8ba819a3 2020-07-23 stsp hdrlen = 0;
1070 8ba819a3 2020-07-23 stsp } while (len != 0);
1071 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1074 8ba819a3 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1075 8ba819a3 2020-07-23 stsp * in which the blob object is being installed.
1077 8ba819a3 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1078 8ba819a3 2020-07-23 stsp char *parent = dirname(ondisk_path);
1079 ef68ca6f 2020-07-23 stsp if (parent == NULL) {
1080 ef68ca6f 2020-07-23 stsp err = got_error_from_errno2("dirname", ondisk_path);
1081 ef68ca6f 2020-07-23 stsp goto done;
1083 8ba819a3 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1084 8ba819a3 2020-07-23 stsp err = got_error_from_errno("asprintf");
1085 8ba819a3 2020-07-23 stsp goto done;
1090 8ba819a3 2020-07-23 stsp * unveil(2) restricts our view of paths in the filesystem.
1091 8ba819a3 2020-07-23 stsp * ENOENT will occur if a link target path does not exist or
1092 8ba819a3 2020-07-23 stsp * if it points outside our unveiled path space.
1094 8ba819a3 2020-07-23 stsp resolved_path = realpath(abspath ? abspath : target_path, NULL);
1095 8ba819a3 2020-07-23 stsp if (resolved_path == NULL) {
1096 b15bc87b 2020-07-23 stsp if (errno != ENOENT) {
1097 b15bc87b 2020-07-23 stsp err = got_error_from_errno2("realpath", target_path);
1098 b15bc87b 2020-07-23 stsp goto done;
1102 8ba819a3 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1103 0ab20ee9 2020-07-23 stsp if (!got_path_is_child(resolved_path ? resolved_path : (abspath ?
1104 0ab20ee9 2020-07-23 stsp abspath : target_path), worktree->root_path,
1105 0ab20ee9 2020-07-23 stsp strlen(worktree->root_path))) {
1106 8ba819a3 2020-07-23 stsp /* install as a regular file */
1107 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1108 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1109 8ba819a3 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, st_mode, blob,
1110 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1111 8ba819a3 2020-07-23 stsp repo, progress_cb, progress_arg);
1112 8ba819a3 2020-07-23 stsp goto done;
1115 906c123b 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1116 906c123b 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
1117 906c123b 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1) {
1118 906c123b 2020-07-23 stsp err = got_error_from_errno("asprintf");
1119 906c123b 2020-07-23 stsp goto done;
1121 906c123b 2020-07-23 stsp if (got_path_is_child(resolved_path ? resolved_path : (abspath ?
1122 906c123b 2020-07-23 stsp abspath : target_path), path_got, strlen(path_got))) {
1123 906c123b 2020-07-23 stsp /* install as a regular file */
1124 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1125 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1126 906c123b 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, st_mode, blob,
1127 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1128 906c123b 2020-07-23 stsp repo, progress_cb, progress_arg);
1129 906c123b 2020-07-23 stsp goto done;
1132 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1133 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1134 8ba819a3 2020-07-23 stsp struct stat sb;
1135 8ba819a3 2020-07-23 stsp ssize_t elen;
1136 8ba819a3 2020-07-23 stsp char etarget[PATH_MAX];
1137 8ba819a3 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
1138 8ba819a3 2020-07-23 stsp err = got_error_from_errno2("lstat",
1139 8ba819a3 2020-07-23 stsp ondisk_path);
1140 8ba819a3 2020-07-23 stsp goto done;
1142 8ba819a3 2020-07-23 stsp if (!S_ISLNK(sb.st_mode)) {
1143 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1144 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1145 8ba819a3 2020-07-23 stsp goto done;
1147 8ba819a3 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1148 8ba819a3 2020-07-23 stsp if (elen == -1) {
1149 8ba819a3 2020-07-23 stsp err = got_error_from_errno2("readlink",
1150 8ba819a3 2020-07-23 stsp ondisk_path);
1151 8ba819a3 2020-07-23 stsp goto done;
1153 8ba819a3 2020-07-23 stsp if (elen == target_len &&
1154 f35fa46a 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0) {
1155 f35fa46a 2020-07-23 stsp err = NULL; /* nothing to do */
1156 f35fa46a 2020-07-23 stsp goto done;
1158 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, target_path,
1159 af57b12a 2020-07-23 stsp target_len);
1161 f35fa46a 2020-07-23 stsp goto done;
1162 bd6aa359 2020-07-23 stsp if (progress_cb) {
1163 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1164 bd6aa359 2020-07-23 stsp GOT_STATUS_UPDATE, path);
1166 f35fa46a 2020-07-23 stsp goto done;
1170 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1171 f35fa46a 2020-07-23 stsp char *parent = dirname(ondisk_path);
1172 f35fa46a 2020-07-23 stsp if (parent == NULL) {
1173 f35fa46a 2020-07-23 stsp err = got_error_from_errno2("dirname",
1174 f35fa46a 2020-07-23 stsp ondisk_path);
1175 f35fa46a 2020-07-23 stsp goto done;
1177 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1179 f35fa46a 2020-07-23 stsp goto done;
1181 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1182 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1184 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1185 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1186 f35fa46a 2020-07-23 stsp goto done;
1190 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1191 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1192 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1193 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1194 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1195 8ba819a3 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, st_mode, blob,
1196 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1197 8ba819a3 2020-07-23 stsp repo, progress_cb, progress_arg);
1198 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1199 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1200 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1202 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1203 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1205 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1206 f35fa46a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_ADD, path);
1208 8ba819a3 2020-07-23 stsp free(resolved_path);
1209 8ba819a3 2020-07-23 stsp free(abspath);
1210 906c123b 2020-07-23 stsp free(path_got);
1211 8ba819a3 2020-07-23 stsp return err;
1214 8ba819a3 2020-07-23 stsp static const struct got_error *
1215 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1216 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1217 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1218 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1219 bd6aa359 2020-07-23 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1220 bd6aa359 2020-07-23 stsp void *progress_arg)
1222 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1223 507dc3bb 2018-12-29 stsp int fd = -1;
1224 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1225 507dc3bb 2018-12-29 stsp int update = 0;
1226 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1228 8ba819a3 2020-07-23 stsp if (S_ISLNK(te_mode))
1229 8ba819a3 2020-07-23 stsp return install_symlink(worktree, ondisk_path, path, te_mode,
1230 8ba819a3 2020-07-23 stsp st_mode, blob, restoring_missing_file,
1231 8ba819a3 2020-07-23 stsp reverting_versioned_file, repo, progress_cb, progress_arg);
1233 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1234 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
1235 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1236 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1237 21908da4 2019-01-13 stsp char *parent = dirname(path);
1238 21908da4 2019-01-13 stsp if (parent == NULL)
1239 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
1240 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1242 21908da4 2019-01-13 stsp return err;
1243 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1244 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1245 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1246 21908da4 2019-01-13 stsp if (fd == -1)
1247 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1248 230a42bd 2019-05-11 jcs ondisk_path);
1249 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1250 bd6aa359 2020-07-23 stsp if (!S_ISREG(st_mode) && !installing_bad_symlink) {
1251 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1252 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1253 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1254 507dc3bb 2018-12-29 stsp goto done;
1256 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1257 507dc3bb 2018-12-29 stsp ondisk_path);
1259 507dc3bb 2018-12-29 stsp goto done;
1260 507dc3bb 2018-12-29 stsp update = 1;
1263 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1266 bd6aa359 2020-07-23 stsp if (progress_cb) {
1267 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1268 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1270 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1271 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1274 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1275 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1277 bd6aa359 2020-07-23 stsp goto done;
1280 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1282 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1283 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1286 9d31a1d8 2018-03-11 stsp if (len > 0) {
1287 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1288 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1289 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1290 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1291 b87c6f83 2018-12-24 stsp goto done;
1292 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1293 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1294 b87c6f83 2018-12-24 stsp goto done;
1296 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1298 9d31a1d8 2018-03-11 stsp } while (len != 0);
1300 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1301 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1302 816dc654 2019-02-16 stsp goto done;
1305 507dc3bb 2018-12-29 stsp if (update) {
1306 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1307 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1308 230a42bd 2019-05-11 jcs ondisk_path);
1309 2a57020b 2019-02-20 stsp unlink(tmppath);
1310 68ed9ba5 2019-02-10 stsp goto done;
1314 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1315 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1316 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1317 1ebedb77 2019-10-19 stsp goto done;
1321 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1322 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1323 507dc3bb 2018-12-29 stsp free(tmppath);
1324 6353ad76 2019-02-08 stsp return err;
1327 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1328 6353ad76 2019-02-08 stsp static const struct got_error *
1329 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1331 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1332 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1333 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1334 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1335 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1337 7154f6ce 2019-03-27 stsp int i = 0;
1338 7154f6ce 2019-03-27 stsp char *line;
1339 7154f6ce 2019-03-27 stsp size_t len;
1340 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1342 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1343 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1344 7154f6ce 2019-03-27 stsp if (line == NULL) {
1345 7154f6ce 2019-03-27 stsp if (feof(f))
1347 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1351 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1352 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1354 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1360 7154f6ce 2019-03-27 stsp return err;
1363 e2b1e152 2019-07-13 stsp static int
1364 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1366 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1367 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1370 1ebedb77 2019-10-19 stsp static int
1371 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1373 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1374 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1375 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1376 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1377 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1378 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1381 c363b2c1 2019-08-03 stsp static unsigned char
1382 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1384 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1385 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1386 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1387 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1388 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1389 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1390 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1392 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1396 a919d5c4 2020-07-23 stsp static const struct got_error *
1397 a919d5c4 2020-07-23 stsp get_symlink_status(unsigned char *status, struct stat *sb,
1398 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1399 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1401 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1402 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1403 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1404 a919d5c4 2020-07-23 stsp ssize_t elen;
1405 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1406 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1407 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1409 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1411 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1413 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1415 a919d5c4 2020-07-23 stsp return err;
1416 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1418 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1419 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1421 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1423 a919d5c4 2020-07-23 stsp if (len > 0) {
1424 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1425 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1426 a919d5c4 2020-07-23 stsp len - hdrlen);
1427 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1428 a919d5c4 2020-07-23 stsp hdrlen = 0;
1430 a919d5c4 2020-07-23 stsp } while (len != 0);
1431 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1433 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1434 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1435 a919d5c4 2020-07-23 stsp if (elen == -1)
1436 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1438 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1439 a919d5c4 2020-07-23 stsp if (elen == -1)
1440 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1443 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1444 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1446 a919d5c4 2020-07-23 stsp return NULL;
1449 7154f6ce 2019-03-27 stsp static const struct got_error *
1450 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1451 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1452 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1454 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1455 6353ad76 2019-02-08 stsp struct got_object_id id;
1456 6353ad76 2019-02-08 stsp size_t hdrlen;
1457 1338848f 2019-12-13 stsp int fd = -1;
1458 6353ad76 2019-02-08 stsp FILE *f = NULL;
1459 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1460 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1461 6353ad76 2019-02-08 stsp size_t flen, blen;
1462 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1464 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1467 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1468 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1469 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1471 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1472 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1473 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1474 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1475 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1477 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1478 882ef1b9 2019-12-13 stsp goto done;
1480 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1481 3d35a492 2019-12-13 stsp goto done;
1484 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1485 a919d5c4 2020-07-23 stsp if (fd == -1 && errno != ENOENT && errno != ELOOP)
1486 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1487 a919d5c4 2020-07-23 stsp else if (fd == -1 && errno == ELOOP) {
1488 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1489 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1490 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1491 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1492 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1493 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1495 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1496 3d35a492 2019-12-13 stsp goto done;
1498 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1499 1338848f 2019-12-13 stsp goto done;
1503 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1504 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1505 1338848f 2019-12-13 stsp goto done;
1508 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1509 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1510 1338848f 2019-12-13 stsp goto done;
1511 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1512 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1513 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1514 1338848f 2019-12-13 stsp goto done;
1517 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1518 1338848f 2019-12-13 stsp goto done;
1520 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1521 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1522 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1524 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1526 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1528 1338848f 2019-12-13 stsp goto done;
1530 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1531 a919d5c4 2020-07-23 stsp /* Staging changes to symlinks is not yet(?) supported. */
1532 a919d5c4 2020-07-23 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
1533 a919d5c4 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_FILE_STATUS);
1534 a919d5c4 2020-07-23 stsp goto done;
1536 a919d5c4 2020-07-23 stsp err = get_symlink_status(status, sb, ie, abspath, dirfd,
1537 a919d5c4 2020-07-23 stsp de_name, blob);
1538 a919d5c4 2020-07-23 stsp goto done;
1542 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1543 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1544 ab0d4361 2019-12-13 stsp if (fd == -1) {
1545 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1546 ab0d4361 2019-12-13 stsp goto done;
1550 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1551 6353ad76 2019-02-08 stsp if (f == NULL) {
1552 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1553 6353ad76 2019-02-08 stsp goto done;
1556 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1558 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1559 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1561 7154f6ce 2019-03-27 stsp goto done;
1562 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1563 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1564 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1565 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1566 7154f6ce 2019-03-27 stsp goto done;
1568 6353ad76 2019-02-08 stsp if (blen == 0) {
1569 6353ad76 2019-02-08 stsp if (flen != 0)
1570 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1572 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1573 6353ad76 2019-02-08 stsp if (blen != 0)
1574 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1576 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1577 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1578 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1579 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1583 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1586 6353ad76 2019-02-08 stsp hdrlen = 0;
1589 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1590 7154f6ce 2019-03-27 stsp rewind(f);
1591 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1592 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1593 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1596 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1597 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1598 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1599 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1600 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1601 9d31a1d8 2018-03-11 stsp return err;
1605 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1606 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1608 e2b1e152 2019-07-13 stsp static const struct got_error *
1609 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1610 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1612 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1613 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1614 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1616 e2b1e152 2019-07-13 stsp return NULL;
1619 9d31a1d8 2018-03-11 stsp static const struct got_error *
1620 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1621 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1622 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1623 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1624 0584f854 2019-04-06 stsp void *progress_arg)
1626 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1627 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1628 6353ad76 2019-02-08 stsp char *ondisk_path;
1629 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1630 b8f41171 2019-02-10 stsp struct stat sb;
1632 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1633 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1636 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1637 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1638 a76c42e6 2019-08-03 stsp goto done;
1640 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1643 abb4604f 2019-07-27 stsp goto done;
1644 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1645 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1647 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1649 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1650 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1651 b8f41171 2019-02-10 stsp goto done;
1653 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1654 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1656 5036ab18 2020-04-18 stsp goto done;
1659 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1660 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1661 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1662 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1663 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1664 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1666 e2b1e152 2019-07-13 stsp goto done;
1667 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1669 6353ad76 2019-02-08 stsp goto done;
1671 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1672 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1673 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1674 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1675 b8f41171 2019-02-10 stsp goto done;
1679 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1681 6353ad76 2019-02-08 stsp goto done;
1683 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1684 234035bc 2019-06-01 stsp int update_timestamps;
1685 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1686 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1687 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1688 234035bc 2019-06-01 stsp struct got_object_id id2;
1689 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1690 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1692 f69721c3 2019-10-21 stsp goto done;
1694 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1695 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1696 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1697 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1698 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1699 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1700 f69721c3 2019-10-21 stsp goto done;
1702 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1703 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1704 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1705 234035bc 2019-06-01 stsp goto done;
1708 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1709 f69721c3 2019-10-21 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1710 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1711 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1712 f69721c3 2019-10-21 stsp free(label_orig);
1713 234035bc 2019-06-01 stsp if (blob2)
1714 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1716 909d120e 2019-09-22 stsp goto done;
1718 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1719 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1720 234035bc 2019-06-01 stsp * unmodified files again.
1722 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1723 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1724 234035bc 2019-06-01 stsp update_timestamps);
1725 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1726 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1727 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1728 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1729 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1731 1ee397ad 2019-07-12 stsp goto done;
1732 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1733 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1735 13d9040b 2019-03-27 stsp goto done;
1737 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1738 bd6aa359 2020-07-23 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0, 0,
1739 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1741 13d9040b 2019-03-27 stsp goto done;
1743 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1744 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 1);
1746 054041d0 2020-06-24 stsp err = create_fileindex_entry(fileindex,
1747 054041d0 2020-06-24 stsp worktree->base_commit_id, ondisk_path, path,
1748 054041d0 2020-06-24 stsp &blob->id);
1751 13d9040b 2019-03-27 stsp goto done;
1753 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1755 6353ad76 2019-02-08 stsp free(ondisk_path);
1756 8da9e5f4 2019-01-12 stsp return err;
1759 90285c3b 2019-01-08 stsp static const struct got_error *
1760 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1762 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1763 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1765 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1766 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1768 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1769 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1770 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1772 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1773 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1774 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1775 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1776 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1780 90285c3b 2019-01-08 stsp parent = dirname(parent);
1783 90285c3b 2019-01-08 stsp free(ondisk_path);
1784 90285c3b 2019-01-08 stsp return err;
1787 708d8e67 2019-03-27 stsp static const struct got_error *
1788 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1789 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1790 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1792 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1793 708d8e67 2019-03-27 stsp unsigned char status;
1794 708d8e67 2019-03-27 stsp struct stat sb;
1795 708d8e67 2019-03-27 stsp char *ondisk_path;
1797 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1798 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1800 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1802 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1804 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
1806 5a58a424 2020-06-23 stsp goto done;
1808 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1809 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1810 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1812 5a58a424 2020-06-23 stsp goto done;
1814 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1815 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1817 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1820 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1822 5a58a424 2020-06-23 stsp goto done;
1823 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1824 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1826 5a58a424 2020-06-23 stsp goto done;
1828 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1831 5a58a424 2020-06-23 stsp free(ondisk_path);
1832 fc6346c4 2019-03-27 stsp return err;
1835 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1836 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1837 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1838 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1839 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1840 8da9e5f4 2019-01-12 stsp void *progress_arg;
1841 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1842 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1845 512f0d0e 2019-01-02 stsp static const struct got_error *
1846 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1847 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1849 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1851 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1852 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1854 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1855 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1858 8da9e5f4 2019-01-12 stsp static const struct got_error *
1859 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1861 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1863 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1864 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1866 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1867 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1870 9d31a1d8 2018-03-11 stsp static const struct got_error *
1871 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1873 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1874 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1875 8da9e5f4 2019-01-12 stsp char *path;
1877 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1878 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1880 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
1881 63c5ca5d 2019-08-24 stsp return NULL;
1883 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1884 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1886 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1888 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1889 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1891 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1892 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1894 8da9e5f4 2019-01-12 stsp free(path);
1895 0cd1c46a 2019-03-11 stsp return err;
1898 818c7501 2019-07-11 stsp static const struct got_error *
1899 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1901 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1902 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1903 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1905 517bab73 2019-03-11 stsp *refname = NULL;
1907 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1908 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1909 cc483380 2019-09-01 stsp return got_error_uuid(uuid_status, "uuid_to_string");
1911 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1913 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1914 0647c563 2019-03-11 stsp *refname = NULL;
1916 517bab73 2019-03-11 stsp free(uuidstr);
1917 517bab73 2019-03-11 stsp return err;
1920 818c7501 2019-07-11 stsp const struct got_error *
1921 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1923 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1926 818c7501 2019-07-11 stsp static const struct got_error *
1927 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1929 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1930 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1933 818c7501 2019-07-11 stsp static const struct got_error *
1934 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1936 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1939 818c7501 2019-07-11 stsp static const struct got_error *
1940 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1942 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1943 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1946 818c7501 2019-07-11 stsp static const struct got_error *
1947 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1949 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1950 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1953 0ebf8283 2019-07-24 stsp static const struct got_error *
1954 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1956 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1957 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1960 0ebf8283 2019-07-24 stsp static const struct got_error *
1961 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1963 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1964 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1967 0ebf8283 2019-07-24 stsp static const struct got_error *
1968 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1970 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1971 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1974 0ebf8283 2019-07-24 stsp static const struct got_error *
1975 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1977 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1978 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1981 0ebf8283 2019-07-24 stsp const struct got_error *
1982 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1983 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1985 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1986 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1987 0ebf8283 2019-07-24 stsp *path = NULL;
1988 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1990 0ebf8283 2019-07-24 stsp return NULL;
1994 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1995 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1997 517bab73 2019-03-11 stsp static const struct got_error *
1998 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2000 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2001 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2002 517bab73 2019-03-11 stsp char *refname;
2004 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2006 517bab73 2019-03-11 stsp return err;
2008 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2010 0cd1c46a 2019-03-11 stsp goto done;
2012 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2014 0cd1c46a 2019-03-11 stsp free(refname);
2016 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2017 3e3a69f1 2019-07-25 stsp return err;
2020 3e3a69f1 2019-07-25 stsp static const struct got_error *
2021 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2023 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2025 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2026 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2027 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2028 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2030 9d31a1d8 2018-03-11 stsp return err;
2034 ebf99748 2019-05-09 stsp static const struct got_error *
2035 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2036 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2038 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2039 ebf99748 2019-05-09 stsp FILE *index = NULL;
2041 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2042 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2043 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2044 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2046 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2048 ebf99748 2019-05-09 stsp goto done;
2050 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2051 ebf99748 2019-05-09 stsp if (index == NULL) {
2052 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2053 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2055 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2056 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
2057 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2060 ebf99748 2019-05-09 stsp if (err) {
2061 ebf99748 2019-05-09 stsp free(*fileindex_path);
2062 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2063 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2064 ebf99748 2019-05-09 stsp *fileindex = NULL;
2066 ebf99748 2019-05-09 stsp return err;
2069 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2070 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2071 c932eeeb 2019-05-22 stsp const char *path;
2072 c932eeeb 2019-05-22 stsp size_t path_len;
2073 c932eeeb 2019-05-22 stsp const char *entry_name;
2074 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2075 a484d721 2019-06-10 stsp void *progress_arg;
2078 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2079 c932eeeb 2019-05-22 stsp static const struct got_error *
2080 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2082 1ee397ad 2019-07-12 stsp const struct got_error *err;
2083 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2085 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2086 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2087 c932eeeb 2019-05-22 stsp return NULL;
2088 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2089 102ff934 2019-06-11 stsp return NULL;
2091 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2092 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2093 c932eeeb 2019-05-22 stsp return NULL;
2095 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2096 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2097 edd02c5e 2019-07-11 stsp ie->path);
2099 1ee397ad 2019-07-12 stsp return err;
2101 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2102 c932eeeb 2019-05-22 stsp return NULL;
2105 9c6338c4 2019-06-02 stsp static const struct got_error *
2106 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2108 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2109 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2110 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2111 867630bb 2020-01-17 stsp struct timespec timeout;
2113 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2114 9c6338c4 2019-06-02 stsp fileindex_path);
2116 9c6338c4 2019-06-02 stsp goto done;
2118 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2120 9c6338c4 2019-06-02 stsp goto done;
2122 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2123 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2124 9c6338c4 2019-06-02 stsp fileindex_path);
2125 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2129 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2130 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2131 867630bb 2020-01-17 stsp * was recorded in the file index.
2133 867630bb 2020-01-17 stsp timeout.tv_sec = 0;
2134 867630bb 2020-01-17 stsp timeout.tv_nsec = 1;
2135 867630bb 2020-01-17 stsp nanosleep(&timeout, NULL);
2137 9c6338c4 2019-06-02 stsp if (new_index)
2138 9c6338c4 2019-06-02 stsp fclose(new_index);
2139 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2140 9c6338c4 2019-06-02 stsp return err;
2143 6ced4176 2019-07-12 stsp static const struct got_error *
2144 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2145 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2146 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2148 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2149 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2150 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2151 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2153 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2154 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2155 6ced4176 2019-07-12 stsp *tree_id = NULL;
2157 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2158 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2159 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2160 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2161 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2162 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2163 6ced4176 2019-07-12 stsp goto done;
2165 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2166 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2168 6ced4176 2019-07-12 stsp goto done;
2169 6ced4176 2019-07-12 stsp return NULL;
2172 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2174 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2175 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2176 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2177 6ced4176 2019-07-12 stsp goto done;
2180 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2181 6ced4176 2019-07-12 stsp in_repo_path);
2183 6ced4176 2019-07-12 stsp goto done;
2185 6ced4176 2019-07-12 stsp free(in_repo_path);
2186 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2188 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2190 6ced4176 2019-07-12 stsp goto done;
2192 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2193 6ced4176 2019-07-12 stsp /* Check out a single file. */
2194 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2195 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2196 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2197 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2198 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2199 6ced4176 2019-07-12 stsp goto done;
2201 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2202 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2203 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2204 6ced4176 2019-07-12 stsp goto done;
2207 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2208 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2210 6ced4176 2019-07-12 stsp return err;
2211 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2212 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2213 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2214 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2215 6ced4176 2019-07-12 stsp goto done;
2218 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2219 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2221 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2222 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2223 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2224 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2225 6ced4176 2019-07-12 stsp goto done;
2227 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2228 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2229 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2230 6ced4176 2019-07-12 stsp goto done;
2235 6ced4176 2019-07-12 stsp free(in_repo_path);
2236 6ced4176 2019-07-12 stsp if (err) {
2237 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2238 6ced4176 2019-07-12 stsp free(*tree_relpath);
2239 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2240 6ced4176 2019-07-12 stsp free(*tree_id);
2241 6ced4176 2019-07-12 stsp *tree_id = NULL;
2243 07ed472d 2019-07-12 stsp return err;
2246 07ed472d 2019-07-12 stsp static const struct got_error *
2247 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2248 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2249 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2250 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2252 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2253 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2254 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2255 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2256 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2258 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2259 7f47418f 2019-12-20 stsp if (err) {
2260 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2261 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2262 7f47418f 2019-12-20 stsp goto done;
2263 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2264 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2266 7f47418f 2019-12-20 stsp return err;
2269 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2270 07ed472d 2019-07-12 stsp worktree->base_commit_id);
2272 07ed472d 2019-07-12 stsp goto done;
2274 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2276 07ed472d 2019-07-12 stsp goto done;
2278 07ed472d 2019-07-12 stsp if (entry_name &&
2279 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2280 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2281 07ed472d 2019-07-12 stsp goto done;
2284 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2285 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2286 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2287 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2288 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2289 07ed472d 2019-07-12 stsp arg.repo = repo;
2290 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2291 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2292 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2293 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2294 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2295 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2298 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2299 07ed472d 2019-07-12 stsp if (commit)
2300 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2301 6ced4176 2019-07-12 stsp return err;
2304 9d31a1d8 2018-03-11 stsp const struct got_error *
2305 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2306 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2307 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2308 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2310 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2311 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2312 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2313 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2314 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2315 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2316 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2317 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
2318 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2319 f2ea84fa 2019-07-27 stsp int entry_type;
2320 f2ea84fa 2019-07-27 stsp char *relpath;
2321 f2ea84fa 2019-07-27 stsp char *entry_name;
2322 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2323 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2325 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
2327 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2329 9d31a1d8 2018-03-11 stsp return err;
2331 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2332 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2333 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2334 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2335 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2336 f2ea84fa 2019-07-27 stsp goto done;
2339 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2340 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2341 f2ea84fa 2019-07-27 stsp if (err) {
2342 f2ea84fa 2019-07-27 stsp free(tpd);
2343 6ced4176 2019-07-12 stsp goto done;
2346 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2347 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2348 f2ea84fa 2019-07-27 stsp if (err) {
2349 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2350 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2351 f2ea84fa 2019-07-27 stsp free(tpd);
2352 f2ea84fa 2019-07-27 stsp goto done;
2355 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2357 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2361 51514078 2018-12-25 stsp * Read the file index.
2362 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2363 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2365 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2367 c4cdcb68 2019-04-03 stsp goto done;
2369 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2370 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2371 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2373 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2374 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2375 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2379 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2380 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2381 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2382 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2383 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2384 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2385 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2386 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2390 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2392 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2393 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2394 af12c6b9 2019-06-04 stsp err = sync_err;
2396 9c6338c4 2019-06-02 stsp free(fileindex_path);
2398 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2399 9d31a1d8 2018-03-11 stsp if (commit)
2400 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2401 5ade8233 2019-07-12 stsp if (fileindex)
2402 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2403 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2404 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2405 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2406 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2407 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2408 f2ea84fa 2019-07-27 stsp free(tpd);
2410 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2411 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2412 9d31a1d8 2018-03-11 stsp err = unlockerr;
2413 f8d1f275 2019-02-04 stsp return err;
2416 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2417 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2418 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2419 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2420 234035bc 2019-06-01 stsp void *progress_arg;
2421 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2422 234035bc 2019-06-01 stsp void *cancel_arg;
2423 f69721c3 2019-10-21 stsp const char *label_orig;
2424 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2427 234035bc 2019-06-01 stsp static const struct got_error *
2428 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2429 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2430 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2431 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2433 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2434 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2435 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2436 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2437 234035bc 2019-06-01 stsp struct stat sb;
2438 234035bc 2019-06-01 stsp unsigned char status;
2439 234035bc 2019-06-01 stsp int local_changes_subsumed;
2441 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2442 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2443 d6c87207 2019-08-02 stsp strlen(path2));
2444 1ee397ad 2019-07-12 stsp if (ie == NULL)
2445 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2446 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2448 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2449 234035bc 2019-06-01 stsp path2) == -1)
2450 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2452 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2455 234035bc 2019-06-01 stsp goto done;
2457 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2458 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2459 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2460 234035bc 2019-06-01 stsp goto done;
2462 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2463 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2464 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2465 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2466 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2467 234035bc 2019-06-01 stsp goto done;
2470 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2471 af57b12a 2020-07-23 stsp err = merge_symlink(a->worktree, blob1,
2472 af57b12a 2020-07-23 stsp ondisk_path, path2, sb.st_mode, a->label_orig,
2473 af57b12a 2020-07-23 stsp blob2, a->commit_id2, repo, a->progress_cb,
2474 af57b12a 2020-07-23 stsp a->progress_arg);
2476 af57b12a 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2477 af57b12a 2020-07-23 stsp blob1, ondisk_path, path2, sb.st_mode,
2478 af57b12a 2020-07-23 stsp a->label_orig, blob2, a->commit_id2, repo,
2479 af57b12a 2020-07-23 stsp a->progress_cb, a->progress_arg);
2481 234035bc 2019-06-01 stsp } else if (blob1) {
2482 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2483 d6c87207 2019-08-02 stsp strlen(path1));
2484 1ee397ad 2019-07-12 stsp if (ie == NULL)
2485 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2486 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2488 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2489 2b92fad7 2019-06-02 stsp path1) == -1)
2490 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2492 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2495 2b92fad7 2019-06-02 stsp goto done;
2497 2b92fad7 2019-06-02 stsp switch (status) {
2498 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2499 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2500 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2502 1ee397ad 2019-07-12 stsp goto done;
2503 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2505 2b92fad7 2019-06-02 stsp goto done;
2507 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2509 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2510 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2511 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2512 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2514 1ee397ad 2019-07-12 stsp goto done;
2516 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2518 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2519 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2520 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2521 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2522 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2524 1ee397ad 2019-07-12 stsp goto done;
2526 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2527 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2529 1ee397ad 2019-07-12 stsp goto done;
2534 234035bc 2019-06-01 stsp } else if (blob2) {
2535 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2536 234035bc 2019-06-01 stsp path2) == -1)
2537 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2538 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2539 d6c87207 2019-08-02 stsp strlen(path2));
2541 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2542 7f91a133 2019-12-13 stsp -1, NULL, repo);
2544 234035bc 2019-06-01 stsp goto done;
2545 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2546 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2547 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2548 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2549 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2550 1ee397ad 2019-07-12 stsp status, path2);
2551 234035bc 2019-06-01 stsp goto done;
2553 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2554 f69721c3 2019-10-21 stsp NULL, ondisk_path, path2, sb.st_mode,
2555 f69721c3 2019-10-21 stsp a->label_orig, blob2, a->commit_id2, repo,
2556 f69721c3 2019-10-21 stsp a->progress_cb,
2557 f69721c3 2019-10-21 stsp a->progress_arg);
2558 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2559 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2560 054041d0 2020-06-24 stsp ondisk_path, blob2->id.sha1,
2561 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2563 234035bc 2019-06-01 stsp goto done;
2566 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2567 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2568 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2569 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2570 bd6aa359 2020-07-23 stsp sb.st_mode, blob2, 0, 0, 0, repo,
2571 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2573 234035bc 2019-06-01 stsp goto done;
2574 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2576 234035bc 2019-06-01 stsp goto done;
2577 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path,
2578 3969253a 2020-03-07 stsp NULL, NULL, 1);
2579 3969253a 2020-03-07 stsp if (err) {
2580 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2581 3969253a 2020-03-07 stsp goto done;
2583 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2584 2b92fad7 2019-06-02 stsp if (err) {
2585 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2586 2b92fad7 2019-06-02 stsp goto done;
2591 234035bc 2019-06-01 stsp free(ondisk_path);
2592 234035bc 2019-06-01 stsp return err;
2595 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2596 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2597 234035bc 2019-06-01 stsp struct got_repository *repo;
2600 234035bc 2019-06-01 stsp static const struct got_error *
2601 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2603 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2604 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2605 234035bc 2019-06-01 stsp unsigned char status;
2606 234035bc 2019-06-01 stsp struct stat sb;
2607 234035bc 2019-06-01 stsp char *ondisk_path;
2609 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2610 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2611 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2612 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2614 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2616 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2618 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2619 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2621 234035bc 2019-06-01 stsp return err;
2622 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2623 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2625 234035bc 2019-06-01 stsp return NULL;
2628 818c7501 2019-07-11 stsp static const struct got_error *
2629 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2630 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2631 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2632 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2633 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2635 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2636 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2637 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2638 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2639 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2641 03415a1a 2019-06-02 stsp if (commit_id1) {
2642 f69721c3 2019-10-21 stsp char *id_str;
2644 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2645 03415a1a 2019-06-02 stsp worktree->path_prefix);
2647 03415a1a 2019-06-02 stsp goto done;
2649 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2651 03415a1a 2019-06-02 stsp goto done;
2653 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
2655 f69721c3 2019-10-21 stsp goto done;
2657 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2658 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2659 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2660 f69721c3 2019-10-21 stsp free(id_str);
2661 f69721c3 2019-10-21 stsp goto done;
2663 f69721c3 2019-10-21 stsp free(id_str);
2666 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2667 234035bc 2019-06-01 stsp worktree->path_prefix);
2669 234035bc 2019-06-01 stsp goto done;
2671 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2673 234035bc 2019-06-01 stsp goto done;
2675 234035bc 2019-06-01 stsp arg.worktree = worktree;
2676 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2677 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2678 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2679 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2680 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2681 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
2682 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2683 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2684 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2685 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2686 af12c6b9 2019-06-04 stsp err = sync_err;
2688 234035bc 2019-06-01 stsp if (tree1)
2689 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2690 234035bc 2019-06-01 stsp if (tree2)
2691 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2692 f69721c3 2019-10-21 stsp free(label_orig);
2693 818c7501 2019-07-11 stsp return err;
2696 818c7501 2019-07-11 stsp const struct got_error *
2697 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2698 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2699 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2700 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2702 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2703 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2704 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2705 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2707 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2709 818c7501 2019-07-11 stsp return err;
2711 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2713 818c7501 2019-07-11 stsp goto done;
2715 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2716 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2717 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2718 818c7501 2019-07-11 stsp &mok_arg);
2720 818c7501 2019-07-11 stsp goto done;
2722 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2723 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2725 818c7501 2019-07-11 stsp if (fileindex)
2726 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2727 818c7501 2019-07-11 stsp free(fileindex_path);
2728 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2729 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2730 234035bc 2019-06-01 stsp err = unlockerr;
2731 234035bc 2019-06-01 stsp return err;
2734 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2735 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2736 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2737 927df6b7 2019-02-10 stsp const char *status_path;
2738 927df6b7 2019-02-10 stsp size_t status_path_len;
2739 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2740 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2741 f8d1f275 2019-02-04 stsp void *status_arg;
2742 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2743 f8d1f275 2019-02-04 stsp void *cancel_arg;
2744 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2745 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2746 f2a9dc41 2019-12-13 tracey int report_unchanged;
2747 3143d852 2020-06-25 stsp int no_ignores;
2750 f8d1f275 2019-02-04 stsp static const struct got_error *
2751 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2752 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
2753 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2754 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
2756 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2757 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2758 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2759 927df6b7 2019-02-10 stsp struct stat sb;
2760 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2761 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2762 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2764 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
2766 98eaaa12 2019-08-03 stsp return err;
2768 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2769 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
2770 98eaaa12 2019-08-03 stsp return NULL;
2772 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2773 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2774 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2776 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2777 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2778 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2780 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2781 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2782 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2783 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2784 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2787 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2788 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
2791 927df6b7 2019-02-10 stsp static const struct got_error *
2792 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2793 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
2795 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2796 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2797 f8d1f275 2019-02-04 stsp char *abspath;
2799 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2800 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2802 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2803 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2804 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2805 927df6b7 2019-02-10 stsp return NULL;
2807 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2808 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2809 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2810 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2812 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2813 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2814 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2817 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
2818 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
2819 f8d1f275 2019-02-04 stsp free(abspath);
2820 9d31a1d8 2018-03-11 stsp return err;
2823 f8d1f275 2019-02-04 stsp static const struct got_error *
2824 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2826 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2827 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2828 2ec1f75b 2019-03-26 stsp unsigned char status;
2830 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2831 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2833 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2834 927df6b7 2019-02-10 stsp return NULL;
2836 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2837 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2838 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2839 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2841 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2842 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2843 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
2847 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2849 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2851 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2852 6841da00 2019-08-08 stsp free((char *)pe->path);
2853 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2857 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2859 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2861 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2862 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2863 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2864 6841da00 2019-08-08 stsp free((char *)pe->path);
2866 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2869 6841da00 2019-08-08 stsp static const struct got_error *
2870 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2872 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2873 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2874 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2875 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
2876 6841da00 2019-08-08 stsp size_t linesize = 0;
2877 6841da00 2019-08-08 stsp ssize_t linelen;
2879 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2880 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2881 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2882 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2884 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2885 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2886 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2888 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
2889 bd8de430 2019-10-04 stsp if (line[0] == '#')
2892 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
2893 bd8de430 2019-10-04 stsp if (line[0] == '!')
2896 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2897 6841da00 2019-08-08 stsp line) == -1) {
2898 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2899 6841da00 2019-08-08 stsp goto done;
2901 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2903 6841da00 2019-08-08 stsp goto done;
2905 6841da00 2019-08-08 stsp if (ferror(f)) {
2906 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2907 6841da00 2019-08-08 stsp goto done;
2910 6841da00 2019-08-08 stsp dirpath = strdup(path);
2911 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2912 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2913 6841da00 2019-08-08 stsp goto done;
2915 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2917 6841da00 2019-08-08 stsp free(line);
2918 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2919 6841da00 2019-08-08 stsp free(dirpath);
2920 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2922 6841da00 2019-08-08 stsp return err;
2926 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2928 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2930 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
2931 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
2932 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
2933 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
2935 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2936 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
2938 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
2940 bd8de430 2019-10-04 stsp pattern += 3;
2942 bd8de430 2019-10-04 stsp while (*p) {
2943 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
2944 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
2945 bd8de430 2019-10-04 stsp /* Retry in next directory. */
2946 bd8de430 2019-10-04 stsp while (*p && *p != '/')
2948 bd8de430 2019-10-04 stsp while (*p == '/')
2958 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2959 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2960 6841da00 2019-08-08 stsp * ignores backwards.
2962 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2963 6841da00 2019-08-08 stsp while (pe) {
2964 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2965 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2966 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2967 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2968 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
2969 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
2970 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
2971 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
2972 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
2977 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2983 6841da00 2019-08-08 stsp static const struct got_error *
2984 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2985 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
2987 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2988 6841da00 2019-08-08 stsp char *ignorespath;
2989 886cec17 2019-12-15 stsp int fd = -1;
2990 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2992 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2993 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
2994 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2996 886cec17 2019-12-15 stsp if (dirfd != -1) {
2997 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
2998 886cec17 2019-12-15 stsp if (fd == -1) {
2999 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3000 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3001 886cec17 2019-12-15 stsp ignorespath);
3003 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3004 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3005 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3006 886cec17 2019-12-15 stsp ignorespath);
3009 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3013 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3014 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3015 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3016 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3017 886cec17 2019-12-15 stsp ignorespath);
3019 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3022 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3023 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3024 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3025 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3026 6841da00 2019-08-08 stsp free(ignorespath);
3027 6841da00 2019-08-08 stsp return err;
3030 f8d1f275 2019-02-04 stsp static const struct got_error *
3031 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3033 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3034 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3035 f8d1f275 2019-02-04 stsp char *path = NULL;
3037 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3038 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3040 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3041 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3042 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3044 f8d1f275 2019-02-04 stsp path = de->d_name;
3047 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3048 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3049 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
3050 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3051 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3052 f8d1f275 2019-02-04 stsp if (parent_path[0])
3053 f8d1f275 2019-02-04 stsp free(path);
3054 b72f483a 2019-02-05 stsp return err;
3057 347d1d3e 2019-07-12 stsp static const struct got_error *
3058 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3060 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3061 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3063 3143d852 2020-06-25 stsp if (a->no_ignores)
3064 3143d852 2020-06-25 stsp return NULL;
3066 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
3067 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3069 3143d852 2020-06-25 stsp return err;
3071 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
3072 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3074 3143d852 2020-06-25 stsp return err;
3077 3143d852 2020-06-25 stsp static const struct got_error *
3078 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3079 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3080 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
3082 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3083 abb4604f 2019-07-27 stsp struct stat sb;
3085 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3087 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3088 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3090 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3091 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3092 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3093 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3094 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3095 abb4604f 2019-07-27 stsp return NULL;
3098 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3099 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3100 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3102 abb4604f 2019-07-27 stsp return NULL;
3105 3143d852 2020-06-25 stsp static const struct got_error *
3106 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3107 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3109 3143d852 2020-06-25 stsp const struct got_error *err;
3110 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3112 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3113 3143d852 2020-06-25 stsp ".cvsignore");
3115 3143d852 2020-06-25 stsp return err;
3117 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3118 3143d852 2020-06-25 stsp ".gitignore");
3120 3143d852 2020-06-25 stsp return err;
3122 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3123 3143d852 2020-06-25 stsp if (err) {
3124 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3125 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3126 3143d852 2020-06-25 stsp return err;
3128 3143d852 2020-06-25 stsp for (;;) {
3129 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3130 3143d852 2020-06-25 stsp ".cvsignore");
3133 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3134 3143d852 2020-06-25 stsp ".gitignore");
3137 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3138 3143d852 2020-06-25 stsp if (err) {
3139 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3140 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3143 b737c85a 2020-06-26 stsp free(parent_path);
3144 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3145 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3148 b737c85a 2020-06-26 stsp free(parent_path);
3149 b737c85a 2020-06-26 stsp free(next_parent_path);
3150 3143d852 2020-06-25 stsp return err;
3153 abb4604f 2019-07-27 stsp static const struct got_error *
3154 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3155 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3156 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3157 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3158 f2a9dc41 2019-12-13 tracey int report_unchanged)
3160 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3161 6fc93f37 2019-12-13 stsp int fd = -1;
3162 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3163 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3164 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3166 3143d852 2020-06-25 stsp TAILQ_INIT(&arg.ignores);
3168 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3169 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3170 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3172 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3173 6fc93f37 2019-12-13 stsp if (fd == -1) {
3174 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3175 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3176 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3178 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3179 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3180 f2a9dc41 2019-12-13 tracey report_unchanged);
3182 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3183 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3184 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3185 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3186 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3187 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3188 abb4604f 2019-07-27 stsp arg.status_path = path;
3189 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3190 abb4604f 2019-07-27 stsp arg.repo = repo;
3191 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3192 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3193 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3194 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3195 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3196 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3197 022fae89 2019-12-06 tracey if (!no_ignores) {
3198 3143d852 2020-06-25 stsp err = add_ignores_from_parent_paths(&arg.ignores,
3199 3143d852 2020-06-25 stsp worktree->root_path, path);
3201 3143d852 2020-06-25 stsp goto done;
3203 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3204 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3207 3143d852 2020-06-25 stsp free_ignores(&arg.ignores);
3208 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
3209 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3210 927df6b7 2019-02-10 stsp free(ondisk_path);
3211 347d1d3e 2019-07-12 stsp return err;
3214 347d1d3e 2019-07-12 stsp const struct got_error *
3215 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3216 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3217 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
3218 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3220 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3221 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3222 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3223 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3225 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3227 347d1d3e 2019-07-12 stsp return err;
3229 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3230 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3231 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3235 f8d1f275 2019-02-04 stsp free(fileindex_path);
3236 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3237 f8d1f275 2019-02-04 stsp return err;
3240 6c7ab921 2019-03-18 stsp const struct got_error *
3241 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3242 6c7ab921 2019-03-18 stsp const char *arg)
3244 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3245 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3246 6c7ab921 2019-03-18 stsp size_t len;
3247 00bb5ea0 2020-07-23 stsp struct stat sb;
3249 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3251 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3252 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3253 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3255 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3256 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3257 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3258 00bb5ea0 2020-07-23 stsp goto done;
3261 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3263 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3264 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3265 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3266 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3268 00bb5ea0 2020-07-23 stsp char *abspath = NULL;
3269 00bb5ea0 2020-07-23 stsp char canonpath[PATH_MAX];
3270 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3271 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3272 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3273 00bb5ea0 2020-07-23 stsp goto done;
3277 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3278 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3280 d0710d08 2019-07-22 stsp goto done;
3281 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3282 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3283 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3284 00bb5ea0 2020-07-23 stsp goto done;
3287 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3288 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3289 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3290 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3291 00bb5ea0 2020-07-23 stsp goto done;
3293 00bb5ea0 2020-07-23 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
3294 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3295 00bb5ea0 2020-07-23 stsp goto done;
3300 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3301 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3302 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3303 6c7ab921 2019-03-18 stsp goto done;
3306 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3307 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3308 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3310 f6d88e1a 2019-05-29 stsp goto done;
3312 f6d88e1a 2019-05-29 stsp path = strdup("");
3313 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3314 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3315 f6d88e1a 2019-05-29 stsp goto done;
3319 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3320 6c7ab921 2019-03-18 stsp len = strlen(path);
3321 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3322 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3326 6c7ab921 2019-03-18 stsp free(resolved);
3327 d0710d08 2019-07-22 stsp free(cwd);
3328 6c7ab921 2019-03-18 stsp if (err == NULL)
3329 6c7ab921 2019-03-18 stsp *wt_path = path;
3331 6c7ab921 2019-03-18 stsp free(path);
3332 d00136be 2019-03-26 stsp return err;
3335 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3336 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3337 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3338 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3339 4e68cba3 2019-11-23 stsp void *progress_arg;
3340 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3343 4e68cba3 2019-11-23 stsp static const struct got_error *
3344 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3345 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3346 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3347 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3349 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3350 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3351 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3352 6d022e97 2019-08-04 stsp struct stat sb;
3353 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3355 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3356 dbb83fbd 2019-12-12 stsp relpath) == -1)
3357 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3359 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3361 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3362 12463d8b 2019-12-13 stsp de_name, a->repo);
3364 dbb83fbd 2019-12-12 stsp goto done;
3365 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3366 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3367 dbb83fbd 2019-12-12 stsp goto done;
3368 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3370 dbb83fbd 2019-12-12 stsp goto done;
3373 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3374 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3375 dbb83fbd 2019-12-12 stsp goto done;
3378 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3380 4e68cba3 2019-11-23 stsp goto done;
3381 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL, 1);
3382 3969253a 2020-03-07 stsp if (err) {
3383 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3384 3969253a 2020-03-07 stsp goto done;
3386 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3387 07f5b47a 2019-06-02 stsp if (err) {
3388 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3389 4e68cba3 2019-11-23 stsp goto done;
3392 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3394 dbb83fbd 2019-12-12 stsp return err;
3395 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3396 dbb83fbd 2019-12-12 stsp return NULL;
3397 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3400 d00136be 2019-03-26 stsp const struct got_error *
3401 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3402 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3403 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3404 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3406 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3407 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3408 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3409 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3410 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3412 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3414 d00136be 2019-03-26 stsp return err;
3416 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3418 d00136be 2019-03-26 stsp goto done;
3420 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3421 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3422 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3423 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3424 4e68cba3 2019-11-23 stsp saa.repo = repo;
3426 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3427 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3428 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3432 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3433 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3434 af12c6b9 2019-06-04 stsp err = sync_err;
3436 fb399478 2019-07-12 stsp free(fileindex_path);
3437 d00136be 2019-03-26 stsp if (fileindex)
3438 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3439 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3440 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3441 d00136be 2019-03-26 stsp err = unlockerr;
3442 6c7ab921 2019-03-18 stsp return err;
3445 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3446 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3447 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3448 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3449 f2a9dc41 2019-12-13 tracey void *progress_arg;
3450 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3451 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3452 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3455 f2a9dc41 2019-12-13 tracey static const struct got_error *
3456 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3457 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3458 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3459 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3461 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3462 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3463 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3464 17ed4618 2019-06-02 stsp struct stat sb;
3465 15341bfd 2020-03-05 tracey char *ondisk_path, *parent = NULL;
3467 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3468 17ed4618 2019-06-02 stsp if (ie == NULL)
3469 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3471 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3472 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3473 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3474 9acbc4fa 2019-08-03 stsp return NULL;
3475 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3478 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3479 f2a9dc41 2019-12-13 tracey relpath) == -1)
3480 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3482 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3485 f2a9dc41 2019-12-13 tracey goto done;
3487 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3488 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3489 f2a9dc41 2019-12-13 tracey goto done;
3490 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3491 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3492 f2a9dc41 2019-12-13 tracey goto done;
3494 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3495 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3496 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3497 f2a9dc41 2019-12-13 tracey goto done;
3501 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3502 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3503 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3504 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3505 12463d8b 2019-12-13 stsp ondisk_path);
3506 12463d8b 2019-12-13 stsp goto done;
3508 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3509 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3510 12463d8b 2019-12-13 stsp goto done;
3513 15341bfd 2020-03-05 tracey parent = dirname(ondisk_path);
3515 15341bfd 2020-03-05 tracey if (parent == NULL) {
3516 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", ondisk_path);
3517 15341bfd 2020-03-05 tracey goto done;
3519 15341bfd 2020-03-05 tracey while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3520 15341bfd 2020-03-05 tracey if (rmdir(parent) == -1) {
3521 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3522 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3523 15341bfd 2020-03-05 tracey parent);
3526 15341bfd 2020-03-05 tracey parent = dirname(parent);
3527 15341bfd 2020-03-05 tracey if (parent == NULL) {
3528 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", parent);
3529 15341bfd 2020-03-05 tracey goto done;
3534 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3536 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3537 f2a9dc41 2019-12-13 tracey if (err)
3538 f2a9dc41 2019-12-13 tracey return err;
3539 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3540 f2a9dc41 2019-12-13 tracey return NULL;
3541 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3542 f2a9dc41 2019-12-13 tracey staged_status, relpath);
3545 2ec1f75b 2019-03-26 stsp const struct got_error *
3546 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
3547 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
3548 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
3549 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
3551 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3552 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
3553 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3554 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3555 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3557 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3559 2ec1f75b 2019-03-26 stsp return err;
3561 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3563 2ec1f75b 2019-03-26 stsp goto done;
3565 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3566 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3567 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3568 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3569 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3570 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3571 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
3573 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3574 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3575 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3579 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3580 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3581 af12c6b9 2019-06-04 stsp err = sync_err;
3583 fb399478 2019-07-12 stsp free(fileindex_path);
3584 2ec1f75b 2019-03-26 stsp if (fileindex)
3585 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3586 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3587 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3588 2ec1f75b 2019-03-26 stsp err = unlockerr;
3589 33aa809d 2019-08-08 stsp return err;
3592 33aa809d 2019-08-08 stsp static const struct got_error *
3593 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3595 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3596 33aa809d 2019-08-08 stsp char *line = NULL;
3597 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3598 33aa809d 2019-08-08 stsp ssize_t linelen;
3600 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3601 33aa809d 2019-08-08 stsp if (linelen == -1) {
3602 33aa809d 2019-08-08 stsp if (ferror(infile)) {
3603 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
3604 33aa809d 2019-08-08 stsp goto done;
3606 33aa809d 2019-08-08 stsp return NULL;
3608 33aa809d 2019-08-08 stsp if (outfile) {
3609 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
3610 33aa809d 2019-08-08 stsp if (n != linelen) {
3611 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3612 33aa809d 2019-08-08 stsp goto done;
3615 33aa809d 2019-08-08 stsp if (rejectfile) {
3616 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
3617 33aa809d 2019-08-08 stsp if (n != linelen)
3618 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3621 33aa809d 2019-08-08 stsp free(line);
3622 2ec1f75b 2019-03-26 stsp return err;
3625 33aa809d 2019-08-08 stsp static const struct got_error *
3626 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
3628 33aa809d 2019-08-08 stsp char *line = NULL;
3629 33aa809d 2019-08-08 stsp size_t linesize = 0;
3630 33aa809d 2019-08-08 stsp ssize_t linelen;
3632 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
3633 500467ff 2019-09-25 hiltjo if (linelen == -1) {
3634 500467ff 2019-09-25 hiltjo if (ferror(f))
3635 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
3636 500467ff 2019-09-25 hiltjo return NULL;
3638 33aa809d 2019-08-08 stsp free(line);
3639 33aa809d 2019-08-08 stsp return NULL;
3642 33aa809d 2019-08-08 stsp static const struct got_error *
3643 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3644 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
3645 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
3647 33aa809d 2019-08-08 stsp const struct got_error *err;
3649 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
3650 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
3651 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
3653 33aa809d 2019-08-08 stsp return err;
3654 33aa809d 2019-08-08 stsp (*line_cur1)++;
3656 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
3657 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
3658 33aa809d 2019-08-08 stsp if (rejectfile)
3659 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
3661 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
3663 33aa809d 2019-08-08 stsp return err;
3664 33aa809d 2019-08-08 stsp (*line_cur2)++;
3666 33aa809d 2019-08-08 stsp /* Copy patched lines. */
3667 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
3668 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
3670 33aa809d 2019-08-08 stsp return err;
3671 33aa809d 2019-08-08 stsp (*line_cur2)++;
3673 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
3674 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
3675 33aa809d 2019-08-08 stsp if (rejectfile)
3676 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
3678 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
3680 33aa809d 2019-08-08 stsp return err;
3681 33aa809d 2019-08-08 stsp (*line_cur1)++;
3684 f1e81a05 2019-08-10 stsp return NULL;
3687 f1e81a05 2019-08-10 stsp static const struct got_error *
3688 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3689 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
3691 f1e81a05 2019-08-10 stsp const struct got_error *err;
3693 f1e81a05 2019-08-10 stsp if (outfile) {
3694 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
3695 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
3696 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
3698 f1e81a05 2019-08-10 stsp return err;
3699 f1e81a05 2019-08-10 stsp (*line_cur1)++;
3702 f1e81a05 2019-08-10 stsp if (rejectfile) {
3703 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
3704 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
3705 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
3707 f1e81a05 2019-08-10 stsp return err;
3708 f1e81a05 2019-08-10 stsp (*line_cur2)++;
3712 33aa809d 2019-08-08 stsp return NULL;
3715 33aa809d 2019-08-08 stsp static const struct got_error *
3716 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3717 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3718 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3719 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
3720 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3722 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3723 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
3724 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
3725 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
3726 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
3727 33aa809d 2019-08-08 stsp long pos1, pos2;
3728 33aa809d 2019-08-08 stsp FILE *hunkfile;
3730 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3732 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
3733 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
3734 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
3736 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
3737 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
3739 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
3740 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3742 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
3743 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3744 33aa809d 2019-08-08 stsp goto done;
3746 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
3747 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3748 33aa809d 2019-08-08 stsp goto done;
3750 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3751 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
3752 33aa809d 2019-08-08 stsp goto done;
3755 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3756 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
3758 33aa809d 2019-08-08 stsp goto done;
3760 33aa809d 2019-08-08 stsp switch (*choice) {
3761 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
3762 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3763 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
3765 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
3766 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3767 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
3769 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
3772 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
3776 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3777 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
3778 33aa809d 2019-08-08 stsp return err;
3781 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3782 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3783 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3784 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3785 1f1abb7e 2019-08-08 stsp void *progress_arg;
3786 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3787 33aa809d 2019-08-08 stsp void *patch_arg;
3788 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3791 e20a8b6f 2019-06-04 stsp static const struct got_error *
3792 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3793 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3794 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
3795 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3796 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3798 33aa809d 2019-08-08 stsp const struct got_error *err;
3799 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3800 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3801 1ebedb77 2019-10-19 stsp int fd2 = -1;
3802 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3803 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3804 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3805 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3806 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3807 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3808 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3809 33aa809d 2019-08-08 stsp int n = 0;
3811 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3813 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3815 33aa809d 2019-08-08 stsp return err;
3817 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
3818 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
3819 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3820 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", path2);
3821 12463d8b 2019-12-13 stsp goto done;
3824 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3825 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3826 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", path2);
3827 12463d8b 2019-12-13 stsp goto done;
3830 1ebedb77 2019-10-19 stsp if (fstat(fd2, &sb2) == -1) {
3831 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("fstat", path2);
3832 1ebedb77 2019-10-19 stsp goto done;
3835 1ebedb77 2019-10-19 stsp f2 = fdopen(fd2, "r");
3836 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3837 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", path2);
3838 33aa809d 2019-08-08 stsp goto done;
3842 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3844 33aa809d 2019-08-08 stsp goto done;
3846 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3848 33aa809d 2019-08-08 stsp goto done;
3850 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3852 33aa809d 2019-08-08 stsp goto done;
3854 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3855 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3856 33aa809d 2019-08-08 stsp goto done;
3859 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3860 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3862 33aa809d 2019-08-08 stsp goto done;
3864 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3866 33aa809d 2019-08-08 stsp goto done;
3868 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3869 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3870 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3871 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3872 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3873 33aa809d 2019-08-08 stsp int choice;
3874 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3875 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3876 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3877 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3878 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3879 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3881 33aa809d 2019-08-08 stsp goto done;
3882 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3883 33aa809d 2019-08-08 stsp have_content = 1;
3884 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3887 1ebedb77 2019-10-19 stsp if (have_content) {
3888 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3889 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
3890 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
3892 1ebedb77 2019-10-19 stsp goto done;
3894 1ebedb77 2019-10-19 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
3895 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", path2);
3896 1ebedb77 2019-10-19 stsp goto done;
3900 33aa809d 2019-08-08 stsp free(id_str);
3902 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3903 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3904 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3905 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3906 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3907 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3908 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
3909 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3910 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3911 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3912 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3913 33aa809d 2019-08-08 stsp if (err || !have_content) {
3914 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3915 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3916 33aa809d 2019-08-08 stsp free(*path_outfile);
3917 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3919 33aa809d 2019-08-08 stsp free(args);
3921 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3924 33aa809d 2019-08-08 stsp if (changes)
3925 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3926 33aa809d 2019-08-08 stsp free(path1);
3927 33aa809d 2019-08-08 stsp return err;
3930 33aa809d 2019-08-08 stsp static const struct got_error *
3931 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3932 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3933 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3934 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3936 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3937 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3938 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3939 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3940 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3941 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3942 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3943 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3944 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3945 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3947 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3948 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3949 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3950 d3bcc3d1 2019-08-08 stsp return NULL;
3952 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
3953 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
3954 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
3956 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3957 65084dad 2019-08-08 stsp if (ie == NULL)
3958 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3960 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3961 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3962 a129376b 2019-03-28 stsp if (err) {
3963 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3964 a129376b 2019-03-28 stsp goto done;
3965 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3966 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3967 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3968 e20a8b6f 2019-06-04 stsp goto done;
3971 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3972 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3973 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3974 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3975 a129376b 2019-03-28 stsp goto done;
3978 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3979 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3980 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3981 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3982 a129376b 2019-03-28 stsp goto done;
3985 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3986 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3987 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3988 a129376b 2019-03-28 stsp goto done;
3993 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3994 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3995 a9fa2909 2019-07-27 stsp if (err) {
3996 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3997 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3998 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3999 a9fa2909 2019-07-27 stsp goto done;
4001 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4003 a9fa2909 2019-07-27 stsp goto done;
4005 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
4006 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
4007 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
4008 a9fa2909 2019-07-27 stsp goto done;
4011 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4012 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4013 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4014 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
4015 a9fa2909 2019-07-27 stsp goto done;
4019 a129376b 2019-03-28 stsp switch (status) {
4020 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4021 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4022 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4023 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4024 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4026 33aa809d 2019-08-08 stsp goto done;
4027 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4030 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4031 1f1abb7e 2019-08-08 stsp ie->path);
4033 1ee397ad 2019-07-12 stsp goto done;
4034 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4036 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4037 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4038 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4039 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4040 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4042 33aa809d 2019-08-08 stsp goto done;
4043 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4046 33aa809d 2019-08-08 stsp /* fall through */
4047 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4048 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4049 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4050 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4051 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4052 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4053 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4054 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4055 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4057 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4058 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4059 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4061 65084dad 2019-08-08 stsp goto done;
4063 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4064 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4065 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4066 a129376b 2019-03-28 stsp goto done;
4069 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4070 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4071 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4072 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4073 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4074 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4076 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
4077 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
4078 33aa809d 2019-08-08 stsp path_content, ondisk_path);
4079 33aa809d 2019-08-08 stsp goto done;
4082 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
4083 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4084 bd6aa359 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob, 0, 1, 0,
4085 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
4087 a129376b 2019-03-28 stsp goto done;
4088 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4089 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4090 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4091 054041d0 2020-06-24 stsp ondisk_path, blob->id.sha1,
4092 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4094 33aa809d 2019-08-08 stsp goto done;
4103 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4104 33aa809d 2019-08-08 stsp free(path_content);
4105 e20a8b6f 2019-06-04 stsp free(parent_path);
4106 a129376b 2019-03-28 stsp free(tree_path);
4108 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4110 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4111 a129376b 2019-03-28 stsp free(tree_id);
4112 e20a8b6f 2019-06-04 stsp return err;
4115 e20a8b6f 2019-06-04 stsp const struct got_error *
4116 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4117 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4118 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4119 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4120 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4122 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4123 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4124 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4125 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4126 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4127 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4129 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4131 e20a8b6f 2019-06-04 stsp return err;
4133 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4135 e20a8b6f 2019-06-04 stsp goto done;
4137 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4138 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4139 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4140 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4141 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4142 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4143 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4144 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4145 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4146 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4150 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4151 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4152 e20a8b6f 2019-06-04 stsp err = sync_err;
4154 fb399478 2019-07-12 stsp free(fileindex_path);
4155 a129376b 2019-03-28 stsp if (fileindex)
4156 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4157 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4158 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4159 a129376b 2019-03-28 stsp err = unlockerr;
4160 c4296144 2019-05-09 stsp return err;
4163 cf066bf8 2019-05-09 stsp static void
4164 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4166 24519714 2019-05-09 stsp free(ct->path);
4167 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4168 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4169 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4170 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4171 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4172 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4176 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4177 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4178 24519714 2019-05-09 stsp struct got_repository *repo;
4179 24519714 2019-05-09 stsp struct got_worktree *worktree;
4180 5f8a88c6 2019-08-03 stsp int have_staged_files;
4183 c4296144 2019-05-09 stsp static const struct got_error *
4184 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
4185 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4186 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4187 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4189 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
4190 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4191 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4192 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4193 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4194 768aea60 2019-05-09 stsp struct stat sb;
4196 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
4197 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4198 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4199 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4200 5f8a88c6 2019-08-03 stsp return NULL;
4202 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4203 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4205 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4206 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4207 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4208 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4209 5f8a88c6 2019-08-03 stsp return NULL;
4212 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4213 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4214 036813ee 2019-05-09 stsp goto done;
4216 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4217 036813ee 2019-05-09 stsp parent_path = strdup("");
4218 69960a46 2019-05-09 stsp if (parent_path == NULL)
4219 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4221 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4223 69960a46 2019-05-09 stsp return err;
4226 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4227 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4228 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4229 c4296144 2019-05-09 stsp goto done;
4232 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4233 768aea60 2019-05-09 stsp relpath) == -1) {
4234 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4235 768aea60 2019-05-09 stsp goto done;
4237 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
4238 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
4240 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4241 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4242 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4243 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4244 12463d8b 2019-12-13 stsp ct->ondisk_path);
4245 12463d8b 2019-12-13 stsp goto done;
4247 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4248 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4249 768aea60 2019-05-09 stsp goto done;
4251 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4254 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4255 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4256 44d03001 2019-05-09 stsp relpath) == -1) {
4257 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4258 44d03001 2019-05-09 stsp goto done;
4261 cf066bf8 2019-05-09 stsp ct->status = status;
4262 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4263 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4264 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4265 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4266 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4267 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4268 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4269 b416585c 2019-05-13 stsp goto done;
4271 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4272 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4273 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4274 f0b75401 2019-08-03 stsp goto done;
4277 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4278 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4279 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4280 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4281 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4282 036813ee 2019-05-09 stsp goto done;
4285 24519714 2019-05-09 stsp ct->path = strdup(path);
4286 24519714 2019-05-09 stsp if (ct->path == NULL) {
4287 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4288 24519714 2019-05-09 stsp goto done;
4290 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4292 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4293 ed175427 2019-05-09 stsp free_commitable(ct);
4294 24519714 2019-05-09 stsp free(parent_path);
4295 036813ee 2019-05-09 stsp free(path);
4296 a129376b 2019-03-28 stsp return err;
4299 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4300 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4301 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4302 036813ee 2019-05-09 stsp struct got_repository *);
4304 ed175427 2019-05-09 stsp static const struct got_error *
4305 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4306 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4307 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4308 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4309 afa376bf 2019-05-09 stsp struct got_repository *repo)
4311 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4312 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4313 036813ee 2019-05-09 stsp char *subpath;
4315 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4316 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4317 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4319 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4321 ed175427 2019-05-09 stsp return err;
4323 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4324 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4325 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4326 036813ee 2019-05-09 stsp free(subpath);
4327 036813ee 2019-05-09 stsp return err;
4330 036813ee 2019-05-09 stsp static const struct got_error *
4331 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4333 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4334 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
4336 036813ee 2019-05-09 stsp *match = 0;
4338 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
4339 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
4340 0f63689d 2019-05-10 stsp return NULL;
4343 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
4345 0f63689d 2019-05-10 stsp return err;
4346 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
4347 036813ee 2019-05-09 stsp free(ct_parent_path);
4348 036813ee 2019-05-09 stsp return err;
4351 768aea60 2019-05-09 stsp static mode_t
4352 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
4354 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
4355 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
4357 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
4360 036813ee 2019-05-09 stsp static const struct got_error *
4361 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
4362 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
4364 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4366 036813ee 2019-05-09 stsp *new_te = NULL;
4368 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
4370 036813ee 2019-05-09 stsp goto done;
4372 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4374 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
4375 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4376 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4378 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4380 036813ee 2019-05-09 stsp if (err && *new_te) {
4381 56e0773d 2019-11-28 stsp free(*new_te);
4382 036813ee 2019-05-09 stsp *new_te = NULL;
4384 036813ee 2019-05-09 stsp return err;
4387 036813ee 2019-05-09 stsp static const struct got_error *
4388 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
4389 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
4391 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4392 036813ee 2019-05-09 stsp char *ct_name;
4394 036813ee 2019-05-09 stsp *new_te = NULL;
4396 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
4397 036813ee 2019-05-09 stsp if (*new_te == NULL)
4398 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4400 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
4401 036813ee 2019-05-09 stsp if (ct_name == NULL) {
4402 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
4403 036813ee 2019-05-09 stsp goto done;
4405 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
4406 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
4407 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4408 036813ee 2019-05-09 stsp goto done;
4411 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4413 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
4414 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4415 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4417 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4419 036813ee 2019-05-09 stsp if (err && *new_te) {
4420 56e0773d 2019-11-28 stsp free(*new_te);
4421 036813ee 2019-05-09 stsp *new_te = NULL;
4423 036813ee 2019-05-09 stsp return err;
4426 036813ee 2019-05-09 stsp static const struct got_error *
4427 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
4428 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
4430 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4431 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
4433 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
4435 036813ee 2019-05-09 stsp return err;
4436 036813ee 2019-05-09 stsp if (new_pe == NULL)
4437 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
4438 036813ee 2019-05-09 stsp return NULL;
4441 afa376bf 2019-05-09 stsp static const struct got_error *
4442 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
4443 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
4445 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
4446 5f8a88c6 2019-08-03 stsp unsigned char status;
4448 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
4449 afa376bf 2019-05-09 stsp ct_path++;
4451 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
4452 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
4454 5f8a88c6 2019-08-03 stsp status = ct->status;
4456 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
4457 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
4460 036813ee 2019-05-09 stsp static const struct got_error *
4461 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
4462 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
4464 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
4465 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
4466 44d03001 2019-05-09 stsp char *te_path;
4468 44d03001 2019-05-09 stsp *modified = 0;
4470 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
4471 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
4472 44d03001 2019-05-09 stsp te->name) == -1)
4473 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4475 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4476 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4477 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
4478 44d03001 2019-05-09 stsp strlen(te_path));
4479 44d03001 2019-05-09 stsp if (*modified)
4483 44d03001 2019-05-09 stsp free(te_path);
4484 44d03001 2019-05-09 stsp return err;
4487 44d03001 2019-05-09 stsp static const struct got_error *
4488 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
4489 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
4490 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
4492 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4493 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4495 036813ee 2019-05-09 stsp *ctp = NULL;
4497 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4498 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4499 036813ee 2019-05-09 stsp char *ct_name = NULL;
4500 036813ee 2019-05-09 stsp int path_matches;
4502 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
4503 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
4504 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
4505 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
4508 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
4509 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
4513 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
4516 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
4518 036813ee 2019-05-09 stsp return err;
4519 036813ee 2019-05-09 stsp if (!path_matches)
4522 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
4523 036813ee 2019-05-09 stsp if (ct_name == NULL)
4524 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
4526 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
4529 036813ee 2019-05-09 stsp *ctp = ct;
4533 2b496619 2019-07-10 stsp return err;
4536 2b496619 2019-07-10 stsp static const struct got_error *
4537 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
4538 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
4539 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
4540 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
4541 2b496619 2019-07-10 stsp struct got_repository *repo)
4543 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
4544 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
4545 2b496619 2019-07-10 stsp char *subtree_path;
4546 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
4547 ba580f68 2020-03-22 stsp int nentries;
4549 2b496619 2019-07-10 stsp *new_tep = NULL;
4551 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
4552 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
4553 2b496619 2019-07-10 stsp child_path) == -1)
4554 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
4556 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
4557 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
4558 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
4559 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
4561 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4562 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
4563 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4564 2b496619 2019-07-10 stsp goto done;
4566 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
4567 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
4568 2b496619 2019-07-10 stsp if (err) {
4569 56e0773d 2019-11-28 stsp free(new_te);
4570 2b496619 2019-07-10 stsp goto done;
4572 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
4575 2b496619 2019-07-10 stsp free(subtree_path);
4576 2b496619 2019-07-10 stsp if (err == NULL)
4577 2b496619 2019-07-10 stsp *new_tep = new_te;
4578 036813ee 2019-05-09 stsp return err;
4581 036813ee 2019-05-09 stsp static const struct got_error *
4582 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
4583 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
4584 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4585 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4586 036813ee 2019-05-09 stsp struct got_repository *repo)
4588 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4589 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
4590 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
4591 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4593 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
4594 ba580f68 2020-03-22 stsp *nentries = 0;
4596 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
4597 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4598 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4599 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
4601 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
4602 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
4603 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
4606 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
4607 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
4610 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4611 036813ee 2019-05-09 stsp pe->path);
4613 036813ee 2019-05-09 stsp goto done;
4615 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
4616 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
4617 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
4619 036813ee 2019-05-09 stsp goto done;
4620 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
4622 afa376bf 2019-05-09 stsp goto done;
4623 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
4624 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4626 2f51b5b3 2019-05-09 stsp goto done;
4627 ba580f68 2020-03-22 stsp (*nentries)++;
4629 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
4630 2b496619 2019-07-10 stsp if (base_tree == NULL ||
4631 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
4632 2b496619 2019-07-10 stsp == NULL) {
4633 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
4634 2b496619 2019-07-10 stsp child_path, path_base_tree,
4635 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
4638 2b496619 2019-07-10 stsp goto done;
4639 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4641 2b496619 2019-07-10 stsp goto done;
4642 ba580f68 2020-03-22 stsp (*nentries)++;
4647 2f51b5b3 2019-05-09 stsp if (base_tree) {
4648 56e0773d 2019-11-28 stsp int i, nbase_entries;
4649 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
4650 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
4651 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
4652 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4654 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
4655 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
4656 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
4657 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
4659 63c5ca5d 2019-08-24 stsp goto done;
4660 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
4662 63c5ca5d 2019-08-24 stsp goto done;
4663 ba580f68 2020-03-22 stsp (*nentries)++;
4667 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
4668 44d03001 2019-05-09 stsp int modified;
4669 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4671 036813ee 2019-05-09 stsp goto done;
4672 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
4673 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
4675 2f51b5b3 2019-05-09 stsp goto done;
4676 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
4677 44d03001 2019-05-09 stsp if (modified) {
4678 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
4679 ba580f68 2020-03-22 stsp int nsubentries;
4680 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
4681 ba580f68 2020-03-22 stsp &nsubentries, te,
4682 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
4683 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
4685 44d03001 2019-05-09 stsp goto done;
4686 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
4687 ba580f68 2020-03-22 stsp /* All entries were deleted. */
4688 ba580f68 2020-03-22 stsp free(new_id);
4691 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
4692 56e0773d 2019-11-28 stsp sizeof(new_te->id));
4693 56e0773d 2019-11-28 stsp free(new_id);
4695 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4697 036813ee 2019-05-09 stsp goto done;
4698 ba580f68 2020-03-22 stsp (*nentries)++;
4702 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
4703 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
4705 f66c734c 2019-09-22 stsp goto done;
4707 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
4708 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
4709 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
4710 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4711 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
4712 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
4714 2f51b5b3 2019-05-09 stsp goto done;
4715 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4717 2f51b5b3 2019-05-09 stsp goto done;
4718 ba580f68 2020-03-22 stsp (*nentries)++;
4720 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
4721 b416585c 2019-05-13 stsp status_arg);
4723 afa376bf 2019-05-09 stsp goto done;
4725 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
4726 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4728 2f51b5b3 2019-05-09 stsp goto done;
4729 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4731 2f51b5b3 2019-05-09 stsp goto done;
4732 ba580f68 2020-03-22 stsp (*nentries)++;
4737 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
4738 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
4740 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
4741 ed175427 2019-05-09 stsp return err;
4744 ebf99748 2019-05-09 stsp static const struct got_error *
4745 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4746 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4747 72fd46fa 2019-09-06 stsp int have_staged_files)
4749 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
4750 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
4752 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4753 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
4754 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4756 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4758 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
4759 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
4760 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
4761 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
4762 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4763 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
4764 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
4765 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
4766 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
4767 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4768 72fd46fa 2019-09-06 stsp !have_staged_files);
4770 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
4771 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
4772 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4773 72fd46fa 2019-09-06 stsp !have_staged_files);
4775 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
4778 3969253a 2020-03-07 stsp err = got_fileindex_entry_update(ie, ct->ondisk_path,
4779 3969253a 2020-03-07 stsp ct->blob_id->sha1, new_base_commit_id->sha1, 1);
4780 3969253a 2020-03-07 stsp if (err) {
4781 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
4784 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
4785 3969253a 2020-03-07 stsp if (err) {
4786 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
4791 d56d26ce 2019-05-10 stsp return err;
4795 d56d26ce 2019-05-10 stsp static const struct got_error *
4796 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
4797 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
4798 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
4799 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
4800 735ef5ac 2019-08-03 stsp int ood_errcode)
4802 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
4803 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
4805 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4806 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
4807 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4808 1a36436d 2019-06-10 stsp return NULL;
4810 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
4811 9bead371 2019-07-28 stsp * on matches file content in the branch head.
4813 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4814 735ef5ac 2019-08-03 stsp in_repo_path);
4815 9bead371 2019-07-28 stsp if (err) {
4816 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
4817 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
4818 1a36436d 2019-06-10 stsp goto done;
4819 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
4820 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
4822 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
4823 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4824 735ef5ac 2019-08-03 stsp in_repo_path);
4825 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4826 1a36436d 2019-06-10 stsp goto done;
4827 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
4831 1a36436d 2019-06-10 stsp return err;
4834 c4296144 2019-05-09 stsp const struct got_error *
4835 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
4836 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
4837 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
4838 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
4839 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4840 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4841 afa376bf 2019-05-09 stsp struct got_repository *repo)
4843 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4844 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
4845 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
4846 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
4847 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
4848 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
4849 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
4850 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
4851 ba580f68 2020-03-22 stsp int nentries;
4852 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
4853 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
4854 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
4856 c4296144 2019-05-09 stsp *new_commit_id = NULL;
4858 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
4860 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4862 588edf97 2019-05-10 stsp goto done;
4864 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4866 588edf97 2019-05-10 stsp goto done;
4868 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4869 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4874 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4875 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4879 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4880 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4881 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4882 cf066bf8 2019-05-09 stsp char *ondisk_path;
4884 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4885 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4886 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4889 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4890 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
4891 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
4894 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4895 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4896 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4897 cf066bf8 2019-05-09 stsp goto done;
4899 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4900 bd6aa359 2020-07-23 stsp if (err) {
4901 bd6aa359 2020-07-23 stsp free(ondisk_path);
4902 cf066bf8 2019-05-09 stsp goto done;
4906 bd6aa359 2020-07-23 stsp * When comitting a symlink we convert "bad" symlinks (those
4907 bd6aa359 2020-07-23 stsp * which point outside the work tree or into .got) to regular
4908 bd6aa359 2020-07-23 stsp * files. This way, the post-commit work tree state matches
4909 bd6aa359 2020-07-23 stsp * a fresh checkout of the tree which was committed.
4911 bd6aa359 2020-07-23 stsp if (S_ISLNK(get_ct_file_mode(ct))) {
4912 bd6aa359 2020-07-23 stsp struct got_blob_object *blob;
4913 bd6aa359 2020-07-23 stsp err = got_object_open_as_blob(&blob, repo, ct->blob_id,
4914 bd6aa359 2020-07-23 stsp PATH_MAX);
4915 bd6aa359 2020-07-23 stsp if (err) {
4916 bd6aa359 2020-07-23 stsp free(ondisk_path);
4917 bd6aa359 2020-07-23 stsp goto done;
4919 bd6aa359 2020-07-23 stsp err = install_symlink(worktree, ondisk_path, ct->path,
4920 bd6aa359 2020-07-23 stsp get_ct_file_mode(ct), GOT_DEFAULT_FILE_MODE, blob,
4921 bd6aa359 2020-07-23 stsp 0, 0, repo, NULL, NULL);
4922 bd6aa359 2020-07-23 stsp got_object_blob_close(blob);
4923 bd6aa359 2020-07-23 stsp if (err) {
4924 bd6aa359 2020-07-23 stsp free(ondisk_path);
4925 bd6aa359 2020-07-23 stsp goto done;
4928 bd6aa359 2020-07-23 stsp free(ondisk_path);
4931 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4932 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
4933 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4935 036813ee 2019-05-09 stsp goto done;
4937 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4939 de18fc63 2019-05-09 stsp goto done;
4940 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4941 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4942 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4943 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4944 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4945 33ad4cbe 2019-05-12 jcs free(logmsg);
4947 9d40349a 2019-05-09 stsp goto done;
4949 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4950 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4951 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4952 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4953 09f5bd90 2019-05-09 stsp goto done;
4955 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4956 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4958 09f5bd90 2019-05-09 stsp goto done;
4959 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4961 ebf99748 2019-05-09 stsp goto done;
4962 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4963 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4964 09f5bd90 2019-05-09 stsp goto done;
4966 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4967 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4969 f2c16586 2019-05-09 stsp goto done;
4970 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4972 f2c16586 2019-05-09 stsp goto done;
4974 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4976 09f5bd90 2019-05-09 stsp goto done;
4978 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4980 ebf99748 2019-05-09 stsp goto done;
4982 588edf97 2019-05-10 stsp if (head_tree)
4983 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4984 588edf97 2019-05-10 stsp if (head_commit)
4985 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4986 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4987 2f17228e 2019-05-12 stsp if (head_ref2) {
4988 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4989 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4990 2f17228e 2019-05-12 stsp err = unlockerr;
4991 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4993 39cd0ff6 2019-07-12 stsp return err;
4996 5c1e53bc 2019-07-28 stsp static const struct got_error *
4997 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4998 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5000 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5001 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5003 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5004 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5005 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5007 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5008 5c1e53bc 2019-07-28 stsp ct_path++;
5010 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5011 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5015 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5016 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5018 5c1e53bc 2019-07-28 stsp return NULL;
5021 f0b75401 2019-08-03 stsp static const struct got_error *
5022 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5024 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5026 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5027 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5028 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5031 f0b75401 2019-08-03 stsp return NULL;
5034 5f8a88c6 2019-08-03 stsp static const struct got_error *
5035 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5036 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5038 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5039 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5041 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5042 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5044 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5045 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5046 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5047 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5048 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5049 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5052 5f8a88c6 2019-08-03 stsp return NULL;
5055 39cd0ff6 2019-07-12 stsp const struct got_error *
5056 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5057 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5058 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
5059 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5060 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5061 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5063 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5064 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5065 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5066 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5067 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5068 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5069 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5070 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5071 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5073 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5075 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5077 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5079 39cd0ff6 2019-07-12 stsp goto done;
5081 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5083 39cd0ff6 2019-07-12 stsp goto done;
5085 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5087 39cd0ff6 2019-07-12 stsp goto done;
5089 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5091 39cd0ff6 2019-07-12 stsp goto done;
5093 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5094 5f8a88c6 2019-08-03 stsp &have_staged_files);
5095 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5096 5f8a88c6 2019-08-03 stsp goto done;
5097 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5098 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5100 5f8a88c6 2019-08-03 stsp goto done;
5103 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5104 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5105 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5106 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5107 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5108 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5109 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5111 5c1e53bc 2019-07-28 stsp goto done;
5114 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5115 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5116 39cd0ff6 2019-07-12 stsp goto done;
5119 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5120 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5122 5c1e53bc 2019-07-28 stsp goto done;
5125 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5126 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5127 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5129 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5130 f0b75401 2019-08-03 stsp ct_path++;
5131 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5132 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5133 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5135 b50cabdf 2019-07-12 stsp goto done;
5139 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5140 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
5141 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5143 39cd0ff6 2019-07-12 stsp goto done;
5145 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5146 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
5147 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5148 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5149 39cd0ff6 2019-07-12 stsp err = sync_err;
5151 39cd0ff6 2019-07-12 stsp if (fileindex)
5152 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5153 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5154 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5155 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5156 39cd0ff6 2019-07-12 stsp err = unlockerr;
5157 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5158 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5159 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5161 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5162 c4296144 2019-05-09 stsp return err;
5165 8656d6c4 2019-05-20 stsp const char *
5166 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5168 8656d6c4 2019-05-20 stsp return ct->path;
5171 8656d6c4 2019-05-20 stsp unsigned int
5172 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5174 8656d6c4 2019-05-20 stsp return ct->status;
5177 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5178 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5179 818c7501 2019-07-11 stsp struct got_repository *repo;
5182 818c7501 2019-07-11 stsp static const struct got_error *
5183 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5185 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5186 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5187 818c7501 2019-07-11 stsp unsigned char status;
5188 818c7501 2019-07-11 stsp struct stat sb;
5189 818c7501 2019-07-11 stsp char *ondisk_path;
5191 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5192 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5193 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5194 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5196 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5198 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5200 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5201 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5202 818c7501 2019-07-11 stsp free(ondisk_path);
5204 818c7501 2019-07-11 stsp return err;
5206 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5207 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5208 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5209 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5211 818c7501 2019-07-11 stsp return NULL;
5214 818c7501 2019-07-11 stsp const struct got_error *
5215 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5216 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5217 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5218 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5220 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5221 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5222 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5223 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5224 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5225 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5226 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5228 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5229 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5230 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5232 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5234 818c7501 2019-07-11 stsp return err;
5236 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5238 818c7501 2019-07-11 stsp goto done;
5240 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5241 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5242 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5245 818c7501 2019-07-11 stsp goto done;
5247 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5249 818c7501 2019-07-11 stsp goto done;
5251 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5253 818c7501 2019-07-11 stsp goto done;
5255 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5257 818c7501 2019-07-11 stsp goto done;
5259 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5262 e51d7b55 2020-01-04 stsp goto done;
5264 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5266 818c7501 2019-07-11 stsp goto done;
5267 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5268 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5269 e51d7b55 2020-01-04 stsp goto done;
5272 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5273 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5275 818c7501 2019-07-11 stsp goto done;
5276 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5278 818c7501 2019-07-11 stsp goto done;
5280 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5282 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5284 818c7501 2019-07-11 stsp goto done;
5286 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5288 818c7501 2019-07-11 stsp goto done;
5290 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5291 818c7501 2019-07-11 stsp worktree->base_commit_id);
5293 818c7501 2019-07-11 stsp goto done;
5294 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5296 818c7501 2019-07-11 stsp goto done;
5298 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5300 818c7501 2019-07-11 stsp goto done;
5302 818c7501 2019-07-11 stsp free(fileindex_path);
5303 818c7501 2019-07-11 stsp free(tmp_branch_name);
5304 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5305 818c7501 2019-07-11 stsp free(branch_ref_name);
5306 818c7501 2019-07-11 stsp if (branch_ref)
5307 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5308 818c7501 2019-07-11 stsp if (wt_branch)
5309 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5310 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5311 818c7501 2019-07-11 stsp if (err) {
5312 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5313 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5314 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5316 818c7501 2019-07-11 stsp if (*tmp_branch) {
5317 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5318 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5320 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5321 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5322 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5324 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5326 818c7501 2019-07-11 stsp return err;
5329 818c7501 2019-07-11 stsp const struct got_error *
5330 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
5331 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
5332 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
5333 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
5335 818c7501 2019-07-11 stsp const struct got_error *err;
5336 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
5337 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5338 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
5339 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5340 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5342 818c7501 2019-07-11 stsp *commit_id = NULL;
5343 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
5344 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
5345 3e3a69f1 2019-07-25 stsp *branch = NULL;
5346 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5348 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5350 3e3a69f1 2019-07-25 stsp return err;
5352 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5354 f032f1f7 2019-08-04 stsp goto done;
5356 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5357 f032f1f7 2019-08-04 stsp &have_staged_files);
5358 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5359 f032f1f7 2019-08-04 stsp goto done;
5360 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5361 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5362 3e3a69f1 2019-07-25 stsp goto done;
5365 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5367 f032f1f7 2019-08-04 stsp goto done;
5369 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5371 818c7501 2019-07-11 stsp goto done;
5373 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5375 818c7501 2019-07-11 stsp goto done;
5377 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5379 818c7501 2019-07-11 stsp goto done;
5381 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
5383 818c7501 2019-07-11 stsp goto done;
5385 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
5386 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
5388 818c7501 2019-07-11 stsp goto done;
5390 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5392 818c7501 2019-07-11 stsp goto done;
5394 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5396 818c7501 2019-07-11 stsp goto done;
5398 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
5399 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
5401 818c7501 2019-07-11 stsp goto done;
5403 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5405 818c7501 2019-07-11 stsp goto done;
5407 818c7501 2019-07-11 stsp free(commit_ref_name);
5408 818c7501 2019-07-11 stsp free(branch_ref_name);
5409 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5410 818c7501 2019-07-11 stsp if (commit_ref)
5411 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5412 818c7501 2019-07-11 stsp if (branch_ref)
5413 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5414 818c7501 2019-07-11 stsp if (err) {
5415 818c7501 2019-07-11 stsp free(*commit_id);
5416 818c7501 2019-07-11 stsp *commit_id = NULL;
5417 818c7501 2019-07-11 stsp if (*tmp_branch) {
5418 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5419 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5421 818c7501 2019-07-11 stsp if (*new_base_branch) {
5422 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
5423 818c7501 2019-07-11 stsp *new_base_branch = NULL;
5425 818c7501 2019-07-11 stsp if (*branch) {
5426 818c7501 2019-07-11 stsp got_ref_close(*branch);
5427 818c7501 2019-07-11 stsp *branch = NULL;
5429 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5430 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5431 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5433 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
5435 818c7501 2019-07-11 stsp return err;
5438 818c7501 2019-07-11 stsp const struct got_error *
5439 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
5441 818c7501 2019-07-11 stsp const struct got_error *err;
5442 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
5444 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5446 818c7501 2019-07-11 stsp return err;
5448 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5449 818c7501 2019-07-11 stsp free(tmp_branch_name);
5450 818c7501 2019-07-11 stsp return NULL;
5453 818c7501 2019-07-11 stsp static const struct got_error *
5454 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
5455 818c7501 2019-07-11 stsp char **logmsg, void *arg)
5457 0ebf8283 2019-07-24 stsp *logmsg = arg;
5458 818c7501 2019-07-11 stsp return NULL;
5461 818c7501 2019-07-11 stsp static const struct got_error *
5462 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
5463 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
5464 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5465 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
5467 818c7501 2019-07-11 stsp return NULL;
5470 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
5471 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
5472 01757395 2019-07-12 stsp void *progress_arg;
5473 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
5476 01757395 2019-07-12 stsp static const struct got_error *
5477 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
5479 01757395 2019-07-12 stsp const struct got_error *err;
5480 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
5482 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
5484 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
5486 01757395 2019-07-12 stsp return err;
5488 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
5489 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
5490 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
5491 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
5492 01757395 2019-07-12 stsp return NULL;
5494 01757395 2019-07-12 stsp p = strdup(path);
5495 01757395 2019-07-12 stsp if (p == NULL)
5496 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
5498 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
5499 01757395 2019-07-12 stsp if (err || new == NULL)
5501 01757395 2019-07-12 stsp return err;
5505 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
5507 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5509 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
5510 01757395 2019-07-12 stsp free((char *)pe->path);
5512 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
5515 0ebf8283 2019-07-24 stsp static const struct got_error *
5516 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
5517 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
5519 818c7501 2019-07-11 stsp const struct got_error *err;
5520 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
5522 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5523 818c7501 2019-07-11 stsp if (err) {
5524 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
5525 818c7501 2019-07-11 stsp goto done;
5526 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
5528 818c7501 2019-07-11 stsp goto done;
5529 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
5531 818c7501 2019-07-11 stsp goto done;
5532 de05890f 2020-03-05 stsp } else if (is_rebase) {
5533 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
5536 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
5538 818c7501 2019-07-11 stsp goto done;
5539 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
5540 818c7501 2019-07-11 stsp free(stored_id);
5541 818c7501 2019-07-11 stsp if (cmp != 0) {
5542 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5543 818c7501 2019-07-11 stsp goto done;
5547 0ebf8283 2019-07-24 stsp if (commit_ref)
5548 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5549 0ebf8283 2019-07-24 stsp return err;
5552 0ebf8283 2019-07-24 stsp static const struct got_error *
5553 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
5554 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
5555 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
5556 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
5557 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5558 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5560 0ebf8283 2019-07-24 stsp const struct got_error *err;
5561 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5562 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
5563 3e3a69f1 2019-07-25 stsp char *fileindex_path;
5565 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5567 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5569 0ebf8283 2019-07-24 stsp return err;
5571 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
5572 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
5573 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
5574 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
5575 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
5576 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
5577 818c7501 2019-07-11 stsp if (commit_ref)
5578 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5579 818c7501 2019-07-11 stsp return err;
5582 818c7501 2019-07-11 stsp const struct got_error *
5583 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
5584 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5585 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5586 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5587 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5588 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5590 0ebf8283 2019-07-24 stsp const struct got_error *err;
5591 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5593 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5595 0ebf8283 2019-07-24 stsp return err;
5597 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
5599 0ebf8283 2019-07-24 stsp goto done;
5601 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5602 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5603 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5605 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5606 0ebf8283 2019-07-24 stsp return err;
5609 0ebf8283 2019-07-24 stsp const struct got_error *
5610 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
5611 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5612 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5613 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5614 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5615 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5617 0ebf8283 2019-07-24 stsp const struct got_error *err;
5618 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5620 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5622 0ebf8283 2019-07-24 stsp return err;
5624 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
5626 0ebf8283 2019-07-24 stsp goto done;
5628 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5629 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5630 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5632 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5633 0ebf8283 2019-07-24 stsp return err;
5636 0ebf8283 2019-07-24 stsp static const struct got_error *
5637 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
5638 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
5639 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5640 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
5641 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
5643 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
5644 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5645 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5646 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5647 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
5648 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5649 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
5651 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5652 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
5654 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5656 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5658 3e3a69f1 2019-07-25 stsp return err;
5660 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5661 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
5662 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
5663 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
5665 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
5666 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
5667 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
5668 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
5670 01757395 2019-07-12 stsp if (merged_paths) {
5671 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5672 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
5673 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
5674 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
5677 01757395 2019-07-12 stsp goto done;
5680 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5681 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5683 01757395 2019-07-12 stsp goto done;
5686 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5687 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
5688 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5690 a0e95631 2019-07-12 stsp goto done;
5691 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5692 a0e95631 2019-07-12 stsp goto done;
5695 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5697 edd02c5e 2019-07-11 stsp goto done;
5699 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5701 818c7501 2019-07-11 stsp goto done;
5703 5943eee2 2019-08-13 stsp if (new_logmsg) {
5704 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
5705 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
5706 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5707 5943eee2 2019-08-13 stsp goto done;
5710 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
5712 5943eee2 2019-08-13 stsp goto done;
5715 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
5716 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
5717 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
5718 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
5719 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5721 a0e95631 2019-07-12 stsp goto done;
5723 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
5725 a0e95631 2019-07-12 stsp goto done;
5727 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5729 a0e95631 2019-07-12 stsp goto done;
5731 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5732 72fd46fa 2019-09-06 stsp fileindex, 0);
5733 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5734 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
5735 a0e95631 2019-07-12 stsp err = sync_err;
5737 a0e95631 2019-07-12 stsp free(fileindex_path);
5738 a0e95631 2019-07-12 stsp free(head_commit_id);
5739 a0e95631 2019-07-12 stsp if (head_ref)
5740 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
5741 818c7501 2019-07-11 stsp if (err) {
5742 818c7501 2019-07-11 stsp free(*new_commit_id);
5743 818c7501 2019-07-11 stsp *new_commit_id = NULL;
5745 818c7501 2019-07-11 stsp return err;
5748 818c7501 2019-07-11 stsp const struct got_error *
5749 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5750 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5751 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5752 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5753 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
5755 0ebf8283 2019-07-24 stsp const struct got_error *err;
5756 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5757 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5758 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5760 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5762 0ebf8283 2019-07-24 stsp return err;
5764 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5766 0ebf8283 2019-07-24 stsp goto done;
5767 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5769 0ebf8283 2019-07-24 stsp goto done;
5770 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5771 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5772 0ebf8283 2019-07-24 stsp goto done;
5775 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5776 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5778 0ebf8283 2019-07-24 stsp if (commit_ref)
5779 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5780 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5781 0ebf8283 2019-07-24 stsp free(commit_id);
5782 0ebf8283 2019-07-24 stsp return err;
5785 0ebf8283 2019-07-24 stsp const struct got_error *
5786 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5787 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5788 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5789 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5790 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
5791 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5793 0ebf8283 2019-07-24 stsp const struct got_error *err;
5794 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5795 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5797 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5799 0ebf8283 2019-07-24 stsp return err;
5801 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5803 0ebf8283 2019-07-24 stsp goto done;
5805 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5806 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5808 0ebf8283 2019-07-24 stsp if (commit_ref)
5809 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5810 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5811 0ebf8283 2019-07-24 stsp return err;
5814 0ebf8283 2019-07-24 stsp const struct got_error *
5815 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
5816 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5818 3e3a69f1 2019-07-25 stsp if (fileindex)
5819 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5820 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
5823 69844fba 2019-07-11 stsp static const struct got_error *
5824 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
5826 69844fba 2019-07-11 stsp const struct got_error *err;
5827 69844fba 2019-07-11 stsp struct got_reference *ref;
5829 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
5830 69844fba 2019-07-11 stsp if (err) {
5831 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
5832 69844fba 2019-07-11 stsp return NULL;
5833 69844fba 2019-07-11 stsp return err;
5836 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
5837 69844fba 2019-07-11 stsp got_ref_close(ref);
5838 69844fba 2019-07-11 stsp return err;
5841 69844fba 2019-07-11 stsp static const struct got_error *
5842 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5844 69844fba 2019-07-11 stsp const struct got_error *err;
5845 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5846 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5848 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5850 69844fba 2019-07-11 stsp goto done;
5851 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
5853 69844fba 2019-07-11 stsp goto done;
5855 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5857 69844fba 2019-07-11 stsp goto done;
5858 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
5860 69844fba 2019-07-11 stsp goto done;
5862 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5864 69844fba 2019-07-11 stsp goto done;
5865 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
5867 69844fba 2019-07-11 stsp goto done;
5869 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5871 69844fba 2019-07-11 stsp goto done;
5872 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
5874 69844fba 2019-07-11 stsp goto done;
5877 69844fba 2019-07-11 stsp free(tmp_branch_name);
5878 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
5879 69844fba 2019-07-11 stsp free(branch_ref_name);
5880 69844fba 2019-07-11 stsp free(commit_ref_name);
5881 69844fba 2019-07-11 stsp return err;
5884 818c7501 2019-07-11 stsp const struct got_error *
5885 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
5886 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5887 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5888 818c7501 2019-07-11 stsp struct got_repository *repo)
5890 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
5891 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
5893 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5895 818c7501 2019-07-11 stsp return err;
5897 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5899 818c7501 2019-07-11 stsp goto done;
5901 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5903 818c7501 2019-07-11 stsp goto done;
5905 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5907 818c7501 2019-07-11 stsp goto done;
5909 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5911 3e3a69f1 2019-07-25 stsp if (fileindex)
5912 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5913 818c7501 2019-07-11 stsp free(new_head_commit_id);
5914 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5915 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5916 818c7501 2019-07-11 stsp err = unlockerr;
5917 818c7501 2019-07-11 stsp return err;
5920 818c7501 2019-07-11 stsp const struct got_error *
5921 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5922 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5923 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5924 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5926 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5927 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5928 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5929 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5930 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5931 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5933 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5935 818c7501 2019-07-11 stsp return err;
5937 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5938 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5940 818c7501 2019-07-11 stsp goto done;
5942 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5944 818c7501 2019-07-11 stsp goto done;
5947 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5948 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5949 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5951 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5953 818c7501 2019-07-11 stsp goto done;
5955 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5957 818c7501 2019-07-11 stsp goto done;
5959 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5960 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5962 ca355955 2019-07-12 stsp goto done;
5964 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5966 ca355955 2019-07-12 stsp goto done;
5968 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5970 818c7501 2019-07-11 stsp goto done;
5972 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5973 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5974 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5975 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5976 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5977 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5978 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5979 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5980 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5982 1f1abb7e 2019-08-08 stsp goto sync;
5984 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5985 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5987 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5988 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5989 ca355955 2019-07-12 stsp err = sync_err;
5991 818c7501 2019-07-11 stsp got_ref_close(resolved);
5992 a3a2faf2 2019-07-12 stsp free(tree_id);
5993 818c7501 2019-07-11 stsp free(commit_id);
5994 0ebf8283 2019-07-24 stsp if (fileindex)
5995 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5996 0ebf8283 2019-07-24 stsp free(fileindex_path);
5998 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5999 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6000 0ebf8283 2019-07-24 stsp err = unlockerr;
6001 0ebf8283 2019-07-24 stsp return err;
6004 0ebf8283 2019-07-24 stsp const struct got_error *
6005 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6006 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6007 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6008 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6010 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6011 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6012 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6013 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6014 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6015 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6016 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6017 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6019 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6020 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6021 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6022 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6024 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6026 0ebf8283 2019-07-24 stsp return err;
6028 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6030 0ebf8283 2019-07-24 stsp goto done;
6032 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6033 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6034 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6037 0ebf8283 2019-07-24 stsp goto done;
6039 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6041 0ebf8283 2019-07-24 stsp goto done;
6043 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6045 0ebf8283 2019-07-24 stsp goto done;
6047 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6048 0ebf8283 2019-07-24 stsp worktree);
6050 0ebf8283 2019-07-24 stsp goto done;
6052 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6055 0ebf8283 2019-07-24 stsp goto done;
6057 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6059 0ebf8283 2019-07-24 stsp goto done;
6061 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6063 0ebf8283 2019-07-24 stsp goto done;
6065 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6066 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6068 0ebf8283 2019-07-24 stsp goto done;
6069 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6071 0ebf8283 2019-07-24 stsp goto done;
6072 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6073 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6074 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6075 0ebf8283 2019-07-24 stsp goto done;
6078 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6079 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6081 0ebf8283 2019-07-24 stsp goto done;
6082 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6084 0ebf8283 2019-07-24 stsp goto done;
6086 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6088 0ebf8283 2019-07-24 stsp goto done;
6090 0ebf8283 2019-07-24 stsp free(fileindex_path);
6091 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6092 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6093 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6094 0ebf8283 2019-07-24 stsp if (wt_branch)
6095 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6096 0ebf8283 2019-07-24 stsp if (err) {
6097 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6098 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6099 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6101 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6102 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6103 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6105 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6106 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6107 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6108 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6110 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6112 0ebf8283 2019-07-24 stsp return err;
6115 0ebf8283 2019-07-24 stsp const struct got_error *
6116 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6117 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6119 3e3a69f1 2019-07-25 stsp if (fileindex)
6120 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6121 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6124 0ebf8283 2019-07-24 stsp const struct got_error *
6125 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6126 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6128 0ebf8283 2019-07-24 stsp const struct got_error *err;
6129 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6131 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6133 0ebf8283 2019-07-24 stsp return err;
6135 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6136 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6137 0ebf8283 2019-07-24 stsp return NULL;
6140 0ebf8283 2019-07-24 stsp const struct got_error *
6141 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6142 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6143 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6144 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6146 0ebf8283 2019-07-24 stsp const struct got_error *err;
6147 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6148 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6149 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6150 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6151 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6152 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6154 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6155 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6156 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6157 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6159 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6161 3e3a69f1 2019-07-25 stsp return err;
6163 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6165 f032f1f7 2019-08-04 stsp goto done;
6167 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6168 f032f1f7 2019-08-04 stsp &have_staged_files);
6169 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6170 f032f1f7 2019-08-04 stsp goto done;
6171 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6172 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6173 3e3a69f1 2019-07-25 stsp goto done;
6176 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6178 f032f1f7 2019-08-04 stsp goto done;
6180 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6182 0ebf8283 2019-07-24 stsp goto done;
6184 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6186 0ebf8283 2019-07-24 stsp goto done;
6188 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6189 0ebf8283 2019-07-24 stsp worktree);
6191 0ebf8283 2019-07-24 stsp goto done;
6193 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6195 0ebf8283 2019-07-24 stsp goto done;
6197 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6199 0ebf8283 2019-07-24 stsp goto done;
6200 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6202 0ebf8283 2019-07-24 stsp goto done;
6204 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6206 0ebf8283 2019-07-24 stsp goto done;
6207 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6209 0ebf8283 2019-07-24 stsp goto done;
6211 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6213 0ebf8283 2019-07-24 stsp goto done;
6215 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6216 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6217 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6218 0ebf8283 2019-07-24 stsp if (commit_ref)
6219 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6220 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6221 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6222 0ebf8283 2019-07-24 stsp if (err) {
6223 0ebf8283 2019-07-24 stsp free(*commit_id);
6224 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6225 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6226 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6227 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6228 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6229 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6231 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6232 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6233 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6235 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6237 0ebf8283 2019-07-24 stsp return err;
6240 0ebf8283 2019-07-24 stsp static const struct got_error *
6241 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6243 0ebf8283 2019-07-24 stsp const struct got_error *err;
6244 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6245 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6247 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6249 0ebf8283 2019-07-24 stsp goto done;
6250 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6252 0ebf8283 2019-07-24 stsp goto done;
6254 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6255 0ebf8283 2019-07-24 stsp worktree);
6257 0ebf8283 2019-07-24 stsp goto done;
6258 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6260 0ebf8283 2019-07-24 stsp goto done;
6262 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6264 0ebf8283 2019-07-24 stsp goto done;
6265 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
6267 0ebf8283 2019-07-24 stsp goto done;
6269 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6271 0ebf8283 2019-07-24 stsp goto done;
6272 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6274 0ebf8283 2019-07-24 stsp goto done;
6276 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6277 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6278 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6279 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6280 0ebf8283 2019-07-24 stsp return err;
6283 0ebf8283 2019-07-24 stsp const struct got_error *
6284 0ebf8283 2019-07-24 stsp got_worktree_histedit_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 *branch, struct got_object_id *base_commit_id,
6287 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6289 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
6290 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6291 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6292 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
6293 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6295 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6297 0ebf8283 2019-07-24 stsp return err;
6299 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6300 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
6302 0ebf8283 2019-07-24 stsp goto done;
6304 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6306 0ebf8283 2019-07-24 stsp goto done;
6308 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
6310 0ebf8283 2019-07-24 stsp goto done;
6312 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
6313 0ebf8283 2019-07-24 stsp worktree->path_prefix);
6315 0ebf8283 2019-07-24 stsp goto done;
6317 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6319 0ebf8283 2019-07-24 stsp goto done;
6321 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6323 0ebf8283 2019-07-24 stsp goto done;
6325 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6326 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6327 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6328 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6329 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6330 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6331 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6332 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
6333 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6335 1f1abb7e 2019-08-08 stsp goto sync;
6337 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6338 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
6340 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6341 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
6342 0ebf8283 2019-07-24 stsp err = sync_err;
6344 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
6345 0ebf8283 2019-07-24 stsp free(tree_id);
6346 818c7501 2019-07-11 stsp free(fileindex_path);
6348 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6349 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6350 818c7501 2019-07-11 stsp err = unlockerr;
6351 818c7501 2019-07-11 stsp return err;
6354 0ebf8283 2019-07-24 stsp const struct got_error *
6355 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
6356 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6357 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
6359 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
6360 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
6361 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6363 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6365 0ebf8283 2019-07-24 stsp return err;
6367 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6368 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
6370 0ebf8283 2019-07-24 stsp goto done;
6372 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
6374 0ebf8283 2019-07-24 stsp goto done;
6376 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
6378 0ebf8283 2019-07-24 stsp goto done;
6380 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6382 0ebf8283 2019-07-24 stsp goto done;
6384 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6386 3e3a69f1 2019-07-25 stsp if (fileindex)
6387 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6388 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
6389 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6390 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6391 0ebf8283 2019-07-24 stsp err = unlockerr;
6392 0ebf8283 2019-07-24 stsp return err;
6395 0ebf8283 2019-07-24 stsp const struct got_error *
6396 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
6397 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6399 0ebf8283 2019-07-24 stsp const struct got_error *err;
6400 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6402 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6404 0ebf8283 2019-07-24 stsp return err;
6406 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6408 0ebf8283 2019-07-24 stsp goto done;
6410 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6412 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6413 2822a352 2019-10-15 stsp return err;
6416 2822a352 2019-10-15 stsp const struct got_error *
6417 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
6418 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
6419 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
6420 2822a352 2019-10-15 stsp struct got_repository *repo)
6422 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
6423 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6424 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
6426 2822a352 2019-10-15 stsp *fileindex = NULL;
6427 2822a352 2019-10-15 stsp *branch_ref = NULL;
6428 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6430 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
6432 2822a352 2019-10-15 stsp return err;
6434 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
6435 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
6436 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
6437 2822a352 2019-10-15 stsp "update -b or different branch name required");
6438 2822a352 2019-10-15 stsp goto done;
6441 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6443 2822a352 2019-10-15 stsp goto done;
6445 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
6446 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
6447 2822a352 2019-10-15 stsp ok_arg.repo = repo;
6448 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6451 2822a352 2019-10-15 stsp goto done;
6453 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
6455 2822a352 2019-10-15 stsp goto done;
6457 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
6458 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
6460 2822a352 2019-10-15 stsp if (err) {
6461 2822a352 2019-10-15 stsp if (*branch_ref) {
6462 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
6463 2822a352 2019-10-15 stsp *branch_ref = NULL;
6465 2822a352 2019-10-15 stsp if (*base_branch_ref) {
6466 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
6467 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
6469 2822a352 2019-10-15 stsp if (*fileindex) {
6470 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
6471 2822a352 2019-10-15 stsp *fileindex = NULL;
6473 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
6475 0cb83759 2019-08-03 stsp return err;
6478 2822a352 2019-10-15 stsp const struct got_error *
6479 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
6480 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6481 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
6482 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6483 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6485 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6486 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
6487 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
6489 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
6491 2822a352 2019-10-15 stsp goto done;
6493 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
6495 2822a352 2019-10-15 stsp goto done;
6497 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
6498 2822a352 2019-10-15 stsp worktree->path_prefix);
6500 2822a352 2019-10-15 stsp goto done;
6502 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6504 2822a352 2019-10-15 stsp goto done;
6506 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
6507 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
6509 2822a352 2019-10-15 stsp goto sync;
6511 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
6513 2822a352 2019-10-15 stsp goto sync;
6515 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
6517 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6518 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
6519 2822a352 2019-10-15 stsp err = sync_err;
6522 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
6523 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6524 2822a352 2019-10-15 stsp err = unlockerr;
6525 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6527 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
6528 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6529 2822a352 2019-10-15 stsp err = unlockerr;
6530 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6532 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
6533 2822a352 2019-10-15 stsp free(fileindex_path);
6534 2822a352 2019-10-15 stsp free(tree_id);
6536 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6537 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6538 2822a352 2019-10-15 stsp err = unlockerr;
6539 2822a352 2019-10-15 stsp return err;
6542 2822a352 2019-10-15 stsp const struct got_error *
6543 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
6544 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6545 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
6547 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
6549 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
6551 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
6553 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
6554 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6555 8b692cd0 2019-10-21 stsp err = unlockerr;
6556 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6558 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
6559 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6560 8b692cd0 2019-10-21 stsp err = unlockerr;
6561 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6563 8b692cd0 2019-10-21 stsp return err;
6566 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
6567 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
6568 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6569 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6570 2db2652d 2019-08-07 stsp struct got_repository *repo;
6571 2db2652d 2019-08-07 stsp int have_changes;
6574 2db2652d 2019-08-07 stsp const struct got_error *
6575 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
6576 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6577 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6578 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6580 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
6581 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
6582 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
6583 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
6584 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
6585 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
6587 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
6588 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
6589 8b13ce36 2019-08-08 stsp return NULL;
6590 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6591 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
6593 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6594 735ef5ac 2019-08-03 stsp if (ie == NULL)
6595 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6597 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
6598 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
6599 735ef5ac 2019-08-03 stsp relpath) == -1)
6600 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
6602 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
6603 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
6604 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6605 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
6608 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
6609 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
6610 3aa5969e 2019-08-06 stsp goto done;
6611 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
6612 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
6613 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
6614 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
6615 735ef5ac 2019-08-03 stsp goto done;
6618 2db2652d 2019-08-07 stsp a->have_changes = 1;
6620 735ef5ac 2019-08-03 stsp p = in_repo_path;
6621 735ef5ac 2019-08-03 stsp while (p[0] == '/')
6623 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
6624 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
6625 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
6627 735ef5ac 2019-08-03 stsp free(in_repo_path);
6628 dc424a06 2019-08-07 stsp return err;
6631 2db2652d 2019-08-07 stsp struct stage_path_arg {
6632 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6633 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6634 2db2652d 2019-08-07 stsp struct got_repository *repo;
6635 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
6636 2db2652d 2019-08-07 stsp void *status_arg;
6637 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
6638 2db2652d 2019-08-07 stsp void *patch_arg;
6639 7b5dc508 2019-10-28 stsp int staged_something;
6642 2db2652d 2019-08-07 stsp static const struct got_error *
6643 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
6644 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6645 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6646 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6648 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
6649 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
6650 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
6651 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
6652 0cb83759 2019-08-03 stsp uint32_t stage;
6653 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
6655 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
6656 8b13ce36 2019-08-08 stsp return NULL;
6658 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6659 d3e7c587 2019-08-03 stsp if (ie == NULL)
6660 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6662 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
6663 2db2652d 2019-08-07 stsp relpath)== -1)
6664 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
6666 0cb83759 2019-08-03 stsp switch (status) {
6667 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
6668 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
6669 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6670 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
6671 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6672 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6673 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
6676 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
6679 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
6680 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
6681 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
6682 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
6683 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
6687 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
6688 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
6691 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
6692 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6693 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
6694 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
6696 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
6697 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6698 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6699 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6701 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6702 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
6703 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
6705 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
6706 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
6708 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6709 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6710 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
6711 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
6714 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6716 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6717 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6721 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
6722 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6723 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6724 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6726 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6727 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
6730 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
6732 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
6733 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6735 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
6736 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
6739 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6743 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
6744 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
6745 dc424a06 2019-08-07 stsp free(path_content);
6746 2db2652d 2019-08-07 stsp free(ondisk_path);
6747 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
6748 0ebf8283 2019-07-24 stsp return err;
6751 0cb83759 2019-08-03 stsp const struct got_error *
6752 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
6753 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
6754 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
6755 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6756 1e71573e 2019-08-03 stsp struct got_repository *repo)
6758 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6759 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
6760 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6761 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
6762 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
6763 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
6764 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
6765 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
6767 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6769 0cb83759 2019-08-03 stsp return err;
6771 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
6772 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
6774 735ef5ac 2019-08-03 stsp goto done;
6775 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6777 735ef5ac 2019-08-03 stsp goto done;
6778 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6780 0cb83759 2019-08-03 stsp goto done;
6782 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
6783 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
6784 2db2652d 2019-08-07 stsp oka.worktree = worktree;
6785 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
6786 2db2652d 2019-08-07 stsp oka.repo = repo;
6787 2db2652d 2019-08-07 stsp oka.have_changes = 0;
6788 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6789 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6790 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
6792 735ef5ac 2019-08-03 stsp goto done;
6794 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
6795 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6796 2db2652d 2019-08-07 stsp goto done;
6799 2db2652d 2019-08-07 stsp spa.worktree = worktree;
6800 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
6801 2db2652d 2019-08-07 stsp spa.repo = repo;
6802 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
6803 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
6804 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
6805 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
6806 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
6807 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6808 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6809 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
6811 2db2652d 2019-08-07 stsp goto done;
6813 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
6814 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6815 7b5dc508 2019-10-28 stsp goto done;
6818 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6819 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
6820 0cb83759 2019-08-03 stsp err = sync_err;
6822 735ef5ac 2019-08-03 stsp if (head_ref)
6823 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
6824 735ef5ac 2019-08-03 stsp free(head_commit_id);
6825 0cb83759 2019-08-03 stsp free(fileindex_path);
6826 0cb83759 2019-08-03 stsp if (fileindex)
6827 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
6828 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6829 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
6830 0cb83759 2019-08-03 stsp err = unlockerr;
6831 0cb83759 2019-08-03 stsp return err;
6834 ad493afc 2019-08-03 stsp struct unstage_path_arg {
6835 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
6836 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
6837 ad493afc 2019-08-03 stsp struct got_repository *repo;
6838 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
6839 ad493afc 2019-08-03 stsp void *progress_arg;
6840 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
6841 2e1f37b0 2019-08-08 stsp void *patch_arg;
6844 2e1f37b0 2019-08-08 stsp static const struct got_error *
6845 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
6846 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
6847 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
6848 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
6849 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
6851 2e1f37b0 2019-08-08 stsp const struct got_error *err;
6852 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
6853 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6854 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6855 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
6856 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
6857 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
6858 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
6859 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
6860 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6861 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
6863 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6864 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6866 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
6868 2e1f37b0 2019-08-08 stsp return err;
6869 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6871 2e1f37b0 2019-08-08 stsp goto done;
6873 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6875 2e1f37b0 2019-08-08 stsp goto done;
6877 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6879 2e1f37b0 2019-08-08 stsp goto done;
6881 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6883 2e1f37b0 2019-08-08 stsp goto done;
6885 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6887 2e1f37b0 2019-08-08 stsp goto done;
6889 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6891 2e1f37b0 2019-08-08 stsp goto done;
6893 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
6894 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
6895 2e1f37b0 2019-08-08 stsp goto done;
6898 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
6899 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
6900 2e1f37b0 2019-08-08 stsp goto done;
6903 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
6904 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6906 2e1f37b0 2019-08-08 stsp goto done;
6908 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
6909 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
6911 2e1f37b0 2019-08-08 stsp goto done;
6912 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
6913 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
6915 2e1f37b0 2019-08-08 stsp goto done;
6917 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
6918 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
6919 2e1f37b0 2019-08-08 stsp goto done;
6921 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
6922 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
6923 2e1f37b0 2019-08-08 stsp goto done;
6925 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6926 2e1f37b0 2019-08-08 stsp int choice;
6927 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
6928 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
6929 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
6930 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
6932 2e1f37b0 2019-08-08 stsp goto done;
6933 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
6934 2e1f37b0 2019-08-08 stsp have_content = 1;
6936 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
6937 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
6940 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
6941 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6942 f1e81a05 2019-08-10 stsp outfile, rejectfile);
6944 2e1f37b0 2019-08-08 stsp free(label1);
6946 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
6947 2e1f37b0 2019-08-08 stsp if (staged_blob)
6948 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
6949 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
6950 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
6951 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
6952 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
6953 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
6954 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
6955 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6956 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
6957 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
6958 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
6959 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
6960 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
6961 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
6962 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
6963 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
6964 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6965 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
6966 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
6967 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6969 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
6970 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
6971 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
6972 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6973 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
6974 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
6975 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6977 2e1f37b0 2019-08-08 stsp free(args);
6979 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
6982 2e1f37b0 2019-08-08 stsp if (changes)
6983 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
6984 2e1f37b0 2019-08-08 stsp free(path1);
6985 2e1f37b0 2019-08-08 stsp free(path2);
6986 2e1f37b0 2019-08-08 stsp return err;
6989 ad493afc 2019-08-03 stsp static const struct got_error *
6990 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
6991 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
6992 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6993 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6995 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
6996 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
6997 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
6998 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6999 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
7000 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
7001 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
7002 ad493afc 2019-08-03 stsp int local_changes_subsumed;
7003 9bc94a15 2019-08-03 stsp struct stat sb;
7005 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
7006 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
7007 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
7008 2e1f37b0 2019-08-08 stsp return NULL;
7010 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7011 ad493afc 2019-08-03 stsp if (ie == NULL)
7012 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7014 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7016 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
7018 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
7019 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
7021 f69721c3 2019-10-21 stsp goto done;
7022 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7023 f69721c3 2019-10-21 stsp id_str) == -1) {
7024 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
7025 f69721c3 2019-10-21 stsp goto done;
7028 ad493afc 2019-08-03 stsp switch (staged_status) {
7029 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
7030 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
7031 ad493afc 2019-08-03 stsp blob_id, 8192);
7034 ad493afc 2019-08-03 stsp /* fall through */
7035 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
7036 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7037 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
7038 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7039 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7040 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7043 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
7046 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
7047 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
7048 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
7049 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
7050 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
7051 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
7053 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
7054 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
7055 2e1f37b0 2019-08-08 stsp &staged_blob_id,
7056 2e1f37b0 2019-08-08 stsp path_new_staged_content,
7060 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
7061 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
7062 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
7064 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
7065 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
7066 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
7067 f69721c3 2019-10-21 stsp path_unstaged_content, label_orig,
7068 f69721c3 2019-10-21 stsp "unstaged", a->repo, a->progress_cb,
7069 f69721c3 2019-10-21 stsp a->progress_arg);
7070 2e1f37b0 2019-08-08 stsp if (err == NULL &&
7071 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
7072 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
7073 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
7074 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
7077 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
7078 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
7081 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
7082 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
7083 f69721c3 2019-10-21 stsp got_fileindex_perms_to_st(ie), label_orig, blob_staged,
7084 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
7085 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
7086 ad493afc 2019-08-03 stsp if (err == NULL)
7087 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
7088 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
7090 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
7091 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7092 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7093 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7094 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7097 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7099 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7100 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7104 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7105 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
7106 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
7109 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
7113 ad493afc 2019-08-03 stsp free(ondisk_path);
7114 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
7115 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
7116 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
7117 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
7118 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
7119 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
7120 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
7121 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
7122 ad493afc 2019-08-03 stsp if (blob_base)
7123 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
7124 ad493afc 2019-08-03 stsp if (blob_staged)
7125 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
7126 f69721c3 2019-10-21 stsp free(id_str);
7127 f69721c3 2019-10-21 stsp free(label_orig);
7128 ad493afc 2019-08-03 stsp return err;
7131 ad493afc 2019-08-03 stsp const struct got_error *
7132 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
7133 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
7134 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7135 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7136 ad493afc 2019-08-03 stsp struct got_repository *repo)
7138 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7139 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7140 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7141 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
7142 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
7144 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7146 ad493afc 2019-08-03 stsp return err;
7148 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7150 ad493afc 2019-08-03 stsp goto done;
7152 ad493afc 2019-08-03 stsp upa.worktree = worktree;
7153 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
7154 ad493afc 2019-08-03 stsp upa.repo = repo;
7155 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
7156 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
7157 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
7158 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
7159 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7160 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7161 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
7163 ad493afc 2019-08-03 stsp goto done;
7166 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7167 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
7168 ad493afc 2019-08-03 stsp err = sync_err;
7170 ad493afc 2019-08-03 stsp free(fileindex_path);
7171 ad493afc 2019-08-03 stsp if (fileindex)
7172 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
7173 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7174 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
7175 ad493afc 2019-08-03 stsp err = unlockerr;
7176 ad493afc 2019-08-03 stsp return err;
