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;
2383 f259c4c1 2021-09-24 stsp static const struct got_error *
2384 f259c4c1 2021-09-24 stsp get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2386 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2387 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2390 f259c4c1 2021-09-24 stsp static const struct got_error *
2391 f259c4c1 2021-09-24 stsp get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2393 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2394 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2398 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2399 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2401 517bab73 2019-03-11 stsp static const struct got_error *
2402 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2404 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2405 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2406 517bab73 2019-03-11 stsp char *refname;
2408 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2410 517bab73 2019-03-11 stsp return err;
2412 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2414 0cd1c46a 2019-03-11 stsp goto done;
2416 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2418 0cd1c46a 2019-03-11 stsp free(refname);
2420 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2421 3e3a69f1 2019-07-25 stsp return err;
2424 3e3a69f1 2019-07-25 stsp static const struct got_error *
2425 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2427 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2429 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2430 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2431 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2432 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2434 9d31a1d8 2018-03-11 stsp return err;
2438 ebf99748 2019-05-09 stsp static const struct got_error *
2439 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2440 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2442 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2443 ebf99748 2019-05-09 stsp FILE *index = NULL;
2445 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2446 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2447 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2448 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2450 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2452 ebf99748 2019-05-09 stsp goto done;
2454 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2455 ebf99748 2019-05-09 stsp if (index == NULL) {
2456 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2457 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2459 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2460 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2461 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2464 ebf99748 2019-05-09 stsp if (err) {
2465 ebf99748 2019-05-09 stsp free(*fileindex_path);
2466 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2467 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2468 ebf99748 2019-05-09 stsp *fileindex = NULL;
2470 ebf99748 2019-05-09 stsp return err;
2473 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2474 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2475 c932eeeb 2019-05-22 stsp const char *path;
2476 c932eeeb 2019-05-22 stsp size_t path_len;
2477 c932eeeb 2019-05-22 stsp const char *entry_name;
2478 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2479 a484d721 2019-06-10 stsp void *progress_arg;
2482 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2483 c932eeeb 2019-05-22 stsp static const struct got_error *
2484 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2486 1ee397ad 2019-07-12 stsp const struct got_error *err;
2487 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2489 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2490 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2491 c932eeeb 2019-05-22 stsp return NULL;
2492 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2493 102ff934 2019-06-11 stsp return NULL;
2495 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2496 a769b60b 2021-06-27 stsp return NULL;
2498 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2499 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2500 c932eeeb 2019-05-22 stsp return NULL;
2502 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2503 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2504 edd02c5e 2019-07-11 stsp ie->path);
2506 1ee397ad 2019-07-12 stsp return err;
2508 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2509 c932eeeb 2019-05-22 stsp return NULL;
2512 a615e0e7 2020-12-16 stsp static const struct got_error *
2513 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2514 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2515 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2517 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2519 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2520 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2521 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2522 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2523 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2524 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2526 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2527 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2530 9c6338c4 2019-06-02 stsp static const struct got_error *
2531 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2533 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2534 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2535 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2536 867630bb 2020-01-17 stsp struct timespec timeout;
2538 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2539 9c6338c4 2019-06-02 stsp fileindex_path);
2541 9c6338c4 2019-06-02 stsp goto done;
2543 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2545 9c6338c4 2019-06-02 stsp goto done;
2547 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2548 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2549 9c6338c4 2019-06-02 stsp fileindex_path);
2550 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2554 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2555 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2556 867630bb 2020-01-17 stsp * was recorded in the file index.
2558 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2559 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2560 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2562 9c6338c4 2019-06-02 stsp if (new_index)
2563 9c6338c4 2019-06-02 stsp fclose(new_index);
2564 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2565 9c6338c4 2019-06-02 stsp return err;
2568 6ced4176 2019-07-12 stsp static const struct got_error *
2569 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2570 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2571 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2573 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2574 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2575 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2576 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2578 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2579 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2580 6ced4176 2019-07-12 stsp *tree_id = NULL;
2582 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2583 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2584 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2585 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2586 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2587 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2588 6ced4176 2019-07-12 stsp goto done;
2590 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2591 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2593 6ced4176 2019-07-12 stsp goto done;
2594 6ced4176 2019-07-12 stsp return NULL;
2597 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2599 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2600 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2601 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2602 6ced4176 2019-07-12 stsp goto done;
2605 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2606 6ced4176 2019-07-12 stsp in_repo_path);
2608 6ced4176 2019-07-12 stsp goto done;
2610 6ced4176 2019-07-12 stsp free(in_repo_path);
2611 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2613 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2615 6ced4176 2019-07-12 stsp goto done;
2617 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2618 6ced4176 2019-07-12 stsp /* Check out a single file. */
2619 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2620 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2621 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2622 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2623 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2624 6ced4176 2019-07-12 stsp goto done;
2626 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2627 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2628 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2629 6ced4176 2019-07-12 stsp goto done;
2632 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2633 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2635 6ced4176 2019-07-12 stsp return err;
2636 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2637 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2638 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2639 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2640 6ced4176 2019-07-12 stsp goto done;
2643 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2644 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2646 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2647 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2648 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2649 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2650 6ced4176 2019-07-12 stsp goto done;
2652 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2653 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2654 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2655 6ced4176 2019-07-12 stsp goto done;
2660 6ced4176 2019-07-12 stsp free(in_repo_path);
2661 6ced4176 2019-07-12 stsp if (err) {
2662 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2663 6ced4176 2019-07-12 stsp free(*tree_relpath);
2664 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2665 6ced4176 2019-07-12 stsp free(*tree_id);
2666 6ced4176 2019-07-12 stsp *tree_id = NULL;
2668 07ed472d 2019-07-12 stsp return err;
2671 07ed472d 2019-07-12 stsp static const struct got_error *
2672 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2673 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2674 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2675 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2677 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2678 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2679 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2680 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2681 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2683 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2684 7f47418f 2019-12-20 stsp if (err) {
2685 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2686 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2687 7f47418f 2019-12-20 stsp goto done;
2688 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2689 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2691 7f47418f 2019-12-20 stsp return err;
2694 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2695 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2697 07ed472d 2019-07-12 stsp goto done;
2699 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2701 07ed472d 2019-07-12 stsp goto done;
2703 07ed472d 2019-07-12 stsp if (entry_name &&
2704 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2705 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2706 07ed472d 2019-07-12 stsp goto done;
2709 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2710 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2711 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2712 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2713 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2714 07ed472d 2019-07-12 stsp arg.repo = repo;
2715 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2716 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2717 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2718 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2719 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2720 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2723 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2724 07ed472d 2019-07-12 stsp if (commit)
2725 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2726 6ced4176 2019-07-12 stsp return err;
2729 9d31a1d8 2018-03-11 stsp const struct got_error *
2730 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2731 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2732 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2733 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2735 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2736 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2737 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2738 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2739 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2740 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2741 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2742 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2743 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2744 f2ea84fa 2019-07-27 stsp int entry_type;
2745 f2ea84fa 2019-07-27 stsp char *relpath;
2746 f2ea84fa 2019-07-27 stsp char *entry_name;
2747 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2748 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2750 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2752 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2754 9d31a1d8 2018-03-11 stsp return err;
2756 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2757 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2758 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2759 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2760 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2761 f2ea84fa 2019-07-27 stsp goto done;
2764 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2765 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2766 f2ea84fa 2019-07-27 stsp if (err) {
2767 f2ea84fa 2019-07-27 stsp free(tpd);
2768 6ced4176 2019-07-12 stsp goto done;
2771 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2772 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2773 f2ea84fa 2019-07-27 stsp if (err) {
2774 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2775 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2776 f2ea84fa 2019-07-27 stsp free(tpd);
2777 f2ea84fa 2019-07-27 stsp goto done;
2780 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2782 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2786 51514078 2018-12-25 stsp * Read the file index.
2787 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2788 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2790 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2792 c4cdcb68 2019-04-03 stsp goto done;
2794 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2795 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2796 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2798 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2799 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2800 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2804 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2805 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2806 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2807 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2808 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2809 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2810 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2811 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2815 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2817 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2818 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2819 af12c6b9 2019-06-04 stsp err = sync_err;
2821 9c6338c4 2019-06-02 stsp free(fileindex_path);
2823 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2824 9d31a1d8 2018-03-11 stsp if (commit)
2825 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2826 5ade8233 2019-07-12 stsp if (fileindex)
2827 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2828 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2829 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2830 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2831 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2832 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2833 f2ea84fa 2019-07-27 stsp free(tpd);
2835 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2836 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2837 9d31a1d8 2018-03-11 stsp err = unlockerr;
2838 f8d1f275 2019-02-04 stsp return err;
2841 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2842 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2843 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2844 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2845 234035bc 2019-06-01 stsp void *progress_arg;
2846 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2847 234035bc 2019-06-01 stsp void *cancel_arg;
2848 f69721c3 2019-10-21 stsp const char *label_orig;
2849 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2852 234035bc 2019-06-01 stsp static const struct got_error *
2853 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2854 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2855 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2856 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2858 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2859 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2860 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2861 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2862 234035bc 2019-06-01 stsp struct stat sb;
2863 234035bc 2019-06-01 stsp unsigned char status;
2864 234035bc 2019-06-01 stsp int local_changes_subsumed;
2865 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2866 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2868 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2869 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2870 d6c87207 2019-08-02 stsp strlen(path2));
2871 1ee397ad 2019-07-12 stsp if (ie == NULL)
2872 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2873 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2875 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2876 234035bc 2019-06-01 stsp path2) == -1)
2877 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2879 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2882 234035bc 2019-06-01 stsp goto done;
2884 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2885 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2886 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2887 234035bc 2019-06-01 stsp goto done;
2889 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2890 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2891 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2892 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2893 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2894 234035bc 2019-06-01 stsp goto done;
2897 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2898 36bf999c 2020-07-23 stsp char *link_target2;
2899 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2901 36bf999c 2020-07-23 stsp goto done;
2902 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2903 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2904 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2905 36bf999c 2020-07-23 stsp free(link_target2);
2909 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2910 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2911 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2912 1af628f4 2021-06-03 stsp goto done;
2914 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2915 1af628f4 2021-06-03 stsp f_orig, blob1);
2917 1af628f4 2021-06-03 stsp goto done;
2919 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2920 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2921 1af628f4 2021-06-03 stsp goto done;
2922 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2923 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2925 1af628f4 2021-06-03 stsp goto done;
2927 1af628f4 2021-06-03 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
2928 1af628f4 2021-06-03 stsp if (fd == -1) {
2929 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2930 1af628f4 2021-06-03 stsp ondisk_path);
2931 1af628f4 2021-06-03 stsp goto done;
2933 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2934 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2935 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2936 1af628f4 2021-06-03 stsp ondisk_path);
2937 1af628f4 2021-06-03 stsp close(fd);
2938 1af628f4 2021-06-03 stsp goto done;
2940 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2942 1af628f4 2021-06-03 stsp goto done;
2943 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2944 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2945 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2946 1af628f4 2021-06-03 stsp goto done;
2948 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2949 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2950 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2951 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2952 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2954 234035bc 2019-06-01 stsp } else if (blob1) {
2955 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2956 d6c87207 2019-08-02 stsp strlen(path1));
2957 1ee397ad 2019-07-12 stsp if (ie == NULL)
2958 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2959 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2961 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2962 2b92fad7 2019-06-02 stsp path1) == -1)
2963 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2965 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2968 2b92fad7 2019-06-02 stsp goto done;
2970 2b92fad7 2019-06-02 stsp switch (status) {
2971 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2972 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2973 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2975 1ee397ad 2019-07-12 stsp goto done;
2976 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2978 2b92fad7 2019-06-02 stsp goto done;
2980 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2982 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2983 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2984 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2985 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2987 1ee397ad 2019-07-12 stsp goto done;
2989 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2991 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2992 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2993 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2995 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2996 0a22ca1a 2020-09-23 stsp * exists in the repository.
2998 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
3000 0a22ca1a 2020-09-23 stsp goto done;
3001 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
3002 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
3003 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
3005 0a22ca1a 2020-09-23 stsp goto done;
3006 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
3009 0a22ca1a 2020-09-23 stsp goto done;
3011 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
3014 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
3015 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
3017 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
3018 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
3021 0a22ca1a 2020-09-23 stsp goto done;
3024 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
3025 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
3026 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3027 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
3029 1ee397ad 2019-07-12 stsp goto done;
3031 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
3032 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
3034 1ee397ad 2019-07-12 stsp goto done;
3039 234035bc 2019-06-01 stsp } else if (blob2) {
3040 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3041 234035bc 2019-06-01 stsp path2) == -1)
3042 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3043 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
3044 d6c87207 2019-08-02 stsp strlen(path2));
3046 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
3047 7f91a133 2019-12-13 stsp -1, NULL, repo);
3049 234035bc 2019-06-01 stsp goto done;
3050 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
3051 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
3052 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
3053 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
3054 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3055 1ee397ad 2019-07-12 stsp status, path2);
3056 234035bc 2019-06-01 stsp goto done;
3058 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3059 36bf999c 2020-07-23 stsp char *link_target2;
3060 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3063 36bf999c 2020-07-23 stsp goto done;
3064 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3065 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3066 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3067 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3068 36bf999c 2020-07-23 stsp free(link_target2);
3069 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3070 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3071 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3072 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3073 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3074 526a746f 2020-07-23 stsp a->progress_arg);
3076 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3077 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3080 dfe9fba0 2020-07-23 stsp goto done;
3081 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3082 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3083 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3084 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3086 234035bc 2019-06-01 stsp goto done;
3089 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3090 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3091 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3092 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3093 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3094 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
3096 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3097 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3098 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3101 234035bc 2019-06-01 stsp goto done;
3102 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3104 234035bc 2019-06-01 stsp goto done;
3105 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3106 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3107 3969253a 2020-03-07 stsp if (err) {
3108 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3109 3969253a 2020-03-07 stsp goto done;
3111 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3112 2b92fad7 2019-06-02 stsp if (err) {
3113 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3114 2b92fad7 2019-06-02 stsp goto done;
3116 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3117 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3118 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3123 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3124 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3125 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3126 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3127 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3128 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3129 1af628f4 2021-06-03 stsp free(id_str);
3130 54d5be07 2021-06-03 stsp free(label_deriv2);
3131 234035bc 2019-06-01 stsp free(ondisk_path);
3132 234035bc 2019-06-01 stsp return err;
3135 69de9dd4 2021-09-03 stsp static const struct got_error *
3136 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3138 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3140 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3141 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3142 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3143 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3144 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3146 69de9dd4 2021-09-03 stsp return NULL;
3149 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3150 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3151 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3152 234035bc 2019-06-01 stsp struct got_repository *repo;
3155 234035bc 2019-06-01 stsp static const struct got_error *
3156 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3157 69de9dd4 2021-09-03 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3158 69de9dd4 2021-09-03 stsp struct got_object_id *id2, const char *path1, const char *path2,
3159 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3161 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3162 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3163 234035bc 2019-06-01 stsp unsigned char status;
3164 234035bc 2019-06-01 stsp struct stat sb;
3165 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3166 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3167 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3168 234035bc 2019-06-01 stsp char *ondisk_path;
3170 69de9dd4 2021-09-03 stsp if (id == NULL)
3171 69de9dd4 2021-09-03 stsp return NULL;
3173 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3174 69de9dd4 2021-09-03 stsp if (ie == NULL)
3175 69de9dd4 2021-09-03 stsp return NULL;
3177 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3179 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3181 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3182 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3183 5546d466 2021-09-02 stsp free(ondisk_path);
3185 234035bc 2019-06-01 stsp return err;
3186 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3187 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3189 234035bc 2019-06-01 stsp return NULL;
3192 818c7501 2019-07-11 stsp static const struct got_error *
3193 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3194 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3195 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3196 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3197 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3199 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3200 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3201 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3202 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3203 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3204 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3206 03415a1a 2019-06-02 stsp if (commit_id1) {
3207 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3208 03415a1a 2019-06-02 stsp worktree->path_prefix);
3209 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3210 03415a1a 2019-06-02 stsp goto done;
3212 69d57f3d 2020-07-31 stsp if (tree_id1) {
3213 69d57f3d 2020-07-31 stsp char *id_str;
3215 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3217 03415a1a 2019-06-02 stsp goto done;
3219 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3221 f69721c3 2019-10-21 stsp goto done;
3223 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3224 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3225 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3226 f69721c3 2019-10-21 stsp free(id_str);
3227 f69721c3 2019-10-21 stsp goto done;
3229 f69721c3 2019-10-21 stsp free(id_str);
3232 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3233 234035bc 2019-06-01 stsp worktree->path_prefix);
3235 234035bc 2019-06-01 stsp goto done;
3237 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3239 234035bc 2019-06-01 stsp goto done;
3241 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3242 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3243 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3244 69de9dd4 2021-09-03 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3245 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3247 69de9dd4 2021-09-03 stsp goto done;
3249 234035bc 2019-06-01 stsp arg.worktree = worktree;
3250 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3251 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3252 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3253 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3254 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3255 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3256 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3257 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3258 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3259 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3260 af12c6b9 2019-06-04 stsp err = sync_err;
3262 234035bc 2019-06-01 stsp if (tree1)
3263 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3264 234035bc 2019-06-01 stsp if (tree2)
3265 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3266 f69721c3 2019-10-21 stsp free(label_orig);
3267 818c7501 2019-07-11 stsp return err;
3270 818c7501 2019-07-11 stsp const struct got_error *
3271 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3272 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3273 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3274 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3276 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3277 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3278 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3280 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3282 818c7501 2019-07-11 stsp return err;
3284 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3286 818c7501 2019-07-11 stsp goto done;
3288 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3289 69de9dd4 2021-09-03 stsp worktree);
3291 818c7501 2019-07-11 stsp goto done;
3293 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3294 f259c4c1 2021-09-24 stsp commit_id2, repo, progress_cb, progress_arg,
3295 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
3297 818c7501 2019-07-11 stsp if (fileindex)
3298 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3299 818c7501 2019-07-11 stsp free(fileindex_path);
3300 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3301 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3302 234035bc 2019-06-01 stsp err = unlockerr;
3303 234035bc 2019-06-01 stsp return err;
3306 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3307 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3308 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3309 927df6b7 2019-02-10 stsp const char *status_path;
3310 927df6b7 2019-02-10 stsp size_t status_path_len;
3311 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3312 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3313 f8d1f275 2019-02-04 stsp void *status_arg;
3314 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3315 f8d1f275 2019-02-04 stsp void *cancel_arg;
3316 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3317 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3318 f2a9dc41 2019-12-13 tracey int report_unchanged;
3319 3143d852 2020-06-25 stsp int no_ignores;
3322 f8d1f275 2019-02-04 stsp static const struct got_error *
3323 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3324 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3325 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3326 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3328 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3329 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3330 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3331 927df6b7 2019-02-10 stsp struct stat sb;
3332 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3333 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3334 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3336 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3338 98eaaa12 2019-08-03 stsp return err;
3340 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3341 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3342 98eaaa12 2019-08-03 stsp return NULL;
3344 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3345 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3346 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3348 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3349 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3350 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3352 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3353 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3354 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3355 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3356 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3359 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3360 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3363 927df6b7 2019-02-10 stsp static const struct got_error *
3364 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3365 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3367 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3368 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3369 f8d1f275 2019-02-04 stsp char *abspath;
3371 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3372 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3374 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3375 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3376 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3377 927df6b7 2019-02-10 stsp return NULL;
3379 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3380 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3381 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3382 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3384 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3385 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3386 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3389 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3390 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3391 f8d1f275 2019-02-04 stsp free(abspath);
3392 9d31a1d8 2018-03-11 stsp return err;
3395 f8d1f275 2019-02-04 stsp static const struct got_error *
3396 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3398 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3399 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3400 2ec1f75b 2019-03-26 stsp unsigned char status;
3402 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3403 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3405 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3406 927df6b7 2019-02-10 stsp return NULL;
3408 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3409 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3410 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3411 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3413 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3414 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3415 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3419 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3421 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3423 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3424 6841da00 2019-08-08 stsp free((char *)pe->path);
3425 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3429 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3431 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3433 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3434 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3435 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3436 6841da00 2019-08-08 stsp free((char *)pe->path);
3438 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3441 6841da00 2019-08-08 stsp static const struct got_error *
3442 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3444 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3445 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3446 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3447 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3448 6841da00 2019-08-08 stsp size_t linesize = 0;
3449 6841da00 2019-08-08 stsp ssize_t linelen;
3451 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3452 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3453 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3454 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3456 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3457 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3458 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3460 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3461 bd8de430 2019-10-04 stsp if (line[0] == '#')
3464 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3465 bd8de430 2019-10-04 stsp if (line[0] == '!')
3468 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3469 6841da00 2019-08-08 stsp line) == -1) {
3470 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3471 6841da00 2019-08-08 stsp goto done;
3473 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3475 6841da00 2019-08-08 stsp goto done;
3477 6841da00 2019-08-08 stsp if (ferror(f)) {
3478 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3479 6841da00 2019-08-08 stsp goto done;
3482 6841da00 2019-08-08 stsp dirpath = strdup(path);
3483 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3484 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3485 6841da00 2019-08-08 stsp goto done;
3487 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3489 6841da00 2019-08-08 stsp free(line);
3490 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3491 6841da00 2019-08-08 stsp free(dirpath);
3492 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3494 6841da00 2019-08-08 stsp return err;
3498 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3500 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3502 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3503 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3504 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3505 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3507 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3508 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3510 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3512 bd8de430 2019-10-04 stsp pattern += 3;
3514 bd8de430 2019-10-04 stsp while (*p) {
3515 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3516 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3517 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3518 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3520 bd8de430 2019-10-04 stsp while (*p == '/')
3530 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3531 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3532 6841da00 2019-08-08 stsp * ignores backwards.
3534 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3535 6841da00 2019-08-08 stsp while (pe) {
3536 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3537 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3538 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3539 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3540 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3541 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3542 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3543 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3544 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3549 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3555 6841da00 2019-08-08 stsp static const struct got_error *
3556 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3557 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3559 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3560 6841da00 2019-08-08 stsp char *ignorespath;
3561 886cec17 2019-12-15 stsp int fd = -1;
3562 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3564 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3565 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3566 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3568 886cec17 2019-12-15 stsp if (dirfd != -1) {
3569 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3570 886cec17 2019-12-15 stsp if (fd == -1) {
3571 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3572 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3573 886cec17 2019-12-15 stsp ignorespath);
3575 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3576 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3577 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3578 886cec17 2019-12-15 stsp ignorespath);
3581 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3585 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3586 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3587 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3588 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3589 886cec17 2019-12-15 stsp ignorespath);
3591 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3594 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3595 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3596 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3597 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3598 6841da00 2019-08-08 stsp free(ignorespath);
3599 6841da00 2019-08-08 stsp return err;
3602 f8d1f275 2019-02-04 stsp static const struct got_error *
3603 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3605 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3606 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3607 f8d1f275 2019-02-04 stsp char *path = NULL;
3609 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3610 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3612 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3613 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3614 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3616 f8d1f275 2019-02-04 stsp path = de->d_name;
3619 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3620 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3621 ff56836b 2021-07-08 stsp && !match_ignores(a->ignores, path))
3622 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3623 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3624 f8d1f275 2019-02-04 stsp if (parent_path[0])
3625 f8d1f275 2019-02-04 stsp free(path);
3626 b72f483a 2019-02-05 stsp return err;
3629 347d1d3e 2019-07-12 stsp static const struct got_error *
3630 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3632 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3633 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3635 3143d852 2020-06-25 stsp if (a->no_ignores)
3636 3143d852 2020-06-25 stsp return NULL;
3638 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3639 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3641 3143d852 2020-06-25 stsp return err;
3643 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3644 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3646 3143d852 2020-06-25 stsp return err;
3649 3143d852 2020-06-25 stsp static const struct got_error *
3650 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3651 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3652 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3653 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3655 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3656 abb4604f 2019-07-27 stsp struct stat sb;
3658 0e33f8e0 2021-09-01 stsp if (!no_ignores && match_ignores(ignores, path))
3659 ff56836b 2021-07-08 stsp return NULL;
3661 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3663 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3664 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3666 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3667 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3668 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3669 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3670 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3671 abb4604f 2019-07-27 stsp return NULL;
3674 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3675 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3676 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3678 abb4604f 2019-07-27 stsp return NULL;
3681 3143d852 2020-06-25 stsp static const struct got_error *
3682 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3683 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3685 3143d852 2020-06-25 stsp const struct got_error *err;
3686 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3688 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3689 3143d852 2020-06-25 stsp ".cvsignore");
3691 3143d852 2020-06-25 stsp return err;
3693 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3694 3143d852 2020-06-25 stsp ".gitignore");
3696 3143d852 2020-06-25 stsp return err;
3698 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3699 3143d852 2020-06-25 stsp if (err) {
3700 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3701 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3702 3143d852 2020-06-25 stsp return err;
3704 3143d852 2020-06-25 stsp for (;;) {
3705 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3706 3143d852 2020-06-25 stsp ".cvsignore");
3709 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3710 3143d852 2020-06-25 stsp ".gitignore");
3713 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3714 3143d852 2020-06-25 stsp if (err) {
3715 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3716 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3719 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3721 b737c85a 2020-06-26 stsp free(parent_path);
3722 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3723 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3726 b737c85a 2020-06-26 stsp free(parent_path);
3727 b737c85a 2020-06-26 stsp free(next_parent_path);
3728 3143d852 2020-06-25 stsp return err;
3731 abb4604f 2019-07-27 stsp static const struct got_error *
3732 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3733 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3734 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3735 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3736 f2a9dc41 2019-12-13 tracey int report_unchanged)
3738 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3739 6fc93f37 2019-12-13 stsp int fd = -1;
3740 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3741 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3742 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3743 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3745 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3747 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3748 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3749 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3751 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3752 6fc93f37 2019-12-13 stsp if (fd == -1) {
3753 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3754 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3755 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3757 ff56836b 2021-07-08 stsp if (!no_ignores) {
3758 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3759 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3761 ff56836b 2021-07-08 stsp goto done;
3763 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3764 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3765 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3768 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3769 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3770 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3771 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3772 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3773 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3774 abb4604f 2019-07-27 stsp arg.status_path = path;
3775 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3776 abb4604f 2019-07-27 stsp arg.repo = repo;
3777 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3778 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3779 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3780 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3781 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3782 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3783 022fae89 2019-12-06 tracey if (!no_ignores) {
3784 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3785 3143d852 2020-06-25 stsp worktree->root_path, path);
3787 3143d852 2020-06-25 stsp goto done;
3789 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3790 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3791 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3794 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3795 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3796 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3797 927df6b7 2019-02-10 stsp free(ondisk_path);
3798 347d1d3e 2019-07-12 stsp return err;
3801 347d1d3e 2019-07-12 stsp const struct got_error *
3802 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3803 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3804 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3805 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3807 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3808 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3809 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3810 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3812 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3814 347d1d3e 2019-07-12 stsp return err;
3816 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3817 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3818 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3819 f6343036 2021-06-22 stsp no_ignores, 0);
3823 f8d1f275 2019-02-04 stsp free(fileindex_path);
3824 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3825 f8d1f275 2019-02-04 stsp return err;
3828 6c7ab921 2019-03-18 stsp const struct got_error *
3829 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3830 6c7ab921 2019-03-18 stsp const char *arg)
3832 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3833 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3834 6c7ab921 2019-03-18 stsp size_t len;
3835 00bb5ea0 2020-07-23 stsp struct stat sb;
3836 01740607 2020-11-04 stsp char *abspath = NULL;
3837 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3839 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3841 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3842 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3843 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3845 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3846 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3847 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3848 00bb5ea0 2020-07-23 stsp goto done;
3850 727173c3 2020-11-06 stsp sb.st_mode = 0;
3852 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3854 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3855 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3856 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3857 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3859 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3860 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3861 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3862 00bb5ea0 2020-07-23 stsp goto done;
3866 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3867 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3869 d0710d08 2019-07-22 stsp goto done;
3870 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3871 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3872 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3873 00bb5ea0 2020-07-23 stsp goto done;
3876 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3877 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3878 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3879 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3880 00bb5ea0 2020-07-23 stsp goto done;
3882 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3883 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3884 01740607 2020-11-04 stsp goto done;
3886 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3887 01740607 2020-11-04 stsp sizeof(canonpath));
3889 00bb5ea0 2020-07-23 stsp goto done;
3890 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3891 01740607 2020-11-04 stsp if (resolved == NULL) {
3892 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3893 01740607 2020-11-04 stsp goto done;
3898 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3899 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3900 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3901 6c7ab921 2019-03-18 stsp goto done;
3904 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3905 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3906 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3908 f6d88e1a 2019-05-29 stsp goto done;
3910 f6d88e1a 2019-05-29 stsp path = strdup("");
3911 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3912 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3913 f6d88e1a 2019-05-29 stsp goto done;
3917 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3918 6c7ab921 2019-03-18 stsp len = strlen(path);
3919 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3920 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3924 01740607 2020-11-04 stsp free(abspath);
3925 6c7ab921 2019-03-18 stsp free(resolved);
3926 d0710d08 2019-07-22 stsp free(cwd);
3927 6c7ab921 2019-03-18 stsp if (err == NULL)
3928 6c7ab921 2019-03-18 stsp *wt_path = path;
3930 6c7ab921 2019-03-18 stsp free(path);
3931 d00136be 2019-03-26 stsp return err;
3934 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3935 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3936 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3937 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3938 4e68cba3 2019-11-23 stsp void *progress_arg;
3939 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3942 4e68cba3 2019-11-23 stsp static const struct got_error *
3943 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3944 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3945 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3946 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3948 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3949 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3950 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3951 6d022e97 2019-08-04 stsp struct stat sb;
3952 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3954 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3955 dbb83fbd 2019-12-12 stsp relpath) == -1)
3956 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3958 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3960 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3961 12463d8b 2019-12-13 stsp de_name, a->repo);
3963 dbb83fbd 2019-12-12 stsp goto done;
3964 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3965 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3966 dbb83fbd 2019-12-12 stsp goto done;
3967 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3969 dbb83fbd 2019-12-12 stsp goto done;
3972 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3973 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3974 dbb83fbd 2019-12-12 stsp goto done;
3977 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3979 4e68cba3 2019-11-23 stsp goto done;
3980 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3981 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3982 3969253a 2020-03-07 stsp if (err) {
3983 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3984 3969253a 2020-03-07 stsp goto done;
3986 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3987 07f5b47a 2019-06-02 stsp if (err) {
3988 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3989 4e68cba3 2019-11-23 stsp goto done;
3992 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3994 dbb83fbd 2019-12-12 stsp return err;
3995 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3996 dbb83fbd 2019-12-12 stsp return NULL;
3997 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4000 d00136be 2019-03-26 stsp const struct got_error *
4001 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
4002 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
4003 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4004 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
4006 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4007 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
4008 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4009 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4010 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
4012 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4014 d00136be 2019-03-26 stsp return err;
4016 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4018 d00136be 2019-03-26 stsp goto done;
4020 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
4021 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
4022 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
4023 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
4024 4e68cba3 2019-11-23 stsp saa.repo = repo;
4026 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4027 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4028 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4032 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4033 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4034 af12c6b9 2019-06-04 stsp err = sync_err;
4036 fb399478 2019-07-12 stsp free(fileindex_path);
4037 d00136be 2019-03-26 stsp if (fileindex)
4038 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
4039 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4040 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
4041 d00136be 2019-03-26 stsp err = unlockerr;
4042 6c7ab921 2019-03-18 stsp return err;
4045 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4046 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4047 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4048 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4049 f2a9dc41 2019-12-13 tracey void *progress_arg;
4050 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4051 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4052 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4053 766841c2 2020-08-13 stsp const char *status_codes;
4056 f2a9dc41 2019-12-13 tracey static const struct got_error *
4057 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4058 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4059 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4060 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4062 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4063 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4064 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4065 17ed4618 2019-06-02 stsp struct stat sb;
4066 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4068 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4069 17ed4618 2019-06-02 stsp if (ie == NULL)
4070 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4072 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4073 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4074 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4075 9acbc4fa 2019-08-03 stsp return NULL;
4076 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4079 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4080 f2a9dc41 2019-12-13 tracey relpath) == -1)
4081 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4083 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4086 f2a9dc41 2019-12-13 tracey goto done;
4088 766841c2 2020-08-13 stsp if (a->status_codes) {
4089 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4091 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4092 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4095 766841c2 2020-08-13 stsp if (i == ncodes) {
4096 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4097 766841c2 2020-08-13 stsp free(ondisk_path);
4098 766841c2 2020-08-13 stsp return NULL;
4100 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4101 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4102 766841c2 2020-08-13 stsp static char msg[64];
4103 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4104 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4105 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4106 766841c2 2020-08-13 stsp goto done;
4110 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4111 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4112 f2a9dc41 2019-12-13 tracey goto done;
4113 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4114 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4115 f2a9dc41 2019-12-13 tracey goto done;
4117 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4118 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4119 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4120 f2a9dc41 2019-12-13 tracey goto done;
4124 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4125 20a2ad1c 2020-10-20 stsp size_t root_len;
4127 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4128 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4129 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4130 12463d8b 2019-12-13 stsp ondisk_path);
4131 12463d8b 2019-12-13 stsp goto done;
4133 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4134 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4135 12463d8b 2019-12-13 stsp goto done;
4138 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4140 20a2ad1c 2020-10-20 stsp char *parent;
4141 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4143 2513f20a 2020-10-20 stsp goto done;
4144 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4145 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4146 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4147 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4148 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4149 20a2ad1c 2020-10-20 stsp ondisk_path);
4152 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4153 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4156 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4158 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4159 f2a9dc41 2019-12-13 tracey if (err)
4160 f2a9dc41 2019-12-13 tracey return err;
4161 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4162 f2a9dc41 2019-12-13 tracey return NULL;
4163 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4164 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4167 2ec1f75b 2019-03-26 stsp const struct got_error *
4168 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4169 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4170 766841c2 2020-08-13 stsp const char *status_codes,
4171 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4172 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
4174 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4175 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4176 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4177 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4178 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4180 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4182 2ec1f75b 2019-03-26 stsp return err;
4184 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4186 2ec1f75b 2019-03-26 stsp goto done;
4188 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4189 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4190 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4191 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4192 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4193 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4194 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4195 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4197 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4198 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4199 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
4203 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4204 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4205 af12c6b9 2019-06-04 stsp err = sync_err;
4207 fb399478 2019-07-12 stsp free(fileindex_path);
4208 2ec1f75b 2019-03-26 stsp if (fileindex)
4209 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4210 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4211 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4212 2ec1f75b 2019-03-26 stsp err = unlockerr;
4213 33aa809d 2019-08-08 stsp return err;
4216 33aa809d 2019-08-08 stsp static const struct got_error *
4217 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4219 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4220 33aa809d 2019-08-08 stsp char *line = NULL;
4221 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4222 33aa809d 2019-08-08 stsp ssize_t linelen;
4224 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4225 33aa809d 2019-08-08 stsp if (linelen == -1) {
4226 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4227 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4228 33aa809d 2019-08-08 stsp goto done;
4230 33aa809d 2019-08-08 stsp return NULL;
4232 33aa809d 2019-08-08 stsp if (outfile) {
4233 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4234 33aa809d 2019-08-08 stsp if (n != linelen) {
4235 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4236 33aa809d 2019-08-08 stsp goto done;
4239 33aa809d 2019-08-08 stsp if (rejectfile) {
4240 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4241 33aa809d 2019-08-08 stsp if (n != linelen)
4242 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4245 33aa809d 2019-08-08 stsp free(line);
4246 2ec1f75b 2019-03-26 stsp return err;
4249 33aa809d 2019-08-08 stsp static const struct got_error *
4250 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4252 33aa809d 2019-08-08 stsp char *line = NULL;
4253 33aa809d 2019-08-08 stsp size_t linesize = 0;
4254 33aa809d 2019-08-08 stsp ssize_t linelen;
4256 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4257 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4258 500467ff 2019-09-25 hiltjo if (ferror(f))
4259 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4260 500467ff 2019-09-25 hiltjo return NULL;
4262 33aa809d 2019-08-08 stsp free(line);
4263 33aa809d 2019-08-08 stsp return NULL;
4266 33aa809d 2019-08-08 stsp static const struct got_error *
4267 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4268 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4269 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4271 33aa809d 2019-08-08 stsp const struct got_error *err;
4273 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4274 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4275 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4277 33aa809d 2019-08-08 stsp return err;
4278 33aa809d 2019-08-08 stsp (*line_cur1)++;
4280 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4281 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4282 33aa809d 2019-08-08 stsp if (rejectfile)
4283 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4285 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4287 33aa809d 2019-08-08 stsp return err;
4288 33aa809d 2019-08-08 stsp (*line_cur2)++;
4290 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4291 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4292 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4294 33aa809d 2019-08-08 stsp return err;
4295 33aa809d 2019-08-08 stsp (*line_cur2)++;
4297 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4298 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4299 33aa809d 2019-08-08 stsp if (rejectfile)
4300 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4302 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4304 33aa809d 2019-08-08 stsp return err;
4305 33aa809d 2019-08-08 stsp (*line_cur1)++;
4308 f1e81a05 2019-08-10 stsp return NULL;
4311 f1e81a05 2019-08-10 stsp static const struct got_error *
4312 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4313 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4315 f1e81a05 2019-08-10 stsp const struct got_error *err;
4317 f1e81a05 2019-08-10 stsp if (outfile) {
4318 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4319 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4320 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4322 f1e81a05 2019-08-10 stsp return err;
4323 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4326 f1e81a05 2019-08-10 stsp if (rejectfile) {
4327 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4328 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4329 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4331 f1e81a05 2019-08-10 stsp return err;
4332 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4336 33aa809d 2019-08-08 stsp return NULL;
4339 33aa809d 2019-08-08 stsp static const struct got_error *
4340 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4341 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4342 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4343 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4344 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4346 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4347 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4348 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4349 33aa809d 2019-08-08 stsp FILE *hunkfile;
4350 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4351 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4354 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4356 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4357 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4358 fe621944 2020-11-10 stsp start_old = cc.left.start;
4359 fe621944 2020-11-10 stsp end_old = cc.left.end;
4360 fe621944 2020-11-10 stsp start_new = cc.right.start;
4361 fe621944 2020-11-10 stsp end_new = cc.right.end;
4363 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4364 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4365 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4367 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4368 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4369 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4371 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4372 fe621944 2020-11-10 stsp if (diff_state == NULL)
4373 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4374 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4376 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4377 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4378 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4379 33aa809d 2019-08-08 stsp goto done;
4382 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4383 fe621944 2020-11-10 stsp diff_result, &cc);
4384 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4385 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4386 33aa809d 2019-08-08 stsp goto done;
4389 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4390 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4391 33aa809d 2019-08-08 stsp goto done;
4394 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4395 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4397 33aa809d 2019-08-08 stsp goto done;
4399 33aa809d 2019-08-08 stsp switch (*choice) {
4400 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4401 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4402 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4404 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4405 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4406 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4408 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4411 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4415 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4416 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4417 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4418 33aa809d 2019-08-08 stsp return err;
4421 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4422 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4423 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4424 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4425 1f1abb7e 2019-08-08 stsp void *progress_arg;
4426 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4427 33aa809d 2019-08-08 stsp void *patch_arg;
4428 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4429 f259c4c1 2021-09-24 stsp int unlink_added_files;
4432 e20a8b6f 2019-06-04 stsp static const struct got_error *
4433 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4434 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4435 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4436 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4437 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4439 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4440 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4441 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4442 1ebedb77 2019-10-19 stsp int fd2 = -1;
4443 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4444 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4445 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4446 fe621944 2020-11-10 stsp struct stat sb2;
4447 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4448 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4449 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4451 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4453 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4455 33aa809d 2019-08-08 stsp return err;
4457 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4458 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4459 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4460 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4461 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4462 fa3cef63 2020-07-23 stsp goto done;
4464 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4465 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4466 fa3cef63 2020-07-23 stsp if (link_len == -1)
4467 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4468 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4469 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4472 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4473 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4474 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4475 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4476 fa3cef63 2020-07-23 stsp goto done;
4478 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4479 fa3cef63 2020-07-23 stsp sizeof(link_target));
4480 fa3cef63 2020-07-23 stsp if (link_len == -1)
4481 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4482 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4483 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4486 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4487 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4488 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4489 fa3cef63 2020-07-23 stsp goto done;
4492 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4493 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4494 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4495 fa3cef63 2020-07-23 stsp goto done;
4500 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4501 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4502 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4503 fa3cef63 2020-07-23 stsp goto done;
4505 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4506 fa3cef63 2020-07-23 stsp if (n != link_len) {
4507 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4508 fa3cef63 2020-07-23 stsp goto done;
4510 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4511 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4512 fa3cef63 2020-07-23 stsp goto done;
4514 fa3cef63 2020-07-23 stsp rewind(f2);
4517 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4519 33aa809d 2019-08-08 stsp goto done;
4521 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4523 33aa809d 2019-08-08 stsp goto done;
4525 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4527 33aa809d 2019-08-08 stsp goto done;
4529 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4532 33aa809d 2019-08-08 stsp goto done;
4534 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4536 33aa809d 2019-08-08 stsp goto done;
4538 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4539 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4540 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4541 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4543 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4544 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4545 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4546 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4547 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4548 fe621944 2020-11-10 stsp nchanges++;
4550 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4551 33aa809d 2019-08-08 stsp int choice;
4552 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4553 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4554 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4555 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4556 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4557 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4559 33aa809d 2019-08-08 stsp goto done;
4560 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4561 33aa809d 2019-08-08 stsp have_content = 1;
4562 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4565 1ebedb77 2019-10-19 stsp if (have_content) {
4566 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4567 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4568 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4570 1ebedb77 2019-10-19 stsp goto done;
4572 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4573 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4574 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4575 fa3cef63 2020-07-23 stsp goto done;
4580 33aa809d 2019-08-08 stsp free(id_str);
4582 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4583 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4584 fe621944 2020-11-10 stsp if (err == NULL)
4585 fe621944 2020-11-10 stsp err = free_err;
4586 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4587 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4588 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4589 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4590 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4591 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4592 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4593 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4594 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4595 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4596 33aa809d 2019-08-08 stsp if (err || !have_content) {
4597 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4598 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4599 33aa809d 2019-08-08 stsp free(*path_outfile);
4600 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4602 33aa809d 2019-08-08 stsp free(path1);
4603 33aa809d 2019-08-08 stsp return err;
4606 33aa809d 2019-08-08 stsp static const struct got_error *
4607 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4608 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4609 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4610 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4612 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4613 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4614 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4615 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4616 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4617 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4618 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4619 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4620 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4621 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4623 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4624 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4625 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4626 d3bcc3d1 2019-08-08 stsp return NULL;
4628 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4629 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4630 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4632 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4633 65084dad 2019-08-08 stsp if (ie == NULL)
4634 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4636 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4637 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4638 a129376b 2019-03-28 stsp if (err) {
4639 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4640 a129376b 2019-03-28 stsp goto done;
4641 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4642 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4643 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4644 e20a8b6f 2019-06-04 stsp goto done;
4647 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4648 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4649 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4650 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4651 a129376b 2019-03-28 stsp goto done;
4654 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4655 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4656 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4657 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4658 a129376b 2019-03-28 stsp goto done;
4661 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4662 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4663 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4664 a129376b 2019-03-28 stsp goto done;
4669 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4670 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4671 a9fa2909 2019-07-27 stsp if (err) {
4672 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4673 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4674 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4675 a9fa2909 2019-07-27 stsp goto done;
4677 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4679 a9fa2909 2019-07-27 stsp goto done;
4681 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4683 a9fa2909 2019-07-27 stsp goto done;
4685 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4686 1233e6b6 2020-10-19 stsp free(te_name);
4687 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4688 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4689 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4690 a9fa2909 2019-07-27 stsp goto done;
4694 a129376b 2019-03-28 stsp switch (status) {
4695 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4696 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4697 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4698 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4699 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4701 33aa809d 2019-08-08 stsp goto done;
4702 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4705 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4706 1f1abb7e 2019-08-08 stsp ie->path);
4708 1ee397ad 2019-07-12 stsp goto done;
4709 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4710 f259c4c1 2021-09-24 stsp if (a->unlink_added_files) {
4711 f259c4c1 2021-09-24 stsp if (asprintf(&ondisk_path, "%s/%s",
4712 f259c4c1 2021-09-24 stsp got_worktree_get_root_path(a->worktree),
4713 f259c4c1 2021-09-24 stsp relpath) == -1) {
4714 f259c4c1 2021-09-24 stsp err = got_error_from_errno("asprintf");
4715 f259c4c1 2021-09-24 stsp goto done;
4717 f259c4c1 2021-09-24 stsp if (unlink(ondisk_path) == -1) {
4718 f259c4c1 2021-09-24 stsp err = got_error_from_errno2("unlink",
4719 f259c4c1 2021-09-24 stsp ondisk_path);
4724 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4725 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4726 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4727 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4728 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4730 33aa809d 2019-08-08 stsp goto done;
4731 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4734 33aa809d 2019-08-08 stsp /* fall through */
4735 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4736 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4737 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4738 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4739 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4740 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4741 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4742 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4743 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4745 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4746 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4747 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4749 65084dad 2019-08-08 stsp goto done;
4751 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4752 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4753 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4754 a129376b 2019-03-28 stsp goto done;
4757 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4758 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4759 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4760 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4761 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4762 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4763 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4765 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4766 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4767 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4768 369fd7e5 2020-07-23 stsp path_content);
4771 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4772 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4773 369fd7e5 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4774 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4776 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4777 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4778 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4779 369fd7e5 2020-07-23 stsp goto done;
4783 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4784 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4785 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4786 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4787 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4788 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4790 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4792 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4793 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4794 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4795 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4798 a129376b 2019-03-28 stsp goto done;
4799 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4800 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4801 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4802 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4803 437adc9d 2020-12-10 yzhong blob->id.sha1,
4804 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4806 2e1fa222 2020-07-23 stsp goto done;
4808 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4809 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4810 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4819 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4820 33aa809d 2019-08-08 stsp free(path_content);
4821 e20a8b6f 2019-06-04 stsp free(parent_path);
4822 a129376b 2019-03-28 stsp free(tree_path);
4824 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4826 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4827 a129376b 2019-03-28 stsp free(tree_id);
4828 e20a8b6f 2019-06-04 stsp return err;
4831 e20a8b6f 2019-06-04 stsp const struct got_error *
4832 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4833 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4834 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4835 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4836 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4838 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4839 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4840 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4841 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4842 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4843 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4845 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4847 e20a8b6f 2019-06-04 stsp return err;
4849 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4851 e20a8b6f 2019-06-04 stsp goto done;
4853 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4854 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4855 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4856 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4857 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4858 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4859 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4860 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
4861 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4862 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4863 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4867 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4868 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4869 e20a8b6f 2019-06-04 stsp err = sync_err;
4871 fb399478 2019-07-12 stsp free(fileindex_path);
4872 a129376b 2019-03-28 stsp if (fileindex)
4873 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4874 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4875 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4876 a129376b 2019-03-28 stsp err = unlockerr;
4877 c4296144 2019-05-09 stsp return err;
4880 cf066bf8 2019-05-09 stsp static void
4881 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4883 24519714 2019-05-09 stsp free(ct->path);
4884 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4885 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4886 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4887 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4888 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4889 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4893 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4894 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4895 24519714 2019-05-09 stsp struct got_repository *repo;
4896 24519714 2019-05-09 stsp struct got_worktree *worktree;
4897 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4898 5f8a88c6 2019-08-03 stsp int have_staged_files;
4899 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4902 c4296144 2019-05-09 stsp static const struct got_error *
4903 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
4904 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
4905 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4906 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4908 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
4909 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4910 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4911 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4912 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4913 768aea60 2019-05-09 stsp struct stat sb;
4915 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
4916 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4917 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4918 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4919 5f8a88c6 2019-08-03 stsp return NULL;
4921 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4922 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4924 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4925 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4926 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4927 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4928 5f8a88c6 2019-08-03 stsp return NULL;
4931 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4932 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4933 036813ee 2019-05-09 stsp goto done;
4935 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4936 036813ee 2019-05-09 stsp parent_path = strdup("");
4937 69960a46 2019-05-09 stsp if (parent_path == NULL)
4938 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4940 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4942 69960a46 2019-05-09 stsp return err;
4945 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4946 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4947 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4948 c4296144 2019-05-09 stsp goto done;
4951 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4952 768aea60 2019-05-09 stsp relpath) == -1) {
4953 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4954 768aea60 2019-05-09 stsp goto done;
4957 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4958 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4959 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4960 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4961 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4962 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4963 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4964 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4966 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4967 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4970 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4971 0aeb8099 2020-07-23 stsp goto done;
4973 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4974 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4975 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4976 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4977 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4978 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4979 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4980 12463d8b 2019-12-13 stsp ct->ondisk_path);
4981 12463d8b 2019-12-13 stsp goto done;
4983 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4984 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4985 768aea60 2019-05-09 stsp goto done;
4987 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4990 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4991 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4992 44d03001 2019-05-09 stsp relpath) == -1) {
4993 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4994 44d03001 2019-05-09 stsp goto done;
4997 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4998 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4999 35213c7c 2020-07-23 stsp int is_bad_symlink;
5000 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
5001 35213c7c 2020-07-23 stsp ssize_t target_len;
5002 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
5003 35213c7c 2020-07-23 stsp sizeof(target_path));
5004 35213c7c 2020-07-23 stsp if (target_len == -1) {
5005 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
5006 35213c7c 2020-07-23 stsp ct->ondisk_path);
5007 35213c7c 2020-07-23 stsp goto done;
5009 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
5010 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
5012 35213c7c 2020-07-23 stsp goto done;
5013 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
5014 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
5015 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
5016 35213c7c 2020-07-23 stsp goto done;
5021 cf066bf8 2019-05-09 stsp ct->status = status;
5022 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
5023 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
5024 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
5025 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
5026 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
5027 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
5028 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5029 b416585c 2019-05-13 stsp goto done;
5031 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
5032 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
5033 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
5034 f0b75401 2019-08-03 stsp goto done;
5037 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5038 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5039 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5040 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
5041 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5042 036813ee 2019-05-09 stsp goto done;
5045 24519714 2019-05-09 stsp ct->path = strdup(path);
5046 24519714 2019-05-09 stsp if (ct->path == NULL) {
5047 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
5048 24519714 2019-05-09 stsp goto done;
5050 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5052 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
5053 ed175427 2019-05-09 stsp free_commitable(ct);
5054 24519714 2019-05-09 stsp free(parent_path);
5055 036813ee 2019-05-09 stsp free(path);
5056 a129376b 2019-03-28 stsp return err;
5059 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5060 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5061 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5062 036813ee 2019-05-09 stsp struct got_repository *);
5064 ed175427 2019-05-09 stsp static const struct got_error *
5065 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5066 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5067 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5068 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5069 afa376bf 2019-05-09 stsp struct got_repository *repo)
5071 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5072 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5073 036813ee 2019-05-09 stsp char *subpath;
5075 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5076 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5077 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5079 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5081 ed175427 2019-05-09 stsp return err;
5083 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5084 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5085 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5086 036813ee 2019-05-09 stsp free(subpath);
5087 036813ee 2019-05-09 stsp return err;
5090 036813ee 2019-05-09 stsp static const struct got_error *
5091 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5093 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5094 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5096 036813ee 2019-05-09 stsp *match = 0;
5098 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5099 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5100 0f63689d 2019-05-10 stsp return NULL;
5103 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5105 0f63689d 2019-05-10 stsp return err;
5106 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5107 036813ee 2019-05-09 stsp free(ct_parent_path);
5108 036813ee 2019-05-09 stsp return err;
5111 768aea60 2019-05-09 stsp static mode_t
5112 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5114 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5115 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5117 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5120 036813ee 2019-05-09 stsp static const struct got_error *
5121 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5122 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5124 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5126 036813ee 2019-05-09 stsp *new_te = NULL;
5128 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5130 036813ee 2019-05-09 stsp goto done;
5132 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5134 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5135 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5136 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5138 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5140 036813ee 2019-05-09 stsp if (err && *new_te) {
5141 56e0773d 2019-11-28 stsp free(*new_te);
5142 036813ee 2019-05-09 stsp *new_te = NULL;
5144 036813ee 2019-05-09 stsp return err;
5147 036813ee 2019-05-09 stsp static const struct got_error *
5148 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5149 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5151 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5152 102b254e 2020-10-19 stsp char *ct_name = NULL;
5154 036813ee 2019-05-09 stsp *new_te = NULL;
5156 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5157 036813ee 2019-05-09 stsp if (*new_te == NULL)
5158 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5160 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5162 036813ee 2019-05-09 stsp goto done;
5163 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5164 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5165 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5166 036813ee 2019-05-09 stsp goto done;
5169 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5171 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5172 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5173 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5175 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5177 102b254e 2020-10-19 stsp free(ct_name);
5178 036813ee 2019-05-09 stsp if (err && *new_te) {
5179 56e0773d 2019-11-28 stsp free(*new_te);
5180 036813ee 2019-05-09 stsp *new_te = NULL;
5182 036813ee 2019-05-09 stsp return err;
5185 036813ee 2019-05-09 stsp static const struct got_error *
5186 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5187 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5189 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5190 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5192 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5194 036813ee 2019-05-09 stsp return err;
5195 036813ee 2019-05-09 stsp if (new_pe == NULL)
5196 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5197 036813ee 2019-05-09 stsp return NULL;
5200 afa376bf 2019-05-09 stsp static const struct got_error *
5201 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5202 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5204 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5205 5f8a88c6 2019-08-03 stsp unsigned char status;
5207 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5208 afa376bf 2019-05-09 stsp ct_path++;
5210 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5211 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5213 5f8a88c6 2019-08-03 stsp status = ct->status;
5215 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5216 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5219 036813ee 2019-05-09 stsp static const struct got_error *
5220 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5221 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5223 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5224 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5225 44d03001 2019-05-09 stsp char *te_path;
5227 44d03001 2019-05-09 stsp *modified = 0;
5229 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5230 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5231 44d03001 2019-05-09 stsp te->name) == -1)
5232 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5234 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5235 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5236 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5237 44d03001 2019-05-09 stsp strlen(te_path));
5238 62d463ca 2020-10-20 naddy if (*modified)
5242 44d03001 2019-05-09 stsp free(te_path);
5243 44d03001 2019-05-09 stsp return err;
5246 44d03001 2019-05-09 stsp static const struct got_error *
5247 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5248 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5249 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5251 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5252 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5254 036813ee 2019-05-09 stsp *ctp = NULL;
5256 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5257 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5258 036813ee 2019-05-09 stsp char *ct_name = NULL;
5259 036813ee 2019-05-09 stsp int path_matches;
5261 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5262 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5263 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5264 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5267 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5268 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5272 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5275 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5277 036813ee 2019-05-09 stsp return err;
5278 036813ee 2019-05-09 stsp if (!path_matches)
5281 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5283 d34b633e 2020-10-19 stsp return err;
5285 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5286 d34b633e 2020-10-19 stsp free(ct_name);
5289 d34b633e 2020-10-19 stsp free(ct_name);
5291 036813ee 2019-05-09 stsp *ctp = ct;
5295 2b496619 2019-07-10 stsp return err;
5298 2b496619 2019-07-10 stsp static const struct got_error *
5299 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5300 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5301 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5302 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5303 2b496619 2019-07-10 stsp struct got_repository *repo)
5305 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5306 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5307 2b496619 2019-07-10 stsp char *subtree_path;
5308 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5309 ba580f68 2020-03-22 stsp int nentries;
5311 2b496619 2019-07-10 stsp *new_tep = NULL;
5313 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5314 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5315 2b496619 2019-07-10 stsp child_path) == -1)
5316 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5318 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5319 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5320 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5321 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5323 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5324 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5325 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5326 2b496619 2019-07-10 stsp goto done;
5328 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5329 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5330 2b496619 2019-07-10 stsp if (err) {
5331 56e0773d 2019-11-28 stsp free(new_te);
5332 2b496619 2019-07-10 stsp goto done;
5334 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5337 2b496619 2019-07-10 stsp free(subtree_path);
5338 2b496619 2019-07-10 stsp if (err == NULL)
5339 2b496619 2019-07-10 stsp *new_tep = new_te;
5340 036813ee 2019-05-09 stsp return err;
5343 036813ee 2019-05-09 stsp static const struct got_error *
5344 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5345 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5346 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5347 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5348 036813ee 2019-05-09 stsp struct got_repository *repo)
5350 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5351 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5352 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5353 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5355 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5356 ba580f68 2020-03-22 stsp *nentries = 0;
5358 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5359 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5360 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5361 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5363 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5364 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5365 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5368 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5369 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5372 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5373 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5375 036813ee 2019-05-09 stsp goto done;
5377 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5378 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5379 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5381 036813ee 2019-05-09 stsp goto done;
5382 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5384 afa376bf 2019-05-09 stsp goto done;
5385 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5386 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5388 2f51b5b3 2019-05-09 stsp goto done;
5389 ba580f68 2020-03-22 stsp (*nentries)++;
5391 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5392 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5393 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5394 2b496619 2019-07-10 stsp == NULL) {
5395 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5396 2b496619 2019-07-10 stsp child_path, path_base_tree,
5397 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5400 2b496619 2019-07-10 stsp goto done;
5401 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5403 2b496619 2019-07-10 stsp goto done;
5404 ba580f68 2020-03-22 stsp (*nentries)++;
5409 2f51b5b3 2019-05-09 stsp if (base_tree) {
5410 56e0773d 2019-11-28 stsp int i, nbase_entries;
5411 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5412 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5413 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5414 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5416 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5417 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5418 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5419 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5421 63c5ca5d 2019-08-24 stsp goto done;
5422 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5424 63c5ca5d 2019-08-24 stsp goto done;
5425 ba580f68 2020-03-22 stsp (*nentries)++;
5429 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5430 44d03001 2019-05-09 stsp int modified;
5431 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5433 036813ee 2019-05-09 stsp goto done;
5434 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5435 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5437 2f51b5b3 2019-05-09 stsp goto done;
5438 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5439 44d03001 2019-05-09 stsp if (modified) {
5440 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5441 ba580f68 2020-03-22 stsp int nsubentries;
5442 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5443 ba580f68 2020-03-22 stsp &nsubentries, te,
5444 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5445 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5447 44d03001 2019-05-09 stsp goto done;
5448 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5449 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5450 ba580f68 2020-03-22 stsp free(new_id);
5453 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5454 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5455 56e0773d 2019-11-28 stsp free(new_id);
5457 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5459 036813ee 2019-05-09 stsp goto done;
5460 ba580f68 2020-03-22 stsp (*nentries)++;
5464 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5465 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5467 f66c734c 2019-09-22 stsp goto done;
5469 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5470 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5471 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5472 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5473 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5474 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5476 2f51b5b3 2019-05-09 stsp goto done;
5477 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5479 2f51b5b3 2019-05-09 stsp goto done;
5480 ba580f68 2020-03-22 stsp (*nentries)++;
5482 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5483 b416585c 2019-05-13 stsp status_arg);
5485 afa376bf 2019-05-09 stsp goto done;
5487 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5488 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5490 2f51b5b3 2019-05-09 stsp goto done;
5491 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5493 2f51b5b3 2019-05-09 stsp goto done;
5494 ba580f68 2020-03-22 stsp (*nentries)++;
5499 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5500 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5502 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5503 2e1fa222 2020-07-23 stsp return err;
5506 2e1fa222 2020-07-23 stsp static const struct got_error *
5507 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5508 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5509 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5510 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5512 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5513 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5514 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5516 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5517 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5518 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5520 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5522 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5523 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5524 437adc9d 2020-12-10 yzhong if (err)
5525 437adc9d 2020-12-10 yzhong goto done;
5528 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5529 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5530 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5531 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5532 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5533 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5534 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5535 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5537 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5538 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5539 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5540 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5541 72fd46fa 2019-09-06 stsp !have_staged_files);
5543 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5544 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5545 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5546 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5547 72fd46fa 2019-09-06 stsp !have_staged_files);
5549 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5551 437adc9d 2020-12-10 yzhong goto done;
5552 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5553 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5554 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5555 3969253a 2020-03-07 stsp if (err) {
5556 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5557 437adc9d 2020-12-10 yzhong goto done;
5559 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5560 3969253a 2020-03-07 stsp if (err) {
5561 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5562 437adc9d 2020-12-10 yzhong goto done;
5565 437adc9d 2020-12-10 yzhong free(relpath);
5566 437adc9d 2020-12-10 yzhong relpath = NULL;
5569 437adc9d 2020-12-10 yzhong free(relpath);
5570 d56d26ce 2019-05-10 stsp return err;
5574 d56d26ce 2019-05-10 stsp static const struct got_error *
5575 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5576 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5577 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5578 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5579 735ef5ac 2019-08-03 stsp int ood_errcode)
5581 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5582 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5584 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5585 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5586 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5587 1a36436d 2019-06-10 stsp return NULL;
5589 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5590 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5592 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5593 735ef5ac 2019-08-03 stsp in_repo_path);
5594 9bead371 2019-07-28 stsp if (err) {
5595 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5596 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5597 1a36436d 2019-06-10 stsp goto done;
5598 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5599 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5601 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5602 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5603 735ef5ac 2019-08-03 stsp in_repo_path);
5604 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5605 1a36436d 2019-06-10 stsp goto done;
5606 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5610 1a36436d 2019-06-10 stsp return err;
5613 c4296144 2019-05-09 stsp const struct got_error *
5614 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5615 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5616 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id,
5617 f259c4c1 2021-09-24 stsp struct got_object_id *parent_id2,
5618 f259c4c1 2021-09-24 stsp struct got_worktree *worktree,
5619 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5620 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5621 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5622 afa376bf 2019-05-09 stsp struct got_repository *repo)
5624 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5625 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5626 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5627 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5628 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5629 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5630 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5631 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5632 f259c4c1 2021-09-24 stsp int nentries, nparents = 0;
5633 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5634 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5635 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5637 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5639 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5641 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5643 588edf97 2019-05-10 stsp goto done;
5645 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5647 588edf97 2019-05-10 stsp goto done;
5649 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5650 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5655 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5656 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5660 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5661 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5662 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5663 cf066bf8 2019-05-09 stsp char *ondisk_path;
5665 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5666 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5667 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5670 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5671 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5672 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5675 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5676 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5677 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5678 cf066bf8 2019-05-09 stsp goto done;
5680 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5681 2e1fa222 2020-07-23 stsp free(ondisk_path);
5683 cf066bf8 2019-05-09 stsp goto done;
5686 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5687 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5688 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5690 036813ee 2019-05-09 stsp goto done;
5692 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5694 de18fc63 2019-05-09 stsp goto done;
5695 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5696 f259c4c1 2021-09-24 stsp nparents++;
5697 f259c4c1 2021-09-24 stsp if (parent_id2) {
5698 f259c4c1 2021-09-24 stsp err = got_object_qid_alloc(&pid, parent_id2);
5700 f259c4c1 2021-09-24 stsp goto done;
5701 f259c4c1 2021-09-24 stsp STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5702 f259c4c1 2021-09-24 stsp nparents++;
5704 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5705 f259c4c1 2021-09-24 stsp nparents, author, time(NULL), committer, time(NULL), logmsg, repo);
5706 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5707 33ad4cbe 2019-05-12 jcs free(logmsg);
5709 9d40349a 2019-05-09 stsp goto done;
5711 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5712 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5713 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5714 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5715 09f5bd90 2019-05-09 stsp goto done;
5717 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5718 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5720 09f5bd90 2019-05-09 stsp goto done;
5721 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5723 ebf99748 2019-05-09 stsp goto done;
5724 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5725 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5726 09f5bd90 2019-05-09 stsp goto done;
5728 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5729 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5731 f2c16586 2019-05-09 stsp goto done;
5732 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5734 f2c16586 2019-05-09 stsp goto done;
5736 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5738 09f5bd90 2019-05-09 stsp goto done;
5740 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5742 ebf99748 2019-05-09 stsp goto done;
5744 f259c4c1 2021-09-24 stsp got_object_id_queue_free(&parent_ids);
5745 588edf97 2019-05-10 stsp if (head_tree)
5746 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5747 588edf97 2019-05-10 stsp if (head_commit)
5748 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5749 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5750 2f17228e 2019-05-12 stsp if (head_ref2) {
5751 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5752 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5753 2f17228e 2019-05-12 stsp err = unlockerr;
5754 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5756 39cd0ff6 2019-07-12 stsp return err;
5759 5c1e53bc 2019-07-28 stsp static const struct got_error *
5760 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5761 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5763 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5764 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5766 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5767 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5768 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5770 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5771 5c1e53bc 2019-07-28 stsp ct_path++;
5773 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5774 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5778 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5779 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5781 5c1e53bc 2019-07-28 stsp return NULL;
5784 f0b75401 2019-08-03 stsp static const struct got_error *
5785 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5787 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5789 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5790 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5791 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5794 f0b75401 2019-08-03 stsp return NULL;
5797 5f8a88c6 2019-08-03 stsp static const struct got_error *
5798 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5799 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5801 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5802 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5804 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5805 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5807 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5808 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5809 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5810 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5811 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5812 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5815 5f8a88c6 2019-08-03 stsp return NULL;
5818 39cd0ff6 2019-07-12 stsp const struct got_error *
5819 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5820 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5821 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5822 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5823 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5824 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5826 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5827 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5828 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5829 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5830 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5831 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5832 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5833 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5834 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5836 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5838 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5840 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5842 39cd0ff6 2019-07-12 stsp goto done;
5844 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5846 39cd0ff6 2019-07-12 stsp goto done;
5848 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5850 39cd0ff6 2019-07-12 stsp goto done;
5852 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5854 39cd0ff6 2019-07-12 stsp goto done;
5856 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5857 5f8a88c6 2019-08-03 stsp &have_staged_files);
5858 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5859 5f8a88c6 2019-08-03 stsp goto done;
5860 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5861 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5863 5f8a88c6 2019-08-03 stsp goto done;
5866 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5867 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5868 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5869 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5870 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5871 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5872 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5873 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5874 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5876 5c1e53bc 2019-07-28 stsp goto done;
5879 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5880 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5881 39cd0ff6 2019-07-12 stsp goto done;
5884 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5885 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5887 5c1e53bc 2019-07-28 stsp goto done;
5890 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5891 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5892 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5894 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5895 f0b75401 2019-08-03 stsp ct_path++;
5896 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5897 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5898 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5900 b50cabdf 2019-07-12 stsp goto done;
5904 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5905 f259c4c1 2021-09-24 stsp head_commit_id, NULL, worktree, author, committer,
5906 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5908 39cd0ff6 2019-07-12 stsp goto done;
5910 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5911 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5912 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5913 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5914 39cd0ff6 2019-07-12 stsp err = sync_err;
5916 39cd0ff6 2019-07-12 stsp if (fileindex)
5917 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5918 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5919 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5920 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5921 39cd0ff6 2019-07-12 stsp err = unlockerr;
5922 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5923 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5924 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5926 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5927 c4296144 2019-05-09 stsp return err;
5930 8656d6c4 2019-05-20 stsp const char *
5931 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5933 8656d6c4 2019-05-20 stsp return ct->path;
5936 8656d6c4 2019-05-20 stsp unsigned int
5937 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5939 8656d6c4 2019-05-20 stsp return ct->status;
5942 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5943 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5944 818c7501 2019-07-11 stsp struct got_repository *repo;
5947 818c7501 2019-07-11 stsp static const struct got_error *
5948 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5950 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5951 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5952 818c7501 2019-07-11 stsp unsigned char status;
5953 818c7501 2019-07-11 stsp struct stat sb;
5954 818c7501 2019-07-11 stsp char *ondisk_path;
5956 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5957 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5958 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5959 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5961 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5963 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5965 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5966 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5967 818c7501 2019-07-11 stsp free(ondisk_path);
5969 818c7501 2019-07-11 stsp return err;
5971 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5972 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5973 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5974 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5976 818c7501 2019-07-11 stsp return NULL;
5979 818c7501 2019-07-11 stsp const struct got_error *
5980 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5981 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5982 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5983 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5985 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5986 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5987 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5988 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5989 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5990 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5991 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5993 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5994 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5995 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5997 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5999 818c7501 2019-07-11 stsp return err;
6001 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6003 818c7501 2019-07-11 stsp goto done;
6005 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
6006 818c7501 2019-07-11 stsp ok_arg.repo = repo;
6007 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6010 818c7501 2019-07-11 stsp goto done;
6012 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6014 818c7501 2019-07-11 stsp goto done;
6016 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6018 818c7501 2019-07-11 stsp goto done;
6020 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6022 818c7501 2019-07-11 stsp goto done;
6024 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6027 e51d7b55 2020-01-04 stsp goto done;
6029 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6031 818c7501 2019-07-11 stsp goto done;
6032 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6033 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6034 e51d7b55 2020-01-04 stsp goto done;
6037 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
6038 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
6040 818c7501 2019-07-11 stsp goto done;
6041 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
6043 818c7501 2019-07-11 stsp goto done;
6045 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
6047 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6049 818c7501 2019-07-11 stsp goto done;
6051 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
6053 818c7501 2019-07-11 stsp goto done;
6055 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6056 818c7501 2019-07-11 stsp worktree->base_commit_id);
6058 818c7501 2019-07-11 stsp goto done;
6059 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
6061 818c7501 2019-07-11 stsp goto done;
6063 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6065 818c7501 2019-07-11 stsp goto done;
6067 818c7501 2019-07-11 stsp free(fileindex_path);
6068 818c7501 2019-07-11 stsp free(tmp_branch_name);
6069 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6070 818c7501 2019-07-11 stsp free(branch_ref_name);
6071 818c7501 2019-07-11 stsp if (branch_ref)
6072 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6073 818c7501 2019-07-11 stsp if (wt_branch)
6074 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6075 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6076 818c7501 2019-07-11 stsp if (err) {
6077 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6078 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6079 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6081 818c7501 2019-07-11 stsp if (*tmp_branch) {
6082 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6083 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6085 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6086 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6087 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6089 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6091 818c7501 2019-07-11 stsp return err;
6094 818c7501 2019-07-11 stsp const struct got_error *
6095 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6096 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6097 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6098 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6100 818c7501 2019-07-11 stsp const struct got_error *err;
6101 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6102 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6103 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6104 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6105 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6107 818c7501 2019-07-11 stsp *commit_id = NULL;
6108 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6109 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6110 3e3a69f1 2019-07-25 stsp *branch = NULL;
6111 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6113 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6115 3e3a69f1 2019-07-25 stsp return err;
6117 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6119 f032f1f7 2019-08-04 stsp goto done;
6121 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6122 f032f1f7 2019-08-04 stsp &have_staged_files);
6123 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6124 f032f1f7 2019-08-04 stsp goto done;
6125 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6126 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6127 3e3a69f1 2019-07-25 stsp goto done;
6130 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6132 f032f1f7 2019-08-04 stsp goto done;
6134 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6136 818c7501 2019-07-11 stsp goto done;
6138 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6140 818c7501 2019-07-11 stsp goto done;
6142 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6144 818c7501 2019-07-11 stsp goto done;
6146 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6148 818c7501 2019-07-11 stsp goto done;
6150 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6151 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6153 818c7501 2019-07-11 stsp goto done;
6155 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6157 818c7501 2019-07-11 stsp goto done;
6159 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6161 818c7501 2019-07-11 stsp goto done;
6163 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6164 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6166 818c7501 2019-07-11 stsp goto done;
6168 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6170 818c7501 2019-07-11 stsp goto done;
6172 818c7501 2019-07-11 stsp free(commit_ref_name);
6173 818c7501 2019-07-11 stsp free(branch_ref_name);
6174 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6175 818c7501 2019-07-11 stsp if (commit_ref)
6176 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6177 818c7501 2019-07-11 stsp if (branch_ref)
6178 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6179 818c7501 2019-07-11 stsp if (err) {
6180 818c7501 2019-07-11 stsp free(*commit_id);
6181 818c7501 2019-07-11 stsp *commit_id = NULL;
6182 818c7501 2019-07-11 stsp if (*tmp_branch) {
6183 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6184 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6186 818c7501 2019-07-11 stsp if (*new_base_branch) {
6187 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6188 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6190 818c7501 2019-07-11 stsp if (*branch) {
6191 818c7501 2019-07-11 stsp got_ref_close(*branch);
6192 818c7501 2019-07-11 stsp *branch = NULL;
6194 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6195 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6196 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6198 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6200 818c7501 2019-07-11 stsp return err;
6203 818c7501 2019-07-11 stsp const struct got_error *
6204 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6206 818c7501 2019-07-11 stsp const struct got_error *err;
6207 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6209 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6211 818c7501 2019-07-11 stsp return err;
6213 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6214 818c7501 2019-07-11 stsp free(tmp_branch_name);
6215 818c7501 2019-07-11 stsp return NULL;
6218 818c7501 2019-07-11 stsp static const struct got_error *
6219 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6220 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6222 0ebf8283 2019-07-24 stsp *logmsg = arg;
6223 818c7501 2019-07-11 stsp return NULL;
6226 818c7501 2019-07-11 stsp static const struct got_error *
6227 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6228 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6229 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6230 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6232 818c7501 2019-07-11 stsp return NULL;
6235 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6236 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6237 01757395 2019-07-12 stsp void *progress_arg;
6238 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6241 01757395 2019-07-12 stsp static const struct got_error *
6242 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6244 01757395 2019-07-12 stsp const struct got_error *err;
6245 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6247 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6249 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6251 01757395 2019-07-12 stsp return err;
6253 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6254 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6255 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6256 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6257 01757395 2019-07-12 stsp return NULL;
6259 01757395 2019-07-12 stsp p = strdup(path);
6260 01757395 2019-07-12 stsp if (p == NULL)
6261 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6263 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6264 01757395 2019-07-12 stsp if (err || new == NULL)
6266 01757395 2019-07-12 stsp return err;
6270 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6272 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6274 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6275 01757395 2019-07-12 stsp free((char *)pe->path);
6277 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6280 0ebf8283 2019-07-24 stsp static const struct got_error *
6281 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6282 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6284 818c7501 2019-07-11 stsp const struct got_error *err;
6285 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6287 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6288 818c7501 2019-07-11 stsp if (err) {
6289 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6290 818c7501 2019-07-11 stsp goto done;
6291 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6293 818c7501 2019-07-11 stsp goto done;
6294 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6296 818c7501 2019-07-11 stsp goto done;
6297 de05890f 2020-03-05 stsp } else if (is_rebase) {
6298 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6301 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6303 818c7501 2019-07-11 stsp goto done;
6304 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6305 818c7501 2019-07-11 stsp free(stored_id);
6306 818c7501 2019-07-11 stsp if (cmp != 0) {
6307 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6308 818c7501 2019-07-11 stsp goto done;
6312 0ebf8283 2019-07-24 stsp if (commit_ref)
6313 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6314 0ebf8283 2019-07-24 stsp return err;
6317 0ebf8283 2019-07-24 stsp static const struct got_error *
6318 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6319 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6320 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6321 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6322 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6323 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6325 0ebf8283 2019-07-24 stsp const struct got_error *err;
6326 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6327 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6328 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6330 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6332 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6334 0ebf8283 2019-07-24 stsp return err;
6336 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6337 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6338 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6339 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6340 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6341 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6342 818c7501 2019-07-11 stsp if (commit_ref)
6343 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6344 818c7501 2019-07-11 stsp return err;
6347 818c7501 2019-07-11 stsp const struct got_error *
6348 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6349 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6350 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6351 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6352 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6353 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6355 0ebf8283 2019-07-24 stsp const struct got_error *err;
6356 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6358 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6360 0ebf8283 2019-07-24 stsp return err;
6362 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6364 0ebf8283 2019-07-24 stsp goto done;
6366 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6367 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6368 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6370 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6371 0ebf8283 2019-07-24 stsp return err;
6374 0ebf8283 2019-07-24 stsp const struct got_error *
6375 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6376 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6377 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6378 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6379 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6380 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6382 0ebf8283 2019-07-24 stsp const struct got_error *err;
6383 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6385 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6387 0ebf8283 2019-07-24 stsp return err;
6389 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6391 0ebf8283 2019-07-24 stsp goto done;
6393 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6394 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6395 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6397 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6398 0ebf8283 2019-07-24 stsp return err;
6401 0ebf8283 2019-07-24 stsp static const struct got_error *
6402 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6403 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6404 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6405 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6406 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6408 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6409 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6410 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6411 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6412 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6413 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6414 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6416 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6417 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6419 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6421 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6423 3e3a69f1 2019-07-25 stsp return err;
6425 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6426 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6427 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6428 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6430 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6431 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6433 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6434 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6435 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6436 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6437 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6438 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6440 01757395 2019-07-12 stsp if (merged_paths) {
6441 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6442 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6443 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6444 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6447 01757395 2019-07-12 stsp goto done;
6450 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6451 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6453 01757395 2019-07-12 stsp goto done;
6456 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6457 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6458 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6460 a0e95631 2019-07-12 stsp goto done;
6461 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6462 a0e95631 2019-07-12 stsp goto done;
6465 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6467 edd02c5e 2019-07-11 stsp goto done;
6469 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6471 818c7501 2019-07-11 stsp goto done;
6473 5943eee2 2019-08-13 stsp if (new_logmsg) {
6474 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6475 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6476 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6477 5943eee2 2019-08-13 stsp goto done;
6480 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6482 5943eee2 2019-08-13 stsp goto done;
6485 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6486 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6487 f259c4c1 2021-09-24 stsp NULL, worktree, got_object_commit_get_author(orig_commit),
6488 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6489 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6491 a0e95631 2019-07-12 stsp goto done;
6493 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6495 a0e95631 2019-07-12 stsp goto done;
6497 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6499 a0e95631 2019-07-12 stsp goto done;
6501 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6502 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6503 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6504 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6505 a0e95631 2019-07-12 stsp err = sync_err;
6507 a0e95631 2019-07-12 stsp free(fileindex_path);
6508 a0e95631 2019-07-12 stsp free(head_commit_id);
6509 a0e95631 2019-07-12 stsp if (head_ref)
6510 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6511 818c7501 2019-07-11 stsp if (err) {
6512 818c7501 2019-07-11 stsp free(*new_commit_id);
6513 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6515 818c7501 2019-07-11 stsp return err;
6518 818c7501 2019-07-11 stsp const struct got_error *
6519 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6520 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6521 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6522 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6523 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6525 0ebf8283 2019-07-24 stsp const struct got_error *err;
6526 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6527 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6528 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6530 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6532 0ebf8283 2019-07-24 stsp return err;
6534 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6536 0ebf8283 2019-07-24 stsp goto done;
6537 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6539 0ebf8283 2019-07-24 stsp goto done;
6540 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6541 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6542 0ebf8283 2019-07-24 stsp goto done;
6545 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6546 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6548 0ebf8283 2019-07-24 stsp if (commit_ref)
6549 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6550 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6551 0ebf8283 2019-07-24 stsp free(commit_id);
6552 0ebf8283 2019-07-24 stsp return err;
6555 0ebf8283 2019-07-24 stsp const struct got_error *
6556 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6557 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6558 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6559 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6560 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6561 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6563 0ebf8283 2019-07-24 stsp const struct got_error *err;
6564 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6565 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6567 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6569 0ebf8283 2019-07-24 stsp return err;
6571 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6573 0ebf8283 2019-07-24 stsp goto done;
6575 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6576 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6578 0ebf8283 2019-07-24 stsp if (commit_ref)
6579 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6580 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6581 0ebf8283 2019-07-24 stsp return err;
6584 0ebf8283 2019-07-24 stsp const struct got_error *
6585 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6586 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6588 3e3a69f1 2019-07-25 stsp if (fileindex)
6589 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6590 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6593 69844fba 2019-07-11 stsp static const struct got_error *
6594 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6596 69844fba 2019-07-11 stsp const struct got_error *err;
6597 69844fba 2019-07-11 stsp struct got_reference *ref;
6599 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6600 69844fba 2019-07-11 stsp if (err) {
6601 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6602 69844fba 2019-07-11 stsp return NULL;
6603 69844fba 2019-07-11 stsp return err;
6606 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6607 69844fba 2019-07-11 stsp got_ref_close(ref);
6608 69844fba 2019-07-11 stsp return err;
6611 69844fba 2019-07-11 stsp static const struct got_error *
6612 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6614 69844fba 2019-07-11 stsp const struct got_error *err;
6615 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6616 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6618 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6620 69844fba 2019-07-11 stsp goto done;
6621 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6623 69844fba 2019-07-11 stsp goto done;
6625 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6627 69844fba 2019-07-11 stsp goto done;
6628 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6630 69844fba 2019-07-11 stsp goto done;
6632 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6634 69844fba 2019-07-11 stsp goto done;
6635 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6637 69844fba 2019-07-11 stsp goto done;
6639 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6641 69844fba 2019-07-11 stsp goto done;
6642 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6644 69844fba 2019-07-11 stsp goto done;
6647 69844fba 2019-07-11 stsp free(tmp_branch_name);
6648 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6649 69844fba 2019-07-11 stsp free(branch_ref_name);
6650 69844fba 2019-07-11 stsp free(commit_ref_name);
6651 e600f124 2021-03-21 stsp return err;
6654 e600f124 2021-03-21 stsp const struct got_error *
6655 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6656 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6658 e600f124 2021-03-21 stsp const struct got_error *err;
6659 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6660 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6661 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6662 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6663 e600f124 2021-03-21 stsp char *refname = NULL;
6665 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6666 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6667 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6668 e600f124 2021-03-21 stsp branch_name += 11;
6670 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6672 e600f124 2021-03-21 stsp return err;
6674 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6675 e600f124 2021-03-21 stsp new_id_str) == -1) {
6676 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6677 e600f124 2021-03-21 stsp goto done;
6680 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6682 e600f124 2021-03-21 stsp goto done;
6684 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6686 e600f124 2021-03-21 stsp goto done;
6688 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6690 e600f124 2021-03-21 stsp free(new_id_str);
6691 e600f124 2021-03-21 stsp free(refname);
6692 e600f124 2021-03-21 stsp free(old_commit_id);
6694 e600f124 2021-03-21 stsp got_ref_close(ref);
6695 69844fba 2019-07-11 stsp return err;
6698 818c7501 2019-07-11 stsp const struct got_error *
6699 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6700 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6701 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6702 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6704 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6705 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6706 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6708 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6710 818c7501 2019-07-11 stsp return err;
6712 e600f124 2021-03-21 stsp if (create_backup) {
6713 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6714 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6716 e600f124 2021-03-21 stsp goto done;
6719 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6721 818c7501 2019-07-11 stsp goto done;
6723 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6725 818c7501 2019-07-11 stsp goto done;
6727 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6729 818c7501 2019-07-11 stsp goto done;
6731 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6733 a615e0e7 2020-12-16 stsp goto done;
6735 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6737 a615e0e7 2020-12-16 stsp goto done;
6738 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6739 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6740 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6741 a615e0e7 2020-12-16 stsp err = sync_err;
6743 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6744 a615e0e7 2020-12-16 stsp free(fileindex_path);
6745 818c7501 2019-07-11 stsp free(new_head_commit_id);
6746 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6747 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6748 818c7501 2019-07-11 stsp err = unlockerr;
6749 818c7501 2019-07-11 stsp return err;
6752 818c7501 2019-07-11 stsp const struct got_error *
6753 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6754 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6755 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6756 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
6758 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6759 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6760 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6761 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6762 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6763 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6765 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6767 818c7501 2019-07-11 stsp return err;
6769 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6770 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6772 818c7501 2019-07-11 stsp goto done;
6774 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6776 818c7501 2019-07-11 stsp goto done;
6779 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6780 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6781 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6783 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6785 818c7501 2019-07-11 stsp goto done;
6787 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6789 818c7501 2019-07-11 stsp goto done;
6791 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6792 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6794 ca355955 2019-07-12 stsp goto done;
6796 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6798 ca355955 2019-07-12 stsp goto done;
6800 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6802 818c7501 2019-07-11 stsp goto done;
6804 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6805 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6806 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6807 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6808 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6809 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6810 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6811 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
6812 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6813 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6815 1f1abb7e 2019-08-08 stsp goto sync;
6817 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6818 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6820 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6821 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6822 ca355955 2019-07-12 stsp err = sync_err;
6824 818c7501 2019-07-11 stsp got_ref_close(resolved);
6825 a3a2faf2 2019-07-12 stsp free(tree_id);
6826 818c7501 2019-07-11 stsp free(commit_id);
6827 0ebf8283 2019-07-24 stsp if (fileindex)
6828 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6829 0ebf8283 2019-07-24 stsp free(fileindex_path);
6831 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6832 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6833 0ebf8283 2019-07-24 stsp err = unlockerr;
6834 0ebf8283 2019-07-24 stsp return err;
6837 0ebf8283 2019-07-24 stsp const struct got_error *
6838 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6839 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6840 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6841 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6843 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6844 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6845 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6846 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6847 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6848 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6849 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6850 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6852 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6853 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6854 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6855 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6857 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6859 0ebf8283 2019-07-24 stsp return err;
6861 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6863 0ebf8283 2019-07-24 stsp goto done;
6865 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6866 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6867 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6870 0ebf8283 2019-07-24 stsp goto done;
6872 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6874 0ebf8283 2019-07-24 stsp goto done;
6876 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6878 0ebf8283 2019-07-24 stsp goto done;
6880 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6881 0ebf8283 2019-07-24 stsp worktree);
6883 0ebf8283 2019-07-24 stsp goto done;
6885 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6888 0ebf8283 2019-07-24 stsp goto done;
6890 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6892 0ebf8283 2019-07-24 stsp goto done;
6894 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6896 0ebf8283 2019-07-24 stsp goto done;
6898 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6899 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6901 0ebf8283 2019-07-24 stsp goto done;
6902 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6904 0ebf8283 2019-07-24 stsp goto done;
6905 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6906 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6907 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6908 0ebf8283 2019-07-24 stsp goto done;
6911 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6912 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6914 0ebf8283 2019-07-24 stsp goto done;
6915 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6917 0ebf8283 2019-07-24 stsp goto done;
6919 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6921 0ebf8283 2019-07-24 stsp goto done;
6923 0ebf8283 2019-07-24 stsp free(fileindex_path);
6924 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6925 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6926 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6927 0ebf8283 2019-07-24 stsp if (wt_branch)
6928 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6929 0ebf8283 2019-07-24 stsp if (err) {
6930 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6931 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6932 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6934 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6935 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6936 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6938 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6939 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6940 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6941 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6943 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6945 0ebf8283 2019-07-24 stsp return err;
6948 0ebf8283 2019-07-24 stsp const struct got_error *
6949 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6950 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6952 3e3a69f1 2019-07-25 stsp if (fileindex)
6953 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6954 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6957 0ebf8283 2019-07-24 stsp const struct got_error *
6958 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6959 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6961 0ebf8283 2019-07-24 stsp const struct got_error *err;
6962 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6964 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6966 0ebf8283 2019-07-24 stsp return err;
6968 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6969 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6970 0ebf8283 2019-07-24 stsp return NULL;
6973 0ebf8283 2019-07-24 stsp const struct got_error *
6974 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6975 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6976 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6977 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6979 0ebf8283 2019-07-24 stsp const struct got_error *err;
6980 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6981 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6982 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6983 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6984 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6985 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6987 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6988 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6989 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6990 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6992 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6994 3e3a69f1 2019-07-25 stsp return err;
6996 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6998 f032f1f7 2019-08-04 stsp goto done;
7000 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7001 f032f1f7 2019-08-04 stsp &have_staged_files);
7002 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
7003 f032f1f7 2019-08-04 stsp goto done;
7004 f032f1f7 2019-08-04 stsp if (have_staged_files) {
7005 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7006 3e3a69f1 2019-07-25 stsp goto done;
7009 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7011 f032f1f7 2019-08-04 stsp goto done;
7013 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7015 0ebf8283 2019-07-24 stsp goto done;
7017 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7019 0ebf8283 2019-07-24 stsp goto done;
7021 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7022 0ebf8283 2019-07-24 stsp worktree);
7024 0ebf8283 2019-07-24 stsp goto done;
7026 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7028 0ebf8283 2019-07-24 stsp goto done;
7030 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7032 0ebf8283 2019-07-24 stsp goto done;
7033 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
7035 0ebf8283 2019-07-24 stsp goto done;
7037 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7039 0ebf8283 2019-07-24 stsp goto done;
7040 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7042 0ebf8283 2019-07-24 stsp goto done;
7044 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7046 0ebf8283 2019-07-24 stsp goto done;
7048 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7049 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7050 3e3a69f1 2019-07-25 stsp free(fileindex_path);
7051 0ebf8283 2019-07-24 stsp if (commit_ref)
7052 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
7053 0ebf8283 2019-07-24 stsp if (base_commit_ref)
7054 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
7055 0ebf8283 2019-07-24 stsp if (err) {
7056 0ebf8283 2019-07-24 stsp free(*commit_id);
7057 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7058 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7059 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7060 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7061 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7062 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7064 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7065 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7066 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7068 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7070 0ebf8283 2019-07-24 stsp return err;
7073 0ebf8283 2019-07-24 stsp static const struct got_error *
7074 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7076 0ebf8283 2019-07-24 stsp const struct got_error *err;
7077 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7078 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7080 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7082 0ebf8283 2019-07-24 stsp goto done;
7083 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7085 0ebf8283 2019-07-24 stsp goto done;
7087 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7088 0ebf8283 2019-07-24 stsp worktree);
7090 0ebf8283 2019-07-24 stsp goto done;
7091 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7093 0ebf8283 2019-07-24 stsp goto done;
7095 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7097 0ebf8283 2019-07-24 stsp goto done;
7098 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7100 0ebf8283 2019-07-24 stsp goto done;
7102 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7104 0ebf8283 2019-07-24 stsp goto done;
7105 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7107 0ebf8283 2019-07-24 stsp goto done;
7109 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7110 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7111 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7112 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7113 0ebf8283 2019-07-24 stsp return err;
7116 0ebf8283 2019-07-24 stsp const struct got_error *
7117 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7118 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7119 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7120 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7122 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7123 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7124 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7125 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7126 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7128 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7130 0ebf8283 2019-07-24 stsp return err;
7132 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7133 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7135 0ebf8283 2019-07-24 stsp goto done;
7137 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7139 0ebf8283 2019-07-24 stsp goto done;
7141 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7143 0ebf8283 2019-07-24 stsp goto done;
7145 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7146 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7148 0ebf8283 2019-07-24 stsp goto done;
7150 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7152 0ebf8283 2019-07-24 stsp goto done;
7154 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7156 0ebf8283 2019-07-24 stsp goto done;
7158 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7159 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7160 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7161 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7162 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7163 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7164 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7165 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7166 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7167 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
7169 1f1abb7e 2019-08-08 stsp goto sync;
7171 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7172 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7174 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7175 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7176 0ebf8283 2019-07-24 stsp err = sync_err;
7178 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7179 0ebf8283 2019-07-24 stsp free(tree_id);
7180 818c7501 2019-07-11 stsp free(fileindex_path);
7182 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7183 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7184 818c7501 2019-07-11 stsp err = unlockerr;
7185 818c7501 2019-07-11 stsp return err;
7188 0ebf8283 2019-07-24 stsp const struct got_error *
7189 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7190 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7191 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7193 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7194 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7195 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7196 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7198 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7200 0ebf8283 2019-07-24 stsp return err;
7202 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7203 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7205 e600f124 2021-03-21 stsp goto done;
7207 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7208 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7210 0ebf8283 2019-07-24 stsp goto done;
7212 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7214 0ebf8283 2019-07-24 stsp goto done;
7216 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7218 0ebf8283 2019-07-24 stsp goto done;
7220 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7222 0ebf8283 2019-07-24 stsp goto done;
7224 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7226 a615e0e7 2020-12-16 stsp goto done;
7228 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7230 a615e0e7 2020-12-16 stsp goto done;
7231 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7232 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7233 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7234 a615e0e7 2020-12-16 stsp err = sync_err;
7236 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7237 a615e0e7 2020-12-16 stsp free(fileindex_path);
7238 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7239 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7240 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7241 0ebf8283 2019-07-24 stsp err = unlockerr;
7242 0ebf8283 2019-07-24 stsp return err;
7245 0ebf8283 2019-07-24 stsp const struct got_error *
7246 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7247 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7249 0ebf8283 2019-07-24 stsp const struct got_error *err;
7250 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7252 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7254 0ebf8283 2019-07-24 stsp return err;
7256 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7258 0ebf8283 2019-07-24 stsp goto done;
7260 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7262 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7263 2822a352 2019-10-15 stsp return err;
7266 2822a352 2019-10-15 stsp const struct got_error *
7267 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7268 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7269 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7270 2822a352 2019-10-15 stsp struct got_repository *repo)
7272 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7273 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7274 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7276 2822a352 2019-10-15 stsp *fileindex = NULL;
7277 2822a352 2019-10-15 stsp *branch_ref = NULL;
7278 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7280 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7282 2822a352 2019-10-15 stsp return err;
7284 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7285 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7286 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7287 2822a352 2019-10-15 stsp "update -b or different branch name required");
7288 2822a352 2019-10-15 stsp goto done;
7291 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7293 2822a352 2019-10-15 stsp goto done;
7295 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7296 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7297 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7298 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7301 2822a352 2019-10-15 stsp goto done;
7303 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7305 2822a352 2019-10-15 stsp goto done;
7307 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7308 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7310 2822a352 2019-10-15 stsp if (err) {
7311 2822a352 2019-10-15 stsp if (*branch_ref) {
7312 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7313 2822a352 2019-10-15 stsp *branch_ref = NULL;
7315 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7316 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7317 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7319 2822a352 2019-10-15 stsp if (*fileindex) {
7320 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7321 2822a352 2019-10-15 stsp *fileindex = NULL;
7323 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7325 0cb83759 2019-08-03 stsp return err;
7328 2822a352 2019-10-15 stsp const struct got_error *
7329 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7330 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7331 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7332 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7333 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7335 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7336 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7337 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7339 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7341 2822a352 2019-10-15 stsp goto done;
7343 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7345 2822a352 2019-10-15 stsp goto done;
7347 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7348 2822a352 2019-10-15 stsp worktree->path_prefix);
7350 2822a352 2019-10-15 stsp goto done;
7352 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7354 2822a352 2019-10-15 stsp goto done;
7356 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7357 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7359 2822a352 2019-10-15 stsp goto sync;
7361 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7363 2822a352 2019-10-15 stsp goto sync;
7365 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7367 6e210706 2021-01-22 stsp goto sync;
7369 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7371 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7372 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7373 2822a352 2019-10-15 stsp err = sync_err;
7376 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7377 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7378 2822a352 2019-10-15 stsp err = unlockerr;
7379 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7381 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7382 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7383 2822a352 2019-10-15 stsp err = unlockerr;
7384 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7386 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7387 2822a352 2019-10-15 stsp free(fileindex_path);
7388 2822a352 2019-10-15 stsp free(tree_id);
7390 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7391 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7392 2822a352 2019-10-15 stsp err = unlockerr;
7393 2822a352 2019-10-15 stsp return err;
7396 2822a352 2019-10-15 stsp const struct got_error *
7397 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7398 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7399 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7401 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7403 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7405 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7407 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7408 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7409 8b692cd0 2019-10-21 stsp err = unlockerr;
7410 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7412 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7413 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7414 8b692cd0 2019-10-21 stsp err = unlockerr;
7415 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7417 f259c4c1 2021-09-24 stsp return err;
7420 f259c4c1 2021-09-24 stsp const struct got_error *
7421 f259c4c1 2021-09-24 stsp got_worktree_merge_postpone(struct got_worktree *worktree,
7422 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex)
7424 f259c4c1 2021-09-24 stsp const struct got_error *err, *sync_err;
7425 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7427 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7429 f259c4c1 2021-09-24 stsp goto done;
7431 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7433 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_SH);
7434 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7435 f259c4c1 2021-09-24 stsp err = sync_err;
7437 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7438 f259c4c1 2021-09-24 stsp free(fileindex_path);
7439 8b692cd0 2019-10-21 stsp return err;
7442 f259c4c1 2021-09-24 stsp static const struct got_error *
7443 f259c4c1 2021-09-24 stsp delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7445 f259c4c1 2021-09-24 stsp const struct got_error *err;
7446 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7448 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7450 f259c4c1 2021-09-24 stsp goto done;
7451 f259c4c1 2021-09-24 stsp err = delete_ref(branch_refname, repo);
7453 f259c4c1 2021-09-24 stsp goto done;
7455 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7457 f259c4c1 2021-09-24 stsp goto done;
7458 f259c4c1 2021-09-24 stsp err = delete_ref(commit_refname, repo);
7460 f259c4c1 2021-09-24 stsp goto done;
7463 f259c4c1 2021-09-24 stsp free(branch_refname);
7464 f259c4c1 2021-09-24 stsp free(commit_refname);
7465 f259c4c1 2021-09-24 stsp return err;
7468 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg {
7469 f259c4c1 2021-09-24 stsp struct got_worktree *worktree;
7470 f259c4c1 2021-09-24 stsp const char *branch_name;
7473 f259c4c1 2021-09-24 stsp static const struct got_error *
7474 f259c4c1 2021-09-24 stsp merge_commit_msg_cb(struct got_pathlist_head *commitable_paths, char **logmsg,
7475 f259c4c1 2021-09-24 stsp void *arg)
7477 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg *a = arg;
7479 f259c4c1 2021-09-24 stsp if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7480 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(a->worktree)) == -1)
7481 f259c4c1 2021-09-24 stsp return got_error_from_errno("asprintf");
7483 f259c4c1 2021-09-24 stsp return NULL;
7486 f259c4c1 2021-09-24 stsp static const struct got_error *
7487 f259c4c1 2021-09-24 stsp merge_status_cb(void *arg, unsigned char status, unsigned char staged_status,
7488 f259c4c1 2021-09-24 stsp const char *path, struct got_object_id *blob_id,
7489 f259c4c1 2021-09-24 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
7490 f259c4c1 2021-09-24 stsp int dirfd, const char *de_name)
7492 f259c4c1 2021-09-24 stsp return NULL;
7495 f259c4c1 2021-09-24 stsp const struct got_error *
7496 f259c4c1 2021-09-24 stsp got_worktree_merge_branch(struct got_worktree *worktree,
7497 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex,
7498 f259c4c1 2021-09-24 stsp struct got_object_id *yca_commit_id,
7499 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip,
7500 f259c4c1 2021-09-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7501 f259c4c1 2021-09-24 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7503 f259c4c1 2021-09-24 stsp const struct got_error *err;
7504 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7506 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7508 f259c4c1 2021-09-24 stsp goto done;
7510 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7511 f259c4c1 2021-09-24 stsp worktree);
7513 f259c4c1 2021-09-24 stsp goto done;
7515 f259c4c1 2021-09-24 stsp err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7516 f259c4c1 2021-09-24 stsp branch_tip, repo, progress_cb, progress_arg,
7517 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
7519 f259c4c1 2021-09-24 stsp free(fileindex_path);
7520 f259c4c1 2021-09-24 stsp return err;
7523 f259c4c1 2021-09-24 stsp const struct got_error *
7524 f259c4c1 2021-09-24 stsp got_worktree_merge_commit(struct got_object_id **new_commit_id,
7525 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7526 f259c4c1 2021-09-24 stsp const char *author, const char *committer, int allow_bad_symlinks,
7527 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip, const char *branch_name,
7528 f259c4c1 2021-09-24 stsp struct got_repository *repo)
7530 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL, *sync_err;
7531 f259c4c1 2021-09-24 stsp struct got_pathlist_head commitable_paths;
7532 f259c4c1 2021-09-24 stsp struct collect_commitables_arg cc_arg;
7533 f259c4c1 2021-09-24 stsp struct got_pathlist_entry *pe;
7534 f259c4c1 2021-09-24 stsp struct got_reference *head_ref = NULL;
7535 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id = NULL;
7536 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7537 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg mcm_arg;
7538 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7540 f259c4c1 2021-09-24 stsp *new_commit_id = NULL;
7542 f259c4c1 2021-09-24 stsp TAILQ_INIT(&commitable_paths);
7544 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7546 f259c4c1 2021-09-24 stsp goto done;
7548 f259c4c1 2021-09-24 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7550 f259c4c1 2021-09-24 stsp goto done;
7552 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7554 f259c4c1 2021-09-24 stsp goto done;
7556 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7557 f259c4c1 2021-09-24 stsp &have_staged_files);
7558 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7559 f259c4c1 2021-09-24 stsp goto done;
7560 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7561 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7562 f259c4c1 2021-09-24 stsp goto done;
7565 f259c4c1 2021-09-24 stsp cc_arg.commitable_paths = &commitable_paths;
7566 f259c4c1 2021-09-24 stsp cc_arg.worktree = worktree;
7567 f259c4c1 2021-09-24 stsp cc_arg.fileindex = fileindex;
7568 f259c4c1 2021-09-24 stsp cc_arg.repo = repo;
7569 f259c4c1 2021-09-24 stsp cc_arg.have_staged_files = have_staged_files;
7570 f259c4c1 2021-09-24 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7571 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7572 f259c4c1 2021-09-24 stsp collect_commitables, &cc_arg, NULL, NULL, 0, 0);
7574 f259c4c1 2021-09-24 stsp goto done;
7576 f259c4c1 2021-09-24 stsp if (TAILQ_EMPTY(&commitable_paths)) {
7577 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7578 f259c4c1 2021-09-24 stsp "merge of %s cannot proceed", branch_name);
7579 f259c4c1 2021-09-24 stsp goto done;
7582 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7583 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7584 f259c4c1 2021-09-24 stsp const char *ct_path = ct->in_repo_path;
7586 f259c4c1 2021-09-24 stsp while (ct_path[0] == '/')
7587 f259c4c1 2021-09-24 stsp ct_path++;
7588 f259c4c1 2021-09-24 stsp err = check_out_of_date(ct_path, ct->status,
7589 f259c4c1 2021-09-24 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7590 f259c4c1 2021-09-24 stsp head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7592 f259c4c1 2021-09-24 stsp goto done;
7596 f259c4c1 2021-09-24 stsp mcm_arg.worktree = worktree;
7597 f259c4c1 2021-09-24 stsp mcm_arg.branch_name = branch_name;
7598 f259c4c1 2021-09-24 stsp err = commit_worktree(new_commit_id, &commitable_paths,
7599 f259c4c1 2021-09-24 stsp head_commit_id, branch_tip, worktree, author, committer,
7600 f259c4c1 2021-09-24 stsp merge_commit_msg_cb, &mcm_arg, merge_status_cb, NULL, repo);
7602 f259c4c1 2021-09-24 stsp goto done;
7604 f259c4c1 2021-09-24 stsp err = update_fileindex_after_commit(worktree, &commitable_paths,
7605 f259c4c1 2021-09-24 stsp *new_commit_id, fileindex, have_staged_files);
7606 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7607 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7608 f259c4c1 2021-09-24 stsp err = sync_err;
7610 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7611 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7612 f259c4c1 2021-09-24 stsp free_commitable(ct);
7614 f259c4c1 2021-09-24 stsp got_pathlist_free(&commitable_paths);
7615 f259c4c1 2021-09-24 stsp free(fileindex_path);
7616 f259c4c1 2021-09-24 stsp return err;
7619 f259c4c1 2021-09-24 stsp const struct got_error *
7620 f259c4c1 2021-09-24 stsp got_worktree_merge_complete(struct got_worktree *worktree,
7621 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo)
7623 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7624 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7626 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7628 f259c4c1 2021-09-24 stsp goto done;
7630 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7632 f259c4c1 2021-09-24 stsp goto done;
7633 f259c4c1 2021-09-24 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7634 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7635 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7636 f259c4c1 2021-09-24 stsp err = sync_err;
7638 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7639 f259c4c1 2021-09-24 stsp free(fileindex_path);
7640 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7641 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7642 f259c4c1 2021-09-24 stsp err = unlockerr;
7643 f259c4c1 2021-09-24 stsp return err;
7646 f259c4c1 2021-09-24 stsp const struct got_error *
7647 f259c4c1 2021-09-24 stsp got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7648 f259c4c1 2021-09-24 stsp struct got_repository *repo)
7650 f259c4c1 2021-09-24 stsp const struct got_error *err;
7651 f259c4c1 2021-09-24 stsp char *branch_refname = NULL;
7652 f259c4c1 2021-09-24 stsp struct got_reference *branch_ref = NULL;
7654 f259c4c1 2021-09-24 stsp *in_progress = 0;
7656 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7658 f259c4c1 2021-09-24 stsp return err;
7659 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7660 793fcac3 2021-09-24 stsp free(branch_refname);
7661 f259c4c1 2021-09-24 stsp if (err) {
7662 f259c4c1 2021-09-24 stsp if (err->code != GOT_ERR_NOT_REF)
7663 f259c4c1 2021-09-24 stsp return err;
7665 f259c4c1 2021-09-24 stsp *in_progress = 1;
7667 f259c4c1 2021-09-24 stsp return NULL;
7670 f259c4c1 2021-09-24 stsp const struct got_error *got_worktree_merge_prepare(
7671 f259c4c1 2021-09-24 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7672 f259c4c1 2021-09-24 stsp struct got_reference *branch, struct got_repository *repo)
7674 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL;
7675 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7676 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7677 f259c4c1 2021-09-24 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
7678 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL;
7679 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
7680 f259c4c1 2021-09-24 stsp struct check_rebase_ok_arg ok_arg;
7682 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7684 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7686 f259c4c1 2021-09-24 stsp return err;
7688 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7690 f259c4c1 2021-09-24 stsp goto done;
7692 f259c4c1 2021-09-24 stsp /* Preconditions are the same as for rebase. */
7693 f259c4c1 2021-09-24 stsp ok_arg.worktree = worktree;
7694 f259c4c1 2021-09-24 stsp ok_arg.repo = repo;
7695 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7698 f259c4c1 2021-09-24 stsp goto done;
7700 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7702 f259c4c1 2021-09-24 stsp return err;
7704 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7706 f259c4c1 2021-09-24 stsp return err;
7708 f259c4c1 2021-09-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7711 f259c4c1 2021-09-24 stsp goto done;
7713 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
7715 f259c4c1 2021-09-24 stsp goto done;
7717 f259c4c1 2021-09-24 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
7718 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
7719 f259c4c1 2021-09-24 stsp goto done;
7722 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&branch_tip, repo, branch);
7724 f259c4c1 2021-09-24 stsp goto done;
7726 f259c4c1 2021-09-24 stsp err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
7728 f259c4c1 2021-09-24 stsp goto done;
7729 f259c4c1 2021-09-24 stsp err = got_ref_write(branch_ref, repo);
7731 f259c4c1 2021-09-24 stsp goto done;
7733 f259c4c1 2021-09-24 stsp err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
7735 f259c4c1 2021-09-24 stsp goto done;
7736 f259c4c1 2021-09-24 stsp err = got_ref_write(commit_ref, repo);
7738 f259c4c1 2021-09-24 stsp goto done;
7741 f259c4c1 2021-09-24 stsp free(branch_refname);
7742 f259c4c1 2021-09-24 stsp free(commit_refname);
7743 f259c4c1 2021-09-24 stsp free(fileindex_path);
7744 f259c4c1 2021-09-24 stsp if (branch_ref)
7745 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7746 f259c4c1 2021-09-24 stsp if (commit_ref)
7747 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7748 f259c4c1 2021-09-24 stsp if (wt_branch)
7749 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
7750 f259c4c1 2021-09-24 stsp free(wt_branch_tip);
7751 f259c4c1 2021-09-24 stsp if (err) {
7752 f259c4c1 2021-09-24 stsp if (*fileindex) {
7753 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7754 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7756 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7758 f259c4c1 2021-09-24 stsp return err;
7761 f259c4c1 2021-09-24 stsp const struct got_error *
7762 f259c4c1 2021-09-24 stsp got_worktree_merge_continue(char **branch_name,
7763 f259c4c1 2021-09-24 stsp struct got_object_id **branch_tip, struct got_fileindex **fileindex,
7764 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7766 f259c4c1 2021-09-24 stsp const struct got_error *err;
7767 f259c4c1 2021-09-24 stsp char *commit_refname = NULL, *branch_refname = NULL;
7768 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
7769 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7770 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7772 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7773 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7774 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7776 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7778 f259c4c1 2021-09-24 stsp return err;
7780 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7782 f259c4c1 2021-09-24 stsp goto done;
7784 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7785 f259c4c1 2021-09-24 stsp &have_staged_files);
7786 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7787 f259c4c1 2021-09-24 stsp goto done;
7788 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7789 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7790 f259c4c1 2021-09-24 stsp goto done;
7793 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7795 f259c4c1 2021-09-24 stsp goto done;
7797 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7799 f259c4c1 2021-09-24 stsp goto done;
7801 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7803 f259c4c1 2021-09-24 stsp goto done;
7805 f259c4c1 2021-09-24 stsp if (!got_ref_is_symbolic(branch_ref)) {
7806 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
7807 f259c4c1 2021-09-24 stsp "%s is not a symbolic reference",
7808 f259c4c1 2021-09-24 stsp got_ref_get_name(branch_ref));
7809 f259c4c1 2021-09-24 stsp goto done;
7811 f259c4c1 2021-09-24 stsp *branch_name = strdup(got_ref_get_symref_target(branch_ref));
7812 f259c4c1 2021-09-24 stsp if (*branch_name == NULL) {
7813 f259c4c1 2021-09-24 stsp err = got_error_from_errno("strdup");
7814 f259c4c1 2021-09-24 stsp goto done;
7817 f259c4c1 2021-09-24 stsp err = got_ref_open(&commit_ref, repo, commit_refname, 0);
7819 f259c4c1 2021-09-24 stsp goto done;
7821 f259c4c1 2021-09-24 stsp err = got_ref_resolve(branch_tip, repo, commit_ref);
7823 f259c4c1 2021-09-24 stsp goto done;
7825 f259c4c1 2021-09-24 stsp free(commit_refname);
7826 f259c4c1 2021-09-24 stsp free(branch_refname);
7827 f259c4c1 2021-09-24 stsp free(fileindex_path);
7828 f259c4c1 2021-09-24 stsp if (commit_ref)
7829 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7830 f259c4c1 2021-09-24 stsp if (branch_ref)
7831 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7832 f259c4c1 2021-09-24 stsp if (err) {
7833 f259c4c1 2021-09-24 stsp if (*branch_name) {
7834 f259c4c1 2021-09-24 stsp free(*branch_name);
7835 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7837 f259c4c1 2021-09-24 stsp free(*branch_tip);
7838 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7839 f259c4c1 2021-09-24 stsp if (*fileindex) {
7840 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7841 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7843 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7845 f259c4c1 2021-09-24 stsp return err;
7848 f259c4c1 2021-09-24 stsp const struct got_error *
7849 f259c4c1 2021-09-24 stsp got_worktree_merge_abort(struct got_worktree *worktree,
7850 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7851 f259c4c1 2021-09-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7853 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7854 f259c4c1 2021-09-24 stsp struct got_object_id *commit_id = NULL;
7855 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7856 f259c4c1 2021-09-24 stsp struct revert_file_args rfa;
7857 f259c4c1 2021-09-24 stsp struct got_object_id *tree_id = NULL;
7859 f259c4c1 2021-09-24 stsp err = got_object_id_by_path(&tree_id, repo,
7860 f259c4c1 2021-09-24 stsp worktree->base_commit_id, worktree->path_prefix);
7862 f259c4c1 2021-09-24 stsp goto done;
7864 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7866 f259c4c1 2021-09-24 stsp goto done;
7868 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7870 f259c4c1 2021-09-24 stsp goto done;
7872 f259c4c1 2021-09-24 stsp rfa.worktree = worktree;
7873 f259c4c1 2021-09-24 stsp rfa.fileindex = fileindex;
7874 f259c4c1 2021-09-24 stsp rfa.progress_cb = progress_cb;
7875 f259c4c1 2021-09-24 stsp rfa.progress_arg = progress_arg;
7876 f259c4c1 2021-09-24 stsp rfa.patch_cb = NULL;
7877 f259c4c1 2021-09-24 stsp rfa.patch_arg = NULL;
7878 f259c4c1 2021-09-24 stsp rfa.repo = repo;
7879 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 1;
7880 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7881 f259c4c1 2021-09-24 stsp revert_file, &rfa, NULL, NULL, 0, 0);
7883 f259c4c1 2021-09-24 stsp goto sync;
7885 f259c4c1 2021-09-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7886 f259c4c1 2021-09-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7888 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7889 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7890 f259c4c1 2021-09-24 stsp err = sync_err;
7892 f259c4c1 2021-09-24 stsp free(tree_id);
7893 f259c4c1 2021-09-24 stsp free(commit_id);
7894 f259c4c1 2021-09-24 stsp if (fileindex)
7895 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7896 f259c4c1 2021-09-24 stsp free(fileindex_path);
7898 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7899 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7900 f259c4c1 2021-09-24 stsp err = unlockerr;
7901 f259c4c1 2021-09-24 stsp return err;
7904 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7905 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7906 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7907 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7908 2db2652d 2019-08-07 stsp struct got_repository *repo;
7909 2db2652d 2019-08-07 stsp int have_changes;
7912 2db2652d 2019-08-07 stsp const struct got_error *
7913 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7914 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7915 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7916 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7918 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7919 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7920 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7921 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7922 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7923 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7925 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7926 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7927 8b13ce36 2019-08-08 stsp return NULL;
7928 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7929 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7931 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7932 735ef5ac 2019-08-03 stsp if (ie == NULL)
7933 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7935 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7936 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7937 735ef5ac 2019-08-03 stsp relpath) == -1)
7938 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7940 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7941 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7942 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7943 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7946 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7947 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7948 3aa5969e 2019-08-06 stsp goto done;
7949 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7950 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7951 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7952 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7953 735ef5ac 2019-08-03 stsp goto done;
7956 2db2652d 2019-08-07 stsp a->have_changes = 1;
7958 735ef5ac 2019-08-03 stsp p = in_repo_path;
7959 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7961 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7962 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7963 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7965 735ef5ac 2019-08-03 stsp free(in_repo_path);
7966 dc424a06 2019-08-07 stsp return err;
7969 2db2652d 2019-08-07 stsp struct stage_path_arg {
7970 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7971 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7972 2db2652d 2019-08-07 stsp struct got_repository *repo;
7973 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7974 2db2652d 2019-08-07 stsp void *status_arg;
7975 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7976 2db2652d 2019-08-07 stsp void *patch_arg;
7977 7b5dc508 2019-10-28 stsp int staged_something;
7978 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7981 2db2652d 2019-08-07 stsp static const struct got_error *
7982 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7983 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7984 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7985 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7987 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7988 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7989 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7990 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7991 0cb83759 2019-08-03 stsp uint32_t stage;
7992 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7993 0aeb8099 2020-07-23 stsp struct stat sb;
7995 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7996 8b13ce36 2019-08-08 stsp return NULL;
7998 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7999 d3e7c587 2019-08-03 stsp if (ie == NULL)
8000 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8002 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8003 2db2652d 2019-08-07 stsp relpath)== -1)
8004 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
8006 0cb83759 2019-08-03 stsp switch (status) {
8007 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
8008 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
8009 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
8010 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
8011 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
8014 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8015 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
8016 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8017 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8018 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
8021 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
8024 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
8025 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
8026 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
8027 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
8028 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
8032 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
8033 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
8036 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8037 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8038 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8039 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
8041 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
8042 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8043 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
8044 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
8045 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
8046 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
8047 35213c7c 2020-07-23 stsp ssize_t target_len;
8048 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
8049 35213c7c 2020-07-23 stsp sizeof(target_path));
8050 35213c7c 2020-07-23 stsp if (target_len == -1) {
8051 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
8052 35213c7c 2020-07-23 stsp ondisk_path);
8055 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
8056 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
8057 35213c7c 2020-07-23 stsp a->worktree->root_path);
8060 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
8061 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
8062 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
8066 35213c7c 2020-07-23 stsp if (is_bad_symlink)
8067 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8068 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
8070 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8071 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8073 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8074 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8076 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8077 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8079 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8080 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8081 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8083 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8084 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8086 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8087 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8088 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8089 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8092 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8094 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8095 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8099 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8100 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8101 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8102 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8104 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8105 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8108 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8110 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8111 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8113 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8114 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8117 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8121 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8122 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8123 dc424a06 2019-08-07 stsp free(path_content);
8124 2db2652d 2019-08-07 stsp free(ondisk_path);
8125 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8126 0ebf8283 2019-07-24 stsp return err;
8129 0cb83759 2019-08-03 stsp const struct got_error *
8130 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8131 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8132 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8133 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8134 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8136 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8137 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8138 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8139 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8140 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8141 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8142 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8143 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8145 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8147 0cb83759 2019-08-03 stsp return err;
8149 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8150 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8152 735ef5ac 2019-08-03 stsp goto done;
8153 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8155 735ef5ac 2019-08-03 stsp goto done;
8156 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8158 0cb83759 2019-08-03 stsp goto done;
8160 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8161 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8162 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8163 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8164 2db2652d 2019-08-07 stsp oka.repo = repo;
8165 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8166 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8167 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8168 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
8170 735ef5ac 2019-08-03 stsp goto done;
8172 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8173 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8174 2db2652d 2019-08-07 stsp goto done;
8177 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8178 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8179 2db2652d 2019-08-07 stsp spa.repo = repo;
8180 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8181 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8182 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8183 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8184 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8185 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8186 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8187 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8188 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
8190 2db2652d 2019-08-07 stsp goto done;
8192 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8193 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8194 7b5dc508 2019-10-28 stsp goto done;
8197 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8198 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8199 0cb83759 2019-08-03 stsp err = sync_err;
8201 735ef5ac 2019-08-03 stsp if (head_ref)
8202 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8203 735ef5ac 2019-08-03 stsp free(head_commit_id);
8204 0cb83759 2019-08-03 stsp free(fileindex_path);
8205 0cb83759 2019-08-03 stsp if (fileindex)
8206 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8207 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8208 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8209 0cb83759 2019-08-03 stsp err = unlockerr;
8210 0cb83759 2019-08-03 stsp return err;
8213 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8214 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8215 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8216 ad493afc 2019-08-03 stsp struct got_repository *repo;
8217 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8218 ad493afc 2019-08-03 stsp void *progress_arg;
8219 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8220 2e1f37b0 2019-08-08 stsp void *patch_arg;
8223 2e1f37b0 2019-08-08 stsp static const struct got_error *
8224 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8225 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8226 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8227 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8228 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8230 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8231 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8232 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8233 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8234 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8235 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8236 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8238 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8239 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8241 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8243 2e1f37b0 2019-08-08 stsp return err;
8244 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
8246 2e1f37b0 2019-08-08 stsp goto done;
8248 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8250 2e1f37b0 2019-08-08 stsp goto done;
8252 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8254 2e1f37b0 2019-08-08 stsp goto done;
8256 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
8258 2e1f37b0 2019-08-08 stsp goto done;
8260 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8262 2e1f37b0 2019-08-08 stsp goto done;
8264 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8266 2e1f37b0 2019-08-08 stsp goto done;
8268 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
8269 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
8271 2e1f37b0 2019-08-08 stsp goto done;
8273 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8274 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
8276 2e1f37b0 2019-08-08 stsp goto done;
8277 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8278 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
8280 2e1f37b0 2019-08-08 stsp goto done;
8282 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8283 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8284 2e1f37b0 2019-08-08 stsp goto done;
8286 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8287 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8288 2e1f37b0 2019-08-08 stsp goto done;
8290 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8291 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8292 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
8293 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8294 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8295 fe621944 2020-11-10 stsp nchanges++;
8297 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8298 2e1f37b0 2019-08-08 stsp int choice;
8299 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8300 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8301 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8302 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8304 2e1f37b0 2019-08-08 stsp goto done;
8305 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8306 2e1f37b0 2019-08-08 stsp have_content = 1;
8308 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8309 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8312 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8313 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8314 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8316 2e1f37b0 2019-08-08 stsp free(label1);
8318 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8319 2e1f37b0 2019-08-08 stsp if (staged_blob)
8320 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8321 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8322 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8323 fe621944 2020-11-10 stsp err = free_err;
8324 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8325 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8326 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8327 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8328 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8329 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8330 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8331 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8332 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8333 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8334 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8335 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8336 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8337 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8338 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8339 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8340 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8341 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8342 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8344 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8345 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8346 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8347 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8348 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8349 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8350 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8352 2e1f37b0 2019-08-08 stsp free(path1);
8353 2e1f37b0 2019-08-08 stsp free(path2);
8354 fda8017d 2020-07-23 stsp return err;
8357 fda8017d 2020-07-23 stsp static const struct got_error *
8358 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8359 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8360 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8361 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8362 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8363 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8364 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8366 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8367 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8368 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8369 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8370 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8371 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8372 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8373 fda8017d 2020-07-23 stsp struct stat sb;
8375 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8376 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8377 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8379 fda8017d 2020-07-23 stsp return err;
8381 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8382 fda8017d 2020-07-23 stsp return NULL;
8384 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8385 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8386 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8388 fda8017d 2020-07-23 stsp goto done;
8391 fda8017d 2020-07-23 stsp f = fopen(path_unstaged_content, "r");
8392 fda8017d 2020-07-23 stsp if (f == NULL) {
8393 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8394 fda8017d 2020-07-23 stsp path_unstaged_content);
8395 fda8017d 2020-07-23 stsp goto done;
8397 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8398 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8399 fda8017d 2020-07-23 stsp goto done;
8401 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8402 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8403 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8405 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8406 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8407 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8408 fda8017d 2020-07-23 stsp goto done;
8410 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8411 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8412 fda8017d 2020-07-23 stsp goto done;
8414 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8415 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8416 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8417 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8418 fda8017d 2020-07-23 stsp progress_arg);
8420 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8422 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8424 67a66647 2021-05-31 stsp return err;
8426 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8427 67a66647 2021-05-31 stsp parent) == -1) {
8428 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8429 67a66647 2021-05-31 stsp base_path = NULL;
8430 67a66647 2021-05-31 stsp goto done;
8433 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8435 67a66647 2021-05-31 stsp goto done;
8436 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8437 67a66647 2021-05-31 stsp blob_base);
8439 67a66647 2021-05-31 stsp goto done;
8442 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8443 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8445 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8446 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8447 eec2f5a9 2021-06-03 stsp ondisk_path);
8449 eec2f5a9 2021-06-03 stsp goto done;
8452 eec2f5a9 2021-06-03 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
8453 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8454 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8455 eec2f5a9 2021-06-03 stsp goto done;
8457 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8458 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8459 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8460 eec2f5a9 2021-06-03 stsp close(fd);
8461 eec2f5a9 2021-06-03 stsp goto done;
8465 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8466 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8467 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8468 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8469 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8472 fda8017d 2020-07-23 stsp goto done;
8474 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8475 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8476 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8478 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8479 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8482 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8483 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8484 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8485 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8486 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8487 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8488 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8489 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8490 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8491 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8492 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8493 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8494 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8495 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8496 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8497 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8498 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8499 67a66647 2021-05-31 stsp free(blob_base_path);
8500 67a66647 2021-05-31 stsp free(parent);
8501 67a66647 2021-05-31 stsp free(base_path);
8502 2e1f37b0 2019-08-08 stsp return err;
8505 ad493afc 2019-08-03 stsp static const struct got_error *
8506 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8507 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8508 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8509 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8511 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8512 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8513 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8514 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8515 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8516 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8517 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8518 9bc94a15 2019-08-03 stsp struct stat sb;
8520 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8521 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8522 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8523 2e1f37b0 2019-08-08 stsp return NULL;
8525 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8526 ad493afc 2019-08-03 stsp if (ie == NULL)
8527 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8529 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8531 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8533 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8534 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8536 f69721c3 2019-10-21 stsp goto done;
8537 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8538 f69721c3 2019-10-21 stsp id_str) == -1) {
8539 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8540 f69721c3 2019-10-21 stsp goto done;
8543 ad493afc 2019-08-03 stsp switch (staged_status) {
8544 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8545 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8546 ad493afc 2019-08-03 stsp blob_id, 8192);
8549 ad493afc 2019-08-03 stsp /* fall through */
8550 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8551 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8552 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8553 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8554 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8555 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8558 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8561 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8562 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8563 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8564 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8565 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8566 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8569 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8570 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
8573 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8574 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8575 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8576 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8577 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8578 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8579 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8580 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8581 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8583 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8584 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8585 36bf999c 2020-07-23 stsp char *staged_target;
8586 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8587 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8589 36bf999c 2020-07-23 stsp goto done;
8590 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8591 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8592 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8593 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8594 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8595 36bf999c 2020-07-23 stsp free(staged_target);
8597 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8598 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8599 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8600 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8601 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8602 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8603 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8607 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8610 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8611 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8612 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8613 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8616 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8617 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8618 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8619 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8620 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8623 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8625 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8626 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8630 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8631 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8632 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8633 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8636 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8640 ad493afc 2019-08-03 stsp free(ondisk_path);
8641 ad493afc 2019-08-03 stsp if (blob_base)
8642 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8643 ad493afc 2019-08-03 stsp if (blob_staged)
8644 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8645 f69721c3 2019-10-21 stsp free(id_str);
8646 f69721c3 2019-10-21 stsp free(label_orig);
8647 ad493afc 2019-08-03 stsp return err;
8650 ad493afc 2019-08-03 stsp const struct got_error *
8651 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8652 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8653 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8654 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8655 ad493afc 2019-08-03 stsp struct got_repository *repo)
8657 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8658 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8659 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8660 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8661 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8663 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8665 ad493afc 2019-08-03 stsp return err;
8667 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8669 ad493afc 2019-08-03 stsp goto done;
8671 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8672 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8673 ad493afc 2019-08-03 stsp upa.repo = repo;
8674 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8675 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8676 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8677 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8678 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8679 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8680 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
8682 ad493afc 2019-08-03 stsp goto done;
8685 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8686 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8687 ad493afc 2019-08-03 stsp err = sync_err;
8689 ad493afc 2019-08-03 stsp free(fileindex_path);
8690 ad493afc 2019-08-03 stsp if (fileindex)
8691 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8692 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8693 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8694 ad493afc 2019-08-03 stsp err = unlockerr;
8695 ad493afc 2019-08-03 stsp return err;
8698 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8699 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8700 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8701 b2118c49 2020-07-28 stsp void *info_arg;
8702 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8703 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8704 b2118c49 2020-07-28 stsp void *cancel_arg;
8707 b2118c49 2020-07-28 stsp static const struct got_error *
8708 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8710 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8711 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8712 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8713 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8714 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8715 b2118c49 2020-07-28 stsp int stage;
8717 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8718 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8720 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8721 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8722 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8725 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8726 b2118c49 2020-07-28 stsp return NULL;
8728 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8729 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8730 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8732 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8733 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8734 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8735 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8736 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8737 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8740 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8741 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8742 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8745 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8746 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8749 b2118c49 2020-07-28 stsp const struct got_error *
8750 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8751 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8752 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8753 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8756 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8757 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8758 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8759 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8761 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8763 b2118c49 2020-07-28 stsp return err;
8765 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8767 b2118c49 2020-07-28 stsp goto done;
8769 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8770 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8771 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8772 b2118c49 2020-07-28 stsp arg.paths = paths;
8773 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8774 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8775 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8778 b2118c49 2020-07-28 stsp free(fileindex_path);
8779 b2118c49 2020-07-28 stsp if (fileindex)
8780 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8781 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8782 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8783 b2118c49 2020-07-28 stsp err = unlockerr;
8784 b2118c49 2020-07-28 stsp return err;
