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"
58 50b0790e 2020-09-11 stsp #include "got_lib_gotconfig.h"
61 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
64 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
65 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
67 99724ed4 2018-03-10 stsp static const struct got_error *
68 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
70 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
73 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
74 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
76 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
81 507dc3bb 2018-12-29 stsp static const struct got_error *
82 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
84 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
85 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
86 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
87 507dc3bb 2018-12-29 stsp char *path = NULL;
89 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
90 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
91 507dc3bb 2018-12-29 stsp path = NULL;
95 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
99 507dc3bb 2018-12-29 stsp if (content) {
100 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
101 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
102 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
107 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
108 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
109 2a57020b 2019-02-20 stsp unlink(tmppath);
114 56b63ca4 2021-01-22 stsp if (fclose(tmpfile) == EOF && err == NULL)
115 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
116 230a42bd 2019-05-11 jcs free(tmppath);
117 99724ed4 2018-03-10 stsp return err;
120 09fe317a 2018-03-11 stsp static const struct got_error *
121 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
123 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
124 09fe317a 2018-03-11 stsp char *path;
125 09fe317a 2018-03-11 stsp int fd = -1;
127 09fe317a 2018-03-11 stsp struct stat sb;
129 09fe317a 2018-03-11 stsp *content = NULL;
131 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
132 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
133 09fe317a 2018-03-11 stsp path = NULL;
137 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
138 09fe317a 2018-03-11 stsp if (fd == -1) {
139 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
140 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
142 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
145 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
146 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
147 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
151 e4b9a50c 2019-07-27 stsp if (fstat(fd, &sb) != 0) {
152 e4b9a50c 2019-07-27 stsp err = got_error_from_errno2("fstat", path);
155 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
156 09fe317a 2018-03-11 stsp if (*content == NULL) {
157 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
161 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
162 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
163 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
164 a2e6d162 2019-07-27 stsp got_error_path(path, GOT_ERR_WORKTREE_META));
167 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
168 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
171 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
174 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
175 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
176 09fe317a 2018-03-11 stsp free(path);
178 09fe317a 2018-03-11 stsp free(*content);
179 09fe317a 2018-03-11 stsp *content = NULL;
181 09fe317a 2018-03-11 stsp return err;
184 024e9686 2019-05-14 stsp static const struct got_error *
185 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
187 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
188 024e9686 2019-05-14 stsp char *refstr = NULL;
190 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
191 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
192 024e9686 2019-05-14 stsp if (refstr == NULL)
193 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
195 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
196 024e9686 2019-05-14 stsp if (refstr == NULL)
197 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
199 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
200 024e9686 2019-05-14 stsp free(refstr);
201 024e9686 2019-05-14 stsp return err;
204 86c3caaf 2018-03-09 stsp const struct got_error *
205 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
206 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
208 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
209 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
210 ec22038e 2019-03-10 stsp uuid_t uuid;
211 ec22038e 2019-03-10 stsp uint32_t uuid_status;
212 65596e15 2018-12-24 stsp int obj_type;
213 7ac97322 2018-03-11 stsp char *path_got = NULL;
214 1451e70d 2018-03-10 stsp char *formatstr = NULL;
215 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
216 65596e15 2018-12-24 stsp char *basestr = NULL;
217 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
219 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
220 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
224 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
226 65596e15 2018-12-24 stsp return err;
227 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
229 65596e15 2018-12-24 stsp return err;
230 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
231 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
233 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
234 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
235 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
238 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
239 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
240 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
244 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
245 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
246 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
249 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
250 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
254 056e7441 2018-03-11 stsp /* Create an empty lock file. */
255 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
259 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
260 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
264 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
265 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
269 65596e15 2018-12-24 stsp /* Record our base commit. */
270 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
273 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
277 1451e70d 2018-03-10 stsp /* Store path to repository. */
278 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
279 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
283 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
284 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
285 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
289 ec22038e 2019-03-10 stsp /* Generate UUID. */
290 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
291 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
292 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
295 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
296 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
297 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
300 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
304 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
305 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
306 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
309 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
314 65596e15 2018-12-24 stsp free(commit_id);
315 7ac97322 2018-03-11 stsp free(path_got);
316 1451e70d 2018-03-10 stsp free(formatstr);
317 0bb8a95e 2018-03-12 stsp free(absprefix);
318 65596e15 2018-12-24 stsp free(basestr);
319 ec22038e 2019-03-10 stsp free(uuidstr);
320 86c3caaf 2018-03-09 stsp return err;
323 247140b2 2019-02-05 stsp static const struct got_error *
324 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
326 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
327 7ac97322 2018-03-11 stsp char *path_got;
328 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
329 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
330 056e7441 2018-03-11 stsp char *path_lock = NULL;
331 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
332 6d9d28c3 2018-03-11 stsp int version, fd = -1;
333 6d9d28c3 2018-03-11 stsp const char *errstr;
334 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
335 c442a90d 2019-03-10 stsp uint32_t uuid_status;
337 6d9d28c3 2018-03-11 stsp *worktree = NULL;
339 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
340 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
341 7ac97322 2018-03-11 stsp path_got = NULL;
345 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
346 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
347 056e7441 2018-03-11 stsp path_lock = NULL;
351 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
352 6d9d28c3 2018-03-11 stsp if (fd == -1) {
353 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
354 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
358 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
362 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
363 6d9d28c3 2018-03-11 stsp if (errstr) {
364 a2e6d162 2019-07-27 stsp err = got_error_msg(GOT_ERR_WORKTREE_META,
365 a2e6d162 2019-07-27 stsp "could not parse work tree format version number");
368 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
369 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
373 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
374 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
375 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
378 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
380 7d61d891 2020-07-23 stsp (*worktree)->root_path = realpath(path, NULL);
381 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
382 7d61d891 2020-07-23 stsp err = got_error_from_errno2("realpath", path);
385 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
386 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
390 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
391 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
395 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
396 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
400 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
403 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
404 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
405 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_from_string");
409 c9956ddf 2019-09-08 stsp err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
413 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
414 eaccb85f 2018-12-25 stsp base_commit_id_str);
418 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
419 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
423 50b0790e 2020-09-11 stsp if (asprintf(&(*worktree)->gotconfig_path, "%s/%s/%s",
424 50b0790e 2020-09-11 stsp (*worktree)->root_path,
425 50b0790e 2020-09-11 stsp GOT_WORKTREE_GOT_DIR, GOT_GOTCONFIG_FILENAME) == -1) {
426 50b0790e 2020-09-11 stsp err = got_error_from_errno("asprintf");
430 50b0790e 2020-09-11 stsp err = got_gotconfig_read(&(*worktree)->gotconfig,
431 50b0790e 2020-09-11 stsp (*worktree)->gotconfig_path);
433 437adc9d 2020-12-10 yzhong (*worktree)->root_fd = open((*worktree)->root_path, O_DIRECTORY);
434 437adc9d 2020-12-10 yzhong if ((*worktree)->root_fd == -1) {
435 437adc9d 2020-12-10 yzhong err = got_error_from_errno2("open", (*worktree)->root_path);
436 437adc9d 2020-12-10 yzhong goto done;
439 1d0f4054 2021-06-17 stsp if (repo) {
440 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
441 1d0f4054 2021-06-17 stsp if (err == NULL)
442 1d0f4054 2021-06-17 stsp err = close_err;
444 7ac97322 2018-03-11 stsp free(path_got);
445 056e7441 2018-03-11 stsp free(path_lock);
446 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
447 c442a90d 2019-03-10 stsp free(uuidstr);
448 bd165944 2019-03-10 stsp free(formatstr);
450 6d9d28c3 2018-03-11 stsp if (fd != -1)
452 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
453 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
454 6d9d28c3 2018-03-11 stsp *worktree = NULL;
456 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
458 6d9d28c3 2018-03-11 stsp return err;
461 247140b2 2019-02-05 stsp const struct got_error *
462 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
464 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
465 aedea96d 2020-10-20 stsp char *worktree_path;
467 aedea96d 2020-10-20 stsp worktree_path = strdup(path);
468 aedea96d 2020-10-20 stsp if (worktree_path == NULL)
469 aedea96d 2020-10-20 stsp return got_error_from_errno("strdup");
472 aedea96d 2020-10-20 stsp char *parent_path;
474 aedea96d 2020-10-20 stsp err = open_worktree(worktree, worktree_path);
475 aedea96d 2020-10-20 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT)) {
476 aedea96d 2020-10-20 stsp free(worktree_path);
477 247140b2 2019-02-05 stsp return err;
479 aedea96d 2020-10-20 stsp if (*worktree) {
480 aedea96d 2020-10-20 stsp free(worktree_path);
481 aedea96d 2020-10-20 stsp return NULL;
483 aedea96d 2020-10-20 stsp if (worktree_path[0] == '/' && worktree_path[1] == '\0')
485 aedea96d 2020-10-20 stsp err = got_path_dirname(&parent_path, worktree_path);
487 aedea96d 2020-10-20 stsp if (err->code != GOT_ERR_BAD_PATH) {
488 aedea96d 2020-10-20 stsp free(worktree_path);
489 aedea96d 2020-10-20 stsp return err;
493 aedea96d 2020-10-20 stsp free(worktree_path);
494 aedea96d 2020-10-20 stsp worktree_path = parent_path;
497 aedea96d 2020-10-20 stsp free(worktree_path);
498 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
501 3a6ce05a 2019-02-11 stsp const struct got_error *
502 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
504 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
506 a6b21eef 2021-01-21 stsp if (worktree->lockfd != -1) {
507 08578a35 2021-01-22 stsp if (close(worktree->lockfd) == -1)
508 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
509 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
511 e7abd6b6 2021-01-22 stsp if (close(worktree->root_fd) == -1 && err == NULL)
512 e7abd6b6 2021-01-22 stsp err = got_error_from_errno2("close",
513 e7abd6b6 2021-01-22 stsp got_worktree_get_root_path(worktree));
514 60e40e95 2021-01-22 stsp free(worktree->repo_path);
515 60e40e95 2021-01-22 stsp free(worktree->path_prefix);
516 60e40e95 2021-01-22 stsp free(worktree->base_commit_id);
517 60e40e95 2021-01-22 stsp free(worktree->head_ref_name);
518 60e40e95 2021-01-22 stsp free(worktree->root_path);
519 60e40e95 2021-01-22 stsp free(worktree->gotconfig_path);
520 60e40e95 2021-01-22 stsp got_gotconfig_free(worktree->gotconfig);
521 a06ff56f 2021-01-21 naddy free(worktree);
522 3a6ce05a 2019-02-11 stsp return err;
525 2fbdb5ae 2018-12-29 stsp const char *
526 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
528 c7f4312f 2019-02-05 stsp return worktree->root_path;
531 c7f4312f 2019-02-05 stsp const char *
532 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
534 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
536 49520a32 2018-12-29 stsp const char *
537 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
539 f609be2e 2018-12-29 stsp return worktree->path_prefix;
542 e5dc7198 2018-12-29 stsp const struct got_error *
543 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
544 e5dc7198 2018-12-29 stsp const char *path_prefix)
546 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
548 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
549 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
550 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
552 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
553 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
554 e5dc7198 2018-12-29 stsp free(absprefix);
555 e5dc7198 2018-12-29 stsp return NULL;
558 bc70eb79 2019-05-09 stsp const char *
559 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
561 36a38700 2019-05-10 stsp return worktree->head_ref_name;
564 024e9686 2019-05-14 stsp const struct got_error *
565 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
566 024e9686 2019-05-14 stsp struct got_reference *head_ref)
568 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
569 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
571 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
572 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
573 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
574 024e9686 2019-05-14 stsp path_got = NULL;
578 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
579 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
580 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
584 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
588 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
589 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
591 024e9686 2019-05-14 stsp free(path_got);
593 024e9686 2019-05-14 stsp free(head_ref_name);
594 024e9686 2019-05-14 stsp return err;
597 b72f483a 2019-02-05 stsp struct got_object_id *
598 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
600 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
603 507dc3bb 2018-12-29 stsp const struct got_error *
604 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
605 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
607 507dc3bb 2018-12-29 stsp const struct got_error *err;
608 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
609 507dc3bb 2018-12-29 stsp char *id_str = NULL;
610 507dc3bb 2018-12-29 stsp char *path_got = NULL;
612 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
613 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
614 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
615 507dc3bb 2018-12-29 stsp path_got = NULL;
619 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
621 507dc3bb 2018-12-29 stsp return err;
623 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
624 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
628 507dc3bb 2018-12-29 stsp /* Record our base commit. */
629 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
632 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
636 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
637 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
638 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
639 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
644 507dc3bb 2018-12-29 stsp got_object_close(obj);
645 507dc3bb 2018-12-29 stsp free(id_str);
646 507dc3bb 2018-12-29 stsp free(path_got);
647 507dc3bb 2018-12-29 stsp return err;
650 50b0790e 2020-09-11 stsp const struct got_gotconfig *
651 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
653 50b0790e 2020-09-11 stsp return worktree->gotconfig;
656 9d31a1d8 2018-03-11 stsp static const struct got_error *
657 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
659 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
660 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
661 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
662 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
663 86c3caaf 2018-03-09 stsp return NULL;
666 21908da4 2019-01-13 stsp static const struct got_error *
667 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
669 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
670 4a1ddfc2 2019-01-12 stsp char *abspath;
672 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
673 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
675 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
676 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
677 ddcd8544 2019-03-11 stsp struct stat sb;
678 ddcd8544 2019-03-11 stsp err = NULL;
679 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
680 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
681 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
682 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
683 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
686 4a1ddfc2 2019-01-12 stsp free(abspath);
687 68c76935 2019-02-19 stsp return err;
690 68c76935 2019-02-19 stsp static const struct got_error *
691 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
693 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
694 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
695 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
696 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
701 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
702 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
703 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
706 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
707 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
708 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
711 68c76935 2019-02-19 stsp if (flen1 == 0) {
712 68c76935 2019-02-19 stsp if (flen2 != 0)
715 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
716 68c76935 2019-02-19 stsp if (flen1 != 0)
719 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
720 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
730 68c76935 2019-02-19 stsp return err;
733 68c76935 2019-02-19 stsp static const struct got_error *
734 db590691 2021-06-02 stsp check_files_equal(int *same, FILE *f1, FILE *f2)
736 68c76935 2019-02-19 stsp struct stat sb;
737 68c76935 2019-02-19 stsp size_t size1, size2;
741 db590691 2021-06-02 stsp if (fstat(fileno(f1), &sb) != 0)
742 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
743 68c76935 2019-02-19 stsp size1 = sb.st_size;
745 db590691 2021-06-02 stsp if (fstat(fileno(f2), &sb) != 0)
746 db590691 2021-06-02 stsp return got_error_from_errno("fstat");
747 68c76935 2019-02-19 stsp size2 = sb.st_size;
749 68c76935 2019-02-19 stsp if (size1 != size2) {
751 68c76935 2019-02-19 stsp return NULL;
754 db590691 2021-06-02 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
755 db590691 2021-06-02 stsp return got_ferror(f1, GOT_ERR_IO);
756 db590691 2021-06-02 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
757 db590691 2021-06-02 stsp return got_ferror(f2, GOT_ERR_IO);
759 db590691 2021-06-02 stsp return check_file_contents_equal(same, f1, f2);
763 db590691 2021-06-02 stsp * Perform a 3-way merge where the file f_orig acts as the common
764 db590691 2021-06-02 stsp * ancestor, the file f_deriv acts as the first derived version,
765 eec2f5a9 2021-06-03 stsp * and the file f_deriv2 acts as the second derived version.
766 eec2f5a9 2021-06-03 stsp * The merge result will be written to a new file at ondisk_path; any
767 eec2f5a9 2021-06-03 stsp * existing file at this path will be replaced.
769 6353ad76 2019-02-08 stsp static const struct got_error *
770 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
771 eec2f5a9 2021-06-03 stsp FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
772 07bb0f93 2021-06-02 stsp const char *path, uint16_t st_mode,
773 54d5be07 2021-06-03 stsp const char *label_orig, const char *label_deriv, const char *label_deriv2,
774 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo, struct got_repository *repo,
775 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
777 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
778 6353ad76 2019-02-08 stsp int merged_fd = -1;
779 db590691 2021-06-02 stsp FILE *f_merged = NULL;
780 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
781 234035bc 2019-06-01 stsp int overlapcnt = 0;
782 3524bbf9 2020-10-20 stsp char *parent = NULL;
784 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
786 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
788 3524bbf9 2020-10-20 stsp return err;
790 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
791 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
795 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
799 eec2f5a9 2021-06-03 stsp err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
800 fdf3c2d3 2021-06-17 stsp f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
804 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
805 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
809 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
810 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
814 db590691 2021-06-02 stsp f_merged = fdopen(merged_fd, "r");
815 db590691 2021-06-02 stsp if (f_merged == NULL) {
816 db590691 2021-06-02 stsp err = got_error_from_errno("fdopen");
819 db590691 2021-06-02 stsp merged_fd = -1;
821 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
822 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
823 db590691 2021-06-02 stsp err = check_files_equal(local_changes_subsumed, f_deriv,
829 db590691 2021-06-02 stsp if (fchmod(fileno(f_merged), st_mode) != 0) {
830 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
834 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
835 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
836 230a42bd 2019-05-11 jcs ondisk_path);
841 fdcb7daf 2019-12-15 stsp if (merged_path)
842 fdcb7daf 2019-12-15 stsp unlink(merged_path);
844 08578a35 2021-01-22 stsp if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
845 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
846 db590691 2021-06-02 stsp if (f_merged && fclose(f_merged) == EOF && err == NULL)
847 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
848 6353ad76 2019-02-08 stsp free(merged_path);
849 af54ae4a 2019-02-19 stsp free(base_path);
850 3524bbf9 2020-10-20 stsp free(parent);
851 af57b12a 2020-07-23 stsp return err;
854 af57b12a 2020-07-23 stsp static const struct got_error *
855 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
856 af57b12a 2020-07-23 stsp size_t target_len)
858 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
859 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
860 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
861 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
862 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
863 af57b12a 2020-07-23 stsp ondisk_path);
864 af57b12a 2020-07-23 stsp return NULL;
868 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
869 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
870 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
871 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
873 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
874 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
876 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
877 993e2a1b 2020-07-23 stsp * has deleted this symlink.
879 11cc08c1 2020-07-23 stsp static const struct got_error *
880 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
881 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
882 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
884 11cc08c1 2020-07-23 stsp const struct got_error *err;
885 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
886 11cc08c1 2020-07-23 stsp FILE *f = NULL;
888 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
890 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
892 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
893 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
894 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
898 11cc08c1 2020-07-23 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict");
900 3818e3c4 2020-11-01 naddy goto done;
902 3818e3c4 2020-11-01 naddy if (fchmod(fileno(f), GOT_DEFAULT_FILE_MODE) == -1) {
903 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path);
907 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
908 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
909 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
910 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
911 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
912 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
913 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
914 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
915 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
916 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
920 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
921 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
924 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
925 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
929 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
930 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
931 11cc08c1 2020-07-23 stsp free(path);
932 11cc08c1 2020-07-23 stsp free(id_str);
933 11cc08c1 2020-07-23 stsp free(label_deriv);
934 11cc08c1 2020-07-23 stsp return err;
937 d219f183 2020-07-23 stsp /* forward declaration */
938 d219f183 2020-07-23 stsp static const struct got_error *
939 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
940 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
941 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
942 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
945 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
946 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
947 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
948 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
950 af57b12a 2020-07-23 stsp static const struct got_error *
951 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
952 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
953 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
954 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
955 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
957 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
958 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
959 af57b12a 2020-07-23 stsp struct stat sb;
960 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
961 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
962 11cc08c1 2020-07-23 stsp int have_local_change = 0;
963 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
965 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
966 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
968 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
969 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
970 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
971 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
972 af57b12a 2020-07-23 stsp ondisk_path);
975 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
977 526a746f 2020-07-23 stsp if (blob_orig) {
978 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
983 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
984 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
985 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
986 11cc08c1 2020-07-23 stsp have_local_change = 1;
988 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
989 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
990 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
991 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
992 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
994 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
995 11cc08c1 2020-07-23 stsp if (ancestor_target) {
996 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
997 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
999 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
1000 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
1001 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
1002 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1005 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
1006 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1007 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
1008 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
1010 11cc08c1 2020-07-23 stsp goto done;
1011 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1014 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
1015 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
1016 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
1017 af57b12a 2020-07-23 stsp strlen(deriv_target));
1019 af57b12a 2020-07-23 stsp goto done;
1020 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1021 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
1022 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
1023 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
1024 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
1025 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1028 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1029 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
1030 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
1032 ea7786be 2020-07-23 stsp goto done;
1033 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1039 af57b12a 2020-07-23 stsp free(ancestor_target);
1040 eec2f5a9 2021-06-03 stsp return err;
1043 eec2f5a9 2021-06-03 stsp static const struct got_error *
1044 eec2f5a9 2021-06-03 stsp dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
1046 eec2f5a9 2021-06-03 stsp const struct got_error *err = NULL;
1047 eec2f5a9 2021-06-03 stsp char target_path[PATH_MAX];
1048 eec2f5a9 2021-06-03 stsp ssize_t target_len;
1052 eec2f5a9 2021-06-03 stsp *outfile = NULL;
1054 eec2f5a9 2021-06-03 stsp f = got_opentemp();
1055 eec2f5a9 2021-06-03 stsp if (f == NULL)
1056 eec2f5a9 2021-06-03 stsp return got_error_from_errno("got_opentemp");
1057 eec2f5a9 2021-06-03 stsp target_len = readlink(ondisk_path, target_path, sizeof(target_path));
1058 eec2f5a9 2021-06-03 stsp if (target_len == -1) {
1059 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("readlink", ondisk_path);
1060 eec2f5a9 2021-06-03 stsp goto done;
1062 eec2f5a9 2021-06-03 stsp n = fwrite(target_path, 1, target_len, f);
1063 eec2f5a9 2021-06-03 stsp if (n != target_len) {
1064 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
1065 eec2f5a9 2021-06-03 stsp goto done;
1067 eec2f5a9 2021-06-03 stsp if (fflush(f) == EOF) {
1068 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fflush");
1069 eec2f5a9 2021-06-03 stsp goto done;
1071 eec2f5a9 2021-06-03 stsp if (fseek(f, 0L, SEEK_SET) == -1) {
1072 eec2f5a9 2021-06-03 stsp err = got_ferror(f, GOT_ERR_IO);
1073 eec2f5a9 2021-06-03 stsp goto done;
1077 eec2f5a9 2021-06-03 stsp fclose(f);
1079 eec2f5a9 2021-06-03 stsp *outfile = f;
1080 14c901f1 2019-08-08 stsp return err;
1084 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
1085 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
1086 14c901f1 2019-08-08 stsp * acts as the second derived version.
1088 14c901f1 2019-08-08 stsp static const struct got_error *
1089 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
1090 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
1091 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
1092 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
1093 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1094 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1096 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
1097 eec2f5a9 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
1098 67a66647 2021-05-31 stsp char *blob_orig_path = NULL;
1099 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
1100 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
1102 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
1104 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1106 ed6b5030 2020-10-20 stsp return err;
1108 67a66647 2021-05-31 stsp if (blob_orig) {
1109 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig",
1110 67a66647 2021-05-31 stsp parent) == -1) {
1111 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
1112 67a66647 2021-05-31 stsp base_path = NULL;
1113 67a66647 2021-05-31 stsp goto done;
1116 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
1118 67a66647 2021-05-31 stsp goto done;
1119 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
1120 67a66647 2021-05-31 stsp blob_orig);
1122 67a66647 2021-05-31 stsp goto done;
1123 67a66647 2021-05-31 stsp free(base_path);
1126 db590691 2021-06-02 stsp * No common ancestor exists. This is an "add vs add" conflict
1127 db590691 2021-06-02 stsp * and we simply use an empty ancestor file to make both files
1128 db590691 2021-06-02 stsp * appear in the merged result in their entirety.
1130 db590691 2021-06-02 stsp f_orig = got_opentemp();
1131 db590691 2021-06-02 stsp if (f_orig == NULL) {
1132 db590691 2021-06-02 stsp err = got_error_from_errno("got_opentemp");
1133 db590691 2021-06-02 stsp goto done;
1137 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1138 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1139 14c901f1 2019-08-08 stsp base_path = NULL;
1140 14c901f1 2019-08-08 stsp goto done;
1143 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1145 14c901f1 2019-08-08 stsp goto done;
1146 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1147 14c901f1 2019-08-08 stsp blob_deriv);
1149 14c901f1 2019-08-08 stsp goto done;
1151 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1153 14c901f1 2019-08-08 stsp goto done;
1154 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1155 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1156 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1157 14c901f1 2019-08-08 stsp goto done;
1161 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
1162 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
1164 eec2f5a9 2021-06-03 stsp if (S_ISLNK(st_mode)) {
1165 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1167 eec2f5a9 2021-06-03 stsp goto done;
1170 eec2f5a9 2021-06-03 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
1171 eec2f5a9 2021-06-03 stsp if (fd == -1) {
1172 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
1173 eec2f5a9 2021-06-03 stsp goto done;
1175 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
1176 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
1177 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
1178 eec2f5a9 2021-06-03 stsp close(fd);
1179 eec2f5a9 2021-06-03 stsp goto done;
1183 07bb0f93 2021-06-02 stsp err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1184 eec2f5a9 2021-06-03 stsp f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1185 fdf3c2d3 2021-06-17 stsp NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1187 67a66647 2021-05-31 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
1188 67a66647 2021-05-31 stsp err = got_error_from_errno("fclose");
1189 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1190 eec2f5a9 2021-06-03 stsp err = got_error_from_errno("fclose");
1191 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1192 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1193 14c901f1 2019-08-08 stsp free(base_path);
1194 67a66647 2021-05-31 stsp if (blob_orig_path) {
1195 67a66647 2021-05-31 stsp unlink(blob_orig_path);
1196 67a66647 2021-05-31 stsp free(blob_orig_path);
1198 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1199 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1200 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1202 6353ad76 2019-02-08 stsp free(id_str);
1203 818c7501 2019-07-11 stsp free(label_deriv);
1204 ed6b5030 2020-10-20 stsp free(parent);
1205 4a1ddfc2 2019-01-12 stsp return err;
1208 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1209 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1210 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1211 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1213 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1214 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1216 65b05cec 2020-07-23 stsp *new_iep = NULL;
1218 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1220 054041d0 2020-06-24 stsp return err;
1222 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1223 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1225 054041d0 2020-06-24 stsp goto done;
1227 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1230 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1232 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1233 13d9040b 2019-03-27 stsp return err;
1236 1ebedb77 2019-10-19 stsp static mode_t
1237 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1239 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1241 1ebedb77 2019-10-19 stsp if (executable) {
1242 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1243 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1244 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1245 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1246 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1247 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1250 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1253 8ba819a3 2020-07-23 stsp /* forward declaration */
1254 13d9040b 2019-03-27 stsp static const struct got_error *
1255 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1256 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1257 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1258 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1259 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1260 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1263 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1264 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1266 8ba819a3 2020-07-23 stsp static const struct got_error *
1267 c6e8a826 2021-04-05 stsp replace_existing_symlink(int *did_something, const char *ondisk_path,
1268 c6e8a826 2021-04-05 stsp const char *target_path, size_t target_len)
1270 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1271 5a1fbc73 2020-07-23 stsp ssize_t elen;
1272 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1275 c6e8a826 2021-04-05 stsp *did_something = 0;
1278 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1279 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1280 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1281 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1282 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1283 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1285 5a1fbc73 2020-07-23 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
1286 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1287 5a1fbc73 2020-07-23 stsp if (errno != ELOOP)
1288 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1290 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1291 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1292 5a1fbc73 2020-07-23 stsp if (elen == -1)
1293 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1295 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1296 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1297 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1300 c6e8a826 2021-04-05 stsp *did_something = 1;
1301 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1302 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1303 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1304 5a1fbc73 2020-07-23 stsp return err;
1307 3c1ec782 2020-07-23 stsp static const struct got_error *
1308 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1309 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1311 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1312 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1313 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1315 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1317 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1318 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1319 3c1ec782 2020-07-23 stsp return NULL;
1323 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1324 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1325 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1326 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1327 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1329 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1330 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1331 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1333 ce031e9e 2020-10-20 stsp return err;
1334 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1335 ce031e9e 2020-10-20 stsp free(parent);
1336 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1338 ce031e9e 2020-10-20 stsp free(parent);
1339 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1340 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1341 3c1ec782 2020-07-23 stsp free(abspath);
1342 3c1ec782 2020-07-23 stsp return err;
1344 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1345 3c1ec782 2020-07-23 stsp free(abspath);
1347 3c1ec782 2020-07-23 stsp return err;
1349 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1351 3c1ec782 2020-07-23 stsp return err;
1354 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1355 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1356 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1357 3c1ec782 2020-07-23 stsp return NULL;
1360 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1361 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1362 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1363 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1364 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1365 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1367 3c1ec782 2020-07-23 stsp free(path_got);
1368 3c1ec782 2020-07-23 stsp return NULL;
1371 5a1fbc73 2020-07-23 stsp static const struct got_error *
1372 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1373 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1374 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1375 c90c8ce3 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1376 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1378 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1379 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1380 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1381 906c123b 2020-07-23 stsp char *path_got = NULL;
1382 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1383 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1385 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1388 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1389 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1390 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1391 8ba819a3 2020-07-23 stsp * in the blob object.
1394 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1395 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1396 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1397 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1398 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1399 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1400 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1401 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1402 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1403 3b9f0f87 2020-07-23 stsp progress_arg);
1405 8ba819a3 2020-07-23 stsp if (len > 0) {
1406 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1407 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1408 8ba819a3 2020-07-23 stsp len - hdrlen);
1409 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1410 8ba819a3 2020-07-23 stsp hdrlen = 0;
1412 8ba819a3 2020-07-23 stsp } while (len != 0);
1413 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1415 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1416 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1418 3c1ec782 2020-07-23 stsp return err;
1420 3c1ec782 2020-07-23 stsp if (*is_bad_symlink) {
1421 906c123b 2020-07-23 stsp /* install as a regular file */
1422 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1423 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1424 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1425 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1426 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1427 906c123b 2020-07-23 stsp goto done;
1430 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1431 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1432 c6e8a826 2021-04-05 stsp int symlink_replaced;
1433 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1434 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1435 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1436 c90c8ce3 2020-07-23 stsp goto done;
1438 c6e8a826 2021-04-05 stsp err = replace_existing_symlink(&symlink_replaced,
1439 c6e8a826 2021-04-05 stsp ondisk_path, target_path, target_len);
1441 f35fa46a 2020-07-23 stsp goto done;
1442 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1443 c6e8a826 2021-04-05 stsp if (symlink_replaced) {
1444 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1445 c6e8a826 2021-04-05 stsp reverting_versioned_file ?
1446 c6e8a826 2021-04-05 stsp GOT_STATUS_REVERT :
1447 c6e8a826 2021-04-05 stsp GOT_STATUS_UPDATE, path);
1449 c6e8a826 2021-04-05 stsp err = (*progress_cb)(progress_arg,
1450 c6e8a826 2021-04-05 stsp GOT_STATUS_EXISTS, path);
1453 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1456 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1457 f4994adc 2020-10-20 stsp char *parent;
1458 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1460 f4994adc 2020-10-20 stsp goto done;
1461 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1462 f4994adc 2020-10-20 stsp free(parent);
1464 f35fa46a 2020-07-23 stsp goto done;
1466 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1467 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1469 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1470 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1471 f35fa46a 2020-07-23 stsp goto done;
1475 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1476 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1477 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1478 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1479 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1480 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1481 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1482 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1483 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1484 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1485 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1486 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1487 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1489 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1490 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1492 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1493 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1494 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1496 906c123b 2020-07-23 stsp free(path_got);
1497 8ba819a3 2020-07-23 stsp return err;
1500 8ba819a3 2020-07-23 stsp static const struct got_error *
1501 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1502 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1503 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1504 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1505 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1506 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1508 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1509 507dc3bb 2018-12-29 stsp int fd = -1;
1510 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1511 507dc3bb 2018-12-29 stsp int update = 0;
1512 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1514 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1515 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
1516 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1517 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1518 f5375317 2020-10-20 stsp char *parent;
1519 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1521 f5375317 2020-10-20 stsp return err;
1522 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1523 f5375317 2020-10-20 stsp free(parent);
1525 21908da4 2019-01-13 stsp return err;
1526 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1527 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1528 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1529 21908da4 2019-01-13 stsp if (fd == -1)
1530 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1531 230a42bd 2019-05-11 jcs ondisk_path);
1532 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1533 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1534 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1535 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1536 3b9f0f87 2020-07-23 stsp goto done;
1538 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1539 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1540 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1541 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1542 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1543 507dc3bb 2018-12-29 stsp goto done;
1545 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1546 507dc3bb 2018-12-29 stsp ondisk_path);
1548 507dc3bb 2018-12-29 stsp goto done;
1549 507dc3bb 2018-12-29 stsp update = 1;
1552 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1555 3818e3c4 2020-11-01 naddy if (fchmod(fd, get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1556 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod",
1557 3818e3c4 2020-11-01 naddy update ? tmppath : ondisk_path);
1558 3818e3c4 2020-11-01 naddy goto done;
1561 bd6aa359 2020-07-23 stsp if (progress_cb) {
1562 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1563 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1565 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1566 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1569 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1570 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1572 bd6aa359 2020-07-23 stsp goto done;
1575 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1577 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1578 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1581 9d31a1d8 2018-03-11 stsp if (len > 0) {
1582 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1583 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1584 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1585 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1586 b87c6f83 2018-12-24 stsp goto done;
1587 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1588 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1589 b87c6f83 2018-12-24 stsp goto done;
1591 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1593 9d31a1d8 2018-03-11 stsp } while (len != 0);
1595 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1596 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1597 816dc654 2019-02-16 stsp goto done;
1600 507dc3bb 2018-12-29 stsp if (update) {
1601 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1602 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1603 f6d8c0ac 2020-11-09 stsp goto done;
1605 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1606 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1607 230a42bd 2019-05-11 jcs ondisk_path);
1608 68ed9ba5 2019-02-10 stsp goto done;
1610 63df146d 2020-11-09 stsp free(tmppath);
1611 63df146d 2020-11-09 stsp tmppath = NULL;
1615 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1616 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1617 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1618 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1619 507dc3bb 2018-12-29 stsp free(tmppath);
1620 6353ad76 2019-02-08 stsp return err;
1623 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1624 6353ad76 2019-02-08 stsp static const struct got_error *
1625 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1627 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1628 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1629 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1630 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1631 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1633 7154f6ce 2019-03-27 stsp int i = 0;
1634 9bdd68dd 2020-01-02 naddy char *line = NULL;
1635 9bdd68dd 2020-01-02 naddy size_t linesize = 0;
1636 9bdd68dd 2020-01-02 naddy ssize_t linelen;
1638 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1639 9bdd68dd 2020-01-02 naddy linelen = getline(&line, &linesize, f);
1640 9bdd68dd 2020-01-02 naddy if (linelen == -1) {
1641 7154f6ce 2019-03-27 stsp if (feof(f))
1643 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1647 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1648 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1650 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1655 9bdd68dd 2020-01-02 naddy free(line);
1657 7154f6ce 2019-03-27 stsp return err;
1660 e2b1e152 2019-07-13 stsp static int
1661 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1663 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1664 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1667 1ebedb77 2019-10-19 stsp static int
1668 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1670 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1671 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1672 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1673 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1674 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1675 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1678 c363b2c1 2019-08-03 stsp static unsigned char
1679 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1681 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1682 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1683 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1684 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1685 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1686 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1687 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1689 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1693 a919d5c4 2020-07-23 stsp static const struct got_error *
1694 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1695 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1696 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1698 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1699 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1700 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1701 a919d5c4 2020-07-23 stsp ssize_t elen;
1702 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1703 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1704 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1706 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1708 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1710 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1712 a919d5c4 2020-07-23 stsp return err;
1713 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1715 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1716 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1718 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1720 a919d5c4 2020-07-23 stsp if (len > 0) {
1721 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1722 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1723 a919d5c4 2020-07-23 stsp len - hdrlen);
1724 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1725 a919d5c4 2020-07-23 stsp hdrlen = 0;
1727 a919d5c4 2020-07-23 stsp } while (len != 0);
1728 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1730 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1731 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1732 a919d5c4 2020-07-23 stsp if (elen == -1)
1733 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1735 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1736 a919d5c4 2020-07-23 stsp if (elen == -1)
1737 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1740 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1741 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1743 a919d5c4 2020-07-23 stsp return NULL;
1746 7154f6ce 2019-03-27 stsp static const struct got_error *
1747 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1748 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1749 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1751 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1752 6353ad76 2019-02-08 stsp struct got_object_id id;
1753 6353ad76 2019-02-08 stsp size_t hdrlen;
1754 1338848f 2019-12-13 stsp int fd = -1;
1755 6353ad76 2019-02-08 stsp FILE *f = NULL;
1756 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1757 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1758 6353ad76 2019-02-08 stsp size_t flen, blen;
1759 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1761 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1762 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1765 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1766 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1767 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1769 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1770 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1771 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1772 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1773 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1775 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1776 882ef1b9 2019-12-13 stsp goto done;
1778 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1779 3d35a492 2019-12-13 stsp goto done;
1782 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1783 a919d5c4 2020-07-23 stsp if (fd == -1 && errno != ENOENT && errno != ELOOP)
1784 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1785 a919d5c4 2020-07-23 stsp else if (fd == -1 && errno == ELOOP) {
1786 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1787 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1788 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1789 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1790 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1791 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1793 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1794 3d35a492 2019-12-13 stsp goto done;
1796 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1797 1338848f 2019-12-13 stsp goto done;
1801 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1802 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1803 1338848f 2019-12-13 stsp goto done;
1806 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1807 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1808 1338848f 2019-12-13 stsp goto done;
1809 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1810 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1811 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1812 1338848f 2019-12-13 stsp goto done;
1815 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1816 f179e66d 2020-07-23 stsp goto done;
1818 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1819 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1820 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1821 1338848f 2019-12-13 stsp goto done;
1824 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1825 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1826 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1828 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1830 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1832 1338848f 2019-12-13 stsp goto done;
1834 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1835 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1836 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1837 a919d5c4 2020-07-23 stsp goto done;
1840 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1841 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1842 ab0d4361 2019-12-13 stsp if (fd == -1) {
1843 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1844 ab0d4361 2019-12-13 stsp goto done;
1848 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1849 6353ad76 2019-02-08 stsp if (f == NULL) {
1850 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1851 6353ad76 2019-02-08 stsp goto done;
1854 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1856 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1857 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1859 7154f6ce 2019-03-27 stsp goto done;
1860 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1861 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1862 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1863 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1864 7154f6ce 2019-03-27 stsp goto done;
1866 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1867 6353ad76 2019-02-08 stsp if (flen != 0)
1868 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1870 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1871 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1872 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1874 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1875 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1876 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1877 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1881 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1884 6353ad76 2019-02-08 stsp hdrlen = 0;
1887 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1888 7154f6ce 2019-03-27 stsp rewind(f);
1889 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1890 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1891 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1894 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1895 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1896 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1897 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1898 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1899 9d31a1d8 2018-03-11 stsp return err;
1903 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1904 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1906 e2b1e152 2019-07-13 stsp static const struct got_error *
1907 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1908 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1910 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1911 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1912 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1914 e2b1e152 2019-07-13 stsp return NULL;
1917 9d31a1d8 2018-03-11 stsp static const struct got_error *
1918 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1919 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1920 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1921 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1922 0584f854 2019-04-06 stsp void *progress_arg)
1924 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1925 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1926 6353ad76 2019-02-08 stsp char *ondisk_path;
1927 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1928 b8f41171 2019-02-10 stsp struct stat sb;
1930 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1931 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1934 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1935 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1936 a76c42e6 2019-08-03 stsp goto done;
1938 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1941 abb4604f 2019-07-27 stsp goto done;
1942 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1943 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1945 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1946 c90c8ce3 2020-07-23 stsp status = GOT_STATUS_UNVERSIONED;
1949 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1951 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1952 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1953 b8f41171 2019-02-10 stsp goto done;
1955 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1957 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1958 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1960 5036ab18 2020-04-18 stsp goto done;
1963 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1964 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1965 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1967 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1968 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1969 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1970 c6e8a826 2021-04-05 stsp * updating contents of this file.
1972 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1973 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1974 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1975 c6e8a826 2021-04-05 stsp /* Same commit. */
1976 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1977 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1979 e2b1e152 2019-07-13 stsp goto done;
1980 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1982 6353ad76 2019-02-08 stsp goto done;
1984 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1985 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1986 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1987 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1988 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1989 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1991 0f58026f 2021-04-05 stsp goto done;
1992 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1994 b8f41171 2019-02-10 stsp goto done;
1998 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
2000 6353ad76 2019-02-08 stsp goto done;
2002 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
2003 234035bc 2019-06-01 stsp int update_timestamps;
2004 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
2005 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2006 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
2007 234035bc 2019-06-01 stsp struct got_object_id id2;
2008 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2009 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
2011 f69721c3 2019-10-21 stsp goto done;
2013 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
2014 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
2015 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
2016 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
2017 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
2018 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
2019 f69721c3 2019-10-21 stsp goto done;
2021 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2022 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2023 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2024 234035bc 2019-06-01 stsp goto done;
2027 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
2028 36bf999c 2020-07-23 stsp char *link_target;
2029 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
2031 36bf999c 2020-07-23 stsp goto done;
2032 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
2033 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
2034 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
2035 36bf999c 2020-07-23 stsp free(link_target);
2037 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
2038 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
2039 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
2040 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
2042 f69721c3 2019-10-21 stsp free(label_orig);
2043 234035bc 2019-06-01 stsp if (blob2)
2044 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
2046 909d120e 2019-09-22 stsp goto done;
2048 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
2049 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
2050 234035bc 2019-06-01 stsp * unmodified files again.
2052 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2053 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
2054 234035bc 2019-06-01 stsp update_timestamps);
2055 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
2056 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2057 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2058 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
2059 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
2061 1ee397ad 2019-07-12 stsp goto done;
2062 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2063 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2065 13d9040b 2019-03-27 stsp goto done;
2067 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2068 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
2069 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
2070 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
2071 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
2072 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2073 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2075 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2076 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2077 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2078 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2079 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2082 13d9040b 2019-03-27 stsp goto done;
2085 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2086 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
2087 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2089 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2090 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2091 054041d0 2020-06-24 stsp &blob->id);
2094 13d9040b 2019-03-27 stsp goto done;
2096 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2097 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2098 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2101 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2103 6353ad76 2019-02-08 stsp free(ondisk_path);
2104 8da9e5f4 2019-01-12 stsp return err;
2107 90285c3b 2019-01-08 stsp static const struct got_error *
2108 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2110 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2111 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2113 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2114 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2116 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2117 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2118 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2120 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2121 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2123 1c4cdd89 2021-06-20 stsp goto done;
2124 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2125 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2126 fddefe3b 2020-10-20 stsp free(ondisk_path);
2127 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2128 1c4cdd89 2021-06-20 stsp parent = NULL;
2129 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2130 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2131 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2132 fddefe3b 2020-10-20 stsp ondisk_path);
2135 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2141 90285c3b 2019-01-08 stsp free(ondisk_path);
2142 1c4cdd89 2021-06-20 stsp free(parent);
2143 90285c3b 2019-01-08 stsp return err;
2146 708d8e67 2019-03-27 stsp static const struct got_error *
2147 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2148 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2149 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2151 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2152 708d8e67 2019-03-27 stsp unsigned char status;
2153 708d8e67 2019-03-27 stsp struct stat sb;
2154 708d8e67 2019-03-27 stsp char *ondisk_path;
2156 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2157 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2159 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2161 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2163 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2165 5a58a424 2020-06-23 stsp goto done;
2167 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2168 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2169 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2170 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2171 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2172 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2173 993e2a1b 2020-07-23 stsp goto done;
2175 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2176 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2177 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2178 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2180 993e2a1b 2020-07-23 stsp goto done;
2181 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2182 993e2a1b 2020-07-23 stsp ie->path);
2183 993e2a1b 2020-07-23 stsp goto done;
2186 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2187 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2188 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2190 5a58a424 2020-06-23 stsp goto done;
2192 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2193 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2195 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2196 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2198 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2200 5a58a424 2020-06-23 stsp goto done;
2201 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2202 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2204 5a58a424 2020-06-23 stsp goto done;
2206 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2209 5a58a424 2020-06-23 stsp free(ondisk_path);
2210 fc6346c4 2019-03-27 stsp return err;
2213 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2214 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2215 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2216 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2217 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2218 8da9e5f4 2019-01-12 stsp void *progress_arg;
2219 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2220 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2223 512f0d0e 2019-01-02 stsp static const struct got_error *
2224 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2225 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2227 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2229 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2230 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2232 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2233 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2236 8da9e5f4 2019-01-12 stsp static const struct got_error *
2237 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2239 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2241 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2242 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2244 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2245 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2248 9d31a1d8 2018-03-11 stsp static const struct got_error *
2249 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2251 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2252 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2253 8da9e5f4 2019-01-12 stsp char *path;
2255 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2256 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2258 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2259 63c5ca5d 2019-08-24 stsp return NULL;
2261 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2262 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2264 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2266 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2267 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2269 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2270 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2272 8da9e5f4 2019-01-12 stsp free(path);
2273 0cd1c46a 2019-03-11 stsp return err;
2276 b2118c49 2020-07-28 stsp const struct got_error *
2277 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2279 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2281 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2282 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2283 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2284 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2287 b2118c49 2020-07-28 stsp return NULL;
2290 818c7501 2019-07-11 stsp static const struct got_error *
2291 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2293 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2294 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2296 517bab73 2019-03-11 stsp *refname = NULL;
2298 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2300 b2118c49 2020-07-28 stsp return err;
2302 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2303 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2304 0647c563 2019-03-11 stsp *refname = NULL;
2306 517bab73 2019-03-11 stsp free(uuidstr);
2307 517bab73 2019-03-11 stsp return err;
2310 818c7501 2019-07-11 stsp const struct got_error *
2311 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2313 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2316 818c7501 2019-07-11 stsp static const struct got_error *
2317 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2319 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2320 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2323 818c7501 2019-07-11 stsp static const struct got_error *
2324 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2326 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2329 818c7501 2019-07-11 stsp static const struct got_error *
2330 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2332 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2333 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2336 818c7501 2019-07-11 stsp static const struct got_error *
2337 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2339 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2340 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2343 0ebf8283 2019-07-24 stsp static const struct got_error *
2344 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2346 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2347 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2350 0ebf8283 2019-07-24 stsp static const struct got_error *
2351 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2353 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2354 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2357 0ebf8283 2019-07-24 stsp static const struct got_error *
2358 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2360 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2361 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2364 0ebf8283 2019-07-24 stsp static const struct got_error *
2365 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2367 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2368 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2371 0ebf8283 2019-07-24 stsp const struct got_error *
2372 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2373 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2375 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2376 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2377 0ebf8283 2019-07-24 stsp *path = NULL;
2378 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2380 0ebf8283 2019-07-24 stsp return NULL;
2384 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2385 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2387 517bab73 2019-03-11 stsp static const struct got_error *
2388 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2390 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2391 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2392 517bab73 2019-03-11 stsp char *refname;
2394 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2396 517bab73 2019-03-11 stsp return err;
2398 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2400 0cd1c46a 2019-03-11 stsp goto done;
2402 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2404 0cd1c46a 2019-03-11 stsp free(refname);
2406 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2407 3e3a69f1 2019-07-25 stsp return err;
2410 3e3a69f1 2019-07-25 stsp static const struct got_error *
2411 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2413 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2415 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2416 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2417 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2418 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2420 9d31a1d8 2018-03-11 stsp return err;
2424 ebf99748 2019-05-09 stsp static const struct got_error *
2425 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2426 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2428 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2429 ebf99748 2019-05-09 stsp FILE *index = NULL;
2431 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2432 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2433 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2434 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2436 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2438 ebf99748 2019-05-09 stsp goto done;
2440 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2441 ebf99748 2019-05-09 stsp if (index == NULL) {
2442 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2443 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2445 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2446 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2447 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2450 ebf99748 2019-05-09 stsp if (err) {
2451 ebf99748 2019-05-09 stsp free(*fileindex_path);
2452 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2453 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2454 ebf99748 2019-05-09 stsp *fileindex = NULL;
2456 ebf99748 2019-05-09 stsp return err;
2459 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2460 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2461 c932eeeb 2019-05-22 stsp const char *path;
2462 c932eeeb 2019-05-22 stsp size_t path_len;
2463 c932eeeb 2019-05-22 stsp const char *entry_name;
2464 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2465 a484d721 2019-06-10 stsp void *progress_arg;
2468 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2469 c932eeeb 2019-05-22 stsp static const struct got_error *
2470 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2472 1ee397ad 2019-07-12 stsp const struct got_error *err;
2473 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2475 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2476 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2477 c932eeeb 2019-05-22 stsp return NULL;
2478 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2479 102ff934 2019-06-11 stsp return NULL;
2481 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2482 a769b60b 2021-06-27 stsp return NULL;
2484 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2485 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2486 c932eeeb 2019-05-22 stsp return NULL;
2488 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2489 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2490 edd02c5e 2019-07-11 stsp ie->path);
2492 1ee397ad 2019-07-12 stsp return err;
2494 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2495 c932eeeb 2019-05-22 stsp return NULL;
2498 a615e0e7 2020-12-16 stsp static const struct got_error *
2499 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2500 a615e0e7 2020-12-16 stsp struct got_fileindex *fileindex,
2501 a615e0e7 2020-12-16 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2503 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2505 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2506 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2507 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2508 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2509 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2510 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2512 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2513 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2516 9c6338c4 2019-06-02 stsp static const struct got_error *
2517 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2519 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2520 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2521 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2522 867630bb 2020-01-17 stsp struct timespec timeout;
2524 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2525 9c6338c4 2019-06-02 stsp fileindex_path);
2527 9c6338c4 2019-06-02 stsp goto done;
2529 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2531 9c6338c4 2019-06-02 stsp goto done;
2533 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2534 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2535 9c6338c4 2019-06-02 stsp fileindex_path);
2536 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2540 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2541 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2542 867630bb 2020-01-17 stsp * was recorded in the file index.
2544 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2545 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2546 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2548 9c6338c4 2019-06-02 stsp if (new_index)
2549 9c6338c4 2019-06-02 stsp fclose(new_index);
2550 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2551 9c6338c4 2019-06-02 stsp return err;
2554 6ced4176 2019-07-12 stsp static const struct got_error *
2555 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2556 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2557 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2559 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2560 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2561 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2562 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2564 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2565 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2566 6ced4176 2019-07-12 stsp *tree_id = NULL;
2568 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2569 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2570 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2571 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2572 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2573 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2574 6ced4176 2019-07-12 stsp goto done;
2576 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2577 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2579 6ced4176 2019-07-12 stsp goto done;
2580 6ced4176 2019-07-12 stsp return NULL;
2583 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2585 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2586 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2587 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2588 6ced4176 2019-07-12 stsp goto done;
2591 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2592 6ced4176 2019-07-12 stsp in_repo_path);
2594 6ced4176 2019-07-12 stsp goto done;
2596 6ced4176 2019-07-12 stsp free(in_repo_path);
2597 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2599 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2601 6ced4176 2019-07-12 stsp goto done;
2603 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2604 6ced4176 2019-07-12 stsp /* Check out a single file. */
2605 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2606 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2607 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2608 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2609 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2610 6ced4176 2019-07-12 stsp goto done;
2612 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2613 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2614 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2615 6ced4176 2019-07-12 stsp goto done;
2618 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2619 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2621 6ced4176 2019-07-12 stsp return err;
2622 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2623 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2624 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2625 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2626 6ced4176 2019-07-12 stsp goto done;
2629 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2630 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2632 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2633 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2634 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2635 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2636 6ced4176 2019-07-12 stsp goto done;
2638 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2639 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2640 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2641 6ced4176 2019-07-12 stsp goto done;
2646 6ced4176 2019-07-12 stsp free(in_repo_path);
2647 6ced4176 2019-07-12 stsp if (err) {
2648 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2649 6ced4176 2019-07-12 stsp free(*tree_relpath);
2650 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2651 6ced4176 2019-07-12 stsp free(*tree_id);
2652 6ced4176 2019-07-12 stsp *tree_id = NULL;
2654 07ed472d 2019-07-12 stsp return err;
2657 07ed472d 2019-07-12 stsp static const struct got_error *
2658 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2659 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2660 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2661 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2663 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2664 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2665 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2666 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2667 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2669 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2670 7f47418f 2019-12-20 stsp if (err) {
2671 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2672 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2673 7f47418f 2019-12-20 stsp goto done;
2674 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2675 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2677 7f47418f 2019-12-20 stsp return err;
2680 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2681 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2683 07ed472d 2019-07-12 stsp goto done;
2685 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2687 07ed472d 2019-07-12 stsp goto done;
2689 07ed472d 2019-07-12 stsp if (entry_name &&
2690 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2691 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2692 07ed472d 2019-07-12 stsp goto done;
2695 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2696 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2697 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2698 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2699 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2700 07ed472d 2019-07-12 stsp arg.repo = repo;
2701 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2702 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2703 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2704 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2705 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2706 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2709 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2710 07ed472d 2019-07-12 stsp if (commit)
2711 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2712 6ced4176 2019-07-12 stsp return err;
2715 9d31a1d8 2018-03-11 stsp const struct got_error *
2716 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2717 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2718 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2719 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2721 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2722 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2723 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2724 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2725 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2726 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2727 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2728 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2729 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2730 f2ea84fa 2019-07-27 stsp int entry_type;
2731 f2ea84fa 2019-07-27 stsp char *relpath;
2732 f2ea84fa 2019-07-27 stsp char *entry_name;
2733 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2734 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2736 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2738 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2740 9d31a1d8 2018-03-11 stsp return err;
2742 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2743 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2744 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2745 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2746 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2747 f2ea84fa 2019-07-27 stsp goto done;
2750 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2751 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2752 f2ea84fa 2019-07-27 stsp if (err) {
2753 f2ea84fa 2019-07-27 stsp free(tpd);
2754 6ced4176 2019-07-12 stsp goto done;
2757 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2758 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2759 f2ea84fa 2019-07-27 stsp if (err) {
2760 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2761 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2762 f2ea84fa 2019-07-27 stsp free(tpd);
2763 f2ea84fa 2019-07-27 stsp goto done;
2766 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2768 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2772 51514078 2018-12-25 stsp * Read the file index.
2773 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2774 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2776 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2778 c4cdcb68 2019-04-03 stsp goto done;
2780 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2781 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2782 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2784 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2785 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2786 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2790 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2791 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2792 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2793 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2794 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2795 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2796 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2797 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2801 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2803 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2804 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2805 af12c6b9 2019-06-04 stsp err = sync_err;
2807 9c6338c4 2019-06-02 stsp free(fileindex_path);
2809 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2810 9d31a1d8 2018-03-11 stsp if (commit)
2811 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2812 5ade8233 2019-07-12 stsp if (fileindex)
2813 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2814 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2815 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2816 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2817 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2818 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2819 f2ea84fa 2019-07-27 stsp free(tpd);
2821 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2822 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2823 9d31a1d8 2018-03-11 stsp err = unlockerr;
2824 f8d1f275 2019-02-04 stsp return err;
2827 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2828 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2829 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2830 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2831 234035bc 2019-06-01 stsp void *progress_arg;
2832 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2833 234035bc 2019-06-01 stsp void *cancel_arg;
2834 f69721c3 2019-10-21 stsp const char *label_orig;
2835 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2838 234035bc 2019-06-01 stsp static const struct got_error *
2839 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2840 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2841 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2842 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2844 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2845 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2846 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2847 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2848 234035bc 2019-06-01 stsp struct stat sb;
2849 234035bc 2019-06-01 stsp unsigned char status;
2850 234035bc 2019-06-01 stsp int local_changes_subsumed;
2851 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2852 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2854 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2855 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2856 d6c87207 2019-08-02 stsp strlen(path2));
2857 1ee397ad 2019-07-12 stsp if (ie == NULL)
2858 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2859 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2861 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2862 234035bc 2019-06-01 stsp path2) == -1)
2863 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2865 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2868 234035bc 2019-06-01 stsp goto done;
2870 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2871 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2872 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2873 234035bc 2019-06-01 stsp goto done;
2875 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2876 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2877 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2878 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2879 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2880 234035bc 2019-06-01 stsp goto done;
2883 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2884 36bf999c 2020-07-23 stsp char *link_target2;
2885 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2887 36bf999c 2020-07-23 stsp goto done;
2888 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2889 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2890 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2891 36bf999c 2020-07-23 stsp free(link_target2);
2895 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2896 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2897 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2898 1af628f4 2021-06-03 stsp goto done;
2900 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2901 1af628f4 2021-06-03 stsp f_orig, blob1);
2903 1af628f4 2021-06-03 stsp goto done;
2905 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2906 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2907 1af628f4 2021-06-03 stsp goto done;
2908 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2909 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2911 1af628f4 2021-06-03 stsp goto done;
2913 1af628f4 2021-06-03 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
2914 1af628f4 2021-06-03 stsp if (fd == -1) {
2915 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2916 1af628f4 2021-06-03 stsp ondisk_path);
2917 1af628f4 2021-06-03 stsp goto done;
2919 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2920 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2921 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2922 1af628f4 2021-06-03 stsp ondisk_path);
2923 1af628f4 2021-06-03 stsp close(fd);
2924 1af628f4 2021-06-03 stsp goto done;
2926 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2928 1af628f4 2021-06-03 stsp goto done;
2929 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2930 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2931 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2932 1af628f4 2021-06-03 stsp goto done;
2934 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2935 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2936 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2937 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2938 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2940 234035bc 2019-06-01 stsp } else if (blob1) {
2941 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2942 d6c87207 2019-08-02 stsp strlen(path1));
2943 1ee397ad 2019-07-12 stsp if (ie == NULL)
2944 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2945 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2947 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2948 2b92fad7 2019-06-02 stsp path1) == -1)
2949 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2951 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2954 2b92fad7 2019-06-02 stsp goto done;
2956 2b92fad7 2019-06-02 stsp switch (status) {
2957 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2958 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2959 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2961 1ee397ad 2019-07-12 stsp goto done;
2962 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2964 2b92fad7 2019-06-02 stsp goto done;
2966 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2968 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2969 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2970 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2971 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2973 1ee397ad 2019-07-12 stsp goto done;
2975 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2977 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2978 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2979 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2981 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2982 0a22ca1a 2020-09-23 stsp * exists in the repository.
2984 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
2986 0a22ca1a 2020-09-23 stsp goto done;
2987 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2988 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2989 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2991 0a22ca1a 2020-09-23 stsp goto done;
2992 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2995 0a22ca1a 2020-09-23 stsp goto done;
2997 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
3000 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
3001 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
3003 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
3004 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
3007 0a22ca1a 2020-09-23 stsp goto done;
3010 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
3011 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
3012 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3013 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
3015 1ee397ad 2019-07-12 stsp goto done;
3017 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
3018 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
3020 1ee397ad 2019-07-12 stsp goto done;
3025 234035bc 2019-06-01 stsp } else if (blob2) {
3026 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3027 234035bc 2019-06-01 stsp path2) == -1)
3028 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3029 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
3030 d6c87207 2019-08-02 stsp strlen(path2));
3032 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
3033 7f91a133 2019-12-13 stsp -1, NULL, repo);
3035 234035bc 2019-06-01 stsp goto done;
3036 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
3037 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
3038 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
3039 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
3040 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3041 1ee397ad 2019-07-12 stsp status, path2);
3042 234035bc 2019-06-01 stsp goto done;
3044 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3045 36bf999c 2020-07-23 stsp char *link_target2;
3046 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3049 36bf999c 2020-07-23 stsp goto done;
3050 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3051 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3052 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3053 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3054 36bf999c 2020-07-23 stsp free(link_target2);
3055 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3056 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3057 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3058 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3059 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3060 526a746f 2020-07-23 stsp a->progress_arg);
3062 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3063 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3066 dfe9fba0 2020-07-23 stsp goto done;
3067 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3068 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3069 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3070 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3072 234035bc 2019-06-01 stsp goto done;
3075 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3076 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3077 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3078 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3079 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3080 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
3082 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3083 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3084 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3087 234035bc 2019-06-01 stsp goto done;
3088 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3090 234035bc 2019-06-01 stsp goto done;
3091 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3092 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3093 3969253a 2020-03-07 stsp if (err) {
3094 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3095 3969253a 2020-03-07 stsp goto done;
3097 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3098 2b92fad7 2019-06-02 stsp if (err) {
3099 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3100 2b92fad7 2019-06-02 stsp goto done;
3102 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3103 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3104 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3109 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3110 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3111 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3112 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3113 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3114 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3115 1af628f4 2021-06-03 stsp free(id_str);
3116 54d5be07 2021-06-03 stsp free(label_deriv2);
3117 234035bc 2019-06-01 stsp free(ondisk_path);
3118 234035bc 2019-06-01 stsp return err;
3121 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
3122 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3123 234035bc 2019-06-01 stsp struct got_repository *repo;
3126 234035bc 2019-06-01 stsp static const struct got_error *
3127 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
3129 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3130 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
3131 234035bc 2019-06-01 stsp unsigned char status;
3132 234035bc 2019-06-01 stsp struct stat sb;
3133 234035bc 2019-06-01 stsp char *ondisk_path;
3135 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
3136 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3137 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
3138 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
3140 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3142 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3144 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3145 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3147 234035bc 2019-06-01 stsp return err;
3148 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3149 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3151 234035bc 2019-06-01 stsp return NULL;
3154 818c7501 2019-07-11 stsp static const struct got_error *
3155 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3156 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3157 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3158 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3159 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3161 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3162 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3163 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3164 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3165 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3167 03415a1a 2019-06-02 stsp if (commit_id1) {
3168 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3169 03415a1a 2019-06-02 stsp worktree->path_prefix);
3170 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3171 03415a1a 2019-06-02 stsp goto done;
3173 69d57f3d 2020-07-31 stsp if (tree_id1) {
3174 69d57f3d 2020-07-31 stsp char *id_str;
3176 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3178 03415a1a 2019-06-02 stsp goto done;
3180 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3182 f69721c3 2019-10-21 stsp goto done;
3184 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3185 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3186 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3187 f69721c3 2019-10-21 stsp free(id_str);
3188 f69721c3 2019-10-21 stsp goto done;
3190 f69721c3 2019-10-21 stsp free(id_str);
3193 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3194 234035bc 2019-06-01 stsp worktree->path_prefix);
3196 234035bc 2019-06-01 stsp goto done;
3198 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3200 234035bc 2019-06-01 stsp goto done;
3202 234035bc 2019-06-01 stsp arg.worktree = worktree;
3203 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3204 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3205 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3206 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3207 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3208 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3209 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3210 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3211 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3212 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3213 af12c6b9 2019-06-04 stsp err = sync_err;
3215 234035bc 2019-06-01 stsp if (tree1)
3216 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3217 234035bc 2019-06-01 stsp if (tree2)
3218 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3219 f69721c3 2019-10-21 stsp free(label_orig);
3220 818c7501 2019-07-11 stsp return err;
3223 818c7501 2019-07-11 stsp const struct got_error *
3224 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3225 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3226 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3227 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3229 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3230 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3231 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3232 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
3234 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3236 818c7501 2019-07-11 stsp return err;
3238 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3240 818c7501 2019-07-11 stsp goto done;
3242 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
3243 818c7501 2019-07-11 stsp mok_arg.repo = repo;
3244 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3245 818c7501 2019-07-11 stsp &mok_arg);
3247 818c7501 2019-07-11 stsp goto done;
3249 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3250 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3252 818c7501 2019-07-11 stsp if (fileindex)
3253 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3254 818c7501 2019-07-11 stsp free(fileindex_path);
3255 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3256 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3257 234035bc 2019-06-01 stsp err = unlockerr;
3258 234035bc 2019-06-01 stsp return err;
3261 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3262 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3263 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3264 927df6b7 2019-02-10 stsp const char *status_path;
3265 927df6b7 2019-02-10 stsp size_t status_path_len;
3266 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3267 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3268 f8d1f275 2019-02-04 stsp void *status_arg;
3269 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3270 f8d1f275 2019-02-04 stsp void *cancel_arg;
3271 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3272 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3273 f2a9dc41 2019-12-13 tracey int report_unchanged;
3274 3143d852 2020-06-25 stsp int no_ignores;
3277 f8d1f275 2019-02-04 stsp static const struct got_error *
3278 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3279 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3280 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3281 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3283 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3284 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3285 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3286 927df6b7 2019-02-10 stsp struct stat sb;
3287 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3288 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3289 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3291 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3293 98eaaa12 2019-08-03 stsp return err;
3295 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3296 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3297 98eaaa12 2019-08-03 stsp return NULL;
3299 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3300 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3301 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3303 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3304 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3305 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3307 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3308 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3309 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3310 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3311 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3314 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3315 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3318 927df6b7 2019-02-10 stsp static const struct got_error *
3319 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3320 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3322 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3323 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3324 f8d1f275 2019-02-04 stsp char *abspath;
3326 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3327 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3329 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3330 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3331 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3332 927df6b7 2019-02-10 stsp return NULL;
3334 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3335 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3336 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3337 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3339 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3340 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3341 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3344 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3345 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3346 f8d1f275 2019-02-04 stsp free(abspath);
3347 9d31a1d8 2018-03-11 stsp return err;
3350 f8d1f275 2019-02-04 stsp static const struct got_error *
3351 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3353 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3354 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3355 2ec1f75b 2019-03-26 stsp unsigned char status;
3357 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3358 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3360 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3361 927df6b7 2019-02-10 stsp return NULL;
3363 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3364 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3365 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3366 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3368 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3369 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3370 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3374 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3376 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3378 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3379 6841da00 2019-08-08 stsp free((char *)pe->path);
3380 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3384 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3386 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3388 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3389 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3390 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3391 6841da00 2019-08-08 stsp free((char *)pe->path);
3393 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3396 6841da00 2019-08-08 stsp static const struct got_error *
3397 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3399 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3400 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3401 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3402 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3403 6841da00 2019-08-08 stsp size_t linesize = 0;
3404 6841da00 2019-08-08 stsp ssize_t linelen;
3406 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3407 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3408 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3409 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3411 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3412 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3413 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3415 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3416 bd8de430 2019-10-04 stsp if (line[0] == '#')
3419 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3420 bd8de430 2019-10-04 stsp if (line[0] == '!')
3423 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3424 6841da00 2019-08-08 stsp line) == -1) {
3425 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3426 6841da00 2019-08-08 stsp goto done;
3428 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3430 6841da00 2019-08-08 stsp goto done;
3432 6841da00 2019-08-08 stsp if (ferror(f)) {
3433 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3434 6841da00 2019-08-08 stsp goto done;
3437 6841da00 2019-08-08 stsp dirpath = strdup(path);
3438 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3439 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3440 6841da00 2019-08-08 stsp goto done;
3442 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3444 6841da00 2019-08-08 stsp free(line);
3445 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3446 6841da00 2019-08-08 stsp free(dirpath);
3447 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3449 6841da00 2019-08-08 stsp return err;
3453 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3455 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3457 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3458 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3459 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3460 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3462 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3463 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3465 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3467 bd8de430 2019-10-04 stsp pattern += 3;
3469 bd8de430 2019-10-04 stsp while (*p) {
3470 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3471 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3472 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3473 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3475 bd8de430 2019-10-04 stsp while (*p == '/')
3485 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3486 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3487 6841da00 2019-08-08 stsp * ignores backwards.
3489 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3490 6841da00 2019-08-08 stsp while (pe) {
3491 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3492 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3493 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3494 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3495 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3496 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3497 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3498 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3499 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3504 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3510 6841da00 2019-08-08 stsp static const struct got_error *
3511 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3512 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3514 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3515 6841da00 2019-08-08 stsp char *ignorespath;
3516 886cec17 2019-12-15 stsp int fd = -1;
3517 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3519 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3520 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3521 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3523 886cec17 2019-12-15 stsp if (dirfd != -1) {
3524 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3525 886cec17 2019-12-15 stsp if (fd == -1) {
3526 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3527 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3528 886cec17 2019-12-15 stsp ignorespath);
3530 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3531 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3532 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3533 886cec17 2019-12-15 stsp ignorespath);
3536 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3540 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3541 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3542 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3543 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3544 886cec17 2019-12-15 stsp ignorespath);
3546 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3549 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3550 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3551 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3552 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3553 6841da00 2019-08-08 stsp free(ignorespath);
3554 6841da00 2019-08-08 stsp return err;
3557 f8d1f275 2019-02-04 stsp static const struct got_error *
3558 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3560 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3561 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3562 f8d1f275 2019-02-04 stsp char *path = NULL;
3564 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3565 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3567 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3568 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3569 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3571 f8d1f275 2019-02-04 stsp path = de->d_name;
3574 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3575 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3576 ff56836b 2021-07-08 stsp && !match_ignores(a->ignores, path))
3577 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3578 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3579 f8d1f275 2019-02-04 stsp if (parent_path[0])
3580 f8d1f275 2019-02-04 stsp free(path);
3581 b72f483a 2019-02-05 stsp return err;
3584 347d1d3e 2019-07-12 stsp static const struct got_error *
3585 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3587 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3588 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3590 3143d852 2020-06-25 stsp if (a->no_ignores)
3591 3143d852 2020-06-25 stsp return NULL;
3593 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3594 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3596 3143d852 2020-06-25 stsp return err;
3598 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3599 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3601 3143d852 2020-06-25 stsp return err;
3604 3143d852 2020-06-25 stsp static const struct got_error *
3605 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3606 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3607 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3608 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores)
3610 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3611 abb4604f 2019-07-27 stsp struct stat sb;
3613 ff56836b 2021-07-08 stsp if (match_ignores(ignores, path))
3614 ff56836b 2021-07-08 stsp return NULL;
3616 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3618 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3619 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3621 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3622 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3623 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3624 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3625 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3626 abb4604f 2019-07-27 stsp return NULL;
3629 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3630 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3631 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3633 abb4604f 2019-07-27 stsp return NULL;
3636 3143d852 2020-06-25 stsp static const struct got_error *
3637 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3638 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3640 3143d852 2020-06-25 stsp const struct got_error *err;
3641 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3643 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3644 3143d852 2020-06-25 stsp ".cvsignore");
3646 3143d852 2020-06-25 stsp return err;
3648 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3649 3143d852 2020-06-25 stsp ".gitignore");
3651 3143d852 2020-06-25 stsp return err;
3653 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3654 3143d852 2020-06-25 stsp if (err) {
3655 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3656 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3657 3143d852 2020-06-25 stsp return err;
3659 3143d852 2020-06-25 stsp for (;;) {
3660 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3661 3143d852 2020-06-25 stsp ".cvsignore");
3664 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3665 3143d852 2020-06-25 stsp ".gitignore");
3668 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3669 3143d852 2020-06-25 stsp if (err) {
3670 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3671 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3674 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3676 b737c85a 2020-06-26 stsp free(parent_path);
3677 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3678 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3681 b737c85a 2020-06-26 stsp free(parent_path);
3682 b737c85a 2020-06-26 stsp free(next_parent_path);
3683 3143d852 2020-06-25 stsp return err;
3686 abb4604f 2019-07-27 stsp static const struct got_error *
3687 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3688 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3689 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3690 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3691 f2a9dc41 2019-12-13 tracey int report_unchanged)
3693 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3694 6fc93f37 2019-12-13 stsp int fd = -1;
3695 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3696 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3697 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3698 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3700 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3702 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3703 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3704 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3706 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3707 6fc93f37 2019-12-13 stsp if (fd == -1) {
3708 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3709 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3710 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3712 ff56836b 2021-07-08 stsp if (!no_ignores) {
3713 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3714 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3716 ff56836b 2021-07-08 stsp goto done;
3718 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3719 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3720 ff56836b 2021-07-08 stsp report_unchanged, &ignores);
3723 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3724 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3725 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3726 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3727 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3728 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3729 abb4604f 2019-07-27 stsp arg.status_path = path;
3730 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3731 abb4604f 2019-07-27 stsp arg.repo = repo;
3732 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3733 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3734 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3735 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3736 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3737 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3738 022fae89 2019-12-06 tracey if (!no_ignores) {
3739 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3740 3143d852 2020-06-25 stsp worktree->root_path, path);
3742 3143d852 2020-06-25 stsp goto done;
3744 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3745 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3746 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3749 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3750 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3751 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3752 927df6b7 2019-02-10 stsp free(ondisk_path);
3753 347d1d3e 2019-07-12 stsp return err;
3756 347d1d3e 2019-07-12 stsp const struct got_error *
3757 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3758 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3759 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3760 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3762 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3763 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3764 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3765 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3767 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3769 347d1d3e 2019-07-12 stsp return err;
3771 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3772 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3773 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3774 f6343036 2021-06-22 stsp no_ignores, 0);
3778 f8d1f275 2019-02-04 stsp free(fileindex_path);
3779 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3780 f8d1f275 2019-02-04 stsp return err;
3783 6c7ab921 2019-03-18 stsp const struct got_error *
3784 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3785 6c7ab921 2019-03-18 stsp const char *arg)
3787 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3788 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3789 6c7ab921 2019-03-18 stsp size_t len;
3790 00bb5ea0 2020-07-23 stsp struct stat sb;
3791 01740607 2020-11-04 stsp char *abspath = NULL;
3792 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3794 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3796 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3797 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3798 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3800 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3801 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3802 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3803 00bb5ea0 2020-07-23 stsp goto done;
3805 727173c3 2020-11-06 stsp sb.st_mode = 0;
3807 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3809 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3810 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3811 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3812 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3814 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3815 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3816 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3817 00bb5ea0 2020-07-23 stsp goto done;
3821 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3822 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3824 d0710d08 2019-07-22 stsp goto done;
3825 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3826 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3827 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3828 00bb5ea0 2020-07-23 stsp goto done;
3831 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3832 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3833 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3834 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3835 00bb5ea0 2020-07-23 stsp goto done;
3837 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3838 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3839 01740607 2020-11-04 stsp goto done;
3841 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3842 01740607 2020-11-04 stsp sizeof(canonpath));
3844 00bb5ea0 2020-07-23 stsp goto done;
3845 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3846 01740607 2020-11-04 stsp if (resolved == NULL) {
3847 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3848 01740607 2020-11-04 stsp goto done;
3853 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3854 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3855 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3856 6c7ab921 2019-03-18 stsp goto done;
3859 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3860 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3861 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3863 f6d88e1a 2019-05-29 stsp goto done;
3865 f6d88e1a 2019-05-29 stsp path = strdup("");
3866 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3867 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3868 f6d88e1a 2019-05-29 stsp goto done;
3872 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3873 6c7ab921 2019-03-18 stsp len = strlen(path);
3874 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3875 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3879 01740607 2020-11-04 stsp free(abspath);
3880 6c7ab921 2019-03-18 stsp free(resolved);
3881 d0710d08 2019-07-22 stsp free(cwd);
3882 6c7ab921 2019-03-18 stsp if (err == NULL)
3883 6c7ab921 2019-03-18 stsp *wt_path = path;
3885 6c7ab921 2019-03-18 stsp free(path);
3886 d00136be 2019-03-26 stsp return err;
3889 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3890 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3891 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3892 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3893 4e68cba3 2019-11-23 stsp void *progress_arg;
3894 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3897 4e68cba3 2019-11-23 stsp static const struct got_error *
3898 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3899 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3900 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3901 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3903 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3904 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3905 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3906 6d022e97 2019-08-04 stsp struct stat sb;
3907 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3909 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3910 dbb83fbd 2019-12-12 stsp relpath) == -1)
3911 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3913 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3915 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3916 12463d8b 2019-12-13 stsp de_name, a->repo);
3918 dbb83fbd 2019-12-12 stsp goto done;
3919 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3920 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3921 dbb83fbd 2019-12-12 stsp goto done;
3922 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3924 dbb83fbd 2019-12-12 stsp goto done;
3927 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3928 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3929 dbb83fbd 2019-12-12 stsp goto done;
3932 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3934 4e68cba3 2019-11-23 stsp goto done;
3935 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3936 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3937 3969253a 2020-03-07 stsp if (err) {
3938 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3939 3969253a 2020-03-07 stsp goto done;
3941 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3942 07f5b47a 2019-06-02 stsp if (err) {
3943 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3944 4e68cba3 2019-11-23 stsp goto done;
3947 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3949 dbb83fbd 2019-12-12 stsp return err;
3950 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3951 dbb83fbd 2019-12-12 stsp return NULL;
3952 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3955 d00136be 2019-03-26 stsp const struct got_error *
3956 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3957 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3958 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3959 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3961 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3962 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3963 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3964 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3965 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3967 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3969 d00136be 2019-03-26 stsp return err;
3971 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3973 d00136be 2019-03-26 stsp goto done;
3975 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3976 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3977 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3978 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3979 4e68cba3 2019-11-23 stsp saa.repo = repo;
3981 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3982 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3983 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3987 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3988 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3989 af12c6b9 2019-06-04 stsp err = sync_err;
3991 fb399478 2019-07-12 stsp free(fileindex_path);
3992 d00136be 2019-03-26 stsp if (fileindex)
3993 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3994 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3995 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3996 d00136be 2019-03-26 stsp err = unlockerr;
3997 6c7ab921 2019-03-18 stsp return err;
4000 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4001 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4002 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4003 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4004 f2a9dc41 2019-12-13 tracey void *progress_arg;
4005 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4006 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4007 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4008 766841c2 2020-08-13 stsp const char *status_codes;
4011 f2a9dc41 2019-12-13 tracey static const struct got_error *
4012 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4013 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4014 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4015 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4017 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4018 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4019 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4020 17ed4618 2019-06-02 stsp struct stat sb;
4021 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4023 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4024 17ed4618 2019-06-02 stsp if (ie == NULL)
4025 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4027 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4028 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4029 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4030 9acbc4fa 2019-08-03 stsp return NULL;
4031 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4034 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4035 f2a9dc41 2019-12-13 tracey relpath) == -1)
4036 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4038 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4041 f2a9dc41 2019-12-13 tracey goto done;
4043 766841c2 2020-08-13 stsp if (a->status_codes) {
4044 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4046 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4047 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4050 766841c2 2020-08-13 stsp if (i == ncodes) {
4051 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4052 766841c2 2020-08-13 stsp free(ondisk_path);
4053 766841c2 2020-08-13 stsp return NULL;
4055 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4056 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4057 766841c2 2020-08-13 stsp static char msg[64];
4058 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4059 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4060 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4061 766841c2 2020-08-13 stsp goto done;
4065 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4066 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4067 f2a9dc41 2019-12-13 tracey goto done;
4068 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4069 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4070 f2a9dc41 2019-12-13 tracey goto done;
4072 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4073 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4074 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4075 f2a9dc41 2019-12-13 tracey goto done;
4079 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4080 20a2ad1c 2020-10-20 stsp size_t root_len;
4082 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4083 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4084 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4085 12463d8b 2019-12-13 stsp ondisk_path);
4086 12463d8b 2019-12-13 stsp goto done;
4088 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4089 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4090 12463d8b 2019-12-13 stsp goto done;
4093 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4095 20a2ad1c 2020-10-20 stsp char *parent;
4096 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4098 2513f20a 2020-10-20 stsp goto done;
4099 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4100 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4101 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4102 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4103 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4104 20a2ad1c 2020-10-20 stsp ondisk_path);
4107 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4108 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4111 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4113 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4114 f2a9dc41 2019-12-13 tracey if (err)
4115 f2a9dc41 2019-12-13 tracey return err;
4116 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4117 f2a9dc41 2019-12-13 tracey return NULL;
4118 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4119 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4122 2ec1f75b 2019-03-26 stsp const struct got_error *
4123 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4124 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4125 766841c2 2020-08-13 stsp const char *status_codes,
4126 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4127 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
4129 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4130 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4131 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4132 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4133 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4135 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4137 2ec1f75b 2019-03-26 stsp return err;
4139 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4141 2ec1f75b 2019-03-26 stsp goto done;
4143 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4144 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4145 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4146 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4147 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4148 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4149 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4150 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4152 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4153 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4154 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
4158 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4159 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4160 af12c6b9 2019-06-04 stsp err = sync_err;
4162 fb399478 2019-07-12 stsp free(fileindex_path);
4163 2ec1f75b 2019-03-26 stsp if (fileindex)
4164 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4165 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4166 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4167 2ec1f75b 2019-03-26 stsp err = unlockerr;
4168 33aa809d 2019-08-08 stsp return err;
4171 33aa809d 2019-08-08 stsp static const struct got_error *
4172 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4174 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4175 33aa809d 2019-08-08 stsp char *line = NULL;
4176 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4177 33aa809d 2019-08-08 stsp ssize_t linelen;
4179 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4180 33aa809d 2019-08-08 stsp if (linelen == -1) {
4181 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4182 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4183 33aa809d 2019-08-08 stsp goto done;
4185 33aa809d 2019-08-08 stsp return NULL;
4187 33aa809d 2019-08-08 stsp if (outfile) {
4188 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4189 33aa809d 2019-08-08 stsp if (n != linelen) {
4190 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4191 33aa809d 2019-08-08 stsp goto done;
4194 33aa809d 2019-08-08 stsp if (rejectfile) {
4195 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4196 33aa809d 2019-08-08 stsp if (n != linelen)
4197 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4200 33aa809d 2019-08-08 stsp free(line);
4201 2ec1f75b 2019-03-26 stsp return err;
4204 33aa809d 2019-08-08 stsp static const struct got_error *
4205 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4207 33aa809d 2019-08-08 stsp char *line = NULL;
4208 33aa809d 2019-08-08 stsp size_t linesize = 0;
4209 33aa809d 2019-08-08 stsp ssize_t linelen;
4211 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4212 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4213 500467ff 2019-09-25 hiltjo if (ferror(f))
4214 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4215 500467ff 2019-09-25 hiltjo return NULL;
4217 33aa809d 2019-08-08 stsp free(line);
4218 33aa809d 2019-08-08 stsp return NULL;
4221 33aa809d 2019-08-08 stsp static const struct got_error *
4222 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4223 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4224 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4226 33aa809d 2019-08-08 stsp const struct got_error *err;
4228 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4229 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4230 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4232 33aa809d 2019-08-08 stsp return err;
4233 33aa809d 2019-08-08 stsp (*line_cur1)++;
4235 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4236 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4237 33aa809d 2019-08-08 stsp if (rejectfile)
4238 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4240 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4242 33aa809d 2019-08-08 stsp return err;
4243 33aa809d 2019-08-08 stsp (*line_cur2)++;
4245 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4246 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4247 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4249 33aa809d 2019-08-08 stsp return err;
4250 33aa809d 2019-08-08 stsp (*line_cur2)++;
4252 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4253 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4254 33aa809d 2019-08-08 stsp if (rejectfile)
4255 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4257 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4259 33aa809d 2019-08-08 stsp return err;
4260 33aa809d 2019-08-08 stsp (*line_cur1)++;
4263 f1e81a05 2019-08-10 stsp return NULL;
4266 f1e81a05 2019-08-10 stsp static const struct got_error *
4267 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4268 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4270 f1e81a05 2019-08-10 stsp const struct got_error *err;
4272 f1e81a05 2019-08-10 stsp if (outfile) {
4273 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4274 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4275 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4277 f1e81a05 2019-08-10 stsp return err;
4278 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4281 f1e81a05 2019-08-10 stsp if (rejectfile) {
4282 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4283 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4284 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4286 f1e81a05 2019-08-10 stsp return err;
4287 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4291 33aa809d 2019-08-08 stsp return NULL;
4294 33aa809d 2019-08-08 stsp static const struct got_error *
4295 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4296 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4297 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4298 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4299 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4301 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4302 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4303 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4304 33aa809d 2019-08-08 stsp FILE *hunkfile;
4305 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4306 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4309 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4311 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4312 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4313 fe621944 2020-11-10 stsp start_old = cc.left.start;
4314 fe621944 2020-11-10 stsp end_old = cc.left.end;
4315 fe621944 2020-11-10 stsp start_new = cc.right.start;
4316 fe621944 2020-11-10 stsp end_new = cc.right.end;
4318 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4319 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4320 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4322 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4323 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4324 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4326 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4327 fe621944 2020-11-10 stsp if (diff_state == NULL)
4328 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4329 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4331 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4332 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4333 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4334 33aa809d 2019-08-08 stsp goto done;
4337 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4338 fe621944 2020-11-10 stsp diff_result, &cc);
4339 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4340 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4341 33aa809d 2019-08-08 stsp goto done;
4344 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4345 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4346 33aa809d 2019-08-08 stsp goto done;
4349 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4350 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4352 33aa809d 2019-08-08 stsp goto done;
4354 33aa809d 2019-08-08 stsp switch (*choice) {
4355 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4356 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4357 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4359 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4360 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4361 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4363 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4366 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4370 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4371 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4372 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4373 33aa809d 2019-08-08 stsp return err;
4376 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4377 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4378 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4379 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4380 1f1abb7e 2019-08-08 stsp void *progress_arg;
4381 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4382 33aa809d 2019-08-08 stsp void *patch_arg;
4383 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4386 e20a8b6f 2019-06-04 stsp static const struct got_error *
4387 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4388 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4389 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4390 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4391 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4393 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4394 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4395 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4396 1ebedb77 2019-10-19 stsp int fd2 = -1;
4397 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4398 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4399 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4400 fe621944 2020-11-10 stsp struct stat sb2;
4401 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4402 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4403 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4405 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4407 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4409 33aa809d 2019-08-08 stsp return err;
4411 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4412 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4413 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4414 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4415 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4416 fa3cef63 2020-07-23 stsp goto done;
4418 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4419 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4420 fa3cef63 2020-07-23 stsp if (link_len == -1)
4421 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4422 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4423 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4426 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4427 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4428 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4429 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4430 fa3cef63 2020-07-23 stsp goto done;
4432 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4433 fa3cef63 2020-07-23 stsp sizeof(link_target));
4434 fa3cef63 2020-07-23 stsp if (link_len == -1)
4435 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4436 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4437 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4440 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4441 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4442 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4443 fa3cef63 2020-07-23 stsp goto done;
4446 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4447 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4448 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4449 fa3cef63 2020-07-23 stsp goto done;
4454 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4455 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4456 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4457 fa3cef63 2020-07-23 stsp goto done;
4459 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4460 fa3cef63 2020-07-23 stsp if (n != link_len) {
4461 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4462 fa3cef63 2020-07-23 stsp goto done;
4464 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4465 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4466 fa3cef63 2020-07-23 stsp goto done;
4468 fa3cef63 2020-07-23 stsp rewind(f2);
4471 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4473 33aa809d 2019-08-08 stsp goto done;
4475 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4477 33aa809d 2019-08-08 stsp goto done;
4479 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4481 33aa809d 2019-08-08 stsp goto done;
4483 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4486 33aa809d 2019-08-08 stsp goto done;
4488 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4490 33aa809d 2019-08-08 stsp goto done;
4492 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4493 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4494 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4495 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4497 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4498 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4499 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4500 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4501 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4502 fe621944 2020-11-10 stsp nchanges++;
4504 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4505 33aa809d 2019-08-08 stsp int choice;
4506 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4507 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4508 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4509 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4510 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4511 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4513 33aa809d 2019-08-08 stsp goto done;
4514 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4515 33aa809d 2019-08-08 stsp have_content = 1;
4516 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4519 1ebedb77 2019-10-19 stsp if (have_content) {
4520 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4521 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4522 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4524 1ebedb77 2019-10-19 stsp goto done;
4526 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4527 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4528 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4529 fa3cef63 2020-07-23 stsp goto done;
4534 33aa809d 2019-08-08 stsp free(id_str);
4536 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4537 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4538 fe621944 2020-11-10 stsp if (err == NULL)
4539 fe621944 2020-11-10 stsp err = free_err;
4540 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4541 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4542 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4543 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4544 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4545 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4546 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4547 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4548 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4549 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4550 33aa809d 2019-08-08 stsp if (err || !have_content) {
4551 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4552 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4553 33aa809d 2019-08-08 stsp free(*path_outfile);
4554 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4556 33aa809d 2019-08-08 stsp free(path1);
4557 33aa809d 2019-08-08 stsp return err;
4560 33aa809d 2019-08-08 stsp static const struct got_error *
4561 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4562 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4563 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4564 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4566 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4567 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4568 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4569 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4570 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4571 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4572 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4573 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4574 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4575 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4577 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4578 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4579 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4580 d3bcc3d1 2019-08-08 stsp return NULL;
4582 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4583 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4584 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4586 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4587 65084dad 2019-08-08 stsp if (ie == NULL)
4588 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4590 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4591 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4592 a129376b 2019-03-28 stsp if (err) {
4593 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4594 a129376b 2019-03-28 stsp goto done;
4595 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4596 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4597 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4598 e20a8b6f 2019-06-04 stsp goto done;
4601 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4602 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4603 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4604 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4605 a129376b 2019-03-28 stsp goto done;
4608 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4609 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4610 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4611 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4612 a129376b 2019-03-28 stsp goto done;
4615 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4616 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4617 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4618 a129376b 2019-03-28 stsp goto done;
4623 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4624 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4625 a9fa2909 2019-07-27 stsp if (err) {
4626 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4627 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4628 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4629 a9fa2909 2019-07-27 stsp goto done;
4631 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4633 a9fa2909 2019-07-27 stsp goto done;
4635 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4637 a9fa2909 2019-07-27 stsp goto done;
4639 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4640 1233e6b6 2020-10-19 stsp free(te_name);
4641 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4642 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4643 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4644 a9fa2909 2019-07-27 stsp goto done;
4648 a129376b 2019-03-28 stsp switch (status) {
4649 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4650 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4651 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4652 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4653 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4655 33aa809d 2019-08-08 stsp goto done;
4656 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4659 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4660 1f1abb7e 2019-08-08 stsp ie->path);
4662 1ee397ad 2019-07-12 stsp goto done;
4663 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4665 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4666 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4667 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4668 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4669 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4671 33aa809d 2019-08-08 stsp goto done;
4672 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4675 33aa809d 2019-08-08 stsp /* fall through */
4676 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4677 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4678 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4679 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4680 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4681 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4682 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4683 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4684 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4686 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4687 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4688 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4690 65084dad 2019-08-08 stsp goto done;
4692 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4693 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4694 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4695 a129376b 2019-03-28 stsp goto done;
4698 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4699 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4700 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4701 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4702 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4703 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4704 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4706 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4707 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4708 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4709 369fd7e5 2020-07-23 stsp path_content);
4712 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4713 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4714 369fd7e5 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4715 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4717 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4718 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4719 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4720 369fd7e5 2020-07-23 stsp goto done;
4724 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4725 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4726 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4727 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4728 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4729 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4731 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4733 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4734 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4735 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4736 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4739 a129376b 2019-03-28 stsp goto done;
4740 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4741 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4742 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4743 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4744 437adc9d 2020-12-10 yzhong blob->id.sha1,
4745 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4747 2e1fa222 2020-07-23 stsp goto done;
4749 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4750 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4751 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4760 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4761 33aa809d 2019-08-08 stsp free(path_content);
4762 e20a8b6f 2019-06-04 stsp free(parent_path);
4763 a129376b 2019-03-28 stsp free(tree_path);
4765 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4767 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4768 a129376b 2019-03-28 stsp free(tree_id);
4769 e20a8b6f 2019-06-04 stsp return err;
4772 e20a8b6f 2019-06-04 stsp const struct got_error *
4773 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4774 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4775 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4776 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4777 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4779 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4780 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4781 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4782 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4783 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4784 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4786 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4788 e20a8b6f 2019-06-04 stsp return err;
4790 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4792 e20a8b6f 2019-06-04 stsp goto done;
4794 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4795 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4796 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4797 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4798 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4799 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4800 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4801 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4802 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4803 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4807 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4808 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4809 e20a8b6f 2019-06-04 stsp err = sync_err;
4811 fb399478 2019-07-12 stsp free(fileindex_path);
4812 a129376b 2019-03-28 stsp if (fileindex)
4813 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4814 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4815 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4816 a129376b 2019-03-28 stsp err = unlockerr;
4817 c4296144 2019-05-09 stsp return err;
4820 cf066bf8 2019-05-09 stsp static void
4821 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4823 24519714 2019-05-09 stsp free(ct->path);
4824 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4825 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4826 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4827 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4828 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4829 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4833 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4834 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4835 24519714 2019-05-09 stsp struct got_repository *repo;
4836 24519714 2019-05-09 stsp struct got_worktree *worktree;
4837 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4838 5f8a88c6 2019-08-03 stsp int have_staged_files;
4839 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4842 c4296144 2019-05-09 stsp static const struct got_error *
4843 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
4844 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4845 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4846 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4848 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
4849 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4850 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4851 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4852 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4853 768aea60 2019-05-09 stsp struct stat sb;
4855 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
4856 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4857 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4858 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4859 5f8a88c6 2019-08-03 stsp return NULL;
4861 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4862 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4864 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4865 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4866 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4867 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4868 5f8a88c6 2019-08-03 stsp return NULL;
4871 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4872 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4873 036813ee 2019-05-09 stsp goto done;
4875 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4876 036813ee 2019-05-09 stsp parent_path = strdup("");
4877 69960a46 2019-05-09 stsp if (parent_path == NULL)
4878 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4880 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4882 69960a46 2019-05-09 stsp return err;
4885 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4886 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4887 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4888 c4296144 2019-05-09 stsp goto done;
4891 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4892 768aea60 2019-05-09 stsp relpath) == -1) {
4893 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4894 768aea60 2019-05-09 stsp goto done;
4897 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4898 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4899 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4900 0aeb8099 2020-07-23 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4901 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4902 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4903 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4904 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4906 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4907 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4910 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4911 0aeb8099 2020-07-23 stsp goto done;
4913 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4914 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4915 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4916 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4917 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4918 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4919 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4920 12463d8b 2019-12-13 stsp ct->ondisk_path);
4921 12463d8b 2019-12-13 stsp goto done;
4923 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4924 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4925 768aea60 2019-05-09 stsp goto done;
4927 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4930 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4931 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4932 44d03001 2019-05-09 stsp relpath) == -1) {
4933 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4934 44d03001 2019-05-09 stsp goto done;
4937 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4938 35213c7c 2020-07-23 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4939 35213c7c 2020-07-23 stsp int is_bad_symlink;
4940 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4941 35213c7c 2020-07-23 stsp ssize_t target_len;
4942 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4943 35213c7c 2020-07-23 stsp sizeof(target_path));
4944 35213c7c 2020-07-23 stsp if (target_len == -1) {
4945 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4946 35213c7c 2020-07-23 stsp ct->ondisk_path);
4947 35213c7c 2020-07-23 stsp goto done;
4949 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4950 35213c7c 2020-07-23 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4952 35213c7c 2020-07-23 stsp goto done;
4953 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4954 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4955 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4956 35213c7c 2020-07-23 stsp goto done;
4961 cf066bf8 2019-05-09 stsp ct->status = status;
4962 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4963 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4964 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4965 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4966 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4967 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4968 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4969 b416585c 2019-05-13 stsp goto done;
4971 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4972 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4973 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4974 f0b75401 2019-08-03 stsp goto done;
4977 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4978 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4979 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4980 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4981 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4982 036813ee 2019-05-09 stsp goto done;
4985 24519714 2019-05-09 stsp ct->path = strdup(path);
4986 24519714 2019-05-09 stsp if (ct->path == NULL) {
4987 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4988 24519714 2019-05-09 stsp goto done;
4990 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4992 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4993 ed175427 2019-05-09 stsp free_commitable(ct);
4994 24519714 2019-05-09 stsp free(parent_path);
4995 036813ee 2019-05-09 stsp free(path);
4996 a129376b 2019-03-28 stsp return err;
4999 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5000 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5001 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5002 036813ee 2019-05-09 stsp struct got_repository *);
5004 ed175427 2019-05-09 stsp static const struct got_error *
5005 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5006 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5007 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5008 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5009 afa376bf 2019-05-09 stsp struct got_repository *repo)
5011 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5012 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5013 036813ee 2019-05-09 stsp char *subpath;
5015 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5016 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5017 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5019 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5021 ed175427 2019-05-09 stsp return err;
5023 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5024 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5025 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5026 036813ee 2019-05-09 stsp free(subpath);
5027 036813ee 2019-05-09 stsp return err;
5030 036813ee 2019-05-09 stsp static const struct got_error *
5031 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5033 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5034 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5036 036813ee 2019-05-09 stsp *match = 0;
5038 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5039 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5040 0f63689d 2019-05-10 stsp return NULL;
5043 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5045 0f63689d 2019-05-10 stsp return err;
5046 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5047 036813ee 2019-05-09 stsp free(ct_parent_path);
5048 036813ee 2019-05-09 stsp return err;
5051 768aea60 2019-05-09 stsp static mode_t
5052 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5054 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5055 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5057 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5060 036813ee 2019-05-09 stsp static const struct got_error *
5061 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5062 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5064 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5066 036813ee 2019-05-09 stsp *new_te = NULL;
5068 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5070 036813ee 2019-05-09 stsp goto done;
5072 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5074 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5075 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5076 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5078 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5080 036813ee 2019-05-09 stsp if (err && *new_te) {
5081 56e0773d 2019-11-28 stsp free(*new_te);
5082 036813ee 2019-05-09 stsp *new_te = NULL;
5084 036813ee 2019-05-09 stsp return err;
5087 036813ee 2019-05-09 stsp static const struct got_error *
5088 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5089 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5091 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5092 102b254e 2020-10-19 stsp char *ct_name = NULL;
5094 036813ee 2019-05-09 stsp *new_te = NULL;
5096 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5097 036813ee 2019-05-09 stsp if (*new_te == NULL)
5098 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5100 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5102 036813ee 2019-05-09 stsp goto done;
5103 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5104 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5105 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5106 036813ee 2019-05-09 stsp goto done;
5109 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5111 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5112 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5113 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5115 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5117 102b254e 2020-10-19 stsp free(ct_name);
5118 036813ee 2019-05-09 stsp if (err && *new_te) {
5119 56e0773d 2019-11-28 stsp free(*new_te);
5120 036813ee 2019-05-09 stsp *new_te = NULL;
5122 036813ee 2019-05-09 stsp return err;
5125 036813ee 2019-05-09 stsp static const struct got_error *
5126 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5127 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5129 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5130 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5132 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5134 036813ee 2019-05-09 stsp return err;
5135 036813ee 2019-05-09 stsp if (new_pe == NULL)
5136 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5137 036813ee 2019-05-09 stsp return NULL;
5140 afa376bf 2019-05-09 stsp static const struct got_error *
5141 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5142 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5144 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5145 5f8a88c6 2019-08-03 stsp unsigned char status;
5147 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5148 afa376bf 2019-05-09 stsp ct_path++;
5150 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5151 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5153 5f8a88c6 2019-08-03 stsp status = ct->status;
5155 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5156 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5159 036813ee 2019-05-09 stsp static const struct got_error *
5160 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5161 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5163 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5164 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5165 44d03001 2019-05-09 stsp char *te_path;
5167 44d03001 2019-05-09 stsp *modified = 0;
5169 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5170 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5171 44d03001 2019-05-09 stsp te->name) == -1)
5172 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5174 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5175 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5176 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5177 44d03001 2019-05-09 stsp strlen(te_path));
5178 62d463ca 2020-10-20 naddy if (*modified)
5182 44d03001 2019-05-09 stsp free(te_path);
5183 44d03001 2019-05-09 stsp return err;
5186 44d03001 2019-05-09 stsp static const struct got_error *
5187 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5188 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5189 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5191 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5192 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5194 036813ee 2019-05-09 stsp *ctp = NULL;
5196 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5197 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5198 036813ee 2019-05-09 stsp char *ct_name = NULL;
5199 036813ee 2019-05-09 stsp int path_matches;
5201 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5202 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5203 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5204 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5207 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5208 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5212 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5215 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5217 036813ee 2019-05-09 stsp return err;
5218 036813ee 2019-05-09 stsp if (!path_matches)
5221 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5223 d34b633e 2020-10-19 stsp return err;
5225 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5226 d34b633e 2020-10-19 stsp free(ct_name);
5229 d34b633e 2020-10-19 stsp free(ct_name);
5231 036813ee 2019-05-09 stsp *ctp = ct;
5235 2b496619 2019-07-10 stsp return err;
5238 2b496619 2019-07-10 stsp static const struct got_error *
5239 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5240 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5241 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5242 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5243 2b496619 2019-07-10 stsp struct got_repository *repo)
5245 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5246 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5247 2b496619 2019-07-10 stsp char *subtree_path;
5248 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5249 ba580f68 2020-03-22 stsp int nentries;
5251 2b496619 2019-07-10 stsp *new_tep = NULL;
5253 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5254 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5255 2b496619 2019-07-10 stsp child_path) == -1)
5256 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5258 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5259 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5260 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5261 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5263 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5264 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5265 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5266 2b496619 2019-07-10 stsp goto done;
5268 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5269 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5270 2b496619 2019-07-10 stsp if (err) {
5271 56e0773d 2019-11-28 stsp free(new_te);
5272 2b496619 2019-07-10 stsp goto done;
5274 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5277 2b496619 2019-07-10 stsp free(subtree_path);
5278 2b496619 2019-07-10 stsp if (err == NULL)
5279 2b496619 2019-07-10 stsp *new_tep = new_te;
5280 036813ee 2019-05-09 stsp return err;
5283 036813ee 2019-05-09 stsp static const struct got_error *
5284 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5285 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5286 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5287 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5288 036813ee 2019-05-09 stsp struct got_repository *repo)
5290 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5291 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5292 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5293 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5295 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5296 ba580f68 2020-03-22 stsp *nentries = 0;
5298 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5299 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5300 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5301 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5303 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5304 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5305 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5308 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5309 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5312 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5313 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5315 036813ee 2019-05-09 stsp goto done;
5317 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5318 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5319 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5321 036813ee 2019-05-09 stsp goto done;
5322 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5324 afa376bf 2019-05-09 stsp goto done;
5325 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5326 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5328 2f51b5b3 2019-05-09 stsp goto done;
5329 ba580f68 2020-03-22 stsp (*nentries)++;
5331 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5332 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5333 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5334 2b496619 2019-07-10 stsp == NULL) {
5335 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5336 2b496619 2019-07-10 stsp child_path, path_base_tree,
5337 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5340 2b496619 2019-07-10 stsp goto done;
5341 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5343 2b496619 2019-07-10 stsp goto done;
5344 ba580f68 2020-03-22 stsp (*nentries)++;
5349 2f51b5b3 2019-05-09 stsp if (base_tree) {
5350 56e0773d 2019-11-28 stsp int i, nbase_entries;
5351 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5352 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5353 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5354 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5356 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5357 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5358 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5359 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5361 63c5ca5d 2019-08-24 stsp goto done;
5362 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5364 63c5ca5d 2019-08-24 stsp goto done;
5365 ba580f68 2020-03-22 stsp (*nentries)++;
5369 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5370 44d03001 2019-05-09 stsp int modified;
5371 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5373 036813ee 2019-05-09 stsp goto done;
5374 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5375 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5377 2f51b5b3 2019-05-09 stsp goto done;
5378 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5379 44d03001 2019-05-09 stsp if (modified) {
5380 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5381 ba580f68 2020-03-22 stsp int nsubentries;
5382 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5383 ba580f68 2020-03-22 stsp &nsubentries, te,
5384 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5385 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5387 44d03001 2019-05-09 stsp goto done;
5388 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5389 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5390 ba580f68 2020-03-22 stsp free(new_id);
5393 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5394 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5395 56e0773d 2019-11-28 stsp free(new_id);
5397 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5399 036813ee 2019-05-09 stsp goto done;
5400 ba580f68 2020-03-22 stsp (*nentries)++;
5404 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5405 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5407 f66c734c 2019-09-22 stsp goto done;
5409 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5410 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5411 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5412 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5413 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5414 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5416 2f51b5b3 2019-05-09 stsp goto done;
5417 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5419 2f51b5b3 2019-05-09 stsp goto done;
5420 ba580f68 2020-03-22 stsp (*nentries)++;
5422 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5423 b416585c 2019-05-13 stsp status_arg);
5425 afa376bf 2019-05-09 stsp goto done;
5427 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5428 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5430 2f51b5b3 2019-05-09 stsp goto done;
5431 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5433 2f51b5b3 2019-05-09 stsp goto done;
5434 ba580f68 2020-03-22 stsp (*nentries)++;
5439 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5440 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5442 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5443 2e1fa222 2020-07-23 stsp return err;
5446 2e1fa222 2020-07-23 stsp static const struct got_error *
5447 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5448 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5449 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5450 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5452 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5453 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5454 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5456 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5457 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5458 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5460 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5462 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5463 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5464 437adc9d 2020-12-10 yzhong if (err)
5465 437adc9d 2020-12-10 yzhong goto done;
5468 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5469 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5470 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5471 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5472 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5473 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5474 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5475 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5477 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5478 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5479 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5480 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5481 72fd46fa 2019-09-06 stsp !have_staged_files);
5483 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5484 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5485 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5486 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5487 72fd46fa 2019-09-06 stsp !have_staged_files);
5489 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5491 437adc9d 2020-12-10 yzhong goto done;
5492 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5493 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5494 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5495 3969253a 2020-03-07 stsp if (err) {
5496 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5497 437adc9d 2020-12-10 yzhong goto done;
5499 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5500 3969253a 2020-03-07 stsp if (err) {
5501 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5502 437adc9d 2020-12-10 yzhong goto done;
5505 437adc9d 2020-12-10 yzhong free(relpath);
5506 437adc9d 2020-12-10 yzhong relpath = NULL;
5509 437adc9d 2020-12-10 yzhong free(relpath);
5510 d56d26ce 2019-05-10 stsp return err;
5514 d56d26ce 2019-05-10 stsp static const struct got_error *
5515 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5516 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5517 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5518 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5519 735ef5ac 2019-08-03 stsp int ood_errcode)
5521 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5522 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5524 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5525 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5526 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5527 1a36436d 2019-06-10 stsp return NULL;
5529 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5530 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5532 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5533 735ef5ac 2019-08-03 stsp in_repo_path);
5534 9bead371 2019-07-28 stsp if (err) {
5535 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5536 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5537 1a36436d 2019-06-10 stsp goto done;
5538 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5539 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5541 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5542 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5543 735ef5ac 2019-08-03 stsp in_repo_path);
5544 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5545 1a36436d 2019-06-10 stsp goto done;
5546 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5550 1a36436d 2019-06-10 stsp return err;
5553 c4296144 2019-05-09 stsp const struct got_error *
5554 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5555 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5556 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
5557 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5558 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5559 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5560 afa376bf 2019-05-09 stsp struct got_repository *repo)
5562 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5563 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5564 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5565 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5566 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5567 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5568 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5569 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5570 ba580f68 2020-03-22 stsp int nentries;
5571 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5572 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5573 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5575 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5577 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5579 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5581 588edf97 2019-05-10 stsp goto done;
5583 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5585 588edf97 2019-05-10 stsp goto done;
5587 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5588 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5593 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5594 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5598 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5599 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5600 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5601 cf066bf8 2019-05-09 stsp char *ondisk_path;
5603 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5604 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5605 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5608 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5609 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5610 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5613 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5614 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5615 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5616 cf066bf8 2019-05-09 stsp goto done;
5618 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5619 2e1fa222 2020-07-23 stsp free(ondisk_path);
5621 cf066bf8 2019-05-09 stsp goto done;
5624 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5625 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5626 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5628 036813ee 2019-05-09 stsp goto done;
5630 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5632 de18fc63 2019-05-09 stsp goto done;
5633 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5634 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5635 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
5636 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
5637 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5638 33ad4cbe 2019-05-12 jcs free(logmsg);
5640 9d40349a 2019-05-09 stsp goto done;
5642 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5643 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5644 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5645 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5646 09f5bd90 2019-05-09 stsp goto done;
5648 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5649 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5651 09f5bd90 2019-05-09 stsp goto done;
5652 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5654 ebf99748 2019-05-09 stsp goto done;
5655 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5656 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5657 09f5bd90 2019-05-09 stsp goto done;
5659 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5660 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5662 f2c16586 2019-05-09 stsp goto done;
5663 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5665 f2c16586 2019-05-09 stsp goto done;
5667 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5669 09f5bd90 2019-05-09 stsp goto done;
5671 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5673 ebf99748 2019-05-09 stsp goto done;
5675 588edf97 2019-05-10 stsp if (head_tree)
5676 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5677 588edf97 2019-05-10 stsp if (head_commit)
5678 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5679 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5680 2f17228e 2019-05-12 stsp if (head_ref2) {
5681 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5682 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5683 2f17228e 2019-05-12 stsp err = unlockerr;
5684 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5686 39cd0ff6 2019-07-12 stsp return err;
5689 5c1e53bc 2019-07-28 stsp static const struct got_error *
5690 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5691 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5693 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5694 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5696 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5697 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5698 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5700 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5701 5c1e53bc 2019-07-28 stsp ct_path++;
5703 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5704 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5708 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5709 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5711 5c1e53bc 2019-07-28 stsp return NULL;
5714 f0b75401 2019-08-03 stsp static const struct got_error *
5715 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5717 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5719 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5720 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5721 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5724 f0b75401 2019-08-03 stsp return NULL;
5727 5f8a88c6 2019-08-03 stsp static const struct got_error *
5728 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5729 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5731 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5732 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5734 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5735 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5737 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5738 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5739 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5740 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5741 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5742 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5745 5f8a88c6 2019-08-03 stsp return NULL;
5748 39cd0ff6 2019-07-12 stsp const struct got_error *
5749 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5750 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5751 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5752 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5753 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5754 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5756 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5757 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5758 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5759 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5760 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5761 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5762 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5763 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5764 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5766 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5768 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5770 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5772 39cd0ff6 2019-07-12 stsp goto done;
5774 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5776 39cd0ff6 2019-07-12 stsp goto done;
5778 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5780 39cd0ff6 2019-07-12 stsp goto done;
5782 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5784 39cd0ff6 2019-07-12 stsp goto done;
5786 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5787 5f8a88c6 2019-08-03 stsp &have_staged_files);
5788 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5789 5f8a88c6 2019-08-03 stsp goto done;
5790 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5791 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5793 5f8a88c6 2019-08-03 stsp goto done;
5796 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5797 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5798 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5799 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5800 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5801 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5802 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5803 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5804 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5806 5c1e53bc 2019-07-28 stsp goto done;
5809 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5810 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5811 39cd0ff6 2019-07-12 stsp goto done;
5814 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5815 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5817 5c1e53bc 2019-07-28 stsp goto done;
5820 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5821 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5822 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5824 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5825 f0b75401 2019-08-03 stsp ct_path++;
5826 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5827 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5828 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5830 b50cabdf 2019-07-12 stsp goto done;
5834 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5835 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
5836 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5838 39cd0ff6 2019-07-12 stsp goto done;
5840 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5841 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5842 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5843 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5844 39cd0ff6 2019-07-12 stsp err = sync_err;
5846 39cd0ff6 2019-07-12 stsp if (fileindex)
5847 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5848 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5849 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5850 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5851 39cd0ff6 2019-07-12 stsp err = unlockerr;
5852 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5853 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5854 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5856 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5857 c4296144 2019-05-09 stsp return err;
5860 8656d6c4 2019-05-20 stsp const char *
5861 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5863 8656d6c4 2019-05-20 stsp return ct->path;
5866 8656d6c4 2019-05-20 stsp unsigned int
5867 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5869 8656d6c4 2019-05-20 stsp return ct->status;
5872 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5873 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5874 818c7501 2019-07-11 stsp struct got_repository *repo;
5877 818c7501 2019-07-11 stsp static const struct got_error *
5878 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5880 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5881 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5882 818c7501 2019-07-11 stsp unsigned char status;
5883 818c7501 2019-07-11 stsp struct stat sb;
5884 818c7501 2019-07-11 stsp char *ondisk_path;
5886 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5887 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5888 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5889 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5891 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5893 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5895 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5896 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5897 818c7501 2019-07-11 stsp free(ondisk_path);
5899 818c7501 2019-07-11 stsp return err;
5901 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5902 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5903 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5904 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5906 818c7501 2019-07-11 stsp return NULL;
5909 818c7501 2019-07-11 stsp const struct got_error *
5910 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5911 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5912 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5913 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5915 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5916 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5917 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5918 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5919 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5920 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5921 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5923 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5924 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5925 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5927 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5929 818c7501 2019-07-11 stsp return err;
5931 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5933 818c7501 2019-07-11 stsp goto done;
5935 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5936 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5937 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5940 818c7501 2019-07-11 stsp goto done;
5942 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5944 818c7501 2019-07-11 stsp goto done;
5946 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5948 818c7501 2019-07-11 stsp goto done;
5950 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5952 818c7501 2019-07-11 stsp goto done;
5954 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5957 e51d7b55 2020-01-04 stsp goto done;
5959 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5961 818c7501 2019-07-11 stsp goto done;
5962 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5963 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5964 e51d7b55 2020-01-04 stsp goto done;
5967 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5968 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5970 818c7501 2019-07-11 stsp goto done;
5971 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5973 818c7501 2019-07-11 stsp goto done;
5975 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5977 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5979 818c7501 2019-07-11 stsp goto done;
5981 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5983 818c7501 2019-07-11 stsp goto done;
5985 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5986 818c7501 2019-07-11 stsp worktree->base_commit_id);
5988 818c7501 2019-07-11 stsp goto done;
5989 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5991 818c7501 2019-07-11 stsp goto done;
5993 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5995 818c7501 2019-07-11 stsp goto done;
5997 818c7501 2019-07-11 stsp free(fileindex_path);
5998 818c7501 2019-07-11 stsp free(tmp_branch_name);
5999 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6000 818c7501 2019-07-11 stsp free(branch_ref_name);
6001 818c7501 2019-07-11 stsp if (branch_ref)
6002 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6003 818c7501 2019-07-11 stsp if (wt_branch)
6004 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6005 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6006 818c7501 2019-07-11 stsp if (err) {
6007 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6008 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6009 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6011 818c7501 2019-07-11 stsp if (*tmp_branch) {
6012 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6013 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6015 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6016 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6017 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6019 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6021 818c7501 2019-07-11 stsp return err;
6024 818c7501 2019-07-11 stsp const struct got_error *
6025 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6026 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6027 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6028 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6030 818c7501 2019-07-11 stsp const struct got_error *err;
6031 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6032 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6033 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6034 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6035 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6037 818c7501 2019-07-11 stsp *commit_id = NULL;
6038 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6039 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6040 3e3a69f1 2019-07-25 stsp *branch = NULL;
6041 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6043 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6045 3e3a69f1 2019-07-25 stsp return err;
6047 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6049 f032f1f7 2019-08-04 stsp goto done;
6051 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6052 f032f1f7 2019-08-04 stsp &have_staged_files);
6053 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6054 f032f1f7 2019-08-04 stsp goto done;
6055 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6056 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6057 3e3a69f1 2019-07-25 stsp goto done;
6060 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6062 f032f1f7 2019-08-04 stsp goto done;
6064 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6066 818c7501 2019-07-11 stsp goto done;
6068 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6070 818c7501 2019-07-11 stsp goto done;
6072 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6074 818c7501 2019-07-11 stsp goto done;
6076 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6078 818c7501 2019-07-11 stsp goto done;
6080 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6081 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6083 818c7501 2019-07-11 stsp goto done;
6085 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6087 818c7501 2019-07-11 stsp goto done;
6089 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6091 818c7501 2019-07-11 stsp goto done;
6093 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6094 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6096 818c7501 2019-07-11 stsp goto done;
6098 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6100 818c7501 2019-07-11 stsp goto done;
6102 818c7501 2019-07-11 stsp free(commit_ref_name);
6103 818c7501 2019-07-11 stsp free(branch_ref_name);
6104 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6105 818c7501 2019-07-11 stsp if (commit_ref)
6106 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6107 818c7501 2019-07-11 stsp if (branch_ref)
6108 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6109 818c7501 2019-07-11 stsp if (err) {
6110 818c7501 2019-07-11 stsp free(*commit_id);
6111 818c7501 2019-07-11 stsp *commit_id = NULL;
6112 818c7501 2019-07-11 stsp if (*tmp_branch) {
6113 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6114 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6116 818c7501 2019-07-11 stsp if (*new_base_branch) {
6117 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6118 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6120 818c7501 2019-07-11 stsp if (*branch) {
6121 818c7501 2019-07-11 stsp got_ref_close(*branch);
6122 818c7501 2019-07-11 stsp *branch = NULL;
6124 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6125 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6126 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6128 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6130 818c7501 2019-07-11 stsp return err;
6133 818c7501 2019-07-11 stsp const struct got_error *
6134 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6136 818c7501 2019-07-11 stsp const struct got_error *err;
6137 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6139 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6141 818c7501 2019-07-11 stsp return err;
6143 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6144 818c7501 2019-07-11 stsp free(tmp_branch_name);
6145 818c7501 2019-07-11 stsp return NULL;
6148 818c7501 2019-07-11 stsp static const struct got_error *
6149 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6150 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6152 0ebf8283 2019-07-24 stsp *logmsg = arg;
6153 818c7501 2019-07-11 stsp return NULL;
6156 818c7501 2019-07-11 stsp static const struct got_error *
6157 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6158 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6159 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6160 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6162 818c7501 2019-07-11 stsp return NULL;
6165 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6166 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6167 01757395 2019-07-12 stsp void *progress_arg;
6168 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6171 01757395 2019-07-12 stsp static const struct got_error *
6172 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6174 01757395 2019-07-12 stsp const struct got_error *err;
6175 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6177 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6179 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6181 01757395 2019-07-12 stsp return err;
6183 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6184 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6185 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6186 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6187 01757395 2019-07-12 stsp return NULL;
6189 01757395 2019-07-12 stsp p = strdup(path);
6190 01757395 2019-07-12 stsp if (p == NULL)
6191 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6193 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6194 01757395 2019-07-12 stsp if (err || new == NULL)
6196 01757395 2019-07-12 stsp return err;
6200 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6202 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6204 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6205 01757395 2019-07-12 stsp free((char *)pe->path);
6207 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6210 0ebf8283 2019-07-24 stsp static const struct got_error *
6211 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6212 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6214 818c7501 2019-07-11 stsp const struct got_error *err;
6215 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6217 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6218 818c7501 2019-07-11 stsp if (err) {
6219 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6220 818c7501 2019-07-11 stsp goto done;
6221 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6223 818c7501 2019-07-11 stsp goto done;
6224 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6226 818c7501 2019-07-11 stsp goto done;
6227 de05890f 2020-03-05 stsp } else if (is_rebase) {
6228 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6231 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6233 818c7501 2019-07-11 stsp goto done;
6234 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6235 818c7501 2019-07-11 stsp free(stored_id);
6236 818c7501 2019-07-11 stsp if (cmp != 0) {
6237 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6238 818c7501 2019-07-11 stsp goto done;
6242 0ebf8283 2019-07-24 stsp if (commit_ref)
6243 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6244 0ebf8283 2019-07-24 stsp return err;
6247 0ebf8283 2019-07-24 stsp static const struct got_error *
6248 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6249 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6250 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6251 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6252 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6253 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6255 0ebf8283 2019-07-24 stsp const struct got_error *err;
6256 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6257 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6258 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6260 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6262 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6264 0ebf8283 2019-07-24 stsp return err;
6266 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6267 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6268 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6269 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6270 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6271 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6272 818c7501 2019-07-11 stsp if (commit_ref)
6273 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6274 818c7501 2019-07-11 stsp return err;
6277 818c7501 2019-07-11 stsp const struct got_error *
6278 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6279 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6280 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6281 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6282 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6283 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6285 0ebf8283 2019-07-24 stsp const struct got_error *err;
6286 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6288 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6290 0ebf8283 2019-07-24 stsp return err;
6292 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6294 0ebf8283 2019-07-24 stsp goto done;
6296 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6297 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6298 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6300 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6301 0ebf8283 2019-07-24 stsp return err;
6304 0ebf8283 2019-07-24 stsp const struct got_error *
6305 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6306 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6307 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6308 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6309 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6310 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6312 0ebf8283 2019-07-24 stsp const struct got_error *err;
6313 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6315 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6317 0ebf8283 2019-07-24 stsp return err;
6319 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6321 0ebf8283 2019-07-24 stsp goto done;
6323 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6324 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6325 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6327 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6328 0ebf8283 2019-07-24 stsp return err;
6331 0ebf8283 2019-07-24 stsp static const struct got_error *
6332 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6333 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6334 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6335 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6336 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6338 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6339 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6340 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6341 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6342 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6343 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6344 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6346 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6347 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6349 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6351 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6353 3e3a69f1 2019-07-25 stsp return err;
6355 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6356 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6357 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6358 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6360 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6361 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6362 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
6363 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6365 01757395 2019-07-12 stsp if (merged_paths) {
6366 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6367 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6368 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6369 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6372 01757395 2019-07-12 stsp goto done;
6375 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6376 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6378 01757395 2019-07-12 stsp goto done;
6381 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6382 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6383 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6385 a0e95631 2019-07-12 stsp goto done;
6386 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6387 a0e95631 2019-07-12 stsp goto done;
6390 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6392 edd02c5e 2019-07-11 stsp goto done;
6394 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6396 818c7501 2019-07-11 stsp goto done;
6398 5943eee2 2019-08-13 stsp if (new_logmsg) {
6399 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6400 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6401 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6402 5943eee2 2019-08-13 stsp goto done;
6405 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6407 5943eee2 2019-08-13 stsp goto done;
6410 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6411 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6412 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
6413 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6414 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6416 a0e95631 2019-07-12 stsp goto done;
6418 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6420 a0e95631 2019-07-12 stsp goto done;
6422 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6424 a0e95631 2019-07-12 stsp goto done;
6426 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6427 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6428 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6429 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6430 a0e95631 2019-07-12 stsp err = sync_err;
6432 a0e95631 2019-07-12 stsp free(fileindex_path);
6433 a0e95631 2019-07-12 stsp free(head_commit_id);
6434 a0e95631 2019-07-12 stsp if (head_ref)
6435 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6436 818c7501 2019-07-11 stsp if (err) {
6437 818c7501 2019-07-11 stsp free(*new_commit_id);
6438 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6440 818c7501 2019-07-11 stsp return err;
6443 818c7501 2019-07-11 stsp const struct got_error *
6444 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6445 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6446 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6447 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6448 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6450 0ebf8283 2019-07-24 stsp const struct got_error *err;
6451 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6452 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6453 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6455 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6457 0ebf8283 2019-07-24 stsp return err;
6459 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6461 0ebf8283 2019-07-24 stsp goto done;
6462 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6464 0ebf8283 2019-07-24 stsp goto done;
6465 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6466 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6467 0ebf8283 2019-07-24 stsp goto done;
6470 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6471 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6473 0ebf8283 2019-07-24 stsp if (commit_ref)
6474 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6475 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6476 0ebf8283 2019-07-24 stsp free(commit_id);
6477 0ebf8283 2019-07-24 stsp return err;
6480 0ebf8283 2019-07-24 stsp const struct got_error *
6481 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6482 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6483 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6484 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6485 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6486 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6488 0ebf8283 2019-07-24 stsp const struct got_error *err;
6489 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6490 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6492 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6494 0ebf8283 2019-07-24 stsp return err;
6496 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6498 0ebf8283 2019-07-24 stsp goto done;
6500 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6501 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6503 0ebf8283 2019-07-24 stsp if (commit_ref)
6504 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6505 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6506 0ebf8283 2019-07-24 stsp return err;
6509 0ebf8283 2019-07-24 stsp const struct got_error *
6510 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6511 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6513 3e3a69f1 2019-07-25 stsp if (fileindex)
6514 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6515 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6518 69844fba 2019-07-11 stsp static const struct got_error *
6519 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6521 69844fba 2019-07-11 stsp const struct got_error *err;
6522 69844fba 2019-07-11 stsp struct got_reference *ref;
6524 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6525 69844fba 2019-07-11 stsp if (err) {
6526 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6527 69844fba 2019-07-11 stsp return NULL;
6528 69844fba 2019-07-11 stsp return err;
6531 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6532 69844fba 2019-07-11 stsp got_ref_close(ref);
6533 69844fba 2019-07-11 stsp return err;
6536 69844fba 2019-07-11 stsp static const struct got_error *
6537 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6539 69844fba 2019-07-11 stsp const struct got_error *err;
6540 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6541 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6543 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6545 69844fba 2019-07-11 stsp goto done;
6546 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6548 69844fba 2019-07-11 stsp goto done;
6550 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6552 69844fba 2019-07-11 stsp goto done;
6553 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6555 69844fba 2019-07-11 stsp goto done;
6557 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6559 69844fba 2019-07-11 stsp goto done;
6560 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6562 69844fba 2019-07-11 stsp goto done;
6564 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6566 69844fba 2019-07-11 stsp goto done;
6567 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6569 69844fba 2019-07-11 stsp goto done;
6572 69844fba 2019-07-11 stsp free(tmp_branch_name);
6573 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6574 69844fba 2019-07-11 stsp free(branch_ref_name);
6575 69844fba 2019-07-11 stsp free(commit_ref_name);
6576 e600f124 2021-03-21 stsp return err;
6579 e600f124 2021-03-21 stsp const struct got_error *
6580 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6581 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6583 e600f124 2021-03-21 stsp const struct got_error *err;
6584 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6585 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6586 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6587 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6588 e600f124 2021-03-21 stsp char *refname = NULL;
6590 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6591 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6592 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6593 e600f124 2021-03-21 stsp branch_name += 11;
6595 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6597 e600f124 2021-03-21 stsp return err;
6599 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6600 e600f124 2021-03-21 stsp new_id_str) == -1) {
6601 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6602 e600f124 2021-03-21 stsp goto done;
6605 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6607 e600f124 2021-03-21 stsp goto done;
6609 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6611 e600f124 2021-03-21 stsp goto done;
6613 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6615 e600f124 2021-03-21 stsp free(new_id_str);
6616 e600f124 2021-03-21 stsp free(refname);
6617 e600f124 2021-03-21 stsp free(old_commit_id);
6619 e600f124 2021-03-21 stsp got_ref_close(ref);
6620 69844fba 2019-07-11 stsp return err;
6623 818c7501 2019-07-11 stsp const struct got_error *
6624 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6625 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6626 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6627 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6629 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6630 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6631 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6633 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6635 818c7501 2019-07-11 stsp return err;
6637 e600f124 2021-03-21 stsp if (create_backup) {
6638 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6639 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6641 e600f124 2021-03-21 stsp goto done;
6644 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6646 818c7501 2019-07-11 stsp goto done;
6648 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6650 818c7501 2019-07-11 stsp goto done;
6652 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6654 818c7501 2019-07-11 stsp goto done;
6656 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6658 a615e0e7 2020-12-16 stsp goto done;
6660 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6662 a615e0e7 2020-12-16 stsp goto done;
6663 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6664 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6665 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6666 a615e0e7 2020-12-16 stsp err = sync_err;
6668 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6669 a615e0e7 2020-12-16 stsp free(fileindex_path);
6670 818c7501 2019-07-11 stsp free(new_head_commit_id);
6671 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6672 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6673 818c7501 2019-07-11 stsp err = unlockerr;
6674 818c7501 2019-07-11 stsp return err;
6677 818c7501 2019-07-11 stsp const struct got_error *
6678 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6679 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6680 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6681 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6683 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6684 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6685 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6686 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6687 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6688 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6690 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6692 818c7501 2019-07-11 stsp return err;
6694 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6695 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6697 818c7501 2019-07-11 stsp goto done;
6699 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6701 818c7501 2019-07-11 stsp goto done;
6704 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6705 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6706 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6708 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6710 818c7501 2019-07-11 stsp goto done;
6712 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6714 818c7501 2019-07-11 stsp goto done;
6716 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6717 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6719 ca355955 2019-07-12 stsp goto done;
6721 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6723 ca355955 2019-07-12 stsp goto done;
6725 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6727 818c7501 2019-07-11 stsp goto done;
6729 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6730 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6731 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6732 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6733 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6734 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6735 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6736 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6737 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6739 1f1abb7e 2019-08-08 stsp goto sync;
6741 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6742 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6744 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6745 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6746 ca355955 2019-07-12 stsp err = sync_err;
6748 818c7501 2019-07-11 stsp got_ref_close(resolved);
6749 a3a2faf2 2019-07-12 stsp free(tree_id);
6750 818c7501 2019-07-11 stsp free(commit_id);
6751 0ebf8283 2019-07-24 stsp if (fileindex)
6752 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6753 0ebf8283 2019-07-24 stsp free(fileindex_path);
6755 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6756 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6757 0ebf8283 2019-07-24 stsp err = unlockerr;
6758 0ebf8283 2019-07-24 stsp return err;
6761 0ebf8283 2019-07-24 stsp const struct got_error *
6762 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6763 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6764 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6765 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6767 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6768 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6769 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6770 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6771 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6772 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6773 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6774 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6776 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6777 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6778 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6779 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6781 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6783 0ebf8283 2019-07-24 stsp return err;
6785 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6787 0ebf8283 2019-07-24 stsp goto done;
6789 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6790 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6791 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6794 0ebf8283 2019-07-24 stsp goto done;
6796 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6798 0ebf8283 2019-07-24 stsp goto done;
6800 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6802 0ebf8283 2019-07-24 stsp goto done;
6804 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6805 0ebf8283 2019-07-24 stsp worktree);
6807 0ebf8283 2019-07-24 stsp goto done;
6809 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6812 0ebf8283 2019-07-24 stsp goto done;
6814 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6816 0ebf8283 2019-07-24 stsp goto done;
6818 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6820 0ebf8283 2019-07-24 stsp goto done;
6822 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6823 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6825 0ebf8283 2019-07-24 stsp goto done;
6826 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6828 0ebf8283 2019-07-24 stsp goto done;
6829 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6830 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6831 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6832 0ebf8283 2019-07-24 stsp goto done;
6835 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6836 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6838 0ebf8283 2019-07-24 stsp goto done;
6839 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6841 0ebf8283 2019-07-24 stsp goto done;
6843 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6845 0ebf8283 2019-07-24 stsp goto done;
6847 0ebf8283 2019-07-24 stsp free(fileindex_path);
6848 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6849 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6850 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6851 0ebf8283 2019-07-24 stsp if (wt_branch)
6852 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6853 0ebf8283 2019-07-24 stsp if (err) {
6854 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6855 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6856 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6858 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6859 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6860 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6862 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6863 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6864 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6865 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6867 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6869 0ebf8283 2019-07-24 stsp return err;
6872 0ebf8283 2019-07-24 stsp const struct got_error *
6873 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6874 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6876 3e3a69f1 2019-07-25 stsp if (fileindex)
6877 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6878 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6881 0ebf8283 2019-07-24 stsp const struct got_error *
6882 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6883 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6885 0ebf8283 2019-07-24 stsp const struct got_error *err;
6886 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6888 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6890 0ebf8283 2019-07-24 stsp return err;
6892 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6893 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6894 0ebf8283 2019-07-24 stsp return NULL;
6897 0ebf8283 2019-07-24 stsp const struct got_error *
6898 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6899 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6900 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6901 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6903 0ebf8283 2019-07-24 stsp const struct got_error *err;
6904 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6905 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6906 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6907 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6908 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6909 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6911 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6912 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6913 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6914 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6916 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6918 3e3a69f1 2019-07-25 stsp return err;
6920 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6922 f032f1f7 2019-08-04 stsp goto done;
6924 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6925 f032f1f7 2019-08-04 stsp &have_staged_files);
6926 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6927 f032f1f7 2019-08-04 stsp goto done;
6928 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6929 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6930 3e3a69f1 2019-07-25 stsp goto done;
6933 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6935 f032f1f7 2019-08-04 stsp goto done;
6937 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6939 0ebf8283 2019-07-24 stsp goto done;
6941 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6943 0ebf8283 2019-07-24 stsp goto done;
6945 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6946 0ebf8283 2019-07-24 stsp worktree);
6948 0ebf8283 2019-07-24 stsp goto done;
6950 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6952 0ebf8283 2019-07-24 stsp goto done;
6954 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6956 0ebf8283 2019-07-24 stsp goto done;
6957 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6959 0ebf8283 2019-07-24 stsp goto done;
6961 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6963 0ebf8283 2019-07-24 stsp goto done;
6964 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6966 0ebf8283 2019-07-24 stsp goto done;
6968 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6970 0ebf8283 2019-07-24 stsp goto done;
6972 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6973 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6974 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6975 0ebf8283 2019-07-24 stsp if (commit_ref)
6976 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6977 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6978 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6979 0ebf8283 2019-07-24 stsp if (err) {
6980 0ebf8283 2019-07-24 stsp free(*commit_id);
6981 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6982 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6983 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6984 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6985 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6986 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6988 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6989 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6990 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6992 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6994 0ebf8283 2019-07-24 stsp return err;
6997 0ebf8283 2019-07-24 stsp static const struct got_error *
6998 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7000 0ebf8283 2019-07-24 stsp const struct got_error *err;
7001 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7002 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7004 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7006 0ebf8283 2019-07-24 stsp goto done;
7007 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7009 0ebf8283 2019-07-24 stsp goto done;
7011 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7012 0ebf8283 2019-07-24 stsp worktree);
7014 0ebf8283 2019-07-24 stsp goto done;
7015 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7017 0ebf8283 2019-07-24 stsp goto done;
7019 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7021 0ebf8283 2019-07-24 stsp goto done;
7022 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7024 0ebf8283 2019-07-24 stsp goto done;
7026 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7028 0ebf8283 2019-07-24 stsp goto done;
7029 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7031 0ebf8283 2019-07-24 stsp goto done;
7033 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7034 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7035 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7036 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7037 0ebf8283 2019-07-24 stsp return err;
7040 0ebf8283 2019-07-24 stsp const struct got_error *
7041 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7042 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7043 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7044 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7046 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7047 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7048 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7049 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7050 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7052 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7054 0ebf8283 2019-07-24 stsp return err;
7056 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7057 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7059 0ebf8283 2019-07-24 stsp goto done;
7061 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7063 0ebf8283 2019-07-24 stsp goto done;
7065 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7067 0ebf8283 2019-07-24 stsp goto done;
7069 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7070 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7072 0ebf8283 2019-07-24 stsp goto done;
7074 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7076 0ebf8283 2019-07-24 stsp goto done;
7078 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7080 0ebf8283 2019-07-24 stsp goto done;
7082 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7083 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7084 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7085 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7086 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7087 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7088 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7089 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7090 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
7092 1f1abb7e 2019-08-08 stsp goto sync;
7094 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7095 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7097 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7098 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7099 0ebf8283 2019-07-24 stsp err = sync_err;
7101 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7102 0ebf8283 2019-07-24 stsp free(tree_id);
7103 818c7501 2019-07-11 stsp free(fileindex_path);
7105 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7106 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7107 818c7501 2019-07-11 stsp err = unlockerr;
7108 818c7501 2019-07-11 stsp return err;
7111 0ebf8283 2019-07-24 stsp const struct got_error *
7112 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7113 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7114 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7116 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7117 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7118 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7119 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7121 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7123 0ebf8283 2019-07-24 stsp return err;
7125 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7126 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7128 e600f124 2021-03-21 stsp goto done;
7130 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7131 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7133 0ebf8283 2019-07-24 stsp goto done;
7135 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7137 0ebf8283 2019-07-24 stsp goto done;
7139 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7141 0ebf8283 2019-07-24 stsp goto done;
7143 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7145 0ebf8283 2019-07-24 stsp goto done;
7147 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7149 a615e0e7 2020-12-16 stsp goto done;
7151 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7153 a615e0e7 2020-12-16 stsp goto done;
7154 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7155 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7156 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7157 a615e0e7 2020-12-16 stsp err = sync_err;
7159 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7160 a615e0e7 2020-12-16 stsp free(fileindex_path);
7161 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7162 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7163 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7164 0ebf8283 2019-07-24 stsp err = unlockerr;
7165 0ebf8283 2019-07-24 stsp return err;
7168 0ebf8283 2019-07-24 stsp const struct got_error *
7169 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7170 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7172 0ebf8283 2019-07-24 stsp const struct got_error *err;
7173 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7175 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7177 0ebf8283 2019-07-24 stsp return err;
7179 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7181 0ebf8283 2019-07-24 stsp goto done;
7183 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7185 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7186 2822a352 2019-10-15 stsp return err;
7189 2822a352 2019-10-15 stsp const struct got_error *
7190 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7191 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7192 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7193 2822a352 2019-10-15 stsp struct got_repository *repo)
7195 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7196 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7197 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7199 2822a352 2019-10-15 stsp *fileindex = NULL;
7200 2822a352 2019-10-15 stsp *branch_ref = NULL;
7201 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7203 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7205 2822a352 2019-10-15 stsp return err;
7207 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7208 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7209 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7210 2822a352 2019-10-15 stsp "update -b or different branch name required");
7211 2822a352 2019-10-15 stsp goto done;
7214 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7216 2822a352 2019-10-15 stsp goto done;
7218 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7219 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7220 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7221 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7224 2822a352 2019-10-15 stsp goto done;
7226 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7228 2822a352 2019-10-15 stsp goto done;
7230 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7231 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7233 2822a352 2019-10-15 stsp if (err) {
7234 2822a352 2019-10-15 stsp if (*branch_ref) {
7235 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7236 2822a352 2019-10-15 stsp *branch_ref = NULL;
7238 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7239 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7240 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7242 2822a352 2019-10-15 stsp if (*fileindex) {
7243 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7244 2822a352 2019-10-15 stsp *fileindex = NULL;
7246 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7248 0cb83759 2019-08-03 stsp return err;
7251 2822a352 2019-10-15 stsp const struct got_error *
7252 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7253 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7254 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7255 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7256 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7258 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7259 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7260 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7262 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7264 2822a352 2019-10-15 stsp goto done;
7266 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7268 2822a352 2019-10-15 stsp goto done;
7270 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7271 2822a352 2019-10-15 stsp worktree->path_prefix);
7273 2822a352 2019-10-15 stsp goto done;
7275 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7277 2822a352 2019-10-15 stsp goto done;
7279 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7280 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7282 2822a352 2019-10-15 stsp goto sync;
7284 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7286 2822a352 2019-10-15 stsp goto sync;
7288 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7290 6e210706 2021-01-22 stsp goto sync;
7292 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7294 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7295 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7296 2822a352 2019-10-15 stsp err = sync_err;
7299 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7300 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7301 2822a352 2019-10-15 stsp err = unlockerr;
7302 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7304 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7305 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7306 2822a352 2019-10-15 stsp err = unlockerr;
7307 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7309 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7310 2822a352 2019-10-15 stsp free(fileindex_path);
7311 2822a352 2019-10-15 stsp free(tree_id);
7313 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7314 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7315 2822a352 2019-10-15 stsp err = unlockerr;
7316 2822a352 2019-10-15 stsp return err;
7319 2822a352 2019-10-15 stsp const struct got_error *
7320 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7321 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7322 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7324 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7326 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7328 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7330 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7331 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7332 8b692cd0 2019-10-21 stsp err = unlockerr;
7333 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7335 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7336 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7337 8b692cd0 2019-10-21 stsp err = unlockerr;
7338 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7340 8b692cd0 2019-10-21 stsp return err;
7343 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7344 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7345 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7346 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7347 2db2652d 2019-08-07 stsp struct got_repository *repo;
7348 2db2652d 2019-08-07 stsp int have_changes;
7351 2db2652d 2019-08-07 stsp const struct got_error *
7352 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7353 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7354 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7355 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7357 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7358 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7359 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7360 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7361 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7362 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7364 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7365 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7366 8b13ce36 2019-08-08 stsp return NULL;
7367 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7368 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7370 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7371 735ef5ac 2019-08-03 stsp if (ie == NULL)
7372 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7374 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7375 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7376 735ef5ac 2019-08-03 stsp relpath) == -1)
7377 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7379 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7380 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7381 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7382 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7385 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7386 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7387 3aa5969e 2019-08-06 stsp goto done;
7388 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7389 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7390 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7391 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7392 735ef5ac 2019-08-03 stsp goto done;
7395 2db2652d 2019-08-07 stsp a->have_changes = 1;
7397 735ef5ac 2019-08-03 stsp p = in_repo_path;
7398 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7400 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7401 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7402 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7404 735ef5ac 2019-08-03 stsp free(in_repo_path);
7405 dc424a06 2019-08-07 stsp return err;
7408 2db2652d 2019-08-07 stsp struct stage_path_arg {
7409 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7410 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7411 2db2652d 2019-08-07 stsp struct got_repository *repo;
7412 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7413 2db2652d 2019-08-07 stsp void *status_arg;
7414 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7415 2db2652d 2019-08-07 stsp void *patch_arg;
7416 7b5dc508 2019-10-28 stsp int staged_something;
7417 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7420 2db2652d 2019-08-07 stsp static const struct got_error *
7421 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7422 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7423 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7424 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7426 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7427 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7428 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7429 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7430 0cb83759 2019-08-03 stsp uint32_t stage;
7431 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7432 0aeb8099 2020-07-23 stsp struct stat sb;
7434 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7435 8b13ce36 2019-08-08 stsp return NULL;
7437 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7438 d3e7c587 2019-08-03 stsp if (ie == NULL)
7439 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7441 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7442 2db2652d 2019-08-07 stsp relpath)== -1)
7443 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7445 0cb83759 2019-08-03 stsp switch (status) {
7446 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7447 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7448 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7449 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7450 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7453 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7454 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7455 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7456 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7457 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7460 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7463 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7464 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7465 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7466 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7467 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7471 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7472 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7475 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7476 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7477 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7478 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7480 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7481 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7482 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7483 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7484 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7485 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7486 35213c7c 2020-07-23 stsp ssize_t target_len;
7487 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7488 35213c7c 2020-07-23 stsp sizeof(target_path));
7489 35213c7c 2020-07-23 stsp if (target_len == -1) {
7490 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7491 35213c7c 2020-07-23 stsp ondisk_path);
7494 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7495 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7496 35213c7c 2020-07-23 stsp a->worktree->root_path);
7499 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7500 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7501 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7505 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7506 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7507 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7509 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7510 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7512 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7513 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7515 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7516 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7518 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7519 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7520 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7522 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7523 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7525 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7526 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7527 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7528 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7531 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7533 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7534 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7538 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
7539 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7540 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7541 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7543 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7544 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7547 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
7549 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
7550 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7552 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
7553 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
7556 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7560 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
7561 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
7562 dc424a06 2019-08-07 stsp free(path_content);
7563 2db2652d 2019-08-07 stsp free(ondisk_path);
7564 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
7565 0ebf8283 2019-07-24 stsp return err;
7568 0cb83759 2019-08-03 stsp const struct got_error *
7569 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
7570 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
7571 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
7572 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7573 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
7575 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7576 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
7577 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7578 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
7579 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
7580 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
7581 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
7582 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
7584 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7586 0cb83759 2019-08-03 stsp return err;
7588 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
7589 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
7591 735ef5ac 2019-08-03 stsp goto done;
7592 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7594 735ef5ac 2019-08-03 stsp goto done;
7595 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7597 0cb83759 2019-08-03 stsp goto done;
7599 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
7600 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
7601 2db2652d 2019-08-07 stsp oka.worktree = worktree;
7602 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
7603 2db2652d 2019-08-07 stsp oka.repo = repo;
7604 2db2652d 2019-08-07 stsp oka.have_changes = 0;
7605 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7606 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7607 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
7609 735ef5ac 2019-08-03 stsp goto done;
7611 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
7612 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7613 2db2652d 2019-08-07 stsp goto done;
7616 2db2652d 2019-08-07 stsp spa.worktree = worktree;
7617 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
7618 2db2652d 2019-08-07 stsp spa.repo = repo;
7619 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
7620 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
7621 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
7622 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
7623 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
7624 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
7625 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7626 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7627 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
7629 2db2652d 2019-08-07 stsp goto done;
7631 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
7632 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7633 7b5dc508 2019-10-28 stsp goto done;
7636 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7637 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
7638 0cb83759 2019-08-03 stsp err = sync_err;
7640 735ef5ac 2019-08-03 stsp if (head_ref)
7641 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
7642 735ef5ac 2019-08-03 stsp free(head_commit_id);
7643 0cb83759 2019-08-03 stsp free(fileindex_path);
7644 0cb83759 2019-08-03 stsp if (fileindex)
7645 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
7646 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7647 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
7648 0cb83759 2019-08-03 stsp err = unlockerr;
7649 0cb83759 2019-08-03 stsp return err;
7652 ad493afc 2019-08-03 stsp struct unstage_path_arg {
7653 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
7654 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
7655 ad493afc 2019-08-03 stsp struct got_repository *repo;
7656 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
7657 ad493afc 2019-08-03 stsp void *progress_arg;
7658 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
7659 2e1f37b0 2019-08-08 stsp void *patch_arg;
7662 2e1f37b0 2019-08-08 stsp static const struct got_error *
7663 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
7664 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
7665 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
7666 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
7667 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
7669 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
7670 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
7671 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7672 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7673 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
7674 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
7675 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
7677 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7678 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7680 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
7682 2e1f37b0 2019-08-08 stsp return err;
7683 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7685 2e1f37b0 2019-08-08 stsp goto done;
7687 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7689 2e1f37b0 2019-08-08 stsp goto done;
7691 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7693 2e1f37b0 2019-08-08 stsp goto done;
7695 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7697 2e1f37b0 2019-08-08 stsp goto done;
7699 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7701 2e1f37b0 2019-08-08 stsp goto done;
7703 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7705 2e1f37b0 2019-08-08 stsp goto done;
7707 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
7708 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
7710 2e1f37b0 2019-08-08 stsp goto done;
7712 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
7713 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
7715 2e1f37b0 2019-08-08 stsp goto done;
7716 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
7717 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
7719 2e1f37b0 2019-08-08 stsp goto done;
7721 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
7722 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
7723 2e1f37b0 2019-08-08 stsp goto done;
7725 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
7726 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
7727 2e1f37b0 2019-08-08 stsp goto done;
7729 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
7730 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
7731 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
7732 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
7733 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
7734 fe621944 2020-11-10 stsp nchanges++;
7736 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
7737 2e1f37b0 2019-08-08 stsp int choice;
7738 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
7739 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
7740 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
7741 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
7743 2e1f37b0 2019-08-08 stsp goto done;
7744 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
7745 2e1f37b0 2019-08-08 stsp have_content = 1;
7747 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
7748 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
7751 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
7752 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7753 f1e81a05 2019-08-10 stsp outfile, rejectfile);
7755 2e1f37b0 2019-08-08 stsp free(label1);
7757 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
7758 2e1f37b0 2019-08-08 stsp if (staged_blob)
7759 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
7760 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
7761 fe621944 2020-11-10 stsp if (free_err && err == NULL)
7762 fe621944 2020-11-10 stsp err = free_err;
7763 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
7764 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
7765 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
7766 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
7767 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
7768 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
7769 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7770 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
7771 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
7772 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
7773 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
7774 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
7775 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
7776 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
7777 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
7778 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7779 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
7780 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
7781 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7783 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
7784 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
7785 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
7786 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7787 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
7788 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
7789 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7791 2e1f37b0 2019-08-08 stsp free(path1);
7792 2e1f37b0 2019-08-08 stsp free(path2);
7793 fda8017d 2020-07-23 stsp return err;
7796 fda8017d 2020-07-23 stsp static const struct got_error *
7797 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
7798 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
7799 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
7800 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
7801 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
7802 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7803 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7805 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
7806 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
7807 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
7808 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
7809 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
7810 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
7811 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
7812 fda8017d 2020-07-23 stsp struct stat sb;
7814 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
7815 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
7816 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
7818 fda8017d 2020-07-23 stsp return err;
7820 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
7821 fda8017d 2020-07-23 stsp return NULL;
7823 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
7824 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
7825 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
7827 fda8017d 2020-07-23 stsp goto done;
7830 fda8017d 2020-07-23 stsp f = fopen(path_unstaged_content, "r");
7831 fda8017d 2020-07-23 stsp if (f == NULL) {
7832 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
7833 fda8017d 2020-07-23 stsp path_unstaged_content);
7834 fda8017d 2020-07-23 stsp goto done;
7836 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
7837 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
7838 fda8017d 2020-07-23 stsp goto done;
7840 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
7841 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
7842 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
7844 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
7845 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
7846 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
7847 fda8017d 2020-07-23 stsp goto done;
7849 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
7850 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
7851 fda8017d 2020-07-23 stsp goto done;
7853 fda8017d 2020-07-23 stsp link_target[r] = '\0';
7854 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
7855 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
7856 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
7857 fda8017d 2020-07-23 stsp progress_arg);
7859 fda8017d 2020-07-23 stsp int local_changes_subsumed;
7861 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
7863 67a66647 2021-05-31 stsp return err;
7865 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
7866 67a66647 2021-05-31 stsp parent) == -1) {
7867 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
7868 67a66647 2021-05-31 stsp base_path = NULL;
7869 67a66647 2021-05-31 stsp goto done;
7872 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
7874 67a66647 2021-05-31 stsp goto done;
7875 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
7876 67a66647 2021-05-31 stsp blob_base);
7878 67a66647 2021-05-31 stsp goto done;
7881 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
7882 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
7884 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
7885 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
7886 eec2f5a9 2021-06-03 stsp ondisk_path);
7888 eec2f5a9 2021-06-03 stsp goto done;
7891 eec2f5a9 2021-06-03 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
7892 eec2f5a9 2021-06-03 stsp if (fd == -1) {
7893 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
7894 eec2f5a9 2021-06-03 stsp goto done;
7896 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
7897 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
7898 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
7899 eec2f5a9 2021-06-03 stsp close(fd);
7900 eec2f5a9 2021-06-03 stsp goto done;
7904 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
7905 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
7906 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
7907 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
7908 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
7911 fda8017d 2020-07-23 stsp goto done;
7913 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
7914 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7915 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
7917 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7918 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
7921 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
7922 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
7923 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
7924 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
7925 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
7926 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
7927 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
7928 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
7929 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
7930 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
7931 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
7932 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
7933 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
7934 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
7935 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
7936 fda8017d 2020-07-23 stsp free(path_unstaged_content);
7937 fda8017d 2020-07-23 stsp free(path_new_staged_content);
7938 67a66647 2021-05-31 stsp free(blob_base_path);
7939 67a66647 2021-05-31 stsp free(parent);
7940 67a66647 2021-05-31 stsp free(base_path);
7941 2e1f37b0 2019-08-08 stsp return err;
7944 ad493afc 2019-08-03 stsp static const struct got_error *
7945 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
7946 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
7947 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7948 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7950 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
7951 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
7952 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
7953 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7954 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
7955 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
7956 ad493afc 2019-08-03 stsp int local_changes_subsumed;
7957 9bc94a15 2019-08-03 stsp struct stat sb;
7959 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
7960 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
7961 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
7962 2e1f37b0 2019-08-08 stsp return NULL;
7964 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7965 ad493afc 2019-08-03 stsp if (ie == NULL)
7966 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7968 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7970 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
7972 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
7973 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
7975 f69721c3 2019-10-21 stsp goto done;
7976 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7977 f69721c3 2019-10-21 stsp id_str) == -1) {
7978 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
7979 f69721c3 2019-10-21 stsp goto done;
7982 ad493afc 2019-08-03 stsp switch (staged_status) {
7983 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
7984 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
7985 ad493afc 2019-08-03 stsp blob_id, 8192);
7988 ad493afc 2019-08-03 stsp /* fall through */
7989 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
7990 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7991 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
7992 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7993 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7994 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7997 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8000 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8001 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8002 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8003 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8004 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8005 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8008 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8009 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
8012 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8013 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8014 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8015 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8016 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8017 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8018 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8019 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8020 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8022 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8023 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8024 36bf999c 2020-07-23 stsp char *staged_target;
8025 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8026 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8028 36bf999c 2020-07-23 stsp goto done;
8029 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8030 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8031 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8032 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8033 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8034 36bf999c 2020-07-23 stsp free(staged_target);
8036 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8037 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8038 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8039 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8040 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8041 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8042 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8046 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8049 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8050 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8051 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8052 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8055 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8056 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8057 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8058 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8059 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8062 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8064 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8065 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8069 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8070 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8071 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8072 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8075 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8079 ad493afc 2019-08-03 stsp free(ondisk_path);
8080 ad493afc 2019-08-03 stsp if (blob_base)
8081 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8082 ad493afc 2019-08-03 stsp if (blob_staged)
8083 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8084 f69721c3 2019-10-21 stsp free(id_str);
8085 f69721c3 2019-10-21 stsp free(label_orig);
8086 ad493afc 2019-08-03 stsp return err;
8089 ad493afc 2019-08-03 stsp const struct got_error *
8090 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8091 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8092 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8093 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8094 ad493afc 2019-08-03 stsp struct got_repository *repo)
8096 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8097 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8098 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8099 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8100 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8102 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8104 ad493afc 2019-08-03 stsp return err;
8106 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8108 ad493afc 2019-08-03 stsp goto done;
8110 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8111 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8112 ad493afc 2019-08-03 stsp upa.repo = repo;
8113 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8114 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8115 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8116 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8117 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8118 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8119 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
8121 ad493afc 2019-08-03 stsp goto done;
8124 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8125 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8126 ad493afc 2019-08-03 stsp err = sync_err;
8128 ad493afc 2019-08-03 stsp free(fileindex_path);
8129 ad493afc 2019-08-03 stsp if (fileindex)
8130 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8131 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8132 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8133 ad493afc 2019-08-03 stsp err = unlockerr;
8134 ad493afc 2019-08-03 stsp return err;
8137 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8138 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8139 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8140 b2118c49 2020-07-28 stsp void *info_arg;
8141 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8142 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8143 b2118c49 2020-07-28 stsp void *cancel_arg;
8146 b2118c49 2020-07-28 stsp static const struct got_error *
8147 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8149 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8150 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8151 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8152 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8153 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8154 b2118c49 2020-07-28 stsp int stage;
8156 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8157 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8159 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8160 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8161 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8164 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8165 b2118c49 2020-07-28 stsp return NULL;
8167 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8168 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8169 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8171 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8172 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8173 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8174 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8175 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8176 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8179 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8180 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8181 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8184 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8185 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8188 b2118c49 2020-07-28 stsp const struct got_error *
8189 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8190 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8191 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8192 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8195 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8196 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8197 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8198 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8200 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8202 b2118c49 2020-07-28 stsp return err;
8204 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8206 b2118c49 2020-07-28 stsp goto done;
8208 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8209 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8210 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8211 b2118c49 2020-07-28 stsp arg.paths = paths;
8212 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8213 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8214 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8217 b2118c49 2020-07-28 stsp free(fileindex_path);
8218 b2118c49 2020-07-28 stsp if (fileindex)
8219 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8220 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8221 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8222 b2118c49 2020-07-28 stsp err = unlockerr;
8223 b2118c49 2020-07-28 stsp return err;
