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 2021-01-02 naddy char *line = NULL;
1635 9bdd68dd 2021-01-02 naddy size_t linesize = 0;
1636 9bdd68dd 2021-01-02 naddy ssize_t linelen;
1638 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1639 9bdd68dd 2021-01-02 naddy linelen = getline(&line, &linesize, f);
1640 9bdd68dd 2021-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 2021-01-02 naddy free(line);
1657 7154f6ce 2019-03-27 stsp return err;
1660 e2b1e152 2019-07-13 stsp static int
1661 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1663 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1664 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1667 1ebedb77 2019-10-19 stsp static int
1668 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1670 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1671 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1672 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1673 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1674 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1675 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1678 c363b2c1 2019-08-03 stsp static unsigned char
1679 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1681 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1682 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1683 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1684 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1685 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1686 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1687 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1689 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1693 a919d5c4 2020-07-23 stsp static const struct got_error *
1694 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1695 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1696 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1698 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1699 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1700 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1701 a919d5c4 2020-07-23 stsp ssize_t elen;
1702 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1703 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1704 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1706 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1708 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1710 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1712 a919d5c4 2020-07-23 stsp return err;
1713 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1715 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1716 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1718 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1720 a919d5c4 2020-07-23 stsp if (len > 0) {
1721 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1722 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1723 a919d5c4 2020-07-23 stsp len - hdrlen);
1724 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1725 a919d5c4 2020-07-23 stsp hdrlen = 0;
1727 a919d5c4 2020-07-23 stsp } while (len != 0);
1728 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1730 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1731 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1732 a919d5c4 2020-07-23 stsp if (elen == -1)
1733 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1735 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1736 a919d5c4 2020-07-23 stsp if (elen == -1)
1737 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1740 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1741 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1743 a919d5c4 2020-07-23 stsp return NULL;
1746 7154f6ce 2019-03-27 stsp static const struct got_error *
1747 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1748 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1749 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1751 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1752 6353ad76 2019-02-08 stsp struct got_object_id id;
1753 6353ad76 2019-02-08 stsp size_t hdrlen;
1754 1338848f 2019-12-13 stsp int fd = -1;
1755 6353ad76 2019-02-08 stsp FILE *f = NULL;
1756 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1757 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1758 6353ad76 2019-02-08 stsp size_t flen, blen;
1759 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1761 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1762 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1765 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1766 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1767 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1769 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1770 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1771 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1772 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1773 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1775 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1776 882ef1b9 2019-12-13 stsp goto done;
1778 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1779 3d35a492 2019-12-13 stsp goto done;
1782 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1783 a919d5c4 2020-07-23 stsp if (fd == -1 && errno != ENOENT && errno != ELOOP)
1784 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1785 a919d5c4 2020-07-23 stsp else if (fd == -1 && errno == ELOOP) {
1786 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1787 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1788 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1789 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1790 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1791 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1793 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1794 3d35a492 2019-12-13 stsp goto done;
1796 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1797 1338848f 2019-12-13 stsp goto done;
1801 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1802 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1803 1338848f 2019-12-13 stsp goto done;
1806 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1807 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1808 1338848f 2019-12-13 stsp goto done;
1809 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1810 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1811 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1812 1338848f 2019-12-13 stsp goto done;
1815 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1816 f179e66d 2020-07-23 stsp goto done;
1818 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1819 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1820 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1821 1338848f 2019-12-13 stsp goto done;
1824 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1825 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1826 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1828 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1830 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1832 1338848f 2019-12-13 stsp goto done;
1834 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1835 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1836 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1837 a919d5c4 2020-07-23 stsp goto done;
1840 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1841 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1842 ab0d4361 2019-12-13 stsp if (fd == -1) {
1843 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1844 ab0d4361 2019-12-13 stsp goto done;
1848 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1849 6353ad76 2019-02-08 stsp if (f == NULL) {
1850 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1851 6353ad76 2019-02-08 stsp goto done;
1854 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1856 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1857 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1859 7154f6ce 2019-03-27 stsp goto done;
1860 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1861 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1862 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1863 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1864 7154f6ce 2019-03-27 stsp goto done;
1866 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1867 6353ad76 2019-02-08 stsp if (flen != 0)
1868 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1870 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1871 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1872 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1874 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1875 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1876 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1877 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1881 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1884 6353ad76 2019-02-08 stsp hdrlen = 0;
1887 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1888 7154f6ce 2019-03-27 stsp rewind(f);
1889 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1890 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1891 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1894 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1895 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1896 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1897 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1898 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1899 9d31a1d8 2018-03-11 stsp return err;
1903 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1904 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1906 e2b1e152 2019-07-13 stsp static const struct got_error *
1907 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1908 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1910 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1911 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1912 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1914 e2b1e152 2019-07-13 stsp return NULL;
1917 9d31a1d8 2018-03-11 stsp static const struct got_error *
1918 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1919 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1920 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1921 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1922 0584f854 2019-04-06 stsp void *progress_arg)
1924 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1925 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1926 6353ad76 2019-02-08 stsp char *ondisk_path;
1927 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1928 b8f41171 2019-02-10 stsp struct stat sb;
1930 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1931 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1934 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1935 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1936 a76c42e6 2019-08-03 stsp goto done;
1938 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1941 abb4604f 2019-07-27 stsp goto done;
1942 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1943 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1945 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1946 c90c8ce3 2020-07-23 stsp status = GOT_STATUS_UNVERSIONED;
1949 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1950 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1951 b8f41171 2019-02-10 stsp goto done;
1953 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1954 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1956 5036ab18 2020-04-18 stsp goto done;
1959 c6e8a826 2021-04-05 stsp if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1960 c6e8a826 2021-04-05 stsp (S_ISLNK(te->mode) ||
1961 c6e8a826 2021-04-05 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1963 c6e8a826 2021-04-05 stsp * This is a regular file or an installed bad symlink.
1964 c6e8a826 2021-04-05 stsp * If the file index indicates that this file is already
1965 c6e8a826 2021-04-05 stsp * up-to-date with respect to the repository we can skip
1966 c6e8a826 2021-04-05 stsp * updating contents of this file.
1968 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1969 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1970 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1971 c6e8a826 2021-04-05 stsp /* Same commit. */
1972 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1973 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1975 e2b1e152 2019-07-13 stsp goto done;
1976 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1978 6353ad76 2019-02-08 stsp goto done;
1980 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1981 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1982 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1983 c6e8a826 2021-04-05 stsp /* Different commit but the same blob. */
1984 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1985 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1987 0f58026f 2021-04-05 stsp goto done;
1988 0f58026f 2021-04-05 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1990 b8f41171 2019-02-10 stsp goto done;
1994 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1996 6353ad76 2019-02-08 stsp goto done;
1998 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1999 234035bc 2019-06-01 stsp int update_timestamps;
2000 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
2001 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2002 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
2003 234035bc 2019-06-01 stsp struct got_object_id id2;
2004 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2005 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
2007 f69721c3 2019-10-21 stsp goto done;
2009 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
2010 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
2011 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
2012 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
2013 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
2014 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
2015 f69721c3 2019-10-21 stsp goto done;
2017 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2018 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2019 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2020 234035bc 2019-06-01 stsp goto done;
2023 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
2024 36bf999c 2020-07-23 stsp char *link_target;
2025 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
2027 36bf999c 2020-07-23 stsp goto done;
2028 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
2029 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
2030 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
2031 36bf999c 2020-07-23 stsp free(link_target);
2033 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
2034 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
2035 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
2036 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
2038 f69721c3 2019-10-21 stsp free(label_orig);
2039 234035bc 2019-06-01 stsp if (blob2)
2040 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
2042 909d120e 2019-09-22 stsp goto done;
2044 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
2045 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
2046 234035bc 2019-06-01 stsp * unmodified files again.
2048 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2049 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
2050 234035bc 2019-06-01 stsp update_timestamps);
2051 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
2052 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2053 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2054 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
2055 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
2057 1ee397ad 2019-07-12 stsp goto done;
2058 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2059 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2061 13d9040b 2019-03-27 stsp goto done;
2063 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2064 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
2065 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
2066 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
2067 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
2068 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2069 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2071 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2072 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2073 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2074 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2075 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2078 13d9040b 2019-03-27 stsp goto done;
2081 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2082 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
2083 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2085 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2086 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2087 054041d0 2020-06-24 stsp &blob->id);
2090 13d9040b 2019-03-27 stsp goto done;
2092 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2093 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2094 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2097 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2099 6353ad76 2019-02-08 stsp free(ondisk_path);
2100 8da9e5f4 2019-01-12 stsp return err;
2103 90285c3b 2019-01-08 stsp static const struct got_error *
2104 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2106 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2107 1c4cdd89 2021-06-20 stsp char *ondisk_path = NULL, *parent = NULL;
2109 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2110 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2112 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2113 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2114 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2116 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2117 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2119 1c4cdd89 2021-06-20 stsp goto done;
2120 1c4cdd89 2021-06-20 stsp while (got_path_cmp(parent, root_path,
2121 1c4cdd89 2021-06-20 stsp strlen(parent), root_len) != 0) {
2122 fddefe3b 2020-10-20 stsp free(ondisk_path);
2123 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2124 1c4cdd89 2021-06-20 stsp parent = NULL;
2125 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2126 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2127 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2128 fddefe3b 2020-10-20 stsp ondisk_path);
2131 1c4cdd89 2021-06-20 stsp err = got_path_dirname(&parent, ondisk_path);
2137 90285c3b 2019-01-08 stsp free(ondisk_path);
2138 1c4cdd89 2021-06-20 stsp free(parent);
2139 90285c3b 2019-01-08 stsp return err;
2142 708d8e67 2019-03-27 stsp static const struct got_error *
2143 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2144 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2145 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2147 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2148 708d8e67 2019-03-27 stsp unsigned char status;
2149 708d8e67 2019-03-27 stsp struct stat sb;
2150 708d8e67 2019-03-27 stsp char *ondisk_path;
2152 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2153 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2155 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2157 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2159 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2161 5a58a424 2020-06-23 stsp goto done;
2163 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2164 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2165 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2166 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2167 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2168 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2169 993e2a1b 2020-07-23 stsp goto done;
2171 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2172 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2173 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2174 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2176 993e2a1b 2020-07-23 stsp goto done;
2177 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2178 993e2a1b 2020-07-23 stsp ie->path);
2179 993e2a1b 2020-07-23 stsp goto done;
2182 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2183 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2184 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2186 5a58a424 2020-06-23 stsp goto done;
2188 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2189 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2191 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2192 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2194 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2196 5a58a424 2020-06-23 stsp goto done;
2197 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2198 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2200 5a58a424 2020-06-23 stsp goto done;
2202 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2205 5a58a424 2020-06-23 stsp free(ondisk_path);
2206 fc6346c4 2019-03-27 stsp return err;
2209 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2210 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2211 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2212 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2213 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2214 8da9e5f4 2019-01-12 stsp void *progress_arg;
2215 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2216 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2219 512f0d0e 2019-01-02 stsp static const struct got_error *
2220 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2221 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2223 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2225 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2226 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2228 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2229 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2232 8da9e5f4 2019-01-12 stsp static const struct got_error *
2233 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2235 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2237 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2238 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2240 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2241 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2244 9d31a1d8 2018-03-11 stsp static const struct got_error *
2245 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2247 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2248 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2249 8da9e5f4 2019-01-12 stsp char *path;
2251 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2252 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2254 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2255 63c5ca5d 2019-08-24 stsp return NULL;
2257 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2258 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2260 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2262 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2263 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2265 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2266 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2268 8da9e5f4 2019-01-12 stsp free(path);
2269 0cd1c46a 2019-03-11 stsp return err;
2272 b2118c49 2020-07-28 stsp const struct got_error *
2273 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2275 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2277 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2278 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2279 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2280 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2283 b2118c49 2020-07-28 stsp return NULL;
2286 818c7501 2019-07-11 stsp static const struct got_error *
2287 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2289 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2290 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2292 517bab73 2019-03-11 stsp *refname = NULL;
2294 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2296 b2118c49 2020-07-28 stsp return err;
2298 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2299 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2300 0647c563 2019-03-11 stsp *refname = NULL;
2302 517bab73 2019-03-11 stsp free(uuidstr);
2303 517bab73 2019-03-11 stsp return err;
2306 818c7501 2019-07-11 stsp const struct got_error *
2307 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2309 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2312 818c7501 2019-07-11 stsp static const struct got_error *
2313 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2315 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2316 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2319 818c7501 2019-07-11 stsp static const struct got_error *
2320 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2322 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2325 818c7501 2019-07-11 stsp static const struct got_error *
2326 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2328 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2329 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2332 818c7501 2019-07-11 stsp static const struct got_error *
2333 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2335 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2336 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2339 0ebf8283 2019-07-24 stsp static const struct got_error *
2340 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2342 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2343 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2346 0ebf8283 2019-07-24 stsp static const struct got_error *
2347 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2349 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2350 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2353 0ebf8283 2019-07-24 stsp static const struct got_error *
2354 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2356 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2357 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2360 0ebf8283 2019-07-24 stsp static const struct got_error *
2361 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2363 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2364 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2367 0ebf8283 2019-07-24 stsp const struct got_error *
2368 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2369 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2371 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2372 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2373 0ebf8283 2019-07-24 stsp *path = NULL;
2374 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2376 0ebf8283 2019-07-24 stsp return NULL;
2380 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2381 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2383 517bab73 2019-03-11 stsp static const struct got_error *
2384 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2386 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2387 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2388 517bab73 2019-03-11 stsp char *refname;
2390 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2392 517bab73 2019-03-11 stsp return err;
2394 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2396 0cd1c46a 2019-03-11 stsp goto done;
2398 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2400 0cd1c46a 2019-03-11 stsp free(refname);
2402 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2403 3e3a69f1 2019-07-25 stsp return err;
2406 3e3a69f1 2019-07-25 stsp static const struct got_error *
2407 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2409 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2411 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2412 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2413 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2414 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2416 9d31a1d8 2018-03-11 stsp return err;
2420 ebf99748 2019-05-09 stsp static const struct got_error *
2421 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2422 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2424 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2425 ebf99748 2019-05-09 stsp FILE *index = NULL;
2427 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2428 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2429 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2430 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2432 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2434 ebf99748 2019-05-09 stsp goto done;
2436 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2437 ebf99748 2019-05-09 stsp if (index == NULL) {
2438 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2439 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2441 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2442 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2443 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2446 ebf99748 2019-05-09 stsp if (err) {
2447 ebf99748 2019-05-09 stsp free(*fileindex_path);
2448 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2449 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2450 ebf99748 2019-05-09 stsp *fileindex = NULL;
2452 ebf99748 2019-05-09 stsp return err;
2455 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2456 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2457 c932eeeb 2019-05-22 stsp const char *path;
2458 c932eeeb 2019-05-22 stsp size_t path_len;
2459 c932eeeb 2019-05-22 stsp const char *entry_name;
2460 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2461 a484d721 2019-06-10 stsp void *progress_arg;
2464 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2465 c932eeeb 2019-05-22 stsp static const struct got_error *
2466 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2468 1ee397ad 2019-07-12 stsp const struct got_error *err;
2469 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2471 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2472 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2473 c932eeeb 2019-05-22 stsp return NULL;
2474 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2475 102ff934 2019-06-11 stsp return NULL;
2477 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2478 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2479 c932eeeb 2019-05-22 stsp return NULL;
2481 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2482 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2483 edd02c5e 2019-07-11 stsp ie->path);
2485 1ee397ad 2019-07-12 stsp return err;
2487 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2488 c932eeeb 2019-05-22 stsp return NULL;
2491 a615e0e7 2020-12-16 stsp static const struct got_error *
2492 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2493 a615e0e7 2020-12-16 stsp struct got_fileindex *fileindex,
2494 a615e0e7 2020-12-16 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2496 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2498 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2499 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2500 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2501 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2502 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2503 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2505 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2506 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2509 9c6338c4 2019-06-02 stsp static const struct got_error *
2510 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2512 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2513 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2514 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2515 867630bb 2020-01-17 stsp struct timespec timeout;
2517 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2518 9c6338c4 2019-06-02 stsp fileindex_path);
2520 9c6338c4 2019-06-02 stsp goto done;
2522 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2524 9c6338c4 2019-06-02 stsp goto done;
2526 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2527 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2528 9c6338c4 2019-06-02 stsp fileindex_path);
2529 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2533 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2534 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2535 867630bb 2020-01-17 stsp * was recorded in the file index.
2537 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2538 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2539 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2541 9c6338c4 2019-06-02 stsp if (new_index)
2542 9c6338c4 2019-06-02 stsp fclose(new_index);
2543 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2544 9c6338c4 2019-06-02 stsp return err;
2547 6ced4176 2019-07-12 stsp static const struct got_error *
2548 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2549 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2550 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2552 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2553 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2554 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2555 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2557 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2558 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2559 6ced4176 2019-07-12 stsp *tree_id = NULL;
2561 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2562 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2563 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2564 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2565 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2566 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2567 6ced4176 2019-07-12 stsp goto done;
2569 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2570 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2572 6ced4176 2019-07-12 stsp goto done;
2573 6ced4176 2019-07-12 stsp return NULL;
2576 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2578 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2579 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2580 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2581 6ced4176 2019-07-12 stsp goto done;
2584 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2585 6ced4176 2019-07-12 stsp in_repo_path);
2587 6ced4176 2019-07-12 stsp goto done;
2589 6ced4176 2019-07-12 stsp free(in_repo_path);
2590 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2592 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2594 6ced4176 2019-07-12 stsp goto done;
2596 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2597 6ced4176 2019-07-12 stsp /* Check out a single file. */
2598 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2599 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2600 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2601 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2602 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2603 6ced4176 2019-07-12 stsp goto done;
2605 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2606 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2607 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2608 6ced4176 2019-07-12 stsp goto done;
2611 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2612 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2614 6ced4176 2019-07-12 stsp return err;
2615 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2616 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2617 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2618 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2619 6ced4176 2019-07-12 stsp goto done;
2622 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2623 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2625 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2626 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2627 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2628 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2629 6ced4176 2019-07-12 stsp goto done;
2631 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2632 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2633 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2634 6ced4176 2019-07-12 stsp goto done;
2639 6ced4176 2019-07-12 stsp free(in_repo_path);
2640 6ced4176 2019-07-12 stsp if (err) {
2641 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2642 6ced4176 2019-07-12 stsp free(*tree_relpath);
2643 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2644 6ced4176 2019-07-12 stsp free(*tree_id);
2645 6ced4176 2019-07-12 stsp *tree_id = NULL;
2647 07ed472d 2019-07-12 stsp return err;
2650 07ed472d 2019-07-12 stsp static const struct got_error *
2651 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2652 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2653 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2654 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2656 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2657 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2658 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2659 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2660 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2662 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2663 7f47418f 2019-12-20 stsp if (err) {
2664 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2665 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2666 7f47418f 2019-12-20 stsp goto done;
2667 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2668 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2670 7f47418f 2019-12-20 stsp return err;
2673 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2674 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2676 07ed472d 2019-07-12 stsp goto done;
2678 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2680 07ed472d 2019-07-12 stsp goto done;
2682 07ed472d 2019-07-12 stsp if (entry_name &&
2683 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2684 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2685 07ed472d 2019-07-12 stsp goto done;
2688 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2689 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2690 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2691 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2692 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2693 07ed472d 2019-07-12 stsp arg.repo = repo;
2694 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2695 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2696 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2697 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2698 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2699 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2702 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2703 07ed472d 2019-07-12 stsp if (commit)
2704 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2705 6ced4176 2019-07-12 stsp return err;
2708 9d31a1d8 2018-03-11 stsp const struct got_error *
2709 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2710 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2711 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2712 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2714 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2715 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2716 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2717 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2718 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2719 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2720 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2721 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
2722 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2723 f2ea84fa 2019-07-27 stsp int entry_type;
2724 f2ea84fa 2019-07-27 stsp char *relpath;
2725 f2ea84fa 2019-07-27 stsp char *entry_name;
2726 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2727 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2729 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
2731 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2733 9d31a1d8 2018-03-11 stsp return err;
2735 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2736 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2737 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2738 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2739 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2740 f2ea84fa 2019-07-27 stsp goto done;
2743 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2744 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2745 f2ea84fa 2019-07-27 stsp if (err) {
2746 f2ea84fa 2019-07-27 stsp free(tpd);
2747 6ced4176 2019-07-12 stsp goto done;
2750 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2751 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2752 f2ea84fa 2019-07-27 stsp if (err) {
2753 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2754 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2755 f2ea84fa 2019-07-27 stsp free(tpd);
2756 f2ea84fa 2019-07-27 stsp goto done;
2759 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2761 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2765 51514078 2018-12-25 stsp * Read the file index.
2766 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2767 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2769 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2771 c4cdcb68 2019-04-03 stsp goto done;
2773 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2774 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2775 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2777 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2778 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2779 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2783 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2784 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2785 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2786 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2787 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2788 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2789 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2790 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2794 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2796 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2797 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2798 af12c6b9 2019-06-04 stsp err = sync_err;
2800 9c6338c4 2019-06-02 stsp free(fileindex_path);
2802 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2803 9d31a1d8 2018-03-11 stsp if (commit)
2804 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2805 5ade8233 2019-07-12 stsp if (fileindex)
2806 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2807 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2808 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2809 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2810 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2811 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2812 f2ea84fa 2019-07-27 stsp free(tpd);
2814 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2815 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2816 9d31a1d8 2018-03-11 stsp err = unlockerr;
2817 f8d1f275 2019-02-04 stsp return err;
2820 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2821 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2822 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2823 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2824 234035bc 2019-06-01 stsp void *progress_arg;
2825 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2826 234035bc 2019-06-01 stsp void *cancel_arg;
2827 f69721c3 2019-10-21 stsp const char *label_orig;
2828 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2831 234035bc 2019-06-01 stsp static const struct got_error *
2832 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2833 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2834 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2835 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2837 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2838 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2839 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2840 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2841 234035bc 2019-06-01 stsp struct stat sb;
2842 234035bc 2019-06-01 stsp unsigned char status;
2843 234035bc 2019-06-01 stsp int local_changes_subsumed;
2844 1af628f4 2021-06-03 stsp FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2845 54d5be07 2021-06-03 stsp char *id_str = NULL, *label_deriv2 = NULL;
2847 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2848 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2849 d6c87207 2019-08-02 stsp strlen(path2));
2850 1ee397ad 2019-07-12 stsp if (ie == NULL)
2851 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2852 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2854 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2855 234035bc 2019-06-01 stsp path2) == -1)
2856 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2858 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2861 234035bc 2019-06-01 stsp goto done;
2863 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2864 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2865 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2866 234035bc 2019-06-01 stsp goto done;
2868 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2869 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2870 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2871 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2872 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2873 234035bc 2019-06-01 stsp goto done;
2876 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2877 36bf999c 2020-07-23 stsp char *link_target2;
2878 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2880 36bf999c 2020-07-23 stsp goto done;
2881 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2882 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2883 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2884 36bf999c 2020-07-23 stsp free(link_target2);
2888 1af628f4 2021-06-03 stsp f_orig = got_opentemp();
2889 1af628f4 2021-06-03 stsp if (f_orig == NULL) {
2890 1af628f4 2021-06-03 stsp err = got_error_from_errno("got_opentemp");
2891 1af628f4 2021-06-03 stsp goto done;
2893 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2894 1af628f4 2021-06-03 stsp f_orig, blob1);
2896 1af628f4 2021-06-03 stsp goto done;
2898 54d5be07 2021-06-03 stsp f_deriv2 = got_opentemp();
2899 54d5be07 2021-06-03 stsp if (f_deriv2 == NULL)
2900 1af628f4 2021-06-03 stsp goto done;
2901 1af628f4 2021-06-03 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2902 54d5be07 2021-06-03 stsp f_deriv2, blob2);
2904 1af628f4 2021-06-03 stsp goto done;
2906 1af628f4 2021-06-03 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
2907 1af628f4 2021-06-03 stsp if (fd == -1) {
2908 1af628f4 2021-06-03 stsp err = got_error_from_errno2("open",
2909 1af628f4 2021-06-03 stsp ondisk_path);
2910 1af628f4 2021-06-03 stsp goto done;
2912 54d5be07 2021-06-03 stsp f_deriv = fdopen(fd, "r");
2913 54d5be07 2021-06-03 stsp if (f_deriv == NULL) {
2914 1af628f4 2021-06-03 stsp err = got_error_from_errno2("fdopen",
2915 1af628f4 2021-06-03 stsp ondisk_path);
2916 1af628f4 2021-06-03 stsp close(fd);
2917 1af628f4 2021-06-03 stsp goto done;
2919 1af628f4 2021-06-03 stsp err = got_object_id_str(&id_str, a->commit_id2);
2921 1af628f4 2021-06-03 stsp goto done;
2922 54d5be07 2021-06-03 stsp if (asprintf(&label_deriv2, "%s: commit %s",
2923 1af628f4 2021-06-03 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2924 1af628f4 2021-06-03 stsp err = got_error_from_errno("asprintf");
2925 1af628f4 2021-06-03 stsp goto done;
2927 1af628f4 2021-06-03 stsp err = merge_file(&local_changes_subsumed, a->worktree,
2928 1af628f4 2021-06-03 stsp f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2929 54d5be07 2021-06-03 stsp sb.st_mode, a->label_orig, NULL, label_deriv2,
2930 fdf3c2d3 2021-06-17 stsp GOT_DIFF_ALGORITHM_PATIENCE, repo,
2931 fdf3c2d3 2021-06-17 stsp a->progress_cb, a->progress_arg);
2933 234035bc 2019-06-01 stsp } else if (blob1) {
2934 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2935 d6c87207 2019-08-02 stsp strlen(path1));
2936 1ee397ad 2019-07-12 stsp if (ie == NULL)
2937 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2938 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2940 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2941 2b92fad7 2019-06-02 stsp path1) == -1)
2942 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2944 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2947 2b92fad7 2019-06-02 stsp goto done;
2949 2b92fad7 2019-06-02 stsp switch (status) {
2950 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2951 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2952 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2954 1ee397ad 2019-07-12 stsp goto done;
2955 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2957 2b92fad7 2019-06-02 stsp goto done;
2959 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2961 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2962 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2963 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2964 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2966 1ee397ad 2019-07-12 stsp goto done;
2968 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2970 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2971 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2972 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2974 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2975 0a22ca1a 2020-09-23 stsp * exists in the repository.
2977 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
2979 0a22ca1a 2020-09-23 stsp goto done;
2980 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2981 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2982 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2984 0a22ca1a 2020-09-23 stsp goto done;
2985 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2988 0a22ca1a 2020-09-23 stsp goto done;
2990 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2993 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2994 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2996 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2997 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
3000 0a22ca1a 2020-09-23 stsp goto done;
3003 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
3004 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
3005 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3006 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
3008 1ee397ad 2019-07-12 stsp goto done;
3010 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
3011 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
3013 1ee397ad 2019-07-12 stsp goto done;
3018 234035bc 2019-06-01 stsp } else if (blob2) {
3019 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3020 234035bc 2019-06-01 stsp path2) == -1)
3021 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3022 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
3023 d6c87207 2019-08-02 stsp strlen(path2));
3025 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
3026 7f91a133 2019-12-13 stsp -1, NULL, repo);
3028 234035bc 2019-06-01 stsp goto done;
3029 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
3030 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
3031 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
3032 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
3033 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
3034 1ee397ad 2019-07-12 stsp status, path2);
3035 234035bc 2019-06-01 stsp goto done;
3037 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3038 36bf999c 2020-07-23 stsp char *link_target2;
3039 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
3042 36bf999c 2020-07-23 stsp goto done;
3043 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
3044 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
3045 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
3046 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
3047 36bf999c 2020-07-23 stsp free(link_target2);
3048 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
3049 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
3050 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
3051 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
3052 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
3053 526a746f 2020-07-23 stsp a->progress_arg);
3055 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
3056 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
3059 dfe9fba0 2020-07-23 stsp goto done;
3060 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
3061 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
3062 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
3063 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
3065 234035bc 2019-06-01 stsp goto done;
3068 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
3069 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3070 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
3071 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
3072 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
3073 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
3075 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
3076 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3077 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
3080 234035bc 2019-06-01 stsp goto done;
3081 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
3083 234035bc 2019-06-01 stsp goto done;
3084 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
3085 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
3086 3969253a 2020-03-07 stsp if (err) {
3087 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3088 3969253a 2020-03-07 stsp goto done;
3090 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3091 2b92fad7 2019-06-02 stsp if (err) {
3092 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3093 2b92fad7 2019-06-02 stsp goto done;
3095 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3096 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3097 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3102 1af628f4 2021-06-03 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
3103 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3104 1af628f4 2021-06-03 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3105 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3106 1af628f4 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3107 1af628f4 2021-06-03 stsp err = got_error_from_errno("fclose");
3108 1af628f4 2021-06-03 stsp free(id_str);
3109 54d5be07 2021-06-03 stsp free(label_deriv2);
3110 234035bc 2019-06-01 stsp free(ondisk_path);
3111 234035bc 2019-06-01 stsp return err;
3114 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
3115 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3116 234035bc 2019-06-01 stsp struct got_repository *repo;
3119 234035bc 2019-06-01 stsp static const struct got_error *
3120 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
3122 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3123 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
3124 234035bc 2019-06-01 stsp unsigned char status;
3125 234035bc 2019-06-01 stsp struct stat sb;
3126 234035bc 2019-06-01 stsp char *ondisk_path;
3128 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
3129 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3130 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
3131 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
3133 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3135 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3137 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3138 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3140 234035bc 2019-06-01 stsp return err;
3141 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3142 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3144 234035bc 2019-06-01 stsp return NULL;
3147 818c7501 2019-07-11 stsp static const struct got_error *
3148 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3149 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3150 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3151 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3152 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3154 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3155 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3156 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3157 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3158 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3160 03415a1a 2019-06-02 stsp if (commit_id1) {
3161 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3162 03415a1a 2019-06-02 stsp worktree->path_prefix);
3163 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3164 03415a1a 2019-06-02 stsp goto done;
3166 69d57f3d 2020-07-31 stsp if (tree_id1) {
3167 69d57f3d 2020-07-31 stsp char *id_str;
3169 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3171 03415a1a 2019-06-02 stsp goto done;
3173 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3175 f69721c3 2019-10-21 stsp goto done;
3177 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3178 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3179 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3180 f69721c3 2019-10-21 stsp free(id_str);
3181 f69721c3 2019-10-21 stsp goto done;
3183 f69721c3 2019-10-21 stsp free(id_str);
3186 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3187 234035bc 2019-06-01 stsp worktree->path_prefix);
3189 234035bc 2019-06-01 stsp goto done;
3191 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3193 234035bc 2019-06-01 stsp goto done;
3195 234035bc 2019-06-01 stsp arg.worktree = worktree;
3196 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3197 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3198 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3199 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3200 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3201 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3202 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3203 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3204 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3205 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3206 af12c6b9 2019-06-04 stsp err = sync_err;
3208 234035bc 2019-06-01 stsp if (tree1)
3209 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3210 234035bc 2019-06-01 stsp if (tree2)
3211 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3212 f69721c3 2019-10-21 stsp free(label_orig);
3213 818c7501 2019-07-11 stsp return err;
3216 818c7501 2019-07-11 stsp const struct got_error *
3217 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3218 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3219 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3220 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3222 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3223 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3224 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3225 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
3227 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3229 818c7501 2019-07-11 stsp return err;
3231 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3233 818c7501 2019-07-11 stsp goto done;
3235 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
3236 818c7501 2019-07-11 stsp mok_arg.repo = repo;
3237 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3238 818c7501 2019-07-11 stsp &mok_arg);
3240 818c7501 2019-07-11 stsp goto done;
3242 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3243 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3245 818c7501 2019-07-11 stsp if (fileindex)
3246 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3247 818c7501 2019-07-11 stsp free(fileindex_path);
3248 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3249 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3250 234035bc 2019-06-01 stsp err = unlockerr;
3251 234035bc 2019-06-01 stsp return err;
3254 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3255 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3256 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3257 927df6b7 2019-02-10 stsp const char *status_path;
3258 927df6b7 2019-02-10 stsp size_t status_path_len;
3259 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3260 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3261 f8d1f275 2019-02-04 stsp void *status_arg;
3262 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3263 f8d1f275 2019-02-04 stsp void *cancel_arg;
3264 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3265 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
3266 f2a9dc41 2019-12-13 tracey int report_unchanged;
3267 3143d852 2020-06-25 stsp int no_ignores;
3270 f8d1f275 2019-02-04 stsp static const struct got_error *
3271 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3272 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3273 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3274 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3276 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3277 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3278 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3279 927df6b7 2019-02-10 stsp struct stat sb;
3280 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3281 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3282 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3284 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3286 98eaaa12 2019-08-03 stsp return err;
3288 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3289 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3290 98eaaa12 2019-08-03 stsp return NULL;
3292 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3293 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3294 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3296 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3297 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3298 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3300 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3301 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3302 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3303 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3304 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3307 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3308 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3311 927df6b7 2019-02-10 stsp static const struct got_error *
3312 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3313 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3315 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3316 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3317 f8d1f275 2019-02-04 stsp char *abspath;
3319 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3320 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3322 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3323 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3324 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3325 927df6b7 2019-02-10 stsp return NULL;
3327 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3328 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3329 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3330 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3332 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3333 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3334 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3337 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3338 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3339 f8d1f275 2019-02-04 stsp free(abspath);
3340 9d31a1d8 2018-03-11 stsp return err;
3343 f8d1f275 2019-02-04 stsp static const struct got_error *
3344 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3346 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3347 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3348 2ec1f75b 2019-03-26 stsp unsigned char status;
3350 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3351 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3353 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3354 927df6b7 2019-02-10 stsp return NULL;
3356 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3357 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3358 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3359 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3361 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3362 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3363 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3367 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3369 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3371 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3372 6841da00 2019-08-08 stsp free((char *)pe->path);
3373 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3377 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3379 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3381 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3382 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3383 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3384 6841da00 2019-08-08 stsp free((char *)pe->path);
3386 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3389 6841da00 2019-08-08 stsp static const struct got_error *
3390 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3392 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3393 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3394 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3395 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3396 6841da00 2019-08-08 stsp size_t linesize = 0;
3397 6841da00 2019-08-08 stsp ssize_t linelen;
3399 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3400 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3401 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3402 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3404 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3405 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3406 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3408 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3409 bd8de430 2019-10-04 stsp if (line[0] == '#')
3412 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3413 bd8de430 2019-10-04 stsp if (line[0] == '!')
3416 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3417 6841da00 2019-08-08 stsp line) == -1) {
3418 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3419 6841da00 2019-08-08 stsp goto done;
3421 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3423 6841da00 2019-08-08 stsp goto done;
3425 6841da00 2019-08-08 stsp if (ferror(f)) {
3426 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3427 6841da00 2019-08-08 stsp goto done;
3430 6841da00 2019-08-08 stsp dirpath = strdup(path);
3431 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3432 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3433 6841da00 2019-08-08 stsp goto done;
3435 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3437 6841da00 2019-08-08 stsp free(line);
3438 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3439 6841da00 2019-08-08 stsp free(dirpath);
3440 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3442 6841da00 2019-08-08 stsp return err;
3446 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3448 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3450 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3451 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3452 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3453 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3455 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3456 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3458 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3460 bd8de430 2019-10-04 stsp pattern += 3;
3462 bd8de430 2019-10-04 stsp while (*p) {
3463 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3464 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3465 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3466 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3468 bd8de430 2019-10-04 stsp while (*p == '/')
3478 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3479 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3480 6841da00 2019-08-08 stsp * ignores backwards.
3482 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3483 6841da00 2019-08-08 stsp while (pe) {
3484 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3485 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3486 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3487 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3488 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3489 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3490 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3491 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3492 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3497 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3503 6841da00 2019-08-08 stsp static const struct got_error *
3504 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3505 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3507 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3508 6841da00 2019-08-08 stsp char *ignorespath;
3509 886cec17 2019-12-15 stsp int fd = -1;
3510 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3512 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3513 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3514 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3516 886cec17 2019-12-15 stsp if (dirfd != -1) {
3517 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3518 886cec17 2019-12-15 stsp if (fd == -1) {
3519 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3520 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3521 886cec17 2019-12-15 stsp ignorespath);
3523 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3524 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3525 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3526 886cec17 2019-12-15 stsp ignorespath);
3529 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3533 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3534 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3535 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3536 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3537 886cec17 2019-12-15 stsp ignorespath);
3539 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3542 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3543 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3544 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3545 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3546 6841da00 2019-08-08 stsp free(ignorespath);
3547 6841da00 2019-08-08 stsp return err;
3550 f8d1f275 2019-02-04 stsp static const struct got_error *
3551 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3553 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3554 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3555 f8d1f275 2019-02-04 stsp char *path = NULL;
3557 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3558 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3560 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3561 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3562 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3564 f8d1f275 2019-02-04 stsp path = de->d_name;
3567 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3568 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3569 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
3570 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3571 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3572 f8d1f275 2019-02-04 stsp if (parent_path[0])
3573 f8d1f275 2019-02-04 stsp free(path);
3574 b72f483a 2019-02-05 stsp return err;
3577 347d1d3e 2019-07-12 stsp static const struct got_error *
3578 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3580 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3581 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3583 3143d852 2020-06-25 stsp if (a->no_ignores)
3584 3143d852 2020-06-25 stsp return NULL;
3586 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
3587 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3589 3143d852 2020-06-25 stsp return err;
3591 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
3592 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3594 3143d852 2020-06-25 stsp return err;
3597 3143d852 2020-06-25 stsp static const struct got_error *
3598 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3599 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3600 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
3602 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3603 abb4604f 2019-07-27 stsp struct stat sb;
3605 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3607 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3608 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3610 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3611 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3612 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3613 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3614 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3615 abb4604f 2019-07-27 stsp return NULL;
3618 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3619 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3620 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3622 abb4604f 2019-07-27 stsp return NULL;
3625 3143d852 2020-06-25 stsp static const struct got_error *
3626 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3627 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3629 3143d852 2020-06-25 stsp const struct got_error *err;
3630 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3632 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3633 3143d852 2020-06-25 stsp ".cvsignore");
3635 3143d852 2020-06-25 stsp return err;
3637 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3638 3143d852 2020-06-25 stsp ".gitignore");
3640 3143d852 2020-06-25 stsp return err;
3642 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3643 3143d852 2020-06-25 stsp if (err) {
3644 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3645 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3646 3143d852 2020-06-25 stsp return err;
3648 3143d852 2020-06-25 stsp for (;;) {
3649 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3650 3143d852 2020-06-25 stsp ".cvsignore");
3653 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3654 3143d852 2020-06-25 stsp ".gitignore");
3657 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3658 3143d852 2020-06-25 stsp if (err) {
3659 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3660 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3663 b737c85a 2020-06-26 stsp free(parent_path);
3664 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3665 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3668 b737c85a 2020-06-26 stsp free(parent_path);
3669 b737c85a 2020-06-26 stsp free(next_parent_path);
3670 3143d852 2020-06-25 stsp return err;
3673 abb4604f 2019-07-27 stsp static const struct got_error *
3674 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3675 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3676 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3677 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3678 f2a9dc41 2019-12-13 tracey int report_unchanged)
3680 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3681 6fc93f37 2019-12-13 stsp int fd = -1;
3682 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3683 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3684 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3686 3143d852 2020-06-25 stsp TAILQ_INIT(&arg.ignores);
3688 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3689 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3690 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3692 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3693 6fc93f37 2019-12-13 stsp if (fd == -1) {
3694 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3695 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3696 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3698 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3699 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3700 f2a9dc41 2019-12-13 tracey report_unchanged);
3702 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3703 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3704 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3705 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3706 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3707 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3708 abb4604f 2019-07-27 stsp arg.status_path = path;
3709 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3710 abb4604f 2019-07-27 stsp arg.repo = repo;
3711 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3712 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3713 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3714 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3715 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3716 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3717 022fae89 2019-12-06 tracey if (!no_ignores) {
3718 3143d852 2020-06-25 stsp err = add_ignores_from_parent_paths(&arg.ignores,
3719 3143d852 2020-06-25 stsp worktree->root_path, path);
3721 3143d852 2020-06-25 stsp goto done;
3723 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3724 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3727 3143d852 2020-06-25 stsp free_ignores(&arg.ignores);
3728 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3729 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3730 927df6b7 2019-02-10 stsp free(ondisk_path);
3731 347d1d3e 2019-07-12 stsp return err;
3734 347d1d3e 2019-07-12 stsp const struct got_error *
3735 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3736 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3737 f6343036 2021-06-22 stsp int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3738 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3740 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3741 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3742 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3743 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3745 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3747 347d1d3e 2019-07-12 stsp return err;
3749 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3750 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3751 f6343036 2021-06-22 stsp status_cb, status_arg, cancel_cb, cancel_arg,
3752 f6343036 2021-06-22 stsp no_ignores, 0);
3756 f8d1f275 2019-02-04 stsp free(fileindex_path);
3757 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3758 f8d1f275 2019-02-04 stsp return err;
3761 6c7ab921 2019-03-18 stsp const struct got_error *
3762 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3763 6c7ab921 2019-03-18 stsp const char *arg)
3765 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3766 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3767 6c7ab921 2019-03-18 stsp size_t len;
3768 00bb5ea0 2020-07-23 stsp struct stat sb;
3769 01740607 2020-11-04 stsp char *abspath = NULL;
3770 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3772 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3774 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3775 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3776 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3778 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3779 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3780 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3781 00bb5ea0 2020-07-23 stsp goto done;
3783 727173c3 2020-11-06 stsp sb.st_mode = 0;
3785 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3787 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3788 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3789 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3790 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3792 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3793 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3794 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3795 00bb5ea0 2020-07-23 stsp goto done;
3799 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3800 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3802 d0710d08 2019-07-22 stsp goto done;
3803 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3804 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3805 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3806 00bb5ea0 2020-07-23 stsp goto done;
3809 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3810 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3811 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3812 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3813 00bb5ea0 2020-07-23 stsp goto done;
3815 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3816 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3817 01740607 2020-11-04 stsp goto done;
3819 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3820 01740607 2020-11-04 stsp sizeof(canonpath));
3822 00bb5ea0 2020-07-23 stsp goto done;
3823 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3824 01740607 2020-11-04 stsp if (resolved == NULL) {
3825 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3826 01740607 2020-11-04 stsp goto done;
3831 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3832 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3833 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3834 6c7ab921 2019-03-18 stsp goto done;
3837 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3838 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3839 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3841 f6d88e1a 2019-05-29 stsp goto done;
3843 f6d88e1a 2019-05-29 stsp path = strdup("");
3844 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3845 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3846 f6d88e1a 2019-05-29 stsp goto done;
3850 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3851 6c7ab921 2019-03-18 stsp len = strlen(path);
3852 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3853 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3857 01740607 2020-11-04 stsp free(abspath);
3858 6c7ab921 2019-03-18 stsp free(resolved);
3859 d0710d08 2019-07-22 stsp free(cwd);
3860 6c7ab921 2019-03-18 stsp if (err == NULL)
3861 6c7ab921 2019-03-18 stsp *wt_path = path;
3863 6c7ab921 2019-03-18 stsp free(path);
3864 d00136be 2019-03-26 stsp return err;
3867 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3868 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3869 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3870 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3871 4e68cba3 2019-11-23 stsp void *progress_arg;
3872 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3875 4e68cba3 2019-11-23 stsp static const struct got_error *
3876 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3877 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3878 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3879 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3881 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3882 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3883 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3884 6d022e97 2019-08-04 stsp struct stat sb;
3885 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3887 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3888 dbb83fbd 2019-12-12 stsp relpath) == -1)
3889 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3891 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3893 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3894 12463d8b 2019-12-13 stsp de_name, a->repo);
3896 dbb83fbd 2019-12-12 stsp goto done;
3897 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3898 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3899 dbb83fbd 2019-12-12 stsp goto done;
3900 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3902 dbb83fbd 2019-12-12 stsp goto done;
3905 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3906 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3907 dbb83fbd 2019-12-12 stsp goto done;
3910 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3912 4e68cba3 2019-11-23 stsp goto done;
3913 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3914 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3915 3969253a 2020-03-07 stsp if (err) {
3916 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3917 3969253a 2020-03-07 stsp goto done;
3919 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3920 07f5b47a 2019-06-02 stsp if (err) {
3921 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3922 4e68cba3 2019-11-23 stsp goto done;
3925 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3927 dbb83fbd 2019-12-12 stsp return err;
3928 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3929 dbb83fbd 2019-12-12 stsp return NULL;
3930 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3933 d00136be 2019-03-26 stsp const struct got_error *
3934 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3935 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3936 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3937 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3939 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3940 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3941 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3942 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3943 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3945 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3947 d00136be 2019-03-26 stsp return err;
3949 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3951 d00136be 2019-03-26 stsp goto done;
3953 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3954 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3955 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3956 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3957 4e68cba3 2019-11-23 stsp saa.repo = repo;
3959 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3960 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3961 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3965 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3966 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3967 af12c6b9 2019-06-04 stsp err = sync_err;
3969 fb399478 2019-07-12 stsp free(fileindex_path);
3970 d00136be 2019-03-26 stsp if (fileindex)
3971 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3972 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3973 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3974 d00136be 2019-03-26 stsp err = unlockerr;
3975 6c7ab921 2019-03-18 stsp return err;
3978 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3979 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3980 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3981 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3982 f2a9dc41 2019-12-13 tracey void *progress_arg;
3983 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3984 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3985 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3986 766841c2 2020-08-13 stsp const char *status_codes;
3989 f2a9dc41 2019-12-13 tracey static const struct got_error *
3990 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3991 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3992 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3993 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3995 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3996 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3997 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3998 17ed4618 2019-06-02 stsp struct stat sb;
3999 20a2ad1c 2020-10-20 stsp char *ondisk_path;
4001 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4002 17ed4618 2019-06-02 stsp if (ie == NULL)
4003 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4005 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
4006 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
4007 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
4008 9acbc4fa 2019-08-03 stsp return NULL;
4009 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4012 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4013 f2a9dc41 2019-12-13 tracey relpath) == -1)
4014 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
4016 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4019 f2a9dc41 2019-12-13 tracey goto done;
4021 766841c2 2020-08-13 stsp if (a->status_codes) {
4022 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
4024 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
4025 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
4028 766841c2 2020-08-13 stsp if (i == ncodes) {
4029 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
4030 766841c2 2020-08-13 stsp free(ondisk_path);
4031 766841c2 2020-08-13 stsp return NULL;
4033 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4034 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
4035 766841c2 2020-08-13 stsp static char msg[64];
4036 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
4037 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
4038 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4039 766841c2 2020-08-13 stsp goto done;
4043 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
4044 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
4045 f2a9dc41 2019-12-13 tracey goto done;
4046 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4047 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4048 f2a9dc41 2019-12-13 tracey goto done;
4050 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
4051 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
4052 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4053 f2a9dc41 2019-12-13 tracey goto done;
4057 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4058 20a2ad1c 2020-10-20 stsp size_t root_len;
4060 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4061 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
4062 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
4063 12463d8b 2019-12-13 stsp ondisk_path);
4064 12463d8b 2019-12-13 stsp goto done;
4066 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
4067 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
4068 12463d8b 2019-12-13 stsp goto done;
4071 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
4073 20a2ad1c 2020-10-20 stsp char *parent;
4074 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
4076 2513f20a 2020-10-20 stsp goto done;
4077 20a2ad1c 2020-10-20 stsp free(ondisk_path);
4078 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
4079 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
4080 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
4081 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
4082 20a2ad1c 2020-10-20 stsp ondisk_path);
4085 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4086 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
4089 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
4091 f2a9dc41 2019-12-13 tracey free(ondisk_path);
4092 f2a9dc41 2019-12-13 tracey if (err)
4093 f2a9dc41 2019-12-13 tracey return err;
4094 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
4095 f2a9dc41 2019-12-13 tracey return NULL;
4096 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4097 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4100 2ec1f75b 2019-03-26 stsp const struct got_error *
4101 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4102 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4103 766841c2 2020-08-13 stsp const char *status_codes,
4104 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4105 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
4107 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4108 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4109 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4110 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4111 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4113 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4115 2ec1f75b 2019-03-26 stsp return err;
4117 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4119 2ec1f75b 2019-03-26 stsp goto done;
4121 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4122 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4123 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4124 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4125 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4126 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4127 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4128 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4130 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4131 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4132 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
4136 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4137 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4138 af12c6b9 2019-06-04 stsp err = sync_err;
4140 fb399478 2019-07-12 stsp free(fileindex_path);
4141 2ec1f75b 2019-03-26 stsp if (fileindex)
4142 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4143 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4144 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4145 2ec1f75b 2019-03-26 stsp err = unlockerr;
4146 33aa809d 2019-08-08 stsp return err;
4149 33aa809d 2019-08-08 stsp static const struct got_error *
4150 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4152 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4153 33aa809d 2019-08-08 stsp char *line = NULL;
4154 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4155 33aa809d 2019-08-08 stsp ssize_t linelen;
4157 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4158 33aa809d 2019-08-08 stsp if (linelen == -1) {
4159 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4160 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4161 33aa809d 2019-08-08 stsp goto done;
4163 33aa809d 2019-08-08 stsp return NULL;
4165 33aa809d 2019-08-08 stsp if (outfile) {
4166 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4167 33aa809d 2019-08-08 stsp if (n != linelen) {
4168 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4169 33aa809d 2019-08-08 stsp goto done;
4172 33aa809d 2019-08-08 stsp if (rejectfile) {
4173 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4174 33aa809d 2019-08-08 stsp if (n != linelen)
4175 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4178 33aa809d 2019-08-08 stsp free(line);
4179 2ec1f75b 2019-03-26 stsp return err;
4182 33aa809d 2019-08-08 stsp static const struct got_error *
4183 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4185 33aa809d 2019-08-08 stsp char *line = NULL;
4186 33aa809d 2019-08-08 stsp size_t linesize = 0;
4187 33aa809d 2019-08-08 stsp ssize_t linelen;
4189 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4190 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4191 500467ff 2019-09-25 hiltjo if (ferror(f))
4192 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4193 500467ff 2019-09-25 hiltjo return NULL;
4195 33aa809d 2019-08-08 stsp free(line);
4196 33aa809d 2019-08-08 stsp return NULL;
4199 33aa809d 2019-08-08 stsp static const struct got_error *
4200 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4201 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4202 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4204 33aa809d 2019-08-08 stsp const struct got_error *err;
4206 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4207 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4208 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4210 33aa809d 2019-08-08 stsp return err;
4211 33aa809d 2019-08-08 stsp (*line_cur1)++;
4213 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4214 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4215 33aa809d 2019-08-08 stsp if (rejectfile)
4216 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4218 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4220 33aa809d 2019-08-08 stsp return err;
4221 33aa809d 2019-08-08 stsp (*line_cur2)++;
4223 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4224 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4225 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4227 33aa809d 2019-08-08 stsp return err;
4228 33aa809d 2019-08-08 stsp (*line_cur2)++;
4230 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4231 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4232 33aa809d 2019-08-08 stsp if (rejectfile)
4233 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4235 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4237 33aa809d 2019-08-08 stsp return err;
4238 33aa809d 2019-08-08 stsp (*line_cur1)++;
4241 f1e81a05 2019-08-10 stsp return NULL;
4244 f1e81a05 2019-08-10 stsp static const struct got_error *
4245 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4246 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4248 f1e81a05 2019-08-10 stsp const struct got_error *err;
4250 f1e81a05 2019-08-10 stsp if (outfile) {
4251 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4252 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4253 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4255 f1e81a05 2019-08-10 stsp return err;
4256 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4259 f1e81a05 2019-08-10 stsp if (rejectfile) {
4260 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4261 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4262 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4264 f1e81a05 2019-08-10 stsp return err;
4265 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4269 33aa809d 2019-08-08 stsp return NULL;
4272 33aa809d 2019-08-08 stsp static const struct got_error *
4273 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4274 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4275 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4276 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4277 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4279 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4280 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4281 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4282 33aa809d 2019-08-08 stsp FILE *hunkfile;
4283 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4284 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4287 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4289 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4290 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4291 fe621944 2020-11-10 stsp start_old = cc.left.start;
4292 fe621944 2020-11-10 stsp end_old = cc.left.end;
4293 fe621944 2020-11-10 stsp start_new = cc.right.start;
4294 fe621944 2020-11-10 stsp end_new = cc.right.end;
4296 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4297 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4298 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4300 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4301 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4302 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4304 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4305 fe621944 2020-11-10 stsp if (diff_state == NULL)
4306 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4307 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4309 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4310 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4311 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4312 33aa809d 2019-08-08 stsp goto done;
4315 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4316 fe621944 2020-11-10 stsp diff_result, &cc);
4317 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4318 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4319 33aa809d 2019-08-08 stsp goto done;
4322 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4323 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4324 33aa809d 2019-08-08 stsp goto done;
4327 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4328 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4330 33aa809d 2019-08-08 stsp goto done;
4332 33aa809d 2019-08-08 stsp switch (*choice) {
4333 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4334 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4335 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4337 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4338 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4339 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4341 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4344 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4348 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4349 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4350 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4351 33aa809d 2019-08-08 stsp return err;
4354 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4355 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4356 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4357 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4358 1f1abb7e 2019-08-08 stsp void *progress_arg;
4359 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4360 33aa809d 2019-08-08 stsp void *patch_arg;
4361 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4364 e20a8b6f 2019-06-04 stsp static const struct got_error *
4365 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4366 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4367 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4368 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4369 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4371 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4372 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4373 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4374 1ebedb77 2019-10-19 stsp int fd2 = -1;
4375 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4376 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4377 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4378 fe621944 2020-11-10 stsp struct stat sb2;
4379 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4380 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4381 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4383 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4385 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4387 33aa809d 2019-08-08 stsp return err;
4389 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4390 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4391 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4392 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4393 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4394 fa3cef63 2020-07-23 stsp goto done;
4396 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4397 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4398 fa3cef63 2020-07-23 stsp if (link_len == -1)
4399 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4400 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4401 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4404 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4405 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4406 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4407 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4408 fa3cef63 2020-07-23 stsp goto done;
4410 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4411 fa3cef63 2020-07-23 stsp sizeof(link_target));
4412 fa3cef63 2020-07-23 stsp if (link_len == -1)
4413 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4414 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4415 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4418 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4419 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4420 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4421 fa3cef63 2020-07-23 stsp goto done;
4424 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4425 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4426 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4427 fa3cef63 2020-07-23 stsp goto done;
4432 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4433 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4434 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4435 fa3cef63 2020-07-23 stsp goto done;
4437 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4438 fa3cef63 2020-07-23 stsp if (n != link_len) {
4439 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4440 fa3cef63 2020-07-23 stsp goto done;
4442 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4443 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4444 fa3cef63 2020-07-23 stsp goto done;
4446 fa3cef63 2020-07-23 stsp rewind(f2);
4449 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4451 33aa809d 2019-08-08 stsp goto done;
4453 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4455 33aa809d 2019-08-08 stsp goto done;
4457 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4459 33aa809d 2019-08-08 stsp goto done;
4461 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4464 33aa809d 2019-08-08 stsp goto done;
4466 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4468 33aa809d 2019-08-08 stsp goto done;
4470 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4471 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4472 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4473 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4475 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4476 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4477 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4478 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4479 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4480 fe621944 2020-11-10 stsp nchanges++;
4482 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4483 33aa809d 2019-08-08 stsp int choice;
4484 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4485 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4486 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4487 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4488 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4489 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4491 33aa809d 2019-08-08 stsp goto done;
4492 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4493 33aa809d 2019-08-08 stsp have_content = 1;
4494 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4497 1ebedb77 2019-10-19 stsp if (have_content) {
4498 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4499 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4500 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4502 1ebedb77 2019-10-19 stsp goto done;
4504 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4505 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4506 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4507 fa3cef63 2020-07-23 stsp goto done;
4512 33aa809d 2019-08-08 stsp free(id_str);
4514 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4515 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4516 fe621944 2020-11-10 stsp if (err == NULL)
4517 fe621944 2020-11-10 stsp err = free_err;
4518 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4519 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4520 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4521 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4522 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4523 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4524 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4525 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4526 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4527 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4528 33aa809d 2019-08-08 stsp if (err || !have_content) {
4529 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4530 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4531 33aa809d 2019-08-08 stsp free(*path_outfile);
4532 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4534 33aa809d 2019-08-08 stsp free(path1);
4535 33aa809d 2019-08-08 stsp return err;
4538 33aa809d 2019-08-08 stsp static const struct got_error *
4539 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4540 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4541 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4542 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4544 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4545 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4546 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4547 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4548 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4549 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4550 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4551 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4552 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4553 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4555 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4556 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4557 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4558 d3bcc3d1 2019-08-08 stsp return NULL;
4560 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4561 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4562 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4564 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4565 65084dad 2019-08-08 stsp if (ie == NULL)
4566 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4568 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4569 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4570 a129376b 2019-03-28 stsp if (err) {
4571 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4572 a129376b 2019-03-28 stsp goto done;
4573 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4574 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4575 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4576 e20a8b6f 2019-06-04 stsp goto done;
4579 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4580 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4581 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4582 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4583 a129376b 2019-03-28 stsp goto done;
4586 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4587 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4588 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4589 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4590 a129376b 2019-03-28 stsp goto done;
4593 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4594 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4595 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4596 a129376b 2019-03-28 stsp goto done;
4601 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4602 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4603 a9fa2909 2019-07-27 stsp if (err) {
4604 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4605 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4606 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4607 a9fa2909 2019-07-27 stsp goto done;
4609 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4611 a9fa2909 2019-07-27 stsp goto done;
4613 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4615 a9fa2909 2019-07-27 stsp goto done;
4617 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4618 1233e6b6 2020-10-19 stsp free(te_name);
4619 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4620 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4621 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4622 a9fa2909 2019-07-27 stsp goto done;
4626 a129376b 2019-03-28 stsp switch (status) {
4627 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4628 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4629 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4630 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4631 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4633 33aa809d 2019-08-08 stsp goto done;
4634 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4637 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4638 1f1abb7e 2019-08-08 stsp ie->path);
4640 1ee397ad 2019-07-12 stsp goto done;
4641 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4643 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4644 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4645 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4646 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4647 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4649 33aa809d 2019-08-08 stsp goto done;
4650 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4653 33aa809d 2019-08-08 stsp /* fall through */
4654 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4655 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4656 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4657 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4658 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4659 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4660 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4661 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4662 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4664 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4665 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4666 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4668 65084dad 2019-08-08 stsp goto done;
4670 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4671 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4672 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4673 a129376b 2019-03-28 stsp goto done;
4676 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4677 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4678 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4679 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4680 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4681 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4682 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4684 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4685 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4686 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4687 369fd7e5 2020-07-23 stsp path_content);
4690 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4691 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4692 369fd7e5 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4693 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4695 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4696 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4697 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4698 369fd7e5 2020-07-23 stsp goto done;
4702 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4703 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4704 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4705 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4706 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4707 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4709 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4711 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4712 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4713 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4714 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4717 a129376b 2019-03-28 stsp goto done;
4718 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4719 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4720 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4721 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4722 437adc9d 2020-12-10 yzhong blob->id.sha1,
4723 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4725 2e1fa222 2020-07-23 stsp goto done;
4727 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4728 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4729 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4738 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4739 33aa809d 2019-08-08 stsp free(path_content);
4740 e20a8b6f 2019-06-04 stsp free(parent_path);
4741 a129376b 2019-03-28 stsp free(tree_path);
4743 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4745 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4746 a129376b 2019-03-28 stsp free(tree_id);
4747 e20a8b6f 2019-06-04 stsp return err;
4750 e20a8b6f 2019-06-04 stsp const struct got_error *
4751 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4752 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4753 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4754 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4755 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4757 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4758 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4759 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4760 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4761 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4762 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4764 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4766 e20a8b6f 2019-06-04 stsp return err;
4768 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4770 e20a8b6f 2019-06-04 stsp goto done;
4772 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4773 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4774 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4775 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4776 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4777 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4778 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4779 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4780 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4781 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4785 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4786 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4787 e20a8b6f 2019-06-04 stsp err = sync_err;
4789 fb399478 2019-07-12 stsp free(fileindex_path);
4790 a129376b 2019-03-28 stsp if (fileindex)
4791 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4792 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4793 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4794 a129376b 2019-03-28 stsp err = unlockerr;
4795 c4296144 2019-05-09 stsp return err;
4798 cf066bf8 2019-05-09 stsp static void
4799 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4801 24519714 2019-05-09 stsp free(ct->path);
4802 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4803 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4804 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4805 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4806 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4807 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4811 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4812 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4813 24519714 2019-05-09 stsp struct got_repository *repo;
4814 24519714 2019-05-09 stsp struct got_worktree *worktree;
4815 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4816 5f8a88c6 2019-08-03 stsp int have_staged_files;
4817 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4820 c4296144 2019-05-09 stsp static const struct got_error *
4821 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
4822 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4823 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4824 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4826 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
4827 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4828 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4829 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4830 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4831 768aea60 2019-05-09 stsp struct stat sb;
4833 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
4834 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4835 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4836 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4837 5f8a88c6 2019-08-03 stsp return NULL;
4839 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4840 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4842 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4843 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4844 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4845 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4846 5f8a88c6 2019-08-03 stsp return NULL;
4849 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4850 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4851 036813ee 2019-05-09 stsp goto done;
4853 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4854 036813ee 2019-05-09 stsp parent_path = strdup("");
4855 69960a46 2019-05-09 stsp if (parent_path == NULL)
4856 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4858 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4860 69960a46 2019-05-09 stsp return err;
4863 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4864 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4865 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4866 c4296144 2019-05-09 stsp goto done;
4869 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4870 768aea60 2019-05-09 stsp relpath) == -1) {
4871 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4872 768aea60 2019-05-09 stsp goto done;
4875 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4876 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4877 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4878 0aeb8099 2020-07-23 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4879 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4880 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4881 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4882 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4884 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4885 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4888 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4889 0aeb8099 2020-07-23 stsp goto done;
4891 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4892 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4893 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4894 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4895 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4896 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4897 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4898 12463d8b 2019-12-13 stsp ct->ondisk_path);
4899 12463d8b 2019-12-13 stsp goto done;
4901 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4902 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4903 768aea60 2019-05-09 stsp goto done;
4905 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4908 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4909 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4910 44d03001 2019-05-09 stsp relpath) == -1) {
4911 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4912 44d03001 2019-05-09 stsp goto done;
4915 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4916 35213c7c 2020-07-23 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4917 35213c7c 2020-07-23 stsp int is_bad_symlink;
4918 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4919 35213c7c 2020-07-23 stsp ssize_t target_len;
4920 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4921 35213c7c 2020-07-23 stsp sizeof(target_path));
4922 35213c7c 2020-07-23 stsp if (target_len == -1) {
4923 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4924 35213c7c 2020-07-23 stsp ct->ondisk_path);
4925 35213c7c 2020-07-23 stsp goto done;
4927 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4928 35213c7c 2020-07-23 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4930 35213c7c 2020-07-23 stsp goto done;
4931 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4932 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4933 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4934 35213c7c 2020-07-23 stsp goto done;
4939 cf066bf8 2019-05-09 stsp ct->status = status;
4940 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4941 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4942 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4943 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4944 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4945 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4946 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4947 b416585c 2019-05-13 stsp goto done;
4949 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4950 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4951 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4952 f0b75401 2019-08-03 stsp goto done;
4955 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4956 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4957 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4958 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4959 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4960 036813ee 2019-05-09 stsp goto done;
4963 24519714 2019-05-09 stsp ct->path = strdup(path);
4964 24519714 2019-05-09 stsp if (ct->path == NULL) {
4965 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4966 24519714 2019-05-09 stsp goto done;
4968 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4970 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4971 ed175427 2019-05-09 stsp free_commitable(ct);
4972 24519714 2019-05-09 stsp free(parent_path);
4973 036813ee 2019-05-09 stsp free(path);
4974 a129376b 2019-03-28 stsp return err;
4977 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4978 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4979 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4980 036813ee 2019-05-09 stsp struct got_repository *);
4982 ed175427 2019-05-09 stsp static const struct got_error *
4983 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4984 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4985 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4986 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4987 afa376bf 2019-05-09 stsp struct got_repository *repo)
4989 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4990 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4991 036813ee 2019-05-09 stsp char *subpath;
4993 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4994 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4995 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4997 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4999 ed175427 2019-05-09 stsp return err;
5001 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
5002 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5003 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
5004 036813ee 2019-05-09 stsp free(subpath);
5005 036813ee 2019-05-09 stsp return err;
5008 036813ee 2019-05-09 stsp static const struct got_error *
5009 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5011 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5012 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
5014 036813ee 2019-05-09 stsp *match = 0;
5016 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
5017 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
5018 0f63689d 2019-05-10 stsp return NULL;
5021 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5023 0f63689d 2019-05-10 stsp return err;
5024 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
5025 036813ee 2019-05-09 stsp free(ct_parent_path);
5026 036813ee 2019-05-09 stsp return err;
5029 768aea60 2019-05-09 stsp static mode_t
5030 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
5032 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
5033 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
5035 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5038 036813ee 2019-05-09 stsp static const struct got_error *
5039 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5040 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
5042 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5044 036813ee 2019-05-09 stsp *new_te = NULL;
5046 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
5048 036813ee 2019-05-09 stsp goto done;
5050 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5052 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
5053 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5054 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5056 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5058 036813ee 2019-05-09 stsp if (err && *new_te) {
5059 56e0773d 2019-11-28 stsp free(*new_te);
5060 036813ee 2019-05-09 stsp *new_te = NULL;
5062 036813ee 2019-05-09 stsp return err;
5065 036813ee 2019-05-09 stsp static const struct got_error *
5066 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5067 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
5069 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5070 102b254e 2020-10-19 stsp char *ct_name = NULL;
5072 036813ee 2019-05-09 stsp *new_te = NULL;
5074 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
5075 036813ee 2019-05-09 stsp if (*new_te == NULL)
5076 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5078 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
5080 036813ee 2019-05-09 stsp goto done;
5081 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5082 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
5083 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5084 036813ee 2019-05-09 stsp goto done;
5087 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
5089 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
5090 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
5091 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
5093 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5095 102b254e 2020-10-19 stsp free(ct_name);
5096 036813ee 2019-05-09 stsp if (err && *new_te) {
5097 56e0773d 2019-11-28 stsp free(*new_te);
5098 036813ee 2019-05-09 stsp *new_te = NULL;
5100 036813ee 2019-05-09 stsp return err;
5103 036813ee 2019-05-09 stsp static const struct got_error *
5104 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5105 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5107 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5108 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5110 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5112 036813ee 2019-05-09 stsp return err;
5113 036813ee 2019-05-09 stsp if (new_pe == NULL)
5114 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5115 036813ee 2019-05-09 stsp return NULL;
5118 afa376bf 2019-05-09 stsp static const struct got_error *
5119 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5120 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5122 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5123 5f8a88c6 2019-08-03 stsp unsigned char status;
5125 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5126 afa376bf 2019-05-09 stsp ct_path++;
5128 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5129 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5131 5f8a88c6 2019-08-03 stsp status = ct->status;
5133 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5134 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5137 036813ee 2019-05-09 stsp static const struct got_error *
5138 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5139 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5141 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5142 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5143 44d03001 2019-05-09 stsp char *te_path;
5145 44d03001 2019-05-09 stsp *modified = 0;
5147 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5148 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5149 44d03001 2019-05-09 stsp te->name) == -1)
5150 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5152 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5153 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5154 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5155 44d03001 2019-05-09 stsp strlen(te_path));
5156 62d463ca 2020-10-20 naddy if (*modified)
5160 44d03001 2019-05-09 stsp free(te_path);
5161 44d03001 2019-05-09 stsp return err;
5164 44d03001 2019-05-09 stsp static const struct got_error *
5165 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5166 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5167 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5169 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5170 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5172 036813ee 2019-05-09 stsp *ctp = NULL;
5174 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5175 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5176 036813ee 2019-05-09 stsp char *ct_name = NULL;
5177 036813ee 2019-05-09 stsp int path_matches;
5179 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5180 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5181 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5182 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5185 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5186 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5190 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5193 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5195 036813ee 2019-05-09 stsp return err;
5196 036813ee 2019-05-09 stsp if (!path_matches)
5199 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5201 d34b633e 2020-10-19 stsp return err;
5203 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5204 d34b633e 2020-10-19 stsp free(ct_name);
5207 d34b633e 2020-10-19 stsp free(ct_name);
5209 036813ee 2019-05-09 stsp *ctp = ct;
5213 2b496619 2019-07-10 stsp return err;
5216 2b496619 2019-07-10 stsp static const struct got_error *
5217 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5218 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5219 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5220 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5221 2b496619 2019-07-10 stsp struct got_repository *repo)
5223 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5224 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5225 2b496619 2019-07-10 stsp char *subtree_path;
5226 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5227 ba580f68 2020-03-22 stsp int nentries;
5229 2b496619 2019-07-10 stsp *new_tep = NULL;
5231 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5232 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5233 2b496619 2019-07-10 stsp child_path) == -1)
5234 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5236 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5237 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5238 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5239 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5241 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5242 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5243 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5244 2b496619 2019-07-10 stsp goto done;
5246 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5247 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5248 2b496619 2019-07-10 stsp if (err) {
5249 56e0773d 2019-11-28 stsp free(new_te);
5250 2b496619 2019-07-10 stsp goto done;
5252 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5255 2b496619 2019-07-10 stsp free(subtree_path);
5256 2b496619 2019-07-10 stsp if (err == NULL)
5257 2b496619 2019-07-10 stsp *new_tep = new_te;
5258 036813ee 2019-05-09 stsp return err;
5261 036813ee 2019-05-09 stsp static const struct got_error *
5262 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5263 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5264 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5265 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5266 036813ee 2019-05-09 stsp struct got_repository *repo)
5268 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5269 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5270 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5271 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5273 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5274 ba580f68 2020-03-22 stsp *nentries = 0;
5276 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5277 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5278 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5279 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5281 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5282 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5283 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5286 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5287 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5290 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5291 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5293 036813ee 2019-05-09 stsp goto done;
5295 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5296 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5297 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5299 036813ee 2019-05-09 stsp goto done;
5300 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5302 afa376bf 2019-05-09 stsp goto done;
5303 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5304 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5306 2f51b5b3 2019-05-09 stsp goto done;
5307 ba580f68 2020-03-22 stsp (*nentries)++;
5309 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5310 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5311 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5312 2b496619 2019-07-10 stsp == NULL) {
5313 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5314 2b496619 2019-07-10 stsp child_path, path_base_tree,
5315 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5318 2b496619 2019-07-10 stsp goto done;
5319 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5321 2b496619 2019-07-10 stsp goto done;
5322 ba580f68 2020-03-22 stsp (*nentries)++;
5327 2f51b5b3 2019-05-09 stsp if (base_tree) {
5328 56e0773d 2019-11-28 stsp int i, nbase_entries;
5329 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5330 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5331 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5332 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5334 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5335 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5336 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5337 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5339 63c5ca5d 2019-08-24 stsp goto done;
5340 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5342 63c5ca5d 2019-08-24 stsp goto done;
5343 ba580f68 2020-03-22 stsp (*nentries)++;
5347 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5348 44d03001 2019-05-09 stsp int modified;
5349 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5351 036813ee 2019-05-09 stsp goto done;
5352 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5353 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5355 2f51b5b3 2019-05-09 stsp goto done;
5356 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5357 44d03001 2019-05-09 stsp if (modified) {
5358 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5359 ba580f68 2020-03-22 stsp int nsubentries;
5360 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5361 ba580f68 2020-03-22 stsp &nsubentries, te,
5362 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5363 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5365 44d03001 2019-05-09 stsp goto done;
5366 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5367 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5368 ba580f68 2020-03-22 stsp free(new_id);
5371 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5372 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5373 56e0773d 2019-11-28 stsp free(new_id);
5375 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5377 036813ee 2019-05-09 stsp goto done;
5378 ba580f68 2020-03-22 stsp (*nentries)++;
5382 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5383 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5385 f66c734c 2019-09-22 stsp goto done;
5387 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5388 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5389 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5390 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5391 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5392 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5394 2f51b5b3 2019-05-09 stsp goto done;
5395 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5397 2f51b5b3 2019-05-09 stsp goto done;
5398 ba580f68 2020-03-22 stsp (*nentries)++;
5400 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5401 b416585c 2019-05-13 stsp status_arg);
5403 afa376bf 2019-05-09 stsp goto done;
5405 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5406 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5408 2f51b5b3 2019-05-09 stsp goto done;
5409 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5411 2f51b5b3 2019-05-09 stsp goto done;
5412 ba580f68 2020-03-22 stsp (*nentries)++;
5417 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5418 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5420 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5421 2e1fa222 2020-07-23 stsp return err;
5424 2e1fa222 2020-07-23 stsp static const struct got_error *
5425 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5426 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5427 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5428 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5430 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5431 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5432 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5434 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5435 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5436 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5438 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5440 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5441 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5442 437adc9d 2020-12-10 yzhong if (err)
5443 437adc9d 2020-12-10 yzhong goto done;
5446 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5447 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5448 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5449 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5450 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5451 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5452 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5453 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5455 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5456 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5457 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5458 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5459 72fd46fa 2019-09-06 stsp !have_staged_files);
5461 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5462 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5463 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5464 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5465 72fd46fa 2019-09-06 stsp !have_staged_files);
5467 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5469 437adc9d 2020-12-10 yzhong goto done;
5470 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5471 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5472 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5473 3969253a 2020-03-07 stsp if (err) {
5474 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5475 437adc9d 2020-12-10 yzhong goto done;
5477 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5478 3969253a 2020-03-07 stsp if (err) {
5479 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5480 437adc9d 2020-12-10 yzhong goto done;
5483 437adc9d 2020-12-10 yzhong free(relpath);
5484 437adc9d 2020-12-10 yzhong relpath = NULL;
5487 437adc9d 2020-12-10 yzhong free(relpath);
5488 d56d26ce 2019-05-10 stsp return err;
5492 d56d26ce 2019-05-10 stsp static const struct got_error *
5493 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5494 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5495 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5496 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5497 735ef5ac 2019-08-03 stsp int ood_errcode)
5499 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5500 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5502 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5503 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5504 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5505 1a36436d 2019-06-10 stsp return NULL;
5507 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5508 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5510 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5511 735ef5ac 2019-08-03 stsp in_repo_path);
5512 9bead371 2019-07-28 stsp if (err) {
5513 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5514 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5515 1a36436d 2019-06-10 stsp goto done;
5516 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5517 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5519 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5520 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5521 735ef5ac 2019-08-03 stsp in_repo_path);
5522 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5523 1a36436d 2019-06-10 stsp goto done;
5524 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5528 1a36436d 2019-06-10 stsp return err;
5531 c4296144 2019-05-09 stsp const struct got_error *
5532 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5533 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5534 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
5535 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5536 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5537 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5538 afa376bf 2019-05-09 stsp struct got_repository *repo)
5540 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5541 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5542 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5543 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5544 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5545 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5546 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5547 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5548 ba580f68 2020-03-22 stsp int nentries;
5549 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5550 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5551 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5553 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5555 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
5557 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5559 588edf97 2019-05-10 stsp goto done;
5561 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5563 588edf97 2019-05-10 stsp goto done;
5565 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5566 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5571 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5572 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5576 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5577 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5578 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5579 cf066bf8 2019-05-09 stsp char *ondisk_path;
5581 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5582 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5583 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5586 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5587 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5588 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5591 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5592 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5593 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5594 cf066bf8 2019-05-09 stsp goto done;
5596 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5597 2e1fa222 2020-07-23 stsp free(ondisk_path);
5599 cf066bf8 2019-05-09 stsp goto done;
5602 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5603 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5604 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5606 036813ee 2019-05-09 stsp goto done;
5608 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5610 de18fc63 2019-05-09 stsp goto done;
5611 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
5612 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5613 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
5614 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
5615 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5616 33ad4cbe 2019-05-12 jcs free(logmsg);
5618 9d40349a 2019-05-09 stsp goto done;
5620 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5621 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5622 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5623 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5624 09f5bd90 2019-05-09 stsp goto done;
5626 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5627 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5629 09f5bd90 2019-05-09 stsp goto done;
5630 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5632 ebf99748 2019-05-09 stsp goto done;
5633 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5634 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5635 09f5bd90 2019-05-09 stsp goto done;
5637 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5638 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5640 f2c16586 2019-05-09 stsp goto done;
5641 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5643 f2c16586 2019-05-09 stsp goto done;
5645 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5647 09f5bd90 2019-05-09 stsp goto done;
5649 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5651 ebf99748 2019-05-09 stsp goto done;
5653 588edf97 2019-05-10 stsp if (head_tree)
5654 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5655 588edf97 2019-05-10 stsp if (head_commit)
5656 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5657 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5658 2f17228e 2019-05-12 stsp if (head_ref2) {
5659 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5660 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5661 2f17228e 2019-05-12 stsp err = unlockerr;
5662 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5664 39cd0ff6 2019-07-12 stsp return err;
5667 5c1e53bc 2019-07-28 stsp static const struct got_error *
5668 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5669 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5671 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5672 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5674 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5675 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5676 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5678 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5679 5c1e53bc 2019-07-28 stsp ct_path++;
5681 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5682 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5686 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5687 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5689 5c1e53bc 2019-07-28 stsp return NULL;
5692 f0b75401 2019-08-03 stsp static const struct got_error *
5693 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5695 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5697 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5698 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5699 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5702 f0b75401 2019-08-03 stsp return NULL;
5705 5f8a88c6 2019-08-03 stsp static const struct got_error *
5706 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5707 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5709 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5710 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5712 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5713 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5715 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5716 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5717 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5718 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5719 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5720 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5723 5f8a88c6 2019-08-03 stsp return NULL;
5726 39cd0ff6 2019-07-12 stsp const struct got_error *
5727 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5728 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5729 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5730 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5731 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5732 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5734 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5735 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5736 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5737 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5738 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5739 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5740 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5741 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5742 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5744 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5746 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5748 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5750 39cd0ff6 2019-07-12 stsp goto done;
5752 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5754 39cd0ff6 2019-07-12 stsp goto done;
5756 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5758 39cd0ff6 2019-07-12 stsp goto done;
5760 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5762 39cd0ff6 2019-07-12 stsp goto done;
5764 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5765 5f8a88c6 2019-08-03 stsp &have_staged_files);
5766 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5767 5f8a88c6 2019-08-03 stsp goto done;
5768 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5769 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5771 5f8a88c6 2019-08-03 stsp goto done;
5774 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5775 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5776 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5777 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5778 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5779 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5780 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5781 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5782 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5784 5c1e53bc 2019-07-28 stsp goto done;
5787 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5788 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5789 39cd0ff6 2019-07-12 stsp goto done;
5792 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5793 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5795 5c1e53bc 2019-07-28 stsp goto done;
5798 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5799 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5800 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5802 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5803 f0b75401 2019-08-03 stsp ct_path++;
5804 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5805 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5806 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5808 b50cabdf 2019-07-12 stsp goto done;
5812 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5813 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
5814 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5816 39cd0ff6 2019-07-12 stsp goto done;
5818 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5819 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5820 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5821 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5822 39cd0ff6 2019-07-12 stsp err = sync_err;
5824 39cd0ff6 2019-07-12 stsp if (fileindex)
5825 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5826 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5827 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5828 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5829 39cd0ff6 2019-07-12 stsp err = unlockerr;
5830 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5831 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5832 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5834 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5835 c4296144 2019-05-09 stsp return err;
5838 8656d6c4 2019-05-20 stsp const char *
5839 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5841 8656d6c4 2019-05-20 stsp return ct->path;
5844 8656d6c4 2019-05-20 stsp unsigned int
5845 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5847 8656d6c4 2019-05-20 stsp return ct->status;
5850 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5851 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5852 818c7501 2019-07-11 stsp struct got_repository *repo;
5855 818c7501 2019-07-11 stsp static const struct got_error *
5856 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5858 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5859 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5860 818c7501 2019-07-11 stsp unsigned char status;
5861 818c7501 2019-07-11 stsp struct stat sb;
5862 818c7501 2019-07-11 stsp char *ondisk_path;
5864 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5865 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5866 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5867 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5869 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5871 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5873 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5874 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5875 818c7501 2019-07-11 stsp free(ondisk_path);
5877 818c7501 2019-07-11 stsp return err;
5879 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5880 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5881 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5882 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5884 818c7501 2019-07-11 stsp return NULL;
5887 818c7501 2019-07-11 stsp const struct got_error *
5888 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5889 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5890 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5891 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5893 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5894 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5895 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5896 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5897 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5898 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5899 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5901 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5902 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5903 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5905 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5907 818c7501 2019-07-11 stsp return err;
5909 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5911 818c7501 2019-07-11 stsp goto done;
5913 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5914 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5915 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5918 818c7501 2019-07-11 stsp goto done;
5920 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5922 818c7501 2019-07-11 stsp goto done;
5924 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5926 818c7501 2019-07-11 stsp goto done;
5928 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5930 818c7501 2019-07-11 stsp goto done;
5932 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5935 e51d7b55 2020-01-04 stsp goto done;
5937 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5939 818c7501 2019-07-11 stsp goto done;
5940 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5941 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5942 e51d7b55 2020-01-04 stsp goto done;
5945 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5946 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5948 818c7501 2019-07-11 stsp goto done;
5949 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5951 818c7501 2019-07-11 stsp goto done;
5953 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5955 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5957 818c7501 2019-07-11 stsp goto done;
5959 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5961 818c7501 2019-07-11 stsp goto done;
5963 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5964 818c7501 2019-07-11 stsp worktree->base_commit_id);
5966 818c7501 2019-07-11 stsp goto done;
5967 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5969 818c7501 2019-07-11 stsp goto done;
5971 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5973 818c7501 2019-07-11 stsp goto done;
5975 818c7501 2019-07-11 stsp free(fileindex_path);
5976 818c7501 2019-07-11 stsp free(tmp_branch_name);
5977 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5978 818c7501 2019-07-11 stsp free(branch_ref_name);
5979 818c7501 2019-07-11 stsp if (branch_ref)
5980 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5981 818c7501 2019-07-11 stsp if (wt_branch)
5982 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5983 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5984 818c7501 2019-07-11 stsp if (err) {
5985 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5986 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5987 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5989 818c7501 2019-07-11 stsp if (*tmp_branch) {
5990 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5991 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5993 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5994 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5995 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5997 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5999 818c7501 2019-07-11 stsp return err;
6002 818c7501 2019-07-11 stsp const struct got_error *
6003 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
6004 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6005 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
6006 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
6008 818c7501 2019-07-11 stsp const struct got_error *err;
6009 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6010 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6011 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6012 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6013 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6015 818c7501 2019-07-11 stsp *commit_id = NULL;
6016 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
6017 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
6018 3e3a69f1 2019-07-25 stsp *branch = NULL;
6019 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6021 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6023 3e3a69f1 2019-07-25 stsp return err;
6025 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6027 f032f1f7 2019-08-04 stsp goto done;
6029 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6030 f032f1f7 2019-08-04 stsp &have_staged_files);
6031 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6032 f032f1f7 2019-08-04 stsp goto done;
6033 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6034 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6035 3e3a69f1 2019-07-25 stsp goto done;
6038 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6040 f032f1f7 2019-08-04 stsp goto done;
6042 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6044 818c7501 2019-07-11 stsp goto done;
6046 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6048 818c7501 2019-07-11 stsp goto done;
6050 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6052 818c7501 2019-07-11 stsp goto done;
6054 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6056 818c7501 2019-07-11 stsp goto done;
6058 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
6059 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
6061 818c7501 2019-07-11 stsp goto done;
6063 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6065 818c7501 2019-07-11 stsp goto done;
6067 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6069 818c7501 2019-07-11 stsp goto done;
6071 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
6072 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
6074 818c7501 2019-07-11 stsp goto done;
6076 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6078 818c7501 2019-07-11 stsp goto done;
6080 818c7501 2019-07-11 stsp free(commit_ref_name);
6081 818c7501 2019-07-11 stsp free(branch_ref_name);
6082 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6083 818c7501 2019-07-11 stsp if (commit_ref)
6084 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6085 818c7501 2019-07-11 stsp if (branch_ref)
6086 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
6087 818c7501 2019-07-11 stsp if (err) {
6088 818c7501 2019-07-11 stsp free(*commit_id);
6089 818c7501 2019-07-11 stsp *commit_id = NULL;
6090 818c7501 2019-07-11 stsp if (*tmp_branch) {
6091 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
6092 818c7501 2019-07-11 stsp *tmp_branch = NULL;
6094 818c7501 2019-07-11 stsp if (*new_base_branch) {
6095 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
6096 818c7501 2019-07-11 stsp *new_base_branch = NULL;
6098 818c7501 2019-07-11 stsp if (*branch) {
6099 818c7501 2019-07-11 stsp got_ref_close(*branch);
6100 818c7501 2019-07-11 stsp *branch = NULL;
6102 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6103 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6104 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6106 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6108 818c7501 2019-07-11 stsp return err;
6111 818c7501 2019-07-11 stsp const struct got_error *
6112 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6114 818c7501 2019-07-11 stsp const struct got_error *err;
6115 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6117 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6119 818c7501 2019-07-11 stsp return err;
6121 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6122 818c7501 2019-07-11 stsp free(tmp_branch_name);
6123 818c7501 2019-07-11 stsp return NULL;
6126 818c7501 2019-07-11 stsp static const struct got_error *
6127 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6128 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6130 0ebf8283 2019-07-24 stsp *logmsg = arg;
6131 818c7501 2019-07-11 stsp return NULL;
6134 818c7501 2019-07-11 stsp static const struct got_error *
6135 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6136 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6137 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6138 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6140 818c7501 2019-07-11 stsp return NULL;
6143 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6144 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6145 01757395 2019-07-12 stsp void *progress_arg;
6146 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6149 01757395 2019-07-12 stsp static const struct got_error *
6150 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6152 01757395 2019-07-12 stsp const struct got_error *err;
6153 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6155 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6157 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6159 01757395 2019-07-12 stsp return err;
6161 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6162 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6163 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6164 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6165 01757395 2019-07-12 stsp return NULL;
6167 01757395 2019-07-12 stsp p = strdup(path);
6168 01757395 2019-07-12 stsp if (p == NULL)
6169 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6171 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6172 01757395 2019-07-12 stsp if (err || new == NULL)
6174 01757395 2019-07-12 stsp return err;
6178 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6180 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6182 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6183 01757395 2019-07-12 stsp free((char *)pe->path);
6185 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6188 0ebf8283 2019-07-24 stsp static const struct got_error *
6189 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6190 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6192 818c7501 2019-07-11 stsp const struct got_error *err;
6193 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6195 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6196 818c7501 2019-07-11 stsp if (err) {
6197 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6198 818c7501 2019-07-11 stsp goto done;
6199 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6201 818c7501 2019-07-11 stsp goto done;
6202 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6204 818c7501 2019-07-11 stsp goto done;
6205 de05890f 2020-03-05 stsp } else if (is_rebase) {
6206 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6209 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6211 818c7501 2019-07-11 stsp goto done;
6212 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6213 818c7501 2019-07-11 stsp free(stored_id);
6214 818c7501 2019-07-11 stsp if (cmp != 0) {
6215 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6216 818c7501 2019-07-11 stsp goto done;
6220 0ebf8283 2019-07-24 stsp if (commit_ref)
6221 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6222 0ebf8283 2019-07-24 stsp return err;
6225 0ebf8283 2019-07-24 stsp static const struct got_error *
6226 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6227 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6228 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6229 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6230 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6231 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6233 0ebf8283 2019-07-24 stsp const struct got_error *err;
6234 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6235 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6236 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6238 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6240 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6242 0ebf8283 2019-07-24 stsp return err;
6244 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6245 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6246 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6247 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6248 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6249 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6250 818c7501 2019-07-11 stsp if (commit_ref)
6251 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6252 818c7501 2019-07-11 stsp return err;
6255 818c7501 2019-07-11 stsp const struct got_error *
6256 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6257 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6258 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6259 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6260 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6261 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6263 0ebf8283 2019-07-24 stsp const struct got_error *err;
6264 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6266 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6268 0ebf8283 2019-07-24 stsp return err;
6270 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6272 0ebf8283 2019-07-24 stsp goto done;
6274 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6275 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6276 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6278 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6279 0ebf8283 2019-07-24 stsp return err;
6282 0ebf8283 2019-07-24 stsp const struct got_error *
6283 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6284 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6285 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6286 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6287 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6288 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6290 0ebf8283 2019-07-24 stsp const struct got_error *err;
6291 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6293 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6295 0ebf8283 2019-07-24 stsp return err;
6297 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6299 0ebf8283 2019-07-24 stsp goto done;
6301 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6302 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6303 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6305 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6306 0ebf8283 2019-07-24 stsp return err;
6309 0ebf8283 2019-07-24 stsp static const struct got_error *
6310 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6311 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6312 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6313 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6314 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6316 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6317 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6318 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6319 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6320 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6321 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6322 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6324 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6325 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6327 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6329 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6331 3e3a69f1 2019-07-25 stsp return err;
6333 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6334 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6335 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6336 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6338 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6339 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6340 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
6341 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6343 01757395 2019-07-12 stsp if (merged_paths) {
6344 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6345 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6346 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6347 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6350 01757395 2019-07-12 stsp goto done;
6353 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6354 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6356 01757395 2019-07-12 stsp goto done;
6359 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6360 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6361 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6363 a0e95631 2019-07-12 stsp goto done;
6364 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6365 a0e95631 2019-07-12 stsp goto done;
6368 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6370 edd02c5e 2019-07-11 stsp goto done;
6372 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6374 818c7501 2019-07-11 stsp goto done;
6376 5943eee2 2019-08-13 stsp if (new_logmsg) {
6377 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6378 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6379 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6380 5943eee2 2019-08-13 stsp goto done;
6383 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6385 5943eee2 2019-08-13 stsp goto done;
6388 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6389 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6390 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
6391 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6392 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6394 a0e95631 2019-07-12 stsp goto done;
6396 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6398 a0e95631 2019-07-12 stsp goto done;
6400 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6402 a0e95631 2019-07-12 stsp goto done;
6404 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6405 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6406 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6407 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6408 a0e95631 2019-07-12 stsp err = sync_err;
6410 a0e95631 2019-07-12 stsp free(fileindex_path);
6411 a0e95631 2019-07-12 stsp free(head_commit_id);
6412 a0e95631 2019-07-12 stsp if (head_ref)
6413 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6414 818c7501 2019-07-11 stsp if (err) {
6415 818c7501 2019-07-11 stsp free(*new_commit_id);
6416 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6418 818c7501 2019-07-11 stsp return err;
6421 818c7501 2019-07-11 stsp const struct got_error *
6422 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6423 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6424 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6425 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6426 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6428 0ebf8283 2019-07-24 stsp const struct got_error *err;
6429 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6430 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6431 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6433 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6435 0ebf8283 2019-07-24 stsp return err;
6437 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6439 0ebf8283 2019-07-24 stsp goto done;
6440 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6442 0ebf8283 2019-07-24 stsp goto done;
6443 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6444 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6445 0ebf8283 2019-07-24 stsp goto done;
6448 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6449 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6451 0ebf8283 2019-07-24 stsp if (commit_ref)
6452 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6453 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6454 0ebf8283 2019-07-24 stsp free(commit_id);
6455 0ebf8283 2019-07-24 stsp return err;
6458 0ebf8283 2019-07-24 stsp const struct got_error *
6459 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6460 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6461 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6462 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6463 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6464 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6466 0ebf8283 2019-07-24 stsp const struct got_error *err;
6467 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6468 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6470 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6472 0ebf8283 2019-07-24 stsp return err;
6474 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6476 0ebf8283 2019-07-24 stsp goto done;
6478 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6479 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6481 0ebf8283 2019-07-24 stsp if (commit_ref)
6482 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6483 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6484 0ebf8283 2019-07-24 stsp return err;
6487 0ebf8283 2019-07-24 stsp const struct got_error *
6488 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6489 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6491 3e3a69f1 2019-07-25 stsp if (fileindex)
6492 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6493 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6496 69844fba 2019-07-11 stsp static const struct got_error *
6497 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6499 69844fba 2019-07-11 stsp const struct got_error *err;
6500 69844fba 2019-07-11 stsp struct got_reference *ref;
6502 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6503 69844fba 2019-07-11 stsp if (err) {
6504 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6505 69844fba 2019-07-11 stsp return NULL;
6506 69844fba 2019-07-11 stsp return err;
6509 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6510 69844fba 2019-07-11 stsp got_ref_close(ref);
6511 69844fba 2019-07-11 stsp return err;
6514 69844fba 2019-07-11 stsp static const struct got_error *
6515 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6517 69844fba 2019-07-11 stsp const struct got_error *err;
6518 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6519 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6521 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6523 69844fba 2019-07-11 stsp goto done;
6524 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6526 69844fba 2019-07-11 stsp goto done;
6528 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6530 69844fba 2019-07-11 stsp goto done;
6531 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6533 69844fba 2019-07-11 stsp goto done;
6535 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6537 69844fba 2019-07-11 stsp goto done;
6538 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6540 69844fba 2019-07-11 stsp goto done;
6542 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6544 69844fba 2019-07-11 stsp goto done;
6545 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6547 69844fba 2019-07-11 stsp goto done;
6550 69844fba 2019-07-11 stsp free(tmp_branch_name);
6551 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6552 69844fba 2019-07-11 stsp free(branch_ref_name);
6553 69844fba 2019-07-11 stsp free(commit_ref_name);
6554 e600f124 2021-03-21 stsp return err;
6557 e600f124 2021-03-21 stsp const struct got_error *
6558 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6559 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6561 e600f124 2021-03-21 stsp const struct got_error *err;
6562 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6563 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6564 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6565 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6566 e600f124 2021-03-21 stsp char *refname = NULL;
6568 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6569 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6570 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6571 e600f124 2021-03-21 stsp branch_name += 11;
6573 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6575 e600f124 2021-03-21 stsp return err;
6577 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6578 e600f124 2021-03-21 stsp new_id_str) == -1) {
6579 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6580 e600f124 2021-03-21 stsp goto done;
6583 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6585 e600f124 2021-03-21 stsp goto done;
6587 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6589 e600f124 2021-03-21 stsp goto done;
6591 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6593 e600f124 2021-03-21 stsp free(new_id_str);
6594 e600f124 2021-03-21 stsp free(refname);
6595 e600f124 2021-03-21 stsp free(old_commit_id);
6597 e600f124 2021-03-21 stsp got_ref_close(ref);
6598 69844fba 2019-07-11 stsp return err;
6601 818c7501 2019-07-11 stsp const struct got_error *
6602 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6603 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6604 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6605 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6607 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6608 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6609 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6611 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6613 818c7501 2019-07-11 stsp return err;
6615 e600f124 2021-03-21 stsp if (create_backup) {
6616 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6617 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6619 e600f124 2021-03-21 stsp goto done;
6622 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6624 818c7501 2019-07-11 stsp goto done;
6626 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6628 818c7501 2019-07-11 stsp goto done;
6630 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6632 818c7501 2019-07-11 stsp goto done;
6634 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6636 a615e0e7 2020-12-16 stsp goto done;
6638 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6640 a615e0e7 2020-12-16 stsp goto done;
6641 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6642 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6643 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6644 a615e0e7 2020-12-16 stsp err = sync_err;
6646 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6647 a615e0e7 2020-12-16 stsp free(fileindex_path);
6648 818c7501 2019-07-11 stsp free(new_head_commit_id);
6649 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6650 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6651 818c7501 2019-07-11 stsp err = unlockerr;
6652 818c7501 2019-07-11 stsp return err;
6655 818c7501 2019-07-11 stsp const struct got_error *
6656 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6657 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6658 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6659 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6661 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6662 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6663 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6664 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6665 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6666 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6668 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6670 818c7501 2019-07-11 stsp return err;
6672 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6673 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6675 818c7501 2019-07-11 stsp goto done;
6677 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6679 818c7501 2019-07-11 stsp goto done;
6682 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6683 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6684 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6686 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6688 818c7501 2019-07-11 stsp goto done;
6690 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6692 818c7501 2019-07-11 stsp goto done;
6694 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6695 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6697 ca355955 2019-07-12 stsp goto done;
6699 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6701 ca355955 2019-07-12 stsp goto done;
6703 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6705 818c7501 2019-07-11 stsp goto done;
6707 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6708 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6709 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6710 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6711 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6712 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6713 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6714 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6715 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6717 1f1abb7e 2019-08-08 stsp goto sync;
6719 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6720 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6722 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6723 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6724 ca355955 2019-07-12 stsp err = sync_err;
6726 818c7501 2019-07-11 stsp got_ref_close(resolved);
6727 a3a2faf2 2019-07-12 stsp free(tree_id);
6728 818c7501 2019-07-11 stsp free(commit_id);
6729 0ebf8283 2019-07-24 stsp if (fileindex)
6730 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6731 0ebf8283 2019-07-24 stsp free(fileindex_path);
6733 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6734 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6735 0ebf8283 2019-07-24 stsp err = unlockerr;
6736 0ebf8283 2019-07-24 stsp return err;
6739 0ebf8283 2019-07-24 stsp const struct got_error *
6740 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6741 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6742 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6743 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6745 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6746 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6747 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6748 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6749 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6750 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6751 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6752 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6754 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6755 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6756 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6757 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6759 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6761 0ebf8283 2019-07-24 stsp return err;
6763 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6765 0ebf8283 2019-07-24 stsp goto done;
6767 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6768 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6769 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6772 0ebf8283 2019-07-24 stsp goto done;
6774 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6776 0ebf8283 2019-07-24 stsp goto done;
6778 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6780 0ebf8283 2019-07-24 stsp goto done;
6782 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6783 0ebf8283 2019-07-24 stsp worktree);
6785 0ebf8283 2019-07-24 stsp goto done;
6787 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6790 0ebf8283 2019-07-24 stsp goto done;
6792 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6794 0ebf8283 2019-07-24 stsp goto done;
6796 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6798 0ebf8283 2019-07-24 stsp goto done;
6800 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6801 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6803 0ebf8283 2019-07-24 stsp goto done;
6804 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6806 0ebf8283 2019-07-24 stsp goto done;
6807 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6808 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6809 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6810 0ebf8283 2019-07-24 stsp goto done;
6813 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6814 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6816 0ebf8283 2019-07-24 stsp goto done;
6817 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6819 0ebf8283 2019-07-24 stsp goto done;
6821 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6823 0ebf8283 2019-07-24 stsp goto done;
6825 0ebf8283 2019-07-24 stsp free(fileindex_path);
6826 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6827 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6828 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6829 0ebf8283 2019-07-24 stsp if (wt_branch)
6830 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6831 0ebf8283 2019-07-24 stsp if (err) {
6832 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6833 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6834 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6836 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6837 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6838 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6840 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6841 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6842 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6843 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6845 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6847 0ebf8283 2019-07-24 stsp return err;
6850 0ebf8283 2019-07-24 stsp const struct got_error *
6851 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6852 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6854 3e3a69f1 2019-07-25 stsp if (fileindex)
6855 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6856 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6859 0ebf8283 2019-07-24 stsp const struct got_error *
6860 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6861 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6863 0ebf8283 2019-07-24 stsp const struct got_error *err;
6864 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6866 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6868 0ebf8283 2019-07-24 stsp return err;
6870 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6871 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6872 0ebf8283 2019-07-24 stsp return NULL;
6875 0ebf8283 2019-07-24 stsp const struct got_error *
6876 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6877 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6878 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6879 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6881 0ebf8283 2019-07-24 stsp const struct got_error *err;
6882 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6883 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6884 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6885 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6886 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6887 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6889 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6890 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6891 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6892 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6894 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6896 3e3a69f1 2019-07-25 stsp return err;
6898 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6900 f032f1f7 2019-08-04 stsp goto done;
6902 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6903 f032f1f7 2019-08-04 stsp &have_staged_files);
6904 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6905 f032f1f7 2019-08-04 stsp goto done;
6906 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6907 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6908 3e3a69f1 2019-07-25 stsp goto done;
6911 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6913 f032f1f7 2019-08-04 stsp goto done;
6915 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6917 0ebf8283 2019-07-24 stsp goto done;
6919 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6921 0ebf8283 2019-07-24 stsp goto done;
6923 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6924 0ebf8283 2019-07-24 stsp worktree);
6926 0ebf8283 2019-07-24 stsp goto done;
6928 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6930 0ebf8283 2019-07-24 stsp goto done;
6932 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6934 0ebf8283 2019-07-24 stsp goto done;
6935 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6937 0ebf8283 2019-07-24 stsp goto done;
6939 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6941 0ebf8283 2019-07-24 stsp goto done;
6942 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6944 0ebf8283 2019-07-24 stsp goto done;
6946 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6948 0ebf8283 2019-07-24 stsp goto done;
6950 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6951 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6952 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6953 0ebf8283 2019-07-24 stsp if (commit_ref)
6954 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6955 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6956 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6957 0ebf8283 2019-07-24 stsp if (err) {
6958 0ebf8283 2019-07-24 stsp free(*commit_id);
6959 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6960 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6961 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6962 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6963 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6964 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6966 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6967 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6968 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6970 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6972 0ebf8283 2019-07-24 stsp return err;
6975 0ebf8283 2019-07-24 stsp static const struct got_error *
6976 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6978 0ebf8283 2019-07-24 stsp const struct got_error *err;
6979 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6980 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6982 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6984 0ebf8283 2019-07-24 stsp goto done;
6985 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6987 0ebf8283 2019-07-24 stsp goto done;
6989 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6990 0ebf8283 2019-07-24 stsp worktree);
6992 0ebf8283 2019-07-24 stsp goto done;
6993 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6995 0ebf8283 2019-07-24 stsp goto done;
6997 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6999 0ebf8283 2019-07-24 stsp goto done;
7000 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
7002 0ebf8283 2019-07-24 stsp goto done;
7004 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7006 0ebf8283 2019-07-24 stsp goto done;
7007 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7009 0ebf8283 2019-07-24 stsp goto done;
7011 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
7012 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
7013 0ebf8283 2019-07-24 stsp free(branch_ref_name);
7014 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7015 0ebf8283 2019-07-24 stsp return err;
7018 0ebf8283 2019-07-24 stsp const struct got_error *
7019 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
7020 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7021 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
7022 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7024 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
7025 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7026 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
7027 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
7028 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
7030 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
7032 0ebf8283 2019-07-24 stsp return err;
7034 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7035 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
7037 0ebf8283 2019-07-24 stsp goto done;
7039 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7041 0ebf8283 2019-07-24 stsp goto done;
7043 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7045 0ebf8283 2019-07-24 stsp goto done;
7047 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
7048 0ebf8283 2019-07-24 stsp worktree->path_prefix);
7050 0ebf8283 2019-07-24 stsp goto done;
7052 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7054 0ebf8283 2019-07-24 stsp goto done;
7056 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
7058 0ebf8283 2019-07-24 stsp goto done;
7060 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
7061 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
7062 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
7063 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
7064 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
7065 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
7066 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
7067 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
7068 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
7070 1f1abb7e 2019-08-08 stsp goto sync;
7072 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7073 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
7075 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7076 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
7077 0ebf8283 2019-07-24 stsp err = sync_err;
7079 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
7080 0ebf8283 2019-07-24 stsp free(tree_id);
7081 818c7501 2019-07-11 stsp free(fileindex_path);
7083 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7084 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
7085 818c7501 2019-07-11 stsp err = unlockerr;
7086 818c7501 2019-07-11 stsp return err;
7089 0ebf8283 2019-07-24 stsp const struct got_error *
7090 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
7091 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7092 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
7094 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
7095 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
7096 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
7097 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7099 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7101 0ebf8283 2019-07-24 stsp return err;
7103 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7104 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7106 e600f124 2021-03-21 stsp goto done;
7108 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7109 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7111 0ebf8283 2019-07-24 stsp goto done;
7113 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7115 0ebf8283 2019-07-24 stsp goto done;
7117 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7119 0ebf8283 2019-07-24 stsp goto done;
7121 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7123 0ebf8283 2019-07-24 stsp goto done;
7125 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7127 a615e0e7 2020-12-16 stsp goto done;
7129 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7131 a615e0e7 2020-12-16 stsp goto done;
7132 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7133 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7134 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7135 a615e0e7 2020-12-16 stsp err = sync_err;
7137 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7138 a615e0e7 2020-12-16 stsp free(fileindex_path);
7139 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7140 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7141 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7142 0ebf8283 2019-07-24 stsp err = unlockerr;
7143 0ebf8283 2019-07-24 stsp return err;
7146 0ebf8283 2019-07-24 stsp const struct got_error *
7147 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7148 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7150 0ebf8283 2019-07-24 stsp const struct got_error *err;
7151 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7153 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7155 0ebf8283 2019-07-24 stsp return err;
7157 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7159 0ebf8283 2019-07-24 stsp goto done;
7161 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7163 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7164 2822a352 2019-10-15 stsp return err;
7167 2822a352 2019-10-15 stsp const struct got_error *
7168 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7169 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7170 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7171 2822a352 2019-10-15 stsp struct got_repository *repo)
7173 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7174 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7175 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7177 2822a352 2019-10-15 stsp *fileindex = NULL;
7178 2822a352 2019-10-15 stsp *branch_ref = NULL;
7179 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7181 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7183 2822a352 2019-10-15 stsp return err;
7185 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7186 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7187 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7188 2822a352 2019-10-15 stsp "update -b or different branch name required");
7189 2822a352 2019-10-15 stsp goto done;
7192 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7194 2822a352 2019-10-15 stsp goto done;
7196 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7197 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7198 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7199 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7202 2822a352 2019-10-15 stsp goto done;
7204 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7206 2822a352 2019-10-15 stsp goto done;
7208 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7209 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7211 2822a352 2019-10-15 stsp if (err) {
7212 2822a352 2019-10-15 stsp if (*branch_ref) {
7213 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7214 2822a352 2019-10-15 stsp *branch_ref = NULL;
7216 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7217 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7218 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7220 2822a352 2019-10-15 stsp if (*fileindex) {
7221 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7222 2822a352 2019-10-15 stsp *fileindex = NULL;
7224 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7226 0cb83759 2019-08-03 stsp return err;
7229 2822a352 2019-10-15 stsp const struct got_error *
7230 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7231 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7232 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7233 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7234 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7236 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7237 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7238 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7240 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7242 2822a352 2019-10-15 stsp goto done;
7244 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7246 2822a352 2019-10-15 stsp goto done;
7248 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7249 2822a352 2019-10-15 stsp worktree->path_prefix);
7251 2822a352 2019-10-15 stsp goto done;
7253 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7255 2822a352 2019-10-15 stsp goto done;
7257 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7258 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7260 2822a352 2019-10-15 stsp goto sync;
7262 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7264 2822a352 2019-10-15 stsp goto sync;
7266 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7268 6e210706 2021-01-22 stsp goto sync;
7270 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7272 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7273 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7274 2822a352 2019-10-15 stsp err = sync_err;
7277 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7278 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7279 2822a352 2019-10-15 stsp err = unlockerr;
7280 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7282 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7283 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7284 2822a352 2019-10-15 stsp err = unlockerr;
7285 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7287 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7288 2822a352 2019-10-15 stsp free(fileindex_path);
7289 2822a352 2019-10-15 stsp free(tree_id);
7291 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7292 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7293 2822a352 2019-10-15 stsp err = unlockerr;
7294 2822a352 2019-10-15 stsp return err;
7297 2822a352 2019-10-15 stsp const struct got_error *
7298 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7299 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7300 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7302 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7304 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7306 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7308 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7309 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7310 8b692cd0 2019-10-21 stsp err = unlockerr;
7311 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7313 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7314 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7315 8b692cd0 2019-10-21 stsp err = unlockerr;
7316 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7318 8b692cd0 2019-10-21 stsp return err;
7321 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7322 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7323 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7324 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7325 2db2652d 2019-08-07 stsp struct got_repository *repo;
7326 2db2652d 2019-08-07 stsp int have_changes;
7329 2db2652d 2019-08-07 stsp const struct got_error *
7330 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7331 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7332 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7333 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7335 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7336 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7337 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7338 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7339 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7340 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7342 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7343 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7344 8b13ce36 2019-08-08 stsp return NULL;
7345 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7346 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7348 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7349 735ef5ac 2019-08-03 stsp if (ie == NULL)
7350 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7352 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7353 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7354 735ef5ac 2019-08-03 stsp relpath) == -1)
7355 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7357 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7358 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7359 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7360 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7363 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7364 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7365 3aa5969e 2019-08-06 stsp goto done;
7366 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7367 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7368 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7369 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7370 735ef5ac 2019-08-03 stsp goto done;
7373 2db2652d 2019-08-07 stsp a->have_changes = 1;
7375 735ef5ac 2019-08-03 stsp p = in_repo_path;
7376 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7378 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7379 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7380 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7382 735ef5ac 2019-08-03 stsp free(in_repo_path);
7383 dc424a06 2019-08-07 stsp return err;
7386 2db2652d 2019-08-07 stsp struct stage_path_arg {
7387 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7388 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7389 2db2652d 2019-08-07 stsp struct got_repository *repo;
7390 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7391 2db2652d 2019-08-07 stsp void *status_arg;
7392 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7393 2db2652d 2019-08-07 stsp void *patch_arg;
7394 7b5dc508 2019-10-28 stsp int staged_something;
7395 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7398 2db2652d 2019-08-07 stsp static const struct got_error *
7399 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7400 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7401 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7402 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7404 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7405 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7406 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7407 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7408 0cb83759 2019-08-03 stsp uint32_t stage;
7409 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7410 0aeb8099 2020-07-23 stsp struct stat sb;
7412 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7413 8b13ce36 2019-08-08 stsp return NULL;
7415 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7416 d3e7c587 2019-08-03 stsp if (ie == NULL)
7417 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7419 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7420 2db2652d 2019-08-07 stsp relpath)== -1)
7421 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7423 0cb83759 2019-08-03 stsp switch (status) {
7424 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7425 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7426 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7427 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7428 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7431 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7432 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7433 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7434 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7435 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7438 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7441 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7442 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7443 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7444 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7445 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7449 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7450 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7453 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7454 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7455 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7456 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7458 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7459 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7460 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7461 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7462 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7463 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7464 35213c7c 2020-07-23 stsp ssize_t target_len;
7465 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7466 35213c7c 2020-07-23 stsp sizeof(target_path));
7467 35213c7c 2020-07-23 stsp if (target_len == -1) {
7468 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7469 35213c7c 2020-07-23 stsp ondisk_path);
7472 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7473 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7474 35213c7c 2020-07-23 stsp a->worktree->root_path);
7477 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7478 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7479 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7483 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7484 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7485 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7487 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7488 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7490 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7491 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7493 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7494 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7496 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7497 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7498 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7500 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7501 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7503 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7504 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7505 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7506 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7509 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7511 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7512 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7516 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
7517 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7518 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7519 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7521 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7522 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7525 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
7527 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
7528 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7530 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
7531 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
7534 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7538 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
7539 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
7540 dc424a06 2019-08-07 stsp free(path_content);
7541 2db2652d 2019-08-07 stsp free(ondisk_path);
7542 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
7543 0ebf8283 2019-07-24 stsp return err;
7546 0cb83759 2019-08-03 stsp const struct got_error *
7547 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
7548 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
7549 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
7550 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7551 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
7553 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7554 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
7555 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7556 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
7557 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
7558 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
7559 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
7560 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
7562 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7564 0cb83759 2019-08-03 stsp return err;
7566 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
7567 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
7569 735ef5ac 2019-08-03 stsp goto done;
7570 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7572 735ef5ac 2019-08-03 stsp goto done;
7573 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7575 0cb83759 2019-08-03 stsp goto done;
7577 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
7578 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
7579 2db2652d 2019-08-07 stsp oka.worktree = worktree;
7580 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
7581 2db2652d 2019-08-07 stsp oka.repo = repo;
7582 2db2652d 2019-08-07 stsp oka.have_changes = 0;
7583 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7584 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7585 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
7587 735ef5ac 2019-08-03 stsp goto done;
7589 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
7590 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7591 2db2652d 2019-08-07 stsp goto done;
7594 2db2652d 2019-08-07 stsp spa.worktree = worktree;
7595 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
7596 2db2652d 2019-08-07 stsp spa.repo = repo;
7597 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
7598 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
7599 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
7600 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
7601 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
7602 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
7603 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7604 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7605 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
7607 2db2652d 2019-08-07 stsp goto done;
7609 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
7610 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7611 7b5dc508 2019-10-28 stsp goto done;
7614 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7615 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
7616 0cb83759 2019-08-03 stsp err = sync_err;
7618 735ef5ac 2019-08-03 stsp if (head_ref)
7619 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
7620 735ef5ac 2019-08-03 stsp free(head_commit_id);
7621 0cb83759 2019-08-03 stsp free(fileindex_path);
7622 0cb83759 2019-08-03 stsp if (fileindex)
7623 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
7624 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7625 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
7626 0cb83759 2019-08-03 stsp err = unlockerr;
7627 0cb83759 2019-08-03 stsp return err;
7630 ad493afc 2019-08-03 stsp struct unstage_path_arg {
7631 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
7632 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
7633 ad493afc 2019-08-03 stsp struct got_repository *repo;
7634 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
7635 ad493afc 2019-08-03 stsp void *progress_arg;
7636 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
7637 2e1f37b0 2019-08-08 stsp void *patch_arg;
7640 2e1f37b0 2019-08-08 stsp static const struct got_error *
7641 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
7642 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
7643 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
7644 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
7645 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
7647 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
7648 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
7649 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7650 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7651 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
7652 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
7653 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
7655 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7656 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7658 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
7660 2e1f37b0 2019-08-08 stsp return err;
7661 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7663 2e1f37b0 2019-08-08 stsp goto done;
7665 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7667 2e1f37b0 2019-08-08 stsp goto done;
7669 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7671 2e1f37b0 2019-08-08 stsp goto done;
7673 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7675 2e1f37b0 2019-08-08 stsp goto done;
7677 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7679 2e1f37b0 2019-08-08 stsp goto done;
7681 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7683 2e1f37b0 2019-08-08 stsp goto done;
7685 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
7686 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
7688 2e1f37b0 2019-08-08 stsp goto done;
7690 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
7691 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
7693 2e1f37b0 2019-08-08 stsp goto done;
7694 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
7695 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
7697 2e1f37b0 2019-08-08 stsp goto done;
7699 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
7700 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
7701 2e1f37b0 2019-08-08 stsp goto done;
7703 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
7704 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
7705 2e1f37b0 2019-08-08 stsp goto done;
7707 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
7708 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
7709 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
7710 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
7711 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
7712 fe621944 2020-11-10 stsp nchanges++;
7714 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
7715 2e1f37b0 2019-08-08 stsp int choice;
7716 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
7717 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
7718 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
7719 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
7721 2e1f37b0 2019-08-08 stsp goto done;
7722 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
7723 2e1f37b0 2019-08-08 stsp have_content = 1;
7725 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
7726 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
7729 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
7730 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7731 f1e81a05 2019-08-10 stsp outfile, rejectfile);
7733 2e1f37b0 2019-08-08 stsp free(label1);
7735 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
7736 2e1f37b0 2019-08-08 stsp if (staged_blob)
7737 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
7738 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
7739 fe621944 2020-11-10 stsp if (free_err && err == NULL)
7740 fe621944 2020-11-10 stsp err = free_err;
7741 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
7742 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
7743 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
7744 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
7745 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
7746 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
7747 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7748 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
7749 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
7750 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
7751 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
7752 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
7753 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
7754 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
7755 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
7756 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7757 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
7758 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
7759 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7761 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
7762 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
7763 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
7764 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7765 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
7766 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
7767 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7769 2e1f37b0 2019-08-08 stsp free(path1);
7770 2e1f37b0 2019-08-08 stsp free(path2);
7771 fda8017d 2020-07-23 stsp return err;
7774 fda8017d 2020-07-23 stsp static const struct got_error *
7775 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
7776 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
7777 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
7778 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
7779 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
7780 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7781 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7783 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
7784 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
7785 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
7786 67a66647 2021-05-31 stsp char *parent = NULL, *base_path = NULL;
7787 67a66647 2021-05-31 stsp char *blob_base_path = NULL;
7788 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
7789 eec2f5a9 2021-06-03 stsp FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
7790 fda8017d 2020-07-23 stsp struct stat sb;
7792 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
7793 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
7794 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
7796 fda8017d 2020-07-23 stsp return err;
7798 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
7799 fda8017d 2020-07-23 stsp return NULL;
7801 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
7802 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
7803 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
7805 fda8017d 2020-07-23 stsp goto done;
7808 fda8017d 2020-07-23 stsp f = fopen(path_unstaged_content, "r");
7809 fda8017d 2020-07-23 stsp if (f == NULL) {
7810 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
7811 fda8017d 2020-07-23 stsp path_unstaged_content);
7812 fda8017d 2020-07-23 stsp goto done;
7814 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
7815 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
7816 fda8017d 2020-07-23 stsp goto done;
7818 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
7819 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
7820 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
7822 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
7823 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
7824 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
7825 fda8017d 2020-07-23 stsp goto done;
7827 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
7828 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
7829 fda8017d 2020-07-23 stsp goto done;
7831 fda8017d 2020-07-23 stsp link_target[r] = '\0';
7832 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
7833 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
7834 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
7835 fda8017d 2020-07-23 stsp progress_arg);
7837 fda8017d 2020-07-23 stsp int local_changes_subsumed;
7839 67a66647 2021-05-31 stsp err = got_path_dirname(&parent, ondisk_path);
7841 67a66647 2021-05-31 stsp return err;
7843 67a66647 2021-05-31 stsp if (asprintf(&base_path, "%s/got-unstage-blob-orig",
7844 67a66647 2021-05-31 stsp parent) == -1) {
7845 67a66647 2021-05-31 stsp err = got_error_from_errno("asprintf");
7846 67a66647 2021-05-31 stsp base_path = NULL;
7847 67a66647 2021-05-31 stsp goto done;
7850 67a66647 2021-05-31 stsp err = got_opentemp_named(&blob_base_path, &f_base, base_path);
7852 67a66647 2021-05-31 stsp goto done;
7853 67a66647 2021-05-31 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
7854 67a66647 2021-05-31 stsp blob_base);
7856 67a66647 2021-05-31 stsp goto done;
7859 eec2f5a9 2021-06-03 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
7860 eec2f5a9 2021-06-03 stsp * target path into a temporary file and use that file with diff3.
7862 eec2f5a9 2021-06-03 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
7863 eec2f5a9 2021-06-03 stsp err = dump_symlink_target_path_to_file(&f_deriv2,
7864 eec2f5a9 2021-06-03 stsp ondisk_path);
7866 eec2f5a9 2021-06-03 stsp goto done;
7869 eec2f5a9 2021-06-03 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
7870 eec2f5a9 2021-06-03 stsp if (fd == -1) {
7871 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("open", ondisk_path);
7872 eec2f5a9 2021-06-03 stsp goto done;
7874 eec2f5a9 2021-06-03 stsp f_deriv2 = fdopen(fd, "r");
7875 eec2f5a9 2021-06-03 stsp if (f_deriv2 == NULL) {
7876 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fdopen", ondisk_path);
7877 eec2f5a9 2021-06-03 stsp close(fd);
7878 eec2f5a9 2021-06-03 stsp goto done;
7882 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
7883 eec2f5a9 2021-06-03 stsp f_base, f, f_deriv2, ondisk_path, ie->path,
7884 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
7885 fdf3c2d3 2021-06-17 stsp label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
7886 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
7889 fda8017d 2020-07-23 stsp goto done;
7891 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
7892 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7893 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
7895 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7896 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
7899 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
7900 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
7901 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
7902 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
7903 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
7904 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
7905 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
7906 67a66647 2021-05-31 stsp if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
7907 67a66647 2021-05-31 stsp err = got_error_from_errno2("unlink", blob_base_path);
7908 67a66647 2021-05-31 stsp if (f_base && fclose(f_base) == EOF && err == NULL)
7909 67a66647 2021-05-31 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
7910 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
7911 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
7912 eec2f5a9 2021-06-03 stsp if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
7913 eec2f5a9 2021-06-03 stsp err = got_error_from_errno2("fclose", ondisk_path);
7914 fda8017d 2020-07-23 stsp free(path_unstaged_content);
7915 fda8017d 2020-07-23 stsp free(path_new_staged_content);
7916 67a66647 2021-05-31 stsp free(blob_base_path);
7917 67a66647 2021-05-31 stsp free(parent);
7918 67a66647 2021-05-31 stsp free(base_path);
7919 2e1f37b0 2019-08-08 stsp return err;
7922 ad493afc 2019-08-03 stsp static const struct got_error *
7923 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
7924 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
7925 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7926 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7928 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
7929 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
7930 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
7931 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7932 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
7933 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
7934 ad493afc 2019-08-03 stsp int local_changes_subsumed;
7935 9bc94a15 2019-08-03 stsp struct stat sb;
7937 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
7938 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
7939 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
7940 2e1f37b0 2019-08-08 stsp return NULL;
7942 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7943 ad493afc 2019-08-03 stsp if (ie == NULL)
7944 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7946 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7948 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
7950 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
7951 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
7953 f69721c3 2019-10-21 stsp goto done;
7954 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7955 f69721c3 2019-10-21 stsp id_str) == -1) {
7956 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
7957 f69721c3 2019-10-21 stsp goto done;
7960 ad493afc 2019-08-03 stsp switch (staged_status) {
7961 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
7962 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
7963 ad493afc 2019-08-03 stsp blob_id, 8192);
7966 ad493afc 2019-08-03 stsp /* fall through */
7967 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
7968 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7969 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
7970 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7971 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7972 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7975 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
7978 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
7979 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
7980 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
7981 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
7982 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
7983 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
7986 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
7987 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
7990 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
7991 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
7992 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
7993 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
7994 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
7995 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
7996 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
7997 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7998 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
8000 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
8001 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8002 36bf999c 2020-07-23 stsp char *staged_target;
8003 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
8004 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
8006 36bf999c 2020-07-23 stsp goto done;
8007 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
8008 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
8009 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
8010 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
8011 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
8012 36bf999c 2020-07-23 stsp free(staged_target);
8014 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
8015 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
8016 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
8017 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
8018 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
8019 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
8020 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
8024 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8027 2ac8aa02 2020-11-09 stsp if (err == NULL) {
8028 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
8029 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
8030 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8033 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
8034 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
8035 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
8036 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
8037 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
8040 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
8042 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
8043 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
8047 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8048 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
8049 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
8050 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
8053 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
8057 ad493afc 2019-08-03 stsp free(ondisk_path);
8058 ad493afc 2019-08-03 stsp if (blob_base)
8059 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
8060 ad493afc 2019-08-03 stsp if (blob_staged)
8061 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
8062 f69721c3 2019-10-21 stsp free(id_str);
8063 f69721c3 2019-10-21 stsp free(label_orig);
8064 ad493afc 2019-08-03 stsp return err;
8067 ad493afc 2019-08-03 stsp const struct got_error *
8068 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
8069 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
8070 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
8071 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
8072 ad493afc 2019-08-03 stsp struct got_repository *repo)
8074 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
8075 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
8076 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
8077 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
8078 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
8080 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
8082 ad493afc 2019-08-03 stsp return err;
8084 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8086 ad493afc 2019-08-03 stsp goto done;
8088 ad493afc 2019-08-03 stsp upa.worktree = worktree;
8089 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
8090 ad493afc 2019-08-03 stsp upa.repo = repo;
8091 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
8092 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
8093 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
8094 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
8095 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
8096 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
8097 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
8099 ad493afc 2019-08-03 stsp goto done;
8102 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
8103 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
8104 ad493afc 2019-08-03 stsp err = sync_err;
8106 ad493afc 2019-08-03 stsp free(fileindex_path);
8107 ad493afc 2019-08-03 stsp if (fileindex)
8108 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
8109 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
8110 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
8111 ad493afc 2019-08-03 stsp err = unlockerr;
8112 ad493afc 2019-08-03 stsp return err;
8115 b2118c49 2020-07-28 stsp struct report_file_info_arg {
8116 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
8117 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
8118 b2118c49 2020-07-28 stsp void *info_arg;
8119 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
8120 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
8121 b2118c49 2020-07-28 stsp void *cancel_arg;
8124 b2118c49 2020-07-28 stsp static const struct got_error *
8125 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
8127 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
8128 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
8129 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
8130 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
8131 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
8132 b2118c49 2020-07-28 stsp int stage;
8134 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
8135 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
8137 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
8138 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
8139 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
8142 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
8143 b2118c49 2020-07-28 stsp return NULL;
8145 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
8146 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
8147 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
8149 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
8150 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
8151 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
8152 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
8153 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8154 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8157 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8158 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8159 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8162 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8163 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8166 b2118c49 2020-07-28 stsp const struct got_error *
8167 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8168 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8169 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8170 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8173 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8174 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8175 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8176 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8178 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8180 b2118c49 2020-07-28 stsp return err;
8182 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8184 b2118c49 2020-07-28 stsp goto done;
8186 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8187 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8188 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8189 b2118c49 2020-07-28 stsp arg.paths = paths;
8190 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8191 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8192 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8195 b2118c49 2020-07-28 stsp free(fileindex_path);
8196 b2118c49 2020-07-28 stsp if (fileindex)
8197 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8198 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8199 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8200 b2118c49 2020-07-28 stsp err = unlockerr;
8201 b2118c49 2020-07-28 stsp return err;
