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;
440 eaccb85f 2018-12-25 stsp got_repo_close(repo);
441 7ac97322 2018-03-11 stsp free(path_got);
442 056e7441 2018-03-11 stsp free(path_lock);
443 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
444 c442a90d 2019-03-10 stsp free(uuidstr);
445 bd165944 2019-03-10 stsp free(formatstr);
447 6d9d28c3 2018-03-11 stsp if (fd != -1)
449 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
450 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
451 6d9d28c3 2018-03-11 stsp *worktree = NULL;
453 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
455 6d9d28c3 2018-03-11 stsp return err;
458 247140b2 2019-02-05 stsp const struct got_error *
459 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
461 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
462 aedea96d 2020-10-20 stsp char *worktree_path;
464 aedea96d 2020-10-20 stsp worktree_path = strdup(path);
465 aedea96d 2020-10-20 stsp if (worktree_path == NULL)
466 aedea96d 2020-10-20 stsp return got_error_from_errno("strdup");
469 aedea96d 2020-10-20 stsp char *parent_path;
471 aedea96d 2020-10-20 stsp err = open_worktree(worktree, worktree_path);
472 aedea96d 2020-10-20 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT)) {
473 aedea96d 2020-10-20 stsp free(worktree_path);
474 247140b2 2019-02-05 stsp return err;
476 aedea96d 2020-10-20 stsp if (*worktree) {
477 aedea96d 2020-10-20 stsp free(worktree_path);
478 aedea96d 2020-10-20 stsp return NULL;
480 aedea96d 2020-10-20 stsp if (worktree_path[0] == '/' && worktree_path[1] == '\0')
482 aedea96d 2020-10-20 stsp err = got_path_dirname(&parent_path, worktree_path);
484 aedea96d 2020-10-20 stsp if (err->code != GOT_ERR_BAD_PATH) {
485 aedea96d 2020-10-20 stsp free(worktree_path);
486 aedea96d 2020-10-20 stsp return err;
490 aedea96d 2020-10-20 stsp free(worktree_path);
491 aedea96d 2020-10-20 stsp worktree_path = parent_path;
494 aedea96d 2020-10-20 stsp free(worktree_path);
495 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
498 3a6ce05a 2019-02-11 stsp const struct got_error *
499 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
501 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
503 a6b21eef 2021-01-21 stsp if (worktree->lockfd != -1) {
504 08578a35 2021-01-22 stsp if (close(worktree->lockfd) == -1)
505 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
506 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
508 e7abd6b6 2021-01-22 stsp if (close(worktree->root_fd) == -1 && err == NULL)
509 e7abd6b6 2021-01-22 stsp err = got_error_from_errno2("close",
510 e7abd6b6 2021-01-22 stsp got_worktree_get_root_path(worktree));
511 60e40e95 2021-01-22 stsp free(worktree->repo_path);
512 60e40e95 2021-01-22 stsp free(worktree->path_prefix);
513 60e40e95 2021-01-22 stsp free(worktree->base_commit_id);
514 60e40e95 2021-01-22 stsp free(worktree->head_ref_name);
515 60e40e95 2021-01-22 stsp free(worktree->root_path);
516 60e40e95 2021-01-22 stsp free(worktree->gotconfig_path);
517 60e40e95 2021-01-22 stsp got_gotconfig_free(worktree->gotconfig);
518 a06ff56f 2021-01-21 naddy free(worktree);
519 3a6ce05a 2019-02-11 stsp return err;
522 2fbdb5ae 2018-12-29 stsp const char *
523 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
525 c7f4312f 2019-02-05 stsp return worktree->root_path;
528 c7f4312f 2019-02-05 stsp const char *
529 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
531 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
533 49520a32 2018-12-29 stsp const char *
534 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
536 f609be2e 2018-12-29 stsp return worktree->path_prefix;
539 e5dc7198 2018-12-29 stsp const struct got_error *
540 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
541 e5dc7198 2018-12-29 stsp const char *path_prefix)
543 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
545 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
546 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
547 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
549 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
550 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
551 e5dc7198 2018-12-29 stsp free(absprefix);
552 e5dc7198 2018-12-29 stsp return NULL;
555 bc70eb79 2019-05-09 stsp const char *
556 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
558 36a38700 2019-05-10 stsp return worktree->head_ref_name;
561 024e9686 2019-05-14 stsp const struct got_error *
562 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
563 024e9686 2019-05-14 stsp struct got_reference *head_ref)
565 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
566 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
568 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
569 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
570 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
571 024e9686 2019-05-14 stsp path_got = NULL;
575 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
576 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
577 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
581 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
585 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
586 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
588 024e9686 2019-05-14 stsp free(path_got);
590 024e9686 2019-05-14 stsp free(head_ref_name);
591 024e9686 2019-05-14 stsp return err;
594 b72f483a 2019-02-05 stsp struct got_object_id *
595 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
597 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
600 507dc3bb 2018-12-29 stsp const struct got_error *
601 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
602 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
604 507dc3bb 2018-12-29 stsp const struct got_error *err;
605 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
606 507dc3bb 2018-12-29 stsp char *id_str = NULL;
607 507dc3bb 2018-12-29 stsp char *path_got = NULL;
609 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
610 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
611 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
612 507dc3bb 2018-12-29 stsp path_got = NULL;
616 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
618 507dc3bb 2018-12-29 stsp return err;
620 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
621 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
625 507dc3bb 2018-12-29 stsp /* Record our base commit. */
626 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
629 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
633 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
634 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
635 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
636 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
641 507dc3bb 2018-12-29 stsp got_object_close(obj);
642 507dc3bb 2018-12-29 stsp free(id_str);
643 507dc3bb 2018-12-29 stsp free(path_got);
644 507dc3bb 2018-12-29 stsp return err;
647 50b0790e 2020-09-11 stsp const struct got_gotconfig *
648 50b0790e 2020-09-11 stsp got_worktree_get_gotconfig(struct got_worktree *worktree)
650 50b0790e 2020-09-11 stsp return worktree->gotconfig;
653 9d31a1d8 2018-03-11 stsp static const struct got_error *
654 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
656 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
657 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
658 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
659 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
660 86c3caaf 2018-03-09 stsp return NULL;
663 21908da4 2019-01-13 stsp static const struct got_error *
664 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
666 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
667 4a1ddfc2 2019-01-12 stsp char *abspath;
669 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
670 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
672 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
673 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
674 ddcd8544 2019-03-11 stsp struct stat sb;
675 ddcd8544 2019-03-11 stsp err = NULL;
676 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
677 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
678 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
679 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
680 3665fce0 2020-07-13 stsp err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
683 4a1ddfc2 2019-01-12 stsp free(abspath);
684 68c76935 2019-02-19 stsp return err;
687 68c76935 2019-02-19 stsp static const struct got_error *
688 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
690 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
691 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
692 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
693 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
698 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
699 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
700 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
703 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
704 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
705 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
708 68c76935 2019-02-19 stsp if (flen1 == 0) {
709 68c76935 2019-02-19 stsp if (flen2 != 0)
712 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
713 68c76935 2019-02-19 stsp if (flen1 != 0)
716 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
717 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
727 68c76935 2019-02-19 stsp return err;
730 68c76935 2019-02-19 stsp static const struct got_error *
731 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
733 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
734 68c76935 2019-02-19 stsp struct stat sb;
735 68c76935 2019-02-19 stsp size_t size1, size2;
736 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
740 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
741 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
744 68c76935 2019-02-19 stsp size1 = sb.st_size;
746 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
747 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
750 68c76935 2019-02-19 stsp size2 = sb.st_size;
752 68c76935 2019-02-19 stsp if (size1 != size2) {
754 68c76935 2019-02-19 stsp return NULL;
757 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
758 68c76935 2019-02-19 stsp if (f1 == NULL)
759 60522982 2019-12-15 stsp return got_error_from_errno2("fopen", f1_path);
761 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
762 68c76935 2019-02-19 stsp if (f2 == NULL) {
763 60522982 2019-12-15 stsp err = got_error_from_errno2("fopen", f2_path);
767 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
769 56b63ca4 2021-01-22 stsp if (f1 && fclose(f1) == EOF && err == NULL)
770 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
771 56b63ca4 2021-01-22 stsp if (f2 && fclose(f2) == EOF && err == NULL)
772 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
774 6353ad76 2019-02-08 stsp return err;
778 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
779 14c901f1 2019-08-08 stsp * the file at deriv_path acts as the first derived version, and the
780 14c901f1 2019-08-08 stsp * file on disk acts as the second derived version.
782 6353ad76 2019-02-08 stsp static const struct got_error *
783 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
784 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
785 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, const char *deriv_path,
786 f69721c3 2019-10-21 stsp const char *label_orig, const char *label_deriv,
787 f69721c3 2019-10-21 stsp struct got_repository *repo,
788 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
790 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
791 6353ad76 2019-02-08 stsp int merged_fd = -1;
792 14c901f1 2019-08-08 stsp FILE *f_orig = NULL;
793 14c901f1 2019-08-08 stsp char *blob_orig_path = NULL;
794 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
795 234035bc 2019-06-01 stsp int overlapcnt = 0;
796 3524bbf9 2020-10-20 stsp char *parent = NULL;
797 3b9f0f87 2020-07-23 stsp char *symlink_path = NULL;
798 3b9f0f87 2020-07-23 stsp FILE *symlinkf = NULL;
800 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
802 3524bbf9 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
804 3524bbf9 2020-10-20 stsp return err;
806 3524bbf9 2020-10-20 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
807 3524bbf9 2020-10-20 stsp err = got_error_from_errno("asprintf");
811 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
815 af54ae4a 2019-02-19 stsp free(base_path);
816 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
817 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
818 af54ae4a 2019-02-19 stsp base_path = NULL;
822 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
825 46b6ee73 2019-06-04 stsp if (blob_orig) {
826 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
827 46b6ee73 2019-06-04 stsp blob_orig);
832 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
833 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
834 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
839 3b9f0f87 2020-07-23 stsp * In order the run a 3-way merge with a symlink we copy the symlink's
840 3b9f0f87 2020-07-23 stsp * target path into a temporary file and use that file with diff3.
842 3b9f0f87 2020-07-23 stsp if (S_ISLNK(st_mode)) {
843 3b9f0f87 2020-07-23 stsp char target_path[PATH_MAX];
844 3b9f0f87 2020-07-23 stsp ssize_t target_len;
847 3b9f0f87 2020-07-23 stsp free(base_path);
848 3b9f0f87 2020-07-23 stsp if (asprintf(&base_path, "%s/got-symlink-merge",
849 3b9f0f87 2020-07-23 stsp parent) == -1) {
850 3b9f0f87 2020-07-23 stsp err = got_error_from_errno("asprintf");
851 3b9f0f87 2020-07-23 stsp base_path = NULL;
854 3b9f0f87 2020-07-23 stsp err = got_opentemp_named(&symlink_path, &symlinkf, base_path);
857 3b9f0f87 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
858 3b9f0f87 2020-07-23 stsp sizeof(target_path));
859 3b9f0f87 2020-07-23 stsp if (target_len == -1) {
860 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
863 3b9f0f87 2020-07-23 stsp n = fwrite(target_path, 1, target_len, symlinkf);
864 3b9f0f87 2020-07-23 stsp if (n != target_len) {
865 3b9f0f87 2020-07-23 stsp err = got_ferror(symlinkf, GOT_ERR_IO);
868 3b9f0f87 2020-07-23 stsp if (fflush(symlinkf) == EOF) {
869 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("fflush", symlink_path);
874 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
875 3b9f0f87 2020-07-23 stsp blob_orig_path, symlink_path ? symlink_path : ondisk_path,
876 3b9f0f87 2020-07-23 stsp label_deriv, label_orig, NULL);
880 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
881 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
885 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
886 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
890 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
891 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
892 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
893 68c76935 2019-02-19 stsp merged_path);
898 2ad902c0 2019-12-15 stsp if (fchmod(merged_fd, st_mode) != 0) {
899 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
903 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
904 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
905 230a42bd 2019-05-11 jcs ondisk_path);
910 fdcb7daf 2019-12-15 stsp if (merged_path)
911 fdcb7daf 2019-12-15 stsp unlink(merged_path);
913 3b9f0f87 2020-07-23 stsp if (symlink_path) {
914 3b9f0f87 2020-07-23 stsp if (unlink(symlink_path) == -1 && err == NULL)
915 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("unlink", symlink_path);
917 3b9f0f87 2020-07-23 stsp if (symlinkf && fclose(symlinkf) == EOF && err == NULL)
918 3b9f0f87 2020-07-23 stsp err = got_error_from_errno2("fclose", symlink_path);
919 3b9f0f87 2020-07-23 stsp free(symlink_path);
920 08578a35 2021-01-22 stsp if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
921 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
922 56b63ca4 2021-01-22 stsp if (f_orig && fclose(f_orig) == EOF && err == NULL)
923 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
924 6353ad76 2019-02-08 stsp free(merged_path);
925 af54ae4a 2019-02-19 stsp free(base_path);
926 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
927 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
928 46b6ee73 2019-06-04 stsp free(blob_orig_path);
930 3524bbf9 2020-10-20 stsp free(parent);
931 af57b12a 2020-07-23 stsp return err;
934 af57b12a 2020-07-23 stsp static const struct got_error *
935 af57b12a 2020-07-23 stsp update_symlink(const char *ondisk_path, const char *target_path,
936 af57b12a 2020-07-23 stsp size_t target_len)
938 af57b12a 2020-07-23 stsp /* This is not atomic but matches what 'ln -sf' does. */
939 af57b12a 2020-07-23 stsp if (unlink(ondisk_path) == -1)
940 af57b12a 2020-07-23 stsp return got_error_from_errno2("unlink", ondisk_path);
941 af57b12a 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1)
942 af57b12a 2020-07-23 stsp return got_error_from_errno3("symlink", target_path,
943 af57b12a 2020-07-23 stsp ondisk_path);
944 af57b12a 2020-07-23 stsp return NULL;
948 11cc08c1 2020-07-23 stsp * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
949 11cc08c1 2020-07-23 stsp * in the work tree with a file that contains conflict markers and the
950 993e2a1b 2020-07-23 stsp * conflicting target paths of the original version, a "derived version"
951 993e2a1b 2020-07-23 stsp * of a symlink from an incoming change, and a local version of the symlink.
953 993e2a1b 2020-07-23 stsp * The original versions's target path can be NULL if it is not available,
954 993e2a1b 2020-07-23 stsp * such as if both derived versions added a new symlink at the same path.
956 993e2a1b 2020-07-23 stsp * The incoming derived symlink target is NULL in case the incoming change
957 993e2a1b 2020-07-23 stsp * has deleted this symlink.
959 11cc08c1 2020-07-23 stsp static const struct got_error *
960 11cc08c1 2020-07-23 stsp install_symlink_conflict(const char *deriv_target,
961 11cc08c1 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, const char *orig_target,
962 11cc08c1 2020-07-23 stsp const char *label_orig, const char *local_target, const char *ondisk_path)
964 11cc08c1 2020-07-23 stsp const struct got_error *err;
965 11cc08c1 2020-07-23 stsp char *id_str = NULL, *label_deriv = NULL, *path = NULL;
966 11cc08c1 2020-07-23 stsp FILE *f = NULL;
968 11cc08c1 2020-07-23 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
970 11cc08c1 2020-07-23 stsp return got_error_from_errno("asprintf");
972 11cc08c1 2020-07-23 stsp if (asprintf(&label_deriv, "%s: commit %s",
973 11cc08c1 2020-07-23 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
974 11cc08c1 2020-07-23 stsp err = got_error_from_errno("asprintf");
978 11cc08c1 2020-07-23 stsp err = got_opentemp_named(&path, &f, "got-symlink-conflict");
980 3818e3c4 2020-11-01 naddy goto done;
982 3818e3c4 2020-11-01 naddy if (fchmod(fileno(f), GOT_DEFAULT_FILE_MODE) == -1) {
983 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path);
987 283102fc 2020-07-23 stsp if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
988 993e2a1b 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
989 993e2a1b 2020-07-23 stsp deriv_target ? deriv_target : "(symlink was deleted)",
990 11cc08c1 2020-07-23 stsp orig_target ? label_orig : "",
991 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
992 11cc08c1 2020-07-23 stsp orig_target ? orig_target : "",
993 11cc08c1 2020-07-23 stsp orig_target ? "\n" : "",
994 11cc08c1 2020-07-23 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
995 11cc08c1 2020-07-23 stsp local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
996 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fprintf", path);
1000 11cc08c1 2020-07-23 stsp if (unlink(ondisk_path) == -1) {
1001 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("unlink", ondisk_path);
1002 11cc08c1 2020-07-23 stsp goto done;
1004 11cc08c1 2020-07-23 stsp if (rename(path, ondisk_path) == -1) {
1005 11cc08c1 2020-07-23 stsp err = got_error_from_errno3("rename", path, ondisk_path);
1006 11cc08c1 2020-07-23 stsp goto done;
1009 11cc08c1 2020-07-23 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1010 11cc08c1 2020-07-23 stsp err = got_error_from_errno2("fclose", path);
1011 11cc08c1 2020-07-23 stsp free(path);
1012 11cc08c1 2020-07-23 stsp free(id_str);
1013 11cc08c1 2020-07-23 stsp free(label_deriv);
1014 11cc08c1 2020-07-23 stsp return err;
1017 d219f183 2020-07-23 stsp /* forward declaration */
1018 d219f183 2020-07-23 stsp static const struct got_error *
1019 d219f183 2020-07-23 stsp merge_blob(int *, struct got_worktree *, struct got_blob_object *,
1020 d219f183 2020-07-23 stsp const char *, const char *, uint16_t, const char *,
1021 d219f183 2020-07-23 stsp struct got_blob_object *, struct got_object_id *,
1022 d219f183 2020-07-23 stsp struct got_repository *, got_worktree_checkout_cb, void *);
1025 af57b12a 2020-07-23 stsp * Merge a symlink into the work tree, where blob_orig acts as the common
1026 36bf999c 2020-07-23 stsp * ancestor, deriv_target is the link target of the first derived version,
1027 36bf999c 2020-07-23 stsp * and the symlink on disk acts as the second derived version.
1028 af57b12a 2020-07-23 stsp * Assume that contents of both blobs represent symlinks.
1030 af57b12a 2020-07-23 stsp static const struct got_error *
1031 af57b12a 2020-07-23 stsp merge_symlink(struct got_worktree *worktree,
1032 af57b12a 2020-07-23 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
1033 36bf999c 2020-07-23 stsp const char *path, const char *label_orig, const char *deriv_target,
1034 af57b12a 2020-07-23 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1035 af57b12a 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1037 af57b12a 2020-07-23 stsp const struct got_error *err = NULL;
1038 36bf999c 2020-07-23 stsp char *ancestor_target = NULL;
1039 af57b12a 2020-07-23 stsp struct stat sb;
1040 11cc08c1 2020-07-23 stsp ssize_t ondisk_len, deriv_len;
1041 af57b12a 2020-07-23 stsp char ondisk_target[PATH_MAX];
1042 11cc08c1 2020-07-23 stsp int have_local_change = 0;
1043 11cc08c1 2020-07-23 stsp int have_incoming_change = 0;
1045 af57b12a 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1)
1046 af57b12a 2020-07-23 stsp return got_error_from_errno2("lstat", ondisk_path);
1048 af57b12a 2020-07-23 stsp ondisk_len = readlink(ondisk_path, ondisk_target,
1049 af57b12a 2020-07-23 stsp sizeof(ondisk_target));
1050 af57b12a 2020-07-23 stsp if (ondisk_len == -1) {
1051 af57b12a 2020-07-23 stsp err = got_error_from_errno2("readlink",
1052 af57b12a 2020-07-23 stsp ondisk_path);
1053 af57b12a 2020-07-23 stsp goto done;
1055 56d815a9 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
1057 526a746f 2020-07-23 stsp if (blob_orig) {
1058 526a746f 2020-07-23 stsp err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
1060 526a746f 2020-07-23 stsp goto done;
1063 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
1064 11cc08c1 2020-07-23 stsp (ondisk_len != strlen(ancestor_target) ||
1065 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
1066 11cc08c1 2020-07-23 stsp have_local_change = 1;
1068 11cc08c1 2020-07-23 stsp deriv_len = strlen(deriv_target);
1069 11cc08c1 2020-07-23 stsp if (ancestor_target == NULL ||
1070 11cc08c1 2020-07-23 stsp (deriv_len != strlen(ancestor_target) ||
1071 11cc08c1 2020-07-23 stsp memcmp(deriv_target, ancestor_target, deriv_len) != 0))
1072 11cc08c1 2020-07-23 stsp have_incoming_change = 1;
1074 11cc08c1 2020-07-23 stsp if (!have_local_change && !have_incoming_change) {
1075 11cc08c1 2020-07-23 stsp if (ancestor_target) {
1076 11cc08c1 2020-07-23 stsp /* Both sides made the same change. */
1077 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1079 11cc08c1 2020-07-23 stsp } else if (deriv_len == ondisk_len &&
1080 11cc08c1 2020-07-23 stsp memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
1081 11cc08c1 2020-07-23 stsp /* Both sides added the same symlink. */
1082 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1085 11cc08c1 2020-07-23 stsp /* Both sides added symlinks which don't match. */
1086 11cc08c1 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1087 11cc08c1 2020-07-23 stsp deriv_base_commit_id, ancestor_target,
1088 11cc08c1 2020-07-23 stsp label_orig, ondisk_target, ondisk_path);
1090 11cc08c1 2020-07-23 stsp goto done;
1091 11cc08c1 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1094 11cc08c1 2020-07-23 stsp } else if (!have_local_change && have_incoming_change) {
1095 af57b12a 2020-07-23 stsp /* Apply the incoming change. */
1096 af57b12a 2020-07-23 stsp err = update_symlink(ondisk_path, deriv_target,
1097 af57b12a 2020-07-23 stsp strlen(deriv_target));
1099 af57b12a 2020-07-23 stsp goto done;
1100 af57b12a 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1101 11cc08c1 2020-07-23 stsp } else if (have_local_change && have_incoming_change) {
1102 ea7786be 2020-07-23 stsp if (deriv_len == ondisk_len &&
1103 ea7786be 2020-07-23 stsp memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
1104 ea7786be 2020-07-23 stsp /* Both sides made the same change. */
1105 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
1108 ea7786be 2020-07-23 stsp err = install_symlink_conflict(deriv_target,
1109 ea7786be 2020-07-23 stsp deriv_base_commit_id, ancestor_target, label_orig,
1110 ea7786be 2020-07-23 stsp ondisk_target, ondisk_path);
1112 ea7786be 2020-07-23 stsp goto done;
1113 ea7786be 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
1119 af57b12a 2020-07-23 stsp free(ancestor_target);
1120 14c901f1 2019-08-08 stsp return err;
1124 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
1125 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
1126 14c901f1 2019-08-08 stsp * acts as the second derived version.
1128 14c901f1 2019-08-08 stsp static const struct got_error *
1129 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
1130 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
1131 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
1132 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
1133 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
1134 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1136 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
1137 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
1138 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
1139 ed6b5030 2020-10-20 stsp char *label_deriv = NULL, *parent = NULL;
1141 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
1143 ed6b5030 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1145 ed6b5030 2020-10-20 stsp return err;
1147 14c901f1 2019-08-08 stsp free(base_path);
1148 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1149 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1150 14c901f1 2019-08-08 stsp base_path = NULL;
1151 14c901f1 2019-08-08 stsp goto done;
1154 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
1156 14c901f1 2019-08-08 stsp goto done;
1157 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1158 14c901f1 2019-08-08 stsp blob_deriv);
1160 14c901f1 2019-08-08 stsp goto done;
1162 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
1164 14c901f1 2019-08-08 stsp goto done;
1165 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
1166 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1167 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
1168 14c901f1 2019-08-08 stsp goto done;
1171 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
1172 f69721c3 2019-10-21 stsp ondisk_path, path, st_mode, blob_deriv_path, label_orig,
1173 f69721c3 2019-10-21 stsp label_deriv, repo, progress_cb, progress_arg);
1175 56b63ca4 2021-01-22 stsp if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1176 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
1177 14c901f1 2019-08-08 stsp free(base_path);
1178 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
1179 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
1180 14c901f1 2019-08-08 stsp free(blob_deriv_path);
1182 6353ad76 2019-02-08 stsp free(id_str);
1183 818c7501 2019-07-11 stsp free(label_deriv);
1184 ed6b5030 2020-10-20 stsp free(parent);
1185 4a1ddfc2 2019-01-12 stsp return err;
1188 4a1ddfc2 2019-01-12 stsp static const struct got_error *
1189 65b05cec 2020-07-23 stsp create_fileindex_entry(struct got_fileindex_entry **new_iep,
1190 65b05cec 2020-07-23 stsp struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1191 437adc9d 2020-12-10 yzhong int wt_fd, const char *path, struct got_object_id *blob_id)
1193 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
1194 054041d0 2020-06-24 stsp struct got_fileindex_entry *new_ie;
1196 65b05cec 2020-07-23 stsp *new_iep = NULL;
1198 054041d0 2020-06-24 stsp err = got_fileindex_entry_alloc(&new_ie, path);
1200 054041d0 2020-06-24 stsp return err;
1202 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(new_ie, wt_fd, path,
1203 054041d0 2020-06-24 stsp blob_id->sha1, base_commit_id->sha1, 1);
1205 054041d0 2020-06-24 stsp goto done;
1207 054041d0 2020-06-24 stsp err = got_fileindex_entry_add(fileindex, new_ie);
1210 054041d0 2020-06-24 stsp got_fileindex_entry_free(new_ie);
1212 65b05cec 2020-07-23 stsp *new_iep = new_ie;
1213 13d9040b 2019-03-27 stsp return err;
1216 1ebedb77 2019-10-19 stsp static mode_t
1217 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
1219 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
1221 1ebedb77 2019-10-19 stsp if (executable) {
1222 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
1223 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
1224 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
1225 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
1226 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
1227 1ebedb77 2019-10-19 stsp return st_mode | xbits;
1230 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
1233 8ba819a3 2020-07-23 stsp /* forward declaration */
1234 13d9040b 2019-03-27 stsp static const struct got_error *
1235 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1236 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
1237 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
1238 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1239 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1240 8ba819a3 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg);
1243 5a1fbc73 2020-07-23 stsp * This function assumes that the provided symlink target points at a
1244 5a1fbc73 2020-07-23 stsp * safe location in the work tree!
1246 8ba819a3 2020-07-23 stsp static const struct got_error *
1247 5a1fbc73 2020-07-23 stsp replace_existing_symlink(const char *ondisk_path, const char *target_path,
1248 5a1fbc73 2020-07-23 stsp size_t target_len)
1250 5a1fbc73 2020-07-23 stsp const struct got_error *err = NULL;
1251 5a1fbc73 2020-07-23 stsp ssize_t elen;
1252 5a1fbc73 2020-07-23 stsp char etarget[PATH_MAX];
1256 5a1fbc73 2020-07-23 stsp * "Bad" symlinks (those pointing outside the work tree or into the
1257 5a1fbc73 2020-07-23 stsp * .got directory) are installed in the work tree as a regular file
1258 5a1fbc73 2020-07-23 stsp * which contains the bad symlink target path.
1259 5a1fbc73 2020-07-23 stsp * The new symlink target has already been checked for safety by our
1260 5a1fbc73 2020-07-23 stsp * caller. If we can successfully open a regular file then we simply
1261 5a1fbc73 2020-07-23 stsp * replace this file with a symlink below.
1263 5a1fbc73 2020-07-23 stsp fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
1264 5a1fbc73 2020-07-23 stsp if (fd == -1) {
1265 5a1fbc73 2020-07-23 stsp if (errno != ELOOP)
1266 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("open", ondisk_path);
1268 5a1fbc73 2020-07-23 stsp /* We are updating an existing on-disk symlink. */
1269 5a1fbc73 2020-07-23 stsp elen = readlink(ondisk_path, etarget, sizeof(etarget));
1270 5a1fbc73 2020-07-23 stsp if (elen == -1)
1271 5a1fbc73 2020-07-23 stsp return got_error_from_errno2("readlink", ondisk_path);
1273 5a1fbc73 2020-07-23 stsp if (elen == target_len &&
1274 5a1fbc73 2020-07-23 stsp memcmp(etarget, target_path, target_len) == 0)
1275 5a1fbc73 2020-07-23 stsp return NULL; /* nothing to do */
1278 5a1fbc73 2020-07-23 stsp err = update_symlink(ondisk_path, target_path, target_len);
1279 5a1fbc73 2020-07-23 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1280 5a1fbc73 2020-07-23 stsp err = got_error_from_errno2("close", ondisk_path);
1281 5a1fbc73 2020-07-23 stsp return err;
1284 3c1ec782 2020-07-23 stsp static const struct got_error *
1285 3c1ec782 2020-07-23 stsp is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1286 3c1ec782 2020-07-23 stsp size_t target_len, const char *ondisk_path, const char *wtroot_path)
1288 3c1ec782 2020-07-23 stsp const struct got_error *err = NULL;
1289 3c1ec782 2020-07-23 stsp char canonpath[PATH_MAX];
1290 3c1ec782 2020-07-23 stsp char *path_got = NULL;
1292 3c1ec782 2020-07-23 stsp *is_bad_symlink = 0;
1294 3c1ec782 2020-07-23 stsp if (target_len >= sizeof(canonpath)) {
1295 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1296 3c1ec782 2020-07-23 stsp return NULL;
1300 3c1ec782 2020-07-23 stsp * We do not use realpath(3) to resolve the symlink's target
1301 3c1ec782 2020-07-23 stsp * path because we don't want to resolve symlinks recursively.
1302 3c1ec782 2020-07-23 stsp * Instead we make the path absolute and then canonicalize it.
1303 3c1ec782 2020-07-23 stsp * Relative symlink target lookup should begin at the directory
1304 3c1ec782 2020-07-23 stsp * in which the blob object is being installed.
1306 3c1ec782 2020-07-23 stsp if (!got_path_is_absolute(target_path)) {
1307 ce031e9e 2020-10-20 stsp char *abspath, *parent;
1308 ce031e9e 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1310 ce031e9e 2020-10-20 stsp return err;
1311 ce031e9e 2020-10-20 stsp if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1312 ce031e9e 2020-10-20 stsp free(parent);
1313 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1315 ce031e9e 2020-10-20 stsp free(parent);
1316 3c1ec782 2020-07-23 stsp if (strlen(abspath) >= sizeof(canonpath)) {
1317 3c1ec782 2020-07-23 stsp err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1318 3c1ec782 2020-07-23 stsp free(abspath);
1319 3c1ec782 2020-07-23 stsp return err;
1321 3c1ec782 2020-07-23 stsp err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1322 3c1ec782 2020-07-23 stsp free(abspath);
1324 3c1ec782 2020-07-23 stsp return err;
1326 3c1ec782 2020-07-23 stsp err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1328 3c1ec782 2020-07-23 stsp return err;
1331 3c1ec782 2020-07-23 stsp /* Only allow symlinks pointing at paths within the work tree. */
1332 3c1ec782 2020-07-23 stsp if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1333 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1334 3c1ec782 2020-07-23 stsp return NULL;
1337 3c1ec782 2020-07-23 stsp /* Do not allow symlinks pointing into the .got directory. */
1338 3c1ec782 2020-07-23 stsp if (asprintf(&path_got, "%s/%s", wtroot_path,
1339 3c1ec782 2020-07-23 stsp GOT_WORKTREE_GOT_DIR) == -1)
1340 3c1ec782 2020-07-23 stsp return got_error_from_errno("asprintf");
1341 3c1ec782 2020-07-23 stsp if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1342 3c1ec782 2020-07-23 stsp *is_bad_symlink = 1;
1344 3c1ec782 2020-07-23 stsp free(path_got);
1345 3c1ec782 2020-07-23 stsp return NULL;
1348 5a1fbc73 2020-07-23 stsp static const struct got_error *
1349 2e1fa222 2020-07-23 stsp install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1350 2e1fa222 2020-07-23 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
1351 2e1fa222 2020-07-23 stsp int restoring_missing_file, int reverting_versioned_file,
1352 c90c8ce3 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1353 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1355 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1356 8ba819a3 2020-07-23 stsp char target_path[PATH_MAX];
1357 8ba819a3 2020-07-23 stsp size_t len, target_len = 0;
1358 906c123b 2020-07-23 stsp char *path_got = NULL;
1359 8ba819a3 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1360 8ba819a3 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1362 2e1fa222 2020-07-23 stsp *is_bad_symlink = 0;
1365 8ba819a3 2020-07-23 stsp * Blob object content specifies the target path of the link.
1366 8ba819a3 2020-07-23 stsp * If a symbolic link cannot be installed we instead create
1367 8ba819a3 2020-07-23 stsp * a regular file which contains the link target path stored
1368 8ba819a3 2020-07-23 stsp * in the blob object.
1371 8ba819a3 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1372 8ba819a3 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1373 8ba819a3 2020-07-23 stsp /* Path too long; install as a regular file. */
1374 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1375 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1376 8ba819a3 2020-07-23 stsp return install_blob(worktree, ondisk_path, path,
1377 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1378 8ba819a3 2020-07-23 stsp restoring_missing_file, reverting_versioned_file,
1379 3b9f0f87 2020-07-23 stsp 1, path_is_unversioned, repo, progress_cb,
1380 3b9f0f87 2020-07-23 stsp progress_arg);
1382 8ba819a3 2020-07-23 stsp if (len > 0) {
1383 8ba819a3 2020-07-23 stsp /* Skip blob object header first time around. */
1384 8ba819a3 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1385 8ba819a3 2020-07-23 stsp len - hdrlen);
1386 8ba819a3 2020-07-23 stsp target_len += len - hdrlen;
1387 8ba819a3 2020-07-23 stsp hdrlen = 0;
1389 8ba819a3 2020-07-23 stsp } while (len != 0);
1390 8ba819a3 2020-07-23 stsp target_path[target_len] = '\0';
1392 3c1ec782 2020-07-23 stsp err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1393 3c1ec782 2020-07-23 stsp ondisk_path, worktree->root_path);
1395 3c1ec782 2020-07-23 stsp return err;
1397 3c1ec782 2020-07-23 stsp if (*is_bad_symlink) {
1398 906c123b 2020-07-23 stsp /* install as a regular file */
1399 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1400 906c123b 2020-07-23 stsp got_object_blob_rewind(blob);
1401 906c123b 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1402 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1403 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1404 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo, progress_cb, progress_arg);
1405 906c123b 2020-07-23 stsp goto done;
1408 8ba819a3 2020-07-23 stsp if (symlink(target_path, ondisk_path) == -1) {
1409 8ba819a3 2020-07-23 stsp if (errno == EEXIST) {
1410 c90c8ce3 2020-07-23 stsp if (path_is_unversioned) {
1411 c90c8ce3 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1412 c90c8ce3 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1413 c90c8ce3 2020-07-23 stsp goto done;
1415 5a1fbc73 2020-07-23 stsp err = replace_existing_symlink(ondisk_path,
1416 5a1fbc73 2020-07-23 stsp target_path, target_len);
1418 f35fa46a 2020-07-23 stsp goto done;
1419 5a1fbc73 2020-07-23 stsp if (progress_cb) {
1420 5a1fbc73 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1421 6e1eade5 2020-07-23 stsp reverting_versioned_file ?
1422 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_UPDATE,
1425 5a1fbc73 2020-07-23 stsp goto done; /* Nothing else to do. */
1428 f35fa46a 2020-07-23 stsp if (errno == ENOENT) {
1429 f4994adc 2020-10-20 stsp char *parent;
1430 f4994adc 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
1432 f4994adc 2020-10-20 stsp goto done;
1433 f35fa46a 2020-07-23 stsp err = add_dir_on_disk(worktree, parent);
1434 f4994adc 2020-10-20 stsp free(parent);
1436 f35fa46a 2020-07-23 stsp goto done;
1438 f35fa46a 2020-07-23 stsp * Retry, and fall through to error handling
1439 f35fa46a 2020-07-23 stsp * below if this second attempt fails.
1441 f35fa46a 2020-07-23 stsp if (symlink(target_path, ondisk_path) != -1) {
1442 f35fa46a 2020-07-23 stsp err = NULL; /* success */
1443 f35fa46a 2020-07-23 stsp goto done;
1447 f35fa46a 2020-07-23 stsp /* Handle errors from first or second creation attempt. */
1448 f35fa46a 2020-07-23 stsp if (errno == ENAMETOOLONG) {
1449 8ba819a3 2020-07-23 stsp /* bad target path; install as a regular file */
1450 2e1fa222 2020-07-23 stsp *is_bad_symlink = 1;
1451 8ba819a3 2020-07-23 stsp got_object_blob_rewind(blob);
1452 8ba819a3 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
1453 b88d214a 2020-07-23 stsp GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1454 bd6aa359 2020-07-23 stsp restoring_missing_file, reverting_versioned_file, 1,
1455 3b9f0f87 2020-07-23 stsp path_is_unversioned, repo,
1456 3b9f0f87 2020-07-23 stsp progress_cb, progress_arg);
1457 8ba819a3 2020-07-23 stsp } else if (errno == ENOTDIR) {
1458 8ba819a3 2020-07-23 stsp err = got_error_path(ondisk_path,
1459 8ba819a3 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
1461 8ba819a3 2020-07-23 stsp err = got_error_from_errno3("symlink",
1462 8ba819a3 2020-07-23 stsp target_path, ondisk_path);
1464 bd6aa359 2020-07-23 stsp } else if (progress_cb)
1465 6e1eade5 2020-07-23 stsp err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1466 6e1eade5 2020-07-23 stsp GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1468 906c123b 2020-07-23 stsp free(path_got);
1469 8ba819a3 2020-07-23 stsp return err;
1472 8ba819a3 2020-07-23 stsp static const struct got_error *
1473 8ba819a3 2020-07-23 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
1474 8ba819a3 2020-07-23 stsp const char *path, mode_t te_mode, mode_t st_mode,
1475 8ba819a3 2020-07-23 stsp struct got_blob_object *blob, int restoring_missing_file,
1476 bd6aa359 2020-07-23 stsp int reverting_versioned_file, int installing_bad_symlink,
1477 3b9f0f87 2020-07-23 stsp int path_is_unversioned, struct got_repository *repo,
1478 3b9f0f87 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1480 8ba819a3 2020-07-23 stsp const struct got_error *err = NULL;
1481 507dc3bb 2018-12-29 stsp int fd = -1;
1482 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
1483 507dc3bb 2018-12-29 stsp int update = 0;
1484 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
1486 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1487 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
1488 9d31a1d8 2018-03-11 stsp if (fd == -1) {
1489 21908da4 2019-01-13 stsp if (errno == ENOENT) {
1490 f5375317 2020-10-20 stsp char *parent;
1491 f5375317 2020-10-20 stsp err = got_path_dirname(&parent, path);
1493 f5375317 2020-10-20 stsp return err;
1494 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
1495 f5375317 2020-10-20 stsp free(parent);
1497 21908da4 2019-01-13 stsp return err;
1498 21908da4 2019-01-13 stsp fd = open(ondisk_path,
1499 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
1500 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
1501 21908da4 2019-01-13 stsp if (fd == -1)
1502 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
1503 230a42bd 2019-05-11 jcs ondisk_path);
1504 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
1505 3b9f0f87 2020-07-23 stsp if (path_is_unversioned) {
1506 3b9f0f87 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1507 3b9f0f87 2020-07-23 stsp GOT_STATUS_UNVERSIONED, path);
1508 3b9f0f87 2020-07-23 stsp goto done;
1510 f6d8c0ac 2020-11-09 stsp if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1511 f6d8c0ac 2020-11-09 stsp !S_ISREG(st_mode) && !installing_bad_symlink) {
1512 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
1513 3665fce0 2020-07-13 stsp err = got_error_path(ondisk_path,
1514 3665fce0 2020-07-13 stsp GOT_ERR_FILE_OBSTRUCTED);
1515 507dc3bb 2018-12-29 stsp goto done;
1517 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
1518 507dc3bb 2018-12-29 stsp ondisk_path);
1520 507dc3bb 2018-12-29 stsp goto done;
1521 507dc3bb 2018-12-29 stsp update = 1;
1524 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
1527 3818e3c4 2020-11-01 naddy if (fchmod(fd, get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1528 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod",
1529 3818e3c4 2020-11-01 naddy update ? tmppath : ondisk_path);
1530 3818e3c4 2020-11-01 naddy goto done;
1533 bd6aa359 2020-07-23 stsp if (progress_cb) {
1534 bd6aa359 2020-07-23 stsp if (restoring_missing_file)
1535 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1537 bd6aa359 2020-07-23 stsp else if (reverting_versioned_file)
1538 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1541 bd6aa359 2020-07-23 stsp err = (*progress_cb)(progress_arg,
1542 bd6aa359 2020-07-23 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1544 bd6aa359 2020-07-23 stsp goto done;
1547 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1549 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1550 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
1553 9d31a1d8 2018-03-11 stsp if (len > 0) {
1554 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1555 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1556 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1557 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1558 b87c6f83 2018-12-24 stsp goto done;
1559 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1560 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1561 b87c6f83 2018-12-24 stsp goto done;
1563 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1565 9d31a1d8 2018-03-11 stsp } while (len != 0);
1567 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1568 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1569 816dc654 2019-02-16 stsp goto done;
1572 507dc3bb 2018-12-29 stsp if (update) {
1573 f6d8c0ac 2020-11-09 stsp if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1574 f6d8c0ac 2020-11-09 stsp err = got_error_from_errno2("unlink", ondisk_path);
1575 f6d8c0ac 2020-11-09 stsp goto done;
1577 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1578 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1579 230a42bd 2019-05-11 jcs ondisk_path);
1580 68ed9ba5 2019-02-10 stsp goto done;
1582 63df146d 2020-11-09 stsp free(tmppath);
1583 63df146d 2020-11-09 stsp tmppath = NULL;
1587 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1588 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1589 63df146d 2020-11-09 stsp if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1590 63df146d 2020-11-09 stsp err = got_error_from_errno2("unlink", tmppath);
1591 507dc3bb 2018-12-29 stsp free(tmppath);
1592 6353ad76 2019-02-08 stsp return err;
1595 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1596 6353ad76 2019-02-08 stsp static const struct got_error *
1597 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1599 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1600 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1601 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1602 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1603 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1605 7154f6ce 2019-03-27 stsp int i = 0;
1606 9bdd68dd 2020-01-02 naddy char *line = NULL;
1607 9bdd68dd 2020-01-02 naddy size_t linesize = 0;
1608 9bdd68dd 2020-01-02 naddy ssize_t linelen;
1610 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1611 9bdd68dd 2020-01-02 naddy linelen = getline(&line, &linesize, f);
1612 9bdd68dd 2020-01-02 naddy if (linelen == -1) {
1613 7154f6ce 2019-03-27 stsp if (feof(f))
1615 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1619 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1620 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1622 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1627 9bdd68dd 2020-01-02 naddy free(line);
1629 7154f6ce 2019-03-27 stsp return err;
1632 e2b1e152 2019-07-13 stsp static int
1633 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1635 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1636 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1639 1ebedb77 2019-10-19 stsp static int
1640 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1642 0823ffc2 2020-09-10 naddy return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1643 0823ffc2 2020-09-10 naddy ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1644 0823ffc2 2020-09-10 naddy ie->mtime_sec == sb->st_mtim.tv_sec &&
1645 0823ffc2 2020-09-10 naddy ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1646 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1647 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1650 c363b2c1 2019-08-03 stsp static unsigned char
1651 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1653 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1654 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1655 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1656 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1657 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1658 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1659 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1661 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1665 a919d5c4 2020-07-23 stsp static const struct got_error *
1666 f9eec9d5 2020-07-23 stsp get_symlink_modification_status(unsigned char *status,
1667 a919d5c4 2020-07-23 stsp struct got_fileindex_entry *ie, const char *abspath,
1668 a919d5c4 2020-07-23 stsp int dirfd, const char *de_name, struct got_blob_object *blob)
1670 a919d5c4 2020-07-23 stsp const struct got_error *err = NULL;
1671 a919d5c4 2020-07-23 stsp char target_path[PATH_MAX];
1672 a919d5c4 2020-07-23 stsp char etarget[PATH_MAX];
1673 a919d5c4 2020-07-23 stsp ssize_t elen;
1674 a919d5c4 2020-07-23 stsp size_t len, target_len = 0;
1675 a919d5c4 2020-07-23 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
1676 a919d5c4 2020-07-23 stsp size_t hdrlen = got_object_blob_get_hdrlen(blob);
1678 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_NO_CHANGE;
1680 a919d5c4 2020-07-23 stsp /* Blob object content specifies the target path of the link. */
1682 a919d5c4 2020-07-23 stsp err = got_object_blob_read_block(&len, blob);
1684 a919d5c4 2020-07-23 stsp return err;
1685 a919d5c4 2020-07-23 stsp if (len + target_len >= sizeof(target_path)) {
1687 a919d5c4 2020-07-23 stsp * Should not happen. The blob contents were OK
1688 a919d5c4 2020-07-23 stsp * when this symlink was installed.
1690 a919d5c4 2020-07-23 stsp return got_error(GOT_ERR_NO_SPACE);
1692 a919d5c4 2020-07-23 stsp if (len > 0) {
1693 a919d5c4 2020-07-23 stsp /* Skip blob object header first time around. */
1694 a919d5c4 2020-07-23 stsp memcpy(target_path + target_len, buf + hdrlen,
1695 a919d5c4 2020-07-23 stsp len - hdrlen);
1696 a919d5c4 2020-07-23 stsp target_len += len - hdrlen;
1697 a919d5c4 2020-07-23 stsp hdrlen = 0;
1699 a919d5c4 2020-07-23 stsp } while (len != 0);
1700 a919d5c4 2020-07-23 stsp target_path[target_len] = '\0';
1702 a919d5c4 2020-07-23 stsp if (dirfd != -1) {
1703 a919d5c4 2020-07-23 stsp elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1704 a919d5c4 2020-07-23 stsp if (elen == -1)
1705 a919d5c4 2020-07-23 stsp return got_error_from_errno2("readlinkat", abspath);
1707 a919d5c4 2020-07-23 stsp elen = readlink(abspath, etarget, sizeof(etarget));
1708 a919d5c4 2020-07-23 stsp if (elen == -1)
1709 b448fd00 2020-07-23 stsp return got_error_from_errno2("readlink", abspath);
1712 a919d5c4 2020-07-23 stsp if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1713 a919d5c4 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1715 a919d5c4 2020-07-23 stsp return NULL;
1718 7154f6ce 2019-03-27 stsp static const struct got_error *
1719 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1720 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1721 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1723 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1724 6353ad76 2019-02-08 stsp struct got_object_id id;
1725 6353ad76 2019-02-08 stsp size_t hdrlen;
1726 1338848f 2019-12-13 stsp int fd = -1;
1727 6353ad76 2019-02-08 stsp FILE *f = NULL;
1728 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1729 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1730 6353ad76 2019-02-08 stsp size_t flen, blen;
1731 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1733 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1734 4cc1f028 2021-03-23 stsp memset(sb, 0, sizeof(*sb));
1737 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1738 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1739 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1741 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1742 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1743 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1744 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1745 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1747 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1748 882ef1b9 2019-12-13 stsp goto done;
1750 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1751 3d35a492 2019-12-13 stsp goto done;
1754 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1755 a919d5c4 2020-07-23 stsp if (fd == -1 && errno != ENOENT && errno != ELOOP)
1756 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1757 a919d5c4 2020-07-23 stsp else if (fd == -1 && errno == ELOOP) {
1758 a919d5c4 2020-07-23 stsp if (lstat(abspath, sb) == -1)
1759 a919d5c4 2020-07-23 stsp return got_error_from_errno2("lstat", abspath);
1760 a919d5c4 2020-07-23 stsp } else if (fd == -1 || fstat(fd, sb) == -1) {
1761 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1762 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1763 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1765 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1766 3d35a492 2019-12-13 stsp goto done;
1768 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1769 1338848f 2019-12-13 stsp goto done;
1773 00bb5ea0 2020-07-23 stsp if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1774 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1775 1338848f 2019-12-13 stsp goto done;
1778 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1779 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1780 1338848f 2019-12-13 stsp goto done;
1781 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1782 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1783 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1784 1338848f 2019-12-13 stsp goto done;
1787 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1788 f179e66d 2020-07-23 stsp goto done;
1790 f179e66d 2020-07-23 stsp if (S_ISLNK(sb->st_mode) &&
1791 f179e66d 2020-07-23 stsp got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1792 f179e66d 2020-07-23 stsp *status = GOT_STATUS_MODIFY;
1793 1338848f 2019-12-13 stsp goto done;
1796 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1797 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1798 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1800 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1802 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1804 1338848f 2019-12-13 stsp goto done;
1806 a919d5c4 2020-07-23 stsp if (S_ISLNK(sb->st_mode)) {
1807 f9eec9d5 2020-07-23 stsp err = get_symlink_modification_status(status, ie,
1808 f9eec9d5 2020-07-23 stsp abspath, dirfd, de_name, blob);
1809 a919d5c4 2020-07-23 stsp goto done;
1812 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1813 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1814 ab0d4361 2019-12-13 stsp if (fd == -1) {
1815 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1816 ab0d4361 2019-12-13 stsp goto done;
1820 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1821 6353ad76 2019-02-08 stsp if (f == NULL) {
1822 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1823 6353ad76 2019-02-08 stsp goto done;
1826 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1828 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1829 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1831 7154f6ce 2019-03-27 stsp goto done;
1832 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1833 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1834 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1835 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1836 7154f6ce 2019-03-27 stsp goto done;
1838 4a26d3f8 2020-10-07 stsp if (blen - hdrlen == 0) {
1839 6353ad76 2019-02-08 stsp if (flen != 0)
1840 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1842 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1843 4a26d3f8 2020-10-07 stsp if (blen - hdrlen != 0)
1844 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1846 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1847 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1848 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1849 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1853 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1856 6353ad76 2019-02-08 stsp hdrlen = 0;
1859 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1860 7154f6ce 2019-03-27 stsp rewind(f);
1861 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1862 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1863 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1866 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1867 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1868 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1869 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1870 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1871 9d31a1d8 2018-03-11 stsp return err;
1875 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1876 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1878 e2b1e152 2019-07-13 stsp static const struct got_error *
1879 437adc9d 2020-12-10 yzhong sync_timestamps(int wt_fd, const char *path, unsigned char status,
1880 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1882 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1883 437adc9d 2020-12-10 yzhong return got_fileindex_entry_update(ie, wt_fd, path,
1884 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1886 e2b1e152 2019-07-13 stsp return NULL;
1889 9d31a1d8 2018-03-11 stsp static const struct got_error *
1890 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1891 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1892 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1893 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1894 0584f854 2019-04-06 stsp void *progress_arg)
1896 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1897 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1898 6353ad76 2019-02-08 stsp char *ondisk_path;
1899 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1900 b8f41171 2019-02-10 stsp struct stat sb;
1902 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1903 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1906 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1907 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1908 a76c42e6 2019-08-03 stsp goto done;
1910 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1913 abb4604f 2019-07-27 stsp goto done;
1914 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1915 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1917 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1918 c90c8ce3 2020-07-23 stsp status = GOT_STATUS_UNVERSIONED;
1921 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1922 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1923 b8f41171 2019-02-10 stsp goto done;
1925 5036ab18 2020-04-18 stsp if (status == GOT_STATUS_CONFLICT) {
1926 5036ab18 2020-04-18 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1928 5036ab18 2020-04-18 stsp goto done;
1931 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1932 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1933 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1934 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1935 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1936 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1937 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1939 e2b1e152 2019-07-13 stsp goto done;
1940 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1942 6353ad76 2019-02-08 stsp goto done;
1944 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1945 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1946 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1947 437adc9d 2020-12-10 yzhong err = sync_timestamps(worktree->root_fd,
1948 437adc9d 2020-12-10 yzhong path, status, ie, &sb);
1949 b8f41171 2019-02-10 stsp goto done;
1953 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1955 6353ad76 2019-02-08 stsp goto done;
1957 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1958 234035bc 2019-06-01 stsp int update_timestamps;
1959 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1960 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1961 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1962 234035bc 2019-06-01 stsp struct got_object_id id2;
1963 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1964 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1966 f69721c3 2019-10-21 stsp goto done;
1968 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1969 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1970 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1971 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1972 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1973 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1974 f69721c3 2019-10-21 stsp goto done;
1976 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1977 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1978 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1979 234035bc 2019-06-01 stsp goto done;
1982 dfe9fba0 2020-07-23 stsp if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1983 36bf999c 2020-07-23 stsp char *link_target;
1984 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target, blob);
1986 36bf999c 2020-07-23 stsp goto done;
1987 36bf999c 2020-07-23 stsp err = merge_symlink(worktree, blob2, ondisk_path, path,
1988 36bf999c 2020-07-23 stsp label_orig, link_target, worktree->base_commit_id,
1989 36bf999c 2020-07-23 stsp repo, progress_cb, progress_arg);
1990 36bf999c 2020-07-23 stsp free(link_target);
1992 993e2a1b 2020-07-23 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1993 993e2a1b 2020-07-23 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1994 993e2a1b 2020-07-23 stsp worktree->base_commit_id, repo,
1995 993e2a1b 2020-07-23 stsp progress_cb, progress_arg);
1997 f69721c3 2019-10-21 stsp free(label_orig);
1998 234035bc 2019-06-01 stsp if (blob2)
1999 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
2001 909d120e 2019-09-22 stsp goto done;
2003 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
2004 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
2005 234035bc 2019-06-01 stsp * unmodified files again.
2007 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2008 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
2009 234035bc 2019-06-01 stsp update_timestamps);
2010 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
2011 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2012 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2013 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
2014 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
2016 1ee397ad 2019-07-12 stsp goto done;
2017 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd, path,
2018 054041d0 2020-06-24 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
2020 13d9040b 2019-03-27 stsp goto done;
2022 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2023 2e1fa222 2020-07-23 stsp if (S_ISLNK(te->mode)) {
2024 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink, worktree,
2025 2e1fa222 2020-07-23 stsp ondisk_path, path, blob,
2026 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_MISSING, 0,
2027 c90c8ce3 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2028 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2030 2e1fa222 2020-07-23 stsp err = install_blob(worktree, ondisk_path, path,
2031 2e1fa222 2020-07-23 stsp te->mode, sb.st_mode, blob,
2032 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_MISSING, 0, 0,
2033 3b9f0f87 2020-07-23 stsp status == GOT_STATUS_UNVERSIONED, repo,
2034 2e1fa222 2020-07-23 stsp progress_cb, progress_arg);
2037 13d9040b 2019-03-27 stsp goto done;
2040 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2041 437adc9d 2020-12-10 yzhong worktree->root_fd, path, blob->id.sha1,
2042 437adc9d 2020-12-10 yzhong worktree->base_commit_id->sha1, 1);
2044 65b05cec 2020-07-23 stsp err = create_fileindex_entry(&ie, fileindex,
2045 437adc9d 2020-12-10 yzhong worktree->base_commit_id, worktree->root_fd, path,
2046 054041d0 2020-06-24 stsp &blob->id);
2049 13d9040b 2019-03-27 stsp goto done;
2051 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
2052 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
2053 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
2056 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
2058 6353ad76 2019-02-08 stsp free(ondisk_path);
2059 8da9e5f4 2019-01-12 stsp return err;
2062 90285c3b 2019-01-08 stsp static const struct got_error *
2063 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
2065 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
2066 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
2068 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2069 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2071 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
2072 c97665ae 2019-01-13 stsp if (errno != ENOENT)
2073 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
2075 fddefe3b 2020-10-20 stsp size_t root_len = strlen(root_path);
2077 fddefe3b 2020-10-20 stsp char *parent;
2078 fddefe3b 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
2081 fddefe3b 2020-10-20 stsp free(ondisk_path);
2082 fddefe3b 2020-10-20 stsp ondisk_path = parent;
2083 fddefe3b 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
2084 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
2085 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
2086 fddefe3b 2020-10-20 stsp ondisk_path);
2089 fddefe3b 2020-10-20 stsp } while (got_path_cmp(ondisk_path, root_path,
2090 fddefe3b 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
2092 90285c3b 2019-01-08 stsp free(ondisk_path);
2093 90285c3b 2019-01-08 stsp return err;
2096 708d8e67 2019-03-27 stsp static const struct got_error *
2097 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2098 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
2099 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2101 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
2102 708d8e67 2019-03-27 stsp unsigned char status;
2103 708d8e67 2019-03-27 stsp struct stat sb;
2104 708d8e67 2019-03-27 stsp char *ondisk_path;
2106 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2107 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2109 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2111 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2113 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2115 5a58a424 2020-06-23 stsp goto done;
2117 993e2a1b 2020-07-23 stsp if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2118 993e2a1b 2020-07-23 stsp char ondisk_target[PATH_MAX];
2119 993e2a1b 2020-07-23 stsp ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2120 993e2a1b 2020-07-23 stsp sizeof(ondisk_target));
2121 993e2a1b 2020-07-23 stsp if (ondisk_len == -1) {
2122 993e2a1b 2020-07-23 stsp err = got_error_from_errno2("readlink", ondisk_path);
2123 993e2a1b 2020-07-23 stsp goto done;
2125 993e2a1b 2020-07-23 stsp ondisk_target[ondisk_len] = '\0';
2126 993e2a1b 2020-07-23 stsp err = install_symlink_conflict(NULL, worktree->base_commit_id,
2127 993e2a1b 2020-07-23 stsp NULL, NULL, /* XXX pass common ancestor info? */
2128 993e2a1b 2020-07-23 stsp ondisk_target, ondisk_path);
2130 993e2a1b 2020-07-23 stsp goto done;
2131 993e2a1b 2020-07-23 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2132 993e2a1b 2020-07-23 stsp ie->path);
2133 993e2a1b 2020-07-23 stsp goto done;
2136 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2137 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
2138 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2140 5a58a424 2020-06-23 stsp goto done;
2142 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
2143 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
2145 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, worktree->root_fd,
2146 437adc9d 2020-12-10 yzhong ie->path, NULL, NULL, 0);
2148 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2150 5a58a424 2020-06-23 stsp goto done;
2151 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
2152 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
2154 5a58a424 2020-06-23 stsp goto done;
2156 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
2159 5a58a424 2020-06-23 stsp free(ondisk_path);
2160 fc6346c4 2019-03-27 stsp return err;
2163 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
2164 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
2165 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
2166 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
2167 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
2168 8da9e5f4 2019-01-12 stsp void *progress_arg;
2169 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2170 8da9e5f4 2019-01-12 stsp void *cancel_arg;
2173 512f0d0e 2019-01-02 stsp static const struct got_error *
2174 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
2175 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
2177 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2179 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2180 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2182 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
2183 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
2186 8da9e5f4 2019-01-12 stsp static const struct got_error *
2187 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2189 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2191 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2192 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2194 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
2195 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2198 9d31a1d8 2018-03-11 stsp static const struct got_error *
2199 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2201 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
2202 8da9e5f4 2019-01-12 stsp const struct got_error *err;
2203 8da9e5f4 2019-01-12 stsp char *path;
2205 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2206 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2208 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
2209 63c5ca5d 2019-08-24 stsp return NULL;
2211 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
2212 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
2214 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2216 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
2217 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
2219 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2220 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
2222 8da9e5f4 2019-01-12 stsp free(path);
2223 0cd1c46a 2019-03-11 stsp return err;
2226 b2118c49 2020-07-28 stsp const struct got_error *
2227 b2118c49 2020-07-28 stsp got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2229 b2118c49 2020-07-28 stsp uint32_t uuid_status;
2231 b2118c49 2020-07-28 stsp uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2232 b2118c49 2020-07-28 stsp if (uuid_status != uuid_s_ok) {
2233 b2118c49 2020-07-28 stsp *uuidstr = NULL;
2234 b2118c49 2020-07-28 stsp return got_error_uuid(uuid_status, "uuid_to_string");
2237 b2118c49 2020-07-28 stsp return NULL;
2240 818c7501 2019-07-11 stsp static const struct got_error *
2241 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2243 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
2244 0647c563 2019-03-11 stsp char *uuidstr = NULL;
2246 517bab73 2019-03-11 stsp *refname = NULL;
2248 b2118c49 2020-07-28 stsp err = got_worktree_get_uuid(&uuidstr, worktree);
2250 b2118c49 2020-07-28 stsp return err;
2252 b2118c49 2020-07-28 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2253 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2254 0647c563 2019-03-11 stsp *refname = NULL;
2256 517bab73 2019-03-11 stsp free(uuidstr);
2257 517bab73 2019-03-11 stsp return err;
2260 818c7501 2019-07-11 stsp const struct got_error *
2261 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2263 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2266 818c7501 2019-07-11 stsp static const struct got_error *
2267 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2269 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2270 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2273 818c7501 2019-07-11 stsp static const struct got_error *
2274 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2276 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2279 818c7501 2019-07-11 stsp static const struct got_error *
2280 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2282 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2283 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2286 818c7501 2019-07-11 stsp static const struct got_error *
2287 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2289 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
2290 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2293 0ebf8283 2019-07-24 stsp static const struct got_error *
2294 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2296 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2297 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2300 0ebf8283 2019-07-24 stsp static const struct got_error *
2301 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2303 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2304 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2307 0ebf8283 2019-07-24 stsp static const struct got_error *
2308 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2310 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2311 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2314 0ebf8283 2019-07-24 stsp static const struct got_error *
2315 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2317 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
2318 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2321 0ebf8283 2019-07-24 stsp const struct got_error *
2322 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
2323 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
2325 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
2326 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2327 0ebf8283 2019-07-24 stsp *path = NULL;
2328 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
2330 0ebf8283 2019-07-24 stsp return NULL;
2334 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
2335 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
2337 517bab73 2019-03-11 stsp static const struct got_error *
2338 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2340 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
2341 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
2342 517bab73 2019-03-11 stsp char *refname;
2344 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
2346 517bab73 2019-03-11 stsp return err;
2348 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2350 0cd1c46a 2019-03-11 stsp goto done;
2352 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
2354 0cd1c46a 2019-03-11 stsp free(refname);
2356 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
2357 3e3a69f1 2019-07-25 stsp return err;
2360 3e3a69f1 2019-07-25 stsp static const struct got_error *
2361 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2363 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
2365 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2366 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2367 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
2368 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
2370 9d31a1d8 2018-03-11 stsp return err;
2374 ebf99748 2019-05-09 stsp static const struct got_error *
2375 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2376 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
2378 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
2379 ebf99748 2019-05-09 stsp FILE *index = NULL;
2381 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2382 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
2383 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
2384 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
2386 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
2388 ebf99748 2019-05-09 stsp goto done;
2390 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
2391 ebf99748 2019-05-09 stsp if (index == NULL) {
2392 ebf99748 2019-05-09 stsp if (errno != ENOENT)
2393 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
2395 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
2396 56b63ca4 2021-01-22 stsp if (fclose(index) == EOF && err == NULL)
2397 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2400 ebf99748 2019-05-09 stsp if (err) {
2401 ebf99748 2019-05-09 stsp free(*fileindex_path);
2402 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
2403 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
2404 ebf99748 2019-05-09 stsp *fileindex = NULL;
2406 ebf99748 2019-05-09 stsp return err;
2409 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
2410 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
2411 c932eeeb 2019-05-22 stsp const char *path;
2412 c932eeeb 2019-05-22 stsp size_t path_len;
2413 c932eeeb 2019-05-22 stsp const char *entry_name;
2414 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
2415 a484d721 2019-06-10 stsp void *progress_arg;
2418 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
2419 c932eeeb 2019-05-22 stsp static const struct got_error *
2420 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2422 1ee397ad 2019-07-12 stsp const struct got_error *err;
2423 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
2425 c932eeeb 2019-05-22 stsp if (a->entry_name) {
2426 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
2427 c932eeeb 2019-05-22 stsp return NULL;
2428 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2429 102ff934 2019-06-11 stsp return NULL;
2431 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2432 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
2433 c932eeeb 2019-05-22 stsp return NULL;
2435 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
2436 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2437 edd02c5e 2019-07-11 stsp ie->path);
2439 1ee397ad 2019-07-12 stsp return err;
2441 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2442 c932eeeb 2019-05-22 stsp return NULL;
2445 a615e0e7 2020-12-16 stsp static const struct got_error *
2446 a615e0e7 2020-12-16 stsp bump_base_commit_id_everywhere(struct got_worktree *worktree,
2447 a615e0e7 2020-12-16 stsp struct got_fileindex *fileindex,
2448 a615e0e7 2020-12-16 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
2450 a615e0e7 2020-12-16 stsp struct bump_base_commit_id_arg bbc_arg;
2452 a615e0e7 2020-12-16 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2453 a615e0e7 2020-12-16 stsp bbc_arg.entry_name = NULL;
2454 a615e0e7 2020-12-16 stsp bbc_arg.path = "";
2455 a615e0e7 2020-12-16 stsp bbc_arg.path_len = 0;
2456 a615e0e7 2020-12-16 stsp bbc_arg.progress_cb = progress_cb;
2457 a615e0e7 2020-12-16 stsp bbc_arg.progress_arg = progress_arg;
2459 a615e0e7 2020-12-16 stsp return got_fileindex_for_each_entry_safe(fileindex,
2460 a615e0e7 2020-12-16 stsp bump_base_commit_id, &bbc_arg);
2463 9c6338c4 2019-06-02 stsp static const struct got_error *
2464 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2466 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
2467 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
2468 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
2469 867630bb 2020-01-17 stsp struct timespec timeout;
2471 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
2472 9c6338c4 2019-06-02 stsp fileindex_path);
2474 9c6338c4 2019-06-02 stsp goto done;
2476 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
2478 9c6338c4 2019-06-02 stsp goto done;
2480 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
2481 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
2482 9c6338c4 2019-06-02 stsp fileindex_path);
2483 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
2487 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
2488 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
2489 867630bb 2020-01-17 stsp * was recorded in the file index.
2491 62d463ca 2020-10-20 naddy timeout.tv_sec = 0;
2492 62d463ca 2020-10-20 naddy timeout.tv_nsec = 1;
2493 62d463ca 2020-10-20 naddy nanosleep(&timeout, NULL);
2495 9c6338c4 2019-06-02 stsp if (new_index)
2496 9c6338c4 2019-06-02 stsp fclose(new_index);
2497 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
2498 9c6338c4 2019-06-02 stsp return err;
2501 6ced4176 2019-07-12 stsp static const struct got_error *
2502 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2503 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
2504 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
2506 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
2507 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
2508 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
2509 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2511 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2512 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2513 6ced4176 2019-07-12 stsp *tree_id = NULL;
2515 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
2516 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
2517 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
2518 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2519 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2520 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2521 6ced4176 2019-07-12 stsp goto done;
2523 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2524 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
2526 6ced4176 2019-07-12 stsp goto done;
2527 6ced4176 2019-07-12 stsp return NULL;
2530 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
2532 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2533 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
2534 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2535 6ced4176 2019-07-12 stsp goto done;
2538 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
2539 6ced4176 2019-07-12 stsp in_repo_path);
2541 6ced4176 2019-07-12 stsp goto done;
2543 6ced4176 2019-07-12 stsp free(in_repo_path);
2544 6ced4176 2019-07-12 stsp in_repo_path = NULL;
2546 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
2548 6ced4176 2019-07-12 stsp goto done;
2550 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2551 6ced4176 2019-07-12 stsp /* Check out a single file. */
2552 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
2553 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
2554 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
2555 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
2556 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2557 6ced4176 2019-07-12 stsp goto done;
2559 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
2560 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2561 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2562 6ced4176 2019-07-12 stsp goto done;
2565 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
2566 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
2568 6ced4176 2019-07-12 stsp return err;
2569 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
2570 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
2571 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
2572 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
2573 6ced4176 2019-07-12 stsp goto done;
2576 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
2577 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
2579 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
2580 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
2581 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
2582 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
2583 6ced4176 2019-07-12 stsp goto done;
2585 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
2586 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
2587 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
2588 6ced4176 2019-07-12 stsp goto done;
2593 6ced4176 2019-07-12 stsp free(in_repo_path);
2594 6ced4176 2019-07-12 stsp if (err) {
2595 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
2596 6ced4176 2019-07-12 stsp free(*tree_relpath);
2597 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
2598 6ced4176 2019-07-12 stsp free(*tree_id);
2599 6ced4176 2019-07-12 stsp *tree_id = NULL;
2601 07ed472d 2019-07-12 stsp return err;
2604 07ed472d 2019-07-12 stsp static const struct got_error *
2605 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2606 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2607 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2608 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2610 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
2611 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
2612 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
2613 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
2614 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
2616 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
2617 7f47418f 2019-12-20 stsp if (err) {
2618 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
2619 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
2620 7f47418f 2019-12-20 stsp goto done;
2621 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
2622 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2624 7f47418f 2019-12-20 stsp return err;
2627 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
2628 62d463ca 2020-10-20 naddy worktree->base_commit_id);
2630 07ed472d 2019-07-12 stsp goto done;
2632 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2634 07ed472d 2019-07-12 stsp goto done;
2636 07ed472d 2019-07-12 stsp if (entry_name &&
2637 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
2638 b66cd6f3 2020-07-31 stsp err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2639 07ed472d 2019-07-12 stsp goto done;
2642 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
2643 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
2644 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
2645 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
2646 07ed472d 2019-07-12 stsp arg.worktree = worktree;
2647 07ed472d 2019-07-12 stsp arg.repo = repo;
2648 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
2649 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
2650 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
2651 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
2652 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
2653 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
2656 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
2657 07ed472d 2019-07-12 stsp if (commit)
2658 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
2659 6ced4176 2019-07-12 stsp return err;
2662 9d31a1d8 2018-03-11 stsp const struct got_error *
2663 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
2664 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2665 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2666 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2668 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2669 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
2670 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
2671 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
2672 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2673 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
2674 f2ea84fa 2019-07-27 stsp struct tree_path_data {
2675 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
2676 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
2677 f2ea84fa 2019-07-27 stsp int entry_type;
2678 f2ea84fa 2019-07-27 stsp char *relpath;
2679 f2ea84fa 2019-07-27 stsp char *entry_name;
2680 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
2681 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
2683 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
2685 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
2687 9d31a1d8 2018-03-11 stsp return err;
2689 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
2690 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2691 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
2692 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
2693 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
2694 f2ea84fa 2019-07-27 stsp goto done;
2697 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
2698 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
2699 f2ea84fa 2019-07-27 stsp if (err) {
2700 f2ea84fa 2019-07-27 stsp free(tpd);
2701 6ced4176 2019-07-12 stsp goto done;
2704 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2705 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
2706 f2ea84fa 2019-07-27 stsp if (err) {
2707 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2708 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2709 f2ea84fa 2019-07-27 stsp free(tpd);
2710 f2ea84fa 2019-07-27 stsp goto done;
2713 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
2715 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
2719 51514078 2018-12-25 stsp * Read the file index.
2720 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
2721 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
2723 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2725 c4cdcb68 2019-04-03 stsp goto done;
2727 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2728 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2729 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2731 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2732 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2733 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2737 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2738 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2739 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2740 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2741 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2742 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2743 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2744 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2748 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2750 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2751 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2752 af12c6b9 2019-06-04 stsp err = sync_err;
2754 9c6338c4 2019-06-02 stsp free(fileindex_path);
2756 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2757 9d31a1d8 2018-03-11 stsp if (commit)
2758 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2759 5ade8233 2019-07-12 stsp if (fileindex)
2760 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2761 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2762 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2763 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2764 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2765 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2766 f2ea84fa 2019-07-27 stsp free(tpd);
2768 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2769 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2770 9d31a1d8 2018-03-11 stsp err = unlockerr;
2771 f8d1f275 2019-02-04 stsp return err;
2774 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2775 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2776 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2777 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2778 234035bc 2019-06-01 stsp void *progress_arg;
2779 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2780 234035bc 2019-06-01 stsp void *cancel_arg;
2781 f69721c3 2019-10-21 stsp const char *label_orig;
2782 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2785 234035bc 2019-06-01 stsp static const struct got_error *
2786 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2787 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2788 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2789 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2791 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2792 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2793 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2794 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2795 234035bc 2019-06-01 stsp struct stat sb;
2796 234035bc 2019-06-01 stsp unsigned char status;
2797 234035bc 2019-06-01 stsp int local_changes_subsumed;
2799 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2800 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2801 d6c87207 2019-08-02 stsp strlen(path2));
2802 1ee397ad 2019-07-12 stsp if (ie == NULL)
2803 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2804 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2806 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2807 234035bc 2019-06-01 stsp path2) == -1)
2808 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2810 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2813 234035bc 2019-06-01 stsp goto done;
2815 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2816 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2817 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2818 234035bc 2019-06-01 stsp goto done;
2820 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2821 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2822 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2823 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2824 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2825 234035bc 2019-06-01 stsp goto done;
2828 af57b12a 2020-07-23 stsp if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2829 36bf999c 2020-07-23 stsp char *link_target2;
2830 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2, blob2);
2832 36bf999c 2020-07-23 stsp goto done;
2833 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob1, ondisk_path,
2834 36bf999c 2020-07-23 stsp path2, a->label_orig, link_target2, a->commit_id2,
2835 36bf999c 2020-07-23 stsp repo, a->progress_cb, a->progress_arg);
2836 36bf999c 2020-07-23 stsp free(link_target2);
2838 af57b12a 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2839 af57b12a 2020-07-23 stsp blob1, ondisk_path, path2, sb.st_mode,
2840 af57b12a 2020-07-23 stsp a->label_orig, blob2, a->commit_id2, repo,
2841 af57b12a 2020-07-23 stsp a->progress_cb, a->progress_arg);
2843 234035bc 2019-06-01 stsp } else if (blob1) {
2844 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2845 d6c87207 2019-08-02 stsp strlen(path1));
2846 1ee397ad 2019-07-12 stsp if (ie == NULL)
2847 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2848 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2850 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2851 2b92fad7 2019-06-02 stsp path1) == -1)
2852 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2854 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2857 2b92fad7 2019-06-02 stsp goto done;
2859 2b92fad7 2019-06-02 stsp switch (status) {
2860 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2861 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2862 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2864 1ee397ad 2019-07-12 stsp goto done;
2865 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2867 2b92fad7 2019-06-02 stsp goto done;
2869 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2871 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2872 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2873 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2874 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2876 1ee397ad 2019-07-12 stsp goto done;
2878 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2880 0a22ca1a 2020-09-23 stsp case GOT_STATUS_ADD: {
2881 0a22ca1a 2020-09-23 stsp struct got_object_id *id;
2882 0a22ca1a 2020-09-23 stsp FILE *blob1_f;
2884 0a22ca1a 2020-09-23 stsp * Delete the added file only if its content already
2885 0a22ca1a 2020-09-23 stsp * exists in the repository.
2887 0a22ca1a 2020-09-23 stsp err = got_object_blob_file_create(&id, &blob1_f, path1);
2889 0a22ca1a 2020-09-23 stsp goto done;
2890 0a22ca1a 2020-09-23 stsp if (got_object_id_cmp(id, id1) == 0) {
2891 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2892 0a22ca1a 2020-09-23 stsp GOT_STATUS_DELETE, path1);
2894 0a22ca1a 2020-09-23 stsp goto done;
2895 0a22ca1a 2020-09-23 stsp err = remove_ondisk_file(a->worktree->root_path,
2898 0a22ca1a 2020-09-23 stsp goto done;
2900 0a22ca1a 2020-09-23 stsp got_fileindex_entry_remove(a->fileindex,
2903 0a22ca1a 2020-09-23 stsp err = (*a->progress_cb)(a->progress_arg,
2904 0a22ca1a 2020-09-23 stsp GOT_STATUS_CANNOT_DELETE, path1);
2906 0a22ca1a 2020-09-23 stsp if (fclose(blob1_f) == EOF && err == NULL)
2907 0a22ca1a 2020-09-23 stsp err = got_error_from_errno("fclose");
2910 0a22ca1a 2020-09-23 stsp goto done;
2913 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2914 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2915 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2916 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2918 1ee397ad 2019-07-12 stsp goto done;
2920 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2921 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2923 1ee397ad 2019-07-12 stsp goto done;
2928 234035bc 2019-06-01 stsp } else if (blob2) {
2929 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2930 234035bc 2019-06-01 stsp path2) == -1)
2931 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2932 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2933 d6c87207 2019-08-02 stsp strlen(path2));
2935 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2936 7f91a133 2019-12-13 stsp -1, NULL, repo);
2938 234035bc 2019-06-01 stsp goto done;
2939 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2940 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2941 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2942 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2943 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2944 1ee397ad 2019-07-12 stsp status, path2);
2945 234035bc 2019-06-01 stsp goto done;
2947 dfe9fba0 2020-07-23 stsp if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
2948 36bf999c 2020-07-23 stsp char *link_target2;
2949 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(&link_target2,
2952 36bf999c 2020-07-23 stsp goto done;
2953 526a746f 2020-07-23 stsp err = merge_symlink(a->worktree, NULL,
2954 dfe9fba0 2020-07-23 stsp ondisk_path, path2, a->label_orig,
2955 36bf999c 2020-07-23 stsp link_target2, a->commit_id2, repo,
2956 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
2957 36bf999c 2020-07-23 stsp free(link_target2);
2958 dfe9fba0 2020-07-23 stsp } else if (S_ISREG(sb.st_mode)) {
2959 526a746f 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
2960 526a746f 2020-07-23 stsp a->worktree, NULL, ondisk_path, path2,
2961 526a746f 2020-07-23 stsp sb.st_mode, a->label_orig, blob2,
2962 526a746f 2020-07-23 stsp a->commit_id2, repo, a->progress_cb,
2963 526a746f 2020-07-23 stsp a->progress_arg);
2965 dfe9fba0 2020-07-23 stsp err = got_error_path(ondisk_path,
2966 dfe9fba0 2020-07-23 stsp GOT_ERR_FILE_OBSTRUCTED);
2969 dfe9fba0 2020-07-23 stsp goto done;
2970 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2971 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
2972 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, blob2->id.sha1,
2973 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 0);
2975 234035bc 2019-06-01 stsp goto done;
2978 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
2979 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2980 2e1fa222 2020-07-23 stsp if (S_ISLNK(mode2)) {
2981 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
2982 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, path2, blob2, 0,
2983 c90c8ce3 2020-07-23 stsp 0, 1, repo, a->progress_cb, a->progress_arg);
2985 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path, path2,
2986 3b9f0f87 2020-07-23 stsp mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
2987 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
2990 234035bc 2019-06-01 stsp goto done;
2991 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, path2);
2993 234035bc 2019-06-01 stsp goto done;
2994 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
2995 437adc9d 2020-12-10 yzhong a->worktree->root_fd, path2, NULL, NULL, 1);
2996 3969253a 2020-03-07 stsp if (err) {
2997 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
2998 3969253a 2020-03-07 stsp goto done;
3000 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3001 2b92fad7 2019-06-02 stsp if (err) {
3002 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
3003 2b92fad7 2019-06-02 stsp goto done;
3005 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
3006 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
3007 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
3012 234035bc 2019-06-01 stsp free(ondisk_path);
3013 234035bc 2019-06-01 stsp return err;
3016 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
3017 234035bc 2019-06-01 stsp struct got_worktree *worktree;
3018 234035bc 2019-06-01 stsp struct got_repository *repo;
3021 234035bc 2019-06-01 stsp static const struct got_error *
3022 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
3024 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
3025 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
3026 234035bc 2019-06-01 stsp unsigned char status;
3027 234035bc 2019-06-01 stsp struct stat sb;
3028 234035bc 2019-06-01 stsp char *ondisk_path;
3030 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
3031 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3032 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
3033 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
3035 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3037 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
3039 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
3040 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3042 234035bc 2019-06-01 stsp return err;
3043 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
3044 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
3046 234035bc 2019-06-01 stsp return NULL;
3049 818c7501 2019-07-11 stsp static const struct got_error *
3050 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3051 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
3052 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
3053 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3054 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3056 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3057 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3058 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3059 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
3060 f69721c3 2019-10-21 stsp char *label_orig = NULL;
3062 03415a1a 2019-06-02 stsp if (commit_id1) {
3063 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
3064 03415a1a 2019-06-02 stsp worktree->path_prefix);
3065 69d57f3d 2020-07-31 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3066 03415a1a 2019-06-02 stsp goto done;
3068 69d57f3d 2020-07-31 stsp if (tree_id1) {
3069 69d57f3d 2020-07-31 stsp char *id_str;
3071 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3073 03415a1a 2019-06-02 stsp goto done;
3075 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
3077 f69721c3 2019-10-21 stsp goto done;
3079 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
3080 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
3081 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
3082 f69721c3 2019-10-21 stsp free(id_str);
3083 f69721c3 2019-10-21 stsp goto done;
3085 f69721c3 2019-10-21 stsp free(id_str);
3088 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
3089 234035bc 2019-06-01 stsp worktree->path_prefix);
3091 234035bc 2019-06-01 stsp goto done;
3093 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3095 234035bc 2019-06-01 stsp goto done;
3097 234035bc 2019-06-01 stsp arg.worktree = worktree;
3098 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
3099 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
3100 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
3101 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
3102 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
3103 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
3104 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
3105 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
3106 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3107 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3108 af12c6b9 2019-06-04 stsp err = sync_err;
3110 234035bc 2019-06-01 stsp if (tree1)
3111 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
3112 234035bc 2019-06-01 stsp if (tree2)
3113 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
3114 f69721c3 2019-10-21 stsp free(label_orig);
3115 818c7501 2019-07-11 stsp return err;
3118 818c7501 2019-07-11 stsp const struct got_error *
3119 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
3120 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3121 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3122 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3124 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3125 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3126 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3127 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
3129 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3131 818c7501 2019-07-11 stsp return err;
3133 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3135 818c7501 2019-07-11 stsp goto done;
3137 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
3138 818c7501 2019-07-11 stsp mok_arg.repo = repo;
3139 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
3140 818c7501 2019-07-11 stsp &mok_arg);
3142 818c7501 2019-07-11 stsp goto done;
3144 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3145 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
3147 818c7501 2019-07-11 stsp if (fileindex)
3148 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3149 818c7501 2019-07-11 stsp free(fileindex_path);
3150 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3151 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
3152 234035bc 2019-06-01 stsp err = unlockerr;
3153 234035bc 2019-06-01 stsp return err;
3156 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
3157 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
3158 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
3159 927df6b7 2019-02-10 stsp const char *status_path;
3160 927df6b7 2019-02-10 stsp size_t status_path_len;
3161 f8d1f275 2019-02-04 stsp struct got_repository *repo;
3162 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
3163 f8d1f275 2019-02-04 stsp void *status_arg;
3164 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
3165 f8d1f275 2019-02-04 stsp void *cancel_arg;
3166 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
3167 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
3168 f2a9dc41 2019-12-13 tracey int report_unchanged;
3169 3143d852 2020-06-25 stsp int no_ignores;
3172 f8d1f275 2019-02-04 stsp static const struct got_error *
3173 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3174 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
3175 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3176 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
3178 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
3179 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
3180 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
3181 927df6b7 2019-02-10 stsp struct stat sb;
3182 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
3183 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3184 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
3186 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3188 98eaaa12 2019-08-03 stsp return err;
3190 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
3191 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3192 98eaaa12 2019-08-03 stsp return NULL;
3194 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
3195 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3196 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
3198 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
3199 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3200 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
3202 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3203 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3204 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3205 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3206 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
3209 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
3210 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3213 927df6b7 2019-02-10 stsp static const struct got_error *
3214 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
3215 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
3217 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3218 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3219 f8d1f275 2019-02-04 stsp char *abspath;
3221 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3222 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3224 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
3225 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
3226 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3227 927df6b7 2019-02-10 stsp return NULL;
3229 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3230 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3231 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
3232 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3234 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3235 f8d1f275 2019-02-04 stsp de->d_name) == -1)
3236 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3239 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
3240 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3241 f8d1f275 2019-02-04 stsp free(abspath);
3242 9d31a1d8 2018-03-11 stsp return err;
3245 f8d1f275 2019-02-04 stsp static const struct got_error *
3246 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3248 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3249 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
3250 2ec1f75b 2019-03-26 stsp unsigned char status;
3252 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3253 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3255 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3256 927df6b7 2019-02-10 stsp return NULL;
3258 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3259 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3260 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
3261 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
3263 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
3264 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3265 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3269 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
3271 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3273 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
3274 6841da00 2019-08-08 stsp free((char *)pe->path);
3275 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
3279 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
3281 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3283 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
3284 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3285 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3286 6841da00 2019-08-08 stsp free((char *)pe->path);
3288 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
3291 6841da00 2019-08-08 stsp static const struct got_error *
3292 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3294 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3295 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
3296 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
3297 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
3298 6841da00 2019-08-08 stsp size_t linesize = 0;
3299 6841da00 2019-08-08 stsp ssize_t linelen;
3301 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
3302 6841da00 2019-08-08 stsp if (ignorelist == NULL)
3303 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
3304 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
3306 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
3307 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
3308 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
3310 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
3311 bd8de430 2019-10-04 stsp if (line[0] == '#')
3314 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
3315 bd8de430 2019-10-04 stsp if (line[0] == '!')
3318 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3319 6841da00 2019-08-08 stsp line) == -1) {
3320 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
3321 6841da00 2019-08-08 stsp goto done;
3323 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3325 6841da00 2019-08-08 stsp goto done;
3327 6841da00 2019-08-08 stsp if (ferror(f)) {
3328 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
3329 6841da00 2019-08-08 stsp goto done;
3332 6841da00 2019-08-08 stsp dirpath = strdup(path);
3333 6841da00 2019-08-08 stsp if (dirpath == NULL) {
3334 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
3335 6841da00 2019-08-08 stsp goto done;
3337 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3339 6841da00 2019-08-08 stsp free(line);
3340 6841da00 2019-08-08 stsp if (err || pe == NULL) {
3341 6841da00 2019-08-08 stsp free(dirpath);
3342 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
3344 6841da00 2019-08-08 stsp return err;
3348 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
3350 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
3352 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
3353 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
3354 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
3355 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
3357 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3358 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
3360 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
3362 bd8de430 2019-10-04 stsp pattern += 3;
3364 bd8de430 2019-10-04 stsp while (*p) {
3365 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
3366 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
3367 bd8de430 2019-10-04 stsp /* Retry in next directory. */
3368 bd8de430 2019-10-04 stsp while (*p && *p != '/')
3370 bd8de430 2019-10-04 stsp while (*p == '/')
3380 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
3381 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
3382 6841da00 2019-08-08 stsp * ignores backwards.
3384 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
3385 6841da00 2019-08-08 stsp while (pe) {
3386 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
3387 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
3388 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
3389 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
3390 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
3391 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
3392 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
3393 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
3394 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
3399 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3405 6841da00 2019-08-08 stsp static const struct got_error *
3406 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3407 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
3409 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
3410 6841da00 2019-08-08 stsp char *ignorespath;
3411 886cec17 2019-12-15 stsp int fd = -1;
3412 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
3414 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3415 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
3416 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
3418 886cec17 2019-12-15 stsp if (dirfd != -1) {
3419 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
3420 886cec17 2019-12-15 stsp if (fd == -1) {
3421 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3422 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
3423 886cec17 2019-12-15 stsp ignorespath);
3425 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
3426 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
3427 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
3428 886cec17 2019-12-15 stsp ignorespath);
3431 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3435 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
3436 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
3437 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
3438 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
3439 886cec17 2019-12-15 stsp ignorespath);
3441 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
3444 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3445 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
3446 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3447 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
3448 6841da00 2019-08-08 stsp free(ignorespath);
3449 6841da00 2019-08-08 stsp return err;
3452 f8d1f275 2019-02-04 stsp static const struct got_error *
3453 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
3455 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
3456 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
3457 f8d1f275 2019-02-04 stsp char *path = NULL;
3459 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3460 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
3462 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
3463 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3464 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3466 f8d1f275 2019-02-04 stsp path = de->d_name;
3469 3143d852 2020-06-25 stsp if (de->d_type != DT_DIR &&
3470 3143d852 2020-06-25 stsp got_path_is_child(path, a->status_path, a->status_path_len)
3471 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
3472 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3473 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3474 f8d1f275 2019-02-04 stsp if (parent_path[0])
3475 f8d1f275 2019-02-04 stsp free(path);
3476 b72f483a 2019-02-05 stsp return err;
3479 347d1d3e 2019-07-12 stsp static const struct got_error *
3480 3143d852 2020-06-25 stsp status_traverse(void *arg, const char *path, int dirfd)
3482 3143d852 2020-06-25 stsp const struct got_error *err = NULL;
3483 3143d852 2020-06-25 stsp struct diff_dir_cb_arg *a = arg;
3485 3143d852 2020-06-25 stsp if (a->no_ignores)
3486 3143d852 2020-06-25 stsp return NULL;
3488 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
3489 3143d852 2020-06-25 stsp path, dirfd, ".cvsignore");
3491 3143d852 2020-06-25 stsp return err;
3493 3143d852 2020-06-25 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
3494 3143d852 2020-06-25 stsp dirfd, ".gitignore");
3496 3143d852 2020-06-25 stsp return err;
3499 3143d852 2020-06-25 stsp static const struct got_error *
3500 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
3501 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3502 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
3504 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
3505 abb4604f 2019-07-27 stsp struct stat sb;
3507 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3509 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
3510 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
3512 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
3513 abb4604f 2019-07-27 stsp if (errno != ENOENT)
3514 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
3515 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3516 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3517 abb4604f 2019-07-27 stsp return NULL;
3520 00bb5ea0 2020-07-23 stsp if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3521 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3522 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3524 abb4604f 2019-07-27 stsp return NULL;
3527 3143d852 2020-06-25 stsp static const struct got_error *
3528 3143d852 2020-06-25 stsp add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3529 3143d852 2020-06-25 stsp const char *root_path, const char *path)
3531 3143d852 2020-06-25 stsp const struct got_error *err;
3532 b737c85a 2020-06-26 stsp char *parent_path, *next_parent_path = NULL;
3534 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3535 3143d852 2020-06-25 stsp ".cvsignore");
3537 3143d852 2020-06-25 stsp return err;
3539 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, "", -1,
3540 3143d852 2020-06-25 stsp ".gitignore");
3542 3143d852 2020-06-25 stsp return err;
3544 3143d852 2020-06-25 stsp err = got_path_dirname(&parent_path, path);
3545 3143d852 2020-06-25 stsp if (err) {
3546 3143d852 2020-06-25 stsp if (err->code == GOT_ERR_BAD_PATH)
3547 3143d852 2020-06-25 stsp return NULL; /* cannot traverse parent */
3548 3143d852 2020-06-25 stsp return err;
3550 3143d852 2020-06-25 stsp for (;;) {
3551 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3552 3143d852 2020-06-25 stsp ".cvsignore");
3555 3143d852 2020-06-25 stsp err = add_ignores(ignores, root_path, parent_path, -1,
3556 3143d852 2020-06-25 stsp ".gitignore");
3559 3143d852 2020-06-25 stsp err = got_path_dirname(&next_parent_path, parent_path);
3560 3143d852 2020-06-25 stsp if (err) {
3561 b737c85a 2020-06-26 stsp if (err->code == GOT_ERR_BAD_PATH)
3562 b737c85a 2020-06-26 stsp err = NULL; /* traversed everything */
3565 b737c85a 2020-06-26 stsp free(parent_path);
3566 b737c85a 2020-06-26 stsp parent_path = next_parent_path;
3567 b737c85a 2020-06-26 stsp next_parent_path = NULL;
3570 b737c85a 2020-06-26 stsp free(parent_path);
3571 b737c85a 2020-06-26 stsp free(next_parent_path);
3572 3143d852 2020-06-25 stsp return err;
3575 abb4604f 2019-07-27 stsp static const struct got_error *
3576 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
3577 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
3578 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3579 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3580 f2a9dc41 2019-12-13 tracey int report_unchanged)
3582 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
3583 6fc93f37 2019-12-13 stsp int fd = -1;
3584 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
3585 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
3586 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
3588 3143d852 2020-06-25 stsp TAILQ_INIT(&arg.ignores);
3590 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
3591 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
3592 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
3594 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
3595 6fc93f37 2019-12-13 stsp if (fd == -1) {
3596 00bb5ea0 2020-07-23 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3597 00bb5ea0 2020-07-23 stsp errno != ELOOP)
3598 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
3600 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
3601 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
3602 f2a9dc41 2019-12-13 tracey report_unchanged);
3604 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
3605 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
3606 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
3607 3143d852 2020-06-25 stsp fdiff_cb.diff_traverse = status_traverse;
3608 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
3609 abb4604f 2019-07-27 stsp arg.worktree = worktree;
3610 abb4604f 2019-07-27 stsp arg.status_path = path;
3611 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
3612 abb4604f 2019-07-27 stsp arg.repo = repo;
3613 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
3614 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
3615 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
3616 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
3617 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
3618 3143d852 2020-06-25 stsp arg.no_ignores = no_ignores;
3619 022fae89 2019-12-06 tracey if (!no_ignores) {
3620 3143d852 2020-06-25 stsp err = add_ignores_from_parent_paths(&arg.ignores,
3621 3143d852 2020-06-25 stsp worktree->root_path, path);
3623 3143d852 2020-06-25 stsp goto done;
3625 3143d852 2020-06-25 stsp err = got_fileindex_diff_dir(fileindex, fd,
3626 3143d852 2020-06-25 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
3629 3143d852 2020-06-25 stsp free_ignores(&arg.ignores);
3630 08578a35 2021-01-22 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
3631 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
3632 927df6b7 2019-02-10 stsp free(ondisk_path);
3633 347d1d3e 2019-07-12 stsp return err;
3636 347d1d3e 2019-07-12 stsp const struct got_error *
3637 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
3638 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
3639 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
3640 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
3642 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
3643 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
3644 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3645 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
3647 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3649 347d1d3e 2019-07-12 stsp return err;
3651 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
3652 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3653 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
3657 f8d1f275 2019-02-04 stsp free(fileindex_path);
3658 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
3659 f8d1f275 2019-02-04 stsp return err;
3662 6c7ab921 2019-03-18 stsp const struct got_error *
3663 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3664 6c7ab921 2019-03-18 stsp const char *arg)
3666 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
3667 00bb5ea0 2020-07-23 stsp char *resolved = NULL, *cwd = NULL, *path = NULL;
3668 6c7ab921 2019-03-18 stsp size_t len;
3669 00bb5ea0 2020-07-23 stsp struct stat sb;
3670 01740607 2020-11-04 stsp char *abspath = NULL;
3671 01740607 2020-11-04 stsp char canonpath[PATH_MAX];
3673 6c7ab921 2019-03-18 stsp *wt_path = NULL;
3675 00bb5ea0 2020-07-23 stsp cwd = getcwd(NULL, 0);
3676 00bb5ea0 2020-07-23 stsp if (cwd == NULL)
3677 00bb5ea0 2020-07-23 stsp return got_error_from_errno("getcwd");
3679 00bb5ea0 2020-07-23 stsp if (lstat(arg, &sb) == -1) {
3680 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3681 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("lstat", arg);
3682 00bb5ea0 2020-07-23 stsp goto done;
3684 727173c3 2020-11-06 stsp sb.st_mode = 0;
3686 00bb5ea0 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
3688 00bb5ea0 2020-07-23 stsp * We cannot use realpath(3) with symlinks since we want to
3689 00bb5ea0 2020-07-23 stsp * operate on the symlink itself.
3690 00bb5ea0 2020-07-23 stsp * But we can make the path absolute, assuming it is relative
3691 00bb5ea0 2020-07-23 stsp * to the current working directory, and then canonicalize it.
3693 00bb5ea0 2020-07-23 stsp if (!got_path_is_absolute(arg)) {
3694 00bb5ea0 2020-07-23 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3695 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3696 00bb5ea0 2020-07-23 stsp goto done;
3700 00bb5ea0 2020-07-23 stsp err = got_canonpath(abspath ? abspath : arg, canonpath,
3701 00bb5ea0 2020-07-23 stsp sizeof(canonpath));
3703 d0710d08 2019-07-22 stsp goto done;
3704 00bb5ea0 2020-07-23 stsp resolved = strdup(canonpath);
3705 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3706 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("strdup");
3707 00bb5ea0 2020-07-23 stsp goto done;
3710 00bb5ea0 2020-07-23 stsp resolved = realpath(arg, NULL);
3711 00bb5ea0 2020-07-23 stsp if (resolved == NULL) {
3712 00bb5ea0 2020-07-23 stsp if (errno != ENOENT) {
3713 00bb5ea0 2020-07-23 stsp err = got_error_from_errno2("realpath", arg);
3714 00bb5ea0 2020-07-23 stsp goto done;
3716 01740607 2020-11-04 stsp if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3717 00bb5ea0 2020-07-23 stsp err = got_error_from_errno("asprintf");
3718 01740607 2020-11-04 stsp goto done;
3720 01740607 2020-11-04 stsp err = got_canonpath(abspath, canonpath,
3721 01740607 2020-11-04 stsp sizeof(canonpath));
3723 00bb5ea0 2020-07-23 stsp goto done;
3724 01740607 2020-11-04 stsp resolved = strdup(canonpath);
3725 01740607 2020-11-04 stsp if (resolved == NULL) {
3726 01740607 2020-11-04 stsp err = got_error_from_errno("strdup");
3727 01740607 2020-11-04 stsp goto done;
3732 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
3733 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
3734 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3735 6c7ab921 2019-03-18 stsp goto done;
3738 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3739 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
3740 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
3742 f6d88e1a 2019-05-29 stsp goto done;
3744 f6d88e1a 2019-05-29 stsp path = strdup("");
3745 f6d88e1a 2019-05-29 stsp if (path == NULL) {
3746 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
3747 f6d88e1a 2019-05-29 stsp goto done;
3751 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
3752 6c7ab921 2019-03-18 stsp len = strlen(path);
3753 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
3754 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
3758 01740607 2020-11-04 stsp free(abspath);
3759 6c7ab921 2019-03-18 stsp free(resolved);
3760 d0710d08 2019-07-22 stsp free(cwd);
3761 6c7ab921 2019-03-18 stsp if (err == NULL)
3762 6c7ab921 2019-03-18 stsp *wt_path = path;
3764 6c7ab921 2019-03-18 stsp free(path);
3765 d00136be 2019-03-26 stsp return err;
3768 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
3769 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
3770 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
3771 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
3772 4e68cba3 2019-11-23 stsp void *progress_arg;
3773 4e68cba3 2019-11-23 stsp struct got_repository *repo;
3776 4e68cba3 2019-11-23 stsp static const struct got_error *
3777 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3778 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
3779 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3780 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3782 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
3783 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
3784 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
3785 6d022e97 2019-08-04 stsp struct stat sb;
3786 dbb83fbd 2019-12-12 stsp char *ondisk_path;
3788 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3789 dbb83fbd 2019-12-12 stsp relpath) == -1)
3790 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
3792 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3794 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3795 12463d8b 2019-12-13 stsp de_name, a->repo);
3797 dbb83fbd 2019-12-12 stsp goto done;
3798 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
3799 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
3800 dbb83fbd 2019-12-12 stsp goto done;
3801 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3803 dbb83fbd 2019-12-12 stsp goto done;
3806 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
3807 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3808 dbb83fbd 2019-12-12 stsp goto done;
3811 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, relpath);
3813 4e68cba3 2019-11-23 stsp goto done;
3814 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3815 437adc9d 2020-12-10 yzhong relpath, NULL, NULL, 1);
3816 3969253a 2020-03-07 stsp if (err) {
3817 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
3818 3969253a 2020-03-07 stsp goto done;
3820 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
3821 07f5b47a 2019-06-02 stsp if (err) {
3822 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
3823 4e68cba3 2019-11-23 stsp goto done;
3826 dbb83fbd 2019-12-12 stsp free(ondisk_path);
3828 dbb83fbd 2019-12-12 stsp return err;
3829 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
3830 dbb83fbd 2019-12-12 stsp return NULL;
3831 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
3834 d00136be 2019-03-26 stsp const struct got_error *
3835 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
3836 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
3837 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3838 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
3840 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3841 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3842 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3843 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
3844 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
3846 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3848 d00136be 2019-03-26 stsp return err;
3850 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3852 d00136be 2019-03-26 stsp goto done;
3854 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
3855 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
3856 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
3857 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
3858 4e68cba3 2019-11-23 stsp saa.repo = repo;
3860 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3861 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3862 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
3866 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3867 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3868 af12c6b9 2019-06-04 stsp err = sync_err;
3870 fb399478 2019-07-12 stsp free(fileindex_path);
3871 d00136be 2019-03-26 stsp if (fileindex)
3872 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
3873 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3874 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
3875 d00136be 2019-03-26 stsp err = unlockerr;
3876 6c7ab921 2019-03-18 stsp return err;
3879 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
3880 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
3881 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
3882 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
3883 f2a9dc41 2019-12-13 tracey void *progress_arg;
3884 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
3885 f2a9dc41 2019-12-13 tracey int delete_local_mods;
3886 70e3e7f5 2019-12-13 tracey int keep_on_disk;
3887 766841c2 2020-08-13 stsp const char *status_codes;
3890 f2a9dc41 2019-12-13 tracey static const struct got_error *
3891 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
3892 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
3893 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3894 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3896 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
3897 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
3898 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
3899 17ed4618 2019-06-02 stsp struct stat sb;
3900 20a2ad1c 2020-10-20 stsp char *ondisk_path;
3902 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3903 17ed4618 2019-06-02 stsp if (ie == NULL)
3904 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3906 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3907 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3908 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3909 9acbc4fa 2019-08-03 stsp return NULL;
3910 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3913 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3914 f2a9dc41 2019-12-13 tracey relpath) == -1)
3915 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3917 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3920 f2a9dc41 2019-12-13 tracey goto done;
3922 766841c2 2020-08-13 stsp if (a->status_codes) {
3923 766841c2 2020-08-13 stsp size_t ncodes = strlen(a->status_codes);
3925 766841c2 2020-08-13 stsp for (i = 0; i < ncodes ; i++) {
3926 766841c2 2020-08-13 stsp if (status == a->status_codes[i])
3929 766841c2 2020-08-13 stsp if (i == ncodes) {
3930 766841c2 2020-08-13 stsp /* Do not delete files in non-matching status. */
3931 766841c2 2020-08-13 stsp free(ondisk_path);
3932 766841c2 2020-08-13 stsp return NULL;
3934 766841c2 2020-08-13 stsp if (a->status_codes[i] != GOT_STATUS_MODIFY &&
3935 766841c2 2020-08-13 stsp a->status_codes[i] != GOT_STATUS_MISSING) {
3936 766841c2 2020-08-13 stsp static char msg[64];
3937 766841c2 2020-08-13 stsp snprintf(msg, sizeof(msg),
3938 766841c2 2020-08-13 stsp "invalid status code '%c'", a->status_codes[i]);
3939 766841c2 2020-08-13 stsp err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
3940 766841c2 2020-08-13 stsp goto done;
3944 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3945 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3946 f2a9dc41 2019-12-13 tracey goto done;
3947 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3948 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3949 f2a9dc41 2019-12-13 tracey goto done;
3951 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3952 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3953 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3954 f2a9dc41 2019-12-13 tracey goto done;
3958 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3959 20a2ad1c 2020-10-20 stsp size_t root_len;
3961 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3962 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3963 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3964 12463d8b 2019-12-13 stsp ondisk_path);
3965 12463d8b 2019-12-13 stsp goto done;
3967 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3968 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3969 12463d8b 2019-12-13 stsp goto done;
3972 20a2ad1c 2020-10-20 stsp root_len = strlen(a->worktree->root_path);
3974 20a2ad1c 2020-10-20 stsp char *parent;
3975 20a2ad1c 2020-10-20 stsp err = got_path_dirname(&parent, ondisk_path);
3977 2513f20a 2020-10-20 stsp goto done;
3978 20a2ad1c 2020-10-20 stsp free(ondisk_path);
3979 20a2ad1c 2020-10-20 stsp ondisk_path = parent;
3980 20a2ad1c 2020-10-20 stsp if (rmdir(ondisk_path) == -1) {
3981 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3982 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3983 20a2ad1c 2020-10-20 stsp ondisk_path);
3986 20a2ad1c 2020-10-20 stsp } while (got_path_cmp(ondisk_path, a->worktree->root_path,
3987 20a2ad1c 2020-10-20 stsp strlen(ondisk_path), root_len) != 0);
3990 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3992 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3993 f2a9dc41 2019-12-13 tracey if (err)
3994 f2a9dc41 2019-12-13 tracey return err;
3995 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3996 f2a9dc41 2019-12-13 tracey return NULL;
3997 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3998 f2a9dc41 2019-12-13 tracey staged_status, relpath);
4001 2ec1f75b 2019-03-26 stsp const struct got_error *
4002 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
4003 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
4004 766841c2 2020-08-13 stsp const char *status_codes,
4005 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
4006 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
4008 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
4009 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
4010 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4011 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
4012 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
4014 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
4016 2ec1f75b 2019-03-26 stsp return err;
4018 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4020 2ec1f75b 2019-03-26 stsp goto done;
4022 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
4023 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
4024 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
4025 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
4026 f2a9dc41 2019-12-13 tracey sda.repo = repo;
4027 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
4028 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
4029 766841c2 2020-08-13 stsp sda.status_codes = status_codes;
4031 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
4032 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
4033 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
4037 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4038 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
4039 af12c6b9 2019-06-04 stsp err = sync_err;
4041 fb399478 2019-07-12 stsp free(fileindex_path);
4042 2ec1f75b 2019-03-26 stsp if (fileindex)
4043 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
4044 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4045 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
4046 2ec1f75b 2019-03-26 stsp err = unlockerr;
4047 33aa809d 2019-08-08 stsp return err;
4050 33aa809d 2019-08-08 stsp static const struct got_error *
4051 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4053 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4054 33aa809d 2019-08-08 stsp char *line = NULL;
4055 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
4056 33aa809d 2019-08-08 stsp ssize_t linelen;
4058 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
4059 33aa809d 2019-08-08 stsp if (linelen == -1) {
4060 33aa809d 2019-08-08 stsp if (ferror(infile)) {
4061 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
4062 33aa809d 2019-08-08 stsp goto done;
4064 33aa809d 2019-08-08 stsp return NULL;
4066 33aa809d 2019-08-08 stsp if (outfile) {
4067 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
4068 33aa809d 2019-08-08 stsp if (n != linelen) {
4069 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4070 33aa809d 2019-08-08 stsp goto done;
4073 33aa809d 2019-08-08 stsp if (rejectfile) {
4074 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
4075 33aa809d 2019-08-08 stsp if (n != linelen)
4076 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
4079 33aa809d 2019-08-08 stsp free(line);
4080 2ec1f75b 2019-03-26 stsp return err;
4083 33aa809d 2019-08-08 stsp static const struct got_error *
4084 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
4086 33aa809d 2019-08-08 stsp char *line = NULL;
4087 33aa809d 2019-08-08 stsp size_t linesize = 0;
4088 33aa809d 2019-08-08 stsp ssize_t linelen;
4090 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
4091 500467ff 2019-09-25 hiltjo if (linelen == -1) {
4092 500467ff 2019-09-25 hiltjo if (ferror(f))
4093 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
4094 500467ff 2019-09-25 hiltjo return NULL;
4096 33aa809d 2019-08-08 stsp free(line);
4097 33aa809d 2019-08-08 stsp return NULL;
4100 33aa809d 2019-08-08 stsp static const struct got_error *
4101 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4102 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
4103 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
4105 33aa809d 2019-08-08 stsp const struct got_error *err;
4107 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
4108 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
4109 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
4111 33aa809d 2019-08-08 stsp return err;
4112 33aa809d 2019-08-08 stsp (*line_cur1)++;
4114 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
4115 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
4116 33aa809d 2019-08-08 stsp if (rejectfile)
4117 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
4119 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
4121 33aa809d 2019-08-08 stsp return err;
4122 33aa809d 2019-08-08 stsp (*line_cur2)++;
4124 33aa809d 2019-08-08 stsp /* Copy patched lines. */
4125 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
4126 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
4128 33aa809d 2019-08-08 stsp return err;
4129 33aa809d 2019-08-08 stsp (*line_cur2)++;
4131 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
4132 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
4133 33aa809d 2019-08-08 stsp if (rejectfile)
4134 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
4136 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
4138 33aa809d 2019-08-08 stsp return err;
4139 33aa809d 2019-08-08 stsp (*line_cur1)++;
4142 f1e81a05 2019-08-10 stsp return NULL;
4145 f1e81a05 2019-08-10 stsp static const struct got_error *
4146 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4147 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
4149 f1e81a05 2019-08-10 stsp const struct got_error *err;
4151 f1e81a05 2019-08-10 stsp if (outfile) {
4152 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
4153 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
4154 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
4156 f1e81a05 2019-08-10 stsp return err;
4157 f1e81a05 2019-08-10 stsp (*line_cur1)++;
4160 f1e81a05 2019-08-10 stsp if (rejectfile) {
4161 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
4162 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
4163 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
4165 f1e81a05 2019-08-10 stsp return err;
4166 f1e81a05 2019-08-10 stsp (*line_cur2)++;
4170 33aa809d 2019-08-08 stsp return NULL;
4173 33aa809d 2019-08-08 stsp static const struct got_error *
4174 fe621944 2020-11-10 stsp apply_or_reject_change(int *choice, int *nchunks_used,
4175 fe621944 2020-11-10 stsp struct diff_result *diff_result, int n,
4176 fe621944 2020-11-10 stsp const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4177 fe621944 2020-11-10 stsp FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4178 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4180 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
4181 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4182 fe621944 2020-11-10 stsp int start_old, end_old, start_new, end_new;
4183 33aa809d 2019-08-08 stsp FILE *hunkfile;
4184 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_state;
4185 fe621944 2020-11-10 stsp struct diff_input_info diff_info;
4188 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
4190 fe621944 2020-11-10 stsp /* Get changed line numbers without context lines for copy_change(). */
4191 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4192 fe621944 2020-11-10 stsp start_old = cc.left.start;
4193 fe621944 2020-11-10 stsp end_old = cc.left.end;
4194 fe621944 2020-11-10 stsp start_new = cc.right.start;
4195 fe621944 2020-11-10 stsp end_new = cc.right.end;
4197 fe621944 2020-11-10 stsp /* Get the same change with context lines for display. */
4198 fe621944 2020-11-10 stsp memset(&cc, 0, sizeof(cc));
4199 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4201 fe621944 2020-11-10 stsp memset(&diff_info, 0, sizeof(diff_info));
4202 fe621944 2020-11-10 stsp diff_info.left_path = relpath;
4203 fe621944 2020-11-10 stsp diff_info.right_path = relpath;
4205 fe621944 2020-11-10 stsp diff_state = diff_output_unidiff_state_alloc();
4206 fe621944 2020-11-10 stsp if (diff_state == NULL)
4207 fe621944 2020-11-10 stsp return got_error_set_errno(ENOMEM,
4208 fe621944 2020-11-10 stsp "diff_output_unidiff_state_alloc");
4210 fe621944 2020-11-10 stsp hunkfile = got_opentemp();
4211 fe621944 2020-11-10 stsp if (hunkfile == NULL) {
4212 fe621944 2020-11-10 stsp err = got_error_from_errno("got_opentemp");
4213 33aa809d 2019-08-08 stsp goto done;
4216 fe621944 2020-11-10 stsp rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4217 fe621944 2020-11-10 stsp diff_result, &cc);
4218 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK) {
4219 fe621944 2020-11-10 stsp err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4220 33aa809d 2019-08-08 stsp goto done;
4223 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4224 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
4225 33aa809d 2019-08-08 stsp goto done;
4228 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4229 fe621944 2020-11-10 stsp hunkfile, changeno, nchanges);
4231 33aa809d 2019-08-08 stsp goto done;
4233 33aa809d 2019-08-08 stsp switch (*choice) {
4234 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
4235 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4236 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
4238 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
4239 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4240 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
4242 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
4245 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
4249 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(diff_state);
4250 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4251 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
4252 33aa809d 2019-08-08 stsp return err;
4255 1f1abb7e 2019-08-08 stsp struct revert_file_args {
4256 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
4257 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
4258 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
4259 1f1abb7e 2019-08-08 stsp void *progress_arg;
4260 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
4261 33aa809d 2019-08-08 stsp void *patch_arg;
4262 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
4265 e20a8b6f 2019-06-04 stsp static const struct got_error *
4266 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
4267 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
4268 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
4269 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
4270 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
4272 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
4273 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
4274 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4275 1ebedb77 2019-10-19 stsp int fd2 = -1;
4276 fa3cef63 2020-07-23 stsp char link_target[PATH_MAX];
4277 fa3cef63 2020-07-23 stsp ssize_t link_len = 0;
4278 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
4279 fe621944 2020-11-10 stsp struct stat sb2;
4280 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
4281 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4282 fe621944 2020-11-10 stsp int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4284 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4286 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
4288 33aa809d 2019-08-08 stsp return err;
4290 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
4291 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
4292 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4293 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4294 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("openat", path2);
4295 fa3cef63 2020-07-23 stsp goto done;
4297 fa3cef63 2020-07-23 stsp link_len = readlinkat(dirfd2, de_name2,
4298 fa3cef63 2020-07-23 stsp link_target, sizeof(link_target));
4299 fa3cef63 2020-07-23 stsp if (link_len == -1)
4300 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlinkat", path2);
4301 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4302 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4305 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
4306 12463d8b 2019-12-13 stsp if (fd2 == -1) {
4307 fa3cef63 2020-07-23 stsp if (errno != ELOOP) {
4308 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("open", path2);
4309 fa3cef63 2020-07-23 stsp goto done;
4311 fa3cef63 2020-07-23 stsp link_len = readlink(path2, link_target,
4312 fa3cef63 2020-07-23 stsp sizeof(link_target));
4313 fa3cef63 2020-07-23 stsp if (link_len == -1)
4314 fa3cef63 2020-07-23 stsp return got_error_from_errno2("readlink", path2);
4315 fa3cef63 2020-07-23 stsp sb2.st_mode = S_IFLNK;
4316 fa3cef63 2020-07-23 stsp sb2.st_size = link_len;
4319 fa3cef63 2020-07-23 stsp if (fd2 != -1) {
4320 fa3cef63 2020-07-23 stsp if (fstat(fd2, &sb2) == -1) {
4321 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fstat", path2);
4322 fa3cef63 2020-07-23 stsp goto done;
4325 fa3cef63 2020-07-23 stsp f2 = fdopen(fd2, "r");
4326 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4327 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("fdopen", path2);
4328 fa3cef63 2020-07-23 stsp goto done;
4333 fa3cef63 2020-07-23 stsp f2 = got_opentemp();
4334 fa3cef63 2020-07-23 stsp if (f2 == NULL) {
4335 fa3cef63 2020-07-23 stsp err = got_error_from_errno2("got_opentemp", path2);
4336 fa3cef63 2020-07-23 stsp goto done;
4338 fa3cef63 2020-07-23 stsp n = fwrite(link_target, 1, link_len, f2);
4339 fa3cef63 2020-07-23 stsp if (n != link_len) {
4340 fa3cef63 2020-07-23 stsp err = got_ferror(f2, GOT_ERR_IO);
4341 fa3cef63 2020-07-23 stsp goto done;
4343 fa3cef63 2020-07-23 stsp if (fflush(f2) == EOF) {
4344 fa3cef63 2020-07-23 stsp err = got_error_from_errno("fflush");
4345 fa3cef63 2020-07-23 stsp goto done;
4347 fa3cef63 2020-07-23 stsp rewind(f2);
4350 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
4352 33aa809d 2019-08-08 stsp goto done;
4354 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
4356 33aa809d 2019-08-08 stsp goto done;
4358 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4360 33aa809d 2019-08-08 stsp goto done;
4362 64453f7e 2020-11-21 stsp err = got_diff_files(&diffreg_result, f1, id_str, f2, path2, 3, 0, 1,
4365 33aa809d 2019-08-08 stsp goto done;
4367 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
4369 33aa809d 2019-08-08 stsp goto done;
4371 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
4372 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
4373 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
4374 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
4376 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
4377 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4378 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
4379 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
4380 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
4381 fe621944 2020-11-10 stsp nchanges++;
4383 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4384 33aa809d 2019-08-08 stsp int choice;
4385 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
4386 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
4387 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
4388 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
4389 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
4390 fe621944 2020-11-10 stsp ++i, nchanges, patch_cb, patch_arg);
4392 33aa809d 2019-08-08 stsp goto done;
4393 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
4394 33aa809d 2019-08-08 stsp have_content = 1;
4395 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
4398 1ebedb77 2019-10-19 stsp if (have_content) {
4399 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4400 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
4401 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
4403 1ebedb77 2019-10-19 stsp goto done;
4405 fa3cef63 2020-07-23 stsp if (!S_ISLNK(sb2.st_mode)) {
4406 3818e3c4 2020-11-01 naddy if (fchmod(fileno(outfile), sb2.st_mode) == -1) {
4407 3818e3c4 2020-11-01 naddy err = got_error_from_errno2("fchmod", path2);
4408 fa3cef63 2020-07-23 stsp goto done;
4413 33aa809d 2019-08-08 stsp free(id_str);
4415 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
4416 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
4417 fe621944 2020-11-10 stsp if (err == NULL)
4418 fe621944 2020-11-10 stsp err = free_err;
4419 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
4420 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
4421 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
4422 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
4423 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4424 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
4425 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
4426 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
4427 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
4428 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
4429 33aa809d 2019-08-08 stsp if (err || !have_content) {
4430 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4431 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
4432 33aa809d 2019-08-08 stsp free(*path_outfile);
4433 33aa809d 2019-08-08 stsp *path_outfile = NULL;
4435 33aa809d 2019-08-08 stsp free(path1);
4436 33aa809d 2019-08-08 stsp return err;
4439 33aa809d 2019-08-08 stsp static const struct got_error *
4440 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
4441 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
4442 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4443 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4445 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
4446 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
4447 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
4448 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
4449 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
4450 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
4451 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
4452 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
4453 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
4454 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
4456 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
4457 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
4458 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
4459 d3bcc3d1 2019-08-08 stsp return NULL;
4461 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
4462 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
4463 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
4465 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4466 65084dad 2019-08-08 stsp if (ie == NULL)
4467 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
4469 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
4470 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
4471 a129376b 2019-03-28 stsp if (err) {
4472 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
4473 a129376b 2019-03-28 stsp goto done;
4474 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
4475 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
4476 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
4477 e20a8b6f 2019-06-04 stsp goto done;
4480 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
4481 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
4482 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4483 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4484 a129376b 2019-03-28 stsp goto done;
4487 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
4488 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
4489 a129376b 2019-03-28 stsp if (tree_path == NULL) {
4490 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4491 a129376b 2019-03-28 stsp goto done;
4494 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
4495 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
4496 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4497 a129376b 2019-03-28 stsp goto done;
4502 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
4503 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
4504 a9fa2909 2019-07-27 stsp if (err) {
4505 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4506 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
4507 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
4508 a9fa2909 2019-07-27 stsp goto done;
4510 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
4512 a9fa2909 2019-07-27 stsp goto done;
4514 1233e6b6 2020-10-19 stsp err = got_path_basename(&te_name, ie->path);
4516 a9fa2909 2019-07-27 stsp goto done;
4518 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
4519 1233e6b6 2020-10-19 stsp free(te_name);
4520 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
4521 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
4522 b66cd6f3 2020-07-31 stsp err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4523 a9fa2909 2019-07-27 stsp goto done;
4527 a129376b 2019-03-28 stsp switch (status) {
4528 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
4529 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4530 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4531 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4532 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4534 33aa809d 2019-08-08 stsp goto done;
4535 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4538 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4539 1f1abb7e 2019-08-08 stsp ie->path);
4541 1ee397ad 2019-07-12 stsp goto done;
4542 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
4544 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
4545 33aa809d 2019-08-08 stsp if (a->patch_cb) {
4546 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
4547 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
4548 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
4550 33aa809d 2019-08-08 stsp goto done;
4551 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
4554 33aa809d 2019-08-08 stsp /* fall through */
4555 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
4556 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
4557 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
4558 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
4559 e20a8b6f 2019-06-04 stsp struct got_object_id id;
4560 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
4561 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
4562 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
4563 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4565 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
4566 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4567 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
4569 65084dad 2019-08-08 stsp goto done;
4571 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
4572 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
4573 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
4574 a129376b 2019-03-28 stsp goto done;
4577 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4578 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
4579 369fd7e5 2020-07-23 stsp int is_bad_symlink = 0;
4580 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
4581 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
4582 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
4583 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
4585 369fd7e5 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4586 369fd7e5 2020-07-23 stsp if (unlink(path_content) == -1) {
4587 369fd7e5 2020-07-23 stsp err = got_error_from_errno2("unlink",
4588 369fd7e5 2020-07-23 stsp path_content);
4591 369fd7e5 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4592 369fd7e5 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4593 369fd7e5 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4594 369fd7e5 2020-07-23 stsp a->progress_cb, a->progress_arg);
4596 369fd7e5 2020-07-23 stsp if (rename(path_content, ondisk_path) == -1) {
4597 369fd7e5 2020-07-23 stsp err = got_error_from_errno3("rename",
4598 369fd7e5 2020-07-23 stsp path_content, ondisk_path);
4599 369fd7e5 2020-07-23 stsp goto done;
4603 2e1fa222 2020-07-23 stsp int is_bad_symlink = 0;
4604 2e1fa222 2020-07-23 stsp if (te && S_ISLNK(te->mode)) {
4605 2e1fa222 2020-07-23 stsp err = install_symlink(&is_bad_symlink,
4606 2e1fa222 2020-07-23 stsp a->worktree, ondisk_path, ie->path,
4607 c90c8ce3 2020-07-23 stsp blob, 0, 1, 0, a->repo,
4608 2e1fa222 2020-07-23 stsp a->progress_cb, a->progress_arg);
4610 2e1fa222 2020-07-23 stsp err = install_blob(a->worktree, ondisk_path,
4612 2e1fa222 2020-07-23 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
4613 3b9f0f87 2020-07-23 stsp got_fileindex_perms_to_st(ie), blob,
4614 3b9f0f87 2020-07-23 stsp 0, 1, 0, 0, a->repo,
4615 3b9f0f87 2020-07-23 stsp a->progress_cb, a->progress_arg);
4618 a129376b 2019-03-28 stsp goto done;
4619 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
4620 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
4621 054041d0 2020-06-24 stsp err = got_fileindex_entry_update(ie,
4622 437adc9d 2020-12-10 yzhong a->worktree->root_fd, relpath,
4623 437adc9d 2020-12-10 yzhong blob->id.sha1,
4624 054041d0 2020-06-24 stsp a->worktree->base_commit_id->sha1, 1);
4626 2e1fa222 2020-07-23 stsp goto done;
4628 2e1fa222 2020-07-23 stsp if (is_bad_symlink) {
4629 6131ab45 2020-07-23 stsp got_fileindex_entry_filetype_set(ie,
4630 2e1fa222 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
4639 1f1abb7e 2019-08-08 stsp free(ondisk_path);
4640 33aa809d 2019-08-08 stsp free(path_content);
4641 e20a8b6f 2019-06-04 stsp free(parent_path);
4642 a129376b 2019-03-28 stsp free(tree_path);
4644 a129376b 2019-03-28 stsp got_object_blob_close(blob);
4646 a129376b 2019-03-28 stsp got_object_tree_close(tree);
4647 a129376b 2019-03-28 stsp free(tree_id);
4648 e20a8b6f 2019-06-04 stsp return err;
4651 e20a8b6f 2019-06-04 stsp const struct got_error *
4652 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
4653 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
4654 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4655 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
4656 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
4658 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
4659 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
4660 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4661 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
4662 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
4663 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
4665 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
4667 e20a8b6f 2019-06-04 stsp return err;
4669 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4671 e20a8b6f 2019-06-04 stsp goto done;
4673 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
4674 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
4675 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
4676 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
4677 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
4678 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
4679 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
4680 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
4681 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4682 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
4686 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4687 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
4688 e20a8b6f 2019-06-04 stsp err = sync_err;
4690 fb399478 2019-07-12 stsp free(fileindex_path);
4691 a129376b 2019-03-28 stsp if (fileindex)
4692 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
4693 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4694 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
4695 a129376b 2019-03-28 stsp err = unlockerr;
4696 c4296144 2019-05-09 stsp return err;
4699 cf066bf8 2019-05-09 stsp static void
4700 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
4702 24519714 2019-05-09 stsp free(ct->path);
4703 44d03001 2019-05-09 stsp free(ct->in_repo_path);
4704 768aea60 2019-05-09 stsp free(ct->ondisk_path);
4705 e75eb4da 2019-05-10 stsp free(ct->blob_id);
4706 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
4707 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
4708 b416585c 2019-05-13 stsp free(ct->base_commit_id);
4712 ed175427 2019-05-09 stsp struct collect_commitables_arg {
4713 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
4714 24519714 2019-05-09 stsp struct got_repository *repo;
4715 24519714 2019-05-09 stsp struct got_worktree *worktree;
4716 0aeb8099 2020-07-23 stsp struct got_fileindex *fileindex;
4717 5f8a88c6 2019-08-03 stsp int have_staged_files;
4718 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
4721 c4296144 2019-05-09 stsp static const struct got_error *
4722 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
4723 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4724 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4725 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
4727 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
4728 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
4729 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4730 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
4731 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
4732 768aea60 2019-05-09 stsp struct stat sb;
4734 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
4735 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
4736 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
4737 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
4738 5f8a88c6 2019-08-03 stsp return NULL;
4740 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
4741 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
4743 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
4744 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
4745 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
4746 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
4747 5f8a88c6 2019-08-03 stsp return NULL;
4750 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
4751 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4752 036813ee 2019-05-09 stsp goto done;
4754 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
4755 036813ee 2019-05-09 stsp parent_path = strdup("");
4756 69960a46 2019-05-09 stsp if (parent_path == NULL)
4757 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
4759 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
4761 69960a46 2019-05-09 stsp return err;
4764 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
4765 cf066bf8 2019-05-09 stsp if (ct == NULL) {
4766 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4767 c4296144 2019-05-09 stsp goto done;
4770 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
4771 768aea60 2019-05-09 stsp relpath) == -1) {
4772 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4773 768aea60 2019-05-09 stsp goto done;
4776 0aeb8099 2020-07-23 stsp if (staged_status == GOT_STATUS_ADD ||
4777 0aeb8099 2020-07-23 stsp staged_status == GOT_STATUS_MODIFY) {
4778 0aeb8099 2020-07-23 stsp struct got_fileindex_entry *ie;
4779 0aeb8099 2020-07-23 stsp ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
4780 0aeb8099 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
4781 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
4782 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
4783 0aeb8099 2020-07-23 stsp ct->mode = S_IFREG;
4785 0aeb8099 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
4786 0aeb8099 2020-07-23 stsp ct->mode = S_IFLNK;
4789 0aeb8099 2020-07-23 stsp err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
4790 0aeb8099 2020-07-23 stsp goto done;
4792 0aeb8099 2020-07-23 stsp ct->mode |= got_fileindex_entry_perms_get(ie);
4793 0aeb8099 2020-07-23 stsp } else if (status != GOT_STATUS_DELETE &&
4794 0aeb8099 2020-07-23 stsp staged_status != GOT_STATUS_DELETE) {
4795 12463d8b 2019-12-13 stsp if (dirfd != -1) {
4796 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
4797 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
4798 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
4799 12463d8b 2019-12-13 stsp ct->ondisk_path);
4800 12463d8b 2019-12-13 stsp goto done;
4802 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
4803 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
4804 768aea60 2019-05-09 stsp goto done;
4806 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
4809 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
4810 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
4811 44d03001 2019-05-09 stsp relpath) == -1) {
4812 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4813 44d03001 2019-05-09 stsp goto done;
4816 35213c7c 2020-07-23 stsp if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
4817 35213c7c 2020-07-23 stsp status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
4818 35213c7c 2020-07-23 stsp int is_bad_symlink;
4819 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
4820 35213c7c 2020-07-23 stsp ssize_t target_len;
4821 35213c7c 2020-07-23 stsp target_len = readlink(ct->ondisk_path, target_path,
4822 35213c7c 2020-07-23 stsp sizeof(target_path));
4823 35213c7c 2020-07-23 stsp if (target_len == -1) {
4824 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
4825 35213c7c 2020-07-23 stsp ct->ondisk_path);
4826 35213c7c 2020-07-23 stsp goto done;
4828 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink, target_path,
4829 35213c7c 2020-07-23 stsp target_len, ct->ondisk_path, a->worktree->root_path);
4831 35213c7c 2020-07-23 stsp goto done;
4832 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
4833 35213c7c 2020-07-23 stsp err = got_error_path(ct->ondisk_path,
4834 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
4835 35213c7c 2020-07-23 stsp goto done;
4840 cf066bf8 2019-05-09 stsp ct->status = status;
4841 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
4842 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
4843 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
4844 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
4845 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
4846 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
4847 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4848 b416585c 2019-05-13 stsp goto done;
4850 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
4851 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
4852 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
4853 f0b75401 2019-08-03 stsp goto done;
4856 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4857 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4858 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
4859 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
4860 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4861 036813ee 2019-05-09 stsp goto done;
4864 24519714 2019-05-09 stsp ct->path = strdup(path);
4865 24519714 2019-05-09 stsp if (ct->path == NULL) {
4866 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
4867 24519714 2019-05-09 stsp goto done;
4869 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
4871 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
4872 ed175427 2019-05-09 stsp free_commitable(ct);
4873 24519714 2019-05-09 stsp free(parent_path);
4874 036813ee 2019-05-09 stsp free(path);
4875 a129376b 2019-03-28 stsp return err;
4878 ba580f68 2020-03-22 stsp static const struct got_error *write_tree(struct got_object_id **, int *,
4879 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
4880 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4881 036813ee 2019-05-09 stsp struct got_repository *);
4883 ed175427 2019-05-09 stsp static const struct got_error *
4884 ba580f68 2020-03-22 stsp write_subtree(struct got_object_id **new_subtree_id, int *nentries,
4885 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
4886 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4887 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4888 afa376bf 2019-05-09 stsp struct got_repository *repo)
4890 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
4891 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
4892 036813ee 2019-05-09 stsp char *subpath;
4894 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
4895 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
4896 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4898 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
4900 ed175427 2019-05-09 stsp return err;
4902 ba580f68 2020-03-22 stsp err = write_tree(new_subtree_id, nentries, subtree, subpath,
4903 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
4904 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
4905 036813ee 2019-05-09 stsp free(subpath);
4906 036813ee 2019-05-09 stsp return err;
4909 036813ee 2019-05-09 stsp static const struct got_error *
4910 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
4912 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4913 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
4915 036813ee 2019-05-09 stsp *match = 0;
4917 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
4918 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
4919 0f63689d 2019-05-10 stsp return NULL;
4922 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
4924 0f63689d 2019-05-10 stsp return err;
4925 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
4926 036813ee 2019-05-09 stsp free(ct_parent_path);
4927 036813ee 2019-05-09 stsp return err;
4930 768aea60 2019-05-09 stsp static mode_t
4931 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
4933 3d9a4ec4 2020-07-23 stsp if (S_ISLNK(ct->mode))
4934 3d9a4ec4 2020-07-23 stsp return S_IFLNK;
4936 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
4939 036813ee 2019-05-09 stsp static const struct got_error *
4940 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
4941 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
4943 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4945 036813ee 2019-05-09 stsp *new_te = NULL;
4947 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
4949 036813ee 2019-05-09 stsp goto done;
4951 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4953 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
4954 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4955 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4957 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4959 036813ee 2019-05-09 stsp if (err && *new_te) {
4960 56e0773d 2019-11-28 stsp free(*new_te);
4961 036813ee 2019-05-09 stsp *new_te = NULL;
4963 036813ee 2019-05-09 stsp return err;
4966 036813ee 2019-05-09 stsp static const struct got_error *
4967 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
4968 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
4970 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4971 102b254e 2020-10-19 stsp char *ct_name = NULL;
4973 036813ee 2019-05-09 stsp *new_te = NULL;
4975 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
4976 036813ee 2019-05-09 stsp if (*new_te == NULL)
4977 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4979 102b254e 2020-10-19 stsp err = got_path_basename(&ct_name, ct->path);
4981 036813ee 2019-05-09 stsp goto done;
4982 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
4983 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
4984 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4985 036813ee 2019-05-09 stsp goto done;
4988 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
4990 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
4991 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
4992 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
4994 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
4996 102b254e 2020-10-19 stsp free(ct_name);
4997 036813ee 2019-05-09 stsp if (err && *new_te) {
4998 56e0773d 2019-11-28 stsp free(*new_te);
4999 036813ee 2019-05-09 stsp *new_te = NULL;
5001 036813ee 2019-05-09 stsp return err;
5004 036813ee 2019-05-09 stsp static const struct got_error *
5005 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
5006 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
5008 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5009 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
5011 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5013 036813ee 2019-05-09 stsp return err;
5014 036813ee 2019-05-09 stsp if (new_pe == NULL)
5015 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
5016 036813ee 2019-05-09 stsp return NULL;
5019 afa376bf 2019-05-09 stsp static const struct got_error *
5020 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
5021 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
5023 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
5024 5f8a88c6 2019-08-03 stsp unsigned char status;
5026 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
5027 afa376bf 2019-05-09 stsp ct_path++;
5029 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5030 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
5032 5f8a88c6 2019-08-03 stsp status = ct->status;
5034 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5035 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5038 036813ee 2019-05-09 stsp static const struct got_error *
5039 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
5040 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5042 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
5043 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
5044 44d03001 2019-05-09 stsp char *te_path;
5046 44d03001 2019-05-09 stsp *modified = 0;
5048 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
5049 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
5050 44d03001 2019-05-09 stsp te->name) == -1)
5051 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5053 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5054 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5055 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
5056 44d03001 2019-05-09 stsp strlen(te_path));
5057 62d463ca 2020-10-20 naddy if (*modified)
5061 44d03001 2019-05-09 stsp free(te_path);
5062 44d03001 2019-05-09 stsp return err;
5065 44d03001 2019-05-09 stsp static const struct got_error *
5066 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
5067 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
5068 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
5070 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5071 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5073 036813ee 2019-05-09 stsp *ctp = NULL;
5075 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5076 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5077 036813ee 2019-05-09 stsp char *ct_name = NULL;
5078 036813ee 2019-05-09 stsp int path_matches;
5080 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5081 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
5082 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
5083 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
5086 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
5087 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
5091 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5094 62d463ca 2020-10-20 naddy err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5096 036813ee 2019-05-09 stsp return err;
5097 036813ee 2019-05-09 stsp if (!path_matches)
5100 d34b633e 2020-10-19 stsp err = got_path_basename(&ct_name, pe->path);
5102 d34b633e 2020-10-19 stsp return err;
5104 d34b633e 2020-10-19 stsp if (strcmp(te->name, ct_name) != 0) {
5105 d34b633e 2020-10-19 stsp free(ct_name);
5108 d34b633e 2020-10-19 stsp free(ct_name);
5110 036813ee 2019-05-09 stsp *ctp = ct;
5114 2b496619 2019-07-10 stsp return err;
5117 2b496619 2019-07-10 stsp static const struct got_error *
5118 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5119 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
5120 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
5121 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
5122 2b496619 2019-07-10 stsp struct got_repository *repo)
5124 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
5125 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
5126 2b496619 2019-07-10 stsp char *subtree_path;
5127 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
5128 ba580f68 2020-03-22 stsp int nentries;
5130 2b496619 2019-07-10 stsp *new_tep = NULL;
5132 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5133 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
5134 2b496619 2019-07-10 stsp child_path) == -1)
5135 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
5137 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
5138 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
5139 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
5140 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
5142 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5143 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
5144 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
5145 2b496619 2019-07-10 stsp goto done;
5147 ba580f68 2020-03-22 stsp err = write_tree(&id, &nentries, NULL, subtree_path,
5148 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
5149 2b496619 2019-07-10 stsp if (err) {
5150 56e0773d 2019-11-28 stsp free(new_te);
5151 2b496619 2019-07-10 stsp goto done;
5153 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
5156 2b496619 2019-07-10 stsp free(subtree_path);
5157 2b496619 2019-07-10 stsp if (err == NULL)
5158 2b496619 2019-07-10 stsp *new_tep = new_te;
5159 036813ee 2019-05-09 stsp return err;
5162 036813ee 2019-05-09 stsp static const struct got_error *
5163 ba580f68 2020-03-22 stsp write_tree(struct got_object_id **new_tree_id, int *nentries,
5164 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
5165 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
5166 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5167 036813ee 2019-05-09 stsp struct got_repository *repo)
5169 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
5170 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
5171 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
5172 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
5174 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
5175 ba580f68 2020-03-22 stsp *nentries = 0;
5177 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
5178 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5179 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5180 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
5182 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
5183 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
5184 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
5187 62d463ca 2020-10-20 naddy if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5188 62d463ca 2020-10-20 naddy strlen(path_base_tree)))
5191 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5192 f2b0a8b0 2020-07-31 stsp ct->in_repo_path);
5194 036813ee 2019-05-09 stsp goto done;
5196 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
5197 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
5198 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
5200 036813ee 2019-05-09 stsp goto done;
5201 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
5203 afa376bf 2019-05-09 stsp goto done;
5204 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
5205 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5207 2f51b5b3 2019-05-09 stsp goto done;
5208 ba580f68 2020-03-22 stsp (*nentries)++;
5210 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
5211 2b496619 2019-07-10 stsp if (base_tree == NULL ||
5212 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
5213 2b496619 2019-07-10 stsp == NULL) {
5214 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
5215 2b496619 2019-07-10 stsp child_path, path_base_tree,
5216 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
5219 2b496619 2019-07-10 stsp goto done;
5220 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
5222 2b496619 2019-07-10 stsp goto done;
5223 ba580f68 2020-03-22 stsp (*nentries)++;
5228 2f51b5b3 2019-05-09 stsp if (base_tree) {
5229 56e0773d 2019-11-28 stsp int i, nbase_entries;
5230 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
5231 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
5232 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
5233 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
5235 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
5236 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
5237 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
5238 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
5240 63c5ca5d 2019-08-24 stsp goto done;
5241 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
5243 63c5ca5d 2019-08-24 stsp goto done;
5244 ba580f68 2020-03-22 stsp (*nentries)++;
5248 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
5249 44d03001 2019-05-09 stsp int modified;
5250 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5252 036813ee 2019-05-09 stsp goto done;
5253 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
5254 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
5256 2f51b5b3 2019-05-09 stsp goto done;
5257 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
5258 44d03001 2019-05-09 stsp if (modified) {
5259 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
5260 ba580f68 2020-03-22 stsp int nsubentries;
5261 ba580f68 2020-03-22 stsp err = write_subtree(&new_id,
5262 ba580f68 2020-03-22 stsp &nsubentries, te,
5263 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
5264 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
5266 44d03001 2019-05-09 stsp goto done;
5267 ba580f68 2020-03-22 stsp if (nsubentries == 0) {
5268 ba580f68 2020-03-22 stsp /* All entries were deleted. */
5269 ba580f68 2020-03-22 stsp free(new_id);
5272 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
5273 56e0773d 2019-11-28 stsp sizeof(new_te->id));
5274 56e0773d 2019-11-28 stsp free(new_id);
5276 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5278 036813ee 2019-05-09 stsp goto done;
5279 ba580f68 2020-03-22 stsp (*nentries)++;
5283 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
5284 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
5286 f66c734c 2019-09-22 stsp goto done;
5288 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
5289 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
5290 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
5291 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5292 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
5293 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
5295 2f51b5b3 2019-05-09 stsp goto done;
5296 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5298 2f51b5b3 2019-05-09 stsp goto done;
5299 ba580f68 2020-03-22 stsp (*nentries)++;
5301 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
5302 b416585c 2019-05-13 stsp status_arg);
5304 afa376bf 2019-05-09 stsp goto done;
5306 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
5307 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
5309 2f51b5b3 2019-05-09 stsp goto done;
5310 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
5312 2f51b5b3 2019-05-09 stsp goto done;
5313 ba580f68 2020-03-22 stsp (*nentries)++;
5318 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
5319 ba580f68 2020-03-22 stsp err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5321 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
5322 2e1fa222 2020-07-23 stsp return err;
5325 2e1fa222 2020-07-23 stsp static const struct got_error *
5326 437adc9d 2020-12-10 yzhong update_fileindex_after_commit(struct got_worktree *worktree,
5327 437adc9d 2020-12-10 yzhong struct got_pathlist_head *commitable_paths,
5328 437adc9d 2020-12-10 yzhong struct got_object_id *new_base_commit_id,
5329 437adc9d 2020-12-10 yzhong struct got_fileindex *fileindex, int have_staged_files)
5331 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
5332 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
5333 437adc9d 2020-12-10 yzhong char *relpath = NULL;
5335 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5336 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
5337 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5339 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5341 437adc9d 2020-12-10 yzhong err = got_path_skip_common_ancestor(&relpath,
5342 437adc9d 2020-12-10 yzhong worktree->root_path, ct->ondisk_path);
5343 437adc9d 2020-12-10 yzhong if (err)
5344 437adc9d 2020-12-10 yzhong goto done;
5347 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
5348 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
5349 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
5350 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
5351 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
5352 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
5353 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
5354 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
5356 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
5357 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5358 437adc9d 2020-12-10 yzhong ct->staged_blob_id->sha1,
5359 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5360 72fd46fa 2019-09-06 stsp !have_staged_files);
5362 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
5363 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath,
5364 437adc9d 2020-12-10 yzhong ct->blob_id->sha1,
5365 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
5366 72fd46fa 2019-09-06 stsp !have_staged_files);
5368 3969253a 2020-03-07 stsp err = got_fileindex_entry_alloc(&ie, pe->path);
5370 437adc9d 2020-12-10 yzhong goto done;
5371 437adc9d 2020-12-10 yzhong err = got_fileindex_entry_update(ie,
5372 437adc9d 2020-12-10 yzhong worktree->root_fd, relpath, ct->blob_id->sha1,
5373 437adc9d 2020-12-10 yzhong new_base_commit_id->sha1, 1);
5374 3969253a 2020-03-07 stsp if (err) {
5375 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5376 437adc9d 2020-12-10 yzhong goto done;
5378 3969253a 2020-03-07 stsp err = got_fileindex_entry_add(fileindex, ie);
5379 3969253a 2020-03-07 stsp if (err) {
5380 3969253a 2020-03-07 stsp got_fileindex_entry_free(ie);
5381 437adc9d 2020-12-10 yzhong goto done;
5384 437adc9d 2020-12-10 yzhong free(relpath);
5385 437adc9d 2020-12-10 yzhong relpath = NULL;
5388 437adc9d 2020-12-10 yzhong free(relpath);
5389 d56d26ce 2019-05-10 stsp return err;
5393 d56d26ce 2019-05-10 stsp static const struct got_error *
5394 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
5395 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
5396 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
5397 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
5398 735ef5ac 2019-08-03 stsp int ood_errcode)
5400 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
5401 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
5403 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5404 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
5405 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5406 1a36436d 2019-06-10 stsp return NULL;
5408 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
5409 9bead371 2019-07-28 stsp * on matches file content in the branch head.
5411 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5412 735ef5ac 2019-08-03 stsp in_repo_path);
5413 9bead371 2019-07-28 stsp if (err) {
5414 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
5415 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
5416 1a36436d 2019-06-10 stsp goto done;
5417 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
5418 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
5420 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
5421 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
5422 735ef5ac 2019-08-03 stsp in_repo_path);
5423 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5424 1a36436d 2019-06-10 stsp goto done;
5425 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
5429 1a36436d 2019-06-10 stsp return err;
5432 c4296144 2019-05-09 stsp const struct got_error *
5433 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
5434 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
5435 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
5436 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
5437 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5438 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
5439 afa376bf 2019-05-09 stsp struct got_repository *repo)
5441 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5442 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
5443 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
5444 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
5445 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
5446 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
5447 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
5448 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
5449 ba580f68 2020-03-22 stsp int nentries;
5450 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
5451 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
5452 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
5454 c4296144 2019-05-09 stsp *new_commit_id = NULL;
5456 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
5458 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5460 588edf97 2019-05-10 stsp goto done;
5462 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5464 588edf97 2019-05-10 stsp goto done;
5466 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
5467 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
5472 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
5473 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5477 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
5478 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
5479 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
5480 cf066bf8 2019-05-09 stsp char *ondisk_path;
5482 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
5483 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
5484 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
5487 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
5488 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
5489 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
5492 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
5493 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
5494 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5495 cf066bf8 2019-05-09 stsp goto done;
5497 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5498 2e1fa222 2020-07-23 stsp free(ondisk_path);
5500 cf066bf8 2019-05-09 stsp goto done;
5503 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
5504 ba580f68 2020-03-22 stsp err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5505 ba580f68 2020-03-22 stsp commitable_paths, status_cb, status_arg, repo);
5507 036813ee 2019-05-09 stsp goto done;
5509 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5511 de18fc63 2019-05-09 stsp goto done;
5512 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
5513 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5514 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
5515 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
5516 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
5517 33ad4cbe 2019-05-12 jcs free(logmsg);
5519 9d40349a 2019-05-09 stsp goto done;
5521 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
5522 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
5523 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
5524 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
5525 09f5bd90 2019-05-09 stsp goto done;
5527 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
5528 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5530 09f5bd90 2019-05-09 stsp goto done;
5531 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
5533 ebf99748 2019-05-09 stsp goto done;
5534 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
5535 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
5536 09f5bd90 2019-05-09 stsp goto done;
5538 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
5539 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
5541 f2c16586 2019-05-09 stsp goto done;
5542 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
5544 f2c16586 2019-05-09 stsp goto done;
5546 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
5548 09f5bd90 2019-05-09 stsp goto done;
5550 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
5552 ebf99748 2019-05-09 stsp goto done;
5554 588edf97 2019-05-10 stsp if (head_tree)
5555 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
5556 588edf97 2019-05-10 stsp if (head_commit)
5557 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
5558 09f5bd90 2019-05-09 stsp free(head_commit_id2);
5559 2f17228e 2019-05-12 stsp if (head_ref2) {
5560 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
5561 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
5562 2f17228e 2019-05-12 stsp err = unlockerr;
5563 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
5565 39cd0ff6 2019-07-12 stsp return err;
5568 5c1e53bc 2019-07-28 stsp static const struct got_error *
5569 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
5570 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
5572 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
5573 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
5575 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
5576 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
5577 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
5579 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
5580 5c1e53bc 2019-07-28 stsp ct_path++;
5582 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
5583 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
5587 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
5588 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
5590 5c1e53bc 2019-07-28 stsp return NULL;
5593 f0b75401 2019-08-03 stsp static const struct got_error *
5594 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
5596 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
5598 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
5599 f0b75401 2019-08-03 stsp *have_staged_files = 1;
5600 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
5603 f0b75401 2019-08-03 stsp return NULL;
5606 5f8a88c6 2019-08-03 stsp static const struct got_error *
5607 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
5608 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
5610 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
5611 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
5613 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5614 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
5616 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5617 5f8a88c6 2019-08-03 stsp if (ie == NULL)
5618 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
5619 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
5620 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
5621 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
5624 5f8a88c6 2019-08-03 stsp return NULL;
5627 39cd0ff6 2019-07-12 stsp const struct got_error *
5628 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
5629 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
5630 35213c7c 2020-07-23 stsp const char *author, const char *committer, int allow_bad_symlinks,
5631 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5632 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
5633 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
5635 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
5636 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
5637 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
5638 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5639 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5640 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
5641 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
5642 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5643 f0b75401 2019-08-03 stsp int have_staged_files = 0;
5645 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
5647 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5649 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
5651 39cd0ff6 2019-07-12 stsp goto done;
5653 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5655 39cd0ff6 2019-07-12 stsp goto done;
5657 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5659 39cd0ff6 2019-07-12 stsp goto done;
5661 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5663 39cd0ff6 2019-07-12 stsp goto done;
5665 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
5666 5f8a88c6 2019-08-03 stsp &have_staged_files);
5667 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
5668 5f8a88c6 2019-08-03 stsp goto done;
5669 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
5670 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
5672 5f8a88c6 2019-08-03 stsp goto done;
5675 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5676 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
5677 0aeb8099 2020-07-23 stsp cc_arg.fileindex = fileindex;
5678 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
5679 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
5680 35213c7c 2020-07-23 stsp cc_arg.allow_bad_symlinks = allow_bad_symlinks;
5681 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5682 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5683 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5685 5c1e53bc 2019-07-28 stsp goto done;
5688 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5689 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5690 39cd0ff6 2019-07-12 stsp goto done;
5693 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
5694 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
5696 5c1e53bc 2019-07-28 stsp goto done;
5699 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5700 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
5701 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
5703 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
5704 f0b75401 2019-08-03 stsp ct_path++;
5705 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
5706 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
5707 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
5709 b50cabdf 2019-07-12 stsp goto done;
5713 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
5714 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
5715 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
5717 39cd0ff6 2019-07-12 stsp goto done;
5719 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
5720 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, have_staged_files);
5721 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5722 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
5723 39cd0ff6 2019-07-12 stsp err = sync_err;
5725 39cd0ff6 2019-07-12 stsp if (fileindex)
5726 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
5727 39cd0ff6 2019-07-12 stsp free(fileindex_path);
5728 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5729 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
5730 39cd0ff6 2019-07-12 stsp err = unlockerr;
5731 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
5732 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
5733 39cd0ff6 2019-07-12 stsp free_commitable(ct);
5735 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
5736 c4296144 2019-05-09 stsp return err;
5739 8656d6c4 2019-05-20 stsp const char *
5740 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
5742 8656d6c4 2019-05-20 stsp return ct->path;
5745 8656d6c4 2019-05-20 stsp unsigned int
5746 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
5748 8656d6c4 2019-05-20 stsp return ct->status;
5751 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
5752 818c7501 2019-07-11 stsp struct got_worktree *worktree;
5753 818c7501 2019-07-11 stsp struct got_repository *repo;
5756 818c7501 2019-07-11 stsp static const struct got_error *
5757 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
5759 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5760 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
5761 818c7501 2019-07-11 stsp unsigned char status;
5762 818c7501 2019-07-11 stsp struct stat sb;
5763 818c7501 2019-07-11 stsp char *ondisk_path;
5765 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
5766 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
5767 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
5768 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
5770 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
5772 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
5774 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
5775 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
5776 818c7501 2019-07-11 stsp free(ondisk_path);
5778 818c7501 2019-07-11 stsp return err;
5780 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
5781 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
5782 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
5783 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
5785 818c7501 2019-07-11 stsp return NULL;
5788 818c7501 2019-07-11 stsp const struct got_error *
5789 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
5790 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
5791 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
5792 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5794 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
5795 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5796 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
5797 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5798 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
5799 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
5800 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
5802 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5803 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5804 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5806 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5808 818c7501 2019-07-11 stsp return err;
5810 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5812 818c7501 2019-07-11 stsp goto done;
5814 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
5815 818c7501 2019-07-11 stsp ok_arg.repo = repo;
5816 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5819 818c7501 2019-07-11 stsp goto done;
5821 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5823 818c7501 2019-07-11 stsp goto done;
5825 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5827 818c7501 2019-07-11 stsp goto done;
5829 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5831 818c7501 2019-07-11 stsp goto done;
5833 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5836 e51d7b55 2020-01-04 stsp goto done;
5838 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
5840 818c7501 2019-07-11 stsp goto done;
5841 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
5842 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
5843 e51d7b55 2020-01-04 stsp goto done;
5846 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
5847 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
5849 818c7501 2019-07-11 stsp goto done;
5850 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
5852 818c7501 2019-07-11 stsp goto done;
5854 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
5856 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
5858 818c7501 2019-07-11 stsp goto done;
5860 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
5862 818c7501 2019-07-11 stsp goto done;
5864 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5865 818c7501 2019-07-11 stsp worktree->base_commit_id);
5867 818c7501 2019-07-11 stsp goto done;
5868 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
5870 818c7501 2019-07-11 stsp goto done;
5872 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5874 818c7501 2019-07-11 stsp goto done;
5876 818c7501 2019-07-11 stsp free(fileindex_path);
5877 818c7501 2019-07-11 stsp free(tmp_branch_name);
5878 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
5879 818c7501 2019-07-11 stsp free(branch_ref_name);
5880 818c7501 2019-07-11 stsp if (branch_ref)
5881 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5882 818c7501 2019-07-11 stsp if (wt_branch)
5883 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
5884 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
5885 818c7501 2019-07-11 stsp if (err) {
5886 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
5887 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
5888 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
5890 818c7501 2019-07-11 stsp if (*tmp_branch) {
5891 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5892 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5894 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5895 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5896 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5898 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
5900 818c7501 2019-07-11 stsp return err;
5903 818c7501 2019-07-11 stsp const struct got_error *
5904 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
5905 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
5906 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
5907 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
5909 818c7501 2019-07-11 stsp const struct got_error *err;
5910 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
5911 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5912 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
5913 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5914 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5916 818c7501 2019-07-11 stsp *commit_id = NULL;
5917 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
5918 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
5919 3e3a69f1 2019-07-25 stsp *branch = NULL;
5920 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5922 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5924 3e3a69f1 2019-07-25 stsp return err;
5926 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5928 f032f1f7 2019-08-04 stsp goto done;
5930 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5931 f032f1f7 2019-08-04 stsp &have_staged_files);
5932 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5933 f032f1f7 2019-08-04 stsp goto done;
5934 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5935 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5936 3e3a69f1 2019-07-25 stsp goto done;
5939 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5941 f032f1f7 2019-08-04 stsp goto done;
5943 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5945 818c7501 2019-07-11 stsp goto done;
5947 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5949 818c7501 2019-07-11 stsp goto done;
5951 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5953 818c7501 2019-07-11 stsp goto done;
5955 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
5957 818c7501 2019-07-11 stsp goto done;
5959 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
5960 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
5962 818c7501 2019-07-11 stsp goto done;
5964 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5966 818c7501 2019-07-11 stsp goto done;
5968 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5970 818c7501 2019-07-11 stsp goto done;
5972 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
5973 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
5975 818c7501 2019-07-11 stsp goto done;
5977 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5979 818c7501 2019-07-11 stsp goto done;
5981 818c7501 2019-07-11 stsp free(commit_ref_name);
5982 818c7501 2019-07-11 stsp free(branch_ref_name);
5983 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5984 818c7501 2019-07-11 stsp if (commit_ref)
5985 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5986 818c7501 2019-07-11 stsp if (branch_ref)
5987 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
5988 818c7501 2019-07-11 stsp if (err) {
5989 818c7501 2019-07-11 stsp free(*commit_id);
5990 818c7501 2019-07-11 stsp *commit_id = NULL;
5991 818c7501 2019-07-11 stsp if (*tmp_branch) {
5992 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
5993 818c7501 2019-07-11 stsp *tmp_branch = NULL;
5995 818c7501 2019-07-11 stsp if (*new_base_branch) {
5996 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
5997 818c7501 2019-07-11 stsp *new_base_branch = NULL;
5999 818c7501 2019-07-11 stsp if (*branch) {
6000 818c7501 2019-07-11 stsp got_ref_close(*branch);
6001 818c7501 2019-07-11 stsp *branch = NULL;
6003 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6004 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6005 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6007 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
6009 818c7501 2019-07-11 stsp return err;
6012 818c7501 2019-07-11 stsp const struct got_error *
6013 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6015 818c7501 2019-07-11 stsp const struct got_error *err;
6016 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
6018 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6020 818c7501 2019-07-11 stsp return err;
6022 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6023 818c7501 2019-07-11 stsp free(tmp_branch_name);
6024 818c7501 2019-07-11 stsp return NULL;
6027 818c7501 2019-07-11 stsp static const struct got_error *
6028 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6029 818c7501 2019-07-11 stsp char **logmsg, void *arg)
6031 0ebf8283 2019-07-24 stsp *logmsg = arg;
6032 818c7501 2019-07-11 stsp return NULL;
6035 818c7501 2019-07-11 stsp static const struct got_error *
6036 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6037 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
6038 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6039 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
6041 818c7501 2019-07-11 stsp return NULL;
6044 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
6045 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
6046 01757395 2019-07-12 stsp void *progress_arg;
6047 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
6050 01757395 2019-07-12 stsp static const struct got_error *
6051 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
6053 01757395 2019-07-12 stsp const struct got_error *err;
6054 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
6056 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
6058 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
6060 01757395 2019-07-12 stsp return err;
6062 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
6063 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
6064 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
6065 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
6066 01757395 2019-07-12 stsp return NULL;
6068 01757395 2019-07-12 stsp p = strdup(path);
6069 01757395 2019-07-12 stsp if (p == NULL)
6070 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
6072 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6073 01757395 2019-07-12 stsp if (err || new == NULL)
6075 01757395 2019-07-12 stsp return err;
6079 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6081 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6083 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
6084 01757395 2019-07-12 stsp free((char *)pe->path);
6086 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
6089 0ebf8283 2019-07-24 stsp static const struct got_error *
6090 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6091 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
6093 818c7501 2019-07-11 stsp const struct got_error *err;
6094 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
6096 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6097 818c7501 2019-07-11 stsp if (err) {
6098 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
6099 818c7501 2019-07-11 stsp goto done;
6100 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6102 818c7501 2019-07-11 stsp goto done;
6103 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
6105 818c7501 2019-07-11 stsp goto done;
6106 de05890f 2020-03-05 stsp } else if (is_rebase) {
6107 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
6110 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
6112 818c7501 2019-07-11 stsp goto done;
6113 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
6114 818c7501 2019-07-11 stsp free(stored_id);
6115 818c7501 2019-07-11 stsp if (cmp != 0) {
6116 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6117 818c7501 2019-07-11 stsp goto done;
6121 0ebf8283 2019-07-24 stsp if (commit_ref)
6122 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6123 0ebf8283 2019-07-24 stsp return err;
6126 0ebf8283 2019-07-24 stsp static const struct got_error *
6127 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
6128 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
6129 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6130 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
6131 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6132 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6134 0ebf8283 2019-07-24 stsp const struct got_error *err;
6135 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6136 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
6137 3e3a69f1 2019-07-25 stsp char *fileindex_path;
6139 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6141 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6143 0ebf8283 2019-07-24 stsp return err;
6145 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
6146 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
6147 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
6148 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
6149 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
6150 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
6151 818c7501 2019-07-11 stsp if (commit_ref)
6152 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
6153 818c7501 2019-07-11 stsp return err;
6156 818c7501 2019-07-11 stsp const struct got_error *
6157 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6158 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6159 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6160 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6161 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6162 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6164 0ebf8283 2019-07-24 stsp const struct got_error *err;
6165 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6167 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6169 0ebf8283 2019-07-24 stsp return err;
6171 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6173 0ebf8283 2019-07-24 stsp goto done;
6175 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6176 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6177 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6179 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6180 0ebf8283 2019-07-24 stsp return err;
6183 0ebf8283 2019-07-24 stsp const struct got_error *
6184 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6185 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6186 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6187 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
6188 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6189 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
6191 0ebf8283 2019-07-24 stsp const struct got_error *err;
6192 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6194 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6196 0ebf8283 2019-07-24 stsp return err;
6198 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6200 0ebf8283 2019-07-24 stsp goto done;
6202 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6203 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
6204 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
6206 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6207 0ebf8283 2019-07-24 stsp return err;
6210 0ebf8283 2019-07-24 stsp static const struct got_error *
6211 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
6212 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6213 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
6214 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
6215 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
6217 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
6218 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
6219 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
6220 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6221 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
6222 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
6223 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
6225 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
6226 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
6228 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
6230 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6232 3e3a69f1 2019-07-25 stsp return err;
6234 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
6235 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
6236 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
6237 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
6239 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
6240 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
6241 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
6242 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
6244 01757395 2019-07-12 stsp if (merged_paths) {
6245 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
6246 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
6247 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
6248 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
6251 01757395 2019-07-12 stsp goto done;
6254 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6255 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6257 01757395 2019-07-12 stsp goto done;
6260 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
6261 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
6262 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6264 a0e95631 2019-07-12 stsp goto done;
6265 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6266 a0e95631 2019-07-12 stsp goto done;
6269 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6271 edd02c5e 2019-07-11 stsp goto done;
6273 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6275 818c7501 2019-07-11 stsp goto done;
6277 5943eee2 2019-08-13 stsp if (new_logmsg) {
6278 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
6279 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
6280 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
6281 5943eee2 2019-08-13 stsp goto done;
6284 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6286 5943eee2 2019-08-13 stsp goto done;
6289 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
6290 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6291 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
6292 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
6293 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6295 a0e95631 2019-07-12 stsp goto done;
6297 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
6299 a0e95631 2019-07-12 stsp goto done;
6301 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
6303 a0e95631 2019-07-12 stsp goto done;
6305 437adc9d 2020-12-10 yzhong err = update_fileindex_after_commit(worktree, &commitable_paths,
6306 437adc9d 2020-12-10 yzhong *new_commit_id, fileindex, 0);
6307 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6308 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
6309 a0e95631 2019-07-12 stsp err = sync_err;
6311 a0e95631 2019-07-12 stsp free(fileindex_path);
6312 a0e95631 2019-07-12 stsp free(head_commit_id);
6313 a0e95631 2019-07-12 stsp if (head_ref)
6314 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
6315 818c7501 2019-07-11 stsp if (err) {
6316 818c7501 2019-07-11 stsp free(*new_commit_id);
6317 818c7501 2019-07-11 stsp *new_commit_id = NULL;
6319 818c7501 2019-07-11 stsp return err;
6322 818c7501 2019-07-11 stsp const struct got_error *
6323 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6324 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6325 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6326 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6327 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
6329 0ebf8283 2019-07-24 stsp const struct got_error *err;
6330 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6331 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6332 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
6334 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6336 0ebf8283 2019-07-24 stsp return err;
6338 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6340 0ebf8283 2019-07-24 stsp goto done;
6341 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
6343 0ebf8283 2019-07-24 stsp goto done;
6344 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6345 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
6346 0ebf8283 2019-07-24 stsp goto done;
6349 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6350 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
6352 0ebf8283 2019-07-24 stsp if (commit_ref)
6353 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6354 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6355 0ebf8283 2019-07-24 stsp free(commit_id);
6356 0ebf8283 2019-07-24 stsp return err;
6359 0ebf8283 2019-07-24 stsp const struct got_error *
6360 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6361 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6362 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6363 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
6364 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
6365 0ebf8283 2019-07-24 stsp struct got_repository *repo)
6367 0ebf8283 2019-07-24 stsp const struct got_error *err;
6368 0ebf8283 2019-07-24 stsp char *commit_ref_name;
6369 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6371 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6373 0ebf8283 2019-07-24 stsp return err;
6375 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6377 0ebf8283 2019-07-24 stsp goto done;
6379 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6380 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
6382 0ebf8283 2019-07-24 stsp if (commit_ref)
6383 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6384 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6385 0ebf8283 2019-07-24 stsp return err;
6388 0ebf8283 2019-07-24 stsp const struct got_error *
6389 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
6390 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6392 3e3a69f1 2019-07-25 stsp if (fileindex)
6393 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6394 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
6397 69844fba 2019-07-11 stsp static const struct got_error *
6398 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
6400 69844fba 2019-07-11 stsp const struct got_error *err;
6401 69844fba 2019-07-11 stsp struct got_reference *ref;
6403 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
6404 69844fba 2019-07-11 stsp if (err) {
6405 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
6406 69844fba 2019-07-11 stsp return NULL;
6407 69844fba 2019-07-11 stsp return err;
6410 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
6411 69844fba 2019-07-11 stsp got_ref_close(ref);
6412 69844fba 2019-07-11 stsp return err;
6415 69844fba 2019-07-11 stsp static const struct got_error *
6416 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6418 69844fba 2019-07-11 stsp const struct got_error *err;
6419 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6420 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6422 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6424 69844fba 2019-07-11 stsp goto done;
6425 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
6427 69844fba 2019-07-11 stsp goto done;
6429 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6431 69844fba 2019-07-11 stsp goto done;
6432 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
6434 69844fba 2019-07-11 stsp goto done;
6436 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6438 69844fba 2019-07-11 stsp goto done;
6439 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
6441 69844fba 2019-07-11 stsp goto done;
6443 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6445 69844fba 2019-07-11 stsp goto done;
6446 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
6448 69844fba 2019-07-11 stsp goto done;
6451 69844fba 2019-07-11 stsp free(tmp_branch_name);
6452 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
6453 69844fba 2019-07-11 stsp free(branch_ref_name);
6454 69844fba 2019-07-11 stsp free(commit_ref_name);
6455 e600f124 2021-03-21 stsp return err;
6458 e600f124 2021-03-21 stsp const struct got_error *
6459 e600f124 2021-03-21 stsp create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6460 e600f124 2021-03-21 stsp struct got_object_id *new_commit_id, struct got_repository *repo)
6462 e600f124 2021-03-21 stsp const struct got_error *err;
6463 e600f124 2021-03-21 stsp struct got_reference *ref = NULL;
6464 e600f124 2021-03-21 stsp struct got_object_id *old_commit_id = NULL;
6465 e600f124 2021-03-21 stsp const char *branch_name = NULL;
6466 e600f124 2021-03-21 stsp char *new_id_str = NULL;
6467 e600f124 2021-03-21 stsp char *refname = NULL;
6469 e600f124 2021-03-21 stsp branch_name = got_ref_get_name(branch);
6470 e600f124 2021-03-21 stsp if (strncmp(branch_name, "refs/heads/", 11) != 0)
6471 e600f124 2021-03-21 stsp return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6472 e600f124 2021-03-21 stsp branch_name += 11;
6474 e600f124 2021-03-21 stsp err = got_object_id_str(&new_id_str, new_commit_id);
6476 e600f124 2021-03-21 stsp return err;
6478 e600f124 2021-03-21 stsp if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6479 e600f124 2021-03-21 stsp new_id_str) == -1) {
6480 e600f124 2021-03-21 stsp err = got_error_from_errno("asprintf");
6481 e600f124 2021-03-21 stsp goto done;
6484 e600f124 2021-03-21 stsp err = got_ref_resolve(&old_commit_id, repo, branch);
6486 e600f124 2021-03-21 stsp goto done;
6488 e600f124 2021-03-21 stsp err = got_ref_alloc(&ref, refname, old_commit_id);
6490 e600f124 2021-03-21 stsp goto done;
6492 e600f124 2021-03-21 stsp err = got_ref_write(ref, repo);
6494 e600f124 2021-03-21 stsp free(new_id_str);
6495 e600f124 2021-03-21 stsp free(refname);
6496 e600f124 2021-03-21 stsp free(old_commit_id);
6498 e600f124 2021-03-21 stsp got_ref_close(ref);
6499 69844fba 2019-07-11 stsp return err;
6502 818c7501 2019-07-11 stsp const struct got_error *
6503 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
6504 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
6505 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
6506 e600f124 2021-03-21 stsp struct got_repository *repo, int create_backup)
6508 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6509 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
6510 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
6512 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
6514 818c7501 2019-07-11 stsp return err;
6516 e600f124 2021-03-21 stsp if (create_backup) {
6517 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
6518 e600f124 2021-03-21 stsp rebased_branch, new_head_commit_id, repo);
6520 e600f124 2021-03-21 stsp goto done;
6523 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
6525 818c7501 2019-07-11 stsp goto done;
6527 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
6529 818c7501 2019-07-11 stsp goto done;
6531 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
6533 818c7501 2019-07-11 stsp goto done;
6535 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
6537 a615e0e7 2020-12-16 stsp goto done;
6539 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
6541 a615e0e7 2020-12-16 stsp goto done;
6542 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
6543 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6544 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
6545 a615e0e7 2020-12-16 stsp err = sync_err;
6547 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
6548 a615e0e7 2020-12-16 stsp free(fileindex_path);
6549 818c7501 2019-07-11 stsp free(new_head_commit_id);
6550 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6551 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6552 818c7501 2019-07-11 stsp err = unlockerr;
6553 818c7501 2019-07-11 stsp return err;
6556 818c7501 2019-07-11 stsp const struct got_error *
6557 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
6558 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6559 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
6560 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6562 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
6563 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
6564 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
6565 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
6566 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6567 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
6569 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
6571 818c7501 2019-07-11 stsp return err;
6573 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
6574 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
6576 818c7501 2019-07-11 stsp goto done;
6578 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
6580 818c7501 2019-07-11 stsp goto done;
6583 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
6584 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
6585 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
6587 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
6589 818c7501 2019-07-11 stsp goto done;
6591 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
6593 818c7501 2019-07-11 stsp goto done;
6595 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
6596 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
6598 ca355955 2019-07-12 stsp goto done;
6600 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
6602 ca355955 2019-07-12 stsp goto done;
6604 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6606 818c7501 2019-07-11 stsp goto done;
6608 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6609 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6610 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6611 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6612 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6613 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6614 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6615 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
6616 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6618 1f1abb7e 2019-08-08 stsp goto sync;
6620 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6621 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
6623 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6624 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
6625 ca355955 2019-07-12 stsp err = sync_err;
6627 818c7501 2019-07-11 stsp got_ref_close(resolved);
6628 a3a2faf2 2019-07-12 stsp free(tree_id);
6629 818c7501 2019-07-11 stsp free(commit_id);
6630 0ebf8283 2019-07-24 stsp if (fileindex)
6631 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
6632 0ebf8283 2019-07-24 stsp free(fileindex_path);
6634 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6635 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
6636 0ebf8283 2019-07-24 stsp err = unlockerr;
6637 0ebf8283 2019-07-24 stsp return err;
6640 0ebf8283 2019-07-24 stsp const struct got_error *
6641 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
6642 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
6643 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
6644 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
6646 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
6647 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6648 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
6649 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
6650 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6651 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
6652 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
6653 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6655 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6656 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6657 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6658 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6660 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6662 0ebf8283 2019-07-24 stsp return err;
6664 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6666 0ebf8283 2019-07-24 stsp goto done;
6668 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
6669 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
6670 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6673 0ebf8283 2019-07-24 stsp goto done;
6675 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6677 0ebf8283 2019-07-24 stsp goto done;
6679 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6681 0ebf8283 2019-07-24 stsp goto done;
6683 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6684 0ebf8283 2019-07-24 stsp worktree);
6686 0ebf8283 2019-07-24 stsp goto done;
6688 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6691 0ebf8283 2019-07-24 stsp goto done;
6693 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
6695 0ebf8283 2019-07-24 stsp goto done;
6697 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
6699 0ebf8283 2019-07-24 stsp goto done;
6701 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
6702 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6704 0ebf8283 2019-07-24 stsp goto done;
6705 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
6707 0ebf8283 2019-07-24 stsp goto done;
6708 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
6709 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
6710 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
6711 0ebf8283 2019-07-24 stsp goto done;
6714 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
6715 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
6717 0ebf8283 2019-07-24 stsp goto done;
6718 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
6720 0ebf8283 2019-07-24 stsp goto done;
6722 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
6724 0ebf8283 2019-07-24 stsp goto done;
6726 0ebf8283 2019-07-24 stsp free(fileindex_path);
6727 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6728 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6729 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6730 0ebf8283 2019-07-24 stsp if (wt_branch)
6731 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
6732 0ebf8283 2019-07-24 stsp if (err) {
6733 0ebf8283 2019-07-24 stsp if (*branch_ref) {
6734 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
6735 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
6737 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6738 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6739 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6741 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6742 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6743 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6744 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6746 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
6748 0ebf8283 2019-07-24 stsp return err;
6751 0ebf8283 2019-07-24 stsp const struct got_error *
6752 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
6753 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
6755 3e3a69f1 2019-07-25 stsp if (fileindex)
6756 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
6757 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
6760 0ebf8283 2019-07-24 stsp const struct got_error *
6761 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
6762 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
6764 0ebf8283 2019-07-24 stsp const struct got_error *err;
6765 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
6767 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6769 0ebf8283 2019-07-24 stsp return err;
6771 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6772 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6773 0ebf8283 2019-07-24 stsp return NULL;
6776 0ebf8283 2019-07-24 stsp const struct got_error *
6777 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
6778 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
6779 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
6780 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
6782 0ebf8283 2019-07-24 stsp const struct got_error *err;
6783 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
6784 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6785 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
6786 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
6787 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
6788 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
6790 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6791 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6792 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6793 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6795 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
6797 3e3a69f1 2019-07-25 stsp return err;
6799 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
6801 f032f1f7 2019-08-04 stsp goto done;
6803 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6804 f032f1f7 2019-08-04 stsp &have_staged_files);
6805 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
6806 f032f1f7 2019-08-04 stsp goto done;
6807 f032f1f7 2019-08-04 stsp if (have_staged_files) {
6808 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
6809 3e3a69f1 2019-07-25 stsp goto done;
6812 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6814 f032f1f7 2019-08-04 stsp goto done;
6816 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6818 0ebf8283 2019-07-24 stsp goto done;
6820 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6822 0ebf8283 2019-07-24 stsp goto done;
6824 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6825 0ebf8283 2019-07-24 stsp worktree);
6827 0ebf8283 2019-07-24 stsp goto done;
6829 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
6831 0ebf8283 2019-07-24 stsp goto done;
6833 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6835 0ebf8283 2019-07-24 stsp goto done;
6836 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
6838 0ebf8283 2019-07-24 stsp goto done;
6840 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
6842 0ebf8283 2019-07-24 stsp goto done;
6843 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
6845 0ebf8283 2019-07-24 stsp goto done;
6847 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6849 0ebf8283 2019-07-24 stsp goto done;
6851 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6852 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6853 3e3a69f1 2019-07-25 stsp free(fileindex_path);
6854 0ebf8283 2019-07-24 stsp if (commit_ref)
6855 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
6856 0ebf8283 2019-07-24 stsp if (base_commit_ref)
6857 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
6858 0ebf8283 2019-07-24 stsp if (err) {
6859 0ebf8283 2019-07-24 stsp free(*commit_id);
6860 0ebf8283 2019-07-24 stsp *commit_id = NULL;
6861 0ebf8283 2019-07-24 stsp free(*base_commit_id);
6862 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
6863 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
6864 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
6865 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
6867 3e3a69f1 2019-07-25 stsp if (*fileindex) {
6868 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
6869 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
6871 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
6873 0ebf8283 2019-07-24 stsp return err;
6876 0ebf8283 2019-07-24 stsp static const struct got_error *
6877 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
6879 0ebf8283 2019-07-24 stsp const struct got_error *err;
6880 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
6881 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
6883 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
6885 0ebf8283 2019-07-24 stsp goto done;
6886 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
6888 0ebf8283 2019-07-24 stsp goto done;
6890 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
6891 0ebf8283 2019-07-24 stsp worktree);
6893 0ebf8283 2019-07-24 stsp goto done;
6894 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
6896 0ebf8283 2019-07-24 stsp goto done;
6898 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
6900 0ebf8283 2019-07-24 stsp goto done;
6901 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
6903 0ebf8283 2019-07-24 stsp goto done;
6905 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6907 0ebf8283 2019-07-24 stsp goto done;
6908 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
6910 0ebf8283 2019-07-24 stsp goto done;
6912 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
6913 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
6914 0ebf8283 2019-07-24 stsp free(branch_ref_name);
6915 0ebf8283 2019-07-24 stsp free(commit_ref_name);
6916 0ebf8283 2019-07-24 stsp return err;
6919 0ebf8283 2019-07-24 stsp const struct got_error *
6920 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
6921 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6922 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
6923 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
6925 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
6926 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6927 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
6928 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
6929 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
6931 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
6933 0ebf8283 2019-07-24 stsp return err;
6935 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
6936 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
6938 0ebf8283 2019-07-24 stsp goto done;
6940 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
6942 0ebf8283 2019-07-24 stsp goto done;
6944 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
6946 0ebf8283 2019-07-24 stsp goto done;
6948 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
6949 0ebf8283 2019-07-24 stsp worktree->path_prefix);
6951 0ebf8283 2019-07-24 stsp goto done;
6953 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
6955 0ebf8283 2019-07-24 stsp goto done;
6957 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
6959 0ebf8283 2019-07-24 stsp goto done;
6961 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
6962 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
6963 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
6964 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
6965 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
6966 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
6967 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
6968 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
6969 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
6971 1f1abb7e 2019-08-08 stsp goto sync;
6973 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
6974 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
6976 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6977 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
6978 0ebf8283 2019-07-24 stsp err = sync_err;
6980 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
6981 0ebf8283 2019-07-24 stsp free(tree_id);
6982 818c7501 2019-07-11 stsp free(fileindex_path);
6984 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6985 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
6986 818c7501 2019-07-11 stsp err = unlockerr;
6987 818c7501 2019-07-11 stsp return err;
6990 0ebf8283 2019-07-24 stsp const struct got_error *
6991 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
6992 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6993 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
6995 a615e0e7 2020-12-16 stsp const struct got_error *err, *unlockerr, *sync_err;
6996 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
6997 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
6998 a615e0e7 2020-12-16 stsp char *fileindex_path = NULL;
7000 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7002 0ebf8283 2019-07-24 stsp return err;
7004 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
7005 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
7007 e600f124 2021-03-21 stsp goto done;
7009 e600f124 2021-03-21 stsp err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7010 e600f124 2021-03-21 stsp resolved, new_head_commit_id, repo);
7012 0ebf8283 2019-07-24 stsp goto done;
7014 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
7016 0ebf8283 2019-07-24 stsp goto done;
7018 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
7020 0ebf8283 2019-07-24 stsp goto done;
7022 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
7024 0ebf8283 2019-07-24 stsp goto done;
7026 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
7028 a615e0e7 2020-12-16 stsp goto done;
7030 a615e0e7 2020-12-16 stsp err = get_fileindex_path(&fileindex_path, worktree);
7032 a615e0e7 2020-12-16 stsp goto done;
7033 a615e0e7 2020-12-16 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7034 a615e0e7 2020-12-16 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7035 a615e0e7 2020-12-16 stsp if (sync_err && err == NULL)
7036 a615e0e7 2020-12-16 stsp err = sync_err;
7038 a615e0e7 2020-12-16 stsp got_fileindex_free(fileindex);
7039 a615e0e7 2020-12-16 stsp free(fileindex_path);
7040 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
7041 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7042 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
7043 0ebf8283 2019-07-24 stsp err = unlockerr;
7044 0ebf8283 2019-07-24 stsp return err;
7047 0ebf8283 2019-07-24 stsp const struct got_error *
7048 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7049 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
7051 0ebf8283 2019-07-24 stsp const struct got_error *err;
7052 0ebf8283 2019-07-24 stsp char *commit_ref_name;
7054 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7056 0ebf8283 2019-07-24 stsp return err;
7058 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7060 0ebf8283 2019-07-24 stsp goto done;
7062 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
7064 0ebf8283 2019-07-24 stsp free(commit_ref_name);
7065 2822a352 2019-10-15 stsp return err;
7068 2822a352 2019-10-15 stsp const struct got_error *
7069 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7070 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7071 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
7072 2822a352 2019-10-15 stsp struct got_repository *repo)
7074 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
7075 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7076 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
7078 2822a352 2019-10-15 stsp *fileindex = NULL;
7079 2822a352 2019-10-15 stsp *branch_ref = NULL;
7080 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7082 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
7084 2822a352 2019-10-15 stsp return err;
7086 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7087 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
7088 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
7089 2822a352 2019-10-15 stsp "update -b or different branch name required");
7090 2822a352 2019-10-15 stsp goto done;
7093 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
7095 2822a352 2019-10-15 stsp goto done;
7097 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
7098 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
7099 2822a352 2019-10-15 stsp ok_arg.repo = repo;
7100 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7103 2822a352 2019-10-15 stsp goto done;
7105 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
7107 2822a352 2019-10-15 stsp goto done;
7109 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
7110 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
7112 2822a352 2019-10-15 stsp if (err) {
7113 2822a352 2019-10-15 stsp if (*branch_ref) {
7114 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
7115 2822a352 2019-10-15 stsp *branch_ref = NULL;
7117 2822a352 2019-10-15 stsp if (*base_branch_ref) {
7118 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
7119 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
7121 2822a352 2019-10-15 stsp if (*fileindex) {
7122 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
7123 2822a352 2019-10-15 stsp *fileindex = NULL;
7125 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
7127 0cb83759 2019-08-03 stsp return err;
7130 2822a352 2019-10-15 stsp const struct got_error *
7131 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
7132 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7133 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7134 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7135 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
7137 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7138 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
7139 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
7141 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
7143 2822a352 2019-10-15 stsp goto done;
7145 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
7147 2822a352 2019-10-15 stsp goto done;
7149 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
7150 2822a352 2019-10-15 stsp worktree->path_prefix);
7152 2822a352 2019-10-15 stsp goto done;
7154 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7156 2822a352 2019-10-15 stsp goto done;
7158 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7159 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
7161 2822a352 2019-10-15 stsp goto sync;
7163 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
7165 2822a352 2019-10-15 stsp goto sync;
7167 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
7169 6e210706 2021-01-22 stsp goto sync;
7171 6e210706 2021-01-22 stsp err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7173 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7174 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
7175 2822a352 2019-10-15 stsp err = sync_err;
7178 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
7179 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7180 2822a352 2019-10-15 stsp err = unlockerr;
7181 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7183 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
7184 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7185 2822a352 2019-10-15 stsp err = unlockerr;
7186 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7188 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
7189 2822a352 2019-10-15 stsp free(fileindex_path);
7190 2822a352 2019-10-15 stsp free(tree_id);
7192 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7193 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
7194 2822a352 2019-10-15 stsp err = unlockerr;
7195 2822a352 2019-10-15 stsp return err;
7198 2822a352 2019-10-15 stsp const struct got_error *
7199 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
7200 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
7201 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7203 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
7205 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
7207 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
7209 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
7210 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7211 8b692cd0 2019-10-21 stsp err = unlockerr;
7212 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
7214 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
7215 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
7216 8b692cd0 2019-10-21 stsp err = unlockerr;
7217 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
7219 8b692cd0 2019-10-21 stsp return err;
7222 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
7223 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
7224 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7225 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7226 2db2652d 2019-08-07 stsp struct got_repository *repo;
7227 2db2652d 2019-08-07 stsp int have_changes;
7230 2db2652d 2019-08-07 stsp const struct got_error *
7231 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
7232 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7233 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7234 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7236 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
7237 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
7238 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
7239 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
7240 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
7241 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
7243 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
7244 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
7245 8b13ce36 2019-08-08 stsp return NULL;
7246 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
7247 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
7249 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7250 735ef5ac 2019-08-03 stsp if (ie == NULL)
7251 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7253 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
7254 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
7255 735ef5ac 2019-08-03 stsp relpath) == -1)
7256 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
7258 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
7259 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
7260 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7261 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
7264 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
7265 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
7266 3aa5969e 2019-08-06 stsp goto done;
7267 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
7268 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
7269 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
7270 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
7271 735ef5ac 2019-08-03 stsp goto done;
7274 2db2652d 2019-08-07 stsp a->have_changes = 1;
7276 735ef5ac 2019-08-03 stsp p = in_repo_path;
7277 735ef5ac 2019-08-03 stsp while (p[0] == '/')
7279 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
7280 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
7281 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
7283 735ef5ac 2019-08-03 stsp free(in_repo_path);
7284 dc424a06 2019-08-07 stsp return err;
7287 2db2652d 2019-08-07 stsp struct stage_path_arg {
7288 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
7289 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
7290 2db2652d 2019-08-07 stsp struct got_repository *repo;
7291 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
7292 2db2652d 2019-08-07 stsp void *status_arg;
7293 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
7294 2db2652d 2019-08-07 stsp void *patch_arg;
7295 7b5dc508 2019-10-28 stsp int staged_something;
7296 35213c7c 2020-07-23 stsp int allow_bad_symlinks;
7299 2db2652d 2019-08-07 stsp static const struct got_error *
7300 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
7301 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
7302 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7303 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7305 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
7306 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
7307 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
7308 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
7309 0cb83759 2019-08-03 stsp uint32_t stage;
7310 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
7311 0aeb8099 2020-07-23 stsp struct stat sb;
7313 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
7314 8b13ce36 2019-08-08 stsp return NULL;
7316 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7317 d3e7c587 2019-08-03 stsp if (ie == NULL)
7318 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7320 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
7321 2db2652d 2019-08-07 stsp relpath)== -1)
7322 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
7324 0cb83759 2019-08-03 stsp switch (status) {
7325 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
7326 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
7327 0aeb8099 2020-07-23 stsp /* XXX could sb.st_mode be passed in by our caller? */
7328 0aeb8099 2020-07-23 stsp if (lstat(ondisk_path, &sb) == -1) {
7329 0aeb8099 2020-07-23 stsp err = got_error_from_errno2("lstat", ondisk_path);
7332 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7333 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
7334 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7335 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7336 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
7339 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
7342 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
7343 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
7344 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
7345 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
7346 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
7350 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
7351 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
7354 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7355 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
7356 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
7357 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
7359 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
7360 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7361 0aeb8099 2020-07-23 stsp if (S_ISLNK(sb.st_mode)) {
7362 35213c7c 2020-07-23 stsp int is_bad_symlink = 0;
7363 35213c7c 2020-07-23 stsp if (!a->allow_bad_symlinks) {
7364 35213c7c 2020-07-23 stsp char target_path[PATH_MAX];
7365 35213c7c 2020-07-23 stsp ssize_t target_len;
7366 35213c7c 2020-07-23 stsp target_len = readlink(ondisk_path, target_path,
7367 35213c7c 2020-07-23 stsp sizeof(target_path));
7368 35213c7c 2020-07-23 stsp if (target_len == -1) {
7369 35213c7c 2020-07-23 stsp err = got_error_from_errno2("readlink",
7370 35213c7c 2020-07-23 stsp ondisk_path);
7373 35213c7c 2020-07-23 stsp err = is_bad_symlink_target(&is_bad_symlink,
7374 35213c7c 2020-07-23 stsp target_path, target_len, ondisk_path,
7375 35213c7c 2020-07-23 stsp a->worktree->root_path);
7378 35213c7c 2020-07-23 stsp if (is_bad_symlink) {
7379 35213c7c 2020-07-23 stsp err = got_error_path(ondisk_path,
7380 35213c7c 2020-07-23 stsp GOT_ERR_BAD_SYMLINK);
7384 35213c7c 2020-07-23 stsp if (is_bad_symlink)
7385 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7386 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_BAD_SYMLINK);
7388 35213c7c 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7389 35213c7c 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK);
7391 0aeb8099 2020-07-23 stsp got_fileindex_entry_staged_filetype_set(ie,
7392 0aeb8099 2020-07-23 stsp GOT_FILEIDX_MODE_REGULAR_FILE);
7394 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7395 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7397 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7398 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
7399 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
7401 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
7402 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
7404 2db2652d 2019-08-07 stsp if (a->patch_cb) {
7405 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
7406 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
7407 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
7410 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7412 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7413 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7417 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
7418 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
7419 7b5dc508 2019-10-28 stsp a->staged_something = 1;
7420 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
7422 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
7423 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
7426 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
7428 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
7429 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
7431 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
7432 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
7435 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
7439 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
7440 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
7441 dc424a06 2019-08-07 stsp free(path_content);
7442 2db2652d 2019-08-07 stsp free(ondisk_path);
7443 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
7444 0ebf8283 2019-07-24 stsp return err;
7447 0cb83759 2019-08-03 stsp const struct got_error *
7448 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
7449 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
7450 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
7451 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7452 35213c7c 2020-07-23 stsp int allow_bad_symlinks, struct got_repository *repo)
7454 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7455 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
7456 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7457 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
7458 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
7459 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
7460 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
7461 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
7463 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7465 0cb83759 2019-08-03 stsp return err;
7467 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
7468 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
7470 735ef5ac 2019-08-03 stsp goto done;
7471 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
7473 735ef5ac 2019-08-03 stsp goto done;
7474 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7476 0cb83759 2019-08-03 stsp goto done;
7478 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
7479 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
7480 2db2652d 2019-08-07 stsp oka.worktree = worktree;
7481 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
7482 2db2652d 2019-08-07 stsp oka.repo = repo;
7483 2db2652d 2019-08-07 stsp oka.have_changes = 0;
7484 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7485 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7486 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
7488 735ef5ac 2019-08-03 stsp goto done;
7490 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
7491 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7492 2db2652d 2019-08-07 stsp goto done;
7495 2db2652d 2019-08-07 stsp spa.worktree = worktree;
7496 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
7497 2db2652d 2019-08-07 stsp spa.repo = repo;
7498 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
7499 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
7500 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
7501 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
7502 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
7503 35213c7c 2020-07-23 stsp spa.allow_bad_symlinks = allow_bad_symlinks;
7504 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7505 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7506 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
7508 2db2652d 2019-08-07 stsp goto done;
7510 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
7511 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
7512 7b5dc508 2019-10-28 stsp goto done;
7515 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7516 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
7517 0cb83759 2019-08-03 stsp err = sync_err;
7519 735ef5ac 2019-08-03 stsp if (head_ref)
7520 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
7521 735ef5ac 2019-08-03 stsp free(head_commit_id);
7522 0cb83759 2019-08-03 stsp free(fileindex_path);
7523 0cb83759 2019-08-03 stsp if (fileindex)
7524 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
7525 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7526 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
7527 0cb83759 2019-08-03 stsp err = unlockerr;
7528 0cb83759 2019-08-03 stsp return err;
7531 ad493afc 2019-08-03 stsp struct unstage_path_arg {
7532 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
7533 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
7534 ad493afc 2019-08-03 stsp struct got_repository *repo;
7535 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
7536 ad493afc 2019-08-03 stsp void *progress_arg;
7537 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
7538 2e1f37b0 2019-08-08 stsp void *patch_arg;
7541 2e1f37b0 2019-08-08 stsp static const struct got_error *
7542 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
7543 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
7544 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
7545 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
7546 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
7548 fe621944 2020-11-10 stsp const struct got_error *err, *free_err;
7549 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
7550 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
7551 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
7552 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
7553 fe621944 2020-11-10 stsp int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
7554 fe621944 2020-11-10 stsp int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
7556 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7557 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7559 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
7561 2e1f37b0 2019-08-08 stsp return err;
7562 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
7564 2e1f37b0 2019-08-08 stsp goto done;
7566 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
7568 2e1f37b0 2019-08-08 stsp goto done;
7570 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
7572 2e1f37b0 2019-08-08 stsp goto done;
7574 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
7576 2e1f37b0 2019-08-08 stsp goto done;
7578 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
7580 2e1f37b0 2019-08-08 stsp goto done;
7582 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
7584 2e1f37b0 2019-08-08 stsp goto done;
7586 fe621944 2020-11-10 stsp err = got_diff_files(&diffreg_result, f1, label1, f2,
7587 64453f7e 2020-11-21 stsp path2, 3, 0, 1, NULL);
7589 2e1f37b0 2019-08-08 stsp goto done;
7591 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
7592 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
7594 2e1f37b0 2019-08-08 stsp goto done;
7595 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
7596 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
7598 2e1f37b0 2019-08-08 stsp goto done;
7600 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
7601 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
7602 2e1f37b0 2019-08-08 stsp goto done;
7604 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
7605 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
7606 2e1f37b0 2019-08-08 stsp goto done;
7608 fe621944 2020-11-10 stsp /* Count the number of actual changes in the diff result. */
7609 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
7610 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
7611 fe621944 2020-11-10 stsp diff_chunk_context_load_change(&cc, &nchunks_used,
7612 fe621944 2020-11-10 stsp diffreg_result->result, n, 0);
7613 fe621944 2020-11-10 stsp nchanges++;
7615 fe621944 2020-11-10 stsp for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
7616 2e1f37b0 2019-08-08 stsp int choice;
7617 fe621944 2020-11-10 stsp err = apply_or_reject_change(&choice, &nchunks_used,
7618 fe621944 2020-11-10 stsp diffreg_result->result, n, relpath, f1, f2,
7619 fe621944 2020-11-10 stsp &line_cur1, &line_cur2,
7620 fe621944 2020-11-10 stsp outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
7622 2e1f37b0 2019-08-08 stsp goto done;
7623 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
7624 2e1f37b0 2019-08-08 stsp have_content = 1;
7626 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
7627 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
7630 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
7631 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
7632 f1e81a05 2019-08-10 stsp outfile, rejectfile);
7634 2e1f37b0 2019-08-08 stsp free(label1);
7636 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
7637 2e1f37b0 2019-08-08 stsp if (staged_blob)
7638 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
7639 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
7640 fe621944 2020-11-10 stsp if (free_err && err == NULL)
7641 fe621944 2020-11-10 stsp err = free_err;
7642 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
7643 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
7644 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
7645 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
7646 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
7647 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
7648 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
7649 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
7650 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
7651 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
7652 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
7653 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
7654 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
7655 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
7656 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
7657 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7658 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
7659 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
7660 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
7662 fda8017d 2020-07-23 stsp if (err || !have_content || !have_rejected_content) {
7663 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
7664 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
7665 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
7666 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
7667 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
7668 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
7670 2e1f37b0 2019-08-08 stsp free(path1);
7671 2e1f37b0 2019-08-08 stsp free(path2);
7672 fda8017d 2020-07-23 stsp return err;
7675 fda8017d 2020-07-23 stsp static const struct got_error *
7676 fda8017d 2020-07-23 stsp unstage_hunks(struct got_object_id *staged_blob_id,
7677 fda8017d 2020-07-23 stsp struct got_blob_object *blob_base,
7678 fda8017d 2020-07-23 stsp struct got_object_id *blob_id, struct got_fileindex_entry *ie,
7679 fda8017d 2020-07-23 stsp const char *ondisk_path, const char *label_orig,
7680 fda8017d 2020-07-23 stsp struct got_worktree *worktree, struct got_repository *repo,
7681 fda8017d 2020-07-23 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7682 fda8017d 2020-07-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
7684 fda8017d 2020-07-23 stsp const struct got_error *err = NULL;
7685 fda8017d 2020-07-23 stsp char *path_unstaged_content = NULL;
7686 fda8017d 2020-07-23 stsp char *path_new_staged_content = NULL;
7687 fda8017d 2020-07-23 stsp struct got_object_id *new_staged_blob_id = NULL;
7688 fda8017d 2020-07-23 stsp FILE *f = NULL;
7689 fda8017d 2020-07-23 stsp struct stat sb;
7691 fda8017d 2020-07-23 stsp err = create_unstaged_content(&path_unstaged_content,
7692 fda8017d 2020-07-23 stsp &path_new_staged_content, blob_id, staged_blob_id,
7693 fda8017d 2020-07-23 stsp ie->path, repo, patch_cb, patch_arg);
7695 fda8017d 2020-07-23 stsp return err;
7697 fda8017d 2020-07-23 stsp if (path_unstaged_content == NULL)
7698 fda8017d 2020-07-23 stsp return NULL;
7700 fda8017d 2020-07-23 stsp if (path_new_staged_content) {
7701 fda8017d 2020-07-23 stsp err = got_object_blob_create(&new_staged_blob_id,
7702 fda8017d 2020-07-23 stsp path_new_staged_content, repo);
7704 fda8017d 2020-07-23 stsp goto done;
7707 fda8017d 2020-07-23 stsp f = fopen(path_unstaged_content, "r");
7708 fda8017d 2020-07-23 stsp if (f == NULL) {
7709 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fopen",
7710 fda8017d 2020-07-23 stsp path_unstaged_content);
7711 fda8017d 2020-07-23 stsp goto done;
7713 fda8017d 2020-07-23 stsp if (fstat(fileno(f), &sb) == -1) {
7714 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fstat", path_unstaged_content);
7715 fda8017d 2020-07-23 stsp goto done;
7717 fda8017d 2020-07-23 stsp if (got_fileindex_entry_staged_filetype_get(ie) ==
7718 fda8017d 2020-07-23 stsp GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
7719 fda8017d 2020-07-23 stsp char link_target[PATH_MAX];
7721 fda8017d 2020-07-23 stsp r = fread(link_target, 1, sizeof(link_target), f);
7722 fda8017d 2020-07-23 stsp if (r == 0 && ferror(f)) {
7723 fda8017d 2020-07-23 stsp err = got_error_from_errno("fread");
7724 fda8017d 2020-07-23 stsp goto done;
7726 fda8017d 2020-07-23 stsp if (r >= sizeof(link_target)) { /* should not happen */
7727 fda8017d 2020-07-23 stsp err = got_error(GOT_ERR_NO_SPACE);
7728 fda8017d 2020-07-23 stsp goto done;
7730 fda8017d 2020-07-23 stsp link_target[r] = '\0';
7731 fda8017d 2020-07-23 stsp err = merge_symlink(worktree, blob_base,
7732 fda8017d 2020-07-23 stsp ondisk_path, ie->path, label_orig, link_target,
7733 fda8017d 2020-07-23 stsp worktree->base_commit_id, repo, progress_cb,
7734 fda8017d 2020-07-23 stsp progress_arg);
7736 fda8017d 2020-07-23 stsp int local_changes_subsumed;
7737 fda8017d 2020-07-23 stsp err = merge_file(&local_changes_subsumed, worktree,
7738 fda8017d 2020-07-23 stsp blob_base, ondisk_path, ie->path,
7739 fda8017d 2020-07-23 stsp got_fileindex_perms_to_st(ie),
7740 fda8017d 2020-07-23 stsp path_unstaged_content, label_orig, "unstaged",
7741 fda8017d 2020-07-23 stsp repo, progress_cb, progress_arg);
7744 fda8017d 2020-07-23 stsp goto done;
7746 fda8017d 2020-07-23 stsp if (new_staged_blob_id) {
7747 fda8017d 2020-07-23 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
7748 fda8017d 2020-07-23 stsp SHA1_DIGEST_LENGTH);
7750 fda8017d 2020-07-23 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7751 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
7754 fda8017d 2020-07-23 stsp free(new_staged_blob_id);
7755 fda8017d 2020-07-23 stsp if (path_unstaged_content &&
7756 fda8017d 2020-07-23 stsp unlink(path_unstaged_content) == -1 && err == NULL)
7757 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
7758 fda8017d 2020-07-23 stsp if (path_new_staged_content &&
7759 fda8017d 2020-07-23 stsp unlink(path_new_staged_content) == -1 && err == NULL)
7760 fda8017d 2020-07-23 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
7761 56b63ca4 2021-01-22 stsp if (f && fclose(f) == EOF && err == NULL)
7762 fda8017d 2020-07-23 stsp err = got_error_from_errno2("fclose", path_unstaged_content);
7763 fda8017d 2020-07-23 stsp free(path_unstaged_content);
7764 fda8017d 2020-07-23 stsp free(path_new_staged_content);
7765 2e1f37b0 2019-08-08 stsp return err;
7768 ad493afc 2019-08-03 stsp static const struct got_error *
7769 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
7770 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
7771 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7772 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
7774 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
7775 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
7776 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
7777 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
7778 fda8017d 2020-07-23 stsp char *ondisk_path = NULL;
7779 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
7780 ad493afc 2019-08-03 stsp int local_changes_subsumed;
7781 9bc94a15 2019-08-03 stsp struct stat sb;
7783 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
7784 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
7785 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
7786 2e1f37b0 2019-08-08 stsp return NULL;
7788 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
7789 ad493afc 2019-08-03 stsp if (ie == NULL)
7790 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
7792 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
7794 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
7796 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
7797 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
7799 f69721c3 2019-10-21 stsp goto done;
7800 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
7801 f69721c3 2019-10-21 stsp id_str) == -1) {
7802 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
7803 f69721c3 2019-10-21 stsp goto done;
7806 ad493afc 2019-08-03 stsp switch (staged_status) {
7807 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
7808 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
7809 ad493afc 2019-08-03 stsp blob_id, 8192);
7812 ad493afc 2019-08-03 stsp /* fall through */
7813 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
7814 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7815 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
7816 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7817 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7818 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7821 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
7824 fda8017d 2020-07-23 stsp err = unstage_hunks(staged_blob_id,
7825 fda8017d 2020-07-23 stsp blob_base, blob_id, ie, ondisk_path,
7826 fda8017d 2020-07-23 stsp label_orig, a->worktree, a->repo,
7827 fda8017d 2020-07-23 stsp a->patch_cb, a->patch_arg,
7828 fda8017d 2020-07-23 stsp a->progress_cb, a->progress_arg);
7829 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
7832 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
7833 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
7836 ea7786be 2020-07-23 stsp switch (got_fileindex_entry_staged_filetype_get(ie)) {
7837 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_BAD_SYMLINK:
7838 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_REGULAR_FILE:
7839 ea7786be 2020-07-23 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
7840 ea7786be 2020-07-23 stsp blob_base, ondisk_path, relpath,
7841 ea7786be 2020-07-23 stsp got_fileindex_perms_to_st(ie), label_orig,
7842 ea7786be 2020-07-23 stsp blob_staged, commit_id ? commit_id :
7843 ea7786be 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7844 ea7786be 2020-07-23 stsp a->progress_cb, a->progress_arg);
7846 ea7786be 2020-07-23 stsp case GOT_FILEIDX_MODE_SYMLINK:
7847 dfe9fba0 2020-07-23 stsp if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
7848 36bf999c 2020-07-23 stsp char *staged_target;
7849 36bf999c 2020-07-23 stsp err = got_object_blob_read_to_str(
7850 36bf999c 2020-07-23 stsp &staged_target, blob_staged);
7852 36bf999c 2020-07-23 stsp goto done;
7853 dfe9fba0 2020-07-23 stsp err = merge_symlink(a->worktree, blob_base,
7854 dfe9fba0 2020-07-23 stsp ondisk_path, relpath, label_orig,
7855 36bf999c 2020-07-23 stsp staged_target, commit_id ? commit_id :
7856 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id,
7857 dfe9fba0 2020-07-23 stsp a->repo, a->progress_cb, a->progress_arg);
7858 36bf999c 2020-07-23 stsp free(staged_target);
7860 dfe9fba0 2020-07-23 stsp err = merge_blob(&local_changes_subsumed,
7861 dfe9fba0 2020-07-23 stsp a->worktree, blob_base, ondisk_path,
7862 dfe9fba0 2020-07-23 stsp relpath, got_fileindex_perms_to_st(ie),
7863 dfe9fba0 2020-07-23 stsp label_orig, blob_staged,
7864 dfe9fba0 2020-07-23 stsp commit_id ? commit_id :
7865 dfe9fba0 2020-07-23 stsp a->worktree->base_commit_id, a->repo,
7866 dfe9fba0 2020-07-23 stsp a->progress_cb, a->progress_arg);
7870 ea7786be 2020-07-23 stsp err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
7873 2ac8aa02 2020-11-09 stsp if (err == NULL) {
7874 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
7875 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
7876 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
7879 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
7880 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
7881 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
7882 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
7883 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
7886 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
7888 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
7889 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
7893 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
7894 2ac8aa02 2020-11-09 stsp got_fileindex_entry_staged_filetype_set(ie, 0);
7895 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
7896 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
7899 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
7903 ad493afc 2019-08-03 stsp free(ondisk_path);
7904 ad493afc 2019-08-03 stsp if (blob_base)
7905 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
7906 ad493afc 2019-08-03 stsp if (blob_staged)
7907 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
7908 f69721c3 2019-10-21 stsp free(id_str);
7909 f69721c3 2019-10-21 stsp free(label_orig);
7910 ad493afc 2019-08-03 stsp return err;
7913 ad493afc 2019-08-03 stsp const struct got_error *
7914 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
7915 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
7916 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
7917 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
7918 ad493afc 2019-08-03 stsp struct got_repository *repo)
7920 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
7921 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
7922 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
7923 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
7924 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
7926 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
7928 ad493afc 2019-08-03 stsp return err;
7930 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
7932 ad493afc 2019-08-03 stsp goto done;
7934 ad493afc 2019-08-03 stsp upa.worktree = worktree;
7935 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
7936 ad493afc 2019-08-03 stsp upa.repo = repo;
7937 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
7938 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
7939 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
7940 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
7941 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
7942 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
7943 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
7945 ad493afc 2019-08-03 stsp goto done;
7948 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
7949 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
7950 ad493afc 2019-08-03 stsp err = sync_err;
7952 ad493afc 2019-08-03 stsp free(fileindex_path);
7953 ad493afc 2019-08-03 stsp if (fileindex)
7954 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
7955 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
7956 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
7957 ad493afc 2019-08-03 stsp err = unlockerr;
7958 ad493afc 2019-08-03 stsp return err;
7961 b2118c49 2020-07-28 stsp struct report_file_info_arg {
7962 b2118c49 2020-07-28 stsp struct got_worktree *worktree;
7963 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb;
7964 b2118c49 2020-07-28 stsp void *info_arg;
7965 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths;
7966 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb;
7967 b2118c49 2020-07-28 stsp void *cancel_arg;
7970 b2118c49 2020-07-28 stsp static const struct got_error *
7971 b2118c49 2020-07-28 stsp report_file_info(void *arg, struct got_fileindex_entry *ie)
7973 b2118c49 2020-07-28 stsp struct report_file_info_arg *a = arg;
7974 b2118c49 2020-07-28 stsp struct got_pathlist_entry *pe;
7975 b2118c49 2020-07-28 stsp struct got_object_id blob_id, staged_blob_id, commit_id;
7976 b2118c49 2020-07-28 stsp struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
7977 b2118c49 2020-07-28 stsp struct got_object_id *commit_idp = NULL;
7978 b2118c49 2020-07-28 stsp int stage;
7980 b2118c49 2020-07-28 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
7981 b2118c49 2020-07-28 stsp return got_error(GOT_ERR_CANCELLED);
7983 b2118c49 2020-07-28 stsp TAILQ_FOREACH(pe, a->paths, entry) {
7984 b2118c49 2020-07-28 stsp if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
7985 b2118c49 2020-07-28 stsp got_path_is_child(ie->path, pe->path, pe->path_len))
7988 b2118c49 2020-07-28 stsp if (pe == NULL) /* not found */
7989 b2118c49 2020-07-28 stsp return NULL;
7991 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_blob(ie)) {
7992 b2118c49 2020-07-28 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
7993 b2118c49 2020-07-28 stsp blob_idp = &blob_id;
7995 b2118c49 2020-07-28 stsp stage = got_fileindex_entry_stage_get(ie);
7996 b2118c49 2020-07-28 stsp if (stage == GOT_FILEIDX_STAGE_MODIFY ||
7997 b2118c49 2020-07-28 stsp stage == GOT_FILEIDX_STAGE_ADD) {
7998 b2118c49 2020-07-28 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
7999 b2118c49 2020-07-28 stsp SHA1_DIGEST_LENGTH);
8000 b2118c49 2020-07-28 stsp staged_blob_idp = &staged_blob_id;
8003 b2118c49 2020-07-28 stsp if (got_fileindex_entry_has_commit(ie)) {
8004 b2118c49 2020-07-28 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
8005 b2118c49 2020-07-28 stsp commit_idp = &commit_id;
8008 b2118c49 2020-07-28 stsp return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
8009 b2118c49 2020-07-28 stsp (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
8012 b2118c49 2020-07-28 stsp const struct got_error *
8013 b2118c49 2020-07-28 stsp got_worktree_path_info(struct got_worktree *worktree,
8014 b2118c49 2020-07-28 stsp struct got_pathlist_head *paths,
8015 b2118c49 2020-07-28 stsp got_worktree_path_info_cb info_cb, void *info_arg,
8016 b2118c49 2020-07-28 stsp got_cancel_cb cancel_cb, void *cancel_arg)
8019 b2118c49 2020-07-28 stsp const struct got_error *err = NULL, *unlockerr;
8020 b2118c49 2020-07-28 stsp struct got_fileindex *fileindex = NULL;
8021 b2118c49 2020-07-28 stsp char *fileindex_path = NULL;
8022 b2118c49 2020-07-28 stsp struct report_file_info_arg arg;
8024 b2118c49 2020-07-28 stsp err = lock_worktree(worktree, LOCK_SH);
8026 b2118c49 2020-07-28 stsp return err;
8028 b2118c49 2020-07-28 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
8030 b2118c49 2020-07-28 stsp goto done;
8032 b2118c49 2020-07-28 stsp arg.worktree = worktree;
8033 b2118c49 2020-07-28 stsp arg.info_cb = info_cb;
8034 b2118c49 2020-07-28 stsp arg.info_arg = info_arg;
8035 b2118c49 2020-07-28 stsp arg.paths = paths;
8036 b2118c49 2020-07-28 stsp arg.cancel_cb = cancel_cb;
8037 b2118c49 2020-07-28 stsp arg.cancel_arg = cancel_arg;
8038 b2118c49 2020-07-28 stsp err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
8041 b2118c49 2020-07-28 stsp free(fileindex_path);
8042 b2118c49 2020-07-28 stsp if (fileindex)
8043 b2118c49 2020-07-28 stsp got_fileindex_free(fileindex);
8044 b2118c49 2020-07-28 stsp unlockerr = lock_worktree(worktree, LOCK_UN);
8045 b2118c49 2020-07-28 stsp if (unlockerr && err == NULL)
8046 b2118c49 2020-07-28 stsp err = unlockerr;
8047 b2118c49 2020-07-28 stsp return err;
