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 f6764181 2021-09-24 stsp if (stat(ondisk_path, &sb) == -1) {
1946 f6764181 2021-09-24 stsp if (errno != ENOENT) {
1947 f6764181 2021-09-24 stsp err = got_error_from_errno2("stat",
1948 f6764181 2021-09-24 stsp ondisk_path);
1949 f6764181 2021-09-24 stsp goto done;
1951 f6764181 2021-09-24 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1952 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1954 f6764181 2021-09-24 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1955 f6764181 2021-09-24 stsp status = GOT_STATUS_UNVERSIONED;
1957 f6764181 2021-09-24 stsp status = GOT_STATUS_OBSTRUCTED;
1961 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1963 2c41dce7 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1964 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1965 b8f41171 2019-02-10 stsp goto done;
1967 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1969 a769b60b 2021-06-27 stsp got_fileindex_entry_mark_skipped(ie);
1970 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1972 5036ab18 2020-04-18 stsp goto done;
1975 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1976 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1977 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1979 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1980 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1981 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1982 c6e8a826 2021-04-05 stsp * updating contents of this file.
1984 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1985 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1986 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1987 c6e8a826 2021-04-05 stsp /* Same commit. */
1988 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1989 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1991 e2b1e152 2019-07-13 stsp goto done;
1992 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1994 6353ad76 2019-02-08 stsp goto done;
1996 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1997 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1998 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1999 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
2000 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
2001 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
2003 0f58026f 2021-04-05 stsp goto done;
2004 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
2006 b8f41171 2019-02-10 stsp goto done;
2010 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
2012 6353ad76 2019-02-08 stsp goto done;
2014 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
2015 234035bc 2019-06-01 stsp int update_timestamps;
2016 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
2017 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2018 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
2019 234035bc 2019-06-01 stsp struct got_object_id id2;
2020 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2021 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
2023 f69721c3 2019-10-21 stsp goto done;
2025 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
2026 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
2027 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
2028 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
2029 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
2030 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
2031 f69721c3 2019-10-21 stsp goto done;
2033 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2034 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2035 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2036 234035bc 2019-06-01 stsp goto done;
2039 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
2040 36bf999c 2020-07-23 stsp char *link_target;
2041 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
2043 36bf999c 2020-07-23 stsp goto done;
2044 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
2045 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
2046 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
2047 36bf999c 2020-07-23 stsp free(link_target);
2049 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
2050 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
2051 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
2052 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
2054 f69721c3 2019-10-21 stsp free(label_orig);
2055 234035bc 2019-06-01 stsp if (blob2)
2056 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
2058 909d120e 2019-09-22 stsp goto done;
2060 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
2061 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
2062 234035bc 2019-06-01 stsp * unmodified files again.
2064 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2065 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
2066 234035bc 2019-06-01 stsp update_timestamps);
2067 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
2068 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2069 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2070 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
2071 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
2073 1ee397ad 2019-07-12 stsp goto done;
2074 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2075 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2077 13d9040b 2019-03-27 stsp goto done;
2079 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2080 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
2081 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
2082 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
2083 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
2084 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2085 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2087 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2088 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2089 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2090 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2091 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2094 13d9040b 2019-03-27 stsp goto done;
2097 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2098 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
2099 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2101 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2102 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2103 054041d0 2020-06-24 stsp &blob->id);
2106 13d9040b 2019-03-27 stsp goto done;
2108 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2109 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2110 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2113 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2115 6353ad76 2019-02-08 stsp free(ondisk_path);
2116 8da9e5f4 2019-01-12 stsp return err;
2119 90285c3b 2019-01-08 stsp static const struct got_error *
2120 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2122 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2123 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2125 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2126 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2128 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2129 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2130 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2132 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2133 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2135 1c4cdd89 2021-06-20 stsp goto done;
2136 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2137 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2138 fddefe3b 2020-10-20 stsp free(ondisk_path);
2139 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2140 1c4cdd89 2021-06-20 stsp parent = NULL;
2141 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2142 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2143 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2144 fddefe3b 2020-10-20 stsp ondisk_path);
2147 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2153 90285c3b 2019-01-08 stsp free(ondisk_path);
2154 1c4cdd89 2021-06-20 stsp free(parent);
2155 90285c3b 2019-01-08 stsp return err;
2158 708d8e67 2019-03-27 stsp static const struct got_error *
2159 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2160 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2161 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2163 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2164 708d8e67 2019-03-27 stsp unsigned char status;
2165 708d8e67 2019-03-27 stsp struct stat sb;
2166 708d8e67 2019-03-27 stsp char *ondisk_path;
2168 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2169 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2171 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2173 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2175 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2177 5a58a424 2020-06-23 stsp goto done;
2179 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2180 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2181 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2182 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2183 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2184 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2185 993e2a1b 2020-07-23 stsp goto done;
2187 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2188 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2189 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2190 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2192 993e2a1b 2020-07-23 stsp goto done;
2193 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2194 993e2a1b 2020-07-23 stsp ie->path);
2195 993e2a1b 2020-07-23 stsp goto done;
2198 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2199 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2200 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2202 5a58a424 2020-06-23 stsp goto done;
2204 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2205 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2207 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2208 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2210 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2212 5a58a424 2020-06-23 stsp goto done;
2213 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2214 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2216 5a58a424 2020-06-23 stsp goto done;
2218 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2221 5a58a424 2020-06-23 stsp free(ondisk_path);
2222 fc6346c4 2019-03-27 stsp return err;
2225 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2226 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2227 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2228 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2229 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2230 8da9e5f4 2019-01-12 stsp void *progress_arg;
2231 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2232 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2235 512f0d0e 2019-01-02 stsp static const struct got_error *
2236 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2237 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, 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 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2245 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2248 8da9e5f4 2019-01-12 stsp static const struct got_error *
2249 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2251 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2253 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2254 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2256 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2257 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2260 9d31a1d8 2018-03-11 stsp static const struct got_error *
2261 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2263 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2264 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2265 8da9e5f4 2019-01-12 stsp char *path;
2267 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2268 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2270 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2271 63c5ca5d 2019-08-24 stsp return NULL;
2273 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2274 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2276 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2278 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2279 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2281 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2282 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2284 8da9e5f4 2019-01-12 stsp free(path);
2285 0cd1c46a 2019-03-11 stsp return err;
2288 b2118c49 2020-07-28 stsp const struct got_error *
2289 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2291 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2293 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2294 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2295 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2296 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2299 b2118c49 2020-07-28 stsp return NULL;
2302 818c7501 2019-07-11 stsp static const struct got_error *
2303 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2305 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2306 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2308 517bab73 2019-03-11 stsp *refname = NULL;
2310 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2312 b2118c49 2020-07-28 stsp return err;
2314 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2315 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2316 0647c563 2019-03-11 stsp *refname = NULL;
2318 517bab73 2019-03-11 stsp free(uuidstr);
2319 517bab73 2019-03-11 stsp return err;
2322 818c7501 2019-07-11 stsp const struct got_error *
2323 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2325 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2328 818c7501 2019-07-11 stsp static const struct got_error *
2329 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2331 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2332 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2335 818c7501 2019-07-11 stsp static const struct got_error *
2336 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2338 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2341 818c7501 2019-07-11 stsp static const struct got_error *
2342 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2344 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2345 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2348 818c7501 2019-07-11 stsp static const struct got_error *
2349 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2351 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2352 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2355 0ebf8283 2019-07-24 stsp static const struct got_error *
2356 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2358 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2359 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2362 0ebf8283 2019-07-24 stsp static const struct got_error *
2363 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2365 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2366 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2369 0ebf8283 2019-07-24 stsp static const struct got_error *
2370 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2372 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2373 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2376 0ebf8283 2019-07-24 stsp static const struct got_error *
2377 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2379 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2380 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2383 0ebf8283 2019-07-24 stsp const struct got_error *
2384 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2385 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2387 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2388 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2389 0ebf8283 2019-07-24 stsp *path = NULL;
2390 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2392 0ebf8283 2019-07-24 stsp return NULL;
2395 f259c4c1 2021-09-24 stsp static const struct got_error *
2396 f259c4c1 2021-09-24 stsp get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2398 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2399 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2402 f259c4c1 2021-09-24 stsp static const struct got_error *
2403 f259c4c1 2021-09-24 stsp get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2405 f259c4c1 2021-09-24 stsp return get_ref_name(refname, worktree,
2406 f259c4c1 2021-09-24 stsp GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2410 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2411 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2413 517bab73 2019-03-11 stsp static const struct got_error *
2414 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2416 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2417 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2418 517bab73 2019-03-11 stsp char *refname;
2420 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2422 517bab73 2019-03-11 stsp return err;
2424 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2426 0cd1c46a 2019-03-11 stsp goto done;
2428 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2430 0cd1c46a 2019-03-11 stsp free(refname);
2432 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2433 3e3a69f1 2019-07-25 stsp return err;
2436 3e3a69f1 2019-07-25 stsp static const struct got_error *
2437 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2439 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2441 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2442 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2443 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2444 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2446 9d31a1d8 2018-03-11 stsp return err;
2450 ebf99748 2019-05-09 stsp static const struct got_error *
2451 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2452 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2454 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2455 ebf99748 2019-05-09 stsp FILE *index = NULL;
2457 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2458 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2459 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2460 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2462 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2464 ebf99748 2019-05-09 stsp goto done;
2466 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2467 ebf99748 2019-05-09 stsp if (index == NULL) {
2468 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2469 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2471 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2472 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2473 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2476 ebf99748 2019-05-09 stsp if (err) {
2477 ebf99748 2019-05-09 stsp free(*fileindex_path);
2478 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2479 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2480 ebf99748 2019-05-09 stsp *fileindex = NULL;
2482 ebf99748 2019-05-09 stsp return err;
2485 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2486 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2487 c932eeeb 2019-05-22 stsp const char *path;
2488 c932eeeb 2019-05-22 stsp size_t path_len;
2489 c932eeeb 2019-05-22 stsp const char *entry_name;
2490 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2491 a484d721 2019-06-10 stsp void *progress_arg;
2494 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2495 c932eeeb 2019-05-22 stsp static const struct got_error *
2496 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2498 1ee397ad 2019-07-12 stsp const struct got_error *err;
2499 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2501 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2502 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2503 c932eeeb 2019-05-22 stsp return NULL;
2504 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2505 102ff934 2019-06-11 stsp return NULL;
2507 a769b60b 2021-06-27 stsp if (got_fileindex_entry_was_skipped(ie))
2508 a769b60b 2021-06-27 stsp return NULL;
2510 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2511 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2512 c932eeeb 2019-05-22 stsp return NULL;
2514 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2515 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2516 edd02c5e 2019-07-11 stsp ie->path);
2518 1ee397ad 2019-07-12 stsp return err;
2520 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2521 c932eeeb 2019-05-22 stsp return NULL;
2524 a615e0e7 2020-12-16 stsp static const struct got_error *
2525 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2526 abc59930 2021-09-05 naddy struct got_fileindex *fileindex,
2527 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
2529 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2531 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2532 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2533 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2534 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2535 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2536 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2538 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2539 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2542 9c6338c4 2019-06-02 stsp static const struct got_error *
2543 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2545 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2546 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2547 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2548 867630bb 2020-01-17 stsp struct timespec timeout;
2550 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2551 9c6338c4 2019-06-02 stsp fileindex_path);
2553 9c6338c4 2019-06-02 stsp goto done;
2555 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2557 9c6338c4 2019-06-02 stsp goto done;
2559 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2560 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2561 9c6338c4 2019-06-02 stsp fileindex_path);
2562 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2566 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2567 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2568 867630bb 2020-01-17 stsp * was recorded in the file index.
2570 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2571 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2572 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2574 9c6338c4 2019-06-02 stsp if (new_index)
2575 9c6338c4 2019-06-02 stsp fclose(new_index);
2576 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2577 9c6338c4 2019-06-02 stsp return err;
2580 6ced4176 2019-07-12 stsp static const struct got_error *
2581 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2582 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2583 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2585 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2586 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2587 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2588 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2590 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2591 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2592 6ced4176 2019-07-12 stsp *tree_id = NULL;
2594 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2595 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2596 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2597 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2598 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2599 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2600 6ced4176 2019-07-12 stsp goto done;
2602 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2603 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2605 6ced4176 2019-07-12 stsp goto done;
2606 6ced4176 2019-07-12 stsp return NULL;
2609 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2611 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2612 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2613 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2614 6ced4176 2019-07-12 stsp goto done;
2617 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2618 6ced4176 2019-07-12 stsp in_repo_path);
2620 6ced4176 2019-07-12 stsp goto done;
2622 6ced4176 2019-07-12 stsp free(in_repo_path);
2623 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2625 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2627 6ced4176 2019-07-12 stsp goto done;
2629 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2630 6ced4176 2019-07-12 stsp /* Check out a single file. */
2631 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2632 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2633 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2634 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2635 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2636 6ced4176 2019-07-12 stsp goto done;
2638 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2639 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2640 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2641 6ced4176 2019-07-12 stsp goto done;
2644 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2645 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2647 6ced4176 2019-07-12 stsp return err;
2648 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2649 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2650 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2651 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2652 6ced4176 2019-07-12 stsp goto done;
2655 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2656 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2658 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2659 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2660 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2661 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2662 6ced4176 2019-07-12 stsp goto done;
2664 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2665 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2666 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2667 6ced4176 2019-07-12 stsp goto done;
2672 6ced4176 2019-07-12 stsp free(in_repo_path);
2673 6ced4176 2019-07-12 stsp if (err) {
2674 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2675 6ced4176 2019-07-12 stsp free(*tree_relpath);
2676 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2677 6ced4176 2019-07-12 stsp free(*tree_id);
2678 6ced4176 2019-07-12 stsp *tree_id = NULL;
2680 07ed472d 2019-07-12 stsp return err;
2683 07ed472d 2019-07-12 stsp static const struct got_error *
2684 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2685 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2686 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2687 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2689 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2690 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2691 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2692 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2693 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2695 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2696 7f47418f 2019-12-20 stsp if (err) {
2697 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2698 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2699 7f47418f 2019-12-20 stsp goto done;
2700 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2701 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2703 7f47418f 2019-12-20 stsp return err;
2706 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2707 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2709 07ed472d 2019-07-12 stsp goto done;
2711 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2713 07ed472d 2019-07-12 stsp goto done;
2715 07ed472d 2019-07-12 stsp if (entry_name &&
2716 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2717 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2718 07ed472d 2019-07-12 stsp goto done;
2721 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2722 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2723 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2724 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2725 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2726 07ed472d 2019-07-12 stsp arg.repo = repo;
2727 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2728 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2729 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2730 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2731 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2732 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2735 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2736 07ed472d 2019-07-12 stsp if (commit)
2737 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2738 6ced4176 2019-07-12 stsp return err;
2741 9d31a1d8 2018-03-11 stsp const struct got_error *
2742 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2743 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2744 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2745 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2747 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2748 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2749 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2750 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2751 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2752 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2753 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2754 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tree_path_data) entry;
2755 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2756 f2ea84fa 2019-07-27 stsp int entry_type;
2757 f2ea84fa 2019-07-27 stsp char *relpath;
2758 f2ea84fa 2019-07-27 stsp char *entry_name;
2759 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2760 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2762 dbdddfee 2021-06-23 naddy STAILQ_INIT(&tree_paths);
2764 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2766 9d31a1d8 2018-03-11 stsp return err;
2768 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2769 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2770 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2771 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2772 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2773 f2ea84fa 2019-07-27 stsp goto done;
2776 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2777 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2778 f2ea84fa 2019-07-27 stsp if (err) {
2779 f2ea84fa 2019-07-27 stsp free(tpd);
2780 6ced4176 2019-07-12 stsp goto done;
2783 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2784 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2785 f2ea84fa 2019-07-27 stsp if (err) {
2786 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2787 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2788 f2ea84fa 2019-07-27 stsp free(tpd);
2789 f2ea84fa 2019-07-27 stsp goto done;
2792 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2794 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2798 51514078 2018-12-25 stsp * Read the file index.
2799 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2800 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2802 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2804 c4cdcb68 2019-04-03 stsp goto done;
2806 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2807 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2808 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2810 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2811 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2812 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2816 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2817 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2818 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2819 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2820 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2821 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2822 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2823 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2827 dbdddfee 2021-06-23 naddy tpd = STAILQ_NEXT(tpd, entry);
2829 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2830 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2831 af12c6b9 2019-06-04 stsp err = sync_err;
2833 9c6338c4 2019-06-02 stsp free(fileindex_path);
2835 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2836 9d31a1d8 2018-03-11 stsp if (commit)
2837 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2838 5ade8233 2019-07-12 stsp if (fileindex)
2839 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2840 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&tree_paths)) {
2841 dbdddfee 2021-06-23 naddy tpd = STAILQ_FIRST(&tree_paths);
2842 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&tree_paths, entry);
2843 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2844 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2845 f2ea84fa 2019-07-27 stsp free(tpd);
2847 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2848 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2849 9d31a1d8 2018-03-11 stsp err = unlockerr;
2850 f8d1f275 2019-02-04 stsp return err;
2853 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2854 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2855 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2856 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2857 234035bc 2019-06-01 stsp void *progress_arg;
2858 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2859 234035bc 2019-06-01 stsp void *cancel_arg;
2860 f69721c3 2019-10-21 stsp const char *label_orig;
2861 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2864 234035bc 2019-06-01 stsp static const struct got_error *
2865 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2866 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2867 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2868 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2870 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2871 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2872 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2873 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2874 234035bc 2019-06-01 stsp struct stat sb;
2875 234035bc 2019-06-01 stsp unsigned char status;
2876 234035bc 2019-06-01 stsp int local_changes_subsumed;
2877 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2878 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2880 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2881 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2882 d6c87207 2019-08-02 stsp strlen(path2));
2883 1ee397ad 2019-07-12 stsp if (ie == NULL)
2884 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2885 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2887 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2888 234035bc 2019-06-01 stsp path2) == -1)
2889 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2891 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2894 234035bc 2019-06-01 stsp goto done;
2896 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2897 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2898 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2899 234035bc 2019-06-01 stsp goto done;
2901 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2902 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2903 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2904 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2905 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2906 234035bc 2019-06-01 stsp goto done;
2909 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2910 36bf999c 2020-07-23 stsp char *link_target2;
2911 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2913 36bf999c 2020-07-23 stsp goto done;
2914 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2915 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2916 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2917 36bf999c 2020-07-23 stsp free(link_target2);
2921 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2922 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2923 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2924 1af628f4 2021-06-03 stsp goto done;
2926 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2927 1af628f4 2021-06-03 stsp f_orig, blob1);
2929 1af628f4 2021-06-03 stsp goto done;
2931 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2932 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2933 1af628f4 2021-06-03 stsp goto done;
2934 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2935 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2937 1af628f4 2021-06-03 stsp goto done;
2939 1af628f4 2021-06-03 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
2940 1af628f4 2021-06-03 stsp if (fd == -1) {
2941 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2942 1af628f4 2021-06-03 stsp ondisk_path);
2943 1af628f4 2021-06-03 stsp goto done;
2945 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2946 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2947 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2948 1af628f4 2021-06-03 stsp ondisk_path);
2949 1af628f4 2021-06-03 stsp close(fd);
2950 1af628f4 2021-06-03 stsp goto done;
2952 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2954 1af628f4 2021-06-03 stsp goto done;
2955 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2956 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2957 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2958 1af628f4 2021-06-03 stsp goto done;
2960 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2961 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2962 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2963 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2964 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2966 234035bc 2019-06-01 stsp } else if (blob1) {
2967 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2968 d6c87207 2019-08-02 stsp strlen(path1));
2969 1ee397ad 2019-07-12 stsp if (ie == NULL)
2970 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2971 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2973 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2974 2b92fad7 2019-06-02 stsp path1) == -1)
2975 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2977 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2980 2b92fad7 2019-06-02 stsp goto done;
2982 2b92fad7 2019-06-02 stsp switch (status) {
2983 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
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;
2988 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2990 2b92fad7 2019-06-02 stsp goto done;
2992 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2994 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2995 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2996 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2997 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2999 1ee397ad 2019-07-12 stsp goto done;
3001 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3003 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
3004 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
3005 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
3007 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
3008 0a22ca1a 2020-09-23 stsp * exists in the repository.
3010 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
3012 0a22ca1a 2020-09-23 stsp goto done;
3013 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
3014 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
3015 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
3017 0a22ca1a 2020-09-23 stsp goto done;
3018 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
3021 0a22ca1a 2020-09-23 stsp goto done;
3023 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
3026 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
3027 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
3029 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
3030 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
3033 0a22ca1a 2020-09-23 stsp goto done;
3036 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
3037 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
3038 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3039 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
3041 1ee397ad 2019-07-12 stsp goto done;
3043 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
3044 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
3046 1ee397ad 2019-07-12 stsp goto done;
3051 234035bc 2019-06-01 stsp } else if (blob2) {
3052 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3053 234035bc 2019-06-01 stsp path2) == -1)
3054 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3055 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
3056 d6c87207 2019-08-02 stsp strlen(path2));
3058 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
3059 7f91a133 2019-12-13 stsp -1, NULL, repo);
3061 234035bc 2019-06-01 stsp goto done;
3062 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
3063 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
3064 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
3065 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
3066 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3067 1ee397ad 2019-07-12 stsp status, path2);
3068 234035bc 2019-06-01 stsp goto done;
3070 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3071 36bf999c 2020-07-23 stsp char *link_target2;
3072 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3075 36bf999c 2020-07-23 stsp goto done;
3076 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3077 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3078 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3079 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3080 36bf999c 2020-07-23 stsp free(link_target2);
3081 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3082 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3083 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3084 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3085 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3086 526a746f 2020-07-23 stsp a->progress_arg);
3088 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3089 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3092 dfe9fba0 2020-07-23 stsp goto done;
3093 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3094 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3095 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3096 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3098 234035bc 2019-06-01 stsp goto done;
3101 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3102 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3103 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3104 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3105 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3106 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
3108 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3109 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3110 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3113 234035bc 2019-06-01 stsp goto done;
3114 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3116 234035bc 2019-06-01 stsp goto done;
3117 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3118 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3119 3969253a 2020-03-07 stsp if (err) {
3120 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3121 3969253a 2020-03-07 stsp goto done;
3123 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3124 2b92fad7 2019-06-02 stsp if (err) {
3125 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3126 2b92fad7 2019-06-02 stsp goto done;
3128 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3129 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3130 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3135 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3136 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3137 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3138 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3139 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3140 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3141 1af628f4 2021-06-03 stsp free(id_str);
3142 54d5be07 2021-06-03 stsp free(label_deriv2);
3143 234035bc 2019-06-01 stsp free(ondisk_path);
3144 234035bc 2019-06-01 stsp return err;
3147 69de9dd4 2021-09-03 stsp static const struct got_error *
3148 69de9dd4 2021-09-03 stsp check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3150 69de9dd4 2021-09-03 stsp struct got_worktree *worktree = arg;
3152 abc59930 2021-09-05 naddy /* Reject merges into a work tree with mixed base commits. */
3153 abc59930 2021-09-05 naddy if (got_fileindex_entry_has_commit(ie) &&
3154 69de9dd4 2021-09-03 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3155 69de9dd4 2021-09-03 stsp SHA1_DIGEST_LENGTH) != 0)
3156 abc59930 2021-09-05 naddy return got_error(GOT_ERR_MIXED_COMMITS);
3158 69de9dd4 2021-09-03 stsp return NULL;
3161 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg {
3162 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3163 69de9dd4 2021-09-03 stsp struct got_fileindex *fileindex;
3164 234035bc 2019-06-01 stsp struct got_repository *repo;
3167 234035bc 2019-06-01 stsp static const struct got_error *
3168 69de9dd4 2021-09-03 stsp check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3169 69de9dd4 2021-09-03 stsp struct got_blob_object *blob2, struct got_object_id *id1,
3170 69de9dd4 2021-09-03 stsp struct got_object_id *id2, const char *path1, const char *path2,
3171 69de9dd4 2021-09-03 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
3173 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3174 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg *a = arg;
3175 234035bc 2019-06-01 stsp unsigned char status;
3176 234035bc 2019-06-01 stsp struct stat sb;
3177 69de9dd4 2021-09-03 stsp struct got_fileindex_entry *ie;
3178 69de9dd4 2021-09-03 stsp const char *path = path2 ? path2 : path1;
3179 69de9dd4 2021-09-03 stsp struct got_object_id *id = id2 ? id2 : id1;
3180 234035bc 2019-06-01 stsp char *ondisk_path;
3182 69de9dd4 2021-09-03 stsp if (id == NULL)
3183 69de9dd4 2021-09-03 stsp return NULL;
3185 69de9dd4 2021-09-03 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3186 69de9dd4 2021-09-03 stsp if (ie == NULL)
3187 69de9dd4 2021-09-03 stsp return NULL;
3189 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3191 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3193 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3194 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3195 5546d466 2021-09-02 stsp free(ondisk_path);
3197 234035bc 2019-06-01 stsp return err;
3198 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3199 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3201 234035bc 2019-06-01 stsp return NULL;
3204 818c7501 2019-07-11 stsp static const struct got_error *
3205 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3206 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3207 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3208 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3209 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3211 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3212 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3213 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3214 69de9dd4 2021-09-03 stsp struct check_merge_conflicts_arg cmc_arg;
3215 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3216 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3218 03415a1a 2019-06-02 stsp if (commit_id1) {
3219 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3220 03415a1a 2019-06-02 stsp worktree->path_prefix);
3221 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3222 03415a1a 2019-06-02 stsp goto done;
3224 69d57f3d 2020-07-31 stsp if (tree_id1) {
3225 69d57f3d 2020-07-31 stsp char *id_str;
3227 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3229 03415a1a 2019-06-02 stsp goto done;
3231 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3233 f69721c3 2019-10-21 stsp goto done;
3235 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3236 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3237 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3238 f69721c3 2019-10-21 stsp free(id_str);
3239 f69721c3 2019-10-21 stsp goto done;
3241 f69721c3 2019-10-21 stsp free(id_str);
3244 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3245 234035bc 2019-06-01 stsp worktree->path_prefix);
3247 234035bc 2019-06-01 stsp goto done;
3249 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3251 234035bc 2019-06-01 stsp goto done;
3253 69de9dd4 2021-09-03 stsp cmc_arg.worktree = worktree;
3254 69de9dd4 2021-09-03 stsp cmc_arg.fileindex = fileindex;
3255 69de9dd4 2021-09-03 stsp cmc_arg.repo = repo;
3256 69de9dd4 2021-09-03 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3257 69de9dd4 2021-09-03 stsp check_merge_conflicts, &cmc_arg, 0);
3259 69de9dd4 2021-09-03 stsp goto done;
3261 234035bc 2019-06-01 stsp arg.worktree = worktree;
3262 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3263 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3264 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3265 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3266 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3267 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3268 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3269 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3270 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3271 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3272 af12c6b9 2019-06-04 stsp err = sync_err;
3274 234035bc 2019-06-01 stsp if (tree1)
3275 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3276 234035bc 2019-06-01 stsp if (tree2)
3277 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3278 f69721c3 2019-10-21 stsp free(label_orig);
3279 818c7501 2019-07-11 stsp return err;
3282 818c7501 2019-07-11 stsp const struct got_error *
3283 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3284 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3285 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3286 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3288 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3289 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3290 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3292 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3294 818c7501 2019-07-11 stsp return err;
3296 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3298 818c7501 2019-07-11 stsp goto done;
3300 69de9dd4 2021-09-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3301 69de9dd4 2021-09-03 stsp worktree);
3303 818c7501 2019-07-11 stsp goto done;
3305 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3306 f259c4c1 2021-09-24 stsp commit_id2, repo, progress_cb, progress_arg,
3307 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
3309 818c7501 2019-07-11 stsp if (fileindex)
3310 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3311 818c7501 2019-07-11 stsp free(fileindex_path);
3312 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3313 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3314 234035bc 2019-06-01 stsp err = unlockerr;
3315 234035bc 2019-06-01 stsp return err;
3318 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3319 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3320 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3321 927df6b7 2019-02-10 stsp const char *status_path;
3322 927df6b7 2019-02-10 stsp size_t status_path_len;
3323 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3324 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3325 f8d1f275 2019-02-04 stsp void *status_arg;
3326 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3327 f8d1f275 2019-02-04 stsp void *cancel_arg;
3328 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3329 ff56836b 2021-07-08 stsp struct got_pathlist_head *ignores;
3330 f2a9dc41 2019-12-13 tracey int report_unchanged;
3331 3143d852 2020-06-25 stsp int no_ignores;
3334 f8d1f275 2019-02-04 stsp static const struct got_error *
3335 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3336 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3337 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3338 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3340 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3341 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3342 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3343 927df6b7 2019-02-10 stsp struct stat sb;
3344 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3345 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3346 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3348 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3350 98eaaa12 2019-08-03 stsp return err;
3352 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3353 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3354 98eaaa12 2019-08-03 stsp return NULL;
3356 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3357 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3358 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3360 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3361 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3362 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3364 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3365 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3366 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3367 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3368 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3371 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3372 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3375 927df6b7 2019-02-10 stsp static const struct got_error *
3376 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3377 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3379 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3380 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3381 f8d1f275 2019-02-04 stsp char *abspath;
3383 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3384 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3386 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3387 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3388 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3389 927df6b7 2019-02-10 stsp return NULL;
3391 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3392 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3393 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3394 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3396 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3397 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3398 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3401 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3402 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3403 f8d1f275 2019-02-04 stsp free(abspath);
3404 9d31a1d8 2018-03-11 stsp return err;
3407 f8d1f275 2019-02-04 stsp static const struct got_error *
3408 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3410 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3411 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3412 2ec1f75b 2019-03-26 stsp unsigned char status;
3414 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3415 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3417 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3418 927df6b7 2019-02-10 stsp return NULL;
3420 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3421 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3422 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3423 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3425 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3426 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3427 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3431 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3433 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3435 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3436 6841da00 2019-08-08 stsp free((char *)pe->path);
3437 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3441 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3443 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3445 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3446 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3447 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3448 6841da00 2019-08-08 stsp free((char *)pe->path);
3450 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3453 6841da00 2019-08-08 stsp static const struct got_error *
3454 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3456 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3457 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3458 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3459 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3460 6841da00 2019-08-08 stsp size_t linesize = 0;
3461 6841da00 2019-08-08 stsp ssize_t linelen;
3463 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3464 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3465 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3466 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3468 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3469 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3470 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3472 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3473 bd8de430 2019-10-04 stsp if (line[0] == '#')
3476 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3477 bd8de430 2019-10-04 stsp if (line[0] == '!')
3480 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3481 6841da00 2019-08-08 stsp line) == -1) {
3482 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3483 6841da00 2019-08-08 stsp goto done;
3485 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3487 6841da00 2019-08-08 stsp goto done;
3489 6841da00 2019-08-08 stsp if (ferror(f)) {
3490 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3491 6841da00 2019-08-08 stsp goto done;
3494 6841da00 2019-08-08 stsp dirpath = strdup(path);
3495 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3496 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3497 6841da00 2019-08-08 stsp goto done;
3499 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3501 6841da00 2019-08-08 stsp free(line);
3502 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3503 6841da00 2019-08-08 stsp free(dirpath);
3504 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3506 6841da00 2019-08-08 stsp return err;
3510 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3512 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3514 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3515 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3516 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3517 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3519 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3520 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3522 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3524 bd8de430 2019-10-04 stsp pattern += 3;
3526 bd8de430 2019-10-04 stsp while (*p) {
3527 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3528 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3529 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3530 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3532 bd8de430 2019-10-04 stsp while (*p == '/')
3542 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3543 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3544 6841da00 2019-08-08 stsp * ignores backwards.
3546 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3547 6841da00 2019-08-08 stsp while (pe) {
3548 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3549 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3550 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3551 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3552 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3553 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3554 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3555 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3556 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3561 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3567 6841da00 2019-08-08 stsp static const struct got_error *
3568 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3569 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3571 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3572 6841da00 2019-08-08 stsp char *ignorespath;
3573 886cec17 2019-12-15 stsp int fd = -1;
3574 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3576 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3577 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3578 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3580 886cec17 2019-12-15 stsp if (dirfd != -1) {
3581 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3582 886cec17 2019-12-15 stsp if (fd == -1) {
3583 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3584 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3585 886cec17 2019-12-15 stsp ignorespath);
3587 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3588 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3589 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3590 886cec17 2019-12-15 stsp ignorespath);
3593 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3597 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3598 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3599 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3600 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3601 886cec17 2019-12-15 stsp ignorespath);
3603 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3606 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3607 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3608 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3609 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3610 6841da00 2019-08-08 stsp free(ignorespath);
3611 6841da00 2019-08-08 stsp return err;
3614 f8d1f275 2019-02-04 stsp static const struct got_error *
3615 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3617 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3618 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3619 f8d1f275 2019-02-04 stsp char *path = NULL;
3621 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3622 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3624 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3625 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3626 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3628 f8d1f275 2019-02-04 stsp path = de->d_name;
3631 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3632 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3633 ff56836b 2021-07-08 stsp && !match_ignores(a->ignores, path))
3634 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3635 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3636 f8d1f275 2019-02-04 stsp if (parent_path[0])
3637 f8d1f275 2019-02-04 stsp free(path);
3638 b72f483a 2019-02-05 stsp return err;
3641 347d1d3e 2019-07-12 stsp static const struct got_error *
3642 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3644 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3645 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3647 3143d852 2020-06-25 stsp if (a->no_ignores)
3648 3143d852 2020-06-25 stsp return NULL;
3650 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path,
3651 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3653 3143d852 2020-06-25 stsp return err;
3655 ff56836b 2021-07-08 stsp err = add_ignores(a->ignores, a->worktree->root_path, path,
3656 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3658 3143d852 2020-06-25 stsp return err;
3661 3143d852 2020-06-25 stsp static const struct got_error *
3662 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3663 ff56836b 2021-07-08 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3664 ff56836b 2021-07-08 stsp void *status_arg, struct got_repository *repo, int report_unchanged,
3665 0e33f8e0 2021-09-01 stsp struct got_pathlist_head *ignores, int no_ignores)
3667 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3668 abb4604f 2019-07-27 stsp struct stat sb;
3670 0e33f8e0 2021-09-01 stsp if (!no_ignores && match_ignores(ignores, path))
3671 ff56836b 2021-07-08 stsp return NULL;
3673 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3675 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3676 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3678 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3679 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3680 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3681 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3682 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3683 abb4604f 2019-07-27 stsp return NULL;
3686 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3687 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3688 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3690 abb4604f 2019-07-27 stsp return NULL;
3693 3143d852 2020-06-25 stsp static const struct got_error *
3694 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3695 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3697 3143d852 2020-06-25 stsp const struct got_error *err;
3698 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3700 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3701 3143d852 2020-06-25 stsp ".cvsignore");
3703 3143d852 2020-06-25 stsp return err;
3705 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3706 3143d852 2020-06-25 stsp ".gitignore");
3708 3143d852 2020-06-25 stsp return err;
3710 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3711 3143d852 2020-06-25 stsp if (err) {
3712 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3713 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3714 3143d852 2020-06-25 stsp return err;
3716 3143d852 2020-06-25 stsp for (;;) {
3717 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3718 3143d852 2020-06-25 stsp ".cvsignore");
3721 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3722 3143d852 2020-06-25 stsp ".gitignore");
3725 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3726 3143d852 2020-06-25 stsp if (err) {
3727 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3728 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3731 ff56836b 2021-07-08 stsp if (got_path_is_root_dir(parent_path))
3733 b737c85a 2020-06-26 stsp free(parent_path);
3734 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3735 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3738 b737c85a 2020-06-26 stsp free(parent_path);
3739 b737c85a 2020-06-26 stsp free(next_parent_path);
3740 3143d852 2020-06-25 stsp return err;
3743 abb4604f 2019-07-27 stsp static const struct got_error *
3744 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3745 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3746 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3747 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3748 f2a9dc41 2019-12-13 tracey int report_unchanged)
3750 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3751 6fc93f37 2019-12-13 stsp int fd = -1;
3752 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3753 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3754 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3755 ff56836b 2021-07-08 stsp struct got_pathlist_head ignores;
3757 ff56836b 2021-07-08 stsp TAILQ_INIT(&ignores);
3759 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3760 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3761 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3763 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3764 6fc93f37 2019-12-13 stsp if (fd == -1) {
3765 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3766 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3767 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3769 ff56836b 2021-07-08 stsp if (!no_ignores) {
3770 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3771 ff56836b 2021-07-08 stsp worktree->root_path, ondisk_path);
3773 ff56836b 2021-07-08 stsp goto done;
3775 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3776 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3777 0e33f8e0 2021-09-01 stsp report_unchanged, &ignores, no_ignores);
3780 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3781 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3782 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3783 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3784 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3785 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3786 abb4604f 2019-07-27 stsp arg.status_path = path;
3787 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3788 abb4604f 2019-07-27 stsp arg.repo = repo;
3789 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3790 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3791 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3792 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3793 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3794 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3795 022fae89 2019-12-06 tracey if (!no_ignores) {
3796 ff56836b 2021-07-08 stsp err = add_ignores_from_parent_paths(&ignores,
3797 3143d852 2020-06-25 stsp worktree->root_path, path);
3799 3143d852 2020-06-25 stsp goto done;
3801 ff56836b 2021-07-08 stsp arg.ignores = &ignores;
3802 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3803 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3806 ff56836b 2021-07-08 stsp free_ignores(&ignores);
3807 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3808 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3809 927df6b7 2019-02-10 stsp free(ondisk_path);
3810 347d1d3e 2019-07-12 stsp return err;
3813 347d1d3e 2019-07-12 stsp const struct got_error *
3814 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3815 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3816 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3817 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3819 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3820 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3821 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3822 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3824 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3826 347d1d3e 2019-07-12 stsp return err;
3828 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3829 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3830 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3831 f6343036 2021-06-22 stsp no_ignores, 0);
3835 f8d1f275 2019-02-04 stsp free(fileindex_path);
3836 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3837 f8d1f275 2019-02-04 stsp return err;
3840 6c7ab921 2019-03-18 stsp const struct got_error *
3841 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3842 6c7ab921 2019-03-18 stsp const char *arg)
3844 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3845 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3846 6c7ab921 2019-03-18 stsp size_t len;
3847 00bb5ea0 2020-07-23 stsp struct stat sb;
3848 01740607 2020-11-04 stsp char *abspath = NULL;
3849 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3851 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3853 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3854 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3855 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3857 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3858 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3859 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3860 00bb5ea0 2020-07-23 stsp goto done;
3862 727173c3 2020-11-06 stsp sb.st_mode = 0;
3864 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3866 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3867 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3868 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3869 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3871 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3872 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3873 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3874 00bb5ea0 2020-07-23 stsp goto done;
3878 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3879 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3881 d0710d08 2019-07-22 stsp goto done;
3882 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3883 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3884 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3885 00bb5ea0 2020-07-23 stsp goto done;
3888 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3889 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3890 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3891 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3892 00bb5ea0 2020-07-23 stsp goto done;
3894 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3895 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3896 01740607 2020-11-04 stsp goto done;
3898 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3899 01740607 2020-11-04 stsp sizeof(canonpath));
3901 00bb5ea0 2020-07-23 stsp goto done;
3902 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3903 01740607 2020-11-04 stsp if (resolved == NULL) {
3904 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3905 01740607 2020-11-04 stsp goto done;
3910 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3911 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3912 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3913 6c7ab921 2019-03-18 stsp goto done;
3916 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3917 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3918 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3920 f6d88e1a 2019-05-29 stsp goto done;
3922 f6d88e1a 2019-05-29 stsp path = strdup("");
3923 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3924 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3925 f6d88e1a 2019-05-29 stsp goto done;
3929 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3930 6c7ab921 2019-03-18 stsp len = strlen(path);
3931 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3932 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3936 01740607 2020-11-04 stsp free(abspath);
3937 6c7ab921 2019-03-18 stsp free(resolved);
3938 d0710d08 2019-07-22 stsp free(cwd);
3939 6c7ab921 2019-03-18 stsp if (err == NULL)
3940 6c7ab921 2019-03-18 stsp *wt_path = path;
3942 6c7ab921 2019-03-18 stsp free(path);
3943 d00136be 2019-03-26 stsp return err;
3946 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3947 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3948 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3949 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3950 4e68cba3 2019-11-23 stsp void *progress_arg;
3951 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3954 4e68cba3 2019-11-23 stsp static const struct got_error *
3955 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3956 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3957 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3958 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3960 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3961 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3962 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3963 6d022e97 2019-08-04 stsp struct stat sb;
3964 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3966 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3967 dbb83fbd 2019-12-12 stsp relpath) == -1)
3968 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3970 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3972 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3973 12463d8b 2019-12-13 stsp de_name, a->repo);
3975 dbb83fbd 2019-12-12 stsp goto done;
3976 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3977 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3978 dbb83fbd 2019-12-12 stsp goto done;
3979 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3981 dbb83fbd 2019-12-12 stsp goto done;
3984 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3985 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3986 dbb83fbd 2019-12-12 stsp goto done;
3989 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3991 4e68cba3 2019-11-23 stsp goto done;
3992 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3993 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3994 3969253a 2020-03-07 stsp if (err) {
3995 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3996 3969253a 2020-03-07 stsp goto done;
3998 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3999 07f5b47a 2019-06-02 stsp if (err) {
4000 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
4001 4e68cba3 2019-11-23 stsp goto done;
4004 dbb83fbd 2019-12-12 stsp free(ondisk_path);
4006 dbb83fbd 2019-12-12 stsp return err;
4007 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
4008 dbb83fbd 2019-12-12 stsp return NULL;
4009 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4012 d00136be 2019-03-26 stsp const struct got_error *
4013 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
4014 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
4015 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4016 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
4018 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4019 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
4020 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4021 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
4022 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
4024 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4026 d00136be 2019-03-26 stsp return err;
4028 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4030 d00136be 2019-03-26 stsp goto done;
4032 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
4033 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
4034 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
4035 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
4036 4e68cba3 2019-11-23 stsp saa.repo = repo;
4038 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4039 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4040 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4044 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4045 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4046 af12c6b9 2019-06-04 stsp err = sync_err;
4048 fb399478 2019-07-12 stsp free(fileindex_path);
4049 d00136be 2019-03-26 stsp if (fileindex)
4050 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
4051 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4052 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
4053 d00136be 2019-03-26 stsp err = unlockerr;
4054 6c7ab921 2019-03-18 stsp return err;
4057 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
4058 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
4059 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
4060 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
4061 f2a9dc41 2019-12-13 tracey void *progress_arg;
4062 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
4063 f2a9dc41 2019-12-13 tracey int delete_local_mods;
4064 70e3e7f5 2019-12-13 tracey int keep_on_disk;
4065 766841c2 2020-08-13 stsp const char *status_codes;
4068 f2a9dc41 2019-12-13 tracey static const struct got_error *
4069 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
4070 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
4071 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4072 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4074 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
4075 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
4076 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
4077 17ed4618 2019-06-02 stsp struct stat sb;
4078 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4080 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4081 17ed4618 2019-06-02 stsp if (ie == NULL)
4082 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4084 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4085 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4086 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4087 9acbc4fa 2019-08-03 stsp return NULL;
4088 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4091 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4092 f2a9dc41 2019-12-13 tracey relpath) == -1)
4093 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4095 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4098 f2a9dc41 2019-12-13 tracey goto done;
4100 766841c2 2020-08-13 stsp if (a->status_codes) {
4101 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4103 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4104 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4107 766841c2 2020-08-13 stsp if (i == ncodes) {
4108 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4109 766841c2 2020-08-13 stsp free(ondisk_path);
4110 766841c2 2020-08-13 stsp return NULL;
4112 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4113 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4114 766841c2 2020-08-13 stsp static char msg[64];
4115 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4116 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4117 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4118 766841c2 2020-08-13 stsp goto done;
4122 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4123 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4124 f2a9dc41 2019-12-13 tracey goto done;
4125 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4126 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4127 f2a9dc41 2019-12-13 tracey goto done;
4129 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4130 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4131 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4132 f2a9dc41 2019-12-13 tracey goto done;
4136 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4137 20a2ad1c 2020-10-20 stsp size_t root_len;
4139 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4140 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4141 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4142 12463d8b 2019-12-13 stsp ondisk_path);
4143 12463d8b 2019-12-13 stsp goto done;
4145 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4146 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4147 12463d8b 2019-12-13 stsp goto done;
4150 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4152 20a2ad1c 2020-10-20 stsp char *parent;
4153 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4155 2513f20a 2020-10-20 stsp goto done;
4156 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4157 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4158 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4159 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4160 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4161 20a2ad1c 2020-10-20 stsp ondisk_path);
4164 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4165 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4168 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4170 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4171 f2a9dc41 2019-12-13 tracey if (err)
4172 f2a9dc41 2019-12-13 tracey return err;
4173 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4174 f2a9dc41 2019-12-13 tracey return NULL;
4175 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4176 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4179 2ec1f75b 2019-03-26 stsp const struct got_error *
4180 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4181 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4182 766841c2 2020-08-13 stsp const char *status_codes,
4183 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4184 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
4186 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4187 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4188 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4189 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4190 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4192 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4194 2ec1f75b 2019-03-26 stsp return err;
4196 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4198 2ec1f75b 2019-03-26 stsp goto done;
4200 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4201 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4202 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4203 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4204 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4205 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4206 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4207 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4209 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4210 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4211 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
4215 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4216 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4217 af12c6b9 2019-06-04 stsp err = sync_err;
4219 fb399478 2019-07-12 stsp free(fileindex_path);
4220 2ec1f75b 2019-03-26 stsp if (fileindex)
4221 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4222 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4223 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4224 2ec1f75b 2019-03-26 stsp err = unlockerr;
4225 33aa809d 2019-08-08 stsp return err;
4228 33aa809d 2019-08-08 stsp static const struct got_error *
4229 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4231 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4232 33aa809d 2019-08-08 stsp char *line = NULL;
4233 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4234 33aa809d 2019-08-08 stsp ssize_t linelen;
4236 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4237 33aa809d 2019-08-08 stsp if (linelen == -1) {
4238 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4239 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4240 33aa809d 2019-08-08 stsp goto done;
4242 33aa809d 2019-08-08 stsp return NULL;
4244 33aa809d 2019-08-08 stsp if (outfile) {
4245 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4246 33aa809d 2019-08-08 stsp if (n != linelen) {
4247 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4248 33aa809d 2019-08-08 stsp goto done;
4251 33aa809d 2019-08-08 stsp if (rejectfile) {
4252 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4253 33aa809d 2019-08-08 stsp if (n != linelen)
4254 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4257 33aa809d 2019-08-08 stsp free(line);
4258 2ec1f75b 2019-03-26 stsp return err;
4261 33aa809d 2019-08-08 stsp static const struct got_error *
4262 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4264 33aa809d 2019-08-08 stsp char *line = NULL;
4265 33aa809d 2019-08-08 stsp size_t linesize = 0;
4266 33aa809d 2019-08-08 stsp ssize_t linelen;
4268 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4269 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4270 500467ff 2019-09-25 hiltjo if (ferror(f))
4271 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4272 500467ff 2019-09-25 hiltjo return NULL;
4274 33aa809d 2019-08-08 stsp free(line);
4275 33aa809d 2019-08-08 stsp return NULL;
4278 33aa809d 2019-08-08 stsp static const struct got_error *
4279 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4280 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4281 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4283 33aa809d 2019-08-08 stsp const struct got_error *err;
4285 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4286 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4287 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4289 33aa809d 2019-08-08 stsp return err;
4290 33aa809d 2019-08-08 stsp (*line_cur1)++;
4292 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4293 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4294 33aa809d 2019-08-08 stsp if (rejectfile)
4295 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4297 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4299 33aa809d 2019-08-08 stsp return err;
4300 33aa809d 2019-08-08 stsp (*line_cur2)++;
4302 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4303 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4304 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4306 33aa809d 2019-08-08 stsp return err;
4307 33aa809d 2019-08-08 stsp (*line_cur2)++;
4309 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4310 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4311 33aa809d 2019-08-08 stsp if (rejectfile)
4312 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4314 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4316 33aa809d 2019-08-08 stsp return err;
4317 33aa809d 2019-08-08 stsp (*line_cur1)++;
4320 f1e81a05 2019-08-10 stsp return NULL;
4323 f1e81a05 2019-08-10 stsp static const struct got_error *
4324 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4325 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4327 f1e81a05 2019-08-10 stsp const struct got_error *err;
4329 f1e81a05 2019-08-10 stsp if (outfile) {
4330 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4331 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4332 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4334 f1e81a05 2019-08-10 stsp return err;
4335 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4338 f1e81a05 2019-08-10 stsp if (rejectfile) {
4339 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4340 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4341 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4343 f1e81a05 2019-08-10 stsp return err;
4344 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4348 33aa809d 2019-08-08 stsp return NULL;
4351 33aa809d 2019-08-08 stsp static const struct got_error *
4352 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4353 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4354 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4355 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4356 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4358 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4359 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4360 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4361 33aa809d 2019-08-08 stsp FILE *hunkfile;
4362 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4363 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4366 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4368 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4369 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4370 fe621944 2020-11-10 stsp start_old = cc.left.start;
4371 fe621944 2020-11-10 stsp end_old = cc.left.end;
4372 fe621944 2020-11-10 stsp start_new = cc.right.start;
4373 fe621944 2020-11-10 stsp end_new = cc.right.end;
4375 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4376 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4377 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4379 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4380 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4381 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4383 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4384 fe621944 2020-11-10 stsp if (diff_state == NULL)
4385 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4386 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4388 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4389 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4390 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4391 33aa809d 2019-08-08 stsp goto done;
4394 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4395 fe621944 2020-11-10 stsp diff_result, &cc);
4396 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4397 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4398 33aa809d 2019-08-08 stsp goto done;
4401 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4402 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4403 33aa809d 2019-08-08 stsp goto done;
4406 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4407 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4409 33aa809d 2019-08-08 stsp goto done;
4411 33aa809d 2019-08-08 stsp switch (*choice) {
4412 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4413 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4414 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4416 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4417 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4418 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4420 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4423 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4427 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4428 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4429 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4430 33aa809d 2019-08-08 stsp return err;
4433 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4434 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4435 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4436 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4437 1f1abb7e 2019-08-08 stsp void *progress_arg;
4438 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4439 33aa809d 2019-08-08 stsp void *patch_arg;
4440 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4441 f259c4c1 2021-09-24 stsp int unlink_added_files;
4444 e20a8b6f 2019-06-04 stsp static const struct got_error *
4445 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4446 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4447 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4448 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4449 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4451 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4452 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4453 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4454 1ebedb77 2019-10-19 stsp int fd2 = -1;
4455 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4456 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4457 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4458 fe621944 2020-11-10 stsp struct stat sb2;
4459 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4460 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4461 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4463 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4465 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4467 33aa809d 2019-08-08 stsp return err;
4469 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4470 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4471 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4472 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4473 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4474 fa3cef63 2020-07-23 stsp goto done;
4476 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4477 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4478 fa3cef63 2020-07-23 stsp if (link_len == -1)
4479 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4480 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4481 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4484 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4485 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4486 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4487 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4488 fa3cef63 2020-07-23 stsp goto done;
4490 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4491 fa3cef63 2020-07-23 stsp sizeof(link_target));
4492 fa3cef63 2020-07-23 stsp if (link_len == -1)
4493 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4494 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4495 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4498 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4499 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4500 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4501 fa3cef63 2020-07-23 stsp goto done;
4504 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4505 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4506 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4507 fa3cef63 2020-07-23 stsp goto done;
4512 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4513 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4514 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4515 fa3cef63 2020-07-23 stsp goto done;
4517 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4518 fa3cef63 2020-07-23 stsp if (n != link_len) {
4519 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4520 fa3cef63 2020-07-23 stsp goto done;
4522 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4523 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4524 fa3cef63 2020-07-23 stsp goto done;
4526 fa3cef63 2020-07-23 stsp rewind(f2);
4529 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4531 33aa809d 2019-08-08 stsp goto done;
4533 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4535 33aa809d 2019-08-08 stsp goto done;
4537 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4539 33aa809d 2019-08-08 stsp goto done;
4541 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4544 33aa809d 2019-08-08 stsp goto done;
4546 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4548 33aa809d 2019-08-08 stsp goto done;
4550 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4551 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4552 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4553 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4555 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4556 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4557 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4558 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4559 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4560 fe621944 2020-11-10 stsp nchanges++;
4562 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4563 33aa809d 2019-08-08 stsp int choice;
4564 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4565 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4566 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4567 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4568 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4569 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4571 33aa809d 2019-08-08 stsp goto done;
4572 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4573 33aa809d 2019-08-08 stsp have_content = 1;
4574 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4577 1ebedb77 2019-10-19 stsp if (have_content) {
4578 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4579 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4580 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4582 1ebedb77 2019-10-19 stsp goto done;
4584 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4585 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4586 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4587 fa3cef63 2020-07-23 stsp goto done;
4592 33aa809d 2019-08-08 stsp free(id_str);
4594 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4595 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4596 fe621944 2020-11-10 stsp if (err == NULL)
4597 fe621944 2020-11-10 stsp err = free_err;
4598 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4599 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4600 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4601 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4602 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4603 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4604 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4605 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4606 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4607 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4608 33aa809d 2019-08-08 stsp if (err || !have_content) {
4609 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4610 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4611 33aa809d 2019-08-08 stsp free(*path_outfile);
4612 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4614 33aa809d 2019-08-08 stsp free(path1);
4615 33aa809d 2019-08-08 stsp return err;
4618 33aa809d 2019-08-08 stsp static const struct got_error *
4619 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4620 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4621 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4622 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4624 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4625 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4626 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4627 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4628 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4629 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4630 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4631 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4632 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4633 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4635 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4636 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4637 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4638 d3bcc3d1 2019-08-08 stsp return NULL;
4640 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4641 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4642 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4644 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4645 65084dad 2019-08-08 stsp if (ie == NULL)
4646 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4648 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4649 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4650 a129376b 2019-03-28 stsp if (err) {
4651 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4652 a129376b 2019-03-28 stsp goto done;
4653 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4654 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4655 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4656 e20a8b6f 2019-06-04 stsp goto done;
4659 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4660 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4661 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4662 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4663 a129376b 2019-03-28 stsp goto done;
4666 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4667 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4668 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4669 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4670 a129376b 2019-03-28 stsp goto done;
4673 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4674 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4675 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4676 a129376b 2019-03-28 stsp goto done;
4681 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4682 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4683 a9fa2909 2019-07-27 stsp if (err) {
4684 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4685 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4686 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4687 a9fa2909 2019-07-27 stsp goto done;
4689 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4691 a9fa2909 2019-07-27 stsp goto done;
4693 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4695 a9fa2909 2019-07-27 stsp goto done;
4697 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4698 1233e6b6 2020-10-19 stsp free(te_name);
4699 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4700 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4701 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4702 a9fa2909 2019-07-27 stsp goto done;
4706 a129376b 2019-03-28 stsp switch (status) {
4707 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4708 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4709 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4710 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4711 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4713 33aa809d 2019-08-08 stsp goto done;
4714 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4717 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4718 1f1abb7e 2019-08-08 stsp ie->path);
4720 1ee397ad 2019-07-12 stsp goto done;
4721 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4722 f259c4c1 2021-09-24 stsp if (a->unlink_added_files) {
4723 f259c4c1 2021-09-24 stsp if (asprintf(&ondisk_path, "%s/%s",
4724 f259c4c1 2021-09-24 stsp got_worktree_get_root_path(a->worktree),
4725 f259c4c1 2021-09-24 stsp relpath) == -1) {
4726 f259c4c1 2021-09-24 stsp err = got_error_from_errno("asprintf");
4727 f259c4c1 2021-09-24 stsp goto done;
4729 f259c4c1 2021-09-24 stsp if (unlink(ondisk_path) == -1) {
4730 f259c4c1 2021-09-24 stsp err = got_error_from_errno2("unlink",
4731 f259c4c1 2021-09-24 stsp ondisk_path);
4736 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4737 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4738 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4739 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4740 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4742 33aa809d 2019-08-08 stsp goto done;
4743 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4746 33aa809d 2019-08-08 stsp /* fall through */
4747 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4748 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4749 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4750 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4751 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4752 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4753 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4754 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4755 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4757 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4758 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4759 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4761 65084dad 2019-08-08 stsp goto done;
4763 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4764 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4765 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4766 a129376b 2019-03-28 stsp goto done;
4769 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4770 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4771 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4772 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4773 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4774 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4775 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4777 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4778 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4779 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4780 369fd7e5 2020-07-23 stsp path_content);
4783 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4784 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4785 369fd7e5 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4786 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4788 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4789 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4790 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4791 369fd7e5 2020-07-23 stsp goto done;
4795 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4796 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4797 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4798 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4799 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4800 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4802 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4804 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4805 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4806 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4807 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4810 a129376b 2019-03-28 stsp goto done;
4811 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4812 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4813 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4814 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4815 437adc9d 2020-12-10 yzhong blob->id.sha1,
4816 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4818 2e1fa222 2020-07-23 stsp goto done;
4820 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4821 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4822 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4831 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4832 33aa809d 2019-08-08 stsp free(path_content);
4833 e20a8b6f 2019-06-04 stsp free(parent_path);
4834 a129376b 2019-03-28 stsp free(tree_path);
4836 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4838 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4839 a129376b 2019-03-28 stsp free(tree_id);
4840 e20a8b6f 2019-06-04 stsp return err;
4843 e20a8b6f 2019-06-04 stsp const struct got_error *
4844 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4845 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4846 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4847 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4848 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4850 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4851 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4852 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4853 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4854 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4855 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4857 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4859 e20a8b6f 2019-06-04 stsp return err;
4861 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4863 e20a8b6f 2019-06-04 stsp goto done;
4865 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4866 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4867 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4868 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4869 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4870 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4871 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4872 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
4873 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4874 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4875 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4879 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4880 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4881 e20a8b6f 2019-06-04 stsp err = sync_err;
4883 fb399478 2019-07-12 stsp free(fileindex_path);
4884 a129376b 2019-03-28 stsp if (fileindex)
4885 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4886 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4887 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4888 a129376b 2019-03-28 stsp err = unlockerr;
4889 c4296144 2019-05-09 stsp return err;
4892 cf066bf8 2019-05-09 stsp static void
4893 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4895 24519714 2019-05-09 stsp free(ct->path);
4896 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4897 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4898 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4899 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4900 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4901 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4905 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4906 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4907 24519714 2019-05-09 stsp struct got_repository *repo;
4908 24519714 2019-05-09 stsp struct got_worktree *worktree;
4909 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4910 5f8a88c6 2019-08-03 stsp int have_staged_files;
4911 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4914 c4296144 2019-05-09 stsp static const struct got_error *
4915 dae2a678 2021-09-01 stsp collect_commitables(void *arg, unsigned char status,
4916 dae2a678 2021-09-01 stsp unsigned char staged_status, const char *relpath,
4917 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4918 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4920 dae2a678 2021-09-01 stsp struct collect_commitables_arg *a = arg;
4921 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4922 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4923 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4924 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4925 768aea60 2019-05-09 stsp struct stat sb;
4927 dae2a678 2021-09-01 stsp if (a->have_staged_files) {
4928 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4929 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4930 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4931 5f8a88c6 2019-08-03 stsp return NULL;
4933 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4934 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4936 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4937 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4938 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4939 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4940 5f8a88c6 2019-08-03 stsp return NULL;
4943 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4944 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4945 036813ee 2019-05-09 stsp goto done;
4947 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4948 036813ee 2019-05-09 stsp parent_path = strdup("");
4949 69960a46 2019-05-09 stsp if (parent_path == NULL)
4950 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4952 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4954 69960a46 2019-05-09 stsp return err;
4957 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4958 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4959 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4960 c4296144 2019-05-09 stsp goto done;
4963 dae2a678 2021-09-01 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4964 768aea60 2019-05-09 stsp relpath) == -1) {
4965 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4966 768aea60 2019-05-09 stsp goto done;
4969 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4970 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4971 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4972 dae2a678 2021-09-01 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4973 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4974 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4975 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4976 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4978 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4979 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4982 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4983 0aeb8099 2020-07-23 stsp goto done;
4985 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4986 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4987 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4988 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4989 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4990 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4991 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4992 12463d8b 2019-12-13 stsp ct->ondisk_path);
4993 12463d8b 2019-12-13 stsp goto done;
4995 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4996 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4997 768aea60 2019-05-09 stsp goto done;
4999 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
5002 dae2a678 2021-09-01 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5003 dae2a678 2021-09-01 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5004 44d03001 2019-05-09 stsp relpath) == -1) {
5005 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5006 44d03001 2019-05-09 stsp goto done;
5009 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5010 dae2a678 2021-09-01 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5011 35213c7c 2020-07-23 stsp int is_bad_symlink;
5012 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
5013 35213c7c 2020-07-23 stsp ssize_t target_len;
5014 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
5015 35213c7c 2020-07-23 stsp sizeof(target_path));
5016 35213c7c 2020-07-23 stsp if (target_len == -1) {
5017 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
5018 35213c7c 2020-07-23 stsp ct->ondisk_path);
5019 35213c7c 2020-07-23 stsp goto done;
5021 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
5022 dae2a678 2021-09-01 stsp target_len, ct->ondisk_path, a->worktree->root_path);
5024 35213c7c 2020-07-23 stsp goto done;
5025 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
5026 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
5027 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
5028 35213c7c 2020-07-23 stsp goto done;
5033 cf066bf8 2019-05-09 stsp ct->status = status;
5034 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
5035 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
5036 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
5037 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
5038 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
5039 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
5040 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5041 b416585c 2019-05-13 stsp goto done;
5043 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
5044 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
5045 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
5046 f0b75401 2019-08-03 stsp goto done;
5049 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5050 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5051 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5052 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
5053 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5054 036813ee 2019-05-09 stsp goto done;
5057 24519714 2019-05-09 stsp ct->path = strdup(path);
5058 24519714 2019-05-09 stsp if (ct->path == NULL) {
5059 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
5060 24519714 2019-05-09 stsp goto done;
5062 dae2a678 2021-09-01 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5064 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
5065 ed175427 2019-05-09 stsp free_commitable(ct);
5066 24519714 2019-05-09 stsp free(parent_path);
5067 036813ee 2019-05-09 stsp free(path);
5068 a129376b 2019-03-28 stsp return err;
5071 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
5072 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
5073 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5074 036813ee 2019-05-09 stsp struct got_repository *);
5076 ed175427 2019-05-09 stsp static const struct got_error *
5077 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5078 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
5079 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5080 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5081 afa376bf 2019-05-09 stsp struct got_repository *repo)
5083 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
5084 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
5085 036813ee 2019-05-09 stsp char *subpath;
5087 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
5088 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5089 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5091 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
5093 ed175427 2019-05-09 stsp return err;
5095 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5096 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5097 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5098 036813ee 2019-05-09 stsp free(subpath);
5099 036813ee 2019-05-09 stsp return err;
5102 036813ee 2019-05-09 stsp static const struct got_error *
5103 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5105 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5106 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5108 036813ee 2019-05-09 stsp *match = 0;
5110 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5111 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5112 0f63689d 2019-05-10 stsp return NULL;
5115 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5117 0f63689d 2019-05-10 stsp return err;
5118 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5119 036813ee 2019-05-09 stsp free(ct_parent_path);
5120 036813ee 2019-05-09 stsp return err;
5123 768aea60 2019-05-09 stsp static mode_t
5124 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5126 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5127 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5129 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5132 036813ee 2019-05-09 stsp static const struct got_error *
5133 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5134 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5136 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5138 036813ee 2019-05-09 stsp *new_te = NULL;
5140 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5142 036813ee 2019-05-09 stsp goto done;
5144 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5146 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5147 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5148 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5150 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5152 036813ee 2019-05-09 stsp if (err && *new_te) {
5153 56e0773d 2019-11-28 stsp free(*new_te);
5154 036813ee 2019-05-09 stsp *new_te = NULL;
5156 036813ee 2019-05-09 stsp return err;
5159 036813ee 2019-05-09 stsp static const struct got_error *
5160 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5161 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5163 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5164 102b254e 2020-10-19 stsp char *ct_name = NULL;
5166 036813ee 2019-05-09 stsp *new_te = NULL;
5168 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5169 036813ee 2019-05-09 stsp if (*new_te == NULL)
5170 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5172 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5174 036813ee 2019-05-09 stsp goto done;
5175 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5176 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5177 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5178 036813ee 2019-05-09 stsp goto done;
5181 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5183 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5184 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5185 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5187 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5189 102b254e 2020-10-19 stsp free(ct_name);
5190 036813ee 2019-05-09 stsp if (err && *new_te) {
5191 56e0773d 2019-11-28 stsp free(*new_te);
5192 036813ee 2019-05-09 stsp *new_te = NULL;
5194 036813ee 2019-05-09 stsp return err;
5197 036813ee 2019-05-09 stsp static const struct got_error *
5198 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5199 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5201 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5202 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5204 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5206 036813ee 2019-05-09 stsp return err;
5207 036813ee 2019-05-09 stsp if (new_pe == NULL)
5208 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5209 036813ee 2019-05-09 stsp return NULL;
5212 afa376bf 2019-05-09 stsp static const struct got_error *
5213 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5214 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5216 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5217 5f8a88c6 2019-08-03 stsp unsigned char status;
5219 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5220 afa376bf 2019-05-09 stsp ct_path++;
5222 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5223 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5225 5f8a88c6 2019-08-03 stsp status = ct->status;
5227 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5228 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5231 036813ee 2019-05-09 stsp static const struct got_error *
5232 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5233 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5235 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5236 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5237 44d03001 2019-05-09 stsp char *te_path;
5239 44d03001 2019-05-09 stsp *modified = 0;
5241 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5242 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5243 44d03001 2019-05-09 stsp te->name) == -1)
5244 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5246 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5247 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5248 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5249 44d03001 2019-05-09 stsp strlen(te_path));
5250 62d463ca 2020-10-20 naddy if (*modified)
5254 44d03001 2019-05-09 stsp free(te_path);
5255 44d03001 2019-05-09 stsp return err;
5258 44d03001 2019-05-09 stsp static const struct got_error *
5259 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5260 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5261 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5263 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5264 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5266 036813ee 2019-05-09 stsp *ctp = NULL;
5268 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5269 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5270 036813ee 2019-05-09 stsp char *ct_name = NULL;
5271 036813ee 2019-05-09 stsp int path_matches;
5273 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5274 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5275 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5276 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5279 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5280 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5284 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5287 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5289 036813ee 2019-05-09 stsp return err;
5290 036813ee 2019-05-09 stsp if (!path_matches)
5293 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5295 d34b633e 2020-10-19 stsp return err;
5297 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5298 d34b633e 2020-10-19 stsp free(ct_name);
5301 d34b633e 2020-10-19 stsp free(ct_name);
5303 036813ee 2019-05-09 stsp *ctp = ct;
5307 2b496619 2019-07-10 stsp return err;
5310 2b496619 2019-07-10 stsp static const struct got_error *
5311 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5312 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5313 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5314 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5315 2b496619 2019-07-10 stsp struct got_repository *repo)
5317 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5318 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5319 2b496619 2019-07-10 stsp char *subtree_path;
5320 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5321 ba580f68 2020-03-22 stsp int nentries;
5323 2b496619 2019-07-10 stsp *new_tep = NULL;
5325 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5326 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5327 2b496619 2019-07-10 stsp child_path) == -1)
5328 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5330 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5331 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5332 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5333 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5335 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5336 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5337 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5338 2b496619 2019-07-10 stsp goto done;
5340 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5341 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5342 2b496619 2019-07-10 stsp if (err) {
5343 56e0773d 2019-11-28 stsp free(new_te);
5344 2b496619 2019-07-10 stsp goto done;
5346 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5349 2b496619 2019-07-10 stsp free(subtree_path);
5350 2b496619 2019-07-10 stsp if (err == NULL)
5351 2b496619 2019-07-10 stsp *new_tep = new_te;
5352 036813ee 2019-05-09 stsp return err;
5355 036813ee 2019-05-09 stsp static const struct got_error *
5356 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5357 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5358 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5359 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5360 036813ee 2019-05-09 stsp struct got_repository *repo)
5362 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5363 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5364 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5365 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5367 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5368 ba580f68 2020-03-22 stsp *nentries = 0;
5370 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5371 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5372 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5373 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5375 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5376 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5377 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5380 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5381 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5384 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5385 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5387 036813ee 2019-05-09 stsp goto done;
5389 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5390 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5391 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5393 036813ee 2019-05-09 stsp goto done;
5394 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5396 afa376bf 2019-05-09 stsp goto done;
5397 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5398 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5400 2f51b5b3 2019-05-09 stsp goto done;
5401 ba580f68 2020-03-22 stsp (*nentries)++;
5403 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5404 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5405 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5406 2b496619 2019-07-10 stsp == NULL) {
5407 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5408 2b496619 2019-07-10 stsp child_path, path_base_tree,
5409 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5412 2b496619 2019-07-10 stsp goto done;
5413 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5415 2b496619 2019-07-10 stsp goto done;
5416 ba580f68 2020-03-22 stsp (*nentries)++;
5421 2f51b5b3 2019-05-09 stsp if (base_tree) {
5422 56e0773d 2019-11-28 stsp int i, nbase_entries;
5423 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5424 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5425 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5426 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5428 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5429 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5430 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5431 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5433 63c5ca5d 2019-08-24 stsp goto done;
5434 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5436 63c5ca5d 2019-08-24 stsp goto done;
5437 ba580f68 2020-03-22 stsp (*nentries)++;
5441 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5442 44d03001 2019-05-09 stsp int modified;
5443 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5445 036813ee 2019-05-09 stsp goto done;
5446 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5447 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5449 2f51b5b3 2019-05-09 stsp goto done;
5450 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5451 44d03001 2019-05-09 stsp if (modified) {
5452 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5453 ba580f68 2020-03-22 stsp int nsubentries;
5454 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5455 ba580f68 2020-03-22 stsp &nsubentries, te,
5456 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5457 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5459 44d03001 2019-05-09 stsp goto done;
5460 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5461 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5462 ba580f68 2020-03-22 stsp free(new_id);
5465 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5466 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5467 56e0773d 2019-11-28 stsp free(new_id);
5469 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5471 036813ee 2019-05-09 stsp goto done;
5472 ba580f68 2020-03-22 stsp (*nentries)++;
5476 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5477 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5479 f66c734c 2019-09-22 stsp goto done;
5481 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5482 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5483 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5484 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5485 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5486 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5488 2f51b5b3 2019-05-09 stsp goto done;
5489 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5491 2f51b5b3 2019-05-09 stsp goto done;
5492 ba580f68 2020-03-22 stsp (*nentries)++;
5494 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5495 b416585c 2019-05-13 stsp status_arg);
5497 afa376bf 2019-05-09 stsp goto done;
5499 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5500 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5502 2f51b5b3 2019-05-09 stsp goto done;
5503 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5505 2f51b5b3 2019-05-09 stsp goto done;
5506 ba580f68 2020-03-22 stsp (*nentries)++;
5511 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5512 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5514 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5515 2e1fa222 2020-07-23 stsp return err;
5518 2e1fa222 2020-07-23 stsp static const struct got_error *
5519 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5520 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5521 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5522 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5524 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5525 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5526 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5528 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5529 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5530 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5532 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5534 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5535 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5536 437adc9d 2020-12-10 yzhong if (err)
5537 437adc9d 2020-12-10 yzhong goto done;
5540 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5541 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5542 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5543 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5544 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5545 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5546 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5547 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5549 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5550 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5551 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5552 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5553 72fd46fa 2019-09-06 stsp !have_staged_files);
5555 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5556 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5557 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5558 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5559 72fd46fa 2019-09-06 stsp !have_staged_files);
5561 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5563 437adc9d 2020-12-10 yzhong goto done;
5564 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5565 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5566 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5567 3969253a 2020-03-07 stsp if (err) {
5568 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5569 437adc9d 2020-12-10 yzhong goto done;
5571 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5572 3969253a 2020-03-07 stsp if (err) {
5573 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5574 437adc9d 2020-12-10 yzhong goto done;
5577 437adc9d 2020-12-10 yzhong free(relpath);
5578 437adc9d 2020-12-10 yzhong relpath = NULL;
5581 437adc9d 2020-12-10 yzhong free(relpath);
5582 d56d26ce 2019-05-10 stsp return err;
5586 d56d26ce 2019-05-10 stsp static const struct got_error *
5587 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5588 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5589 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5590 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5591 735ef5ac 2019-08-03 stsp int ood_errcode)
5593 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5594 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5596 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5597 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5598 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5599 1a36436d 2019-06-10 stsp return NULL;
5601 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5602 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5604 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5605 735ef5ac 2019-08-03 stsp in_repo_path);
5606 9bead371 2019-07-28 stsp if (err) {
5607 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5608 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5609 1a36436d 2019-06-10 stsp goto done;
5610 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5611 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5613 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5614 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5615 735ef5ac 2019-08-03 stsp in_repo_path);
5616 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5617 1a36436d 2019-06-10 stsp goto done;
5618 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5622 1a36436d 2019-06-10 stsp return err;
5625 c4296144 2019-05-09 stsp const struct got_error *
5626 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5627 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5628 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id,
5629 f259c4c1 2021-09-24 stsp struct got_object_id *parent_id2,
5630 f259c4c1 2021-09-24 stsp struct got_worktree *worktree,
5631 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5632 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5633 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5634 afa376bf 2019-05-09 stsp struct got_repository *repo)
5636 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5637 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5638 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5639 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5640 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5641 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5642 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5643 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5644 f259c4c1 2021-09-24 stsp int nentries, nparents = 0;
5645 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5646 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5647 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5649 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5651 dbdddfee 2021-06-23 naddy STAILQ_INIT(&parent_ids);
5653 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5655 588edf97 2019-05-10 stsp goto done;
5657 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5659 588edf97 2019-05-10 stsp goto done;
5661 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5662 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5667 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5668 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5672 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5673 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5674 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5675 cf066bf8 2019-05-09 stsp char *ondisk_path;
5677 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5678 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5679 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5682 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5683 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5684 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5687 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5688 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5689 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5690 cf066bf8 2019-05-09 stsp goto done;
5692 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5693 2e1fa222 2020-07-23 stsp free(ondisk_path);
5695 cf066bf8 2019-05-09 stsp goto done;
5698 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5699 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5700 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5702 036813ee 2019-05-09 stsp goto done;
5704 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5706 de18fc63 2019-05-09 stsp goto done;
5707 dbdddfee 2021-06-23 naddy STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5708 f259c4c1 2021-09-24 stsp nparents++;
5709 f259c4c1 2021-09-24 stsp if (parent_id2) {
5710 f259c4c1 2021-09-24 stsp err = got_object_qid_alloc(&pid, parent_id2);
5712 f259c4c1 2021-09-24 stsp goto done;
5713 f259c4c1 2021-09-24 stsp STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5714 f259c4c1 2021-09-24 stsp nparents++;
5716 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5717 f259c4c1 2021-09-24 stsp nparents, author, time(NULL), committer, time(NULL), logmsg, repo);
5718 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5719 33ad4cbe 2019-05-12 jcs free(logmsg);
5721 9d40349a 2019-05-09 stsp goto done;
5723 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5724 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5725 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5726 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5727 09f5bd90 2019-05-09 stsp goto done;
5729 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5730 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5732 09f5bd90 2019-05-09 stsp goto done;
5733 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5735 ebf99748 2019-05-09 stsp goto done;
5736 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5737 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5738 09f5bd90 2019-05-09 stsp goto done;
5740 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5741 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5743 f2c16586 2019-05-09 stsp goto done;
5744 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5746 f2c16586 2019-05-09 stsp goto done;
5748 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5750 09f5bd90 2019-05-09 stsp goto done;
5752 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5754 ebf99748 2019-05-09 stsp goto done;
5756 f259c4c1 2021-09-24 stsp got_object_id_queue_free(&parent_ids);
5757 588edf97 2019-05-10 stsp if (head_tree)
5758 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5759 588edf97 2019-05-10 stsp if (head_commit)
5760 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5761 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5762 2f17228e 2019-05-12 stsp if (head_ref2) {
5763 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5764 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5765 2f17228e 2019-05-12 stsp err = unlockerr;
5766 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5768 39cd0ff6 2019-07-12 stsp return err;
5771 5c1e53bc 2019-07-28 stsp static const struct got_error *
5772 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5773 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5775 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5776 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5778 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5779 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5780 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5782 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5783 5c1e53bc 2019-07-28 stsp ct_path++;
5785 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5786 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5790 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5791 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5793 5c1e53bc 2019-07-28 stsp return NULL;
5796 f0b75401 2019-08-03 stsp static const struct got_error *
5797 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5799 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5801 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5802 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5803 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5806 f0b75401 2019-08-03 stsp return NULL;
5809 5f8a88c6 2019-08-03 stsp static const struct got_error *
5810 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5811 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5813 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5814 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5816 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5817 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5819 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5820 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5821 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5822 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5823 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5824 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5827 5f8a88c6 2019-08-03 stsp return NULL;
5830 39cd0ff6 2019-07-12 stsp const struct got_error *
5831 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5832 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5833 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5834 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5835 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5836 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5838 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5839 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5840 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5841 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5842 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5843 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5844 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5845 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5846 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5848 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5850 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5852 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5854 39cd0ff6 2019-07-12 stsp goto done;
5856 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5858 39cd0ff6 2019-07-12 stsp goto done;
5860 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5862 39cd0ff6 2019-07-12 stsp goto done;
5864 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5866 39cd0ff6 2019-07-12 stsp goto done;
5868 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5869 5f8a88c6 2019-08-03 stsp &have_staged_files);
5870 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5871 5f8a88c6 2019-08-03 stsp goto done;
5872 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5873 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5875 5f8a88c6 2019-08-03 stsp goto done;
5878 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5879 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5880 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5881 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5882 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5883 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5884 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5885 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5886 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5888 5c1e53bc 2019-07-28 stsp goto done;
5891 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5892 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5893 39cd0ff6 2019-07-12 stsp goto done;
5896 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5897 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5899 5c1e53bc 2019-07-28 stsp goto done;
5902 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5903 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5904 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5906 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5907 f0b75401 2019-08-03 stsp ct_path++;
5908 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5909 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5910 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5912 b50cabdf 2019-07-12 stsp goto done;
5916 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5917 f259c4c1 2021-09-24 stsp head_commit_id, NULL, worktree, author, committer,
5918 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5920 39cd0ff6 2019-07-12 stsp goto done;
5922 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5923 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5924 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5925 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5926 39cd0ff6 2019-07-12 stsp err = sync_err;
5928 39cd0ff6 2019-07-12 stsp if (fileindex)
5929 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5930 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5931 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5932 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5933 39cd0ff6 2019-07-12 stsp err = unlockerr;
5934 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5935 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5936 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5938 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5939 c4296144 2019-05-09 stsp return err;
5942 8656d6c4 2019-05-20 stsp const char *
5943 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5945 8656d6c4 2019-05-20 stsp return ct->path;
5948 8656d6c4 2019-05-20 stsp unsigned int
5949 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5951 8656d6c4 2019-05-20 stsp return ct->status;
5954 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5955 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5956 818c7501 2019-07-11 stsp struct got_repository *repo;
5959 818c7501 2019-07-11 stsp static const struct got_error *
5960 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5962 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5963 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5964 818c7501 2019-07-11 stsp unsigned char status;
5965 818c7501 2019-07-11 stsp struct stat sb;
5966 818c7501 2019-07-11 stsp char *ondisk_path;
5968 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5969 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5970 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5971 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5973 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5975 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5977 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5978 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5979 818c7501 2019-07-11 stsp free(ondisk_path);
5981 818c7501 2019-07-11 stsp return err;
5983 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5984 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5985 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5986 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5988 818c7501 2019-07-11 stsp return NULL;
5991 818c7501 2019-07-11 stsp const struct got_error *
5992 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5993 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5994 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5995 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5997 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5998 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5999 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
6000 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6001 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
6002 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6003 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
6005 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6006 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6007 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6009 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6011 818c7501 2019-07-11 stsp return err;
6013 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6015 818c7501 2019-07-11 stsp goto done;
6017 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
6018 818c7501 2019-07-11 stsp ok_arg.repo = repo;
6019 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6022 818c7501 2019-07-11 stsp goto done;
6024 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6026 818c7501 2019-07-11 stsp goto done;
6028 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6030 818c7501 2019-07-11 stsp goto done;
6032 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6034 818c7501 2019-07-11 stsp goto done;
6036 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6039 e51d7b55 2020-01-04 stsp goto done;
6041 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6043 818c7501 2019-07-11 stsp goto done;
6044 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6045 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6046 e51d7b55 2020-01-04 stsp goto done;
6049 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
6050 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
6052 818c7501 2019-07-11 stsp goto done;
6053 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
6055 818c7501 2019-07-11 stsp goto done;
6057 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
6059 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6061 818c7501 2019-07-11 stsp goto done;
6063 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
6065 818c7501 2019-07-11 stsp goto done;
6067 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6068 818c7501 2019-07-11 stsp worktree->base_commit_id);
6070 818c7501 2019-07-11 stsp goto done;
6071 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
6073 818c7501 2019-07-11 stsp goto done;
6075 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6077 818c7501 2019-07-11 stsp goto done;
6079 818c7501 2019-07-11 stsp free(fileindex_path);
6080 818c7501 2019-07-11 stsp free(tmp_branch_name);
6081 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
6082 818c7501 2019-07-11 stsp free(branch_ref_name);
6083 818c7501 2019-07-11 stsp if (branch_ref)
6084 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6085 818c7501 2019-07-11 stsp if (wt_branch)
6086 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
6087 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
6088 818c7501 2019-07-11 stsp if (err) {
6089 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
6090 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
6091 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
6093 818c7501 2019-07-11 stsp if (*tmp_branch) {
6094 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6095 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6097 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6098 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6099 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6101 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
6103 818c7501 2019-07-11 stsp return err;
6106 818c7501 2019-07-11 stsp const struct got_error *
6107 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6108 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6109 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6110 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6112 818c7501 2019-07-11 stsp const struct got_error *err;
6113 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6114 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6115 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6116 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6117 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6119 818c7501 2019-07-11 stsp *commit_id = NULL;
6120 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6121 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6122 3e3a69f1 2019-07-25 stsp *branch = NULL;
6123 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6125 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6127 3e3a69f1 2019-07-25 stsp return err;
6129 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6131 f032f1f7 2019-08-04 stsp goto done;
6133 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6134 f032f1f7 2019-08-04 stsp &have_staged_files);
6135 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6136 f032f1f7 2019-08-04 stsp goto done;
6137 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6138 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6139 3e3a69f1 2019-07-25 stsp goto done;
6142 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6144 f032f1f7 2019-08-04 stsp goto done;
6146 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6148 818c7501 2019-07-11 stsp goto done;
6150 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6152 818c7501 2019-07-11 stsp goto done;
6154 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6156 818c7501 2019-07-11 stsp goto done;
6158 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6160 818c7501 2019-07-11 stsp goto done;
6162 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6163 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6165 818c7501 2019-07-11 stsp goto done;
6167 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6169 818c7501 2019-07-11 stsp goto done;
6171 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6173 818c7501 2019-07-11 stsp goto done;
6175 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6176 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6178 818c7501 2019-07-11 stsp goto done;
6180 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6182 818c7501 2019-07-11 stsp goto done;
6184 818c7501 2019-07-11 stsp free(commit_ref_name);
6185 818c7501 2019-07-11 stsp free(branch_ref_name);
6186 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6187 818c7501 2019-07-11 stsp if (commit_ref)
6188 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6189 818c7501 2019-07-11 stsp if (branch_ref)
6190 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6191 818c7501 2019-07-11 stsp if (err) {
6192 818c7501 2019-07-11 stsp free(*commit_id);
6193 818c7501 2019-07-11 stsp *commit_id = NULL;
6194 818c7501 2019-07-11 stsp if (*tmp_branch) {
6195 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6196 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6198 818c7501 2019-07-11 stsp if (*new_base_branch) {
6199 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6200 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6202 818c7501 2019-07-11 stsp if (*branch) {
6203 818c7501 2019-07-11 stsp got_ref_close(*branch);
6204 818c7501 2019-07-11 stsp *branch = NULL;
6206 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6207 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6208 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6210 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6212 818c7501 2019-07-11 stsp return err;
6215 818c7501 2019-07-11 stsp const struct got_error *
6216 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6218 818c7501 2019-07-11 stsp const struct got_error *err;
6219 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6221 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6223 818c7501 2019-07-11 stsp return err;
6225 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6226 818c7501 2019-07-11 stsp free(tmp_branch_name);
6227 818c7501 2019-07-11 stsp return NULL;
6230 818c7501 2019-07-11 stsp static const struct got_error *
6231 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6232 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6234 0ebf8283 2019-07-24 stsp *logmsg = arg;
6235 818c7501 2019-07-11 stsp return NULL;
6238 818c7501 2019-07-11 stsp static const struct got_error *
6239 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6240 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6241 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6242 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6244 818c7501 2019-07-11 stsp return NULL;
6247 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6248 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6249 01757395 2019-07-12 stsp void *progress_arg;
6250 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6253 01757395 2019-07-12 stsp static const struct got_error *
6254 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6256 01757395 2019-07-12 stsp const struct got_error *err;
6257 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6259 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6261 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6263 01757395 2019-07-12 stsp return err;
6265 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6266 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6267 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6268 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6269 01757395 2019-07-12 stsp return NULL;
6271 01757395 2019-07-12 stsp p = strdup(path);
6272 01757395 2019-07-12 stsp if (p == NULL)
6273 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6275 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6276 01757395 2019-07-12 stsp if (err || new == NULL)
6278 01757395 2019-07-12 stsp return err;
6282 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6284 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6286 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6287 01757395 2019-07-12 stsp free((char *)pe->path);
6289 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6292 0ebf8283 2019-07-24 stsp static const struct got_error *
6293 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6294 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6296 818c7501 2019-07-11 stsp const struct got_error *err;
6297 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6299 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6300 818c7501 2019-07-11 stsp if (err) {
6301 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6302 818c7501 2019-07-11 stsp goto done;
6303 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6305 818c7501 2019-07-11 stsp goto done;
6306 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6308 818c7501 2019-07-11 stsp goto done;
6309 de05890f 2020-03-05 stsp } else if (is_rebase) {
6310 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6313 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6315 818c7501 2019-07-11 stsp goto done;
6316 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6317 818c7501 2019-07-11 stsp free(stored_id);
6318 818c7501 2019-07-11 stsp if (cmp != 0) {
6319 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6320 818c7501 2019-07-11 stsp goto done;
6324 0ebf8283 2019-07-24 stsp if (commit_ref)
6325 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6326 0ebf8283 2019-07-24 stsp return err;
6329 0ebf8283 2019-07-24 stsp static const struct got_error *
6330 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6331 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6332 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6333 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6334 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6335 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6337 0ebf8283 2019-07-24 stsp const struct got_error *err;
6338 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6339 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6340 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6342 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6344 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6346 0ebf8283 2019-07-24 stsp return err;
6348 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6349 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6350 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6351 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6352 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6353 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6354 818c7501 2019-07-11 stsp if (commit_ref)
6355 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6356 818c7501 2019-07-11 stsp return err;
6359 818c7501 2019-07-11 stsp const struct got_error *
6360 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6361 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6362 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6363 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6364 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6365 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6367 0ebf8283 2019-07-24 stsp const struct got_error *err;
6368 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6370 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6372 0ebf8283 2019-07-24 stsp return err;
6374 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6376 0ebf8283 2019-07-24 stsp goto done;
6378 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6379 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6380 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6382 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6383 0ebf8283 2019-07-24 stsp return err;
6386 0ebf8283 2019-07-24 stsp const struct got_error *
6387 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6388 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6389 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6390 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6391 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6392 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6394 0ebf8283 2019-07-24 stsp const struct got_error *err;
6395 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6397 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6399 0ebf8283 2019-07-24 stsp return err;
6401 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6403 0ebf8283 2019-07-24 stsp goto done;
6405 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6406 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6407 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6409 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6410 0ebf8283 2019-07-24 stsp return err;
6413 0ebf8283 2019-07-24 stsp static const struct got_error *
6414 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6415 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6416 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6417 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6418 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6420 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6421 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6422 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6423 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6424 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6425 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6426 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6428 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6429 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6431 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6433 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6435 3e3a69f1 2019-07-25 stsp return err;
6437 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6438 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6439 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6440 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6442 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6443 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6445 6c13b005 2021-09-02 stsp * Ideally, merged_paths would contain a list of commitables
6446 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6447 6c13b005 2021-09-02 stsp * However, we would then need carefully keep track of cumulative
6448 6c13b005 2021-09-02 stsp * effects of operations such as file additions and deletions
6449 6c13b005 2021-09-02 stsp * in 'got histedit -f' (folding multiple commits into one),
6450 6c13b005 2021-09-02 stsp * and this extra complexity is not really worth it.
6452 01757395 2019-07-12 stsp if (merged_paths) {
6453 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6454 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6455 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6456 0e33f8e0 2021-09-01 stsp repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6459 01757395 2019-07-12 stsp goto done;
6462 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6463 0e33f8e0 2021-09-01 stsp collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6465 01757395 2019-07-12 stsp goto done;
6468 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6469 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6470 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6472 a0e95631 2019-07-12 stsp goto done;
6473 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6474 a0e95631 2019-07-12 stsp goto done;
6477 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6479 edd02c5e 2019-07-11 stsp goto done;
6481 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6483 818c7501 2019-07-11 stsp goto done;
6485 5943eee2 2019-08-13 stsp if (new_logmsg) {
6486 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6487 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6488 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6489 5943eee2 2019-08-13 stsp goto done;
6492 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6494 5943eee2 2019-08-13 stsp goto done;
6497 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6498 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6499 f259c4c1 2021-09-24 stsp NULL, worktree, got_object_commit_get_author(orig_commit),
6500 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6501 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6503 a0e95631 2019-07-12 stsp goto done;
6505 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6507 a0e95631 2019-07-12 stsp goto done;
6509 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6511 a0e95631 2019-07-12 stsp goto done;
6513 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6514 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6515 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6516 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6517 a0e95631 2019-07-12 stsp err = sync_err;
6519 a0e95631 2019-07-12 stsp free(fileindex_path);
6520 a0e95631 2019-07-12 stsp free(head_commit_id);
6521 a0e95631 2019-07-12 stsp if (head_ref)
6522 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6523 818c7501 2019-07-11 stsp if (err) {
6524 818c7501 2019-07-11 stsp free(*new_commit_id);
6525 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6527 818c7501 2019-07-11 stsp return err;
6530 818c7501 2019-07-11 stsp const struct got_error *
6531 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6532 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6533 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6534 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6535 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6537 0ebf8283 2019-07-24 stsp const struct got_error *err;
6538 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6539 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6540 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6542 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6544 0ebf8283 2019-07-24 stsp return err;
6546 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6548 0ebf8283 2019-07-24 stsp goto done;
6549 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6551 0ebf8283 2019-07-24 stsp goto done;
6552 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6553 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6554 0ebf8283 2019-07-24 stsp goto done;
6557 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6558 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6560 0ebf8283 2019-07-24 stsp if (commit_ref)
6561 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6562 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6563 0ebf8283 2019-07-24 stsp free(commit_id);
6564 0ebf8283 2019-07-24 stsp return err;
6567 0ebf8283 2019-07-24 stsp const struct got_error *
6568 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6569 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6570 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6571 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6572 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6573 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6575 0ebf8283 2019-07-24 stsp const struct got_error *err;
6576 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6577 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6579 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6581 0ebf8283 2019-07-24 stsp return err;
6583 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6585 0ebf8283 2019-07-24 stsp goto done;
6587 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6588 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6590 0ebf8283 2019-07-24 stsp if (commit_ref)
6591 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6592 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6593 0ebf8283 2019-07-24 stsp return err;
6596 0ebf8283 2019-07-24 stsp const struct got_error *
6597 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6598 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6600 3e3a69f1 2019-07-25 stsp if (fileindex)
6601 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6602 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6605 69844fba 2019-07-11 stsp static const struct got_error *
6606 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6608 69844fba 2019-07-11 stsp const struct got_error *err;
6609 69844fba 2019-07-11 stsp struct got_reference *ref;
6611 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6612 69844fba 2019-07-11 stsp if (err) {
6613 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6614 69844fba 2019-07-11 stsp return NULL;
6615 69844fba 2019-07-11 stsp return err;
6618 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6619 69844fba 2019-07-11 stsp got_ref_close(ref);
6620 69844fba 2019-07-11 stsp return err;
6623 69844fba 2019-07-11 stsp static const struct got_error *
6624 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6626 69844fba 2019-07-11 stsp const struct got_error *err;
6627 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6628 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6630 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6632 69844fba 2019-07-11 stsp goto done;
6633 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6635 69844fba 2019-07-11 stsp goto done;
6637 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6639 69844fba 2019-07-11 stsp goto done;
6640 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6642 69844fba 2019-07-11 stsp goto done;
6644 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6646 69844fba 2019-07-11 stsp goto done;
6647 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6649 69844fba 2019-07-11 stsp goto done;
6651 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6653 69844fba 2019-07-11 stsp goto done;
6654 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6656 69844fba 2019-07-11 stsp goto done;
6659 69844fba 2019-07-11 stsp free(tmp_branch_name);
6660 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6661 69844fba 2019-07-11 stsp free(branch_ref_name);
6662 69844fba 2019-07-11 stsp free(commit_ref_name);
6663 e600f124 2021-03-21 stsp return err;
6666 e600f124 2021-03-21 stsp const struct got_error *
6667 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6668 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6670 e600f124 2021-03-21 stsp const struct got_error *err;
6671 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6672 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6673 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6674 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6675 e600f124 2021-03-21 stsp char *refname = NULL;
6677 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6678 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6679 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6680 e600f124 2021-03-21 stsp branch_name += 11;
6682 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6684 e600f124 2021-03-21 stsp return err;
6686 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6687 e600f124 2021-03-21 stsp new_id_str) == -1) {
6688 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6689 e600f124 2021-03-21 stsp goto done;
6692 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6694 e600f124 2021-03-21 stsp goto done;
6696 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6698 e600f124 2021-03-21 stsp goto done;
6700 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6702 e600f124 2021-03-21 stsp free(new_id_str);
6703 e600f124 2021-03-21 stsp free(refname);
6704 e600f124 2021-03-21 stsp free(old_commit_id);
6706 e600f124 2021-03-21 stsp got_ref_close(ref);
6707 69844fba 2019-07-11 stsp return err;
6710 818c7501 2019-07-11 stsp const struct got_error *
6711 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6712 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6713 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6714 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6716 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6717 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6718 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6720 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6722 818c7501 2019-07-11 stsp return err;
6724 e600f124 2021-03-21 stsp if (create_backup) {
6725 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6726 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6728 e600f124 2021-03-21 stsp goto done;
6731 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6733 818c7501 2019-07-11 stsp goto done;
6735 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6737 818c7501 2019-07-11 stsp goto done;
6739 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6741 818c7501 2019-07-11 stsp goto done;
6743 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6745 a615e0e7 2020-12-16 stsp goto done;
6747 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6749 a615e0e7 2020-12-16 stsp goto done;
6750 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6751 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6752 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6753 a615e0e7 2020-12-16 stsp err = sync_err;
6755 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6756 a615e0e7 2020-12-16 stsp free(fileindex_path);
6757 818c7501 2019-07-11 stsp free(new_head_commit_id);
6758 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6759 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6760 818c7501 2019-07-11 stsp err = unlockerr;
6761 818c7501 2019-07-11 stsp return err;
6764 818c7501 2019-07-11 stsp const struct got_error *
6765 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6766 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6767 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6768 abc59930 2021-09-05 naddy got_worktree_checkout_cb progress_cb, void *progress_arg)
6770 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6771 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6772 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6773 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6774 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6775 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6777 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6779 818c7501 2019-07-11 stsp return err;
6781 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6782 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6784 818c7501 2019-07-11 stsp goto done;
6786 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6788 818c7501 2019-07-11 stsp goto done;
6791 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6792 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6793 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6795 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6797 818c7501 2019-07-11 stsp goto done;
6799 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6801 818c7501 2019-07-11 stsp goto done;
6803 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6804 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6806 ca355955 2019-07-12 stsp goto done;
6808 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6810 ca355955 2019-07-12 stsp goto done;
6812 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6814 818c7501 2019-07-11 stsp goto done;
6816 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6817 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6818 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6819 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6820 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6821 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6822 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6823 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
6824 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6825 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6827 1f1abb7e 2019-08-08 stsp goto sync;
6829 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6830 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6832 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6833 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6834 ca355955 2019-07-12 stsp err = sync_err;
6836 818c7501 2019-07-11 stsp got_ref_close(resolved);
6837 a3a2faf2 2019-07-12 stsp free(tree_id);
6838 818c7501 2019-07-11 stsp free(commit_id);
6839 0ebf8283 2019-07-24 stsp if (fileindex)
6840 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6841 0ebf8283 2019-07-24 stsp free(fileindex_path);
6843 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6844 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6845 0ebf8283 2019-07-24 stsp err = unlockerr;
6846 0ebf8283 2019-07-24 stsp return err;
6849 0ebf8283 2019-07-24 stsp const struct got_error *
6850 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6851 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6852 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6853 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6855 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6856 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6857 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6858 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6859 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6860 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6861 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6862 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6864 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6865 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6866 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6867 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6869 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6871 0ebf8283 2019-07-24 stsp return err;
6873 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6875 0ebf8283 2019-07-24 stsp goto done;
6877 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6878 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6879 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6882 0ebf8283 2019-07-24 stsp goto done;
6884 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6886 0ebf8283 2019-07-24 stsp goto done;
6888 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6890 0ebf8283 2019-07-24 stsp goto done;
6892 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6893 0ebf8283 2019-07-24 stsp worktree);
6895 0ebf8283 2019-07-24 stsp goto done;
6897 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6900 0ebf8283 2019-07-24 stsp goto done;
6902 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6904 0ebf8283 2019-07-24 stsp goto done;
6906 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6908 0ebf8283 2019-07-24 stsp goto done;
6910 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6911 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6913 0ebf8283 2019-07-24 stsp goto done;
6914 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6916 0ebf8283 2019-07-24 stsp goto done;
6917 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6918 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6919 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6920 0ebf8283 2019-07-24 stsp goto done;
6923 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6924 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6926 0ebf8283 2019-07-24 stsp goto done;
6927 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6929 0ebf8283 2019-07-24 stsp goto done;
6931 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6933 0ebf8283 2019-07-24 stsp goto done;
6935 0ebf8283 2019-07-24 stsp free(fileindex_path);
6936 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6937 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6938 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6939 0ebf8283 2019-07-24 stsp if (wt_branch)
6940 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6941 0ebf8283 2019-07-24 stsp if (err) {
6942 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6943 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6944 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6946 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6947 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6948 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6950 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6951 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6952 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6953 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6955 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6957 0ebf8283 2019-07-24 stsp return err;
6960 0ebf8283 2019-07-24 stsp const struct got_error *
6961 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6962 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6964 3e3a69f1 2019-07-25 stsp if (fileindex)
6965 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6966 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6969 0ebf8283 2019-07-24 stsp const struct got_error *
6970 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6971 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6973 0ebf8283 2019-07-24 stsp const struct got_error *err;
6974 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6976 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6978 0ebf8283 2019-07-24 stsp return err;
6980 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6981 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6982 0ebf8283 2019-07-24 stsp return NULL;
6985 0ebf8283 2019-07-24 stsp const struct got_error *
6986 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6987 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6988 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6989 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6991 0ebf8283 2019-07-24 stsp const struct got_error *err;
6992 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6993 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6994 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6995 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6996 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6997 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6999 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7000 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7001 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7002 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7004 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
7006 3e3a69f1 2019-07-25 stsp return err;
7008 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7010 f032f1f7 2019-08-04 stsp goto done;
7012 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7013 f032f1f7 2019-08-04 stsp &have_staged_files);
7014 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
7015 f032f1f7 2019-08-04 stsp goto done;
7016 f032f1f7 2019-08-04 stsp if (have_staged_files) {
7017 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7018 3e3a69f1 2019-07-25 stsp goto done;
7021 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7023 f032f1f7 2019-08-04 stsp goto done;
7025 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7027 0ebf8283 2019-07-24 stsp goto done;
7029 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7031 0ebf8283 2019-07-24 stsp goto done;
7033 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7034 0ebf8283 2019-07-24 stsp worktree);
7036 0ebf8283 2019-07-24 stsp goto done;
7038 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7040 0ebf8283 2019-07-24 stsp goto done;
7042 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7044 0ebf8283 2019-07-24 stsp goto done;
7045 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
7047 0ebf8283 2019-07-24 stsp goto done;
7049 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7051 0ebf8283 2019-07-24 stsp goto done;
7052 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7054 0ebf8283 2019-07-24 stsp goto done;
7056 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7058 0ebf8283 2019-07-24 stsp goto done;
7060 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7061 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7062 3e3a69f1 2019-07-25 stsp free(fileindex_path);
7063 0ebf8283 2019-07-24 stsp if (commit_ref)
7064 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
7065 0ebf8283 2019-07-24 stsp if (base_commit_ref)
7066 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
7067 0ebf8283 2019-07-24 stsp if (err) {
7068 0ebf8283 2019-07-24 stsp free(*commit_id);
7069 0ebf8283 2019-07-24 stsp *commit_id = NULL;
7070 0ebf8283 2019-07-24 stsp free(*base_commit_id);
7071 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
7072 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
7073 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
7074 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
7076 3e3a69f1 2019-07-25 stsp if (*fileindex) {
7077 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
7078 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
7080 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
7082 0ebf8283 2019-07-24 stsp return err;
7085 0ebf8283 2019-07-24 stsp static const struct got_error *
7086 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7088 0ebf8283 2019-07-24 stsp const struct got_error *err;
7089 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7090 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
7092 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7094 0ebf8283 2019-07-24 stsp goto done;
7095 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
7097 0ebf8283 2019-07-24 stsp goto done;
7099 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7100 0ebf8283 2019-07-24 stsp worktree);
7102 0ebf8283 2019-07-24 stsp goto done;
7103 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
7105 0ebf8283 2019-07-24 stsp goto done;
7107 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7109 0ebf8283 2019-07-24 stsp goto done;
7110 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7112 0ebf8283 2019-07-24 stsp goto done;
7114 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7116 0ebf8283 2019-07-24 stsp goto done;
7117 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7119 0ebf8283 2019-07-24 stsp goto done;
7121 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7122 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7123 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7124 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7125 0ebf8283 2019-07-24 stsp return err;
7128 0ebf8283 2019-07-24 stsp const struct got_error *
7129 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7130 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7131 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7132 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7134 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7135 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7136 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7137 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7138 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7140 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7142 0ebf8283 2019-07-24 stsp return err;
7144 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7145 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7147 0ebf8283 2019-07-24 stsp goto done;
7149 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7151 0ebf8283 2019-07-24 stsp goto done;
7153 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7155 0ebf8283 2019-07-24 stsp goto done;
7157 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7158 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7160 0ebf8283 2019-07-24 stsp goto done;
7162 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7164 0ebf8283 2019-07-24 stsp goto done;
7166 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7168 0ebf8283 2019-07-24 stsp goto done;
7170 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7171 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7172 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7173 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7174 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7175 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7176 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7177 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 0;
7178 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7179 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
7181 1f1abb7e 2019-08-08 stsp goto sync;
7183 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7184 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7186 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7187 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7188 0ebf8283 2019-07-24 stsp err = sync_err;
7190 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7191 0ebf8283 2019-07-24 stsp free(tree_id);
7192 818c7501 2019-07-11 stsp free(fileindex_path);
7194 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7195 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7196 818c7501 2019-07-11 stsp err = unlockerr;
7197 818c7501 2019-07-11 stsp return err;
7200 0ebf8283 2019-07-24 stsp const struct got_error *
7201 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7202 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7203 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7205 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7206 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7207 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7208 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7210 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7212 0ebf8283 2019-07-24 stsp return err;
7214 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7215 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7217 e600f124 2021-03-21 stsp goto done;
7219 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7220 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7222 0ebf8283 2019-07-24 stsp goto done;
7224 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7226 0ebf8283 2019-07-24 stsp goto done;
7228 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7230 0ebf8283 2019-07-24 stsp goto done;
7232 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7234 0ebf8283 2019-07-24 stsp goto done;
7236 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7238 a615e0e7 2020-12-16 stsp goto done;
7240 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7242 a615e0e7 2020-12-16 stsp goto done;
7243 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7244 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7245 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7246 a615e0e7 2020-12-16 stsp err = sync_err;
7248 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7249 a615e0e7 2020-12-16 stsp free(fileindex_path);
7250 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7251 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7252 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7253 0ebf8283 2019-07-24 stsp err = unlockerr;
7254 0ebf8283 2019-07-24 stsp return err;
7257 0ebf8283 2019-07-24 stsp const struct got_error *
7258 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7259 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7261 0ebf8283 2019-07-24 stsp const struct got_error *err;
7262 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7264 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7266 0ebf8283 2019-07-24 stsp return err;
7268 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7270 0ebf8283 2019-07-24 stsp goto done;
7272 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7274 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7275 2822a352 2019-10-15 stsp return err;
7278 2822a352 2019-10-15 stsp const struct got_error *
7279 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7280 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7281 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7282 2822a352 2019-10-15 stsp struct got_repository *repo)
7284 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7285 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7286 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7288 2822a352 2019-10-15 stsp *fileindex = NULL;
7289 2822a352 2019-10-15 stsp *branch_ref = NULL;
7290 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7292 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7294 2822a352 2019-10-15 stsp return err;
7296 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7297 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7298 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7299 2822a352 2019-10-15 stsp "update -b or different branch name required");
7300 2822a352 2019-10-15 stsp goto done;
7303 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7305 2822a352 2019-10-15 stsp goto done;
7307 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7308 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7309 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7310 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7313 2822a352 2019-10-15 stsp goto done;
7315 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7317 2822a352 2019-10-15 stsp goto done;
7319 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7320 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7322 2822a352 2019-10-15 stsp if (err) {
7323 2822a352 2019-10-15 stsp if (*branch_ref) {
7324 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7325 2822a352 2019-10-15 stsp *branch_ref = NULL;
7327 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7328 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7329 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7331 2822a352 2019-10-15 stsp if (*fileindex) {
7332 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7333 2822a352 2019-10-15 stsp *fileindex = NULL;
7335 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7337 0cb83759 2019-08-03 stsp return err;
7340 2822a352 2019-10-15 stsp const struct got_error *
7341 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7342 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7343 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7344 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7345 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7347 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7348 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7349 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7351 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7353 2822a352 2019-10-15 stsp goto done;
7355 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7357 2822a352 2019-10-15 stsp goto done;
7359 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7360 2822a352 2019-10-15 stsp worktree->path_prefix);
7362 2822a352 2019-10-15 stsp goto done;
7364 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7366 2822a352 2019-10-15 stsp goto done;
7368 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7369 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7371 2822a352 2019-10-15 stsp goto sync;
7373 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7375 2822a352 2019-10-15 stsp goto sync;
7377 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7379 6e210706 2021-01-22 stsp goto sync;
7381 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7383 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7384 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7385 2822a352 2019-10-15 stsp err = sync_err;
7388 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7389 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7390 2822a352 2019-10-15 stsp err = unlockerr;
7391 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7393 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7394 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7395 2822a352 2019-10-15 stsp err = unlockerr;
7396 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7398 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7399 2822a352 2019-10-15 stsp free(fileindex_path);
7400 2822a352 2019-10-15 stsp free(tree_id);
7402 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7403 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7404 2822a352 2019-10-15 stsp err = unlockerr;
7405 2822a352 2019-10-15 stsp return err;
7408 2822a352 2019-10-15 stsp const struct got_error *
7409 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7410 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7411 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7413 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7415 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7417 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7419 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7420 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7421 8b692cd0 2019-10-21 stsp err = unlockerr;
7422 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7424 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7425 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7426 8b692cd0 2019-10-21 stsp err = unlockerr;
7427 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7429 f259c4c1 2021-09-24 stsp return err;
7432 f259c4c1 2021-09-24 stsp const struct got_error *
7433 f259c4c1 2021-09-24 stsp got_worktree_merge_postpone(struct got_worktree *worktree,
7434 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex)
7436 f259c4c1 2021-09-24 stsp const struct got_error *err, *sync_err;
7437 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7439 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7441 f259c4c1 2021-09-24 stsp goto done;
7443 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7445 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_SH);
7446 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7447 f259c4c1 2021-09-24 stsp err = sync_err;
7449 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7450 f259c4c1 2021-09-24 stsp free(fileindex_path);
7451 8b692cd0 2019-10-21 stsp return err;
7454 f259c4c1 2021-09-24 stsp static const struct got_error *
7455 f259c4c1 2021-09-24 stsp delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7457 f259c4c1 2021-09-24 stsp const struct got_error *err;
7458 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7460 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7462 f259c4c1 2021-09-24 stsp goto done;
7463 f259c4c1 2021-09-24 stsp err = delete_ref(branch_refname, repo);
7465 f259c4c1 2021-09-24 stsp goto done;
7467 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7469 f259c4c1 2021-09-24 stsp goto done;
7470 f259c4c1 2021-09-24 stsp err = delete_ref(commit_refname, repo);
7472 f259c4c1 2021-09-24 stsp goto done;
7475 f259c4c1 2021-09-24 stsp free(branch_refname);
7476 f259c4c1 2021-09-24 stsp free(commit_refname);
7477 f259c4c1 2021-09-24 stsp return err;
7480 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg {
7481 f259c4c1 2021-09-24 stsp struct got_worktree *worktree;
7482 f259c4c1 2021-09-24 stsp const char *branch_name;
7485 f259c4c1 2021-09-24 stsp static const struct got_error *
7486 f259c4c1 2021-09-24 stsp merge_commit_msg_cb(struct got_pathlist_head *commitable_paths, char **logmsg,
7487 f259c4c1 2021-09-24 stsp void *arg)
7489 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg *a = arg;
7491 f259c4c1 2021-09-24 stsp if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7492 f259c4c1 2021-09-24 stsp got_worktree_get_head_ref_name(a->worktree)) == -1)
7493 f259c4c1 2021-09-24 stsp return got_error_from_errno("asprintf");
7495 f259c4c1 2021-09-24 stsp return NULL;
7498 f259c4c1 2021-09-24 stsp static const struct got_error *
7499 f259c4c1 2021-09-24 stsp merge_status_cb(void *arg, unsigned char status, unsigned char staged_status,
7500 f259c4c1 2021-09-24 stsp const char *path, struct got_object_id *blob_id,
7501 f259c4c1 2021-09-24 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
7502 f259c4c1 2021-09-24 stsp int dirfd, const char *de_name)
7504 f259c4c1 2021-09-24 stsp return NULL;
7507 f259c4c1 2021-09-24 stsp const struct got_error *
7508 f259c4c1 2021-09-24 stsp got_worktree_merge_branch(struct got_worktree *worktree,
7509 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex,
7510 f259c4c1 2021-09-24 stsp struct got_object_id *yca_commit_id,
7511 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip,
7512 f259c4c1 2021-09-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7513 f259c4c1 2021-09-24 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7515 f259c4c1 2021-09-24 stsp const struct got_error *err;
7516 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7518 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7520 f259c4c1 2021-09-24 stsp goto done;
7522 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7523 f259c4c1 2021-09-24 stsp worktree);
7525 f259c4c1 2021-09-24 stsp goto done;
7527 f259c4c1 2021-09-24 stsp err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7528 f259c4c1 2021-09-24 stsp branch_tip, repo, progress_cb, progress_arg,
7529 f259c4c1 2021-09-24 stsp cancel_cb, cancel_arg);
7531 f259c4c1 2021-09-24 stsp free(fileindex_path);
7532 f259c4c1 2021-09-24 stsp return err;
7535 f259c4c1 2021-09-24 stsp const struct got_error *
7536 f259c4c1 2021-09-24 stsp got_worktree_merge_commit(struct got_object_id **new_commit_id,
7537 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
7538 f259c4c1 2021-09-24 stsp const char *author, const char *committer, int allow_bad_symlinks,
7539 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip, const char *branch_name,
7540 f259c4c1 2021-09-24 stsp struct got_repository *repo)
7542 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL, *sync_err;
7543 f259c4c1 2021-09-24 stsp struct got_pathlist_head commitable_paths;
7544 f259c4c1 2021-09-24 stsp struct collect_commitables_arg cc_arg;
7545 f259c4c1 2021-09-24 stsp struct got_pathlist_entry *pe;
7546 f259c4c1 2021-09-24 stsp struct got_reference *head_ref = NULL;
7547 f259c4c1 2021-09-24 stsp struct got_object_id *head_commit_id = NULL;
7548 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7549 f259c4c1 2021-09-24 stsp struct merge_commit_msg_arg mcm_arg;
7550 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7552 f259c4c1 2021-09-24 stsp *new_commit_id = NULL;
7554 f259c4c1 2021-09-24 stsp TAILQ_INIT(&commitable_paths);
7556 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7558 f259c4c1 2021-09-24 stsp goto done;
7560 f259c4c1 2021-09-24 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7562 f259c4c1 2021-09-24 stsp goto done;
7564 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7566 f259c4c1 2021-09-24 stsp goto done;
7568 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7569 f259c4c1 2021-09-24 stsp &have_staged_files);
7570 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7571 f259c4c1 2021-09-24 stsp goto done;
7572 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7573 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7574 f259c4c1 2021-09-24 stsp goto done;
7577 f259c4c1 2021-09-24 stsp cc_arg.commitable_paths = &commitable_paths;
7578 f259c4c1 2021-09-24 stsp cc_arg.worktree = worktree;
7579 f259c4c1 2021-09-24 stsp cc_arg.fileindex = fileindex;
7580 f259c4c1 2021-09-24 stsp cc_arg.repo = repo;
7581 f259c4c1 2021-09-24 stsp cc_arg.have_staged_files = have_staged_files;
7582 f259c4c1 2021-09-24 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7583 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7584 f259c4c1 2021-09-24 stsp collect_commitables, &cc_arg, NULL, NULL, 0, 0);
7586 f259c4c1 2021-09-24 stsp goto done;
7588 f259c4c1 2021-09-24 stsp if (TAILQ_EMPTY(&commitable_paths)) {
7589 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7590 f259c4c1 2021-09-24 stsp "merge of %s cannot proceed", branch_name);
7591 f259c4c1 2021-09-24 stsp goto done;
7594 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7595 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7596 f259c4c1 2021-09-24 stsp const char *ct_path = ct->in_repo_path;
7598 f259c4c1 2021-09-24 stsp while (ct_path[0] == '/')
7599 f259c4c1 2021-09-24 stsp ct_path++;
7600 f259c4c1 2021-09-24 stsp err = check_out_of_date(ct_path, ct->status,
7601 f259c4c1 2021-09-24 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7602 f259c4c1 2021-09-24 stsp head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7604 f259c4c1 2021-09-24 stsp goto done;
7608 f259c4c1 2021-09-24 stsp mcm_arg.worktree = worktree;
7609 f259c4c1 2021-09-24 stsp mcm_arg.branch_name = branch_name;
7610 f259c4c1 2021-09-24 stsp err = commit_worktree(new_commit_id, &commitable_paths,
7611 f259c4c1 2021-09-24 stsp head_commit_id, branch_tip, worktree, author, committer,
7612 f259c4c1 2021-09-24 stsp merge_commit_msg_cb, &mcm_arg, merge_status_cb, NULL, repo);
7614 f259c4c1 2021-09-24 stsp goto done;
7616 f259c4c1 2021-09-24 stsp err = update_fileindex_after_commit(worktree, &commitable_paths,
7617 f259c4c1 2021-09-24 stsp *new_commit_id, fileindex, have_staged_files);
7618 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7619 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7620 f259c4c1 2021-09-24 stsp err = sync_err;
7622 f259c4c1 2021-09-24 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
7623 f259c4c1 2021-09-24 stsp struct got_commitable *ct = pe->data;
7624 f259c4c1 2021-09-24 stsp free_commitable(ct);
7626 f259c4c1 2021-09-24 stsp got_pathlist_free(&commitable_paths);
7627 f259c4c1 2021-09-24 stsp free(fileindex_path);
7628 f259c4c1 2021-09-24 stsp return err;
7631 f259c4c1 2021-09-24 stsp const struct got_error *
7632 f259c4c1 2021-09-24 stsp got_worktree_merge_complete(struct got_worktree *worktree,
7633 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo)
7635 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7636 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7638 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7640 f259c4c1 2021-09-24 stsp goto done;
7642 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7644 f259c4c1 2021-09-24 stsp goto done;
7645 f259c4c1 2021-09-24 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7646 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7647 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7648 f259c4c1 2021-09-24 stsp err = sync_err;
7650 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7651 f259c4c1 2021-09-24 stsp free(fileindex_path);
7652 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7653 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7654 f259c4c1 2021-09-24 stsp err = unlockerr;
7655 f259c4c1 2021-09-24 stsp return err;
7658 f259c4c1 2021-09-24 stsp const struct got_error *
7659 f259c4c1 2021-09-24 stsp got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7660 f259c4c1 2021-09-24 stsp struct got_repository *repo)
7662 f259c4c1 2021-09-24 stsp const struct got_error *err;
7663 f259c4c1 2021-09-24 stsp char *branch_refname = NULL;
7664 f259c4c1 2021-09-24 stsp struct got_reference *branch_ref = NULL;
7666 f259c4c1 2021-09-24 stsp *in_progress = 0;
7668 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7670 f259c4c1 2021-09-24 stsp return err;
7671 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7672 793fcac3 2021-09-24 stsp free(branch_refname);
7673 f259c4c1 2021-09-24 stsp if (err) {
7674 f259c4c1 2021-09-24 stsp if (err->code != GOT_ERR_NOT_REF)
7675 f259c4c1 2021-09-24 stsp return err;
7677 f259c4c1 2021-09-24 stsp *in_progress = 1;
7679 f259c4c1 2021-09-24 stsp return NULL;
7682 f259c4c1 2021-09-24 stsp const struct got_error *got_worktree_merge_prepare(
7683 f259c4c1 2021-09-24 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
7684 f259c4c1 2021-09-24 stsp struct got_reference *branch, struct got_repository *repo)
7686 f259c4c1 2021-09-24 stsp const struct got_error *err = NULL;
7687 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7688 f259c4c1 2021-09-24 stsp char *branch_refname = NULL, *commit_refname = NULL;
7689 f259c4c1 2021-09-24 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
7690 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL;
7691 f259c4c1 2021-09-24 stsp struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
7692 f259c4c1 2021-09-24 stsp struct check_rebase_ok_arg ok_arg;
7694 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7696 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7698 f259c4c1 2021-09-24 stsp return err;
7700 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7702 f259c4c1 2021-09-24 stsp goto done;
7704 f259c4c1 2021-09-24 stsp /* Preconditions are the same as for rebase. */
7705 f259c4c1 2021-09-24 stsp ok_arg.worktree = worktree;
7706 f259c4c1 2021-09-24 stsp ok_arg.repo = repo;
7707 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7710 f259c4c1 2021-09-24 stsp goto done;
7712 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7714 f259c4c1 2021-09-24 stsp return err;
7716 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7718 f259c4c1 2021-09-24 stsp return err;
7720 f259c4c1 2021-09-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7723 f259c4c1 2021-09-24 stsp goto done;
7725 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
7727 f259c4c1 2021-09-24 stsp goto done;
7729 f259c4c1 2021-09-24 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
7730 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
7731 f259c4c1 2021-09-24 stsp goto done;
7734 f259c4c1 2021-09-24 stsp err = got_ref_resolve(&branch_tip, repo, branch);
7736 f259c4c1 2021-09-24 stsp goto done;
7738 f259c4c1 2021-09-24 stsp err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
7740 f259c4c1 2021-09-24 stsp goto done;
7741 f259c4c1 2021-09-24 stsp err = got_ref_write(branch_ref, repo);
7743 f259c4c1 2021-09-24 stsp goto done;
7745 f259c4c1 2021-09-24 stsp err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
7747 f259c4c1 2021-09-24 stsp goto done;
7748 f259c4c1 2021-09-24 stsp err = got_ref_write(commit_ref, repo);
7750 f259c4c1 2021-09-24 stsp goto done;
7753 f259c4c1 2021-09-24 stsp free(branch_refname);
7754 f259c4c1 2021-09-24 stsp free(commit_refname);
7755 f259c4c1 2021-09-24 stsp free(fileindex_path);
7756 f259c4c1 2021-09-24 stsp if (branch_ref)
7757 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7758 f259c4c1 2021-09-24 stsp if (commit_ref)
7759 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7760 f259c4c1 2021-09-24 stsp if (wt_branch)
7761 f259c4c1 2021-09-24 stsp got_ref_close(wt_branch);
7762 f259c4c1 2021-09-24 stsp free(wt_branch_tip);
7763 f259c4c1 2021-09-24 stsp if (err) {
7764 f259c4c1 2021-09-24 stsp if (*fileindex) {
7765 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7766 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7768 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7770 f259c4c1 2021-09-24 stsp return err;
7773 f259c4c1 2021-09-24 stsp const struct got_error *
7774 f259c4c1 2021-09-24 stsp got_worktree_merge_continue(char **branch_name,
7775 f259c4c1 2021-09-24 stsp struct got_object_id **branch_tip, struct got_fileindex **fileindex,
7776 f259c4c1 2021-09-24 stsp struct got_worktree *worktree, struct got_repository *repo)
7778 f259c4c1 2021-09-24 stsp const struct got_error *err;
7779 f259c4c1 2021-09-24 stsp char *commit_refname = NULL, *branch_refname = NULL;
7780 f259c4c1 2021-09-24 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
7781 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7782 f259c4c1 2021-09-24 stsp int have_staged_files = 0;
7784 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7785 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7786 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7788 f259c4c1 2021-09-24 stsp err = lock_worktree(worktree, LOCK_EX);
7790 f259c4c1 2021-09-24 stsp return err;
7792 f259c4c1 2021-09-24 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7794 f259c4c1 2021-09-24 stsp goto done;
7796 f259c4c1 2021-09-24 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7797 f259c4c1 2021-09-24 stsp &have_staged_files);
7798 f259c4c1 2021-09-24 stsp if (err && err->code != GOT_ERR_CANCELLED)
7799 f259c4c1 2021-09-24 stsp goto done;
7800 f259c4c1 2021-09-24 stsp if (have_staged_files) {
7801 f259c4c1 2021-09-24 stsp err = got_error(GOT_ERR_STAGED_PATHS);
7802 f259c4c1 2021-09-24 stsp goto done;
7805 f259c4c1 2021-09-24 stsp err = get_merge_branch_ref_name(&branch_refname, worktree);
7807 f259c4c1 2021-09-24 stsp goto done;
7809 f259c4c1 2021-09-24 stsp err = get_merge_commit_ref_name(&commit_refname, worktree);
7811 f259c4c1 2021-09-24 stsp goto done;
7813 f259c4c1 2021-09-24 stsp err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7815 f259c4c1 2021-09-24 stsp goto done;
7817 f259c4c1 2021-09-24 stsp if (!got_ref_is_symbolic(branch_ref)) {
7818 f259c4c1 2021-09-24 stsp err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
7819 f259c4c1 2021-09-24 stsp "%s is not a symbolic reference",
7820 f259c4c1 2021-09-24 stsp got_ref_get_name(branch_ref));
7821 f259c4c1 2021-09-24 stsp goto done;
7823 f259c4c1 2021-09-24 stsp *branch_name = strdup(got_ref_get_symref_target(branch_ref));
7824 f259c4c1 2021-09-24 stsp if (*branch_name == NULL) {
7825 f259c4c1 2021-09-24 stsp err = got_error_from_errno("strdup");
7826 f259c4c1 2021-09-24 stsp goto done;
7829 f259c4c1 2021-09-24 stsp err = got_ref_open(&commit_ref, repo, commit_refname, 0);
7831 f259c4c1 2021-09-24 stsp goto done;
7833 f259c4c1 2021-09-24 stsp err = got_ref_resolve(branch_tip, repo, commit_ref);
7835 f259c4c1 2021-09-24 stsp goto done;
7837 f259c4c1 2021-09-24 stsp free(commit_refname);
7838 f259c4c1 2021-09-24 stsp free(branch_refname);
7839 f259c4c1 2021-09-24 stsp free(fileindex_path);
7840 f259c4c1 2021-09-24 stsp if (commit_ref)
7841 f259c4c1 2021-09-24 stsp got_ref_close(commit_ref);
7842 f259c4c1 2021-09-24 stsp if (branch_ref)
7843 f259c4c1 2021-09-24 stsp got_ref_close(branch_ref);
7844 f259c4c1 2021-09-24 stsp if (err) {
7845 f259c4c1 2021-09-24 stsp if (*branch_name) {
7846 f259c4c1 2021-09-24 stsp free(*branch_name);
7847 f259c4c1 2021-09-24 stsp *branch_name = NULL;
7849 f259c4c1 2021-09-24 stsp free(*branch_tip);
7850 f259c4c1 2021-09-24 stsp *branch_tip = NULL;
7851 f259c4c1 2021-09-24 stsp if (*fileindex) {
7852 f259c4c1 2021-09-24 stsp got_fileindex_free(*fileindex);
7853 f259c4c1 2021-09-24 stsp *fileindex = NULL;
7855 f259c4c1 2021-09-24 stsp lock_worktree(worktree, LOCK_SH);
7857 f259c4c1 2021-09-24 stsp return err;
7860 f259c4c1 2021-09-24 stsp const struct got_error *
7861 f259c4c1 2021-09-24 stsp got_worktree_merge_abort(struct got_worktree *worktree,
7862 f259c4c1 2021-09-24 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7863 f259c4c1 2021-09-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7865 f259c4c1 2021-09-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7866 f259c4c1 2021-09-24 stsp struct got_object_id *commit_id = NULL;
7867 f259c4c1 2021-09-24 stsp char *fileindex_path = NULL;
7868 f259c4c1 2021-09-24 stsp struct revert_file_args rfa;
7869 f259c4c1 2021-09-24 stsp struct got_object_id *tree_id = NULL;
7871 f259c4c1 2021-09-24 stsp err = got_object_id_by_path(&tree_id, repo,
7872 f259c4c1 2021-09-24 stsp worktree->base_commit_id, worktree->path_prefix);
7874 f259c4c1 2021-09-24 stsp goto done;
7876 f259c4c1 2021-09-24 stsp err = delete_merge_refs(worktree, repo);
7878 f259c4c1 2021-09-24 stsp goto done;
7880 f259c4c1 2021-09-24 stsp err = get_fileindex_path(&fileindex_path, worktree);
7882 f259c4c1 2021-09-24 stsp goto done;
7884 f259c4c1 2021-09-24 stsp rfa.worktree = worktree;
7885 f259c4c1 2021-09-24 stsp rfa.fileindex = fileindex;
7886 f259c4c1 2021-09-24 stsp rfa.progress_cb = progress_cb;
7887 f259c4c1 2021-09-24 stsp rfa.progress_arg = progress_arg;
7888 f259c4c1 2021-09-24 stsp rfa.patch_cb = NULL;
7889 f259c4c1 2021-09-24 stsp rfa.patch_arg = NULL;
7890 f259c4c1 2021-09-24 stsp rfa.repo = repo;
7891 f259c4c1 2021-09-24 stsp rfa.unlink_added_files = 1;
7892 f259c4c1 2021-09-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7893 f259c4c1 2021-09-24 stsp revert_file, &rfa, NULL, NULL, 0, 0);
7895 f259c4c1 2021-09-24 stsp goto sync;
7897 f259c4c1 2021-09-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7898 f259c4c1 2021-09-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7900 f259c4c1 2021-09-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7901 f259c4c1 2021-09-24 stsp if (sync_err && err == NULL)
7902 f259c4c1 2021-09-24 stsp err = sync_err;
7904 f259c4c1 2021-09-24 stsp free(tree_id);
7905 f259c4c1 2021-09-24 stsp free(commit_id);
7906 f259c4c1 2021-09-24 stsp if (fileindex)
7907 f259c4c1 2021-09-24 stsp got_fileindex_free(fileindex);
7908 f259c4c1 2021-09-24 stsp free(fileindex_path);
7910 f259c4c1 2021-09-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7911 f259c4c1 2021-09-24 stsp if (unlockerr && err == NULL)
7912 f259c4c1 2021-09-24 stsp err = unlockerr;
7913 f259c4c1 2021-09-24 stsp return err;
7916 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7917 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7918 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7919 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7920 2db2652d 2019-08-07 stsp struct got_repository *repo;
7921 2db2652d 2019-08-07 stsp int have_changes;
7924 2db2652d 2019-08-07 stsp const struct got_error *
7925 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7926 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7927 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7928 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7930 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7931 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7932 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7933 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7934 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7935 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7937 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7938 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7939 8b13ce36 2019-08-08 stsp return NULL;
7940 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7941 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7943 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7944 735ef5ac 2019-08-03 stsp if (ie == NULL)
7945 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7947 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7948 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7949 735ef5ac 2019-08-03 stsp relpath) == -1)
7950 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7952 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7953 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7954 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7955 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7958 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7959 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7960 3aa5969e 2019-08-06 stsp goto done;
7961 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7962 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7963 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7964 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7965 735ef5ac 2019-08-03 stsp goto done;
7968 2db2652d 2019-08-07 stsp a->have_changes = 1;
7970 735ef5ac 2019-08-03 stsp p = in_repo_path;
7971 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7973 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7974 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7975 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7977 735ef5ac 2019-08-03 stsp free(in_repo_path);
7978 dc424a06 2019-08-07 stsp return err;
7981 2db2652d 2019-08-07 stsp struct stage_path_arg {
7982 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7983 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7984 2db2652d 2019-08-07 stsp struct got_repository *repo;
7985 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7986 2db2652d 2019-08-07 stsp void *status_arg;
7987 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7988 2db2652d 2019-08-07 stsp void *patch_arg;
7989 7b5dc508 2019-10-28 stsp int staged_something;
7990 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7993 2db2652d 2019-08-07 stsp static const struct got_error *
7994 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7995 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7996 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7997 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7999 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
8000 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
8001 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
8002 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
8003 0cb83759 2019-08-03 stsp uint32_t stage;
8004 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
8005 0aeb8099 2020-07-23 stsp struct stat sb;
8007 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
8008 8b13ce36 2019-08-08 stsp return NULL;
8010 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8011 d3e7c587 2019-08-03 stsp if (ie == NULL)
8012 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8014 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8015 2db2652d 2019-08-07 stsp relpath)== -1)
8016 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
8018 0cb83759 2019-08-03 stsp switch (status) {
8019 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
8020 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
8021 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
8022 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
8023 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
8026 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8027 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
8028 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8029 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8030 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
8033 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
8036 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
8037 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
8038 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
8039 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
8040 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
8044 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
8045 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
8048 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8049 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
8050 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8051 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
8053 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
8054 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8055 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
8056 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
8057 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
8058 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
8059 35213c7c 2020-07-23 stsp ssize_t target_len;
8060 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
8061 35213c7c 2020-07-23 stsp sizeof(target_path));
8062 35213c7c 2020-07-23 stsp if (target_len == -1) {
8063 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
8064 35213c7c 2020-07-23 stsp ondisk_path);
8067 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
8068 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
8069 35213c7c 2020-07-23 stsp a->worktree->root_path);
8072 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
8073 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
8074 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
8078 35213c7c 2020-07-23 stsp if (is_bad_symlink)
8079 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8080 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
8082 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8083 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
8085 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
8086 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
8088 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8089 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8091 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8092 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
8093 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
8095 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
8096 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
8098 2db2652d 2019-08-07 stsp if (a->patch_cb) {
8099 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
8100 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
8101 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
8104 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8106 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8107 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8111 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
8112 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
8113 7b5dc508 2019-10-28 stsp a->staged_something = 1;
8114 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
8116 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8117 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8120 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
8122 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
8123 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8125 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
8126 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
8129 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8133 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
8134 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
8135 dc424a06 2019-08-07 stsp free(path_content);
8136 2db2652d 2019-08-07 stsp free(ondisk_path);
8137 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
8138 0ebf8283 2019-07-24 stsp return err;
8141 0cb83759 2019-08-03 stsp const struct got_error *
8142 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
8143 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
8144 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
8145 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8146 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
8148 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8149 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
8150 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8151 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
8152 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
8153 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
8154 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
8155 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
8157 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8159 0cb83759 2019-08-03 stsp return err;
8161 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
8162 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
8164 735ef5ac 2019-08-03 stsp goto done;
8165 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
8167 735ef5ac 2019-08-03 stsp goto done;
8168 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8170 0cb83759 2019-08-03 stsp goto done;
8172 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
8173 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
8174 2db2652d 2019-08-07 stsp oka.worktree = worktree;
8175 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
8176 2db2652d 2019-08-07 stsp oka.repo = repo;
8177 2db2652d 2019-08-07 stsp oka.have_changes = 0;
8178 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8179 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8180 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
8182 735ef5ac 2019-08-03 stsp goto done;
8184 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
8185 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8186 2db2652d 2019-08-07 stsp goto done;
8189 2db2652d 2019-08-07 stsp spa.worktree = worktree;
8190 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
8191 2db2652d 2019-08-07 stsp spa.repo = repo;
8192 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
8193 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
8194 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
8195 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
8196 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
8197 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
8198 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8199 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8200 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
8202 2db2652d 2019-08-07 stsp goto done;
8204 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
8205 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8206 7b5dc508 2019-10-28 stsp goto done;
8209 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8210 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
8211 0cb83759 2019-08-03 stsp err = sync_err;
8213 735ef5ac 2019-08-03 stsp if (head_ref)
8214 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
8215 735ef5ac 2019-08-03 stsp free(head_commit_id);
8216 0cb83759 2019-08-03 stsp free(fileindex_path);
8217 0cb83759 2019-08-03 stsp if (fileindex)
8218 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
8219 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8220 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
8221 0cb83759 2019-08-03 stsp err = unlockerr;
8222 0cb83759 2019-08-03 stsp return err;
8225 ad493afc 2019-08-03 stsp struct unstage_path_arg {
8226 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
8227 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
8228 ad493afc 2019-08-03 stsp struct got_repository *repo;
8229 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
8230 ad493afc 2019-08-03 stsp void *progress_arg;
8231 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
8232 2e1f37b0 2019-08-08 stsp void *patch_arg;
8235 2e1f37b0 2019-08-08 stsp static const struct got_error *
8236 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
8237 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
8238 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
8239 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
8240 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
8242 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
8243 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
8244 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8245 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8246 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
8247 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8248 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8250 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8251 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8253 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
8255 2e1f37b0 2019-08-08 stsp return err;
8256 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
8258 2e1f37b0 2019-08-08 stsp goto done;
8260 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
8262 2e1f37b0 2019-08-08 stsp goto done;
8264 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8266 2e1f37b0 2019-08-08 stsp goto done;
8268 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
8270 2e1f37b0 2019-08-08 stsp goto done;
8272 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
8274 2e1f37b0 2019-08-08 stsp goto done;
8276 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8278 2e1f37b0 2019-08-08 stsp goto done;
8280 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
8281 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
8283 2e1f37b0 2019-08-08 stsp goto done;
8285 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
8286 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
8288 2e1f37b0 2019-08-08 stsp goto done;
8289 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
8290 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
8292 2e1f37b0 2019-08-08 stsp goto done;
8294 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
8295 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
8296 2e1f37b0 2019-08-08 stsp goto done;
8298 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
8299 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
8300 2e1f37b0 2019-08-08 stsp goto done;
8302 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
8303 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8304 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
8305 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
8306 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
8307 fe621944 2020-11-10 stsp nchanges++;
8309 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8310 2e1f37b0 2019-08-08 stsp int choice;
8311 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
8312 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
8313 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
8314 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8316 2e1f37b0 2019-08-08 stsp goto done;
8317 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
8318 2e1f37b0 2019-08-08 stsp have_content = 1;
8320 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
8321 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
8324 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
8325 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8326 f1e81a05 2019-08-10 stsp outfile, rejectfile);
8328 2e1f37b0 2019-08-08 stsp free(label1);
8330 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
8331 2e1f37b0 2019-08-08 stsp if (staged_blob)
8332 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
8333 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
8334 fe621944 2020-11-10 stsp if (free_err && err == NULL)
8335 fe621944 2020-11-10 stsp err = free_err;
8336 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
8337 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
8338 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
8339 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
8340 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
8341 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
8342 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8343 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
8344 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
8345 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
8346 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
8347 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
8348 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
8349 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
8350 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
8351 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8352 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
8353 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
8354 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
8356 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
8357 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
8358 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
8359 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
8360 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
8361 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
8362 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
8364 2e1f37b0 2019-08-08 stsp free(path1);
8365 2e1f37b0 2019-08-08 stsp free(path2);
8366 fda8017d 2020-07-23 stsp return err;
8369 fda8017d 2020-07-23 stsp static const struct got_error *
8370 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
8371 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
8372 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8373 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
8374 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
8375 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8376 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
8378 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
8379 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
8380 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
8381 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
8382 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
8383 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
8384 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8385 fda8017d 2020-07-23 stsp struct stat sb;
8387 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
8388 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
8389 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
8391 fda8017d 2020-07-23 stsp return err;
8393 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
8394 fda8017d 2020-07-23 stsp return NULL;
8396 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
8397 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
8398 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
8400 fda8017d 2020-07-23 stsp goto done;
8403 fda8017d 2020-07-23 stsp f = fopen(path_unstaged_content, "r");
8404 fda8017d 2020-07-23 stsp if (f == NULL) {
8405 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
8406 fda8017d 2020-07-23 stsp path_unstaged_content);
8407 fda8017d 2020-07-23 stsp goto done;
8409 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
8410 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
8411 fda8017d 2020-07-23 stsp goto done;
8413 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
8414 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8415 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
8417 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
8418 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
8419 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
8420 fda8017d 2020-07-23 stsp goto done;
8422 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
8423 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
8424 fda8017d 2020-07-23 stsp goto done;
8426 fda8017d 2020-07-23 stsp link_target[r] = '\0';
8427 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
8428 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
8429 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
8430 fda8017d 2020-07-23 stsp progress_arg);
8432 fda8017d 2020-07-23 stsp int local_changes_subsumed;
8434 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
8436 67a66647 2021-05-31 stsp return err;
8438 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8439 67a66647 2021-05-31 stsp parent) == -1) {
8440 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
8441 67a66647 2021-05-31 stsp base_path = NULL;
8442 67a66647 2021-05-31 stsp goto done;
8445 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
8447 67a66647 2021-05-31 stsp goto done;
8448 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8449 67a66647 2021-05-31 stsp blob_base);
8451 67a66647 2021-05-31 stsp goto done;
8454 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
8455 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
8457 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8458 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
8459 eec2f5a9 2021-06-03 stsp ondisk_path);
8461 eec2f5a9 2021-06-03 stsp goto done;
8464 eec2f5a9 2021-06-03 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
8465 eec2f5a9 2021-06-03 stsp if (fd == -1) {
8466 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
8467 eec2f5a9 2021-06-03 stsp goto done;
8469 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
8470 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
8471 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
8472 eec2f5a9 2021-06-03 stsp close(fd);
8473 eec2f5a9 2021-06-03 stsp goto done;
8477 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
8478 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
8479 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
8480 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8481 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
8484 fda8017d 2020-07-23 stsp goto done;
8486 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
8487 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8488 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
8490 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8491 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8494 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
8495 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
8496 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
8497 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
8498 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
8499 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
8500 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
8501 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8502 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
8503 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
8504 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8505 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
8506 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
8507 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8508 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
8509 fda8017d 2020-07-23 stsp free(path_unstaged_content);
8510 fda8017d 2020-07-23 stsp free(path_new_staged_content);
8511 67a66647 2021-05-31 stsp free(blob_base_path);
8512 67a66647 2021-05-31 stsp free(parent);
8513 67a66647 2021-05-31 stsp free(base_path);
8514 2e1f37b0 2019-08-08 stsp return err;
8517 ad493afc 2019-08-03 stsp static const struct got_error *
8518 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
8519 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
8520 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8521 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
8523 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
8524 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
8525 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
8526 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8527 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
8528 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
8529 ad493afc 2019-08-03 stsp int local_changes_subsumed;
8530 9bc94a15 2019-08-03 stsp struct stat sb;
8532 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
8533 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
8534 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
8535 2e1f37b0 2019-08-08 stsp return NULL;
8537 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8538 ad493afc 2019-08-03 stsp if (ie == NULL)
8539 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8541 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8543 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
8545 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
8546 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
8548 f69721c3 2019-10-21 stsp goto done;
8549 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8550 f69721c3 2019-10-21 stsp id_str) == -1) {
8551 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
8552 f69721c3 2019-10-21 stsp goto done;
8555 ad493afc 2019-08-03 stsp switch (staged_status) {
8556 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
8557 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
8558 ad493afc 2019-08-03 stsp blob_id, 8192);
8561 ad493afc 2019-08-03 stsp /* fall through */
8562 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
8563 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8564 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
8565 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8566 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8567 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8570 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
8573 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
8574 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
8575 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
8576 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
8577 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
8578 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
8581 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
8582 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
8585 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
8586 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
8587 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
8588 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
8589 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
8590 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
8591 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
8592 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8593 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8595 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8596 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8597 36bf999c 2020-07-23 stsp char *staged_target;
8598 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8599 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8601 36bf999c 2020-07-23 stsp goto done;
8602 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8603 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8604 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8605 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8606 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8607 36bf999c 2020-07-23 stsp free(staged_target);
8609 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8610 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8611 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8612 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8613 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8614 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8615 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8619 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8622 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8623 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8624 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8625 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8628 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8629 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8630 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8631 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8632 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8635 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8637 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8638 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8642 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8643 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8644 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8645 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8648 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8652 ad493afc 2019-08-03 stsp free(ondisk_path);
8653 ad493afc 2019-08-03 stsp if (blob_base)
8654 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8655 ad493afc 2019-08-03 stsp if (blob_staged)
8656 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8657 f69721c3 2019-10-21 stsp free(id_str);
8658 f69721c3 2019-10-21 stsp free(label_orig);
8659 ad493afc 2019-08-03 stsp return err;
8662 ad493afc 2019-08-03 stsp const struct got_error *
8663 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8664 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8665 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8666 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8667 ad493afc 2019-08-03 stsp struct got_repository *repo)
8669 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8670 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8671 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8672 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8673 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8675 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8677 ad493afc 2019-08-03 stsp return err;
8679 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8681 ad493afc 2019-08-03 stsp goto done;
8683 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8684 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8685 ad493afc 2019-08-03 stsp upa.repo = repo;
8686 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8687 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8688 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8689 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8690 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8691 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8692 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
8694 ad493afc 2019-08-03 stsp goto done;
8697 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8698 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8699 ad493afc 2019-08-03 stsp err = sync_err;
8701 ad493afc 2019-08-03 stsp free(fileindex_path);
8702 ad493afc 2019-08-03 stsp if (fileindex)
8703 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8704 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8705 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8706 ad493afc 2019-08-03 stsp err = unlockerr;
8707 ad493afc 2019-08-03 stsp return err;
8710 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8711 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8712 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8713 b2118c49 2020-07-28 stsp void *info_arg;
8714 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8715 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8716 b2118c49 2020-07-28 stsp void *cancel_arg;
8719 b2118c49 2020-07-28 stsp static const struct got_error *
8720 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8722 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8723 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8724 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8725 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8726 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8727 b2118c49 2020-07-28 stsp int stage;
8729 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8730 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8732 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8733 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8734 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8737 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8738 b2118c49 2020-07-28 stsp return NULL;
8740 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8741 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8742 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8744 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8745 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8746 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8747 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8748 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8749 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8752 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8753 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8754 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8757 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8758 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8761 b2118c49 2020-07-28 stsp const struct got_error *
8762 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8763 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8764 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8765 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8768 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8769 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8770 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8771 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8773 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8775 b2118c49 2020-07-28 stsp return err;
8777 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8779 b2118c49 2020-07-28 stsp goto done;
8781 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8782 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8783 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8784 b2118c49 2020-07-28 stsp arg.paths = paths;
8785 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8786 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8787 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8790 b2118c49 2020-07-28 stsp free(fileindex_path);
8791 b2118c49 2020-07-28 stsp if (fileindex)
8792 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8793 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8794 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8795 b2118c49 2020-07-28 stsp err = unlockerr;
8796 b2118c49 2020-07-28 stsp return err;
